chore(runway): cherry-pick fix: show banner for hardware wallets not supported (#16152)

- fix: cp-7.47.0 show banner for hardware wallets not supported (#16094)

Author: runway-github[bot]

app/components/UI/Bridge/Views/BridgeView/BridgeView.test.tsx

@@ -14,6 +14,8 @@ import mockQuotes from '../../_mocks_/mock-quotes-sol-sol.json';
 import { SolScope } from '@metamask/keyring-api';
 import { mockUseBridgeQuoteData } from '../../_mocks_/useBridgeQuoteData.mock';
 import { useBridgeQuoteData } from '../../hooks/useBridgeQuoteData';
+import { isHardwareAccount } from '../../../../../util/address';
+import { strings } from '../../../../../../locales/i18n';
 
 // TODO remove this mock once we have a real implementation
 jest.mock('../../../../../selectors/confirmTransaction');
@@ -69,6 +71,9 @@ jest.mock('../../../../hooks/useAccounts', () => ({
         isSelected: true,
       },
     ],
+    ensByAccountAddress: {
+      '0x1234567890123456789012345678901234567890': '',
+    },
   }),
 }));
 
@@ -123,6 +128,12 @@ jest.mock('../../hooks/useBridgeQuoteData', () => ({
     .mockImplementation(() => mockUseBridgeQuoteData),
 }));
 
