From 1d8d129305da747b9d8232dd4a1a8d417e36fe15 Mon Sep 17 00:00:00 2001 From: Whymarrh Whitby Date: Thu, 14 Feb 2019 10:43:12 -0330 Subject: Checksum address before slicing it for the confirm screen (#6133) --- .../confirm-transaction-base.container.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'ui') diff --git a/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.container.js b/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.container.js index 669462ba5..e11b35459 100644 --- a/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.container.js +++ b/ui/app/components/pages/confirm-transaction-base/confirm-transaction-base.container.js @@ -17,7 +17,7 @@ import { getHexGasTotal } from '../../../helpers/confirm-transaction/util' import { isBalanceSufficient, calcGasTotal } from '../../send/send.utils' import { conversionGreaterThan } from '../../../conversion-util' import { MIN_GAS_LIMIT_DEC } from '../../send/send.constants' -import { addressSlicer, valuesFor } from '../../../util' +import { checksumAddress, addressSlicer, valuesFor } from '../../../util' import { getMetaMaskAccounts, getAdvancedInlineGasShown } from '../../../selectors' const casedContractMap = Object.keys(contractMap).reduce((acc, base) => { @@ -77,7 +77,11 @@ const mapStateToProps = (state, props) => { const toAddress = propsToAddress || txParamsToAddress const toName = identities[toAddress] ? identities[toAddress].name - : casedContractMap[toAddress] ? casedContractMap[toAddress].name : addressSlicer(toAddress) + : ( + casedContractMap[toAddress] + ? casedContractMap[toAddress].name + : addressSlicer(checksumAddress(toAddress)) + ) const isTxReprice = Boolean(lastGasPrice) -- cgit v1.2.3