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.

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

[2847] Bug in token balance #2866

Merged
merged 40 commits into from
Sep 7, 2021
Merged
Changes from 9 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
aa2eba8
fix(WatchAssetRequestComponent): Token balance
Jul 1, 2021
3025372
Merge branch 'develop' of https://github.com/MetaMask/metamask-mobile…
Jul 4, 2021
1e0c4b0
fix(WatchAssetRequestComponent): Update
Jul 5, 2021
ed4b0cb
Merge branch 'develop' into bug/token-correct-balance
Jul 12, 2021
8ec99d3
Merge branch 'develop' into bug/token-correct-balance
Jul 13, 2021
3816273
Merge branch 'develop' into bug/token-correct-balance
Jul 14, 2021
455e37c
Merge branch 'develop' into bug/token-correct-balance
Jul 28, 2021
5b22181
Merge branch 'develop' into bug/token-correct-balance
Aug 4, 2021
b4e5cf9
Merge branch 'develop' into bug/token-correct-balance
Aug 7, 2021
f0d5b7a
Merge branch 'develop' into bug/token-correct-balance
Aug 10, 2021
8fa1728
Merge branch 'develop' of https://github.com/MetaMask/metamask-mobile…
Aug 11, 2021
cc0f2b1
Merge branch 'develop' of https://github.com/MetaMask/metamask-mobile…
Aug 17, 2021
609837c
fix(TokenBalance): Add hook to fetch token balances
Aug 18, 2021
f2af3f0
refactor(TokenBalance): WatchAssetRequest component
Aug 18, 2021
87c45a4
Merge branch 'develop' of https://github.com/MetaMask/metamask-mobile…
Aug 19, 2021
fc8edb7
docs(TokenBalance): useTokenBalance hook
Aug 19, 2021
ee5d371
fix(TokenBalance): Change condition for balance source
Aug 19, 2021
b273d1b
fix(TokenBalance): Change data type
Aug 19, 2021
ba92e33
Merge branch 'develop' into bug/token-correct-balance
Aug 19, 2021
64953d0
Merge branch 'develop' into bug/token-correct-balance
Aug 19, 2021
33aa7e4
Merge branch 'develop' of https://github.com/MetaMask/metamask-mobile…
Aug 20, 2021
839167e
Merge branch 'bug/token-correct-balance' of https://github.com/MetaMa…
Aug 20, 2021
659c404
test(WatchAssetRequest): Update
Aug 21, 2021
d698c48
Merge branch 'develop' into bug/token-correct-balance
Aug 26, 2021
010e9fc
fix(TokenBalance): Add try-catch
Aug 28, 2021
db6619b
fix(TokenBalance): Change type from string to BN
Aug 28, 2021
3027227
Merge branch 'develop' of https://github.com/MetaMask/metamask-mobile…
Aug 28, 2021
59fce75
fix(TokenBalance): Remove props from unmount in useEffect hook
Aug 30, 2021
92690f4
Merge branch 'develop' into bug/token-correct-balance
Sep 1, 2021
2530a39
Merge branch 'develop' into bug/token-correct-balance
Sep 2, 2021
a172f1c
Merge branch 'develop' into bug/token-correct-balance
sethkfman Sep 2, 2021
030b4ed
Merge branch 'develop' into bug/token-correct-balance
sethkfman Sep 2, 2021
deae65c
Merge branch 'develop' into bug/token-correct-balance
Sep 7, 2021
8e83d21
fix(WatchAsset): Address review comments
Sep 7, 2021
6490c93
lint
Sep 7, 2021
7de95c0
Update docs
Sep 7, 2021
9699472
Merge branch 'develop' into bug/token-correct-balance
Sep 7, 2021
553e91a
Merge branch 'develop' into bug/token-correct-balance
Sep 7, 2021
0277d3c
fix(TokenBalance): Handle crash
Sep 7, 2021
ca83241
Merge branch 'bug/token-correct-balance' of https://github.com/MetaMa…
Sep 7, 2021
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
7 changes: 3 additions & 4 deletions app/components/UI/WatchAssetRequest/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { strings } from '../../../../locales/i18n';
import { connect } from 'react-redux';
import ActionView from '../ActionView';
import { renderFromTokenMinimalUnit } from '../../../util/number';
import { toLowerCaseEquals } from '../../../util/general';
import TokenImage from '../../UI/TokenImage';
import Device from '../../../util/Device';
import Engine from '../../../core/Engine';
Expand Down Expand Up @@ -149,10 +150,8 @@ class WatchAssetRequest extends PureComponent {
suggestedAssetMeta: { asset },
contractBalances
} = this.props;
const balance =
asset.address in contractBalances
? renderFromTokenMinimalUnit(contractBalances[asset.address], asset.decimals)
: '0';
const address = Object.keys(contractBalances).find(key => toLowerCaseEquals(key, asset.address));
const balance = address ? renderFromTokenMinimalUnit(contractBalances[address], asset.decimals) : '0';
return (
<View style={styles.root}>
<View style={styles.titleWrapper}>
Expand Down