From fad2d879efde6ed143b3314251ef3bb48f65b1de Mon Sep 17 00:00:00 2001
From: Sander van Grieken <sander@outrightsolutions.nl>
Date: Tue, 5 Apr 2022 18:06:30 +0200
Subject: [PATCH] UI fixes

---
 electrum/gui/qml/components/Addresses.qml     |  2 ++
 electrum/gui/qml/components/QRScan.qml        |  2 ++
 electrum/gui/qml/components/Receive.qml       |  2 +-
 electrum/gui/qml/components/RequestDialog.qml | 16 +++++++++-------
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/electrum/gui/qml/components/Addresses.qml b/electrum/gui/qml/components/Addresses.qml
index f8aeaa977..51120b75c 100644
--- a/electrum/gui/qml/components/Addresses.qml
+++ b/electrum/gui/qml/components/Addresses.qml
@@ -8,6 +8,7 @@ import org.electrum 1.0
 Pane {
     id: rootItem
     padding: 0
+    width: parent.width
     property string title: Daemon.currentWallet.name + ' - ' + qsTr('Addresses')
 
     ColumnLayout {
@@ -73,6 +74,7 @@ Pane {
                             Label {
                                 font.family: FixedFont
                                 text: model.address
+                                elide: Text.ElideMiddle
                                 Layout.fillWidth: true
                             }
 
diff --git a/electrum/gui/qml/components/QRScan.qml b/electrum/gui/qml/components/QRScan.qml
index b681a92ec..514fd2591 100644
--- a/electrum/gui/qml/components/QRScan.qml
+++ b/electrum/gui/qml/components/QRScan.qml
@@ -24,12 +24,14 @@ Item {
         Rectangle {
             width: parent.width
             height: (parent.height - parent.width) / 2
+            visible: camera.cameraStatus == Camera.ActiveStatus
             anchors.top: parent.top
             color: Qt.rgba(0,0,0,0.5)
         }
         Rectangle {
             width: parent.width
             height: (parent.height - parent.width) / 2
+            visible: camera.cameraStatus == Camera.ActiveStatus
             anchors.bottom: parent.bottom
             color: Qt.rgba(0,0,0,0.5)
         }
diff --git a/electrum/gui/qml/components/Receive.qml b/electrum/gui/qml/components/Receive.qml
index 6598d606c..4b73042e2 100644
--- a/electrum/gui/qml/components/Receive.qml
+++ b/electrum/gui/qml/components/Receive.qml
@@ -85,7 +85,7 @@ Pane {
             color: Material.accentColor
         }
 
-        Item { width: 1; height: 1; Layout.fillWidth: true }
+        Item { visible: Daemon.fx.enabled; width: 1; height: 1; Layout.fillWidth: true }
 
         Label {
             text: qsTr('Expires after')
diff --git a/electrum/gui/qml/components/RequestDialog.qml b/electrum/gui/qml/components/RequestDialog.qml
index 33dd68f7c..b1633f45f 100644
--- a/electrum/gui/qml/components/RequestDialog.qml
+++ b/electrum/gui/qml/components/RequestDialog.qml
@@ -46,18 +46,18 @@ Dialog {
             id: rootLayout
             width: parent.width
             rowSpacing: constants.paddingMedium
-            columns: 3
+            columns: 4
 
             Rectangle {
                 height: 1
                 Layout.fillWidth: true
-                Layout.columnSpan: 3
+                Layout.columnSpan: 4
                 color: Material.accentColor
             }
 
             Image {
                 id: qr
-                Layout.columnSpan: 3
+                Layout.columnSpan: 4
                 Layout.alignment: Qt.AlignHCenter
                 Layout.topMargin: constants.paddingSmall
                 Layout.bottomMargin: constants.paddingSmall
@@ -84,12 +84,12 @@ Dialog {
             Rectangle {
                 height: 1
                 Layout.fillWidth: true
-                Layout.columnSpan: 3
+                Layout.columnSpan: 4
                 color: Material.accentColor
             }
 
             RowLayout {
-                Layout.columnSpan: 3
+                Layout.columnSpan: 4
                 Layout.alignment: Qt.AlignHCenter
                 Button {
                     icon.source: '../../icons/delete.png'
@@ -117,7 +117,7 @@ Dialog {
             }
             Label {
                 visible: modelItem.message != ''
-                Layout.columnSpan: 2
+                Layout.columnSpan: 3
                 Layout.fillWidth: true
                 wrapMode: Text.WordWrap
                 text: modelItem.message
@@ -137,6 +137,7 @@ Dialog {
             Label {
                 visible: modelItem.amount > 0
                 Layout.fillWidth: true
+                Layout.columnSpan: 2
                 text: Config.baseUnit
                 color: Material.accentColor
                 font.pixelSize: constants.fontSizeLarge
@@ -147,6 +148,7 @@ Dialog {
             }
             Label {
                 Layout.fillWidth: true
+                Layout.columnSpan: 2
                 font.family: FixedFont
                 font.pixelSize: constants.fontSizeLarge
                 wrapMode: Text.WrapAnywhere
@@ -163,7 +165,7 @@ Dialog {
                 text: qsTr('Status')
             }
             Label {
-                Layout.columnSpan: 2
+                Layout.columnSpan: 3
                 Layout.fillWidth: true
                 font.pixelSize: constants.fontSizeLarge
                 text: modelItem.status