diff --git a/CHANGELOG.md b/CHANGELOG.md index fdaf4f59cc7e..55fc0dfda4b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [11.11.2] +### Changed +- Update the image in the Staking button What's New popup ([#23330](https://github.com/MetaMask/metamask-extension/pull/23330)) + +### Fixed +- [MMI] Fixed bug that prevents MMI users from submitting multiple Txs ([#23342](https://github.com/MetaMask/metamask-extension/pull/23342)) +- Fix the display of the native currency token symbol in the asset list + - ([#23355](https://github.com/MetaMask/metamask-extension/pull/23355)) + - ([#23327](https://github.com/MetaMask/metamask-extension/pull/23327)) + ## [11.11.1] ### Added - Adds a staking button to the mainnet Ethereum token list item ([#22347](https://github.com/MetaMask/metamask-extension/pull/22347)) @@ -4428,7 +4438,8 @@ Update styles and spacing on the critical error page ([#20350](https://github.c ### Uncategorized - Added the ability to restore accounts from seed words. -[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.11.1...HEAD +[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.11.2...HEAD +[11.11.2]: https://github.com/MetaMask/metamask-extension/compare/v11.11.1...v11.11.2 [11.11.1]: https://github.com/MetaMask/metamask-extension/compare/v11.11.0...v11.11.1 [11.11.0]: https://github.com/MetaMask/metamask-extension/compare/v11.10.1...v11.11.0 [11.10.1]: https://github.com/MetaMask/metamask-extension/compare/v11.10.0...v11.10.1 diff --git a/app/images/portfolio-stake-notification-light-mode.png b/app/images/portfolio-stake-notification-light-mode.png deleted file mode 100644 index 33cbe2933920..000000000000 Binary files a/app/images/portfolio-stake-notification-light-mode.png and /dev/null differ diff --git a/app/images/staking-light-mode-preview.png b/app/images/staking-light-mode-preview.png new file mode 100644 index 000000000000..21081dc68fb0 Binary files /dev/null and b/app/images/staking-light-mode-preview.png differ diff --git a/package.json b/package.json index dfcae21af58d..5880b8f6f593 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask-crx", - "version": "11.11.1", + "version": "11.11.2", "private": true, "repository": { "type": "git", @@ -223,7 +223,7 @@ }, "dependencies": { "@babel/runtime": "^7.23.2", - "@blockaid/ppom_release": "^1.4.1", + "@blockaid/ppom_release": "^1.4.4", "@ensdomains/content-hash": "^2.5.6", "@ethereumjs/common": "^3.1.1", "@ethereumjs/tx": "^4.1.1", diff --git a/shared/notifications/index.js b/shared/notifications/index.js index 7e57c92ba9c0..ab1b8ea8f688 100644 --- a/shared/notifications/index.js +++ b/shared/notifications/index.js @@ -183,7 +183,7 @@ export const UI_NOTIFICATIONS = { id: Number(NOTIFICATION_STAKING_PORTFOLIO), date: null, image: { - src: 'images/portfolio-stake-notification-light-mode.png', + src: 'images/staking-light-mode-preview.png', width: '100%', }, }, diff --git a/ui/components/app/asset-list/asset-list.js b/ui/components/app/asset-list/asset-list.js index 0c3a1a141ff0..de42660335d4 100644 --- a/ui/components/app/asset-list/asset-list.js +++ b/ui/components/app/asset-list/asset-list.js @@ -90,13 +90,11 @@ const AssetList = ({ onClickAsset }) => { numberOfDecimals: secondaryNumberOfDecimals, } = useUserPreferencedCurrency(SECONDARY, { ethNumberOfDecimals: 4 }); - const [, primaryCurrencyProperties] = useCurrencyDisplay( - selectedAccountBalance, - { + const [primaryCurrencyDisplay, primaryCurrencyProperties] = + useCurrencyDisplay(selectedAccountBalance, { numberOfDecimals: primaryNumberOfDecimals, currency: primaryCurrency, - }, - ); + }); const [secondaryCurrencyDisplay, secondaryCurrencyProperties] = useCurrencyDisplay(selectedAccountBalance, { @@ -190,30 +188,28 @@ const AssetList = ({ onClickAsset }) => { onClickAsset(nativeCurrency)} title={nativeCurrency} + // The primary and secondary currencies are subject to change based on the user's settings + // TODO: rename this primary/secondary concept here to be more intuitive, regardless of setting primary={ - showPrimaryCurrency( + showSecondaryCurrency( isOriginalNativeSymbol, useNativeCurrencyAsPrimaryCurrency, ) - ? primaryCurrencyProperties.value ?? - secondaryCurrencyProperties.value - : null + ? secondaryCurrencyDisplay + : undefined } tokenSymbol={ - showPrimaryCurrency( - isOriginalNativeSymbol, - useNativeCurrencyAsPrimaryCurrency, - ) + useNativeCurrencyAsPrimaryCurrency ? primaryCurrencyProperties.suffix - : null + : secondaryCurrencyProperties.suffix } secondary={ showFiat && - showSecondaryCurrency( + showPrimaryCurrency( isOriginalNativeSymbol, useNativeCurrencyAsPrimaryCurrency, ) - ? secondaryCurrencyDisplay + ? primaryCurrencyDisplay : undefined } tokenImage={balanceIsLoading ? null : primaryTokenImage} 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 ebf7e4a58ccf..04cfdf246020 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 @@ -85,7 +85,6 @@ exports[`Token Cell should match snapshot 1`] = ` 5.000 TEST -

