diff --git a/CHANGELOG.md b/CHANGELOG.md index 359eaa009..2c3439235 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Current Develop Branch +## 9.0.3 Fri Jan 22 2021 +- [#10243](https://github.com/MetaMask/metamask-extension/pull/10243): Fix site metadata handling +- [#10252](https://github.com/MetaMask/metamask-extension/pull/10252): Fix decrypt message confirmation UI crash + ## 9.0.2 Wed Jan 20 2021 - [#10191](https://github.com/MetaMask/metamask-extension/pull/10191): zh_TW: 乙太 -> 以太 (#10191) diff --git a/app/manifest/_base.json b/app/manifest/_base.json index 89b75c0af..f299aebb2 100644 --- a/app/manifest/_base.json +++ b/app/manifest/_base.json @@ -78,6 +78,6 @@ "notifications" ], "short_name": "__MSG_appName__", - "version": "9.0.2", + "version": "9.0.3", "web_accessible_resources": ["inpage.js", "phishing.html"] } diff --git a/app/scripts/controllers/permissions/permissionsMethodMiddleware.js b/app/scripts/controllers/permissions/permissionsMethodMiddleware.js index de9009f13..2a2485e33 100644 --- a/app/scripts/controllers/permissions/permissionsMethodMiddleware.js +++ b/app/scripts/controllers/permissions/permissionsMethodMiddleware.js @@ -74,8 +74,8 @@ export default function createPermissionsMethodMiddleware({ // custom method for getting metadata from the requesting domain, // sent automatically by the inpage provider when it's initialized case 'metamask_sendDomainMetadata': { - if (typeof req.domainMetadata?.name === 'string') { - addDomainMetadata(req.origin, req.domainMetadata) + if (typeof req.params?.name === 'string') { + addDomainMetadata(req.origin, req.params) } res.result = true return diff --git a/test/unit/app/controllers/permissions/mocks.js b/test/unit/app/controllers/permissions/mocks.js index 48937faf2..6c977f272 100644 --- a/test/unit/app/controllers/permissions/mocks.js +++ b/test/unit/app/controllers/permissions/mocks.js @@ -600,7 +600,7 @@ export const getters = deepFreeze({ return { origin, method: 'metamask_sendDomainMetadata', - domainMetadata: { + params: { ...args, name, }, diff --git a/ui/app/pages/confirm-decrypt-message/confirm-decrypt-message.component.js b/ui/app/pages/confirm-decrypt-message/confirm-decrypt-message.component.js index a9f68d388..d9baf455e 100644 --- a/ui/app/pages/confirm-decrypt-message/confirm-decrypt-message.component.js +++ b/ui/app/pages/confirm-decrypt-message/confirm-decrypt-message.component.js @@ -174,8 +174,9 @@ export default class ConfirmDecryptMessage extends Component { const { decryptMessageInline, domainMetadata, txData } = this.props const { t } = this.context - const origin = domainMetadata[txData.msgParams.origin] - const notice = t('decryptMessageNotice', [origin.name]) + const originMetadata = domainMetadata[txData.msgParams.origin] + const name = originMetadata?.name || txData.msgParams.origin + const notice = t('decryptMessageNotice', [txData.msgParams.origin]) const { hasCopied, @@ -191,15 +192,15 @@ export default class ConfirmDecryptMessage extends Component { {this.renderAccountInfo()}