feat: remove metametrics and update choose password screen

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

@@ -362,32 +362,50 @@ describe('App', () => {
       });
     });
 
-    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 === OPTIN_META_METRICS_UI_SEEN) {
-          return false; // OptinMetrics UI has not been seen
-        }
-        return null; // Default for other keys
+    describe('SRP vs Social Login user differentiation', () => {
+      beforeEach(() => {
+        jest.spyOn(Authentication, 'appTriggeredAuth').mockResolvedValue();
       });
 
-      renderScreen(
-        App,
-        { name: 'App' },
-        {
-          state: {
-            ...initialState,
-            user: {
-              ...initialState.user,
-              existingUser: true,
+      it('shows metrics optin for SRP users when not seen before', async () => {
+        const srpUserState = {
+          ...initialState,
+          user: {
+            ...initialState.user,
+            existingUser: true,
+          },
+          engine: {
+            ...initialState.engine,
+            backgroundState: {
+              ...initialState.engine?.backgroundState,
+              SeedlessOnboardingController: {
+                vault: undefined,
+              },
             },
           },
-        },
-      );
+        };
+
+        jest
+          .spyOn(StorageWrapper, 'getItem')
+          .mockImplementation(async (key) => {
+            if (key === OPTIN_META_METRICS_UI_SEEN) {
+              return false;
+            }
+            return null;
+          });
+
+        // Mock useMetrics hook to return false for isEnabled
+        jest.mock('../../hooks/useMetrics/useMetrics', () => ({
+          useMetrics: () => ({
+            isEnabled: jest.fn().mockReturnValue(false),
+          }),
+        }));
+
+        // Act
+        renderScreen(App, { name: 'App' }, { state: srpUserState });
 
-      // Wait a bit longer and add debugging
-      await waitFor(
-        () => {
+        // Assert
+        await waitFor(() => {
           expect(mockReset).toHaveBeenCalledWith({
             routes: [
               {
@@ -401,9 +419,46 @@ describe('App', () => {
               },
             ],
           });
-        },
-        { timeout: 5000 },
-      );
+        });
+      });
+
+      it('navigates directly to home for SRP users when metrics UI already seen', async () => {
+        const srpUserState = {
+          ...initialState,
+          user: {
+            ...initialState.user,
+            existingUser: true,
+          },
+          engine: {
+            ...initialState.engine,
+            backgroundState: {
+              ...initialState.engine?.backgroundState,
+              SeedlessOnboardingController: {
+                vault: undefined,
+              },
+            },
+          },
+        };
+
+        jest
+          .spyOn(StorageWrapper, 'getItem')
+          .mockImplementation(async (key) => {
+            if (key === OPTIN_META_METRICS_UI_SEEN) {
+              return true;
+            }
+            return null;
+          });
+
+        // Act
+        renderScreen(App, { name: 'App' }, { state: srpUserState });
+
+        // Assert
+        await waitFor(() => {
+          expect(mockReset).toHaveBeenCalledWith({
+            routes: [{ name: Routes.ONBOARDING.HOME_NAV }],
+          });
+        });
+      });
     });
 
     describe('Seedless onboarding password outdated check', () => {
@@ -797,43 +852,43 @@ describe('App', () => {
         });
       });
     });
+  });
 
-    it('should 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
-        }
-        return null; // Default for other keys
-      });
+  it('should 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
+      }
+      return null; // Default for other keys
+    });
 
