https://trello.com/c/Rd0lvLdK/59-possible-change-to-add-to-address-book-functionality-in-transfer-window

https://trello.com/c/kyZNLKlk/61-hide-payment-id-in-history-if-unused-for-a-transaction

4 files changed, 12 insertions, 29 deletions

diff --git a/components/HistoryTable.qml b/components/HistoryTable.qml
index b3a45116..1c78e273 100644
--- a/components/HistoryTable.qml
+++ b/components/HistoryTable.qml
@@ -86,7 +86,7 @@ ListView {
             font.pixelSize: 12
             font.letterSpacing: -1
             color: "#535353"
-            text: qsTr("Payment ID:")
+            text: paymentId !== "" ? qsTr("Payment ID:") : ""
         }
 
         Text {
diff --git a/components/TitleBar.qml b/components/TitleBar.qml
index 8e545e11..535a4113 100644
--- a/components/TitleBar.qml
+++ b/components/TitleBar.qml
@@ -95,8 +95,6 @@ Rectangle {
                 anchors.fill: parent
                 onClicked: {
                     appWindow.visibility = Window.Minimized
-//                    parent.containsMouse = Qt.binding(function(){ return titleBar.mouseX >= x + row.x && titleBar.mouseX <= x + row.x + width &&
-//                                                                  appWindow.visibility !== Window.Minimized })
                 }
             }
         }
diff --git a/main.qml b/main.qml
index 2d5be6f2..3f4eb529 100644
--- a/main.qml
+++ b/main.qml
@@ -86,6 +86,7 @@ ApplicationWindow {
     height: 800
     color: "#FFFFFF"
     flags: Qt.FramelessWindowHint | Qt.WindowSystemMenuHint | Qt.Window | Qt.WindowMinimizeButtonHint
+    onVisibilityChanged: visible = visibility !== Window.Minimized
     onWidthChanged: x -= 0
 
     Component.onCompleted: {
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index fc5ba27c..77bb7dd1 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -147,8 +147,7 @@ Rectangle {
         anchors.rightMargin: 17
         anchors.topMargin: 17
         fontSize: 14
-        text: qsTr("Description <font size='2'>( Local database )</font>")
-        visible: checkBox.checked
+        text: qsTr("Description <font size='2'>( An optional description that will be saved to the local address book if entered )</font>")
     }
 
     LineEdit {
@@ -159,34 +158,19 @@ Rectangle {
         anchors.leftMargin: 17
         anchors.rightMargin: 17
         anchors.topMargin: 5
-        visible: checkBox.checked
     }
 
-    Row {
+    StandardButton {
+        id: sendButton
         anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: checkBox.checked ? descriptionLine.bottom : paymentLine.bottom
+        anchors.top: descriptionLine.bottom
         anchors.leftMargin: 17
-        anchors.rightMargin: 17
         anchors.topMargin: 17
-        spacing: 17
-
-        StandardButton {
-            id: sendButton
-            width: 60
-            text: qsTr("SEND")
-            shadowReleasedColor: "#FF4304"
-            shadowPressedColor: "#B32D00"
-            releasedColor: "#FF6C3C"
-            pressedColor: "#FF4304"
-        }
-
-        CheckBox {
-            id: checkBox
-            text: qsTr("Add to Address book")
-            anchors.bottom: sendButton.bottom
-            checkedIcon: "../images/checkedOrangeIcon.png"
-            uncheckedIcon: "../images/uncheckedIcon.png"
-        }
+        width: 60
+        text: qsTr("SEND")
+        shadowReleasedColor: "#FF4304"
+        shadowPressedColor: "#B32D00"
+        releasedColor: "#FF6C3C"
+        pressedColor: "#FF4304"
     }
 }