+jest.mock('../../../../../util/address', () => ({
+  isHardwareAccount: jest.fn().mockReturnValue(false),
+  formatAddress: jest.fn().mockImplementation((address) => address),
+  getLabelTextByAddress: jest.fn().mockReturnValue(''),
+}));
+
 describe('BridgeView', () => {
   const token2Address = '0x0000000000000000000000000000000000000002' as Hex;
 
@@ -630,6 +641,47 @@ describe('BridgeView', () => {
 
       expect(toJSON()).toMatchSnapshot();
     });
+
+    it('displays hardware wallet not supported banner and disables continue button when using hardware wallet with Solana source', async () => {
+      // Mock isHardwareAccount to return true for this test only
+      const mockIsHardwareAccount = jest.fn().mockReturnValue(true);
+      jest.mocked(isHardwareAccount).mockImplementation(mockIsHardwareAccount);
+
+      const testState = createBridgeTestState({
+        bridgeControllerOverrides: {
+          quoteRequest: {
+            insufficientBal: false,
+          },
+          quotesLoadingStatus: RequestStatus.FETCHED,
+          quotes: [mockQuotes[0] as unknown as QuoteResponse],
+          quotesLastFetched: 12,
+        },
+        bridgeReducerOverrides: {
+          sourceAmount: '1.0',
+          sourceToken: {
+            address: 'So11111111111111111111111111111111111111112',
+            chainId: SolScope.Mainnet,
+            decimals: 9,
+            image: '',
+            name: 'Solana',
+            symbol: 'SOL',
+          },
+        },
+      });
+
+      const { getByText } = renderScreen(
+        BridgeView,
+        {
+          name: Routes.BRIDGE.ROOT,
+        },
+        { state: testState },
+      );
+
+      // Wait for the banner text to appear
+      await waitFor(() => {
+        expect(getByText(strings('bridge.hardware_wallet_not_supported_solana'))).toBeTruthy();
+      });
+    });
   });
 
   describe('Error Banner Visibility', () => {

app/components/UI/Bridge/Views/BridgeView/index.tsx

@@ -39,6 +39,7 @@ import {
   setIsSubmittingTx,
   selectIsSolanaToEvm,
   selectDestAddress,
+  selectIsSolanaSourced,
 } from '../../../../../core/redux/slices/bridge';
 import {
   useNavigation,
@@ -70,6 +71,8 @@ import { BridgeToken, BridgeViewMode } from '../../types';
 import { useSwitchTokens } from '../../hooks/useSwitchTokens';
 import { ScrollView } from 'react-native';
 import useIsInsufficientBalance from '../../hooks/useInsufficientBalance';
+import { selectSelectedInternalAccountFormattedAddress } from '../../../../../selectors/accountsController';
+import { isHardwareAccount } from '../../../../../util/address';
 
 export interface BridgeRouteParams {
   token?: BridgeToken;
@@ -119,10 +122,17 @@ const BridgeView = () => {
   } = useBridgeQuoteData();
   const { quotesLastFetched } = useSelector(selectBridgeControllerState);
   const { handleSwitchTokens } = useSwitchTokens();
+  const selectedAddress = useSelector(
+    selectSelectedInternalAccountFormattedAddress,
+  );
+  const isHardwareAddress = selectedAddress
+    ? !!isHardwareAccount(selectedAddress)
+    : false;
 
   const isEvmSolanaBridge = useSelector(selectIsEvmSolanaBridge);
   const isSolanaSwap = useSelector(selectIsSolanaSwap);
   const isSolanaToEvm = useSelector(selectIsSolanaToEvm);
+  const isSolanaSourced = useSelector(selectIsSolanaSourced);
   // inputRef is used to programmatically blur the input field after a delay
   // This gives users time to type before the keyboard disappears
   // The ref is typed to only expose the blur method we need
@@ -156,9 +166,9 @@ const BridgeView = () => {
     sourceAmount !== undefined && sourceAmount !== '.' && sourceToken?.decimals;
 
   const hasValidBridgeInputs =
-    isValidSourceAmount && 
-    !!sourceToken && 
-    !!destToken && 
+    isValidSourceAmount &&
+    !!sourceToken &&
+    !!destToken &&
     // Prevent quote fetching when destination address is not set
     // Destinations address is only needed for EVM <> Solana bridges
     (!isEvmSolanaBridge || (isEvmSolanaBridge && !!destAddress));
@@ -326,7 +336,9 @@ const BridgeView = () => {
     }
 
     const isSwap = route.params.bridgeViewMode === BridgeViewMode.Swap;
-    return isSwap ? strings('bridge.confirm_swap') : strings('bridge.confirm_bridge');
+    return isSwap
+      ? strings('bridge.confirm_swap')
+      : strings('bridge.confirm_bridge');
   };
 
   useEffect(() => {
@@ -379,12 +391,26 @@ const BridgeView = () => {
       activeQuote &&
       quotesLastFetched && (
         <Box style={styles.buttonContainer}>
+          {isHardwareAddress && (
+            <BannerAlert
+              severity={BannerAlertSeverity.Error}
+              description={
+                isSolanaSourced
+                  ? strings('bridge.hardware_wallet_not_supported_solana')
+                  : strings('bridge.hardware_wallet_not_supported')
+              }
+            />
+          )}
           <Button
             variant={ButtonVariants.Primary}
             label={getButtonLabel()}
             onPress={handleContinue}
             style={styles.button}
-            isDisabled={hasInsufficientBalance || isSubmittingTx}
+            isDisabled={
+              hasInsufficientBalance ||
+              isSubmittingTx ||
+              isHardwareAddress
+            }
           />
           <Button
             variant={ButtonVariants.Link}

app/components/UI/Bridge/components/QuoteExpiredModal/__snapshots__/QuoteExpiredModal.test.tsx.snap

@@ -240,7 +240,7 @@ exports[`QuoteExpiredModal renders correctly 1`] = `
               }
             }
           >
-            Rates update every 10 seconds, so tap Get new quote when you're ready.
+            Rates update every 15 seconds, so tap Get new quote when you're ready.
           </Text>
         </View>
         <View

app/core/redux/slices/bridge/index.ts

@@ -340,6 +340,14 @@ export const selectBridgeQuotes = createSelector(
     }),
 );
 
+export const selectIsSolanaSourced = createSelector(
+  selectSourceToken,
+  (sourceToken) =>
+    sourceToken?.chainId &&
+    isSolanaChainId(sourceToken.chainId),
+);
+
+
 export const selectIsEvmToSolana = createSelector(
   selectSourceToken,
   selectDestToken,

locales/languages/en.json

@@ -3937,18 +3937,15 @@
     "title": "Bridge",
     "submitting_transaction": "Submitting",
     "fetching_quote": "Fetching quote",
-    "fee_disclaimer": "Includes 0.875% MM fee"
+    "fee_disclaimer": "Includes 0.875% MM fee",
+    "hardware_wallet_not_supported": "Hardware wallets aren't supported yet. Use a hot wallet to continue.",
+    "hardware_wallet_not_supported_solana": "Hardware wallets aren't supported for Solana yet. Use a hot wallet to continue."
   },
   "quote_expired_modal": {
     "title": "New quotes are available",
     "description": "Rates update every {{refreshRate}} seconds, so tap Get new quote when you're ready.",
     "get_new_quote": "Get new quote"
   },
-  "quote_expired_modal": {
-    "title": "New quotes are available",
-    "description": "Rates update every 10 seconds, so tap Get new quote when you're ready.",
-    "get_new_quote": "Get new quote"
-  },
   "bridge_transaction_details": {
     "status": "Status",
     "date": "Date",