diff options
| author | Tom Schmidt <imtomhschmidt@gmail.com> | 2018-03-10 07:22:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-10 07:22:59 +0800 |
| commit | 47af38ecb8d59789af9db2079e18ee0b6e589786 (patch) | |
| tree | abd75e02d19d7c2e9c7b8df1ebe7152e2d364a40 /packages/website/ts/blockchain.ts | |
| parent | 654c790c3df3ee857952a1023761f186bb9c777d (diff) | |
| parent | 7116f100ee194f46d0e34782afa8f680791adc9c (diff) | |
| download | dexon-0x-contracts-47af38ecb8d59789af9db2079e18ee0b6e589786.tar dexon-0x-contracts-47af38ecb8d59789af9db2079e18ee0b6e589786.tar.gz dexon-0x-contracts-47af38ecb8d59789af9db2079e18ee0b6e589786.tar.bz2 dexon-0x-contracts-47af38ecb8d59789af9db2079e18ee0b6e589786.tar.lz dexon-0x-contracts-47af38ecb8d59789af9db2079e18ee0b6e589786.tar.xz dexon-0x-contracts-47af38ecb8d59789af9db2079e18ee0b6e589786.tar.zst dexon-0x-contracts-47af38ecb8d59789af9db2079e18ee0b6e589786.zip | |
Merge branch 'development' into feature/website/web3-logging
Diffstat (limited to 'packages/website/ts/blockchain.ts')
| -rw-r--r-- | packages/website/ts/blockchain.ts | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts index 156dc44e8..fca9504d7 100644 --- a/packages/website/ts/blockchain.ts +++ b/packages/website/ts/blockchain.ts @@ -15,6 +15,7 @@ import { TransactionReceiptWithDecodedLogs, ZeroEx, } from '0x.js'; +import { EtherscanLinkSuffixes, utils as sharedUtils } from '@0xproject/react-shared'; import { InjectedWeb3Subprovider, ledgerEthereumBrowserClientFactoryAsync, @@ -35,7 +36,6 @@ import { BlockchainCallErrs, BlockchainErrs, ContractInstance, - EtherscanLinkSuffixes, Order as PortalOrder, ProviderType, Side, @@ -271,7 +271,11 @@ export class Blockchain { }, ); await this._showEtherScanLinkAndAwaitTransactionMinedAsync(txHash); - const etherScanLinkIfExists = utils.getEtherScanLinkIfExists(txHash, this.networkId, EtherscanLinkSuffixes.Tx); + const etherScanLinkIfExists = sharedUtils.getEtherScanLinkIfExists( + txHash, + this.networkId, + EtherscanLinkSuffixes.Tx, + ); this._dispatcher.showFlashMessage( React.createElement(TokenSendCompleted, { etherScanLinkIfExists, @@ -542,7 +546,11 @@ export class Blockchain { private async _showEtherScanLinkAndAwaitTransactionMinedAsync( txHash: string, ): Promise<TransactionReceiptWithDecodedLogs> { - const etherScanLinkIfExists = utils.getEtherScanLinkIfExists(txHash, this.networkId, EtherscanLinkSuffixes.Tx); + const etherScanLinkIfExists = sharedUtils.getEtherScanLinkIfExists( + txHash, + this.networkId, + EtherscanLinkSuffixes.Tx, + ); this._dispatcher.showFlashMessage( React.createElement(TransactionSubmitted, { etherScanLinkIfExists, |