Merge branch 'x' into ext-auth

OneKeyHQ · Oct 9, 2024 · 121208c · 121208c
2 parents d16c573 + a96c4fa
commit 121208c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/packages/kit-bg/src/vaults/impls/ada/settings.ts b/packages/kit-bg/src/vaults/impls/ada/settings.ts
@@ -45,6 +45,7 @@ const settings: IVaultSettings = {
   editFeeEnabled: false,
   replaceTxEnabled: false,
   estimatedFeePollingInterval: 600,
+  maxSendCanNotSentFullAmount: true,
 
   accountDeriveInfo,
   networkInfo: {

diff --git a/packages/kit-bg/src/vaults/impls/btc/KeyringHardware.ts b/packages/kit-bg/src/vaults/impls/btc/KeyringHardware.ts
@@ -266,7 +266,7 @@ export class KeyringHardware extends KeyringHardwareBase {
     const signedPsbt = response.psbt;
 
     let rawTx = '';
-    const finalizedPsbt = BitcoinJS.Psbt.fromHex(psbt.toHex(), {
+    const finalizedPsbt = BitcoinJS.Psbt.fromHex(signedPsbt, {
       network: btcNetwork,
     });
     inputsToSign.forEach((v) => {

diff --git a/packages/kit-bg/src/vaults/types.ts b/packages/kit-bg/src/vaults/types.ts
@@ -222,6 +222,8 @@ export type IVaultSettings = {
     [networkId: string]: number;
   };
 
+  maxSendCanNotSentFullAmount?: boolean;
+
   preCheckDappTxFeeInfoRequired?: boolean;
 
   activateTokenRequired?: boolean;

diff --git a/packages/kit/src/components/TxAction/TxActionTransfer.tsx b/packages/kit/src/components/TxAction/TxActionTransfer.tsx
@@ -18,6 +18,7 @@ import { useAccountData } from '@onekeyhq/kit/src/hooks/useAccountData';
 import { useSettingsPersistAtom } from '@onekeyhq/kit-bg/src/states/jotai/atoms';
 import { ETranslations } from '@onekeyhq/shared/src/locale';
 import accountUtils from '@onekeyhq/shared/src/utils/accountUtils';
+import networkUtils from '@onekeyhq/shared/src/utils/networkUtils';
 import { EOnChainHistoryTxType } from '@onekeyhq/shared/types/history';
 import {
   EDecodedTxDirection,
@@ -569,8 +570,7 @@ function TxActionTransferDetailView(props: ITxActionProps) {
                   isSendNativeToken &&
                   !isNil(nativeTokenTransferAmountToUpdate) &&
                   transfer.isNative &&
-                  block.direction === EDecodedTxDirection.OUT &&
-                  !isUTXO
+                  block.direction === EDecodedTxDirection.OUT
                     ? nativeTokenTransferAmountToUpdate
                     : transfer.amount
                 } ${
@@ -809,7 +809,6 @@ function TxActionTransferDetailView(props: ITxActionProps) {
       intl,
       isInternalStaking,
       isSendNativeToken,
-      isUTXO,
       nativeTokenTransferAmountToUpdate,
       network?.id,
       network?.logoURI,

diff --git a/packages/kit/src/views/Send/pages/SendConfirm/TxActionsContainer.tsx b/packages/kit/src/views/Send/pages/SendConfirm/TxActionsContainer.tsx
@@ -89,7 +89,10 @@ function TxActionsContainer(props: IProps) {
         isSendNativeTokenOnly = true;
       }
 
-      if (isSendNativeTokenOnly && !vaultSettings?.isUtxo) {
+      if (
+        isSendNativeTokenOnly &&
+        !vaultSettings?.maxSendCanNotSentFullAmount
+      ) {
         nativeTokenTransferBN = new BigNumber(
           transferPayload?.amountToSend ?? nativeTokenTransferBN,
         );
@@ -145,7 +148,7 @@ function TxActionsContainer(props: IProps) {
     updateNativeTokenTransferAmount,
     updateNativeTokenTransferAmountToUpdate,
     vaultSettings?.ignoreUpdateNativeAmount,
-    vaultSettings?.isUtxo,
+    vaultSettings?.maxSendCanNotSentFullAmount,
     vaultSettings?.maxSendFeeUpRatio,
   ]);