temp+fix: cp-7.53.0 Properly stop Snaps when clearing state (#17810)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Properly stop Snaps when clearing state. Patching in a fix from
MetaMask/snaps#3552 because mobile is a few
versions behind on `snaps-controllers`.

Author: runway-github[bot]

.detoxrc.js

@@ -31,7 +31,7 @@ module.exports = {
   configurations: {
     'ios.sim.apiSpecs': {
       device: 'ios.simulator',
-      app: process.env.CI ? `ios.${process.env.METAMASK_BUILD_TYPE}.release` : 'ios.debug',
+      app: process.env.CI ? 'ios.qa' :'ios.debug',
       testRunner: {
         args: {
           "$0": "node e2e/api-specs/run-api-spec-tests.js",
@@ -42,14 +42,19 @@ module.exports = {
       device: 'ios.simulator',
       app: 'ios.debug',
     },
-    'ios.sim.main.release': {
+    'ios.sim.release': {
       device: 'ios.simulator',
-      app: 'ios.main.release',
+      app: 'ios.release',
     },
-    'ios.sim.flask.release': {
+    'ios.sim.qa': {
       device: 'ios.simulator',
-      app: 'ios.flask.release',
+      app: 'ios.qa',
     },
+    'ios.sim.flask': {
+      device: 'ios.simulator',
+      app: 'ios.flask',
+    },
+
     'android.emu.debug': {
       device: 'android.emulator',
       app: 'android.debug',
@@ -58,9 +63,9 @@ module.exports = {
       device: 'android.bitrise.emulator',
       app: 'android.release',
     },
-    'android.emu.flask.release': {
+    'android.emu.release.qa': {
       device: 'android.bitrise.emulator',
-      app: 'android.flask.release',
+      app: 'android.qa',
     },
   },
   devices: {
@@ -92,35 +97,30 @@ module.exports = {
       type: 'ios.app',
       binaryPath:
         process.env.PREBUILT_IOS_APP_PATH || 'ios/build/Build/Products/Debug-iphonesimulator/MetaMask.app',
-      build: 'export CONFIGURATION="Debug" && yarn build:ios:main:e2e',
+      build: 'yarn start:ios:e2e',
     },
-    'ios.main.release': {
+    'ios.qa': {
       type: 'ios.app',
       binaryPath:
-        'ios/build/Build/Products/Release-iphonesimulator/MetaMask.app',
-      build: `yarn build:ios:main:e2e`,
+        'ios/build/Build/Products/Release-iphonesimulator/MetaMask-QA.app',
+      build: `METAMASK_BUILD_TYPE='${process.env.METAMASK_BUILD_TYPE || 'main'}' METAMASK_ENVIRONMENT='qa' yarn build:ios:qa`,
     },
-    'ios.flask.release': {
+    'ios.flask': {
       type: 'ios.app',
       binaryPath:
-        'ios/build/Build/Products/Release-iphonesimulator/MetaMask-Flask.app',
-      build: `yarn build:ios:flask:e2e`,
+        process.env.PREBUILT_IOS_FLASK_APP_PATH || 'ios/build/Build/Products/Debug-iphonesimulator/MetaMask-Flask.app',
+      build: 'yarn start:ios:e2e:flask',
     },
     'android.debug': {
       type: 'android.apk',
       binaryPath: process.env.PREBUILT_ANDROID_APK_PATH || 'android/app/build/outputs/apk/prod/debug/app-prod-debug.apk',
       testBinaryPath: process.env.PREBUILT_ANDROID_TEST_APK_PATH,
       build: 'yarn start:android:e2e',
     },
-    'android.release': {
+    'android.qa': {
       type: 'android.apk',
-      binaryPath: 'android/app/build/outputs/apk/prod/release/app-prod-release.apk',
-      build: `yarn build:android:main:e2e`,
-    },
-    'android.flask.release': {
-      type: 'android.apk',
-      binaryPath: 'android/app/build/outputs/apk/flask/release/app-flask-release.apk',
-      build: `yarn build:android:flask:e2e`,
-    },
+      binaryPath: 'android/app/build/outputs/apk/qa/release/app-qa-release.apk',
+      build: `METAMASK_BUILD_TYPE='${process.env.METAMASK_BUILD_TYPE || 'main'}' METAMASK_ENVIRONMENT='qa' yarn build:android:qa`,
+    }
   },
 };

.github/pull-request-template.md

@@ -33,13 +33,9 @@ Fixes:
 
 ## **Manual testing steps**
 
-```gherkin
-Feature: my feature name
-  Scenario: user [verb for user action]
-    Given [describe expected initial app state] 
-    When user [verb for user action]
-    Then [describe expected outcome]
-```
+1. Go to this page...
+2.
+3.
 
 ## **Screenshots/Recordings**
 

.github/workflows/ci.yml

@@ -100,7 +100,7 @@ jobs:
         with:
           node-version-file: '.nvmrc'
           cache: yarn
-      - run: yarn setup --node
+      - run: yarn setup
       # The "10" in this command is the total number of shards. It must be kept
       # in sync with the length of matrix.shard
       - run: yarn test:unit --shard=${{ matrix.shard }}/10 --forceExit --silent --coverageReporters=json
@@ -133,7 +133,7 @@ jobs:
         with:
           node-version-file: '.nvmrc'
           cache: yarn
-      - run: yarn setup --node
+      - run: yarn setup
       - uses: actions/download-artifact@v4
         with:
           path: tests/coverage/
@@ -167,7 +167,7 @@ jobs:
           node-version-file: '.nvmrc'
           cache: yarn
       - name: Install dependencies
-        run: yarn setup --no-build-android
+        run: yarn setup
 
       - name: Generate iOS bundle
         run: yarn gen-bundle:ios
@@ -216,11 +216,9 @@ jobs:
           path: coverage/
       - name: Upload coverage reports to Codecov
         if: ${{ always() }}
-        continue-on-error: true
         uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70
       - name: SonarCloud Scan
-        if: ${{ env.HAVE_SONAR_TOKEN == 'true' && github.event_name == 'pull_request' }}
-        continue-on-error: true
+        if: ${{ env.HAVE_SONAR_TOKEN == 'true' }}
         # This is SonarSource/[email protected]
         uses: SonarSource/sonarcloud-github-action@4b4d7634dab97dcee0b75763a54a6dc92a9e6bc1
         env:
@@ -255,7 +253,7 @@ jobs:
           ISSUE_NUMBER: ${{ github.event.issue.number || github.event.pull_request.number }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          # Skip step if event is not a PR
+          # Skip step if event is a PR
           if [[ "${{ github.event_name }}" != "pull_request" ]]; then
             echo "This job only runs for pull requests."
             exit 0

.github/workflows/update-latest-build-version.yml

@@ -7,39 +7,45 @@
 ##############################################################################################
 name: Update Latest Build Version
 
+
 on:
   workflow_dispatch:
     inputs:
       base-branch:
         description: 'The base branch, tag, or SHA for git operations and the pull request.'
         required: true
 jobs:
-  generate-build-version:
-    uses: MetaMask/metamask-mobile-build-version/.github/workflows/[email protected]
-    permissions:
-      id-token: write
-
-  bump-version:
-    runs-on: ubuntu-latest
-    needs: generate-build-version
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          ref: ${{ inputs.base-branch }}
-          token: ${{ secrets.PR_TOKEN }}
+    generate-build-version:
+      uses: MetaMask/metamask-mobile-build-version/.github/workflows/[email protected]
+      permissions:
+        id-token: write
 
-      - name: Bump script
-        env:
-          HEAD_REF: ${{ inputs.base-branch }}
-        run: |
-          ./scripts/set-build-version.sh ${{ needs.generate-build-version.outputs.build-version }}
-          git diff
-          git config user.name metamaskbot
-          git config user.email [email protected]
-          git add bitrise.yml
-          git add package.json
-          git add ios/MetaMask.xcodeproj/project.pbxproj
-          git add android/app/build.gradle
-          git commit -m "Bump version number to ${{ needs.generate-build-version.outputs.build-version }}"
-          git push origin HEAD:"$HEAD_REF" --force-with-lease
+    bump-version:
+        runs-on: ubuntu-latest
+        needs: generate-build-version
+        permissions:
+          contents: write
+          id-token: write
+        steps:
+        - uses: actions/checkout@v3
+          with:
+            fetch-depth: 0
+            ref: ${{ inputs.base-branch }}
+            token: ${{ secrets.PR_TOKEN }}
+            
+        - name: Bump script
+          env:
+            HEAD_REF: ${{ inputs.base-branch }}
+          run: |
+            ./scripts/set-build-version.sh ${{ needs.generate-build-version.outputs.build-version }}
+            git diff
+            git config user.name metamaskbot
+            git config user.email [email protected]
+            git add bitrise.yml
+            git add package.json
+            git add ios/MetaMask.xcodeproj/project.pbxproj
+            git add android/app/build.gradle
+            git commit -m "Bump version number to ${{ needs.generate-build-version.outputs.build-version }}"
+            git push origin HEAD:"$HEAD_REF" --force
+            
+  

ReactotronConfig.js

@@ -171,7 +171,7 @@ def reactNativeArchitectures() {
 * Adding function that will retuen the Bitrise ndkPath if it is a QA or Production Build
 */
 def ndkPath() {
-    return System.getenv('METAMASK_BUILD_TYPE') == 'qa' || System.getenv('METAMASK_ENVIRONMENT') == 'qa' || System.getenv('METAMASK_ENVIRONMENT') == 'production' ? rootProject.ext.bitriseNdkPath : ""
+    return System.getenv('METAMASK_ENVIRONMENT') == 'qa' || System.getenv('METAMASK_ENVIRONMENT') == 'production' ? rootProject.ext.bitriseNdkPath : ""
 }
 
 
@@ -187,8 +187,8 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionName "7.54.0"
-        versionCode 2203
+        versionName "7.53.0"
+        versionCode 2215
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders.MM_BRANCH_KEY_TEST = "$System.env.MM_BRANCH_KEY_TEST"
@@ -275,7 +275,7 @@ android {
             applicationIdSuffix ".flask"
             applicationId "io.metamask"
             // Use the appropriate signing config based on environment
-            if (System.getenv("METAMASK_ENVIRONMENT") == 'qa' || System.getenv('METAMASK_BUILD_TYPE') == 'qa') {
+            if (System.getenv("METAMASK_ENVIRONMENT") == 'qa') {
               signingConfig signingConfigs.qa
             } else {
               signingConfig signingConfigs.flask

android/app/build.gradle

@@ -1,10 +1,16 @@
 /* eslint-disable no-console */
 /* eslint-disable import/prefer-default-export */
+// External dependencies.
+import { AvatarAccountType } from '../../Avatars/Avatar/variants/AvatarAccount';
+
 // Internal dependencies.
 import { PickerAccountProps } from './PickerAccount.types';
 
 // Sample consts
 export const SAMPLE_PICKERACCOUNT_PROPS: PickerAccountProps = {
+  accountAddress: '0x2990079bcdEe240329a520d2444386FC119da21a',
+  accountAvatarType: AvatarAccountType.JazzIcon,
   accountName: 'Orangefox.eth',
   onPress: () => console.log('PickerAccount pressed'),
+  showAddress: false,
 };

app/component-library/components/Pickers/PickerAccount/PickerAccount.constants.ts

@@ -1,35 +1,36 @@
 /* eslint-disable react/display-name */
-// Third party dependencies.
-import React from 'react';
+// External dependencies.
+import { AvatarAccountType } from '../../Avatars/Avatar/variants/AvatarAccount';
 
 // Internal dependencies.
 import { default as PickerAccountComponent } from './PickerAccount';
 import { SAMPLE_PICKERACCOUNT_PROPS } from './PickerAccount.constants';
-import { TouchableOpacityProps, View } from 'react-native';
-import { PickerAccountProps } from './PickerAccount.types';
 
 const PickerAccountMeta = {
   title: 'Component Library / Pickers',
   component: PickerAccountComponent,
   argTypes: {
+    accountAddress: {
+      control: { type: 'text' },
+      defaultValue: SAMPLE_PICKERACCOUNT_PROPS.accountAddress,
+    },
+    accountAvatarType: {
+      options: AvatarAccountType,
+      control: {
+        type: 'select',
+      },
+      defaultValue: SAMPLE_PICKERACCOUNT_PROPS.accountAvatarType,
+    },
     accountName: {
       control: { type: 'text' },
+      defaultValue: SAMPLE_PICKERACCOUNT_PROPS.accountName,
+    },
+    showAddress: {
+      control: { type: 'boolean' },
+      defaultValue: SAMPLE_PICKERACCOUNT_PROPS.showAddress,
     },
   },
 };
 export default PickerAccountMeta;
 
-export const PickerAccount = {
-  args: {
-    accountName: SAMPLE_PICKERACCOUNT_PROPS.accountName,
-  },
-  render: (
-    args: React.JSX.IntrinsicAttributes &
-      PickerAccountProps &
-      React.RefAttributes<
-        React.ForwardRefExoticComponent<
-          TouchableOpacityProps & React.RefAttributes<View>
-        >
-      >,
-  ) => <PickerAccountComponent {...args} />,
-};
+export const PickerAccount = {};

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

@@ -21,24 +21,39 @@ const styleSheet = (params: {
 }) => {
   const { vars, theme } = params;
   const { colors } = theme;
-  const { style } = vars;
+  const { style, cellAccountContainerStyle } = vars;
   return StyleSheet.create({
     base: {
       ...(style as ViewStyle),
       flexDirection: 'row',
+      padding: 0,
       borderWidth: 0,
     },
-    basePressed: {
-      ...(style as ViewStyle),
-      flexDirection: 'row',
-      borderWidth: 0,
-      borderRadius: 2,
-      backgroundColor: colors.background.pressed,
+    accountAvatar: {
+      marginRight: 8,
     },
     accountAddressLabel: {
       color: colors.text.alternative,
       textAlign: 'center',
     },
+    cellAccount: {
+      flexDirection: 'row',
+      alignItems: 'center',
+      justifyContent: 'center',
+      ...cellAccountContainerStyle,
+    },
+    accountNameLabel: {
+      alignItems: 'center',
+      justifyContent: 'center',
+    },
+    accountNameAvatar: {
+      flexDirection: 'row',
+      alignItems: 'center',
+    },
+    pickerAccountContainer: {
+      justifyContent: 'center',
+      alignItems: 'center',
+    },
     dropDownIcon: {
       marginLeft: 8,
     },