fix view as another wallet (#573)

open-dollar · Jun 13, 2024 · 5098c00 · 5098c00
1 parent 24c6409
commit 5098c00
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/components/VaultManager.tsx b/src/components/VaultManager.tsx
@@ -46,7 +46,11 @@ const VaultManager = () => {
                 return
             }
             popupsActions.setIsWaitingModalOpen(true)
-            history.push(`/${value}`)
+            if (window?.location) {
+                window.location.assign(`/${value}`)
+            } else {
+                history.push(`/${value}`)
+            }
             handleCancel()
             await timeout(3000)
             popupsActions.setIsWaitingModalOpen(false)

diff --git a/src/containers/Vaults/VaultDetails.tsx b/src/containers/Vaults/VaultDetails.tsx
@@ -31,14 +31,14 @@ const VaultDetails = ({ ...props }) => {
             return props.location.pathname.includes('deposit')
         }
         return false
-    }, [props])
+    }, [props.location])
 
     const isWithdraw = useMemo(() => {
         if (props.location) {
             return props.location.pathname.includes('withdraw')
         }
         return false
-    }, [props])
+    }, [props.location])
 
     const isOwner = useIsOwner(safeId)
 
@@ -52,6 +52,7 @@ const VaultDetails = ({ ...props }) => {
         if (safe && safeId && geb && liquidationData) {
             safeActions.setSingleSafe(safe)
             safeActions.setSafeData(DEFAULT_SAFE_STATE)
+            return
         }
 
         if (!safe && geb && safeId) {

diff --git a/src/model/safeModel.ts b/src/model/safeModel.ts
@@ -230,6 +230,9 @@ const safeModel: SafeModel = {
         state.list = payload
     }),
     setSingleSafe: action((state, payload) => {
+        if (!payload) {
+            return
+        }
         state.singleSafe = payload
     }),
     setOperation: action((state, payload) => {