Merge branch 'development' into addExtraDocs

* development:
  Change blockchain prop to not optional
  Other style changes
  Updated padding and colors
  Refactor TokenState type
  Fix a bug causing fillOrdersUpTo validation to fail because of some extra orders being passed
  Implement initial wallet interface

# Conflicts:
#	packages/react-shared/CHANGELOG.md
#	packages/website/ts/types.ts

1 files changed, 1 insertions, 8 deletions

diff --git a/packages/website/ts/components/token_balances.tsx b/packages/website/ts/components/token_balances.tsx
index 186393c4f..b4a710ef4 100644
--- a/packages/website/ts/components/token_balances.tsx
+++ b/packages/website/ts/components/token_balances.tsx
@@ -37,6 +37,7 @@ import {
     ScreenWidths,
     Token,
     TokenByAddress,
+    TokenStateByAddress,
     TokenVisibility,
 } from 'ts/types';
 import { configs } from 'ts/utils/configs';
@@ -61,14 +62,6 @@ const styles: Styles = {
     },
 };
 
-interface TokenStateByAddress {
-    [address: string]: {
-        balance: BigNumber;
-        allowance: BigNumber;
-        isLoaded: boolean;
-    };
-}
-
 interface TokenBalancesProps {
     blockchain: Blockchain;
     blockchainErr: BlockchainErrs;