diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2016-11-11 12:36:50 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-11 12:36:50 +0800 |
commit | ad290d3edca99daa22d595a26e63ac6dff480d9d (patch) | |
tree | 8948496230e160c389ad57ab8ed26b9d8e3557a3 /ui/app/components | |
parent | 161ff62fdcf6f76f7243a1e865dd0cccbc89121f (diff) | |
parent | 17aac2dbc54b733aeed5f16ef2e7bd8378060ca9 (diff) | |
download | tangerine-wallet-browser-ad290d3edca99daa22d595a26e63ac6dff480d9d.tar.gz tangerine-wallet-browser-ad290d3edca99daa22d595a26e63ac6dff480d9d.tar.zst tangerine-wallet-browser-ad290d3edca99daa22d595a26e63ac6dff480d9d.zip |
Merge pull request #802 from MetaMask/confTxFix
Conf tx fix
Diffstat (limited to 'ui/app/components')
-rw-r--r-- | ui/app/components/coinbase-form.js | 4 | ||||
-rw-r--r-- | ui/app/components/shapeshift-form.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/app/components/coinbase-form.js b/ui/app/components/coinbase-form.js index efd05ec96..3c5708bf8 100644 --- a/ui/app/components/coinbase-form.js +++ b/ui/app/components/coinbase-form.js @@ -116,10 +116,10 @@ CoinbaseForm.prototype.toCoinbase = function () { props.dispatch(actions.buyEth(address, props.buyView.amount)) } else if (!isValidAmountforCoinBase(amount).valid) { message = isValidAmountforCoinBase(amount).message - return props.dispatch(actions.showWarning(message)) + return props.dispatch(actions.displayWarning(message)) } else { message = 'Receiving address is invalid.' - return props.dispatch(actions.showWarning(message)) + return props.dispatch(actions.displayWarning(message)) } } diff --git a/ui/app/components/shapeshift-form.js b/ui/app/components/shapeshift-form.js index 2bb384b94..1da549288 100644 --- a/ui/app/components/shapeshift-form.js +++ b/ui/app/components/shapeshift-form.js @@ -244,7 +244,7 @@ ShapeshiftForm.prototype.updateCoin = function (event) { if (!coinOptions[coin.toUpperCase()] || coin.toUpperCase() === 'ETH') { var message = 'Not a valid coin' - return props.dispatch(actions.showWarning(message)) + return props.dispatch(actions.displayWarning(message)) } else { return props.dispatch(actions.pairUpdate(coin)) } |