From 20d12031b330843137f730a9246e7e55b62feed5 Mon Sep 17 00:00:00 2001 From: AntiD2ta Date: Fri, 7 Feb 2020 17:55:00 -0500 Subject: [PATCH] [models] refs #337 - Set sky and coinHours properties of qWallet properly Use FormatCoins --- src/models/walletsManager.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/models/walletsManager.go b/src/models/walletsManager.go index ed7102af..eb470839 100644 --- a/src/models/walletsManager.go +++ b/src/models/walletsManager.go @@ -1,7 +1,6 @@ package models import ( - "fmt" "sync" "github.com/fibercrypto/fibercryptowallet/src/coin/skycoin/params" @@ -874,8 +873,7 @@ func fromWalletToQWallet(wlt core.Wallet, isEncrypted bool) *QWallet { return qWallet } - floatBl := float64(bl) / float64(accuracy) - qWallet.SetSky(fmt.Sprint(floatBl)) + qWallet.SetSky(util.FormatCoins(bl, accuracy)) bl, err = wlt.GetCryptoAccount().GetBalance(sky.CoinHoursTicker) if err != nil { @@ -883,7 +881,13 @@ func fromWalletToQWallet(wlt core.Wallet, isEncrypted bool) *QWallet { logWalletManager.WithError(err).Error("Couldn't get Coin Hours balance") return qWallet } - qWallet.SetCoinHours(fmt.Sprint(bl)) + accuracy, err = util.AltcoinQuotient(params.CoinHoursTicker) + if err != nil { + qWallet.SetCoinHours("N/A") + logWalletManager.WithError(err).Error("Couldn't get Coin Hours Altcoin quotient") + return qWallet + } + qWallet.SetCoinHours(util.FormatCoins(bl, accuracy)) return qWallet }