Merge branch 'main' into feat/account_syncing_improvements

MetaMask · Nov 25, 2024 · 5d5c303 · 5d5c303
2 parents 9045802 + 0f1a8a0
commit 5d5c303
Show file tree

Hide file tree

Showing 7 changed files with 2,128 additions and 5,533 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -7,6 +7,7 @@
 app/component-library/               @MetaMask/design-system-engineers
 
 # Platform Team
+.github/CODEOWNERS                   @MetaMask/mobile-platform
 patches/                             @MetaMask/mobile-platform
 app/core/Engine/Engine.ts            @MetaMask/mobile-platform
 app/core/Engine/Engine.test.ts       @MetaMask/mobile-platform
@@ -15,49 +16,48 @@ app/core/Engine/types.ts             @MetaMask/mobile-platform
 app/core/Analytics/                  @MetaMask/mobile-platform
 app/util/metrics/                    @MetaMask/mobile-platform
 app/components/hooks/useMetrics/     @MetaMask/mobile-platform
-
-# Supply Chain Team
-bitrise.yml                          @MetaMask/supply-chain @MetaMask/mobile-platform
-yarn.lock                            @MetaMask/supply-chain @MetaMask/mobile-platform
-ios/Podfile.lock                     @MetaMask/supply-chain @MetaMask/mobile-platform
+app/store/migrations/                @MetaMask/mobile-platform
+bitrise.yml                          @MetaMask/mobile-platform
+yarn.lock                            @MetaMask/mobile-platform
+ios/Podfile.lock                     @MetaMask/mobile-platform
 
 # Ramps Team
-app/components/UI/Ramp/              @MetaMask/ramp @MetaMask/mobile-platform
-app/reducers/fiatOrders/             @MetaMask/ramp @MetaMask/mobile-platform
+app/components/UI/Ramp/              @MetaMask/ramp
+app/reducers/fiatOrders/             @MetaMask/ramp
 
 # Confirmation Team
-app/components/Views/confirmations   @MetaMask/confirmations @MetaMask/mobile-platform
-ppom                                 @MetaMask/confirmations @MetaMask/mobile-platform
+app/components/Views/confirmations   @MetaMask/confirmations
+ppom                                 @MetaMask/confirmations
 
 # All below files are maintained by the SDK team because they contain SDK related code, WalletConnect integrations, or critical SDK flows.
-app/actions/sdk   @MetaMask/sdk-devs @MetaMask/mobile-platform
-app/components/Approvals/WalletConnectApproval   @MetaMask/sdk-devs @MetaMask/mobile-platform
-app/components/Views/SDK   @MetaMask/sdk-devs @MetaMask/mobile-platform
-app/components/Views/WalletConnectSessions   @MetaMask/sdk-devs @MetaMask/mobile-platform
-app/core/BackgroundBridge/WalletConnectPort.ts   @MetaMask/sdk-devs @MetaMask/mobile-platform
-app/core/DeeplinkManager   @MetaMask/sdk-devs @MetaMask/mobile-platform
-app/core/RPCMethods/RPCMethodMiddleware.ts   @MetaMask/sdk-devs @MetaMask/mobile-platform
-app/core/SDKConnect   @MetaMask/sdk-devs @MetaMask/mobile-platform
-app/core/WalletConnect   @MetaMask/sdk-devs @MetaMask/mobile-platform
-app/reducers/sdk   @MetaMask/sdk-devs @MetaMask/mobile-platform
-app/util/walletconnect.js   @MetaMask/sdk-devs @MetaMask/mobile-platform
+app/actions/sdk   @MetaMask/sdk-devs
+app/components/Approvals/WalletConnectApproval   @MetaMask/sdk-devs
+app/components/Views/SDK   @MetaMask/sdk-devs
+app/components/Views/WalletConnectSessions   @MetaMask/sdk-devs
+app/core/BackgroundBridge/WalletConnectPort.ts   @MetaMask/sdk-devs
+app/core/DeeplinkManager   @MetaMask/sdk-devs
+app/core/RPCMethods/RPCMethodMiddleware.ts   @MetaMask/sdk-devs
+app/core/SDKConnect   @MetaMask/sdk-devs
+app/core/WalletConnect   @MetaMask/sdk-devs
+app/reducers/sdk   @MetaMask/sdk-devs
+app/util/walletconnect.js   @MetaMask/sdk-devs
 
 # Accounts Team
 app/core/Encryptor/   @MetaMask/accounts-engineers
 app/core/Engine/controllers/accounts   @MetaMask/accounts-engineers
 
 # Swaps Team
