[pull] main from MetaMask:main#309
Merged
Merged
Conversation
<!--
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?
-->
This PR fixes several issues affecting the Card feature to improve
stability and UI consistency:
- Fixed negative allowance values displayed on CardHome
- Fixed token priority not updating correctly after delegation
- Fixed text clipping in the Asset BottomSheet
- Ensured all addresses are properly checksummed
- Fixed BottomSheet layering issue where it appeared below the header
## **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: Negative allowance values displayed on CardHome
CHANGELOG entry: Token priority not updating after delegation
CHANGELOG entry: Text clipping in Asset BottomSheet
CHANGELOG entry: Missing address checksum formatting
CHANGELOG entry: BottomSheet not appearing above header
## **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**
- [ ] 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]
> Moves add-funds and asset-selection to dedicated modal routes, adds a
spending limit progress bar with latest-allowance fetching, improves OTP
error UX, and introduces a reusable priority-update hook.
>
> - **Navigation/Architecture**:
> - Add `CardModals` stack with `CardAddFundsModal` and
`CardAssetSelectionModal`; migrate CardHome/SpendingLimit to navigate to
these modals.
> - **CardHome**:
> - Replace inline bottom sheets with modal navigation for Add Funds and
Asset Selection.
> - Add Spending Limit progress bar (with skeleton) when
`AllowanceState.Limited`; hide for unsupported tokens (e.g., `aUSDC`).
> - Gate "close to limit" warning by token support; minor style
additions.
> - **SpendingLimit**:
> - Open Asset Selection as a modal (selection-only flow returning via
`callerRoute`).
> - Block back navigation while delegating; update token priority after
successful delegation; clear cache when needed.
> - **Bottom Sheets**:
> - Refactor `AddFundsBottomSheet` and `AssetSelectionBottomSheet` to
modal components using `navUtils` params; show balances, filter by
network/location; close-on-navigate behavior.
> - **Hooks**:
> - New `useUpdateTokenPriority` to reorder wallet priorities and update
Redux/cache.
> - New `useGetLatestAllowanceForPriorityToken` to read latest approval
from logs; integrated in `useLoadCardData` to populate `totalAllowance`.
> - `useAssetBalances`: improved fiat fallbacks and proportional/zero
handling.
> - `useGetCardExternalWalletDetails`: stop bulk `totalAllowance` fetch;
map details without it.
> - **SDK**:
> - Implement `getLatestAllowanceFromLogs` (ethers log scan); make some
helpers sync; include tenant ID in `createOnboardingConsent` using API
key.
> - **Auth UX**:
> - OTP error shown below fields; clear on input; tests updated.
> - **Utils**:
> - `truncateAddress` now checksums hex addresses.
> - **Tests**:
> - Extensive updates/new tests across views, hooks, SDK, and
components.
>
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
327555d. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->
… market is resolved (#22358) <!-- 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** - Now shows the resolved outcomes under the outcomes tab (on the market details screen) when the market is resolved. - Sidenote the `app/components/UI/Predict/providers/polymarket/PolymarketProvider.ts` view is increasingly in need of a refactor, but holding off while we prioritize backlog, etc <!-- 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: NA ## **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** <img width="420" alt="image" src="https://github.com/user-attachments/assets/7a16c912-b905-4499-bb99-09dba3e224a7" /> <img width="420" alt="image" src="https://github.com/user-attachments/assets/62e45d3b-253c-47b7-9ca2-965b2f4f6f52" /> ## **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** - [ ] 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] > Adds `PredictMarketOutcomeResolved` and integrates it to display resolved outcomes in the Outcomes tab for closed and partially resolved markets, with tests and i18n updates. > > - **UI/Logic (Predict Market Details)**: > - **Resolved Outcomes Rendering**: Introduces `renderOutcomesContent` to show: > - Closed binary markets: winning/losing outcomes. > - Closed multi-outcome markets: list of resolved outcomes via `PredictMarketOutcomeResolved`. > - Open markets with partial resolution: expandable "Resolved outcomes" section using `PredictMarketOutcomeResolved` plus open outcomes. > - Integrates `PredictMarketOutcomeResolved` into `PredictMarketDetails` and updates tab defaulting for closed markets. > - **New Component**: > - `components/PredictMarketOutcomeResolved`: Displays group title, formatted volume, winner/draw, and confirmation icon. > - **Tests**: > - Adds comprehensive tests for `PredictMarketOutcomeResolved` (winner/draw, formatting, styling). > - Updates `PredictMarketDetails` tests to assert new outcomes rendering and collapsed/expanded behavior. > - **i18n**: > - Adds `predict.outcome_draw` string. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit a7b83c0. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
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.
2 participants
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )