Skip to content

chore(runway): cherry-pick fix(predict): stabilize Predict pay-with-any-token quote updates#30187

Merged
chloeYue merged 1 commit into
release/7.77.0from
cherry-pick-7-77-0-ec66ea6
May 14, 2026
Merged

chore(runway): cherry-pick fix(predict): stabilize Predict pay-with-any-token quote updates#30187
chloeYue merged 1 commit into
release/7.77.0from
cherry-pick-7-77-0-ec66ea6

Conversation

@runway-github

@runway-github runway-github Bot commented May 14, 2026

Copy link
Copy Markdown
Contributor

Description

This fixes Predict pay-with-any-token quote and CTA timing issues that
could appear when users changed payment tokens.

The quote trigger previously deduped updates only by amount, so a new
transaction or selected token using the same amount could skip
updatePendingAmount / updateTokenAmountCallback and fail to start
the quote request. This PR keys those emissions by transaction id, token
address, and chain id so the same amount is still emitted when the
active transaction or payment token changes.

The Predict buy CTA could also remain enabled briefly while the payment
selector was closing and before the new quote loading state appeared.
This PR adds a Predict-only payment-selector navigation lock in
usePredictBuyConditions, disables the buy CTA/pay row immediately when
the selector opens, and releases the lock one second after the screen
regains focus.

It also waits for account tokens before defaulting back to Predict
balance, avoiding an early fallback while token data is still empty.

Finally, this keeps transaction-pay alert text visible in the Predict
bottom-sheet flow, including while quote/pay-fee loading is in progress,
and persists order-failed banners after the controller refreshes active
order state, preventing alert/banner flicker.

When a pay-totals alert is returned with fee data, the displayed Total
now still includes the deposit fee so users can see the actual amount
required by the selected payment token.

Changelog

CHANGELOG entry: Fixed bugs that could prevent Predict
pay-with-any-token quotes and alerts from refreshing correctly after
changing payment tokens

Related issues

Fixes:
PRED-882

Manual testing steps

Feature: Predict pay with any token quote refresh

  Scenario: user changes the payment token before placing a bet
    Given the Predict pay-with-any-token feature is enabled
    And the user opens a Predict buy preview with a valid bet amount
    And an external payment token is selected

    When the user opens the payment token selector
    Then the buy CTA is disabled while the selector is open

    When the user selects a different supported payment token
    And the selector closes
    Then the buy CTA remains disabled while the quote refresh starts
    And the quote request is triggered for the selected token and current bet amount
    And the buy CTA only becomes enabled after the quote state has settled

  Scenario: user sees payment and order errors in the Predict bottom sheet
    Given the user opens a Predict buy preview in bottom-sheet mode

    When the selected payment token cannot cover the quote
    Then the transaction-pay alert remains visible

    When order placement fails
    Then the order-failed banner remains visible until the user retries, changes the amount, or closes the sheet

Screenshots/Recordings

Before

N/A

After

N/A

Pre-merge author checklist

Performance checks (if applicable)

  • I've tested on Android
    • Ideally on a mid-range device; emulator is acceptable
  • I've tested with a power user scenario
  • Use these power-user
    SRPs

    to import wallets with many accounts and tokens
  • I've instrumented key operations with Sentry traces for production
    performance metrics
  • See trace() for usage and
    addToken
    for an example

For performance guidelines and tooling, see the Performance
Guide
.

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.

Note

Medium Risk
Touches Predict buy/payment gating, navigation timing, and error
surfacing logic; issues could block order placement or hide critical
alerts if the new lock/settling conditions misfire.

Overview
Predict pay-with-any-token quote/CTA timing is hardened. Adds a
payment-selector navigation lock (with 1s delayed unlock + 5s safety
timeout) and threads it through
PredictBuyWithAnyToken/usePredictBuyConditions to disable the buy
CTA and PredictPayWithRow immediately while the selector is
opening/closing.

Quote settling and emissions are made token/tx-aware.
usePredictBuyConditions now treats settling as a token+chain+amount
key (not just token address), and PredictPayWithAnyTokenInfo dedupes
updatePendingAmount/updateTokenAmount by transactionMeta.id + token address + chainId so selecting a new token/tx with the same amount
still re-triggers quotes.

