fix: prevent withdraw dialog from disappearing

fireblocks · Sep 18, 2023 · d3a2a02 · d3a2a02
1 parent 6f50354
commit d3a2a02
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/apps/recovery-utility/renderer/components/Modals/WithdrawModal/index.tsx b/apps/recovery-utility/renderer/components/Modals/WithdrawModal/index.tsx
@@ -1,11 +1,20 @@
 import { useMemo, useState, ReactNode } from 'react';
 import { nanoid } from 'nanoid';
 import { Typography, Box } from '@mui/material';
-import { VaultAccount, BaseModal, AssetIcon, TransactionInitInput, RelayRxTx } from '@fireblocks/recovery-shared';
+import {
+  VaultAccount,
+  BaseModal,
+  AssetIcon,
+  TransactionInitInput,
+  RelayRxTx,
+  getLogger,
+  wrapState,
+} from '@fireblocks/recovery-shared';
 import { getAssetConfig, derivableAssets, AssetConfig, getDerivableAssetConfig } from '@fireblocks/asset-config';
 import { useWorkspace } from '../../../context/Workspace';
 import { InitiateTransaction } from './InitiateTransaction';
 import { SignTransaction } from './SignTransaction';
+import { LOGGER_NAME_UTILITY } from '@fireblocks/recovery-shared/constants';
 
 type Props = {
   assetId?: string;
@@ -50,9 +59,11 @@ export const WithdrawModal = ({ assetId, accountId, open, onClose: onCloseModal
     [accountsArray],
   );
 
-  const [txInitData, setTxInitData] = useState<TransactionInitInput | null>(null);
+  const [txInitData, setTxInitDataInt] = useState<TransactionInitInput | null>(null);
 
-  const [createTxOutboundRelayUrl, setCreateTxOutboundRelayUrl] = useState<string | null>(null);
+  const [createTxOutboundRelayUrl, setCreateTxOutboundRelayUrlInt] = useState<string | null>(null);
+  const setTxInitData = wrapState<TransactionInitInput | null>('txInitData', setTxInitDataInt);
+  const setCreateTxOutboundRelayUrl = wrapState<string | null>('createTxOutboundRelayUrl', setCreateTxOutboundRelayUrlInt);
 
   const selectedAccount = typeof accountId === 'number' ? accounts.get(accountId) : undefined;
 
@@ -118,7 +129,9 @@ export const WithdrawModal = ({ assetId, accountId, open, onClose: onCloseModal
             txTitle={`xpub/fpub, account ${txInitData.accountId}, asset ${txInitData.assetId}`}
             txUrl={createTxOutboundRelayUrl}
             onDecodeQrCode={(data) => {
-              setInboundRelayUrl(data);
+              if (!setInboundRelayUrl(data)) {
+                return;
+              }
               setCreateTxOutboundRelayUrl(null);
             }}
           />

diff --git a/packages/shared/hooks/useBaseWorkspace/index.ts b/packages/shared/hooks/useBaseWorkspace/index.ts
@@ -31,7 +31,7 @@ const defaultBaseWorkspace: BaseWorkspace<BaseWallet> = {
 
 export const defaultBaseWorkspaceContext: BaseWorkspaceContext<BaseWallet> = {
   ...defaultBaseWorkspace,
-  setInboundRelayUrl: () => undefined,
+  setInboundRelayUrl: () => false,
   getOutboundRelayUrl: () => '',
   setExtendedKeys: () => undefined,
   importCsv: () => Promise.resolve(),

diff --git a/packages/shared/hooks/useBaseWorkspace/types.ts b/packages/shared/hooks/useBaseWorkspace/types.ts
@@ -22,7 +22,7 @@ export type BaseWorkspaceContext<
   Derivation extends BaseWallet = BaseWallet,
   App extends 'utility' | 'relay' = 'utility',
 > = BaseWorkspace<Derivation, App> & {
-  setInboundRelayUrl: (relayUrl: string | null) => void;
+  setInboundRelayUrl: (relayUrl: string | null) => boolean;
   getOutboundRelayUrl: <Params extends App extends 'utility' ? RelayRequestParams : RelayResponseParams>(
     params: Params,
   ) => string;

diff --git a/packages/shared/hooks/useBaseWorkspace/useRelayUrl/index.ts b/packages/shared/hooks/useBaseWorkspace/useRelayUrl/index.ts
@@ -66,13 +66,16 @@ export const useRelayUrl = <App extends 'utility' | 'relay'>(app: App, baseUrl:
       logger.debug('setInboundRelayUrl', { relayUrl });
       if (!relayUrl) {
         setInboundRelayParams(undefined);
+        return false;
       } else {
         const params = getInboundRelayParams(relayUrl);
 
         setInboundRelayParams(params);
+        return true;
       }
     } catch (error) {
       logger.error(error);
+      return false;
     }
   };