Merge remote-tracking branch 'refs/remotes/origin/dev' into feat/ipfs

Adamant-im · May 14, 2024 · abfea27 · abfea27
2 parents 4b4d8a4 + 8c9e7c9
commit abfea27
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git 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,7 +183,7 @@ 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) {

diff --git 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
@@ -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,