Skip to content

Commit dd32eb0

Browse files
authored
fix: handle invalid timestamp (#20484)
<!-- 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** <!-- 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: ## **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** - [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. ## **Pre-merge reviewer checklist** - [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] > Adds InvalidTimestampError and retries silent auth/mobile join with server timestamp; improves error messages/tests; minor UI alignment; bumps solana snap. > > - **Backend (RewardsController)**: > - Retry `RewardsDataService:login` and `mobileJoin` when `InvalidTimestampError` occurs by re-signing with server-provided `timestamp` (single retry). > - Import and handle `InvalidTimestampError`; refine silent auth flow and logging; maintain state updates and cache invalidation. > - **Data Service**: > - Add `InvalidTimestampError` with server `timestamp` parsing; throw on `/auth/mobile-login` and `/wr/subscriptions/mobile-join` invalid timestamp responses. > - Improve error messages for `mobileJoin` (include server message). > - **Tests**: > - Expand unit tests to cover timestamp-retry paths, Solana signing, session token storage failures, cache invalidation, and error filtering; mock `RewardsDataService` appropriately. > - **UI**: > - Tweak `SeasonStatus` layout: left-align points block and right-align next-tier message with width constraint. > - **Dependencies**: > - Bump `@metamask/solana-wallet-snap` to `^2.4.1`. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 232780f. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
1 parent bb906a0 commit dd32eb0

File tree

7 files changed

+943
-624
lines changed

7 files changed

+943
-624
lines changed

app/components/UI/Rewards/components/SeasonStatus/SeasonStatus.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ const SeasonStatus: React.FC = () => {
193193
twClassName="gap-2 justify-between items-center"
194194
>
195195
<Box
196-
alignItems={BoxAlignItems.Center}
196+
alignItems={BoxAlignItems.Start}
197197
flexDirection={BoxFlexDirection.Row}
198198
twClassName="gap-2"
199199
>
@@ -215,7 +215,10 @@ const SeasonStatus: React.FC = () => {
215215
</Box>
216216

217217
{!!nextTierPointsNeeded && (
218-
<Text variant={TextVariant.BodySm} twClassName="text-alternative">
218+
<Text
219+
variant={TextVariant.BodySm}
220+
twClassName="text-alternative w-[50%] text-right"
221+
>
219222
{formatNumber(nextTierPointsNeeded)}{' '}
220223
{strings('rewards.to_level_up').toLowerCase()}
221224
</Text>

0 commit comments

Comments
 (0)