diff --git a/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.js.snap b/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.js.snap index c64a5372e1a9..767d276c97e6 100644 --- a/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.js.snap +++ b/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.js.snap @@ -72,7 +72,6 @@ exports[`TokenListItem should render correctly 1`] = ` data-testid="multichain-token-list-item-value" > -

diff --git a/ui/components/multichain/token-list-item/token-list-item.js b/ui/components/multichain/token-list-item/token-list-item.js index d5066208bf13..c7e03331fea0 100644 --- a/ui/components/multichain/token-list-item/token-list-item.js +++ b/ui/components/multichain/token-list-item/token-list-item.js @@ -300,7 +300,7 @@ export const TokenListItem = ({ variant={TextVariant.bodyMd} textAlign={TextAlign.End} > - {primary} {tokenSymbol}{' '} + {primary} {isNativeCurrency ? '' : tokenSymbol} diff --git a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap index c8ba0efbb9dd..4d966a68fc9b 100644 --- a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap +++ b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/__snapshots__/blockaid-banner-alert.test.js.snap @@ -50,7 +50,7 @@ exports[`Blockaid Banner Alert should render 'danger' UI when securityAlertRespo Something doesn't look right? @@ -142,7 +142,7 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp Something doesn't look right? @@ -234,7 +234,7 @@ exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResp Something doesn't look right? @@ -327,7 +327,7 @@ exports[`Blockaid Banner Alert should render details section even when features Something doesn't look right? @@ -433,7 +433,7 @@ exports[`Blockaid Banner Alert should render details when provided 1`] = ` Something doesn't look right? @@ -527,7 +527,7 @@ exports[`Blockaid Banner Alert should render link to report url 1`] = ` Something doesn't look right? diff --git a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.test.js b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.test.js index b34d9d9b0e0a..810c16f7424c 100644 --- a/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.test.js +++ b/ui/pages/confirmations/components/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert.test.js @@ -1,6 +1,7 @@ import React from 'react'; import * as Sentry from '@sentry/browser'; import { fireEvent, screen } from '@testing-library/react'; +import BlockaidPackage from '@blockaid/ppom_release/package.json'; import { renderWithProvider } from '../../../../../../test/lib/render-helpers'; import { Severity } from '../../../../../helpers/constants/design-system'; @@ -243,7 +244,7 @@ describe('Blockaid Banner Alert', () => { const elm = getByRole('link', { name: 'Report an issue' }); expect(elm.href).toBe( - 'https://blockaid-false-positive-portal.metamask.io/?data=%7B%22blockaidVersion%22%3A%221.4.1%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom', + `https://blockaid-false-positive-portal.metamask.io/?data=%7B%22blockaidVersion%22%3A%22${BlockaidPackage.version}%22%2C%22classification%22%3A%22set_approval_for_all%22%2C%22resultType%22%3A%22Warning%22%7D&utm_source=metamask-ppom`, ); }); @@ -264,7 +265,7 @@ describe('Blockaid Banner Alert', () => { const elm = getByRole('link', { name: 'Report an issue' }); expect(elm.href).toBe( - 'https://blockaid-false-positive-portal.metamask.io/?data=%7B%22blockaidVersion%22%3A%221.4.1%22%2C%22classification%22%3A%22error%22%2C%22resultType%22%3A%22Error%22%7D&utm_source=metamask-ppom', + `https://blockaid-false-positive-portal.metamask.io/?data=%7B%22blockaidVersion%22%3A%22${BlockaidPackage.version}%22%2C%22classification%22%3A%22error%22%2C%22resultType%22%3A%22Error%22%7D&utm_source=metamask-ppom`, ); }); }); diff --git a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js index 1cc1685a6031..560eb4bd4eba 100644 --- a/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js +++ b/ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js @@ -264,10 +264,14 @@ const mapStateToProps = (state, ownProps) => { const isMultiLayerFeeNetwork = getIsMultiLayerFeeNetwork(state); const isUsingPaymaster = getIsUsingPaymaster(state); - const isSigningOrSubmitting = Boolean( + let isSigningOrSubmitting = Boolean( getApprovedAndSignedTransactions(state).length, ); + ///: BEGIN:ONLY_INCLUDE_IF(build-mmi) + isSigningOrSubmitting = false; + ///: END:ONLY_INCLUDE_IF + return { balance, fromAddress, diff --git a/yarn.lock b/yarn.lock index 05bc18a5bfd0..dc34aadc5327 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1683,10 +1683,10 @@ __metadata: languageName: node linkType: hard -"@blockaid/ppom_release@npm:^1.4.1": - version: 1.4.1 - resolution: "@blockaid/ppom_release@npm:1.4.1" - checksum: 6fff1d24cdfe5a1457b7f64b169f225e67ccbed48c3f5d61b4d24514b7b60cf67bbf130808d7b9cd88d490a86d689afd4b90820929d140526fcd8759b3a4bc6b +"@blockaid/ppom_release@npm:^1.4.4": + version: 1.4.4 + resolution: "@blockaid/ppom_release@npm:1.4.4" + checksum: 71f6276b21a59bc3b16d3335a266d199071e98009bb789ce26ab066da650b72068dff7743c3fbe86fef6dcbcef1eccef0e90362686283865b34514a956a5f4cd languageName: node linkType: hard @@ -24037,7 +24037,7 @@ __metadata: "@babel/preset-typescript": "npm:^7.23.2" "@babel/register": "npm:^7.22.15" "@babel/runtime": "npm:^7.23.2" - "@blockaid/ppom_release": "npm:^1.4.1" + "@blockaid/ppom_release": "npm:^1.4.4" "@ensdomains/content-hash": "npm:^2.5.6" "@ethereumjs/common": "npm:^3.1.1" "@ethereumjs/tx": "npm:^4.1.1"