diff options
| author | Dan Miller <danjm.com@gmail.com> | 2018-10-03 21:20:05 +0800 |
|---|---|---|
| committer | Dan Miller <danjm.com@gmail.com> | 2018-12-04 11:36:05 +0800 |
| commit | 2dbae581ac3f9190ddd1c3457bd51b41eef8051b (patch) | |
| tree | 774a8d9bd982f53b25e5aef54fa383197eb54b2e /ui/app/components/gas-customization/gas-modal-page-container | |
| parent | 0ba6f7d9bb5c2183d8a370fd0955e18d45616207 (diff) | |
| download | tangerine-wallet-browser-2dbae581ac3f9190ddd1c3457bd51b41eef8051b.tar.gz tangerine-wallet-browser-2dbae581ac3f9190ddd1c3457bd51b41eef8051b.tar.zst tangerine-wallet-browser-2dbae581ac3f9190ddd1c3457bd51b41eef8051b.zip | |
Gas price chart improvements, redesign, bug fixes, and set up to receive external data
Diffstat (limited to 'ui/app/components/gas-customization/gas-modal-page-container')
3 files changed, 4 insertions, 1 deletions
diff --git a/ui/app/components/gas-customization/gas-modal-page-container/advanced-tab-content/index.scss b/ui/app/components/gas-customization/gas-modal-page-container/advanced-tab-content/index.scss index 9c89688e2..0fc9f4578 100644 --- a/ui/app/components/gas-customization/gas-modal-page-container/advanced-tab-content/index.scss +++ b/ui/app/components/gas-customization/gas-modal-page-container/advanced-tab-content/index.scss @@ -50,7 +50,6 @@ font-size: 12px; color: #313A5E; margin-left: 22px; - margin-bottom: 11px; } &__speed-buttons { diff --git a/ui/app/components/gas-customization/gas-modal-page-container/gas-modal-page-container.component.js b/ui/app/components/gas-customization/gas-modal-page-container/gas-modal-page-container.component.js index 88ef921c5..ac5981ab7 100644 --- a/ui/app/components/gas-customization/gas-modal-page-container/gas-modal-page-container.component.js +++ b/ui/app/components/gas-customization/gas-modal-page-container/gas-modal-page-container.component.js @@ -27,6 +27,7 @@ export default class GasModalPageContainer extends Component { customModalGasPriceInHex: PropTypes.string, customModalGasLimitInHex: PropTypes.string, cancelAndClose: PropTypes.func, + transactionFee: PropTypes.string, } state = {} @@ -46,6 +47,7 @@ export default class GasModalPageContainer extends Component { customGasLimit, newTotalFiat, }) { + const { transactionFee } = this.props return ( <AdvancedTabContent updateCustomGasPrice={convertThenUpdateCustomGasPrice} @@ -53,6 +55,7 @@ export default class GasModalPageContainer extends Component { customGasPrice={customGasPrice} customGasLimit={customGasLimit} timeRemaining="1 min 31 sec" + transactionFee={transactionFee} totalFee={newTotalFiat} /> ) diff --git a/ui/app/components/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js b/ui/app/components/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js index 0d8d9d8e4..9d6dd3fb5 100644 --- a/ui/app/components/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js +++ b/ui/app/components/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js @@ -73,6 +73,7 @@ const mapStateToProps = state => { customGasPrice: calcCustomGasPrice(customModalGasPriceInHex), customGasLimit: calcCustomGasLimit(customModalGasLimitInHex), newTotalFiat, + transactionFee: addHexWEIsToRenderableFiat('0x0', customGasTotal, currentCurrency, conversionRate), gasPriceButtonGroupProps: { buttonDataLoading, defaultActiveButtonIndex: getDefaultActiveButtonIndex(gasButtonInfo, customModalGasPriceInHex), |