From a7f52db61386e1af24ce3aa3836f6991decebae3 Mon Sep 17 00:00:00 2001
From: Jaquee <jaquee.monero@gmail.com>
Date: Thu, 3 Aug 2017 21:43:01 +0200
Subject: History: Support coinbase txs requires #2247

---
 components/HistoryTable.qml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'components')

diff --git a/components/HistoryTable.qml b/components/HistoryTable.qml
index 933c606c..082822d3 100644
--- a/components/HistoryTable.qml
+++ b/components/HistoryTable.qml
@@ -259,11 +259,11 @@ ListView {
                 //elide: Text.ElideRight
                 font.family: "Arial"
                 font.pixelSize: 13
-                color:  (confirmations < 10)? "#FF6C3C" : "#545454"
+                color:  (confirmations < confirmationsRequired)? "#FF6C3C" : "#545454"
                 text: {
                     if (!isPending)
-                        if(confirmations < 10)
-                            return blockHeight + " " + qsTr("(%1/10 confirmations)").arg(confirmations)
+                        if(confirmations < confirmationsRequired)
+                            return blockHeight + " " + qsTr("(%1/%2 confirmations)").arg(confirmations).arg(confirmationsRequired)
                         else
                             return blockHeight
                     if (!isOut)
-- 
cgit v1.2.3


From 8480c70571ed815bfbdf2c6120a9a6fe1e7e1149 Mon Sep 17 00:00:00 2001
From: Jaquee <jaquee.monero@gmail.com>
Date: Thu, 24 Aug 2017 11:27:00 +0200
Subject: add textBlock component

---
 components/TextBlock.qml | 7 +++++++
 qml.qrc                  | 1 +
 2 files changed, 8 insertions(+)
 create mode 100644 components/TextBlock.qml

(limited to 'components')

diff --git a/components/TextBlock.qml b/components/TextBlock.qml
new file mode 100644
index 00000000..7c36088a
--- /dev/null
+++ b/components/TextBlock.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.0
+
+TextEdit {
+    wrapMode: Text.Wrap
+    readOnly: true
+    selectByMouse: true
+}
diff --git a/qml.qrc b/qml.qrc
index 5c0bb707..6c511d34 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -140,5 +140,6 @@
         <file>components/QRCodeScanner.qml</file>
         <file>components/Notifier.qml</file>
         <file>components/MobileHeader.qml</file>
+        <file>components/TextBlock.qml</file>
     </qresource>
 </RCC>
-- 
cgit v1.2.3


From b8da85d0a4e6ec0f7b2f39ec869efbca9c701984 Mon Sep 17 00:00:00 2001
From: MaxXor <admin@maxxor.org>
Date: Thu, 31 Aug 2017 14:44:44 +0200
Subject: Fix IconButton

---
 components/IconButton.qml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'components')

diff --git a/components/IconButton.qml b/components/IconButton.qml
index eeb80267..042439f1 100644
--- a/components/IconButton.qml
+++ b/components/IconButton.qml
@@ -50,23 +50,23 @@ Item {
         z: 100
     }
 
-//    MouseArea {
-//        id: buttonArea
-//        anchors.fill: parent
+    MouseArea {
+        id: buttonArea
+        anchors.fill: parent
 
 
-//        onPressed: {
-//            buttonImage.x = buttonImage.x + 2
-//            buttonImage.y = buttonImage.y + 2
-//        }
-//        onReleased: {
-//            buttonImage.x = buttonImage.x - 2
-//            buttonImage.y = buttonImage.y - 2
-//        }
+        onPressed: {
+            buttonImage.x = buttonImage.x + 2
+            buttonImage.y = buttonImage.y + 2
+        }
+        onReleased: {
+            buttonImage.x = buttonImage.x - 2
+            buttonImage.y = buttonImage.y - 2
+        }
 
-//        onClicked: {
-//            parent.clicked(mouse)
-//        }
-//    }
+        onClicked: {
+            parent.clicked(mouse)
+        }
+    }
 
 }
-- 
cgit v1.2.3