diff options
author | Brandon Millman <brandon.millman@gmail.com> | 2018-07-03 07:52:20 +0800 |
---|---|---|
committer | Brandon Millman <brandon.millman@gmail.com> | 2018-07-03 08:02:11 +0800 |
commit | 73d8a2adf748e06552a1a7a7a188433c4c41095b (patch) | |
tree | 40cf24bb8142d8d392e63ff0b558b9b67fdfe34c /packages/website/ts/components/wallet/wallet.tsx | |
parent | 2eede4a09ecd17cade6623b4a770a62bee57a2e8 (diff) | |
download | dexon-0x-contracts-73d8a2adf748e06552a1a7a7a188433c4c41095b.tar dexon-0x-contracts-73d8a2adf748e06552a1a7a7a188433c4c41095b.tar.gz dexon-0x-contracts-73d8a2adf748e06552a1a7a7a188433c4c41095b.tar.bz2 dexon-0x-contracts-73d8a2adf748e06552a1a7a7a188433c4c41095b.tar.lz dexon-0x-contracts-73d8a2adf748e06552a1a7a7a188433c4c41095b.tar.xz dexon-0x-contracts-73d8a2adf748e06552a1a7a7a188433c4c41095b.tar.zst dexon-0x-contracts-73d8a2adf748e06552a1a7a7a188433c4c41095b.zip |
Always show the wrap ether row in between ETH and WETH
Diffstat (limited to 'packages/website/ts/components/wallet/wallet.tsx')
-rw-r--r-- | packages/website/ts/components/wallet/wallet.tsx | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/packages/website/ts/components/wallet/wallet.tsx b/packages/website/ts/components/wallet/wallet.tsx index 1f1e3598a..a75404637 100644 --- a/packages/website/ts/components/wallet/wallet.tsx +++ b/packages/website/ts/components/wallet/wallet.tsx @@ -320,8 +320,24 @@ export class Wallet extends React.Component<WalletProps, WalletState> { this.state.wrappedEtherDirection === accessoryItemConfig.wrappedEtherDirection && !_.isUndefined(this.props.userEtherBalanceInWei); const etherToken = this._getEthToken(); + const wrapEtherItem = shouldShowWrapEtherItem ? ( + <WrapEtherItem + userAddress={this.props.userAddress} + networkId={this.props.networkId} + blockchain={this.props.blockchain} + dispatcher={this.props.dispatcher} + userEtherBalanceInWei={this.props.userEtherBalanceInWei} + direction={accessoryItemConfig.wrappedEtherDirection} + etherToken={etherToken} + lastForceTokenStateRefetch={this.props.lastForceTokenStateRefetch} + onConversionSuccessful={this._closeWrappedEtherActionRow.bind(this)} + // tslint:disable:jsx-no-lambda + refetchEthTokenStateAsync={async () => this.props.refetchTokenStateAsync(etherToken.address)} + /> + ) : null; return ( <div id={key} key={key} className={`flex flex-column ${className || ''}`}> + {this.state.wrappedEtherDirection === Side.Receive && wrapEtherItem} <StandardIconRow icon={icon} main={ @@ -331,23 +347,8 @@ export class Wallet extends React.Component<WalletProps, WalletState> { </div> } accessory={this._renderAccessoryItems(accessoryItemConfig)} - backgroundColor={shouldShowWrapEtherItem ? colors.walletFocusedItemBackground : undefined} /> - {shouldShowWrapEtherItem && ( - <WrapEtherItem - userAddress={this.props.userAddress} - networkId={this.props.networkId} - blockchain={this.props.blockchain} - dispatcher={this.props.dispatcher} - userEtherBalanceInWei={this.props.userEtherBalanceInWei} - direction={accessoryItemConfig.wrappedEtherDirection} - etherToken={etherToken} - lastForceTokenStateRefetch={this.props.lastForceTokenStateRefetch} - onConversionSuccessful={this._closeWrappedEtherActionRow.bind(this)} - // tslint:disable:jsx-no-lambda - refetchEthTokenStateAsync={async () => this.props.refetchTokenStateAsync(etherToken.address)} - /> - )} + {this.state.wrappedEtherDirection === Side.Deposit && wrapEtherItem} </div> ); } |