diff options
author | Steve Klebanoff <steve.klebanoff@gmail.com> | 2018-10-27 10:53:15 +0800 |
---|---|---|
committer | Steve Klebanoff <steve.klebanoff@gmail.com> | 2018-10-27 10:53:15 +0800 |
commit | ff295daa5c56b5c056a5faa5ca8875c317524070 (patch) | |
tree | 96e6ee707cf75e3272d90d44a8c8cf1b0567a5ce /packages/instant/src/util | |
parent | bb307a55d347c34ab51144c75721860e13659ecb (diff) | |
download | dexon-sol-tools-ff295daa5c56b5c056a5faa5ca8875c317524070.tar dexon-sol-tools-ff295daa5c56b5c056a5faa5ca8875c317524070.tar.gz dexon-sol-tools-ff295daa5c56b5c056a5faa5ca8875c317524070.tar.bz2 dexon-sol-tools-ff295daa5c56b5c056a5faa5ca8875c317524070.tar.lz dexon-sol-tools-ff295daa5c56b5c056a5faa5ca8875c317524070.tar.xz dexon-sol-tools-ff295daa5c56b5c056a5faa5ca8875c317524070.tar.zst dexon-sol-tools-ff295daa5c56b5c056a5faa5ca8875c317524070.zip |
Simpler way of validaitng has enough eth
Diffstat (limited to 'packages/instant/src/util')
-rw-r--r-- | packages/instant/src/util/balance.ts | 40 |
1 files changed, 10 insertions, 30 deletions
diff --git a/packages/instant/src/util/balance.ts b/packages/instant/src/util/balance.ts index 954dc7156..9cb8b8987 100644 --- a/packages/instant/src/util/balance.ts +++ b/packages/instant/src/util/balance.ts @@ -1,38 +1,18 @@ import { BuyQuote } from '@0x/asset-buyer'; import { Web3Wrapper } from '@0x/web3-wrapper'; import * as _ from 'lodash'; -import { Dispatch } from 'redux'; - -import { ZeroExInstantError } from '../types'; - -import { errorUtil } from './error'; - -const hasSufficientFunds = async (takerAddress: string | undefined, buyQuote: BuyQuote, web3Wrapper: Web3Wrapper) => { - if (_.isUndefined(takerAddress)) { - return false; - } - const balanceWei = await web3Wrapper.getBalanceInWeiAsync(takerAddress); - return balanceWei >= buyQuote.worstCaseQuoteInfo.totalEthAmount; -}; export const balanceUtil = { - /** - * Checks to see if user has enough balance to buy assets - * If they do not, flash an error and return false - * If they do, return true - */ - checkInsufficientEthBalanceAndFlashError: async ( - takerAddress: string | undefined, - buyQuote: BuyQuote, - web3Wrapper: Web3Wrapper, - dispatch: Dispatch, - ) => { - const hasEnoughFunds = await hasSufficientFunds(takerAddress, buyQuote, web3Wrapper); - if (hasEnoughFunds) { - return true; + hasSufficientFunds: async (takerAddress: string | undefined, buyQuote: BuyQuote, web3Wrapper: Web3Wrapper) => { + if (_.isUndefined(takerAddress)) { + return false; } - const balanceError = new Error(ZeroExInstantError.InsufficientBalance); - errorUtil.errorFlasher.flashNewError(dispatch, balanceError); - return false; + const balanceWei = await web3Wrapper.getBalanceInWeiAsync(takerAddress); + console.log('balanceWei', balanceWei.toString()); + console.log( + 'buyQuote.worstCaseQuoteInfo.totalEthAmount', + buyQuote.worstCaseQuoteInfo.totalEthAmount.toString(), + ); + return balanceWei >= buyQuote.worstCaseQuoteInfo.totalEthAmount; }, }; |