Merge pull request #2097

ed603f3 device: fix hardware wallet creation / restore height (xiphon)

main.qml

@@ -602,6 +602,9 @@ ApplicationWindow {
             if(persistentSettings.is_recovering) {
                 persistentSettings.is_recovering = false
             }
+            if (persistentSettings.is_recovering_from_device) {
+                persistentSettings.is_recovering_from_device = false;
+            }
         }
 
         // Update history on every refresh if it's empty

wizard/WizardController.qml

@@ -507,6 +507,7 @@ Rectangle {
     function openWalletFile(fn) {
         persistentSettings.restore_height = 0;
         persistentSettings.is_recovering = false;
+        persistentSettings.is_recovering_from_device = false;
 
         appWindow.restoreHeight = 0;
         appWindow.walletPassword = "";