Merge branch 'main' into fix/9345-bitrise-cache-failure

MetaMask · May 10, 2024 · 5eef9c3 · 5eef9c3
2 parents 034cee7 + 78dd5f1
commit 5eef9c3
Show file tree

Hide file tree

Showing 74 changed files with 1,914 additions and 1,323 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,81 @@
 
 ## Current Main Branch
 
+## 7.22.0 - Apr 25, 2024
+### Added
+- [#9329](https://github.com/MetaMask/metamask-mobile/pull/9329): feat: Added log to capture failing exception for getItem (#9329)
+- [#9271](https://github.com/MetaMask/metamask-mobile/pull/9271): feat: update phishing controller v8.0.0 (#9271)
+- [#9254](https://github.com/MetaMask/metamask-mobile/pull/9254): feat: Update Gas fee controller v10 (#9254)
+- [#9183](https://github.com/MetaMask/metamask-mobile/pull/9183): feat: gas fee controller update v^7 (#9183)
+- [#9241](https://github.com/MetaMask/metamask-mobile/pull/9241): feat: Update network controller to v^15 (#9241)
+- [#9149](https://github.com/MetaMask/metamask-mobile/pull/9149): feat: Update controller utils to 5.0.2 (#9149)
+- [#9182](https://github.com/MetaMask/metamask-mobile/pull/9182): feat: Update assets controllers v14 (#9182)
+- [#9406](https://github.com/MetaMask/metamask-mobile/pull/9406): feat: notifications feature flag (#9406)
+- [#9263](https://github.com/MetaMask/metamask-mobile/pull/9263): feat: add notifications onboarding wizard (#9263)
+- [#9258](https://github.com/MetaMask/metamask-mobile/pull/9258): feat: notifications settings UI (#9258)
+- [#9240](https://github.com/MetaMask/metamask-mobile/pull/9240): feat: notifications types (#9240)
+- [#9238](https://github.com/MetaMask/metamask-mobile/pull/9238): feat: add new notifications badge (#9238)
+- [#9257](https://github.com/MetaMask/metamask-mobile/pull/9257): feat: add all translations necessary to notifications feature (#9257)
+- [#9208](https://github.com/MetaMask/metamask-mobile/pull/9208): feat: enable basic functionality on onboarding & settings (#9208)
+- [#8565](https://github.com/MetaMask/metamask-mobile/pull/8565): feat: Improve localization workflow such that it allows for branch/PR focused translation (#8565)
+- [#9225](https://github.com/MetaMask/metamask-mobile/pull/9225): feat: Update the privacy policy url (#9225)
+- [#9227](https://github.com/MetaMask/metamask-mobile/pull/9227): feat: Update the Palm logo with a new one (#9227)
+- [#9153](https://github.com/MetaMask/metamask-mobile/pull/9153): feat(ramp): add deeplink handler (#9153)
+- [#9361](https://github.com/MetaMask/metamask-mobile/pull/9361): feat: translations for fiat testnet toggle (#9361)
+- [#9236](https://github.com/MetaMask/metamask-mobile/pull/9236): feat: improve the URL validation and error handling in 'parseDeeplink' Method (#9236)
+- [#9030](https://github.com/MetaMask/metamask-mobile/pull/9030): feat: Extend blockaid validations to base network (#9030)
+
+### Changed
+- [#9393](https://github.com/MetaMask/metamask-mobile/pull/9393): test: Fix failing regression test basic fun feat (#9393)
+- [#9386](https://github.com/MetaMask/metamask-mobile/pull/9386): chore: Revert #9263 feat: add notifications onboarding wizard (#9386)
+- [#8909](https://github.com/MetaMask/metamask-mobile/pull/8909): test: 1453 refactor modal pages batch 3 (#8909)
+- [#8856](https://github.com/MetaMask/metamask-mobile/pull/8856): test: E2E networks Flow (#8856)
+- [#9175](https://github.com/MetaMask/metamask-mobile/pull/9175): test: Upgrading test cases (#9175)
+- [#8896](https://github.com/MetaMask/metamask-mobile/pull/8896): test: 8735 research appium upgrading app version (#8896)
+- [#9285](https://github.com/MetaMask/metamask-mobile/pull/9285): chore: New Crowdin translations by Github Action (#9285)
+- [#9317](https://github.com/MetaMask/metamask-mobile/pull/9317): chore: smart tx small constants (#9317)
+- [#9320](https://github.com/MetaMask/metamask-mobile/pull/9320): chore: add strings to en.json for smart transactions (#9320)
+- [#9171](https://github.com/MetaMask/metamask-mobile/pull/9171): chore(deps): remove useless @ethereumjs/common direct dependency (#9171)
+- [#9192](https://github.com/MetaMask/metamask-mobile/pull/9192): chore: update readme (#9192)
+- [#9304](https://github.com/MetaMask/metamask-mobile/pull/9304): chore(ramp): upgrade sdk to 1.27.1 (#9304)
+- [#9342](https://github.com/MetaMask/metamask-mobile/pull/9342): chore: Update ppom package (#9342)
+- [#9336](https://github.com/MetaMask/metamask-mobile/pull/9336): chore: revert iterations (#9336)
+- [#9332](https://github.com/MetaMask/metamask-mobile/pull/9332): test: fix minor details in `Encryptor` unit test (#9332)
+- [#9093](https://github.com/MetaMask/metamask-mobile/pull/9093): refactor: migrate Encryptor to TypeScript and increase PBKDF2 iterations number (#9093)
+
+### Fixed
+- [#9302](https://github.com/MetaMask/metamask-mobile/pull/9302): fix: e2e test permission problem (#9302)
+- [#9395](https://github.com/MetaMask/metamask-mobile/pull/9395): fix(translations): Fix hard coded repo name left from testing in diff repo (#9395)
+- [#9337](https://github.com/MetaMask/metamask-mobile/pull/9337): fix: show banner alert if account balance is insufficient (#9337)
+- [#9360](https://github.com/MetaMask/metamask-mobile/pull/9360): fix: remove unusable import variables (#9360)
+- [#9292](https://github.com/MetaMask/metamask-mobile/pull/9292): fix: Network Configurations state is undefined (#9292)
+- [#9307](https://github.com/MetaMask/metamask-mobile/pull/9307): fix: Refactor/9083 logger class (#9307)
+- [#9247](https://github.com/MetaMask/metamask-mobile/pull/9247): fix: Update siwe parse to v2.1.0 (#9247)
+- [#9228](https://github.com/MetaMask/metamask-mobile/pull/9228): fix: Update pods from notifications changes (#9228)
+- [#9229](https://github.com/MetaMask/metamask-mobile/pull/9229): fix: Resolve missed controller-util yarn lock versions (#9229)
+- [#9134](https://github.com/MetaMask/metamask-mobile/pull/9134): fix: Revert controller utils update (#9134)
+- [#9216](https://github.com/MetaMask/metamask-mobile/pull/9216): fix: correct `SubjectType` for origins connecting via the `BackgroundBridge` (#9216)
+- [#9362](https://github.com/MetaMask/metamask-mobile/pull/9362): fix(translations): Crowdin does not allow slashes (#9362)
+- [#9326](https://github.com/MetaMask/metamask-mobile/pull/9326): fix(translations): Fix upload translations (#9326)
+- [#9173](https://github.com/MetaMask/metamask-mobile/pull/9173): fix(8667): trigger swap tx on approval tx confirmed (#9173)
+- [#9243](https://github.com/MetaMask/metamask-mobile/pull/9243): fix: add missing isPortfolioUrl import and update portfolio url name (#9243)
+- [#9384](https://github.com/MetaMask/metamask-mobile/pull/9384): fix(deps): Move @metamask/react-native-animated-fox from git to npm (#9384)
+- [#9278](https://github.com/MetaMask/metamask-mobile/pull/9278): fix(deps): axios@1.6.0->^1.6.8 (#9278)
+- [#9277](https://github.com/MetaMask/metamask-mobile/pull/9277): fix(deps): remove unused eth-json-rpc-infura (#9277)
+- [#9327](https://github.com/MetaMask/metamask-mobile/pull/9327): fix(deps): move @metamask/react-native-splash-screen from github.com to registry (#9327)
+- [#9338](https://github.com/MetaMask/metamask-mobile/pull/9338): fix: pin web3-provider-engine@^16.0.8 in resolutions (#9338)
+- [#9273](https://github.com/MetaMask/metamask-mobile/pull/9273): fix(deps): eth-rpc-errors@^4.0.3 -> @metamask/rpc-errors@^6.2.1 (#9273)
+- [#9253](https://github.com/MetaMask/metamask-mobile/pull/9253): fix(deps): replace eth-json-rpc-errors with eth-rpc-errors (#9253)
+- [#9224](https://github.com/MetaMask/metamask-mobile/pull/9224): fix: add migration for linea goerli (#9224)
+- [#9215](https://github.com/MetaMask/metamask-mobile/pull/9215): fix: Send ppom metrics when transaction is cancelled. (#9215)
+- [#9343](https://github.com/MetaMask/metamask-mobile/pull/9343): fix: Fix intermittent install failures (#9343)
+- [#9142](https://github.com/MetaMask/metamask-mobile/pull/9142): fix(labeling guidelines): Add definition of regression-develop label (#9142)
+- [#9214](https://github.com/MetaMask/metamask-mobile/pull/9214): fix: Fix image import related type errors (#9214)
+- [#9092](https://github.com/MetaMask/metamask-mobile/pull/9092): fix: check HD keyring (#9092)
+- [#9309](https://github.com/MetaMask/metamask-mobile/pull/9309): fix: error when re-using exising id on permissionController (#9309)
+- [#9284](https://github.com/MetaMask/metamask-mobile/pull/9284): fix: invalid url on inapp-browser (#9284)
+- [#9283](https://github.com/MetaMask/metamask-mobile/pull/9283): fix: missing walletConnect prop (#9283)
+
 ## 7.21.0 - Apr 25, 2024
 ### Added
 - [#9222](https://github.com/MetaMask/metamask-mobile/pull/9222): feat:  Cherry pick controller utils v5 (#9222)

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -181,8 +181,8 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1317
-        versionName "7.21.0"
+        versionCode 1325
+        versionName "7.22.0"
         testBuildType System.getProperty('testBuildType', 'debug')
         missingDimensionStrategy 'react-native-camera', 'general'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/...omponents/Avatars/Avatar/variants/AvatarAccount/__snapshots__/AvatarAccount.test.tsx.snap b/...omponents/Avatars/Avatar/variants/AvatarAccount/__snapshots__/AvatarAccount.test.tsx.snap
@@ -48,9 +48,21 @@ exports[`AvatarAccount should render correctly 1`] = `
       }
       width={32}
     >
-      <RNSVGGroup>
+      <RNSVGGroup
+        fill={
+          {
+            "payload": 4278190080,
+            "type": 0,
+          }
+        }
+      >
         <RNSVGRect
-          fill={4278401629}
+          fill={
+            {
+              "payload": 4278401629,
+              "type": 0,
+            }
+          }
           height={32}
           matrix={
             [
@@ -72,7 +84,12 @@ exports[`AvatarAccount should render correctly 1`] = `
           y={0}
         />
         <RNSVGRect
-          fill={4293653248}
+          fill={
+            {
+              "payload": 4293653248,
+              "type": 0,
+            }
+          }
           height={32}
           matrix={
             [
@@ -94,7 +111,12 @@ exports[`AvatarAccount should render correctly 1`] = `
           y={0}
         />
         <RNSVGRect
-          fill={4291236897}
+          fill={
+            {
+              "payload": 4291236897,
+              "type": 0,
+            }
+          }
           height={32}
           matrix={
             [

diff --git a/app/component-library/components/Cells/Cell/__snapshots__/Cell.test.tsx.snap b/app/component-library/components/Cells/Cell/__snapshots__/Cell.test.tsx.snap
@@ -80,9 +80,21 @@ exports[`Cell should render CellDisplay given the type Display 1`] = `
           }
           width={32}
         >
-          <RNSVGGroup>
+          <RNSVGGroup
+            fill={
+              {
+                "payload": 4278190080,
+                "type": 0,
+              }
+            }
+          >
             <RNSVGRect
-              fill={4294034178}
+              fill={
+                {
+                  "payload": 4294034178,
+                  "type": 0,
+                }
+              }
               height={32}
               matrix={
                 [
@@ -104,7 +116,12 @@ exports[`Cell should render CellDisplay given the type Display 1`] = `
               y={0}
             />
             <RNSVGRect
-              fill={4294711613}
+              fill={
+                {
+                  "payload": 4294711613,
+                  "type": 0,
+                }
+              }
               height={32}
               matrix={
                 [
@@ -126,7 +143,12 @@ exports[`Cell should render CellDisplay given the type Display 1`] = `
               y={0}
             />
             <RNSVGRect
-              fill={4294745088}
+              fill={
+                {
+                  "payload": 4294745088,
+                  "type": 0,
+                }
+              }
               height={32}
               matrix={
                 [
@@ -362,9 +384,21 @@ exports[`Cell should render CellMultiSelect given the type MultiSelect 1`] = `
             }
             width={32}
           >
-            <RNSVGGroup>
+            <RNSVGGroup
+              fill={
+                {
+                  "payload": 4278190080,
+                  "type": 0,
+                }
+              }
+            >
               <RNSVGRect
-                fill={4294034178}
+                fill={
+                  {
+                    "payload": 4294034178,
+                    "type": 0,
+                  }
+                }
                 height={32}
                 matrix={
                   [
@@ -386,7 +420,12 @@ exports[`Cell should render CellMultiSelect given the type MultiSelect 1`] = `
                 y={0}
               />
               <RNSVGRect
-                fill={4294711613}
+                fill={
+                  {
+                    "payload": 4294711613,
+                    "type": 0,
+                  }
+                }
                 height={32}
                 matrix={
                   [
@@ -408,7 +447,12 @@ exports[`Cell should render CellMultiSelect given the type MultiSelect 1`] = `
                 y={0}
               />
               <RNSVGRect
-                fill={4294745088}
+                fill={
+                  {
+                    "payload": 4294745088,
+                    "type": 0,
+                  }
+                }
                 height={32}
                 matrix={
                   [
@@ -607,9 +651,21 @@ exports[`Cell should render CellSelect given the type Select 1`] = `
             }
             width={32}
           >
-            <RNSVGGroup>
+            <RNSVGGroup
+              fill={
+                {
+                  "payload": 4278190080,
+                  "type": 0,
+                }
+              }
+            >
               <RNSVGRect
-                fill={4294034178}
+                fill={
+                  {
+                    "payload": 4294034178,
+                    "type": 0,
+                  }
+                }
                 height={32}
                 matrix={
                   [
@@ -631,7 +687,12 @@ exports[`Cell should render CellSelect given the type Select 1`] = `
                 y={0}
               />
               <RNSVGRect
-                fill={4294711613}
+                fill={
+                  {
+                    "payload": 4294711613,
+                    "type": 0,
+                  }
+                }
                 height={32}
                 matrix={
                   [
@@ -653,7 +714,12 @@ exports[`Cell should render CellSelect given the type Select 1`] = `
                 y={0}
               />
               <RNSVGRect
-                fill={4294745088}
+                fill={
+                  {
+                    "payload": 4294745088,
+                    "type": 0,
+                  }
+                }
                 height={32}
                 matrix={
                   [

diff --git a/...nt-library/components/Cells/Cell/foundation/CellBase/__snapshots__/CellBase.test.tsx.snap b/...nt-library/components/Cells/Cell/foundation/CellBase/__snapshots__/CellBase.test.tsx.snap
@@ -57,9 +57,21 @@ exports[`CellBase should render default settings correctly 1`] = `
         }
         width={32}
       >
-        <RNSVGGroup>
+        <RNSVGGroup
+          fill={
+            {
+              "payload": 4278190080,
+              "type": 0,
+            }
+          }
+        >
           <RNSVGRect
-            fill={4294034178}
+            fill={
+              {
+                "payload": 4294034178,
+                "type": 0,
+              }
+            }
             height={32}
             matrix={
               [
@@ -81,7 +93,12 @@ exports[`CellBase should render default settings correctly 1`] = `
             y={0}
           />
           <RNSVGRect
-            fill={4294711613}
+            fill={
+              {
+                "payload": 4294711613,
+                "type": 0,
+              }
+            }
             height={32}
             matrix={
               [
@@ -103,7 +120,12 @@ exports[`CellBase should render default settings correctly 1`] = `
             y={0}
           />
           <RNSVGRect
-            fill={4294745088}
+            fill={
+              {
+                "payload": 4294745088,
+                "type": 0,
+              }
+            }
             height={32}
             matrix={
               [