Merge branch 'main' into hm/refactor-snaps-ui-tests

Author: hmalik88

.github/CODEOWNERS

@@ -103,13 +103,13 @@ app/components/UI/TemplateRenderer   @MetaMask/confirmations @MetaMask/snaps-dev
 # Wallet API Platform Team
  app/core/RPCMethods/                @MetaMask/wallet-api-platform-engineers
 
-# Staking Team
-app/components/UI/Stake              @MetaMask/metamask-staking
-app/core/Engine/controllers/earn-controller @MetaMask/metamask-staking
-app/core/Engine/messengers/earn-controller-messenger @MetaMask/metamask-staking
-app/selectors/earnController         @MetaMask/metamask-staking
-**/Earn/**                           @MetaMask/metamask-staking
-**/earn/**                           @MetaMask/metamask-staking
+# Earn Team
+app/components/UI/Stake              @MetaMask/metamask-earn
+app/core/Engine/controllers/earn-controller @MetaMask/metamask-earn
+app/core/Engine/messengers/earn-controller-messenger @MetaMask/metamask-earn
+app/selectors/earnController         @MetaMask/metamask-earn
+**/Earn/**                           @MetaMask/metamask-earn
+**/earn/**                           @MetaMask/metamask-earn
 
 # Assets Team
 app/components/hooks/useIsOriginalNativeTokenSymbol @MetaMask/metamask-assets

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -2,6 +2,7 @@ name: Bug Report
 description: Using MetaMask, but it's not working as you expect?
 title: "[Bug]: "
 labels: ["type-bug"]
+type: 'Bug'
 body:
  - type: markdown
    attributes:
@@ -11,7 +12,7 @@ body:
        ## **Before Submitting:**
 
        * Please search to make sure this issue has not been opened already.
-       * If this is a question about how to integrate MetaMask with your project, please ask in our [Community forum](https://community.metamask.io/c/developer-questions/) instead. This will get your question answered more quickly and make it easier for other devs to find the answer in the future.
+       * If this is a question about how to integrate MetaMask with your project, please ask in our [Community forum](https://community.metamask.io/c/developer-discussion/) instead. This will get your question answered more quickly and make it easier for other devs to find the answer in the future.
  - type: textarea
    id: what-happened
    attributes:
@@ -55,7 +56,7 @@ body:
      description: At what stage was the bug detected?
      options:
        - In production (default)
-       - In beta
+       - In public beta
        - During release testing
        - On main branch
        - On a feature branch

.github/scripts/check-template-and-add-labels.ts

@@ -203,7 +203,7 @@ function extractRegressionStageFromBugReportIssueBody(
       return RegressionStage.DevelopmentMain;
     case 'During release testing':
       return RegressionStage.Testing;
-    case 'In beta':
+    case 'In public beta':
       return RegressionStage.Beta;
     case 'In production (default)':
       return RegressionStage.Production;

.github/workflows/changelog-check.yml

@@ -6,6 +6,11 @@ on:
 
 jobs:
   check-changelog:
+    # Asking engineers to update CHANGELOG.md increases the potential for
+    # conflicts across all pull requests.
+    # Disable this workflow until we can refine the new changelog process.
+    if: false
+
     uses: MetaMask/github-tools/.github/workflows/changelog-check.yml@91e349d177db2c569e03c7aa69d2acb404b62f75
     with:
       base-branch: ${{ github.event.pull_request.base.ref }}

.iyarc

@@ -0,0 +1,2 @@
+# Advisory exclusions
+GHSA-h9w6-f932-gq62

CHANGELOG.md

@@ -9,17 +9,43 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- feat(bridge): implement quote expiration handling in Bridge feature ([#14872](https://github.com/MetaMask/metamask-mobile/pull/14872))
+- feat(bridge): use dynamic slippage for single-chain Solana swaps ([#14805](https://github.com/MetaMask/metamask-mobile/pull/14805))
+- feat(bridge): enhance bridging with network fee estimation and UI improvements ([#14786](https://github.com/MetaMask/metamask-mobile/pull/14786))
+- feat(ramp): auto-select region ([#14780](https://github.com/MetaMask/metamask-mobile/pull/14780))
+- feat(bridge): add solana chain support and improve bridge state management ([#14713](https://github.com/MetaMask/metamask-mobile/pull/14713))
+- feat(bridge): add error handling and input management for bridge quotes ([#14693](https://github.com/MetaMask/metamask-mobile/pull/14693))
 - feat(multi-srp): enable multi-srp in main and beta ([#14558](https://github.com/MetaMask/metamask-mobile/pull/14558))
 - feat(ramp): Update ramp data flow to fetch cryptos before payment methods ([#14437](https://github.com/MetaMask/metamask-mobile/pull/14437))
 - feat(bridge): add destination account picker ([#14656](https://github.com/MetaMask/metamask-mobile/pull/14656))
 - feat(bridge): add Solana assets to bridge token pickers ([#14365](https://github.com/MetaMask/metamask-mobile/pull/14365))
 - feat: add AppMetadataController controller ([#14513](https://github.com/MetaMask/metamask-mobile/pull/14513))
 - feat(bridge): implement bridge quote fetching ([#14413](https://github.com/MetaMask/metamask-mobile/pull/14413))
-
+- feat(multi-srp): add e2e tests ([#14583](https://github.com/MetaMask/metamask-mobile/pull/14583))
+- feat(bridge): fetch token metadata for Bridge token pickers if not already available ([#14699](https://github.com/MetaMask/metamask-mobile/pull/14699))
+- feat(bridge): use `BridgeStatusController` for EVM and Solana Bridge transaction submission ([#14708](https://github.com/MetaMask/metamask-mobile/pull/14708))
+- feat(multi-srp): add discover accounts to MultichainWalletSnapClient ([#14727](https://github.com/MetaMask/metamask-mobile/pull/14727))
+- feat: real time dapp scanning BrowserTab ([#14515](https://github.com/MetaMask/metamask-mobile/pull/14515))
 
 ### Changed
 
 - feat(bridge): Handle Solana vs EVM swap and bridge routing ([#14614](https://github.com/MetaMask/metamask-mobile/pull/14614))
+- fix(multi-srp): allow a user to select srp when creating a multichain account ([#14644](https://github.com/MetaMask/metamask-mobile/pull/14644))
+- fix(multi-srp): display errors only after all the words are have been entered ([#14607](https://github.com/MetaMask/metamask-mobile/pull/14607))
+- feat: update address truncation format from 4 to 5 characters to match extension ([#14744](https://github.com/MetaMask/metamask-mobile/pull/14744))
+- fix(multi-srp): display errors only after all the words are have been entered ([#14607](https://github.com/MetaMask/metamask-mobile/pull/14607))
+- fix(wallet-ux): increased touchable area for account picker so it is easier to select ([#14762](https://github.com/MetaMask/metamask-mobile/pull/14762))
+- fix(multi-srp): display alternative text color when in dark mode([#14718](https://github.com/MetaMask/metamask-mobile/pull/14718))
+
+### Fixed
+
+- fix(bridge): keyboard not appearing when error banner is displayed ([#14862](https://github.com/MetaMask/metamask-mobile/pull/14862))
+- fix(bridge): fix not switching networks when selecting source token ([#14712](https://github.com/MetaMask/metamask-mobile/pull/14712))
+- fix: updates a padding style specifically for Android devices ([#14725](https://github.com/MetaMask/metamask-mobile/pull/14725))
+- fix(bridge): enhance UI/UX with improved input handling and layout adjustments ([#14781](https://github.com/MetaMask/metamask-mobile/pull/14781))
+- fix(swaps): set default slippage when source or destination token is not stablecoin ([#14730](https://github.com/MetaMask/metamask-mobile/pull/14730))
+- fix(bridge): fix transaction history for EVM and Solana bridge transactions ([#14759](https://github.com/MetaMask/metamask-mobile/pull/14759))
+- fix(bridge): change networks properly when user switches between source and destination tokens ([#14812](https://github.com/MetaMask/metamask-mobile/pull/14812))
 
 ## [7.44.0]
 
@@ -93,11 +119,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - fix: inherit icon size from text component parent ([#14024](https://github.com/MetaMask/metamask-mobile/pull/14024))
 - fix: animation added for loading state on SnapUILink button ([#13973](https://github.com/MetaMask/metamask-mobile/pull/13973))
 - fix: Revert "chore: upgrade Xcode 16 on bitrise.yml" ([#14012](https://github.com/MetaMask/metamask-mobile/pull/14012))
-
-### Fixed
-
 - fix(bridge): hide staked native assets from token selectors ([#14457](https://github.com/MetaMask/metamask-mobile/pull/14457))
 
+
 ## [7.43.0]
 
 ### Added

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

@@ -52,7 +52,7 @@ exports[`Component ContractBoxBase should render correctly 1`] = `
       <Text
         variant="sBodyMD"
       >
-        0x2990...a21a
+        0x29900...da21a
       </Text>
     </Component>
   </View>

app/component-library/components/Pickers/PickerAccount/PickerAccount.tsx

@@ -61,7 +61,10 @@ const PickerAccount: React.ForwardRefRenderFunction<
   );
 
   return (
-    <View style={styles.pickerAccountContainer}>
+    <TouchableOpacity
+      style={styles.pickerAccountContainer}
+      onPress={props.onPress}
+    >
       <PickerBase
         iconSize={IconSize.Xs}
         style={styles.base}
@@ -79,7 +82,7 @@ const PickerAccount: React.ForwardRefRenderFunction<
           {shortenedAddress}
         </Text>
       )}
-    </View>
+    </TouchableOpacity>
   );
 };
 

app/component-library/components/Pickers/PickerAccount/__snapshots__/PickerAccount.test.tsx.snap

@@ -1,7 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`PickerAccount should render correctly 1`] = `
-<View
+<TouchableOpacity
+  onPress={[Function]}
   style={
     {
       "alignItems": "center",
@@ -236,7 +237,7 @@ exports[`PickerAccount should render correctly 1`] = `
       }
     }
   >
-    0x2990...a21a
+    0x29900...da21a
   </Text>
-</View>
+</TouchableOpacity>
 `;

app/components/Approvals/PermissionApproval/PermissionApproval.test.tsx

@@ -147,6 +147,13 @@ describe('PermissionApproval', () => {
               2: 'testAccount2',
               3: 'testAccount3',
             },
+            accountsByChainId: {
+              '0x1': {
+                1: 'testAccount',
+                2: 'testAccount2',
+                3: 'testAccount3',
+              },
+            },
           },
         },
       },