From 701b83fae1eec7479c7e34bfaac5e2d19b086265 Mon Sep 17 00:00:00 2001
From: Yulia Hermak <germak372@gmail.com>
Date: Thu, 2 May 2024 00:51:53 +0100
Subject: [PATCH 1/2] fix: scroll in wallets and nodes

---
 src/router/index.js   | 2 +-
 src/views/Nodes.vue   | 2 --
 src/views/Wallets.vue | 7 +------
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index d5da8560f..2d549349c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -187,7 +187,7 @@ const router = createRouter({
     } else if (savedPosition) {
       return savedPosition
     } else if (to.meta.scrollPosition) {
-      return to.meta.scrollPosition
+      return window.scrollTo(to.meta.scrollPosition.x, to.meta.scrollPosition.y)
     }
   }
 })
diff --git a/src/views/Nodes.vue b/src/views/Nodes.vue
index aa060fe22..c739403bf 100644
--- a/src/views/Nodes.vue
+++ b/src/views/Nodes.vue
@@ -32,8 +32,6 @@ export default {
     className: () => 'nodes-view'
   },
   mounted() {
-    // TODO: probably it can be refactored later
-    window.scrollTo(0, 0)
     this.$store.dispatch('nodes/updateStatus')
 
     nodesManager.updateHealthcheckInterval('onScreen')
diff --git a/src/views/Wallets.vue b/src/views/Wallets.vue
index 2f7aaafbb..9d0324a8b 100644
--- a/src/views/Wallets.vue
+++ b/src/views/Wallets.vue
@@ -48,7 +48,7 @@
 <script lang="ts">
 import draggable from 'vuedraggable'
 import AppToolbarCentered from '@/components/AppToolbarCentered.vue'
-import { computed, defineComponent, onBeforeUnmount, onMounted, ref } from 'vue'
+import { computed, defineComponent, onBeforeUnmount, ref } from 'vue'
 import { CryptosInfo, CryptoSymbol, isErc20 } from '@/lib/constants'
 import { useStore } from 'vuex'
 import WalletsSearchInput from '@/components/wallets/WalletsSearchInput.vue'
@@ -163,11 +163,6 @@ export default defineComponent({
       clearInterval(timer.value)
     })
 
-    // TODO: probably it can be refactored later
-    onMounted(() => {
-      window.scrollTo(0, 0)
-    })
-
     return {
       classes,
       dragOptions,

From 5f73db14cbb7043c0b285567dac7757f3a8bdb68 Mon Sep 17 00:00:00 2001
From: bludnic <victorcpla@gmail.com>
Date: Thu, 9 May 2024 14:47:58 +0100
Subject: [PATCH 2/2] fix(router): api for scrollBehaviour changed (x, y ->
 left, top)

---
 src/router/index.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 2d549349c..6bcad8c32 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -31,8 +31,8 @@ const routes = [
       requiresAuth: false,
       layout: 'no-container',
       scrollPosition: {
-        x: 0,
-        y: 0
+        left: 0,
+        top: 0
       }
     }
   },
@@ -53,8 +53,8 @@ const routes = [
       requiresAuth: true,
       layout: 'no-container',
       scrollPosition: {
-        x: 0,
-        y: 0
+        left: 0,
+        top: 0
       }
     }
   },
@@ -103,8 +103,8 @@ const routes = [
       layout: 'no-container',
       showNavigation: true,
       scrollPosition: {
-        x: 0,
-        y: 0
+        left: 0,
+        top: 0
       }
     }
   },
@@ -130,8 +130,8 @@ const routes = [
       containerNoPadding: true,
       showNavigation: true,
       scrollPosition: {
-        x: 0,
-        y: 0
+        left: 0,
+        top: 0
       }
     }
   },
@@ -183,11 +183,11 @@ const router = createRouter({
   scrollBehavior(to, from, savedPosition) {
     if (to.params.txId) {
       // Don't restore scroll for Transaction details screen
-      return { x: 0, y: 0 }
+      return { left: 0, top: 0 }
     } else if (savedPosition) {
       return savedPosition
     } else if (to.meta.scrollPosition) {
-      return window.scrollTo(to.meta.scrollPosition.x, to.meta.scrollPosition.y)
+      return to.meta.scrollPosition
     }
   }
 })