Merge branch 'main' into fix/12728_getAnalyticsParams_anon_prop

.github/scripts/get-next-semver-version.sh

@@ -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"

.nvmrc

@@ -1 +1 @@
-20.17.0
+20.18.0

.storybook/storybook.requires.js

@@ -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"),
   };
 };

CHANGELOG.md

@@ -2,6 +2,77 @@
 
 ## Current Main Branch
 
+## 7.38.0 - Jan 16, 2024
+### Added
+- [#12427](https://github.com/MetaMask/metamask-mobile/pull/12427): feat: implement remote feature flag controller (#12427)
+- [#12507](https://github.com/MetaMask/metamask-mobile/pull/12507): feat: activate portfolio view (#12507)
+- [#12540](https://github.com/MetaMask/metamask-mobile/pull/12540): feat: migrate Base network RPC from https://mainnet.base.org to base-… (#12540)
+- [#12505](https://github.com/MetaMask/metamask-mobile/pull/12505): feat: add aggregated portfolio balance cross chains (#12505)
+- [#12417](https://github.com/MetaMask/metamask-mobile/pull/12417): feat: multichain detect tokens feat (#12417)
+- [#12419](https://github.com/MetaMask/metamask-mobile/pull/12419): feat: upgrade transaction controller to get incoming transactions using accounts API (#12419)
+- [#12537](https://github.com/MetaMask/metamask-mobile/pull/12537): feat: enable ledger clear signing feature (#12537)
+- [#12622](https://github.com/MetaMask/metamask-mobile/pull/12622): feat: Hide the smart transaction status page if we return a txHash asap (#12622)
+- [#12244](https://github.com/MetaMask/metamask-mobile/pull/12244): feat(ci): Expo (#12244)
+- [#12459](https://github.com/MetaMask/metamask-mobile/pull/12459): feat: upgrade profile-sync-controller to 1.0.0 (#12459)
+- [#12294](https://github.com/MetaMask/metamask-mobile/pull/12294): feat: Add Bitcoin accounts (Flask Only) (#12294)
+- [#12243](https://github.com/MetaMask/metamask-mobile/pull/12243): feat: cicd e2e label requirements + pr automation (#12243)
+- [#12495](https://github.com/MetaMask/metamask-mobile/pull/12495): feat: Support gas fee flows in swaps (#12495)
+- [#12431](https://github.com/MetaMask/metamask-mobile/pull/12431): feat: multi chain asset list (#12431)
+
+### Changed
+- [#12623](https://github.com/MetaMask/metamask-mobile/pull/12623): chore: update bug template to include feature branches (#12623)
+- [#12538](https://github.com/MetaMask/metamask-mobile/pull/12538): chore: Chore/12435 mvp handle engine does not exist (#12538)
+- [#12617](https://github.com/MetaMask/metamask-mobile/pull/12617): docs: Update README.md with new expo instructions (#12617)
+- [#12559](https://github.com/MetaMask/metamask-mobile/pull/12559): test: move remaining modal pages and selectors to their respective folders (#12559)
+- [#12556](https://github.com/MetaMask/metamask-mobile/pull/12556): test: remove redundent tests in quarantine folder (#12556)
+- [#12558](https://github.com/MetaMask/metamask-mobile/pull/12558): test: Create e2e tag for multi chain  (#12558)
+- [#12531](https://github.com/MetaMask/metamask-mobile/pull/12531): test: Move files to Wallet folder (#12531)
+- [#12511](https://github.com/MetaMask/metamask-mobile/pull/12511): test: Move files to Onboarding folder (#12511)
+- [#12512](https://github.com/MetaMask/metamask-mobile/pull/12512): test: address regression pipeline slow down (#12512)
+- [#12513](https://github.com/MetaMask/metamask-mobile/pull/12513): ci: disable security e2e tests (#12513)
+- [#12602](https://github.com/MetaMask/metamask-mobile/pull/12602): chore: Additional e2e test to support `PortfolioView` (#12602)
+- [#12321](https://github.com/MetaMask/metamask-mobile/pull/12321): refactor: remove global network from transaction controller  (#12321)
+- [#12536](https://github.com/MetaMask/metamask-mobile/pull/12536): test: fix mock server (#12536)
+- [#12288](https://github.com/MetaMask/metamask-mobile/pull/12288): test: add e2e test for security alert api  (#12288)
+- [#12597](https://github.com/MetaMask/metamask-mobile/pull/12597): test(3615): additional e2e scenarios editing permissions and non permitted networks (#12597)
+- [#12488](https://github.com/MetaMask/metamask-mobile/pull/12488): test(3615): add new e2e test for initial dapp connection and non permitted flow (#12488)
+- [#12532](https://github.com/MetaMask/metamask-mobile/pull/12532): refactor: de-anonymize insensitive properties of swaps events (#12532)
+- [#12485](https://github.com/MetaMask/metamask-mobile/pull/12485): chore: Stop suppressing pod install failures (#12485)
+- [#12574](https://github.com/MetaMask/metamask-mobile/pull/12574): chore: Add option to skip pod install setup step (#12574)
+- [#12609](https://github.com/MetaMask/metamask-mobile/pull/12609): chore: update user storage E2E framework (#12609)
+- [#12569](https://github.com/MetaMask/metamask-mobile/pull/12569): chore: transfer ownership of auth & profile sync E2E from notifications to identity (#12569)
+- [#12534](https://github.com/MetaMask/metamask-mobile/pull/12534): chore: change ownership of profile sync from notifications to identity (#12534)
+- [#12543](https://github.com/MetaMask/metamask-mobile/pull/12543): chore: Decrease hot and cold start app to wallet view time (#12543)
+- [#12428](https://github.com/MetaMask/metamask-mobile/pull/12428): chore: Add eth hd keyring and key tree to decrease unlock time (#12428)
+- [#12555](https://github.com/MetaMask/metamask-mobile/pull/12555): chore: Update accounts packages (#12555)
+- [#12563](https://github.com/MetaMask/metamask-mobile/pull/12563): chore: cicd e2e hardening (#12563)
+- [#12554](https://github.com/MetaMask/metamask-mobile/pull/12554): chore: fail status when on no labels for retro-label changes (#12554)
+- [#12295](https://github.com/MetaMask/metamask-mobile/pull/12295): chore: use getShares contract method from stake-sdk for unstake all flow (#12295)
+- [#12551](https://github.com/MetaMask/metamask-mobile/pull/12551): chore: Bump Snaps packages (#12551)
+
+### Fixed
+- [#12650](https://github.com/MetaMask/metamask-mobile/pull/12650): fix: fix swaps button on asset overview page for multichain feature (#12650)
+- [#12659](https://github.com/MetaMask/metamask-mobile/pull/12659): fix: fix token details navigation (#12659)
+- [#12624](https://github.com/MetaMask/metamask-mobile/pull/12624): fix: add new translations (#12624)
+- [#12373](https://github.com/MetaMask/metamask-mobile/pull/12373): fix: circular dependencies engine-network-handleNetworkSwitch (#12373)
+- [#12663](https://github.com/MetaMask/metamask-mobile/pull/12663): fix: disable flaky tests on incoming-transactions.spec (#12663)
+- [#12598](https://github.com/MetaMask/metamask-mobile/pull/12598): fix: disable mock poc test (#12598)
+- [#12230](https://github.com/MetaMask/metamask-mobile/pull/12230): fix: Jest timer error in unit test (#12230)
+- [#12626](https://github.com/MetaMask/metamask-mobile/pull/12626): fix: fix flaky test (#12626)
+- [#12372](https://github.com/MetaMask/metamask-mobile/pull/12372): fix: abstract out circular dependencies between engine and networks util (#12372)
+- [#12641](https://github.com/MetaMask/metamask-mobile/pull/12641): fix: fix network selector (#12641)
+- [#12637](https://github.com/MetaMask/metamask-mobile/pull/12637): fix: fix native tokens filter when all networks is selected (#12637)
+- [#12529](https://github.com/MetaMask/metamask-mobile/pull/12529): fix: fix NFTs disappearing after killing app (#12529)
+- [#12562](https://github.com/MetaMask/metamask-mobile/pull/12562): fix: Move `AssetPollingProvider` from Root to Nav/Main/index.js (#12562)
+- [#12607](https://github.com/MetaMask/metamask-mobile/pull/12607): fix: e2e regression gas api (#12607)
+- [#12460](https://github.com/MetaMask/metamask-mobile/pull/12460): fix: add source when local PPOM fails (#12460)
+- [#12199](https://github.com/MetaMask/metamask-mobile/pull/12199): fix: 10967 User able to add Ledger account with existing account name (#12199)
+- [#12566](https://github.com/MetaMask/metamask-mobile/pull/12566): fix(12527): sdk connection with unknown url causes a bug (#12566)
+- [#12405](https://github.com/MetaMask/metamask-mobile/pull/12405): fix(431-2): active network icon has too much margin and adding optional prop (#12405)
+- [#12591](https://github.com/MetaMask/metamask-mobile/pull/12591): fix: add resolution for express to fix failing audit on path-to-regexp (#12591)
+- [#12567](https://github.com/MetaMask/metamask-mobile/pull/12567): fix: update input handling in useInputHandler to support BACK key functionality (#12567)
+- [#12630](https://github.com/MetaMask/metamask-mobile/pull/12630): fix: hide tokens without balance for multichain (#12630)
+
 ## 7.37.1 - Dec 16, 2024
 ### Fixed
 - [#12577](https://github.com/MetaMask/metamask-mobile/pull/12577): chore: bump {gas-fee,network,selected-network,notification-services,profile-sync,signature}-controller (#12577)

android/app/build.gradle

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

app/actions/multichain/state.ts

@@ -1,4 +1,7 @@
+///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
 export interface MultichainSettingsState {
   bitcoinSupportEnabled: boolean;
   bitcoinTestnetSupportEnabled: boolean;
+  solanaSupportEnabled: boolean;
 }
+///: END:ONLY_INCLUDE_IF

app/component-library/base-components/TagBase/__snapshots__/TagBase.test.tsx.snap

@@ -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",

app/component-library/components-temp/CellSelectWithMenu/__snapshots__/CellSelectWithMenu.test.tsx.snap

@@ -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,

app/component-library/components/Badges/Badge/variants/BadgeNetwork/__snapshots__/BadgeNetwork.test.tsx.snap

@@ -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,

app/component-library/components/Banners/Banner/__snapshots__/Banner.test.tsx.snap

@@ -4,7 +4,7 @@ exports[`Banner should render correctly 1`] = `
 <View
   style={
     {
-      "backgroundColor": "#d738471a",
+      "backgroundColor": "#D738471A",
       "borderColor": "#d73847",
       "borderLeftWidth": 4,
       "borderRadius": 4,
@@ -81,7 +81,7 @@ exports[`Banner should render correctly with a close button 1`] = `
 <View
   style={
     {
-      "backgroundColor": "#d738471a",
+      "backgroundColor": "#D738471A",
       "borderColor": "#d73847",
       "borderLeftWidth": 4,
       "borderRadius": 4,
@@ -236,7 +236,7 @@ exports[`Banner should render correctly with a start accessory 1`] = `
 <View
   style={
     {
-      "backgroundColor": "#d738471a",
+      "backgroundColor": "#D738471A",
       "borderColor": "#d73847",
       "borderLeftWidth": 4,
       "borderRadius": 4,
@@ -316,7 +316,7 @@ exports[`Banner should render correctly with an action button 1`] = `
 <View
   style={
     {
-      "backgroundColor": "#d738471a",
+      "backgroundColor": "#D738471A",
       "borderColor": "#d73847",
       "borderLeftWidth": 4,
       "borderRadius": 4,

app/component-library/components/Banners/Banner/variants/BannerAlert/__snapshots__/BannerAlert.test.tsx.snap

@@ -4,7 +4,7 @@ exports[`BannerAlert should render BannerAlert 1`] = `
 <View
   style={
     {
-      "backgroundColor": "#0376c91a",
+      "backgroundColor": "#0376C91A",
       "borderColor": "#0376c9",
       "borderLeftWidth": 4,
       "borderRadius": 4,

app/component-library/components/Banners/Banner/variants/BannerTip/__snapshots__/BannerTip.test.tsx.snap

@@ -5,7 +5,7 @@ exports[`BannerTip should render default settings correctly 1`] = `
   style={
     {
       "backgroundColor": "#ffffff",
-      "borderColor": "#bbc0c5",
+      "borderColor": "#848c96",
       "borderRadius": 4,
       "borderWidth": 1,
       "flexDirection": "row",

app/component-library/components/BottomSheets/BottomSheet/foundation/BottomSheetDialog/__snapshots__/BottomSheetDialog.test.tsx.snap

@@ -26,14 +26,14 @@ exports[`BottomSheetDialog should render correctly 1`] = `
       [
         {
           "backgroundColor": "#ffffff",
-          "borderColor": "#bbc0c566",
+          "borderColor": "#BBC0C566",
           "borderTopLeftRadius": 8,
           "borderTopRightRadius": 8,
           "borderWidth": 1,
           "maxHeight": 1333,
           "overflow": "hidden",
           "paddingBottom": 3,
-          "shadowColor": "#0000001a",
+          "shadowColor": "#0000001A",
           "shadowOffset": {
             "height": 2,
             "width": 0,
@@ -63,7 +63,7 @@ exports[`BottomSheetDialog should render correctly 1`] = `
       <View
         style={
           {
-            "backgroundColor": "#bbc0c566",
+            "backgroundColor": "#BBC0C566",
             "borderRadius": 2,
             "height": 4,
             "width": 40,

app/component-library/components/Cards/Card/__snapshots__/Card.test.tsx.snap

@@ -5,7 +5,7 @@ exports[`Card - Snapshot should render correctly 1`] = `
   style={
     {
       "backgroundColor": "#ffffff",
-      "borderColor": "#bbc0c5",
+      "borderColor": "#848c96",
       "borderRadius": 4,
       "borderWidth": 1,
       "padding": 16,

app/component-library/components/Cells/Cell/__snapshots__/Cell.test.tsx.snap

@@ -13,7 +13,7 @@ exports[`Cell should render CellDisplay given the type Display 1`] = `
   style={
     {
       "backgroundColor": "#ffffff",
-      "borderColor": "#bbc0c5",
+      "borderColor": "#848c96",
       "borderRadius": 4,
       "borderWidth": 1,
       "padding": 16,
@@ -234,7 +234,7 @@ exports[`Cell should render CellDisplay given the type Display 1`] = `
         style={
           {
             "backgroundColor": "#ffffff",
-            "borderColor": "#bbc0c5",
+            "borderColor": "#848c96",
             "borderRadius": 10,
             "borderWidth": 1,
             "height": 24,
@@ -543,7 +543,7 @@ exports[`Cell should render CellMultiSelect given the type MultiSelect 1`] = `
             style={
               {
                 "backgroundColor": "#ffffff",
-                "borderColor": "#bbc0c5",
+                "borderColor": "#848c96",
                 "borderRadius": 10,
                 "borderWidth": 1,
                 "height": 24,
@@ -816,7 +816,7 @@ exports[`Cell should render CellSelect given the type Select 1`] = `
             style={
               {
                 "backgroundColor": "#ffffff",
-                "borderColor": "#bbc0c5",
+                "borderColor": "#848c96",
                 "borderRadius": 10,
                 "borderWidth": 1,
                 "height": 24,

app/component-library/components/Cells/Cell/foundation/CellBase/__snapshots__/CellBase.test.tsx.snap

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

app/component-library/components/Cells/Cell/variants/CellDisplay/__snapshots__/CellDisplay.test.tsx.snap

@@ -13,7 +13,7 @@ exports[`CellDisplay should render default settings correctly 1`] = `
   style={
     {
       "backgroundColor": "#ffffff",
-      "borderColor": "#bbc0c5",
+      "borderColor": "#848c96",
       "borderRadius": 4,
       "borderWidth": 1,
       "padding": 16,
@@ -234,7 +234,7 @@ exports[`CellDisplay should render default settings correctly 1`] = `
         style={
           {
             "backgroundColor": "#ffffff",
-            "borderColor": "#bbc0c5",
+            "borderColor": "#848c96",
             "borderRadius": 10,
             "borderWidth": 1,
             "height": 24,

app/component-library/components/Cells/Cell/variants/CellMultiSelect/__snapshots__/CellMultiSelect.test.tsx.snap

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

app/component-library/components/Cells/Cell/variants/CellSelect/__snapshots__/CellSelect.test.tsx.snap

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

app/component-library/components/Form/TextField/TextField.tsx

@@ -2,7 +2,7 @@
 
 // Third party dependencies.
 import React, { useCallback, useState } from 'react';
-import { View } from 'react-native';
+import { TextInput, View } from 'react-native';
 
 // External dependencies.
 import { useStyles } from '../../../hooks';
@@ -19,19 +19,22 @@ import {
   TEXTFIELD_ENDACCESSORY_TEST_ID,
 } from './TextField.constants';
 
-const TextField: React.FC<TextFieldProps> = ({
-  style,
-  size = DEFAULT_TEXTFIELD_SIZE,
-  startAccessory,
-  endAccessory,
-  isError = false,
-  inputElement,
-  isDisabled = false,
-  autoFocus = false,
-  onBlur,
-  onFocus,
-  ...props
-}) => {
+const TextField = React.forwardRef<TextInput, TextFieldProps>((
+  {
+    style,
+    size = DEFAULT_TEXTFIELD_SIZE,
+    startAccessory,
+    endAccessory,
+    isError = false,
+    inputElement,
+    isDisabled = false,
+    autoFocus = false,
+    onBlur,
+    onFocus,
+    ...props
+  },
+  ref
+) => {
   const [isFocused, setIsFocused] = useState(autoFocus);
 
   const { styles } = useStyles(styleSheet, {
@@ -87,6 +90,7 @@ const TextField: React.FC<TextFieldProps> = ({
             onBlur={onBlurHandler}
             onFocus={onFocusHandler}
             {...props}
+            ref={ref}
             isStateStylesDisabled
           />
         )}
@@ -101,6 +105,6 @@ const TextField: React.FC<TextFieldProps> = ({
       )}
     </View>
   );
-};
+});
 
 export default TextField;

app/component-library/components/Form/TextField/__snapshots__/TextField.test.tsx.snap

@@ -6,7 +6,7 @@ exports[`TextField should render default settings correctly 1`] = `
     {
       "alignItems": "center",
       "backgroundColor": "#ffffff",
-      "borderColor": "#bbc0c5",
+      "borderColor": "#848c96",
       "borderRadius": 8,
       "borderWidth": 1,
       "flexDirection": "row",
@@ -24,7 +24,7 @@ exports[`TextField should render default settings correctly 1`] = `
       }
     }
   >
-    <Input
+    <ForwardRef
       autoFocus={false}
       isDisabled={false}
       isStateStylesDisabled={true}