diff --git a/ui/app/AppLayouts/Onboarding/OnboardingLayout.qml b/ui/app/AppLayouts/Onboarding/OnboardingLayout.qml index 6e0c6d926b..42cb30ae46 100644 --- a/ui/app/AppLayouts/Onboarding/OnboardingLayout.qml +++ b/ui/app/AppLayouts/Onboarding/OnboardingLayout.qml @@ -203,15 +203,18 @@ QtObject { id: keysMain KeysMainView { onButtonClicked: { + OnboardingStore.accountImported = false Global.applicationWindow.navigateTo("GenKey"); } onKeycardLinkClicked: { + OnboardingStore.accountImported = false Global.applicationWindow.navigateTo("KeycardFlowSelection"); } onSeedLinkClicked: { Global.applicationWindow.navigateTo("ExistingKey"); } onBackClicked: { + OnboardingStore.accountImported = false Global.applicationWindow.navigateTo("Welcome"); } } diff --git a/ui/app/AppLayouts/Onboarding/popups/MnemonicRecoverySuccessModal.qml b/ui/app/AppLayouts/Onboarding/popups/MnemonicRecoverySuccessModal.qml index 19b7bc55f6..3374220089 100644 --- a/ui/app/AppLayouts/Onboarding/popups/MnemonicRecoverySuccessModal.qml +++ b/ui/app/AppLayouts/Onboarding/popups/MnemonicRecoverySuccessModal.qml @@ -79,6 +79,7 @@ ModalPopup { text: qsTrId("re-encrypt-key") onClicked: { + OnboardingStore.accountImported = true popup.buttonClicked() } } diff --git a/ui/app/AppLayouts/Onboarding/stores/OnboardingStore.qml b/ui/app/AppLayouts/Onboarding/stores/OnboardingStore.qml index 75eb114d69..78858f3591 100644 --- a/ui/app/AppLayouts/Onboarding/stores/OnboardingStore.qml +++ b/ui/app/AppLayouts/Onboarding/stores/OnboardingStore.qml @@ -19,6 +19,7 @@ QtObject { property real profImgBX: 0.0 property real profImgBY: 0.0 property bool accountCreated: false + property bool accountImported: false property bool showBeforeGetStartedPopup: true @@ -31,6 +32,10 @@ QtObject { onboardingModuleInst.setSelectedAccountByIndex(selectedAccountIdx) } + function importAccountAndDisplayName(displayName) { + onboardingModuleInst.setDisplayName(displayName) + } + function updatedDisplayName(displayName) { if (displayName !== root.displayName) { print(displayName, root.displayName) diff --git a/ui/app/AppLayouts/Onboarding/views/ConfirmPasswordView.qml b/ui/app/AppLayouts/Onboarding/views/ConfirmPasswordView.qml index 45aedf6f75..b936b4bd4d 100644 --- a/ui/app/AppLayouts/Onboarding/views/ConfirmPasswordView.qml +++ b/ui/app/AppLayouts/Onboarding/views/ConfirmPasswordView.qml @@ -115,7 +115,6 @@ OnboardingBasePage { } onClicked: { - //confPswInput.text = "" if (OnboardingStore.accountCreated) { if (root.password !== root.tmpPass) { OnboardingStore.changePassword(root.tmpPass, root.password); @@ -127,7 +126,12 @@ OnboardingBasePage { } else { root.tmpPass = root.password; submitBtn.loading = true - OnboardingStore.setCurrentAccountAndDisplayName(0, root.displayName); + if (OnboardingStore.accountImported) { + OnboardingStore.importAccountAndDisplayName(root.displayName); + } else { + OnboardingStore.setCurrentAccountAndDisplayName(0, root.displayName); + } + pause.start(); } } diff --git a/ui/app/AppLayouts/Onboarding/views/InsertDetailsView.qml b/ui/app/AppLayouts/Onboarding/views/InsertDetailsView.qml index 501eb188e0..5a6d66812f 100644 --- a/ui/app/AppLayouts/Onboarding/views/InsertDetailsView.qml +++ b/ui/app/AppLayouts/Onboarding/views/InsertDetailsView.qml @@ -22,13 +22,25 @@ Item { state: "username" - ListView { - id: accountsList - model: OnboardingStore.onboardingModuleInst.accountsModel - delegate: Item { - Component.onCompleted: { - root.pubKey = model.pubKey; - root.address = model.address; + Component.onCompleted: { + if (OnboardingStore.accountImported) { + root.pubKey = OnboardingStore.onboardingModuleInst.importedAccountPubKey; + root.address = OnboardingStore.onboardingModuleInst.importedAccountAddress; + } + } + + Loader { + active: !OnboardingStore.accountImported + sourceComponent: ListView { + id: accountsList + model: OnboardingStore.onboardingModuleInst.accountsModel + delegate: Item { + Component.onCompleted: { + if (index === 0) { + root.pubKey = model.pubKey; + root.address = model.address; + } + } } } } diff --git a/ui/app/AppLayouts/Onboarding/views/KeysMainView.qml b/ui/app/AppLayouts/Onboarding/views/KeysMainView.qml index a540df50d9..5ebd0f51d1 100644 --- a/ui/app/AppLayouts/Onboarding/views/KeysMainView.qml +++ b/ui/app/AppLayouts/Onboarding/views/KeysMainView.qml @@ -180,7 +180,7 @@ OnboardingBasePage { } PropertyChanges { target: seedLink - text: qsTr("lmport a seed phrase") + text: qsTr("Import a seed phrase") } }, @@ -188,7 +188,7 @@ OnboardingBasePage { name: "importseed" PropertyChanges { target: txtTitle - text: qsTr("lmport a seed phrase") + text: qsTr("Import a seed phrase") } PropertyChanges { @@ -199,12 +199,12 @@ Only use this option if you already have a seed phrase.") } PropertyChanges { target: button - text: qsTr("lmport a seed phrase") + text: qsTr("Import a seed phrase") } PropertyChanges { target: keycardLink - text: qsTr("lmport a seed phrase into a new Keycard") + text: qsTr("Import a seed phrase into a new Keycard") } PropertyChanges { diff --git a/ui/app/AppLayouts/Onboarding/views/LoginView.qml b/ui/app/AppLayouts/Onboarding/views/LoginView.qml index 6c25a2da84..20f1f0e630 100644 --- a/ui/app/AppLayouts/Onboarding/views/LoginView.qml +++ b/ui/app/AppLayouts/Onboarding/views/LoginView.qml @@ -248,6 +248,7 @@ Item { anchors.topMargin: 16 anchors.horizontalCenter: parent.horizontalCenter onClicked: { + OnboardingStore.accountImported = false onGenKeyClicked() } }