Merge branch 'main' into jongsun/feat/251002-add-param-to-privateSendUpdate

Author: MajorLift

.depcheckrc.yml

@@ -5,6 +5,7 @@ ignores:
   #
 
   - '@lavamoat/snow'
+  - '@lavamoat/webpack'
   - '@lavamoat/allow-scripts'
   - '@babel/runtime'
   - '@fortawesome/fontawesome-free'

.github/scripts/resolve-previous-ref.sh

@@ -13,7 +13,7 @@ if [ "$patch" -gt 0 ]; then
   exit 0
 fi
 
-# Function to paginate and collect refs for a prefix
+# Function to paginate and collect refs for a prefix (narrow prefixes only)
 fetch_matching_refs() {
   local prefix="$1"
   local temp_file
@@ -43,24 +43,61 @@ fetch_matching_refs() {
   echo "$temp_file"
 }
 
-# Fetch for each prefix
-version_v_file=$(fetch_matching_refs "Version-v")
-release_file=$(fetch_matching_refs "release/")
+# Try immediate previous minor within the same major by direct branch existence checks
+major="${semver%%.*}"
+rest_minor_patch="${semver#*.}"
+minor="${rest_minor_patch%%.*}"
 
-# Combine and process: extract {name, semver} for matches, sort desc by semver
-jq -s 'add | [ .[] | .ref | ltrimstr("refs/heads/") as $name | select($name | test("^Version-v[0-9]+\\.[0-9]+\\.[0-9]+$") or test("^release/[0-9]+\\.[0-9]+\\.[0-9]+$")) | {name: $name, semver: (if $name | test("^Version-v") then $name | ltrimstr("Version-v") else $name | ltrimstr("release/") end) } ] | sort_by( .semver | split(".") | map(tonumber) ) | reverse' "$version_v_file" "$release_file" > all_versions.json
+if ! [[ "$major" =~ ^[0-9]+$ && "$minor" =~ ^[0-9]+$ ]]; then
+  echo "Error: Unable to parse major/minor from semver: $semver" >&2
+  exit 1
+fi
+
+if [ "$minor" -gt 0 ]; then
+  cand_minor=$((minor - 1))
+  while [ "$cand_minor" -ge 0 ]; do
+    candidate="release/${major}.${cand_minor}.0"
+    echo "Checking for branch: ${candidate}" >&2
+    http_code=$(curl -s -o /dev/null -w "%{http_code}" \
+      -H "Authorization: token $GITHUB_TOKEN" \
+      -H "Accept: application/vnd.github.v3+json" \
+      "https://api.github.com/repos/${GITHUB_REPOSITORY}/branches/${candidate}")
+    if [ "$http_code" = "200" ]; then
+      echo "Found previous non-hotfix branch: ${candidate}" >&2
+      echo "previous_ref=${candidate}" >> "$GITHUB_OUTPUT"
+      exit 0
+    fi
+    cand_minor=$((cand_minor - 1))
+  done
+fi
+
+# Fallback: move to previous major and select highest non-hotfix (patch==0)
+prev_major=$((major - 1))
+if [ "$prev_major" -lt 0 ]; then
+  echo "Error: No previous major available for semver: $semver" >&2
+  exit 1
+fi
+
+release_file=$(fetch_matching_refs "release/${prev_major}.")
 
-# Filter to those with semver strictly lower than current and non-hotfix (patch==0)
-jq --arg semver "$semver" '[ .[] | select( .semver as $v | $semver | split(".") as $c | $v | split(".") as $p | ( ($p[0] | tonumber) < ($c[0] | tonumber) or (($p[0] | tonumber) == ($c[0] | tonumber) and (($p[1] | tonumber) < ($c[1] | tonumber) or (($p[1] | tonumber) == ($c[1] | tonumber) and ($p[2] | tonumber) < ($c[2] | tonumber)))) ) and (($p[2] | tonumber) == 0) ) ]' all_versions.json > filtered_versions.json
+# From the fetched list for the previous major, keep only patch==0 branches and pick the highest
+jq -s '[ (add // [])
+        | .[]
+        | .ref
+        | ltrimstr("refs/heads/") as $name
+        | select($name | test("^release/[0-9]+\\.[0-9]+\\.[0-9]+$"))
+        | { name: $name, semver: ($name | ltrimstr("release/")) }
+      ]
+      | map(select(.semver | split(".")[2] == "0"))
+      | sort_by( .semver | split(".") | map(tonumber) )
+      | reverse' "$release_file" > filtered_versions.json
 
-# Select the highest lower: first in filtered list. If none found, fail.
 if [ "$(jq length filtered_versions.json)" -eq 0 ]; then
-  echo "Error: No lower non-hotfix versions found; cannot determine previous-version-ref." >&2
-  echo "This likely indicates a missing prior minor release branch (e.g., Version-vX.(Y-1).0 or release/X.(Y-1).0)." >&2
+  echo "Error: No non-hotfix branches found for previous major ${prev_major}." >&2
   exit 1
 else
-  highest_lower="$(jq -r '.[0].semver' filtered_versions.json)"
+  selected_semver="$(jq -r '.[0].semver' filtered_versions.json)"
   previous_ref="$(jq -r '.[0].name' filtered_versions.json)"
-  echo "Selected highest lower non-hotfix version: ${highest_lower} (branch: ${previous_ref})"
+  echo "Selected previous major highest non-hotfix: ${selected_semver} (branch: ${previous_ref})"
   echo "previous_ref=${previous_ref}" >> "$GITHUB_OUTPUT"
 fi

.github/workflows/e2e-chrome.yml

@@ -43,7 +43,7 @@ jobs:
       test-suite-name: test-e2e-chrome-webpack
       build-artifact: build-test-webpack
       build-command: yarn build:test:webpack
