[pull] main from MetaMask:main#294
Merged
Merged
Conversation
…22085) <!-- 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** - Drops the buy / sell previews auto-refresh from `5000` to `1000` <!-- 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: NA ## **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] > Lowers preview auto-refresh to 1000ms and removes isCalculating checks from buy/sell preview logic and button states. > > - **Predict Previews**: > - **Buy (`PredictBuyPreview.tsx`)**: > - Set `usePredictOrderPreview({ autoRefreshTimeout: 1000 })` (from `5000`). > - Stop using `isCalculating`; remove from hook result and `canPlaceBet` condition. > - **Sell (`PredictSellPreview.tsx`)**: > - Set `usePredictOrderPreview({ autoRefreshTimeout: 1000 })` (from `5000`). > - Stop using `isCalculating`; remove from hook result and cash-out button `disabled` condition. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit e836356. 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** This updates the Toast component to follow same implementation on metamask extension [PR](MetaMask/metamask-extension#36408). Changes: - Updated the UI following new Toast design - Allow adding description to Toast message Note: This is just the first iteration in order to adapt the basic styling on the new Toast design and allow adding description for more details. https://www.figma.com/design/eICFHu03RYI3dhRNgDxhzh/Toast-updates?node-id=5690-5607&m=dev <!-- 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: Updated toast ui and allow adding description ## **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] --> **This video shows how new toast look like on different scenarios (light and dark mode)** <video src='https://github.com/user-attachments/assets/656ed6f2-a73c-4bc5-a184-3620b9dec30d' /> ## **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. ## **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 description support to Toast, updates styles to themed design with Secondary action button, and introduces unit tests. > > - **Toast component (`app/component-library/components/Toast/Toast.tsx`)**: > - Add `descriptionOptions` rendering via `renderDescription` using `TextVariant.BodySM` and `TextColor.Alternative`. > - Change link/action button to `renderActionButton` with `ButtonVariants.Secondary` and spacing. > - Integrate `useStyles(styleSheet, {})` with new themed stylesheet; minor layout refactor. > - **Styles (`app/component-library/components/Toast/Toast.styles.ts`)**: > - Convert to theme-based factory; update background to `colors.background.muted`, add 1px border, radius `12`, padding `12`. > - Adjust spacings; add styles for `description` and `actionButton`. > - **Types (`app/component-library/components/Toast/Toast.types.ts`)**: > - Introduce `ToastDescriptionOptions` and optional `descriptionOptions` on base options. > - **Storybook (`app/component-library/components/Toast/Toast.stories.tsx`)**: > - Demonstrate `descriptionOptions` for `ToastVariants.Network`. > - **Tests (`app/component-library/components/Toast/Toast.test.tsx`)**: > - New tests for default render, labels (normal/bold/multi-part), description rendering, and closing; add snapshot. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 3bae746. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> --------- Co-authored-by: Amanda Yeoh <147617420+amandaye0h@users.noreply.github.com>
<!-- 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** Remove all references of components related to Ramps from Bridge. <!-- 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: https://consensyssoftware.atlassian.net/browse/SWAPS-3322 ## **Manual testing steps** ```gherkin Ensure no regressions exist in token input and token selector. ``` ## **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] > Decouples Bridge from Ramps by switching to shared parseAmount, introducing a local currency formatter (with tests), updating exchange-rate formatting, and simplifying loading skeleton UI; updates CODEOWNERS accordingly. > > - **Bridge** > - **`components/TokenInputArea`**: Replace Ramp `parseAmount` with shared `app/util/parseAmount`; add locale-aware display formatting; adjust imports. > - **`components/TokenSelectorItem`**: Switch to shared `parseAmount`; replace `SkeletonText` with styled `View` for loading placeholder. > - **`utils/exchange-rates.ts`**: Use new `formatCurrency` from `utils/currencyUtils`. > - **`utils/currencyUtils.ts`**: New currency formatting utility using `Intl`. > - **`utils/currencyUtils.test.ts`**: Add comprehensive tests for `formatCurrency`. > - **Ramps** > - **`Aggregator/hooks/useIntentAmount.ts`**: Update to use shared `app/util/parseAmount`. > - **Shared utils** > - **`app/util/parseAmount.ts` / `.test.ts`**: Centralized usage across Bridge and Ramps. > - **Infrastructure** > - **`.github/CODEOWNERS`**: Fix Bridge path alignment; add co-ownership for `app/util/parseAmount.ts` and its test to Swaps and Ramps teams. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 12a0937. 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** This PR fixes a bug causing a flickering when transitioning between views on the dapp connection modal <!-- 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: Fixed a bug causing a flickering when transitioning between views on the dapp connection modal ## **Related issues** Fixes: https://consensyssoftware.atlassian.net/browse/TMCU-38 https://consensyssoftware.atlassian.net/browse/TMCU-37 ## **Manual testing steps** ```gherkin Feature: Edit accounts or network pemissions Scenario: user edits network pemissions Given user is trying to connect to the dapp When user goes to permissions, clicks edit next to the networks row and then clicks back button Then there is no flickering of the screen ``` ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** https://github.com/user-attachments/assets/f767fa34-d8ba-43ef-858c-83856b7975aa <!-- [screenshots/recordings] --> ### **After** https://github.com/user-attachments/assets/bd8a6afb-6db2-4561-a99f-1050a0316a40 <!-- [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] > Prevents view flicker in the dapp connection modal by keeping screens mounted with absolute-positioned containers and aligns network selector state with provided defaults. > > - **Multichain connect UI**: > - Introduces `ScreenContainer` and always mounts screens (`SingleConnect`, `MultiConnectSelector`, `MultiConnectNetworkSelector`) with layered styles (`styles.screenVisible`/`styles.screenHidden`) and `pointerEvents` to avoid flicker. > - Adds `screenVisible`/`screenHidden` styles in `MultichainAccountConnect.styles.ts` using absolute positioning and opacity. > - **Network selector**: > - Initializes `selectedChainIds` from `defaultSelectedChainIds` and simplifies effect deps; updates snapshot accordingly. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit dd6022f. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
## **Description** This PR bumps `@metamask/multichain-account-service` to `^2.1.0`, which includes performance improvements for lower end devices during account creation. Changelog: ```md - Add per-provider throttling for non-EVM account creation to improve performance on low-end devices ([#7000](MetaMask/core#7000)) - Solana provider is now limited to 3 concurrent account creations by default when creating multichain account groups. - Other providers remain unthrottled by default. ``` ## **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/MUL-1230 ## **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] > Updates `@metamask/multichain-account-service` from `^2.0.1` to `^2.1.0`. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit c10179c. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
## **Description** Added `error_type` property to the `REHYDRATION_PASSWORD_FAILED` analytics event to distinguish between incorrect password errors and other error types during social login rehydration. **Changes:** - Added `error_type: 'incorrect_password'` to `REHYDRATION_PASSWORD_FAILED` event tracking - Applied to both standard password errors and seedless onboarding incorrect password errors - Only tracks during OAuth rehydration flow (`isComingFromOauthOnboarding`) ## **Changelog** CHANGELOG entry: null ## **Related issues** Fixes: https://consensyssoftware.atlassian.net/browse/SL-240 ## **Manual testing steps** ```gherkin Feature: Social login rehydration error tracking Scenario: user enters incorrect password during social login rehydration Given user has a social login account And user is on the login screen after OAuth authentication When user enters an incorrect password Then REHYDRATION_PASSWORD_FAILED event is tracked with error_type: 'incorrect_password' And the event includes account_type: 'social' and failed_attempts count ``` ## **Screenshots/Recordings** N/A - Analytics tracking change only ### **Before** `REHYDRATION_PASSWORD_FAILED` event tracked without `error_type` property ### **After** `REHYDRATION_PASSWORD_FAILED` event tracked with `error_type: 'incorrect_password'` ## **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 error_type to REHYDRATION_PASSWORD_FAILED during social login rehydration, distinguishing incorrect_password from unknown_error, with updated tests. > > - **Analytics (Login)**: > - Track `REHYDRATION_PASSWORD_FAILED` with `error_type: 'incorrect_password'` for wrong password cases (`WRONG_PASSWORD_ERROR`, Android variants) during OAuth rehydration. > - Track `error_type: 'incorrect_password'` on seedless `IncorrectPassword` and `TooManyLoginAttempts` (syncs failed attempts), and `error_type: 'unknown_error'` on seedless `PasswordRecentlyUpdated` and other unexpected OAuth failures. > - Remove generic tracking from `handlePasswordError`; add final fallback tracking with `error_type: 'unknown_error'` for other OAuth errors. > - **Tests (Login)**: > - Mock `trackOnboarding` and assert events include `error_type` for all wrong password variants; ensure not tracked for `PASSWORD_REQUIREMENTS_NOT_MET`. > - Add coverage for Android error variant `_2`; minor suite rename to clarify navigation checks. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit fcd807c. 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.
6 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 : )