Merge branch 'main' into refactor-parse-signTypedData-logic

Author: digiwand

.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/guidelines/LABELING_GUIDELINES.md

@@ -22,7 +22,8 @@ Every PR shall include one the QA labels below:
 To merge your PR one of the following QA labels are required:
 - **QA Passed**: If the PR was labeled with `needs-qa`, this label must be added once QA has signed off
 - **No QA Needed**: If the PR does not require any QA effort. This label should only be used in case you are updating a README or other files that does not impact the building or runtime of the application.
-- **Run E2E Smoke**: This label will kick-off E2E testing and trigger a check to make sure the E2E tests pass. 
+- **Run E2E Smoke**: This label will kick-off E2E testing and trigger a check to make sure the E2E tests pass.
+- **No E2E Smoke Needed**: This label will bypass the E2E smoke test gate and allow the PR to be merged.
 
 ### Optional labels:
 - **regression-main**: This label can manually be added to a bug report issue at the time of its creation if the bug is present on the development branch, i.e., `main`, but is not yet released in production.

.github/scripts/check-pr-has-required-labels.ts

@@ -58,7 +58,7 @@ async function main(): Promise<void> {
       console.log(`PR contains a team label as expected: ${label}`);
       hasTeamLabel = true;
     }
-    if (label.includes('Run Smoke E2E') || label.includes('No QA Needed') || label.includes('QA Passed')  ) {
+    if (label.includes('No QA Needed') || label.includes('QA Passed')  ) {
       console.log(`PR contains a QA label as expected: ${label}`);
       hasQALabel = true;
     }
@@ -80,7 +80,7 @@ async function main(): Promise<void> {
   }
 
   if (!hasQALabel) {
-    errorMessage += 'No \'Run E2E Smoke\' or \'No QA Needed\' or \'QA Passed\' label. ';
+    errorMessage += 'No \'No QA Needed\' or \'QA Passed\' label. ';
   }
   errorMessage += `Please make sure the PR is appropriately labeled before merging it.\n\nSee labeling guidelines for more detail: https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md`;
   core.setFailed(errorMessage);

.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

@@ -109,8 +109,13 @@ export MM_MULTICHAIN_V1_ENABLED=""
 # Permissions Settings feature flag specific to UI changes
 export MM_PERMISSIONS_SETTINGS_V1_ENABLED=""
 
-# Feature flag for Stablecoin Lending UI
+# Earn Variables
+## Stablecoin Lending
 export MM_STABLECOIN_LENDING_UI_ENABLED="true"
+export MM_STABLE_COIN_SERVICE_INTERRUPTION_BANNER_ENABLED="true"
+## Pooled-Staking
+export MM_POOLED_STAKING_ENABLED="true"
+export MM_POOLED_STAKING_SERVICE_INTERRUPTION_BANNER_ENABLED="true"
 
 # Activates remote feature flag override mode.
 # Remote feature flag values won't be updated,

.js.env.example

@@ -7,16 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Fixed
-
-- fix(swaps): set default slippage when source or destination token is not stablecoin ([#14730](https://github.com/MetaMask/metamask-mobile/pull/14730))
-
-### Changed
-
-- fix(multi-srp): display errors only after all the words are have been entered ([#14607](https://github.com/MetaMask/metamask-mobile/pull/14607))
-
 ### 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))
@@ -28,14 +24,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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))
+- feat(multi-srp): add new srp pills labels ([#14829](https://github.com/MetaMask/metamask-mobile/pull/14829))
+- feat(earn): add pooled-staking and stablecoin lending remote feature flags ([#14660](https://github.com/MetaMask/metamask-mobile/pull/14660))
+- feat: feat: AccountConnect and AccountApproval use dapp scanning ([#14514](https://github.com/MetaMask/metamask-mobile/pull/14514/))
 
 ### 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))
+- fix(confirmations): remove transaction simulations from wallet initiated send flow ([#14994](https://github.com/MetaMask/metamask-mobile/pull/14994))
 
 ### 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: update confirmation font sizes ([#14715](https://github.com/MetaMask/metamask-mobile/pull/14715))
+- 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]
 

CHANGELOG.md

@@ -23,6 +23,7 @@ To learn how to contribute to the MetaMask codebase, visit our [Contributor Docs
 - [API Call Logging for Debugging](./docs/readme/api-logging.md)
 - [Storybook](./docs/readme/storybook.md)
 - [Miscellaneous](./docs/readme/miscellaneous.md)
+- [E2E Testing Segment Events](./docs/testing/e2e/segment-events.md)
 
 ## Getting started
 

README.md

@@ -179,7 +179,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionName "7.44.0"
-        versionCode 1685
+        versionCode 1707
         testBuildType System.getProperty('testBuildType', 'debug')
         missingDimensionStrategy 'react-native-camera', 'general'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

android/app/build.gradle

@@ -36,30 +36,10 @@ const CellSelectWithMenu = ({
   children,
   withAvatar = true,
   showSecondaryTextIcon = true,
-  onTextClick,
   ...props
 }: CellSelectWithMenuProps) => {
   const { styles } = useStyles(styleSheet, { style });
 
-  const renderSecondaryText = () => (
-    <>
-      <Text
-        numberOfLines={1}
-        variant={DEFAULT_CELLBASE_AVATAR_SECONDARYTEXT_TEXTVARIANT}
-        style={styles.secondaryText}
-      >
-        {secondaryText}
-      </Text>
-      {showSecondaryTextIcon && (
-        <Icon
-          name={IconName.ArrowDown}
-          size={IconSize.Xss}
-          style={styles.arrowStyle}
-        />
-      )}
-    </>
-  );
-
   return (
     <ListItemMultiSelectButton
       isSelected={isSelected}
@@ -79,34 +59,36 @@ const CellSelectWithMenu = ({
         ) : null}
 
         <View style={styles.cellBaseInfo}>
-          {title === undefined ||
-          title === null ||
-          typeof title === 'string' ||
-          typeof title === 'number' ||
-          typeof title === 'boolean' ? (
-            <Text
-              numberOfLines={1}
-              variant={DEFAULT_CELLBASE_AVATAR_TITLE_TEXTVARIANT}
-              testID={CellComponentSelectorsIDs.BASE_TITLE}
-            >
-              {title}
-            </Text>
-          ) : (
-            title
-          )}
-          {!!secondaryText && onTextClick && (
+          <Text
+            numberOfLines={1}
+            variant={DEFAULT_CELLBASE_AVATAR_TITLE_TEXTVARIANT}
+            testID={CellComponentSelectorsIDs.BASE_TITLE}
+          >
+            {title}
+          </Text>
+          {!!secondaryText && (
             <TouchableWithoutFeedback>
               <TouchableOpacity
                 style={styles.containerRow}
-                onPress={onTextClick}
+                onPress={props.onTextClick}
               >
-                {renderSecondaryText()}
+                <Text
+                  numberOfLines={1}
+                  variant={DEFAULT_CELLBASE_AVATAR_SECONDARYTEXT_TEXTVARIANT}
+                  style={styles.secondaryText}
+                >
+                  {secondaryText}
+                </Text>
+                {showSecondaryTextIcon && (
+                  <Icon
+                    name={IconName.ArrowDown}
+                    size={IconSize.Xss}
+                    style={styles.arrowStyle}
+                  />
+                )}
               </TouchableOpacity>
             </TouchableWithoutFeedback>
           )}
-          {!!secondaryText && !onTextClick && (
-            <View>{renderSecondaryText()}</View>
-          )}
           {!!tagLabel && (
             <Tag
               testID={CellComponentSelectorsIDs.TAG_LABEL}

app/component-library/components-temp/CellSelectWithMenu/CellSelectWithMenu.tsx

@@ -221,7 +221,34 @@ exports[`CellSelectWithMenu should render with default settings correctly 1`] =
             >
               Orangefox.eth
             </Text>
-            <View>
+            <TouchableOpacity
+              accessibilityState={
+                {
+                  "busy": undefined,
+                  "checked": undefined,
+                  "disabled": undefined,
+                  "expanded": undefined,
+                  "selected": undefined,
+                }
+              }
+              accessible={true}
+              focusable={false}
+              onClick={[Function]}
+              onResponderGrant={[Function]}
+              onResponderMove={[Function]}
+              onResponderRelease={[Function]}
+              onResponderTerminate={[Function]}
+              onResponderTerminationRequest={[Function]}
+              onStartShouldSetResponder={[Function]}
+              style={
+                {
+                  "alignItems": "flex-start",
+                  "flexDirection": "row",
+                  "marginBottom": 0,
+                  "zIndex": 1,
+                }
+              }
+            >
               <Text
                 accessibilityRole="text"
                 numberOfLines={1}
@@ -252,7 +279,7 @@ exports[`CellSelectWithMenu should render with default settings correctly 1`] =
                 }
                 width={10}
               />
-            </View>
+            </TouchableOpacity>
             <View
               style={
                 {

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

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