From 928cb61dd4afea6c6067e31d6abc6cc1b617b7c4 Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Tue, 18 Jul 2023 13:59:59 +0000 Subject: [PATCH 01/12] Version v10.35.0 --- CHANGELOG.md | 7 ++++++- package.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00d3852f0..1d8b93bdc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [10.35.0] +### Uncategorized +- temp + ## [10.34.0] ### Added - Add a security quiz to the SRP reveal ([#19283](https://github.com/MetaMask/metamask-extension/pull/19283)) @@ -3853,7 +3857,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.34.0...HEAD +[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.35.0...HEAD +[10.35.0]: https://github.com/MetaMask/metamask-extension/compare/v10.34.0...v10.35.0 [10.34.0]: https://github.com/MetaMask/metamask-extension/compare/v10.33.1...v10.34.0 [10.33.1]: https://github.com/MetaMask/metamask-extension/compare/v10.33.0...v10.33.1 [10.33.0]: https://github.com/MetaMask/metamask-extension/compare/v10.32.0...v10.33.0 diff --git a/package.json b/package.json index 59b5523bb..e5822e1a4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask-crx", - "version": "10.34.0", + "version": "10.35.0", "private": true, "repository": { "type": "git", From 723d8bb51e125c0e45e66c743eb476dacecbfbdf Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Mon, 14 Aug 2023 13:55:41 -0230 Subject: [PATCH 02/12] Fix opening of speedup popover in activity list (in the popup view) (#20205) * Set height of activity-list-item rightContent to Blocksize.min, so that the element doesn't overlap buttons * Fix unit test --------- Co-authored-by: Brad Decker --- .../__snapshots__/activity-list-item.test.js.snap | 2 +- .../multichain/activity-list-item/activity-list-item.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/components/multichain/activity-list-item/__snapshots__/activity-list-item.test.js.snap b/ui/components/multichain/activity-list-item/__snapshots__/activity-list-item.test.js.snap index a84226530..92e55f2ed 100644 --- a/ui/components/multichain/activity-list-item/__snapshots__/activity-list-item.test.js.snap +++ b/ui/components/multichain/activity-list-item/__snapshots__/activity-list-item.test.js.snap @@ -86,7 +86,7 @@ exports[`ActivityListItem should match snapshot with props 1`] = `

