Merge branch 'main' into feat/dynamic-parameters

Author: itsyoboieltr

.github/workflows/main.yml

@@ -336,6 +336,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       INFURA_PROJECT_ID: ${{ secrets.INFURA_PROJECT_ID }}
       GOOGLE_PROD_CLIENT_ID: 00000000000
       APPLE_PROD_CLIENT_ID: 00000000000
@@ -345,7 +346,8 @@ jobs:
       APPLE_EXPERIMENTAL_CLIENT_ID: 00000000000
       GOOGLE_FLASK_CLIENT_ID: 00000000000
       APPLE_FLASK_CLIENT_ID: 00000000000
-
+    outputs:
+      lavamoat-policy-changed: ${{ steps.lavamoat-policy-changed.outputs.lavamoat-policy-changed }}
     steps:
       - name: Checkout and setup environment
         uses: MetaMask/action-checkout-and-setup@v1
@@ -354,15 +356,47 @@ jobs:
           skip-allow-scripts: true
           use-yarn-hydrate: true
 
+      - name: Download changed-files artifact
+        if: ${{ env.BRANCH != 'main' }}
+        id: download-changed-files
+        continue-on-error: true
+        uses: actions/download-artifact@v4
+        with:
+          name: changed-files
+          path: ./changed-files/
+
+      # if the changed-files artifact does not exist, we get the diff
+      - run: yarn tsx .github/scripts/git-diff-default-branch.ts
+        if: ${{ steps.download-changed-files.outcome == 'failure' }}
+
+      - name: See if lavamoat policy files have changed
+        id: lavamoat-policy-changed
+        run: |
+          # if 'changed-files/changed-files.json' exists, check if it contains any files named policy.json or policy-override.json
+          if [ -f "changed-files/changed-files.json" ]; then
+            if grep -q -e 'policy.json' -e 'policy-override.json' changed-files/changed-files.json; then
+              echo "Lavamoat policy file changes detected."
+              echo "lavamoat-policy-changed=true" >> "$GITHUB_OUTPUT"
+            else
+              echo "No Lavamoat policy file changes detected."
+              echo "lavamoat-policy-changed=false" >> "$GITHUB_OUTPUT"
+            fi
+          else
+            echo "Cannot find 'changed-files.json', assuming that Lavamoat policy files have changed."
+            echo "lavamoat-policy-changed=true" >> "$GITHUB_OUTPUT"
+          fi
+
       - name: Download artifact 'build-dist-browserify'
+        if: ${{ steps.lavamoat-policy-changed.outputs.lavamoat-policy-changed == 'true' }}
         uses: actions/download-artifact@v4
         with:
           name: build-dist-browserify
 
       - run: ./.github/scripts/create-lavamoat-viz.sh
+        if: ${{ steps.lavamoat-policy-changed.outputs.lavamoat-policy-changed == 'true' }}
 
       - name: Upload 'build-viz' to S3
-        if: ${{ vars.AWS_REGION && vars.AWS_IAM_ROLE && vars.AWS_S3_BUCKET }}
+        if: ${{ steps.lavamoat-policy-changed.outputs.lavamoat-policy-changed == 'true' && vars.AWS_REGION && vars.AWS_IAM_ROLE && vars.AWS_S3_BUCKET }}
         uses: metamask/github-tools/.github/actions/upload-s3@1233659b3850eb84824d7375e2e0c58eb237701d
         with:
           aws-region: ${{ vars.AWS_REGION }}
@@ -372,6 +406,7 @@ jobs:
 
   publish-prerelease:
     name: Publish prerelease
+    if: ${{ github.event_name != 'merge_group' }} # Skip this job for the Merge Queue
     needs:
       - build-dist-browserify
       - build-dist-mv2-browserify
@@ -390,6 +425,8 @@ jobs:
       - build-source-map-explorer
       - build-lavamoat-viz
     uses: ./.github/workflows/publish-prerelease.yml
+    with:
+      lavamoat-policy-changed: ${{ needs.build-lavamoat-viz.outputs.lavamoat-policy-changed == 'true' }}
     secrets:
       PR_COMMENT_TOKEN: ${{ secrets.PR_COMMENT_TOKEN }}
 

.github/workflows/publish-prerelease.yml

@@ -5,6 +5,11 @@ on:
     secrets:
       PR_COMMENT_TOKEN:
         required: true
+    inputs:
+      lavamoat-policy-changed:
+        description: 'Whether the Lavamoat policy files have changed'
+        required: true
+        type: boolean
 
 jobs:
   publish-prerelease:
@@ -25,6 +30,7 @@ jobs:
       MERGE_BASE_COMMIT_HASH: '' # placeholder so that we have autocomplete and logs
       CLOUDFRONT_REPO_URL: ${{ vars.AWS_CLOUDFRONT_URL }}/${{ github.event.repository.name }}
       HOST_URL: ${{ vars.AWS_CLOUDFRONT_URL }}/${{ github.event.repository.name }}/${{ github.run_id }}