-      renderScreen(
-        App,
-        { name: 'App' },
-        {
-          state: {
-            ...initialState,
-            user: {
-              ...initialState.user,
-              existingUser: true,
-            },
+    renderScreen(
+      App,
+      { name: 'App' },
+      {
+        state: {
+          ...initialState,
+          user: {
+            ...initialState.user,
+            existingUser: true,
           },
         },
-      );
+      },
+    );
 
-      await waitFor(() => {
-        expect(mockReset).toHaveBeenCalledWith({
-          routes: [
-            {
-              name: Routes.ONBOARDING.ROOT_NAV,
+    await waitFor(() => {
+      expect(mockReset).toHaveBeenCalledWith({
+        routes: [
+          {
+            name: Routes.ONBOARDING.ROOT_NAV,
+            params: {
+              screen: Routes.ONBOARDING.NAV,
               params: {
-                screen: Routes.ONBOARDING.NAV,
-                params: {
-                  screen: Routes.ONBOARDING.OPTIN_METRICS,
-                },
+                screen: Routes.ONBOARDING.OPTIN_METRICS,
               },
             },
-          ],
-        });
+          },
+        ],
       });
     });
   });

app/components/Nav/App/App.tsx

@@ -1007,9 +1007,7 @@
   const routes = useNavigationState((state) => state.routes);
   const { toastRef } = useContext(ToastContext);
   const isFirstRender = useRef(true);
-
   const { isEnabled: checkMetricsEnabled } = useMetrics();
-
   const isSeedlessOnboardingLoginFlow = useSelector(
     selectSeedlessOnboardingLoginFlow,
   );
@@ -1071,30 +1069,35 @@
             },
           );
 
-          const isOptinMetaMetricsUISeen = await StorageWrapper.getItem(
-            OPTIN_META_METRICS_UI_SEEN,
-          );
+          // Only show metrics optin for SRP users
+          if (!isSeedlessOnboardingLoginFlow) {
+            const isOptinMetaMetricsUISeen = await StorageWrapper.getItem(
+              OPTIN_META_METRICS_UI_SEEN,
+            );
 
-          if (!isOptinMetaMetricsUISeen && !checkMetricsEnabled()) {
-            const resetParams = {
-              routes: [
-                {
-                  name: Routes.ONBOARDING.ROOT_NAV,
-                  params: {
-                    screen: Routes.ONBOARDING.NAV,
+            if (!isOptinMetaMetricsUISeen && !checkMetricsEnabled()) {
+              const resetParams = {
+                routes: [
+                  {
+                    name: Routes.ONBOARDING.ROOT_NAV,
                     params: {
-                      screen: Routes.ONBOARDING.OPTIN_METRICS,
+                      screen: Routes.ONBOARDING.NAV,
+                      params: {
+                        screen: Routes.ONBOARDING.OPTIN_METRICS,
+                      },
                     },
                   },
-                },
-              ],
-            };
-            navigation.reset(resetParams);
-          } else {
-            navigation.reset({
-              routes: [{ name: Routes.ONBOARDING.HOME_NAV }],
-            });
+                ],
+              };
+              navigation.reset(resetParams);
+              return;
+            }
           }
+
+          // Navigate to home for both SRP users (who have seen metrics) and social login users
+          navigation.reset({
+            routes: [{ name: Routes.ONBOARDING.HOME_NAV }],
+          });
         } else {
           navigation.reset({ routes: [{ name: Routes.ONBOARDING.ROOT_NAV }] });
         }
@@ -1207,7 +1210,7 @@
       Logger.error(error, 'Error starting app');
     });
     // existingUser is not present in the dependency array because it is not needed to re-run the effect when it changes and it will cause a bug.
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   return (

app/components/Nav/Main/index.test.tsx

@@ -11,6 +11,33 @@ import { renderHookWithProvider } from '../../../util/test/renderWithProvider';
 import Engine from '../../../core/Engine';
 import configureMockStore from 'redux-mock-store';
 import { Provider } from 'react-redux';
+
+// Mock Ramp SDK dependencies to prevent SdkEnvironment.Production errors
+jest.mock('../../../components/UI/Ramp', () => ({
+  RampOrders: ({ children }: { children: React.ReactNode }) => children,
+}));
+
+jest.mock('../../../components/UI/Ramp/Deposit/sdk', () => ({
+  DepositSDKProvider: ({ children }: { children: React.ReactNode }) => children,
+  DepositSDKContext: {
+    Provider: ({ children }: { children: React.ReactNode }) => children,
+  },
+}));
+
+jest.mock('../../../components/UI/Ramp/Deposit/orderProcessor', () => ({}));
+
+jest.mock('@consensys/native-ramps-sdk', () => ({
+  SdkEnvironment: {
+    Production: 'production',
+    Staging: 'staging',
+  },
+  Context: {
+    MobileIOS: 'mobile-ios',
+    MobileAndroid: 'mobile-android',
+  },
+  NativeRampsSdk: jest.fn(),
+}));
+
 const mockStore = configureMockStore();
 const mockInitialState = {
   user: {

app/components/Views/ChoosePassword/__snapshots__/index.test.tsx.snap

@@ -396,11 +396,14 @@ exports[`ChoosePassword render matches snapshot 1`] = `
             style={
               {
                 "alignItems": "flex-start",
+                "backgroundColor": "#f3f5f9",
+                "borderRadius": 8,
                 "flexDirection": "row",
                 "gap": 8,
                 "justifyContent": "flex-start",
                 "marginBottom": 16,
                 "marginTop": 8,
+                "padding": 16,
               }
             }
           >
@@ -453,6 +456,7 @@ exports[`ChoosePassword render matches snapshot 1`] = `
                   "justifyContent": "flex-start",
                   "letterSpacing": 0,
                   "lineHeight": 24,
+                  "marginTop": -6,
                   "width": "90%",
                 }
               }
@@ -465,28 +469,42 @@ exports[`ChoosePassword render matches snapshot 1`] = `
                   {
                     "color": "#121314",
                     "fontFamily": "Geist Regular",
-                    "fontSize": 16,
+                    "fontSize": 14,
                     "letterSpacing": 0,
-                    "lineHeight": 24,
+                    "lineHeight": 22,
                   }
                 }
               >
-                If I forget this password, MetaMask can't recover it for me.
                 <Text
                   accessibilityRole="text"
-                  onPress={[Function]}
                   style={
                     {
-                      "color": "#4459ff",
+                      "color": "#686e7d",
                       "fontFamily": "Geist Regular",
-                      "fontSize": 16,
+                      "fontSize": 14,
                       "letterSpacing": 0,
-                      "lineHeight": 24,
+                      "lineHeight": 22,
                     }
                   }
-                  testID="learn-more-link"
                 >
-                   Learn more.
+                  If I lose this password, MetaMask can’t reset it.
+                  <Text
+                    accessibilityRole="text"
+                    onPress={[Function]}
+                    style={
+                      {
+                        "color": "#4459ff",
+                        "fontFamily": "Geist Regular",
+                        "fontSize": 14,
+                        "letterSpacing": 0,
+                        "lineHeight": 22,
+                      }
+                    }
+                    testID="learn-more-link"
+                  >
+
+                    Learn more.
+                  </Text>
                 </Text>
               </Text>
             </Text>