Skip to content

chore(runway): cherry-pick fix(predict): reset active order state on payment token clear and suppress stale balance alert cp-7.73.0#28529

Merged
chloeYue merged 1 commit into
release/7.73.0from
runway-cherry-pick-7.73.0-1775653893
Apr 8, 2026
Merged

chore(runway): cherry-pick fix(predict): reset active order state on payment token clear and suppress stale balance alert cp-7.73.0#28529
chloeYue merged 1 commit into
release/7.73.0from
runway-cherry-pick-7.73.0-1775653893

Conversation

@runway-github

@runway-github runway-github Bot commented Apr 8, 2026

Copy link
Copy Markdown
Contributor

Description

Fixes two issues in the Predict buy flow when using the
pay-with-any-token feature:

  1. Active order state stuck at pay_with_any_token: When the user had
    enough predict balance to cover the bet, resetSelectedPaymentToken()
    cleared the payment token via setSelectedPaymentToken(null) but never
    transitioned the active order state machine from PAY_WITH_ANY_TOKEN back
    to PREVIEW. Fixed by routing through selectPaymentToken(null) instead,
    which treats null as a balance token selection and properly transitions
    the state.
  2. Premature insufficient balance alert while typing: The insufficient
    pay token balance alert fired while the user was still editing the
    amount, because the deposit amount only syncs to
    TransactionPayController when the input loses focus. Gated the alert
    behind isInputFocused so it only appears after the user finishes
    editing.

Changes

  • PredictController.selectPaymentToken — Removed the null early-return
    guard; null is now treated as balance token (isBalanceToken = true),
    triggering the PAY_WITH_ANY_TOKEN → PREVIEW transition
  • usePredictPaymentToken.resetSelectedPaymentToken — Calls
    selectPaymentToken(null) instead of setSelectedPaymentToken(null)
  • usePredictBuyError — Added isInputFocused param to suppress the
    insufficient pay token balance alert while the input is focused
  • PredictBuyWithAnyToken — Passes isInputFocused through to
    usePredictBuyError
  • Updated tests for all changes

Changelog

CHANGELOG entry: null

Related issues

Fixes: #28492
#28493

Manual testing steps

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

Before

After

Pre-merge author checklist

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 the Predict buy flow state machine and error handling; small
but user-facing behavior changes could affect order transitions and when
balance errors are shown.

Overview
Fixes the Predict pay-with-any-token buy flow so clearing the
payment token (passing null) is treated as selecting Predict balance,
which also resets the active order from PAY_WITH_ANY_TOKEN back to
PREVIEW.

Updates usePredictPaymentToken.resetSelectedPaymentToken to route
through selectPaymentToken(null) (instead of directly setting state),
and adds an isInputFocused gate in usePredictBuyError to suppress
the insufficient pay-token balance alert while the amount input is being
edited. Tests were updated to cover the new null behavior and the
input-focus suppression.

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

[4276cd7](https://github.com/MetaMask/metamask-mobile/commit/4276cd7cdf2e1ee0a6a1792bea94e352062f8228)

…payment token clear and suppress stale balance alert cp-7.73.0 (#28491)

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

Fixes two issues in the Predict buy flow when using the
pay-with-any-token feature:

1. Active order state stuck at pay_with_any_token: When the user had
enough predict balance to cover the bet, resetSelectedPaymentToken()
cleared the payment token via setSelectedPaymentToken(null) but never
transitioned the active order state machine from PAY_WITH_ANY_TOKEN back
to PREVIEW. Fixed by routing through selectPaymentToken(null) instead,
which treats null as a balance token selection and properly transitions
the state.
2. Premature insufficient balance alert while typing: The insufficient
pay token balance alert fired while the user was still editing the
amount, because the deposit amount only syncs to
TransactionPayController when the input loses focus. Gated the alert
behind isInputFocused so it only appears after the user finishes
editing.

Changes
- PredictController.selectPaymentToken — Removed the null early-return
guard; null is now treated as balance token (isBalanceToken = true),
triggering the PAY_WITH_ANY_TOKEN → PREVIEW transition
- usePredictPaymentToken.resetSelectedPaymentToken — Calls
selectPaymentToken(null) instead of setSelectedPaymentToken(null)
- usePredictBuyError — Added isInputFocused param to suppress the
insufficient pay token balance alert while the input is focused
- PredictBuyWithAnyToken — Passes isInputFocused through to
usePredictBuyError
- Updated tests for all changes

<!--
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: #28492
#28493

## **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]
> **Medium Risk**
> Touches the Predict buy flow state machine and error handling; small
but user-facing behavior changes could affect order transitions and when
balance errors are shown.
> 
> **Overview**
> Fixes the Predict *pay-with-any-token* buy flow so clearing the
payment token (passing `null`) is treated as selecting Predict balance,
which also resets the active order from `PAY_WITH_ANY_TOKEN` back to
`PREVIEW`.
> 
> Updates `usePredictPaymentToken.resetSelectedPaymentToken` to route
through `selectPaymentToken(null)` (instead of directly setting state),
and adds an `isInputFocused` gate in `usePredictBuyError` to suppress
the insufficient pay-token balance alert while the amount input is being
edited. Tests were updated to cover the new `null` behavior and the
input-focus suppression.
> 
> <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit
75fc16f. Bugbot is set up for automated
code reviews on this repo. Configure
[here](https://www.cursor.com/dashboard/bugbot).</sup>
<!-- /CURSOR_SUMMARY -->
@runway-github runway-github Bot requested a review from a team as a code owner April 8, 2026 13:11
@github-actions

github-actions Bot commented Apr 8, 2026

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.

@metamaskbot metamaskbot added the team-bots Bot team (for MetaMask Bot, Runway Bot, etc.) label Apr 8, 2026
@github-actions github-actions Bot added size-S risk-medium Moderate testing recommended · Possible bug introduction risk labels Apr 8, 2026

@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 added the skip-smart-e2e-selection Skip Smart E2E selection, i.e. select all E2E tests to run label Apr 8, 2026
@github-actions github-actions Bot added risk-high Extensive testing required · High bug introduction risk and removed risk-medium Moderate testing recommended · Possible bug introduction risk labels Apr 8, 2026
@github-actions

github-actions Bot commented Apr 8, 2026

Copy link
Copy Markdown
Contributor

🔍 Smart E2E Test Selection

⏭️ Smart E2E selection skipped - skip-smart-e2e-selection label found

All E2E tests pre-selected.

View GitHub Actions results

@github-actions

github-actions Bot commented Apr 8, 2026

Copy link
Copy Markdown
Contributor

E2E Fixture Validation — Schema is up to date
16 value mismatches detected (expected — fixture represents an existing user).
View details

@sonarqubecloud

sonarqubecloud Bot commented Apr 8, 2026

Copy link
Copy Markdown

@chloeYue chloeYue merged commit 317287e into release/7.73.0 Apr 8, 2026
191 checks passed
@chloeYue chloeYue deleted the runway-cherry-pick-7.73.0-1775653893 branch April 8, 2026 15:25
@github-actions github-actions Bot locked and limited conversation to collaborators Apr 8, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

risk-high Extensive testing required · High bug introduction risk size-S skip-smart-e2e-selection Skip Smart E2E selection, i.e. select all E2E tests to run 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