Merge pull request #1878

77cd521 Wizard/Device: set estimated restore height if none is provided (selsta)
pull/2/head
luigi1111 5 years ago
commit 90b0f4fa55
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

@ -233,9 +233,6 @@ ApplicationWindow {
if (typeof wizard.m_wallet !== 'undefined') {
console.log("using wizard wallet")
//Set restoreHeight
if (persistentSettings.restore_height == 0 && persistentSettings.is_recovering_from_device && walletManager.localDaemonSynced()) {
persistentSettings.restore_height = walletManager.blockchainHeight() - 1;
}
if(persistentSettings.restore_height > 0){
// We store restore height in own variable for performance reasons.
restoreHeight = persistentSettings.restore_height

@ -96,6 +96,7 @@ ColumnLayout {
var success = wallet.status === Wallet.Status_Ok;
if (success) {
m_wallet = wallet;
settingsObject['restore_height'] = m_wallet.walletCreationHeight;
settingsObject['is_recovering_from_device'] = true;
settingsObject['tmp_wallet_filename'] = tmp_wallet_filename
} else {