fixing hook call ordering

Emurgo · Jun 17, 2024 · 1e6e189 · 1e6e189
1 parent 3d931f3
commit 1e6e189
Showing 1 changed file with 32 additions and 15 deletions.
diff --git a/packages/yoroi-extension/app/containers/swap/hooks.js b/packages/yoroi-extension/app/containers/swap/hooks.js
@@ -97,11 +97,21 @@ export function useSwapFeeDisplay(
 }
 
 export function useRichOpenOrders(): any {
+  let openOrders = [];
+  try {
+    openOrders = useSwapOrdersByStatusOpen();
+  } catch (e) {
+    console.warn('useRichCompletedOrders.useSwapOrdersByStatusOpen', e);
+  }
+  let onlyVerifiedTokens = [];
+  try {
+    const res = useSwapTokensOnlyVerified();
+    onlyVerifiedTokens = res.onlyVerifiedTokens;
+  } catch (e) {
+    console.warn('useRichCompletedOrders.useSwapTokensOnlyVerified', e);
+  }
+  if ((openOrders?.length || 0) === 0 || (onlyVerifiedTokens?.length || 0) === 0) return [];
   try {
-    const openOrders = useSwapOrdersByStatusOpen();
-    if (openOrders?.length === 0) return [];
-    const { onlyVerifiedTokens } = useSwapTokensOnlyVerified();
-    if (onlyVerifiedTokens.length === 0) return [];
     const tokensMap = onlyVerifiedTokens.reduce((map, t) => ({ ...map, [t.id]: t }), {});
     return openOrders.map(o => {
       const fromToken = tokensMap[o.from.tokenId];
@@ -117,20 +127,28 @@ export function useRichOpenOrders(): any {
         sender: o.sender,
       };
     });
-  } catch (error) {
-    console.warn(error);
+  } catch (e) {
+    console.warn('useRichOpenOrders', e);
     return [];
   }
 }
 
 export function useRichCompletedOrders(): any {
+  let completedOrders = [];
+  try {
+    completedOrders = useSwapOrdersByStatusCompleted();
+  } catch (e) {
+    console.warn('useRichCompletedOrders.useSwapOrdersByStatusCompleted', e);
+  }
+  let onlyVerifiedTokens = [];
+  try {
+    const res = useSwapTokensOnlyVerified();
+    onlyVerifiedTokens = res.onlyVerifiedTokens;
+  } catch (e) {
+    console.warn('useRichCompletedOrders.useSwapTokensOnlyVerified', e);
+  }
+  if ((completedOrders?.length || 0) === 0 || (onlyVerifiedTokens?.length || 0) === 0) return [];
   try {
-    console.log(11);
-    const completedOrders = useSwapOrdersByStatusCompleted();
-    console.log(22);
-    const { onlyVerifiedTokens } = useSwapTokensOnlyVerified();
-    console.log(33);
-    if (completedOrders?.length === 0) return [];
     const tokensMap = onlyVerifiedTokens.reduce((map, t) => ({ ...map, [t.id]: t }), {});
     return completedOrders.map(o => {
       const fromToken = tokensMap[o.from.tokenId];
@@ -141,9 +159,8 @@ export function useRichCompletedOrders(): any {
         to: { quantity: o.to.quantity, token: toToken },
       };
     });
-  } catch (error) {
-    console.log(99);
-    console.warn(error);
+  } catch (e) {
+    console.warn('useRichCompletedOrders', e);
     return [];
   }
 }