-      test-command: yarn test:e2e:chrome:webpack
+      test-command: yarn test:e2e:chrome
       matrix-index: ${{ matrix.index }}
       matrix-total: ${{ strategy.job-total }}
 

.github/workflows/e2e-firefox.yml

@@ -27,6 +27,24 @@ jobs:
       matrix-index: ${{ matrix.index }}
       matrix-total: ${{ strategy.job-total }}
 
+  test-e2e-firefox-webpack:
+    uses: ./.github/workflows/run-e2e.yml
+    if: ${{ github.event_name != 'merge_group' }}
+    secrets:
+      INFURA_PROJECT_ID: ${{ secrets.INFURA_PROJECT_ID }}
+    strategy:
+      fail-fast: ${{ github.event_name == 'merge_group' }}
+      matrix:
+        index:
+          [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
+    with:
+      test-suite-name: test-e2e-firefox-webpack
+      build-artifact: build-test-webpack
+      build-command: yarn build:test:webpack
+      test-command: yarn test:e2e:firefox
+      matrix-index: ${{ matrix.index }}
+      matrix-total: ${{ strategy.job-total }}
+
   test-e2e-firefox-flask:
     uses: ./.github/workflows/run-e2e.yml
     strategy:
@@ -44,6 +62,7 @@ jobs:
   test-e2e-firefox-report:
     needs:
       - test-e2e-firefox-browserify
+      - test-e2e-firefox-webpack
       - test-e2e-firefox-flask
     runs-on: ubuntu-latest
     if: ${{ !cancelled() }}

.github/workflows/main.yml

@@ -274,6 +274,7 @@ jobs:
     needs:
       - needs-e2e
       - build-test-mv2-browserify
+      - build-test-webpack
       - build-test-flask-mv2-browserify
     if: ${{ needs.needs-e2e.outputs.needs-e2e == 'true' }}
     uses: ./.github/workflows/e2e-firefox.yml

.github/workflows/update-lavamoat-policies.yml

@@ -155,6 +155,42 @@ jobs:
           path: lavamoat/browserify/${{ matrix.build-type }}
           key: cache-${{ matrix.build-type }}-${{ needs.prepare.outputs.COMMIT_SHA }}
 
+  update-lavamoat-webpack-policy:
+    name: Update LavaMoat webpack policy
+    runs-on: ubuntu-latest
+    needs:
+      - prepare
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Checkout pull request
+        run: gh pr checkout "${PR_NUMBER}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.LAVAMOAT_UPDATE_TOKEN }}
+          PR_NUMBER: ${{ github.event.issue.number }}
+
+      - name: Checkout and setup environment
+        uses: MetaMask/action-checkout-and-setup@v1
+        with:
+          is-high-risk-environment: false
+          skip-allow-scripts: true
+          use-yarn-hydrate: true
+
+      - name: Update LavaMoat webpack policy
+        run: yarn webpack --env production --no-cache --generatePolicy
+        env:
+          INFURA_PROD_PROJECT_ID: 00000000000
+          SEGMENT_PROD_WRITE_KEY: 00000000000
+          GOOGLE_PROD_CLIENT_ID: 00000000000
+          APPLE_PROD_CLIENT_ID: 00000000000
+
+      - name: Cache webpack policy
+        uses: actions/cache/save@v4
+        with:
+          path: lavamoat/webpack
+          key: cache-webpack-${{ needs.prepare.outputs.COMMIT_SHA }}
+
   commit-updated-policies:
     name: Commit the updated LavaMoat policies
     runs-on: ubuntu-latest
@@ -163,6 +199,7 @@ jobs:
       - is-fork-pull-request
       - update-lavamoat-build-policy
       - update-lavamoat-webapp-policy
+      - update-lavamoat-webpack-policy
     # Ensure forks don't get access to the LavaMoat update token
     if: ${{ needs.is-fork-pull-request.outputs.IS_FORK == 'false' }}
     steps:
@@ -220,6 +257,13 @@ jobs:
           key: cache-experimental-${{ needs.prepare.outputs.COMMIT_SHA }}
           fail-on-cache-miss: true
 
+      - name: Restore webpack policy
+        uses: actions/cache/restore@v4
+        with:
+          path: lavamoat/webpack
+          key: cache-webpack-${{ needs.prepare.outputs.COMMIT_SHA }}
+          fail-on-cache-miss: true
+
       - name: Check whether there are policy changes
         id: policy-changes
         run: |

.github/workflows/validate-lavamoat-policies.yml

@@ -64,3 +64,29 @@ jobs:
               echo "::error::Working tree dirty."
               exit 1
           fi
+
+  validate-lavamoat-policy-webpack:
+    name: Validate LavaMoat webpack policy
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout and setup environment
+        uses: MetaMask/action-checkout-and-setup@v1
+        with:
+          is-high-risk-environment: false
+          skip-allow-scripts: true
+          use-yarn-hydrate: true
+
+      - name: Validate LavaMoat webpack policy
+        run: yarn webpack --env production --no-cache --generatePolicy
+        env:
+          INFURA_PROD_PROJECT_ID: 00000000000
+          SEGMENT_PROD_WRITE_KEY: 00000000000
+          GOOGLE_PROD_CLIENT_ID: 00000000000
+          APPLE_PROD_CLIENT_ID: 00000000000
+
+      - name: Check working tree
+        run: |
+          if ! git diff --exit-code; then
+              echo "::error::Working tree dirty."
+              exit 1
+          fi

.storybook/test-data.js

@@ -1710,6 +1710,9 @@ const state = {
       },
     },
     openSeaEnabled: true,
+    networkConnectionBanner: {
+      status: 'unknown',
+    },
   },
   appState: {
     isAccountMenuOpen: false,