diff options
author | Fabio Berger <me@fabioberger.com> | 2018-01-31 04:27:21 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-31 04:27:21 +0800 |
commit | 1feac1a30886944ccadc00b2ff4f493e0d495301 (patch) | |
tree | be68e9a62e3de3caf6e5e841899df16d8decc7e5 /packages/website/ts/components/send_button.tsx | |
parent | 2bcb7d56394c43acd68d1823092de2ad047abc6d (diff) | |
parent | d3e42e4b3e2f893b616246d35f46dba92f251e83 (diff) | |
download | dexon-sol-tools-1feac1a30886944ccadc00b2ff4f493e0d495301.tar dexon-sol-tools-1feac1a30886944ccadc00b2ff4f493e0d495301.tar.gz dexon-sol-tools-1feac1a30886944ccadc00b2ff4f493e0d495301.tar.bz2 dexon-sol-tools-1feac1a30886944ccadc00b2ff4f493e0d495301.tar.lz dexon-sol-tools-1feac1a30886944ccadc00b2ff4f493e0d495301.tar.xz dexon-sol-tools-1feac1a30886944ccadc00b2ff4f493e0d495301.tar.zst dexon-sol-tools-1feac1a30886944ccadc00b2ff4f493e0d495301.zip |
Merge pull request #351 from 0xProject/feature/portal-ledger-support
Portal Ledger Support, Lazy-loading token balances/allowances
Diffstat (limited to 'packages/website/ts/components/send_button.tsx')
-rw-r--r-- | packages/website/ts/components/send_button.tsx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/packages/website/ts/components/send_button.tsx b/packages/website/ts/components/send_button.tsx index f94ec346a..ffa165f60 100644 --- a/packages/website/ts/components/send_button.tsx +++ b/packages/website/ts/components/send_button.tsx @@ -5,16 +5,19 @@ import * as React from 'react'; import { Blockchain } from 'ts/blockchain'; import { SendDialog } from 'ts/components/dialogs/send_dialog'; import { Dispatcher } from 'ts/redux/dispatcher'; -import { BlockchainCallErrs, Token, TokenState } from 'ts/types'; +import { BlockchainCallErrs, Token } from 'ts/types'; import { errorReporter } from 'ts/utils/error_reporter'; import { utils } from 'ts/utils/utils'; interface SendButtonProps { + userAddress: string; + networkId: number; token: Token; - tokenState: TokenState; dispatcher: Dispatcher; blockchain: Blockchain; onError: () => void; + lastForceTokenStateRefetch: number; + refetchTokenStateAsync: (tokenAddress: string) => Promise<void>; } interface SendButtonState { @@ -42,11 +45,14 @@ export class SendButton extends React.Component<SendButtonProps, SendButtonState onClick={this._toggleSendDialog.bind(this)} /> <SendDialog + blockchain={this.props.blockchain} + userAddress={this.props.userAddress} + networkId={this.props.networkId} isOpen={this.state.isSendDialogVisible} onComplete={this._onSendAmountSelectedAsync.bind(this)} onCancelled={this._toggleSendDialog.bind(this)} token={this.props.token} - tokenState={this.props.tokenState} + lastForceTokenStateRefetch={this.props.lastForceTokenStateRefetch} /> </div> ); @@ -62,18 +68,15 @@ export class SendButton extends React.Component<SendButtonProps, SendButtonState }); this._toggleSendDialog(); const token = this.props.token; - const tokenState = this.props.tokenState; - let balance = tokenState.balance; try { await this.props.blockchain.transferAsync(token, recipient, value); - balance = balance.minus(value); - this.props.dispatcher.replaceTokenBalanceByAddress(token.address, balance); + await this.props.refetchTokenStateAsync(token.address); } catch (err) { const errMsg = `${err}`; if (_.includes(errMsg, BlockchainCallErrs.UserHasNoAssociatedAddresses)) { this.props.dispatcher.updateShouldBlockchainErrDialogBeOpen(true); return; - } else if (!_.includes(errMsg, 'User denied transaction')) { + } else if (!utils.didUserDenyWeb3Request(errMsg)) { utils.consoleLog(`Unexpected error encountered: ${err}`); utils.consoleLog(err.stack); this.props.onError(); |