Content rendered to the right diff --git a/ui/components/multichain/activity-list-item/activity-list-item.js b/ui/components/multichain/activity-list-item/activity-list-item.js index eeb88fbe6..44a942bf0 100644 --- a/ui/components/multichain/activity-list-item/activity-list-item.js +++ b/ui/components/multichain/activity-list-item/activity-list-item.js @@ -110,6 +110,7 @@ export const ActivityListItem = ({ Date: Sat, 5 Aug 2023 11:11:27 -0500 Subject: [PATCH 03/12] Fix #20184 - Prevent overflow within the activity list (#20188) * Fix #20184 - Prevent overflow within the activity list * removing inline style, updating snap --------- Co-authored-by: Victor Thomas <10986371+vthomas13@users.noreply.github.com> --- .../__snapshots__/activity-list-item.test.js.snap | 4 ++-- .../multichain/activity-list-item/activity-list-item.js | 6 +++++- ui/components/multichain/activity-list-item/index.scss | 4 ++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ui/components/multichain/activity-list-item/__snapshots__/activity-list-item.test.js.snap b/ui/components/multichain/activity-list-item/__snapshots__/activity-list-item.test.js.snap index 92e55f2ed..a7dd27534 100644 --- a/ui/components/multichain/activity-list-item/__snapshots__/activity-list-item.test.js.snap +++ b/ui/components/multichain/activity-list-item/__snapshots__/activity-list-item.test.js.snap @@ -10,7 +10,7 @@ exports[`ActivityListItem should match snapshot with no props 1`] = ` class="mm-box mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--width-full" >

{icon && {icon}} - + Date: Mon, 24 Jul 2023 19:06:37 -0500 Subject: [PATCH 04/12] Fix #20140 - Ensure only one network displays as selected in the network picker when chain IDs collide (#20152) --- .../network-list-menu/network-list-menu.js | 5 ++- .../network-list-menu.test.js | 38 ++++++++++++++++--- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/ui/components/multichain/network-list-menu/network-list-menu.js b/ui/components/multichain/network-list-menu/network-list-menu.js index dd9278bc1..fb4ae7dbb 100644 --- a/ui/components/multichain/network-list-menu/network-list-menu.js +++ b/ui/components/multichain/network-list-menu/network-list-menu.js @@ -17,6 +17,7 @@ import { getCurrentChainId, getNonTestNetworks, getTestNetworks, + getCurrentNetwork, } from '../../../selectors'; import ToggleButton from '../../ui/toggle-button'; import { @@ -64,6 +65,7 @@ export const NetworkListMenu = ({ onClose }) => { const history = useHistory(); const trackEvent = useContext(MetaMetricsContext); + const currentNetwork = useSelector(getCurrentNetwork); const currentlyOnTestNetwork = TEST_CHAINS.includes(currentChainId); const environmentType = getEnvironmentType(); @@ -85,7 +87,8 @@ export const NetworkListMenu = ({ onClose }) => { return null; } - const isCurrentNetwork = currentChainId === network.chainId; + const isCurrentNetwork = currentNetwork.id === network.id; + const canDeleteNetwork = !isCurrentNetwork && !UNREMOVABLE_CHAIN_IDS.includes(network.chainId); diff --git a/ui/components/multichain/network-list-menu/network-list-menu.test.js b/ui/components/multichain/network-list-menu/network-list-menu.test.js index 6608b1bae..9ef01f599 100644 --- a/ui/components/multichain/network-list-menu/network-list-menu.test.js +++ b/ui/components/multichain/network-list-menu/network-list-menu.test.js @@ -19,19 +19,26 @@ jest.mock('../../../store/actions.ts', () => ({ toggleNetworkMenu: () => mockToggleNetworkMenu, })); -const render = (showTestNetworks = false, currentChainId = '0x1') => { - const store = configureStore({ +const render = ( + showTestNetworks = false, + currentChainId = '0x5', + providerConfigId = 'chain5', +) => { + const state = { metamask: { ...mockState.metamask, providerConfig: { ...mockState.metamask.providerConfig, chainId: currentChainId, + id: providerConfigId, }, preferences: { showTestNetworks, }, }, - }); + }; + + const store = configureStore(state); return renderWithProvider(, store); }; @@ -61,8 +68,8 @@ describe('NetworkListMenu', () => { }); it('disables toggle when on test network', () => { - const { container } = render(false, CHAIN_IDS.GOERLI); - expect(container.querySelector('.toggle-button--disabled')).toBeDefined(); + render(false, CHAIN_IDS.GOERLI); + expect(document.querySelector('.toggle-button--disabled')).toBeDefined(); }); it('switches networks when an item is clicked', () => { @@ -71,4 +78,25 @@ describe('NetworkListMenu', () => { expect(mockToggleNetworkMenu).toHaveBeenCalled(); expect(mockSetProviderType).toHaveBeenCalled(); }); + + it('shows the correct selected network when networks share the same chain ID', () => { + // Mainnet and Custom Mainnet RPC both use chain ID 0x1 + render(false, '0x1', 'testNetworkConfigurationId'); + + // Contains Mainnet and the two custom networks + const networkItems = document.querySelectorAll( + '.multichain-network-list-item', + ); + expect(networkItems).toHaveLength(3); + + const selectedNodes = document.querySelectorAll( + '.multichain-network-list-item--selected', + ); + expect(selectedNodes).toHaveLength(1); + + const selectedNodeText = selectedNodes[0].querySelector( + '.multichain-network-list-item__network-name', + ).textContent; + expect(selectedNodeText).toStrictEqual('Custom Mainnet RPC'); + }); }); From bc4a000c26a82013a85f6e4d61065ec5e67ee0bf Mon Sep 17 00:00:00 2001 From: witmicko Date: Tue, 1 Aug 2023 07:04:23 +0100 Subject: [PATCH 05/12] solves 1114 (#20307) * fixes 207 --- app/scripts/contentscript.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js index e72a2a8fe..1ed6d60a6 100644 --- a/app/scripts/contentscript.js +++ b/app/scripts/contentscript.js @@ -615,6 +615,12 @@ function redirectToPhishingWarning() { const querystring = new URLSearchParams({ hostname, href }); window.location.href = `${baseUrl}#${querystring}`; + // eslint-disable-next-line no-constant-condition + while (1) { + console.log( + 'MetaMask: Locking js execution, redirection will complete shortly', + ); + } } const start = () => { From 9c712bc8e0fa65ddd23b6dd40f6aeef72db184b2 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Sat, 19 Aug 2023 03:56:15 -0230 Subject: [PATCH 06/12] Update errors.spec.js e2e snapshot tests for v10.35.0 --- .../errors-after-init-opt-in-background-state.json | 2 +- .../state-snapshots/errors-after-init-opt-in-ui-state.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json index b682921e7..f8045ea4a 100644 --- a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json +++ b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json @@ -8,7 +8,7 @@ }, "AnnouncementController": "object", "AppMetadataController": { - "currentAppVersion": "10.34.5", + "currentAppVersion": "10.35.0", "previousAppVersion": "", "previousMigrationVersion": 0, "currentMigrationVersion": 92.1 diff --git a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json index af2f71406..74cbdb1fc 100644 --- a/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json +++ b/test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json @@ -56,7 +56,7 @@ "usedNetworks": "object", "snapsInstallPrivacyWarningShown": "boolean", "serviceWorkerLastActiveTime": "number", - "currentAppVersion": "10.34.5", + "currentAppVersion": "10.35.0", "previousAppVersion": "", "previousMigrationVersion": 0, "currentMigrationVersion": 92.1, From 03fa41c5be22bf5b496d83747c70adcf93d0b9fa Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Sat, 19 Aug 2023 02:00:01 -0700 Subject: [PATCH 07/12] Update changelog for v10.35.0 (#20139) * [skip-e2e] Update changelog for v10.35.0 * [skip-e2e] Lint * Remove MMI entries, and group flask entries * Update CHANGELOG.md --------- Co-authored-by: Dan J Miller --- CHANGELOG.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2977751b5..f580b1dae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,53 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Fix bug that could cause a failure in the persistence of network related data ([#20080](https://github.com/MetaMask/metamask-extension/pull/20080)) - Fix ([#20080](https://github.com/MetaMask/metamask-extension/pull/20080)) +### Added +- Add the ability to customize tx nonce on ERC20 approval screens ([#17945](https://github.com/MetaMask/metamask-extension/pull/17945)) + +### Changed +- Update the "Spending Cap Request" screen (also known as the "ERC 20 approval" or "token allowance" screen) ([#19666](https://github.com/MetaMask/metamask-extension/pull/19666)) + - Populate the "Custom Spending Cap" input with the dapp suggesed value + - Show "Use Site Suggestion" button when user changes input + - Update copy + - Add a "Learn more" link +- Update icons and text of Activity Screen, and categorize transactions by dates ([#19557](https://github.com/MetaMask/metamask-extension/pull/19557)) +- Change the "Import NFTs" UI from a full screen page to a modal ([#19806](https://github.com/MetaMask/metamask-extension/pull/19806)) +- Add loading indicator when clicking Refresh list on tokens screen ([#19952](https://github.com/MetaMask/metamask-extension/pull/19952)) +- Bolden "Done" text for priv key export button ([#20059](https://github.com/MetaMask/metamask-extension/pull/20059)) +- Added background color of test network icons in the network menu ([#20032](https://github.com/MetaMask/metamask-extension/pull/20032)) +- Ensure "Show test networks" is toggled on if current network is a test network ([#20048](https://github.com/MetaMask/metamask-extension/pull/20048)) +- Disable the "Show test networks" toggle when the currently selected network is a test network ([#19951](https://github.com/MetaMask/metamask-extension/pull/19951)) +- Increase size of nft detection text ([#20053](https://github.com/MetaMask/metamask-extension/pull/20053)) +- Add underline to most link texts on hover ([#19992](https://github.com/MetaMask/metamask-extension/pull/19992)) +- Move MetaMask fee and quote list to new line for swap review quote ([#20030](https://github.com/MetaMask/metamask-extension/pull/20030)) +- Change the "Import NFTs" UI from a full screen page to a modal ([#19806](https://github.com/MetaMask/metamask-extension/pull/19806)) +- Change "Hardware wallet" link text to "Add Hardware wallet" ([#20026](https://github.com/MetaMask/metamask-extension/pull/20026)) +- Remove the portfolio icon from the screen (because it is now it the three dot menu) ([#19988](https://github.com/MetaMask/metamask-extension/pull/19988)) +- Use System Theme colors for tooltip ([#19954](https://github.com/MetaMask/metamask-extension/pull/19954)) +- Separate the test networks from other networks in the "Select a network" popup ([#19812](https://github.com/MetaMask/metamask-extension/pull/19812)) +- Update "three dot" menu on token screen ([#19765](https://github.com/MetaMask/metamask-extension/pull/19765)) + - Make the token's three-dot menu smaller + - Move it next to the breadcrumbs + - Remove the "Account Details" option from the token detail menu +- Update BNB Chain name from "BNB Smart Chain" to "BNB Chain" ([#19836](https://github.com/MetaMask/metamask-extension/pull/19836)) +- [FLASK] Allow Snaps to use `eth_accounts` as a revokable permission ([#19306](https://github.com/MetaMask/metamask-extension/pull/19306)) + + +### Fixed +- Fix "Hold to reveal SRP" button on mobile browsers ([#19847](https://github.com/MetaMask/metamask-extension/pull/19847)) +- Correctly show network name and selection when chainIds collide ([#19947](https://github.com/MetaMask/metamask-extension/pull/19947)) +- Fix misaligned icons in 'Connected sites' modal ([#19944](https://github.com/MetaMask/metamask-extension/pull/19944)) +- Show the icon of the correct network in the "badge" associated with token icon's in the assets list ([#19964](https://github.com/MetaMask/metamask-extension/pull/19964)) +- Stop showing "product tour" steps when on the Swaps screen ([#19938](https://github.com/MetaMask/metamask-extension/pull/19938)) +- Fixing auto scrolling to settings when searching within Advanced and Security settings ([#19771](https://github.com/MetaMask/metamask-extension/pull/19771)) +- Fixed connected sites icon's background color ([#19891](https://github.com/MetaMask/metamask-extension/pull/19891)) +- Fix to ensure "Account Details" is displayed when that option is selected from each accounts three-dot menu within the Account Menu ([#19857](https://github.com/MetaMask/metamask-extension/pull/19857)) +- Render correct image in the asset dropdown while sending an NFT ([#19787](https://github.com/MetaMask/metamask-extension/pull/19787)) +- Removed grey line from connected sites modal if there are no connected sites ([#20036](https://github.com/MetaMask/metamask-extension/pull/20036)) +- [FLASK] Fix overflow on snaps connect screen ([#19995](https://github.com/MetaMask/metamask-extension/pull/19995)) +- [FLASK] Fix Snaps UI divider ([#19919](https://github.com/MetaMask/metamask-extension/pull/19919)) +- [FLASK] Fix fetch for snap registry ([#19866](https://github.com/MetaMask/metamask-extension/pull/19866)) +- [FLASK] Fix Snaps UI divider ([#19919](https://github.com/MetaMask/metamask-extension/pull/19919)) ## [10.34.0] ### Added From a5bf7503f55c054fc732ab8081a39aa0b7815f27 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Sat, 19 Aug 2023 06:38:34 -0230 Subject: [PATCH 08/12] Lint changelog --- CHANGELOG.md | 91 +++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 47 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f580b1dae..2ce2c6bf2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,50 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ## [10.35.0] -### Uncategorized -- temp -## [10.34.5] -### Changed -- Improve error diagnostic information - - Add additional logging for state migrations ([#20424](https://github.com/MetaMask/metamask-extension/pull/20424), [#20517](https://github.com/MetaMask/metamask-extension/pull/20517), [#20521](https://github.com/MetaMask/metamask-extension/pull/20521)) - - Improve diagnostic state snapshot ([#20457](https://github.com/MetaMask/metamask-extension/pull/20457), [#20491](https://github.com/MetaMask/metamask-extension/pull/20491), [#20428](https://github.com/MetaMask/metamask-extension/pull/20428), [#20458](https://github.com/MetaMask/metamask-extension/pull/20458)) - - Capture additional errors when state migrations fail ([#20427](https://github.com/MetaMask/metamask-extension/pull/20427)) - -### Fixed -- Fix bug where state was temporarily incomplete upon initial load ([#20468](https://github.com/MetaMask/metamask-extension/pull/20468)) - - In rare circumstances, this bug may have resulted in data loss (of preferences, permissions, or tracked NFTs/tokens) or UI crashes. - -## [10.34.4] -### Changed -- Updated snaps execution environment ([#20420](https://github.com/MetaMask/metamask-extension/pull/20420)) - -## [10.34.3] -### Fixed -- Ensure users phishing warning list is properly updated ([#20381](https://github.com/MetaMask/metamask-extension/pull/20381)) -- Fix inaccurate info in swaps flow for zero-balance tokens ([#20388](https://github.com/MetaMask/metamask-extension/pull/20388)) -- Fix 'Global Menu Explorer / Account Details' What's New notification display ([#20371](https://github.com/MetaMask/metamask-extension/pull/20371)) - -## [10.34.2] -### Added -- Add Address Details and View on Explorer to Global Menu ([#20013](https://github.com/MetaMask/metamask-extension/pull/20013)) - -## Changed -- Increase copy clipboard time ([#20008](https://github.com/MetaMask/metamask-extension/pull/20008)) -- Show checksum addresses on account list menu ([#20217](https://github.com/MetaMask/metamask-extension/pull/20217/commits/41bab4a6e14682388f4021f2f51bc74bddcbe80e)) -- Scroll to selected account when opening account list menu ([#20166](https://github.com/MetaMask/metamask-extension/pull/20166)) -- Remove fallback phishing warning configuration ([#20327](https://github.com/MetaMask/metamask-extension/pull/20327)) - - The phishing warning feature will no longer function if the wallet is unable to receive configuration updates. Previously a fallback config was used in this case, but we found that it was too outdated to be helpful and it caused many problems for users. -- Improved UI for downloading state logs on Chromium-based browsers ([#19872](https://github.com/MetaMask/metamask-extension/pull/19872)) - - We now use a file picker to let you select the download location, rather than saving the state logs in your downloads folder. - -### Fixed -- Fixed bug that could cause loss of network or token data for users upgrading from old versions ([#20276](https://github.com/MetaMask/metamask-extension/pull/20276)) -- Fix crash on open of MetaMask for some users that have old network data in state ([#20345](https://github.com/MetaMask/metamask-extension/pull/20345)) - -## [10.34.1] -### Fixed -- Fix bug that could cause a failure in the persistence of network related data ([#20080](https://github.com/MetaMask/metamask-extension/pull/20080)) -- Fix ([#20080](https://github.com/MetaMask/metamask-extension/pull/20080)) ### Added - Add the ability to customize tx nonce on ERC20 approval screens ([#17945](https://github.com/MetaMask/metamask-extension/pull/17945)) @@ -99,6 +55,49 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [FLASK] Fix fetch for snap registry ([#19866](https://github.com/MetaMask/metamask-extension/pull/19866)) - [FLASK] Fix Snaps UI divider ([#19919](https://github.com/MetaMask/metamask-extension/pull/19919)) +## [10.34.5] +### Changed +- Improve error diagnostic information + - Add additional logging for state migrations ([#20424](https://github.com/MetaMask/metamask-extension/pull/20424), [#20517](https://github.com/MetaMask/metamask-extension/pull/20517), [#20521](https://github.com/MetaMask/metamask-extension/pull/20521)) + - Improve diagnostic state snapshot ([#20457](https://github.com/MetaMask/metamask-extension/pull/20457), [#20491](https://github.com/MetaMask/metamask-extension/pull/20491), [#20428](https://github.com/MetaMask/metamask-extension/pull/20428), [#20458](https://github.com/MetaMask/metamask-extension/pull/20458)) + - Capture additional errors when state migrations fail ([#20427](https://github.com/MetaMask/metamask-extension/pull/20427)) + +### Fixed +- Fix bug where state was temporarily incomplete upon initial load ([#20468](https://github.com/MetaMask/metamask-extension/pull/20468)) + - In rare circumstances, this bug may have resulted in data loss (of preferences, permissions, or tracked NFTs/tokens) or UI crashes. + +## [10.34.4] +### Changed +- Updated snaps execution environment ([#20420](https://github.com/MetaMask/metamask-extension/pull/20420)) + +## [10.34.3] +### Fixed +- Ensure users phishing warning list is properly updated ([#20381](https://github.com/MetaMask/metamask-extension/pull/20381)) +- Fix inaccurate info in swaps flow for zero-balance tokens ([#20388](https://github.com/MetaMask/metamask-extension/pull/20388)) +- Fix 'Global Menu Explorer / Account Details' What's New notification display ([#20371](https://github.com/MetaMask/metamask-extension/pull/20371)) + +## [10.34.2] +### Added +- Add Address Details and View on Explorer to Global Menu ([#20013](https://github.com/MetaMask/metamask-extension/pull/20013)) + +## Changed +- Increase copy clipboard time ([#20008](https://github.com/MetaMask/metamask-extension/pull/20008)) +- Show checksum addresses on account list menu ([#20217](https://github.com/MetaMask/metamask-extension/pull/20217/commits/41bab4a6e14682388f4021f2f51bc74bddcbe80e)) +- Scroll to selected account when opening account list menu ([#20166](https://github.com/MetaMask/metamask-extension/pull/20166)) +- Remove fallback phishing warning configuration ([#20327](https://github.com/MetaMask/metamask-extension/pull/20327)) + - The phishing warning feature will no longer function if the wallet is unable to receive configuration updates. Previously a fallback config was used in this case, but we found that it was too outdated to be helpful and it caused many problems for users. +- Improved UI for downloading state logs on Chromium-based browsers ([#19872](https://github.com/MetaMask/metamask-extension/pull/19872)) + - We now use a file picker to let you select the download location, rather than saving the state logs in your downloads folder. + +### Fixed +- Fixed bug that could cause loss of network or token data for users upgrading from old versions ([#20276](https://github.com/MetaMask/metamask-extension/pull/20276)) +- Fix crash on open of MetaMask for some users that have old network data in state ([#20345](https://github.com/MetaMask/metamask-extension/pull/20345)) + +## [10.34.1] +### Fixed +- Fix bug that could cause a failure in the persistence of network related data ([#20080](https://github.com/MetaMask/metamask-extension/pull/20080)) +- Fix ([#20080](https://github.com/MetaMask/metamask-extension/pull/20080)) + ## [10.34.0] ### Added - Add a security quiz to the SRP reveal ([#19283](https://github.com/MetaMask/metamask-extension/pull/19283)) @@ -3947,9 +3946,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added the ability to restore accounts from seed words. [Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.35.0...HEAD -[10.35.0]: https://github.com/MetaMask/metamask-extension/compare/v10.34.0...v10.35.0 -[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.34.4...HEAD -[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.34.5...HEAD +[10.35.0]: https://github.com/MetaMask/metamask-extension/compare/v10.34.5...v10.35.0 [10.34.5]: https://github.com/MetaMask/metamask-extension/compare/v10.34.4...v10.34.5 [10.34.4]: https://github.com/MetaMask/metamask-extension/compare/v10.34.3...v10.34.4 [10.34.3]: https://github.com/MetaMask/metamask-extension/compare/v10.34.2...v10.34.3 From 838c8e1aa7d66ada6ed5e86e6d25e3d19fbd01f9 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Mon, 21 Aug 2023 07:45:25 -0230 Subject: [PATCH 09/12] Use primary transaction to get token value in useTransactionDisplayData (#20536) Co-authored-by: Jyoti Puri --- ui/hooks/useTransactionDisplayData.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/hooks/useTransactionDisplayData.js b/ui/hooks/useTransactionDisplayData.js index 8d5f7bc3d..6ce9b11c5 100644 --- a/ui/hooks/useTransactionDisplayData.js +++ b/ui/hooks/useTransactionDisplayData.js @@ -198,7 +198,7 @@ export function useTransactionDisplayData(transactionGroup) { ); const tokenDisplayValue = useTokenDisplayValue( - initialTransaction?.txParams?.data, + primaryTransaction?.txParams?.data, token, isTokenCategory, ); From 88f294664f837442ac7b0bbd5db1cb4563714583 Mon Sep 17 00:00:00 2001 From: Danyal Prout Date: Mon, 14 Aug 2023 08:22:02 -0700 Subject: [PATCH 10/12] Specify that Base is a multilayer network (#20097) --- shared/constants/network.ts | 4 ++++ ui/selectors/selectors.js | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/shared/constants/network.ts b/shared/constants/network.ts index c3eb9dc1d..a36d1961a 100644 --- a/shared/constants/network.ts +++ b/shared/constants/network.ts @@ -138,6 +138,8 @@ export const CHAIN_IDS = { BSC_TESTNET: '0x61', OPTIMISM: '0xa', OPTIMISM_TESTNET: '0x1a4', + BASE: '0x2105', + BASE_TESTNET: '0x14a33', POLYGON: '0x89', POLYGON_TESTNET: '0x13881', AVALANCHE: '0xa86a', @@ -542,6 +544,8 @@ export const BUYABLE_CHAINS_MAP: { ChainId, | typeof CHAIN_IDS.LOCALHOST | typeof CHAIN_IDS.OPTIMISM_TESTNET + | typeof CHAIN_IDS.BASE_TESTNET + | typeof CHAIN_IDS.BASE | typeof CHAIN_IDS.BSC_TESTNET | typeof CHAIN_IDS.POLYGON_TESTNET | typeof CHAIN_IDS.AVALANCHE_TESTNET diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js index 079c1f493..9cc5b74f3 100644 --- a/ui/selectors/selectors.js +++ b/ui/selectors/selectors.js @@ -1291,11 +1291,22 @@ export function getIsOptimism(state) { ); } +export function getIsBase(state) { + return ( + getCurrentChainId(state) === CHAIN_IDS.BASE || + getCurrentChainId(state) === CHAIN_IDS.BASE_TESTNET + ); +} + +export function getIsOpStack(state) { + return getIsOptimism(state) || getIsBase(state); +} + export function getIsMultiLayerFeeNetwork(state) { - return getIsOptimism(state); + return getIsOpStack(state); } /** - * To retrieve the maxBaseFee and priotitFee teh user has set as default + * To retrieve the maxBaseFee and priorityFee the user has set as default * * @param {*} state * @returns Boolean From 7f3ea4b9068d9afd6376aa2b436515ecf39750d3 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Mon, 21 Aug 2023 12:27:52 -0230 Subject: [PATCH 11/12] Update changelog to include last two commits --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ce2c6bf2..5c580bd4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [10.35.0] ### Added - Add the ability to customize tx nonce on ERC20 approval screens ([#17945](https://github.com/MetaMask/metamask-extension/pull/17945)) +- Improved gas estimates on Base network ([#20097](https://github.com/MetaMask/metamask-extension/pull/20097)) ### Changed - Update the "Spending Cap Request" screen (also known as the "ERC 20 approval" or "token allowance" screen) ([#19666](https://github.com/MetaMask/metamask-extension/pull/19666)) @@ -50,6 +51,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fix to ensure "Account Details" is displayed when that option is selected from each accounts three-dot menu within the Account Menu ([#19857](https://github.com/MetaMask/metamask-extension/pull/19857)) - Render correct image in the asset dropdown while sending an NFT ([#19787](https://github.com/MetaMask/metamask-extension/pull/19787)) - Removed grey line from connected sites modal if there are no connected sites ([#20036](https://github.com/MetaMask/metamask-extension/pull/20036)) +- Fix custom nonce support on Approval confirmations ([#20536](https://github.com/MetaMask/metamask-extension/pull/20536)) - [FLASK] Fix overflow on snaps connect screen ([#19995](https://github.com/MetaMask/metamask-extension/pull/19995)) - [FLASK] Fix Snaps UI divider ([#19919](https://github.com/MetaMask/metamask-extension/pull/19919)) - [FLASK] Fix fetch for snap registry ([#19866](https://github.com/MetaMask/metamask-extension/pull/19866)) From ace2138a9457266462bf710b6a8e0a1620978db7 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Mon, 21 Aug 2023 18:39:15 -0230 Subject: [PATCH 12/12] Remove unnecessary change entry The bug fix in #20536 wasn't necessary to include because the bug it fixes was never in production. it was introduced in this release as part of #17945. --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c580bd4d..6bb54e3bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,7 +51,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fix to ensure "Account Details" is displayed when that option is selected from each accounts three-dot menu within the Account Menu ([#19857](https://github.com/MetaMask/metamask-extension/pull/19857)) - Render correct image in the asset dropdown while sending an NFT ([#19787](https://github.com/MetaMask/metamask-extension/pull/19787)) - Removed grey line from connected sites modal if there are no connected sites ([#20036](https://github.com/MetaMask/metamask-extension/pull/20036)) -- Fix custom nonce support on Approval confirmations ([#20536](https://github.com/MetaMask/metamask-extension/pull/20536)) - [FLASK] Fix overflow on snaps connect screen ([#19995](https://github.com/MetaMask/metamask-extension/pull/19995)) - [FLASK] Fix Snaps UI divider ([#19919](https://github.com/MetaMask/metamask-extension/pull/19919)) - [FLASK] Fix fetch for snap registry ([#19866](https://github.com/MetaMask/metamask-extension/pull/19866))