Merge branch 'main' into feat/eth-json-rpc

.github/scripts/fitness-functions/common/constants.ts

@@ -7,4 +7,7 @@ enum AUTOMATION_TYPE {
   PRE_PUSH_HOOK = 'pre-push-hook',
 }
 
-export { EXCLUDE_REGEX, AUTOMATION_TYPE };
+// only allow TS and TSX files in the app directory only
+const APP_FOLDER_JS_REGEX = /^(app).*\.(js|jsx)$/;
+
+export { EXCLUDE_REGEX, APP_FOLDER_JS_REGEX, AUTOMATION_TYPE };

.github/scripts/fitness-functions/common/shared.ts

@@ -33,6 +33,34 @@ function filterDiffByFilePath(diff: string, regex: RegExp): string {
   return filteredDiff;
 }
 
+function restrictedFilePresent(diff: string, regex: RegExp): boolean {
+  // split by `diff --git` and remove the first element which is empty
+  const diffBlocks = diff.split(`diff --git`).slice(1);
+  let jsOrJsxFilePresent = false;
+  diffBlocks
+    .map((block) => block.trim())
+    .filter((block) => {
+      block
+        // get the first line of the block which has the paths
+        .split('\n')[0]
+        .trim()
+        // split the two paths
+        .split(' ')
+        // remove `a/` and `b/` from the paths
+        .map((path) => path.substring(2))
+        // if at least one of the two paths matches the regex, filter the
+        // corresponding diff block in
+        .forEach((path) => {
+          if (regex.test(path)) {
+            // Not excluded, include in check
+            jsOrJsxFilePresent = true;
+          }
+        });
+      return jsOrJsxFilePresent;
+    })
+  return jsOrJsxFilePresent;
+}
+
 // This function returns all lines that are additions to files that are being
 // modified but that previously already existed. Example:
 // diff --git a/test.js b/test.js
