Merge branch 'main' into fix/duplicate-key-error-privacy-settings-chainId

Author: gambinish

.git-blame-ignore-revs

@@ -2,3 +2,5 @@
 57afe4ca921d85a51a923470239ca977fccbd1ae
 # Standardize prettier configuration https://github.com/MetaMask/metamask-mobile/pull/4182
 bdb7f37c90e4fc923881a07fca38d4e77c73a579
+# Fix mixed tabs and spaces https://github.com/MetaMask/metamask-mobile/pull/1379
+9f9a1121c6899e06d4aeef29017bb479df142adb

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## Current Main Branch
 
-## 7.32.0 - Sep 19, 2024
+## 7.32.0 - Oct 7, 2024
 
 ### Added
 
@@ -91,6 +91,9 @@
 - [#11193](https://github.com/MetaMask/metamask-mobile/pull/11193): fix: ItemMenu crash using dayjs (#11193)
 - [#11098](https://github.com/MetaMask/metamask-mobile/pull/11098): fix: badge count and ui polishing (#11098)
 
+## 7.31.1 - Oct 4, 2024
+### Fixed
+- [#11631](https://github.com/MetaMask/metamask-mobile/pull/11631): fix: Fixes UI issue in token details (#11631)
 
 ## 7.31.0 - Sep 6, 2024
 ### Added

android/app/build.gradle

@@ -173,7 +173,7 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1444
+        versionCode 1450
         versionName "7.32.0"
         testBuildType System.getProperty('testBuildType', 'debug')
         missingDimensionStrategy 'react-native-camera', 'general'

app/components/Nav/Main/index.js

@@ -113,9 +113,6 @@ const Main = (props) => {
   useEnableAutomaticSecurityChecks();
   useMinimumVersions();
 
-
-
-
   useEffect(() => {
     if (DEPRECATED_NETWORKS.includes(props.chainId)) {
       setShowDeprecatedAlert(true);
@@ -268,7 +265,6 @@ const Main = (props) => {
       initForceReload();
       return;
     }
-
   });
 
   // Remove all notifications that aren't visible

app/components/hooks/MinimumVersions/useMinimumVersions.test.ts

@@ -0,0 +1,68 @@
+import { renderHook } from '@testing-library/react-hooks';
+import { useSelector } from 'react-redux';
+import { useNavigation } from '@react-navigation/native';
+import { getBuildNumber } from 'react-native-device-info';
+import useMinimumVersions from './useMinimumVersions';
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+}));
+
+jest.mock('@react-navigation/native', () => ({
+  useNavigation: jest.fn(),
+}));
+
+jest.mock('react-native-device-info', () => ({
+  getBuildNumber: jest.fn(),
+}));
+
+jest.mock('react-native', () => ({
+  InteractionManager: {
+    runAfterInteractions: jest.fn((callback) => callback()),
+  },
+}));
+
+jest.mock('../../UI/UpdateNeeded/UpdateNeeded', () => ({
+  createUpdateNeededNavDetails: jest.fn(),
+}));
+
+describe('useMinimumVersions', () => {
+  const mockNavigation = {
+    navigate: jest.fn(),
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (useNavigation as jest.Mock).mockReturnValue(mockNavigation);
+  });
+
+  it('requires update only if automaticSecurityChecksEnabled', () => {
+    (useSelector as jest.Mock).mockImplementation(() => ({
+      security: { automaticSecurityChecksEnabled: false },
+      featureFlags: {
+        featureFlags: { mobileMinimumVersions: { appMinimumBuild: 100 } },
+      },
+    }));
+
+    (getBuildNumber as jest.Mock).mockReturnValue('101');
+
+    renderHook(() => useMinimumVersions());
+
+    expect(mockNavigation.navigate).not.toHaveBeenCalled();
+  });
+
+  it('requires update only if currentBuildNumber is lower than appMinimumBuild', () => {
+    (useSelector as jest.Mock).mockImplementation(() => ({
+      security: { automaticSecurityChecksEnabled: true },
+      featureFlags: {
+        featureFlags: { mobileMinimumVersions: { appMinimumBuild: 100 } },
+      },
+    }));
+
+    (getBuildNumber as jest.Mock).mockReturnValue('101');
+
+    renderHook(() => useMinimumVersions());
+
+    expect(mockNavigation.navigate).not.toHaveBeenCalled();
+  });
+});

app/components/hooks/MinimumVersions/useMinimumVersions.tsx

@@ -1,30 +1,25 @@
-import { useEffect, useMemo } from 'react';
+import { useEffect } from 'react';
 import { getBuildNumber } from 'react-native-device-info';
-import { useAppConfig } from '../AppConfig';
 import { createUpdateNeededNavDetails } from '../../UI/UpdateNeeded/UpdateNeeded';
 import { useSelector } from 'react-redux';
 import { useNavigation } from '@react-navigation/native';
 import { InteractionManager } from 'react-native';
+import { FeatureFlagsState } from '../../../core/redux/slices/featureFlags';
+import { SecurityState } from '../../../../app/reducers/security';
+import { RootState } from '../../../../app/reducers';
 
 const useMinimumVersions = () => {
-  const allowAutomaticSecurityChecks = useSelector(
-    // TODO: Replace "any" with type
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (state: any) => state.security.automaticSecurityChecksEnabled,
+  const { automaticSecurityChecksEnabled }: SecurityState = useSelector(
+    (state: RootState) => state.security,
+  );
+  const { featureFlags }: FeatureFlagsState = useSelector(
+    (state: RootState) => state.featureFlags,
   );
-  const minimumValues = useAppConfig(allowAutomaticSecurityChecks);
   const currentBuildNumber = Number(getBuildNumber());
   const navigation = useNavigation();
-  const shouldTriggerUpdateFlow = useMemo(
-    () =>
-      !!(
-        allowAutomaticSecurityChecks &&
-        minimumValues.data &&
-        minimumValues.data.security.minimumVersions.appMinimumBuild >
-          currentBuildNumber
-      ),
-    [allowAutomaticSecurityChecks, currentBuildNumber, minimumValues.data],
-  );
+  const shouldTriggerUpdateFlow =
+    automaticSecurityChecksEnabled &&
+    featureFlags?.mobileMinimumVersions?.appMinimumBuild > currentBuildNumber;
 
   useEffect(() => {
     if (shouldTriggerUpdateFlow) {

app/core/AppConstants.ts

@@ -212,7 +212,7 @@ export default {
     'config-api.metamask.io/featureFlags',
   ],
   FEATURE_FLAGS_API: {
-    BASE_URL: 'https://client-config.api.cx.metamask.io/',
+    BASE_URL: 'https://client-config.api.cx.metamask.io',
     VERSION: 'v1',
   },
 } as const;

app/reducers/index.ts

@@ -21,7 +21,7 @@ import infuraAvailabilityReducer from './infuraAvailability';
 import collectiblesReducer from './collectibles';
 import navigationReducer from './navigation';
 import networkOnboardReducer from './networkSelector';
-import securityReducer from './security';
+import securityReducer, { SecurityState } from './security';
 import { combineReducers, Reducer } from 'redux';
 import experimentalSettingsReducer from './experimentalSettings';
 import { EngineState } from '../core/Engine';
@@ -106,7 +106,7 @@ export interface RootState {
   // TODO: Replace "any" with type
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   networkOnboarded: any;
-  security: StateFromReducer<typeof securityReducer>;
+  security: SecurityState;
   sdk: StateFromReducer<typeof sdkReducer>;
   // The experimentalSettings reducer is TypeScript but not yet a valid reducer
   // TODO: Replace "any" with type

app/reducers/security/index.ts

@@ -2,6 +2,15 @@
 import { ActionType, Action } from '../../actions/security';
 import { SecuritySettingsState } from '../../actions/security/state';
 
+export interface SecurityState {
+  allowLoginWithRememberMe: boolean;
+  automaticSecurityChecksEnabled: boolean;
+  hasUserSelectedAutomaticSecurityCheckOption: boolean;
+  isAutomaticSecurityChecksModalOpen: boolean;
+  dataCollectionForMarketing: boolean | null;
+  isNFTAutoDetectionModalViewed: boolean;
+}
+
 export const initialState: Readonly<SecuritySettingsState> = {
   allowLoginWithRememberMe: false,
   automaticSecurityChecksEnabled: false,

bitrise.yml

@@ -1500,13 +1500,13 @@ app:
       VERSION_NAME: 7.32.0
     - opts:
         is_expand: false
-      VERSION_NUMBER: 1444
+      VERSION_NUMBER: 1450
     - opts:
         is_expand: false
       FLASK_VERSION_NAME: 7.32.0
     - opts:
         is_expand: false
-      FLASK_VERSION_NUMBER: 1444
+      FLASK_VERSION_NUMBER: 1450
     - opts:
         is_expand: false
       ANDROID_APK_LINK: ''