Merge branch 'main' into harry/MMQA-1525

Author: LeVinhGithub

app/components/UI/SecurityTrust/Views/SecurityTrustScreen.tsx

@@ -63,7 +63,7 @@ const SecurityTrustScreen: React.FC = () => {
   const networkName = useNetworkName(params?.chainId as Hex);
 
   // Get action handlers from hook (single source of truth)
-  const { onBuy, goToSwaps, hasEligibleSwapTokens, networkModal } =
+  const { onBuy, handleStickySwapPress, hasEligibleSwapTokens, networkModal } =
     useTokenActions({
       token: params,
       networkName,
@@ -619,7 +619,7 @@ const SecurityTrustScreen: React.FC = () => {
         token={params}
         securityData={securityData}
         onBuy={onBuy}
-        goToSwaps={goToSwaps}
+        onSwap={handleStickySwapPress}
         hasEligibleSwapTokens={hasEligibleSwapTokens}
       />
     </View>

app/components/UI/TokenDetails/Views/TokenDetails.test.tsx

@@ -80,6 +80,7 @@ jest.mock('../../Ramp/hooks/useTokenBuyability', () => ({
 }));
 
 const mockGoToSwaps = jest.fn();
+const mockHandleStickySwapPress = jest.fn();
 const mockOnBuy = jest.fn();
 const mockUseTokenActions = jest.fn();
 jest.mock('../hooks/useTokenActions', () => ({
@@ -217,6 +218,7 @@ describe('TokenDetails', () => {
       goToSwaps: mockGoToSwaps,
       handleBuyPress: jest.fn(),
       handleSellPress: jest.fn(),
+      handleStickySwapPress: mockHandleStickySwapPress,
       hasEligibleSwapTokens: true,
       networkModal: null,
     });
@@ -291,12 +293,7 @@ describe('TokenDetails', () => {
 
       fireEvent.press(getByText('Swap'));
 
-      expect(mockGoToSwaps).toHaveBeenCalledWith(
-        undefined,
-        undefined,
-        undefined,
-        true,
-      );
+      expect(mockHandleStickySwapPress).toHaveBeenCalledTimes(1);
     });
 
     it('shows only Swap when user has eligible tokens but token is not buyable', () => {
@@ -319,6 +316,7 @@ describe('TokenDetails', () => {
         goToSwaps: mockGoToSwaps,
         handleBuyPress: jest.fn(),
         handleSellPress: jest.fn(),
+        handleStickySwapPress: mockHandleStickySwapPress,
         hasEligibleSwapTokens: false,
         networkModal: null,
       });

app/components/UI/TokenDetails/Views/TokenDetails.tsx

@@ -153,11 +153,18 @@ const TokenDetails: React.FC<{
     ///: END:ONLY_INCLUDE_IF
   } = useTokenBalance(token);
 
-  const { onBuy, onSend, onReceive, goToSwaps, hasEligibleSwapTokens } =
-    useTokenActions({
-      token,
-      networkName,
-    });
+  const {
+    onBuy,
+    onSend,
+    onReceive,
+    goToSwaps,
+    handleStickySwapPress,
+    hasEligibleSwapTokens,
+  } = useTokenActions({
+    token,
+    networkName,
+    currentTokenBalance: balance,
+  });
 
   // Swaps view should always scroll to top when navigating from the token details view
   const goToSwapsFromDetails = useCallback(
@@ -306,7 +313,7 @@ const TokenDetails: React.FC<{
           token={token}
           securityData={securityData}
           onBuy={onBuy}
-          goToSwaps={goToSwapsFromDetails}
+          onSwap={handleStickySwapPress}
           hasEligibleSwapTokens={hasEligibleSwapTokens}
         />
       )}

app/components/UI/TokenDetails/components/TokenDetailsStickyFooter.tsx

@@ -23,15 +23,15 @@ interface TokenStickyFooterProps {
   securityData: TokenSecurityData | null | undefined;
   /** Action handlers from parent's useTokenActions hook */
   onBuy: () => void;
-  goToSwaps: () => void;
+  onSwap: () => void;
   hasEligibleSwapTokens: boolean;
 }
 
 const TokenDetailsStickyFooter: React.FC<TokenStickyFooterProps> = ({
   token,
   securityData,
   onBuy,
-  goToSwaps,
+  onSwap,
   hasEligibleSwapTokens,
 }) => {
   const navigation = useNavigation();
@@ -139,7 +139,7 @@ const TokenDetailsStickyFooter: React.FC<TokenStickyFooterProps> = ({
                     size: ButtonSize.Lg,
                     onPress: () =>
                       handleFooterAction(
-                        () => goToSwaps(),
+                        onSwap,
                         strings('asset_overview.swap'),
                       ),
                   },