Skip to content

release: 7.60.2 - #23510

Merged
joaoloureirop merged 7 commits into
stablefrom
release/7.60.2
Dec 5, 2025
Merged

joaoloureirop merged 7 commits into
stablefrom
release/7.60.2

Conversation

@metamaskbot

Copy link
Copy Markdown
Collaborator

🚀 v7.60.2 Testing & Release Quality Process

Hi Team,
As part of our new MetaMask Release Quality Process, here’s a quick overview of the key processes, testing strategies, and milestones to ensure a smooth and high-quality deployment.


📋 Key Processes

Testing Strategy

  • Developer Teams:
    Conduct regression and exploratory testing for your functional areas, including automated and manual tests for critical workflows.
  • QA Team:
    Focus on exploratory testing across the wallet, prioritize high-impact areas, and triage any Sentry errors found during testing.
  • Customer Success Team:
    Validate new functionalities and provide feedback to support release monitoring.

GitHub Signoff

  • Each team must sign off on the Release Candidate (RC) via GitHub by the end of the validation timeline (Tuesday EOD PT).
  • Ensure all tests outlined in the Testing Plan are executed, and any identified issues are addressed.

Issue Resolution

  • Resolve all Release Blockers (Sev0 and Sev1) by Tuesday EOD PT.
  • For unresolved blockers, PRs may be reverted, or feature flags disabled to maintain release quality and timelines.

Cherry-Picking Criteria

  • Only critical fixes meeting outlined criteria will be cherry-picked.
  • Developers must ensure these fixes are thoroughly reviewed, tested, and merged by Tuesday EOD PT.

🗓️ Timeline and Milestones

  1. Today (Friday): Begin Release Candidate validation.
  2. Tuesday EOD PT: Finalize RC with all fixes and cherry-picks.
  3. Wednesday: Buffer day for final checks.
  4. Thursday: Submit release to app stores and begin rollout to 1% of users.
  5. Monday: Scale deployment to 10%.
  6. Tuesday: Full rollout to 100%.

✅ Signoff Checklist

Each team is responsible for signing off via GitHub. Use the checkbox below to track signoff completion:

Team sign-off checklist

  • Mobile Platform

This process is a major step forward in ensuring release stability and quality. Let’s stay aligned and make this release a success! 🚀

Feel free to reach out if you have questions or need clarification.

Many thanks in advance

Reference

@metamaskbot metamaskbot added the team-bots Bot team (for MetaMask Bot, Runway Bot, etc.) label Dec 1, 2025
@socket-security

socket-security Bot commented Dec 1, 2025 •

Copy link
Copy Markdown

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff Package Supply Chain
Security
Vulnerability Quality Maintenance License
Updatednpm/​@​metamask/​transaction-controller@​62.3.1 ⏵ 62.4.0100 +4100100 +20100 +3100
Updatednpm/​@​metamask/​transaction-pay-controller@​10.2.0 ⏵ 10.3.0100 +22100100 +23100 +4100

View full report

