Merge branch 'master' into patch-1

1 files changed, 6 insertions, 2 deletions

diff --git a/main.qml b/main.qml
index 6432803f..267461d1 100644
--- a/main.qml
+++ b/main.qml
@@ -286,6 +286,9 @@ ApplicationWindow {
         leftPanel.networkStatus.connected = status
         leftPanel.progressBar.visible = (status === Wallet.ConnectionStatus_Connected) && !daemonSynced
 
+        // Update fee multiplier dropdown on transfer page
+        middlePanel.transferView.updatePriorityDropdown();
+
         // If wallet isnt connected and no daemon is running - Ask
         if(!walletInitialized && status === Wallet.ConnectionStatus_Disconnected && !daemonManager.running(persistentSettings.testnet)){
             daemonManagerDialog.open();
@@ -537,6 +540,7 @@ ApplicationWindow {
             console.log("integer amount: ", amountxmr);
             console.log("integer unlocked",currentWallet.unlockedBalance)
             if (amountxmr <= 0) {
+                hideProcessingSplash()
                 informationPopup.title = qsTr("Error") + translationManager.emptyString;
                 informationPopup.text  = qsTr("Amount is wrong: expected number from %1 to %2")
                         .arg(walletManager.displayAmount(0))
@@ -548,8 +552,9 @@ ApplicationWindow {
                 informationPopup.open()
                 return;
             } else if (amountxmr > currentWallet.unlockedBalance) {
+                hideProcessingSplash()
                 informationPopup.title = qsTr("Error") + translationManager.emptyString;
-                informationPopup.text  = qsTr("insufficient funds. Unlocked balance: %1")
+                informationPopup.text  = qsTr("Insufficient funds. Unlocked balance: %1")
                         .arg(walletManager.displayAmount(currentWallet.unlockedBalance))
                         + translationManager.emptyString
 
@@ -1253,7 +1258,6 @@ ApplicationWindow {
                 lineHeight: 0.7
                 font.family: "Arial"
                 font.pixelSize: 12
-                font.letterSpacing: -1
                 color: "#FFFFFF"
             }
         }