diff options
| author | fragosti <francesco.agosti93@gmail.com> | 2018-06-07 02:23:57 +0800 |
|---|---|---|
| committer | fragosti <francesco.agosti93@gmail.com> | 2018-06-07 02:23:57 +0800 |
| commit | 6a2da6dc06c616ba50930bbe04a6fa200885ecfd (patch) | |
| tree | b26f964d4ec0890f40d2ca990978a7d2ac796bb2 | |
| parent | 58603e2a5a06f6bccfb5b6d2d12732ee6f0e69da (diff) | |
| download | dexon-sol-tools-6a2da6dc06c616ba50930bbe04a6fa200885ecfd.tar dexon-sol-tools-6a2da6dc06c616ba50930bbe04a6fa200885ecfd.tar.gz dexon-sol-tools-6a2da6dc06c616ba50930bbe04a6fa200885ecfd.tar.bz2 dexon-sol-tools-6a2da6dc06c616ba50930bbe04a6fa200885ecfd.tar.lz dexon-sol-tools-6a2da6dc06c616ba50930bbe04a6fa200885ecfd.tar.xz dexon-sol-tools-6a2da6dc06c616ba50930bbe04a6fa200885ecfd.tar.zst dexon-sol-tools-6a2da6dc06c616ba50930bbe04a6fa200885ecfd.zip | |
Fix merge conflict
| -rw-r--r-- | packages/website/ts/components/wallet/wallet.tsx | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx index 34e40dfb0..4f099d636 100644 --- a/packages/website/ts/components/wallet/wallet.tsx +++ b/packages/website/ts/components/wallet/wallet.tsx @@ -496,20 +496,6 @@ 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, |