Merge branch 'main' into wsun/ota-update-exp-workflow

Author: weitingsun

.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/auto-create-release-pr.yml.disabled renamed to .github/workflows/auto-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

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

@@ -141,7 +141,7 @@ jobs:
       fail-fast: false
     uses: ./.github/workflows/run-e2e-workflow.yml
     with:
-      test-suite-name: prediction_market_android_smoke-${{ matrix.split }}
+      test-suite-name: prediction-market-android-smoke-${{ matrix.split }}
       platform: android
       test_suite_tag: 'SmokePredictions'
       split_number: ${{ matrix.split }}

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

@@ -141,7 +141,7 @@ jobs:
       fail-fast: false
     uses: ./.github/workflows/run-e2e-workflow.yml
     with:
-      test-suite-name: prediction_market_ios_smoke-${{ matrix.split }}
+      test-suite-name: prediction-market-ios-smoke-${{ matrix.split }}
       platform: ios
       test_suite_tag: 'SmokePredictions'
       split_number: ${{ matrix.split }}

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

@@ -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"

android/app/build.gradle

@@ -30,11 +30,6 @@ interface TestDescriptors {
   [key: string]: TestTabDescriptor;
 }
 
-// Force rewards feature flag to be enabled for this test file
-jest.mock('../../../../selectors/featureFlagController/rewards', () => ({
-  selectRewardsEnabledFlag: () => true,
-}));
-
 // Mock trending tokens feature flag selector
 jest.mock('../../../../selectors/featureFlagController/assetsTrendingTokens');
 

app/component-library/components/Navigation/TabBar/TabBar.test.tsx

@@ -27,14 +27,12 @@ import {
   LABEL_BY_TAB_BAR_ICON_KEY,
 } from './TabBar.constants';
 import { selectChainId } from '../../../../selectors/networkController';
