merge v2-prototype

2018-06-06 12:31:30 +02:00
parent fe437da751 cc39eea999
commit 271fa26890
71 changed files with 1258 additions and 3864 deletions
--- a/packages/website/ts/components/token_balances.tsx
+++ b/packages/website/ts/components/token_balances.tsx
@@ -76,11 +76,11 @@ interface TokenBalancesProps {

 interface TokenBalancesState {
    errorType: BalanceErrs;
+    trackedTokenStateByAddress: TokenStateByAddress;
    isBalanceSpinnerVisible: boolean;
    isZRXSpinnerVisible: boolean;
    isTokenPickerOpen: boolean;
    isAddingToken: boolean;
-    trackedTokenStateByAddress: TokenStateByAddress;
 }

 export class TokenBalances extends React.Component<TokenBalancesProps, TokenBalancesState> {