Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bugfix: remove tokens but ETH #1054

Merged
merged 4 commits into from
Sep 5, 2019
Merged

bugfix: remove tokens but ETH #1054

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bc59c53
block eth deletion
estebanmino Sep 3, 2019
96e6c1f
Merge branch 'develop' into bugfix/remove-tokens-but-ETH
estebanmino Sep 3, 2019
c1eeb2d
Merge branch 'develop' into bugfix/remove-tokens-but-ETH
estebanmino Sep 5, 2019
1be4e61
Merge branch 'develop' into bugfix/remove-tokens-but-ETH
estebanmino Sep 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/components/UI/Tokens/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class Tokens extends PureComponent {
asset.balance ||
(itemAddress in tokenBalances ? renderFromTokenMinimalUnit(tokenBalances[itemAddress], asset.decimals) : 0);
const balanceFiat = asset.balanceFiat || balanceToFiat(balance, conversionRate, exchangeRate, currentCurrency);
const balanceValue = balance + ' ' + asset.symbol;
const balanceValue = `${balance} ${asset.symbol}`;

// render balances according to primary currency
let mainBalance, secondaryBalance;
Expand All @@ -159,7 +159,7 @@ class Tokens extends PureComponent {
<AssetElement
key={itemAddress || '0x'}
onPress={this.onItemPress}
onLongPress={this.showRemoveMenu}
onLongPress={asset.isETH ? null : this.showRemoveMenu}
asset={asset}
>
{asset.isETH ? (
Expand Down