diff options
author | Dan <danjm.com@gmail.com> | 2018-03-22 08:58:58 +0800 |
---|---|---|
committer | Dan <danjm.com@gmail.com> | 2018-03-22 08:58:58 +0800 |
commit | be845fd190ee71d2bb6e641a5c23c453668268e3 (patch) | |
tree | 28d5267d8c149b0e323351a9ebfa222de9d33bdc /ui/app/components/pending-tx/index.js | |
parent | d24a0590d363dbe88d383c8faec8eb28809242f0 (diff) | |
parent | 04b1f8428b487663b276a541d739631954fe0be1 (diff) | |
download | tangerine-wallet-browser-be845fd190ee71d2bb6e641a5c23c453668268e3.tar.gz tangerine-wallet-browser-be845fd190ee71d2bb6e641a5c23c453668268e3.tar.zst tangerine-wallet-browser-be845fd190ee71d2bb6e641a5c23c453668268e3.zip |
Merge branch 'master' into i18n-translator-redux
Diffstat (limited to 'ui/app/components/pending-tx/index.js')
-rw-r--r-- | ui/app/components/pending-tx/index.js | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/ui/app/components/pending-tx/index.js b/ui/app/components/pending-tx/index.js index e490a45f4..0a8813b03 100644 --- a/ui/app/components/pending-tx/index.js +++ b/ui/app/components/pending-tx/index.js @@ -64,13 +64,20 @@ PendingTx.prototype.componentWillMount = async function () { }) } - try { + // inspect tx data for supported special confirmation screens + let isTokenTransaction = false + if (txParams.data) { + const tokenData = abiDecoder.decodeMethod(txParams.data) + const { name: tokenMethodName } = tokenData || {} + isTokenTransaction = (tokenMethodName === 'transfer') + } + + if (isTokenTransaction) { const token = util.getContractAtAddress(txParams.to) const results = await Promise.all([ token.symbol(), token.decimals(), ]) - const [ symbol, decimals ] = results if (symbol[0] && decimals[0]) { @@ -83,11 +90,14 @@ PendingTx.prototype.componentWillMount = async function () { }) } else { this.setState({ - transactionType: TX_TYPES.SEND_ETHER, + transactionType: TX_TYPES.SEND_TOKEN, + tokenAddress: txParams.to, + tokenSymbol: null, + tokenDecimals: null, isFetching: false, }) } - } catch (e) { + } else { this.setState({ transactionType: TX_TYPES.SEND_ETHER, isFetching: false, |