From 7611e826aa2be305e2bfcc22361deb4d03d76c8d Mon Sep 17 00:00:00 2001
From: dsc <xmrdsc@protonmail.com>
Date: Mon, 18 Mar 2019 00:12:51 +0100
Subject: History redesign

---
 MiddlePanel.qml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'MiddlePanel.qml')

diff --git a/MiddlePanel.qml b/MiddlePanel.qml
index df0aa1b3..3643740b 100644
--- a/MiddlePanel.qml
+++ b/MiddlePanel.qml
@@ -118,8 +118,7 @@ Rectangle {
             State {
                 name: "History"
                 PropertyChanges { target: root; currentView: historyView }
-                PropertyChanges { target: historyView; model: appWindow.currentWallet ? appWindow.currentWallet.historyModel : null }
-                PropertyChanges { target: mainFlickable; contentHeight: historyView.tableHeight + 220 * scaleRatio }
+                PropertyChanges { target: mainFlickable; contentHeight: historyView.contentHeight + 100 * scaleRatio}
             }, State {
                 name: "Transfer"
                 PropertyChanges { target: root; currentView: transferView }
@@ -186,7 +185,13 @@ Rectangle {
 
     ColumnLayout {
         anchors.fill: parent
-        anchors.margins: currentView !== merchantView ? 20 * scaleRatio : 0
+        anchors.margins: {
+            if(currentView === merchantView || currentView === historyView)
+                return 0;
+
+            return 20 * scaleRatio;
+        }
+
         anchors.topMargin: appWindow.persistentSettings.customDecorations ? 50 * scaleRatio : 0
         spacing: 0
 
-- 
cgit v1.2.3