fix: cowSwap some issue ok-34971 ok-34976 ok-34986

packages/kit-bg/src/services/ServiceSwap.ts

@@ -997,6 +997,12 @@ export default class ServiceSwap extends ServiceBase {
     await this.backgroundApi.simpleDb.swapHistory.deleteSwapHistoryItem(
       statuses,
     );
+    const inAppNotification = await inAppNotificationAtom.get();
+    const deleteHistoryIds = inAppNotification.swapHistoryPendingList
+      .filter((item) => statuses?.includes(item.status))
+      .map((item) =>
+        item.txInfo.useOrderId ? item.txInfo.orderId : item.txInfo.txId,
+      );
     await inAppNotificationAtom.set((pre) => ({
       ...pre,
       swapHistoryPendingList: statuses
@@ -1005,6 +1011,9 @@ export default class ServiceSwap extends ServiceBase {
           )
         : [],
     }));
+    await Promise.all(
+      deleteHistoryIds.map((id) => this.cleanHistoryStateIntervals(id)),
+    );
   }
 
   @backgroundMethod()
@@ -1014,14 +1023,16 @@ export default class ServiceSwap extends ServiceBase {
     orderId?: string;
   }) {
     await this.backgroundApi.simpleDb.swapHistory.deleteOneSwapHistory(txInfo);
+    const deleteHistoryId = txInfo.useOrderId
+      ? txInfo.orderId ?? ''
+      : txInfo.txId ?? '';
     await inAppNotificationAtom.set((pre) => ({
       ...pre,
-      swapHistoryPendingList: pre.swapHistoryPendingList.filter((item) =>
-        item.txInfo.useOrderId
-          ? item.txInfo.orderId !== txInfo.orderId
-          : item.txInfo.txId !== txInfo.txId,
+      swapHistoryPendingList: pre.swapHistoryPendingList.filter(
+        (item) => item.txInfo.txId !== deleteHistoryId,
       ),
     }));
+    await this.cleanHistoryStateIntervals(deleteHistoryId);
   }
 
   @backgroundMethod()

packages/kit/src/states/jotai/contexts/swap/actions.ts

@@ -666,6 +666,15 @@ class ContentJotaiActionsSwap extends ContextJotaiActionsBase {
                   txId: undefined,
                   status: ESwapApproveTransactionStatus.FAILED,
                 };
+              } else {
+                // update quote list
+                const quoteList = get(swapQuoteListAtom());
+                const updateQuoteList = quoteList.filter(
+                  (quote) =>
+                    quote.info.provider !== preApproveTx.provider ||
+                    quote.quoteId !== preApproveTx.quoteId,
+                );
+                set(swapQuoteListAtom(), [...updateQuoteList]);
               }
               await backgroundApiProxy.serviceSwap.setApprovingTransaction(
                 newApproveTx,

packages/kit/src/views/Swap/hooks/useSwapBuiltTx.ts

@@ -96,6 +96,7 @@ export function useSwapBuildTx() {
   const isBatchTransfer = useSwapBatchTransfer(
     swapFromAddressInfo.networkId,
     swapFromAddressInfo.accountInfo?.account?.id,
+    selectQuote?.providerDisableBatchTransfer,
   );
 
   const syncRecentTokenPairs = useCallback(
@@ -717,6 +718,7 @@ export function useSwapBuildTx() {
                 provider: selectQuote?.info.provider,
                 fromToken,
                 toToken,
+                quoteId: selectQuote?.quoteId ?? '',
                 amount,
                 useAddress: swapFromAddressInfo.address ?? '',
                 spenderAddress: allowanceInfo.allowanceTarget,

packages/kit/src/views/Swap/hooks/useSwapState.ts

@@ -123,7 +123,11 @@ export function useSwapQuoteEventFetching() {
   );
 }
 
-export function useSwapBatchTransfer(networkId?: string, accountId?: string) {
+export function useSwapBatchTransfer(
+  networkId?: string,
+  accountId?: string,
+  providerDisableBatchTransfer?: boolean,
+) {
   const [settingsPersistAtom] = useSettingsPersistAtom();
   const isExternalAccount = accountUtils.isExternalAccount({
     accountId: accountId ?? '',
@@ -133,7 +137,8 @@ export function useSwapBatchTransfer(networkId?: string, accountId?: string) {
   return (
     settingsPersistAtom.swapBatchApproveAndSwap &&
     !isUnSupportBatchTransferNet &&
-    !isExternalAccount
+    !isExternalAccount &&
+    !providerDisableBatchTransfer
   );
 }
 
@@ -159,6 +164,7 @@ export function useSwapActionState() {
   const isBatchTransfer = useSwapBatchTransfer(
     swapFromAddressInfo.networkId,
     swapFromAddressInfo.accountInfo?.account?.id,
+    quoteCurrentSelect?.providerDisableBatchTransfer,
   );
   const isRefreshQuote = useMemo(
     () => quoteIntervalCount > swapQuoteIntervalMaxCount || shouldRefreshQuote,

packages/kit/src/views/Swap/hooks/useSwapTxHistory.ts

@@ -89,6 +89,7 @@ export function useSwapTxHistoryActions() {
               swapTxInfo.swapBuildResData.result.fee?.otherFeeInfos ?? [],
             orderId: swapTxInfo.swapBuildResData.orderId,
             supportUrl: swapTxInfo.swapBuildResData.result.supportUrl,
+            orderSupportUrl: swapTxInfo.swapBuildResData.result.orderSupportUrl,
           },
           ctx: swapTxInfo.swapBuildResData.ctx,
         };

packages/kit/src/views/Swap/pages/components/SwapActionsState.tsx

@@ -142,6 +142,7 @@ const SwapActionsState = ({
   const isBatchTransfer = useSwapBatchTransfer(
     swapFromAddressInfo.networkId,
     swapFromAddressInfo.accountInfo?.account?.id,
+    currentQuoteRes?.providerDisableBatchTransfer,
   );
   const swapRecipientAddressInfo = useSwapRecipientAddressInfo(
     swapEnableRecipientAddress,

packages/kit/src/views/Swap/pages/modal/SwapHistoryDetailModal.tsx

@@ -349,6 +349,14 @@ const SwapHistoryDetailModal = () => {
                 label="Order ID"
                 renderContent={txHistory.txInfo.orderId}
                 showCopy
+                {...(txHistory.swapInfo.orderSupportUrl
+                  ? {
+                      openWithUrl: () =>
+                        onViewInBrowser(
+                          txHistory.swapInfo.orderSupportUrl ?? '',
+                        ),
+                    }
+                  : {})}
               />
             ) : null}
             <InfoItem
@@ -386,6 +394,7 @@ const SwapHistoryDetailModal = () => {
     );
   }, [
     intl,
+    onViewInBrowser,
     renderNetworkFee,
     renderRate,
     renderSwapAssetsChange,

packages/shared/types/swap/types.ts

@@ -169,6 +169,7 @@ export interface ISwapApproveTransaction {
   fromToken: ISwapToken;
   toToken: ISwapToken;
   provider: string;
+  quoteId: string;
   useAddress: string;
   spenderAddress: string;
   amount: string;
@@ -273,11 +274,13 @@ export interface IFetchQuoteResult {
   };
   protocolNoRouterInfo?: string;
   supportUrl?: string;
+  orderSupportUrl?: string;
   isAntiMEV?: boolean;
   tokenMetadata?: ISwapTokenMetadata;
   quoteShowTip?: IQuoteTip;
   gasLimit?: number;
   slippage?: number;
+  providerDisableBatchTransfer?: boolean;
 }
 
 export interface IAllowanceResult {
@@ -571,6 +574,7 @@ export interface ISwapTxHistory {
     otherFeeInfos?: IQuoteResultFeeOtherFeeInfo[];
     orderId?: string;
     supportUrl?: string;
+    orderSupportUrl?: string;
   };
   date: {
     created: number;