From 5afd1c9fa6dbcde9d3c8207137005d74f1e1984a Mon Sep 17 00:00:00 2001 From: ryanml Date: Thu, 10 Jun 2021 10:49:14 -0700 Subject: [PATCH] Using native network currency for encryption public key requests (#11257) Fixes MetaMask/metamask-extension#11247 --- .../confirm-encryption-public-key.component.js | 7 ++++--- .../confirm-encryption-public-key.container.js | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js index 2382ea0bc..358c71f3c 100644 --- a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js +++ b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js @@ -30,6 +30,7 @@ export default class ConfirmEncryptionPublicKey extends Component { txData: PropTypes.object, domainMetadata: PropTypes.object, mostRecentOverviewPage: PropTypes.string.isRequired, + nativeCurrency: PropTypes.string.isRequired, }; state = { @@ -108,13 +109,13 @@ export default class ConfirmEncryptionPublicKey extends Component { }; renderBalance = () => { - const { conversionRate } = this.props; + const { conversionRate, nativeCurrency } = this.props; const { t } = this.context; const { fromAccount: { balance }, } = this.state; - const balanceInEther = conversionUtil(balance, { + const nativeCurrencyBalance = conversionUtil(balance, { fromNumericBase: 'hex', toNumericBase: 'dec', fromDenomination: 'WEI', @@ -128,7 +129,7 @@ export default class ConfirmEncryptionPublicKey extends Component { {`${t('balance')}:`}
- {`${balanceInEther} ETH`} + {`${nativeCurrencyBalance} ${nativeCurrency}`}
); diff --git a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js index 3439589b6..a7e569ca6 100644 --- a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js +++ b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.container.js @@ -16,6 +16,7 @@ import { import { clearConfirmTransaction } from '../../ducks/confirm-transaction/confirm-transaction.duck'; import { getMostRecentOverviewPage } from '../../ducks/history/history'; +import { getNativeCurrency } from '../../ducks/metamask/metamask'; import ConfirmEncryptionPublicKey from './confirm-encryption-public-key.component'; function mapStateToProps(state) { @@ -39,6 +40,7 @@ function mapStateToProps(state) { requesterAddress: null, conversionRate: conversionRateSelector(state), mostRecentOverviewPage: getMostRecentOverviewPage(state), + nativeCurrency: getNativeCurrency(state), }; }