+      LAVAMOAT_POLICY_CHANGED: ${{ inputs.lavamoat-policy-changed }}
     steps:
       - name: Checkout and setup high risk environment
         uses: MetaMask/action-checkout-and-setup@v1

.github/workflows/run-benchmarks.yml

@@ -14,6 +14,7 @@ env:
 
 jobs:
   benchmarks:
+    if: ${{ github.event_name != 'merge_group' }} # Skip this job for the Merge Queue
     runs-on: ubuntu-22.04
     timeout-minutes: 30
     strategy:

.github/workflows/run-tests.yml

@@ -73,7 +73,7 @@ jobs:
           use-yarn-hydrate: true
 
       - name: test:integration:coverage
-        run: yarn test:integration:coverage
+        run: yarn test:integration:coverage --silent
 
       - name: Rename coverage
         run: mv coverage/integration/coverage-final.json coverage/integration/coverage-integration.json

.storybook/test-data.js

@@ -690,6 +690,7 @@ const state = {
     ],
     accountsAssets: {},
     assetsMetadata: {},
+    allIgnoredAssets: {},
     balances: {},
     conversionRates: {},
     networkConfigurationsByChainId: {},

CHANGELOG.md

@@ -7,6 +7,58 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [13.7.0]
+
+### Added
+
+- Fix Transaction Shield membership banner on light mode (#37162)
+- Cached last used subscription payment method (& token), so that user won't need to re-select on navigations. (#37144)
+- Return tx hashes asap from the submitBatch hook (#37113)
+- Show wallet name in bridge quote recipient field (#37083)
+- Adds Billing Start Date in shield-subscription confirmation screen. (#37103)
+- Handle crypto approval in shield settings update payment method (#37057)
+- Update shield-controller to `v0.4.0`. (#37071)
+- Use SSE to stream swap quotes (#36481)
+- Adds network and native token logos for Injective network. (#36923)
+- Add `auxiliaryFunds` + `requiredAssets` support defined under [ERC-7682](https://eips.ethereum.org/EIPS/eip-7682) (#36061)
+- Add bitcoin ff to main build (#36940)
+- Improves user experience in permission confirmation dialogs. (#36490)
+- Adapted the payload of request `signRewardsMessage` for improved performance (#36921)
+  (https://github.com/MetaMask/snap-solana-wallet/pull/554)
+  Improved speed when looking up the state for accounts
+  by id (https://github.com/MetaMask/snap-solana-wallet/pull/550)
+  Fixed a serialization issue causing the snap to try
+  rendering bigints
+  (https://github.com/MetaMask/snap-solana-wallet/pull/551)
+  Fixed incorrect token icon URL building
+  (https://github.com/MetaMask/snap-solana-wallet/pull/548)
+  Fixed the send flow to support token account recipients
+  (https://github.com/MetaMask/snap-solana-wallet/pull/547)
+- Enables watch only accounts on experimental builds (#37051)
+
+### Fixed
+
+- Toast avatar icon (#37124)
+- Shield subscription default payment method crypto if available (#37101)
+- Fix a bug when multiple confirmation exist but navigation fails to when approving (#36990)
+- Fix coverage status not showing (#37097)
+- Fix recipient icon when recipient is ENS domain (#37043)
+- Fixed a bug where the wallet would not prompt the user for unlock and would silently drop `personal_sign` requests when the (#36963)
+  wallet was locked and the user was opted into MetaMetrics
+- Prevent unresponsive UI in the case where the user has more than 64MB of state; the trade off is that we now allow state (#35308)
+  size to increase until the memory the browser has allotted for the
+  extension process runs out (and crashes).
+- Fixed missing `Bearer` in the shield-gateway proxy Authorization Header. (#36985)
+- Remove unneccesary callback and dependencies (#36974)
+- Fixed a bug that was causing the token list to show "No conversion rate available" once the user connects to testnet from a (#36685)
+  dapp.
+- Improves gator permissions page loading performance with cache-first strategy. (#36833)
+- Removes extra transactions call to improve performance (#36968)
+- Prevents quick reconnection when websocket connection is misbehaving (#37118)
+- Fixes the incorrect USDC address for SEI (#37221)
+- Only triggers onActive and onInactive Snap lifecycle hooks when client is unlocked (#37222)
+- Fixes a bug where the Authentication API was called infinitely in useCarouselManagement (#37334)
+
 ## [13.6.0]
 
 ### Added
@@ -957,7 +1009,8 @@ authorized by the user.` error until the user fully revoked dapp
 - This changelog was split off with 12.22.0
 - All older changes can be found in [docs/CHANGELOG_older.md](https://github.com/MetaMask/metamask-extension/blob/main/docs/CHANGELOG_older.md)
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.6.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.7.0...HEAD
+[13.7.0]: https://github.com/MetaMask/metamask-extension/compare/v13.6.0...v13.7.0
 [13.6.0]: https://github.com/MetaMask/metamask-extension/compare/v13.5.0...v13.6.0
 [13.5.0]: https://github.com/MetaMask/metamask-extension/compare/v13.4.3...v13.5.0
 [13.4.3]: https://github.com/MetaMask/metamask-extension/compare/v13.4.2...v13.4.3