From 7eef3fa3a9756db8455b6a4c782d4ff5bed00307 Mon Sep 17 00:00:00 2001
From: Natanael Rodriguez Ramos <nathan@Natanaels-MacBook-Pro.local>
Date: Tue, 23 Apr 2024 13:30:22 +0100
Subject: [PATCH 1/3] fix: Add scroll reset on payment select

---
 .../ivpn-v3/assets/js/components/SelectPaymentMethod.vue | 8 ++++++++
 src/themes/ivpn-v3/assets/js/views/Account/AddFunds.vue  | 9 +++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/themes/ivpn-v3/assets/js/components/SelectPaymentMethod.vue b/src/themes/ivpn-v3/assets/js/components/SelectPaymentMethod.vue
index f7d99d1cc..c980e40cf 100644
--- a/src/themes/ivpn-v3/assets/js/components/SelectPaymentMethod.vue
+++ b/src/themes/ivpn-v3/assets/js/components/SelectPaymentMethod.vue
@@ -23,6 +23,7 @@
                 tag="button"
                 class="btn btn-solid pay-button"
                 :to="{ name: 'add-funds-cc', params: { price: price.id } }"
+                @click.native="scrollToTop"
             >
                 <div class="credit-card-icon"></div>
                 Credit Card
@@ -31,6 +32,7 @@
                 tag="button"
                 class="btn btn-solid pay-button"
                 :to="{ name: 'add-funds-paypal', params: { price: price.id } }"
+                @click.native="scrollToTop"
             >
                 <div class="paypal-icon"></div>
                 PayPal
@@ -39,6 +41,7 @@
                 tag="button"
                 class="btn btn-solid pay-button"
                 :to="{ name: 'add-funds-bitcoin', params: { price: price.id } }"
+                @click.native="scrollToTop"
             >
                 <div class="bitcoin-icon"></div>
                 Bitcoin
@@ -47,6 +50,7 @@
                 tag="button"
                 class="btn btn-solid pay-button"
                 :to="{ name: 'add-funds-monero', params: { price: price.id } }"
+                @click.native="scrollToTop"
             >
                 <div class="monero-icon"></div>
                 Monero
@@ -55,6 +59,7 @@
                 tag="button"
                 class="btn btn-solid pay-button"
                 :to="{ name: 'add-funds-cash', params: { price: price.id } }"
+                @click.native="scrollToTop"
             >
                 <div class="cash-icon"></div>
                 Cash
@@ -113,6 +118,9 @@ export default {
         toggleMoreOptions() {
             this.more = !this.more;
         },
+        scrollToTop() {
+            window.scrollTo(0,0);
+        },
     },
 };
 </script>
diff --git a/src/themes/ivpn-v3/assets/js/views/Account/AddFunds.vue b/src/themes/ivpn-v3/assets/js/views/Account/AddFunds.vue
index 523e4b4f3..13f938935 100644
--- a/src/themes/ivpn-v3/assets/js/views/Account/AddFunds.vue
+++ b/src/themes/ivpn-v3/assets/js/views/Account/AddFunds.vue
@@ -1,10 +1,10 @@
 <template>
     <div v-if="!isLight" class="payment-page-header">
         <div class="back-link">
-            <router-link :to="{ name: 'account' }" v-if="account.is_new">
+            <router-link :to="{ name: 'account' }" v-if="account.is_new" @click.native="scrollToTop">
                 <span class="icon-back"></span>Select payment method
             </router-link>
-            <router-link :to="{ name: 'payment' }" v-else>
+            <router-link :to="{ name: 'payment' }" v-else @click.native="scrollToTop">
                 <span class="icon-back"></span>Select payment method
             </router-link>
         </div>
@@ -74,6 +74,11 @@ export default {
             window.location = "/light";
         }
     },
+    methods: {
+        scrollToTop() {
+            window.scrollTo(0,0);
+        },
+    },
 };
 </script>
 

From c289e28ef1d3ce4e47ebc940ce37e28d15b45a0c Mon Sep 17 00:00:00 2001
From: Natanael Rodriguez Ramos <nathan@Natanaels-MacBook-Pro.local>
Date: Tue, 23 Apr 2024 13:53:43 +0100
Subject: [PATCH 2/3] fix: Removed scroll saved position

---
 .../ivpn-v3/assets/js/components/SelectPaymentMethod.vue | 8 --------
 src/themes/ivpn-v3/assets/js/router/index.js             | 6 +-----
 src/themes/ivpn-v3/assets/js/views/Account/AddFunds.vue  | 9 ++-------
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/themes/ivpn-v3/assets/js/components/SelectPaymentMethod.vue b/src/themes/ivpn-v3/assets/js/components/SelectPaymentMethod.vue
index c980e40cf..f7d99d1cc 100644
--- a/src/themes/ivpn-v3/assets/js/components/SelectPaymentMethod.vue
+++ b/src/themes/ivpn-v3/assets/js/components/SelectPaymentMethod.vue
@@ -23,7 +23,6 @@
                 tag="button"
                 class="btn btn-solid pay-button"
                 :to="{ name: 'add-funds-cc', params: { price: price.id } }"
