[pull] main from MetaMask:main#401
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** This PR introduce a change to the behavior of destination asset picker to match that of extension. We are introducing a mechanism to automatically change the destination asset to match the source chain when users land on swaps. This behavior is canceled when users flip swap assets or manually select a destination asset. <!-- 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: Automatically change the destination asset to match source asset chain when users land on swaps. ## **Related issues** Fixes: https://consensyssoftware.atlassian.net/browse/SWAPS-3565 ## **Manual testing steps** Reopen app after manual dest selection: Kill app after manually selecting dest token → reopen → navigate to swaps → change source network → dest token auto-updates Manual dest selection within session: Manually select dest token → change source network → dest token does NOT auto-update Flip tokens: Tap flip button → change source network → dest token does NOT auto-update (flip counts as manual) Navigate away and return: Manually set dest → go to dashboard → return to swaps → change source network → dest token auto-updates Fresh swaps navigation: Open swaps fresh → select single source network → dest token auto-updates to match Open from token details: Previously set dest manually → open swaps from token details → dest auto-update is enabled again Background app (no kill): Manually select dest → background app → return to swaps → dest token remains manually selected. ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** https://github.com/user-attachments/assets/b060c665-4747-4b18-9b77-095c3d6f8918 <!-- [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] > Automatically updates the destination token when the source network/token changes, unless the user manually selected or flipped tokens, powered by a new hook and Redux flag. > > - **State/Redux** > - Add `bridge.isDestTokenManuallySet` to `initialState`, reducers, actions (`setIsDestTokenManuallySet`), and selector `selectIsDestTokenManuallySet`. > - Ensure `setDestToken` updates `selectedDestChainId` without altering the manual flag. > - **Hooks** > - New `useAutoUpdateDestToken` hook to set `destToken` based on source changes (default dest, native fallback, BTC→ETH special-case) when `isDestTokenManuallySet` is false. > - Update `useSwapBridgeNavigation` to reset `isDestTokenManuallySet` to `false` on entry and preseed `destToken` (default or native fallback). > - Update `useSwitchTokens` to set `isDestTokenManuallySet` to `true` on flip. > - **UI** > - `BridgeSourceNetworkSelector`/`BridgeSourceTokenSelector`: when a single source chain/token is chosen, set source and call `autoUpdateDestToken`; also handle EVM/non‑EVM switching. > - `BridgeDestTokenSelector`: on selection, set `destToken` and mark `isDestTokenManuallySet=true`. > - **Tests** > - Add/expand tests for auto-update logic, manual override, navigation reset, network switching, and selectors across affected components/hooks. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 2d030b5. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
Dependency #23517 (merged) ## **Description** This PR is a **fast-follow to #23517 (expo-font implementation)** that isolates brand font changes (MM Sans and MM Poly) requiring review from code owners outside the mobile-platform and design-system teams. ### Strategy By splitting these changes into a separate PR, we can: - Avoid #23517 becoming stale while waiting for reviews from multiple code owners - Get brand font updates reviewed and merged independently - Reduce merge conflicts and review complexity ### Changes Updates MM Sans and MM Poly font references to use PostScript names with hyphens instead of spaces: - `'MM Sans Regular'` → `'MMSans-Regular'` - `'MM Poly'` / `'MM Poly Regular'` → `'MMPoly-Regular'` Removes platform-specific `Platform.select` wrappers since PostScript names work consistently across iOS and Android. ### Why PostScript Names? iOS requires the PostScript name from font file metadata (not the Full Name or filename). By using PostScript names and naming our font files to match, both platforms can reference fonts consistently. ## **Changelog** CHANGELOG entry: null ## **Related issues** Related to: #23517 ## **Manual testing steps** ```gherkin Feature: Brand font rendering Scenario: user views screens with MM Sans and MM Poly fonts Given the app is built and installed on a device When user navigates to onboarding screens And user views Perps GTM modal And user views Predict GTM modal And user views Rewards onboarding And user views Earn education views Then MM Sans and MM Poly fonts render correctly without fallback to system fonts ``` ## **Screenshots/Recordings** ### **Before** Brand fonts(MM Poly and MM Sans) will be currently broken ### **After** Screenshots and recordings taken from original PR #23517 which these changes were broken out from. **iOS** https://github.com/user-attachments/assets/d73b1049-b5d4-43e9-9aea-2273e216e549 Key screens: - MM Sans & MM Poly working - Tabs built with `@metamask/design-system-react-native` working <img width="398" height="259" alt="Screenshot 2025-12-10 at 8 41 08 AM" src="https://github.com/user-attachments/assets/d5a11151-19b9-455c-86b7-c69531239054" /> <img width="427" height="291" alt="Screenshot 2025-12-10 at 8 41 14 AM" src="https://github.com/user-attachments/assets/54d64ffe-5410-4c86-b2a7-30ed19b898df" /> <img width="412" height="120" alt="Screenshot 2025-12-10 at 8 41 23 AM" src="https://github.com/user-attachments/assets/56734145-114a-443c-a4de-ed1274cfb2e5" /> **Android** https://github.com/user-attachments/assets/1d14744b-0d2c-4aaa-b18b-9eb5175a6af6 Key screens: - MM Sans & MM Poly working - Tabs built with `@metamask/design-system-react-native` working <img width="442" height="362" alt="Screenshot 2025-12-10 at 8 31 02 AM" src="https://github.com/user-attachments/assets/3ef52f3c-0ae9-46ed-aca8-cab75d3b1666" /> <img width="413" height="183" alt="Screenshot 2025-12-10 at 8 31 06 AM" src="https://github.com/user-attachments/assets/e1e69c06-e3cd-4e27-96f9-f9e0a607e798" /> <img width="318" height="127" alt="Screenshot 2025-12-10 at 8 30 33 AM" src="https://github.com/user-attachments/assets/8b683b25-f87c-4bab-b395-f6555cc05467" /> ## **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] > Replaces MM Sans, MM Poly, and Geist font references with PostScript names and removes platform-specific font handling across onboarding, modals, rewards, and confirmations. > > - **Fonts**: > - Switch to PostScript names: `MMSans-Regular`, `MMPoly-Regular`, and `Geist-*` (`Geist-Regular`, `Geist-Medium`, `Geist-Bold`). > - Remove platform-specific `Platform` font branching where applicable. > - **Affected areas**: > - `UI/Perps/PerpsGTMModal.styles.ts`: unify title font to `MMPoly-Regular`; keep system font fallback logic. > - `UI/Predict/PredictGTMModal.styles.ts`: set title font to `MMPoly-Regular`; keep system font for description. > - `UI/Earn/...EarnMusdConversionEducationView.styles.ts`: heading uses `MMSans-Regular`. > - `Views/Onboarding/styles.ts` and `Views/OnboardingSuccess/index.styles.ts`: titles use `MMSans-Regular`. > - `UI/Rewards/.../OnboardingIntroStep.tsx`: title text uses `MMPoly-Regular`. > - `UI/ReviewModal/styles.ts` and `UI/DeleteWalletModal/styles.ts`: replace Geist families with `Geist-*`. > - `Views/confirmations/.../amount.styles.ts`: input text uses `Geist-Medium`. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit a6630d2. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
<!-- 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? --> Enable spot prices v3 by removing patch forcing a fallback. ## **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: https://consensyssoftware.atlassian.net/browse/ASSETS-1746 ## **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] > Enables spot-prices v3 by replacing the patched `@metamask/assets-controllers` with the upstream package and cleaning related lockfile/patch entries. > > - **Dependencies**: > - Replace patched `@metamask/assets-controllers` with `^93.0.0` (resolved to `93.1.0`). > - Update `yarn.lock` to consolidate on upstream `@metamask/assets-controllers` and remove patch-based entries. > - **Build/Patches**: > - Remove custom patch file `/.yarn/patches/@metamask-assets-controllers-npm-93.0.0-*.patch` (previously forced fallback in `SPOT_PRICES_SUPPORT_INFO`). > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 9b7ca8e. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
<!-- 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 aims to drop emoji usage on gas modals and speed row. It also adds filtering of `high` option in fee levels if they are same with `medium`. ## **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: Remove emojis from gas options ## **Related issues** Fixes: MetaMask/MetaMask-planning#6446 ## **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** <img width="542" height="1078" alt="Screenshot 2025-12-11 at 00 50 28" src="https://github.com/user-attachments/assets/260a534e-78b5-4897-b581-7077320497a8" /> ### **After** <img width="586" height="1122" alt="Screenshot 2025-12-11 at 00 50 13" src="https://github.com/user-attachments/assets/62f3ed56-419c-4a0b-ad43-d419fa963ed3" /> ## **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] > Removes emojis from gas options/speed and skips the High option when its fees match Medium for fee market estimates. > > - **UI (gas options/speed)** > - Remove emojis from `GasOption` and `GasSpeed` displays; adjust styles (`leftSection` spacing) and keep selection indicator/value display. > - **Types/Constants** > - Drop `GasOptionIcon` enum and `GasOption.emoji` field. > - **Logic** > - In `useGasFeeEstimateLevelOptions`, omit `High` when its `maxFeePerGas` and `maxPriorityFeePerGas` equal `Medium` (FeeMarket). > - **Tests** > - Update tests to remove emoji assertions; add test ensuring `High` is excluded when equal to `Medium`. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit feaba63. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
<!-- 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** * fix: resetpassword screen touch-id state * Jira: https://consensyssoftware.atlassian.net/browse/SL-371 <!-- 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: resetpassword screen touch-id state ## **Related issues** Fixes: https://consensyssoftware.atlassian.net/browse/SL-371 ## **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] > Saves biometry choice to storage only after a successful password reset, removing premature writes and adding tests to verify the flow. > > - **ResetPassword flow (`app/components/Views/ResetPassword/index.js`)**: > - Move `updateAuthTypeStorageFlags(this.state.biometryChoice)` to run after successful password reset and vault recreation. > - Remove storage update from `updateBiometryChoice` handler. > - **Tests (`app/components/Views/ResetPassword/index.test.tsx`)**: > - Mock `updateAuthTypeStorageFlags` and add test ensuring it is called only after confirming the password change. > - Minor test scaffolding updates to support the new flow. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 937780b. 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.
5 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 : )