crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove extra border from the bottom of the wallet

Browse Source
This commit is contained in:
Brandon Millman
2018-06-22 16:07:07 -07:00
parent a1737a28d0
commit 1f5848ba82
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/website/ts/components/wallet/wallet.tsx
View File

@@ -311,7 +311,7 @@ export class Wallet extends React.Component<WalletProps, WalletState> {
wrappedEtherDirection: Side.Deposit, wrappedEtherDirection: Side.Deposit,
}; };
const key = ETHER_ITEM_KEY; const key = ETHER_ITEM_KEY;
return this._renderBalanceRow(key, icon, primaryText, secondaryText, accessoryItemConfig, 'eth-row'); return this._renderBalanceRow(key, icon, primaryText, secondaryText, accessoryItemConfig, false, 'eth-row');
} }
private _renderTokenRows(): React.ReactNode { private _renderTokenRows(): React.ReactNode {
const trackedTokens = this.props.trackedTokens; const trackedTokens = this.props.trackedTokens;
@@ -322,7 +322,7 @@ export class Wallet extends React.Component<WalletProps, WalletState> {
); );
return _.map(trackedTokensStartingWithEtherToken, this._renderTokenRow.bind(this)); return _.map(trackedTokensStartingWithEtherToken, this._renderTokenRow.bind(this));
} }
private _renderTokenRow(token: Token, _index: number): React.ReactNode { private _renderTokenRow(token: Token, index: number): React.ReactNode {
const tokenState = this.props.trackedTokenStateByAddress[token.address]; const tokenState = this.props.trackedTokenStateByAddress[token.address];
if (_.isUndefined(tokenState)) { if (_.isUndefined(tokenState)) {
return null; return null;
@@ -350,12 +350,14 @@ export class Wallet extends React.Component<WalletProps, WalletState> {
}, },
}; };
const key = token.address; const key = token.address;
const isLastRow = index === this.props.trackedTokens.length - 1;
return this._renderBalanceRow( return this._renderBalanceRow(
key, key,
icon, icon,
primaryText, primaryText,
secondaryText, secondaryText,
accessoryItemConfig, accessoryItemConfig,
isLastRow,
isWeth ? 'weth-row' : undefined, isWeth ? 'weth-row' : undefined,
); );
} }
@@ -365,13 +367,19 @@ export class Wallet extends React.Component<WalletProps, WalletState> {
primaryText: React.ReactNode, primaryText: React.ReactNode,
secondaryText: React.ReactNode, secondaryText: React.ReactNode,
accessoryItemConfig: AccessoryItemConfig, accessoryItemConfig: AccessoryItemConfig,
isLastRow: boolean,
className?: string, className?: string,
): React.ReactNode { ): React.ReactNode {
const shouldShowWrapEtherItem = const shouldShowWrapEtherItem =
!_.isUndefined(this.state.wrappedEtherDirection) && !_.isUndefined(this.state.wrappedEtherDirection) &&
this.state.wrappedEtherDirection === accessoryItemConfig.wrappedEtherDirection && this.state.wrappedEtherDirection === accessoryItemConfig.wrappedEtherDirection &&
!_.isUndefined(this.props.userEtherBalanceInWei); !_.isUndefined(this.props.userEtherBalanceInWei);
const additionalStyle = shouldShowWrapEtherItem ? walletItemStyles.focusedItem : styles.borderedItem; let additionalStyle;
if (shouldShowWrapEtherItem) {
additionalStyle = walletItemStyles.focusedItem;
} else if (!isLastRow) {
additionalStyle = styles.borderedItem;
}
const style = { ...styles.tokenItem, ...additionalStyle }; const style = { ...styles.tokenItem, ...additionalStyle };
const etherToken = this._getEthToken(); const etherToken = this._getEthToken();
return ( return (