chore(runway): cherry-pick chore: fix time range change race condition cp-7.74.0#28956
Merged
Merged
Conversation
…n cp-7.74.0 (#28939) ## **Description** Fixes the token advanced chart staying scrolled back in time when users pan and then change the time range quickly. Also avoids sending previous range OHLCV into the WebView while the new fetch is still in flight **Problem** Viewport / scroll — TradingView keeps pan/scroll state inside the WebView. Changing range without a full new surface could reuse that state, so the chart looked wrong after a fast time-range change. Stale data — useOHLCVChart keeps the last ohlcvData until the new request completes. Right after a range change, props can show the new ohlcvSeriesKey but the old candle array (same reference). Sending that as SET_OHLCV_DATA for the new range causes bad data / races. **Solution** WebView key — Tie key to ohlcvSeriesKey (with ?? '' when the prop is omitted) so each series change remounts the WebView and drops inherited TradingView scroll state. ohlcvSeriesStaleSnapshotRef + guard — When the series key changes but ohlcvData is still the previous array reference, don’t sync full OHLCV; wait until the hook returns a new array reference, then send. useEffect on ohlcvSeriesKey — Reset loading / ready state (chartReadyCount, webViewLoaded, layout settle timers) and clear ohlcvSeriesStaleSnapshotRef. Reset activeIndicatorsRef, prevPositionLinesRef, and prevChartTypeRef so the new WebView gets indicators, position lines, and chart type (line vs candles) applied correctly without a default-candles flash. ## **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: Fixes race condition on timeRange switch ## **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] --> Uploading Screen Recording 2026-04-16 at 23.39.54.mov… ### **After** <!-- [screenshots/recordings] --> Uploading Screen Recording 2026-04-17 at 00.10.19.mov… ## **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. #### 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](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 - [ ] 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). ## **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 chart lifecycle/sync logic and WebView remount behavior, which could regress loading/skeleton timing or data updates across range switches if edge cases weren’t covered. > > **Overview** > Fixes a race on time-range changes in `AdvancedChart` by **remounting the WebView** when `ohlcvSeriesKey` changes (via a `key`) and resetting “ready/loading/layout settle” state so the new instance re-applies indicators, position lines, and chart type deterministically. > > Adds a **stale-series guard** (`ohlcvSeriesStaleSnapshotRef`) that suppresses `SET_OHLCV_DATA` syncing when the series key updates but `ohlcvData` is still the previous array reference, resuming only once fresh data arrives; updates tests to reflect the WebView remount/load sequence and stale-data wait behavior. > > <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit f7a52c7. Bugbot is set up for automated code reviews on this repo. Configure [here](https://www.cursor.com/dashboard/bugbot).</sup> <!-- /CURSOR_SUMMARY -->
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. |
Contributor
🔍 Smart E2E Test Selection⏭️ Smart E2E selection skipped - PR targets a release branch (release/*) All E2E tests pre-selected. |
Contributor
|
✅ E2E Fixture Validation — Schema is up to date |
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.



Description
Fixes the token advanced chart staying scrolled back in time when users
pan and then change the time range quickly. Also avoids sending previous
range OHLCV into the WebView while the new fetch is still in flight
Problem
Viewport / scroll — TradingView keeps pan/scroll state inside the
WebView. Changing range without a full new surface could reuse that
state, so the chart looked wrong after a fast time-range change.
Stale data — useOHLCVChart keeps the last ohlcvData until the new
request completes. Right after a range change, props can show the new
ohlcvSeriesKey but the old candle array (same reference). Sending that
as SET_OHLCV_DATA for the new range causes bad data / races.
Solution
WebView key — Tie key to ohlcvSeriesKey (with ?? '' when the prop is
omitted) so each series change remounts the WebView and drops inherited
TradingView scroll state.
ohlcvSeriesStaleSnapshotRef + guard — When the series key changes but
ohlcvData is still the previous array reference, don’t sync full OHLCV;
wait until the hook returns a new array reference, then send.
useEffect on ohlcvSeriesKey — Reset loading / ready state
(chartReadyCount, webViewLoaded, layout settle timers) and clear
ohlcvSeriesStaleSnapshotRef. Reset activeIndicatorsRef,
prevPositionLinesRef, and prevChartTypeRef so the new WebView gets
indicators, position lines, and chart type (line vs candles) applied
correctly without a default-candles flash.
Changelog
CHANGELOG entry: Fixes race condition on timeRange switch
Related issues
Fixes:
Manual testing steps
Screenshots/Recordings
Before
Uploading Screen Recording 2026-04-16 at 23.39.54.mov…
After
Uploading Screen Recording 2026-04-17 at 00.10.19.mov…
Pre-merge author checklist
Docs and MetaMask Mobile
Coding
Standards.
if applicable
guidelines).
Not required for external contributors.
Performance checks (if applicable)
SRPs
to import wallets with many accounts and tokens
performance metrics
trace()for usage andaddTokenfor an example
For performance guidelines and tooling, see the Performance
Guide.
Pre-merge reviewer checklist
app, test code being changed).
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
Note
Medium Risk
Touches chart lifecycle/sync logic and WebView remount behavior, which
could regress loading/skeleton timing or data updates across range
switches if edge cases weren’t covered.
Overview
Fixes a race on time-range changes in
AdvancedChartby remountingthe WebView when
ohlcvSeriesKeychanges (via akey) and resetting“ready/loading/layout settle” state so the new instance re-applies
indicators, position lines, and chart type deterministically.
Adds a stale-series guard (
ohlcvSeriesStaleSnapshotRef) thatsuppresses
SET_OHLCV_DATAsyncing when the series key updates butohlcvDatais still the previous array reference, resuming only oncefresh data arrives; updates tests to reflect the WebView remount/load
sequence and stale-data wait behavior.
Reviewed by Cursor Bugbot for commit
f7a52c7. Bugbot is set up for automated
code reviews on this repo. Configure
here.