Merge branch 'main' of github.com:MetaMask/metamask-mobile into fix/card-onboarding-debounced-values

Author: Brunonascdev

.github/actions/smart-e2e-selection/action.yml

@@ -46,8 +46,10 @@ runs:
     - name: Fetch base branch for comparison
       shell: bash
       run: |
-        # Fetch base branch with enough depth to compute merge base for git diff
-        git fetch origin main --depth=100 2>/dev/null || git fetch origin master --depth=100 2>/dev/null || true
+        # Unshallow the repository first (if it's shallow)
+        git fetch --unshallow 2>/dev/null || true
+        # Then fetch base branch to ensure merge-base exists
+        git fetch origin main 2>/dev/null || true
 
     - name: Setup Node.js
       uses: actions/setup-node@v4

.github/workflows/create-release-pr.yml

@@ -79,15 +79,15 @@ jobs:
   create-release-pr:
     needs: [resolve-bases, resolve-previous-ref, generate-build-version]
     name: Create Release Pull Request using Github Tools
-    uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@749c097218590d5cd36d28d07967e12ba830b146
+    uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@6a04e4d0c8c25680a7543cfcd2e2fb7125b6759c
     with:
       platform: mobile
       checkout-base-branch: ${{ needs.resolve-bases.outputs.checkout_base }}
       release-pr-base-branch: ${{ needs.resolve-bases.outputs.release_base }}
       semver-version: ${{ inputs.semver-version }}
       previous-version-ref: ${{ needs.resolve-previous-ref.outputs.previous_ref }}
       mobile-build-version: ${{ needs.generate-build-version.outputs.build-version }}
-      github-tools-version: 749c097218590d5cd36d28d07967e12ba830b146
+      github-tools-version: 6a04e4d0c8c25680a7543cfcd2e2fb7125b6759c
     secrets:
       # This token needs write permissions to metamask-mobile & read permissions to metamask-planning
       # If called from auto-create-release-pr use the PR_TOKEN passed in as an input, if called manually use github secret token values

android/app/build.gradle

@@ -187,7 +187,7 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionName "7.60.0"
+        versionName "7.61.0"
         versionCode 2993
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/components/Nav/Main/MainNavigator.js

@@ -60,7 +60,7 @@ import RampRoutes from '../../UI/Ramp/Aggregator/routes';
 import { RampType } from '../../UI/Ramp/Aggregator/types';
 import RampSettings from '../../UI/Ramp/Aggregator/Views/Settings';
 import RampActivationKeyForm from '../../UI/Ramp/Aggregator/Views/Settings/ActivationKeyForm';
-import RampTokenSelection from '../../UI/Ramp/components/TokenSelection';
+import TokenListRoutes from '../../UI/Ramp/routes';
 
 import DepositOrderDetails from '../../UI/Ramp/Deposit/Views/DepositOrderDetails/DepositOrderDetails';
 import DepositRoutes from '../../UI/Ramp/Deposit/routes';
@@ -1047,7 +1047,7 @@ const MainNavigator = () => {
       <Stack.Screen name="PaymentRequestView" component={PaymentRequestView} />
       <Stack.Screen
         name={Routes.RAMP.TOKEN_SELECTION}
-        component={RampTokenSelection}
+        component={TokenListRoutes}
       />
       <Stack.Screen name={Routes.RAMP.BUY}>
         {() => <RampRoutes rampType={RampType.BUY} />}

app/components/UI/Bridge/Views/BridgeView/BridgeView.styles.ts

@@ -56,14 +56,6 @@ export const createStyles = (params: { theme: Theme }) => {
       flex: 1,
       justifyContent: 'flex-end',
     },
-    keypadContainer: {
-      flex: 1,
-      justifyContent: 'flex-end',
-      paddingBottom: 8,
-    },
-    keypad: {
-      paddingHorizontal: 24,
-    },
     destinationAccountSelectorContainer: {
       paddingBottom: 12,
     },

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

@@ -443,7 +443,7 @@ describe('BridgeView', () => {
       },
     };
 
-    const { queryByText } = renderScreen(
+    const { queryByTestId } = renderScreen(
       BridgeView,
       {
         name: Routes.BRIDGE.ROOT,
@@ -452,7 +452,7 @@ describe('BridgeView', () => {
     );
 
     // Verify max button is not present for native token
-    expect(queryByText('Max')).toBeNull();
+    expect(queryByTestId('token-input-area-max-button')).toBeNull();
   });
 
   it('should display max button when source token is not native token', () => {
@@ -472,7 +472,7 @@ describe('BridgeView', () => {
       },
     };
 
-    const { queryByText } = renderScreen(
+    const { queryByTestId } = renderScreen(
       BridgeView,
       {
         name: Routes.BRIDGE.ROOT,
@@ -481,7 +481,7 @@ describe('BridgeView', () => {
     );
 
     // Verify max button is present for ERC-20 token
-    expect(queryByText('Max')).toBeTruthy();
+    expect(queryByTestId('token-input-area-max-button')).toBeTruthy();
   });
 
   it('should set source amount to maximum balance when max button is pressed', async () => {
@@ -501,7 +501,7 @@ describe('BridgeView', () => {
       },
     };
 
-    const { getByText, getByTestId } = renderScreen(
+    const { getByTestId } = renderScreen(
       BridgeView,
       {
         name: Routes.BRIDGE.ROOT,
@@ -510,7 +510,7 @@ describe('BridgeView', () => {
     );
 
     // Find and press the max button
-    const maxButton = getByText('Max');
+    const maxButton = getByTestId('token-input-area-max-button');
     expect(maxButton).toBeTruthy();
     fireEvent.press(maxButton);