Merge branch 'main' into feat/bump-bitcoin-1-4-5

Author: aganglada

.github/workflows/run-e2e-smoke-tests-android.yml

@@ -29,20 +29,20 @@ jobs:
       changed_files: ${{ inputs.changed_files }}
     secrets: inherit
 
-  perps-android-smoke:
-    strategy:
-      matrix:
-        split: [1]
-      fail-fast: false
-    uses: ./.github/workflows/run-e2e-workflow.yml
-    with:
-      test-suite-name: perps-android-smoke-${{ matrix.split }}
-      platform: android
-      test_suite_tag: 'SmokePerps'
-      split_number: ${{ matrix.split }}
-      total_splits: 1
-      changed_files: ${{ inputs.changed_files }}
-    secrets: inherit
+  # perps-android-smoke:
+  #   strategy:
+  #     matrix:
+  #       split: [1]
+  #     fail-fast: false
+  #   uses: ./.github/workflows/run-e2e-workflow.yml
+  #   with:
+  #     test-suite-name: perps-android-smoke-${{ matrix.split }}
+  #     platform: android
+  #     test_suite_tag: 'SmokePerps'
+  #     split_number: ${{ matrix.split }}
+  #     total_splits: 1
+  #     changed_files: ${{ inputs.changed_files }}
+  #   secrets: inherit
 
   wallet-platform-android-smoke:
     strategy:
@@ -170,7 +170,7 @@ jobs:
     if: ${{ !cancelled() }}
     needs:
       - trade-android-smoke
-      - perps-android-smoke
+      # - perps-android-smoke
       - wallet-platform-android-smoke
       - identity-android-smoke
       - accounts-android-smoke

app/components/Nav/App/App.tsx

@@ -148,7 +148,6 @@ import { Duration } from '@metamask/utils';
 import { selectSeedlessOnboardingLoginFlow } from '../../../selectors/seedlessOnboardingController';
 import { SmartAccountUpdateModal } from '../../Views/confirmations/components/smart-account-update-modal';
 import { PayWithModal } from '../../Views/confirmations/components/modals/pay-with-modal/pay-with-modal';
-import { PayWithNetworkModal } from '../../Views/confirmations/components/modals/pay-with-network-modal/pay-with-network-modal';
 import { useMetrics } from '../../hooks/useMetrics';
 import { State2AccountConnectWrapper } from '../../Views/MultichainAccounts/MultichainAccountConnect/State2AccountConnectWrapper';
 import { SmartAccountModal } from '../../Views/MultichainAccounts/AccountDetails/components/SmartAccountModal/SmartAccountModal';
@@ -1052,10 +1051,6 @@ const AppFlow = () => {
           name={Routes.CONFIRMATION_PAY_WITH_MODAL}
           component={PayWithModal}
         />
-        <Stack.Screen
-          name={Routes.CONFIRMATION_PAY_WITH_NETWORK_MODAL}
-          component={PayWithNetworkModal}
-        />
       </Stack.Navigator>
     </>
   );

app/components/UI/Card/Views/CardAuthentication/CardAuthentication.test.tsx

@@ -939,7 +939,7 @@ describe('CardAuthentication Component', () => {
     });
   });
 
