status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(@desktop/wallet): Total balance reflect real total 

fixes #3054
This commit is contained in:
Anthony Laibe 2021-08-04 10:32:24 +02:00
parent ee84818c06
commit 992828b0c3
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/status/wallet/balance_manager.nim
View File

@ -61,22 +61,23 @@ proc convertValue*(balance: string, fromCurrency: string, toCurrency: string): f
balanceManager.pricePairs.cacheValue(cacheKey, fiat_crypto_price) balanceManager.pricePairs.cacheValue(cacheKey, fiat_crypto_price)
parseFloat(balance) * parseFloat(fiat_crypto_price) parseFloat(balance) * parseFloat(fiat_crypto_price)
proc updateBalance*(asset: Asset, currency: string, refreshCache: bool) = proc updateBalance*(asset: Asset, currency: string, refreshCache: bool): float =
var token_balance = getBalance(asset.symbol, asset.accountAddress, asset.address, refreshCache) var token_balance = getBalance(asset.symbol, asset.accountAddress, asset.address, refreshCache)
let fiat_balance = convertValue(token_balance, asset.symbol, currency) let fiat_balance = convertValue(token_balance, asset.symbol, currency)
asset.value = token_balance asset.value = token_balance
asset.fiatBalanceDisplay = fmt"{fiat_balance:.2f} {currency}" asset.fiatBalanceDisplay = fmt"{fiat_balance:.2f} {currency}"
asset.fiatBalance = fmt"{fiat_balance:.2f}" asset.fiatBalance = fmt"{fiat_balance:.2f}"
return fiat_balance
proc updateBalance*(account: WalletAccount, currency: string, refreshCache: bool = false) = proc updateBalance*(account: WalletAccount, currency: string, refreshCache: bool = false) =
try: try:
let eth_balance = getBalance("ETH", account.address, "", refreshCache) var usd_balance = 0.0
let usd_balance = convertValue(eth_balance, "ETH", currency)
var totalAccountBalance = usd_balance
account.realFiatBalance = some(totalAccountBalance)
account.balance = some(fmt"{totalAccountBalance:.2f} {currency}")
for asset in account.assetList: for asset in account.assetList:
updateBalance(asset, currency, refreshCache) let assetFiatBalance = updateBalance(asset, currency, refreshCache)
usd_balance = usd_balance + assetFiatBalance
account.realFiatBalance = some(usd_balance)
account.balance = some(fmt"{usd_balance:.2f} {currency}")
except RpcException: except RpcException:
error "Error in updateBalance", message = getCurrentExceptionMsg() error "Error in updateBalance", message = getCurrentExceptionMsg()