diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2018-03-12 22:50:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 22:50:55 +0800 |
| commit | b7c7083a112ea6908e8c5990886ab388200a51f4 (patch) | |
| tree | bf7e0f880b5a3ce32cd0b0e680f62e0f5068df8d /ui/app/components | |
| parent | 174f57b4646b3d320850c6286189a146cf0e23b0 (diff) | |
| parent | ddc85354d3df508cbecc016fc0213a6560d885e1 (diff) | |
| download | tangerine-wallet-browser-b7c7083a112ea6908e8c5990886ab388200a51f4.tar.gz tangerine-wallet-browser-b7c7083a112ea6908e8c5990886ab388200a51f4.tar.zst tangerine-wallet-browser-b7c7083a112ea6908e8c5990886ab388200a51f4.zip | |
Merge branch 'master' into i18n
Diffstat (limited to 'ui/app/components')
| -rw-r--r-- | ui/app/components/dropdowns/network-dropdown.js | 8 | ||||
| -rw-r--r-- | ui/app/components/pending-tx/confirm-send-token.js | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ui/app/components/dropdowns/network-dropdown.js b/ui/app/components/dropdowns/network-dropdown.js index 67daaa5fd..5afe730c1 100644 --- a/ui/app/components/dropdowns/network-dropdown.js +++ b/ui/app/components/dropdowns/network-dropdown.js @@ -115,7 +115,7 @@ NetworkDropdown.prototype.render = function () { [ providerType === 'mainnet' ? h('i.fa.fa-check') : h('.network-check__transparent', '✓'), h(NetworkDropdownIcon, { - backgroundColor: '#038789', // $blue-lagoon + backgroundColor: '#29B6AF', // $java isSelected: providerType === 'mainnet', }), h('span.network-name-item', { @@ -137,7 +137,7 @@ NetworkDropdown.prototype.render = function () { [ providerType === 'ropsten' ? h('i.fa.fa-check') : h('.network-check__transparent', '✓'), h(NetworkDropdownIcon, { - backgroundColor: '#e91550', // $crimson + backgroundColor: '#ff4a8d', // $wild-strawberry isSelected: providerType === 'ropsten', }), h('span.network-name-item', { @@ -159,7 +159,7 @@ NetworkDropdown.prototype.render = function () { [ providerType === 'kovan' ? h('i.fa.fa-check') : h('.network-check__transparent', '✓'), h(NetworkDropdownIcon, { - backgroundColor: '#690496', // $purple + backgroundColor: '#7057ff', // $cornflower-blue isSelected: providerType === 'kovan', }), h('span.network-name-item', { @@ -181,7 +181,7 @@ NetworkDropdown.prototype.render = function () { [ providerType === 'rinkeby' ? h('i.fa.fa-check') : h('.network-check__transparent', '✓'), h(NetworkDropdownIcon, { - backgroundColor: '#ebb33f', // $tulip-tree + backgroundColor: '#f6c343', // $saffron isSelected: providerType === 'rinkeby', }), h('span.network-name-item', { diff --git a/ui/app/components/pending-tx/confirm-send-token.js b/ui/app/components/pending-tx/confirm-send-token.js index 606aca3c2..69afa8094 100644 --- a/ui/app/components/pending-tx/confirm-send-token.js +++ b/ui/app/components/pending-tx/confirm-send-token.js @@ -64,8 +64,8 @@ function mapDispatchToProps (dispatch, ownProps) { updateTokenExchangeRate: () => dispatch(actions.updateTokenExchangeRate(symbol)), editTransaction: txMeta => { const { token: { address } } = ownProps - const { txParams, id } = txMeta - const tokenData = txParams.data && abiDecoder.decodeMethod(txParams.data) + const { txParams = {}, id } = txMeta + const tokenData = txParams.data && abiDecoder.decodeMethod(txParams.data) || {} const { params = [] } = tokenData const { value: to } = params[0] || {} const { value: tokenAmountInDec } = params[1] || {} |