aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/confirm-page-container
diff options
context:
space:
mode:
authorAlexander Tseung <alextsg@users.noreply.github.com>2018-07-18 09:17:54 +0800
committerGitHub <noreply@github.com>2018-07-18 09:17:54 +0800
commitf6ca06f775a739c8b449405c5e96b03151a6a33c (patch)
treec81242106d9e6c718e54ab338e99b5e10c665089 /ui/app/components/confirm-page-container
parent89911dda170e33d8d9ca2f29f2705ed446d4c0f2 (diff)
parent301ae305b88d0a7e3a3cbca9a500f4b39753dc52 (diff)
downloadtangerine-wallet-browser-f6ca06f775a739c8b449405c5e96b03151a6a33c.tar.gz
tangerine-wallet-browser-f6ca06f775a739c8b449405c5e96b03151a6a33c.tar.zst
tangerine-wallet-browser-f6ca06f775a739c8b449405c5e96b03151a6a33c.zip
Merge pull request #4800 from MetaMask/i4785-confirm-screen-fixes
Add fallback when no function found, fix network colors, add fiat values for tokens with contract exchange rates
Diffstat (limited to 'ui/app/components/confirm-page-container')
-rw-r--r--ui/app/components/confirm-page-container/confirm-detail-row/confirm-detail-row.component.js18
1 files changed, 9 insertions, 9 deletions
diff --git a/ui/app/components/confirm-page-container/confirm-detail-row/confirm-detail-row.component.js b/ui/app/components/confirm-page-container/confirm-detail-row/confirm-detail-row.component.js
index 631cf5803..f0703dde2 100644
--- a/ui/app/components/confirm-page-container/confirm-detail-row/confirm-detail-row.component.js
+++ b/ui/app/components/confirm-page-container/confirm-detail-row/confirm-detail-row.component.js
@@ -5,10 +5,10 @@ import classnames from 'classnames'
const ConfirmDetailRow = props => {
const {
label,
- fiatFee,
- ethFee,
+ fiatText,
+ ethText,
onHeaderClick,
- fiatFeeColor,
+ fiatTextColor,
headerText,
headerTextClassName,
} = props
@@ -27,12 +27,12 @@ const ConfirmDetailRow = props => {
</div>
<div
className="confirm-detail-row__fiat"
- style={{ color: fiatFeeColor }}
+ style={{ color: fiatTextColor }}
>
- { fiatFee }
+ { fiatText }
</div>
<div className="confirm-detail-row__eth">
- { `\u2666 ${ethFee}` }
+ { ethText }
</div>
</div>
</div>
@@ -41,9 +41,9 @@ const ConfirmDetailRow = props => {
ConfirmDetailRow.propTypes = {
label: PropTypes.string,
- fiatFee: PropTypes.string,
- ethFee: PropTypes.string,
- fiatFeeColor: PropTypes.string,
+ fiatText: PropTypes.string,
+ ethText: PropTypes.string,
+ fiatTextColor: PropTypes.string,
onHeaderClick: PropTypes.func,
headerText: PropTypes.string,
headerTextClassName: PropTypes.string,