Merge branch 'main' into homepage/tabs

Author: brianacnguyen

.depcheckrc.yml

@@ -15,6 +15,9 @@ ignores:
   - 'react-compiler-runtime'
   # This is used on the patch for TokenRatesController of Assets controllers, for we to be able to use the last version of it
   - cockatiel
+  # These are used in metro.config.js to setup Hardened JavaScript via @lavamoat/react-native-lockdown
+  - '@react-native/js-polyfills'
+  - 'reflect-metadata'
 
   # Note: Everything below this line should be removed after investigation
   # TODO: Investigate each dependency to see whether it's used
@@ -105,4 +108,4 @@ ignores:
   - '@react-native/typescript-config'
   - 'react-native-pager-view'
   # this dependency can probably be removed, needs investigation
-  - '@types/react-test-renderer'
+  - '@types/react-test-renderer'

.eslintrc.js

@@ -15,6 +15,10 @@ module.exports = {
   // ESLint can find the plugin without the `eslint-plugin-` prefix. Ex. `eslint-plugin-react-compiler` -> `react-compiler`
   plugins: ['@typescript-eslint', '@metamask/design-tokens', 'react-compiler'],
   overrides: [
+    {
+      files: ['e2e/**/*.{js,ts}'],
+      extends: ['./e2e/framework/.eslintrc.js'],
+    },
     {
       files: ['*.{ts,tsx}'],
       extends: ['@metamask/eslint-config-typescript'],

.github/CODEOWNERS

@@ -187,8 +187,9 @@ app/components/Views/transactions @MetaMask/transactions
 # Web3auth Team
 app/core/Engine/messengers/seedless-onboarding-controller-messenger @MetaMask/web3auth
 app/core/Engine/controllers/seedless-onboarding-controller  @MetaMask/web3auth
-app/components/Views/Onboarding @MetaMask/web3auth
-app/reducers/onboarding @MetaMask/web3auth
+app/core/OAuthService                                       @MetaMask/web3auth
+app/components/Views/Onboarding                             @MetaMask/web3auth
+app/reducers/onboarding                                     @MetaMask/web3auth
 
 # Snapshots – no code owners assigned
 # This allows anyone with write access to approve changes to any *.snap files.

.github/pull-request-template.md

@@ -11,6 +11,22 @@ Write a short description of the changes included in this pull request, also inc
 2. What is the improvement/solution?
 -->
 
+## **Changelog**
+
+<!--
+If this PR is not End-User-Facing and should not show up in the CHANGELOG, you can choose to either:
+1. Write `CHANGELOG entry: null`
+2. Label with `no-changelog`
+
+If this PR is End-User-Facing, please write a short User-Facing description in the past tense like:
+`CHANGELOG entry: Added a new tab for users to see their NFTs`
+`CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker`
+
+(This helps the Release Engineer do their job more quickly and accurately)
+-->
+
+CHANGELOG entry:
+
 ## **Related issues**
 
 Fixes:

.github/scripts/shared/template.ts

@@ -39,6 +39,7 @@ const bugReportIssueTemplateTitles = [
 // Titles of PR template
 const prTemplateTitles = [
   '## **Description**',
+  '## **Changelog**',
   '## **Related issues**',
   '## **Manual testing steps**',
   '## **Screenshots/Recordings**',

.js.env.example

@@ -133,4 +133,24 @@ export RAMP_INTERNAL_BUILD="true"
 
 
 # set seedless onboarding environment
-export WEB3AUTH_NETWORK="sapphire_devnet"
+export WEB3AUTH_NETWORK="sapphire_devnet"
+
+# To enable seedless onboarding ( set to true for seedless onboarding )
+export SEEDLESS_ONBOARDING_ENABLED='false'
+
+# env for seedless onboarding main-dev
+export ANDROID_APPLE_CLIENT_ID='io.metamask.appleloginclient.dev'
+export ANDROID_GOOGLE_CLIENT_ID='8615965109465-i8oeh9kuvl1n6lk1ffkobpvth27bmi41.apps.googleusercontent.com'
+export ANDROID_GOOGLE_SERVER_CLIENT_ID='615965109465-i8oeh9kuvl1n6lk1ffkobpvth27bmi41.apps.googleusercontent.com'
+export IOS_GOOGLE_CLIENT_ID='615965109465-h6tp2h3crls6hbggispcgovbvk4vabu3.apps.googleusercontent.com'
+export IOS_GOOGLE_REDIRECT_URI='com.googleusercontent.apps.615965109465-h6tp2h3crls6hbggispcgovbvk4vabu3:/oauth2redirect/google'
+
+# env for seedless onboarding flask-dev
+#export ANDROID_APPLE_CLIENT_ID="io.metamask.appleloginclient.flask.dev"
+#export ANDROID_GOOGLE_CLIENT_ID="615965109465-ab20kuqbls6fj5s50fvmvbnket8nv1sh.apps.googleusercontent.com"
+#export ANDROID_GOOGLE_SERVER_CLIENT_ID="615965109465-ab20kuqbls6fj5s50fvmvbnket8nv1sh.apps.googleusercontent.com"
+#export IOS_GOOGLE_CLIENT_ID="615965109465-89b2lmqgm5ka8j8t403qhooouv57id9b.apps.googleusercontent.com"
+#export IOS_GOOGLE_REDIRECT_URI="com.googleusercontent.apps.615965109465-89b2lmqgm5ka8j8t403qhooouv57id9b:/oauth2redirect/google"
+
+# Enable 7702 locally
+export MM_SMART_ACCOUNT_UI_ENABLED="true"

.storybook/main.js

@@ -2,10 +2,7 @@ module.exports = {
   stories: [
     '../app/component-library/components/**/*.stories.?(ts|tsx|js|jsx)',
     '../app/component-library/base-components/**/*.stories.?(ts|tsx|js|jsx)',
-    '../app/component-library/components-temp/TagColored/**/*.stories.?(ts|tsx|js|jsx)',
-    '../app/component-library/components-temp/KeyValueRow/**/*.stories.?(ts|tsx|js|jsx)',
-    '../app/component-library/components-temp/Buttons/ButtonToggle/**/*.stories.?(ts|tsx|js|jsx)',
-    '../app/component-library/components-temp/SegmentedControl/**/*.stories.?(ts|tsx|js|jsx)',
+    '../app/component-library/components-temp/**/*.stories.?(ts|tsx|js|jsx)',
   ],
   addons: ['@storybook/addon-ondevice-controls'],
   framework: '@storybook/react-native',