Merge branch 'main' into mikesposito/deps/smart-transactions-controller

Author: mikesposito

.detoxrc.js

@@ -25,6 +25,7 @@ module.exports = {
     },
     jest: {
       setupTimeout: 220000,
+      teardownTimeout: 60000, // Increase teardown timeout from default 30s to 60s
     },
     retries: 1,
   },

.github/CODEOWNERS

@@ -83,9 +83,9 @@ app/core/Engine/controllers/accounts-controller             @MetaMask/accounts-e
 app/core/Engine/messengers/accounts-controller-messenger    @MetaMask/accounts-engineers
 app/core/SnapKeyring                                        @MetaMask/accounts-engineers
 
-# Co-owned by accounts and wallet-ux
-app/components/Views/AccountSelector                        @MetaMask/accounts-engineers @MetaMask/wallet-ux
-app/components/UI/EvmAccountSelectorList                    @MetaMask/accounts-engineers @MetaMask/wallet-ux
+# Co-owned by accounts and mobile-core-ux
+app/components/Views/AccountSelector                        @MetaMask/accounts-engineers @MetaMask/mobile-core-ux
+app/components/UI/EvmAccountSelectorList                    @MetaMask/accounts-engineers @MetaMask/mobile-core-ux
 
 # Multichain Accounts
 **/multichain-accounts/**                                   @MetaMask/accounts-engineers
@@ -186,25 +186,25 @@ app/core/Engine/messengers/defi-positions-controller-messenger @MetaMask/metamas
 app/selectors/assets @MetaMask/metamask-assets
 
 # UX Team
-app/components/Views/AccountActions @MetaMask/wallet-ux
-app/components/Views/AccountSelector @MetaMask/wallet-ux
-app/components/Views/AddressQRCode @MetaMask/wallet-ux
-app/components/Views/EditAccountName @MetaMask/wallet-ux
-app/components/Views/LockScreen @MetaMask/wallet-ux
-app/components/Views/Login @MetaMask/wallet-ux
-app/components/Views/NetworkConnect @MetaMask/wallet-ux
-app/components/Views/NetworkSelector @MetaMask/wallet-ux
-app/components/Views/OnboardingCarousel @MetaMask/wallet-ux
-app/components/Views/OnboardingSuccess @MetaMask/wallet-ux
-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
-app/reducers/privacy @MetaMask/wallet-ux
-app/reducers/settings @MetaMask/wallet-ux
+app/components/Views/AccountActions @MetaMask/mobile-core-ux
+app/components/Views/AccountSelector @MetaMask/mobile-core-ux
+app/components/Views/AddressQRCode @MetaMask/mobile-core-ux
+app/components/Views/EditAccountName @MetaMask/mobile-core-ux
+app/components/Views/LockScreen @MetaMask/mobile-core-ux
+app/components/Views/Login @MetaMask/mobile-core-ux
+app/components/Views/NetworkConnect @MetaMask/mobile-core-ux
+app/components/Views/NetworkSelector @MetaMask/mobile-core-ux
+app/components/Views/OnboardingCarousel @MetaMask/mobile-core-ux
+app/components/Views/OnboardingSuccess @MetaMask/mobile-core-ux
+app/components/Views/QRAccountDisplay @MetaMask/mobile-core-ux
+app/components/Views/QRScanner @MetaMask/mobile-core-ux
+app/components/Views/Settings @MetaMask/mobile-core-ux
+app/components/Views/TermsAndConditions @MetaMask/mobile-core-ux
+app/reducers/experimentalSettings @MetaMask/mobile-core-ux
+app/reducers/modals @MetaMask/mobile-core-ux
+app/reducers/navigation @MetaMask/mobile-core-ux
+app/reducers/privacy @MetaMask/mobile-core-ux
+app/reducers/settings @MetaMask/mobile-core-ux
 
 # Transactions Team
 app/components/Views/transactions @MetaMask/transactions
@@ -216,6 +216,9 @@ app/core/OAuthService                                       @MetaMask/web3auth
 app/components/Views/Onboarding                             @MetaMask/web3auth
 app/reducers/onboarding                                     @MetaMask/web3auth
 
+# Delegation team
+app/core/Engine/controllers/gator-permissions-controller    @MetaMask/delegation
+app/core/Engine/messengers/gator-permissions-controller-messenger      @MetaMask/delegation
 # QA Team - E2E Framework
 e2e/api-mocking/                             @MetaMask/qa
 e2e/fixtures/                                @MetaMask/qa

.github/actionlint.yaml

@@ -4,6 +4,8 @@ self-hosted-runner:
     - "gha-mmsdk-scale-set-ubuntu-22.04-amd64-xl"
     - "gha-mmsdk-scale-set-ubuntu-22.04-amd64-large"
     - "gha-mm-scale-set-ubuntu-22.04-amd64-large"
+    - "gha-mm-scale-set-ubuntu-22.04-amd64-small"
+    - "gha-mm-scale-set-ubuntu-22.04-amd64-med"
     - "macos-15"
     - "ghcr.io/cirruslabs/macos-runner:sequoia"
     - "ghcr.io/cirruslabs/macos-runner:sequoia-xl"

.github/guidelines/LABELING_GUIDELINES.md

@@ -17,7 +17,7 @@ The check can be bypassed when necessary, either by setting the changelog entry
 
 ## Optional labels (manual addition)
 
- Any label can be manually added on demand depending on the PR's content. For instance, the label **QA passed** will indicate that a thorough manual testing has been performed and the PR is ready to be merged. In addition, following labels have some specific use cases.
+Any label can be manually added on demand depending on the PR's content. For instance, the label **QA passed** will indicate that a thorough manual testing has been performed and the PR is ready to be merged. In addition, following labels have some specific use cases.
 
 ### Run iOS E2E tests