qml: add frozen lightning to BalanceDetails, indent frozen on-chain and lightning amounts

electrum/gui/qml/components/BalanceDetails.qml

@@ -81,8 +81,9 @@ Pane {
                     GridLayout {
                         Layout.alignment: Qt.AlignHCenter
                         visible: Daemon.currentWallet
-                        columns: 3
+                        columns: 2
 
+                        RowLayout {
                             Rectangle {
                                 Layout.preferredWidth: constants.iconSizeXSmall
                                 Layout.preferredHeight: constants.iconSizeXSmall
@@ -93,10 +94,12 @@ Pane {
                             Label {
                                 text: qsTr('Total')
                             }
+                        }
                         FormattedAmount {
                             amount: Daemon.currentWallet.totalBalance
                         }
 
+                        RowLayout {
                             Rectangle {
                                 visible: Daemon.currentWallet.isLightning
                                 Layout.preferredWidth: constants.iconSizeXSmall
@@ -106,53 +109,74 @@ Pane {
                             Label {
                                 visible: Daemon.currentWallet.isLightning
                                 text: qsTr('Lightning')
-
+                            }
                         }
                         FormattedAmount {
                             visible: Daemon.currentWallet.isLightning
                             amount: Daemon.currentWallet.lightningBalance
                         }
 
+                        RowLayout {
+                            visible: Daemon.currentWallet.isLightning
                             Rectangle {
+                                Layout.leftMargin: constants.paddingLarge
+                                Layout.preferredWidth: constants.iconSizeXSmall
+                                Layout.preferredHeight: constants.iconSizeXSmall
+                                color: constants.colorPiechartLightningFrozen
+                            }
+                            Label {
+                                text: qsTr('Frozen')
+                            }
+                        }
+                        FormattedAmount {
+                            visible: Daemon.currentWallet.isLightning
+                            amount: Daemon.currentWallet.lightningBalanceFrozen
+                        }
+
+                        RowLayout {
                             visible: Daemon.currentWallet.isLightning || !Daemon.currentWallet.frozenBalance.isEmpty
+                            Rectangle {
                                 Layout.preferredWidth: constants.iconSizeXSmall
                                 Layout.preferredHeight: constants.iconSizeXSmall
                                 color: constants.colorPiechartOnchain
                             }
                             Label {
-                            visible: Daemon.currentWallet.isLightning || !Daemon.currentWallet.frozenBalance.isEmpty
                                 text: qsTr('On-chain')
                             }
+                        }
                         FormattedAmount {
                             visible: Daemon.currentWallet.isLightning || !Daemon.currentWallet.frozenBalance.isEmpty
                             amount: Daemon.currentWallet.confirmedBalance
                         }
 
-                        Rectangle {
+                        RowLayout {
                             visible: !Daemon.currentWallet.frozenBalance.isEmpty
+                            Rectangle {
+                                Layout.leftMargin: constants.paddingLarge
                                 Layout.preferredWidth: constants.iconSizeXSmall
                                 Layout.preferredHeight: constants.iconSizeXSmall
                                 color: constants.colorPiechartFrozen
                             }
                             Label {
-                            visible: !Daemon.currentWallet.frozenBalance.isEmpty
                                 text: qsTr('Frozen')
                             }
+                        }
                         FormattedAmount {
                             amount: Daemon.currentWallet.frozenBalance
                             visible: !Daemon.currentWallet.frozenBalance.isEmpty
                         }
 
-                        Rectangle {
+                        RowLayout {
                             visible: !Daemon.currentWallet.unconfirmedBalance.isEmpty
+                            Rectangle {
                                 Layout.preferredWidth: constants.iconSizeXSmall
                                 Layout.preferredHeight: constants.iconSizeXSmall
                                 color: constants.colorPiechartUnconfirmed
                             }
                             Label {
-                            visible: !Daemon.currentWallet.unconfirmedBalance.isEmpty
                                 text: qsTr('Unconfirmed')
                             }
+                        }
                         FormattedAmount {
                             amount: Daemon.currentWallet.unconfirmedBalance
                             visible: !Daemon.currentWallet.unconfirmedBalance.isEmpty

electrum/gui/qml/qewallet.py

@@ -103,6 +103,7 @@ class QEWallet(AuthMixin, QObject, QtEventListener):
         self._totalbalance = QEAmount()
         self._lightningcanreceive = QEAmount()
         self._lightningcansend = QEAmount()
+        self._lightningbalancefrozen = QEAmount()
 
         self._seed = ''
 
@@ -461,6 +462,12 @@ class QEWallet(AuthMixin, QObject, QtEventListener):
             self._lightningbalance.satsInt = int(self.wallet.lnworker.get_balance())
         return self._lightningbalance
 
+    @pyqtProperty(QEAmount, notify=balanceChanged)
+    def lightningBalanceFrozen(self):
+        if self.isLightning:
+            self._lightningbalancefrozen.satsInt = int(self.wallet.lnworker.get_balance(frozen=True))
+        return self._lightningbalancefrozen
+
     @pyqtProperty(QEAmount, notify=balanceChanged)
     def totalBalance(self):
         total = self.confirmedBalance.satsInt + self.lightningBalance.satsInt