From 7d62a0bfdd8d6243bcf390429fd799110a6a718e Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Fri, 5 May 2023 19:48:35 +0000 Subject: [PATCH 01/12] Version v10.31.0 --- CHANGELOG.md | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++- package.json | 2 +- 2 files changed, 177 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff018c396..1cf21ebf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,180 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [10.31.0] +### Uncategorized +- Fix build types not overriding the manifest ([#19027](https://github.com/MetaMask/metamask-extension/pull/19027)) +- Bundle size reduction: Upgrading ethereumjs/tx and ethereumjs/common ([#18302](https://github.com/MetaMask/metamask-extension/pull/18302)) +- Master sync PR following v10.30.0 and v10.30.1 ([#19026](https://github.com/MetaMask/metamask-extension/pull/19026)) +- Fix #18984 - UX: Multichain - Network connection fixes ([#19000](https://github.com/MetaMask/metamask-extension/pull/19000)) +- [MMI] Applied code fencing in transactions and pending tx tracker controllers ([#17909](https://github.com/MetaMask/metamask-extension/pull/17909)) +- chore: refactor connect to dapp action in e2e ([#19015](https://github.com/MetaMask/metamask-extension/pull/19015)) +- Part of #18714: Replacing Typography consts with enums ([#19013](https://github.com/MetaMask/metamask-extension/pull/19013)) +- [MMI] Added compliance details modal and compliance details component ([#18118](https://github.com/MetaMask/metamask-extension/pull/18118)) +- Use core signature controller ([#18654](https://github.com/MetaMask/metamask-extension/pull/18654)) +- Merge branch 'develop' into master-sync +- Part of #17670: Replace Typography with Text component in smart-transaction-status.js ([#18743](https://github.com/MetaMask/metamask-extension/pull/18743)) +- Part of #17670 Replace Typography with Text component for 4 files. ([#18793](https://github.com/MetaMask/metamask-extension/pull/18793)) +- Update interactive-replacement-token-modal.js ([#19003](https://github.com/MetaMask/metamask-extension/pull/19003)) +- [MMI] Added code fencing in account details modal and selected accounts ([#18070](https://github.com/MetaMask/metamask-extension/pull/18070)) +- [FLASK] Don't show the title on Install/Update when it's loading ([#19012](https://github.com/MetaMask/metamask-extension/pull/19012)) +- UX Multichain: Fixed UI updates for header ([#19006](https://github.com/MetaMask/metamask-extension/pull/19006)) +- Update CODEOWNERS: remove requirement for supply-chain team to approv… ([#19014](https://github.com/MetaMask/metamask-extension/pull/19014)) +- UX: Multichain: Focus on test networks when setting is flipped on ([#18996](https://github.com/MetaMask/metamask-extension/pull/18996)) +- Update CODEOWNERS ([#19007](https://github.com/MetaMask/metamask-extension/pull/19007)) +- feature(17946): implement mv3 e2e for popup consistency after service worker restarted ([#19010](https://github.com/MetaMask/metamask-extension/pull/19010)) +- Changes in blockaid texts ([#19001](https://github.com/MetaMask/metamask-extension/pull/19001)) +- Part of #17670 & #18714: Replace Typography with Text component: token-allowance.js ([#18742](https://github.com/MetaMask/metamask-extension/pull/18742)) +- clean up and adds a code fence ([#19005](https://github.com/MetaMask/metamask-extension/pull/19005)) +- Fix #18990 - UX: Multichain - Copy Address Fixes ([#18993](https://github.com/MetaMask/metamask-extension/pull/18993)) +- eth_sign toggle Update in advanced settings ([#18848](https://github.com/MetaMask/metamask-extension/pull/18848)) +- e2e test for action metrics ([#18347](https://github.com/MetaMask/metamask-extension/pull/18347)) +- Migrates avatar base to TypeScript ([#18494](https://github.com/MetaMask/metamask-extension/pull/18494)) +- devDeps: pretty-error@2.1.1->2.1.2 ([#18868](https://github.com/MetaMask/metamask-extension/pull/18868)) +- Fix popover hiding ([#18843](https://github.com/MetaMask/metamask-extension/pull/18843)) +- Ensure we can successfully create prod builds with specific types ([#18991](https://github.com/MetaMask/metamask-extension/pull/18991)) +- UX: Multichain: Implement Account Details Popover ([#18811](https://github.com/MetaMask/metamask-extension/pull/18811)) +- UX Multichain: Account List Search Fix ([#18963](https://github.com/MetaMask/metamask-extension/pull/18963)) +- removed top border from list item ([#18959](https://github.com/MetaMask/metamask-extension/pull/18959)) +- UX Multichain: Fixed NaN USD issue under Eth when using Fiat ([#18981](https://github.com/MetaMask/metamask-extension/pull/18981)) +- Feat/srp metrics ([#18015](https://github.com/MetaMask/metamask-extension/pull/18015)) +- add scuttle exceptions for JSON and Date ([#18989](https://github.com/MetaMask/metamask-extension/pull/18989)) +- limit connections ([#18355](https://github.com/MetaMask/metamask-extension/pull/18355)) +- [MMI] Don't group transactions by nonce if they are custodial Tx ([#18982](https://github.com/MetaMask/metamask-extension/pull/18982)) +- adds custody page route to account routes ([#18985](https://github.com/MetaMask/metamask-extension/pull/18985)) +- Fixes the cancel-speedup-popover.js ([#18948](https://github.com/MetaMask/metamask-extension/pull/18948)) +- Part of #17670: Replace Typography with Text component in beta-header/index.js ([#18964](https://github.com/MetaMask/metamask-extension/pull/18964)) +- Delete two unused selectors ([#18904](https://github.com/MetaMask/metamask-extension/pull/18904)) +- Update messages.json ([#18897](https://github.com/MetaMask/metamask-extension/pull/18897)) +- Fixing broken responsive box background color prop and color fix ([#18978](https://github.com/MetaMask/metamask-extension/pull/18978)) +- Part of #17670: Replace Typography with Text component in: detected-token-values.js ([#18977](https://github.com/MetaMask/metamask-extension/pull/18977)) +- Use separate versions for Flask and Stable snaps ([#18875](https://github.com/MetaMask/metamask-extension/pull/18875)) +- fix ff diff generation ([#18824](https://github.com/MetaMask/metamask-extension/pull/18824)) +- fix: prevent cancel and speedup transactions to call accept approval ([#18846](https://github.com/MetaMask/metamask-extension/pull/18846)) +- [FLASK] Fix overflowing notification content ([#18881](https://github.com/MetaMask/metamask-extension/pull/18881)) +- Clean up some code fencing around snaps ([#18802](https://github.com/MetaMask/metamask-extension/pull/18802)) +- UX: Multichain: Add maximum width for network picker in full screen mode ([#18879](https://github.com/MetaMask/metamask-extension/pull/18879)) +- UX: Multichain: Provide localization for the network menu ([#18880](https://github.com/MetaMask/metamask-extension/pull/18880)) +- Rename `provider` to `providerConfig` ([#18907](https://github.com/MetaMask/metamask-extension/pull/18907)) +- Bump Circle CI docker image ([#18914](https://github.com/MetaMask/metamask-extension/pull/18914)) +- Improving code formatting in component-library readme ([#18910](https://github.com/MetaMask/metamask-extension/pull/18910)) +- Fence snaps endowments and permissions for stable/flask ([#18847](https://github.com/MetaMask/metamask-extension/pull/18847)) +- Expand usage of `getProviderConfig` selector ([#18906](https://github.com/MetaMask/metamask-extension/pull/18906)) +- Discontinue use of deleted getProductionConfig function ([#18900](https://github.com/MetaMask/metamask-extension/pull/18900)) +- Simplify network controller unit test setup ([#18901](https://github.com/MetaMask/metamask-extension/pull/18901)) +- Adding deprecation notice to old Button component ([#18908](https://github.com/MetaMask/metamask-extension/pull/18908)) +- Part of #17670: Replace Typography with Text component for 'review-spending-cap' & 'tooltip.stories'. ([#18839](https://github.com/MetaMask/metamask-extension/pull/18839)) +- Transaction cleanup and fix TransactionDetailItem key not unique bug ([#18899](https://github.com/MetaMask/metamask-extension/pull/18899)) +- Part of #17670 Replace Typography with Text component in: signature-request-siwe-tag\index.js ([#18898](https://github.com/MetaMask/metamask-extension/pull/18898)) +- Part of #17670 , #18714 & #18651 for 3 files. ([#18752](https://github.com/MetaMask/metamask-extension/pull/18752)) +- Update pin-extension.js ([#18877](https://github.com/MetaMask/metamask-extension/pull/18877)) +- Part of #17670 Replace Typography with Text component in: nft-default-image.js ([#18894](https://github.com/MetaMask/metamask-extension/pull/18894)) +- Refactor provider config selector ([#18905](https://github.com/MetaMask/metamask-extension/pull/18905)) +- Show gas warning for legacy networks also ([#18871](https://github.com/MetaMask/metamask-extension/pull/18871)) +- Added code fences ([#18872](https://github.com/MetaMask/metamask-extension/pull/18872)) +- Part of #17670: Replace Typography with Text component for 11 files. ([#18837](https://github.com/MetaMask/metamask-extension/pull/18837)) +- Adding new icons ([#18870](https://github.com/MetaMask/metamask-extension/pull/18870)) +- Consistent message for third party requests across screens ([#18873](https://github.com/MetaMask/metamask-extension/pull/18873)) +- UX: Multichain: Set a maximum width on the network picker ([#18731](https://github.com/MetaMask/metamask-extension/pull/18731)) +- Terms of use e2e ([#18861](https://github.com/MetaMask/metamask-extension/pull/18861)) +- E2E: update selenium webdriver ([#18854](https://github.com/MetaMask/metamask-extension/pull/18854)) +- fix(18709): fix error when switching to linea testnet using wallet_sw… ([#18710](https://github.com/MetaMask/metamask-extension/pull/18710)) +- [MMI] Adds custodian icon next to metafox ([#18851](https://github.com/MetaMask/metamask-extension/pull/18851)) +- [MMI] Add the custody status text in the transaction status ([#18797](https://github.com/MetaMask/metamask-extension/pull/18797)) +- fix: remove firefox build for beta ([#18874](https://github.com/MetaMask/metamask-extension/pull/18874)) +- [MMI] adds some constants and necessary routes ([#17868](https://github.com/MetaMask/metamask-extension/pull/17868)) +- [MMI] Added confirm-remove-jwt component ([#18186](https://github.com/MetaMask/metamask-extension/pull/18186)) +- Fix in approve header to show correct account name ([#18849](https://github.com/MetaMask/metamask-extension/pull/18849)) +- deprecation notice ([#18859](https://github.com/MetaMask/metamask-extension/pull/18859)) +- devDeps: eslint@8.14.0,8.20.0->8.36.0 ([#18748](https://github.com/MetaMask/metamask-extension/pull/18748)) +- Adding price checker deactivation for Optimism ([#18833](https://github.com/MetaMask/metamask-extension/pull/18833)) +- Part of #17670: Replace Typography with Text component in RecoveryPhraseReminder ([#18639](https://github.com/MetaMask/metamask-extension/pull/18639)) +- Add snaps entries to CODEOWNERS ([#18825](https://github.com/MetaMask/metamask-extension/pull/18825)) +- Ux Multichain: Hide search input for single account ([#18798](https://github.com/MetaMask/metamask-extension/pull/18798)) +- UX: Multichain: Analytics ([#18674](https://github.com/MetaMask/metamask-extension/pull/18674)) +- update ses@0.18.4 ([#17521](https://github.com/MetaMask/metamask-extension/pull/17521)) +- [e2e] test-dapp update to `v6.0.0` ([#18844](https://github.com/MetaMask/metamask-extension/pull/18844)) +- Return state when calling EncryptionPublicKeyController.cancelEncryptionPublicKey ([#18845](https://github.com/MetaMask/metamask-extension/pull/18845)) +- [MMI] custody page component ([#18688](https://github.com/MetaMask/metamask-extension/pull/18688)) +- Update Snaps icon in settings search and fix missing icon ([#18803](https://github.com/MetaMask/metamask-extension/pull/18803)) +- [MMI] Add interactive-replacement-token-page ([#18683](https://github.com/MetaMask/metamask-extension/pull/18683)) +- Fix for wrong type being assigned to the transaction ([#18818](https://github.com/MetaMask/metamask-extension/pull/18818)) +- locales/ko: Fix some mistranslation and typo ([#18799](https://github.com/MetaMask/metamask-extension/pull/18799)) +- Strong tag support in Text component ([#18816](https://github.com/MetaMask/metamask-extension/pull/18816)) +- Update Button prop name type to variant ([#18774](https://github.com/MetaMask/metamask-extension/pull/18774)) +- Part of #17670 for file: detected-token-ignored-popover.js ([#18738](https://github.com/MetaMask/metamask-extension/pull/18738)) +- Update knobs to control: MetamaskTemplateRenderer ([#18677](https://github.com/MetaMask/metamask-extension/pull/18677)) +- devDeps: bumps source-map related dependencies ([#18830](https://github.com/MetaMask/metamask-extension/pull/18830)) +- devDeps: bump @storybook/* ([#18832](https://github.com/MetaMask/metamask-extension/pull/18832)) +- Consume Decrypt Message Manager from @metamask/message-manager ([#18379](https://github.com/MetaMask/metamask-extension/pull/18379)) +- Fix mv3 beta build ([#18690](https://github.com/MetaMask/metamask-extension/pull/18690)) +- UX: Remove Goerli buy link and disable button ([#18137](https://github.com/MetaMask/metamask-extension/pull/18137)) +- UX: Multichain: Fix Network Picker when Test Networks Disabled ([#18694](https://github.com/MetaMask/metamask-extension/pull/18694)) +- UX: Multichain: Focus on account search when menu appears ([#18705](https://github.com/MetaMask/metamask-extension/pull/18705)) +- deps: bump json5, loader-utils, minimist ([#18733](https://github.com/MetaMask/metamask-extension/pull/18733)) +- Unbreak CI checks ([#18813](https://github.com/MetaMask/metamask-extension/pull/18813)) +- Improve logging at build-time ([#18780](https://github.com/MetaMask/metamask-extension/pull/18780)) +- Enable editing L2 gas on optimism ([#18217](https://github.com/MetaMask/metamask-extension/pull/18217)) +- Adding ModalHeader component and updating PopoverHeader stories ([#18311](https://github.com/MetaMask/metamask-extension/pull/18311)) +- Policy formatting issue ([#18810](https://github.com/MetaMask/metamask-extension/pull/18810)) +- UX: Multichain: App header cleanups ([#18627](https://github.com/MetaMask/metamask-extension/pull/18627)) +- UX: Multichain: Use correct blockie or jazzicon in the account menu ([#18782](https://github.com/MetaMask/metamask-extension/pull/18782)) +- Part of #17670: Replace Typography with Text component for networks-list.js ([#18754](https://github.com/MetaMask/metamask-extension/pull/18754)) +- [FLASK] Expanded Snap authorship ([#18775](https://github.com/MetaMask/metamask-extension/pull/18775)) +- Fix diff generation for fitness functions ([#18508](https://github.com/MetaMask/metamask-extension/pull/18508)) +- deps: replace gulp-dart-sass with gulp-sass. ([#16302](https://github.com/MetaMask/metamask-extension/pull/16302)) +- feat: add yaml feature management ([#18125](https://github.com/MetaMask/metamask-extension/pull/18125)) +- [MMI] Created custody-confirm-link-modal component ([#18632](https://github.com/MetaMask/metamask-extension/pull/18632)) +- Update keystone links ([#18792](https://github.com/MetaMask/metamask-extension/pull/18792)) +- Part of #17670 for file custom-spending-cap-tooltip.js ([#18686](https://github.com/MetaMask/metamask-extension/pull/18686)) +- Part of #17670 for file network-statistics.js ([#18644](https://github.com/MetaMask/metamask-extension/pull/18644)) +- Update slippage-buttons.js ([#18745](https://github.com/MetaMask/metamask-extension/pull/18745)) +- Update fee-card.js ([#18746](https://github.com/MetaMask/metamask-extension/pull/18746)) +- Update settings-tab.component.js ([#18753](https://github.com/MetaMask/metamask-extension/pull/18753)) +- Worked on #17670 & #18714 for 7 files. ([#18789](https://github.com/MetaMask/metamask-extension/pull/18789)) +- [FLASK] Update permissions to use IconName and IconSize design system enum ([#18786](https://github.com/MetaMask/metamask-extension/pull/18786)) +- [MMI] Adds a warning if message signing account mismatches selected account ([#18659](https://github.com/MetaMask/metamask-extension/pull/18659)) +- Approvals selector refactor ([#18664](https://github.com/MetaMask/metamask-extension/pull/18664)) +- Use SIWE origin validation logic from @metamask/controller-utils ([#18518](https://github.com/MetaMask/metamask-extension/pull/18518)) +- devDeps: security updates roundup ([#18739](https://github.com/MetaMask/metamask-extension/pull/18739)) +- Revert "Shallow git clone (#18491)" ([#18491](https://github.com/MetaMask/metamask-extension/pull/18491)) +- Unit tests for various modals ([#18115](https://github.com/MetaMask/metamask-extension/pull/18115)) +- Fix missing icon for webassembly endowment ([#18781](https://github.com/MetaMask/metamask-extension/pull/18781)) +- Only build LavaMoat runtime once ([#18768](https://github.com/MetaMask/metamask-extension/pull/18768)) +- Some linting issues in the file custom spending cap tooltip.js ([#18687](https://github.com/MetaMask/metamask-extension/pull/18687)) +- Fix ICON_NAMES error for snaps settings ([#18784](https://github.com/MetaMask/metamask-extension/pull/18784)) +- Prevent new JS files in shared folder ([#17737](https://github.com/MetaMask/metamask-extension/pull/17737)) +- update icons to ts enum version ([#18698](https://github.com/MetaMask/metamask-extension/pull/18698)) +- Shallow git clone ([#18491](https://github.com/MetaMask/metamask-extension/pull/18491)) +- deps: bump serve-handler@6.1.3->6.1.5; minimatch@3.0.4->3.1.2 ([#18734](https://github.com/MetaMask/metamask-extension/pull/18734)) +- Bump `@metamask/slip44` to `3.0.0` ([#18773](https://github.com/MetaMask/metamask-extension/pull/18773)) +- [FLASK] Fix text selection bug in snap ui ([#18719](https://github.com/MetaMask/metamask-extension/pull/18719)) +- [FLASK] Add updated version of the Snaps settings UI ([#18438](https://github.com/MetaMask/metamask-extension/pull/18438)) +- Part of #17670: Replace Typography with Text component ([#18569](https://github.com/MetaMask/metamask-extension/pull/18569)) +- Part of 17670: Replace Typography with Text in detected-token-address.js ([#18435](https://github.com/MetaMask/metamask-extension/pull/18435)) +- Update knobs to controls in storybook: SelectQuotePopover ([#18671](https://github.com/MetaMask/metamask-extension/pull/18671)) +- Sign-in With Ethereum SIWE cleanup ([#18230](https://github.com/MetaMask/metamask-extension/pull/18230)) +- update ethereum provider endowment weight level and update install warning copy ([#18732](https://github.com/MetaMask/metamask-extension/pull/18732)) +- [MMI] Add-compliance-details component ([#18575](https://github.com/MetaMask/metamask-extension/pull/18575)) +- Updating Avatar components to forward refs ([#18678](https://github.com/MetaMask/metamask-extension/pull/18678)) +- Add "Do Not Merge" GH Action to block PRs with "DO-NOT-MERGE" label ([#18724](https://github.com/MetaMask/metamask-extension/pull/18724)) +- UX Multichain: Added product tour component ([#18571](https://github.com/MetaMask/metamask-extension/pull/18571)) +- Update outdated browser versions ([#18721](https://github.com/MetaMask/metamask-extension/pull/18721)) +- [MMI] Add transaction-failed functional component ([#18623](https://github.com/MetaMask/metamask-extension/pull/18623)) +- UX: Multichain: Network Menu: Set Focus on Selected Network ([#18706](https://github.com/MetaMask/metamask-extension/pull/18706)) +- TransactionUtils: update determineTransactionType method / contractInteraction support ([#18652](https://github.com/MetaMask/metamask-extension/pull/18652)) +- added new snaps wasm test ([#18696](https://github.com/MetaMask/metamask-extension/pull/18696)) +- Stop transpiling ES2020 libraries ([#18713](https://github.com/MetaMask/metamask-extension/pull/18713)) +- [MMI] update eth overview component ([#18625](https://github.com/MetaMask/metamask-extension/pull/18625)) +- [MMI] adds institutional duck to mmi folder ([#18578](https://github.com/MetaMask/metamask-extension/pull/18578)) +- [MMI] interactive replacement token notification ([#18620](https://github.com/MetaMask/metamask-extension/pull/18620)) +- Update tokens controller ([#18459](https://github.com/MetaMask/metamask-extension/pull/18459)) +- Fixing issue with gasLimit in transaction being 0 ([#18682](https://github.com/MetaMask/metamask-extension/pull/18682)) +- 17873 ledger instruction banner ([#17937](https://github.com/MetaMask/metamask-extension/pull/17937)) +- Show Bridge button in TokenOverview component ([#18630](https://github.com/MetaMask/metamask-extension/pull/18630)) +- deps/security: vm2@3.9.16->3.9.17 ([#18707](https://github.com/MetaMask/metamask-extension/pull/18707)) +- Confirm recovery phrase onboarding unit test ([#18250](https://github.com/MetaMask/metamask-extension/pull/18250)) + ## [10.30.1] ### Fixed - Disable Flask RPC test to fix failing build ([#19011](https://github.com/MetaMask/metamask-extension/pull/19011)) @@ -3711,7 +3885,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Uncategorized - Added the ability to restore accounts from seed words. -[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.30.1...HEAD +[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.31.0...HEAD +[10.31.0]: https://github.com/MetaMask/metamask-extension/compare/v10.30.1...v10.31.0 [10.30.1]: https://github.com/MetaMask/metamask-extension/compare/v10.30.0...v10.30.1 [10.30.0]: https://github.com/MetaMask/metamask-extension/compare/v10.29.0...v10.30.0 [10.29.0]: https://github.com/MetaMask/metamask-extension/compare/v10.28.3...v10.29.0 diff --git a/package.json b/package.json index afaf7c54a..da342c4b8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask-crx", - "version": "10.30.1", + "version": "10.31.0", "private": true, "repository": { "type": "git", From 4775a46e20c0a6d37c2641bd8d661e0475a94d19 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Tue, 16 May 2023 17:24:55 -0230 Subject: [PATCH 02/12] Run yarn:lavamoat auto for v10.31.0 --- lavamoat/build-system/policy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index d5b552bdc..2782e3c96 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -7367,7 +7367,7 @@ }, "stylelint>postcss-html>htmlparser2>domutils>dom-serializer": { "packages": { - "stylelint>postcss-html>htmlparser2>domutils>dom-serializer>domelementtype": true, + "stylelint>postcss-html>htmlparser2>domelementtype": true, "stylelint>postcss-html>htmlparser2>entities": true } }, From 6f21e01bebcb35302687c497b30b5905f0fc6bbf Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Wed, 17 May 2023 10:06:06 -0700 Subject: [PATCH 03/12] Update v10.31.0 changelog (#19147) * [skip e2e] Update changelog for v10.31.0 Co-authored-by: Dan J Miller * Update CHANGELOG.md Co-authored-by: Frederik Bolding * Update CHANGELOG.md Co-authored-by: Frederik Bolding * Update CHANGELOG.md Co-authored-by: Frederik Bolding --------- Co-authored-by: Dan J Miller Co-authored-by: Frederik Bolding --- CHANGELOG.md | 194 +++++++-------------------------------------------- 1 file changed, 24 insertions(+), 170 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cf21ebf4..a76e370c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,178 +7,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ## [10.31.0] -### Uncategorized -- Fix build types not overriding the manifest ([#19027](https://github.com/MetaMask/metamask-extension/pull/19027)) -- Bundle size reduction: Upgrading ethereumjs/tx and ethereumjs/common ([#18302](https://github.com/MetaMask/metamask-extension/pull/18302)) -- Master sync PR following v10.30.0 and v10.30.1 ([#19026](https://github.com/MetaMask/metamask-extension/pull/19026)) -- Fix #18984 - UX: Multichain - Network connection fixes ([#19000](https://github.com/MetaMask/metamask-extension/pull/19000)) -- [MMI] Applied code fencing in transactions and pending tx tracker controllers ([#17909](https://github.com/MetaMask/metamask-extension/pull/17909)) -- chore: refactor connect to dapp action in e2e ([#19015](https://github.com/MetaMask/metamask-extension/pull/19015)) -- Part of #18714: Replacing Typography consts with enums ([#19013](https://github.com/MetaMask/metamask-extension/pull/19013)) -- [MMI] Added compliance details modal and compliance details component ([#18118](https://github.com/MetaMask/metamask-extension/pull/18118)) -- Use core signature controller ([#18654](https://github.com/MetaMask/metamask-extension/pull/18654)) -- Merge branch 'develop' into master-sync -- Part of #17670: Replace Typography with Text component in smart-transaction-status.js ([#18743](https://github.com/MetaMask/metamask-extension/pull/18743)) -- Part of #17670 Replace Typography with Text component for 4 files. ([#18793](https://github.com/MetaMask/metamask-extension/pull/18793)) -- Update interactive-replacement-token-modal.js ([#19003](https://github.com/MetaMask/metamask-extension/pull/19003)) -- [MMI] Added code fencing in account details modal and selected accounts ([#18070](https://github.com/MetaMask/metamask-extension/pull/18070)) -- [FLASK] Don't show the title on Install/Update when it's loading ([#19012](https://github.com/MetaMask/metamask-extension/pull/19012)) -- UX Multichain: Fixed UI updates for header ([#19006](https://github.com/MetaMask/metamask-extension/pull/19006)) -- Update CODEOWNERS: remove requirement for supply-chain team to approv… ([#19014](https://github.com/MetaMask/metamask-extension/pull/19014)) -- UX: Multichain: Focus on test networks when setting is flipped on ([#18996](https://github.com/MetaMask/metamask-extension/pull/18996)) -- Update CODEOWNERS ([#19007](https://github.com/MetaMask/metamask-extension/pull/19007)) -- feature(17946): implement mv3 e2e for popup consistency after service worker restarted ([#19010](https://github.com/MetaMask/metamask-extension/pull/19010)) -- Changes in blockaid texts ([#19001](https://github.com/MetaMask/metamask-extension/pull/19001)) -- Part of #17670 & #18714: Replace Typography with Text component: token-allowance.js ([#18742](https://github.com/MetaMask/metamask-extension/pull/18742)) -- clean up and adds a code fence ([#19005](https://github.com/MetaMask/metamask-extension/pull/19005)) -- Fix #18990 - UX: Multichain - Copy Address Fixes ([#18993](https://github.com/MetaMask/metamask-extension/pull/18993)) -- eth_sign toggle Update in advanced settings ([#18848](https://github.com/MetaMask/metamask-extension/pull/18848)) -- e2e test for action metrics ([#18347](https://github.com/MetaMask/metamask-extension/pull/18347)) -- Migrates avatar base to TypeScript ([#18494](https://github.com/MetaMask/metamask-extension/pull/18494)) -- devDeps: pretty-error@2.1.1->2.1.2 ([#18868](https://github.com/MetaMask/metamask-extension/pull/18868)) -- Fix popover hiding ([#18843](https://github.com/MetaMask/metamask-extension/pull/18843)) -- Ensure we can successfully create prod builds with specific types ([#18991](https://github.com/MetaMask/metamask-extension/pull/18991)) -- UX: Multichain: Implement Account Details Popover ([#18811](https://github.com/MetaMask/metamask-extension/pull/18811)) -- UX Multichain: Account List Search Fix ([#18963](https://github.com/MetaMask/metamask-extension/pull/18963)) -- removed top border from list item ([#18959](https://github.com/MetaMask/metamask-extension/pull/18959)) -- UX Multichain: Fixed NaN USD issue under Eth when using Fiat ([#18981](https://github.com/MetaMask/metamask-extension/pull/18981)) -- Feat/srp metrics ([#18015](https://github.com/MetaMask/metamask-extension/pull/18015)) -- add scuttle exceptions for JSON and Date ([#18989](https://github.com/MetaMask/metamask-extension/pull/18989)) -- limit connections ([#18355](https://github.com/MetaMask/metamask-extension/pull/18355)) -- [MMI] Don't group transactions by nonce if they are custodial Tx ([#18982](https://github.com/MetaMask/metamask-extension/pull/18982)) -- adds custody page route to account routes ([#18985](https://github.com/MetaMask/metamask-extension/pull/18985)) -- Fixes the cancel-speedup-popover.js ([#18948](https://github.com/MetaMask/metamask-extension/pull/18948)) -- Part of #17670: Replace Typography with Text component in beta-header/index.js ([#18964](https://github.com/MetaMask/metamask-extension/pull/18964)) -- Delete two unused selectors ([#18904](https://github.com/MetaMask/metamask-extension/pull/18904)) -- Update messages.json ([#18897](https://github.com/MetaMask/metamask-extension/pull/18897)) -- Fixing broken responsive box background color prop and color fix ([#18978](https://github.com/MetaMask/metamask-extension/pull/18978)) -- Part of #17670: Replace Typography with Text component in: detected-token-values.js ([#18977](https://github.com/MetaMask/metamask-extension/pull/18977)) -- Use separate versions for Flask and Stable snaps ([#18875](https://github.com/MetaMask/metamask-extension/pull/18875)) -- fix ff diff generation ([#18824](https://github.com/MetaMask/metamask-extension/pull/18824)) -- fix: prevent cancel and speedup transactions to call accept approval ([#18846](https://github.com/MetaMask/metamask-extension/pull/18846)) -- [FLASK] Fix overflowing notification content ([#18881](https://github.com/MetaMask/metamask-extension/pull/18881)) -- Clean up some code fencing around snaps ([#18802](https://github.com/MetaMask/metamask-extension/pull/18802)) -- UX: Multichain: Add maximum width for network picker in full screen mode ([#18879](https://github.com/MetaMask/metamask-extension/pull/18879)) -- UX: Multichain: Provide localization for the network menu ([#18880](https://github.com/MetaMask/metamask-extension/pull/18880)) -- Rename `provider` to `providerConfig` ([#18907](https://github.com/MetaMask/metamask-extension/pull/18907)) -- Bump Circle CI docker image ([#18914](https://github.com/MetaMask/metamask-extension/pull/18914)) -- Improving code formatting in component-library readme ([#18910](https://github.com/MetaMask/metamask-extension/pull/18910)) -- Fence snaps endowments and permissions for stable/flask ([#18847](https://github.com/MetaMask/metamask-extension/pull/18847)) -- Expand usage of `getProviderConfig` selector ([#18906](https://github.com/MetaMask/metamask-extension/pull/18906)) -- Discontinue use of deleted getProductionConfig function ([#18900](https://github.com/MetaMask/metamask-extension/pull/18900)) -- Simplify network controller unit test setup ([#18901](https://github.com/MetaMask/metamask-extension/pull/18901)) -- Adding deprecation notice to old Button component ([#18908](https://github.com/MetaMask/metamask-extension/pull/18908)) -- Part of #17670: Replace Typography with Text component for 'review-spending-cap' & 'tooltip.stories'. ([#18839](https://github.com/MetaMask/metamask-extension/pull/18839)) -- Transaction cleanup and fix TransactionDetailItem key not unique bug ([#18899](https://github.com/MetaMask/metamask-extension/pull/18899)) -- Part of #17670 Replace Typography with Text component in: signature-request-siwe-tag\index.js ([#18898](https://github.com/MetaMask/metamask-extension/pull/18898)) -- Part of #17670 , #18714 & #18651 for 3 files. ([#18752](https://github.com/MetaMask/metamask-extension/pull/18752)) -- Update pin-extension.js ([#18877](https://github.com/MetaMask/metamask-extension/pull/18877)) -- Part of #17670 Replace Typography with Text component in: nft-default-image.js ([#18894](https://github.com/MetaMask/metamask-extension/pull/18894)) -- Refactor provider config selector ([#18905](https://github.com/MetaMask/metamask-extension/pull/18905)) -- Show gas warning for legacy networks also ([#18871](https://github.com/MetaMask/metamask-extension/pull/18871)) -- Added code fences ([#18872](https://github.com/MetaMask/metamask-extension/pull/18872)) -- Part of #17670: Replace Typography with Text component for 11 files. ([#18837](https://github.com/MetaMask/metamask-extension/pull/18837)) -- Adding new icons ([#18870](https://github.com/MetaMask/metamask-extension/pull/18870)) -- Consistent message for third party requests across screens ([#18873](https://github.com/MetaMask/metamask-extension/pull/18873)) -- UX: Multichain: Set a maximum width on the network picker ([#18731](https://github.com/MetaMask/metamask-extension/pull/18731)) -- Terms of use e2e ([#18861](https://github.com/MetaMask/metamask-extension/pull/18861)) -- E2E: update selenium webdriver ([#18854](https://github.com/MetaMask/metamask-extension/pull/18854)) -- fix(18709): fix error when switching to linea testnet using wallet_sw… ([#18710](https://github.com/MetaMask/metamask-extension/pull/18710)) -- [MMI] Adds custodian icon next to metafox ([#18851](https://github.com/MetaMask/metamask-extension/pull/18851)) -- [MMI] Add the custody status text in the transaction status ([#18797](https://github.com/MetaMask/metamask-extension/pull/18797)) -- fix: remove firefox build for beta ([#18874](https://github.com/MetaMask/metamask-extension/pull/18874)) -- [MMI] adds some constants and necessary routes ([#17868](https://github.com/MetaMask/metamask-extension/pull/17868)) -- [MMI] Added confirm-remove-jwt component ([#18186](https://github.com/MetaMask/metamask-extension/pull/18186)) -- Fix in approve header to show correct account name ([#18849](https://github.com/MetaMask/metamask-extension/pull/18849)) -- deprecation notice ([#18859](https://github.com/MetaMask/metamask-extension/pull/18859)) -- devDeps: eslint@8.14.0,8.20.0->8.36.0 ([#18748](https://github.com/MetaMask/metamask-extension/pull/18748)) -- Adding price checker deactivation for Optimism ([#18833](https://github.com/MetaMask/metamask-extension/pull/18833)) -- Part of #17670: Replace Typography with Text component in RecoveryPhraseReminder ([#18639](https://github.com/MetaMask/metamask-extension/pull/18639)) -- Add snaps entries to CODEOWNERS ([#18825](https://github.com/MetaMask/metamask-extension/pull/18825)) -- Ux Multichain: Hide search input for single account ([#18798](https://github.com/MetaMask/metamask-extension/pull/18798)) -- UX: Multichain: Analytics ([#18674](https://github.com/MetaMask/metamask-extension/pull/18674)) -- update ses@0.18.4 ([#17521](https://github.com/MetaMask/metamask-extension/pull/17521)) -- [e2e] test-dapp update to `v6.0.0` ([#18844](https://github.com/MetaMask/metamask-extension/pull/18844)) -- Return state when calling EncryptionPublicKeyController.cancelEncryptionPublicKey ([#18845](https://github.com/MetaMask/metamask-extension/pull/18845)) -- [MMI] custody page component ([#18688](https://github.com/MetaMask/metamask-extension/pull/18688)) -- Update Snaps icon in settings search and fix missing icon ([#18803](https://github.com/MetaMask/metamask-extension/pull/18803)) -- [MMI] Add interactive-replacement-token-page ([#18683](https://github.com/MetaMask/metamask-extension/pull/18683)) +### Added +- Add extra friction to enable eth_sign in advanced settings ([#18848](https://github.com/MetaMask/metamask-extension/pull/18848)) - Fix for wrong type being assigned to the transaction ([#18818](https://github.com/MetaMask/metamask-extension/pull/18818)) -- locales/ko: Fix some mistranslation and typo ([#18799](https://github.com/MetaMask/metamask-extension/pull/18799)) -- Strong tag support in Text component ([#18816](https://github.com/MetaMask/metamask-extension/pull/18816)) -- Update Button prop name type to variant ([#18774](https://github.com/MetaMask/metamask-extension/pull/18774)) -- Part of #17670 for file: detected-token-ignored-popover.js ([#18738](https://github.com/MetaMask/metamask-extension/pull/18738)) -- Update knobs to control: MetamaskTemplateRenderer ([#18677](https://github.com/MetaMask/metamask-extension/pull/18677)) -- devDeps: bumps source-map related dependencies ([#18830](https://github.com/MetaMask/metamask-extension/pull/18830)) -- devDeps: bump @storybook/* ([#18832](https://github.com/MetaMask/metamask-extension/pull/18832)) -- Consume Decrypt Message Manager from @metamask/message-manager ([#18379](https://github.com/MetaMask/metamask-extension/pull/18379)) -- Fix mv3 beta build ([#18690](https://github.com/MetaMask/metamask-extension/pull/18690)) -- UX: Remove Goerli buy link and disable button ([#18137](https://github.com/MetaMask/metamask-extension/pull/18137)) -- UX: Multichain: Fix Network Picker when Test Networks Disabled ([#18694](https://github.com/MetaMask/metamask-extension/pull/18694)) -- UX: Multichain: Focus on account search when menu appears ([#18705](https://github.com/MetaMask/metamask-extension/pull/18705)) -- deps: bump json5, loader-utils, minimist ([#18733](https://github.com/MetaMask/metamask-extension/pull/18733)) -- Unbreak CI checks ([#18813](https://github.com/MetaMask/metamask-extension/pull/18813)) -- Improve logging at build-time ([#18780](https://github.com/MetaMask/metamask-extension/pull/18780)) -- Enable editing L2 gas on optimism ([#18217](https://github.com/MetaMask/metamask-extension/pull/18217)) -- Adding ModalHeader component and updating PopoverHeader stories ([#18311](https://github.com/MetaMask/metamask-extension/pull/18311)) -- Policy formatting issue ([#18810](https://github.com/MetaMask/metamask-extension/pull/18810)) -- UX: Multichain: App header cleanups ([#18627](https://github.com/MetaMask/metamask-extension/pull/18627)) -- UX: Multichain: Use correct blockie or jazzicon in the account menu ([#18782](https://github.com/MetaMask/metamask-extension/pull/18782)) -- Part of #17670: Replace Typography with Text component for networks-list.js ([#18754](https://github.com/MetaMask/metamask-extension/pull/18754)) -- [FLASK] Expanded Snap authorship ([#18775](https://github.com/MetaMask/metamask-extension/pull/18775)) -- Fix diff generation for fitness functions ([#18508](https://github.com/MetaMask/metamask-extension/pull/18508)) -- deps: replace gulp-dart-sass with gulp-sass. ([#16302](https://github.com/MetaMask/metamask-extension/pull/16302)) -- feat: add yaml feature management ([#18125](https://github.com/MetaMask/metamask-extension/pull/18125)) -- [MMI] Created custody-confirm-link-modal component ([#18632](https://github.com/MetaMask/metamask-extension/pull/18632)) -- Update keystone links ([#18792](https://github.com/MetaMask/metamask-extension/pull/18792)) -- Part of #17670 for file custom-spending-cap-tooltip.js ([#18686](https://github.com/MetaMask/metamask-extension/pull/18686)) -- Part of #17670 for file network-statistics.js ([#18644](https://github.com/MetaMask/metamask-extension/pull/18644)) -- Update slippage-buttons.js ([#18745](https://github.com/MetaMask/metamask-extension/pull/18745)) -- Update fee-card.js ([#18746](https://github.com/MetaMask/metamask-extension/pull/18746)) -- Update settings-tab.component.js ([#18753](https://github.com/MetaMask/metamask-extension/pull/18753)) -- Worked on #17670 & #18714 for 7 files. ([#18789](https://github.com/MetaMask/metamask-extension/pull/18789)) -- [FLASK] Update permissions to use IconName and IconSize design system enum ([#18786](https://github.com/MetaMask/metamask-extension/pull/18786)) -- [MMI] Adds a warning if message signing account mismatches selected account ([#18659](https://github.com/MetaMask/metamask-extension/pull/18659)) -- Approvals selector refactor ([#18664](https://github.com/MetaMask/metamask-extension/pull/18664)) -- Use SIWE origin validation logic from @metamask/controller-utils ([#18518](https://github.com/MetaMask/metamask-extension/pull/18518)) -- devDeps: security updates roundup ([#18739](https://github.com/MetaMask/metamask-extension/pull/18739)) -- Revert "Shallow git clone (#18491)" ([#18491](https://github.com/MetaMask/metamask-extension/pull/18491)) -- Unit tests for various modals ([#18115](https://github.com/MetaMask/metamask-extension/pull/18115)) -- Fix missing icon for webassembly endowment ([#18781](https://github.com/MetaMask/metamask-extension/pull/18781)) -- Only build LavaMoat runtime once ([#18768](https://github.com/MetaMask/metamask-extension/pull/18768)) -- Some linting issues in the file custom spending cap tooltip.js ([#18687](https://github.com/MetaMask/metamask-extension/pull/18687)) -- Fix ICON_NAMES error for snaps settings ([#18784](https://github.com/MetaMask/metamask-extension/pull/18784)) -- Prevent new JS files in shared folder ([#17737](https://github.com/MetaMask/metamask-extension/pull/17737)) -- update icons to ts enum version ([#18698](https://github.com/MetaMask/metamask-extension/pull/18698)) -- Shallow git clone ([#18491](https://github.com/MetaMask/metamask-extension/pull/18491)) -- deps: bump serve-handler@6.1.3->6.1.5; minimatch@3.0.4->3.1.2 ([#18734](https://github.com/MetaMask/metamask-extension/pull/18734)) -- Bump `@metamask/slip44` to `3.0.0` ([#18773](https://github.com/MetaMask/metamask-extension/pull/18773)) -- [FLASK] Fix text selection bug in snap ui ([#18719](https://github.com/MetaMask/metamask-extension/pull/18719)) -- [FLASK] Add updated version of the Snaps settings UI ([#18438](https://github.com/MetaMask/metamask-extension/pull/18438)) -- Part of #17670: Replace Typography with Text component ([#18569](https://github.com/MetaMask/metamask-extension/pull/18569)) -- Part of 17670: Replace Typography with Text in detected-token-address.js ([#18435](https://github.com/MetaMask/metamask-extension/pull/18435)) -- Update knobs to controls in storybook: SelectQuotePopover ([#18671](https://github.com/MetaMask/metamask-extension/pull/18671)) -- Sign-in With Ethereum SIWE cleanup ([#18230](https://github.com/MetaMask/metamask-extension/pull/18230)) -- update ethereum provider endowment weight level and update install warning copy ([#18732](https://github.com/MetaMask/metamask-extension/pull/18732)) -- [MMI] Add-compliance-details component ([#18575](https://github.com/MetaMask/metamask-extension/pull/18575)) -- Updating Avatar components to forward refs ([#18678](https://github.com/MetaMask/metamask-extension/pull/18678)) -- Add "Do Not Merge" GH Action to block PRs with "DO-NOT-MERGE" label ([#18724](https://github.com/MetaMask/metamask-extension/pull/18724)) -- UX Multichain: Added product tour component ([#18571](https://github.com/MetaMask/metamask-extension/pull/18571)) -- Update outdated browser versions ([#18721](https://github.com/MetaMask/metamask-extension/pull/18721)) -- [MMI] Add transaction-failed functional component ([#18623](https://github.com/MetaMask/metamask-extension/pull/18623)) -- UX: Multichain: Network Menu: Set Focus on Selected Network ([#18706](https://github.com/MetaMask/metamask-extension/pull/18706)) -- TransactionUtils: update determineTransactionType method / contractInteraction support ([#18652](https://github.com/MetaMask/metamask-extension/pull/18652)) -- added new snaps wasm test ([#18696](https://github.com/MetaMask/metamask-extension/pull/18696)) -- Stop transpiling ES2020 libraries ([#18713](https://github.com/MetaMask/metamask-extension/pull/18713)) -- [MMI] update eth overview component ([#18625](https://github.com/MetaMask/metamask-extension/pull/18625)) -- [MMI] adds institutional duck to mmi folder ([#18578](https://github.com/MetaMask/metamask-extension/pull/18578)) -- [MMI] interactive replacement token notification ([#18620](https://github.com/MetaMask/metamask-extension/pull/18620)) -- Update tokens controller ([#18459](https://github.com/MetaMask/metamask-extension/pull/18459)) -- Fixing issue with gasLimit in transaction being 0 ([#18682](https://github.com/MetaMask/metamask-extension/pull/18682)) -- 17873 ledger instruction banner ([#17937](https://github.com/MetaMask/metamask-extension/pull/17937)) +- Update Snaps icon in settings search and fix missing icon ([#18803](https://github.com/MetaMask/metamask-extension/pull/18803)) +- Update Korean transactions ([#18799](https://github.com/MetaMask/metamask-extension/pull/18799)) - Show Bridge button in TokenOverview component ([#18630](https://github.com/MetaMask/metamask-extension/pull/18630)) -- deps/security: vm2@3.9.16->3.9.17 ([#18707](https://github.com/MetaMask/metamask-extension/pull/18707)) -- Confirm recovery phrase onboarding unit test ([#18250](https://github.com/MetaMask/metamask-extension/pull/18250)) +- Update trezor-connect to v9. Introduced trezor changes are documented at [trezor-suite](https://github.com/trezor/trezor-suite/blob/develop/packages/connect/CHANGELOG.md). ([#18302](https://github.com/MetaMask/metamask-extension/pull/18302)) + +### Changed +- Adding new icons ([#18870](https://github.com/MetaMask/metamask-extension/pull/18870)) +- Changed Chinese translation for "Average" password strength([#18897](https://github.com/MetaMask/metamask-extension/pull/18897)) +- Update Ledger instruction banner for transactions ([#17937](https://github.com/MetaMask/metamask-extension/pull/17937)) +- Enable editing L2 gas on optimism ([#18217](https://github.com/MetaMask/metamask-extension/pull/18217)) +- Update keystone links ([#18792](https://github.com/MetaMask/metamask-extension/pull/18792)) +- Remove Goerli buy link and disable button ([#18137](https://github.com/MetaMask/metamask-extension/pull/18137)) +- [FLASK] Don't show the title on Install/Update when it's loading ([#19012](https://github.com/MetaMask/metamask-extension/pull/19012)) +- [FLASK] Add updated version of the Snaps settings UI ([#18438](https://github.com/MetaMask/metamask-extension/pull/18438), ([#18775](https://github.com/MetaMask/metamask-extension/pull/18775))) + +### Fixed +- Fix terms of use popover scroll button hiding when scollbar is at the bottom. ([#18843](https://github.com/MetaMask/metamask-extension/pull/18843)) +- Fix in approve header to show correct account name ([#18849](https://github.com/MetaMask/metamask-extension/pull/18849)) +- Fix error when switching to Linea testnet using wallet_switchEthereumChain ([#18710](https://github.com/MetaMask/metamask-extension/pull/18710)) +- Fix for persistant currency conversion on multi layer transactions when the show balance setting is off ([#18833](https://github.com/MetaMask/metamask-extension/pull/18833)) +- [FLASK] Fix overflowing notification content ([#18881](https://github.com/MetaMask/metamask-extension/pull/18881)) +- [FLASK] Fix missing icon for webassembly endowment ([#18781](https://github.com/MetaMask/metamask-extension/pull/18781)) +- [FLASK] Fix text selection bug in snap ui ([#18719](https://github.com/MetaMask/metamask-extension/pull/18719)) ## [10.30.1] ### Fixed From 24c564a4c334fa4e900462b909e2e0af94de2a5c Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Fri, 19 May 2023 14:20:22 -0230 Subject: [PATCH 04/12] Changelog lint fix --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ea568167..2b892ad03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [FLASK] Fix overflowing notification content ([#18881](https://github.com/MetaMask/metamask-extension/pull/18881)) - [FLASK] Fix missing icon for webassembly endowment ([#18781](https://github.com/MetaMask/metamask-extension/pull/18781)) - [FLASK] Fix text selection bug in snap ui ([#18719](https://github.com/MetaMask/metamask-extension/pull/18719)) + ## [10.30.4] ### Fixed - Fix error upon submitting multiple requests that require approval ([#19050](https://github.com/MetaMask/metamask-extension/pull/19050)) From d746b58c90c8c5d7c6972e19b8a46f5cd8ce5a54 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Fri, 19 May 2023 16:31:32 -0230 Subject: [PATCH 05/12] Version v10.31.0-beta.0 From d2dba07eebd5700c76500e305d401ce32fdf1bdf Mon Sep 17 00:00:00 2001 From: Nidhi Kumari Date: Tue, 23 May 2023 22:54:17 +0530 Subject: [PATCH 06/12] UX Multichain: updated border top for activity list (#19176) * updated border top for activity list * updated border css via prop * fixed symbol * fixed lint errors * fix conditions * updated snapshot --- .../app/token-cell/__snapshots__/token-cell.test.js.snap | 2 +- .../transaction-list-item/transaction-list-item.component.js | 2 ++ .../list-item/__snapshots__/list-item.component.test.js.snap | 4 ++-- ui/components/ui/list-item/index.scss | 5 ++++- ui/components/ui/list-item/list-item.component.js | 5 +++++ 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap b/ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap index 4d77ea5ee..ab99b1f5f 100644 --- a/ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap +++ b/ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap @@ -3,7 +3,7 @@ exports[`Token Cell should match snapshot 1`] = `
diff --git a/ui/components/app/transaction-list-item/transaction-list-item.component.js b/ui/components/app/transaction-list-item/transaction-list-item.component.js index dc99a7eac..f412e7fbc 100644 --- a/ui/components/app/transaction-list-item/transaction-list-item.component.js +++ b/ui/components/app/transaction-list-item/transaction-list-item.component.js @@ -168,6 +168,7 @@ function TransactionListItemInner({ ]); const showCancelButton = !hasCancelled && isPending && !isUnapproved; + const showBorder = process.env.MULTICHAIN; return ( <> @@ -178,6 +179,7 @@ function TransactionListItemInner({ icon={ } + showBorder={showBorder} subtitle={

@@ -21,7 +21,7 @@ exports[`ListItem should match snapshot with no props 1`] = ` exports[`ListItem should match snapshot with props 1`] = `
Date: Wed, 24 May 2023 07:10:12 -0500 Subject: [PATCH 07/12] Fix #19139 - Allow user to switch network when loading networking fails (#19175) --- .../loading-network-screen/loading-network-screen.component.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/components/app/loading-network-screen/loading-network-screen.component.js b/ui/components/app/loading-network-screen/loading-network-screen.component.js index 23c1c309d..5263f2a0f 100644 --- a/ui/components/app/loading-network-screen/loading-network-screen.component.js +++ b/ui/components/app/loading-network-screen/loading-network-screen.component.js @@ -79,6 +79,7 @@ export default class LoadingNetworkScreen extends PureComponent { { window.clearTimeout(this.cancelCallTimeout); + this.setState({ showErrorScreen: false }); }} centerTitle title={ @@ -100,6 +101,7 @@ export default class LoadingNetworkScreen extends PureComponent { { window.clearTimeout(this.cancelCallTimeout); + this.setState({ showErrorScreen: false }); showNetworkDropdown(); }} variant={TextVariant.bodySm} From 6a7688b0d38479bf0b5eb885bdef920b4037012b Mon Sep 17 00:00:00 2001 From: Nidhi Kumari Date: Wed, 10 May 2023 19:11:03 +0530 Subject: [PATCH 08/12] removed mmi fencing from copy icon in header (#19087) * removed mmi fencing from copy icon * updated snapshot --- .../selected-account-component.test.js.snap | 8 -------- .../selected-account/selected-account.component.js | 13 ++----------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/ui/components/app/selected-account/__snapshots__/selected-account-component.test.js.snap b/ui/components/app/selected-account/__snapshots__/selected-account-component.test.js.snap index 43e1f1a76..6031f8d0b 100644 --- a/ui/components/app/selected-account/__snapshots__/selected-account-component.test.js.snap +++ b/ui/components/app/selected-account/__snapshots__/selected-account-component.test.js.snap @@ -29,14 +29,6 @@ exports[`SelectedAccount Component should match snapshot 1`] = ` class="selected-account__address" > 0x0DC...E7bc - From ea321c964fa76aa615f1478d9775e5e6647974b4 Mon Sep 17 00:00:00 2001 From: Nicholas Ellul Date: Wed, 24 May 2023 11:17:00 -0400 Subject: [PATCH 09/12] Revert "limit connections (#18355)" (#19272) This reverts commit 8d2803c1790971230e92b0c9429bc00594073bd8. --- app/scripts/background.js | 46 +++++---------------------------------- 1 file changed, 5 insertions(+), 41 deletions(-) diff --git a/app/scripts/background.js b/app/scripts/background.js index 082a13b67..828973d84 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -32,7 +32,6 @@ import { import { checkForLastErrorAndLog } from '../../shared/modules/browser-runtime.utils'; import { isManifestV3 } from '../../shared/modules/mv3.utils'; import { maskObject } from '../../shared/modules/object.utils'; -import { getEnvironmentType, deferredPromise, getPlatform } from './lib/util'; import migrations from './migrations'; import Migrator from './lib/migrator'; import ExtensionPlatform from './platforms/extension'; @@ -51,6 +50,7 @@ import rawFirstTimeState from './first-time-state'; import getFirstPreferredLangCode from './lib/get-first-preferred-lang-code'; import getObjStructure from './lib/getObjStructure'; import setupEnsIpfsResolver from './lib/ens-ipfs/setup'; +import { deferredPromise, getPlatform } from './lib/util'; /* eslint-enable import/first */ @@ -84,7 +84,6 @@ let popupIsOpen = false; let notificationIsOpen = false; let uiIsTriggering = false; const openMetamaskTabsIDs = {}; -const openMetamaskConnections = new Map(); const requestAccountTabIds = {}; let controller; @@ -185,28 +184,10 @@ let connectExternal; browser.runtime.onConnect.addListener(async (...args) => { // Queue up connection attempts here, waiting until after initialization await isInitialized; - const remotePort = args[0]; - const { sender } = remotePort; - const url = sender?.url; - const detectedProcessName = url ? getEnvironmentType(url) : ''; - - const connectionId = generateConnectionId(remotePort, detectedProcessName); - const openConnections = openMetamaskConnections.get(connectionId) || 0; - - if ( - openConnections === 0 || - (detectedProcessName === 'background' && openConnections < 2) - // 2 background connections are allowed, one for phishing warning page and one for the ledger bridge keyring - ) { - // This is set in `setupController`, which is called as part of initialization - connectRemote(...args); - openMetamaskConnections.set(connectionId, openConnections + 1); - } else { - throw new Error('CONNECTION_ALREADY_EXISTS'); - } + // This is set in `setupController`, which is called as part of initialization + connectRemote(...args); }); - browser.runtime.onConnectExternal.addListener(async (...args) => { // Queue up connection attempts here, waiting until after initialization await isInitialized; @@ -435,21 +416,6 @@ export async function loadStateFromPersistence() { return versionedData.data; } -function generateConnectionId(remotePort, detectedProcessName) { - const { sender } = remotePort; - const id = sender?.tab ? sender.tab.id : sender?.id; - if (!id || !detectedProcessName) { - console.error( - 'Must provide id and detectedProcessName to generate connection id.', - id, - detectedProcessName, - ); // eslint-disable-line no-console - throw new Error( - 'Must provide id and detectedProcessName to generate connection id.', - ); - } - return `${id}-${detectedProcessName}`; -} /** * Initializes the MetaMask Controller with any initial state and default language. * Configures platform-specific error reporting strategy. @@ -604,6 +570,7 @@ export function setupController( // communication with popup controller.isClientOpen = true; controller.setupTrustedCommunication(portStream, remotePort.sender); + if (isManifestV3) { // If we get a WORKER_KEEP_ALIVE message, we respond with an ACK remotePort.onMessage.addListener((message) => { @@ -618,11 +585,9 @@ export function setupController( }); } - const connectionId = generateConnectionId(remotePort, processName); if (processName === ENVIRONMENT_TYPE_POPUP) { popupIsOpen = true; endOfStream(portStream, () => { - openMetamaskConnections.set(connectionId, 0); popupIsOpen = false; const isClientOpen = isClientOpenStatus(); controller.isClientOpen = isClientOpen; @@ -632,8 +597,8 @@ export function setupController( if (processName === ENVIRONMENT_TYPE_NOTIFICATION) { notificationIsOpen = true; + endOfStream(portStream, () => { - openMetamaskConnections.set(connectionId, 0); notificationIsOpen = false; const isClientOpen = isClientOpenStatus(); controller.isClientOpen = isClientOpen; @@ -649,7 +614,6 @@ export function setupController( openMetamaskTabsIDs[tabId] = true; endOfStream(portStream, () => { - openMetamaskConnections.set(connectionId, 0); delete openMetamaskTabsIDs[tabId]; const isClientOpen = isClientOpenStatus(); controller.isClientOpen = isClientOpen; From c42d3920f8a3c778495544a0d91006b4f142b174 Mon Sep 17 00:00:00 2001 From: Daniel <80175477+dan437@users.noreply.github.com> Date: Thu, 25 May 2023 19:30:10 +0200 Subject: [PATCH 10/12] Show the right "balance needed" value if we fallback from STX to regular Swaps (#19230) * Show the right balance needed value if we fallback from STX to regular Swaps * Fix usage of StxErrorTypes --- ui/ducks/swaps/swaps.js | 8 ++++---- ui/pages/swaps/view-quote/view-quote.js | 18 ++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/ui/ducks/swaps/swaps.js b/ui/ducks/swaps/swaps.js index 6f5252bc2..3a9a1f538 100644 --- a/ui/ducks/swaps/swaps.js +++ b/ui/ducks/swaps/swaps.js @@ -208,7 +208,7 @@ const slice = createSlice({ setCurrentSmartTransactionsError: (state, action) => { const errorType = Object.values(StxErrorTypes).includes(action.payload) ? action.payload - : StxErrorTypes.UNAVAILABLE; + : StxErrorTypes.unavailable; state.currentSmartTransactionsError = errorType; }, setSwapsSTXSubmitLoading: (state, action) => { @@ -554,7 +554,7 @@ const disableStxIfRegularTxInProgress = (dispatch, transactions) => { for (const transaction of transactions) { if (IN_PROGRESS_TRANSACTION_STATUSES.includes(transaction.status)) { dispatch( - setCurrentSmartTransactionsError(StxErrorTypes.REGULAR_TX_IN_PROGRESS), + setCurrentSmartTransactionsError(StxErrorTypes.regularTxPending), ); break; } @@ -939,7 +939,7 @@ export const signAndSendSwapsSmartTransaction = ({ if (!fees) { log.error('"fetchSwapsSmartTransactionFees" failed'); dispatch(setSwapsSTXSubmitLoading(false)); - dispatch(setCurrentSmartTransactionsError(StxErrorTypes.UNAVAILABLE)); + dispatch(setCurrentSmartTransactionsError(StxErrorTypes.unavailable)); return; } if (approveTxParams) { @@ -1329,7 +1329,7 @@ export function fetchSwapsSmartTransactionFees({ const errorObj = parseSmartTransactionsError(e.message); if ( fallbackOnNotEnoughFunds || - errorObj?.error !== StxErrorTypes.NOT_ENOUGH_FUNDS + errorObj?.error !== StxErrorTypes.notEnoughFunds ) { dispatch(setCurrentSmartTransactionsError(errorObj?.error)); } diff --git a/ui/pages/swaps/view-quote/view-quote.js b/ui/pages/swaps/view-quote/view-quote.js index 04cab7518..6857b2037 100644 --- a/ui/pages/swaps/view-quote/view-quote.js +++ b/ui/pages/swaps/view-quote/view-quote.js @@ -201,6 +201,8 @@ export default function ViewQuote() { ); const swapsNetworkConfig = useSelector(getSwapsNetworkConfig, shallowEqual); const unsignedTransaction = usedQuote.trade; + const isSmartTransaction = + currentSmartTransactionsEnabled && smartTransactionsOptInStatus; let gasFeeInputs; if (networkAndAccountSupports1559) { @@ -460,7 +462,7 @@ export default function ViewQuote() { : null; let ethBalanceNeededStx; - if (smartTransactionsError?.balanceNeededWei) { + if (isSmartTransaction && smartTransactionsError?.balanceNeededWei) { ethBalanceNeededStx = decWEIToDecETH( smartTransactionsError.balanceNeededWei - smartTransactionsError.currentBalanceWei, @@ -469,7 +471,7 @@ export default function ViewQuote() { const destinationToken = useSelector(getDestinationTokenInfo, isEqual); useEffect(() => { - if (currentSmartTransactionsEnabled && smartTransactionsOptInStatus) { + if (isSmartTransaction) { if (insufficientTokens) { dispatch(setBalanceError(true)); } else if (balanceError && !insufficientTokens) { @@ -485,8 +487,7 @@ export default function ViewQuote() { insufficientEth, balanceError, dispatch, - currentSmartTransactionsEnabled, - smartTransactionsOptInStatus, + isSmartTransaction, ]); useEffect(() => { @@ -522,10 +523,7 @@ export default function ViewQuote() { ethBalanceNeeded; // If it's a Smart Transaction and ETH balance is needed, we want to show a warning. - const isStxAndEthBalanceIsNeeded = - currentSmartTransactionsEnabled && - smartTransactionsOptInStatus && - ethBalanceNeededStx; + const isStxAndEthBalanceIsNeeded = isSmartTransaction && ethBalanceNeededStx; // Indicates if we should show to a user a warning about insufficient funds for swapping. const showInsufficientWarning = @@ -926,14 +924,14 @@ export default function ViewQuote() { ]); useEffect(() => { - if (currentSmartTransactionsEnabled && smartTransactionsOptInStatus) { + if (isSmartTransaction) { // Removes a smart transactions error when the component loads. dispatch({ type: SET_SMART_TRANSACTIONS_ERROR, payload: null, }); } - }, [currentSmartTransactionsEnabled, smartTransactionsOptInStatus, dispatch]); + }, [isSmartTransaction, dispatch]); return (
From a62de72aaadf49f09c81b80585bb1237826f80fe Mon Sep 17 00:00:00 2001 From: Daniel <80175477+dan437@users.noreply.github.com> Date: Thu, 25 May 2023 18:48:11 +0200 Subject: [PATCH 11/12] Styling fix and content update for Swaps (#19284) --- app/_locales/de/messages.json | 4 ---- app/_locales/el/messages.json | 4 ---- app/_locales/en/messages.json | 4 ---- app/_locales/es/messages.json | 4 ---- app/_locales/es_419/messages.json | 4 ---- app/_locales/fr/messages.json | 4 ---- app/_locales/hi/messages.json | 4 ---- app/_locales/id/messages.json | 4 ---- app/_locales/ja/messages.json | 4 ---- app/_locales/ko/messages.json | 4 ---- app/_locales/pt/messages.json | 4 ---- app/_locales/pt_BR/messages.json | 4 ---- app/_locales/ru/messages.json | 4 ---- app/_locales/tl/messages.json | 4 ---- app/_locales/tr/messages.json | 4 ---- app/_locales/vi/messages.json | 4 ---- app/_locales/zh_CN/messages.json | 4 ---- ui/pages/swaps/awaiting-signatures/awaiting-signatures.js | 2 +- ui/pages/swaps/fee-card/fee-card.js | 6 +----- ui/pages/swaps/fee-card/fee-card.stories.js | 1 - ui/pages/swaps/fee-card/fee-card.test.js | 6 +++--- .../loading-swaps-quotes-stories-metadata.test.js.snap | 2 +- ui/pages/swaps/slippage-buttons/slippage-buttons.js | 2 +- ui/pages/swaps/view-quote/view-quote.js | 3 --- 24 files changed, 7 insertions(+), 83 deletions(-) diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index b8b8c19df..95969f006 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -3585,10 +3585,6 @@ "message": "Sie benötigen $1 mehr $2, um diesen Swap abzuschließen", "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol." }, - "swapBestOfNQuotes": { - "message": "Die besten $1 Kurse.", - "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen" - }, "swapBuildQuotePlaceHolderText": { "message": "Keine Token verfügbar mit $1", "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text" diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index 06ebced86..7e71a3e07 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -3585,10 +3585,6 @@ "message": "Χρειάζεστε $1 περισσότερα $2 για να ολοκληρώσετε αυτήν την ανταλλαγή", "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol." }, - "swapBestOfNQuotes": { - "message": "Το καλύτερο από $1 προσφορές.", - "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen" - }, "swapBuildQuotePlaceHolderText": { "message": "Δεν υπάρχουν διαθέσιμα tokens που να ταιριάζουν σε $1", "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text" diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 088fe8444..8369a9c82 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -4086,10 +4086,6 @@ "message": "You need $1 more $2 to complete this swap", "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol." }, - "swapBestOfNQuotes": { - "message": "Best of $1 quotes.", - "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen" - }, "swapBuildQuotePlaceHolderText": { "message": "No tokens available matching $1", "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text" diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 67a3b012a..d70534f6d 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -3585,10 +3585,6 @@ "message": "Necesita $1 más $2 para completar este canje", "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol." }, - "swapBestOfNQuotes": { - "message": "Mejor cotización de $1.", - "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen" - }, "swapBuildQuotePlaceHolderText": { "message": "No hay tokens disponibles que coincidan con $1", "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text" diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json index 98254c6fc..09876fb19 100644 --- a/app/_locales/es_419/messages.json +++ b/app/_locales/es_419/messages.json @@ -2241,10 +2241,6 @@ "message": "Necesita $1 más $2 para realizar este canje", "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol." }, - "swapBestOfNQuotes": { - "message": "Mejor cotización de $1.", - "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen" - }, "swapBuildQuotePlaceHolderText": { "message": "No hay tokens disponibles que coincidan con $1", "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text" diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index b543b2114..b5bfda3f6 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -3585,10 +3585,6 @@ "message": "Vous avez besoin de $1 $2 de plus pour effectuer ce swap", "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol." }, - "swapBestOfNQuotes": { - "message": "Meilleures cotations de $1.", - "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen" - }, "swapBuildQuotePlaceHolderText": { "message": "Aucun jeton disponible correspondant à $1", "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text" diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index e9781a768..8154c2b86 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -3585,10 +3585,6 @@ "message": "इस स्वैप को पूरा करने के लिए आपको अधिक $1 और $2 की आवश्यकता होगी", "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol." }, - "swapBestOfNQuotes": { - "message": "$1 उद्धरणों में से सर्वश्रेष्ठ।", - "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen" - }, "swapBuildQuotePlaceHolderText": { "message": "$1 के मिलान वाले कोई भी टोकन उपलब्ध नहीं हैं", "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text" diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index 97df69b6f..3aff4b7d6 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -3585,10 +3585,6 @@ "message": "Anda memerlukan $1 $2 lagi untuk menyelesaikan swap", "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol." }, - "swapBestOfNQuotes": { - "message": "Kuotasi terbaik dari $1.", - "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen" - }, "swapBuildQuotePlaceHolderText": { "message": "Tidak ada token yang cocok yang tersedia $1", "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text" diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index a3c0dd28e..51ddd57ad 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -3585,10 +3585,6 @@ "message": "このスワップを完了させるには、さらに$1の$2が必要です。", "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol." }, - "swapBestOfNQuotes": { - "message": "最善の$1の見積もり。", - "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen" - }, "swapBuildQuotePlaceHolderText": { "message": "$1と一致するトークンがありません", "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text" diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index c4de64fc4..a6748c52d 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -3585,10 +3585,6 @@ "message": "이 스왑을 완료하려면 $1개의 추가 $2이(가) 필요합니다.", "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol." }, - "swapBestOfNQuotes": { - "message": "$1의 최고 견적", - "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen" - }, "swapBuildQuotePlaceHolderText": { "message": "$1와(과) 일치하는 토큰이 없습니다.", "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text" diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index d52ed995d..2c68d1dce 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -3585,10 +3585,6 @@ "message": "Você precisa de mais $1 $2 para concluir essa troca", "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol." }, - "swapBestOfNQuotes": { - "message": "Melhores cotações de $1.", - "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen" - }, "swapBuildQuotePlaceHolderText": { "message": "Nenhum token disponível correspondente a $1", "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text" diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json index 6c949ccfc..e0189eb64 100644 --- a/app/_locales/pt_BR/messages.json +++ b/app/_locales/pt_BR/messages.json @@ -2241,10 +2241,6 @@ "message": "Você precisa de mais $1 $2 para concluir essa troca", "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol." }, - "swapBestOfNQuotes": { - "message": "Melhores cotações de $1.", - "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen" - }, "swapBuildQuotePlaceHolderText": { "message": "Nenhum token disponível correspondente a $1", "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text" diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 1b9a1a6e8..e6fbc965a 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -3585,10 +3585,6 @@ "message": "Вам нужно еще $1 $2 для завершения этого обмена", "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol." }, - "swapBestOfNQuotes": { - "message": "Лучшие котировки $1.", - "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen" - }, "swapBuildQuotePlaceHolderText": { "message": "Нет доступных токенов, соответствующих $1", "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text" diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index 479683256..7567f49db 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -3585,10 +3585,6 @@ "message": "Kailangan mo ng $1 pa $2 para makumpleto ang pag-swap na ito", "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol." }, - "swapBestOfNQuotes": { - "message": "Pinakamaganda ng $1 na quote.", - "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen" - }, "swapBuildQuotePlaceHolderText": { "message": "Walang available na token na tumutugma sa $1", "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text" diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index 1479da53f..3b7156625 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -3585,10 +3585,6 @@ "message": "Bu takası tamamlamak için $1 tane daha $2 gerekli", "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol." }, - "swapBestOfNQuotes": { - "message": "En iyi $1 teklifleri.", - "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen" - }, "swapBuildQuotePlaceHolderText": { "message": "$1 ile eşleşen token yok", "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text" diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index 4bb67b89e..a29e2daa1 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -3585,10 +3585,6 @@ "message": "Bạn cần $1 $2 nữa để hoàn tất giao dịch hoán đổi này", "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol." }, - "swapBestOfNQuotes": { - "message": "Tốt nhất trong $1 báo giá.", - "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen" - }, "swapBuildQuotePlaceHolderText": { "message": "Không có token nào khớp với $1", "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text" diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 3bbbf0165..f63570154 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -3585,10 +3585,6 @@ "message": "您还需要 $1 的 $2 来完成这笔交换", "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol." }, - "swapBestOfNQuotes": { - "message": "$1 报价中最棒的。", - "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen" - }, "swapBuildQuotePlaceHolderText": { "message": "没有与 $1 匹配的代币", "description": "Tells the user that a given search string does not match any tokens in our token lists. $1 can be any string of text" diff --git a/ui/pages/swaps/awaiting-signatures/awaiting-signatures.js b/ui/pages/swaps/awaiting-signatures/awaiting-signatures.js index 7bf1ace5d..dacb93729 100644 --- a/ui/pages/swaps/awaiting-signatures/awaiting-signatures.js +++ b/ui/pages/swaps/awaiting-signatures/awaiting-signatures.js @@ -102,7 +102,7 @@ export default function AwaitingSignatures() { {needsTwoConfirmations && ( <> - + {t('swapToConfirmWithHwWallet')}
    diff --git a/ui/pages/swaps/fee-card/fee-card.js b/ui/pages/swaps/fee-card/fee-card.js index 153174520..b4df3f0e6 100644 --- a/ui/pages/swaps/fee-card/fee-card.js +++ b/ui/pages/swaps/fee-card/fee-card.js @@ -29,7 +29,6 @@ export default function FeeCard({ numberOfQuotes, onQuotesClick, chainId, - isBestQuote, }) { const t = useContext(I18nContext); const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck); @@ -167,9 +166,7 @@ export default function FeeCard({ onClick={onQuotesClick} className="fee-card__quote-link-text" > - {isBestQuote - ? t('swapBestOfNQuotes', [numberOfQuotes]) - : t('swapNQuotesWithDot', [numberOfQuotes])} + {t('swapNQuotesWithDot', [numberOfQuotes])} )} {t('swapIncludesMMFee', [metaMaskFee])} @@ -202,5 +199,4 @@ FeeCard.propTypes = { onQuotesClick: PropTypes.func.isRequired, numberOfQuotes: PropTypes.number.isRequired, chainId: PropTypes.string.isRequired, - isBestQuote: PropTypes.bool, }; diff --git a/ui/pages/swaps/fee-card/fee-card.stories.js b/ui/pages/swaps/fee-card/fee-card.stories.js index b00e2084e..bd901a05c 100644 --- a/ui/pages/swaps/fee-card/fee-card.stories.js +++ b/ui/pages/swaps/fee-card/fee-card.stories.js @@ -91,7 +91,6 @@ export default { metaMaskFee: '0.875', numberOfQuotes: 6, chainId: CHAIN_IDS.MAINNET, - isBestQuote: true, }, }; diff --git a/ui/pages/swaps/fee-card/fee-card.test.js b/ui/pages/swaps/fee-card/fee-card.test.js index 32b8addd9..3af448cf3 100644 --- a/ui/pages/swaps/fee-card/fee-card.test.js +++ b/ui/pages/swaps/fee-card/fee-card.test.js @@ -95,7 +95,7 @@ describe('FeeCard', () => { useSelector.mockImplementation(generateUseSelectorRouter()); const props = createProps(); const { getByText } = renderWithProvider(); - expect(getByText('Best of 6 quotes.')).toBeInTheDocument(); + expect(getByText('6 quotes.')).toBeInTheDocument(); expect(getByText('Estimated gas fee')).toBeInTheDocument(); expect(getByText('Max fee')).toBeInTheDocument(); expect(getByText(props.primaryFee.fee)).toBeInTheDocument(); @@ -116,7 +116,7 @@ describe('FeeCard', () => { maxFeePerGasDecGWEI: '4', }); const { getByText } = renderWithProvider(); - expect(getByText('Best of 6 quotes.')).toBeInTheDocument(); + expect(getByText('6 quotes.')).toBeInTheDocument(); expect(getByText('Estimated gas fee')).toBeInTheDocument(); expect(getByText('Max fee')).toBeInTheDocument(); expect(getByText(props.primaryFee.fee)).toBeInTheDocument(); @@ -138,7 +138,7 @@ describe('FeeCard', () => { const { getByText, queryByTestId } = renderWithProvider( , ); - expect(getByText('Best of 6 quotes.')).toBeInTheDocument(); + expect(getByText('6 quotes.')).toBeInTheDocument(); expect(getByText('Estimated gas fee')).toBeInTheDocument(); expect(getByText(props.primaryFee.fee)).toBeInTheDocument(); expect(getByText(props.secondaryFee.fee)).toBeInTheDocument(); diff --git a/ui/pages/swaps/loading-swaps-quotes/__snapshots__/loading-swaps-quotes-stories-metadata.test.js.snap b/ui/pages/swaps/loading-swaps-quotes/__snapshots__/loading-swaps-quotes-stories-metadata.test.js.snap index 66be56d52..6581c8123 100644 --- a/ui/pages/swaps/loading-swaps-quotes/__snapshots__/loading-swaps-quotes-stories-metadata.test.js.snap +++ b/ui/pages/swaps/loading-swaps-quotes/__snapshots__/loading-swaps-quotes-stories-metadata.test.js.snap @@ -27,4 +27,4 @@ exports[`storiesMetadata matches expected values for storiesMetadata 1`] = ` "icon": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASkAAAB5CAYAAABlYNfBAAAACXBIWXMAACxLAAAsSwGlPZapAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAlASURBVHgB7d3/eeO2GcDx1336f3UThNcF4g3KLNA4HaDnywC5Xgeo6Q5Q+zpAz+kCd+0AJyUDxNcFTsoCsbtA3gIVFL0CIRGgKMm2vp/nwWPxF0hT4isABCERAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADhCJ4LeVLVyf05d+sylZy7dufSjS7OTk5OPgrXcufN/KpfO16zyfqhzmLGvEjOX7mWA9zgcVx3SwrXL916AvtwHa+TShUtT3cwvfxUCGSLuvJy4dLPh/H2Qgfhg4NIXOrw7l9659EJ6CMfVmPx+5vOCrYSgc6dlpi79SbBC50FquuG8+Qt2JAPQ3QUp65NLdY/jIkh1+LUgi/vwXLk/qWDz/6J/+Ov56p+9uCqXrtz2n7li/GvBoppzJvNzs8m5S9eyG/eyfM9KjGT1/V147tIH979duvf5UoB98gEq8c35dt03p5t/qumqzFvBohT1zpyXqUvnLr3U1ZLqIFU+bZekfInlXHoIefkq/9ma99jnnVVypiSFQei8/UmjC6rO3LZOfIiPuuoXLszn0Tn5h1kWX7RbV/mGDFKJfKtEsPo55zNCkMLWwgcwDlBVwfYXmnYqRypcmC+jC/PULIvbjhrZ0q6ClMnflwyvo+PuLAUSpLA194EZRx+8unD7qaaN5UiFC9qe108dy3+QLe06SIV9xMfdWZoiSOX5lSApfMBqM+vGNYhOJFO4CCoz61vzutbCgPcU6LK/Um1m/zNezaXvzPTpIzlX/rj/aqZ9H8RasDWC1Hrn0XTpHZsL83oi7TuDF3KcavPaX9g3iXXemNf+Yv9SHoe4c+fngq0RpNazF8bElaJmkilRiroMvYgnZp4vIQzSD+gR8QHnGzP9MT6vbtr/ic9Vr86S+2SOe2ZmE6QGQJBKCNULG0BupMxKKcpUE22Vz+d/NA3ooap3Ksv/2c94s251l/5tpkePqHo8EwyKIJV2Fk1/J5lSpSjz+n3HfuK8LnTeH8unRrag897yi7wO0V/LFzVeRfM2ndebaNs/CoC56C7NtHDbqdn2tmP5uCOvM13Vq4+VtrtSNLJn2n4M5kPG+mOz/k99q8e6h7t7sjzmW7OfHzKOi7t7HShJpdlq2EwyabsUlXqkY+XOlWzgqom+5DUxsy56Xqg2GPqn9xvZI10+7V8tZslq1Te5maze+fP/95k8fPY9ZTSDARCk0mwg+I/ks21RPhikLkT7wR1lBJ3X0XEV3RVMBM5G9s9X1+LG75wqtA/S9yaPB1vlC4H4PJr9vQBDS1SNcp/DOo+2e5G5XpWRd9ybuZYM4X+Zmu0O8uygtqt67wq2exdVh4pLkrq/zpzTaB+nGcdFda8DJam2KprOLbLnlKJy9pfSRMeRW5pqZH0j/l5oe8QDP+N97uYu/T2ady4PTPgf/XtSmdkTBj4cBkGq26xrhVCyqcyspiC/30iH0MfKVvtq7RhoLXyL23UuS/p6DSiupt0XBHDPX+i2yvd7eSBCSciPyOpLqPaLw0etrwXYBW2PXFBnbDM2608L8z+X/GOz+7nbVPWJqh5FdyiHohtGPCjII354t7hKpLsbquVa04MgNgV5Ud3rwKB3bVXJytp+xq+R3bk0+1o0or9OHJPvj1SZWYccbK82r+M7djn8Nv+SZR8rX5o6l+3Os8/DjxHW59GkdYPeLVzu++4pjoy2+ybVHeuPS0osukVJKmwfN6KfRssfRGN5OJaNIx4U5nPXNx9l+OBHjTaptrihfG2bUfhA1WZWI+XuCtdvZPUYrxLLq/B6JgdoLPc0PeLBRPqz7ViVPozHZBbPGH7lSk+/LRklA/mo7nV7tmFZY17n3tGLqwr/lQK+Ed1doD7wLILTohHd9zuqZLWx/M2BGssXbOdLH7W+36KkYPurLUZGmEh/76WsD9zCLPz9yN07HIRm9pNKrJf1pL62+0nV0oO2B+SLHaSx3Bxf16/BbOungmPZeT+pPpTqXhaqe21xda9as15jXs8k/yHkKpru+23cVY17KQeiyxEPKtmdxzQyArZAkIqEPkk2ULXapMK3nS05fVtQrfo8sb8+ftex/JUcTmrEg13s4xvBk0ebVNpMlg+K1onlTbTujeSrzOtepagQJBtZPQaf7BhV/i5lfcDGXBtE/WgQf5Dt+cDk+1nVYdq3x434WXIcHW3f5h+ZZXFb1FVBvqNo217dA7TdqbMy+dtb9VPd8+ifa9p/sp5/zMz7dWnetEk9blT30uISji0VNNGydaNLptTR9EQKhYurNrN+edwllChsW1Ul6V9d3qXUiAe5z+rluIn29WAekwH2Zl2JJ1GKKioJaftHJKvC7eOOmtM1642j/ZzKnmi74+Ugv0Ic5T+OSh+jjm0oSeHp0cRzctsEGW0HuLEUyt2/zn/mXXcVKDYcn0/xD39mdc0o3EdRlY8ghSdJ24+vvI2nC/O7iLYvuni13b+q6Vj/uuRCHoKmx3+qZEDhwn4WnYsPGdsQpPD06ObOiFVBPnEpqnTc9FF0LP71KGMbW+3qPUZ45jGmRjzYSQlOC38tmCD1uNFwvtm6DpE3uf2iQmCIq3aNlIlHNWgybrv75X820/7xnr/JbtXmdc445n3Foynwa8E4XtpuB1ItG773Ntr2WgroFo31pSWObWiPBu0t9rWo8q2UFDvWpySFp0nn1aY40ExdeqHrG679NhfaHhDttvTC1XY1ryrYNlUF+6QDBw8dYHC7Hvv0QfEmusBrWX98BCk8XWsC1cJYzY9uhunUaI19AtRFlEfxnbLEheA1MiBN33H7UnZI02NEXWWuS5DC06Ttnui5/HalAcpX82ywu5UedFk1mu7qYtD2iAfZIxQMsN/OmwNKkHrUaDgv4Bqr/W3855LfIDxx6Qu/XY/ny3ypyW8zC+kr6cHt1//xA+t9bfL60aW/yAB0ObidmPx31WDe2r3Mf4B1FtK9rB95wZ5Ln0oHG9wVfxwzkxA5EfQSvrFrmT/Q618vRkvwAcA/VjPhwVcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwJH7H5NlZI/0GQ+cAAAAAElFTkSuQmCC", }, } -`; +`; \ No newline at end of file diff --git a/ui/pages/swaps/slippage-buttons/slippage-buttons.js b/ui/pages/swaps/slippage-buttons/slippage-buttons.js index 59a1c2386..fe7e81f80 100644 --- a/ui/pages/swaps/slippage-buttons/slippage-buttons.js +++ b/ui/pages/swaps/slippage-buttons/slippage-buttons.js @@ -210,7 +210,7 @@ export default function SlippageButtons({ {t('smartTransaction')} diff --git a/ui/pages/swaps/view-quote/view-quote.js b/ui/pages/swaps/view-quote/view-quote.js index 6857b2037..4be72b2c6 100644 --- a/ui/pages/swaps/view-quote/view-quote.js +++ b/ui/pages/swaps/view-quote/view-quote.js @@ -213,8 +213,6 @@ export default function ViewQuote() { }); } - const { isBestQuote } = usedQuote; - const fetchParamsSourceToken = fetchParams?.sourceToken; const additionalTrackingParams = { @@ -1034,7 +1032,6 @@ export default function ViewQuote() { } } chainId={chainId} - isBestQuote={isBestQuote} maxPriorityFeePerGasDecGWEI={hexWEIToDecGWEI( maxPriorityFeePerGas, )} From 00db93763bfe5973ae689d59f660628d520475a9 Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Thu, 25 May 2023 16:00:56 -0700 Subject: [PATCH 12/12] Update Changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b892ad03..034155a79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Enable editing L2 gas on optimism ([#18217](https://github.com/MetaMask/metamask-extension/pull/18217)) - Update keystone links ([#18792](https://github.com/MetaMask/metamask-extension/pull/18792)) - Remove Goerli buy link and disable button ([#18137](https://github.com/MetaMask/metamask-extension/pull/18137)) +- No long show best quote, only present a list of quotes. ([#19284](https://github.com/MetaMask/metamask-extension/pull/19284)) - [FLASK] Don't show the title on Install/Update when it's loading ([#19012](https://github.com/MetaMask/metamask-extension/pull/19012)) - [FLASK] Add updated version of the Snaps settings UI ([#18438](https://github.com/MetaMask/metamask-extension/pull/18438), ([#18775](https://github.com/MetaMask/metamask-extension/pull/18775))) @@ -30,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fix in approve header to show correct account name ([#18849](https://github.com/MetaMask/metamask-extension/pull/18849)) - Fix error when switching to Linea testnet using wallet_switchEthereumChain ([#18710](https://github.com/MetaMask/metamask-extension/pull/18710)) - Fix for persistant currency conversion on multi layer transactions when the show balance setting is off ([#18833](https://github.com/MetaMask/metamask-extension/pull/18833)) +- Show the right "balance needed" value if we fallback from STX to regular Swaps ([#19230](https://github.com/MetaMask/metamask-extension/pull/19230)) - [FLASK] Fix overflowing notification content ([#18881](https://github.com/MetaMask/metamask-extension/pull/18881)) - [FLASK] Fix missing icon for webassembly endowment ([#18781](https://github.com/MetaMask/metamask-extension/pull/18781)) - [FLASK] Fix text selection bug in snap ui ([#18719](https://github.com/MetaMask/metamask-extension/pull/18719))