-app/components/UI/Swaps              @MetaMask/swaps-engineers @MetaMask/mobile-platform
+app/components/UI/Swaps              @MetaMask/swaps-engineers
 
 # Notifications Team
-app/components/Views/Notifications @MetaMask/notifications @MetaMask/mobile-platform
-app/components/Views/Settings/NotificationsSettings @MetaMask/notifications @MetaMask/mobile-platform
-app/components/UI/Notifications @MetaMask/notifications @MetaMask/mobile-platform
-app/reducers/notification  @MetaMask/notifications  @MetaMask/mobile-platform
-app/actions/notification @MetaMask/notifications  @MetaMask/mobile-platform
-app/selectors/notification @MetaMask/notifications  @MetaMask/mobile-platform
-app/util/notifications  @MetaMask/notifications  @MetaMask/mobile-platform
-app/store/util/notifications @MetaMask/notifications @MetaMask/mobile-platform
+app/components/Views/Notifications @MetaMask/notifications
+app/components/Views/Settings/NotificationsSettings @MetaMask/notifications
+app/components/UI/Notifications @MetaMask/notifications
+app/reducers/notification  @MetaMask/notifications 
+app/actions/notification @MetaMask/notifications 
+app/selectors/notification @MetaMask/notifications 
+app/util/notifications  @MetaMask/notifications 
+app/store/util/notifications @MetaMask/notifications
 
 # LavaMoat Team
 ses.cjs                              @MetaMask/supply-chain
@@ -115,7 +115,6 @@ app/components/Views/QRAccountDisplay @MetaMask/wallet-ux
 app/components/Views/QRScanner @MetaMask/wallet-ux
 app/components/Views/Settings @MetaMask/wallet-ux
 app/components/Views/TermsAndConditions @MetaMask/wallet-ux
-
 app/reducers/experimentalSettings @MetaMask/wallet-ux
 app/reducers/modals @MetaMask/wallet-ux
 app/reducers/navigation @MetaMask/wallet-ux

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,10 +2,14 @@
 
 ## Current Main Branch
 
-## 7.35.0 - Nov 15, 2024
+## 7.35.1 - Nov 20, 2024
+### Fixed
+- [#12331](https://github.com/MetaMask/metamask-mobile/pull/12331): fix: tags pending approvals receiving undefined (#12331)
+
+## 7.35.0 - Nov 4, 2024
 ### Added
 - [#12078](https://github.com/MetaMask/metamask-mobile/pull/12078): chore(runway): cherry-pick feat: add favorites to browser menu (#12078)
-- [#12159](https://github.com/MetaMask/metamask-mobile/pull/12159): feat: Add re-simulation feature (#12107) (#12159)
+- [#12107](https://github.com/MetaMask/metamask-mobile/pull/12107): feat: Add re-simulation feature (#12107)
 - [#11770](https://github.com/MetaMask/metamask-mobile/pull/11770): feat: enable Security Alerts API (#11770)
 - [#11812](https://github.com/MetaMask/metamask-mobile/pull/11812): feat: network value component for re-designed confirmation pages (#11812)
 - [#11608](https://github.com/MetaMask/metamask-mobile/pull/11608): feat: enable sentry performance reporting on local development builds  (#11608)

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