-                @click.native="scrollToTop"
             >
                 <div class="credit-card-icon"></div>
                 Credit Card
@@ -32,7 +31,6 @@
                 tag="button"
                 class="btn btn-solid pay-button"
                 :to="{ name: 'add-funds-paypal', params: { price: price.id } }"
-                @click.native="scrollToTop"
             >
                 <div class="paypal-icon"></div>
                 PayPal
@@ -41,7 +39,6 @@
                 tag="button"
                 class="btn btn-solid pay-button"
                 :to="{ name: 'add-funds-bitcoin', params: { price: price.id } }"
-                @click.native="scrollToTop"
             >
                 <div class="bitcoin-icon"></div>
                 Bitcoin
@@ -50,7 +47,6 @@
                 tag="button"
                 class="btn btn-solid pay-button"
                 :to="{ name: 'add-funds-monero', params: { price: price.id } }"
-                @click.native="scrollToTop"
             >
                 <div class="monero-icon"></div>
                 Monero
@@ -59,7 +55,6 @@
                 tag="button"
                 class="btn btn-solid pay-button"
                 :to="{ name: 'add-funds-cash', params: { price: price.id } }"
-                @click.native="scrollToTop"
             >
                 <div class="cash-icon"></div>
                 Cash
@@ -118,9 +113,6 @@ export default {
         toggleMoreOptions() {
             this.more = !this.more;
         },
-        scrollToTop() {
-            window.scrollTo(0,0);
-        },
     },
 };
 </script>
diff --git a/src/themes/ivpn-v3/assets/js/router/index.js b/src/themes/ivpn-v3/assets/js/router/index.js
index db6acd98c..dd916c4b7 100644
--- a/src/themes/ivpn-v3/assets/js/router/index.js
+++ b/src/themes/ivpn-v3/assets/js/router/index.js
@@ -315,11 +315,7 @@ const router = createRouter({
     routes,
     store,
     scrollBehavior(to, from, savedPosition) {
-        if (savedPosition) {
-            return savedPosition
-        } else {
-            return { x: 0, y: 0 }
-        }
+        return { x: 0, y: 0 }
     }
 })
 
diff --git a/src/themes/ivpn-v3/assets/js/views/Account/AddFunds.vue b/src/themes/ivpn-v3/assets/js/views/Account/AddFunds.vue
index 13f938935..523e4b4f3 100644
--- a/src/themes/ivpn-v3/assets/js/views/Account/AddFunds.vue
+++ b/src/themes/ivpn-v3/assets/js/views/Account/AddFunds.vue
@@ -1,10 +1,10 @@
 <template>
     <div v-if="!isLight" class="payment-page-header">
         <div class="back-link">
-            <router-link :to="{ name: 'account' }" v-if="account.is_new" @click.native="scrollToTop">
+            <router-link :to="{ name: 'account' }" v-if="account.is_new">
                 <span class="icon-back"></span>Select payment method
             </router-link>
-            <router-link :to="{ name: 'payment' }" v-else @click.native="scrollToTop">
+            <router-link :to="{ name: 'payment' }" v-else>
                 <span class="icon-back"></span>Select payment method
             </router-link>
         </div>
@@ -74,11 +74,6 @@ export default {
             window.location = "/light";
         }
     },
-    methods: {
-        scrollToTop() {
-            window.scrollTo(0,0);
-        },
-    },
 };
 </script>
 

From 04623b5ceec3e7bfb7d3c1f4bb9596533c80d4a6 Mon Sep 17 00:00:00 2001
From: Natanael Rodriguez Ramos <nathan@Natanaels-MacBook-Pro.local>
Date: Tue, 23 Apr 2024 14:05:34 +0100
Subject: [PATCH 3/3] fix: Removed scroll saved position

---
 src/themes/ivpn-v3/assets/js/router/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/themes/ivpn-v3/assets/js/router/index.js b/src/themes/ivpn-v3/assets/js/router/index.js
index dd916c4b7..7f219839f 100644
--- a/src/themes/ivpn-v3/assets/js/router/index.js
+++ b/src/themes/ivpn-v3/assets/js/router/index.js
@@ -315,7 +315,7 @@ const router = createRouter({
     routes,
     store,
     scrollBehavior(to, from, savedPosition) {
-        return { x: 0, y: 0 }
+        return { top: 0 }
     }
 })