From 47063790793874b63df51a7bcbc50bbb819fd80f Mon Sep 17 00:00:00 2001
From: Ilya Kitaev <mbg033@gmail.com>
Date: Thu, 1 Sep 2016 23:55:30 +0300
Subject: [PATCH] Processing splash bug fixed; Receive page: wrong reference to
 the wallet fixed;

---
 components/ProcessingSplash.qml | 2 +-
 main.qml                        | 2 +-
 pages/Receive.qml               | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/ProcessingSplash.qml b/components/ProcessingSplash.qml
index f98feb3b..70384f05 100644
--- a/components/ProcessingSplash.qml
+++ b/components/ProcessingSplash.qml
@@ -34,7 +34,7 @@ import QtQuick.Layouts 1.1
 Window {
     id: splash
     modality: Qt.ApplicationModal
-    flags: Qt.SplashScreen
+    flags: Qt.Window | Qt.FramelessWindowHint
     property alias message: message.text
     width: 200
     height: 100
diff --git a/main.qml b/main.qml
index 6d57b634..e03aec5c 100644
--- a/main.qml
+++ b/main.qml
@@ -324,7 +324,7 @@ ApplicationWindow {
 
     function hideProcessingSplash() {
         console.log("Hiding processing splash")
-        splash.hide()
+        splash.close()
     }
 
 
diff --git a/pages/Receive.qml b/pages/Receive.qml
index 1218ed7c..e2c1cb7f 100644
--- a/pages/Receive.qml
+++ b/pages/Receive.qml
@@ -46,11 +46,11 @@ Rectangle {
         if (payment_id.length === 0) {
             payment_id = appWindow.wallet.generatePaymentId()
             appWindow.persistentSettings.payment_id = payment_id
-            appWindow.wallet.payment_id = payment_id
+            appWindow.currentWallet.payment_id = payment_id
         }
         paymentIdLine.text = payment_id
-        addressLine.text = appWindow.wallet.address
-        integratedAddressLine.text = appWindow.wallet.integratedAddress(payment_id)
+        addressLine.text = appWindow.currentWallet.address
+        integratedAddressLine.text = appWindow.currentWallet.integratedAddress(payment_id)
     }
 
     Clipboard { id: clipboard }
@@ -168,7 +168,7 @@ Rectangle {
                 text: qsTr("Generate")
                 anchors.right: parent.right
                 onClicked: {
-                    appWindow.persistentSettings.payment_id = appWindow.wallet.generatePaymentId();
+                    appWindow.persistentSettings.payment_id = appWindow.currentWallet.generatePaymentId();
                     updatePaymentId()
                 }
             }