From df9ff6438c9fe3fd15afd7003c4497c314bc6382 Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Thu, 19 Jan 2023 20:30:17 +0000 Subject: [PATCH 1/5] Version v10.24.1 --- CHANGELOG.md | 5 ++++- package.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1def3a26453f..ea297b2f0289 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [10.24.1] + ## [10.24.0] ### Added - Add NFT setApprovalForAll warning popover when approving the NFT Colleciton ([#16195](https://github.com/MetaMask/metamask-extension/pull/16195)) @@ -3423,7 +3425,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 a47fa7dec42d..366ac9999708 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", From 0a7f83172dc622490aa8a62628e37907b3ae49f2 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Thu, 19 Jan 2023 14:52:46 -0800 Subject: [PATCH 2/5] Add missing appName in the zh_TW language file (#17304) * Add missing appName in the zh_TW language file * Fix --- app/_locales/zh_TW/messages.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json index a1749a85b2ef..07812e647892 100644 --- a/app/_locales/zh_TW/messages.json +++ b/app/_locales/zh_TW/messages.json @@ -122,6 +122,18 @@ "message": "以太坊瀏覽器擴充插件", "description": "The description of the application" }, + "appName": { + "message": "MetaMask", + "description": "The name of the application" + }, + "appNameBeta": { + "message": "MetaMask Beta", + "description": "The name of the application (Beta)" + }, + "appNameFlask": { + "message": "MetaMask Flask", + "description": "The name of the application (Flask)" + }, "approve": { "message": "批准花費上限" }, From ebd302b1c24c029014d252f341bf11cf99a6782c Mon Sep 17 00:00:00 2001 From: Dan Miller Date: Fri, 20 Jan 2023 08:25:36 -0330 Subject: [PATCH 3/5] Update changelong for v10.24.1 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea297b2f0289..cd6d87dc9769 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ## [10.24.1] +- 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 From a1d5c1ad6e1057d85a21108fd6027f6c6252f89a Mon Sep 17 00:00:00 2001 From: PeterYinusa Date: Fri, 20 Jan 2023 12:18:11 +0000 Subject: [PATCH 4/5] Update changelong for v10.24.1 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd6d87dc9769..8dd0763e3086 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ## [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] From cf10b2a1a091662c6d3268110745267e753c3f69 Mon Sep 17 00:00:00 2001 From: David Walsh Date: Mon, 23 Jan 2023 16:04:11 -0600 Subject: [PATCH 5/5] Fix #17300, #16843 - Use proper source for image of IPFS NFTs (#17302) --- .../app/collectible-details/collectible-details.js | 5 ++++- .../confirm-page-container-summary.component.js | 10 ++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) 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} /> ); }