diff --git a/locale/de/app.ledger.json b/locale/de/app.ledger.json index e156dfcc32..299dd1e8bc 100644 --- a/locale/de/app.ledger.json +++ b/locale/de/app.ledger.json @@ -11,6 +11,10 @@ "avatarUnique": "Dieser Avatar ist einzigartig, Sie können ihn später nicht ändern.", "back": "Zurück", "choose": "Wählen sie ihren Account", + "help": { + "id": "{div}[Set an ID manually or select an account from the list.]\n{div}[Please save the ID, it would be needed for importing.]" + }, + "id": "Account ID", "importAccount": "Importieren sie einen Account von ihrem Nano Ledger S", "ImportOrSignIn": "Account importieren oder", "login": "Fortsetzen", diff --git a/locale/de/app.restore.json b/locale/de/app.restore.json index 09d0971086..4e5f412827 100644 --- a/locale/de/app.restore.json +++ b/locale/de/app.restore.json @@ -1,4 +1,8 @@ { + "encodedSeedForm": { + "placeholder": "Enter your encoded seed" + }, + "encodedSeedTab": "Encoded seed", "keyForm": { "placeholder": "Enter your private key here" }, @@ -51,6 +55,7 @@ }, "seedOrKeyForm": { "description": "Enter your Seed phrase or private key to access your wallet", + "encodedSeed": "Encoded seed", "keyTitle": "Private key", "seedTitle": "Seed phrase", "title": "Import from seed or key" diff --git a/locale/en/app.ledger.json b/locale/en/app.ledger.json index 2d8a2ff24b..a6249d0822 100644 --- a/locale/en/app.ledger.json +++ b/locale/en/app.ledger.json @@ -11,6 +11,10 @@ "avatarUnique": "This avatar is unique, you can’t change it later.", "back": "Go back", "choose": "Choose your account", + "help": { + "id": "{div}[Set an ID manually or select an account from the list.]\n{div}[Please save the ID, it would be needed for importing.]" + }, + "id": "Account ID", "importAccount": "Import a Ledger account", "ImportOrSignIn": "Import account or", "login": "Continue", diff --git a/locale/en/app.restore.json b/locale/en/app.restore.json index 79580ecc40..270a60bbb1 100644 --- a/locale/en/app.restore.json +++ b/locale/en/app.restore.json @@ -1,4 +1,8 @@ { + "encodedSeedForm": { + "placeholder": "Enter your encoded seed" + }, + "encodedSeedTab": "Encoded seed", "keyForm": { "placeholder": "Enter your private key here" }, @@ -51,6 +55,7 @@ }, "seedOrKeyForm": { "description": "Enter your Seed phrase or private key to access your wallet", + "encodedSeed": "Encoded seed", "keyTitle": "Private key", "seedTitle": "Seed phrase", "title": "Import from seed or key" diff --git a/locale/es/app.ledger.json b/locale/es/app.ledger.json index 469910f0d4..793c0cac14 100644 --- a/locale/es/app.ledger.json +++ b/locale/es/app.ledger.json @@ -11,6 +11,10 @@ "avatarUnique": "Este avatar es único, no puedes cambiarlo después.", "back": "Ir para atrás", "choose": "Elige tu cuenta", + "help": { + "id": "{div}[Set an ID manually or select an account from the list.]\n{div}[Please save the ID, it would be needed for importing.]" + }, + "id": "Account ID", "importAccount": "Importar una cuenta Ledger(Libro de Contabilidad)", "ImportOrSignIn": "Importar cuenta o", "login": "Continuar", diff --git a/locale/es/app.restore.json b/locale/es/app.restore.json index c508ba8427..eec06fed50 100644 --- a/locale/es/app.restore.json +++ b/locale/es/app.restore.json @@ -1,4 +1,8 @@ { + "encodedSeedForm": { + "placeholder": "Enter your encoded seed" + }, + "encodedSeedTab": "Encoded seed", "keyForm": { "placeholder": "Ingrese su clave privada aquí" }, @@ -51,6 +55,7 @@ }, "seedOrKeyForm": { "description": "Ingrese su frase de semilla o clave privada para acceder a su billetera", + "encodedSeed": "Encoded seed", "keyTitle": "Llave privada", "seedTitle": "Frase semilla", "title": "Importar desde semilla o clave" diff --git a/locale/et_EE/app.ledger.json b/locale/et_EE/app.ledger.json index c9247e9c5d..a38b62583f 100644 --- a/locale/et_EE/app.ledger.json +++ b/locale/et_EE/app.ledger.json @@ -11,6 +11,10 @@ "avatarUnique": "See turvapilt on ainulaadne, te ei saa seda hiljem muuta.", "back": "Mine tagasi", "choose": "Valige oma konto", + "help": { + "id": "{div}[Set an ID manually or select an account from the list.]\n{div}[Please save the ID, it would be needed for importing.]" + }, + "id": "Account ID", "importAccount": "Importige Leder'i konto", "ImportOrSignIn": "Importige konto või", "login": "Jätka", diff --git a/locale/et_EE/app.restore.json b/locale/et_EE/app.restore.json index fd537b6bbf..d48a656944 100644 --- a/locale/et_EE/app.restore.json +++ b/locale/et_EE/app.restore.json @@ -1,4 +1,8 @@ { + "encodedSeedForm": { + "placeholder": "Enter your encoded seed" + }, + "encodedSeedTab": "Encoded seed", "keyForm": { "placeholder": "Enter your private key here" }, @@ -51,6 +55,7 @@ }, "seedOrKeyForm": { "description": "Enter your Seed phrase or private key to access your wallet", + "encodedSeed": "Encoded seed", "keyTitle": "Private key", "seedTitle": "Seed phrase", "title": "Import from seed or key" diff --git a/locale/fr/app.ledger.json b/locale/fr/app.ledger.json index 6e4961bab2..378e31b9aa 100644 --- a/locale/fr/app.ledger.json +++ b/locale/fr/app.ledger.json @@ -11,6 +11,10 @@ "avatarUnique": "Cet avatar est unique, vous ne pourrez pas le modifier plus tard.", "back": "Retour", "choose": "Choisissez votre compte", + "help": { + "id": "{div}[Set an ID manually or select an account from the list.]\n{div}[Please save the ID, it would be needed for importing.]" + }, + "id": "Account ID", "importAccount": "Importer un compte Ledger", "ImportOrSignIn": "Importer un compte ou", "login": "Continuer", diff --git a/locale/fr/app.restore.json b/locale/fr/app.restore.json index 8c2a340631..6976e49f81 100644 --- a/locale/fr/app.restore.json +++ b/locale/fr/app.restore.json @@ -1,4 +1,8 @@ { + "encodedSeedForm": { + "placeholder": "Enter your encoded seed" + }, + "encodedSeedTab": "Encoded seed", "keyForm": { "placeholder": "Entrez votre clé privée ici" }, @@ -51,6 +55,7 @@ }, "seedOrKeyForm": { "description": "Entrez votre phrase de sauvegarde (SEED) ou votre clé privée pour accéder à votre portefeuille.", + "encodedSeed": "Encoded seed", "keyTitle": "Clé privée", "seedTitle": "Phrase de sauvegarde (SEED)", "title": "Importer depuis une phrase de sauvegarde (SEED) ou une clé privée" diff --git a/locale/hi_IN/app.ledger.json b/locale/hi_IN/app.ledger.json index afb39dbe83..63ecde1cf4 100644 --- a/locale/hi_IN/app.ledger.json +++ b/locale/hi_IN/app.ledger.json @@ -11,6 +11,10 @@ "avatarUnique": "यह अवतार अनोखा है, आप इसे बाद में नहीं बदल सकते।", "back": "वापस जाओ", "choose": "अपना खाता चुनें", + "help": { + "id": "{div}[Set an ID manually or select an account from the list.]\n{div}[Please save the ID, it would be needed for importing.]" + }, + "id": "Account ID", "importAccount": "एक लेडजर खाता आयात करें", "ImportOrSignIn": "इम्पोर्ट खाता या", "login": "जारी रहना", diff --git a/locale/hi_IN/app.restore.json b/locale/hi_IN/app.restore.json index a7a7e1dcb5..4f0fb56d03 100644 --- a/locale/hi_IN/app.restore.json +++ b/locale/hi_IN/app.restore.json @@ -1,4 +1,8 @@ { + "encodedSeedForm": { + "placeholder": "Enter your encoded seed" + }, + "encodedSeedTab": "Encoded seed", "keyForm": { "placeholder": "Enter your private key here" }, @@ -51,6 +55,7 @@ }, "seedOrKeyForm": { "description": "Enter your Seed phrase or private key to access your wallet", + "encodedSeed": "Encoded seed", "keyTitle": "Private key", "seedTitle": "Seed phrase", "title": "Import from seed or key" diff --git a/locale/id/app.ledger.json b/locale/id/app.ledger.json index 2f3102385a..aec0a2720a 100644 --- a/locale/id/app.ledger.json +++ b/locale/id/app.ledger.json @@ -11,6 +11,10 @@ "avatarUnique": "Avatar ini unik, Anda tidak dapat mengubahnya nanti.", "back": "Kembali", "choose": "Pilih akun Anda", + "help": { + "id": "{div}[Set an ID manually or select an account from the list.]\n{div}[Please save the ID, it would be needed for importing.]" + }, + "id": "Account ID", "importAccount": "Impor akun Ledger", "ImportOrSignIn": "Impor akun atau", "login": "Lanjutkan", diff --git a/locale/id/app.restore.json b/locale/id/app.restore.json index 64a4056660..e6bbda7228 100644 --- a/locale/id/app.restore.json +++ b/locale/id/app.restore.json @@ -1,4 +1,8 @@ { + "encodedSeedForm": { + "placeholder": "Enter your encoded seed" + }, + "encodedSeedTab": "Encoded seed", "keyForm": { "placeholder": "Masukkan kunci pribadimu di sini" }, @@ -51,6 +55,7 @@ }, "seedOrKeyForm": { "description": "Masukkan frase Seed atau kunci pribadi Anda untuk mengakses dompet Anda", + "encodedSeed": "Encoded seed", "keyTitle": "Kunci pribadi", "seedTitle": "Frasa SEED", "title": "Impor dari seed atau kunci" diff --git a/locale/it/app.ledger.json b/locale/it/app.ledger.json index d0c8ef920e..cc51a81379 100644 --- a/locale/it/app.ledger.json +++ b/locale/it/app.ledger.json @@ -11,6 +11,10 @@ "avatarUnique": "Questo avatar è immodificabile, non potrà essere cambiato successivamente.", "back": "Torna indietro", "choose": "Seleziona il tuo account", + "help": { + "id": "{div}[Set an ID manually or select an account from the list.]\n{div}[Please save the ID, it would be needed for importing.]" + }, + "id": "Account ID", "importAccount": "Importa un account Ledger", "ImportOrSignIn": "Importa account oppure", "login": "Continua", diff --git a/locale/it/app.restore.json b/locale/it/app.restore.json index 364e3ce8f1..021419140e 100644 --- a/locale/it/app.restore.json +++ b/locale/it/app.restore.json @@ -1,4 +1,8 @@ { + "encodedSeedForm": { + "placeholder": "Enter your encoded seed" + }, + "encodedSeedTab": "Encoded seed", "keyForm": { "placeholder": "Inserisci qui la tua chiave privata" }, @@ -51,6 +55,7 @@ }, "seedOrKeyForm": { "description": "Inserisci la tua frase Seed o la chiave privata per accedere al tuo wallet", + "encodedSeed": "Encoded seed", "keyTitle": "Chiave Privata", "seedTitle": "La tua frase Seed", "title": "Importa dal Seed o da una chiave" diff --git a/locale/ja/app.ledger.json b/locale/ja/app.ledger.json index 91b27f77f4..9d6f0bbf59 100644 --- a/locale/ja/app.ledger.json +++ b/locale/ja/app.ledger.json @@ -11,6 +11,10 @@ "avatarUnique": "このアバターはユニークです。あとで変更することはできません。", "back": "戻る", "choose": "アカウントを選択", + "help": { + "id": "{div}[Set an ID manually or select an account from the list.]\n{div}[Please save the ID, it would be needed for importing.]" + }, + "id": "Account ID", "importAccount": "Ledgerアカウントをインポート", "ImportOrSignIn": "アカウントをインポート。または、", "login": "次へ", diff --git a/locale/ja/app.restore.json b/locale/ja/app.restore.json index 5862dc48f3..d20bca6774 100644 --- a/locale/ja/app.restore.json +++ b/locale/ja/app.restore.json @@ -1,4 +1,8 @@ { + "encodedSeedForm": { + "placeholder": "Enter your encoded seed" + }, + "encodedSeedTab": "Encoded seed", "keyForm": { "placeholder": "秘密鍵をこちらに入力してください" }, @@ -51,6 +55,7 @@ }, "seedOrKeyForm": { "description": "シードフレーズまたは秘密鍵を入力してウォレットにアクセス", + "encodedSeed": "Encoded seed", "keyTitle": "秘密鍵", "seedTitle": "シードフレーズ", "title": "シードかキーからインポート" diff --git a/locale/ko/app.ledger.json b/locale/ko/app.ledger.json index 2866fcf313..d83d1207ef 100644 --- a/locale/ko/app.ledger.json +++ b/locale/ko/app.ledger.json @@ -11,6 +11,10 @@ "avatarUnique": "본 아바타는 고유하며 추후 변경이 불가합니다.", "back": "뒤로가기", "choose": "귀하의 계정을 선택하세요", + "help": { + "id": "{div}[Set an ID manually or select an account from the list.]\n{div}[Please save the ID, it would be needed for importing.]" + }, + "id": "Account ID", "importAccount": "Ledger 계정 불러오기", "ImportOrSignIn": "계정을 불러오거나", "login": "계속하기", diff --git a/locale/ko/app.restore.json b/locale/ko/app.restore.json index 24f03218b1..e04bc6dd59 100644 --- a/locale/ko/app.restore.json +++ b/locale/ko/app.restore.json @@ -1,4 +1,8 @@ { + "encodedSeedForm": { + "placeholder": "Enter your encoded seed" + }, + "encodedSeedTab": "Encoded seed", "keyForm": { "placeholder": "Enter your private key here" }, @@ -51,6 +55,7 @@ }, "seedOrKeyForm": { "description": "Enter your Seed phrase or private key to access your wallet", + "encodedSeed": "Encoded seed", "keyTitle": "Private key", "seedTitle": "Seed phrase", "title": "Import from seed or key" diff --git a/locale/nl_NL/app.ledger.json b/locale/nl_NL/app.ledger.json index d1908acb6b..282550f848 100644 --- a/locale/nl_NL/app.ledger.json +++ b/locale/nl_NL/app.ledger.json @@ -11,6 +11,10 @@ "avatarUnique": "Deze avatar is uniek, u kunt deze later niet wijzigen.", "back": "Ga terug", "choose": "Kies uw account", + "help": { + "id": "{div}[Set an ID manually or select an account from the list.]\n{div}[Please save the ID, it would be needed for importing.]" + }, + "id": "Account ID", "importAccount": "Importeer een Ledger account", "ImportOrSignIn": "Account importeren of", "login": "Doorgaan", diff --git a/locale/nl_NL/app.restore.json b/locale/nl_NL/app.restore.json index e12d9c68f2..15e27994c0 100644 --- a/locale/nl_NL/app.restore.json +++ b/locale/nl_NL/app.restore.json @@ -1,4 +1,8 @@ { + "encodedSeedForm": { + "placeholder": "Enter your encoded seed" + }, + "encodedSeedTab": "Encoded seed", "keyForm": { "placeholder": "Voer hier uw privésleutel in" }, @@ -51,6 +55,7 @@ }, "seedOrKeyForm": { "description": "Voer uw seed-regel of privésleutel in om toegang te krijgen tot uw portemonnee", + "encodedSeed": "Encoded seed", "keyTitle": "Privésleutel", "seedTitle": "SEED regel", "title": "Importeren vanuit SEED of sleutel" diff --git a/locale/pl/app.ledger.json b/locale/pl/app.ledger.json index 0dff87c916..f92db46fc0 100644 --- a/locale/pl/app.ledger.json +++ b/locale/pl/app.ledger.json @@ -11,6 +11,10 @@ "avatarUnique": "Wybór avataru nie podlega późniejszym zmianom", "back": "Wróć", "choose": "Wybierz swoje konto", + "help": { + "id": "{div}[Set an ID manually or select an account from the list.]\n{div}[Please save the ID, it would be needed for importing.]" + }, + "id": "Account ID", "importAccount": "Importuj konto Ledger", "ImportOrSignIn": "Importuj konto albo", "login": "Kontynuuj", diff --git a/locale/pl/app.restore.json b/locale/pl/app.restore.json index 163c523e88..09065865aa 100644 --- a/locale/pl/app.restore.json +++ b/locale/pl/app.restore.json @@ -1,4 +1,8 @@ { + "encodedSeedForm": { + "placeholder": "Enter your encoded seed" + }, + "encodedSeedTab": "Encoded seed", "keyForm": { "placeholder": "Wprowadź tutaj swój klucz prywatny." }, @@ -51,6 +55,7 @@ }, "seedOrKeyForm": { "description": "Wpisz swoją frazę Seed lub klucz prywatny, aby uzyskać dostęp do portfela", + "encodedSeed": "Encoded seed", "keyTitle": "Klucz prywatny", "seedTitle": "Fraza Seed", "title": "Importuj z Seed lub klucza" diff --git a/locale/pt_BR/app.ledger.json b/locale/pt_BR/app.ledger.json index 023bee2521..5ca862abf4 100644 --- a/locale/pt_BR/app.ledger.json +++ b/locale/pt_BR/app.ledger.json @@ -11,6 +11,10 @@ "avatarUnique": "Este avatar é único, você não pode mudá-lo depois.", "back": "Voltar", "choose": "Escolha sua conta", + "help": { + "id": "{div}[Set an ID manually or select an account from the list.]\n{div}[Please save the ID, it would be needed for importing.]" + }, + "id": "Account ID", "importAccount": "Importar uma conta da Ledger", "ImportOrSignIn": "Importar conta ou", "login": "Continuar", diff --git a/locale/pt_BR/app.restore.json b/locale/pt_BR/app.restore.json index 4058a76127..9a17209bce 100644 --- a/locale/pt_BR/app.restore.json +++ b/locale/pt_BR/app.restore.json @@ -1,4 +1,8 @@ { + "encodedSeedForm": { + "placeholder": "Enter your encoded seed" + }, + "encodedSeedTab": "Encoded seed", "keyForm": { "placeholder": "Enter your private key here" }, @@ -51,6 +55,7 @@ }, "seedOrKeyForm": { "description": "Enter your Seed phrase or private key to access your wallet", + "encodedSeed": "Encoded seed", "keyTitle": "Private key", "seedTitle": "Seed phrase", "title": "Import from seed or key" diff --git a/locale/pt_PT/app.ledger.json b/locale/pt_PT/app.ledger.json index 2d8a2ff24b..a6249d0822 100644 --- a/locale/pt_PT/app.ledger.json +++ b/locale/pt_PT/app.ledger.json @@ -11,6 +11,10 @@ "avatarUnique": "This avatar is unique, you can’t change it later.", "back": "Go back", "choose": "Choose your account", + "help": { + "id": "{div}[Set an ID manually or select an account from the list.]\n{div}[Please save the ID, it would be needed for importing.]" + }, + "id": "Account ID", "importAccount": "Import a Ledger account", "ImportOrSignIn": "Import account or", "login": "Continue", diff --git a/locale/pt_PT/app.restore.json b/locale/pt_PT/app.restore.json index 79580ecc40..270a60bbb1 100644 --- a/locale/pt_PT/app.restore.json +++ b/locale/pt_PT/app.restore.json @@ -1,4 +1,8 @@ { + "encodedSeedForm": { + "placeholder": "Enter your encoded seed" + }, + "encodedSeedTab": "Encoded seed", "keyForm": { "placeholder": "Enter your private key here" }, @@ -51,6 +55,7 @@ }, "seedOrKeyForm": { "description": "Enter your Seed phrase or private key to access your wallet", + "encodedSeed": "Encoded seed", "keyTitle": "Private key", "seedTitle": "Seed phrase", "title": "Import from seed or key" diff --git a/locale/ru/app.ledger.json b/locale/ru/app.ledger.json index 99e9be8068..f013ecaace 100644 --- a/locale/ru/app.ledger.json +++ b/locale/ru/app.ledger.json @@ -11,6 +11,10 @@ "avatarUnique": "Этот аватар уникален. Вы не сможете изменить его потом.", "back": "Вернуться назад", "choose": "Выберите аккаунт", + "help": { + "id": "{div}[Задайте ID вручную или выберите аккаунт из списка.]\n{div}[Пожалуйста, сохраните ID, он понадобится при импорте.]" + }, + "id": "ID аккаунта", "importAccount": "Импортировать Ledger аккаунт", "ImportOrSignIn": "Импортируйте аккаунт или", "login": "Продолжить", diff --git a/locale/ru/app.restore.json b/locale/ru/app.restore.json index 887c477276..ff91607330 100644 --- a/locale/ru/app.restore.json +++ b/locale/ru/app.restore.json @@ -1,4 +1,8 @@ { + "encodedSeedForm": { + "placeholder": "Enter your encoded seed" + }, + "encodedSeedTab": "Закодированная фраза", "keyForm": { "placeholder": "Введите ваш приватный ключ" }, @@ -51,6 +55,7 @@ }, "seedOrKeyForm": { "description": "Введите вашу секретную фразу или приватный ключ, чтобы войти в аккаунт", + "encodedSeed": "Encoded seed", "keyTitle": "Приватный ключ", "seedTitle": "Секретная фраза", "title": "Импорт из сохраненной фразы или по ключу" diff --git a/locale/ru/app.utils.json b/locale/ru/app.utils.json index bdc186af42..281c1fc2ed 100644 --- a/locale/ru/app.utils.json +++ b/locale/ru/app.utils.json @@ -444,7 +444,7 @@ "errors": { "required": "Это обязательное поле" }, - "gatewayError": "Сервис Gateway временно недоступен. Попробуйте, пожалуйста, позже.", + "gatewayError": "Сервис Gateway временно недоступен. Пожалуйста, попробуйте позже.", "invoice": { "title": "Инвойс" }, diff --git a/locale/tr/app.ledger.json b/locale/tr/app.ledger.json index 48b1e6dc48..1bfda92027 100644 --- a/locale/tr/app.ledger.json +++ b/locale/tr/app.ledger.json @@ -11,6 +11,10 @@ "avatarUnique": "Avatarınız size özeldir. Sonradan değiştirilemez.", "back": "Geri dön", "choose": "Hesabınızı seçin", + "help": { + "id": "{div}[Set an ID manually or select an account from the list.]\n{div}[Please save the ID, it would be needed for importing.]" + }, + "id": "Account ID", "importAccount": "Ledger hesabını içe aktarın", "ImportOrSignIn": "Hesapları içeri aktar veya", "login": "Devam", diff --git a/locale/tr/app.restore.json b/locale/tr/app.restore.json index 8f6d29b7ff..cfb5943ff5 100644 --- a/locale/tr/app.restore.json +++ b/locale/tr/app.restore.json @@ -1,4 +1,8 @@ { + "encodedSeedForm": { + "placeholder": "Введите вашу закодированную секретную фразу" + }, + "encodedSeedTab": "Encoded seed", "keyForm": { "placeholder": "Özel anahtarınızı buraya girin" }, @@ -51,6 +55,7 @@ }, "seedOrKeyForm": { "description": "Cüzdanınıza erişmek için Anahtar kelimeleri veya özel anahtarınızı girin.", + "encodedSeed": "Encoded seed", "keyTitle": "Özel Anahtar", "seedTitle": "Anahtar kelimeler", "title": "Anahtar kelimelerden içeri aktar" diff --git a/locale/zh_CN/app.ledger.json b/locale/zh_CN/app.ledger.json index 15660502d5..806e6b1b4d 100644 --- a/locale/zh_CN/app.ledger.json +++ b/locale/zh_CN/app.ledger.json @@ -11,6 +11,10 @@ "avatarUnique": "这个头像是独一无二的，您以后不能改变头像。", "back": "返回", "choose": "选择您的帐户", + "help": { + "id": "{div}[Set an ID manually or select an account from the list.]\n{div}[Please save the ID, it would be needed for importing.]" + }, + "id": "Account ID", "importAccount": "导入 Ledger 帐户", "ImportOrSignIn": "导入帐户或", "login": "继续", diff --git a/locale/zh_CN/app.restore.json b/locale/zh_CN/app.restore.json index a5dbc7e21a..96e6f9452b 100644 --- a/locale/zh_CN/app.restore.json +++ b/locale/zh_CN/app.restore.json @@ -1,4 +1,8 @@ { + "encodedSeedForm": { + "placeholder": "Enter your encoded seed" + }, + "encodedSeedTab": "Encoded seed", "keyForm": { "placeholder": "在此输入您的私钥" }, @@ -51,6 +55,7 @@ }, "seedOrKeyForm": { "description": "输入您的种子短语或私钥以访问您的钱包", + "encodedSeed": "Encoded seed", "keyTitle": "私钥", "seedTitle": "种子短语", "title": "从种子或密钥导入" diff --git a/package-lock.json b/package-lock.json index 871dc88580..6d54c76b59 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "waves-client", - "version": "1.4.0", + "version": "1.4.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -845,9 +845,9 @@ "integrity": "sha512-1qxL22a8LRA38xxzmmJktdVdGTfz2d9SXr9SI2gPpCJSKYrKb7SNGbOE3TgIyCRY0fquOHMtkwXuKGRw+LsJoA==" }, "@waves/signature-adapter": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/@waves/signature-adapter/-/signature-adapter-5.3.1.tgz", - "integrity": "sha512-V9/S4WElxnDiyJDas1V6loXugRGfi4r6foOwX5LWGP3Gq+Eqeex/54sRBxvekromtF9AyN8NSTHb6qo3dsVvvg==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@waves/signature-adapter/-/signature-adapter-5.4.0.tgz", + "integrity": "sha512-1oeHua3KOthGWwUI6uAXW6WJZ2zQAcYS1Fcbf448A/2ERi7iijOp1FP2B0RNq0ws7qi0lG4V8+PbaCXFYazXhg==", "requires": { "@types/ramda": "^0.25.46", "@waves/bignumber": "^0.0.1", @@ -855,7 +855,7 @@ "@waves/ledger": "^3.4.0", "@waves/money-like-to-node": "0.0.10", "@waves/ts-types": "^0.2.0", - "@waves/waves-transactions": "^3.16.3", + "@waves/waves-transactions": "^3.17.0", "ramda": "^0.25.0" }, "dependencies": { @@ -868,6 +868,16 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/@waves/ts-types/-/ts-types-0.2.0.tgz", "integrity": "sha512-mJOovPtwTyFV6fgI+KKFJ8IeqWSTXdKPOwgcCX9vT7wwMNwiJS2dMboAW2acR8YLiPy7LzZ5t41JCxvGLU+ZSA==" + }, + "@waves/waves-transactions": { + "version": "3.18.0", + "resolved": "https://registry.npmjs.org/@waves/waves-transactions/-/waves-transactions-3.18.0.tgz", + "integrity": "sha512-zVY2MVcXtWsk8DW/q1d/FOGd56kX7DpkT6+6kNfBC9J91cdQKIN0VWmlXNkd2UWxA7ijU0xO6ESIVqlwNZOn5w==", + "requires": { + "@waves/marshall": "^0.8.0", + "@waves/ts-lib-crypto": "^1.1.1", + "axios": "^0.19.0" + } } } }, diff --git a/package.json b/package.json index d5d8510a86..93142b3f4a 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,6 @@ "scripts": { "start": "ts-node server.ts startSimple openUrl", "preinstall": "sh scripts/preinstall.sh", - "postinstall": "electron-builder install-app-deps", "postinstall": "sh scripts/postinstall.sh", "preversion": "sh scripts/preversion.sh", "postversion": "sh scripts/postversion.sh", @@ -111,7 +110,7 @@ "@waves/ledger": "^3.4.0", "@waves/marshall": "^0.8.0", "@waves/oracle-data": "^0.0.6", - "@waves/signature-adapter": "^5.3.1", + "@waves/signature-adapter": "^5.4.0", "@waves/ts-types": "0.0.2", "@waves/waves-browser-bus": "^0.1.5", "@waves/waves-transactions": "^3.16.3", diff --git a/src/modules/restore/controllers/RestoreCtrl.js b/src/modules/restore/controllers/RestoreCtrl.js index 431d29bb77..92d76af866 100644 --- a/src/modules/restore/controllers/RestoreCtrl.js +++ b/src/modules/restore/controllers/RestoreCtrl.js @@ -4,9 +4,10 @@ const analytics = require('@waves/event-sender'); const { validators, libs } = require('@waves/waves-transactions'); const { isPublicKey } = validators; - const { address, publicKey } = libs.crypto; + const { address, publicKey, bytesToString, base58Decode } = libs.crypto; const TABS = { seed: 'seed', + encodedSeed: 'encodedSeed', key: 'key' }; @@ -28,11 +29,16 @@ $scope.TABS = TABS; this.seedForm = null; + this.encodedSeedForm = null; this.keyForm = null; /** * @type {string} */ this.seed = ''; + /** + * @type {string} + */ + this.encodedSeed = ''; /** * @type {string} */ @@ -87,23 +93,9 @@ this._usersInStorage = [...legacyUsers, ...users]; }); - this.observe('seed', this._onChangeSeed); - this.observeOnce('seedForm', () => { - this.receive(utils.observe(this.seedForm, '$valid'), () => { - if (this.activeTab === TABS.seed) { - this._onChangeSeed(); - } - }); - }); + this._setFormObservers(); + this.observe('address', this._onChangeAddress); - this.observe('key', this._onChangeKey); - this.observeOnce('keyForm', () => { - this.receive(utils.observe(this.keyForm, '$valid'), () => { - if (this.activeTab === TABS.key) { - this._onChangeKey(); - } - }); - }); this.observe('activeTab', this._onChangeActiveTab); } @@ -159,6 +151,38 @@ this.activeTab = tab; } + /** + * @private + */ + _setFormObservers() { + this.observe('seed', this._onChangeSeed); + this.observeOnce('seedForm', () => { + this.receive(utils.observe(this.seedForm, '$valid'), () => { + if (this.activeTab === TABS.seed) { + this._onChangeSeed(); + } + }); + }); + + this.observe('encodedSeed', this._onChangeEncodedSeed); + this.observeOnce('encodedSeedForm', () => { + this.receive(utils.observe(this.encodedSeedForm, '$valid'), () => { + if (this.activeTab === TABS.encodedSeed) { + this._onChangeEncodedSeed(); + } + }); + }); + + this.observe('key', this._onChangeKey); + this.observeOnce('keyForm', () => { + this.receive(utils.observe(this.keyForm, '$valid'), () => { + if (this.activeTab === TABS.key) { + this._onChangeKey(); + } + }); + }); + } + /** * @private */ @@ -170,6 +194,21 @@ } } + /** + * @private + */ + _onChangeEncodedSeed() { + if (this.encodedSeedForm.$valid && RestoreCtrl._isEncoded(this.encodedSeed)) { + try { + this.address = new ds.Seed(base58Decode(this.encodedSeed), WavesApp.network.code).address; + } catch (e) { + this.address = ''; + } + } else { + this.address = ''; + } + } + /** * @private */ @@ -201,7 +240,9 @@ } /** - * @return {{keyOrSeed: {seed: string}, type: string}|{keyOrSeed: {privateKey: string}, type: string}} + * @return {{keyOrSeed: {seed: string}, type: string}| + * {keyOrSeed: {encodedSeed: string}, type: string}| + * {keyOrSeed: {privateKey: string}, type: string}} * @private */ _getEncryptedAndType() { @@ -213,6 +254,14 @@ }, type: 'privateKey' }); + case TABS.encodedSeed: + return ({ + keyOrSeed: { + seed: `base58:${this.encodedSeed}`, + publicKey: publicKey(bytesToString(base58Decode(this.encodedSeed))) + }, + type: 'seed' + }); default: return ({ keyOrSeed: { @@ -223,6 +272,18 @@ } } + /** + * @private + * @param seed + */ + static _isEncoded(seed) { + try { + return !!base58Decode(seed); + } catch (e) { + return false; + } + } + } return new RestoreCtrl(); diff --git a/src/modules/restore/less/restore.less b/src/modules/restore/less/restore.less index 4c3de3f320..61bfa255fc 100644 --- a/src/modules/restore/less/restore.less +++ b/src/modules/restore/less/restore.less @@ -76,7 +76,6 @@ body.restore { .tab { display: flex; margin: 0 auto 20px; - max-width: 320px; &__item { height: 42px; diff --git a/src/modules/restore/templates/restore.html b/src/modules/restore/templates/restore.html index 9a4726efa0..6ca1a9b835 100644 --- a/src/modules/restore/templates/restore.html +++ b/src/modules/restore/templates/restore.html @@ -20,6 +20,8 @@
+
@@ -34,6 +36,15 @@ minlength="25" required> +
+ +