Merge branch 'release/7.56.0' into cp-c26469d9-release-7.56.0

Author: micaelae

.depcheckrc.yml

@@ -118,4 +118,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'

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

@@ -38,7 +38,7 @@ on:
       PR_TOKEN:
         required: false
       GCP_RLS_SHEET_ACCOUNT_BASE64:
-         required: false
+        required: false
 
 jobs:
   generate-build-version:

.iyarc

@@ -5,4 +5,4 @@ GHSA-c76h-2ccp-4975
 # https://github.com/advisories/GHSA-pq67-2wwv-3xjx
 GHSA-pq67-2wwv-3xjx
 # https://github.com/advisories/GHSA-8cj5-5rvv-wf4v
-GHSA-8cj5-5rvv-wf4v
+GHSA-8cj5-5rvv-wf4v

CHANGELOG.md

@@ -188,7 +188,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionName "7.56.0"
-        versionCode 2522
+        versionCode 2530
         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

@@ -3,6 +3,7 @@ import { fireEvent, screen } from '@testing-library/react-native';
 import GetStarted from './GetStarted';
 import { useDepositSDK } from '../../../sdk';
 import { getDepositNavbarOptions } from '../../../../../Navbar';
+import useDepositFeatureFlags from '../../../hooks/useDepositFeatureFlags';
 import renderWithProvider from '../../../../../../../util/test/renderWithProvider';
 
 jest.mock('../../../sdk', () => ({
@@ -13,6 +14,8 @@ jest.mock('../../../../../Navbar', () => ({
   getDepositNavbarOptions: jest.fn().mockReturnValue({}),
 }));
 
+jest.mock('../../../hooks/useDepositFeatureFlags');
+
 const mockSetOptions = jest.fn();
 const mockReset = jest.fn();
 
@@ -37,6 +40,14 @@ describe('GetStarted', () => {
       getStarted: false,
       setGetStarted: mockSetGetStarted,
     });
+
+    (
+      useDepositFeatureFlags as jest.MockedFunction<
+        typeof useDepositFeatureFlags
+      >
+    ).mockReturnValue({
+      metamaskUsdEnabled: false,
+    });
   });
 
   it('render matches snapshot', () => {
@@ -70,4 +81,34 @@ describe('GetStarted', () => {
     fireEvent.press(getStartedButton);
     expect(mockSetGetStarted).toHaveBeenCalledWith(true);
   });
+
+  describe('MUSD feature flag', () => {
+    it('displays USDC content when MUSD feature flag is disabled', () => {
+      (
+        useDepositFeatureFlags as jest.MockedFunction<
+          typeof useDepositFeatureFlags
+        >
+      ).mockReturnValue({
+        metamaskUsdEnabled: false,
+      });
+
+      renderWithProvider(<GetStarted />);
+
+      expect(screen.getByText('Starting is easy with USDC')).toBeOnTheScreen();
+    });
+
+    it('displays MUSD content when MUSD feature flag is enabled', () => {
+      (
+        useDepositFeatureFlags as jest.MockedFunction<
+          typeof useDepositFeatureFlags
+        >
+      ).mockReturnValue({
+        metamaskUsdEnabled: true,
+      });
+
+      renderWithProvider(<GetStarted />);
+
+      expect(screen.getByText('Starting is easy with mUSD')).toBeOnTheScreen();
+    });
+  });
 });

app/components/UI/Ramp/Deposit/Views/Root/GetStarted/GetStarted.test.tsx

@@ -11,6 +11,8 @@ import ScreenLayout from '../../../../Aggregator/components/ScreenLayout';
 import { getDepositNavbarOptions } from '../../../../../Navbar';
 import { useStyles } from '../../../../../../../component-library/hooks';
 import getStartedIcon from '../../../assets/deposit-get-started-illustration.png';
+import getStartedIconMUSD from '../../../assets/deposit-get-started-illustration-musd.png';
+import useDepositFeatureFlags from '../../../hooks/useDepositFeatureFlags';
 
 import Button, {
   ButtonSize,
@@ -22,27 +24,43 @@ import Icon, {
   IconSize,
 } from '../../../../../../../component-library/components/Icons/Icon';
 
-const bulletPoints = [
-  {
-    title: strings('deposit.get_started.bullet_1_title'),
-    description: strings('deposit.get_started.bullet_1_description'),
-  },
-  {
-    title: strings('deposit.get_started.bullet_2_title'),
-    description: strings('deposit.get_started.bullet_2_description'),
-  },
-  {
-    title: strings('deposit.get_started.bullet_3_title'),
-    description: strings('deposit.get_started.bullet_3_description'),
-  },
-];
-
 const GetStarted: React.FC = () => {
   const navigation = useNavigation();
 
   const { styles, theme } = useStyles(styleSheet, {});
 
   const { getStarted, setGetStarted } = useDepositSDK();
+  const { metamaskUsdEnabled } = useDepositFeatureFlags();
+
+  const bulletPoints = metamaskUsdEnabled
+    ? [
+        {
+          title: strings('deposit.get_started.bullet_1_title_musd'),
+          description: strings('deposit.get_started.bullet_1_description_musd'),
+        },
+        {
+          title: strings('deposit.get_started.bullet_2_title_musd'),
+          description: strings('deposit.get_started.bullet_2_description_musd'),
+        },
+        {
+          title: strings('deposit.get_started.bullet_3_title_musd'),
+          description: strings('deposit.get_started.bullet_3_description_musd'),
+        },
+      ]
+    : [
+        {
+          title: strings('deposit.get_started.bullet_1_title'),
+          description: strings('deposit.get_started.bullet_1_description'),
+        },
+        {
+          title: strings('deposit.get_started.bullet_2_title'),
+          description: strings('deposit.get_started.bullet_2_description'),
+        },
+        {
+          title: strings('deposit.get_started.bullet_3_title'),
+          description: strings('deposit.get_started.bullet_3_description'),
+        },
+      ];
 
   useEffect(() => {
     navigation.setOptions(
@@ -70,16 +88,19 @@ const GetStarted: React.FC = () => {
           <ScreenLayout.Content>
             <View style={styles.getStartedImageWrapper}>
               <Image
-                source={getStartedIcon}
+                source={
+                  metamaskUsdEnabled ? getStartedIconMUSD : getStartedIcon
+                }
                 style={styles.getStartedImage}
                 resizeMode="contain"
               />
             </View>
           </ScreenLayout.Content>
-
           <ScreenLayout.Content>
             <Text variant={TextVariant.HeadingLG} style={styles.title}>
-              {strings('deposit.get_started.title')}
+              {metamaskUsdEnabled
+                ? strings('deposit.get_started.title_musd')
+                : strings('deposit.get_started.title')}
             </Text>
             {bulletPoints.map((bulletPoint, index) => (
               <View key={index} style={styles.bulletPointContainer}>

app/components/UI/Ramp/Deposit/Views/Root/GetStarted/GetStarted.tsx

@@ -157,8 +157,8 @@ export const CONDITIONALLY_SUPPORTED_DEPOSIT_TOKENS: DepositCryptoCurrency[] = [
   USDC_LINEA_TOKEN,
   USDC_BASE_TOKEN,
   USDC_SOLANA_TOKEN,
-  USDT_LINEA_TOKEN,
-  USDT_BASE_TOKEN,
+  //USDT_LINEA_TOKEN,
+  //USDT_BASE_TOKEN,
   USDT_SOLANA_TOKEN,
 ];
 

app/components/UI/Ramp/Deposit/assets/deposit-get-started-illustration-musd.png

@@ -294,7 +294,7 @@ describe('processDepositOrder', () => {
       cryptoAmount: 0.012361263,
       cryptoCurrency: 'BTC',
       fiatCurrency: 'USD',
-      network: 'ethreum',
+      network: 'ethereum',
       status: 'COMPLETED',
       orderType: 'DEPOSIT',
       walletAddress: '0x1234',