update hooks for isswap on prepare bridge page

Author: ghgoodreau

ui/pages/bridge/hooks/useDestinationAccount.ts

@@ -5,19 +5,18 @@ import {
   getSelectedEvmInternalAccount,
   getSelectedInternalAccount,
 } from '../../../selectors';
-import { getToChain, getFromChain } from '../../../ducks/bridge/selectors';
+import { getToChain } from '../../../ducks/bridge/selectors';
 import { getLastSelectedSolanaAccount } from '../../../selectors/multichain';
 import type { DestinationAccount } from '../prepare/types';
 
-export const useDestinationAccount = () => {
+export const useDestinationAccount = (isSwap: boolean) => {
   const [selectedDestinationAccount, setSelectedDestinationAccount] =
     useState<DestinationAccount | null>(null);
 
   const selectedEvmAccount = useSelector(getSelectedEvmInternalAccount);
   const selectedSolanaAccount = useSelector(getLastSelectedSolanaAccount);
   const currentlySelectedAccount = useSelector(getSelectedInternalAccount);
 
-  const fromChain = useSelector(getFromChain);
   const toChain = useSelector(getToChain);
   const isDestinationSolana = toChain && isSolanaChainId(toChain.chainId);
 
@@ -29,9 +28,8 @@ export const useDestinationAccount = () => {
       return;
     }
 
-    // Check if it's a swap (same chain)
-    const isSwap = fromChain?.chainId === toChain?.chainId;
-
+    // Use isSwap parameter to determine behavior
+    // This preserves legacy behavior when unified UI is disabled
     if (isSwap) {
       // For swaps, always use the currently selected account
       setSelectedDestinationAccount(currentlySelectedAccount);
@@ -46,8 +44,8 @@ export const useDestinationAccount = () => {
     selectedSolanaAccount,
     selectedEvmAccount,
     toChain,
-    fromChain,
     currentlySelectedAccount,
+    isSwap,
   ]);
 
   return { selectedDestinationAccount, setSelectedDestinationAccount };

ui/pages/bridge/prepare/prepare-bridge-page.tsx

@@ -150,10 +150,12 @@ const PrepareBridgePage = () => {
     getIsUnifiedUIEnabled(state, fromChain?.chainId),
   );
 
-  // Determine if this is a swap based on unified UI setting
-  const isSwap = isUnifiedUIEnabled
-    ? useSelector(getIsSwap) // Use quote request params when unified
-    : useIsMultichainSwap(); // Use URL params for legacy behavior
+  // Check the two types of swaps
+  const isSwapFromQuote = useSelector(getIsSwap);
+  const isSwapFromUrl = useIsMultichainSwap();
+
+  // Use the appropriate value based on unified UI setting
+  const isSwap = isUnifiedUIEnabled ? isSwapFromQuote : isSwapFromUrl;
 
   const fromToken = useSelector(getFromToken);
   const fromTokens = useSelector(getTokenList) as TokenListMap;
@@ -243,7 +245,7 @@ const PrepareBridgePage = () => {
   const { tokenAlert } = useTokenAlerts();
   const srcTokenBalance = useLatestBalance(fromToken);
   const { selectedDestinationAccount, setSelectedDestinationAccount } =
-    useDestinationAccount();
+    useDestinationAccount(isSwap);
 
   const {
     filteredTokenListGenerator: toTokenListGenerator,