MetaMask · sethkfman · Feb 18, 2025 · Dec 9, 2024 · Dec 9, 2024 · Dec 9, 2024
@@ -78,18 +78,18 @@ module.exports = {
         'app/components/UI/Name/**/*.{js,ts,tsx}',
         'app/components/UI/SimulationDetails/**/*.{js,ts,tsx}',
         'app/components/hooks/DisplayName/**/*.{js,ts,tsx}',
-        'app/components/Views/confirmations/components/Confirm/DataTree/**/*.{js,ts,tsx}',
-        'app/components/Views/confirmations/components/Confirm/Info/**/*.{js,ts,tsx}',
-        'app/components/Views/confirmations/components/PersonalSign/**/*.{js,ts,tsx}',
-        'app/components/Views/confirmations/components/SignatureRequest/**/*.{js,ts,tsx}',
-        'app/components/Views/confirmations/components/TypedSign/**/*.{js,ts,tsx}',
+        'app/components/Views/confirmations/**/*.{js,ts,tsx}'
       ],
+      excludedFiles: [
+        'app/components/Views/confirmations/components/WatchAssetRequest/**/*.{js,ts,tsx}'],
       rules: {
         'no-restricted-syntax': [
           'error',
           {
             selector: `ImportSpecifier[imported.name=/${[
               'selectChainId',
+              'selectContractExchangeRates',
+              'selectConversionRate',
               'selectNetworkClientId',
               'selectNetworkStatus',
               'selectNickname',
@@ -99,7 +99,7 @@ module.exports = {
               'selectSelectedNetworkClientId',
               'selectTicker',
             ]
-              .map((method) => `(${method})`)
+              .map((method) => `^${method}$`)
               .join('|')}/]`,
             message: 'Avoid using global network selectors in confirmations',
           },

@@ -21,7 +21,7 @@ VERSION_PACKAGE=$(node -p "require('../../package.json').version")
 # Compare versions and keep the highest one
 HIGHEST_VERSION=$(printf "%s\n%s\n%s" "$VERSION_BRANCHES" "$VERSION_TAGS" "$VERSION_PACKAGE" | sort --version-sort | tail -n 1)
 
-# Increment the minor version of the highest version found
-NEXT_VERSION=$(echo "$HIGHEST_VERSION" | awk -F. -v OFS=. '{$2++; print}')
+# Increment the minor version of the highest version found and reset the patch version to 0
+NEXT_VERSION=$(echo "$HIGHEST_VERSION" | awk -F. -v OFS=. '{$2++; $3=0; print}')
 
 echo "NEXT_SEMVER_VERSION=${NEXT_VERSION}" >> "$GITHUB_ENV"
@@ -0,0 +1,2 @@
+# Added Temp to Pass Ci
+GHSA-vjh7-7g9h-fjfh
@@ -1 +1 @@
-20.17.0
+20.18.0
@@ -126,6 +126,7 @@ const getStories = () => {
     "./app/components/Views/confirmations/components/UI/InfoRow/InfoRow.stories.tsx": require("../app/components/Views/confirmations/components/UI/InfoRow/InfoRow.stories.tsx"),
     "./app/components/Views/confirmations/components/UI/ExpandableSection/ExpandableSection.stories.tsx": require("../app/components/Views/confirmations/components/UI/ExpandableSection/ExpandableSection.stories.tsx"),
     "./app/components/Views/confirmations/components/UI/Tooltip/Tooltip.stories.tsx": require("../app/components/Views/confirmations/components/UI/Tooltip/Tooltip.stories.tsx"),
+    "./app/components/Views/confirmations/components/UI/TextWithTooltip/TextWithTooltip.stories.tsx": require("../app/components/Views/confirmations/components/UI/TextWithTooltip/TextWithTooltip.stories.tsx"),
     "./app/component-library/components/Texts/SensitiveText/SensitiveText.stories.tsx": require("../app/component-library/components/Texts/SensitiveText/SensitiveText.stories.tsx"),
   };
 };

@@ -2,7 +2,89 @@
 
 ## Current Main Branch
 
-## 7.39.0 - Jan 16, 2024
+## [7.40.0]
+### Added
+- [#12983](https://github.com/MetaMask/metamask-mobile/pull/12983): feat: `NftGrid` view (#12983)
+- [#13198](https://github.com/MetaMask/metamask-mobile/pull/13198): feat(network): validate RPC URL for popular networks on add network from dapp connection (#13198)
+- [#13099](https://github.com/MetaMask/metamask-mobile/pull/13099): feat: add the ability for all networks to be pre-selected in the checkbox list on initial connect to a dapp. (#13099)
+- [#13247](https://github.com/MetaMask/metamask-mobile/pull/13247): feat: Adding text with tooltip component (#13247)
+- [#13195](https://github.com/MetaMask/metamask-mobile/pull/13195): feat: Adding date field type in typed sign data tree (#13195)
+- [#13135](https://github.com/MetaMask/metamask-mobile/pull/13135): feat: hide primary type displayed in collapsed message section if simulation is enabled (#13135)
+- [#13041](https://github.com/MetaMask/metamask-mobile/pull/13041): feat: Decoding Simulation Metrics (#13041)
+- [#12627](https://github.com/MetaMask/metamask-mobile/pull/12627): feat: Enable feature Flag Values with Scope Based on ""threshold""  (#12627)
+- [#13018](https://github.com/MetaMask/metamask-mobile/pull/13018): feat: add earn button to wallet actions (#13018)
+- [#13154](https://github.com/MetaMask/metamask-mobile/pull/13154): feat: STAKE-929 build token list item component (#13154)
+- [#13108](https://github.com/MetaMask/metamask-mobile/pull/13108): feat: STAKE-927 build upsell banner component (#13108)
+- [#13160](https://github.com/MetaMask/metamask-mobile/pull/13160): feat: Add Solana account (Flask only) (#13160)
+- [#13231](https://github.com/MetaMask/metamask-mobile/pull/13231): fix: swaps button missing when no feature flags (#13231)
+- [#13088](https://github.com/MetaMask/metamask-mobile/pull/13088): feat: Ledger team request us to upgrade the @ledgerhq/hw-app-eth to 6.42.0 to fix ledger bug for EIP-712 content (#13088)
+- [#12938](https://github.com/MetaMask/metamask-mobile/pull/12938): feat: MMPD-1528 - View recents and favorites in browser URL modal (#12938)
+
+### Changed
+- [#13272](https://github.com/MetaMask/metamask-mobile/pull/13272): test: Added back ramps smoke tests to Bitrise (#13272)
+- [#13058](https://github.com/MetaMask/metamask-mobile/pull/13058): chore: Remove device constraint from isPortfolioViewEnabled feature flag (#13058)
+- [#13039](https://github.com/MetaMask/metamask-mobile/pull/13039): chore: Scope PortfolioView feature flag to iOS devices only (#13039)
+- [#13217](https://github.com/MetaMask/metamask-mobile/pull/13217): test: Delete suggested-gas-api.mock.spec.js due to duplication (#13217)
+- [#13214](https://github.com/MetaMask/metamask-mobile/pull/13214): test: Disable flakey e2e wallet edit-recipient-address.spec (#13214)
+- [#13181](https://github.com/MetaMask/metamask-mobile/pull/13181): test: fix flakiness while browser loads test dapp (#13181)
+- [#13183](https://github.com/MetaMask/metamask-mobile/pull/13183): test: remove AfterAll hook in e2e (#13183)
+- [#13129](https://github.com/MetaMask/metamask-mobile/pull/13129): test: Reverse TCP port for edit address test (#13129)
+- [#12955](https://github.com/MetaMask/metamask-mobile/pull/12955): refactor: remove global network usage from transaction confirmations (#12955)
+- [#13075](https://github.com/MetaMask/metamask-mobile/pull/13075): chore: Add e2e tests for blockaid validations on re-designed signature request pages (#13075)
+- [#13053](https://github.com/MetaMask/metamask-mobile/pull/13053): chore: Adding e2e test cases for signature pages (#13053)
+- [#13243](https://github.com/MetaMask/metamask-mobile/pull/13243): chore: stable sync with main v7.38.1 (#13243)
+- [#13059](https://github.com/MetaMask/metamask-mobile/pull/13059): test: deprecate gestures in helpers.js file (#13059)
+- [#12740](https://github.com/MetaMask/metamask-mobile/pull/12740): chore: Convert browser tab to typescript (#12740)
+- [#13084](https://github.com/MetaMask/metamask-mobile/pull/13084): chore: Token list performance measurement (#13084)
+- [#12912](https://github.com/MetaMask/metamask-mobile/pull/12912): test: Add regression test for wallet address edit issue on confirmation screen (#12912)
+- [#13043](https://github.com/MetaMask/metamask-mobile/pull/13043): chore: chore/7.39.0-Changelog (#13043)
+- [#13244](https://github.com/MetaMask/metamask-mobile/pull/13244): chore: re-add staking actions when not on supported chain and switch to mainnet (#13244)
+- [#13110](https://github.com/MetaMask/metamask-mobile/pull/13110): chore: upgrade `@metamask/transaction-controller` (#13110)
+- [#13185](https://github.com/MetaMask/metamask-mobile/pull/13185): test: fix edit account regression test (#13185)
+- [#13082](https://github.com/MetaMask/metamask-mobile/pull/13082): chore: add fiat value to token and sort desc by fiat (#13082)
+- [#13221](https://github.com/MetaMask/metamask-mobile/pull/13221): refactor(navigation): unify dapp redirect logic to prevent premature navigation (#13221)
+- [#13157](https://github.com/MetaMask/metamask-mobile/pull/13157): chore: upgrading to  design tokens v5.0.0 (#13157)
+
+### Fixed
+- [#13126](https://github.com/MetaMask/metamask-mobile/pull/13126): fix: Fix assert e2e test for `Address advanced gas fees` test (#13126)
+- [#12926](https://github.com/MetaMask/metamask-mobile/pull/12926): fix: ensure marketing consent is explicitly tracked as boolean (#12926)
+- [#13166](https://github.com/MetaMask/metamask-mobile/pull/13166): fix: Blockaid banner momentarily visible on benign request opened after malicious one (#13166)
+- [#13208](https://github.com/MetaMask/metamask-mobile/pull/13208): fix: update token balances on pull tokenlist pull down (#13208)
+- [#13218](https://github.com/MetaMask/metamask-mobile/pull/13218): fix: fix send flow on token detail page (#13218)
+- [#13200](https://github.com/MetaMask/metamask-mobile/pull/13200): fix: fix edit network and delete network with tokenNetworkFilter (#13… (#13200)
+- [#13228](https://github.com/MetaMask/metamask-mobile/pull/13228): fix: fix balance after swap (#13228)
+- [#13199](https://github.com/MetaMask/metamask-mobile/pull/13199): fix: failure to  convert undefined value to hex object (#13199)
+- [#13141](https://github.com/MetaMask/metamask-mobile/pull/13141): fix: fix edit network and delete network with tokenNetworkFilter (#13141)
+- [#13177](https://github.com/MetaMask/metamask-mobile/pull/13177): fix: token details network name (#13162) (#13177)
+- [#12843](https://github.com/MetaMask/metamask-mobile/pull/12843): fix: improve assets perfs + fix blurred balances and prices (#12843)
+- [#13162](https://github.com/MetaMask/metamask-mobile/pull/13162): fix: token details network name (#13162)
+- [#13146](https://github.com/MetaMask/metamask-mobile/pull/13146): fix: toast msg on deleted network (#13146)
+- [#13057](https://github.com/MetaMask/metamask-mobile/pull/13057): fix: fix holesky network balance included in aggregated balance on ma… (#13057)
+- [#12907](https://github.com/MetaMask/metamask-mobile/pull/12907): fix: bugs in add network modal (#12907)
+- [#13123](https://github.com/MetaMask/metamask-mobile/pull/13123): fix: fix token list on network rpc selection (#13097) (#13123)
+- [#13097](https://github.com/MetaMask/metamask-mobile/pull/13097): fix: fix token list on network rpc selection (#13097)
+- [#13007](https://github.com/MetaMask/metamask-mobile/pull/13007): fix: tokens list to display with hideTokensWithoutBalance setting (#13007)
+- [#13219](https://github.com/MetaMask/metamask-mobile/pull/13219): fix: Prevent extra dismissModal call after network selection (#13219)
+- [#13163](https://github.com/MetaMask/metamask-mobile/pull/13163): fix: removes runAfterInteractions call from OptinMetrics (#13163)
+- [#13262](https://github.com/MetaMask/metamask-mobile/pull/13262): fix: Fix the case of undefined `networkClientId` & `chainId` (#13262)
+- [#13090](https://github.com/MetaMask/metamask-mobile/pull/13090): fix: Add fallback for undefined case when destructuring `isUpdatedAfterSecurityCheck` (#13090)
+- [#13138](https://github.com/MetaMask/metamask-mobile/pull/13138): fix: mobile crash issue during swap with low gas (#13138)
+- [#13142](https://github.com/MetaMask/metamask-mobile/pull/13142): fix: setApprovalForAll nonce too low (#13142)
+- [#13145](https://github.com/MetaMask/metamask-mobile/pull/13145): fix: User should be re-directed to old designs when signing using QR wallet (#13145)
+- [#13139](https://github.com/MetaMask/metamask-mobile/pull/13139): fix: Hide simulation section in typed sign v1 pages (#13139)
+- [#13087](https://github.com/MetaMask/metamask-mobile/pull/13087): fix: Flickering permit and decoding simulation values (#13087)
+- [#13092](https://github.com/MetaMask/metamask-mobile/pull/13092): fix: blockaid validations are not being flagged in re-designed signature request pages (#13092)
+- [#13072](https://github.com/MetaMask/metamask-mobile/pull/13072): fix: Fix `disabled` send button on sending `erc721` and `erc20` (#13072)
+- [#13232](https://github.com/MetaMask/metamask-mobile/pull/13232): fix(action): the next semver version can not be a patch version (#13232)
+- [#12909](https://github.com/MetaMask/metamask-mobile/pull/12909): fix: Change login in field.setValue to use optional operator (#12909)
+- [#13118](https://github.com/MetaMask/metamask-mobile/pull/13118): fix: app opened event (#13118)
+- [#12971](https://github.com/MetaMask/metamask-mobile/pull/12971): fix: use asset ticker else asset.symbol for Price component header text (#12971)
+- [#13158](https://github.com/MetaMask/metamask-mobile/pull/13158): fix: move migration validation out of onPersistComplete (#13158)
+- [#13066](https://github.com/MetaMask/metamask-mobile/pull/13066): fix: apply migration 66 (#13066)
+- [#13077](https://github.com/MetaMask/metamask-mobile/pull/13077): fix: only send length of available_quotes (#13077)
+- [#13119](https://github.com/MetaMask/metamask-mobile/pull/13119): fix: Fix Samsung freeze by reverting reanimated version and bump expo-dev-client (#13119)
+
+## [7.39.0]
 ### Added
 - [#13030](https://github.com/MetaMask/metamask-mobile/pull/13030): feat: ""Unlimited"" value Decoding Simulation and account and message modal UI/UX updates (#13030)
 - [#12994](https://github.com/MetaMask/metamask-mobile/pull/12994): feat: Redesign Signature Decoding Simulation (#12994)

@@ -123,7 +123,7 @@ As an external contributor, you need to provide your own Firebase project config
 export GOOGLE_SERVICES_B64_ANDROID="$(base64 -w0 -i ./android/app/google-services.json)" && echo "export GOOGLE_SERVICES_B64_ANDROID=\"$GOOGLE_SERVICES_B64_ANDROID\"" | tee -a .js.env
 
 # Generate IOS Base64 Version of Google Services
-export GOOGLE_SERVICES_B64_IOS="$(base64 -w0 -i ./ios/GoogleServices/GoogleService-Info-example.plist)" && echo "export GOOGLE_SERVICES_B64_IOS=\"$GOOGLE_SERVICES_B64_IOS\"" | tee -a .js.env
+export GOOGLE_SERVICES_B64_IOS="$(base64 -w0 -i ./ios/GoogleServices/GoogleService-Info.plist)" && echo "export GOOGLE_SERVICES_B64_IOS=\"$GOOGLE_SERVICES_B64_IOS\"" | tee -a .js.env
 ```
 
 [!CAUTION]

@@ -178,8 +178,8 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionName "7.39.0"
-        versionCode 1544
+        versionName "7.40.0"
+        versionCode 1553
         testBuildType System.getProperty('testBuildType', 'debug')
         missingDimensionStrategy 'react-native-camera', 'general'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

@@ -36,10 +36,12 @@ export function addToHistory({ url, name }) {
 /**
  * Clears the entire browser history
  */
-export function clearHistory() {
+export function clearHistory(metricsEnabled, marketingEnabled) {
   return {
     type: 'CLEAR_BROWSER_HISTORY',
     id: Date.now(),
+    metricsEnabled,
+    marketingEnabled,
   };
 }
 

@@ -1,4 +1,7 @@
+///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
 export interface MultichainSettingsState {
   bitcoinSupportEnabled: boolean;
   bitcoinTestnetSupportEnabled: boolean;
+  solanaSupportEnabled: boolean;
 }
+///: END:ONLY_INCLUDE_IF
@@ -9,7 +9,7 @@ exports[`TagBase should render TagBase 1`] = `
     {
       "alignSelf": "flex-start",
       "backgroundColor": "#ffffff",
-      "borderColor": "#bbc0c5",
+      "borderColor": "#848c96",
       "borderRadius": 999,
       "borderWidth": 0,
       "color": "#141618",

@@ -284,7 +284,7 @@ exports[`CellSelectWithMenu should render with default settings correctly 1`] =
               style={
                 {
                   "backgroundColor": "#ffffff",
-                  "borderColor": "#bbc0c5",
+                  "borderColor": "#848c96",
                   "borderRadius": 10,
                   "borderWidth": 1,
                   "height": 24,

@@ -12,7 +12,6 @@ import { ICONSIZE_BY_AVATARSIZE } from '../../Avatar.constants';
 import AvatarBase from '../../foundation/AvatarBase';
 
 // Internal dependencies.
-import { isNumber } from 'lodash';
 import { isFaviconSVG } from '../../../../../../util/favicon';
 import {
   AVATARFAVICON_IMAGE_TESTID,
@@ -28,9 +27,14 @@ const AvatarFavicon = ({
   style,
   ...props
 }: AvatarFaviconProps) => {
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const [error, setError] = useState<any>(undefined);
+  const isRequireSource = !!(imageSource && typeof imageSource === 'number');
+  const isRemoteSource = !!(
+    imageSource &&
+    typeof imageSource === 'object' &&
+    'uri' in imageSource
+  );
+  const isValidSource = isRequireSource || isRemoteSource;
+  const [error, setError] = useState<Error | undefined>(undefined);
   const [svgSource, setSvgSource] = useState<string>('');
   const { styles } = useStyles(stylesheet, { style });
 
@@ -40,9 +44,7 @@ const AvatarFavicon = ({
     [setError],
   );
 
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const onSvgError = useCallback((e: any) => setError(e), [setError]);
+  const onSvgError = useCallback((e: Error) => setError(e), [setError]);
 
   // TODO add the fallback with uppercase letter initial
   //  requires that the domain is passed in as a prop from the parent
@@ -53,30 +55,29 @@ const AvatarFavicon = ({
     />
   );
 
+  // Checks if image is SVG
   useEffect(() => {
+    if (!isRemoteSource) return;
+
     const checkSvgContentType = async (uri: string) => {
       try {
         const response = await fetch(uri, { method: 'HEAD' });
         const contentType = response.headers.get('Content-Type');
         return contentType?.includes('image/svg+xml');
-        // TODO: Replace "any" with type
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      } catch (err: any) {
+      } catch (_) {
         return false;
       }
     };
 
-    if (imageSource && !isNumber(imageSource) && 'uri' in imageSource) {
-      const svg = isFaviconSVG(imageSource);
-      if (svg) {
-        checkSvgContentType(svg).then((isSvg) => {
-          if (isSvg) {
-            setSvgSource(svg);
-          }
-        });
-      }
+    const svg = isFaviconSVG(imageSource);
+    if (svg) {
+      checkSvgContentType(svg).then((isSvg) => {
+        if (isSvg) {
+          setSvgSource(svg);
+        }
+      });
     }
-  }, [imageSource]);
+  }, [imageSource, isRemoteSource]);
 
   const renderSvg = () =>
     svgSource ? (
@@ -86,9 +87,7 @@ const AvatarFavicon = ({
         height="100%"
         uri={svgSource}
         style={styles.image}
-        // TODO: Replace "any" with type
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        onError={(e: any) => onSvgError(e)}
+        onError={(e: unknown) => onSvgError(e as Error)}
       />
     ) : null;
 
@@ -106,7 +105,7 @@ const AvatarFavicon = ({
 
   return (
     <AvatarBase size={size} style={styles.base} {...props}>
-      {error ? renderFallbackFavicon() : renderFavicon()}
+      {error || !isValidSource ? renderFallbackFavicon() : renderFavicon()}
     </AvatarBase>
   );
 };

@@ -27,7 +27,7 @@ exports[`BadgeNetwork should render BadgeNetwork 1`] = `
         "height": 32,
         "justifyContent": "center",
         "overflow": "hidden",
-        "shadowColor": "#0000001a",
+        "shadowColor": "#0000001A",
         "shadowOffset": {
           "height": 2,
           "width": 0,