diff --git a/CHANGELOG.md b/CHANGELOG.md index 5339c0632e0c..c5129351a7bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Added displaying the primaryType during Typed data signing ([#17077](https://github.com/MetaMask/metamask-extension/pull/17077)) +## [10.24.1] +### Added +- Ensure app name appears for Taiwanese language speakers in the extension stores ([#17304](https://github.com/MetaMask/metamask-extension/pull/17304)) + ## [10.24.0] ### Added - Add NFT setApprovalForAll warning popover when approving the NFT Colleciton ([#16195](https://github.com/MetaMask/metamask-extension/pull/16195)) @@ -3425,7 +3429,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.24.0...HEAD +[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.24.1...HEAD +[10.24.1]: https://github.com/MetaMask/metamask-extension/compare/v10.24.0...v10.24.1 [10.24.0]: https://github.com/MetaMask/metamask-extension/compare/v10.23.3...v10.24.0 [10.23.3]: https://github.com/MetaMask/metamask-extension/compare/v10.23.2...v10.23.3 [10.23.2]: https://github.com/MetaMask/metamask-extension/compare/v10.23.1...v10.23.2 diff --git a/package.json b/package.json index a84f6b9f4d0a..4daa48764528 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask-crx", - "version": "10.24.0", + "version": "10.24.1", "private": true, "repository": { "type": "git", diff --git a/ui/components/app/collectible-details/collectible-details.js b/ui/components/app/collectible-details/collectible-details.js index 78dffbe0c766..0c198a58c970 100644 --- a/ui/components/app/collectible-details/collectible-details.js +++ b/ui/components/app/collectible-details/collectible-details.js @@ -175,7 +175,10 @@ export default function CollectibleDetails({ collectible }) { className="collectible-details__card" > {image ? ( - + ) : ( )} diff --git a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js index ace2c3ff747c..ccb62846efd9 100644 --- a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js +++ b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js @@ -1,5 +1,7 @@ /* eslint-disable no-negated-condition */ import React, { useState } from 'react'; +import { useSelector } from 'react-redux'; + import PropTypes from 'prop-types'; import classnames from 'classnames'; @@ -7,6 +9,7 @@ import { TransactionType } from '../../../../../../shared/constants/transaction' import { toChecksumHexAddress } from '../../../../../../shared/modules/hexstring-utils'; import { useI18nContext } from '../../../../../hooks/useI18nContext'; import useAddressDetails from '../../../../../hooks/useAddressDetails'; +import { getIpfsGateway } from '../../../../../selectors'; import Identicon from '../../../../ui/identicon'; import InfoTooltip from '../../../../ui/info-tooltip'; @@ -15,6 +18,7 @@ import Typography from '../../../../ui/typography'; import { TYPOGRAPHY } from '../../../../../helpers/constants/design-system'; import { ORIGIN_METAMASK } from '../../../../../../shared/constants/app'; import SiteOrigin from '../../../../ui/site-origin'; +import { getAssetImageURL } from '../../../../../helpers/utils/util'; const ConfirmPageContainerSummary = (props) => { const { @@ -35,6 +39,7 @@ const ConfirmPageContainerSummary = (props) => { const [showNicknamePopovers, setShowNicknamePopovers] = useState(false); const t = useI18nContext(); + const ipfsGateway = useSelector(getIpfsGateway); const contractInitiatedTransactionType = [ TransactionType.contractInteraction, @@ -62,12 +67,14 @@ const ConfirmPageContainerSummary = (props) => { const checksummedAddress = toChecksumHexAddress(contractAddress); const renderImage = () => { + const imagePath = getAssetImageURL(image, ipfsGateway); + if (image) { return ( ); } else if (contractAddress) { @@ -76,7 +83,6 @@ const ConfirmPageContainerSummary = (props) => { className="confirm-page-container-summary__icon" diameter={36} address={contractAddress} - image={image} /> ); }