Merge branch 'x' into OK-35288

OneKeyHQ · Jan 22, 2025 · 23a6972 · 23a6972
2 parents ace9a7b + dda5948
commit 23a6972
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 17 deletions.
diff --git a/packages/core/src/types/coreTypesTx.ts b/packages/core/src/types/coreTypesTx.ts
@@ -116,6 +116,7 @@ export type IUnsignedTxPro = IUnsignedTx & {
   rawTxUnsigned?: string;
   uuid?: string;
   isInternalSwap?: boolean;
+  isInternalTransfer?: boolean;
 };
 export type ISignedTx = {
   txid: string;

diff --git a/packages/kit-bg/src/services/ServiceSend.ts b/packages/kit-bg/src/services/ServiceSend.ts
@@ -535,6 +535,7 @@ class ServiceSend extends ServiceBase {
       prevNonce,
       feeInfo,
       isInternalSwap,
+      isInternalTransfer,
     } = params;
 
     let newUnsignedTx = unsignedTx;
@@ -560,6 +561,7 @@ class ServiceSend extends ServiceBase {
     }
 
     newUnsignedTx.isInternalSwap = isInternalSwap;
+    newUnsignedTx.isInternalTransfer = isInternalTransfer;
 
     if (swapInfo) {
       newUnsignedTx.swapInfo = swapInfo;

diff --git a/packages/kit-bg/src/vaults/types.ts b/packages/kit-bg/src/vaults/types.ts
@@ -547,6 +547,7 @@ export interface IBuildUnsignedTxParams {
   feeInfo?: IFeeInfoUnit;
   transferPayload?: ITransferPayload;
   isInternalSwap?: boolean;
+  isInternalTransfer?: boolean;
 }
 
 export type ITokenApproveInfo = { allowance: string; isUnlimited: boolean };

diff --git a/packages/kit/src/hooks/useSignatureConfirm.ts b/packages/kit/src/hooks/useSignatureConfirm.ts
@@ -48,6 +48,7 @@ type IBuildUnsignedTxParams = {
   feeInfoEditable?: boolean;
   feeInfo?: IFeeInfoUnit;
   isInternalSwap?: boolean;
+  isInternalTransfer?: boolean;
 };
 
 function useSignatureConfirm(params: IParams) {

diff --git a/packages/kit/src/views/Send/pages/SendDataInput/SendDataInputContainer.tsx b/packages/kit/src/views/Send/pages/SendDataInput/SendDataInputContainer.tsx
@@ -549,6 +549,7 @@ function SendDataInputContainer() {
               paymentId: paymentIdValue,
               note: noteValue,
             },
+            isInternalTransfer: true,
           });
           setIsSubmitting(false);
         } catch (e: any) {

diff --git a/...es/kit/src/views/SignatureConfirm/components/SignatureConfirmActions/TxConfirmActions.tsx b/...es/kit/src/views/SignatureConfirm/components/SignatureConfirmActions/TxConfirmActions.tsx
@@ -60,8 +60,6 @@ type IProps = {
   useFeeInTx?: boolean;
   feeInfoEditable?: boolean;
   popStack?: boolean;
-  fromAddress?: string;
-  toAddress?: string;
 };
 
 function TxConfirmActions(props: IProps) {
@@ -76,8 +74,6 @@ function TxConfirmActions(props: IProps) {
     transferPayload,
     useFeeInTx,
     feeInfoEditable,
-    fromAddress,
-    toAddress,
     popStack = true,
   } = props;
   const intl = useIntl();
@@ -100,6 +96,9 @@ function TxConfirmActions(props: IProps) {
   const successfullySentTxs = useRef<string[]>([]);
   const { bottom } = useSafeAreaInsets();
 
+  const toAddress = transferPayload?.originalRecipient;
+  const unsignedTx = unsignedTxs[0];
+
   const dappApprove = useDappApproveAction({
     id: sourceInfo?.id ?? '',
     closeWindowAfterResolved: true,
@@ -125,11 +124,22 @@ function TxConfirmActions(props: IProps) {
     updateSendTxStatus({ isSubmitting: true });
     isSubmitted.current = true;
     // Pre-check before submit
+
+    const accountAddress =
+      await backgroundApiProxy.serviceAccount.getAccountAddressForApi({
+        accountId,
+        networkId,
+      });
     try {
-      if (networkId && fromAddress && toAddress) {
+      if (
+        unsignedTx.isInternalTransfer &&
+        networkId &&
+        accountAddress &&
+        toAddress
+      ) {
         await serviceSend.checkAddressBeforeSending({
           networkId,
-          fromAddress,
+          fromAddress: accountAddress,
           toAddress,
         });
       }
@@ -286,11 +296,11 @@ function TxConfirmActions(props: IProps) {
     }
   }, [
     updateSendTxStatus,
-    sendSelectedFeeInfo,
+    accountId,
     networkId,
-    fromAddress,
+    sendSelectedFeeInfo,
+    unsignedTx.isInternalTransfer,
     toAddress,
-    accountId,
     unsignedTxs,
     nativeTokenTransferAmountToUpdate.isMaxSend,
     nativeTokenTransferAmountToUpdate.amountToUpdate,

diff --git a/packages/kit/src/views/SignatureConfirm/components/SignatureConfirmComponents/Address.tsx b/packages/kit/src/views/SignatureConfirm/components/SignatureConfirmComponents/Address.tsx
@@ -28,7 +28,14 @@ function formatTagValue(value: string | string[]) {
 
 function Address(props: IProps) {
   const intl = useIntl();
-  const { accountId, networkId, component, showAddressLocalTags } = props;
+  const {
+    accountId,
+    networkId: currentNetworkId,
+    component,
+    showAddressLocalTags,
+  } = props;
+
+  const networkId = component.networkId || currentNetworkId;
 
   return (
     <SignatureConfirmItem>

diff --git a/packages/kit/src/views/SignatureConfirm/pages/TxConfirm/TxConfirm.tsx b/packages/kit/src/views/SignatureConfirm/pages/TxConfirm/TxConfirm.tsx
@@ -127,8 +127,6 @@ function TxConfirm() {
       },
     );
 
-  const fromAddress = decodedTxs?.[0]?.owner;
-  const toAddress = decodedTxs?.[0]?.to;
   usePromiseResult(async () => {
     if (txConfirmParamsInit.current) return;
     updateNativeTokenInfo({
@@ -272,11 +270,7 @@ function TxConfirm() {
       <Page.Body testID="tx-confirmation-body" px="$5">
         {renderTxConfirmContent()}
       </Page.Body>
-      <TxConfirmActions
-        fromAddress={fromAddress}
-        toAddress={toAddress}
-        {...route.params}
-      />
+      <TxConfirmActions {...route.params} />
     </Page>
   );
 }

diff --git a/packages/shared/src/utils/txActionUtils.ts b/packages/shared/src/utils/txActionUtils.ts
@@ -330,6 +330,7 @@ function convertAssetTransferActionToSignatureConfirmComponent({
       }),
       address: unsignedTx.swapInfo.receivingAddress,
       tags: [],
+      networkId: unsignedTx.swapInfo.receiver.accountInfo.networkId,
     };
 
     components.push(receiveAddressComponent);

diff --git a/packages/shared/types/signatureConfirm.ts b/packages/shared/types/signatureConfirm.ts
@@ -64,6 +64,7 @@ export interface IDisplayComponentAddress {
     iconURL?: string;
   }[];
   isNavigable?: boolean;
+  networkId?: string;
 }
 
 export interface IDisplayComponentAmount {