tfix amount_sat in kivy invoice/request dialogs. (follow-up d5f368c584afb1368f6904517db1ba59ac48989c) - electrum - Electrum Bitcoin wallet
 (HTM) git clone https://git.parazyd.org/electrum
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) Submodules
       ---
 (DIR) commit 01202ed3eb45df407d6ed2a1979fb78098928bdd
 (DIR) parent 10c21834613318f15bd30213fa52eaada50d1285
 (HTM) Author: ThomasV <thomasv@electrum.org>
       Date:   Thu, 25 Jun 2020 14:39:14 +0200
       
       fix amount_sat in kivy invoice/request dialogs. (follow-up d5f368c584afb1368f6904517db1ba59ac48989c)
       
       Diffstat:
         M electrum/gui/kivy/uix/dialogs/invo… |       5 +++--
         M electrum/gui/kivy/uix/dialogs/requ… |       7 ++++---
       
       2 files changed, 7 insertions(+), 5 deletions(-)
       ---
 (DIR) diff --git a/electrum/gui/kivy/uix/dialogs/invoice_dialog.py b/electrum/gui/kivy/uix/dialogs/invoice_dialog.py
       t@@ -17,7 +17,7 @@ if TYPE_CHECKING:
        Builder.load_string('''
        <InvoiceDialog@Popup>
            id: popup
       -    amount: None
       +    amount_str: ''
            title: ''
            data: ''
            description:''
       t@@ -44,7 +44,7 @@ Builder.load_string('''
                    RefLabel:
                        data: root.description or _('No description')
                    TopLabel:
       -                text: _('Amount') + ': ' + app.format_amount_and_units(root.amount_sat)
       +                text: _('Amount') + ': ' + root.amount_str
                    TopLabel:
                        text: _('Status') + ': ' + root.status_str
                        color: root.status_color
       t@@ -94,6 +94,7 @@ class InvoiceDialog(Factory.Popup):
                self.key = key
                invoice = self.app.wallet.get_invoice(key)
                self.amount_sat = invoice.get_amount_sat()
       +        self.amount_str = self.app.format_amount_and_units(self.amount_sat)
                self.description = invoice.message
                self.is_lightning = invoice.is_lightning()
                self.update_status()
 (DIR) diff --git a/electrum/gui/kivy/uix/dialogs/request_dialog.py b/electrum/gui/kivy/uix/dialogs/request_dialog.py
       t@@ -17,7 +17,7 @@ if TYPE_CHECKING:
        Builder.load_string('''
        <RequestDialog@Popup>
            id: popup
       -    amount: 0
       +    amount_str: ''
            title: ''
            description:''
            is_lightning: False
       t@@ -44,7 +44,7 @@ Builder.load_string('''
                    TopLabel:
                        text: _('Description') + ': ' + root.description or _('None')
                    TopLabel:
       -                text: _('Amount') + ': ' + app.format_amount_and_units(root.amount_sat)
       +                text: _('Amount') + ': ' + root.amount_str
                    TopLabel:
                        text: (_('Address') if not root.is_lightning else _('Payment hash')) + ': '
                    RefLabel:
       t@@ -93,7 +93,8 @@ class RequestDialog(Factory.Popup):
                r = self.app.wallet.get_request(key)
                self.is_lightning = r.is_lightning()
                self.data = r.invoice if self.is_lightning else self.app.wallet.get_request_URI(r)
       -        self.amount_sat = r.get_amount_sat() or 0
       +        self.amount_sat = r.get_amount_sat()
       +        self.amount_str = self.app.format_amount_and_units(self.amount_sat)
                self.description = r.message
                self.update_status()