Merge branch 'main' into account_selection

Author: jpuri

.depcheckrc.yml

@@ -15,6 +15,9 @@ ignores:
   - 'react-compiler-runtime'
   # This is used on the patch for TokenRatesController of Assets controllers, for we to be able to use the last version of it
   - cockatiel
+  # These are used in metro.config.js to setup Hardened JavaScript via @lavamoat/react-native-lockdown
+  - '@react-native/js-polyfills'
+  - 'reflect-metadata'
 
   # Note: Everything below this line should be removed after investigation
   # TODO: Investigate each dependency to see whether it's used
@@ -105,4 +108,4 @@ ignores:
   - '@react-native/typescript-config'
   - 'react-native-pager-view'
   # this dependency can probably be removed, needs investigation
-  - '@types/react-test-renderer'
+  - '@types/react-test-renderer'

CHANGELOG.md

@@ -187,8 +187,8 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionName "7.47.1"
-        versionCode 2004
+        versionName "7.47.3"
+        versionCode 2051
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders.MM_BRANCH_KEY_TEST = "$System.env.MM_BRANCH_KEY_TEST"

android/app/build.gradle

@@ -25,7 +25,6 @@ import expo.modules.ReactNativeHostWrapper
 
 import cl.json.ShareApplication
 import io.branch.rnbranch.RNBranchModule
-import com.airbnb.android.react.lottie.LottiePackage
 import io.metamask.nativeModules.PreventScreenshotPackage
 import io.metamask.nativeModules.RCTMinimizerPackage
 import io.metamask.nativesdk.NativeSDKPackage
