midefos/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2025-11-06 02:38:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

ui: Rename unconfirmed balance to pending, include immature balance.

Browse Source
This commit is contained in:
tecnovert
2024-02-09 22:53:37 +02:00
parent 1f810fab6b
commit 6e4feb33d7
9 changed files with 72 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
basicswap/basicswap.py
View File

@@ -42,7 +42,6 @@ from .util import (
LockedCoinError,
TemporaryError,
InactiveCoin,
format_amount,
format_timestamp,
DeserialiseNum,
zeroIfNone,
@@ -6584,16 +6583,18 @@ class BasicSwap(BaseApp):
try:
walletinfo = ci.getWalletInfo()
scale = chainparams[coin]['decimal_places']
rv = {
'deposit_address': self.getCachedAddressForCoin(coin),
'balance': format_amount(make_int(walletinfo['balance'], scale), scale),
'unconfirmed': format_amount(make_int(walletinfo.get('unconfirmed_balance'), scale), scale),
'balance': ci.format_amount(walletinfo['balance'], conv_int=True),
'unconfirmed': ci.format_amount(walletinfo['unconfirmed_balance'], conv_int=True),
'expected_seed': ci.knownWalletSeed(),
'encrypted': walletinfo['encrypted'],
'locked': walletinfo['locked'],
}
if 'immature_balance' in walletinfo:
rv['immature'] = ci.format_amount(walletinfo['immature_balance'], conv_int=True)
if 'locked_utxos' in walletinfo:
rv['locked_utxos'] = walletinfo['locked_utxos']
@@ -6611,7 +6612,6 @@ class BasicSwap(BaseApp):
rv['mweb_address'] = self.getCachedStealthAddressForCoin(Coins.LTC_MWEB)
rv['mweb_balance'] = walletinfo['mweb_balance']
rv['mweb_pending'] = walletinfo['mweb_unconfirmed'] + walletinfo['mweb_immature']
rv['mweb_pending'] = walletinfo['mweb_unconfirmed'] + walletinfo['mweb_immature']
return rv
except Exception as e: