Skip to content

chore(runway): cherry-pick fix(Rewards): error when visiting rewards tab#29875

Merged
Montoya merged 1 commit into
release/7.76.0from
cherry-pick-7-76-0-8208502
May 7, 2026
Merged

chore(runway): cherry-pick fix(Rewards): error when visiting rewards tab#29875
Montoya merged 1 commit into
release/7.76.0from
cherry-pick-7-76-0-8208502

Conversation

@runway-github

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

Copy link
Copy Markdown
Contributor

Description

https://consensyssoftware.atlassian.net/browse/RWDS-1267
The Rewards crash likely came from an older persisted Rewards Redux
state that did not have newer array fields, especially campaigns. On
affected devices, selectCampaigns could return undefined.

It was account/device dependent because persisted state differs per
user/install.

Fix Applied: hardened both the restore path and selector path to
fallback to initial state (empty array or object instead of undefined)

Changelog

CHANGELOG entry: null

Related issues

Fixes: https://consensyssoftware.atlassian.net/browse/RWDS-1267

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

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

Low Risk
Low risk: changes are defensive fallbacks for missing/undefined
persisted state and selector inputs, with added tests; behavior should
only differ for legacy/partial states.

Overview
Prevents Rewards tab crashes caused by older/partial persisted
Redux/controller state by defaulting missing fields to safe empty
values
.

Selectors and rehydrate logic now coalesce undefined arrays/objects
(e.g., campaigns, season arrays, benefits, dismissed-toasts map,
controller accounts/subscriptions) to empty defaults, and
RewardsController default state was extracted into defaultState.ts
and reused. Test coverage was expanded to lock in these
upgrade/undefined-state behaviors.

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

[8208502](https://github.com/MetaMask/metamask-mobile/commit/8208502740d27a04b54e338fb640edfd36f3c585)

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

https://consensyssoftware.atlassian.net/browse/RWDS-1267
The Rewards crash likely came from an older persisted Rewards Redux
state that did not have newer array fields, especially campaigns. On
affected devices, selectCampaigns could return undefined.

It was account/device dependent because persisted state differs per
user/install.

Fix Applied: hardened both the restore path and selector path to
fallback to initial state (empty array or object instead of undefined)

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

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

Fixes: https://consensyssoftware.atlassian.net/browse/RWDS-1267

```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]
```

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

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

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

<!--
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`.
-->

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] 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]
> **Low Risk**
> Low risk: changes are defensive fallbacks for missing/undefined
persisted state and selector inputs, with added tests; behavior should
only differ for legacy/partial states.
>
> **Overview**
> Prevents Rewards tab crashes caused by older/partial persisted
Redux/controller state by **defaulting missing fields to safe empty
values**.
>
> Selectors and rehydrate logic now coalesce `undefined` arrays/objects
(e.g., `campaigns`, season arrays, `benefits`, dismissed-toasts map,
controller `accounts`/`subscriptions`) to empty defaults, and
`RewardsController` default state was extracted into `defaultState.ts`
and reused. Test coverage was expanded to lock in these
upgrade/undefined-state behaviors.
>
> <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit
d7b351d. 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 May 7, 2026 16:12
@github-actions

github-actions Bot commented May 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.

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

github-actions Bot commented May 7, 2026

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

@github-actions github-actions Bot added the size-M label May 7, 2026
@sonarqubecloud

sonarqubecloud Bot commented May 7, 2026

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

@Montoya Montoya enabled auto-merge (squash) May 7, 2026 16:40
@Montoya Montoya merged commit 28b7e89 into release/7.76.0 May 7, 2026
115 checks passed
@Montoya Montoya deleted the cherry-pick-7-76-0-8208502 branch May 7, 2026 16:54
@github-actions github-actions Bot locked and limited conversation to collaborators May 7, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

size-M 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