fix: back button unresponsive after network switch (#1662)

WalletConnect · Dec 26, 2023 · 13b71a0 · 13b71a0 · vercel · Dec 26, 2023
1 parent b36153e
commit 13b71a0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/packages/core/src/controllers/RouterController.ts b/packages/core/src/controllers/RouterController.ts
@@ -78,5 +78,15 @@ export const RouterController = {
         state.view = last
       }
     }
+  },
+
+  goBackToIndex(historyIndex: number) {
+    if (state.history.length > 1) {
+      state.history = state.history.slice(0, historyIndex + 1)
+      const [last] = state.history.slice(-1)
+      if (last) {
+        state.view = last
+      }
+    }
   }
 }
diff --git a/packages/core/src/utils/RouterUtil.ts b/packages/core/src/utils/RouterUtil.ts
@@ -12,9 +12,8 @@ export const RouterUtil = {
   navigateAfterNetworkSwitch() {
     const { history } = RouterController.state
     const networkSelectIndex = history.findIndex(name => name === 'Networks')
-    const pageBeforeNetworkSelect = history[networkSelectIndex - 1]
-    if (pageBeforeNetworkSelect) {
-      RouterController.replace(pageBeforeNetworkSelect)
+    if (networkSelectIndex >= 1) {
+      RouterController.goBackToIndex(networkSelectIndex - 1)
     } else {
       ModalController.close()
     }