Error UX is refined for sheet mode. usePredictBuyError now
returns errorMessageSource, prioritizes blocking pay-alert text (even
while pay fees load), persists order_failed banners across controller
refreshes, and clears persisted banners on token change;
PredictBuyWithAnyToken conditionally suppresses only
insufficient-balance helper text in Change Payment/Add Funds modes while
keeping blocking pay alerts visible alongside banners.

Default token and fee display behavior is adjusted.
usePredictDefaultPaymentToken waits for account tokens before falling
back, and usePredictBuyInfo always computes depositFee from
payTotals (including when pay alerts exist) without caching a “last
accepted” fee during confirming.

Reviewed by Cursor Bugbot for commit
ea34d01. Bugbot is set up for automated
code reviews on this repo. Configure
here.

PRED-882:
https://consensyssoftware.atlassian.net/browse/PRED-882?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ ec66ea6

….77.0 (#30064)

<!--
Please submit this PR as a draft initially.

Do not mark it as "Ready for review" until this PR meets the canonical
Definition of Ready For Review in `docs/readme/ready-for-review.md`.

In short: the template must be materially complete (not just section
titles
present), all status checks must be currently passing, and the only
expected
follow-up commits must be reviewer-driven.
-->

<!--
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?
-->

This fixes Predict pay-with-any-token quote and CTA timing issues that
could appear when users changed payment tokens.

The quote trigger previously deduped updates only by amount, so a new
transaction or selected token using the same amount could skip
`updatePendingAmount` / `updateTokenAmountCallback` and fail to start
the quote request. This PR keys those emissions by transaction id, token
address, and chain id so the same amount is still emitted when the
active transaction or payment token changes.

The Predict buy CTA could also remain enabled briefly while the payment
selector was closing and before the new quote loading state appeared.
This PR adds a Predict-only payment-selector navigation lock in
`usePredictBuyConditions`, disables the buy CTA/pay row immediately when
the selector opens, and releases the lock one second after the screen
regains focus.

It also waits for account tokens before defaulting back to Predict
balance, avoiding an early fallback while token data is still empty.

Finally, this keeps transaction-pay alert text visible in the Predict
bottom-sheet flow, including while quote/pay-fee loading is in progress,
and persists order-failed banners after the controller refreshes active
order state, preventing alert/banner flicker.

When a pay-totals alert is returned with fee data, the displayed Total
now still includes the deposit fee so users can see the actual amount
required by the selected payment token.

<!--
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: Fixed bugs that could prevent Predict
pay-with-any-token quotes and alerts from refreshing correctly after
changing payment tokens

Fixes:
[PRED-882](https://consensyssoftware.atlassian.net/browse/PRED-882?atlOrigin=eyJpIjoiNTlkZTZkMmI1MTJkNDEyZmE0ZTE5NjUxZmVhNDg1ZjQiLCJwIjoiaiJ9)

```gherkin
Feature: Predict pay with any token quote refresh

  Scenario: user changes the payment token before placing a bet
    Given the Predict pay-with-any-token feature is enabled
    And the user opens a Predict buy preview with a valid bet amount
    And an external payment token is selected

    When the user opens the payment token selector
    Then the buy CTA is disabled while the selector is open

    When the user selects a different supported payment token
    And the selector closes
    Then the buy CTA remains disabled while the quote refresh starts
    And the quote request is triggered for the selected token and current bet amount
    And the buy CTA only becomes enabled after the quote state has settled

  Scenario: user sees payment and order errors in the Predict bottom sheet
    Given the user opens a Predict buy preview in bottom-sheet mode

    When the selected payment token cannot cover the quote
    Then the transaction-pay alert remains visible

    When order placement fails
    Then the order-failed banner remains visible until the user retries, changes the amount, or closes the sheet
```

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

N/A

N/A

<!--
Every checklist item must be consciously assessed before marking this PR
as
"Ready for review". A checked box means you deliberately considered that
responsibility, not that you literally performed every action listed.

Unchecked boxes are ambiguous: they are not an implicit "N/A" and they
are not
a silent "skip". See `docs/readme/ready-for-review.md` for the full
checklist
semantics.
-->

- [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.

- [x] I've tested on Android
  - Ideally on a mid-range device; emulator is acceptable
- [x] I've tested with a power user scenario
- Use these [power-user
SRPs](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/edit-v2/401401446401?draftShareId=9d77e1e1-4bdc-4be1-9ebb-ccd916988d93)
to import wallets with many accounts and tokens
- [x] I've instrumented key operations with Sentry traces for production
performance metrics
- See [`trace()`](/app/util/trace.ts) for usage and
[`addToken`](/app/components/Views/AddAsset/components/AddCustomToken/AddCustomToken.tsx#L274)
for an example

For performance guidelines and tooling, see the [Performance
Guide](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/400085549067/Performance+Guide+for+Engineers).

<!--
Reviewer checklist items follow the same semantics as the author
checklist: an
unchecked box is ambiguous, a checked box means the reviewer consciously
assessed that responsibility. See `docs/readme/ready-for-review.md`.
-->

- [ ] 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.

<!-- Generated with the help of the pr-description AI skill -->

<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> **Medium Risk**
> Touches Predict buy/payment gating, navigation timing, and error
surfacing logic; issues could block order placement or hide critical
alerts if the new lock/settling conditions misfire.
>
> **Overview**
> **Predict pay-with-any-token quote/CTA timing is hardened.** Adds a
payment-selector navigation lock (with 1s delayed unlock + 5s safety
timeout) and threads it through
`PredictBuyWithAnyToken`/`usePredictBuyConditions` to disable the buy
CTA and `PredictPayWithRow` immediately while the selector is
opening/closing.
>
> **Quote settling and emissions are made token/tx-aware.**
`usePredictBuyConditions` now treats settling as a *token+chain+amount*
key (not just token address), and `PredictPayWithAnyTokenInfo` dedupes
`updatePendingAmount`/`updateTokenAmount` by `transactionMeta.id + token
address + chainId` so selecting a new token/tx with the same amount
still re-triggers quotes.
>
> **Error UX is refined for sheet mode.** `usePredictBuyError` now
returns `errorMessageSource`, prioritizes blocking pay-alert text (even
while pay fees load), persists `order_failed` banners across controller
refreshes, and clears persisted banners on token change;
`PredictBuyWithAnyToken` conditionally suppresses only
insufficient-balance helper text in Change Payment/Add Funds modes while
keeping blocking pay alerts visible alongside banners.
>
> **Default token and fee display behavior is adjusted.**
`usePredictDefaultPaymentToken` waits for account tokens before falling
back, and `usePredictBuyInfo` always computes `depositFee` from
`payTotals` (including when pay alerts exist) without caching a “last
accepted” fee during confirming.
>
> <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit
ea34d01. Bugbot is set up for automated
code reviews on this repo. Configure
[here](https://www.cursor.com/dashboard/bugbot).</sup>
<!-- /CURSOR_SUMMARY -->

[PRED-882]:
https://consensyssoftware.atlassian.net/browse/PRED-882?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
@runway-github runway-github Bot requested a review from a team as a code owner May 14, 2026 13:59
@github-actions

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.

@metamaskbotv2 metamaskbotv2 Bot added the team-bots Bot team (for MetaMask Bot, Runway Bot, etc.) label May 14, 2026
@github-actions

Copy link
Copy Markdown
Contributor

🔍 Smart E2E Test Selection

⏭️ Smart E2E selection skipped - PR targets a release branch (release/*)

All E2E tests pre-selected.

View GitHub Actions results

@sonarqubecloud

Copy link
Copy Markdown

@chloeYue chloeYue left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@chloeYue chloeYue merged commit d7ffcee into release/7.77.0 May 14, 2026
179 of 182 checks passed
@chloeYue chloeYue deleted the cherry-pick-7-77-0-ec66ea6 branch May 14, 2026 16:19
@github-actions github-actions Bot locked and limited conversation to collaborators May 14, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

size-XL team-bots Bot team (for MetaMask Bot, Runway Bot, etc.)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants