diff --git a/electron/main.ts b/electron/main.ts index 3961b8ab34..c4990ff24d 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -192,7 +192,8 @@ class Main implements IMain { private onAppReady() { this.registerProtocol() .then(() => this.createWindow()) - .then(() => this.addContextMenu()); + .then(() => this.addContextMenu()) + .then(() => this.setAppUserModelId()); } private addContextMenu(): Promise { @@ -306,6 +307,12 @@ class Main implements IMain { } } + private setAppUserModelId() { + if (process.platform === 'win32') { + app.setAppUserModelId('com.wavesplatform.client.lite'); + } + } + private static onAllWindowClosed() { app.quit(); } diff --git a/locale/de/app.create.json b/locale/de/app.create.json index a3f22d75b4..a0b33994cd 100644 --- a/locale/de/app.create.json +++ b/locale/de/app.create.json @@ -2,12 +2,15 @@ "backupSeed": { "back": "Zurück", "copySeed": "kopieren", + "description": "Please be careful and never input your SEED into other sites, because your account will be compromised and you will lose all of your funds.", "needConfirm": "Sie müssen die Phrase auf dem nächsten Bildschirm bestätigen.", "ok": "Ich habe es aufgeschrieben.", "or": "oder", "saveSecret": "Backup Phrase sichern", + "seedPhrase": "Seed Phrase", "warn": "Da nur Sie Ihr Geld kontrollieren, müssen Sie Ihre Backup-Phrase speichern, falls diese App gelöscht wird", - "writeSeed": "Bitte diese 15 Worte sorgfältig aufschreiben." + "writeSeed": "Bitte diese 15 Worte sorgfältig aufschreiben.", + "yourSeed": "Ihr Seed" }, "confirmBackup": { "again": "und wieder drücken", @@ -74,5 +77,9 @@ "or": "oder", "skip": "Später", "title": "Keine Sicherung (Backup), kein Geld" + }, + "seed": { + "copyToClipboard": "Copy to clipboard", + "saveToFile": "Save to file" } } \ No newline at end of file diff --git a/locale/de/app.dex.json b/locale/de/app.dex.json index bc9791d96a..c472a77326 100644 --- a/locale/de/app.dex.json +++ b/locale/de/app.dex.json @@ -45,6 +45,8 @@ "fee": "Gebühr {{fee}} WAVES", "hasScript": "Brechen Sie [script](https://docs.wavesplatform.com/de/waves-client/advanced_features/script_transaction.html) ab, um den Handel zu tätigen", "last": "Letzte", + "limit": "Limit Order", + "market": "Market Order", "matcherFee": "Fee", "notifications": { "error": { diff --git a/locale/de/app.utils.json b/locale/de/app.utils.json index 4240daae28..7c8ee9dabd 100644 --- a/locale/de/app.utils.json +++ b/locale/de/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "Backup Phrase", "base58Seed": "Encoded backup phrase", "encodedSeed": "Codierter Seed", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Privat Schlüssel", "publicKey": "Öffentlicher Schlüssel", @@ -888,6 +888,7 @@ "cell6": "Greifen sie nicht auf ihre Wallet zu, wenn Sie öffentliches WLAN oder ein anderes Gerät verwenden.", "nextButton": "Ich verstehe", "p1": "Eine der häufigsten Formen des Betrugs ist Phishing, bei dem Betrüger falsche Gemeinschaften auf Facebook oder anderen Websites erstellen, die den authentischen ähneln.", + "saveSeedButton": "Save your SEED phrase", "title": "Wie man sich vor Phishing schützt" } } diff --git a/locale/de/app.welcome.json b/locale/de/app.welcome.json index 841cdcc0dd..da9ac49843 100644 --- a/locale/de/app.welcome.json +++ b/locale/de/app.welcome.json @@ -1,8 +1,7 @@ { "backupSeed": { "copySeed": "Seed kopieren", - "warn": "Da nur Sie Ihr Geld kontrollieren, müssen Sie Ihre Backup-Phrase speichern, falls diese App gelöscht wird", - "yourSeed": "Ihr Seed" + "warn": "Da nur Sie Ihr Geld kontrollieren, müssen Sie Ihre Backup-Phrase speichern, falls diese App gelöscht wird" }, "createAccount": { "from": "Benutzerkonto anlegen" @@ -148,6 +147,7 @@ "copyAddress": "Copy address", "copyright": "© 2019 Waves Platform", "copyrightVordex": "© 2019 VORDEX", + "createAccount": "Create account", "createToken": "Token erstellen", "currentAccountName": "Current account name", "dashboard": "Dashboard", diff --git a/locale/en/app.create.json b/locale/en/app.create.json index efc60fe60a..db2b92d1e0 100644 --- a/locale/en/app.create.json +++ b/locale/en/app.create.json @@ -2,12 +2,15 @@ "backupSeed": { "back": "go back", "copySeed": "copy them", + "description": "Please be careful and never input your SEED into other sites, because your account will be compromised and you will lose all of your funds.", "needConfirm": "You will confirm this phrase on the next screen.", "ok": "I’ve written it down", "or": "or", "saveSecret": "Save backup phrase", + "seedPhrase": "Seed Phrase", "warn": "Since only you control your money, you’ll need to save your backup phrase in case this app is deleted or", - "writeSeed": "Please carefully write down these 15 words" + "writeSeed": "Please carefully write down these 15 words", + "yourSeed": "Your Seed phrase" }, "confirmBackup": { "again": "and tap again", @@ -74,5 +77,9 @@ "or": "or", "skip": "Do it later", "title": "No Backup, No Money" + }, + "seed": { + "copyToClipboard": "Copy to clipboard", + "saveToFile": "Save to file" } } \ No newline at end of file diff --git a/locale/en/app.dex.json b/locale/en/app.dex.json index 60826cd1aa..fdefb0cd25 100644 --- a/locale/en/app.dex.json +++ b/locale/en/app.dex.json @@ -45,6 +45,8 @@ "fee": "Fee {{fee}} WAVES", "hasScript": "Cancel [script](https://docs.wavesplatform.com/en/waves-client/advanced_features/script_transaction.html) to trade", "last": "Last", + "limit": "Limit Order", + "market": "Market Order", "matcherFee": "Fee", "notifications": { "error": { diff --git a/locale/en/app.utils.json b/locale/en/app.utils.json index 7aaac7f724..63af2f58ce 100644 --- a/locale/en/app.utils.json +++ b/locale/en/app.utils.json @@ -695,7 +695,7 @@ }, "ok": "Sign in", "pairing": { - "devicePairing": "Export account", + "devicePairing": "Export account to app", "header": "Scan Pairing Code", "showCodeLink": "Show Pairing Code", "unavailable": { @@ -717,7 +717,7 @@ "backupPhrase": "Backup phrase", "base58Seed": "Encoded backup phrase", "encodedSeed": "Encoded seed", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Private key", "publicKey": "Public Key", @@ -888,6 +888,7 @@ "cell6": "Do not access your wallet when using public Wi-Fi or someone else’s device.", "nextButton": "I Understand", "p1": "One of the most common forms of scamming is phishing, which is when scammers create fake communities on Facebook or other websites that look similar to the authentic ones.", + "saveSeedButton": "Save your SEED phrase", "title": "How To Protect Yourself from Phishers" } } diff --git a/locale/en/app.welcome.json b/locale/en/app.welcome.json index 3ac96143ed..19dd5f568e 100644 --- a/locale/en/app.welcome.json +++ b/locale/en/app.welcome.json @@ -1,8 +1,7 @@ { "backupSeed": { "copySeed": "Copy Seed phrase", - "warn": "Since only you control your money, you’ll need to save your Seed phrase in case this app is deleted or", - "yourSeed": "Your Seed phrase" + "warn": "Since only you control your money, you’ll need to save your Seed phrase in case this app is deleted or" }, "createAccount": { "from": "createAccount" @@ -148,6 +147,7 @@ "copyAddress": "Copy address", "copyright": "© 2019 Waves Platform", "copyrightVordex": "© 2019 VORDEX", + "createAccount": "Create account", "createToken": "Create token", "currentAccountName": "Current account name", "dashboard": "Dashboard", diff --git a/locale/es/app.create.json b/locale/es/app.create.json index a973173d30..71c798375d 100644 --- a/locale/es/app.create.json +++ b/locale/es/app.create.json @@ -2,12 +2,15 @@ "backupSeed": { "back": "ir para atrás", "copySeed": "cópialas", + "description": "Please be careful and never input your SEED into other sites, because your account will be compromised and you will lose all of your funds.", "needConfirm": "Confirmarás esta frase en la próxima pantalla.", "ok": "Las he anotado", "or": "o", "saveSecret": "Guarda la frase de respaldo (backup)", + "seedPhrase": "Seed Phrase", "warn": "Dado que eres el único que controlas tu dinero, debes guardar la frase de respaldo por si acaso esta app fuera borrada o ", - "writeSeed": "Por favor, anota cuidadosamente estas 15 palabras." + "writeSeed": "Por favor, anota cuidadosamente estas 15 palabras.", + "yourSeed": "Su frase SEED" }, "confirmBackup": { "again": "y desliza otra vez", @@ -74,5 +77,9 @@ "or": "o", "skip": "Lo haré después.", "title": "Sin backup no hay dinero" + }, + "seed": { + "copyToClipboard": "Copy to clipboard", + "saveToFile": "Save to file" } } \ No newline at end of file diff --git a/locale/es/app.dex.json b/locale/es/app.dex.json index 537de9081c..ea0e87ec4d 100644 --- a/locale/es/app.dex.json +++ b/locale/es/app.dex.json @@ -45,6 +45,8 @@ "fee": "Comisión de {{fee}} WAVES", "hasScript": "Cancele[script](https://docs.wavesplatform.com/en/waves-client/advanced_features/script_transaction.html) por operar", "last": "Última", + "limit": "Limit Order", + "market": "Market Order", "matcherFee": "Fee", "notifications": { "error": { diff --git a/locale/es/app.utils.json b/locale/es/app.utils.json index 1baebb0519..2cafdce53c 100644 --- a/locale/es/app.utils.json +++ b/locale/es/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "Frase de Recuperación", "base58Seed": "Frase de seguridad (SEED) codificada", "encodedSeed": "Semilla codificada", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Clave privada", "publicKey": "Clave pública", @@ -888,6 +888,7 @@ "cell6": "No accedas a tu cartera (Wallet) cuando uses un acceso público Wi-Fi o el dispositivo de alguien.", "nextButton": "Lo entiendo", "p1": "Una de las formas más comunes de estafa es la suplantación de identidad, en el que estafadores crean falsas comunidades de Facebook u otros websites que se parecen a los auténticos.", + "saveSeedButton": "Save your SEED phrase", "title": "¿Cómo protegerte de los estafadores?" } } diff --git a/locale/es/app.welcome.json b/locale/es/app.welcome.json index 4481696937..69c53b03b9 100644 --- a/locale/es/app.welcome.json +++ b/locale/es/app.welcome.json @@ -1,8 +1,7 @@ { "backupSeed": { "copySeed": "Copiar frase SEED", - "warn": "Dado que solo usted controla su dinero, deberá guardar su frase SEED en caso de que esta aplicación se elimine o", - "yourSeed": "Su frase SEED" + "warn": "Dado que solo usted controla su dinero, deberá guardar su frase SEED en caso de que esta aplicación se elimine o" }, "createAccount": { "from": "crearCuenta" @@ -148,6 +147,7 @@ "copyAddress": "Copiar la dirección", "copyright": "© 2019 Waves Platform", "copyrightVordex": "© 2019 VORDEX", + "createAccount": "Create account", "createToken": "Crear token", "currentAccountName": "Nombre de cuenta actual", "dashboard": "Tablero", diff --git a/locale/et_EE/app.create.json b/locale/et_EE/app.create.json index 953ab3f34e..cf90116ca1 100644 --- a/locale/et_EE/app.create.json +++ b/locale/et_EE/app.create.json @@ -2,12 +2,15 @@ "backupSeed": { "back": "mine tagasi", "copySeed": "kopeerige need", + "description": "Please be careful and never input your SEED into other sites, because your account will be compromised and you will lose all of your funds.", "needConfirm": "Kinnitate selle fraasi järgmisel ekraanil.", "ok": "Ma olen selle üles kirjutanud", "or": "või", "saveSecret": "Salvestage salafraas", + "seedPhrase": "Seed Phrase", "warn": "Kuna ainult Teie kontrollite enda raha, peate salvestama salafraasi juhul kui see rakendus kustutatakse või", - "writeSeed": "Palun kirjutage hoolikalt üles need 15 sõna" + "writeSeed": "Palun kirjutage hoolikalt üles need 15 sõna", + "yourSeed": "Your Seed phrase" }, "confirmBackup": { "again": "ja vajutage uuesti", @@ -74,5 +77,9 @@ "or": "või", "skip": "Teen seda hiljem", "title": "Pole Salafraasi, Pole Raha" + }, + "seed": { + "copyToClipboard": "Copy to clipboard", + "saveToFile": "Save to file" } } \ No newline at end of file diff --git a/locale/et_EE/app.dex.json b/locale/et_EE/app.dex.json index a964fce5f5..70c674c7c9 100644 --- a/locale/et_EE/app.dex.json +++ b/locale/et_EE/app.dex.json @@ -45,6 +45,8 @@ "fee": "Tasu {{fee}} WAVES", "hasScript": "Kauplemiseks tühista [script](https://docs.wavesplatform.com/en/waves-client/advanced_features/script_transaction.html)", "last": "Viimane", + "limit": "Limit Order", + "market": "Market Order", "matcherFee": "Fee", "notifications": { "error": { diff --git a/locale/et_EE/app.utils.json b/locale/et_EE/app.utils.json index d862093626..7a97426b9f 100644 --- a/locale/et_EE/app.utils.json +++ b/locale/et_EE/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "Salafraas", "base58Seed": "Encoded backup phrase", "encodedSeed": "Kodeeritud salafraas", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Privaatne võti", "publicKey": "Avalik võti", @@ -888,6 +888,7 @@ "cell6": "Ärge avage oma rahakotti, kui kasutate avalikku Wi-Fi't või kellegi teise seadet", "nextButton": "Ma saan aru", "p1": "Üks levinumaid pettuse vorme on andmepüük, mis on siis, kui petturid loovad Facebookis võltsitud kogukonnad või muud autentsete lehekülgedega sarnased veebilehed.", + "saveSeedButton": "Save your SEED phrase", "title": "Kuidas Kaitsta End Andmepüüdjate Eest" } } diff --git a/locale/et_EE/app.welcome.json b/locale/et_EE/app.welcome.json index 158c6bea58..b42d0f8c6c 100644 --- a/locale/et_EE/app.welcome.json +++ b/locale/et_EE/app.welcome.json @@ -1,8 +1,7 @@ { "backupSeed": { "copySeed": "Copy Seed phrase", - "warn": "Since only you control your money, you’ll need to save your Seed phrase in case this app is deleted or", - "yourSeed": "Your Seed phrase" + "warn": "Since only you control your money, you’ll need to save your Seed phrase in case this app is deleted or" }, "createAccount": { "from": "createAccount" @@ -148,6 +147,7 @@ "copyAddress": "Copy address", "copyright": "© 2019 Waves Platform", "copyrightVordex": "© 2019 VORDEX", + "createAccount": "Create account", "createToken": "Create token", "currentAccountName": "Current account name", "dashboard": "Dashboard", diff --git a/locale/fr/app.create.json b/locale/fr/app.create.json index feb131f57e..5b2f812892 100644 --- a/locale/fr/app.create.json +++ b/locale/fr/app.create.json @@ -2,12 +2,15 @@ "backupSeed": { "back": "Retour", "copySeed": "Copier", + "description": "Please be careful and never input your SEED into other sites, because your account will be compromised and you will lose all of your funds.", "needConfirm": "Vous confirmez cette phrase à l'écran suivant.", "ok": "Je l'ai écrite", "or": "ou", "saveSecret": "Enregistrer la phrase de sauvegarde", + "seedPhrase": "Seed Phrase", "warn": "Vu que vous êtes seul à contrôler votre argent, vous devrez enregistrer votre phrase de sauvegarde dans le cas où cette application est supprimée ou", - "writeSeed": "Veuillez soigneusement écrire ces 15 mots" + "writeSeed": "Veuillez soigneusement écrire ces 15 mots", + "yourSeed": "Votre phrase secrète" }, "confirmBackup": { "again": "et saisissez à nouveau", @@ -74,5 +77,9 @@ "or": "ou", "skip": "Le faire plus tard", "title": "Pas de sauvegarde, pas d'argent" + }, + "seed": { + "copyToClipboard": "Copy to clipboard", + "saveToFile": "Save to file" } } \ No newline at end of file diff --git a/locale/fr/app.dex.json b/locale/fr/app.dex.json index 2f3e92e474..b41e6268be 100644 --- a/locale/fr/app.dex.json +++ b/locale/fr/app.dex.json @@ -45,6 +45,8 @@ "fee": "Frais {{fee}} WAVES", "hasScript": "Annuler [script](https://docs.wavesplatform.com/en/waves-client/advanced_features/script_transaction.html) pour échanger", "last": "Dernier", + "limit": "Limit Order", + "market": "Market Order", "matcherFee": "Frais", "notifications": { "error": { diff --git a/locale/fr/app.utils.json b/locale/fr/app.utils.json index 8547375703..6179a9a853 100644 --- a/locale/fr/app.utils.json +++ b/locale/fr/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "Phrase de sauvegarde", "base58Seed": "Encoded backup phrase", "encodedSeed": "SEED encodée", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Clé privée", "publicKey": "Clé publique", @@ -888,6 +888,7 @@ "cell6": "N'accédez pas à votre portefeuille lorsque vous utilisez le Wi-Fi public ou l'appareil de quelqu'un d'autre.", "nextButton": "Je comprends", "p1": "L'une des formes les plus courantes d'escroquerie est l'hameçonnage, qui consiste à créer de fausses communautés sur Facebook ou d'autres sites Web qui ressemblent à des sites authentiques.", + "saveSeedButton": "Save your SEED phrase", "title": "Comment vous protéger des escrocs" } } diff --git a/locale/fr/app.welcome.json b/locale/fr/app.welcome.json index d8fafc6ae7..8f7450fef6 100644 --- a/locale/fr/app.welcome.json +++ b/locale/fr/app.welcome.json @@ -1,8 +1,7 @@ { "backupSeed": { "copySeed": "Copier la phrase secrète", - "warn": "Vu que vous êtes seul à contrôler votre argent, vous devrez enregistrer votre phrase de sauvegarde dans le cas où cette application est supprimée ou", - "yourSeed": "Votre phrase secrète" + "warn": "Vu que vous êtes seul à contrôler votre argent, vous devrez enregistrer votre phrase de sauvegarde dans le cas où cette application est supprimée ou" }, "createAccount": { "from": "créerCompte" @@ -148,6 +147,7 @@ "copyAddress": "Copier l'adresse", "copyright": "© 2019 Waves Platform", "copyrightVordex": "© 2019 VORDEX", + "createAccount": "Create account", "createToken": "Créer un jeton", "currentAccountName": "Nom actuel du compte", "dashboard": "Tableau de bord", diff --git a/locale/hi_IN/app.create.json b/locale/hi_IN/app.create.json index 4dfe763482..887323e576 100644 --- a/locale/hi_IN/app.create.json +++ b/locale/hi_IN/app.create.json @@ -2,12 +2,15 @@ "backupSeed": { "back": "वापस जाएं", "copySeed": "इनको कॉपी करें", + "description": "Please be careful and never input your SEED into other sites, because your account will be compromised and you will lose all of your funds.", "needConfirm": "आप इस वाक्य की पुष्टि अगले स्क्रीन पर करेंगे ", "ok": "मैने इनको लिख लिया है", "or": "या", "saveSecret": "बैकअप वाक्य सहेंजें", + "seedPhrase": "Seed Phrase", "warn": "क्योंकि केवल आप अपना धन नियंत्रित करते हैं इसलिए इस ऐप के हटाएं जाने की स्थिति में आपको अपना बैकअप वाक्य सहेजना चाहिए या", - "writeSeed": "कृपया इन 15 शब्दों को सावधानीपूर्वक लिखें" + "writeSeed": "कृपया इन 15 शब्दों को सावधानीपूर्वक लिखें", + "yourSeed": "Your Seed phrase" }, "confirmBackup": { "again": "और पुनः टैप करें", @@ -74,5 +77,9 @@ "or": "या", "skip": "इसे बाद में करें", "title": "कोई बैकअप नहीं, कोई धन नहीं" + }, + "seed": { + "copyToClipboard": "Copy to clipboard", + "saveToFile": "Save to file" } } \ No newline at end of file diff --git a/locale/hi_IN/app.dex.json b/locale/hi_IN/app.dex.json index 0755b5a2f5..50c1326efa 100644 --- a/locale/hi_IN/app.dex.json +++ b/locale/hi_IN/app.dex.json @@ -45,6 +45,8 @@ "fee": "फीस {{fee}} WAVES", "hasScript": "रद्द करें [स्क्रिप्ट](https://docs.wavesplatform.com/en/waves-client/advanced_features/script_transaction.html) व्यापार करने के लिए", "last": "अंतिम", + "limit": "Limit Order", + "market": "Market Order", "matcherFee": "Fee", "notifications": { "error": { diff --git a/locale/hi_IN/app.utils.json b/locale/hi_IN/app.utils.json index 3d8f520f3c..d1d054596d 100644 --- a/locale/hi_IN/app.utils.json +++ b/locale/hi_IN/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "बैकअप वाक्य", "base58Seed": "Encoded backup phrase", "encodedSeed": "इनकोडेड सीड", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "निजी कुंजी", "publicKey": "सार्वजनिक कुंजी", @@ -888,6 +888,7 @@ "cell6": "सार्वजनिक वाई-फाई या किसी और की डिवाइस का उपयोग करते समय अपने वॉलेट को एक्सेस ना करें।", "nextButton": "मैं समझा", "p1": "अपनी खुद की सुरक्षा के लिए कुछ महत्वपूर्ण चीजों को समझने के लिए कृपया कुछ समय निकालें।", + "saveSeedButton": "Save your SEED phrase", "title": "फिशर्स से खुद की सुरक्षा कैसे करें" } } diff --git a/locale/hi_IN/app.welcome.json b/locale/hi_IN/app.welcome.json index ea9ce57874..ca5e92d178 100644 --- a/locale/hi_IN/app.welcome.json +++ b/locale/hi_IN/app.welcome.json @@ -1,8 +1,7 @@ { "backupSeed": { "copySeed": "Copy Seed phrase", - "warn": "Since only you control your money, you’ll need to save your Seed phrase in case this app is deleted or", - "yourSeed": "Your Seed phrase" + "warn": "Since only you control your money, you’ll need to save your Seed phrase in case this app is deleted or" }, "createAccount": { "from": "createAccount" @@ -148,6 +147,7 @@ "copyAddress": "Copy address", "copyright": "© 2019 Waves Platform", "copyrightVordex": "© 2019 VORDEX", + "createAccount": "Create account", "createToken": "Create token", "currentAccountName": "Current account name", "dashboard": "Dashboard", diff --git a/locale/id/app.create.json b/locale/id/app.create.json index 65db928d2e..9732458660 100644 --- a/locale/id/app.create.json +++ b/locale/id/app.create.json @@ -2,12 +2,15 @@ "backupSeed": { "back": "kembali", "copySeed": "salin semua", + "description": "Please be careful and never input your SEED into other sites, because your account will be compromised and you will lose all of your funds.", "needConfirm": "Anda akan mengkonfirmasi frasa ini pada layar berikutnya.", "ok": "Saya telah menulisnya", "or": "atau", "saveSecret": "Simpan cadangan frasa", + "seedPhrase": "Seed Phrase", "warn": "Karena hanya Anda yang mengontrol uang Anda, Anda harus menyimpan frasa cadangan Anda jika aplikasi ini dihapus atau", - "writeSeed": "Tolong berhati-hati dalam menuliskan 15 kata ini" + "writeSeed": "Tolong berhati-hati dalam menuliskan 15 kata ini", + "yourSeed": "Frasa SEED Anda" }, "confirmBackup": { "again": "dan ketuk lagi", @@ -74,5 +77,9 @@ "or": "atau", "skip": "Lakukan nanti", "title": "Tidak dicadangkan, Beresiko kehilangan Uang" + }, + "seed": { + "copyToClipboard": "Copy to clipboard", + "saveToFile": "Save to file" } } \ No newline at end of file diff --git a/locale/id/app.dex.json b/locale/id/app.dex.json index 428f0928fe..8decb82845 100644 --- a/locale/id/app.dex.json +++ b/locale/id/app.dex.json @@ -45,6 +45,8 @@ "fee": "Biaya {{fee}} WAVES", "hasScript": "Batalkan [skrip](https://docs.wavesplatform.com/en/waves-client/advanced_features/script_transaction.html) untuk pertukaran", "last": "Terakhir", + "limit": "Limit Order", + "market": "Market Order", "matcherFee": "Biaya", "notifications": { "error": { diff --git a/locale/id/app.utils.json b/locale/id/app.utils.json index aaf3eabdd7..43eb863dae 100644 --- a/locale/id/app.utils.json +++ b/locale/id/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "Frasa cadangan", "base58Seed": "Encoded backup phrase", "encodedSeed": "SEED terenkode", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Kunci pribadi", "publicKey": "Kunci Publik", @@ -888,6 +888,7 @@ "cell6": "Jangan mengakses dompet Anda saat menggunakan Wi-Fi publik atau perangkat orang lain.", "nextButton": "Saya mengerti", "p1": "Salah satu bentuk penipuan yang paling umum adalah phishing, yaitu ketika scammers membuat komunitas palsu di Facebook atau situs web lain yang terlihat mirip dengan yang asli.", + "saveSeedButton": "Save your SEED phrase", "title": "Cara Melindungi Diri dari Phisher" } } diff --git a/locale/id/app.welcome.json b/locale/id/app.welcome.json index e34e7481b6..dabdc2d500 100644 --- a/locale/id/app.welcome.json +++ b/locale/id/app.welcome.json @@ -1,8 +1,7 @@ { "backupSeed": { "copySeed": "Salin frasa SEED", - "warn": "Karena hanya Anda yang mengendalikan uang Anda, Anda harus menyimpan frase SEED Anda jika aplikasi ini dihapus atau", - "yourSeed": "Frasa SEED Anda" + "warn": "Karena hanya Anda yang mengendalikan uang Anda, Anda harus menyimpan frase SEED Anda jika aplikasi ini dihapus atau" }, "createAccount": { "from": "createAccount" @@ -148,6 +147,7 @@ "copyAddress": "Salin alamat", "copyright": "© 2019 Waves Platform", "copyrightVordex": "© 2019 VORDEX", + "createAccount": "Create account", "createToken": "Buat token", "currentAccountName": "Nama akun saat ini", "dashboard": "Dasbor", diff --git a/locale/it/app.create.json b/locale/it/app.create.json index 6554dee662..ac132d8818 100644 --- a/locale/it/app.create.json +++ b/locale/it/app.create.json @@ -2,12 +2,15 @@ "backupSeed": { "back": "torna indietro", "copySeed": "copiali", + "description": "Fai attenzione e non inserire mai il tuo SEED in altri siti, perché il tuo account sarà compromesso e perderai tutti i tuoi fondi.", "needConfirm": "Potrai confermare questa frase nella prossima schermata.", "ok": "L'ho scritta", "or": "oppure", "saveSecret": "Salva frase di backup", + "seedPhrase": "Frase Seed", "warn": "Poichè soltanto tu hai il controllo sui tuoi fondi, sarà bene copiare questa frase di backup in caso quest'app venisse rimossa oppure", - "writeSeed": "Per favore, scrivi attentamente queste 15 parole" + "writeSeed": "Per favore, scrivi attentamente queste 15 parole", + "yourSeed": "La tua frase Seed" }, "confirmBackup": { "again": "e seleziona nuovamente", @@ -74,5 +77,9 @@ "or": "oppure", "skip": "Lo faccio dopo", "title": "Niente Backup, Niente Soldi" + }, + "seed": { + "copyToClipboard": "Copia negli appunti", + "saveToFile": "Salva su file" } } \ No newline at end of file diff --git a/locale/it/app.dex.json b/locale/it/app.dex.json index f9623768db..11a7c87628 100644 --- a/locale/it/app.dex.json +++ b/locale/it/app.dex.json @@ -19,7 +19,7 @@ "candleChart": { "error": "{div}[Non è stato possibile scaricare il listino.]{div}[Se vuoi usare questo listino nella tua applicazione, invia una richiesta a [tradingview.com](https://tradingview.com)]" }, - "charts": "charts", + "charts": "grafici", "createOrder": { "1day": "1 giorno", "1hour": "1 ora", @@ -37,14 +37,16 @@ "amountMin": "Importo minimo -", "balance": "{{name}} insufficienti", "precision": "Superamento del massimo di {{precision}} posizioni decimali", - "priceMax": "Max Price - ", - "priceMin": "Min Price - ", + "priceMax": "Prezzo mas -", + "priceMin": "Prezzo min - ", "required": "Questo campo è obbligatorio" }, "expiration": "Scadenza", "fee": "Spese {{fee}} WAVES", "hasScript": "Cancella [script](https://docs.wavesplatform.com/en/waves-client/advanced_features/script_transaction.html) da scambiare", "last": "Ultimi", + "limit": "Ordine limite", + "market": "Ordine di mercato", "matcherFee": "Spese", "notifications": { "error": { @@ -68,8 +70,8 @@ "priceField": "Prezzo Limite", "sell": "Vendi", "spread": "spread", - "stopPriceField": "Stop price", - "stopPriceHelp": "This is an automatic buy or sell order at a predetermined price", + "stopPriceField": "Prezzo stop", + "stopPriceHelp": "Si tratta di un ordine automatico di acquisto o di vendita ad un prezzo predeterminato.", "total": "Totale" }, "demo": { @@ -151,7 +153,7 @@ "header": "Qualcosa non ha funzionato" } }, - "orders": "orders", + "orders": "ordini", "portfolio": { "title": "Portafoglio" }, @@ -237,12 +239,12 @@ "all": "Tutto", "btc": "Btc", "eth": "ETH", - "history": "history", + "history": "cronologia", "myBalance": "Il mio bilancio", "myTradeHistory": "Il mio storico ordini", "openOrders": "I miei ordini pendenti", "OrderHistory": "Storico Ordini", - "trade": "Trade", + "trade": "Commercio", "tradeHistory": "Storico Ordini", "waves": "Waves" } diff --git a/locale/it/app.import.json b/locale/it/app.import.json index bb7b703644..4541299da6 100644 --- a/locale/it/app.import.json +++ b/locale/it/app.import.json @@ -37,7 +37,7 @@ "seedAndKey": { "name": "Seed o chiave" }, - "seedAndKeyDescription": "Importa account da un SEED di backup o da una chiave privata", + "seedAndKeyDescription": "Importa account da un SEED o chiave privata", "selectButton": "Seleziona", "wavesClient": "Client Waves", "wavesClientDescription": "Importa account da un client Waves", diff --git a/locale/it/app.ui.json b/locale/it/app.ui.json index db57e9cb39..8056488188 100644 --- a/locale/it/app.ui.json +++ b/locale/it/app.ui.json @@ -1,5 +1,5 @@ { - "active": "Active", + "active": "Attivo", "all": "Tutto", "amount": "Quantitativo", "balanceInput": { diff --git a/locale/it/app.utils.json b/locale/it/app.utils.json index 3dbc3b86d2..b2cb63060f 100644 --- a/locale/it/app.utils.json +++ b/locale/it/app.utils.json @@ -194,10 +194,10 @@ "ok": "Accedi" }, "deleteAccount": { - "cancel": "Cancel", - "delete": "Remove", - "description": "{div}[Removing an account will lead to its irretrievable loss if you didn't save a backup phrase (SEED).]\n{div}[Click on the REMOVE button to proceed with account removal, or CANCEL to return to the previous screen.]", - "header": "Remove account" + "cancel": "Annulla", + "delete": "Elimina", + "description": "{div} [La rimozione di un account comporterà la sua perdita irrecuperabile se non si salva una frase di backup (SEED).] \n {div} [Fare clic sul pulsante RIMUOVI per procedere con la rimozione dell'account o ANNULLA per tornare alla schermata precedente.]", + "header": "Rimuovi account" }, "deposit": { "coinomatBCH": { @@ -355,7 +355,7 @@ "matcherChoice": { "customMatcher": "Indirizzo Matcher personalizzato", "matcher": "Matcher", - "matcherTerms": "I agree to the Super DEX Mather Terms of Use.", + "matcherTerms": "Accetto i Termini di utilizzo di Super DEX Mather.", "terms": "Termini e condizioni", "title": "Seleziona il Matcher", "wavesTerms": "Ho più di 18 anni e accetto le Condizioni d'uso di Waves e l'Informativa sulla privacy di Waves." @@ -636,7 +636,7 @@ "account": "Account", "cancel": "Crea un account", "changePass": "Cambia password", - "deleteAccount": "Remove account", + "deleteAccount": "Rimuovi account", "exportAccounts": { "accounts": "Account", "export": "Esportazione", @@ -683,7 +683,7 @@ "dataProviderInvalid": "Informazioni del provider non acquisite. Controllare il link e riprovare più tardi", "dataProviderName": "{{dataProviderName}}", "dontShowSpamCheckboxDescr": "Nascondi token sospetti", - "edit": "Edit", + "edit": "Modifica", "forDisableClear": "Per disabilitarlo completamente, lascia vuoto il campo.", "matcherAddress": "Indirizzo Matcher", "nodeAddress": "Indirizzo Nodo", @@ -695,7 +695,7 @@ }, "ok": "Accedi", "pairing": { - "devicePairing": "Esporta account", + "devicePairing": "Esporta account in app", "header": "Scansione Codice Accoppiamento", "showCodeLink": "Mostra Codice Accoppiamento", "unavailable": { @@ -717,7 +717,7 @@ "backupPhrase": "Frase di Backup", "base58Seed": "Frase di backup codificata", "encodedSeed": "Seed codificato", - "exportAccount": "Esporta account", + "exportAccount": "Esporta account su file", "id": "ID Account", "privateKey": "Chiave Privata", "publicKey": "Chiave Pubblica", @@ -888,6 +888,7 @@ "cell6": "Non accedere al tuo wallet utilizzando accessi Wi-Fi pubblici o dispositivi di altre persone.", "nextButton": "Ho capito", "p1": "Una delle forme di truffa più diffuse è il phishing, messo in atto da truffatori che creano false community su Facebook o veri e propri siti che ricordano molto i progetti autentici cui mirano.", + "saveSeedButton": "Salva la tua frase SEED", "title": "Come proteggersi dai Phishers" } } @@ -968,7 +969,7 @@ "1_3_7": "{span.line} [1. Integrazione con [tokenrating.wavesexplorer.com] (https://tokenrating.wavesexplorer.com) Ora puoi valutare i token direttamente nell'app.] \n {span.line} [2. Sono stati corretti altri bug minori.]", "1_3_9": "{span.line} [1. Miglioramento Interfaccia utente e funzionalità delle sezioni di Exchange e Wallet.] \n {span.line} [2. Correzione di altri bug minori.]", "1_4_0": "{span.line}[Aggiunta la possibilità di passare da un account all'altro nello stesso wallet.]", - "1_4_4": "{span.line}[Added ability to backup and restore accounts from the keystore-file]" + "1_4_4": "{span.line} [Aggiunta la possibilità di eseguire il backup e il ripristino degli account dal file keystore]" }, "title": "Le novità della versione {{version}}" } diff --git a/locale/it/app.welcome.json b/locale/it/app.welcome.json index 28ad1ebb30..31715a0a8f 100644 --- a/locale/it/app.welcome.json +++ b/locale/it/app.welcome.json @@ -1,8 +1,7 @@ { "backupSeed": { "copySeed": "Copia frase seed", - "warn": "Poichè soltanto tu hai il controllo sui tuoi fondi, sarà bene copiare questa frase di backup in caso quest'app venisse rimossa oppure", - "yourSeed": "La tua frase Seed" + "warn": "Poichè soltanto tu hai il controllo sui tuoi fondi, sarà bene copiare questa frase di backup in caso quest'app venisse rimossa oppure" }, "createAccount": { "from": "creaAccount" @@ -148,6 +147,7 @@ "copyAddress": "Copia indirizzo", "copyright": "© 2019 Waves Platform", "copyrightVordex": "© 2019 VORDEX", + "createAccount": "Crea account", "createToken": "Crea token", "currentAccountName": "Nome account corrente", "dashboard": "Cruscotto", diff --git a/locale/ja/app.create.json b/locale/ja/app.create.json index abb49ce23a..ff8707c396 100644 --- a/locale/ja/app.create.json +++ b/locale/ja/app.create.json @@ -2,12 +2,15 @@ "backupSeed": { "back": "戻る", "copySeed": "コピー", + "description": "Please be careful and never input your SEED into other sites, because your account will be compromised and you will lose all of your funds.", "needConfirm": "あなたは次の画面でこのフレーズの入力を求められます。", "ok": "書き留めました", "or": "または", "saveSecret": "バックアップフレーズを保存", + "seedPhrase": "Seed Phrase", "warn": "あなたのお金を管理できるのはあなただけです。このアプリが削除された場合に備え、バックアップフレーズを保存してください。または", - "writeSeed": "これらの15単語を慎重に書き留めてください" + "writeSeed": "これらの15単語を慎重に書き留めてください", + "yourSeed": "あなたのシードフレーズ" }, "confirmBackup": { "again": "そして、もう一度タップする", @@ -74,5 +77,9 @@ "or": "または", "skip": "あとで", "title": "バックアップなしでは、あなたの資産は守られません" + }, + "seed": { + "copyToClipboard": "Copy to clipboard", + "saveToFile": "Save to file" } } \ No newline at end of file diff --git a/locale/ja/app.dex.json b/locale/ja/app.dex.json index 48f198a714..14e23c5047 100644 --- a/locale/ja/app.dex.json +++ b/locale/ja/app.dex.json @@ -45,6 +45,8 @@ "fee": "手数料 {{fee}} WAVES", "hasScript": "トレードの為にスクリプト(https://docs.wavesplatform.com/en/waves-client/advanced_features/script_transaction.html) をキャンセル", "last": "最終", + "limit": "Limit Order", + "market": "Market Order", "matcherFee": "手数料", "notifications": { "error": { diff --git a/locale/ja/app.utils.json b/locale/ja/app.utils.json index 64e03c4bfa..2bead243c3 100644 --- a/locale/ja/app.utils.json +++ b/locale/ja/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "バックアップフレーズ", "base58Seed": "Encoded backup phrase", "encodedSeed": "エンコードされたシード", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "秘密鍵", "publicKey": "公開鍵", @@ -888,6 +888,7 @@ "cell6": "公共のWi-Fiに接続している時、または自分以外のデバイスを使用する際、あなたのウォレットにはアクセスしないでください。", "nextButton": "理解しました", "p1": "最も一般的な詐欺の方法の一つがフィッシングです。Facebookやウェブサイト上で公式に似たページを偽造するケースが多いです。", + "saveSeedButton": "Save your SEED phrase", "title": "あなたを詐欺師から守る方法" } } diff --git a/locale/ja/app.welcome.json b/locale/ja/app.welcome.json index 8a246ced4b..50c5fdab52 100644 --- a/locale/ja/app.welcome.json +++ b/locale/ja/app.welcome.json @@ -1,8 +1,7 @@ { "backupSeed": { "copySeed": "シードをコピー", - "warn": "あなたのお金を管理できるのはあなただけです。このアプリが削除された場合に備え、バックアップフレーズを保存してください。または", - "yourSeed": "あなたのシードフレーズ" + "warn": "あなたのお金を管理できるのはあなただけです。このアプリが削除された場合に備え、バックアップフレーズを保存してください。または" }, "createAccount": { "from": "アカウントを作成" @@ -148,6 +147,7 @@ "copyAddress": "アドレスをコピー", "copyright": "©2019 Waves Platform", "copyrightVordex": "© 2019 VORDEX", + "createAccount": "Create account", "createToken": "トークンを作成", "currentAccountName": "現在のアカウント名", "dashboard": "ダッシュボード", diff --git a/locale/ko/app.create.json b/locale/ko/app.create.json index 1771dcad3f..cc8fe834ff 100644 --- a/locale/ko/app.create.json +++ b/locale/ko/app.create.json @@ -2,12 +2,15 @@ "backupSeed": { "back": "이전 페이지로 돌아가세요", "copySeed": "이곳을 클릭하여 복사하세요", + "description": "Please be careful and never input your SEED into other sites, because your account will be compromised and you will lose all of your funds.", "needConfirm": "확인을 위해 다음 단계에서 백업 구절을 직접 입력해야 합니다.", "ok": "백업 구절을 저장했습니다", "or": "하거나", "saveSecret": "백업 구절 저장", + "seedPhrase": "Seed Phrase", "warn": "본인이 직접 자산을 관리해야 하며 앱이 삭제될 경우를 대비해 아래의 백업 구절을 반드시 저장하거나", - "writeSeed": "아래 15개의 단어를 직접 메모" + "writeSeed": "아래 15개의 단어를 직접 메모", + "yourSeed": "귀하의 SEED 구절" }, "confirmBackup": { "again": "다시 순서대로 클릭하세요", @@ -74,5 +77,9 @@ "or": "또는", "skip": "다음에 하기", "title": "백업하지 않으면 자산을 모두 잃을 수 있습니다" + }, + "seed": { + "copyToClipboard": "Copy to clipboard", + "saveToFile": "Save to file" } } \ No newline at end of file diff --git a/locale/ko/app.dex.json b/locale/ko/app.dex.json index 64c0006ee0..2ed1a18269 100644 --- a/locale/ko/app.dex.json +++ b/locale/ko/app.dex.json @@ -45,6 +45,8 @@ "fee": "수수료 {{fee}} WAVES", "hasScript": "거래하기 위해 [Script](https://docs.wavesplatform.com/en/waves-client/advanced_features/script_transaction.html)를 취소하세요", "last": "체결가", + "limit": "Limit Order", + "market": "Market Order", "matcherFee": "수수료", "notifications": { "error": { diff --git a/locale/ko/app.utils.json b/locale/ko/app.utils.json index bcd038792a..d574f5c4ac 100644 --- a/locale/ko/app.utils.json +++ b/locale/ko/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "백업 구절", "base58Seed": "Encoded backup phrase", "encodedSeed": "암호화된 백업 구절", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "프라이빗 키", "publicKey": "퍼블릭 키", @@ -888,6 +888,7 @@ "cell6": "공용 Wi-Fi 또는 타인의 장치를 사용하여 지갑에 액세스하지 마세요.", "nextButton": "모두 이해했습니다", "p1": "가장 일반적인 형태의 사기 중 하나는 피싱입니다. 이는 사기꾼들이 Facebook이나 다른 웹사이트에서 실제의 것과 아주 흡사한 가짜 커뮤니티를 만드는 것입니다.", + "saveSeedButton": "Save your SEED phrase", "title": "피싱으로부터 자신을 보호하는 방법" } } diff --git a/locale/ko/app.welcome.json b/locale/ko/app.welcome.json index 188e176c06..efe319523a 100644 --- a/locale/ko/app.welcome.json +++ b/locale/ko/app.welcome.json @@ -1,8 +1,7 @@ { "backupSeed": { "copySeed": "SEED 구절 복사", - "warn": "귀하의 자산은 본인만 통제할 수 있습니다. 앱이 삭제될 경우를 대비해 반드시 백업 구절을 저장해야 합니다.", - "yourSeed": "귀하의 SEED 구절" + "warn": "귀하의 자산은 본인만 통제할 수 있습니다. 앱이 삭제될 경우를 대비해 반드시 백업 구절을 저장해야 합니다." }, "createAccount": { "from": "계정 생성" @@ -148,6 +147,7 @@ "copyAddress": "주소 복사", "copyright": "© 2019 Waves 플랫폼", "copyrightVordex": "© 2019 VORDEX", + "createAccount": "Create account", "createToken": "토큰 생성", "currentAccountName": "Current account name", "dashboard": "대시보드", diff --git a/locale/nl_NL/app.create.json b/locale/nl_NL/app.create.json index e23230d2aa..fd2bb9706a 100644 --- a/locale/nl_NL/app.create.json +++ b/locale/nl_NL/app.create.json @@ -2,12 +2,15 @@ "backupSeed": { "back": "terug", "copySeed": "kopieer ze", + "description": "Please be careful and never input your SEED into other sites, because your account will be compromised and you will lose all of your funds.", "needConfirm": "U bevestigt deze zin op het volgende scherm.", "ok": "Ik heb het opgeschreven", "or": "of", "saveSecret": "Bewaar back-up regel", + "seedPhrase": "Seed Phrase", "warn": "Omdat alleen u uw geld beheert, moet u uw back-up regel bewaren voor het geval deze app wordt verwijderd of", - "writeSeed": "Noteer deze 15 woorden zorgvuldig" + "writeSeed": "Noteer deze 15 woorden zorgvuldig", + "yourSeed": "Uw backup regel" }, "confirmBackup": { "again": "en tik opnieuw", @@ -74,5 +77,9 @@ "or": "of", "skip": "Doe het later", "title": "Geen Backup, Geen Geld" + }, + "seed": { + "copyToClipboard": "Copy to clipboard", + "saveToFile": "Save to file" } } \ No newline at end of file diff --git a/locale/nl_NL/app.dex.json b/locale/nl_NL/app.dex.json index d1b56f5728..be711ca191 100644 --- a/locale/nl_NL/app.dex.json +++ b/locale/nl_NL/app.dex.json @@ -45,6 +45,8 @@ "fee": "Tarief {{fee}} WAVES", "hasScript": "Annuleer [script](https://docs.wavesplatform.com/en/waves-client/advanced_features/script_transaction.html) om te handelen", "last": "Laatste", + "limit": "Limit Order", + "market": "Market Order", "matcherFee": "Transactiekosten", "notifications": { "error": { diff --git a/locale/nl_NL/app.utils.json b/locale/nl_NL/app.utils.json index 5d1ccea3b8..5f2b51ee57 100644 --- a/locale/nl_NL/app.utils.json +++ b/locale/nl_NL/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "Backup regel", "base58Seed": "Gecodeerde back-upzin", "encodedSeed": "Gecodeerde seed", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Privésleutel", "publicKey": "Publieke sleutel", @@ -888,6 +888,7 @@ "cell6": "Gebruik uw Waves wallet niet terwijl u een publiek Wi-Fi netwerk of een apparaat van iemand anders gebruikt.", "nextButton": "Ik begrijp het", "p1": "De meest gebruikte manier van oplichting is phishing. Phishing houdt onder andere in dat oplichters neppe communities op Facebook of andere websites en platformen maken welke erg op de originele lijken.", + "saveSeedButton": "Save your SEED phrase", "title": "Hoe u zichzelf tegen phishing kunt beschermen" } } diff --git a/locale/nl_NL/app.welcome.json b/locale/nl_NL/app.welcome.json index 0bc7c620ab..e56efd4b8a 100644 --- a/locale/nl_NL/app.welcome.json +++ b/locale/nl_NL/app.welcome.json @@ -1,8 +1,7 @@ { "backupSeed": { "copySeed": "Kopieer backup regel", - "warn": "Omdat alleen u uw geld beheert, moet u uw back-up regel bewaren voor het geval deze app wordt verwijderd of", - "yourSeed": "Uw backup regel" + "warn": "Omdat alleen u uw geld beheert, moet u uw back-up regel bewaren voor het geval deze app wordt verwijderd of" }, "createAccount": { "from": "Maak een account aan" @@ -148,6 +147,7 @@ "copyAddress": "Kopieer adres", "copyright": "© 2019 Waves Platform", "copyrightVordex": "© 2019 VORDEX", + "createAccount": "Create account", "createToken": "Token maken", "currentAccountName": "Huidige accountnaam", "dashboard": "Dashboard", diff --git a/locale/pl/app.create.json b/locale/pl/app.create.json index 0af8151803..e67a9efe0a 100644 --- a/locale/pl/app.create.json +++ b/locale/pl/app.create.json @@ -2,12 +2,15 @@ "backupSeed": { "back": "wróć", "copySeed": "skopiuj", + "description": "Please be careful and never input your SEED into other sites, because your account will be compromised and you will lose all of your funds.", "needConfirm": "Potwierdzisz wygenerowaną frazę na następnym ekranie", "ok": "Zapisałem to", "or": "albo", "saveSecret": "Zapisz kopię zapasową wygenerowanej frazy", + "seedPhrase": "Seed Phrase", "warn": "Tylko ty kontrolujesz swoje pieniądze, stąd musisz zapisać swoją kopię zapasową frazy na wypadek gdyby aplikacja została usunięta lub", - "writeSeed": "Proszę dokładnie zapisać te 15 słów" + "writeSeed": "Proszę dokładnie zapisać te 15 słów", + "yourSeed": "Twoja fraza Seed" }, "confirmBackup": { "again": "i wybierz ponownie", @@ -74,5 +77,9 @@ "or": "albo", "skip": "Zrób to później", "title": "Brak kopii zapasowej grozi utratą zgromadzonych środków." + }, + "seed": { + "copyToClipboard": "Copy to clipboard", + "saveToFile": "Save to file" } } \ No newline at end of file diff --git a/locale/pl/app.dex.json b/locale/pl/app.dex.json index 7ade2bdc19..0eac057692 100644 --- a/locale/pl/app.dex.json +++ b/locale/pl/app.dex.json @@ -45,6 +45,8 @@ "fee": "prowizja {{fee}} WAVES", "hasScript": "Anuluj [script](https://docs.wavesplatform.com/en/waves-client/advanced_features/script_transaction.html) by handlować", "last": "Ostatni", + "limit": "Limit Order", + "market": "Market Order", "matcherFee": "Prowizja", "notifications": { "error": { diff --git a/locale/pl/app.utils.json b/locale/pl/app.utils.json index b0824127b5..0c95cd73ee 100644 --- a/locale/pl/app.utils.json +++ b/locale/pl/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "Kopia zapasowa wyrażenia", "base58Seed": "Encoded backup phrase", "encodedSeed": "Zakodowany SEED", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Klucz prywatny", "publicKey": "Klucz publiczny", @@ -888,6 +888,7 @@ "cell6": "Nie wchodź na swój portfel korzystając z publicznego Wi-FI lub innego obcego urządzenia.", "nextButton": "Rozumiem", "p1": "Jedną z najczęstszych form oszustw jest phishing, czyli oszuści tworzą fałszywe społeczności na Facebooku lub innych stronach, które wyglądają podobnie do autentycznych.", + "saveSeedButton": "Save your SEED phrase", "title": "Jak uchronić się przed phishingiem" } } diff --git a/locale/pl/app.welcome.json b/locale/pl/app.welcome.json index 7bde04076f..21d5773550 100644 --- a/locale/pl/app.welcome.json +++ b/locale/pl/app.welcome.json @@ -1,8 +1,7 @@ { "backupSeed": { "copySeed": "Skopiuj wyrażenie Seed", - "warn": "Tylko ty kontrolujesz swoje pieniądze, stąd musisz zapisać swoją kopię zapasową frazy Seed, na wypadek gdyby aplikacja została usunięta lub", - "yourSeed": "Twoja fraza Seed" + "warn": "Tylko ty kontrolujesz swoje pieniądze, stąd musisz zapisać swoją kopię zapasową frazy Seed, na wypadek gdyby aplikacja została usunięta lub" }, "createAccount": { "from": "Utwórz konto" @@ -148,6 +147,7 @@ "copyAddress": "Kopiuj adres", "copyright": "© 2019 Waves Platform", "copyrightVordex": "© 2019 VORDEX", + "createAccount": "Create account", "createToken": "Utwórz token", "currentAccountName": "Obecna nazwa konta", "dashboard": "Dashboard", diff --git a/locale/pt_BR/app.create.json b/locale/pt_BR/app.create.json index fe08af239a..90a8555b84 100644 --- a/locale/pt_BR/app.create.json +++ b/locale/pt_BR/app.create.json @@ -2,12 +2,15 @@ "backupSeed": { "back": "voltar", "copySeed": "copiar", + "description": "Please be careful and never input your SEED into other sites, because your account will be compromised and you will lose all of your funds.", "needConfirm": "Você irá confirmar esta frase na próxima tela.", "ok": "Eu anotei isso em um local seguro", "or": "ou", "saveSecret": "Salvar frase de backup", + "seedPhrase": "Seed Phrase", "warn": "Como apenas você controla o seu dinheiro, é necessário salvar sua frase de backup (SEED), caso esse aplicativo seja excluído ou", - "writeSeed": "Por favor, anote cuidadosamente estas 15 palavras" + "writeSeed": "Por favor, anote cuidadosamente estas 15 palavras", + "yourSeed": "Your Seed phrase" }, "confirmBackup": { "again": "e clique novamente", @@ -74,5 +77,9 @@ "or": "ou", "skip": "Fazer isso depois", "title": "Sem backup, sem dinheiro" + }, + "seed": { + "copyToClipboard": "Copy to clipboard", + "saveToFile": "Save to file" } } \ No newline at end of file diff --git a/locale/pt_BR/app.dex.json b/locale/pt_BR/app.dex.json index 810635b2ad..7a483844c8 100644 --- a/locale/pt_BR/app.dex.json +++ b/locale/pt_BR/app.dex.json @@ -45,6 +45,8 @@ "fee": "Taxa {{fee}} WAVES", "hasScript": "Cancelar [script](https://docs.wavesplatform.com/en/waves-client/advanced_features/script_transaction.html) para negociação", "last": "Last", + "limit": "Limit Order", + "market": "Market Order", "matcherFee": "Fee", "notifications": { "error": { diff --git a/locale/pt_BR/app.utils.json b/locale/pt_BR/app.utils.json index 6ffb016790..281805a43e 100644 --- a/locale/pt_BR/app.utils.json +++ b/locale/pt_BR/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "Frase de Backup", "base58Seed": "Encoded backup phrase", "encodedSeed": "Seed codificado", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Chave Privada", "publicKey": "Chave Pública", @@ -888,6 +888,7 @@ "cell6": "Não acesse sua carteira ao usar Wi-Fi público ou o dispositivo de outras pessoas.", "nextButton": "Eu Entendi", "p1": "Uma das formas mais comuns de golpes é o phishing, que é quando os golpistas criam comunidades falsas no Facebook ou sites semelhantes aos oficiais.", + "saveSeedButton": "Save your SEED phrase", "title": "Como se proteger de Phishers" } } diff --git a/locale/pt_BR/app.welcome.json b/locale/pt_BR/app.welcome.json index 8a7548453a..cba10d0338 100644 --- a/locale/pt_BR/app.welcome.json +++ b/locale/pt_BR/app.welcome.json @@ -1,8 +1,7 @@ { "backupSeed": { "copySeed": "Copy Seed phrase", - "warn": "Since only you control your money, you’ll need to save your Seed phrase in case this app is deleted or", - "yourSeed": "Your Seed phrase" + "warn": "Since only you control your money, you’ll need to save your Seed phrase in case this app is deleted or" }, "createAccount": { "from": "createAccount" @@ -148,6 +147,7 @@ "copyAddress": "Copy address", "copyright": "© 2019 Waves Platform", "copyrightVordex": "© 2019 VORDEX", + "createAccount": "Create account", "createToken": "Create token", "currentAccountName": "Current account name", "dashboard": "Dashboard", diff --git a/locale/pt_PT/app.create.json b/locale/pt_PT/app.create.json index efc60fe60a..db2b92d1e0 100644 --- a/locale/pt_PT/app.create.json +++ b/locale/pt_PT/app.create.json @@ -2,12 +2,15 @@ "backupSeed": { "back": "go back", "copySeed": "copy them", + "description": "Please be careful and never input your SEED into other sites, because your account will be compromised and you will lose all of your funds.", "needConfirm": "You will confirm this phrase on the next screen.", "ok": "I’ve written it down", "or": "or", "saveSecret": "Save backup phrase", + "seedPhrase": "Seed Phrase", "warn": "Since only you control your money, you’ll need to save your backup phrase in case this app is deleted or", - "writeSeed": "Please carefully write down these 15 words" + "writeSeed": "Please carefully write down these 15 words", + "yourSeed": "Your Seed phrase" }, "confirmBackup": { "again": "and tap again", @@ -74,5 +77,9 @@ "or": "or", "skip": "Do it later", "title": "No Backup, No Money" + }, + "seed": { + "copyToClipboard": "Copy to clipboard", + "saveToFile": "Save to file" } } \ No newline at end of file diff --git a/locale/pt_PT/app.dex.json b/locale/pt_PT/app.dex.json index 60826cd1aa..fdefb0cd25 100644 --- a/locale/pt_PT/app.dex.json +++ b/locale/pt_PT/app.dex.json @@ -45,6 +45,8 @@ "fee": "Fee {{fee}} WAVES", "hasScript": "Cancel [script](https://docs.wavesplatform.com/en/waves-client/advanced_features/script_transaction.html) to trade", "last": "Last", + "limit": "Limit Order", + "market": "Market Order", "matcherFee": "Fee", "notifications": { "error": { diff --git a/locale/pt_PT/app.utils.json b/locale/pt_PT/app.utils.json index faad0b9430..fe4af26c68 100644 --- a/locale/pt_PT/app.utils.json +++ b/locale/pt_PT/app.utils.json @@ -695,7 +695,7 @@ }, "ok": "Sign in", "pairing": { - "devicePairing": "Export account", + "devicePairing": "Export account to app", "header": "Scan Pairing Code", "showCodeLink": "Show Pairing Code", "unavailable": { @@ -717,7 +717,7 @@ "backupPhrase": "Backup phrase", "base58Seed": "Encoded backup phrase", "encodedSeed": "Encoded seed", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Private key", "publicKey": "Public Key", @@ -888,6 +888,7 @@ "cell6": "Do not access your wallet when using public Wi-Fi or someone else’s device.", "nextButton": "I Understand", "p1": "One of the most common forms of scamming is phishing, which is when scammers create fake communities on Facebook or other websites that look similar to the authentic ones.", + "saveSeedButton": "Save your SEED phrase", "title": "How To Protect Yourself from Phishers" } } diff --git a/locale/pt_PT/app.welcome.json b/locale/pt_PT/app.welcome.json index 3ac96143ed..19dd5f568e 100644 --- a/locale/pt_PT/app.welcome.json +++ b/locale/pt_PT/app.welcome.json @@ -1,8 +1,7 @@ { "backupSeed": { "copySeed": "Copy Seed phrase", - "warn": "Since only you control your money, you’ll need to save your Seed phrase in case this app is deleted or", - "yourSeed": "Your Seed phrase" + "warn": "Since only you control your money, you’ll need to save your Seed phrase in case this app is deleted or" }, "createAccount": { "from": "createAccount" @@ -148,6 +147,7 @@ "copyAddress": "Copy address", "copyright": "© 2019 Waves Platform", "copyrightVordex": "© 2019 VORDEX", + "createAccount": "Create account", "createToken": "Create token", "currentAccountName": "Current account name", "dashboard": "Dashboard", diff --git a/locale/ru/app.create.json b/locale/ru/app.create.json index b5c356af62..2cfe30756a 100644 --- a/locale/ru/app.create.json +++ b/locale/ru/app.create.json @@ -2,12 +2,15 @@ "backupSeed": { "back": " вернуться назад", "copySeed": "скопируйте их", + "description": "Будьте осторожны и никогда не вводите свой СИД на других сайтах, потому что ваша учетная запись будет скомпрометирована, и вы потеряете все свои деньги.", "needConfirm": "Вам нужно будет восстановить эту фразу на следующем шаге.", "ok": "Я всё записал", "or": "или", "saveSecret": "Сохранение секретной фразы", + "seedPhrase": "СИД", "warn": "Посколько только вы контролируете ваши деньги, вам необходимо сохранить секретную фразу или", - "writeSeed": "Пожалуйста, внимательно запишите эти 15 слов" + "writeSeed": "Пожалуйста, внимательно запишите эти 15 слов", + "yourSeed": "Your Seed phrase" }, "confirmBackup": { "again": "и попробовать снова", @@ -74,5 +77,9 @@ "or": "или", "skip": "Сделать это позже", "title": "Нет бэкапа — нет денег" + }, + "seed": { + "copyToClipboard": "Скопировать", + "saveToFile": "Сохранить в файл" } } \ No newline at end of file diff --git a/locale/ru/app.dex.json b/locale/ru/app.dex.json index de75e50684..84a038b7f7 100644 --- a/locale/ru/app.dex.json +++ b/locale/ru/app.dex.json @@ -45,6 +45,8 @@ "fee": "Комис. {{fee}} WAVES", "hasScript": "Отмените [скрипт](https://docs.wavesplatform.com/en/waves-client/advanced_features/script_transaction.html) чтобы торговать", "last": "Last", + "limit": "Лимит Ордер", + "market": "Маркет Ордер", "matcherFee": "Комис.", "notifications": { "error": { diff --git a/locale/ru/app.utils.json b/locale/ru/app.utils.json index 6a333e66fa..773cf2333d 100644 --- a/locale/ru/app.utils.json +++ b/locale/ru/app.utils.json @@ -610,7 +610,7 @@ "notEnoughFunds": "У вас недостаточно средств для оплаты комиссии. Вам необходимо оплатить комиссию за транзакцию {{fee, money-currency}}.", "notEnoughFundsWithdraw": "У вас недостаточно средств для отправки транзакции. Вам необходимо оплатить комиссию за транзакцию {{fee, money-currency}} и комиссию шлюза {{getawayFee, BigNumber}} {{currency}}. Минимальная сумма для отправки составляет {{minGatewayAmount, BigNumber}} {{currency}}." }, - "withdrawTitle": "Withdraw" + "withdrawTitle": "Вывод" }, "sepa": { "countryList": "Список допустимых стран и ID", @@ -695,7 +695,7 @@ }, "ok": "Sign in", "pairing": { - "devicePairing": "Экспортировать аккаунт", + "devicePairing": "Экспорт аккаунта в приложение", "header": "Отсканируйте QR-код", "showCodeLink": "Показать QR-код", "unavailable": { @@ -717,7 +717,7 @@ "backupPhrase": "Секретная фраза", "base58Seed": "Закодированная секретная фраза", "encodedSeed": "Зашифрованная секретная фраза", - "exportAccount": "Экспортировать аккаунт", + "exportAccount": "Экспорт аккаунта в файл", "id": "ID аккаунта", "privateKey": "Приватный ключ", "publicKey": "Публичный ключ", @@ -888,6 +888,7 @@ "cell6": "Не заходите в кошелёк, используя общественный Wi-Fi или с чужого устройства.", "nextButton": "Я понял", "p1": "Одним из распространённых видов мошенничества является фишинг — мошенники создают фальшивые группы в Facebook, сайты, внешне похожие на настоящие.", + "saveSeedButton": "Сохраните СИД", "title": "Как защититься от фишинга" } } diff --git a/locale/ru/app.welcome.json b/locale/ru/app.welcome.json index a90d62189a..7286957c1d 100644 --- a/locale/ru/app.welcome.json +++ b/locale/ru/app.welcome.json @@ -1,8 +1,7 @@ { "backupSeed": { "copySeed": "Copy Seed phrase", - "warn": "Since only you control your money, you’ll need to save your Seed phrase in case this app is deleted or", - "yourSeed": "Your Seed phrase" + "warn": "Since only you control your money, you’ll need to save your Seed phrase in case this app is deleted or" }, "createAccount": { "from": "createAccount" @@ -148,6 +147,7 @@ "copyAddress": "Скопировать", "copyright": "© 2019 Waves Platform", "copyrightVordex": "© 2019 VORDEX", + "createAccount": "Создать аккаунт", "createToken": "Создать токен", "currentAccountName": "Имя вашего аккаунта", "dashboard": "Обзор", diff --git a/locale/tr/app.create.json b/locale/tr/app.create.json index 411adef960..d5bf4c0f01 100644 --- a/locale/tr/app.create.json +++ b/locale/tr/app.create.json @@ -2,12 +2,15 @@ "backupSeed": { "back": "Geri git", "copySeed": "kelimeleri kopyalayın", + "description": "Please be careful and never input your SEED into other sites, because your account will be compromised and you will lose all of your funds.", "needConfirm": "Bu kelimeleri bir sonraki ekranda doğrulayacaksınız", "ok": "Hepsini bir kenera yazdım", "or": "veya", "saveSecret": "Geri yükleme kelimelerini kaydedin", + "seedPhrase": "Seed Phrase", "warn": "Kripto paralarınızın kontrolü sizdedir. Uygulamanın silinmesi durumunda geri yükleme kelimelerine ihtiyaç duyacaksınız.", - "writeSeed": "15 kelimeyi eksiksiz ve hatasız olarak saklayın" + "writeSeed": "15 kelimeyi eksiksiz ve hatasız olarak saklayın", + "yourSeed": "Anahtar kelimeleriniz" }, "confirmBackup": { "again": "ve tekrar basın", @@ -74,5 +77,9 @@ "or": "veya", "skip": "Daha sonra yapacağım", "title": "Yedek yoksa cüzdan da yok!" + }, + "seed": { + "copyToClipboard": "Copy to clipboard", + "saveToFile": "Save to file" } } \ No newline at end of file diff --git a/locale/tr/app.dex.json b/locale/tr/app.dex.json index 3706e128ea..e66eb72851 100644 --- a/locale/tr/app.dex.json +++ b/locale/tr/app.dex.json @@ -45,6 +45,8 @@ "fee": "Komisyon {{fee}} WAVES", "hasScript": "Takas yapabilmek için [script]'i(https://docs.wavesplatform.com/en/waves-client/advanced_features/script_transaction.html) iptal edin", "last": "Son", + "limit": "Limit Order", + "market": "Market Order", "matcherFee": "Komisyon", "notifications": { "error": { diff --git a/locale/tr/app.utils.json b/locale/tr/app.utils.json index 37c63675c4..c6038078e1 100644 --- a/locale/tr/app.utils.json +++ b/locale/tr/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "Anahtar (Yedek) kelimeler", "base58Seed": "Encoded backup phrase", "encodedSeed": "Encoded Anahtar kelimeler", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Özel Anahtar", "publicKey": "Açık Anahtar", @@ -888,6 +888,7 @@ "cell6": "Başka birisinin cihazından veya halka açık alanlardaki Wİ-Fİ hizmetlerinden cüzdanınıza erişim sağlamayın.", "nextButton": "Anladım", "p1": "En sık karşılaşılan dolandırıcılık yöntemi Waves Platform'a benzeyen sahte web siteleri, Facebook sayfaları olarak karşımıza çıkmaktadır.", + "saveSeedButton": "Save your SEED phrase", "title": "Kendinizi nasıl koruyacaksınız?" } } diff --git a/locale/tr/app.welcome.json b/locale/tr/app.welcome.json index 8df1d1032b..7069812a91 100644 --- a/locale/tr/app.welcome.json +++ b/locale/tr/app.welcome.json @@ -1,8 +1,7 @@ { "backupSeed": { "copySeed": "Anahtar Kelimeleri Kopyala", - "warn": "Hesabınızı sadece siz kontrol edersiniz. Uygulamanın silinmesi durumuna karşı Anahtar kelimelerinizi mutlaka kaydedin.", - "yourSeed": "Anahtar kelimeleriniz" + "warn": "Hesabınızı sadece siz kontrol edersiniz. Uygulamanın silinmesi durumuna karşı Anahtar kelimelerinizi mutlaka kaydedin." }, "createAccount": { "from": "Hesap Oluştur" @@ -148,6 +147,7 @@ "copyAddress": "Adresi kopyala", "copyright": "© 2019 Waves Platform", "copyrightVordex": "© 2019 VORDEX", + "createAccount": "Create account", "createToken": "Kripto para oluştur", "currentAccountName": "Şu anki hesap adı", "dashboard": "Panel", diff --git a/locale/zh_CN/app.create.json b/locale/zh_CN/app.create.json index 518f4b8c1c..3cab9c5ac9 100644 --- a/locale/zh_CN/app.create.json +++ b/locale/zh_CN/app.create.json @@ -2,12 +2,15 @@ "backupSeed": { "back": "返回", "copySeed": "复制", + "description": "请小心，切勿将SEED输入其他站点，因为您的帐户将被盗用，并且您将损失所有资金。", "needConfirm": "您需要在下一个页面确认备份短语（助记词）", "ok": "我已经写下短语", "or": "或", "saveSecret": "储存备份短语", + "seedPhrase": "种子短语", "warn": "唯一能够掌控资产的是您，您需要储蓄备份短语（助记词）以防该应用钱包丢失 或", - "writeSeed": "请仔细的写下这15个短语" + "writeSeed": "请仔细的写下这15个短语", + "yourSeed": "你的种子短语" }, "confirmBackup": { "again": "并且再次点击", @@ -74,5 +77,9 @@ "or": "或", "skip": "稍后再做", "title": "没有备份，数字资产将会丢失" + }, + "seed": { + "copyToClipboard": "复制到剪贴板", + "saveToFile": "保存到文件" } } \ No newline at end of file diff --git a/locale/zh_CN/app.dex.json b/locale/zh_CN/app.dex.json index e706f31eb2..f8e6fe28e7 100644 --- a/locale/zh_CN/app.dex.json +++ b/locale/zh_CN/app.dex.json @@ -45,6 +45,8 @@ "fee": "费用 {{fee}} WAVES", "hasScript": "取消[脚本]（https://docs.wavesplatform.com/en/waves-client/advanced_features/script_transaction.html）进行交易", "last": "最新交易价", + "limit": "限价单", + "market": "市场订单", "matcherFee": "费用", "notifications": { "error": { diff --git a/locale/zh_CN/app.import.json b/locale/zh_CN/app.import.json index 0dfeeb6641..35a1df20a5 100644 --- a/locale/zh_CN/app.import.json +++ b/locale/zh_CN/app.import.json @@ -1,28 +1,28 @@ { "back": "返回主页", "backupFile": { - "back": "go back", - "enterPasswordDescription": "Please enter your password or", - "helper": "You need to enter the password, which you used for the accounts exporting", + "back": "回去", + "enterPasswordDescription": "请输入您的密码或", + "helper": "您需要输入用于帐户导出的密码", "import": { - "accounts": "Accounts", - "emptyList": "There are no accounts for import in the uploaded file", - "importFailed": "Failed to import keystore file", - "noChosen": "No file chosen", - "selectAccount": "Select account", - "selectAccountDesc": "Please select account or", - "selectAll": "Select all", - "unselectAll": "Unselect all", - "wrongPassword": "Wrong password!" + "accounts": "帐目", + "emptyList": "在上传的文件中没有要导入的帐户", + "importFailed": "导入密钥库文件失败", + "noChosen": "没有选中任何文件", + "selectAccount": "选择帐号", + "selectAccountDesc": "请选择帐户或", + "selectAll": "全选", + "unselectAll": "全部取消选择", + "wrongPassword": "密码错误！" }, - "importFromFile": "Import account from Keystore File", - "importFromFileDescription": "Choose your JSON file and click Import or", - "name": "Keystore File", - "next": "Continue", - "password": "Password", - "selectFileBtn": "Choose file" + "importFromFile": "从密钥库文件导入帐户", + "importFromFileDescription": "选择您的JSON文件，然后单击导入或", + "name": "密钥库文件", + "next": "继续", + "password": "密码", + "selectFileBtn": "选择文件" }, - "backupFileDescription": "Import account from Keystore File", + "backupFileDescription": "从密钥库文件导入帐户", "import": { "signIn": "登录" }, @@ -37,7 +37,7 @@ "seedAndKey": { "name": "种子或钥匙" }, - "seedAndKeyDescription": "从备份SEED或私钥导入帐户", + "seedAndKeyDescription": "从SEED或私钥导入帐户", "selectButton": "选择", "wavesClient": "Waves客户端", "wavesClientDescription": "从Waves客户端导入帐户", diff --git a/locale/zh_CN/app.restore.json b/locale/zh_CN/app.restore.json index ae289f49be..7d947b8c06 100644 --- a/locale/zh_CN/app.restore.json +++ b/locale/zh_CN/app.restore.json @@ -60,7 +60,7 @@ "seedTitle": "种子短语", "title": "从种子或密钥导入" }, - "seedTab": "种子短语", + "seedTab": "种子词组", "warningSeed": { "message": "确保您不要将短语与钱包地址混淆。使用地址作为SEED短语可能导致资金损失。 SEED短语必须由15个单词组成，每个单词之间有空格。", "title": "您输入的SEED短语太短。" diff --git a/locale/zh_CN/app.signUp.json b/locale/zh_CN/app.signUp.json index c9dfc81ea3..84437a3dee 100644 --- a/locale/zh_CN/app.signUp.json +++ b/locale/zh_CN/app.signUp.json @@ -11,6 +11,6 @@ "password": { "notMatch": "密码不匹配" }, - "termsAgreement": "我已阅读并同意[条款和条件](https://wavesplatform.com/files/docs/Waves_terms_and_conditions.pdf)，[隐私政策](https://wavesplatform.com/files/docs/Privacy_Policy_SW.pdf)。" + "termsAgreement": "我已阅读并同意[条款和条件]（https://wavesplatform.com/files/docs/Waves_terms_and_conditions.pdf），[隐私权政策]（https://wavesplatform.com/files/docs/Privacy_Policy_SW.pdf ）。" } } \ No newline at end of file diff --git a/locale/zh_CN/app.ui.json b/locale/zh_CN/app.ui.json index e03eb3175b..74e340d1c7 100644 --- a/locale/zh_CN/app.ui.json +++ b/locale/zh_CN/app.ui.json @@ -127,7 +127,7 @@ "errorBlocks": { "title": "出了些问题…" }, - "importSuccess": "Account Importing from the Keystore File was successful", + "importSuccess": "从密钥库文件导入帐户成功", "modal": { "assetInfo": { "gateway_ui": "出入口" @@ -197,7 +197,7 @@ "true": "完成" }, "headers": { - "activeLeasing": "现在是有效的", + "activeLeasing": "现在激活", "burn": "{{name}}代币消除", "cancel-leasing": "取消的租赁", "canceled": "取消", diff --git a/locale/zh_CN/app.utils.json b/locale/zh_CN/app.utils.json index bcb61d1f5b..9fcb1bf7f0 100644 --- a/locale/zh_CN/app.utils.json +++ b/locale/zh_CN/app.utils.json @@ -638,11 +638,11 @@ "changePass": "更改密码", "deleteAccount": "删除帐号", "exportAccounts": { - "accounts": "Accounts", - "export": "Export", - "selectAll": "Select all", - "title": "Please select account", - "unselectAll": "Unselect all" + "accounts": "帐户", + "export": "输出", + "selectAll": "全选", + "title": "请选择帐号", + "unselectAll": "全部取消选择" }, "general": { "auto": "Auto", @@ -661,7 +661,7 @@ "title": "常规设置", "white": "白色" }, - "helperContent": "You can set a password for exported accounts", + "helperContent": "您可以为导出的帐户设置密码", "info": { "legal": "法律", "privacyPolicy": "隐私政策", @@ -695,7 +695,7 @@ }, "ok": "登录", "pairing": { - "devicePairing": "导出帐户", + "devicePairing": "将帐户导出到应用", "header": "扫描配对码", "showCodeLink": "显示配对码", "unavailable": { @@ -717,11 +717,11 @@ "backupPhrase": "备份短语", "base58Seed": "编码备份短语", "encodedSeed": "编码的SEED", - "exportAccount": "Export account", + "exportAccount": "将帐户导出到文件", "id": "帐户ID", "privateKey": "私钥", "publicKey": "公钥", - "savejson": "Save as JSON file", + "savejson": "另存为JSON文件", "script": "脚本", "scriptButton": "设置脚本", "scriptButtonUpdate": "更新脚本", @@ -816,7 +816,7 @@ "analytics": "我想向开发者发送匿名统计信息来帮助改善Waves平台。", "backup": "我了解如果此应用移至其他设备或已删除，我的Waves账户只能通过备份短语（助记词）进行恢复。", "ok": "确认并开始", - "privacyPolicy": "我已阅读并同意[隐私政策](https://wavesplatform.com/files/docs/Privacy_Policy_SW.pdf)。", + "privacyPolicy": "我已阅读并同意[隐私权政策]（https://wavesplatform.com/files/docs/Privacy_Policy_SW.pdf）。", "read": "我已阅读、理解并同意", "readTermsAndConditions": "我已阅读，理解并同意[条款和细则]（https://wavesplatform.com/files/docs/Waves_terms_and_conditions.pdf）", "security": "我了解我的资产安全地存放在此设备上，而不是存放于公司", @@ -888,6 +888,7 @@ "cell6": "使用公共Wi-Fi或其他人的设备时请勿访问您的钱包。", "nextButton": "我了解", "p1": "诈骗最常见的攻击方式之一是网络钓鱼，一般钓鱼者在Facebook或其他类似于真实的网站上创建假社群。", + "saveSeedButton": "保存您的SEED短语", "title": "如何防止网络钓鱼攻击" } } @@ -968,7 +969,7 @@ "1_3_7": "{span.line} [1。与[tokenrating.wavesexplorer.com]集成（https://tokenrating.wavesexplorer.com）现在您可以直接在应用程序中对令牌进行评分。 \n {span.line} [2。其他小错误已得到修复。]", "1_3_9": "{span.line} [1。改进了Exchange和电子钱包部分的UI和功能。] \n {span.line} [2。其他小错误已得到修复。]", "1_4_0": "{span.line} [增加了在一个钱包内轻松切换帐户的功能。]", - "1_4_4": "{span.line}[Added ability to backup and restore accounts from the keystore-file]" + "1_4_4": "{span.line} [增加了从密钥库文件备份和还原帐户的功能]" }, "title": "此更新 {{version}}中的新功能" } diff --git a/locale/zh_CN/app.wallet.portfolio.json b/locale/zh_CN/app.wallet.portfolio.json index 9817b75be4..48afd15e22 100644 --- a/locale/zh_CN/app.wallet.portfolio.json +++ b/locale/zh_CN/app.wallet.portfolio.json @@ -3,7 +3,7 @@ "burn": "代币消除", "deposit": "存款", "dex": "打开在DEX上", - "hasNftToken": "帐户具有不可替代的代币[（NFT）]（https://wavesexplorer.com/address/{{address}}/nft）", + "hasNftToken": "帐户具有不可替代的令牌[（NFT）]（https://wavesexplorer.com/address/ {{address}} / nft）", "info": "资产信息", "list": { "actions": "操作", diff --git a/locale/zh_CN/app.welcome.json b/locale/zh_CN/app.welcome.json index 27467ddd8f..885d0f2028 100644 --- a/locale/zh_CN/app.welcome.json +++ b/locale/zh_CN/app.welcome.json @@ -1,8 +1,7 @@ { "backupSeed": { "copySeed": "复制种子短语", - "warn": "由于只有你控制你的钱，你需要保存您的种子短语，以防该应用程序被删除或", - "yourSeed": "你的种子短语" + "warn": "由于只有你控制你的钱，你需要保存您的种子短语，以防该应用程序被删除或" }, "createAccount": { "from": "创建帐号" @@ -148,6 +147,7 @@ "copyAddress": "复制地址", "copyright": "©2019年波浪幣平台", "copyrightVordex": "©2019 VORDEX", + "createAccount": "创建帐号", "createToken": "创建令牌", "currentAccountName": "当前帐户名称", "dashboard": "仪表板", diff --git a/package-lock.json b/package-lock.json index e473154258..25c9e950a8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "waves-client", - "version": "1.4.4", + "version": "1.4.5", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -851,9 +851,9 @@ "integrity": "sha512-cbjnqkhKBHKtzQCUsqwK4c3im90BTVdho7ZSM2nq7K5Z7al93qC/qp6Q7Ts2SMXGlGQFu4C2SzU7q62n2wmPEQ==" }, "@waves/signature-adapter": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@waves/signature-adapter/-/signature-adapter-5.6.0.tgz", - "integrity": "sha512-LAFuSl7ye7QexKhLu/FsEW4OSlPD1rjAjTHcbDnhxeY+DJjtnafk69Y49BlpPqq2z4Bblu31BPMj4WSJE2OQyQ==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/@waves/signature-adapter/-/signature-adapter-5.6.1.tgz", + "integrity": "sha512-YIyETSryEXja36pjFzyZW/ESY7X8OkXpkkosujsj7kfhA8LqFb6H8kU2ue9J6qnm54CmjT0gbEC3sWEHhqMqOQ==", "requires": { "@types/ramda": "^0.25.46", "@waves/bignumber": "^0.0.1", @@ -861,7 +861,7 @@ "@waves/ledger": "^3.5.1", "@waves/money-like-to-node": "0.0.10", "@waves/ts-types": "^0.2.0", - "@waves/waves-transactions": "^3.18.0", + "@waves/waves-transactions": "^3.20.2", "ramda": "^0.25.0" }, "dependencies": { @@ -876,22 +876,23 @@ "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==", + "version": "3.20.2", + "resolved": "https://registry.npmjs.org/@waves/waves-transactions/-/waves-transactions-3.20.2.tgz", + "integrity": "sha512-aC3ef0kjjtB3wBZMCMv7emeVYaRkJJl0y62W6Dc0xmZC1k6G6WPD710tXCw0XpMjSHRT71uXv9Ko5e3YltGq6w==", "requires": { "@waves/marshall": "^0.8.0", - "@waves/ts-lib-crypto": "^1.1.1", + "@waves/ts-lib-crypto": "^1.3.1", "axios": "^0.19.0" } } } }, "@waves/ts-lib-crypto": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@waves/ts-lib-crypto/-/ts-lib-crypto-1.1.1.tgz", - "integrity": "sha512-rU4NOa2agwpQmDAomnU2NSbnla3XvEL8PJB4hn8pKWqVxnfcyL4OwxgSUPhLZsV4SQgWasDqBpaLB3mVYf/QRA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@waves/ts-lib-crypto/-/ts-lib-crypto-1.3.1.tgz", + "integrity": "sha512-6FQEAwGFPsFNcZ84ICP7MpLydttQimOZeRKq1nGqyFTLbzgFpPPs3bpFcTuGuf8r6jYOrGANA6xw6cMN/YrgTg==", "requires": { + "js-sha3": "^0.8.0", "node-forge": "^0.8.5" } }, diff --git a/package.json b/package.json index 8f49a8c77b..04b402aad9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "waves-client", - "version": "1.4.4", + "version": "1.4.6", "description": "The official client application for the Waves platform", "private": true, "repository": { @@ -111,7 +111,7 @@ "@waves/marshall": "^0.8.0", "@waves/oracle-data": "^0.0.6", "@waves/parse-json-bignumber": "^1.0.1", - "@waves/signature-adapter": "^5.6.0", + "@waves/signature-adapter": "^5.6.1", "@waves/ts-types": "0.0.2", "@waves/waves-browser-bus": "^0.1.5", "@waves/waves-transactions": "^3.18.1", diff --git a/src/img/icons/dark/import-keystore-file-dark.svg b/src/img/icons/dark/import-keystore-file-dark.svg new file mode 100644 index 0000000000..a5ba926c74 --- /dev/null +++ b/src/img/icons/dark/import-keystore-file-dark.svg @@ -0,0 +1,21 @@ + + + + Icon/40/KeystoreFile-Dark + Created with Sketch. + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/img/icons/icon-removeacc.svg b/src/img/icons/icon-removeacc.svg index 9be3a96934..886b1c8c0f 100644 --- a/src/img/icons/icon-removeacc.svg +++ b/src/img/icons/icon-removeacc.svg @@ -1,8 +1,6 @@ - - - - + + diff --git a/src/img/icons/logo-ledger-white.svg b/src/img/icons/logo-ledger-white.svg new file mode 100644 index 0000000000..93fc91f17d --- /dev/null +++ b/src/img/icons/logo-ledger-white.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/img/icons/select-arrow-black.svg b/src/img/icons/select-arrow-black.svg new file mode 100644 index 0000000000..cd4024a26e --- /dev/null +++ b/src/img/icons/select-arrow-black.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/modules/app/initialize/AppConfig.js b/src/modules/app/initialize/AppConfig.js index 7cb0dd66af..e4a76a6fa1 100644 --- a/src/modules/app/initialize/AppConfig.js +++ b/src/modules/app/initialize/AppConfig.js @@ -136,6 +136,7 @@ tsUtils.filterList( tsUtils.notContains('app.templates'), tsUtils.notContains('app.keeper'), + tsUtils.notContains('app.fromBackup'), tsUtils.notContains('app.wallet'), tsUtils.notContains('app.stand'), tsUtils.notContains('app.switch') diff --git a/src/modules/app/less/app.less b/src/modules/app/less/app.less index 91b648ab7d..2dd4e8cb55 100644 --- a/src/modules/app/less/app.less +++ b/src/modules/app/less/app.less @@ -189,7 +189,7 @@ fieldset { padding: 0; &.disabled { - w-select, span.link, w-qr-code-read, w-import-file, a.link-clear { + .select, span.link, w-qr-code-read, w-import-file, a.link-clear { pointer-events: none; } } @@ -344,7 +344,7 @@ fieldset { } .get-started-checkbox-save { - margin: 20px 0; + margin: 10px 0; } @media screen and (min-width: 480px) { diff --git a/src/modules/app/services/User.js b/src/modules/app/services/User.js index aa1406cb66..94dd38e81d 100644 --- a/src/modules/app/services/User.js +++ b/src/modules/app/services/User.js @@ -125,8 +125,6 @@ constructor() { this._resetFields(); - this._settings = defaultSettings.create(); - this._settings.change.on(() => this._onChangeSettings()); Mousetrap.bind(['ctrl+shift+k'], () => this.switchNextTheme()); } @@ -146,6 +144,10 @@ return this.currentUser ? this.currentUser.address : null; } + get id() { + return this.currentUser ? this.currentUser.id : null; + } + get name() { return this.currentUser ? this.currentUser.name : null; } @@ -330,6 +332,10 @@ * @return {Promise} */ saveMultiAccountUser(user, userHash) { + if (user.settings) { + user.settings = { ...user.settings, encryptionRounds: undefined }; + } + return storage.load('multiAccountUsers') .then(users => this.saveMultiAccountUsers({ ...users, @@ -726,6 +732,23 @@ this._hasScript = false; this._scriptInfoPoll = null; this._scriptInfoPollTimeoutId = null; + + if (this._settings) { + this._settings.change.off(); + } + + let commonSettings; + + if (this._settings) { + commonSettings = this._settings.getSettings().common; + + this._settings.change.off(); + } + + this._settings = defaultSettings.create({}, commonSettings); + this._settings.change.on(() => this._onChangeSettings()); + + ds.dataManager.dropAddress(); } /** @@ -855,7 +878,7 @@ Object.defineProperty(target, key, { get: () => this.__props[key], set: (value) => { - if (value !== this.__props[key]) { + if (!equals(value, this.__props[key])) { this.__props[key] = value; this._onChangePropsForSave(); } diff --git a/src/modules/desktop/less/electron.less b/src/modules/desktop/less/electron.less index f21a9d5c22..474e4df285 100644 --- a/src/modules/desktop/less/electron.less +++ b/src/modules/desktop/less/electron.less @@ -110,7 +110,15 @@ body.desktop:not(.web) { } } - w-select .select .title { + &-copyright { + white-space: nowrap; + .footnote-1(); + color: @color-basic-500; + margin-left: 15px; + margin-bottom: 0; + } + + .select .select__wrap .select__title { background: transparent; &:after { diff --git a/src/modules/dex/directives/createOrder/createOrder.html b/src/modules/dex/directives/createOrder/createOrder.html index d7153abe2b..dab60f5cd7 100644 --- a/src/modules/dex/directives/createOrder/createOrder.html +++ b/src/modules/dex/directives/createOrder/createOrder.html @@ -232,7 +232,7 @@
- + {{fee.toFormat()}} {{(fee.asset.ticker || fee.asset.displayName)}} @@ -241,7 +241,7 @@
- + diff --git a/src/modules/dex/directives/createOrder/createOrder.less b/src/modules/dex/directives/createOrder/createOrder.less index ab9feb0854..fe3a9065a3 100644 --- a/src/modules/dex/directives/createOrder/createOrder.less +++ b/src/modules/dex/directives/createOrder/createOrder.less @@ -26,7 +26,6 @@ w-create-order { .plate-note { padding: 6px 14px; - font-family: 'Roboto-Medium', sans-serif; } .split-half { @@ -90,262 +89,262 @@ w-create-order { background-size: 10px; background-position: center; } +} - .create-order { - position: relative; +.create-order { + position: relative; - w-input { - .w-input-wrap { - input { - color: @color-disabled-900; - background: @color-white; + w-input { + .w-input-wrap { + input { + color: @color-disabled-900; + background: @color-white; - &[type="text"].tiny { - padding: 0 16px; - } + &[type="text"].tiny { + padding: 0 16px; } } } - .head { - align-items: center; - width: 100%; - padding: 0 16px; - height: 30px; - position: relative; + } + .head { + align-items: center; + width: 100%; + padding: 0 16px; + height: 30px; + position: relative; + display: none; + border-bottom: 1px solid @color-disabled-100; + } + + .body { + .choice { display: none; - border-bottom: 1px solid @color-disabled-100; + flex-direction: row; + position: relative; + z-index: 2; + text-transform: uppercase; + background-color: @color-white; + + .choose { + width: 50%; + flex-grow: 1; + height: 50px; + padding-top: 8px; + text-align: center; + cursor: pointer; + color: @white-only; + + .name { + font-size: @font-size-caption-2; + text-transform: uppercase; + } + + .price { + .footnote-2(); + } + + &.sell { + background: @color-error-400; + } + + &.buy { + background: @color-submit-400; + } + + &.inactive { + background: black; + } + } + + .middle { + width: 70px; + padding-top: 15px; + text-align: center; + } } - .body { - .choice { - display: none; + .making-order { + .create-order-notification { + z-index: 1; + } + + .areas { + display: flex; flex-direction: row; position: relative; - z-index: 2; - text-transform: uppercase; - background-color: @color-white; + z-index: 3; - .choose { + .area { width: 50%; flex-grow: 1; - height: 50px; - padding-top: 8px; - text-align: center; + height: 38px; + color: @color-disabled-400; + border-bottom: 1px solid @color-basic-100; cursor: pointer; - color: @white-only; + background: @color-white; + text-align: center; + border-top: 2px solid @color-white; .name { - font-size: @font-size-caption-2; + line-height: 32px; text-transform: uppercase; } - .price { - .footnote-2(); + &:first-child { + border-right: 1px solid @color-basic-100; } - &.sell { - background: @color-error-400; - } + .spread { + position: absolute; + left: 50%; + transform: translate(-50%, 50px); + margin-top: -12px; - &.buy { - background: @color-submit-400; - } + span { + display: block; + text-align: center; + } - &.inactive { - background: black; + .spread-label { + font-size: 9px; + } } } - - .middle { - width: 70px; - padding-top: 15px; - text-align: center; - } } - .making-order { - .create-order-notification { - z-index: 1; - } - - .areas { - display: flex; - flex-direction: row; - position: relative; - z-index: 3; - - .area { - width: 50%; - flex-grow: 1; - height: 38px; - color: @color-disabled-400; - border-bottom: 1px solid @color-basic-100; - cursor: pointer; - background: @color-white; - text-align: center; - border-top: 2px solid @color-white; - - .name { - line-height: 32px; - text-transform: uppercase; - } + .fields { + padding: 6px 25px 17px; + background: @color-white; - &:first-child { - border-right: 1px solid @color-basic-100; - } + .field-label { + margin-top: 8px; + padding-bottom: 4px; + } - .spread { - position: absolute; - left: 50%; - transform: translate(-50%, 50px); - margin-top: -12px; + .field-fee { + margin: 13px 0; - span { - display: block; - text-align: center; - } - - .spread-label { - font-size: 9px; - } - } + span:last-child { + margin-left: 5px; } } - .fields { - padding: 6px 25px 17px; - background: @color-white; - - .field-label { - margin-top: 8px; - padding-bottom: 4px; + w-input-container.invalid { + .input-like { + border: 1px solid @color-error-200; } + } + + .input-like { + padding: 0; + display: flex; + align-items: center; + border-radius: @border-radius / 2; - .field-fee { - margin: 13px 0; + w-input { + display: block; + width: 50%; - span:last-child { - margin-left: 5px; + input { + height: 28px; + border: none; } } - w-input-container.invalid { - .input-like { - border: 1px solid @color-error-200; - } + .asset-name-wrap { + position: relative; + height: 100%; + width: 50%; + padding: 6px 11px; + background-color: @color-basic-50; + border-top-right-radius: @border-radius / 2; + border-bottom-right-radius: @border-radius / 2; + text-align: right; } + } - .input-like { - padding: 0; - display: flex; - align-items: center; - border-radius: @border-radius / 2; + .summary { + display: flex; + padding-top: 14px; + padding-bottom: 25px; + justify-content: space-between; + } - w-input { - display: block; - width: 50%; + .place-order { + width: 100%; + color: @white-only; + border: none; + height: 36px; + box-shadow: none; + border-radius: @border-radius / 2; + } + } - input { - height: 28px; - border: none; - } - } + button.micro { + &[disabled] { + border: 1px solid @color-accent-50; + color: @color-basic-500; + } + } - .asset-name-wrap { - position: relative; - height: 100%; - width: 50%; - padding: 6px 11px; - background-color: @color-basic-50; - border-top-right-radius: @border-radius; - border-bottom-right-radius: @border-radius; - text-align: right; - } - } + &.buy { + .areas .area.buy { + border-top: 2px solid @color-submit-400; + border-bottom: 1px solid @color-white; + cursor: default; + opacity: 1; + } - .summary { - display: flex; - padding-top: 14px; - padding-bottom: 25px; - justify-content: space-between; + button.place-order { + background: @color-submit-400; + &:hover { + background: @color-submit-600; } - - .place-order { - width: 100%; - color: @white-only; - border: none; - height: 36px; - box-shadow: none; - border-radius: @border-radius / 2; + &:active { + background: @color-submit-700; } - } - - button.micro { &[disabled] { - border: 1px solid @color-accent-50; - color: @color-basic-500; + background: @color-submit-400; + opacity: 0.3; } } + } - &.buy { - .areas .area.buy { - border-top: 2px solid @color-submit-400; - border-bottom: 1px solid @color-white; - cursor: default; - opacity: 1; - } - - button.place-order { - background: @color-submit-400; - &:hover { - background: @color-submit-600; - } - &:active { - background: @color-submit-700; - } - &[disabled] { - background: @color-submit-400; - opacity: 0.3; - } - } + &.sell { + .areas .area.sell { + border-top: 2px solid @color-error-400; + border-bottom: 1px solid @color-white; + cursor: default; + opacity: 1; } - &.sell { - .areas .area.sell { - border-top: 2px solid @color-error-400; - border-bottom: 1px solid @color-white; - cursor: default; - opacity: 1; + button.place-order { + background: @color-error-400; + &:hover { + background: @color-error-600; } - - button.place-order { + &:active { + background: @color-error-700; + } + &[disabled] { background: @color-error-400; - &:hover { - background: @color-error-600; - } - &:active { - background: @color-error-700; - } - &[disabled] { - background: @color-error-400; - opacity: 0.3; - } + opacity: 0.3; } } + } - .price { - font-size: @font-size-caption-2; - line-height: 12px; + .price { + font-size: @font-size-caption-2; + line-height: 12px; - span.link { - color: @color-disabled-900; - font-size: @font-size-caption-2; - line-height: 13px; - height: auto; + span.link { + color: @color-disabled-900; + font-size: @font-size-caption-2; + line-height: 13px; + height: auto; - &.active { - color: @color-disabled-600; - } + &.active { + color: @color-disabled-600; } } } diff --git a/src/modules/dex/directives/createOrder/expiration.less b/src/modules/dex/directives/createOrder/expiration.less index 8d8fd08d8a..75a5ac1365 100644 --- a/src/modules/dex/directives/createOrder/expiration.less +++ b/src/modules/dex/directives/createOrder/expiration.less @@ -33,50 +33,17 @@ margin-left: 5px; } - .select { - position: static; - - .title { - padding: 2px 15px 2px 5px; - border: 1px solid transparent; + w-option { + .option { + display: block; + text-align: right; + overflow: hidden; + width: 100%; + text-overflow: ellipsis; + padding: 2px 12px; + line-height: 20px; font-size: @font-size-caption-2; - - &::after { - right: 0; - background-image: @select-arrow-icon; - background-repeat: no-repeat; - background-size: 90%; - } - } - - .select-list { - box-shadow: @dropdown-shadow; - border: 0; - border-radius: 4px; - padding: 5px 0; - width: auto; - - w-option { - .option { - display: block; - text-align: right; - overflow: hidden; - width: 100%; - text-overflow: ellipsis; - padding: 2px 12px; - line-height: 20px; - font-size: @font-size-caption-2; - color: @color-basic-900; - } - } - } - - &.expanded { - .title { - &:after { - background-image: @select-arrow-active-icon; - } - } + color: @color-basic-900; } } } diff --git a/src/modules/dex/directives/dexWatchlist/DexWatchlist.html b/src/modules/dex/directives/dexWatchlist/DexWatchlist.html index 99294f9de9..4f6bb5d0be 100644 --- a/src/modules/dex/directives/dexWatchlist/DexWatchlist.html +++ b/src/modules/dex/directives/dexWatchlist/DexWatchlist.html @@ -10,7 +10,7 @@ + class="select select_watch-list select__no-user-select"> {{::option.name}} diff --git a/src/modules/dex/directives/dexWatchlist/DexWatchlist.less b/src/modules/dex/directives/dexWatchlist/DexWatchlist.less index 1bf5e9c7e3..db99e90e8c 100644 --- a/src/modules/dex/directives/dexWatchlist/DexWatchlist.less +++ b/src/modules/dex/directives/dexWatchlist/DexWatchlist.less @@ -24,7 +24,8 @@ display: inline-block; width: 100%; z-index: 4; - height: 35px; + height: 32px; + min-height: 32px; w-help-icon { position: absolute; @@ -83,42 +84,7 @@ display: none; } - w-select { - position: relative; - z-index: 6; - - .select-list { - max-height: 155px; - overflow: auto; - border-color: @color-basic-100; - color: @color-basic-700; - } - - .title { - background: @color-white; - font-size: @font-size-caption-2; - color: @color-basic-700; - font-family: @font-roboto-medium; - height: 39px; - padding-right: 30px; - border: 1px solid transparent; - - &::after { - right: 13px; - transform: translateY(0); - top: 13px; - background-size: 80%; - background-repeat: no-repeat; - background-position: center left; - } - } - - .select &.expanded { - .title { - border: 1px solid #000; - } - } - + .select { w-option { font-size: @font-size-caption-2; color: @color-basic-700; @@ -130,55 +96,6 @@ color: @color-basic-700; } } - - &.active { - border-radius: 0; - border: 0 none; - - .title { - border-left: 1px solid @color-basic-100; - border-right: 1px solid @color-basic-100; - border-radius: 0; - - &::before { - content: ''; - display: block; - width: calc(100% ~'- 2px'); - height: 2px; - background: @color-white; - position: absolute; - z-index: 1; - bottom: -2px; - left: 1px; - } - } - - &::after { - content: ''; - display: block; - width: 100%; - height: 2px; - background: @color-submit-400; - position: absolute; - z-index: 1; - top: 0; - left: 0; - } - - .select-list { - border-radius: 0; - } - } - - &:not(.active) { - .expanded { - .title { - border: 1px solid @color-basic-100; - border-bottom: 0 none; - } - } - } - } } @@ -285,7 +202,7 @@ } .wrapper { - .titles-wrap .select a.title { + .titles-wrap .select__wrap a.select__title { font-size: 13px; } } @@ -296,10 +213,6 @@ &__watchlist { max-height: calc(100% ~'- 445px'); width: 360px; - - // .loader { - // top: 60%; - // } } &__watchlist-collapsed { diff --git a/src/modules/dex/directives/layout/less/dex-layout.less b/src/modules/dex/directives/layout/less/dex-layout.less index 9c5c3aa03f..3e07e33b99 100644 --- a/src/modules/dex/directives/layout/less/dex-layout.less +++ b/src/modules/dex/directives/layout/less/dex-layout.less @@ -36,7 +36,8 @@ } &__block[data-block="tradevolume"] { - height: 38px; + height: 37px; + overflow: hidden; .block-title i { transform: rotate(-180deg); @@ -200,29 +201,6 @@ } } - .orderbook-table .row:hover, - .smart-table__cell[data-column-id="volume"]:hover { - .tooltip-dex.active { - display: flex; - } - } - - .orderbook-table, - .smart-table { - .row:last-child, - &__row:last-child { - .tooltip-dex { - bottom: 100%; - top: auto; - &::before { - top: auto; - bottom: -6px; - transform: rotate(180deg); - } - } - } - } - .order-permission-error, .create-order-notification { will-change: transform; @@ -269,7 +247,7 @@ &__column { min-width: 360px; } - + &__block { min-width: 360px; } @@ -293,6 +271,14 @@ .caption-2 { font-size: 12px; } + + &_tradevolume-collapsed { + .dex-layout__column_orderbook { + .dex-layout__block[data-block="tradevolume"] { + height: 41px; + } + } + } } } diff --git a/src/modules/dex/directives/layout/less/dex-layout__column_createorder.less b/src/modules/dex/directives/layout/less/dex-layout__column_createorder.less index fd23e4e762..eeb7ca7dba 100644 --- a/src/modules/dex/directives/layout/less/dex-layout__column_createorder.less +++ b/src/modules/dex/directives/layout/less/dex-layout__column_createorder.less @@ -32,7 +32,7 @@ @media screen and (min-width: 2400px) { .dex-layout { - &__createorder { + &__column_createorder { max-height: 440px; width: 360px; diff --git a/src/modules/dex/directives/layout/less/dex-layout__column_orderbook.less b/src/modules/dex/directives/layout/less/dex-layout__column_orderbook.less index babfe70c75..19e7ef9fcc 100644 --- a/src/modules/dex/directives/layout/less/dex-layout__column_orderbook.less +++ b/src/modules/dex/directives/layout/less/dex-layout__column_orderbook.less @@ -50,6 +50,14 @@ } } } + + .table__row { + &:hover { + .tooltip-dex.active { + display: flex; + } + } + } } &_orderbook-collapsed { @@ -73,7 +81,7 @@ @media screen and (min-width: 2400px) { .dex-layout { - &__orderbook { + &__column_orderbook { width: 360px; max-height: calc(100% ~'- 445px') !important; @@ -216,6 +224,7 @@ max-height: 420px; margin-left: 0; order: 2; + margin-bottom: 5px; .dex-layout { &__block[data-block="tradevolume"] { diff --git a/src/modules/dex/less/dex.less b/src/modules/dex/less/dex.less index 28a90a0a68..7ee05d5850 100644 --- a/src/modules/dex/less/dex.less +++ b/src/modules/dex/less/dex.less @@ -130,8 +130,8 @@ body.dex-demo { .titles-wrap { height: 42px; - .select { - .select-list { + .select__wrap { + .select__list { height: 42px; font-size: 13px; } @@ -140,7 +140,7 @@ body.dex-demo { font-size: 13px; } - .title { + .select__title { height: 41px; font-size: 13px; } diff --git a/src/modules/ledger/controllers/LedgerCtrl.js b/src/modules/ledger/controllers/LedgerCtrl.js index f7c426e82e..4c0d325bc4 100644 --- a/src/modules/ledger/controllers/LedgerCtrl.js +++ b/src/modules/ledger/controllers/LedgerCtrl.js @@ -5,6 +5,7 @@ const USERS_COUNT = 5; const PRELOAD_USERS_COUNT = 5; + const MAX_USER_COUNT = 2147483647; /** * @param {typeof Base} Base @@ -35,10 +36,6 @@ * @type {boolean} */ this.error = false; - /** - * @type {Array} - */ - this.users = []; /** * @type {Array} */ @@ -50,7 +47,7 @@ /** * @type {number} */ - this.currentStep = 0; + this.offset = 0; /** * @type {boolean} */ @@ -75,6 +72,10 @@ * @type {boolean} */ this.saveUserData = true; + /** + * @type {string} + */ + this.id = ''; /** * @type {string} */ @@ -84,6 +85,11 @@ * @private */ this._runLedgerCommand = ''; + /** + * @type {Object} + * @private + */ + this._users = {}; /** * @type {Array} * @private @@ -123,27 +129,31 @@ } /** - * @param count - * @return {void} + * @param {number} count + * @return {Promise} */ getUsers(count) { this._runLedgerCommand = 'getUsers'; this.loading = true; this.error = false; - const start = this.users.length; + const countUsers = (count || USERS_COUNT) - 1; - const promise = utils.timeoutPromise(this.adapter.getUserList(start, countUsers), 25000); + const promise = utils.timeoutPromise(this.adapter.getUserList(this.offset, countUsers), 25000); const modalPromise = this.isInit ? Promise.resolve() : modalManager.showLoginByDevice(promise, this.adapter.type); - Promise.all([promise, modalPromise]) + return Promise.all([promise, modalPromise]) .then(([users]) => { this.isInit = true; - this.users = [...this.users, ...users]; this.loading = false; this.error = false; + + (users || []).forEach(curUser => { + this._users[curUser.id] = curUser; + }); + this.showVisibleUsers(); this.selectUser(); $scope.$digest(); @@ -152,6 +162,12 @@ const error = { ...err, count }; this.loading = false; this.error = error; + + if (err instanceof RangeError) { + this.offset = 0; + this.id = ''; + } + $scope.$digest(); throw error; }); @@ -177,10 +193,8 @@ return null; } - if (!user && !this.selectedUser && this.users.length) { - this.selectedUser = this.users[0]; - // } else if (this.selectedUser === user) { - // this.selectedUser = null; + if (!user && !this.selectedUser && this._users[0]) { + this.selectedUser = this._users[0]; } else if (user) { this.selectedUser = user; } @@ -196,9 +210,19 @@ if (this.selectDefault || this.disabledLeft) { return; } - this.currentStep--; - this.currentStep = this.currentStep >= 0 ? this.currentStep : 0; - this.showVisibleUsers(); + + this.offset = this._normalizeOffset(this.offset - USERS_COUNT); + + if (this._hasUsersInCache(this.offset, this.offset + USERS_COUNT - 1)) { + this.showVisibleUsers(); + } else { + if (this.loading) { + return; + } + + this.getUsers(); + } + this._calculateDisabled(); } @@ -210,25 +234,32 @@ return; } - if (this.users.length <= this.currentStep + USERS_COUNT) { + this.offset = this._normalizeOffset(this.offset + USERS_COUNT); + + if (this._hasUsersInCache(this.offset, this.offset + USERS_COUNT - 1)) { + this.showVisibleUsers(); + } else { if (this.loading) { return; } - this.currentStep++; + this.getUsers(); - this._calculateDisabled(); - } else { - this.currentStep++; - this.showVisibleUsers(); - this._calculateDisabled(); } + + this._calculateDisabled(); } /** * {void} */ showVisibleUsers() { - this.visibleUsers = this.users.slice(this.currentStep, this.currentStep + USERS_COUNT); + const tmp = []; + + for (let i = this.offset; i < this.offset + USERS_COUNT; i++) { + tmp.push(this._users[i]); + } + + this.visibleUsers = tmp; } /** @@ -262,18 +293,63 @@ return index !== 0 && this.selectDefault; } + /** + * @public + */ + onChangeId() { + let id = parseInt(this.selectDefault ? this.selectedUser.id : this.id, 10); + + if (isNaN(id) || id < 0) { + id = 0; + } + + if (id > MAX_USER_COUNT) { + id = MAX_USER_COUNT; + } + + this.id = String(id); + + this.offset = this._normalizeOffset(id - Math.floor(USERS_COUNT / 2)); + + if (this._hasUsersInCache(this.offset, this.offset + USERS_COUNT - 1)) { + this.showVisibleUsers(); + this.selectUser(this._users[id]); + } else { + this.getUsers().then(() => { + this.selectUser(this._users[id]); + }); + } + } + _calculateDisabled(disable) { - // const limitRight = this.users.length < this.currentStep + USERS_COUNT + 1; - this.disabledLogin = disable || this.loading || !this.selectedUser; - this.disabledRight = disable || this.selectDefault || this.loading; - this.disabledLeft = disable || this.selectDefault || this.loading || this.currentStep === 0; + this.disabledLogin = ( + disable || + this.loading || + !this.selectedUser + ); + + this.disabledRight = ( + disable || + this.selectDefault || + this.loading || + this.offset === MAX_USER_COUNT - (USERS_COUNT - 1) + ); + + this.disabledLeft = ( + disable || + this.selectDefault || + this.loading || + this.offset === 0 + ); } _onChangeSelectDefault() { if (this.selectDefault) { - this.currentStep = 0; - this.selectedUser = this.users[0]; + this.offset = 0; + this.selectedUser = this._users[0]; + this.id = this.selectedUser.id; } + this._calculateDisabled(); this.showVisibleUsers(); } @@ -282,6 +358,7 @@ * @private */ _onSelectUser() { + this.id = this.selectedUser.id; this.userExisted = this._usersInStorage.find(user => user.address === this.selectedUser.address) || null; @@ -300,6 +377,37 @@ this.importForm.userName.$setValidity('isUnique', !isUnique); } + /** + * @private + * @param {number} from + * @param {number} to + */ + _hasUsersInCache(from, to) { + for (let i = from; i <= to; i++) { + if (!this._users[i]) { + return false; + } + } + + return true; + } + + /** + * @private + * @param {number} offset + */ + _normalizeOffset(offset) { + if (offset > MAX_USER_COUNT - (USERS_COUNT - 1)) { + return MAX_USER_COUNT - (USERS_COUNT - 1); + } + + if (offset < 0) { + return 0; + } + + return offset; + } + } return new LedgerCtrl(); diff --git a/src/modules/ledger/templates/ledger.html b/src/modules/ledger/templates/ledger.html index 16ebbe5860..f8c24ab760 100644 --- a/src/modules/ledger/templates/ledger.html +++ b/src/modules/ledger/templates/ledger.html @@ -44,15 +44,20 @@

-
-
- + +
+
+ +
@@ -66,30 +71,61 @@

-
- - -
-
-
- - - - - - - +
+
+ + +
+ +
+ + + + + +
+ +
+ + + +
+ +
+
+ + + + + + + + +
diff --git a/src/modules/migrate/controllers/MigrateCtrl.js b/src/modules/migrate/controllers/MigrateCtrl.js index 1a48a6fdda..4757fa0b3a 100644 --- a/src/modules/migrate/controllers/MigrateCtrl.js +++ b/src/modules/migrate/controllers/MigrateCtrl.js @@ -142,13 +142,15 @@ try { this._hidePasswordError(); - const { id, publicKey, address } = this.userToMigrate; + const { id, publicKey, address, settings = {} } = this.userToMigrate; + const encryptionRounds = settings.encryptionRounds || 5000; const userType = userType || 'seed'; const networkByte = base58Decode(address)[1]; const seed = userType === 'seed' ? ds.Seed.decryptSeedPhrase( this.userToMigrate.encryptedSeed, - this.migratePassword + this.migratePassword, + encryptionRounds ) : undefined; const privateKey = userType === 'privateKey' ? diff --git a/src/modules/restore/less/restore.less b/src/modules/restore/less/restore.less index c5f572f457..c062a6044b 100644 --- a/src/modules/restore/less/restore.less +++ b/src/modules/restore/less/restore.less @@ -70,6 +70,10 @@ body.restore { &__checkbox { margin: 20px 0 30px; } + + .restore-selects { + display: none; + } } .tab { @@ -147,3 +151,17 @@ body.restore { } } } + +@media screen and (max-width: 480px) { + body.restore { + .restore-content { + .restore-tabs { + display: none; + } + + .restore-selects { + display: block; + } + } + } +} \ No newline at end of file diff --git a/src/modules/restore/templates/restore.html b/src/modules/restore/templates/restore.html index 08cb4da0c0..aef96ae1ae 100644 --- a/src/modules/restore/templates/restore.html +++ b/src/modules/restore/templates/restore.html @@ -18,6 +18,12 @@ w-i18n="{{::tab}}Tab">
+ + +
+ + +
+ class="select big margin-3"> diff --git a/src/modules/sessions/less/sessions.less b/src/modules/sessions/less/sessions.less index 7862844763..a9b8c38c60 100644 --- a/src/modules/sessions/less/sessions.less +++ b/src/modules/sessions/less/sessions.less @@ -11,7 +11,7 @@ padding: 0; margin: 60px 0 30px 0; - w-select, + .select, .input-like { display: flex; flex-direction: row; @@ -46,11 +46,11 @@ background-position: center; } - .title-content .icon-remove-user { + .select__title-content .icon-remove-user { display: none; } - .title-content, + .select__title-content, .option { display: flex; flex-direction: row; diff --git a/src/modules/sessions/templates/sessions.html b/src/modules/sessions/templates/sessions.html index bbefe008b4..6cb2555804 100644 --- a/src/modules/sessions/templates/sessions.html +++ b/src/modules/sessions/templates/sessions.html @@ -21,7 +21,7 @@
- + diff --git a/src/modules/signIn/controllers/SignInCtrl.js b/src/modules/signIn/controllers/SignInCtrl.js index 3529bac44d..8d3c82cb8f 100644 --- a/src/modules/signIn/controllers/SignInCtrl.js +++ b/src/modules/signIn/controllers/SignInCtrl.js @@ -65,7 +65,7 @@ multiAccount.signIn( this.multiAccountData, this.password, - user.getSetting('encryptionRounds'), + undefined, this.multiAccountHash ).then( () => Promise.all([ diff --git a/src/modules/signIn/less/signIn.less b/src/modules/signIn/less/signIn.less index 86084b2503..a638373282 100644 --- a/src/modules/signIn/less/signIn.less +++ b/src/modules/signIn/less/signIn.less @@ -35,28 +35,28 @@ body.signIn { background-position: center; } - w-select { - .select-list { + .select { + .select__list { max-height: 300px; overflow: auto; } - .title-content .icon-remove-user { + .select__title-content .icon-remove-user { display: none; } - .title-content, .option { + .select__title-content, .option { display: flex; flex-direction: row; align-items: center; } } - w-select.one-item { - .title-content .icon-remove-user { + .select.one-item { + .select__title-content .icon-remove-user { display: inline-block; } - .title { + .select__title { padding: 0 0 0 15px; } } @@ -69,7 +69,7 @@ body.signIn { } .input-like, - w-select { + .select { .has-name { .address { color: @color-basic-500; diff --git a/src/modules/signIn/templates/signIn.html b/src/modules/signIn/templates/signIn.html index c1dff8761c..c78816b91e 100644 --- a/src/modules/signIn/templates/signIn.html +++ b/src/modules/signIn/templates/signIn.html @@ -35,7 +35,7 @@
- +
diff --git a/src/modules/stand/less/stand.less b/src/modules/stand/less/stand.less index 2262c8f3cd..00cd196569 100644 --- a/src/modules/stand/less/stand.less +++ b/src/modules/stand/less/stand.less @@ -22,13 +22,13 @@ html body.stand { } } - w-change-language w-select { + w-change-language .select { position: relative; top: 0; right: 0; } - w-select img { + .select img { width: 30px; height: 30px; display: block; @@ -53,7 +53,7 @@ html body.stand { min-width: 1200px; } - .select-list { + .select__list { margin-bottom: 40px; } diff --git a/src/modules/stand/templates/stand.html b/src/modules/stand/templates/stand.html index 4734d77749..84c6993284 100644 --- a/src/modules/stand/templates/stand.html +++ b/src/modules/stand/templates/stand.html @@ -80,7 +80,7 @@

Selects

Select title
- + Default Value 1 Value 2 @@ -91,7 +91,7 @@

Selects

- + Big option 2 option 3 @@ -101,7 +101,7 @@

Selects

- + Big disabled option 2 option 3 @@ -111,7 +111,7 @@

Selects

- + Interface option 2 option 3 @@ -121,7 +121,7 @@

Selects

- + Interface disabled option 2 option 3 @@ -132,7 +132,7 @@

Selects

Select with filter title
- + Bitcoin Waves @@ -182,7 +182,7 @@

Inputs

class="medium" ng-model="$ctrl.inputModel"> - + Value 1 diff --git a/src/modules/tokens/templates/tokens.html b/src/modules/tokens/templates/tokens.html index cdb04a5191..7710d43950 100644 --- a/src/modules/tokens/templates/tokens.html +++ b/src/modules/tokens/templates/tokens.html @@ -82,7 +82,7 @@ w-validator-number required> - + diff --git a/src/modules/ui/directives/actions/action-item.less b/src/modules/ui/directives/actions/action-item.less index c4d66b743a..75e4063cc1 100644 --- a/src/modules/ui/directives/actions/action-item.less +++ b/src/modules/ui/directives/actions/action-item.less @@ -1,8 +1,9 @@ @import (reference) 'config'; .action-item { - padding: 8px 20px; + padding: 8px 10px; display: block; + border-radius: @border-radius; &:hover { background-color: @color-basic-50; diff --git a/src/modules/ui/directives/actions/actions.less b/src/modules/ui/directives/actions/actions.less index 94de0d31d0..f6e1d0ffad 100644 --- a/src/modules/ui/directives/actions/actions.less +++ b/src/modules/ui/directives/actions/actions.less @@ -23,9 +23,9 @@ right: 20px; top: 0; margin-bottom: 10px; - padding: 17px 0; + padding: 17px 10px; background-color: @color-white; - box-shadow: @shadow-buttons-default; + box-shadow: @shadow-portfolio-dropdown; border-radius: @border-radius; &.expanded { diff --git a/src/modules/ui/directives/assetInfoHead/asset-info-head.less b/src/modules/ui/directives/assetInfoHead/asset-info-head.less index 9395c5f1af..42ac1e5883 100644 --- a/src/modules/ui/directives/assetInfoHead/asset-info-head.less +++ b/src/modules/ui/directives/assetInfoHead/asset-info-head.less @@ -4,6 +4,14 @@ .asset-info-head { display: flex; + &_p-40 { + padding: 0 40px; + + @media screen and (max-width: 768px) { + padding: 0 20px; + } + } + &__head { height: 130px; position: relative; @@ -35,7 +43,6 @@ width: calc(100% ~'+ 80px'); left: -40px; bottom: 0; - border-bottom: 1px solid @color-submit-300; } &__rating { diff --git a/src/modules/ui/directives/changeLanguage/changeLanguage.html b/src/modules/ui/directives/changeLanguage/changeLanguage.html index 7b9e1990a0..0b46465158 100644 --- a/src/modules/ui/directives/changeLanguage/changeLanguage.html +++ b/src/modules/ui/directives/changeLanguage/changeLanguage.html @@ -1,5 +1,5 @@ - + -
{{ ::lng.name }}
+
{{ ::lng.name }}
 diff --git a/src/modules/ui/directives/changeLanguage/changeLanguage.less b/src/modules/ui/directives/changeLanguage/changeLanguage.less index 439a86db95..b401c94774 100644 --- a/src/modules/ui/directives/changeLanguage/changeLanguage.less +++ b/src/modules/ui/directives/changeLanguage/changeLanguage.less @@ -1,134 +1,7 @@ @import (reference) 'config'; -w-change-language { - w-select { - width: 142px; - height: 36px; - - .select { - .title { - border: 1px solid transparent; - } - - .select-list { - max-height: 171px; - overflow: auto; - } - } - - .lng-item { - text-transform: capitalize; - font-size: @font-size-control-small; - white-space: nowrap; - width: 100%; - - span { - display: inline-block; - min-width: 18px; - } - - &::before { - content: ''; - width: 18px; - height: 18px; - display: inline-block; - margin-right: 6px; - vertical-align: top; - background-position: center center; - } - } - - .lng-ru::before { - background: url(/img/icons/flags/ru.svg) no-repeat center; - } - - .lng-en::before { - background: url(/img/icons/flags/en.svg) no-repeat center; - } - - .lng-ko::before { - background: url(/img/icons/flags/ko.svg) no-repeat center; - } - - .lng-tr::before { - background: url(/img/icons/flags/tr.svg) no-repeat center; - } - - .lng-zh_CN::before { - background: url(/img/icons/flags/zh-Hans-CN.svg) no-repeat center; - } - - .lng-ja::before, - .lng-ja-JP::before { - background: url(/img/icons/flags/jp.svg) no-repeat center; - } - - .lng-nl::before, - .lng-nl_NL::before { - background: url(/img/icons/flags/nl.svg) no-repeat center; - } - - .lng-hi_IN::before { - background: url(/img/icons/flags/hi.svg) no-repeat center; - } - - .lng-es::before { - background: url(/img/icons/flags/es.svg) no-repeat center; - } - - .lng-pt_BR::before { - background: url(/img/icons/flags/br.svg) no-repeat center; - } - - .lng-pl::before { - background: url(/img/icons/flags/pl.svg) no-repeat center; - } - - .lng-de::before { - background: url(/img/icons/flags/de.svg) no-repeat center; - } - - .lng-et_EE::before { - background: url(/img/icons/flags/est.svg) no-repeat center; - } - - .lng-fr::before { - background: url(/img/icons/flags/fr.svg) no-repeat center; - } - - .lng-id::before { - background: url(/img/icons/flags/id.svg) no-repeat center; - } - - .lng-it::before { - background: url(/img/icons/flags/it.svg) no-repeat center; - } - } -} - -.footer { - w-change-language { - w-select { - .select { - .select-list { - border-top: 1px solid @color-basic-200; - transform: translateY(-100%); - margin-top: -39px; - } - - &.expanded { - .title::after { - transition: .5s; - transform: translateY(-50%) rotate(180deg); - } - } - } - } - } -} - .web-footer-language { - w-select { + .select { width: 200px; position: relative; -moz-appearance: none; @@ -138,47 +11,56 @@ w-change-language { right: 0; top: 0; - .select { + .select__wrap { background: @footer-background; line-height: 40px; height: 40px; color: @color-white; - &.expanded .title { + &.expanded .select__title { border: 1px solid @changeLang-border-footer; border-top: 0 none; border-radius: 0; - } - - .select-list { - background: @footer-background; - border-radius: 4px 4px 0 0; - flex-direction: column-reverse; - border: 1px solid @changeLang-border-footer; - border-bottom: 0 none; - box-shadow: none; - w-option.active { - display: none; + &::after { + transition: .5s; + transform: translateY(-50%) rotate(180deg); } + } - .option { - transition: .3s; - padding: 0 15px; - color: @white-only; + } - &:hover { - background: @footer-select-bg-hover; - } - } + .select__title { + border: 1px solid @changeLang-border-footer; + border-radius: 2px; + background: none transparent; + padding: 0 15px; + color: @white-only; + } + + &__list { + background: @footer-background; + border-radius: 4px 4px 0 0; + flex-direction: column-reverse; + border: 1px solid @changeLang-border-footer; + border-bottom: 0 none; + box-shadow: none; + border-top: 1px solid @color-basic-200; + transform: translateY(-100%); + margin-top: -39px; + + w-option.active { + display: none; } - .title { - border: 1px solid @changeLang-border-footer; - border-radius: 2px; - background: none transparent; + .option { + transition: .3s; padding: 0 15px; color: @white-only; + + &:hover { + background: @footer-select-bg-hover; + } } } diff --git a/src/modules/ui/directives/clickOutSide/ClickOutSide.js b/src/modules/ui/directives/clickOutSide/ClickOutSide.js index 4896cfc1ca..54fd282425 100644 --- a/src/modules/ui/directives/clickOutSide/ClickOutSide.js +++ b/src/modules/ui/directives/clickOutSide/ClickOutSide.js @@ -6,8 +6,9 @@ * @param {JQuery} $element * @param {JQuery} $document * @param {$rootScope.Scope} $scope + * @param {app.utils} utils */ - const controller = function (Base, $element, $document, $scope) { + const controller = function (Base, $element, $document, $scope, utils) { class ClickOutSide extends Base { @@ -18,7 +19,7 @@ if ($target.closest($element).length === 0) { this.onClickOutside({ event: e }); - $scope.$apply(); + utils.safeApply($scope); } }); }); @@ -29,7 +30,7 @@ return new ClickOutSide(); }; - controller.$inject = ['Base', '$element', '$document', '$scope']; + controller.$inject = ['Base', '$element', '$document', '$scope', 'utils']; angular.module('app.ui').component('wClickOutside', { bindings: { diff --git a/src/modules/ui/directives/feeList/feeList.html b/src/modules/ui/directives/feeList/feeList.html index b2b2c190ea..916768b736 100644 --- a/src/modules/ui/directives/feeList/feeList.html +++ b/src/modules/ui/directives/feeList/feeList.html @@ -5,7 +5,7 @@ + class="select select_fee"> {{::fee.asset.displayName}} diff --git a/src/modules/ui/directives/footer/footer.less b/src/modules/ui/directives/footer/footer.less index 5f101eda84..62330ff4e7 100644 --- a/src/modules/ui/directives/footer/footer.less +++ b/src/modules/ui/directives/footer/footer.less @@ -4,7 +4,7 @@ .footer { display: block; - background: @color-basic-900; + background: @footer-background; &__wrap { max-width: 1440px; @@ -21,7 +21,7 @@ margin-bottom: 24px; text-transform: uppercase; font-size: 13px; - color: @color-basic-700; + color: @footer-color-title; } &__link { @@ -31,7 +31,7 @@ transition: color 0.3s; &:hover { - color: @color-white; + color: @white-only; } &_support { diff --git a/src/modules/ui/directives/input/input.less b/src/modules/ui/directives/input/input.less index 3d4a0b8896..ef2af6d4d0 100644 --- a/src/modules/ui/directives/input/input.less +++ b/src/modules/ui/directives/input/input.less @@ -81,20 +81,20 @@ input[type="checkbox"] { display: flex; align-items: center; - w-select { - position: absolute; - right: 6px; - width: calc(50% ~'- 12px'); - - .title-content { - display: flex; - align-items: center; - } + // .select { + // position: absolute; + // right: 6px; + // width: calc(50% ~'- 12px'); - .title { - background-color: @color-white; - } - } + // .select__title-content { + // display: flex; + // align-items: center; + // } + + // .select__title { + // background-color: @color-white; + // } + // } w-input .w-input-wrap { width: 50%; @@ -276,13 +276,13 @@ md-dialog { input[type="number"], textarea { background: @color-basic-50; - + &:not(.no-validate).ng-touched.ng-valid:not(:focus):not(.focus):not(.ng-empty) { border-color: @color-basic-200; } } } - + .input-like { background: @color-basic-50; } @@ -291,7 +291,7 @@ md-dialog { .modal-send { fieldset.disabled { - .select .title { + .select__wrap .select__title { background: @color-basic-50; } } @@ -299,7 +299,7 @@ md-dialog { .change-token { fieldset.disabled { - .input-like .select-wrap .select .title { + .input-like .select-wrapper .select__wrap .select__title { background: @color-basic-50; } } @@ -307,7 +307,7 @@ md-dialog { .tokens-page { fieldset.disabled { - .input-like .select .title { + .input-like .select__wrap .select__title { background: @color-basic-50; } } diff --git a/src/modules/ui/directives/mainHeader/less/largeHeader/switch-account.less b/src/modules/ui/directives/mainHeader/less/largeHeader/switch-account.less index 151ff54149..e3f138d86e 100644 --- a/src/modules/ui/directives/mainHeader/less/largeHeader/switch-account.less +++ b/src/modules/ui/directives/mainHeader/less/largeHeader/switch-account.less @@ -32,7 +32,7 @@ &__list { flex: 1; - max-height: 195px; + max-height: 186px; padding: 4px 20px 4px 0; overflow: auto; overflow-x: hidden; diff --git a/src/modules/ui/directives/mainHeader/less/largeHeader/user-account.less b/src/modules/ui/directives/mainHeader/less/largeHeader/user-account.less index 5a88a439b6..20f961cf51 100644 --- a/src/modules/ui/directives/mainHeader/less/largeHeader/user-account.less +++ b/src/modules/ui/directives/mainHeader/less/largeHeader/user-account.less @@ -10,7 +10,7 @@ padding-bottom: 10px; display: flex; flex-direction: column; - border-bottom: 1px solid @color-info-50; + border-bottom: 1px solid @header-user-account-border; max-width: 249px; &__name { diff --git a/src/modules/ui/directives/select/Option.js b/src/modules/ui/directives/select/Option.js index fd905d80d1..18c97c7ab4 100644 --- a/src/modules/ui/directives/select/Option.js +++ b/src/modules/ui/directives/select/Option.js @@ -96,7 +96,7 @@ * @private */ static _getContentHTML() { - return '
'; + return '
'; } /** diff --git a/src/modules/ui/directives/select/Select.js b/src/modules/ui/directives/select/Select.js index 16e83f999e..33f8b5d955 100644 --- a/src/modules/ui/directives/select/Select.js +++ b/src/modules/ui/directives/select/Select.js @@ -103,9 +103,9 @@ } $postLink() { - this._select = $element.find('.select:first'); - this._activeNode = this._select.find('.title:first'); - this._selectList = this._select.find('.select-list:first'); + this._select = $element.find('.select__wrap:first'); + this._activeNode = this._select.find('.select__title:first'); + this._selectList = this._select.find('.select__list:first'); this._render(); this._setHandlers(); diff --git a/src/modules/ui/directives/select/less/select-change-lang.less b/src/modules/ui/directives/select/less/select-change-lang.less new file mode 100644 index 0000000000..8432f3a659 --- /dev/null +++ b/src/modules/ui/directives/select/less/select-change-lang.less @@ -0,0 +1,113 @@ +@import (reference) "../../../../app/less/app-icons"; +@import (reference) '../../../../app/less/typography'; +@import (reference) 'config'; +@import (reference) 'icons'; + +.select_change-lang { + width: 142px; + height: 36px; + + .select { + &__title { + border: 1px solid transparent; + } + + &__wrap.expanded .select__title { + border: 1px solid @color-basic-200; + border-bottom: 1px solid transparent; + } + + &__list { + max-height: 171px; + overflow: auto; + } + } + + .lng-item { + text-transform: capitalize; + font-size: 13px; + white-space: nowrap; + width: 100%; + + &::before { + content: ''; + width: 18px; + height: 18px; + display: inline-block; + margin-right: 6px; + vertical-align: top; + background-position: center center; + } + } + + .lng-ru::before { + background: url(/img/icons/flags/ru.svg) no-repeat center; + } + + .lng-en::before { + background: url(/img/icons/flags/en.svg) no-repeat center; + } + + .lng-ko::before { + background: url(/img/icons/flags/ko.svg) no-repeat center; + } + + .lng-tr::before { + background: url(/img/icons/flags/tr.svg) no-repeat center; + } + + .lng-zh_CN::before { + background: url(/img/icons/flags/zh-Hans-CN.svg) no-repeat center; + } + + .lng-ja::before, + .lng-ja-JP::before { + background: url(/img/icons/flags/jp.svg) no-repeat center; + } + + .lng-nl::before, + .lng-nl_NL::before { + background: url(/img/icons/flags/nl.svg) no-repeat center; + } + + .lng-hi_IN::before { + background: url(/img/icons/flags/hi.svg) no-repeat center; + } + + .lng-es::before { + background: url(/img/icons/flags/es.svg) no-repeat center; + } + + .lng-pt_BR::before { + background: url(/img/icons/flags/br.svg) no-repeat center; + } + + .lng-pl::before { + background: url(/img/icons/flags/pl.svg) no-repeat center; + } + + .lng-de::before { + background: url(/img/icons/flags/de.svg) no-repeat center; + } + + .lng-et_EE::before { + background: url(/img/icons/flags/est.svg) no-repeat center; + } + + .lng-fr::before { + background: url(/img/icons/flags/fr.svg) no-repeat center; + } + + .lng-id::before { + background: url(/img/icons/flags/id.svg) no-repeat center; + } + + .lng-it::before { + background: url(/img/icons/flags/it.svg) no-repeat center; + } + + .lng-content { + display: inline-block; + min-width: 18px; + } +} \ No newline at end of file diff --git a/src/modules/ui/directives/select/less/select-create-order.less b/src/modules/ui/directives/select/less/select-create-order.less new file mode 100644 index 0000000000..0b90df2b31 --- /dev/null +++ b/src/modules/ui/directives/select/less/select-create-order.less @@ -0,0 +1,41 @@ +@import (reference) "../../../../app/less/app-icons"; +@import (reference) '../../../../app/less/typography'; +@import (reference) 'config'; +@import (reference) 'icons'; + +.select_create-order { + .select { + &__wrap { + position: static; + + &.expanded { + .select__title { + &:after { + background-image: @select-arrow-active-icon; + } + } + } + } + + &__title { + padding: 2px 15px 2px 5px; + border: 1px solid transparent; + font-size: 11px; + + &::after { + right: 0; + background-image: @select-arrow-icon; + background-repeat: no-repeat; + background-size: 90%; + } + } + + &__list { + box-shadow: 0 2px 14px 0 rgba(31, 39, 61, 0.15); + border: 0; + border-radius: 4px; + padding: 5px 0; + width: auto; + } + } +} \ No newline at end of file diff --git a/src/modules/ui/directives/select/less/select-portfolio.less b/src/modules/ui/directives/select/less/select-portfolio.less new file mode 100644 index 0000000000..4041146e48 --- /dev/null +++ b/src/modules/ui/directives/select/less/select-portfolio.less @@ -0,0 +1,113 @@ +@import (reference) "../../../../app/less/app-icons"; +@import (reference) '../../../../app/less/typography'; +@import (reference) 'config'; +@import (reference) 'icons'; + +.select_portfolio { + width: 100%; + height: 42px; + max-width: 250px; + position: absolute; + right: 0; + top: 0; + z-index: 3; + + &:hover { + border-radius: @border-radius @border-radius 0 0; + color: @color-basic-700; + + .select { + &__title { + box-shadow: @shadow-buttons-hover; + transition: all 0.3s; + color: @color-basic-700; + } + + &__wrap:not(.expanded) { + border-radius: 0 0 @border-radius @border-radius; + } + } + } + + .select { + &__wrap.expanded { + .select__title { + border-top: 1px solid @color-basic-200; + border-left: 1px solid @color-basic-200; + border-right: 1px solid @color-basic-200; + border-bottom: 1px solid @color-white; + border-radius: @border-radius @border-radius 0 0; + } + } + + &__title { + .icon-filter(); + display: flex; + padding-left: 40px; + background-position: 15px center; + border-color: @color-white; + color: @color-basic-700; + box-shadow: @shadow-buttons-default; + width: 100%; + font-size: 15px; + } + } + + &[disabled], + &.disabled { + &:hover { + .select__wrap .select__title { + box-shadow: @shadow-buttons-default; //@color-basic-50; + color: @color-basic-500; + } + } + } + + @media screen and (max-width: 769px) { + width: 50px; + height: 42px; + + .select { + &__title { + .icon-filter(); + padding: 0; + position: relative; + font-size: 0; + box-shadow: @shadow-buttons-default; + border: none; + + &::after { + display: none; + } + + span { + font-size: 9px; + display: inline-block; + padding: 1px 2px; + background: @color-submit-400; + color: @white-only; + border-radius: @border-radius / 2; + line-height: 1em; + } + + &-content { + > span { + font-size: 0; + right: 5px; + top: 5px; + position: absolute; + } + } + } + + &__list { + left: auto; + right: 0; + min-width: 156px; + margin-top: -1px; + border-top: 1px solid @color-accent-50; + border-radius: @border-radius 0 @border-radius @border-radius; + } + } + } +} \ No newline at end of file diff --git a/src/modules/ui/directives/select/less/select-receive.less b/src/modules/ui/directives/select/less/select-receive.less new file mode 100644 index 0000000000..ea4309d8f7 --- /dev/null +++ b/src/modules/ui/directives/select/less/select-receive.less @@ -0,0 +1,18 @@ +@import (reference) "../../../../app/less/app-icons"; +@import (reference) '../../../../app/less/typography'; +@import (reference) 'config'; +@import (reference) 'icons'; + +.select { + &_receive-invoice, &_receive-crypt, &_receive-card, &_receive-bank { + height: @height-control-big; + + @media screen and (max-width: 768px) { + height: 42px; + } + } + + &_receive-card { + flex-basis: 48%; + } +} \ No newline at end of file diff --git a/src/modules/ui/directives/select/less/select-sendModal&fee.less b/src/modules/ui/directives/select/less/select-sendModal&fee.less new file mode 100644 index 0000000000..bd12f74a2b --- /dev/null +++ b/src/modules/ui/directives/select/less/select-sendModal&fee.less @@ -0,0 +1,32 @@ +@import (reference) "../../../../app/less/app-icons"; +@import (reference) '../../../../app/less/typography'; +@import (reference) 'config'; +@import (reference) 'icons'; + +.select { + &_send-modal, &_fee { + height: 54px; + + @media screen and (max-width: 768px) { + height: 42px; + } + + .select { + &__list { + max-height: 325px; + overflow: auto; + } + + &__title { + overflow: hidden; + } + + } + + .expanded { + .select__list { + margin-bottom: 40px; + } + } + } +} \ No newline at end of file diff --git a/src/modules/ui/directives/select/less/select-setting.less b/src/modules/ui/directives/select/less/select-setting.less new file mode 100644 index 0000000000..639697731f --- /dev/null +++ b/src/modules/ui/directives/select/less/select-setting.less @@ -0,0 +1,26 @@ +@import (reference) "../../../../app/less/app-icons"; +@import (reference) '../../../../app/less/typography'; +@import (reference) 'config'; +@import (reference) 'icons'; + +.select { + &_setting-session, &_setting-theme { + height: 36px; + + .select { + &__wrap:not(.expanded) .select__title { + border: 1px solid transparent; + } + + &__wrap.expanded .select__title { + border: 1px solid @color-basic-200; + border-bottom: 1px solid transparent; + } + + &__list { + overflow-y: auto; + max-height: 140px; + } + } + } +} \ No newline at end of file diff --git a/src/modules/ui/directives/select/less/select-token.less b/src/modules/ui/directives/select/less/select-token.less new file mode 100644 index 0000000000..c6279b3f86 --- /dev/null +++ b/src/modules/ui/directives/select/less/select-token.less @@ -0,0 +1,18 @@ +@import (reference) "../../../../app/less/app-icons"; +@import (reference) '../../../../app/less/typography'; +@import (reference) 'config'; +@import (reference) 'icons'; + +.select_token { + height: 30px; + position: absolute; + right: 6px; + width: calc(50% ~"- 12px"); + + .select { + &__title-content { + display: flex; + align-items: center; + } + } +} \ No newline at end of file diff --git a/src/modules/ui/directives/select/less/select-transaction.less b/src/modules/ui/directives/select/less/select-transaction.less new file mode 100644 index 0000000000..e879f3289c --- /dev/null +++ b/src/modules/ui/directives/select/less/select-transaction.less @@ -0,0 +1,65 @@ +@import (reference) "../../../../app/less/app-icons"; +@import (reference) '../../../../app/less/typography'; +@import (reference) 'config'; +@import (reference) 'icons'; + +.select_transaction, .select_transaction_mobile { + height: 42px; + margin-right: 10px; + flex-grow: 0; + white-space: nowrap; + + &:hover { + border-radius: @border-radius @border-radius 0 0; + color: @color-basic-700; + + .select__title { + box-shadow: @shadow-buttons-hover; + transition: all 0.3s; + color: @color-basic-700; + } + + .select__wrap:not(.expanded) { + border-radius: 0 0 @border-radius @border-radius; + } + } + + .select { + &__title { + border-color: @color-white; + color: @color-basic-700; + box-shadow: @shadow-buttons-default; + width: 100%; + font-size: 15px; + } + + &__wrap.expanded { + .select__title { + border-top: 1px solid @color-basic-200; + border-left: 1px solid @color-basic-200; + border-right: 1px solid @color-basic-200; + border-bottom: 1px solid @color-white; + border-radius: @border-radius @border-radius 0 0; + } + } + } + + &[disabled], + &.disabled { + &:hover { + .select__wrap .select__title { + box-shadow: @shadow-buttons-default; //@color-basic-50; + color: @color-basic-500; + } + } + } +} + +.select.select_transaction_mobile { + width: 100%; + margin-right: 10px; + + @media screen and (min-width: 1025px) { + display: none; + } +} \ No newline at end of file diff --git a/src/modules/ui/directives/select/less/select-watch-list.less b/src/modules/ui/directives/select/less/select-watch-list.less new file mode 100644 index 0000000000..032cd6f394 --- /dev/null +++ b/src/modules/ui/directives/select/less/select-watch-list.less @@ -0,0 +1,91 @@ +@import (reference) "../../../../app/less/app-icons"; +@import (reference) '../../../../app/less/typography'; +@import (reference) 'config'; +@import (reference) 'icons'; + +.select_watch-list { + position: relative; + z-index: 6; + + &.active { + border-radius: 0; + border: 0 none; + + .select__title { + border-left: 1px solid @color-basic-100; + border-right: 1px solid @color-basic-100; + border-radius: 0; + + &::before { + content: ''; + display: block; + width: calc(100% ~'- 2px'); + height: 2px; + background: @color-white; + position: absolute; + z-index: 1; + bottom: -2px; + left: 1px; + } + } + + &::after { + content: ''; + display: block; + width: 100%; + height: 2px; + background: @color-submit-400; + position: absolute; + z-index: 1; + top: 0; + left: 0; + } + + .select__list { + border-radius: 0; + } + } + + &:not(.active) { + .expanded { + .title { + border: 1px solid @color-basic-100; + border-bottom: 0 none; + } + } + } + + .select { + &__title { + background: @color-white; + font-size: @font-size-caption-2; + color: @color-basic-700; + font-family: @font-roboto-medium; + height: 39px; + padding-right: 30px; + border: 1px solid transparent; + + &::after { + right: 13px; + transform: translateY(0); + top: 13px; + background-size: 80%; + background-repeat: no-repeat; + background-position: center left; + } + } + + &__wrap &.expanded { + .select__title { + border: 1px solid #000; + } + } + + &__list { + max-height: 155px; + overflow: auto; + border-color: @color-basic-100; + color: @color-basic-700; + } + } +} \ No newline at end of file diff --git a/src/modules/ui/directives/select/less/select_main.less b/src/modules/ui/directives/select/less/select_main.less new file mode 100644 index 0000000000..4773c4bad1 --- /dev/null +++ b/src/modules/ui/directives/select/less/select_main.less @@ -0,0 +1,178 @@ +@import (reference) "../../../../app/less/app-icons"; +@import (reference) '../../../../app/less/typography'; +@import (reference) 'config'; +@import (reference) 'icons'; + +.select { + display: block; + + &__no-user-select { + user-select: none; + } + + &__title { + position: relative; + border: 1px solid @color-basic-200; + height: 100%; + background: @color-white; + font-size: @font-size-control-small; + padding: 0 35px 0 15px; + border-radius: @border-radius; + cursor: pointer; + color: @color-disabled-900; + + &::after { + content: ''; + display: block; + position: absolute; + right: 16px; + top: 50%; + width: 12px; + height: 12px; + transform: translateY(-50%); + background-size: 100%; + background-image: @dex-arrow-down-icon; + } + + @media screen and (max-width: 768px) { + padding-left: @padding-control-big-responsive-horizontal; + } + + @media screen and (max-width: 420px) { + font-size: @font-size-caption-1; + } + + &-content { + height: 100%; + display: flex; + align-items: center; + width: 100%; + overflow: hidden; + } + } + + &__list { + display: none; + position: absolute; + border: 1px solid @color-basic-200; + border-top: none; + border-radius: 0 0 @border-radius @border-radius; + width: 100%; + background-color: @color-white; + z-index: 10; + overflow: hidden; + flex-direction: column; + box-shadow: @shadow-main-default; + + w-option { + position: relative; + + &.active { + background-color: @color-basic-50; + } + } + + .option { + cursor: pointer; + padding: 8px 35px 8px 15px; + white-space: nowrap; + color: @color-disabled-900; + display: flex; + align-items: center; + &:hover { + background-color: @color-basic-50; + } + } + } + + &__wrap { + height: 100%; + position: relative; + + &.expanded .select__title { + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + + &::after { + background-image: @dex-arrow-down-blue-icon; + } + } + + &.to-up { + .select__list { + border: 1px solid @color-basic-100; + border-bottom: none; + } + } + + &[disabled] .select__title, + &.disabled .select__title { + background: @color-basic-50; + cursor: default; + } + } + + &.one-item .select__wrap .select__title { + cursor: default; + + &::after { + background-image: none; + } + + w-avatar .avatar-wrap { + cursor: default; + } + } + + &.hide-active .select__wrap .select__list w-option.active { + display: none; + } + + &.interface { + height: 42px; + + .select__title { + background: @color-white; + border-color: @color-white; + color: @color-basic-700; + box-shadow: @shadow-buttons-default; + width: 100%; + font-size: 15px; + } + + &:hover { + border-radius: @border-radius @border-radius 0 0; + color: @color-basic-700; + + .select__title { + box-shadow: @shadow-buttons-hover; + transition: all 0.3s; + color: @color-basic-700; + } + + .select__wrap:not(.expanded) { + border-radius: 0 0 @border-radius @border-radius; + } + } + + .select__wrap.expanded { + .select__title { + border-top: 1px solid @color-basic-200; + border-left: 1px solid @color-basic-200; + border-right: 1px solid @color-basic-200; + border-bottom: 1px solid @color-white; + border-radius: @border-radius @border-radius 0 0; + } + } + + &[disabled], + &.disabled { + &:hover { + .select__wrap .select__title { + box-shadow: @shadow-buttons-default; //@color-basic-50; + color: @color-basic-500; + } + } + } + } +} diff --git a/src/modules/ui/directives/select/select.html b/src/modules/ui/directives/select/select.html index b3031460e6..ea372178b6 100644 --- a/src/modules/ui/directives/select/select.html +++ b/src/modules/ui/directives/select/select.html @@ -1,6 +1,6 @@ -
-
+
+
-
+
diff --git a/src/modules/ui/directives/select/select.less b/src/modules/ui/directives/select/select.less deleted file mode 100644 index fdd7c92ed9..0000000000 --- a/src/modules/ui/directives/select/select.less +++ /dev/null @@ -1,184 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; - -w-select { - display: block; - - &.tiny { - height: @height-control-tiny; - } - - &.small { - height: @height-control-small; - } - - &.big { - height: @height-control-big; - } - - &.select__no-user-select { - user-select: none; - } - - @media screen and (max-width: 768px) { - &.big { - height: @height-control-big-responsive; - } - } - - &.one-item .select .title { - cursor: default; - &::after { - background-image: none; - } - .avatar .avatar__wrap { - cursor: default; - } - } - - &.hide-active .select .select-list w-option.active { - display: none; - } - - .select { - height: 100%; - position: relative; - - .title { - position: relative; - border: 1px solid @color-basic-200; - height: 100%; - background: @color-white; - font-size: @font-size-control-small; - padding: 0 35px 0 15px; - border-radius: @border-radius; - cursor: pointer; - color: @color-disabled-900; - - .title-content { - height: 100%; - display: flex; - align-items: center; - width: 100%; - overflow: hidden; - } - - &::after { - content: ''; - display: block; - position: absolute; - right: 16px; - top: 50%; - width: 12px; - height: 12px; - transform: translateY(-50%); - background-size: 100%; - background-image: @dex-arrow-down-icon; - } - } - - &.expanded .title { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - - &::after { - background-image: @dex-arrow-down-blue-icon; - } - } - - .select-list { - display: none; - position: absolute; - border: 1px solid @color-basic-200; - border-top: none; - border-radius: 0 0 @border-radius @border-radius; - width: 100%; - background-color: @color-white; - z-index: 10; - overflow: hidden; - flex-direction: column; - box-shadow: @shadow-main-default; - - w-option { - position: relative; - - &.active { - background-color: @color-basic-50; - } - } - - .option { - cursor: pointer; - padding: 8px 35px 8px 15px; - white-space: nowrap; - color: @color-disabled-900; - display: flex; - align-items: center; - &:hover { - background-color: @color-basic-50; - } - } - } - - &.to-up { - .select-list { - border: 1px solid @color-basic-100; - border-bottom: none; - } - } - - &[disabled] .title, - &.disabled .title { - background: @color-basic-50; - cursor: default; - } - } - - &.interface { - height: 42px; - - .title { - background: @color-white; - border-color: @color-white; - color: @color-basic-700; - box-shadow: @shadow-buttons-default; - width: 100%; - font-size: 15px; - } - - &:hover { - border-radius: @border-radius @border-radius 0 0; - color: @color-basic-700; - - .title { - box-shadow: @shadow-buttons-hover; - transition: all 0.3s; - color: @color-basic-700; - } - - .select:not(.expanded) { - border-radius: 0 0 @border-radius @border-radius; - } - } - - .select.expanded { - .title { - border-top: 1px solid @color-basic-200; - border-left: 1px solid @color-basic-200; - border-right: 1px solid @color-basic-200; - border-bottom: 1px solid @color-white; - border-radius: @border-radius @border-radius 0 0; - } - } - - &[disabled], - &.disabled { - &:hover { - .select .title { - box-shadow: @shadow-buttons-default; //@color-basic-50; - color: @color-basic-500; - } - } - } - } -} diff --git a/src/modules/ui/directives/selectFilter/selectFilter.less b/src/modules/ui/directives/selectFilter/selectFilter.less index 4d4bf6d5fe..44bf0de729 100644 --- a/src/modules/ui/directives/selectFilter/selectFilter.less +++ b/src/modules/ui/directives/selectFilter/selectFilter.less @@ -1,7 +1,7 @@ @import (reference) 'config'; @import (reference) 'icons'; -w-select { +.select { w-select-filter { display: none; position: relative; @@ -11,10 +11,9 @@ w-select { } } -w-select { - div.select.expanded { - position: relative; - z-index: 1; +.select { + div.select__wrap.expanded { + z-index: 11; w-select-filter { display: block; diff --git a/src/modules/ui/directives/smartTable/less/smart-table_mode-large.less b/src/modules/ui/directives/smartTable/less/smart-table_mode-large.less index fd607599b3..9971cdf4d6 100644 --- a/src/modules/ui/directives/smartTable/less/smart-table_mode-large.less +++ b/src/modules/ui/directives/smartTable/less/smart-table_mode-large.less @@ -145,6 +145,22 @@ } } + .action-item { + &.icon-show { + span.tospam { + display: none; + } + } + } + + .action-item { + &.icon-hide { + span.unspam { + display: none; + } + } + } + .icon { z-index: 2; display: inline-block; diff --git a/src/modules/ui/directives/smartTable/less/smart-table_watchlist.less b/src/modules/ui/directives/smartTable/less/smart-table_watchlist.less index 5e0799047a..ec1d2692a2 100644 --- a/src/modules/ui/directives/smartTable/less/smart-table_watchlist.less +++ b/src/modules/ui/directives/smartTable/less/smart-table_watchlist.less @@ -70,6 +70,12 @@ flex-basis: 25%; text-align: right; padding-right: 10px; + + &:hover { + .tooltip-dex{ + display: flex; + } + } } &[data-column-id="info"] { diff --git a/src/modules/ui/directives/table/table.less b/src/modules/ui/directives/table/table.less index cdb3b0f4d5..9fe0d5879e 100644 --- a/src/modules/ui/directives/table/table.less +++ b/src/modules/ui/directives/table/table.less @@ -88,8 +88,6 @@ &__asks , &__bids { - overflow: hidden; - .table__row { &[data-price] { cursor: pointer; diff --git a/src/modules/ui/directives/tabs/less/tabs_default.less b/src/modules/ui/directives/tabs/less/tabs_default.less index d4ae4c6ca3..e0b13c494e 100644 --- a/src/modules/ui/directives/tabs/less/tabs_default.less +++ b/src/modules/ui/directives/tabs/less/tabs_default.less @@ -57,21 +57,6 @@ min-height: 60px; cursor: pointer; position: relative; - - // &_active { - // color: @color-submit-400; - - // &::after { - // position: absolute; - // z-index: 1; - // content: ''; - // width: 100%; - // height: 1px; - // display: block; - // bottom: 0; - // background: @color-submit-400; - // } - // } } } @@ -115,17 +100,6 @@ w-confirm-transaction { &::before { display: none; } - - &:after { - content: ''; - display: block; - position: absolute; - width: 100%; - height: 1px; - left: 0; - bottom: 0; - background: @color-basic-100; - } } &__title { @@ -141,40 +115,21 @@ w-confirm-transaction { border-left: 1px solid transparent; border-right: 1px solid transparent; white-space: nowrap; + min-height: 38px; &:first-child { border-left: 1px solid @color-white; } - - // &_active { - // background: @color-white; - // border-bottom: 1px solid @color-white; - // border-right: 1px solid @color-disabled-200; - // border-left: 1px solid @color-disabled-200; - - // &::before { - // display: block; - // position: absolute; - // top: 0; - // left: 0; - // width: 100%; - // content: ''; - // height: 2px; - // background: @color-submit-400; - // } - - // &:after { - // position: absolute; - // bottom: -2px; - // height: 2px; - // width: 100%; - // left: 0; - // content: ''; - // display: block; - // z-index: 1; - // background: @color-white; - // } - // } + + &:after { + content: ''; + display: block; + position: absolute; + width: 101%; + left: 0; + bottom: 0; + background: @color-basic-100; + } } } } @@ -194,6 +149,20 @@ w-confirm-transaction { } } +@media screen and (max-width: 1130px) { + .dex-layout__column_tradehistory { + .tabs { + &__header::after { + display: none; + } + + &__title::after { + height: 1px; + } + } + } +} + @media screen and (max-width: 1024px) { .dex-layout__tradehistory { .tabs { @@ -231,16 +200,6 @@ w-confirm-transaction { height: 48px; line-height: 48px; min-height: 48px; - - // &_active { - // border: 0 none; - // border-bottom: 1px solid @color-submit-400; - - // &::after, - // &::before { - // display: none; - // } - // } } } } diff --git a/src/modules/ui/directives/transaction/transactions.less b/src/modules/ui/directives/transaction/transactions.less index 1c2dc6ba6d..8ccf90a7a3 100644 --- a/src/modules/ui/directives/transaction/transactions.less +++ b/src/modules/ui/directives/transaction/transactions.less @@ -7,6 +7,18 @@ border-radius: @border-radius; box-shadow: @shadow-type-1; background: @color-white; + + .row { + &:first-child { + border-top-left-radius: @border-radius; + border-top-right-radius: @border-radius; + } + + &:last-child { + border-bottom-left-radius: @border-radius; + border-bottom-right-radius: @border-radius; + } + } } .status-label, diff --git a/src/modules/ui/directives/transactionList/transactionList.less b/src/modules/ui/directives/transactionList/transactionList.less index b40e35fea9..7d07233115 100644 --- a/src/modules/ui/directives/transactionList/transactionList.less +++ b/src/modules/ui/directives/transactionList/transactionList.less @@ -70,6 +70,12 @@ w-transaction-list { border-bottom: 1px solid @color-basic-50; } + &:last-child { + .w-visible { + border-bottom: none; + } + } + &:hover { background: @hover-default; } @@ -116,4 +122,10 @@ w-transaction-list { } } } + + .transactions w-scroll-box { + .scroll-list { + height: auto; + } + } } diff --git a/src/modules/utils/modals/assetInfo/assetInfo.html b/src/modules/utils/modals/assetInfo/assetInfo.html index b34f825198..d35f018dfb 100644 --- a/src/modules/utils/modals/assetInfo/assetInfo.html +++ b/src/modules/utils/modals/assetInfo/assetInfo.html @@ -1,6 +1,6 @@
- + -
- +
+ diff --git a/src/modules/utils/modals/changeToken/change-token-modal.less b/src/modules/utils/modals/changeToken/change-token-modal.less index e95aa93700..d89e748185 100644 --- a/src/modules/utils/modals/changeToken/change-token-modal.less +++ b/src/modules/utils/modals/changeToken/change-token-modal.less @@ -24,7 +24,7 @@ md-dialog.change-token { } } - .select-wrap { + .select-wrapper { position: relative; height: 100%; width: 50%; @@ -32,21 +32,9 @@ md-dialog.change-token { border-top-right-radius: @border-radius; border-bottom-right-radius: @border-radius; - .issue-select { - width: 216px; - height: 30px; - position: absolute; - right: 6px; + .select { + width: calc(100% ~"- 12px"); top: 6px; - - .title-content { - display: flex; - align-items: center; - } - - .title { - background-color: @color-white; - } } } } @@ -70,6 +58,7 @@ md-dialog.change-token { max-height: 200px; overflow: auto; align-items: flex-start; + margin-top: 4px; } padding: 12px 0; diff --git a/src/modules/utils/modals/exportAccounts/exportAccounts.html b/src/modules/utils/modals/exportAccounts/exportAccounts.html index 23ba3e98ea..3519e59bd2 100644 --- a/src/modules/utils/modals/exportAccounts/exportAccounts.html +++ b/src/modules/utils/modals/exportAccounts/exportAccounts.html @@ -1,12 +1,12 @@
-

-
+
@@ -21,7 +21,7 @@ class="exportAccounts-modal__avatar">
diff --git a/src/modules/utils/modals/exportAccounts/exportAccounts.less b/src/modules/utils/modals/exportAccounts/exportAccounts.less index 8314c331d8..a75ca18027 100644 --- a/src/modules/utils/modals/exportAccounts/exportAccounts.less +++ b/src/modules/utils/modals/exportAccounts/exportAccounts.less @@ -98,6 +98,7 @@ &__password { margin-right: 5px; color: @color-basic-900; + font-size: 15px; } &__form { diff --git a/src/modules/utils/modals/receive/Receive.less b/src/modules/utils/modals/receive/Receive.less index 811dfb3695..c5fbb2be5a 100644 --- a/src/modules/utils/modals/receive/Receive.less +++ b/src/modules/utils/modals/receive/Receive.less @@ -69,11 +69,6 @@ md-dialog.modal-receive { display: none; } - w-select .select-list { - max-height: 325px; - overflow: auto; - } - .flex-row { display: flex; flex-direction: row; @@ -87,8 +82,7 @@ md-dialog.modal-receive { align-items: center; width: 100%; - w-input, - w-select { + w-input { flex-basis: 48%; } @@ -220,21 +214,6 @@ md-dialog.modal-receive { } } -.receive-bank__checkbox { - margin-bottom: 20px; -} - - -@media screen and (max-width: 768px) { - w-select { - .select { - .title { - padding-left: @padding-control-big-responsive-horizontal; - } - } - } -} - @media screen and (max-width: 540px) { md-dialog.modal-receive { md-dialog-content { @@ -271,7 +250,7 @@ md-dialog.modal-receive { @media screen and (max-width: 420px) { w-balance-input w-input .w-input-wrap input[type="text"].big, - w-select .select .title { + .select .select__wrap .select__title { font-size: @font-size-caption-1; } } diff --git a/src/modules/utils/modals/receive/receiveBank/receive-bank.html b/src/modules/utils/modals/receive/receiveBank/receive-bank.html index 0ee209a249..c87adb22df 100644 --- a/src/modules/utils/modals/receive/receiveBank/receive-bank.html +++ b/src/modules/utils/modals/receive/receiveBank/receive-bank.html @@ -12,7 +12,7 @@
diff --git a/src/modules/utils/modals/receive/receiveCard/receive-card.html b/src/modules/utils/modals/receive/receiveCard/receive-card.html index 4894c939c0..a600b555c4 100644 --- a/src/modules/utils/modals/receive/receiveCard/receive-card.html +++ b/src/modules/utils/modals/receive/receiveCard/receive-card.html @@ -13,7 +13,7 @@
- + -
+
diff --git a/src/modules/utils/modals/receive/receiveInvoice/receive-invoice.html b/src/modules/utils/modals/receive/receiveInvoice/receive-invoice.html index 45b763f708..ab9cfc201f 100644 --- a/src/modules/utils/modals/receive/receiveInvoice/receive-invoice.html +++ b/src/modules/utils/modals/receive/receiveInvoice/receive-invoice.html @@ -11,7 +11,7 @@
- + {{::alias}} diff --git a/src/modules/utils/modals/sendAsset/send-header.html b/src/modules/utils/modals/sendAsset/send-header.html index 89afd4c58f..5c72e2f846 100644 --- a/src/modules/utils/modals/sendAsset/send-header.html +++ b/src/modules/utils/modals/sendAsset/send-header.html @@ -11,7 +11,7 @@  {{$ctrl.balance.asset.displayName}}
- diff --git a/src/modules/utils/modals/sendAsset/send.modal.less b/src/modules/utils/modals/sendAsset/send.modal.less index 9e48020202..424fbd3f5d 100644 --- a/src/modules/utils/modals/sendAsset/send.modal.less +++ b/src/modules/utils/modals/sendAsset/send.modal.less @@ -214,8 +214,7 @@ md-dialog.modal-send { max-height: 300px; } - w-select { - + .select { .asset { &__name { @media screen and (max-width: 540px) { @@ -235,21 +234,6 @@ md-dialog.modal-send { max-width: 100px; } } - - .title { - overflow-x: hidden; - } - - .expanded { - .select-list { - margin-bottom: 40px; - } - } - - .select-list { - max-height: 325px; - overflow: auto; - } } .input-like { @@ -470,7 +454,7 @@ md-dialog.modal-send { } w-balance-input w-input .w-input-wrap input[type="text"].big, - w-select .select .title { + .select .select__wrap .select__title { font-size: @font-size-caption-1; } } diff --git a/src/modules/utils/modals/settings/SettingsCtrl.js b/src/modules/utils/modals/settings/SettingsCtrl.js index a690f9ba93..a538543728 100644 --- a/src/modules/utils/modals/settings/SettingsCtrl.js +++ b/src/modules/utils/modals/settings/SettingsCtrl.js @@ -59,6 +59,7 @@ tab = 'general'; address = user.address; publicKey = user.publicKey; + id = user.id; shownSeed = false; shownKey = false; node = ''; diff --git a/src/modules/utils/modals/settings/settings.html b/src/modules/utils/modals/settings/settings.html index 76c9cbc9a3..99984f3c5d 100644 --- a/src/modules/utils/modals/settings/settings.html +++ b/src/modules/utils/modals/settings/settings.html @@ -50,7 +50,7 @@
- + @@ -78,7 +78,7 @@
- + @@ -87,25 +87,10 @@ -
- -
-
-
- -
-
- -
{{$ctrl.blockHeight}}
@@ -159,12 +144,26 @@
{{::$ctrl.publicKey}}
-
+
{{::$ctrl.address}}
-
+ +
+
+
+ +
+
+ + +
@@ -173,7 +172,7 @@
-
+
diff --git a/src/modules/utils/modals/settings/settings.less b/src/modules/utils/modals/settings/settings.less index 9ca95728f0..c7af75f293 100644 --- a/src/modules/utils/modals/settings/settings.less +++ b/src/modules/utils/modals/settings/settings.less @@ -34,19 +34,6 @@ md-dialog.settings-modal { display: block; } - w-select { - &.with-scroll { - .select-list { - overflow-y: auto; - max-height: 140px; - } - } - - .select:not(.expanded) .title { - border: 1px solid transparent; - } - } - w-responsive-menu { width: 199px; height: 100%; @@ -217,7 +204,7 @@ md-dialog.settings-modal { height: 12px; } - w-select w-option i { + .select w-option i { margin-top: -2px; } @@ -449,16 +436,6 @@ md-dialog.settings-modal { } } } - - .select-setting-wrap, - w-change-language { - w-select { - .select.expanded .title { - border: 1px solid @color-basic-200; - border-bottom: 1px solid transparent; - } - } - } } @media screen and (max-width: 767px) { diff --git a/src/modules/wallet/modules/assets/less/assets.less b/src/modules/wallet/modules/assets/less/assets.less index f741b5b75a..78431d2645 100644 --- a/src/modules/wallet/modules/assets/less/assets.less +++ b/src/modules/wallet/modules/assets/less/assets.less @@ -12,7 +12,7 @@ height: 42px; margin-bottom: 10px; - .title-content { + .select__title-content { height: 36px; } } diff --git a/src/modules/wallet/modules/assets/templates/assets.html b/src/modules/wallet/modules/assets/templates/assets.html index 9fd47e3e61..29cbb318f1 100644 --- a/src/modules/wallet/modules/assets/templates/assets.html +++ b/src/modules/wallet/modules/assets/templates/assets.html @@ -33,7 +33,7 @@ - diff --git a/src/modules/wallet/modules/portfolio/less/portfolio.less b/src/modules/wallet/modules/portfolio/less/portfolio.less index 01e89eab87..b5edc4b8e2 100644 --- a/src/modules/wallet/modules/portfolio/less/portfolio.less +++ b/src/modules/wallet/modules/portfolio/less/portfolio.less @@ -35,22 +35,6 @@ display: flex; flex-direction: row; margin-bottom: 10px; - - w-select { - width: 100%; - max-width: 250px; - position: absolute; - right: 0; - top: 0; - z-index: 3; - - .title { - display: flex; - padding-left: 40px; - .icon-filter(); - background-position: 15px center; - } - } } .btn-icon { @@ -121,52 +105,6 @@ .toolbar { width: calc(100% ~'- 10px'); - - w-select { - width: 50px; - height: 42px; - - .title { - padding: 0; - position: relative; - font-size: 0; - .icon-filter(); - box-shadow: @shadow-buttons-default; - border: none; - - &::after { - display: none; - } - - .title-content { - & > span { - font-size: 0; - right: 5px; - top: 5px; - position: absolute; - } - } - - span { - font-size: 9px; - display: inline-block; - padding: 1px 2px; - background: @color-submit-400; - color: @white-only; - border-radius: @border-radius / 2; - line-height: 1em; - } - } - - .select-list { - left: auto; - right: 0; - min-width: 156px; - margin-top: -1px; - border-top: 1px solid @color-accent-50; - border-radius: @border-radius 0 @border-radius @border-radius; - } - } } } } diff --git a/src/modules/wallet/modules/portfolio/templates/portfolio.html b/src/modules/wallet/modules/portfolio/templates/portfolio.html index 7a91cfb246..60f39ffda9 100644 --- a/src/modules/wallet/modules/portfolio/templates/portfolio.html +++ b/src/modules/wallet/modules/portfolio/templates/portfolio.html @@ -10,7 +10,7 @@ - + *.interface svg { margin-left: 0; diff --git a/src/modules/wallet/modules/transactions/templates/transactions.html b/src/modules/wallet/modules/transactions/templates/transactions.html index c94732c726..32a29e3123 100644 --- a/src/modules/wallet/modules/transactions/templates/transactions.html +++ b/src/modules/wallet/modules/transactions/templates/transactions.html @@ -22,7 +22,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/src/modules/welcome/less/section-welcome.less b/src/modules/welcome/less/section-welcome.less index da1217e278..dba34c2de6 100644 --- a/src/modules/welcome/less/section-welcome.less +++ b/src/modules/welcome/less/section-welcome.less @@ -103,6 +103,22 @@ } } +@media screen and (min-width: 2040px) { + .section-welcome { + height: 870px; + } +} + +@media screen and (min-width: 2400px) { + .section-welcome { + height: 970px; + + &__dex-screenshot { + top: 55px; + bottom: 55px; + } + } +} @media screen and (max-width: 1440px) { .section-welcome { &__left { diff --git a/src/themeConfig/black/config.less b/src/themeConfig/black/config.less index 88539a1f10..a250afd489 100644 --- a/src/themeConfig/black/config.less +++ b/src/themeConfig/black/config.less @@ -9,6 +9,7 @@ @fader-opacity: .3; @fader-background: #000; @header-dropdown-hover: #353535; +@header-user-account-border: #424242; @dex-selected-item-bg: #353535; @@ -202,6 +203,7 @@ @shadow-buttons-hover: 0 2px 8px 0 rgba(0, 0, 0, 0.4); @shadow-tooltip-confirm: 0 0 20px rgba(0, 0, 0, 0.5); @shadow-dex-welcome: 0 1px 4px 0 rgba(203, 221, 239, 0.2); +@shadow-portfolio-dropdown: 0 4px 18px 0 rgba(0, 0, 0, .5); // Hovers @hover-default: rgba(53, 53, 53, .7); diff --git a/src/themeConfig/black/icons.less b/src/themeConfig/black/icons.less index 37044a9244..58d2ba93d6 100644 --- a/src/themeConfig/black/icons.less +++ b/src/themeConfig/black/icons.less @@ -1,5 +1,5 @@ @logo-header: url(/img/icons/wavesdex-invert-32.svg); -@logo-footer: url(/img/icons/wavesdex-black-32.svg); +@logo-footer: url(/img/icons/wavesdex-invert-32.svg); /* mobile and top menu icons */ @power-icon: url(/img/icons/dark/menu/power-disabled-600.svg); @@ -120,7 +120,7 @@ @import-modal-icon-beta: url(/img/icons/logo-beta.svg); @import-modal-icon-old: url(/img/icons/logo-alfa.svg); -@import-modal-icon-ledger: url(/img/icons/logo-ledger.svg); +@import-modal-icon-ledger: url(/img/icons/logo-ledger-white.svg); @import-modal-icon-keeper: url(/img/icons/keeper-icon.svg); @import-modal-icon-error: url(/img/icons/icon-error-import.svg); @not-saved-account-icon: url(/img/icons/userimg-empty-box-150.svg); @@ -135,7 +135,7 @@ @arrow-right-white-icon: url(/img/icons/arrow-right-white.svg); @smart-asset-marker-icon: url(/img/icons/smart-asset-marker.svg); @sponsored-asset-marker-icon: url(/img/icons/sponosred-asset-marker.svg); -@select-arrow-icon: url(/img/icons/select-arrow.svg); +@select-arrow-icon: url(/img/icons/select-arrow-black.svg); @select-arrow-active-icon: url(/img/icons/select-arrow-active.svg); @migrate-lock-icon: url(/img/icons/lock-basic-200.svg); @migrate-success-icon: url(/img/icons/migrate-success.svg); @@ -154,4 +154,4 @@ @dex-screenshot: url(/img/landing/dex-screenshot.png); @importBackupFile-icon: url(/img/icons/keystore-file.svg); @importBackupPassword-icon: url(/img/icons/backup-password.svg); -@importKeyStore-file-icon: url(/img/icons/import-keystore-file.svg); +@importKeyStore-file-icon: url(/img/icons/dark/import-keystore-file-dark.svg); diff --git a/src/themeConfig/default/config.less b/src/themeConfig/default/config.less index e6373c9c2b..7fba8e98ae 100644 --- a/src/themeConfig/default/config.less +++ b/src/themeConfig/default/config.less @@ -9,6 +9,7 @@ @fader-opacity: .3; @fader-background: @color-basic-900; @header-dropdown-hover: @color-info-50; +@header-user-account-border: @color-info-50; @dex-selected-item-bg: @color-info-50; @@ -203,6 +204,7 @@ @shadow-buttons-hover: 0 2px 8px 1px rgba(199, 210, 222, 0.6); @shadow-tooltip-confirm: 0 0 19px rgba(97, 116, 144, 0.25); @shadow-dex-welcome: 0 1px 4px 0 rgba(203, 221, 239, 0.2); +@shadow-portfolio-dropdown: 0 2px 4px 0 rgba(218, 225, 233, 0.5); // Hovers @hover-default: rgba(248, 249, 251, .5);