-import { selectRewardsEnabledFlag } from '../../../../selectors/featureFlagController/rewards';
 import { selectAssetsTrendingTokensEnabled } from '../../../../selectors/featureFlagController/assetsTrendingTokens';
 
 const TabBar = ({ state, descriptors, navigation }: TabBarProps) => {
   const { trackEvent, createEventBuilder } = useMetrics();
   const { bottom: bottomInset } = useSafeAreaInsets();
   const chainId = useSelector(selectChainId);
-  const isRewardsEnabled = useSelector(selectRewardsEnabledFlag);
   const isAssetsTrendingTokensEnabled = useSelector(
     selectAssetsTrendingTokensEnabled,
   );
@@ -86,9 +84,7 @@ const TabBar = ({ state, descriptors, navigation }: TabBarProps) => {
             navigation.navigate(Routes.TRANSACTIONS_VIEW);
             break;
           case Routes.REWARDS_VIEW:
-            if (isRewardsEnabled) {
-              navigation.navigate(Routes.REWARDS_VIEW);
-            }
+            navigation.navigate(Routes.REWARDS_VIEW);
             break;
           case Routes.SETTINGS_VIEW:
             navigation.navigate(Routes.SETTINGS_VIEW, {
@@ -127,7 +123,6 @@ const TabBar = ({ state, descriptors, navigation }: TabBarProps) => {
       trackEvent,
       createEventBuilder,
       tw,
-      isRewardsEnabled,
       isAssetsTrendingTokensEnabled,
     ],
   );

app/component-library/components/Navigation/TabBar/TabBar.tsx

@@ -7,17 +7,31 @@ import { Theme } from '../../util/theme/models';
  * Hook that handles both passing style sheet variables into style sheet and memoization.
  *
  * @param styleSheet Return value of useStyles hook.
- * @param vars Variables of styleSheet function.
+ * @param vars Variables of styleSheet function (optional).
  * @returns StyleSheet object.
  */
-export const useStyles = <R, V>(
+// Overload: when vars is provided
+export function useStyles<R, V>(
   styleSheet: (params: { theme: Theme; vars: V }) => R,
   vars: V,
-): { styles: R; theme: Theme } => {
+): { styles: R; theme: Theme };
+
+// Overload: when vars is not provided
+export function useStyles<R>(styleSheet: (params: { theme: Theme }) => R): {
+  styles: R;
+  theme: Theme;
+};
+
+export function useStyles<R, V>(
+  styleSheet:
+    | ((params: { theme: Theme; vars: V }) => R)
+    | ((params: { theme: Theme }) => R),
+  vars?: V,
+): { styles: R; theme: Theme } {
   const theme = useAppThemeFromContext();
   const styles = useMemo(
-    () => styleSheet({ theme, vars }),
+    () => styleSheet({ theme, vars: vars as V }),
     [styleSheet, theme, vars],
   );
   return { styles, theme };
-};
+}

app/component-library/hooks/useStyles.ts

@@ -30,6 +30,7 @@ import { internalAccount1 as mockAccount } from '../../../util/test/accountsCont
 import { KeyringTypes } from '@metamask/keyring-controller';
 import { AccountDetailsIds } from '../../../../e2e/selectors/MultichainAccounts/AccountDetails.selectors';
 import { AvatarAccountType } from '../../../component-library/components/Avatars/Avatar';
+import AUTHENTICATION_TYPE from '../../../constants/userProperties';
 import { useOTAUpdates } from '../../hooks/useOTAUpdates';
 
 const initialState: DeepPartial<RootState> = {
@@ -161,12 +162,16 @@ const mockMetrics = {
   addTraitsToUser: jest.fn(),
 };
 
+const mockAuthType = AUTHENTICATION_TYPE.BIOMETRIC;
 // Mock Authentication module
 jest.mock('../../../core', () => ({
   Authentication: {
     appTriggeredAuth: jest.fn().mockResolvedValue(undefined),
     lockApp: jest.fn(),
     checkIsSeedlessPasswordOutdated: jest.fn(),
+    getType: jest.fn().mockResolvedValue({
+      currentAuthType: mockAuthType,
+    }),
   },
 }));
 
@@ -350,6 +355,46 @@ describe('App', () => {
       });
     });
 
+    it('navigates to login screen when authentication type is password', async () => {
+      const mockRoutesOther = [
+        { name: 'SomeOtherRoute' },
+        { name: 'AnotherRoute' },
+      ];
+      jest
+        .spyOn(NavigationNative, 'useNavigationState')
+        .mockImplementation((selector: unknown) =>
+          (selector as (state: { routes: { name: string }[] }) => unknown)({
+            routes: mockRoutesOther,
+          }),
+        );
+      jest.spyOn(StorageWrapper, 'getItem').mockResolvedValue(true);
+      jest.spyOn(Authentication, 'getType').mockResolvedValue({
+        currentAuthType: AUTHENTICATION_TYPE.PASSWORD,
+      });
+
+      const loggedInState = {
+        ...initialState,
+        user: {
+          ...initialState.user,
+          existingUser: true,
+          userLoggedIn: true,
+        },
+      };
+
+      renderScreen(App, { name: 'App' }, { state: loggedInState });
+
+      await waitFor(() => {
+        expect(mockReset).toHaveBeenCalledWith({
+          routes: [{ name: Routes.ONBOARDING.LOGIN }],
+        });
+        expect(Authentication.appTriggeredAuth).not.toHaveBeenCalled();
+      });
+
+      jest.spyOn(Authentication, 'getType').mockResolvedValue({
+        currentAuthType: AUTHENTICATION_TYPE.BIOMETRIC,
+      });
+    });
+
     it('navigates to onboarding when user does not exist', async () => {
       renderScreen(
         App,
@@ -890,7 +935,7 @@ describe('App', () => {
     });
   });
 
-  it('should use useNavigation.reset with correct parameters for optin metrics navigation', async () => {
+  it('use useNavigation.reset with correct parameters for optin metrics navigation', async () => {
     jest.spyOn(StorageWrapper, 'getItem').mockImplementation(async (key) => {
       if (key === OPTIN_META_METRICS_UI_SEEN) {
         return false; // OptinMetrics UI has not been seen
@@ -965,7 +1010,27 @@ describe('App', () => {
       const { getByTestId } = renderAppWithRouteState(routeState);
 
       await waitFor(() => {
-        expect(getByTestId('eligibility-failed-modal')).toBeTruthy();
+        expect(getByTestId('eligibility-failed-modal')).toBeOnTheScreen();
+      });
+    });
+
+    it('registers the ramp unsupported modal route', async () => {
+      const routeState = {
+        index: 0,
+        routes: [
+          {
+            name: Routes.MODAL.ROOT_MODAL_FLOW,
+            params: {
+              screen: Routes.SHEET.UNSUPPORTED_REGION_MODAL,
+            },
+          },
+        ],
+      };
+
+      const { getByTestId } = renderAppWithRouteState(routeState);
+
+      await waitFor(() => {
+        expect(getByTestId('ramp-unsupported-modal')).toBeOnTheScreen();
       });
     });
   });