diff options
author | Fabio Berger <me@fabioberger.com> | 2018-06-08 03:44:22 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-08 03:44:22 +0800 |
commit | 9bc6ebde4e4425799ed3ddfb50495029865e3ae8 (patch) | |
tree | fe15c8c1abbe77d5e10914ae509b653295862fc6 /packages/website | |
parent | 96b31f39749fb32bd89978245c79aa637791336c (diff) | |
parent | 011f14d1155fd3f61e53aaa16681afd5c9c9f892 (diff) | |
download | dexon-sol-tools-9bc6ebde4e4425799ed3ddfb50495029865e3ae8.tar dexon-sol-tools-9bc6ebde4e4425799ed3ddfb50495029865e3ae8.tar.gz dexon-sol-tools-9bc6ebde4e4425799ed3ddfb50495029865e3ae8.tar.bz2 dexon-sol-tools-9bc6ebde4e4425799ed3ddfb50495029865e3ae8.tar.lz dexon-sol-tools-9bc6ebde4e4425799ed3ddfb50495029865e3ae8.tar.xz dexon-sol-tools-9bc6ebde4e4425799ed3ddfb50495029865e3ae8.tar.zst dexon-sol-tools-9bc6ebde4e4425799ed3ddfb50495029865e3ae8.zip |
Merge pull request #671 from 0xProject/refactor/move-spawn-switch-to-utils
Move spawnSwitchErr to @0xproject/utils
Diffstat (limited to 'packages/website')
4 files changed, 6 insertions, 9 deletions
diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx index 6f5aa756e..555a59830 100644 --- a/packages/website/ts/components/token_balances.tsx +++ b/packages/website/ts/components/token_balances.tsx @@ -5,7 +5,7 @@ import { Styles, utils as sharedUtils, } from '@0xproject/react-shared'; -import { BigNumber, logUtils } from '@0xproject/utils'; +import { BigNumber, errorUtils, logUtils } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as _ from 'lodash'; import Dialog from 'material-ui/Dialog'; @@ -500,7 +500,7 @@ export class TokenBalances extends React.Component<TokenBalancesProps, TokenBala return null; // No error to show default: - throw utils.spawnSwitchErr('errorType', this.state.errorType); + throw errorUtils.spawnSwitchErr('errorType', this.state.errorType); } } private _onErrorOccurred(errorType: BalanceErrs): void { diff --git a/packages/website/ts/components/ui/lifecycle_raised_button.tsx b/packages/website/ts/components/ui/lifecycle_raised_button.tsx index 0c3ebcc0c..380fbc77d 100644 --- a/packages/website/ts/components/ui/lifecycle_raised_button.tsx +++ b/packages/website/ts/components/ui/lifecycle_raised_button.tsx @@ -1,7 +1,7 @@ import { colors } from '@0xproject/react-shared'; +import { errorUtils } from '@0xproject/utils'; import RaisedButton from 'material-ui/RaisedButton'; import * as React from 'react'; -import { utils } from 'ts/utils/utils'; const COMPLETE_STATE_SHOW_LENGTH_MS = 2000; @@ -62,7 +62,7 @@ export class LifeCycleRaisedButton extends React.Component<LifeCycleRaisedButton label = this.props.labelComplete; break; default: - throw utils.spawnSwitchErr('ButtonState', this.state.buttonState); + throw errorUtils.spawnSwitchErr('ButtonState', this.state.buttonState); } return ( <RaisedButton diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx index 977902103..bc2ee227d 100644 --- a/packages/website/ts/components/wallet/wallet.tsx +++ b/packages/website/ts/components/wallet/wallet.tsx @@ -1,5 +1,5 @@ import { EtherscanLinkSuffixes, Styles, utils as sharedUtils } from '@0xproject/react-shared'; -import { BigNumber } from '@0xproject/utils'; +import { BigNumber, errorUtils } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as _ from 'lodash'; import CircularProgress from 'material-ui/CircularProgress'; @@ -491,7 +491,7 @@ export class Wallet extends React.Component<WalletProps, WalletState> { buttonIconName = 'zmdi-long-arrow-up'; break; default: - throw utils.spawnSwitchErr('wrappedEtherDirection', wrappedEtherDirection); + throw errorUtils.spawnSwitchErr('wrappedEtherDirection', wrappedEtherDirection); } } const onClick = isWrappedEtherDirectionOpen diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts index 2c8c06c01..6961784c6 100644 --- a/packages/website/ts/utils/utils.ts +++ b/packages/website/ts/utils/utils.ts @@ -33,9 +33,6 @@ export const utils = { throw new Error(message); } }, - spawnSwitchErr(name: string, value: any): Error { - return new Error(`Unexpected switch value: ${value} encountered for ${name}`); - }, isNumeric(n: string): boolean { return !isNaN(parseFloat(n)) && isFinite(Number(n)); }, |