AaronFiore/electrum
1
0
Fork 0
Code Activity

add frozen balance to balancesummary

Browse Source
This commit is contained in:
Sander van Grieken
2022-06-15 12:53:57 +02:00
parent 5889c92e81
commit b3920f0408
3 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
electrum/gui/qml/components/BalanceSummary.qml
View File

@@ -9,19 +9,23 @@ Frame {
font.pixelSize: constants.fontSizeMedium
property string formattedBalance
property string formattedUnconfirmed
property string formattedBalanceFiat
property string formattedUnconfirmed
property string formattedUnconfirmedFiat
property string formattedFrozen
property string formattedFrozenFiat
property string formattedLightningBalance
property string formattedLightningBalanceFiat
function setBalances() {
root.formattedBalance = Config.formatSats(Daemon.currentWallet.confirmedBalance)
root.formattedUnconfirmed = Config.formatSats(Daemon.currentWallet.unconfirmedBalance)
root.formattedFrozen = Config.formatSats(Daemon.currentWallet.frozenBalance)
root.formattedLightningBalance = Config.formatSats(Daemon.currentWallet.lightningBalance)
if (Daemon.fx.enabled) {
root.formattedBalanceFiat = Daemon.fx.fiatValue(Daemon.currentWallet.confirmedBalance, false)
root.formattedUnconfirmedFiat = Daemon.fx.fiatValue(Daemon.currentWallet.unconfirmedBalance, false)
root.formattedFrozenFiat = Daemon.fx.fiatValue(Daemon.currentWallet.frozenBalance, false)
root.formattedLightningBalanceFiat = Daemon.fx.fiatValue(Daemon.currentWallet.lightningBalance, false)
}
}
@@ -53,32 +57,12 @@ Frame {
}
}
Label {
text: qsTr('Confirmed: ')
font.pixelSize: constants.fontSizeSmall
}
RowLayout {
Label {
font.pixelSize: constants.fontSizeSmall
font.family: FixedFont
text: formattedBalance
}
Label {
font.pixelSize: constants.fontSizeSmall
color: Material.accentColor
text: Config.baseUnit
}
Label {
font.pixelSize: constants.fontSizeSmall
text: Daemon.fx.enabled
? '(' + root.formattedBalanceFiat + ' ' + Daemon.fx.fiatCurrency + ')'
: ''
}
}
Label {
visible: Daemon.currentWallet.unconfirmedBalance.satsInt > 0
font.pixelSize: constants.fontSizeSmall
text: qsTr('Unconfirmed: ')
}
RowLayout {
visible: Daemon.currentWallet.unconfirmedBalance.satsInt > 0
Label {
font.pixelSize: constants.fontSizeSmall
font.family: FixedFont
@@ -96,6 +80,30 @@ Frame {
: ''
}
}
Label {
visible: Daemon.currentWallet.frozenBalance.satsInt > 0
font.pixelSize: constants.fontSizeSmall
text: qsTr('Frozen: ')
}
RowLayout {
visible: Daemon.currentWallet.frozenBalance.satsInt > 0
Label {
font.pixelSize: constants.fontSizeSmall
font.family: FixedFont
text: root.formattedFrozen
}
Label {
font.pixelSize: constants.fontSizeSmall
color: Material.accentColor
text: Config.baseUnit
}
Label {
font.pixelSize: constants.fontSizeSmall
text: Daemon.fx.enabled
? '(' + root.formattedFrozenFiat + ' ' + Daemon.fx.fiatCurrency + ')'
: ''
}
}
Label {
visible: Daemon.currentWallet.isLightning
font.pixelSize: constants.fontSizeSmall

1
electrum/gui/qml/qeaddressdetails.py
View File

@@ -93,6 +93,7 @@ class QEAddressDetails(QObject):
self._wallet.wallet.set_frozen_state_of_addresses([self._address], freeze=freeze)
self._frozen = freeze
self.frozenChanged.emit()
self._wallet.balanceChanged.emit()
@pyqtSlot(str)
def set_label(self, label: str):

4
electrum/gui/qml/qewallet.py
View File

@@ -286,7 +286,9 @@ class QEWallet(QObject):
@pyqtProperty(QEAmount, notify=balanceChanged)
def frozenBalance(self):
self._frozenbalance = QEAmount(amount_sat=self.wallet.get_frozen_balance())
c, u, x = self.wallet.get_frozen_balance()
self._logger.info('frozen balance: ' + str(c) + ' ' + str(u) + ' ' + str(x) + ' ')
self._frozenbalance = QEAmount(amount_sat=c+x)
return self._frozenbalance
@pyqtProperty(QEAmount, notify=balanceChanged)