-  describe('OTP Step - Error Handling', () => {
+  describe.skip('OTP Step - Error Handling', () => {
     it('displays OTP error message when error exists', async () => {
       mockLogin.mockResolvedValue({
         isOtpRequired: true,
@@ -980,6 +980,16 @@ describe('CardAuthentication Component', () => {
         userId: 'user-123',
         phoneNumber: '+1 (555) 123-****',
       });
+      mockUseCardProviderAuthentication.mockReturnValue({
+        login: mockLogin,
+        loading: false,
+        error: null,
+        clearError: mockClearError,
+        sendOtpLogin: mockSendOtpLogin,
+        otpLoading: false,
+        otpError: 'The code you entered is incorrect',
+        clearOtpError: mockClearOtpError,
+      });
 
       render();
       const emailInput = screen.getByPlaceholderText(
@@ -998,22 +1008,9 @@ describe('CardAuthentication Component', () => {
         expect(
           screen.getByText('Enter your verification code'),
         ).toBeOnTheScreen();
-      });
-
-      mockUseCardProviderAuthentication.mockReturnValue({
-        login: mockLogin,
-        loading: false,
-        error: null,
-        clearError: mockClearError,
-        sendOtpLogin: mockSendOtpLogin,
-        otpLoading: false,
-        otpError: 'The code you entered is incorrect',
-        clearOtpError: mockClearOtpError,
-      });
-
-      await waitFor(() => {
-        const errorText = screen.getByText('The code you entered is incorrect');
-        expect(errorText).toBeOnTheScreen();
+        expect(
+          screen.getByText('The code you entered is incorrect'),
+        ).toBeOnTheScreen();
         expect(screen.getByText('Verification Code')).toBeOnTheScreen();
       });
     });

app/components/Views/confirmations/components/UI/token/token.test.tsx

@@ -4,6 +4,7 @@ import { BtcAccountType } from '@metamask/keyring-api';
 import renderWithProvider from '../../../../../../util/test/renderWithProvider';
 import { AssetType } from '../../../types/token';
 import { Token } from './token';
+import { act, fireEvent } from '@testing-library/react-native';
 
 describe('Token', () => {
   const createMockToken = (overrides: Partial<AssetType> = {}): AssetType => ({
@@ -129,4 +130,48 @@ describe('Token', () => {
 
     expect(getByText('Native SegWit')).toBeOnTheScreen();
   });
+
+  it('renders disabled message when token is disabled', () => {
+    const mockToken = createMockToken({
+      disabled: true,
+      disabledMessage: 'Disabled Test',
+    });
+
+    const { getByText } = renderWithProvider(
+      <Token asset={mockToken} onPress={mockOnPress} />,
+    );
+
+    expect(getByText('Disabled Test')).toBeOnTheScreen();
+  });
+
+  it('calls onPress when token is pressed', async () => {
+    const mockToken = createMockToken();
+
+    const { getByText } = renderWithProvider(
+      <Token asset={mockToken} onPress={mockOnPress} />,
+    );
+
+    await act(() => {
+      fireEvent.press(getByText('ETH'));
+    });
+
+    expect(mockOnPress).toHaveBeenCalledTimes(1);
+    expect(mockOnPress).toHaveBeenCalledWith(mockToken);
+  });
+
+  it('does not call onPress when token is disabled and pressed', async () => {
+    const mockToken = createMockToken({
+      disabled: true,
+    });
+
+    const { getByText } = renderWithProvider(
+      <Token asset={mockToken} onPress={mockOnPress} />,
+    );
+
+    await act(() => {
+      fireEvent.press(getByText('ETH'));
+    });
+
+    expect(mockOnPress).not.toHaveBeenCalled();
+  });
 });

app/components/Views/confirmations/components/UI/token/token.tsx

@@ -41,10 +41,12 @@ export function Token({ asset, onPress }: TokenProps) {
 
   return (
     <Pressable
+      disabled={asset.disabled}
       style={({ pressed }) =>
         tw.style(
           'w-full flex-row items-center justify-between py-2 max-w-full',
           pressed || asset.isSelected ? 'bg-pressed' : 'bg-transparent',
+          asset.disabled && 'opacity-50',
         )
       }
       onPress={handlePress}
@@ -98,7 +100,9 @@ export function Token({ asset, onPress }: TokenProps) {
             color={TextColor.TextAlternative}
             numberOfLines={1}
           >
-            {asset.symbol}
+            {!asset.disabled || !asset.disabledMessage
+              ? asset.symbol
+              : asset.disabledMessage}
           </Text>
         </Box>
       </Box>