fix: fix bugss (#4826)

OneKeyHQ · Jun 19, 2024 · ab43b42 · ab43b42
1 parent 22b4ecb
commit ab43b42
Show file tree

Hide file tree

Showing 9 changed files with 102 additions and 43 deletions.
diff --git a/packages/kit/src/states/jotai/contexts/swap/actions.ts b/packages/kit/src/states/jotai/contexts/swap/actions.ts
@@ -33,6 +33,7 @@ import {
   ESwapRateDifferenceUnit,
   ESwapSlippageSegmentKey,
   ESwapTxHistoryStatus,
+  ETokenRiskLevel,
 } from '@onekeyhq/shared/types/swap/types';
 
 import { ContextJotaiActionsBase } from '../../utils/ContextJotaiActionsBase';
@@ -92,15 +93,17 @@ class ContentJotaiActionsSwap extends ContextJotaiActionsBase {
       const catchTokens = swapTokenMap.tokenCatch?.[key];
       const dateNow = Date.now();
       let catchCount = 0;
-      const newTokens = tokens.map((token) => {
-        const network = swapNetworksList.find(
-          (n) => n.networkId === token.networkId,
-        );
-        if (network) {
-          token.networkLogoURI = network.logoURI;
-        }
-        return token;
-      });
+      const newTokens = tokens
+        .filter((t) => t.riskLevel !== ETokenRiskLevel.SCAM)
+        .map((token) => {
+          const network = swapNetworksList.find(
+            (n) => n.networkId === token.networkId,
+          );
+          if (network) {
+            token.networkLogoURI = network.logoURI;
+          }
+          return token;
+        });
       if (swapTokenMap.tokenCatch && catchTokens?.data) {
         // have catch
         if (JSON.stringify(catchTokens.data) !== JSON.stringify(newTokens)) {
@@ -326,7 +329,9 @@ class ContentJotaiActionsSwap extends ContextJotaiActionsBase {
               status: ESwapApproveTransactionStatus.CANCEL,
             };
           });
-          // set(swapBuildTxFetchingAtom(), false);
+          if (txState.state !== ESwapTxHistoryStatus.SUCCESS) {
+            set(swapBuildTxFetchingAtom(), false);
+          }
         }
       } catch (e) {
         console.error(e);

diff --git a/packages/kit/src/views/Swap/hooks/useSwapBuiltTx.ts b/packages/kit/src/views/Swap/hooks/useSwapBuiltTx.ts
@@ -156,7 +156,12 @@ export function useSwapBuildTx() {
   ]);
 
   const approveTx = useCallback(
-    async (amount: string, isMax?: boolean, onApproveSuccess?: () => void) => {
+    async (
+      amount: string,
+      isMax?: boolean,
+      onApproveSuccess?: () => void,
+      isResetApprove?: boolean,
+    ) => {
       const allowanceInfo = selectQuote?.allowanceResult;
       if (
         allowanceInfo &&
@@ -180,17 +185,16 @@ export function useSwapBuildTx() {
               name: fromToken.name ?? fromToken.symbol,
             },
           };
-          if (!onApproveSuccess) {
-            setSwapApprovingTransaction({
-              provider: selectQuote.info.provider,
-              fromToken,
-              toToken,
-              amount,
-              useAddress: swapFromAddressInfo.address,
-              spenderAddress: allowanceInfo.allowanceTarget,
-              status: ESwapApproveTransactionStatus.PENDING,
-            });
-          }
+          setSwapApprovingTransaction({
+            provider: selectQuote.info.provider,
+            fromToken,
+            toToken,
+            amount,
+            useAddress: swapFromAddressInfo.address,
+            spenderAddress: allowanceInfo.allowanceTarget,
+            status: ESwapApproveTransactionStatus.PENDING,
+            isResetApprove,
+          });
           await navigationToSendConfirm({
             approveInfo,
             onSuccess: onApproveSuccess || handleApproveTxSuccess,

diff --git a/packages/kit/src/views/Swap/hooks/useSwapQuote.ts b/packages/kit/src/views/Swap/hooks/useSwapQuote.ts
@@ -109,7 +109,12 @@ export function useSwapQuote() {
     ETabRoutes.Swap,
     (isFocus: boolean, isHiddenModel: boolean) => {
       if (pageType !== EPageType.modal) {
-        if (isFocus && !isHiddenModel && !swapApprovingTxRef.current?.txId) {
+        if (
+          isFocus &&
+          !isHiddenModel &&
+          !swapApprovingTxRef.current?.txId &&
+          !swapApprovingTxRef.current?.isResetApprove
+        ) {
           void recoverQuoteInterval(activeAccountAddressRef.current);
         } else {
           cleanQuoteInterval();
@@ -121,7 +126,11 @@ export function useSwapQuote() {
   const isFocused = useIsFocused();
   useEffect(() => {
     if (pageType === EPageType.modal) {
-      if (isFocused && !swapApprovingTxRef.current?.txId) {
+      if (
+        isFocused &&
+        !swapApprovingTxRef.current?.txId &&
+        !swapApprovingTxRef.current?.isResetApprove
+      ) {
         void recoverQuoteInterval(activeAccountAddressRef.current);
       } else {
         cleanQuoteInterval();

diff --git a/packages/kit/src/views/Swap/hooks/useSwapState.ts b/packages/kit/src/views/Swap/hooks/useSwapState.ts
@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useMemo, useRef } from 'react';
 
+import { useIsFocused } from '@react-navigation/core';
 import BigNumber from 'bignumber.js';
 import { useIntl } from 'react-intl';
 
@@ -48,16 +49,18 @@ function useSwapWarningCheck() {
       accountInfo: undefined,
     },
   });
-
+  const isFocused = useIsFocused();
   const asyncRefContainer = useCallback(() => {
     if (refContainer.current.swapFromAddressInfo !== swapFromAddressInfo) {
       refContainer.current.swapFromAddressInfo = swapFromAddressInfo;
     }
   }, [swapFromAddressInfo]);
 
   useEffect(() => {
-    asyncRefContainer();
-    void checkSwapWarning(refContainer.current.swapFromAddressInfo);
+    if (isFocused) {
+      asyncRefContainer();
+      void checkSwapWarning(refContainer.current.swapFromAddressInfo);
+    }
   }, [
     asyncRefContainer,
     checkSwapWarning,
@@ -67,6 +70,7 @@ function useSwapWarningCheck() {
     fromTokenBalance,
     quoteCurrentSelect,
     networks,
+    isFocused,
   ]);
 }
 

diff --git a/packages/kit/src/views/Swap/pages/components/SwapAccountAddressContainer.tsx b/packages/kit/src/views/Swap/pages/components/SwapAccountAddressContainer.tsx
@@ -176,6 +176,8 @@ const SwapAccountAddressContainer = ({
     if (
       ((fromToken && type === ESwapDirectionType.FROM) ||
         (toToken && type === ESwapDirectionType.TO)) &&
+      swapAddressInfo.address &&
+      swapAnotherAddressInfo.address &&
       swapAddressInfo.address === swapAnotherAddressInfo.address
     ) {
       return null;

diff --git a/packages/kit/src/views/Swap/pages/components/SwapActionsState.tsx b/packages/kit/src/views/Swap/pages/components/SwapActionsState.tsx
@@ -54,7 +54,9 @@ const SwapActionsState = ({
   const handleApprove = useCallback(() => {
     if (swapActionState.shoutResetApprove) {
       Dialog.confirm({
-        onConfirmText: 'Continue',
+        onConfirmText: intl.formatMessage({
+          id: ETranslations.global_continue,
+        }),
         onConfirm: () => {
           onApprove(fromAmount, swapActionState.approveUnLimit, true);
         },
@@ -65,7 +67,7 @@ const SwapActionsState = ({
         description: intl.formatMessage({
           id: ETranslations.swap_page_provider_approve_usdt_dialog_content,
         }),
-        icon: 'TxStatusWarningCircleIllus',
+        icon: 'ErrorOutline',
       });
     } else {
       onApprove(fromAmount, swapActionState.approveUnLimit);

diff --git a/packages/kit/src/views/Swap/pages/components/SwapMainLand.tsx b/packages/kit/src/views/Swap/pages/components/SwapMainLand.tsx
@@ -94,9 +94,14 @@ const SwapMainLoad = ({ swapInitParams, pageType }: ISwapMainLoadProps) => {
   const onApprove = useCallback(
     async (amount: string, isMax?: boolean, shoutResetApprove?: boolean) => {
       if (shoutResetApprove) {
-        await approveTx(swapApproveResetValue, false, async () => {
-          await onApprove(amount, isMax);
-        });
+        await approveTx(
+          swapApproveResetValue,
+          false,
+          async () => {
+            await approveTx(amount, isMax, undefined, true);
+          },
+          true,
+        );
       } else {
         await approveTx(amount, isMax);
       }

diff --git a/packages/kit/src/views/Swap/pages/modal/SwapTokenSelectModal.tsx b/packages/kit/src/views/Swap/pages/modal/SwapTokenSelectModal.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 
 import { useRoute } from '@react-navigation/core';
 import BigNumber from 'bignumber.js';
@@ -83,26 +83,34 @@ const SwapTokenSelectPage = () => {
   const syncDefaultNetworkSelect = useCallback(() => {
     if (type === ESwapDirectionType.FROM) {
       if (fromToken?.networkId) {
-        return swapNetworks.find(
-          (item: ISwapNetwork) => item.networkId === fromToken.networkId,
+        return (
+          swapNetworks.find(
+            (item: ISwapNetwork) => item.networkId === fromToken.networkId,
+          ) ?? swapNetworks?.[0]
         );
       }
       if (swapFromAddressInfo.networkId) {
-        return swapNetworks.find(
-          (item: ISwapNetwork) =>
-            item.networkId === swapToAddressInfo.networkId,
+        return (
+          swapNetworks.find(
+            (item: ISwapNetwork) =>
+              item.networkId === swapToAddressInfo.networkId,
+          ) ?? swapNetworks?.[0]
         );
       }
     } else {
       if (toToken?.networkId) {
-        return swapNetworks.find(
-          (item: ISwapNetwork) => item.networkId === toToken.networkId,
+        return (
+          swapNetworks.find(
+            (item: ISwapNetwork) => item.networkId === toToken.networkId,
+          ) ?? swapNetworks?.[0]
         );
       }
       if (swapToAddressInfo.networkId) {
-        return swapNetworks.find(
-          (item: ISwapNetwork) =>
-            item.networkId === swapToAddressInfo.networkId,
+        return (
+          swapNetworks.find(
+            (item: ISwapNetwork) =>
+              item.networkId === swapToAddressInfo.networkId,
+          ) ?? swapNetworks?.[0]
         );
       }
 
@@ -119,6 +127,24 @@ const SwapTokenSelectPage = () => {
   const [currentSelectNetwork, setCurrentSelectNetwork] = useState<
     ISwapNetwork | undefined
   >(syncDefaultNetworkSelect);
+
+  useEffect(() => {
+    const accountNet =
+      type === ESwapDirectionType.FROM
+        ? swapFromAddressInfo.networkId
+        : swapToAddressInfo.networkId;
+    if (
+      currentSelectNetwork?.networkId &&
+      currentSelectNetwork?.networkId !== accountNet
+    ) {
+      void updateSelectedAccountNetwork({
+        num: type === ESwapDirectionType.FROM ? 0 : 1,
+        networkId: currentSelectNetwork?.networkId,
+      });
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   const { fetchLoading, currentTokens } = useSwapTokenList(
     type,
     currentSelectNetwork?.networkId,

diff --git a/packages/shared/types/swap/types.ts b/packages/shared/types/swap/types.ts
@@ -30,6 +30,7 @@ export enum ETokenRiskLevel {
   WARNING = 2,
   SPAM = 1000,
   MALICIOUS = 1001,
+  SCAM = 1002,
 }
 
 export interface ISwapInitParams {
@@ -136,6 +137,7 @@ export interface ISwapApproveTransaction {
   spenderAddress: string;
   amount: string;
   status: ESwapApproveTransactionStatus;
+  isResetApprove?: boolean;
   txId?: string;
   blockNumber?: number;
 }