weitingsun
weitingsun previously approved these changes Dec 1, 2025
@metamaskbot metamaskbot added the release-7.60.2 Issue or pull request that will be included in release 7.60.2 label Dec 2, 2025
…polling when country is missing (#23518)

- feat(predict): cp-7.60.2 add auto-refresh polling when country is
missing (#23513)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Add automatic polling mechanism to usePredictEligibility hook that
refreshes eligibility when no country is returned in the response.

Changes:
- Add sequential polling pattern (wait for response → wait interval →
poll again)
- Poll every 2 seconds until country is returned or component unmounts
- Continue polling even if individual requests fail
- Stop polling automatically when country becomes available
- Add comprehensive tests for the new polling behavior

This ensures users get their country data even if the initial
eligibility check doesn't return it, improving the reliability
of the Predict feature's geo-restriction handling.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
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: null

## **Related issues**

Fixes:

## **Manual testing steps**

```gherkin
Feature: my feature name

  Scenario: user [verb for user action]
    Given [describe expected initial app state]

    When user [verb for user action]
    Then [describe expected outcome]
```

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding

Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling

guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> Adds sequential auto-refresh polling to `usePredictEligibility` when
`country` is missing (2s interval, 3 retries) and reduces auto-refresh
debounce to 100ms, with comprehensive tests.
> 
> - **Predict Eligibility Hook (`usePredictEligibility`)**:
> - Adds sequential auto-refresh polling when `country` is missing: wait
for response → wait `2000ms` → retry, up to `3` retries.
> - Stores `refreshEligibility` in a `useRef` to avoid effect restarts.
> - Exposes `country` via memoized selector and uses it to control
polling.
>   - Reduces auto-refresh debounce from `60000ms` to `100ms`.
> - **Tests (`usePredictEligibility.test.ts`)**:
>   - Update debounce expectations to `100ms`.
> - Add test suite for missing-country polling: start, interval retries,
stop at max retries, error handling, unmount cleanup, and sequential
polling behavior.
> - Ensure app state transition and race-condition cases respect new
debounce and polling logic.
> 
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
831dd0e. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->


[a9cb801](a9cb801)

Co-authored-by: Caainã Jeronimo <caainaje@gmail.com>
…n metamask pay (#23542)

- fix: cp-7.60.2 overwrite account upgrade in metamask pay (#23521)

## **Description**

When generating delegation data for the `TransactionPayController`,
overwrite any existing EIP-7702 delegation if not supported.

Also bump the controller version to include missing authorization lists
on Predict deposit source transactions, when payment token is on
Polygon.

## **Changelog**

CHANGELOG entry: Fixed bugs causing failed Perps and Predict deposits
due to unsupported or missing account upgrades

## **Related issues**

Fixes: #23494 #23514 

## **Manual testing steps**

## **Screenshots/Recordings**

### **Before**

### **After**

## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding

Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling

guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> Updates delegation transaction to conditionally include EIP-7702
authorization with new error handling, expands tests, and bumps
transaction-related controllers.
> 
> - **Delegation utils (`app/util/transactions/delegation.ts`)**:
> - Build authorization from
`TransactionController.isAtomicBatchSupported` per-chain result; skip if
`isSupported`.
> - Add errors for unsupported chains and missing
`upgradeContractAddress`.
> - Use `getNonceLock` nonce and
`KeyringController:signEip7702Authorization` to construct
`authorizationList`.
> - Support overwriting existing `delegationAddress` when upgrade target
differs; logging adjustments.
> - **Tests (`app/util/transactions/delegation.test.ts` + snapshot)**:
> - Add coverage for already-upgraded, different-upgrade targets,
signing calls, and new error cases.
>   - Update snapshot naming and expectations.
> - **Dependencies**:
> - Bump `@metamask/transaction-controller` to `62.4.0` and
`@metamask/transaction-pay-controller` to `10.3.0` (with lockfile
updates).
> 
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
310fa44. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->


[509b61d](509b61d)

---------

Co-authored-by: Matthew Walsh <matthew.walsh@consensys.net>
Co-authored-by: João Loureiro <175489935+joaoloureirop@users.noreply.github.com>
@socket-security

socket-security Bot commented Dec 2, 2025 •

Copy link
Copy Markdown

All alerts resolved. Learn more about Socket for GitHub.

This PR previously contained dependency changes with security issues that have been resolved, removed, or ignored.

Ignoring alerts on:

  • npm/@metamask/network-controller@27.0.0

View full report

@github-actions

github-actions Bot commented Dec 5, 2025

Copy link
Copy Markdown
Contributor

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

This PR updates the change log for 7.60.2. (Hotfix - no test plan
generated.)

---------

Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>
Co-authored-by: João Loureiro <175489935+joaoloureirop@users.noreply.github.com>
@joaoloureirop
joaoloureirop marked this pull request as ready for review December 5, 2025 00:48
@joaoloureirop
joaoloureirop requested a review from a team as a code owner December 5, 2025 00:48
@joaoloureirop

Copy link
Copy Markdown
Contributor

@SocketSecurity ignore npm/@metamask/network-controller@27.0.0

@github-actions

github-actions Bot commented Dec 5, 2025

Copy link
Copy Markdown
Contributor

🔍 Smart E2E Test Selection

  • Selected E2E tags: SmokePredictions, SmokeConfirmationsRedesigned
  • Risk Level: medium
  • AI Confidence: 75%
click to see 🤖 AI reasoning details

After analyzing the changed files, I've identified the following:

Main Changes:

  1. Predict Feature (usePredictEligibility.ts): Added auto-refresh polling functionality when country data is missing. This is a feature enhancement for the Predict feature with retry logic and proper debouncing. The changes include comprehensive test coverage updates.

  2. Transaction Delegation (delegation.ts): Modified delegation transaction handling with EIP-7702 authorization. This appears to be related to account upgrades and transaction payment flows. The changes include updates to authorization list building and delegation transaction construction.

  3. Build Configuration: Updates to package.json, yarn.lock, Android build.gradle, iOS project file, and bitrise.yml - these are infrastructure changes that support the above functional changes.

  4. CHANGELOG.md: Documents version 7.60.2 with these specific fixes mentioned:

    • Cherry-pick fix for overwriting account upgrade in metamask pay
    • Cherry-pick feat for adding auto-refresh polling when country is missing

Test Tag Selection:

  • SmokePredictions: The Predict eligibility polling changes directly impact Predictions functionality. The auto-refresh mechanism could affect how users interact with Predict features when country data is loading.

  • SmokeConfirmationsRedesigned: The delegation transaction changes affect transaction confirmation flows, particularly for MetaMask Pay and account upgrades with EIP-7702 authorization. These are core transaction handling modifications that impact confirmations.

Risk Assessment: Medium

  • The Predict changes involve polling logic that could impact UX if not working correctly
  • The delegation changes touch core transaction handling with EIP-7702 authorization logic
  • Both have test coverage but involve critical flows
  • Build configuration changes generally don't add functional risk but indicate deployment changes

Why not other tags:

  • SmokeCore/SmokeWalletPlatform: While delegation touches transaction handling, the changes are specific to delegation/authorization flows, not core wallet operations
  • SmokeRamps: MetaMask Pay is mentioned in CHANGELOG but the code changes are in delegation/authorization, not ramp flows directly
  • Other tags: No evidence of changes to assets, swaps, staking, etc.

Confidence: 75%
I have good visibility into the functional changes (Predict polling and delegation authorization) and their test coverage. The CHANGELOG confirms these are the intended changes for 7.60.2. However, I cannot see the full dependency changes in package.json (git diff wasn't available) which might reveal additional impacts.

View GitHub Actions results

@sonarqubecloud

sonarqubecloud Bot commented Dec 5, 2025

Copy link
Copy Markdown

@joaoloureirop
joaoloureirop merged commit 8886580 into stable Dec 5, 2025
81 of 82 checks passed
@github-actions github-actions Bot locked and limited conversation to collaborators Dec 5, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

release-7.60.2 Issue or pull request that will be included in release 7.60.2 team-bots Bot team (for MetaMask Bot, Runway Bot, etc.)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants