Skip to content

fix(predict): reset active order state on payment token clear and suppress stale balance alert cp-7.73.0#28491

Merged
matallui merged 2 commits into
mainfrom
predict/mmpay-test-issues
Apr 7, 2026
Merged

fix(predict): reset active order state on payment token clear and suppress stale balance alert cp-7.73.0#28491
matallui merged 2 commits into
mainfrom
predict/mmpay-test-issues

Conversation

@caieu

@caieu caieu commented Apr 7, 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.

caieu added 2 commits April 7, 2026 16:46
`resetSelectedPaymentToken` was calling `setSelectedPaymentToken(null)`
which only clears the token without transitioning the active order state
machine. This left `activeOrder.state` stuck at `pay_with_any_token`
when the user had enough predict balance to cover the bet.
Route `resetSelectedPaymentToken` through `selectPaymentToken(null)`
instead, which treats null as a balance token selection and properly
transitions `PAY_WITH_ANY_TOKEN → PREVIEW`.
The insufficient pay token balance alert was firing with a stale
deposit amount because it only syncs to TransactionPayController
when the input loses focus. Gate the alert behind `isInputFocused`
so it only appears after the user finishes editing.
@github-actions

github-actions Bot commented Apr 7, 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-predict Predict team label Apr 7, 2026
@github-actions github-actions Bot added the size-S label Apr 7, 2026
@github-actions

github-actions Bot commented Apr 7, 2026

Copy link
Copy Markdown
Contributor

🔍 Smart E2E Test Selection

⏭️ Smart E2E selection skipped - draft PR

All E2E tests pre-selected.

View GitHub Actions results

@caieu caieu marked this pull request as ready for review April 7, 2026 20:03
@caieu caieu requested a review from a team as a code owner April 7, 2026 20:03
@sonarqubecloud

sonarqubecloud Bot commented Apr 7, 2026

Copy link
Copy Markdown

@github-actions

github-actions Bot commented Apr 7, 2026

Copy link
Copy Markdown
Contributor

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

@matallui matallui added this pull request to the merge queue Apr 7, 2026
Merged via the queue into main with commit 4276cd7 Apr 7, 2026
113 of 114 checks passed
@matallui matallui deleted the predict/mmpay-test-issues branch April 7, 2026 20:50
@github-actions github-actions Bot locked and limited conversation to collaborators Apr 7, 2026
@weitingsun weitingsun added release-7.74.0 Issue or pull request that will be included in release 7.74.0 and removed release-7.78.0 labels Apr 8, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

release-7.74.0 Issue or pull request that will be included in release 7.74.0 size-S team-predict Predict team

Projects

None yet

4 participants