use BoxLabel for invoice dialog too

gui/kivy/main.kv

@@ -77,6 +77,17 @@
 #########################
 #       Dialogs
 #########################
+<BoxLabel@BoxLayout>
+    text: ''
+    value: ''
+    size_hint_y: None
+    height: max(lbl1.height, lbl2.height)
+    TopLabel
+        id: lbl1
+        text: root.text
+    TopLabel
+        id: lbl2
+        text: root.value
 
 <OutputList>
     height: self.minimum_height

gui/kivy/uix/dialogs/tx_dialog.py

@@ -9,17 +9,6 @@ from electrum_gui.kivy.i18n import _
 from datetime import datetime
 
 Builder.load_string('''
-<BoxLabel@BoxLayout>
-    text: ''
-    value: ''
-    size_hint_y: None
-    height: max(lbl1.height, lbl2.height)
-    TopLabel
-        id: lbl1
-        text: root.text
-    TopLabel
-        id: lbl2
-        text: root.value
 
 <TxDialog>
     id: popup

gui/kivy/uix/ui_screens/invoice.kv

@@ -20,36 +20,31 @@ Popup:
                 cols: 1
                 height: self.minimum_height
                 size_hint_y: None
+                padding: '10dp'
+                spacing: '10dp'
                 GridLayout:
-                    cols: 2
+                    cols: 1
                     size_hint_y: None
                     height: self.minimum_height
                     spacing: '10dp'
-                    padding: '10dp'
-                    TopLabel:
-                        text: _('Requestor') if popup.is_invoice else _('Address')
-                    TopLabel:
-                        text: root.requestor
-                    TopLabel:
+                    BoxLabel:
+                        text: (_('Status') if popup.amount or popup.is_invoice else _('Amount received')) if root.status else ''
+                        value: root.status
+                    BoxLabel:
                         text: _('Amount') if root.amount else ''
-                    TopLabel:
-                        text: app.format_amount_and_units(root.amount) if root.amount else ''
-                    TopLabel:
+                        value: app.format_amount_and_units(root.amount) if root.amount else ''
+                    BoxLabel:
+                        text: _('Requestor') if popup.is_invoice else _('Address')
+                        value: root.requestor
+                    BoxLabel:
                         text: _('Signature') if root.signature else ''
-                    TopLabel:
-                        text: root.signature
-                    TopLabel:
+                        value: root.signature
+                    BoxLabel:
                         text: _('Expiration') if root.exp else ''
-                    TopLabel:
-                        text: root.exp
-                    TopLabel:
+                        value: root.exp
+                    BoxLabel:
                         text: _('Description') if root.description else ''
-                    TopLabel:
-                        text: root.description
-                    TopLabel:
-                        text: (_('Status') if popup.amount or popup.is_invoice else _('Amount received')) if root.status else ''
-                    TopLabel:
-                        text: root.status
+                        value: root.description
 
                 TopLabel:
                     text: _('Outputs') if popup.is_invoice else ''