fix: change event payload + use callback syntax

safe-global · Oct 18, 2023 · aec7801 · aec7801
1 parent 31f019c
commit aec7801
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/src/components/tx-flow/index.tsx b/src/components/tx-flow/index.tsx
@@ -46,23 +46,25 @@ export const TxModalProvider = ({ children }: { children: ReactNode }): ReactEle
     if (!ok) return
 
     // Reject if the flow is closed
-    txDispatch(TxEvent.USER_QUIT, undefined)
+    txDispatch(TxEvent.USER_QUIT, {})
 
     handleModalClose()
   }, [shouldWarn, handleModalClose])
 
   const setTxFlow = useCallback(
     (newTxFlow: TxModalContextType['txFlow'], onClose?: () => void, shouldWarn?: boolean) => {
-      // Reject if a flow is open and the user changes to a different one
-      if (txFlow && txFlow !== newTxFlow && newTxFlow?.type !== SuccessScreen) {
-        txDispatch(TxEvent.USER_QUIT, undefined)
-      }
+      setFlow((prevFlow) => {
+        // Reject if a flow is open and the user changes to a different one
+        if (prevFlow && prevFlow !== newTxFlow && newTxFlow?.type !== SuccessScreen) {
+          txDispatch(TxEvent.USER_QUIT, {})
+        }
 
-      setFlow(newTxFlow)
+        return newTxFlow
+      })
       setOnClose(() => onClose ?? noop)
       setShouldWarn(shouldWarn ?? true)
     },
-    [txFlow],
+    [],
   )
 
   // Show the confirmation dialog if user navigates

diff --git a/src/hooks/useTxPendingStatuses.ts b/src/hooks/useTxPendingStatuses.ts
@@ -76,10 +76,6 @@ const useTxPendingStatuses = (): void => {
   useEffect(() => {
     const unsubFns = Object.entries(pendingStatuses).map(([event, status]) =>
       txSubscribe(event as TxEvent, (detail) => {
-        if (!detail) {
-          return
-        }
-
         // All pending txns should have a txId
         const txId = 'txId' in detail && detail.txId
         if (!txId) return

diff --git a/src/services/tx/txEvents.ts b/src/services/tx/txEvents.ts
@@ -28,7 +28,7 @@ type Id = { txId: string; groupKey?: string } | { txId?: string; groupKey: strin
 type HumanDescription = { humanDescription?: string }
 
 interface TxEvents {
-  [TxEvent.USER_QUIT]: undefined
+  [TxEvent.USER_QUIT]: {}
   [TxEvent.SIGNED]: { txId?: string }
   [TxEvent.SIGN_FAILED]: HumanDescription & { txId?: string; error: Error }
   [TxEvent.PROPOSE_FAILED]: HumanDescription & { error: Error }