aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts/components/wallet/wallet.tsx
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-06-06 18:31:30 +0800
committerFabio Berger <me@fabioberger.com>2018-06-06 18:31:30 +0800
commit271fa26890c7d86fe516b51d653a308b2789d2c2 (patch)
treeeff3a17c8dd56cd1fbe4da76557b904253792cd2 /packages/website/ts/components/wallet/wallet.tsx
parentfe437da7517b4ea8e308a7210a34e66b715d5c78 (diff)
parentcc39eea9991306eabadd912256452f67fb49c20b (diff)
downloaddexon-0x-contracts-271fa26890c7d86fe516b51d653a308b2789d2c2.tar.gz
dexon-0x-contracts-271fa26890c7d86fe516b51d653a308b2789d2c2.tar.zst
dexon-0x-contracts-271fa26890c7d86fe516b51d653a308b2789d2c2.zip
merge v2-prototype
Diffstat (limited to 'packages/website/ts/components/wallet/wallet.tsx')
-rw-r--r--packages/website/ts/components/wallet/wallet.tsx18
1 files changed, 16 insertions, 2 deletions
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx
index c55cb1ab4..34e40dfb0 100644
--- a/packages/website/ts/components/wallet/wallet.tsx
+++ b/packages/website/ts/components/wallet/wallet.tsx
@@ -22,6 +22,8 @@ import { TokenIcon } from 'ts/components/ui/token_icon';
import { WalletDisconnectedItem } from 'ts/components/wallet/wallet_disconnected_item';
import { WrapEtherItem } from 'ts/components/wallet/wrap_ether_item';
import { Dispatcher } from 'ts/redux/dispatcher';
+import { colors } from 'ts/style/colors';
+import { zIndex } from 'ts/style/z_index';
import {
BlockchainErrs,
ProviderType,
@@ -33,9 +35,7 @@ import {
TokenStateByAddress,
WebsitePaths,
} from 'ts/types';
-import { colors } from 'ts/utils/colors';
import { constants } from 'ts/utils/constants';
-import { zIndex } from 'ts/utils/style';
import { utils } from 'ts/utils/utils';
import { styles as walletItemStyles } from 'ts/utils/wallet_item_styles';
@@ -496,6 +496,20 @@ export class Wallet extends React.Component<WalletProps, WalletState> {
<IconButton iconName={buttonIconName} labelText={buttonLabel} onClick={onClick} color={colors.mediumBlue} />
);
}
+<<<<<<< HEAD
+=======
+ private _getInitialTrackedTokenStateByAddress(tokenAddresses: string[]): TokenStateByAddress {
+ const trackedTokenStateByAddress: TokenStateByAddress = {};
+ _.each(tokenAddresses, tokenAddress => {
+ trackedTokenStateByAddress[tokenAddress] = {
+ balance: new BigNumber(0),
+ allowance: new BigNumber(0),
+ isLoaded: false,
+ };
+ });
+ return trackedTokenStateByAddress;
+ }
+>>>>>>> v2-prototype
private _openWrappedEtherActionRow(wrappedEtherDirection: Side): void {
this.setState({
wrappedEtherDirection,