@@ -41,7 +40,6 @@ class MainApplication : Application(), ShareApplication, ReactApplication {
             override fun getPackages(): List<ReactPackage> {
                 val packages = PackageList(this).packages.toMutableList()
                 // Add all our custom packages
-                packages.add(LottiePackage())
                 packages.add(PreventScreenshotPackage())
                 packages.add(RCTMinimizerPackage())
                 packages.add(NativeSDKPackage())

android/app/src/main/java/io/metamask/MainApplication.kt

@@ -39,8 +39,6 @@ dependencyResolutionManagement {
 include ':app'
 includeBuild(new File(["node", "--print", "require.resolve('@react-native/gradle-plugin/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim()).getParentFile())
 includeBuild('../node_modules/@react-native') {}
-include ':lottie-react-native'
-project(':lottie-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/lottie-react-native/src/android')
 include ':react-native-gesture-handler'
 project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
 

android/settings.gradle

@@ -23,7 +23,6 @@ import {
   type PersistedDataLoadedAction,
   type SetAppServicesReadyAction,
   UserActionType,
-  type SetMetaMetricsUISeenAction,
 } from './types';
 
 export * from './types';
@@ -177,14 +176,3 @@ export function setAppServicesReady(): SetAppServicesReadyAction {
     type: UserActionType.SET_APP_SERVICES_READY,
   };
 }
-
-export function setMetaMetricsUISeen(
-  isMetaMetricsUISeen: boolean,
-): SetMetaMetricsUISeenAction {
-  return {
-    type: UserActionType.SET_META_METRICS_UI_SEEN,
-    payload: {
-      isMetaMetricsUISeen,
-    },
-  };
-}

app/actions/user/index.ts

@@ -93,11 +93,6 @@ export type CheckedAuthAction = Action<UserActionType.CHECKED_AUTH> & {
 export type SetAppServicesReadyAction =
   Action<UserActionType.SET_APP_SERVICES_READY>;
 
-export type SetMetaMetricsUISeenAction =
-  Action<UserActionType.SET_META_METRICS_UI_SEEN> & {
-    payload: { isMetaMetricsUISeen: boolean };
-  };
-
 /**
  * User actions union type
  */
@@ -123,5 +118,4 @@ export type UserAction =
   | SetGasEducationCarouselSeenAction
   | SetAppThemeAction
   | CheckedAuthAction
-  | SetAppServicesReadyAction
-  | SetMetaMetricsUISeenAction;
+  | SetAppServicesReadyAction;

app/actions/user/types.ts

@@ -11,6 +11,10 @@ import { RootState } from '../../../reducers';
 import StorageWrapper from '../../../store/storage-wrapper';
 import { Authentication } from '../../../core';
 import Routes from '../../../constants/navigation/Routes';
+import {
+  OPTIN_META_METRICS_UI_SEEN,
+  EXISTING_USER,
+} from '../../../constants/storage';
 import { strings } from '../../../../locales/i18n';
 import { NavigationContainer } from '@react-navigation/native';
 import configureMockStore from 'redux-mock-store';
@@ -20,7 +24,6 @@ import { mockTheme, ThemeContext } from '../../../util/theme';
 const initialState: DeepPartial<RootState> = {
   user: {
     userLoggedIn: true,
-    isMetaMetricsUISeen: true,
   },
   engine: {
     backgroundState,
@@ -83,6 +86,14 @@ const mockMetrics = {
   addTraitsToUser: jest.fn(),
 };
 
+// Mock Authentication module
+jest.mock('../../../core', () => ({
+  Authentication: {
+    appTriggeredAuth: jest.fn().mockResolvedValue(undefined),
+    lockApp: jest.fn(),
+  },
+}));
+
 // Need to mock this module since it uses store.getState, which interferes with the mocks from this test file.
 jest.mock(
   '../../../util/metrics/UserSettingsAnalyticsMetaData/generateUserProfileAnalyticsMetaData',
@@ -94,6 +105,16 @@ jest.mock(
   () => jest.fn().mockReturnValue({ deviceProp: 'Device value' }),
 );
 
+// Mock essential dependencies
+jest.mock('react-native-branch', () => ({
+  subscribe: jest.fn(),
+  getLatestReferringParams: jest.fn().mockResolvedValue({}),
+}));
+
+jest.mock('react-native-device-info', () => ({
+  getVersion: jest.fn().mockReturnValue('1.0.0'),
+}));
+
 (MetaMetrics.getInstance as jest.Mock).mockReturnValue(mockMetrics);
 
 describe('App', () => {
@@ -122,7 +143,12 @@ describe('App', () => {
 
   describe('Authentication flow logic', () => {
     it('navigates to onboarding when user does not exist', async () => {
-      jest.spyOn(StorageWrapper, 'getItem').mockResolvedValue(null);
+      jest.spyOn(StorageWrapper, 'getItem').mockImplementation(async (key) => {
+        if (key === EXISTING_USER) {
+          return null; // User does not exist
+        }
+        return null; // Default for other keys
+      });
       renderScreen(App, { name: 'App' }, { state: initialState });
       await waitFor(() => {
         expect(mockReset).toHaveBeenCalledWith({
@@ -131,7 +157,15 @@ describe('App', () => {
       });
     });
     it('navigates to login when user exists and logs in', async () => {
-      jest.spyOn(StorageWrapper, 'getItem').mockResolvedValue(true);
+      jest.spyOn(StorageWrapper, 'getItem').mockImplementation(async (key) => {
+        if (key === EXISTING_USER) {
+          return true; // User exists
+        }
+        if (key === OPTIN_META_METRICS_UI_SEEN) {
+          return true; // OptinMetrics UI has been seen
+        }
+        return null; // Default for other keys
+      });
       jest.spyOn(Authentication, 'appTriggeredAuth').mockResolvedValue();
       renderScreen(App, { name: 'App' }, { state: initialState });
       await waitFor(() => {
@@ -141,30 +175,47 @@ describe('App', () => {
       });
     });
 
-    it('navigates to OptinMetrics when user exists and isMetaMetricsUISeen is false', async () => {
-      jest.spyOn(StorageWrapper, 'getItem').mockResolvedValue(true);
-      jest.spyOn(Authentication, 'appTriggeredAuth').mockResolvedValue();
+    it('navigates to OptinMetrics when user exists and OptinMetaMetricsUISeen is false', async () => {
+      // Mock StorageWrapper.getItem to return different values based on the key
+      jest.spyOn(StorageWrapper, 'getItem').mockImplementation(async (key) => {
+        if (key === EXISTING_USER) {
+          return true; // User exists
+        }
+        if (key === OPTIN_META_METRICS_UI_SEEN) {
+          return false; // OptinMetrics UI has not been seen
+        }
+        return null; // Default for other keys
+      });
+
       renderScreen(
         App,
         { name: 'App' },
         {
           state: {
             ...initialState,
-            user: { ...initialState.user, isMetaMetricsUISeen: false },
           },
         },
       );
-      await waitFor(() => {
-        expect(mockNavigate).toHaveBeenCalledWith(Routes.ONBOARDING.ROOT_NAV, {
-          screen: Routes.ONBOARDING.NAV,
-          params: {
-            screen: Routes.ONBOARDING.OPTIN_METRICS,
-            params: {
-              onContinue: expect.any(Function),
-            },
-          },
-        });
-      });
+
+      // Wait a bit longer and add debugging
+      await waitFor(
+        () => {
+          expect(mockReset).toHaveBeenCalledWith({
+            routes: [
+              {
+                name: 'OnboardingRootNav',
+                params: {
+                  screen: 'OnboardingNav',
+                  params: {
+                    screen: 'OptinMetrics',
+                  },
+                },
+              },
+            ],
+          });
+        },
+        { timeout: 5000 },
+      );
     });
   });
 

app/components/Nav/App/App.test.tsx

@@ -32,6 +32,7 @@ import {
   CURRENT_APP_VERSION,
   EXISTING_USER,
   LAST_APP_VERSION,
+  OPTIN_META_METRICS_UI_SEEN,
 } from '../../../constants/storage';
 import { getVersion } from 'react-native-device-info';
 import { Authentication } from '../../../core/';
@@ -146,7 +147,6 @@ import RevealSRP from '../../Views/MultichainAccounts/sheets/RevealSRP';
 import { DeepLinkModal } from '../../UI/DeepLinkModal';
 import { checkForDeeplink } from '../../../actions/user';
 import { WalletDetails } from '../../Views/MultichainAccounts/WalletDetails/WalletDetails';
-import { RootState } from '../../../reducers';
 import { SmartAccountUpdateModal } from '../../Views/confirmations/components/smart-account-update-modal';
 
 const clearStackNavigatorOptions = {
@@ -829,10 +829,6 @@ const App: React.FC = () => {
   const sdkInit = useRef<boolean | undefined>(undefined);
   const isFirstRender = useRef(true);
 
-  const isMetaMetricsUISeen = useSelector(
-    (state: RootState) => state.user.isMetaMetricsUISeen,
-  );
-
   if (isFirstRender.current) {
     trace({
       name: TraceName.NavInit,
@@ -865,19 +861,25 @@ const App: React.FC = () => {
             },
           );
 
-          if (!isMetaMetricsUISeen) {
-            navigation.navigate(Routes.ONBOARDING.ROOT_NAV, {
-              screen: Routes.ONBOARDING.NAV,
-              params: {
-                screen: Routes.ONBOARDING.OPTIN_METRICS,
-                params: {
-                  onContinue: () =>
-                    navigation.reset({
-                      routes: [{ name: Routes.ONBOARDING.HOME_NAV }],
-                    }),
+          const isOptinMetaMetricsUISeen = await StorageWrapper.getItem(
+            OPTIN_META_METRICS_UI_SEEN,
+          );
+
+          if (!isOptinMetaMetricsUISeen) {
+            const resetParams = {
+              routes: [
+                {
+                  name: Routes.ONBOARDING.ROOT_NAV,
+                  params: {
+                    screen: Routes.ONBOARDING.NAV,
+                    params: {
+                      screen: Routes.ONBOARDING.OPTIN_METRICS,
+                    },
+                  },
                 },
-              },
-            });
+              ],
+            };
+            navigation.reset(resetParams);
           } else {
             navigation.reset({
               routes: [{ name: Routes.ONBOARDING.HOME_NAV }],
@@ -903,7 +905,7 @@ const App: React.FC = () => {
     appTriggeredAuth().catch((error) => {
       Logger.error(error, 'App: Error in appTriggeredAuth');
     });
-  }, [navigation, isMetaMetricsUISeen]);
+  }, [navigation]);
 
   const handleDeeplink = useCallback(
     ({ uri }: { uri?: string }) => {

app/components/Nav/App/App.tsx

@@ -63,6 +63,7 @@ import { useNftDetectionChainIds } from '../../hooks/useNftDetectionChainIds';
 import Logger from '../../../util/Logger';
 import { prepareNftDetectionEvents } from '../../../util/assets';
 import { endTrace, trace, TraceName } from '../../../util/trace';
+import { isNonEvmChainId } from '../../../core/Multichain/utils';
 
 const createStyles = (colors) =>
   StyleSheet.create({
@@ -192,6 +193,7 @@ const CollectibleContracts = ({
   const allNetworkClientIds = useMemo(
     () =>
       Object.keys(tokenNetworkFilter).flatMap((chainId) => {
+        if (isNonEvmChainId(chainId)) return [];
         const entry = allNetworks[chainId];
         if (!entry) {
           return [];