fix: destWalletAddress

MetaMask · Feb 25, 2025 · 6bd256c · 6bd256c
1 parent 925b939
commit 6bd256c
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/ui/pages/bridge/prepare/prepare-bridge-page.tsx b/ui/pages/bridge/prepare/prepare-bridge-page.tsx
@@ -87,7 +87,6 @@ import { useCountdownTimer } from '../../../hooks/bridge/useCountdownTimer';
 import {
   getCurrentKeyring,
   getSelectedEvmInternalAccount,
-  getSelectedInternalAccount,
   getTokenList,
 } from '../../../selectors';
 import { isHardwareKeyring } from '../../../helpers/utils/hardware';
@@ -98,6 +97,7 @@ import { useIsMultichainSwap } from '../hooks/useIsMultichainSwap';
 import { useMultichainSelector } from '../../../hooks/useMultichainSelector';
 import { formatChainIdToCaip } from '../../../../shared/modules/bridge-utils/caip-formatters';
 import {
+  getLastSelectedNonEvmAccount,
   getMultichainIsEvm,
   getMultichainTransactions,
 } from '../../../selectors/multichain';
@@ -158,12 +158,12 @@ const PrepareBridgePage = () => {
 
   const isEvm = useMultichainSelector(getMultichainIsEvm);
   const selectedEvmAccount = useSelector(getSelectedEvmInternalAccount);
-  const selectedMultichainAccount = useMultichainSelector(
-    getSelectedInternalAccount,
-  );
+
+  const lastSelectedNonEvmAccount = useSelector(getLastSelectedNonEvmAccount);
+
   const selectedAccount = isEvm
     ? selectedEvmAccount
-    : selectedMultichainAccount;
+    : lastSelectedNonEvmAccount;
 
   const keyring = useSelector(getCurrentKeyring);
   // @ts-expect-error keyring type is wrong maybe?
@@ -318,7 +318,7 @@ const PrepareBridgePage = () => {
         (toChain?.chainId &&
           formatChainIdToCaip(toChain.chainId) === MultichainNetworks.SOLANA) ||
         isSwap
-          ? selectedMultichainAccount?.address
+          ? lastSelectedNonEvmAccount?.address
           : selectedEvmAccount?.address,
     }),
     [
@@ -327,13 +327,13 @@ const PrepareBridgePage = () => {
       toToken?.address,
       fromAmount,
       fromChain?.chainId,
+      isSwap,
       toChain?.chainId,
       providerConfig?.rpcUrl,
       slippage,
       selectedAccount?.address,
-      isSwap,
-      selectedMultichainAccount?.address,
       selectedEvmAccount?.address,
+      lastSelectedNonEvmAccount?.address,
     ],
   );