Update tradeHook.tsx

OneKeyHQ · Dec 26, 2024 · ea8dd56 · ea8dd56
1 parent b67cde1
commit ea8dd56
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/packages/kit/src/views/Market/components/tradeHook.tsx b/packages/kit/src/views/Market/components/tradeHook.tsx
@@ -209,10 +209,6 @@ export const useMarketTradeActions = (token: IMarketTokenDetail | null) => {
     if (!networkId) {
       throw new Error(`cannot find NetworkId ${networkId || ''}`);
     }
-    const deriveType =
-      await backgroundApiProxy.serviceNetwork.getGlobalDeriveTypeOfNetwork({
-        networkId,
-      });
     try {
       if (
         accountUtils.isWatchingAccount({
@@ -223,6 +219,10 @@ export const useMarketTradeActions = (token: IMarketTokenDetail | null) => {
         return undefined;
       }
       if (activeAccount.account?.indexedAccountId) {
+        const deriveType =
+          await backgroundApiProxy.serviceNetwork.getGlobalDeriveTypeOfNetwork({
+            networkId,
+          });
         await backgroundApiProxy.serviceAccount.getNetworkAccount({
           accountId: undefined,
           indexedAccountId: activeAccount.account?.indexedAccountId,
@@ -237,7 +237,7 @@ export const useMarketTradeActions = (token: IMarketTokenDetail | null) => {
         return undefined;
       }
     } catch (error) {
-      await new Promise<void>((resolve, reject) => {
+      const isCreated = await new Promise<boolean>((resolve) => {
         const dialog = Dialog.show({
           title: intl.formatMessage({
             id: ETranslations.wallet_no_address,
@@ -255,13 +255,13 @@ export const useMarketTradeActions = (token: IMarketTokenDetail | null) => {
           showFooter: false,
           onClose: (extra) => {
             if (extra?.flag !== 'created') {
-              reject(new Error('failed to create address'));
+              resolve(false);
             }
           },
           renderContent: (
             <CreateAddressDialogContent
               onCreate={async () => {
-                resolve();
+                resolve(true);
                 await dialog.close({ flag: 'created' });
                 Toast.success({
                   title: intl.formatMessage({
@@ -277,6 +277,10 @@ export const useMarketTradeActions = (token: IMarketTokenDetail | null) => {
       });
     }
 
+    if (!isCreated) {
+      return undefined;
+    }
+
     return {
       activeAccount,
       networkId,