From 03e87a4bdd52e2d2a8750af23908deeb042da8a6 Mon Sep 17 00:00:00 2001 From: rating89us <45968869+rating89us@users.noreply.github.com> Date: Mon, 17 Jan 2022 22:08:57 +0100 Subject: [PATCH] WizardRestoreWallet4, WizardCreateWallet4: reword header subtitle; rename "Create wallet" button to "Restore wallet" --- wizard/WizardCreateDevice1.qml | 3 +++ wizard/WizardCreateWallet4.qml | 5 +++-- wizard/WizardRestoreWallet4.qml | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/wizard/WizardCreateDevice1.qml b/wizard/WizardCreateDevice1.qml index 0bdc03edf7..fb6076f920 100644 --- a/wizard/WizardCreateDevice1.qml +++ b/wizard/WizardCreateDevice1.qml @@ -43,6 +43,7 @@ Rectangle { color: "transparent" property alias pageHeight: pageRoot.height property string viewName: "wizardCreateDevice1" + property alias restoreDeviceWallet: restoreDeviceWallet property var deviceName: deviceNameModel.get(deviceNameDropdown.currentIndex).column2 property var ledgerType: deviceName == "Ledger" ? deviceNameModel.get(deviceNameDropdown.currentIndex).column1 : null @@ -225,6 +226,8 @@ Rectangle { btnNext.text: newDeviceWallet.checked ? qsTr("Create wallet") : qsTr("Restore wallet") + translationManager.emptyString onPrevClicked: { wizardStateView.state = "wizardHome"; + //reset restoreDeviceWallet.checked, since wizardCreateWallet4 reads it + restoreDeviceWallet.checked = false; } onNextClicked: { wizardController.walletOptionsName = walletInput.walletName.text; diff --git a/wizard/WizardCreateWallet4.qml b/wizard/WizardCreateWallet4.qml index 33c1e92693..b5faa8bf4a 100644 --- a/wizard/WizardCreateWallet4.qml +++ b/wizard/WizardCreateWallet4.qml @@ -58,14 +58,14 @@ Rectangle { WizardHeader { title: qsTr("You're all set up!") + translationManager.emptyString - subtitle: qsTr("New wallet details:") + translationManager.emptyString + subtitle: wizardStateView.wizardCreateDevice1View.restoreDeviceWallet.checked ? qsTr("Details of the wallet to be restored:") : qsTr("New wallet details:") + translationManager.emptyString } WizardSummary {} WizardNav { Layout.topMargin: 24 - btnNextText: qsTr("Create wallet") + translationManager.emptyString + btnNextText: wizardStateView.wizardCreateDevice1View.restoreDeviceWallet.checked ? qsTr("Restore wallet") : qsTr("Create wallet") + translationManager.emptyString progressSteps: appWindow.walletMode <= 1 ? 3 : 4 progress: appWindow.walletMode <= 1 ? 2 : 3 @@ -82,6 +82,7 @@ Rectangle { wizardController.writeWallet(function() { wizardController.useMoneroClicked(); wizardController.walletOptionsIsRecoveringFromDevice = false; + wizardStateView.wizardCreateDevice1View.restoreDeviceWallet.checked = false; }); } } diff --git a/wizard/WizardRestoreWallet4.qml b/wizard/WizardRestoreWallet4.qml index 091c143f8b..4e00ac3b1b 100644 --- a/wizard/WizardRestoreWallet4.qml +++ b/wizard/WizardRestoreWallet4.qml @@ -58,14 +58,14 @@ Rectangle { WizardHeader { title: qsTr("You're all set up!") + translationManager.emptyString - subtitle: qsTr("New wallet details:") + translationManager.emptyString + subtitle: qsTr("Details of the wallet to be restored:") + translationManager.emptyString } WizardSummary {} WizardNav { Layout.topMargin: 24 - btnNextText: qsTr("Create wallet") + translationManager.emptyString + btnNextText: qsTr("Restore wallet") + translationManager.emptyString progressSteps: appWindow.walletMode <= 1 ? 3 : 4 progress: appWindow.walletMode <= 1 ? 2 : 3