Merge pull request #302

0b7efa1 Wizard: Prevent user from getting trapped (Jaquee)
This commit is contained in:
Riccardo Spagni 2016-12-20 22:54:53 +02:00
commit def02f6332
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 5 additions and 7 deletions

View file

@ -92,8 +92,8 @@ Rectangle {
var nextButtonVisible = pages[currentPage] !== optionsPage;
nextButton.visible = nextButtonVisible;
if (next && typeof pages[currentPage].onPageOpened !== 'undefined') {
pages[currentPage].onPageOpened(settings)
if (typeof pages[currentPage].onPageOpened !== 'undefined') {
pages[currentPage].onPageOpened(settings,next)
}
@ -113,8 +113,6 @@ Rectangle {
createWalletPage.createWallet(settings)
wizard.nextButton.visible = true
createWalletPage.onPageOpened(settings);
}
function openRecoveryWalletPage() {

View file

@ -44,12 +44,12 @@ Item {
function onWizardRestarted() {
// reset account name field
uiItem.accountNameText = defaultAccountName
// Empty seedText
uiItem.wordsTextItem.memoText = "";
}
function onPageOpened(settingsObject) {
checkNextButton();
// Empty seedText when restoring multiple times in one session
uiItem.wordsTextItem.memoText = "";
checkNextButton();
}
function checkNextButton() {