@@ -111,6 +139,7 @@ function hasNumberOfCodeBlocksIncreased(
 
 export {
   filterDiffByFilePath,
+  restrictedFilePresent,
   filterDiffFileCreations,
   filterDiffLineAdditions,
   hasNumberOfCodeBlocksIncreased,

.github/scripts/fitness-functions/rules/index.ts

@@ -1,3 +1,4 @@
+import { preventJavaScriptFileAdditions } from './javascript-additions';
 import { preventCodeBlocksRule } from './prevent-code-blocks';
 
 const RULES: IRule[] = [
@@ -6,6 +7,11 @@ const RULES: IRule[] = [
     fn: preventCodeBlocksRule,
     docURL: '[WIP] No documentation exists for this rule yet.',
   },
+  {
+    name: 'Check for js or jsx file being added',
+    fn: preventJavaScriptFileAdditions,
+    docURL: '[WIP] No documentation exists for this rule yet.',
+  },
 ];
 
 interface IRule {
@@ -32,5 +38,5 @@ function runFitnessFunctionRule(rule: IRule, diff: string): void {
   }
 }
 
-export { RULES, runFitnessFunctionRule };
+export { RULES, runFitnessFunctionRule, preventJavaScriptFileAdditions };
 export type { IRule };

.github/scripts/fitness-functions/rules/javascript-additions.test.ts

@@ -0,0 +1,51 @@
+import {
+  generateModifyFilesDiff,
+  generateCreateFileDiff,
+} from '../common/test-data';
+import { preventJavaScriptFileAdditions } from './javascript-additions';
+
+describe('preventJavaScriptFileAdditions()', (): void => {
+  it('should pass when receiving an empty diff', (): void => {
+    const testDiff = '';
+
+    const hasRulePassed = preventJavaScriptFileAdditions(testDiff);
+
+    expect(hasRulePassed).toBe(true);
+  });
+
+  it('should pass when receiving a diff with a new TS file on the shared folder', (): void => {
+    const testDiff = [
+      generateModifyFilesDiff('new-file.ts', 'foo', 'bar'),
+      generateModifyFilesDiff('old-file.js', undefined, 'pong'),
+      generateCreateFileDiff('app/test.ts', 'yada yada yada yada'),
+    ].join('');
+
+    const hasRulePassed = preventJavaScriptFileAdditions(testDiff);
+
+    expect(hasRulePassed).toBe(true);
+  });
+
+  it('should not pass when receiving a diff with a new JS file on the shared folder', (): void => {
+    const testDiff = [
+      generateModifyFilesDiff('new-file.ts', 'foo', 'bar'),
+      generateModifyFilesDiff('old-file.js', undefined, 'pong'),
+      generateCreateFileDiff('app/test.js', 'yada yada yada yada'),
+    ].join('');
+
+    const hasRulePassed = preventJavaScriptFileAdditions(testDiff);
+
+    expect(hasRulePassed).toBe(false);
+  });
+
+  it('should not pass when receiving a diff with a new JSX file on the shared folder', (): void => {
+    const testDiff = [
+      generateModifyFilesDiff('new-file.ts', 'foo', 'bar'),
+      generateModifyFilesDiff('old-file.js', undefined, 'pong'),
+      generateCreateFileDiff('app/test.jsx', 'yada yada yada yada'),
+    ].join('');
+
+    const hasRulePassed = preventJavaScriptFileAdditions(testDiff);
+
+    expect(hasRulePassed).toBe(false);
+  });
+});

.github/scripts/fitness-functions/rules/javascript-additions.ts

@@ -0,0 +1,12 @@
+import { APP_FOLDER_JS_REGEX } from '../common/constants';
+import { filterDiffFileCreations, restrictedFilePresent } from '../common/shared';
+
+function preventJavaScriptFileAdditions(diff: string): boolean {
+  const diffAdditions = filterDiffFileCreations(diff);
+  if (restrictedFilePresent(diffAdditions, APP_FOLDER_JS_REGEX)) {
+    return false;
+  }
+  return true;
+}
+
+export { preventJavaScriptFileAdditions };

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Current Main Branch
 
+## 7.24.3 - Jun 19, 2024
+### Fixed
+- [#10045](https://github.com/MetaMask/metamask-mobile/pull/10045): fix: Update ppom package to 1.4.8 (#10041)
+
 ## 7.24.2 - Jun 13, 2024
 ### Added
 - [#9687](https://github.com/MetaMask/metamask-mobile/pull/9687): feat: adds "data collection for marketing" toggles

android/app/build.gradle

@@ -181,8 +181,8 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1348
-        versionName "7.24.2"
+        versionCode 1351
+        versionName "7.24.3"
         testBuildType System.getProperty('testBuildType', 'debug')
         missingDimensionStrategy 'react-native-camera', 'general'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/components/Nav/App/index.js

@@ -344,15 +344,9 @@ const App = ({ userLoggedIn }) => {
         animationNameRef?.current?.play();
       }
     };
-    appTriggeredAuth()
-      .then(() => {
-        queueOfHandleDeeplinkFunctions.current.forEach((func) => func());
-
-        queueOfHandleDeeplinkFunctions.current = [];
-      })
-      .catch((error) => {
-        Logger.error(error, 'App: Error in appTriggeredAuth');
-      });
+    appTriggeredAuth().catch((error) => {
+      Logger.error(error, 'App: Error in appTriggeredAuth');
+    });
   }, [navigator, queueOfHandleDeeplinkFunctions]);
 
   const handleDeeplink = useCallback(({ error, params, uri }) => {
@@ -415,9 +409,11 @@ const App = ({ userLoggedIn }) => {
             handleDeeplink(opts);
           } else {
             queueOfHandleDeeplinkFunctions.current =
-              queueOfHandleDeeplinkFunctions.current.concat(() => {
-                handleDeeplink(opts);
-              });
+              queueOfHandleDeeplinkFunctions.current.concat([
+                () => {
+                  handleDeeplink(opts);
+                },
+              ]);
           }
         });
       }
@@ -456,17 +452,25 @@ const App = ({ userLoggedIn }) => {
         try {
           const sdkConnect = SDKConnect.getInstance();
           await sdkConnect.init({ navigation: navigator, context: 'Nav/App' });
-          await SDKConnect.getInstance().postInit();
+          await SDKConnect.getInstance().postInit(() => {
+            setTimeout(() => {
+              queueOfHandleDeeplinkFunctions.current = [];
+            }, 1000);
+          });
           sdkInit.current = true;
         } catch (err) {
           sdkInit.current = undefined;
           console.error(`Cannot initialize SDKConnect`, err);
         }
       }
     }
