Merge branch 'main' into fix/cherry-pick-node-version

.depcheckrc.yml

@@ -2,6 +2,8 @@
 ignores:
   - '@metamask/oss-attribution-generator'
   - 'webpack-cli'
+  # This is used on the patch for TokenRatesController of Assets controllers, for we to be able to use the last version of it
+  - cockatiel
 
   # Note: Everything below this line should be removed after investigation
   # TODO: Investigate each dependency to see whether it's used

.detoxrc.js

@@ -6,9 +6,9 @@ module.exports = {
       config: 'e2e/jest.e2e.config.js',
     },
     jest: {
-      setupTimeout: 120000,
+      setupTimeout: 220000,
     },
-    retries: 2,
+    retries: 1,
   },
 
   artifacts: {
@@ -82,7 +82,7 @@ module.exports = {
       type: 'ios.app',
       binaryPath:
         'ios/build/Build/Products/Release-iphonesimulator/MetaMask.app',
-      build: "METAMASK_ENVIRONMENT='production' yarn build:ios:release:e2e",
+      build: "METAMASK_BUILD_TYPE='main' METAMASK_ENVIRONMENT='production' yarn build:ios:release:e2e",
     },
     'android.bitrise.debug': {
       type: 'android.apk',
@@ -98,12 +98,12 @@ module.exports = {
       type: 'android.apk',
       binaryPath:
         'android/app/build/outputs/apk/prod/release/app-prod-release.apk',
-      build: "METAMASK_ENVIRONMENT='production' yarn build:android:release:e2e",
+      build: "METAMASK_BUILD_TYPE='main' METAMASK_ENVIRONMENT='production' yarn build:android:release:e2e",
     },
     'android.qa': {
       type: 'android.apk',
       binaryPath: 'android/app/build/outputs/apk/qa/release/app-qa-release.apk',
-      build: "METAMASK_ENVIRONMENT='qa' yarn build:android:qa:e2e",
+      build: "METAMASK_BUILD_TYPE='main' METAMASK_ENVIRONMENT='qa' yarn build:android:qa:e2e",
     },
   },
 };

.github/CODEOWNERS

@@ -2,3 +2,4 @@
 # Each line is a file pattern followed by one or more owners.
 
 *                                    @MetaMask/mobile-devs
+app/component-library/               @MetaMask/design-system-engineers

.github/ISSUE_TEMPLATE/general-issue.yml

@@ -88,6 +88,26 @@ body:
         - XYZ should work
         - Etc.
 
+  - type: markdown
+    attributes:
+      value: |
+        ## **Stakeholder Review (for MetaMask employees only)**
+
+  - type: checkboxes
+    id: stakeholder-review
+    attributes:
+      label: Stakeholder review needed before the work gets merged
+      options:
+        - label: Engineering (needed in most cases)
+        - label: Design
+        - label: Product
+        - label: QA (automation tests are required to pass before merging PRs but not all changes are covered by automation tests - please review if QA is needed beyond automation tests)
+        - label: Security
+        - label: Legal
+        - label: Marketing
+        - label: Management (please specify)
+        - label: Other (please specify)
+
   - type: markdown
     attributes:
       value: |

.github/pull-request-template.md

@@ -8,7 +8,7 @@ Write a short description of the changes included in this pull request, also inc
 
 ## **Related issues**
 
-Fixes: #
+Fixes:
 
 ## **Manual testing steps**
 

.github/workflows/create-bug-report.yml

@@ -9,7 +9,7 @@ jobs:
       - name: Extract version from branch name if release branch
         id: extract_version
         run: |
-          if [[ "$GITHUB_REF" == "refs/heads/release/"* ]]; then
+          if [[ "$GITHUB_REF" =~ ^refs/heads/release/[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
             version="${GITHUB_REF#refs/heads/release/}"
             echo "New release branch($version), continue next steps"
             echo "version=$version" >> "$GITHUB_ENV"

.gitignore

@@ -108,3 +108,7 @@ e2e/reports
 # ppom
 ppom/node_modules
 ppom/dist
+
+
+# ccache
+ccache

.js.env.example

@@ -48,4 +48,7 @@ export MM_BLOCKAID_UI_ENABLED=""
 export WATCHER_PORT=8081
 
 # Environment: "production", "pre-release" or "local"
-export METAMASK_ENVIRONMENT=""
+export METAMASK_ENVIRONMENT=""
+
+# Build type: "main" or "flask"
+export METAMASK_BUILD_TYPE=""

.nvmrc

@@ -1 +1 @@
-v18
+18.18

.prettierignore

@@ -16,3 +16,5 @@ scripts
 .prettierignore
 locales
 .storybook
+/ppom
+app/lib/ppom/ppom.html.js

.ruby-version

@@ -1 +1 @@
-3.0.3
+3.1.4

.storybook/main.js

@@ -1,19 +1,6 @@
 module.exports = {
   stories: [
-    '../app/component-library/components/Cards/Card/**/*.stories.?(ts|tsx|js|jsx)',
-    '../app/component-library/components/Banners/Banner/variants/BannerAlert/**/*.stories.?(ts|tsx|js|jsx)',
-    '../app/component-library/components/BottomSheets/**/*.stories.?(ts|tsx|js|jsx)',
-    '../app/component-library/components/Navigation/**/*.stories.?(ts|tsx|js|jsx)',
-    '../app/component-library/components/Select/**/*.stories.?(ts|tsx|js|jsx)',
-    '../app/component-library/components/Pickers/**/*.stories.?(ts|tsx|js|jsx)',
-    '../app/component-library/components/Cells/**/*.stories.?(ts|tsx|js|jsx)',
-    '../app/component-library/components/HeaderBase/**/*.stories.?(ts|tsx|js|jsx)',
-    '../app/component-library/components/Form/**/*.stories.?(ts|tsx|js|jsx)',
-    '../app/component-library/components/List/**/*.stories.?(ts|tsx|js|jsx)',
-    '../app/component-library/components/Texts/**/*.stories.?(ts|tsx|js|jsx)',
-    '../app/component-library/components/Overlay/**/*.stories.?(ts|tsx|js|jsx)',
-    '../app/component-library/components/Icons/**/*.stories.?(ts|tsx|js|jsx)',
-    '../app/component-library/components/Checkbox/**/*.stories.?(ts|tsx|js|jsx)',
+    '../app/component-library/components/**/*.stories.?(ts|tsx|js|jsx)',
   ],
   addons: ['@storybook/addon-ondevice-controls'],
   framework: '@storybook/react-native',