aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2017-12-18 02:36:50 +0800
committerFabio Berger <me@fabioberger.com>2017-12-18 02:36:50 +0800
commit51af6de6249ac8d7656052f2a7198ae4341061b6 (patch)
treefa958f5e722cda4faef210e07fbef5ef2e041d30
parent5664333490474d1d9a793e887864f125869bf6fa (diff)
downloaddexon-sol-tools-51af6de6249ac8d7656052f2a7198ae4341061b6.tar
dexon-sol-tools-51af6de6249ac8d7656052f2a7198ae4341061b6.tar.gz
dexon-sol-tools-51af6de6249ac8d7656052f2a7198ae4341061b6.tar.bz2
dexon-sol-tools-51af6de6249ac8d7656052f2a7198ae4341061b6.tar.lz
dexon-sol-tools-51af6de6249ac8d7656052f2a7198ae4341061b6.tar.xz
dexon-sol-tools-51af6de6249ac8d7656052f2a7198ae4341061b6.tar.zst
dexon-sol-tools-51af6de6249ac8d7656052f2a7198ae4341061b6.zip
Update to passing etherTokenAddress into withdraw and deposit calls
-rw-r--r--packages/website/ts/blockchain.ts8
-rw-r--r--packages/website/ts/components/eth_weth_conversion_button.tsx4
2 files changed, 6 insertions, 6 deletions
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 6877a301a..a42b19cff 100644
--- a/packages/website/ts/blockchain.ts
+++ b/packages/website/ts/blockchain.ts
@@ -388,18 +388,18 @@ export class Blockchain {
const balance = await this.web3Wrapper.getBalanceInEthAsync(owner);
return balance;
}
- public async convertEthToWrappedEthTokensAsync(amount: BigNumber): Promise<void> {
+ public async convertEthToWrappedEthTokensAsync(etherTokenAddress: string, amount: BigNumber): Promise<void> {
utils.assert(!_.isUndefined(this.zeroEx), 'ZeroEx must be instantiated.');
utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.USER_HAS_NO_ASSOCIATED_ADDRESSES);
- const txHash = await this.zeroEx.etherToken.depositAsync(amount, this.userAddress);
+ const txHash = await this.zeroEx.etherToken.depositAsync(etherTokenAddress, amount, this.userAddress);
await this.showEtherScanLinkAndAwaitTransactionMinedAsync(txHash);
}
- public async convertWrappedEthTokensToEthAsync(amount: BigNumber): Promise<void> {
+ public async convertWrappedEthTokensToEthAsync(etherTokenAddress: string, amount: BigNumber): Promise<void> {
utils.assert(!_.isUndefined(this.zeroEx), 'ZeroEx must be instantiated.');
utils.assert(this.doesUserAddressExist(), BlockchainCallErrs.USER_HAS_NO_ASSOCIATED_ADDRESSES);
- const txHash = await this.zeroEx.etherToken.withdrawAsync(amount, this.userAddress);
+ const txHash = await this.zeroEx.etherToken.withdrawAsync(etherTokenAddress, amount, this.userAddress);
await this.showEtherScanLinkAndAwaitTransactionMinedAsync(txHash);
}
public async doesContractExistAtAddressAsync(address: string) {
diff --git a/packages/website/ts/components/eth_weth_conversion_button.tsx b/packages/website/ts/components/eth_weth_conversion_button.tsx
index b017de27b..c8a279de9 100644
--- a/packages/website/ts/components/eth_weth_conversion_button.tsx
+++ b/packages/website/ts/components/eth_weth_conversion_button.tsx
@@ -88,12 +88,12 @@ export class EthWethConversionButton extends
let balance = tokenState.balance;
try {
if (direction === Side.deposit) {
- await this.props.blockchain.convertEthToWrappedEthTokensAsync(value);
+ await this.props.blockchain.convertEthToWrappedEthTokensAsync(token.address, value);
const ethAmount = ZeroEx.toUnitAmount(value, constants.ETH_DECIMAL_PLACES);
this.props.dispatcher.showFlashMessage(`Successfully wrapped ${ethAmount.toString()} ETH to WETH`);
balance = balance.plus(value);
} else {
- await this.props.blockchain.convertWrappedEthTokensToEthAsync(value);
+ await this.props.blockchain.convertWrappedEthTokensToEthAsync(token.address, value);
const tokenAmount = ZeroEx.toUnitAmount(value, token.decimals);
this.props.dispatcher.showFlashMessage(`Successfully unwrapped ${tokenAmount.toString()} WETH to ETH`);
balance = balance.minus(value);