Merge branch 'main' into expo

.android.env.example

@@ -9,7 +9,7 @@ export FCM_CONFIG_PROJECT_ID=
 export FCM_CONFIG_STORAGE_BUCKET=
 export FCM_CONFIG_MESSAGING_SENDER_ID=
 export FCM_CONFIG_APP_ID=
-export GOOGLE_SERVICES_B64=
+export GOOGLE_SERVICES_B64_ANDROID=
 #Notifications Feature Announcements
 export FEATURES_ANNOUNCEMENTS_ACCESS_TOKEN=
 export FEATURES_ANNOUNCEMENTS_SPACE_ID=

.github/workflows/add-team-label.yml

@@ -7,8 +7,6 @@ on:
 
 jobs:
   add-team-label:
-    uses: metamask/github-tools/.github/workflows/add-team-label.yml@058012b49ff2fbd9649c566ba43b29497f93b21d
-    permissions:
-      pull-requests: write
+    uses: metamask/github-tools/.github/workflows/add-team-label.yml@18af6e4b56a18230d1792480e249ebc50b324927
     secrets:
-      PERSONAL_ACCESS_TOKEN: ${{ secrets.RELEASE_LABEL_TOKEN }}
+      TEAM_LABEL_TOKEN: ${{ secrets.TEAM_LABEL_TOKEN }}

.github/workflows/create-release-pr.yml

@@ -9,15 +9,18 @@ on:
       semver-version:
         description: 'A semantic version. eg: x.x.x'
         required: true
-      version-number:
-        description: 'A natural version number. eg: 862'
-        required: true
       previous-version-tag:
         description: 'Previous release version tag. eg: v7.7.0'
         required: true
 jobs:
+  generate-build-version:
+    uses: MetaMask/metamask-mobile-build-version/.github/workflows/[email protected]
+    permissions:
+      id-token: write
+
   create-release-pr:
     runs-on: ubuntu-latest
+    needs: generate-build-version
     permissions:
       contents: write
       pull-requests: write
@@ -36,6 +39,7 @@ jobs:
           # The workaround is to use a personal access token (BUG_REPORT_TOKEN) instead of
           # the default GITHUB_TOKEN for the checkout action.
           token: ${{ secrets.BUG_REPORT_TOKEN }}
+
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
@@ -48,5 +52,6 @@ jobs:
         shell: bash
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BASE_BRANCH: ${{ github.event.inputs.base-branch }}
         run: |
-          ./scripts/create-release-pr.sh ${{ github.event.inputs.previous-version-tag }} ${{ github.event.inputs.semver-version }} ${{ github.event.inputs.version-number }}
+          ./scripts/create-release-pr.sh ${{ github.event.inputs.previous-version-tag }} ${{ github.event.inputs.semver-version }} ${{ needs.generate-build-version.outputs.build-version }}

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

@@ -0,0 +1,51 @@
+##############################################################################################
+#
+# This Workflow is responsible for updating the latest build version of the project.
+# You can provide your own base branch, tag, or SHA for git operations and the pull request.
+# and it will generate the latest build version & update the neccessary files for you.
+#
+##############################################################################################
+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
+        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
+            
+  

.gitignore

@@ -41,6 +41,7 @@ android/app/_build*
 
 # if we ever want to add google services
 android/app/google-services.json
+ios/GoogleService-Info.plist
 
 # node.js
 node_modules/
@@ -132,4 +133,7 @@ android/app/src/main/assets/modules.json
 # Expo
 .expo
 dist/
-web-build/
+web-build/
+
+# Google firebase base64 derived configs
+**/GoogleService-Info.plist

.ios.env.example

@@ -8,7 +8,7 @@ FCM_CONFIG_PROJECT_ID=
 FCM_CONFIG_STORAGE_BUCKET=
 FCM_CONFIG_MESSAGING_SENDER_ID=
 FCM_CONFIG_APP_ID=
-GOOGLE_SERVICES_B64=
+GOOGLE_SERVICES_B64_IOS=
 #Notifications Feature Announcements
 FEATURES_ANNOUNCEMENTS_ACCESS_TOKEN=
 FEATURES_ANNOUNCEMENTS_SPACE_ID=

.iyarc

@@ -1,3 +0,0 @@
-# ReDoS vulnerability, no impact to this application, and fix not backported yet to the versions we use
-
-GHSA-c2qf-rxjj-qqgw

.js.env.example

@@ -68,18 +68,19 @@ export SEGMENT_FLUSH_INTERVAL="1"
 export SEGMENT_FLUSH_EVENT_LIMIT="1"
 
 # URL of security alerts API used to validate dApp requests.
-export SECURITY_ALERTS_API_URL="http://localhost:3000"
+export SECURITY_ALERTS_API_URL="https://security-alerts.api.cx.metamask.io"
 
 # Temporary mechanism to enable security alerts API prior to release.
-export SECURITY_ALERTS_API_ENABLED="true"
+export MM_SECURITY_ALERTS_API_ENABLED="true"
 # Firebase
 export FCM_CONFIG_API_KEY=""
 export FCM_CONFIG_AUTH_DOMAIN=""
 export FCM_CONFIG_PROJECT_ID=""
 export FCM_CONFIG_STORAGE_BUCKET=""
 export FCM_CONFIG_MESSAGING_SENDER_ID=""
 export FCM_CONFIG_APP_ID=""
-export GOOGLE_SERVICES_B64=""
+export GOOGLE_SERVICES_B64_ANDROID=""
+export GOOGLE_SERVICES_B64_IOS=""
 #Notifications Feature Announcements
 export FEATURES_ANNOUNCEMENTS_ACCESS_TOKEN=
 export FEATURES_ANNOUNCEMENTS_SPACE_ID=

.nvmrc

@@ -1 +1 @@
-20.14.0
+20.17.0