-    initSDKConnect().catch((err) => {
-      Logger.error(err, 'Error initializing SDKConnect');
-    });
+    initSDKConnect()
+      .then(() => {
+        queueOfHandleDeeplinkFunctions.current.forEach((func) => func());
+      })
+      .catch((err) => {
+        Logger.error(err, 'Error initializing SDKConnect');
+      });
   }, [navigator, onboarded, userLoggedIn]);
 
   useEffect(() => {

app/components/UI/AssetOverview/AssetOverview.tsx

@@ -169,7 +169,7 @@ const AssetOverview: React.FC<AssetOverviewProps> = ({
   const itemAddress = safeToChecksumAddress(asset.address);
   const exchangeRate =
     itemAddress && itemAddress in tokenExchangeRates
-      ? tokenExchangeRates[itemAddress]
+      ? tokenExchangeRates?.[itemAddress]?.price
       : undefined;
 
   let balance, balanceFiat;

app/components/UI/NetworkInfo/index.tsx

@@ -8,7 +8,7 @@ import { connect, useSelector } from 'react-redux';
 import Description from './InfoDescription';
 import { useTheme } from '../../../util/theme';
 import { fontStyles } from '../../../styles/common';
-import { isTokenDetectionSupportedForNetwork } from '@metamask/assets-controllers/dist/assetsUtil';
+import { isTokenDetectionSupportedForNetwork } from '@metamask/assets-controllers';
 import { NETWORK_EDUCATION_MODAL_CLOSE_BUTTON } from '../../../../wdio/screen-objects/testIDs/Screens/NetworksScreen.testids.js';
 import { selectProviderConfig } from '../../../selectors/networkController';
 import {

app/components/UI/Notification/BaseNotification/index.js

@@ -9,7 +9,7 @@ import IonicIcon from 'react-native-vector-icons/Ionicons';
 import AntIcon from 'react-native-vector-icons/AntDesign';
 import Text from '../../../Base/Text';
 import { useTheme } from '../../../../util/theme';
-import { CommonSelectorsIDs } from '../../../../../e2e/selectors/Common.selectors';
+import { ToastSelectorsIDs } from '../../../../../e2e/selectors/Modals/ToastModal.selectors';
 
 const createStyles = (colors) =>
   StyleSheet.create({
@@ -185,7 +185,7 @@ const BaseNotification = ({
           <View style={styles.flashLabel}>
             <Text
               style={styles.flashTitle}
-              testID={CommonSelectorsIDs.TOAST_NOTIFICATION_TITLE}
+              testID={ToastSelectorsIDs.NOTIFICATION_TITLE}
             >
               {!title ? getTitle(status, data) : title}
             </Text>

app/components/UI/PaymentRequest/index.js

@@ -46,7 +46,7 @@ import { toLowerCaseEquals } from '../../../util/general';
 import { utils as ethersUtils } from 'ethers';
 import { ThemeContext, mockTheme } from '../../../util/theme';
 import { isTestNet } from '../../../util/networks';
-import { isTokenDetectionSupportedForNetwork } from '@metamask/assets-controllers/dist/assetsUtil';
+import { isTokenDetectionSupportedForNetwork } from '@metamask/assets-controllers';
 import {
   selectChainId,
   selectTicker,
@@ -553,7 +553,7 @@ class PaymentRequest extends PureComponent {
     const exchangeRate =
       selectedAsset &&
       selectedAsset.address &&
-      contractExchangeRates[selectedAsset.address];
+      contractExchangeRates?.[selectedAsset.address]?.price;
     if (selectedAsset.symbol !== 'ETH') {
       secondaryAmount = exchangeRate
         ? balanceToFiat(
@@ -587,7 +587,8 @@ class PaymentRequest extends PureComponent {
     const exchangeRate =
       selectedAsset &&
       selectedAsset.address &&
-      contractExchangeRates[selectedAsset.address];
+      contractExchangeRates &&
+      contractExchangeRates[selectedAsset.address]?.price;
     const undefAmount = (isDecimal(amount) && amount) || 0;
     let secondaryAmount, cryptoAmount;
     if (selectedAsset.symbol !== 'ETH' && exchangeRate && exchangeRate !== 0) {
@@ -631,7 +632,8 @@ class PaymentRequest extends PureComponent {
     const exchangeRate =
       selectedAsset &&
       selectedAsset.address &&
-      contractExchangeRates[selectedAsset.address];
+      contractExchangeRates &&
+      contractExchangeRates[selectedAsset.address]?.price;
     let res;
     // If primary currency is not crypo we need to know if there are conversion and exchange rates to handle0,
     // fiat conversion for the payment request
@@ -745,7 +747,8 @@ class PaymentRequest extends PureComponent {
     const exchangeRate =
       selectedAsset &&
       selectedAsset.address &&
-      contractExchangeRates[selectedAsset.address];
+      contractExchangeRates &&
+      contractExchangeRates[selectedAsset.address]?.price;
     let switchable = true;
     const colors = this.context.colors || mockTheme.colors;
     const themeAppearance = this.context.themeAppearance || 'light';

app/components/UI/Ramp/hooks/useBalance.ts

@@ -51,10 +51,7 @@ export default function useBalance(asset?: Asset) {
     );
     balanceFiat = weiToFiat(balanceBN, conversionRate, currentCurrency);
   } else {
-    const exchangeRate =
-      assetAddress && assetAddress in tokenExchangeRates
-        ? tokenExchangeRates[assetAddress]
-        : undefined;
+    const exchangeRate = tokenExchangeRates?.[assetAddress]?.price;
     balance =
       assetAddress && assetAddress in balances
         ? renderFromTokenMinimalUnit(

app/components/UI/Swaps/components/TokenSelectModal.js

@@ -242,8 +242,8 @@ function TokenSelectModal({
         );
       } else {
         const exchangeRate =
-          itemAddress in tokenExchangeRates
-            ? tokenExchangeRates[itemAddress]
+          tokenExchangeRates && itemAddress in tokenExchangeRates
+            ? tokenExchangeRates[itemAddress]?.price
             : undefined;
         balance =
           itemAddress in balances

app/components/UI/Swaps/index.js

@@ -32,10 +32,8 @@ import { MetaMetricsEvents } from '../../../core/Analytics';
 
 import {
   getFeatureFlagChainId,
-  setSwapsHasOnboarded,
   setSwapsLiveness,
   swapsControllerTokens,
-  swapsHasOnboardedSelector,
   swapsTokensSelector,
   swapsTokensWithBalanceSelector,
   swapsTopAssetsSelector,
@@ -198,8 +196,6 @@ function SwapsAmountView({
   conversionRate,
   tokenExchangeRates,
   currentCurrency,
-  userHasOnboarded,
-  setHasOnboarded,
   setLiveness,
 }) {
   const navigation = useNavigation();
@@ -502,8 +498,8 @@ function SwapsAmountView({
     } else {
       const sourceAddress = safeToChecksumAddress(sourceToken.address);
       const exchangeRate =
-        sourceAddress in tokenExchangeRates
-          ? tokenExchangeRates[sourceAddress]
+        tokenExchangeRates && sourceAddress in tokenExchangeRates
+          ? tokenExchangeRates[sourceAddress]?.price
           : undefined;
       balanceFiat = balanceToFiat(
         amount,
@@ -978,14 +974,6 @@ SwapsAmountView.propTypes = {
    * An object containing token exchange rates in the format address => exchangeRate
    */
   tokenExchangeRates: PropTypes.object,
-  /**
-   * Wether the user has been onboarded or not
-   */
-  userHasOnboarded: PropTypes.bool,
-  /**
-   * Function to set hasOnboarded
-   */
-  setHasOnboarded: PropTypes.func,
   /**
    * Current network provider configuration
    */
@@ -1018,12 +1006,9 @@ const mapStateToProps = (state) => ({
   chainId: selectChainId(state),
   tokensWithBalance: swapsTokensWithBalanceSelector(state),
   tokensTopAssets: swapsTopAssetsSelector(state),
-  userHasOnboarded: swapsHasOnboardedSelector(state),
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  setHasOnboarded: (hasOnboarded) =>
-    dispatch(setSwapsHasOnboarded(hasOnboarded)),
   setLiveness: (chainId, featureFlags) =>
     dispatch(setSwapsLiveness(chainId, featureFlags)),
 });