aboutsummaryrefslogtreecommitdiff
path: root/wizard
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2018-03-06 12:33:01 -0500
committerluigi1111 <luigi1111w@gmail.com>2018-03-06 12:33:01 -0500
commit7c9ba196c9aace3671d8a76e267d58008a98cc2e (patch)
tree4821ba4177a58b51fefa7ec58d2cf675d4c58829 /wizard
parentbe986cf599b754261641e24ecd1ec69760a7f7eb (diff)
parent70d42ee328624a182f5d8d36cbd697bdca5aee6e (diff)
downloadmonzero-gui-7c9ba196c9aace3671d8a76e267d58008a98cc2e.tar.gz
monzero-gui-7c9ba196c9aace3671d8a76e267d58008a98cc2e.tar.xz
monzero-gui-7c9ba196c9aace3671d8a76e267d58008a98cc2e.zip
Merge pull request #1140
70d42ee Wizard: allow seed without checksum
Diffstat (limited to 'wizard')
-rw-r--r--wizard/WizardManageWalletUI.qml2
-rw-r--r--wizard/WizardMemoTextInput.qml2
2 files changed, 2 insertions, 2 deletions
diff --git a/wizard/WizardManageWalletUI.qml b/wizard/WizardManageWalletUI.qml
index 7c9fa536..7d2c789b 100644
--- a/wizard/WizardManageWalletUI.qml
+++ b/wizard/WizardManageWalletUI.qml
@@ -83,7 +83,7 @@ ColumnLayout {
function checkSeed() {
console.log("Checking seed")
var wordsArray = Utils.lineBreaksToSpaces(uiItem.wordsTextItem.memoText).split(" ");
- return wordsArray.length === 25
+ return wordsArray.length === 25 || wordsArray.length === 24
}
function updateFromQrCode(address, payment_id, amount, tx_description, recipient_name, extra_parameters) {
diff --git a/wizard/WizardMemoTextInput.qml b/wizard/WizardMemoTextInput.qml
index d278508e..9611977d 100644
--- a/wizard/WizardMemoTextInput.qml
+++ b/wizard/WizardMemoTextInput.qml
@@ -41,7 +41,7 @@ Column {
font.pixelSize: 16 * scaleRatio
anchors.margins: 8 * scaleRatio
font.bold:true
- text: qsTr("Enter your 25 word mnemonic seed") + translationManager.emptyString
+ text: qsTr("Enter your 25 (or 24) word mnemonic seed") + translationManager.emptyString
color: "#BABABA"
visible: !memoTextInput.text/* && !parent.focus*/
}