From 13e5eb8de5499a7ea7ae9f3df99956a4bf0b7f66 Mon Sep 17 00:00:00 2001 From: ekomarovskaya Date: Fri, 8 Nov 2019 14:03:51 +0300 Subject: [PATCH 01/11] DEXW-2314: add-toaster --- src/img/icons/close-tokenomica.svg | 4 + src/img/icons/logotype.svg | 15 ++ src/modules/ui/directives/footer/footer.html | 18 +++ .../ui/directives/footer/toaster-mobiles.less | 128 +++++++++++++++++- .../directives/footer/toaster-tokenomica.less | 127 +++++++++++++++++ src/themeConfig/black/icons.less | 3 + src/themeConfig/default/icons.less | 5 +- 7 files changed, 297 insertions(+), 3 deletions(-) create mode 100644 src/img/icons/close-tokenomica.svg create mode 100644 src/img/icons/logotype.svg create mode 100644 src/modules/ui/directives/footer/toaster-tokenomica.less diff --git a/src/img/icons/close-tokenomica.svg b/src/img/icons/close-tokenomica.svg new file mode 100644 index 0000000000..2691e52acf --- /dev/null +++ b/src/img/icons/close-tokenomica.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/img/icons/logotype.svg b/src/img/icons/logotype.svg new file mode 100644 index 0000000000..83c61c7e34 --- /dev/null +++ b/src/img/icons/logotype.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/modules/ui/directives/footer/footer.html b/src/modules/ui/directives/footer/footer.html index f3bd1347a2..5a70bdeb45 100644 --- a/src/modules/ui/directives/footer/footer.html +++ b/src/modules/ui/directives/footer/footer.html @@ -113,4 +113,22 @@ + +
+ + +
+
+
+ + + +
+
+ +
+ +
+
+ diff --git a/src/modules/ui/directives/footer/toaster-mobiles.less b/src/modules/ui/directives/footer/toaster-mobiles.less index 2aba446408..8bda3a8c32 100644 --- a/src/modules/ui/directives/footer/toaster-mobiles.less +++ b/src/modules/ui/directives/footer/toaster-mobiles.less @@ -59,7 +59,7 @@ } } } - + &.hidden-toaster { transform: translateY(100%); } @@ -67,4 +67,128 @@ @media screen and (max-width: 768px) { display: flex; } -} \ No newline at end of file +} + +.toaster-tokenomica { + display: flex; + position: fixed; + bottom: 0; + left: 0; + justify-content: space-between; + background: @color-black; + padding: 25px 32px; + width: 100%; + z-index: 5; + transform: translateY(0); + transition: transform 0.2s; + + &__link { + display: flex; + flex: 1 0; + justify-content: space-between; + align-items: center; + } + + &__logo { + background: @logo-tokenomica-icon center no-repeat; + background-size: 100%; + width: 184px; + height: 40px; + flex-shrink: 0; + margin-right: 16px; + } + + &__text { + font-size: 20px; + color: @color-white; + line-height: 18px; + } + + &__text-wrapper { + display: flex; + flex: 1 0; + justify-content: space-between; + align-items: center; + margin-left: 80px; + } + + &__button { + button { + border-radius: 0; + } + + .button__content { + font-size: 20px; + font-weight: bold; + } + } + + &__close { + display: flex; + align-items: center; + margin-left: 36px; + + &-icon { + background: @close-tokenomica-icon center no-repeat; + border: 0; + width: 16px; + height: 16px; + + &:hover { + opacity: .5; + } + } + } + + &.hidden-toaster { + transform: translateY(100%); + } + + @media screen and (max-width: 768px) { + display: flex; + padding: 24px; + border-radius: 16px 16px 0 0; + align-items: flex-start; + + &__link { + flex-direction: column; + align-items: flex-start; + } + + &__logo { + margin: 0 0 16px 0; + width: 109px; + height: 24px; + } + + &__text-wrapper { + flex-direction: column; + align-items: flex-start; + width: 100%; + margin-left: 0; + } + + &__text { + font-size: 14px; + margin: 0 0 16px 0; + line-height: 20px; + width: 100%; + } + + &__button { + width: 100%; + + .button { + width: 100%; + } + + .button__content { + font-size: 16px; + } + } + + &__close { + margin: -6px; + } + } +} diff --git a/src/modules/ui/directives/footer/toaster-tokenomica.less b/src/modules/ui/directives/footer/toaster-tokenomica.less new file mode 100644 index 0000000000..1e616b51df --- /dev/null +++ b/src/modules/ui/directives/footer/toaster-tokenomica.less @@ -0,0 +1,127 @@ +@import (reference) 'config'; +@import (reference) 'icons'; +@import (reference) '../../../app/less/typography'; + +.toaster-tokenomica { + display: flex; + position: fixed; + bottom: 0; + left: 0; + justify-content: space-between; + background: @color-black; + padding: 25px 32px; + width: 100%; + z-index: 5; + transform: translateY(0); + transition: transform 0.2s; + + &__link { + display: flex; + flex: 1 0; + justify-content: space-between; + align-items: center; + } + + &__logo { + background: @logo-tokenomica-icon center no-repeat; + background-size: 100%; + width: 184px; + height: 40px; + flex-shrink: 0; + margin-right: 16px; + } + + &__text { + font-size: 20px; + color: @color-white; + line-height: 18px; + } + + &__text-wrapper { + display: flex; + flex: 1 0; + justify-content: space-between; + align-items: center; + margin-left: 80px; + } + + &__button { + button { + border-radius: 0; + } + + .button__content { + font-size: 20px; + font-weight: bold; + } + } + + &__close { + display: flex; + align-items: center; + margin-left: 36px; + + &-icon { + background: @close-tokenomica-icon center no-repeat; + border: 0; + width: 16px; + height: 16px; + + &:hover { + opacity: .5; + } + } + } + + &.hidden-toaster { + transform: translateY(100%); + } + + @media screen and (max-width: 768px) { + display: flex; + padding: 24px; + border-radius: 16px 16px 0 0; + align-items: flex-start; + + &__link { + flex-direction: column; + align-items: flex-start; + } + + &__logo { + margin: 0 0 16px 0; + width: 109px; + height: 24px; + } + + &__text-wrapper { + flex-direction: column; + align-items: flex-start; + width: 100%; + margin-left: 0; + } + + &__text { + font-size: 14px; + margin: 0 0 16px 0; + line-height: 20px; + width: 100%; + } + + &__button { + width: 100%; + + .button { + width: 100%; + } + + .button__content { + font-size: 16px; + } + } + + &__close { + margin: -6px; + } + } +} diff --git a/src/themeConfig/black/icons.less b/src/themeConfig/black/icons.less index 58d2ba93d6..9f1e8ac763 100644 --- a/src/themeConfig/black/icons.less +++ b/src/themeConfig/black/icons.less @@ -155,3 +155,6 @@ @importBackupFile-icon: url(/img/icons/keystore-file.svg); @importBackupPassword-icon: url(/img/icons/backup-password.svg); @importKeyStore-file-icon: url(/img/icons/dark/import-keystore-file-dark.svg); + +@close-tokenomica-icon: url(/img/icons/close-tokenomica.svg); +@logo-tokenomica-icon: url(/img/icons/logotype.svg); diff --git a/src/themeConfig/default/icons.less b/src/themeConfig/default/icons.less index 6c638bd51d..9cebab144c 100644 --- a/src/themeConfig/default/icons.less +++ b/src/themeConfig/default/icons.less @@ -154,4 +154,7 @@ @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); \ No newline at end of file +@importKeyStore-file-icon: url(/img/icons/import-keystore-file.svg); + +@close-tokenomica-icon: url(/img/icons/close-tokenomica.svg); +@logo-tokenomica-icon: url(/img/icons/logotype.svg); From 64fcaf031c8e21e2a5ea08be8b2a747f0f21297c Mon Sep 17 00:00:00 2001 From: ekomarovskaya Date: Fri, 8 Nov 2019 14:23:58 +0300 Subject: [PATCH 02/11] DEXW-2314: add locale --- locale/de/app.dex.json | 1 + locale/de/app.utils.json | 9 +++++++++ locale/de/app.welcome.json | 2 ++ locale/en/app.dex.json | 1 + locale/en/app.utils.json | 9 +++++++++ locale/en/app.welcome.json | 2 ++ locale/es/app.dex.json | 1 + locale/es/app.utils.json | 9 +++++++++ locale/es/app.welcome.json | 2 ++ locale/et_EE/app.dex.json | 1 + locale/et_EE/app.utils.json | 9 +++++++++ locale/et_EE/app.welcome.json | 2 ++ locale/fr/app.dex.json | 1 + locale/fr/app.utils.json | 9 +++++++++ locale/fr/app.welcome.json | 2 ++ locale/hi_IN/app.dex.json | 1 + locale/hi_IN/app.utils.json | 9 +++++++++ locale/hi_IN/app.welcome.json | 2 ++ locale/id/app.dex.json | 1 + locale/id/app.utils.json | 9 +++++++++ locale/id/app.welcome.json | 2 ++ locale/it/app.dex.json | 1 + locale/it/app.utils.json | 9 +++++++++ locale/it/app.welcome.json | 2 ++ locale/ja/app.dex.json | 1 + locale/ja/app.utils.json | 9 +++++++++ locale/ja/app.welcome.json | 2 ++ locale/ko/app.dex.json | 1 + locale/ko/app.utils.json | 9 +++++++++ locale/ko/app.welcome.json | 2 ++ locale/nl_NL/app.dex.json | 1 + locale/nl_NL/app.utils.json | 9 +++++++++ locale/nl_NL/app.welcome.json | 2 ++ locale/pl/app.dex.json | 1 + locale/pl/app.utils.json | 9 +++++++++ locale/pl/app.welcome.json | 2 ++ locale/pt_BR/app.dex.json | 1 + locale/pt_BR/app.utils.json | 9 +++++++++ locale/pt_BR/app.welcome.json | 2 ++ locale/pt_PT/app.dex.json | 1 + locale/pt_PT/app.utils.json | 9 +++++++++ locale/pt_PT/app.welcome.json | 2 ++ locale/ru/app.dex.json | 1 + locale/ru/app.utils.json | 9 +++++++++ locale/ru/app.welcome.json | 2 ++ locale/tr/app.dex.json | 1 + locale/tr/app.utils.json | 9 +++++++++ locale/tr/app.welcome.json | 2 ++ locale/zh_CN/app.dex.json | 5 +++-- locale/zh_CN/app.utils.json | 15 ++++++++++++--- locale/zh_CN/app.welcome.json | 2 ++ 51 files changed, 209 insertions(+), 5 deletions(-) diff --git a/locale/de/app.dex.json b/locale/de/app.dex.json index 14b69846ba..52811f4b18 100644 --- a/locale/de/app.dex.json +++ b/locale/de/app.dex.json @@ -200,6 +200,7 @@ "noMarkets": "Keine Märkte, die ihren Filtern entsprechen" }, "price": "Preis", + "vol": "Vol", "volume": "Volumen" } }, diff --git a/locale/de/app.utils.json b/locale/de/app.utils.json index 25b393b3e5..706f0de624 100644 --- a/locale/de/app.utils.json +++ b/locale/de/app.utils.json @@ -302,6 +302,12 @@ "warningText": "Überprüfen sie, ob ihre Wallet oder ihre Exchange Smart Contracts verwendet, um ETH zurückzuziehen. Wir akzeptieren solche Transaktionen nicht und können sie nicht zurückerstatten. Sie werden dieses Geld verlieren.", "warningTitle": "Bitte hinterlegen sie ETH nicht von Smart Contracts! Hinterlegen sie keine ERC20 Tokens! Nur Ethereum ist erlaubt." }, + "wavesGatewayUSDT": { + "warningMinAmountText": "If you will send less than {{minAmount, BigNumber}} {{assetTicker}}, you will lose that money.", + "warningMinAmountTitle": "The minimum amount of deposit is {{minAmount, BigNumber}} {{assetTicker}}, the maximum amount of deposit is {{maxAmount}} {{assetTicker}}", + "warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Tether USD. We do not accept such transactions and can’t refund them. You will lose that money", + "warningTitle": "This is ERC20 USDT deposit address. Send only USDT to this deposit address. Sending any other coin or token to this address may result in the loss of your deposit. Please do not deposit USDT from smart contracts!" + }, "wavesGatewayVST": { "helpDescrText": "Sobald die Transaktion bestätigt ist, verarbeitet das Gateway die Übertragung der WEST Token zu einem Token in ihrem Waves Account.", "helpDescrTitle": "Geben Sie diese Adresse in Ihren WEST-Kunden oder Ihr Wallet ein.", @@ -999,5 +1005,8 @@ "byte": { "help": "Bytes übrig: {{bytes}}" } + }, + "warningPlate": { + "startMoving": "Start moving" } } \ No newline at end of file diff --git a/locale/de/app.welcome.json b/locale/de/app.welcome.json index da9ac49843..f33accaa62 100644 --- a/locale/de/app.welcome.json +++ b/locale/de/app.welcome.json @@ -216,6 +216,8 @@ "termsOfUse": "Nutzungsbedingungen", "tokenCreation": "Schnelle Tokenerstellung", "tokenCreationCosts": "Die Erstellung von Token kostet nur 1 WAVES und dauert 1 Minute.", + "tokenomicaToasterButton": "Mehr Erfahren", + "tokenomicaToasterText": "Werden Sie Aktionär der ersten All-in-One-Plattform für die Ausgabe und den Sekundärhandell der digitalisierten Wertpapiere", "tradeOnWaves": "Handel an der Waves Decentralized Exchange", "tradeOnWavesDescription": "Kaufen und verkaufen Sie Token schnell und sicher mit allen Vorteilen einer zentralen Börse, behalten Sie jedoch die vollständige Kontrolle über Ihre Gelder.", "transactions": "Transaktionen", diff --git a/locale/en/app.dex.json b/locale/en/app.dex.json index 9cad1ab1d8..f61ce82dd1 100644 --- a/locale/en/app.dex.json +++ b/locale/en/app.dex.json @@ -200,6 +200,7 @@ "noMarkets": "No markets matching your filters" }, "price": "Price", + "vol": "Vol", "volume": "Volume" } }, diff --git a/locale/en/app.utils.json b/locale/en/app.utils.json index 9921c2d5e5..529d0101d9 100644 --- a/locale/en/app.utils.json +++ b/locale/en/app.utils.json @@ -302,6 +302,12 @@ "warningText": "Check if your wallet or exchange uses smart-contracts to withdraw ETH. We do not accept such transactions and can’t refund them. You will lose that money.", "warningTitle": "Please do not deposit ETH from smart contracts! Do not deposit ERC20 tokens! Only Ethereum is allowed." }, + "wavesGatewayUSDT": { + "warningMinAmountText": "If you will send less than {{minAmount, BigNumber}} {{assetTicker}}, you will lose that money.", + "warningMinAmountTitle": "The minimum amount of deposit is {{minAmount, BigNumber}} {{assetTicker}}, the maximum amount of deposit is {{maxAmount}} {{assetTicker}}", + "warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Tether USD. We do not accept such transactions and can’t refund them. You will lose that money", + "warningTitle": "This is ERC20 USDT deposit address. Send only USDT to this deposit address. Sending any other coin or token to this address may result in the loss of your deposit. Please do not deposit USDT from smart contracts!" + }, "wavesGatewayVST": { "helpDescrText": "Once the transaction is confirmed, the gateway will process the transfer of WEST to a token in your Waves account.", "helpDescrTitle": "Enter this address into your WEST client or wallet", @@ -999,5 +1005,8 @@ "byte": { "help": "Bytes left: {{bytes}}" } + }, + "warningPlate": { + "startMoving": "Start moving" } } \ No newline at end of file diff --git a/locale/en/app.welcome.json b/locale/en/app.welcome.json index 19dd5f568e..07ca72a169 100644 --- a/locale/en/app.welcome.json +++ b/locale/en/app.welcome.json @@ -216,6 +216,8 @@ "termsOfUse": "Terms of use", "tokenCreation": "Fast token creation", "tokenCreationCosts": "Token creation costs just 1 WAVES and takes 1 minute", + "tokenomicaToasterButton": "Learn more", + "tokenomicaToasterText": "Become a shareholder of the first-ever all-in-one platform for issuance and trading of tokenized assets.", "tradeOnWaves": "Trade on the Waves Decentralised Exchange", "tradeOnWavesDescription": "Buy and sell tokens quickly and securely with all advantages of a centralised exchange, but retaining complete control of your funds.", "transactions": "Transactions", diff --git a/locale/es/app.dex.json b/locale/es/app.dex.json index cdefbc120e..487e05af91 100644 --- a/locale/es/app.dex.json +++ b/locale/es/app.dex.json @@ -200,6 +200,7 @@ "noMarkets": "No hay mercados en base a sus filtros" }, "price": "Precio", + "vol": "Vol", "volume": "Volumen" } }, diff --git a/locale/es/app.utils.json b/locale/es/app.utils.json index 4715200366..61a7a6578f 100644 --- a/locale/es/app.utils.json +++ b/locale/es/app.utils.json @@ -302,6 +302,12 @@ "warningText": "Comprueba si tu monedero o tu exchange utiliza Smart-contracts para retirar ETH. No aceptamos ese tipo de transacción y no podemos devolverlo. Perderás ese dinero.", "warningTitle": "!Por favor no deposites ETH desde Smart-Contract! No deposites tokens ERC20, solo se acepta Ethereum." }, + "wavesGatewayUSDT": { + "warningMinAmountText": "If you will send less than {{minAmount, BigNumber}} {{assetTicker}}, you will lose that money.", + "warningMinAmountTitle": "The minimum amount of deposit is {{minAmount, BigNumber}} {{assetTicker}}, the maximum amount of deposit is {{maxAmount}} {{assetTicker}}", + "warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Tether USD. We do not accept such transactions and can’t refund them. You will lose that money", + "warningTitle": "This is ERC20 USDT deposit address. Send only USDT to this deposit address. Sending any other coin or token to this address may result in the loss of your deposit. Please do not deposit USDT from smart contracts!" + }, "wavesGatewayVST": { "helpDescrText": "Una vez que se confirma la transacción, la puerta de enlace procesará la transferencia de WEST en forma de token a su cuenta Waves.", "helpDescrTitle": "Ingrese esta dirección en su cartera o cliente WEST", @@ -999,5 +1005,8 @@ "byte": { "help": "Quedan: {{bytes}}" } + }, + "warningPlate": { + "startMoving": "Start moving" } } \ No newline at end of file diff --git a/locale/es/app.welcome.json b/locale/es/app.welcome.json index 69c53b03b9..b7938918be 100644 --- a/locale/es/app.welcome.json +++ b/locale/es/app.welcome.json @@ -216,6 +216,8 @@ "termsOfUse": "Términos de uso", "tokenCreation": "Creación rápida de tokens", "tokenCreationCosts": "La creación de tokens cuesta solo 1 WAVES y tarda 1 minuto", + "tokenomicaToasterButton": "Aprende Más", + "tokenomicaToasterText": "Conviértase en accionista de la primera plataforma todo-en-uno para la emisión y comercialización de activos tokenizados.", "tradeOnWaves": "Utilizar el intercambio descentralizado de Waves", "tradeOnWavesDescription": "Compre y venda tokens de forma rápida y segura con todas las ventajas de un intercambio centralizado, pero conservando el control total de sus fondos.", "transactions": "Transacciones", diff --git a/locale/et_EE/app.dex.json b/locale/et_EE/app.dex.json index 5ae896089f..665557801c 100644 --- a/locale/et_EE/app.dex.json +++ b/locale/et_EE/app.dex.json @@ -200,6 +200,7 @@ "noMarkets": "Teie filtritele vastavaid turge ei leitud" }, "price": "Hind", + "vol": "Vol", "volume": "Maht" } }, diff --git a/locale/et_EE/app.utils.json b/locale/et_EE/app.utils.json index e77b278c08..3c7f47325e 100644 --- a/locale/et_EE/app.utils.json +++ b/locale/et_EE/app.utils.json @@ -302,6 +302,12 @@ "warningText": "Kontrollige, kas teie rahakott või börs kasutab ETH-i väljavõtmiseks smart-kontrakte. Me ei aktsepteeri selliseid tehinguid ja ei saa neid tagasi maksta. Te kaotate selle raha.", "warningTitle": "Palun ärge tehke sissemakset ETH smart-kontrakrtidelt! Ärge tehkse sissemakseid ERC20 tokenites! Ainult Ethereum on lubatud." }, + "wavesGatewayUSDT": { + "warningMinAmountText": "If you will send less than {{minAmount, BigNumber}} {{assetTicker}}, you will lose that money.", + "warningMinAmountTitle": "The minimum amount of deposit is {{minAmount, BigNumber}} {{assetTicker}}, the maximum amount of deposit is {{maxAmount}} {{assetTicker}}", + "warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Tether USD. We do not accept such transactions and can’t refund them. You will lose that money", + "warningTitle": "This is ERC20 USDT deposit address. Send only USDT to this deposit address. Sending any other coin or token to this address may result in the loss of your deposit. Please do not deposit USDT from smart contracts!" + }, "wavesGatewayVST": { "helpDescrText": "Once the transaction is confirmed, the gateway will process the transfer of WEST to a token in your Waves account.", "helpDescrTitle": "Enter this address into your WEST client or wallet", @@ -999,5 +1005,8 @@ "byte": { "help": "Baite vasakul: {{bytes}}" } + }, + "warningPlate": { + "startMoving": "Start moving" } } \ No newline at end of file diff --git a/locale/et_EE/app.welcome.json b/locale/et_EE/app.welcome.json index b42d0f8c6c..f236b58a2e 100644 --- a/locale/et_EE/app.welcome.json +++ b/locale/et_EE/app.welcome.json @@ -216,6 +216,8 @@ "termsOfUse": "Terms of use", "tokenCreation": "Fast token creation", "tokenCreationCosts": "Token creation costs just 1 WAVES and takes 1 minute", + "tokenomicaToasterButton": "Lisateavet", + "tokenomicaToasterText": "Saage esimese digitaalne väärtpaberite universaalse platvormi aktsionäriks", "tradeOnWaves": "Trade on the Waves Decentralised Exchange", "tradeOnWavesDescription": "Buy and sell tokens quickly and securely with all advantages of a centralised exchange, but retaining complete control of your funds.", "transactions": "Transactions", diff --git a/locale/fr/app.dex.json b/locale/fr/app.dex.json index c5c759df89..5209352c9c 100644 --- a/locale/fr/app.dex.json +++ b/locale/fr/app.dex.json @@ -200,6 +200,7 @@ "noMarkets": "Aucun marché ne correspond à vos filtres" }, "price": "Prix", + "vol": "Vol", "volume": "Volume" } }, diff --git a/locale/fr/app.utils.json b/locale/fr/app.utils.json index 094e35df76..7b21cc9d75 100644 --- a/locale/fr/app.utils.json +++ b/locale/fr/app.utils.json @@ -302,6 +302,12 @@ "warningText": "Vérifiez si votre portefeuille ou votre plateforme d'échange utilise des smart-contracts pour retirer ETH. Nous n'acceptons pas de telles transactions et ne pouvons pas les rembourser. Vous perdrez cet argent.", "warningTitle": "Ne déposez pas d'ETH à partir de smart-contracts ! Ne déposez pas de tokens ERC20 ! Seul Ethereum est autorisé." }, + "wavesGatewayUSDT": { + "warningMinAmountText": "If you will send less than {{minAmount, BigNumber}} {{assetTicker}}, you will lose that money.", + "warningMinAmountTitle": "The minimum amount of deposit is {{minAmount, BigNumber}} {{assetTicker}}, the maximum amount of deposit is {{maxAmount}} {{assetTicker}}", + "warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Tether USD. We do not accept such transactions and can’t refund them. You will lose that money", + "warningTitle": "This is ERC20 USDT deposit address. Send only USDT to this deposit address. Sending any other coin or token to this address may result in the loss of your deposit. Please do not deposit USDT from smart contracts!" + }, "wavesGatewayVST": { "helpDescrText": "Une fois la transaction confirmée, le portail traitera le transfert de WEST vers un jeton dans votre compte Waves.", "helpDescrTitle": "Entrez cette adresse dans votre client ou portefeuille WEST", @@ -999,5 +1005,8 @@ "byte": { "help": "Octets restants : {{bytes}}" } + }, + "warningPlate": { + "startMoving": "Start moving" } } \ No newline at end of file diff --git a/locale/fr/app.welcome.json b/locale/fr/app.welcome.json index 8f7450fef6..3603005992 100644 --- a/locale/fr/app.welcome.json +++ b/locale/fr/app.welcome.json @@ -216,6 +216,8 @@ "termsOfUse": "Conditions d'utilisation", "tokenCreation": "Création rapide de jetons", "tokenCreationCosts": "La création de jetons coûte seulement 1 WAVES et dure 1 minute", + "tokenomicaToasterButton": "Plus d'informations", + "tokenomicaToasterText": "Devenez actionnaire de la première plateforme tout en un d’émission et d’échange de Security Token", "tradeOnWaves": "Échangez sur la plateforme d'échange décentralisé de Waves", "tradeOnWavesDescription": "Achetez et vendez des jetons rapidement et en toute sécurité avec tous les avantages d'un échange centralisé, tout en gardant le contrôle total de vos fonds.", "transactions": "Transactions", diff --git a/locale/hi_IN/app.dex.json b/locale/hi_IN/app.dex.json index 9c08f782a3..51154cb585 100644 --- a/locale/hi_IN/app.dex.json +++ b/locale/hi_IN/app.dex.json @@ -200,6 +200,7 @@ "noMarkets": "आपके फिल्टर से मैच करता कोई मार्केट नहीं" }, "price": "मूल्य", + "vol": "Vol", "volume": "वॉल्यूम" } }, diff --git a/locale/hi_IN/app.utils.json b/locale/hi_IN/app.utils.json index 4b65830941..b899e8a58e 100644 --- a/locale/hi_IN/app.utils.json +++ b/locale/hi_IN/app.utils.json @@ -302,6 +302,12 @@ "warningText": "क करें किया क्या आपका वॉलेट या एक्सचेंज, ETH निकासी के लिए स्मार्ट-कॉन्ट्रैक्ट का उपयोग करता है। हम ऐसे लेनेदेन स्वीकार नहीं करते हैं और उनको रिफंड नहीं कर सकते हैं। आपको उस धन की हानि हो जाएगी।", "warningTitle": "कृपया स्मार्ट-कॉन्ट्रैक्ट से ETH जमा ना करें! ERC20 टोकन जमा ना करें! केवल Ethereum अनुमत है।" }, + "wavesGatewayUSDT": { + "warningMinAmountText": "If you will send less than {{minAmount, BigNumber}} {{assetTicker}}, you will lose that money.", + "warningMinAmountTitle": "The minimum amount of deposit is {{minAmount, BigNumber}} {{assetTicker}}, the maximum amount of deposit is {{maxAmount}} {{assetTicker}}", + "warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Tether USD. We do not accept such transactions and can’t refund them. You will lose that money", + "warningTitle": "This is ERC20 USDT deposit address. Send only USDT to this deposit address. Sending any other coin or token to this address may result in the loss of your deposit. Please do not deposit USDT from smart contracts!" + }, "wavesGatewayVST": { "helpDescrText": "Once the transaction is confirmed, the gateway will process the transfer of WEST to a token in your Waves account.", "helpDescrTitle": "Enter this address into your WEST client or wallet", @@ -999,5 +1005,8 @@ "byte": { "help": "शेष Bytes: {{bytes}}" } + }, + "warningPlate": { + "startMoving": "Start moving" } } \ No newline at end of file diff --git a/locale/hi_IN/app.welcome.json b/locale/hi_IN/app.welcome.json index ca5e92d178..8c1bdbe9f1 100644 --- a/locale/hi_IN/app.welcome.json +++ b/locale/hi_IN/app.welcome.json @@ -216,6 +216,8 @@ "termsOfUse": "Terms of use", "tokenCreation": "Fast token creation", "tokenCreationCosts": "Token creation costs just 1 WAVES and takes 1 minute", + "tokenomicaToasterButton": "और अधिक जानें", + "tokenomicaToasterText": "टोकेन अस्सेट्स के प्रकाशन और व्यापार के लिए पहले कभी ऑल-इन-वन प्लेटफॉर्म का हिस्सेदार बनो", "tradeOnWaves": "Trade on the Waves Decentralised Exchange", "tradeOnWavesDescription": "Buy and sell tokens quickly and securely with all advantages of a centralised exchange, but retaining complete control of your funds.", "transactions": "Transactions", diff --git a/locale/id/app.dex.json b/locale/id/app.dex.json index e820b8ccb4..99cd5d5d4f 100644 --- a/locale/id/app.dex.json +++ b/locale/id/app.dex.json @@ -200,6 +200,7 @@ "noMarkets": "Tidak ada pasar yang cocok dengan filter Anda" }, "price": "Harga", + "vol": "Vol", "volume": "Volume" } }, diff --git a/locale/id/app.utils.json b/locale/id/app.utils.json index 331d8db512..e155a65891 100644 --- a/locale/id/app.utils.json +++ b/locale/id/app.utils.json @@ -302,6 +302,12 @@ "warningText": "Periksa apakah dompet atau pertukaran Anda menggunakan kontrak cerdas untuk menarik ETH. Kami tidak menerima transaksi semacam itu dan dapat mengembalikan uang mereka. Anda akan kehilangan uang itu.", "warningTitle": "Tolong jangan depositkan ETH dari kontrak pintar! Jangan setor token ERC20! Hanya Ethereum yang diizinkan." }, + "wavesGatewayUSDT": { + "warningMinAmountText": "If you will send less than {{minAmount, BigNumber}} {{assetTicker}}, you will lose that money.", + "warningMinAmountTitle": "The minimum amount of deposit is {{minAmount, BigNumber}} {{assetTicker}}, the maximum amount of deposit is {{maxAmount}} {{assetTicker}}", + "warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Tether USD. We do not accept such transactions and can’t refund them. You will lose that money", + "warningTitle": "This is ERC20 USDT deposit address. Send only USDT to this deposit address. Sending any other coin or token to this address may result in the loss of your deposit. Please do not deposit USDT from smart contracts!" + }, "wavesGatewayVST": { "helpDescrText": "Setelah transaksi dikonfirmasi, gateway akan memproses transfer WEST ke token di akun Waves Anda.", "helpDescrTitle": "Masukkan alamat ini ke klien atau dompet WEST Anda", @@ -999,5 +1005,8 @@ "byte": { "help": "Byte tersisa: {{bytes}}" } + }, + "warningPlate": { + "startMoving": "Start moving" } } \ No newline at end of file diff --git a/locale/id/app.welcome.json b/locale/id/app.welcome.json index dabdc2d500..613d39ad66 100644 --- a/locale/id/app.welcome.json +++ b/locale/id/app.welcome.json @@ -216,6 +216,8 @@ "termsOfUse": "Syarat Penggunaan", "tokenCreation": "Pembuatan token cepat", "tokenCreationCosts": "Biaya pembuatan token hanya 1 WAVES dan memakan waktu 1 menit", + "tokenomicaToasterButton": "Belajarlah lagi", + "tokenomicaToasterText": "Menjadi pemegang saham platform bersama pertama untuk penerbitan dan perdagangan aset tokenized", "tradeOnWaves": "Perdagangan di Bursa Desentralisasi Waves", "tradeOnWavesDescription": "Beli dan jual token dengan cepat dan aman dengan semua keuntungan dari pertukaran terpusat, tetapi tetap memegang kendali penuh atas dana Anda.", "transactions": "Transaksi", diff --git a/locale/it/app.dex.json b/locale/it/app.dex.json index a46de99212..903a473459 100644 --- a/locale/it/app.dex.json +++ b/locale/it/app.dex.json @@ -200,6 +200,7 @@ "noMarkets": "Nessun mercato in base ai criteri di ricerca" }, "price": "Prezzo", + "vol": "Vol", "volume": "Volume" } }, diff --git a/locale/it/app.utils.json b/locale/it/app.utils.json index c37e029976..3b7962e301 100644 --- a/locale/it/app.utils.json +++ b/locale/it/app.utils.json @@ -302,6 +302,12 @@ "warningText": "Controlla se il tuo wallet o exchange utilizza smart contract per trasferire ETH. Non accettiamo questo tipo di transazioni e non ci sarà possibile rimborsarle. L'importo trasferito andrà perduto.", "warningTitle": "Per favore, non inviare ETH da smart contracts! Non inviare token ERC20! Accettiamo esclusivamente Ethereum." }, + "wavesGatewayUSDT": { + "warningMinAmountText": "If you will send less than {{minAmount, BigNumber}} {{assetTicker}}, you will lose that money.", + "warningMinAmountTitle": "The minimum amount of deposit is {{minAmount, BigNumber}} {{assetTicker}}, the maximum amount of deposit is {{maxAmount}} {{assetTicker}}", + "warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Tether USD. We do not accept such transactions and can’t refund them. You will lose that money", + "warningTitle": "This is ERC20 USDT deposit address. Send only USDT to this deposit address. Sending any other coin or token to this address may result in the loss of your deposit. Please do not deposit USDT from smart contracts!" + }, "wavesGatewayVST": { "helpDescrText": "Una volta che la transazione sarà confermata, il gateway processerà il trasferimento di WEST in favore di un token nel tuo account Waves.", "helpDescrTitle": "Inserisci questo indirizzo nel tuo client WEST o nel tuo wallet", @@ -999,5 +1005,8 @@ "byte": { "help": "Byte restanti: {{bytes}}" } + }, + "warningPlate": { + "startMoving": "Start moving" } } \ No newline at end of file diff --git a/locale/it/app.welcome.json b/locale/it/app.welcome.json index 31715a0a8f..b8ca34dd1f 100644 --- a/locale/it/app.welcome.json +++ b/locale/it/app.welcome.json @@ -216,6 +216,8 @@ "termsOfUse": "Termini di utilizzo", "tokenCreation": "Creazione rapida di token", "tokenCreationCosts": "La creazione di token costa solo 1 Waves e richiede 1 minuto", + "tokenomicaToasterButton": "Ulteriori Informazioni", + "tokenomicaToasterText": "Diventi azionista della prima tutto-in-uno piattaforma per l'emissione e il secondario commercio di attività tokenizzate", "tradeOnWaves": "Commercia sull'Exchange Decentrato Waves", "tradeOnWavesDescription": "Compra e vendi i token in modo rapido e sicuro con tutti i vantaggi di uno scambio centralizzato, ma mantenendo il controllo completo dei tuoi fondi.", "transactions": "Transazioni", diff --git a/locale/ja/app.dex.json b/locale/ja/app.dex.json index e320f27401..76369cbacf 100644 --- a/locale/ja/app.dex.json +++ b/locale/ja/app.dex.json @@ -200,6 +200,7 @@ "noMarkets": "指定されたフィルターに合致するペアはありません" }, "price": "価格", + "vol": "Vol", "volume": "ボリューム" } }, diff --git a/locale/ja/app.utils.json b/locale/ja/app.utils.json index a8288d1a77..a2ff66cf93 100644 --- a/locale/ja/app.utils.json +++ b/locale/ja/app.utils.json @@ -302,6 +302,12 @@ "warningText": "あなたのウォレットと取引所がスマートコントラクトを用いて、ETHを引出していないか、確認してください。私たちはそのような形式のトランザクションを受け入れておらず、返金することもできません。あなたはあなたの資金を失います。", "warningTitle": "ETHをスマートコントラクトからデポジットしないでください。また、ERC20トークンもデポジットしないでください。" }, + "wavesGatewayUSDT": { + "warningMinAmountText": "If you will send less than {{minAmount, BigNumber}} {{assetTicker}}, you will lose that money.", + "warningMinAmountTitle": "The minimum amount of deposit is {{minAmount, BigNumber}} {{assetTicker}}, the maximum amount of deposit is {{maxAmount}} {{assetTicker}}", + "warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Tether USD. We do not accept such transactions and can’t refund them. You will lose that money", + "warningTitle": "This is ERC20 USDT deposit address. Send only USDT to this deposit address. Sending any other coin or token to this address may result in the loss of your deposit. Please do not deposit USDT from smart contracts!" + }, "wavesGatewayVST": { "helpDescrText": "トランザクションが承認されると、ゲートウェイはWESTの送信を進め、あなたのWavesアカウントにトークンが反映されます。", "helpDescrTitle": "このアドレスをWESTクライアント、またはウォレットに入力してください", @@ -999,5 +1005,8 @@ "byte": { "help": "Bytes 残 : {{bytes}}" } + }, + "warningPlate": { + "startMoving": "Start moving" } } \ No newline at end of file diff --git a/locale/ja/app.welcome.json b/locale/ja/app.welcome.json index 50c5fdab52..e21f51264e 100644 --- a/locale/ja/app.welcome.json +++ b/locale/ja/app.welcome.json @@ -216,6 +216,8 @@ "termsOfUse": "利用規約", "tokenCreation": "高速なトークン生成", "tokenCreationCosts": "トークン生成にかかる費用はわずか1 WAVESで、わずか1分で完了", + "tokenomicaToasterButton": "もっと詳しく知る", + "tokenomicaToasterText": "トークン化された資産の発行と取引のための史上初のオールインワンプラットフォームの株主になる", "tradeOnWaves": "Wavesの分散型取引所でトレード", "tradeOnWavesDescription": "中央型取引所のすべての利点をすべて提供しつつ、資金を完全に管理しながらトークンを迅速かつ安全に売買できます。", "transactions": "トランザクション", diff --git a/locale/ko/app.dex.json b/locale/ko/app.dex.json index acd7af6140..0feb367beb 100644 --- a/locale/ko/app.dex.json +++ b/locale/ko/app.dex.json @@ -200,6 +200,7 @@ "noMarkets": "검색 결과가 없습니다" }, "price": "가격", + "vol": "Vol", "volume": "거래량" } }, diff --git a/locale/ko/app.utils.json b/locale/ko/app.utils.json index 9176d46912..db26f59aa1 100644 --- a/locale/ko/app.utils.json +++ b/locale/ko/app.utils.json @@ -302,6 +302,12 @@ "warningText": "ETH를 출금하려고 하는 지갑 또는 거래소가 Smart-Contracts를 사용하는지 확인하세요. 당사는 해당 트랜잭션을 수신하지 않으며 환불 또한 불가능합니다. 귀하의 자산을 잃게 됩니다.", "warningTitle": "Smart Contracts에서 ETH를 입금하지 마세요! ERC20 토큰을 입금하지 마세요! Ethereum 입금만 가능합니다." }, + "wavesGatewayUSDT": { + "warningMinAmountText": "If you will send less than {{minAmount, BigNumber}} {{assetTicker}}, you will lose that money.", + "warningMinAmountTitle": "The minimum amount of deposit is {{minAmount, BigNumber}} {{assetTicker}}, the maximum amount of deposit is {{maxAmount}} {{assetTicker}}", + "warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Tether USD. We do not accept such transactions and can’t refund them. You will lose that money", + "warningTitle": "This is ERC20 USDT deposit address. Send only USDT to this deposit address. Sending any other coin or token to this address may result in the loss of your deposit. Please do not deposit USDT from smart contracts!" + }, "wavesGatewayVST": { "helpDescrText": "트랜잭션이 승인되면 게이트웨이가 귀하의 Waves 계정에서 WEST를 토큰으로 전송하는 작업을 처리할 것입니다.", "helpDescrTitle": "이 주소를 WEST 클라이언트 또는 지갑에 입력하세요", @@ -999,5 +1005,8 @@ "byte": { "help": "사용 가능 Bytes: {{bytes}}" } + }, + "warningPlate": { + "startMoving": "Start moving" } } \ No newline at end of file diff --git a/locale/ko/app.welcome.json b/locale/ko/app.welcome.json index efe319523a..50a2ade06c 100644 --- a/locale/ko/app.welcome.json +++ b/locale/ko/app.welcome.json @@ -216,6 +216,8 @@ "termsOfUse": "이용 약관", "tokenCreation": "빠른 토큰 생성", "tokenCreationCosts": "1 WAVES로 1분만에 토큰을 생성할 수 있습니다", + "tokenomicaToasterButton": "더 알아보기", + "tokenomicaToasterText": "토큰 화 된 자산의 발행 및 거래를위한 최초의 범용 플랫폼의 주주가 되십시오", "tradeOnWaves": "Waves 탈중앙화 거래소에서 거래하세요", "tradeOnWavesDescription": "본인의 자금에 대한 완전한 통제권 및 중앙 집중식 거래소의 이점과 함께 빠르고 안전하게 토큰을 사고 파세요.", "transactions": "트랜잭션", diff --git a/locale/nl_NL/app.dex.json b/locale/nl_NL/app.dex.json index 940dfacc29..05f6b86244 100644 --- a/locale/nl_NL/app.dex.json +++ b/locale/nl_NL/app.dex.json @@ -200,6 +200,7 @@ "noMarkets": "Geen markten die overeenkomen met uw filters" }, "price": "Prijs", + "vol": "Vol", "volume": "Volume" } }, diff --git a/locale/nl_NL/app.utils.json b/locale/nl_NL/app.utils.json index 7e8b38df29..ade78fc7cf 100644 --- a/locale/nl_NL/app.utils.json +++ b/locale/nl_NL/app.utils.json @@ -302,6 +302,12 @@ "warningText": "Controleer of uw wallet of exchange smart-contracts gebruikt om ETH the withdrawen. Wij accepteren zulke transacties niet en kunnen dit niet terug betalen. U raakt op deze manier uw geld kwijt.", "warningTitle": "Verstuur geen ETH vanuit smart contracts naar dit adres. Stort geen ERC20 tokens! Alleen Ethereum is toegestaan." }, + "wavesGatewayUSDT": { + "warningMinAmountText": "If you will send less than {{minAmount, BigNumber}} {{assetTicker}}, you will lose that money.", + "warningMinAmountTitle": "The minimum amount of deposit is {{minAmount, BigNumber}} {{assetTicker}}, the maximum amount of deposit is {{maxAmount}} {{assetTicker}}", + "warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Tether USD. We do not accept such transactions and can’t refund them. You will lose that money", + "warningTitle": "This is ERC20 USDT deposit address. Send only USDT to this deposit address. Sending any other coin or token to this address may result in the loss of your deposit. Please do not deposit USDT from smart contracts!" + }, "wavesGatewayVST": { "helpDescrText": "Zodra de transactie bevestigd is zal de gateway de transactie behandelen en dit omzetten naar een WEST token in uw Waves account.", "helpDescrTitle": "Dit adres invoeren in uw WEST-client of wallet", @@ -999,5 +1005,8 @@ "byte": { "help": "Bytes over: {{bytes}}" } + }, + "warningPlate": { + "startMoving": "Start moving" } } \ No newline at end of file diff --git a/locale/nl_NL/app.welcome.json b/locale/nl_NL/app.welcome.json index e56efd4b8a..d935dcf38f 100644 --- a/locale/nl_NL/app.welcome.json +++ b/locale/nl_NL/app.welcome.json @@ -216,6 +216,8 @@ "termsOfUse": "Gebruiksvoorwaarden", "tokenCreation": "Snelle tokencreatie", "tokenCreationCosts": "Het aanmaken van tokens kost slechts 1 WAVES en duurt 1 minuut", + "tokenomicaToasterButton": "Leer Meer", + "tokenomicaToasterText": "Word aandeelhouder van het allereerste alles-in-één platform voor uitgifte en secundaire handel de gedigitaliseerde activa.", "tradeOnWaves": "Handel op de Waves gedecentraliseerde exchange", "tradeOnWavesDescription": "Koop en verkoop tokens snel en veilig met alle voordelen van een centrale uitwisseling, maar behoud de volledige controle over uw geld.", "transactions": "Transacties", diff --git a/locale/pl/app.dex.json b/locale/pl/app.dex.json index 437cb6f023..19fa46883a 100644 --- a/locale/pl/app.dex.json +++ b/locale/pl/app.dex.json @@ -200,6 +200,7 @@ "noMarkets": "Brak rynków spełniającyh wymagania" }, "price": "Cena", + "vol": "Vol", "volume": "Wolumen" } }, diff --git a/locale/pl/app.utils.json b/locale/pl/app.utils.json index 9771eb56bb..5142acf364 100644 --- a/locale/pl/app.utils.json +++ b/locale/pl/app.utils.json @@ -302,6 +302,12 @@ "warningText": "Sprawdź czy portfel lub giełda używają inteligentnych kontraktów (smart contracts) do wycofania ETH. Nie akceptujemy takich transakcji i nie możemy ich zwrócić. Stracisz te pieniądze.", "warningTitle": "Proszę nie deponować ETH z inteligentnych kontraktów (smart contracts)! Proszę nie deponować tokenów ERC20! Tylko Ethereum dozwolone." }, + "wavesGatewayUSDT": { + "warningMinAmountText": "If you will send less than {{minAmount, BigNumber}} {{assetTicker}}, you will lose that money.", + "warningMinAmountTitle": "The minimum amount of deposit is {{minAmount, BigNumber}} {{assetTicker}}, the maximum amount of deposit is {{maxAmount}} {{assetTicker}}", + "warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Tether USD. We do not accept such transactions and can’t refund them. You will lose that money", + "warningTitle": "This is ERC20 USDT deposit address. Send only USDT to this deposit address. Sending any other coin or token to this address may result in the loss of your deposit. Please do not deposit USDT from smart contracts!" + }, "wavesGatewayVST": { "helpDescrText": "Jeżeli transakcja zostanie potwierdzona, system wymieni WEST na tokeny w Twoim koncie Waves.", "helpDescrTitle": "Wprowadź ten adres w swoim kliencie albo portfelu WEST", @@ -999,5 +1005,8 @@ "byte": { "help": "Zostały bajty: {{bytes}}" } + }, + "warningPlate": { + "startMoving": "Start moving" } } \ No newline at end of file diff --git a/locale/pl/app.welcome.json b/locale/pl/app.welcome.json index 21d5773550..6a5154ce93 100644 --- a/locale/pl/app.welcome.json +++ b/locale/pl/app.welcome.json @@ -216,6 +216,8 @@ "termsOfUse": "Warunki użytkowania", "tokenCreation": "Szybkie tworzenie tokenów", "tokenCreationCosts": "Tworzenie tokena kosztuje tylko 1 WAVES i trwa 1 minutę", + "tokenomicaToasterButton": "Więcej informacji", + "tokenomicaToasterText": "Zostań akcjonariuszem pierwszej wszechstronnej platformy do emisji i obrotu tokenizowanymi aktywami", "tradeOnWaves": "Handel na zdecentralizowanej giełdzie Waves", "tradeOnWavesDescription": "Kupuj i sprzedawaj żetony szybko i bezpiecznie ze wszystkimi zaletami scentralizowanej wymiany, ale zachowując pełną kontrolę nad swoimi środkami.", "transactions": "Transakcje", diff --git a/locale/pt_BR/app.dex.json b/locale/pt_BR/app.dex.json index d84a65f322..b1c3f99084 100644 --- a/locale/pt_BR/app.dex.json +++ b/locale/pt_BR/app.dex.json @@ -200,6 +200,7 @@ "noMarkets": "Nenhum mercado corresponde aos seus filtros" }, "price": "Preço", + "vol": "Vol", "volume": "Volume" } }, diff --git a/locale/pt_BR/app.utils.json b/locale/pt_BR/app.utils.json index 1a28f2e7fb..1458e28989 100644 --- a/locale/pt_BR/app.utils.json +++ b/locale/pt_BR/app.utils.json @@ -302,6 +302,12 @@ "warningText": "Verifique se a sua carteira ou exchange usa smart contracts para transferir ETH. Nós não aceitamos essas transações e você perderá esse dinheiro, pois não podemos reembolsar.", "warningTitle": "Por favor, não deposite ETH através de smart contracts! Não deposite tokens ERC20! Apenas Ethereum é permitido." }, + "wavesGatewayUSDT": { + "warningMinAmountText": "If you will send less than {{minAmount, BigNumber}} {{assetTicker}}, you will lose that money.", + "warningMinAmountTitle": "The minimum amount of deposit is {{minAmount, BigNumber}} {{assetTicker}}, the maximum amount of deposit is {{maxAmount}} {{assetTicker}}", + "warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Tether USD. We do not accept such transactions and can’t refund them. You will lose that money", + "warningTitle": "This is ERC20 USDT deposit address. Send only USDT to this deposit address. Sending any other coin or token to this address may result in the loss of your deposit. Please do not deposit USDT from smart contracts!" + }, "wavesGatewayVST": { "helpDescrText": "Once the transaction is confirmed, the gateway will process the transfer of WEST to a token in your Waves account.", "helpDescrTitle": "Enter this address into your WEST client or wallet", @@ -999,5 +1005,8 @@ "byte": { "help": "Bytes restantes: {{bytes}}" } + }, + "warningPlate": { + "startMoving": "Start moving" } } \ No newline at end of file diff --git a/locale/pt_BR/app.welcome.json b/locale/pt_BR/app.welcome.json index cba10d0338..49b1ca0641 100644 --- a/locale/pt_BR/app.welcome.json +++ b/locale/pt_BR/app.welcome.json @@ -216,6 +216,8 @@ "termsOfUse": "Terms of use", "tokenCreation": "Fast token creation", "tokenCreationCosts": "Token creation costs just 1 WAVES and takes 1 minute", + "tokenomicaToasterButton": "Saber Mais", + "tokenomicaToasterText": "Torne-se acionista da primeira tudo-em-um plataforma para emissão e negociação secundária de ativos tokenizados", "tradeOnWaves": "Trade on the Waves Decentralised Exchange", "tradeOnWavesDescription": "Buy and sell tokens quickly and securely with all advantages of a centralised exchange, but retaining complete control of your funds.", "transactions": "Transações", diff --git a/locale/pt_PT/app.dex.json b/locale/pt_PT/app.dex.json index 9cad1ab1d8..f61ce82dd1 100644 --- a/locale/pt_PT/app.dex.json +++ b/locale/pt_PT/app.dex.json @@ -200,6 +200,7 @@ "noMarkets": "No markets matching your filters" }, "price": "Price", + "vol": "Vol", "volume": "Volume" } }, diff --git a/locale/pt_PT/app.utils.json b/locale/pt_PT/app.utils.json index 472c8cb29e..90a9f14834 100644 --- a/locale/pt_PT/app.utils.json +++ b/locale/pt_PT/app.utils.json @@ -302,6 +302,12 @@ "warningText": "Check if your wallet or exchange uses smart-contracts to withdraw ETH. We do not accept such transactions and can’t refund them. You will lose that money.", "warningTitle": "Please do not deposit ETH from smart contracts! Do not deposit ERC20 tokens! Only Ethereum is allowed." }, + "wavesGatewayUSDT": { + "warningMinAmountText": "If you will send less than {{minAmount, BigNumber}} {{assetTicker}}, you will lose that money.", + "warningMinAmountTitle": "The minimum amount of deposit is {{minAmount, BigNumber}} {{assetTicker}}, the maximum amount of deposit is {{maxAmount}} {{assetTicker}}", + "warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Tether USD. We do not accept such transactions and can’t refund them. You will lose that money", + "warningTitle": "This is ERC20 USDT deposit address. Send only USDT to this deposit address. Sending any other coin or token to this address may result in the loss of your deposit. Please do not deposit USDT from smart contracts!" + }, "wavesGatewayVST": { "helpDescrText": "Once the transaction is confirmed, the gateway will process the transfer of WEST to a token in your Waves account.", "helpDescrTitle": "Enter this address into your WEST client or wallet", @@ -999,5 +1005,8 @@ "byte": { "help": "Bytes left: {{bytes}}" } + }, + "warningPlate": { + "startMoving": "Start moving" } } \ No newline at end of file diff --git a/locale/pt_PT/app.welcome.json b/locale/pt_PT/app.welcome.json index 19dd5f568e..da6e931bb9 100644 --- a/locale/pt_PT/app.welcome.json +++ b/locale/pt_PT/app.welcome.json @@ -216,6 +216,8 @@ "termsOfUse": "Terms of use", "tokenCreation": "Fast token creation", "tokenCreationCosts": "Token creation costs just 1 WAVES and takes 1 minute", + "tokenomicaToasterButton": "Saber Mais", + "tokenomicaToasterText": "Torne-se acionista da primeira tudo-em-um plataforma para emissão e negociação secundária de ativos tokenizados", "tradeOnWaves": "Trade on the Waves Decentralised Exchange", "tradeOnWavesDescription": "Buy and sell tokens quickly and securely with all advantages of a centralised exchange, but retaining complete control of your funds.", "transactions": "Transactions", diff --git a/locale/ru/app.dex.json b/locale/ru/app.dex.json index 8c74dc219e..f5fe2447d1 100644 --- a/locale/ru/app.dex.json +++ b/locale/ru/app.dex.json @@ -200,6 +200,7 @@ "noMarkets": "Ничего не найдено" }, "price": "Цена", + "vol": "Объём", "volume": "Объём" } }, diff --git a/locale/ru/app.utils.json b/locale/ru/app.utils.json index e65e745fc5..9c9f0bca93 100644 --- a/locale/ru/app.utils.json +++ b/locale/ru/app.utils.json @@ -302,6 +302,12 @@ "warningText": "Проверьте, не использует ли ваш кошелёк или биржа смарт-контракты для отправки ETH. Мы не принимаем такие переводы и не можем возместить их. Вы потеряете эти деньги.", "warningTitle": "Не отправляйте ETH со смарт-контрактов! Не отправляйте ERC20-токены! Только Ethereum." }, + "wavesGatewayUSDT": { + "warningMinAmountText": "Если вы отправите меньше чем {{minAmount, BigNumber}} {{assetTicker}}, вы потеряете деньги.", + "warningMinAmountTitle": "Минимальная сумма депозита {{minAmount, BigNumber}} {{assetTicker}}, максимальная сумма депозита {{maxAmount}} {{assetTicker}}", + "warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Tether USD. We do not accept such transactions and can’t refund them. You will lose that money", + "warningTitle": "This is ERC20 USDT deposit address. Send only USDT to this deposit address. Sending any other coin or token to this address may result in the loss of your deposit. Please do not deposit USDT from smart contracts!" + }, "wavesGatewayVST": { "helpDescrText": "Как только транзакция будет подтверждена, шлюз отправит WEST-токен на ваш аккаунт Waves.", "helpDescrTitle": "Введите этот адрес в ваш WEST клиент или кошелёк.", @@ -999,5 +1005,8 @@ "byte": { "help": "Осталось байт: {{bytes}}" } + }, + "warningPlate": { + "startMoving": "Start moving" } } \ No newline at end of file diff --git a/locale/ru/app.welcome.json b/locale/ru/app.welcome.json index 7286957c1d..3a552ed79f 100644 --- a/locale/ru/app.welcome.json +++ b/locale/ru/app.welcome.json @@ -216,6 +216,8 @@ "termsOfUse": "Договор на обслуживание", "tokenCreation": "Быстрый запуск токена", "tokenCreationCosts": "Создание токена за 1 WAVES за считанные минуты", + "tokenomicaToasterButton": "Узнать подробнее", + "tokenomicaToasterText": "Cтаньте акционером первой универсальной платформы для токенизированных ценных бумаг. ", "tradeOnWaves": "Торгуйте на децентрализованной бирже Waves", "tradeOnWavesDescription": "Покупайте и продавайте токены быстро и безопасно со всеми преимуществами централизованных бирж, но сохраняя полный контроль над своими средствами.", "transactions": "Транзакции", diff --git a/locale/tr/app.dex.json b/locale/tr/app.dex.json index a0a235523c..4e724a2840 100644 --- a/locale/tr/app.dex.json +++ b/locale/tr/app.dex.json @@ -200,6 +200,7 @@ "noMarkets": "Filtrelerinize uygun bir pazar bulunamadı" }, "price": "Fiyat", + "vol": "Vol", "volume": "Hacim" } }, diff --git a/locale/tr/app.utils.json b/locale/tr/app.utils.json index 10db62190e..69fba3dc16 100644 --- a/locale/tr/app.utils.json +++ b/locale/tr/app.utils.json @@ -302,6 +302,12 @@ "warningText": "Cüzdanınızın veya Kripto para borsasının ETH çekimlerinde akıllı kontrat kullanıp kullanmadığını kontrol edin. Akıllı kontratlar tarafından gelen transferleri kabul edemiyoruz. Paranızı kaybedersiniz.", "warningTitle": "ETH akıllı kontratlarından yatırma işlemi yapmayınız. ERC20 tokenleri yatırmayınız! Sadece Ethereum transferleri kabul edilir." }, + "wavesGatewayUSDT": { + "warningMinAmountText": "If you will send less than {{minAmount, BigNumber}} {{assetTicker}}, you will lose that money.", + "warningMinAmountTitle": "The minimum amount of deposit is {{minAmount, BigNumber}} {{assetTicker}}, the maximum amount of deposit is {{maxAmount}} {{assetTicker}}", + "warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Tether USD. We do not accept such transactions and can’t refund them. You will lose that money", + "warningTitle": "This is ERC20 USDT deposit address. Send only USDT to this deposit address. Sending any other coin or token to this address may result in the loss of your deposit. Please do not deposit USDT from smart contracts!" + }, "wavesGatewayVST": { "helpDescrText": "İşlem onaylandıktan sonra WESTlar Waves adresinize geçit tarafından gönderilir.", "helpDescrTitle": "Bu adresi WEST cüzdanına ya da uygulamasına giriniz.", @@ -999,5 +1005,8 @@ "byte": { "help": "Byte kaldı: {{bytes}}" } + }, + "warningPlate": { + "startMoving": "Start moving" } } \ No newline at end of file diff --git a/locale/tr/app.welcome.json b/locale/tr/app.welcome.json index 7069812a91..b69b49b15d 100644 --- a/locale/tr/app.welcome.json +++ b/locale/tr/app.welcome.json @@ -216,6 +216,8 @@ "termsOfUse": "Kullanım koşulları", "tokenCreation": "Hızlı kripto para oluşturma", "tokenCreationCosts": "Kripto para oluşturma maliyeti yalnızca 1 WAVES ve 1 dakika sürer", + "tokenomicaToasterButton": "Daha fazla bilgi", + "tokenomicaToasterText": "Tokenlenmiş assetlerin çıkarmasi ve alım satımı için ilk bir hepsi bir arada platformun hissedarı olun.", "tradeOnWaves": "Waves Merkezsiz Kripto Para Borsasında Kripto Para Alın ve Satın", "tradeOnWavesDescription": "Merkezi bir borsanın tüm avantajları ile birlikte kripto paralarınızı hızlı ve güvenli bir şekilde alın ve satın, bu esnada varlıklarınızın kontrolünü elinizde tutun.", "transactions": "İşlemler", diff --git a/locale/zh_CN/app.dex.json b/locale/zh_CN/app.dex.json index 3e7bddf2f2..3ee464b99f 100644 --- a/locale/zh_CN/app.dex.json +++ b/locale/zh_CN/app.dex.json @@ -47,7 +47,7 @@ "last": "最新交易价", "limit": "限价单", "market": "市场订单", - "marketPriceField": "Price", + "marketPriceField": "价格", "matcherFee": "费用", "notifications": { "error": { @@ -76,7 +76,7 @@ "total": "总额" }, "createorder": { - "yourBalance": "Your balance" + "yourBalance": "您的余额" }, "demo": { "createAccount": "创建新账户", @@ -200,6 +200,7 @@ "noMarkets": "没有符合您的筛选的市场" }, "price": "价格", + "vol": "Vol", "volume": "量" } }, diff --git a/locale/zh_CN/app.utils.json b/locale/zh_CN/app.utils.json index ce6ac8aad5..6e2c57e950 100644 --- a/locale/zh_CN/app.utils.json +++ b/locale/zh_CN/app.utils.json @@ -279,7 +279,7 @@ "warningTitle": "请不要从智能合约中存入BNT！不要存入其他ERC20代币！只允许Bancor。" }, "wavesGatewayBTC": { - "helpDescrText": "Once the transaction is confirmed, the gateway will process the transfer of BTC to a token in your Waves account.", + "helpDescrText": "确认交易后，网关将处理BTC到Waves帐户中令牌的转移。", "helpDescrTitle": "在您的BTC客户端或钱包中输入此地址", "warningMinAmountText": "如果您发送的费用低于{{minAmount, BigNumber}} {{assetTicker}}，您将失去这笔钱。", "warningMinAmountTitle": "最低存款金额为{{minAmount，BigNumber}} {{assetTicker}} ，最高存款金额为{{maxAmount}} {{assetTicker}}", @@ -295,13 +295,19 @@ "warningTitle": "仅将ERGO发送至此存款地址" }, "wavesGatewayETH": { - "helpDescrText": "Once the transaction is confirmed, the gateway will process the transfer of ETH to a token in your Waves account.", - "helpDescrTitle": "Enter this address into your ETH client or wallet", + "helpDescrText": "确认交易后，网关将处理ETH到Waves帐户中的代币的转账。", + "helpDescrTitle": "将此地址输入您的ETH客户或钱包", "warningMinAmountText": "如果你发送少于{{minAmount, BigNumber}} {{assetTicker}}，你将失去这笔钱。", "warningMinAmountTitle": "最低存款金额为{{minAmount，BigNumber}} {{assetTicker}} ，最高存款金额为{{maxAmount}} {{assetTicker}}", "warningText": "检查您的钱包或交易所是否为收回ETH使用智能合约。我们不接受这种交易，也不能退款。您将会失去这笔钱。", "warningTitle": "请不要从智能合约中交存ETH！别交存ERC20代币！您只能交存以太坊Ethereum。" }, + "wavesGatewayUSDT": { + "warningMinAmountText": "如果您的汇款少于{{minAmount，BigNumber}} {{assetTicker}} ，您将损失这笔钱。", + "warningMinAmountTitle": "最低存款额为{{minAmount，BigNumber}} {{assetTicker}} ，最大存款额为{{maxAmount}} {{assetTicker}}", + "warningText": "检查您的钱包或交易所是否使用智能合约提取Tether USD。我们不接受此类交易，也无法退款。你会赔钱的", + "warningTitle": "这是ERC20 USDT的存款地址。仅将USDT发送到该存款地址。将任何其他硬币或令牌发送到此地址可能会导致您的押金丢失。请不要从智能合约中存入USDT！" + }, "wavesGatewayVST": { "helpDescrText": "确认交易后，网关将处理将WEST转移到Waves帐户中的代币。", "helpDescrTitle": "在您的WEST客户端或钱包中输入此地址", @@ -999,5 +1005,8 @@ "byte": { "help": "剩余字节：{{bytes}}" } + }, + "warningPlate": { + "startMoving": "Start moving" } } \ No newline at end of file diff --git a/locale/zh_CN/app.welcome.json b/locale/zh_CN/app.welcome.json index 885d0f2028..9f499288c7 100644 --- a/locale/zh_CN/app.welcome.json +++ b/locale/zh_CN/app.welcome.json @@ -216,6 +216,8 @@ "termsOfUse": "使用条款", "tokenCreation": "快速令牌创建", "tokenCreationCosts": "令牌创建成本仅为1 WAVES，需要1分钟", + "tokenomicaToasterButton": "了解更多", + "tokenomicaToasterText": "成为有史以来第一个用于发行和交易令牌化资产的多平台的股东", "tradeOnWaves": "波浪分散交易所的交易", "tradeOnWavesDescription": "快速，安全地购买和出售代币，具有集中交易的所有优势，但保留对资金的完全控制。", "transactions": "交易记录", From b8ea2299e75ec1e4036596a0b476b64dc28afb29 Mon Sep 17 00:00:00 2001 From: ekomarovskaya Date: Fri, 8 Nov 2019 16:03:31 +0300 Subject: [PATCH 03/11] DEXW-2314: add link --- src/modules/ui/directives/footer/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/ui/directives/footer/footer.html b/src/modules/ui/directives/footer/footer.html index 5a70bdeb45..bc412ec4de 100644 --- a/src/modules/ui/directives/footer/footer.html +++ b/src/modules/ui/directives/footer/footer.html @@ -115,7 +115,7 @@
- +
From 3444c9e610d34c3ab3994b2a922a04268bcd2bc1 Mon Sep 17 00:00:00 2001 From: dtsigelnitskiy Date: Fri, 8 Nov 2019 17:26:36 +0300 Subject: [PATCH 04/11] DEXW-2316: fix fetch asset from node --- data-service/api/assets/assets.ts | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/data-service/api/assets/assets.ts b/data-service/api/assets/assets.ts index 9c049bf374..37a89001d6 100644 --- a/data-service/api/assets/assets.ts +++ b/data-service/api/assets/assets.ts @@ -69,7 +69,7 @@ export function getAssetFromNode(assetId: string): Promise { return Promise.resolve(wavesAsset); } - return request({ url: `${configGet('node')}/assets/details/${assetId}` }) + return request({ url: `${configGet('node')}/assets/details/${assetId}` }) .then((data) => new Asset({ id: data.assetId, name: data.name, @@ -77,9 +77,9 @@ export function getAssetFromNode(assetId: string): Promise { height: data.issueHeight, precision: data.decimals, quantity: data.quantity, - hasScript: !!data.script, + hasScript: data.scripted, reissuable: data.reissuable, - minSponsoredFee: data.minSponsoredFee, + minSponsoredFee: data.minSponsoredAssetFee, sender: data.issuer, timestamp: new Date(data.issueTimestamp) })); @@ -265,3 +265,17 @@ export interface INodeAssetData { reissuable: boolean; script: string | null; } + +export interface INodeAssetInfo { + assetId: string; + issueHeight: number; + issueTimestamp: number; + issuer: string; + name: string; + description: string; + decimals: number; + reissuable: boolean; + quantity: number; + scripted: boolean; + minSponsoredAssetFee: number | string; +} From 0958a8e9b8155e71b5a6f115435ddbc714e41e1d Mon Sep 17 00:00:00 2001 From: Viktor Voronin Date: Fri, 8 Nov 2019 18:26:17 +0300 Subject: [PATCH 05/11] DEXW-2314: add close button behaviour --- src/modules/ui/directives/footer/footer.html | 18 --- .../ui/directives/footer/toaster-mobiles.less | 124 ----------------- .../directives/footer/toaster-tokenomica.less | 127 ----------------- .../modules/assets/controllers/AssetsCtrl.js | 27 +++- .../assets/less/toaster-tokenomica.less | 130 ++++++++++++++++++ .../modules/assets/templates/assets.html | 18 +++ 6 files changed, 172 insertions(+), 272 deletions(-) delete mode 100644 src/modules/ui/directives/footer/toaster-tokenomica.less create mode 100644 src/modules/wallet/modules/assets/less/toaster-tokenomica.less diff --git a/src/modules/ui/directives/footer/footer.html b/src/modules/ui/directives/footer/footer.html index bc412ec4de..f3bd1347a2 100644 --- a/src/modules/ui/directives/footer/footer.html +++ b/src/modules/ui/directives/footer/footer.html @@ -113,22 +113,4 @@
- -
- - -
-
-
- - - -
-
- -
- -
-
- diff --git a/src/modules/ui/directives/footer/toaster-mobiles.less b/src/modules/ui/directives/footer/toaster-mobiles.less index 8bda3a8c32..3705d13016 100644 --- a/src/modules/ui/directives/footer/toaster-mobiles.less +++ b/src/modules/ui/directives/footer/toaster-mobiles.less @@ -68,127 +68,3 @@ display: flex; } } - -.toaster-tokenomica { - display: flex; - position: fixed; - bottom: 0; - left: 0; - justify-content: space-between; - background: @color-black; - padding: 25px 32px; - width: 100%; - z-index: 5; - transform: translateY(0); - transition: transform 0.2s; - - &__link { - display: flex; - flex: 1 0; - justify-content: space-between; - align-items: center; - } - - &__logo { - background: @logo-tokenomica-icon center no-repeat; - background-size: 100%; - width: 184px; - height: 40px; - flex-shrink: 0; - margin-right: 16px; - } - - &__text { - font-size: 20px; - color: @color-white; - line-height: 18px; - } - - &__text-wrapper { - display: flex; - flex: 1 0; - justify-content: space-between; - align-items: center; - margin-left: 80px; - } - - &__button { - button { - border-radius: 0; - } - - .button__content { - font-size: 20px; - font-weight: bold; - } - } - - &__close { - display: flex; - align-items: center; - margin-left: 36px; - - &-icon { - background: @close-tokenomica-icon center no-repeat; - border: 0; - width: 16px; - height: 16px; - - &:hover { - opacity: .5; - } - } - } - - &.hidden-toaster { - transform: translateY(100%); - } - - @media screen and (max-width: 768px) { - display: flex; - padding: 24px; - border-radius: 16px 16px 0 0; - align-items: flex-start; - - &__link { - flex-direction: column; - align-items: flex-start; - } - - &__logo { - margin: 0 0 16px 0; - width: 109px; - height: 24px; - } - - &__text-wrapper { - flex-direction: column; - align-items: flex-start; - width: 100%; - margin-left: 0; - } - - &__text { - font-size: 14px; - margin: 0 0 16px 0; - line-height: 20px; - width: 100%; - } - - &__button { - width: 100%; - - .button { - width: 100%; - } - - .button__content { - font-size: 16px; - } - } - - &__close { - margin: -6px; - } - } -} diff --git a/src/modules/ui/directives/footer/toaster-tokenomica.less b/src/modules/ui/directives/footer/toaster-tokenomica.less deleted file mode 100644 index 1e616b51df..0000000000 --- a/src/modules/ui/directives/footer/toaster-tokenomica.less +++ /dev/null @@ -1,127 +0,0 @@ -@import (reference) 'config'; -@import (reference) 'icons'; -@import (reference) '../../../app/less/typography'; - -.toaster-tokenomica { - display: flex; - position: fixed; - bottom: 0; - left: 0; - justify-content: space-between; - background: @color-black; - padding: 25px 32px; - width: 100%; - z-index: 5; - transform: translateY(0); - transition: transform 0.2s; - - &__link { - display: flex; - flex: 1 0; - justify-content: space-between; - align-items: center; - } - - &__logo { - background: @logo-tokenomica-icon center no-repeat; - background-size: 100%; - width: 184px; - height: 40px; - flex-shrink: 0; - margin-right: 16px; - } - - &__text { - font-size: 20px; - color: @color-white; - line-height: 18px; - } - - &__text-wrapper { - display: flex; - flex: 1 0; - justify-content: space-between; - align-items: center; - margin-left: 80px; - } - - &__button { - button { - border-radius: 0; - } - - .button__content { - font-size: 20px; - font-weight: bold; - } - } - - &__close { - display: flex; - align-items: center; - margin-left: 36px; - - &-icon { - background: @close-tokenomica-icon center no-repeat; - border: 0; - width: 16px; - height: 16px; - - &:hover { - opacity: .5; - } - } - } - - &.hidden-toaster { - transform: translateY(100%); - } - - @media screen and (max-width: 768px) { - display: flex; - padding: 24px; - border-radius: 16px 16px 0 0; - align-items: flex-start; - - &__link { - flex-direction: column; - align-items: flex-start; - } - - &__logo { - margin: 0 0 16px 0; - width: 109px; - height: 24px; - } - - &__text-wrapper { - flex-direction: column; - align-items: flex-start; - width: 100%; - margin-left: 0; - } - - &__text { - font-size: 14px; - margin: 0 0 16px 0; - line-height: 20px; - width: 100%; - } - - &__button { - width: 100%; - - .button { - width: 100%; - } - - .button__content { - font-size: 16px; - } - } - - &__close { - margin: -6px; - } - } -} diff --git a/src/modules/wallet/modules/assets/controllers/AssetsCtrl.js b/src/modules/wallet/modules/assets/controllers/AssetsCtrl.js index c022ac0c77..df27b4ebb9 100644 --- a/src/modules/wallet/modules/assets/controllers/AssetsCtrl.js +++ b/src/modules/wallet/modules/assets/controllers/AssetsCtrl.js @@ -13,8 +13,18 @@ * @param {BalanceWatcher} balanceWatcher * @return {Assets} */ - const controller = function (waves, assetsData, $scope, utils, Base, - user, modalManager, createPoll, balanceWatcher) { + const controller = function ( + waves, + assetsData, + $scope, + utils, + Base, + user, + modalManager, + createPoll, + balanceWatcher, + storage + ) { const { date } = require('ts-utils'); const ds = require('data-service'); @@ -95,6 +105,10 @@ constructor() { super($scope); + storage.load('hideTokenomicaToast').then((flag) => { + this.toastTokenomikaVisible = !flag; + }); + this.options.axes.x.tickFormat = (date) => { if (this.chartMode === 'hour' || this.chartMode === 'day') { return this.dateToHours(date); @@ -404,6 +418,12 @@ return hasYear ? tsUtils.date('DD.MM.YYYY')(date) : tsUtils.date('DD.MM')(date); } + hideTokenomicaToast() { + storage.save('hideTokenomicaToast', true).then(() => { + this.toastTokenomikaVisible = false; + }); + } + } return new Assets(); @@ -418,7 +438,8 @@ 'user', 'modalManager', 'createPoll', - 'balanceWatcher' + 'balanceWatcher', + 'storage' ]; angular.module('app.wallet.assets') diff --git a/src/modules/wallet/modules/assets/less/toaster-tokenomica.less b/src/modules/wallet/modules/assets/less/toaster-tokenomica.less new file mode 100644 index 0000000000..cd6e52be06 --- /dev/null +++ b/src/modules/wallet/modules/assets/less/toaster-tokenomica.less @@ -0,0 +1,130 @@ +@import (reference) 'config'; +@import (reference) 'icons'; + +.toaster-tokenomica { + display: none; + position: fixed; + bottom: 0; + left: 0; + justify-content: space-between; + background: @color-black; + padding: 25px 32px; + width: 100%; + z-index: 5; + transform: translateY(0); + transition: transform 0.2s; + + &__link { + display: flex; + flex: 1 0; + justify-content: space-between; + align-items: center; + } + + &__logo { + background: @logo-tokenomica-icon center no-repeat; + background-size: 100%; + width: 184px; + height: 40px; + flex-shrink: 0; + margin-right: 16px; + } + + &__text { + font-size: 20px; + color: @color-white; + line-height: 18px; + } + + &__text-wrapper { + display: flex; + flex: 1 0; + justify-content: space-between; + align-items: center; + margin-left: 80px; + } + + &__button { + button { + border-radius: 0; + } + + .button__content { + font-size: 20px; + font-weight: bold; + } + } + + &__close { + display: flex; + align-items: center; + margin-left: 36px; + + &-icon { + background: @close-tokenomica-icon center no-repeat; + border: 0; + width: 16px; + height: 16px; + + &:hover { + opacity: .5; + } + } + } + + &.hidden-toaster { + transform: translateY(100%); + } + + @media screen and (max-width: 768px) { + display: flex; + padding: 24px; + border-radius: 16px 16px 0 0; + align-items: flex-start; + + &__link { + flex-direction: column; + align-items: flex-start; + } + + &__logo { + margin: 0 0 16px 0; + width: 109px; + height: 24px; + } + + &__text-wrapper { + flex-direction: column; + align-items: flex-start; + width: 100%; + margin-left: 0; + } + + &__text { + font-size: 14px; + margin: 0 0 16px 0; + line-height: 20px; + width: 100%; + } + + &__button { + width: 100%; + + .button { + width: 100%; + } + + .button__content { + font-size: 16px; + } + } + + &__close { + margin: -6px; + } + } +} + +.toaster_tokenomica_visible { + display: flex; +} \ No newline at end of file diff --git a/src/modules/wallet/modules/assets/templates/assets.html b/src/modules/wallet/modules/assets/templates/assets.html index 29cbb318f1..d302b1a291 100644 --- a/src/modules/wallet/modules/assets/templates/assets.html +++ b/src/modules/wallet/modules/assets/templates/assets.html @@ -108,4 +108,22 @@

{{$ctrl.change > 0 ? '+' : '-'}}{{$ctrl.abs($ctrl.changePercent)}}%

+ +
+ + +
+
+
+ + + +
+
+ +
+ +
+
+ From 858d47de22ac5f1ea71714d7516e809d8677701e Mon Sep 17 00:00:00 2001 From: Max Axenov Date: Mon, 11 Nov 2019 12:11:48 +0300 Subject: [PATCH 06/11] DEXW-2322: added auuid --- src/modules/app/initialize/AppRun.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/modules/app/initialize/AppRun.js b/src/modules/app/initialize/AppRun.js index 0e12174102..e753071502 100644 --- a/src/modules/app/initialize/AppRun.js +++ b/src/modules/app/initialize/AppRun.js @@ -4,6 +4,8 @@ 'use strict'; const { Money } = require('@waves/data-entities'); + const { libs } = require('@waves/waves-transactions'); + const { base64Encode, blake2b, stringToBytes } = libs.crypto; const locationHref = location.href; const i18next = require('i18next'); @@ -352,6 +354,7 @@ }); user.loginSignal.on(() => { + analytics.addDefaultParams({ auuid: base64Encode(blake2b(stringToBytes(user.address))) }); userNotification.destroyAll(); i18nextReady.then(() => { this._updateUserNotifications(); From cad32f3492dea767dd06e606b373efeff6def9f5 Mon Sep 17 00:00:00 2001 From: vk Date: Mon, 11 Nov 2019 14:56:39 +0300 Subject: [PATCH 07/11] DEXW-2331: update ver and locales --- locale/de/app.migrate.json | 7 +++++-- locale/de/app.utils.json | 5 +++++ locale/en/app.migrate.json | 7 +++++-- locale/en/app.utils.json | 5 +++++ locale/es/app.migrate.json | 7 +++++-- locale/es/app.utils.json | 5 +++++ locale/et_EE/app.migrate.json | 7 +++++-- locale/et_EE/app.utils.json | 5 +++++ locale/fr/app.migrate.json | 7 +++++-- locale/fr/app.utils.json | 5 +++++ locale/hi_IN/app.migrate.json | 7 +++++-- locale/hi_IN/app.utils.json | 5 +++++ locale/id/app.migrate.json | 7 +++++-- locale/id/app.utils.json | 5 +++++ locale/it/app.migrate.json | 7 +++++-- locale/it/app.utils.json | 5 +++++ locale/ja/app.migrate.json | 7 +++++-- locale/ja/app.utils.json | 5 +++++ locale/ko/app.migrate.json | 7 +++++-- locale/ko/app.utils.json | 5 +++++ locale/nl_NL/app.migrate.json | 7 +++++-- locale/nl_NL/app.utils.json | 5 +++++ locale/pl/app.migrate.json | 7 +++++-- locale/pl/app.utils.json | 5 +++++ locale/pt_BR/app.migrate.json | 7 +++++-- locale/pt_BR/app.utils.json | 5 +++++ locale/pt_PT/app.migrate.json | 7 +++++-- locale/pt_PT/app.utils.json | 5 +++++ locale/ru/app.migrate.json | 7 +++++-- locale/ru/app.utils.json | 5 +++++ locale/tr/app.migrate.json | 7 +++++-- locale/tr/app.utils.json | 5 +++++ locale/zh_CN/app.migrate.json | 7 +++++-- locale/zh_CN/app.utils.json | 5 +++++ package.json | 2 +- 35 files changed, 171 insertions(+), 35 deletions(-) diff --git a/locale/de/app.migrate.json b/locale/de/app.migrate.json index 168ea76e1f..6fa8273216 100644 --- a/locale/de/app.migrate.json +++ b/locale/de/app.migrate.json @@ -6,11 +6,14 @@ "description": { "enterPass": "Enter your account password or", "goBack": "return back", - "unlock": "Unlock your accounts. You can return to this step later" + "goBackExchange": "go back", + "unlock": "Unlock your accounts. You can return to this step later", + "unlockExchange": "You need to enter a password to transfer your account to [waves.exchange](https://waves.exchange/)" }, "headers": { "unlock": "Unlock your accounts", - "unlockAccount": "Unlock account" + "unlockAccount": "Unlock account", + "unlockExchange": "Unlock Accounts" }, "subtitle": { "account": "Account", diff --git a/locale/de/app.utils.json b/locale/de/app.utils.json index 706f0de624..fb8e71b344 100644 --- a/locale/de/app.utils.json +++ b/locale/de/app.utils.json @@ -918,6 +918,11 @@ "saveSeedButton": "Save the SEED phrase", "title": "Wie man sich vor Phishing schützt" } + }, + "unsuccessfulMigration": { + "checkbox": "Do not show again", + "title": "Unsuccessful Migration!", + "understand": "Ich verstehe" } }, "modals": { diff --git a/locale/en/app.migrate.json b/locale/en/app.migrate.json index 168ea76e1f..6fa8273216 100644 --- a/locale/en/app.migrate.json +++ b/locale/en/app.migrate.json @@ -6,11 +6,14 @@ "description": { "enterPass": "Enter your account password or", "goBack": "return back", - "unlock": "Unlock your accounts. You can return to this step later" + "goBackExchange": "go back", + "unlock": "Unlock your accounts. You can return to this step later", + "unlockExchange": "You need to enter a password to transfer your account to [waves.exchange](https://waves.exchange/)" }, "headers": { "unlock": "Unlock your accounts", - "unlockAccount": "Unlock account" + "unlockAccount": "Unlock account", + "unlockExchange": "Unlock Accounts" }, "subtitle": { "account": "Account", diff --git a/locale/en/app.utils.json b/locale/en/app.utils.json index 529d0101d9..b55f5b1719 100644 --- a/locale/en/app.utils.json +++ b/locale/en/app.utils.json @@ -918,6 +918,11 @@ "saveSeedButton": "Save the SEED phrase", "title": "How To Protect Yourself from Phishers" } + }, + "unsuccessfulMigration": { + "checkbox": "Do not show again", + "title": "Unsuccessful Migration!", + "understand": "I Understand" } }, "modals": { diff --git a/locale/es/app.migrate.json b/locale/es/app.migrate.json index dbf38ef43a..819159488b 100644 --- a/locale/es/app.migrate.json +++ b/locale/es/app.migrate.json @@ -6,11 +6,14 @@ "description": { "enterPass": "Introduzca la contraseña de su cuenta o", "goBack": "Volver", - "unlock": "Desbloquee sus cuentas. Puedes volver a este paso más tarde" + "goBackExchange": "go back", + "unlock": "Desbloquee sus cuentas. Puedes volver a este paso más tarde", + "unlockExchange": "You need to enter a password to transfer your account to [waves.exchange](https://waves.exchange/)" }, "headers": { "unlock": "Desbloquee sus cuentas", - "unlockAccount": "Desbloquear cuenta" + "unlockAccount": "Desbloquear cuenta", + "unlockExchange": "Unlock Accounts" }, "subtitle": { "account": "Cuenta", diff --git a/locale/es/app.utils.json b/locale/es/app.utils.json index 61a7a6578f..533307e915 100644 --- a/locale/es/app.utils.json +++ b/locale/es/app.utils.json @@ -918,6 +918,11 @@ "saveSeedButton": "Save the SEED phrase", "title": "¿Cómo protegerte de los estafadores?" } + }, + "unsuccessfulMigration": { + "checkbox": "Do not show again", + "title": "Unsuccessful Migration!", + "understand": "Lo entiendo" } }, "modals": { diff --git a/locale/et_EE/app.migrate.json b/locale/et_EE/app.migrate.json index 168ea76e1f..6fa8273216 100644 --- a/locale/et_EE/app.migrate.json +++ b/locale/et_EE/app.migrate.json @@ -6,11 +6,14 @@ "description": { "enterPass": "Enter your account password or", "goBack": "return back", - "unlock": "Unlock your accounts. You can return to this step later" + "goBackExchange": "go back", + "unlock": "Unlock your accounts. You can return to this step later", + "unlockExchange": "You need to enter a password to transfer your account to [waves.exchange](https://waves.exchange/)" }, "headers": { "unlock": "Unlock your accounts", - "unlockAccount": "Unlock account" + "unlockAccount": "Unlock account", + "unlockExchange": "Unlock Accounts" }, "subtitle": { "account": "Account", diff --git a/locale/et_EE/app.utils.json b/locale/et_EE/app.utils.json index 3c7f47325e..d1ab71dc3f 100644 --- a/locale/et_EE/app.utils.json +++ b/locale/et_EE/app.utils.json @@ -918,6 +918,11 @@ "saveSeedButton": "Save the SEED phrase", "title": "Kuidas Kaitsta End Andmepüüdjate Eest" } + }, + "unsuccessfulMigration": { + "checkbox": "Do not show again", + "title": "Unsuccessful Migration!", + "understand": "Ma saan aru" } }, "modals": { diff --git a/locale/fr/app.migrate.json b/locale/fr/app.migrate.json index 168ea76e1f..6fa8273216 100644 --- a/locale/fr/app.migrate.json +++ b/locale/fr/app.migrate.json @@ -6,11 +6,14 @@ "description": { "enterPass": "Enter your account password or", "goBack": "return back", - "unlock": "Unlock your accounts. You can return to this step later" + "goBackExchange": "go back", + "unlock": "Unlock your accounts. You can return to this step later", + "unlockExchange": "You need to enter a password to transfer your account to [waves.exchange](https://waves.exchange/)" }, "headers": { "unlock": "Unlock your accounts", - "unlockAccount": "Unlock account" + "unlockAccount": "Unlock account", + "unlockExchange": "Unlock Accounts" }, "subtitle": { "account": "Account", diff --git a/locale/fr/app.utils.json b/locale/fr/app.utils.json index 7b21cc9d75..d7f84d37f2 100644 --- a/locale/fr/app.utils.json +++ b/locale/fr/app.utils.json @@ -918,6 +918,11 @@ "saveSeedButton": "Save the SEED phrase", "title": "Comment vous protéger des escrocs" } + }, + "unsuccessfulMigration": { + "checkbox": "Do not show again", + "title": "Unsuccessful Migration!", + "understand": "Je comprends" } }, "modals": { diff --git a/locale/hi_IN/app.migrate.json b/locale/hi_IN/app.migrate.json index 168ea76e1f..6fa8273216 100644 --- a/locale/hi_IN/app.migrate.json +++ b/locale/hi_IN/app.migrate.json @@ -6,11 +6,14 @@ "description": { "enterPass": "Enter your account password or", "goBack": "return back", - "unlock": "Unlock your accounts. You can return to this step later" + "goBackExchange": "go back", + "unlock": "Unlock your accounts. You can return to this step later", + "unlockExchange": "You need to enter a password to transfer your account to [waves.exchange](https://waves.exchange/)" }, "headers": { "unlock": "Unlock your accounts", - "unlockAccount": "Unlock account" + "unlockAccount": "Unlock account", + "unlockExchange": "Unlock Accounts" }, "subtitle": { "account": "Account", diff --git a/locale/hi_IN/app.utils.json b/locale/hi_IN/app.utils.json index b899e8a58e..cfdd97baad 100644 --- a/locale/hi_IN/app.utils.json +++ b/locale/hi_IN/app.utils.json @@ -918,6 +918,11 @@ "saveSeedButton": "Save the SEED phrase", "title": "फिशर्स से खुद की सुरक्षा कैसे करें" } + }, + "unsuccessfulMigration": { + "checkbox": "Do not show again", + "title": "Unsuccessful Migration!", + "understand": "मैं समझा" } }, "modals": { diff --git a/locale/id/app.migrate.json b/locale/id/app.migrate.json index 939b4c9440..9886e0d28a 100644 --- a/locale/id/app.migrate.json +++ b/locale/id/app.migrate.json @@ -6,11 +6,14 @@ "description": { "enterPass": "Masukkan kata sandi akun Anda atau", "goBack": "kembali", - "unlock": "Buka kunci akun Anda. Anda dapat kembali ke langkah ini nanti" + "goBackExchange": "go back", + "unlock": "Buka kunci akun Anda. Anda dapat kembali ke langkah ini nanti", + "unlockExchange": "You need to enter a password to transfer your account to [waves.exchange](https://waves.exchange/)" }, "headers": { "unlock": "Buka kunci akun Anda", - "unlockAccount": "Membuka akun" + "unlockAccount": "Membuka akun", + "unlockExchange": "Unlock Accounts" }, "subtitle": { "account": "Akun", diff --git a/locale/id/app.utils.json b/locale/id/app.utils.json index e155a65891..131f8a67f2 100644 --- a/locale/id/app.utils.json +++ b/locale/id/app.utils.json @@ -918,6 +918,11 @@ "saveSeedButton": "Save the SEED phrase", "title": "Cara Melindungi Diri dari Phisher" } + }, + "unsuccessfulMigration": { + "checkbox": "Do not show again", + "title": "Unsuccessful Migration!", + "understand": "Saya mengerti" } }, "modals": { diff --git a/locale/it/app.migrate.json b/locale/it/app.migrate.json index 7ad71bc5bd..a0905835e6 100644 --- a/locale/it/app.migrate.json +++ b/locale/it/app.migrate.json @@ -6,11 +6,14 @@ "description": { "enterPass": "Inserisci la password del tuo account oppure", "goBack": "torna indietro", - "unlock": "Sblocca i tuoi account. Potrai tornare a questo passaggio successivamente" + "goBackExchange": "go back", + "unlock": "Sblocca i tuoi account. Potrai tornare a questo passaggio successivamente", + "unlockExchange": "You need to enter a password to transfer your account to [waves.exchange](https://waves.exchange/)" }, "headers": { "unlock": "Sblocca i tuoi account", - "unlockAccount": "Sblocca account" + "unlockAccount": "Sblocca account", + "unlockExchange": "Unlock Accounts" }, "subtitle": { "account": "Account", diff --git a/locale/it/app.utils.json b/locale/it/app.utils.json index 3b7962e301..8ea3096f3e 100644 --- a/locale/it/app.utils.json +++ b/locale/it/app.utils.json @@ -918,6 +918,11 @@ "saveSeedButton": "Salva la tua frase SEED", "title": "Come proteggersi dai Phishers" } + }, + "unsuccessfulMigration": { + "checkbox": "Do not show again", + "title": "Unsuccessful Migration!", + "understand": "Ho capito" } }, "modals": { diff --git a/locale/ja/app.migrate.json b/locale/ja/app.migrate.json index 168ea76e1f..6fa8273216 100644 --- a/locale/ja/app.migrate.json +++ b/locale/ja/app.migrate.json @@ -6,11 +6,14 @@ "description": { "enterPass": "Enter your account password or", "goBack": "return back", - "unlock": "Unlock your accounts. You can return to this step later" + "goBackExchange": "go back", + "unlock": "Unlock your accounts. You can return to this step later", + "unlockExchange": "You need to enter a password to transfer your account to [waves.exchange](https://waves.exchange/)" }, "headers": { "unlock": "Unlock your accounts", - "unlockAccount": "Unlock account" + "unlockAccount": "Unlock account", + "unlockExchange": "Unlock Accounts" }, "subtitle": { "account": "Account", diff --git a/locale/ja/app.utils.json b/locale/ja/app.utils.json index a2ff66cf93..9e9667b552 100644 --- a/locale/ja/app.utils.json +++ b/locale/ja/app.utils.json @@ -918,6 +918,11 @@ "saveSeedButton": "Save the SEED phrase", "title": "あなたを詐欺師から守る方法" } + }, + "unsuccessfulMigration": { + "checkbox": "Do not show again", + "title": "Unsuccessful Migration!", + "understand": "理解しました" } }, "modals": { diff --git a/locale/ko/app.migrate.json b/locale/ko/app.migrate.json index 168ea76e1f..6fa8273216 100644 --- a/locale/ko/app.migrate.json +++ b/locale/ko/app.migrate.json @@ -6,11 +6,14 @@ "description": { "enterPass": "Enter your account password or", "goBack": "return back", - "unlock": "Unlock your accounts. You can return to this step later" + "goBackExchange": "go back", + "unlock": "Unlock your accounts. You can return to this step later", + "unlockExchange": "You need to enter a password to transfer your account to [waves.exchange](https://waves.exchange/)" }, "headers": { "unlock": "Unlock your accounts", - "unlockAccount": "Unlock account" + "unlockAccount": "Unlock account", + "unlockExchange": "Unlock Accounts" }, "subtitle": { "account": "Account", diff --git a/locale/ko/app.utils.json b/locale/ko/app.utils.json index db26f59aa1..64a5e25026 100644 --- a/locale/ko/app.utils.json +++ b/locale/ko/app.utils.json @@ -918,6 +918,11 @@ "saveSeedButton": "Save the SEED phrase", "title": "피싱으로부터 자신을 보호하는 방법" } + }, + "unsuccessfulMigration": { + "checkbox": "Do not show again", + "title": "Unsuccessful Migration!", + "understand": "모두 이해했습니다" } }, "modals": { diff --git a/locale/nl_NL/app.migrate.json b/locale/nl_NL/app.migrate.json index dddc1d6273..04873dcd27 100644 --- a/locale/nl_NL/app.migrate.json +++ b/locale/nl_NL/app.migrate.json @@ -6,11 +6,14 @@ "description": { "enterPass": "Voer uw accountwachtwoord of in", "goBack": "Ga terug", - "unlock": "Ontgrendel uw accounts. U kunt later naar deze stap terugkeren" + "goBackExchange": "go back", + "unlock": "Ontgrendel uw accounts. U kunt later naar deze stap terugkeren", + "unlockExchange": "You need to enter a password to transfer your account to [waves.exchange](https://waves.exchange/)" }, "headers": { "unlock": "Ontgrendel uw accounts", - "unlockAccount": "Account ontgrendelen" + "unlockAccount": "Account ontgrendelen", + "unlockExchange": "Unlock Accounts" }, "subtitle": { "account": "Account", diff --git a/locale/nl_NL/app.utils.json b/locale/nl_NL/app.utils.json index ade78fc7cf..fc402a86b4 100644 --- a/locale/nl_NL/app.utils.json +++ b/locale/nl_NL/app.utils.json @@ -918,6 +918,11 @@ "saveSeedButton": "Save the SEED phrase", "title": "Hoe u zichzelf tegen phishing kunt beschermen" } + }, + "unsuccessfulMigration": { + "checkbox": "Do not show again", + "title": "Unsuccessful Migration!", + "understand": "Ik begrijp het" } }, "modals": { diff --git a/locale/pl/app.migrate.json b/locale/pl/app.migrate.json index 7734943baa..5e2abc2cee 100644 --- a/locale/pl/app.migrate.json +++ b/locale/pl/app.migrate.json @@ -6,11 +6,14 @@ "description": { "enterPass": "Wprowadź swoje hasło do konta lub", "goBack": "powrót", - "unlock": "Odblokuj swoje konta. Możesz wrócić do tego kroku później." + "goBackExchange": "go back", + "unlock": "Odblokuj swoje konta. Możesz wrócić do tego kroku później.", + "unlockExchange": "You need to enter a password to transfer your account to [waves.exchange](https://waves.exchange/)" }, "headers": { "unlock": "Odblokuj swoje konta", - "unlockAccount": "Odblokuj konto" + "unlockAccount": "Odblokuj konto", + "unlockExchange": "Unlock Accounts" }, "subtitle": { "account": "Konto", diff --git a/locale/pl/app.utils.json b/locale/pl/app.utils.json index 5142acf364..c6706daff6 100644 --- a/locale/pl/app.utils.json +++ b/locale/pl/app.utils.json @@ -918,6 +918,11 @@ "saveSeedButton": "Save the SEED phrase", "title": "Jak uchronić się przed phishingiem" } + }, + "unsuccessfulMigration": { + "checkbox": "Do not show again", + "title": "Unsuccessful Migration!", + "understand": "Rozumiem" } }, "modals": { diff --git a/locale/pt_BR/app.migrate.json b/locale/pt_BR/app.migrate.json index 168ea76e1f..6fa8273216 100644 --- a/locale/pt_BR/app.migrate.json +++ b/locale/pt_BR/app.migrate.json @@ -6,11 +6,14 @@ "description": { "enterPass": "Enter your account password or", "goBack": "return back", - "unlock": "Unlock your accounts. You can return to this step later" + "goBackExchange": "go back", + "unlock": "Unlock your accounts. You can return to this step later", + "unlockExchange": "You need to enter a password to transfer your account to [waves.exchange](https://waves.exchange/)" }, "headers": { "unlock": "Unlock your accounts", - "unlockAccount": "Unlock account" + "unlockAccount": "Unlock account", + "unlockExchange": "Unlock Accounts" }, "subtitle": { "account": "Account", diff --git a/locale/pt_BR/app.utils.json b/locale/pt_BR/app.utils.json index 1458e28989..f04fa72200 100644 --- a/locale/pt_BR/app.utils.json +++ b/locale/pt_BR/app.utils.json @@ -918,6 +918,11 @@ "saveSeedButton": "Save the SEED phrase", "title": "Como se proteger de Phishers" } + }, + "unsuccessfulMigration": { + "checkbox": "Do not show again", + "title": "Unsuccessful Migration!", + "understand": "Eu Entendi" } }, "modals": { diff --git a/locale/pt_PT/app.migrate.json b/locale/pt_PT/app.migrate.json index 168ea76e1f..6fa8273216 100644 --- a/locale/pt_PT/app.migrate.json +++ b/locale/pt_PT/app.migrate.json @@ -6,11 +6,14 @@ "description": { "enterPass": "Enter your account password or", "goBack": "return back", - "unlock": "Unlock your accounts. You can return to this step later" + "goBackExchange": "go back", + "unlock": "Unlock your accounts. You can return to this step later", + "unlockExchange": "You need to enter a password to transfer your account to [waves.exchange](https://waves.exchange/)" }, "headers": { "unlock": "Unlock your accounts", - "unlockAccount": "Unlock account" + "unlockAccount": "Unlock account", + "unlockExchange": "Unlock Accounts" }, "subtitle": { "account": "Account", diff --git a/locale/pt_PT/app.utils.json b/locale/pt_PT/app.utils.json index 90a9f14834..d8ec8e16d9 100644 --- a/locale/pt_PT/app.utils.json +++ b/locale/pt_PT/app.utils.json @@ -918,6 +918,11 @@ "saveSeedButton": "Save the SEED phrase", "title": "How To Protect Yourself from Phishers" } + }, + "unsuccessfulMigration": { + "checkbox": "Do not show again", + "title": "Unsuccessful Migration!", + "understand": "I Understand" } }, "modals": { diff --git a/locale/ru/app.migrate.json b/locale/ru/app.migrate.json index 1f11851ad3..878885f9f2 100644 --- a/locale/ru/app.migrate.json +++ b/locale/ru/app.migrate.json @@ -6,11 +6,14 @@ "description": { "enterPass": "Введите пароль от вашего аккаунта или", "goBack": "вернитесь назад", - "unlock": "Разблокируйте аккаунты. Вы можете вернуться к этому шагу позже" + "goBackExchange": "go back", + "unlock": "Разблокируйте аккаунты. Вы можете вернуться к этому шагу позже", + "unlockExchange": "You need to enter a password to transfer your account to [waves.exchange](https://waves.exchange/)" }, "headers": { "unlock": "Разблокируйте аккаунты", - "unlockAccount": "Разблокируйте аккаунт" + "unlockAccount": "Разблокируйте аккаунт", + "unlockExchange": "Unlock Accounts" }, "subtitle": { "account": "Адрес/ Название аккаунта", diff --git a/locale/ru/app.utils.json b/locale/ru/app.utils.json index 9c9f0bca93..08dffc381b 100644 --- a/locale/ru/app.utils.json +++ b/locale/ru/app.utils.json @@ -918,6 +918,11 @@ "saveSeedButton": "Сохраните SEED", "title": "Как защититься от фишинга" } + }, + "unsuccessfulMigration": { + "checkbox": "Do not show again", + "title": "Unsuccessful Migration!", + "understand": "Я понял" } }, "modals": { diff --git a/locale/tr/app.migrate.json b/locale/tr/app.migrate.json index 168ea76e1f..6fa8273216 100644 --- a/locale/tr/app.migrate.json +++ b/locale/tr/app.migrate.json @@ -6,11 +6,14 @@ "description": { "enterPass": "Enter your account password or", "goBack": "return back", - "unlock": "Unlock your accounts. You can return to this step later" + "goBackExchange": "go back", + "unlock": "Unlock your accounts. You can return to this step later", + "unlockExchange": "You need to enter a password to transfer your account to [waves.exchange](https://waves.exchange/)" }, "headers": { "unlock": "Unlock your accounts", - "unlockAccount": "Unlock account" + "unlockAccount": "Unlock account", + "unlockExchange": "Unlock Accounts" }, "subtitle": { "account": "Account", diff --git a/locale/tr/app.utils.json b/locale/tr/app.utils.json index 69fba3dc16..e348d717d6 100644 --- a/locale/tr/app.utils.json +++ b/locale/tr/app.utils.json @@ -918,6 +918,11 @@ "saveSeedButton": "Save the SEED phrase", "title": "Kendinizi nasıl koruyacaksınız?" } + }, + "unsuccessfulMigration": { + "checkbox": "Do not show again", + "title": "Unsuccessful Migration!", + "understand": "Anladım" } }, "modals": { diff --git a/locale/zh_CN/app.migrate.json b/locale/zh_CN/app.migrate.json index 00b6797411..f0956ab582 100644 --- a/locale/zh_CN/app.migrate.json +++ b/locale/zh_CN/app.migrate.json @@ -6,11 +6,14 @@ "description": { "enterPass": "输入您的帐户密码或", "goBack": "回来", - "unlock": "解锁您的帐户。您可以稍后返回此步骤" + "goBackExchange": "go back", + "unlock": "解锁您的帐户。您可以稍后返回此步骤", + "unlockExchange": "You need to enter a password to transfer your account to [waves.exchange](https://waves.exchange/)" }, "headers": { "unlock": "解锁您的帐户", - "unlockAccount": "解锁帐户" + "unlockAccount": "解锁帐户", + "unlockExchange": "Unlock Accounts" }, "subtitle": { "account": "帐户", diff --git a/locale/zh_CN/app.utils.json b/locale/zh_CN/app.utils.json index 6e2c57e950..d980ce68f4 100644 --- a/locale/zh_CN/app.utils.json +++ b/locale/zh_CN/app.utils.json @@ -918,6 +918,11 @@ "saveSeedButton": "保存SEED短语", "title": "如何防止网络钓鱼攻击" } + }, + "unsuccessfulMigration": { + "checkbox": "Do not show again", + "title": "Unsuccessful Migration!", + "understand": "我了解" } }, "modals": { diff --git a/package.json b/package.json index ec8daae8fd..684d2e475d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "waves-client", - "version": "1.4.11", + "version": "1.4.12", "description": "The official client application for the Waves platform", "private": true, "repository": { From 7b64933e6bcb4f6c0b6024acc1f52fbc7ebeafd2 Mon Sep 17 00:00:00 2001 From: Vusal Gakhramanov Date: Mon, 11 Nov 2019 15:05:13 +0300 Subject: [PATCH 08/11] DEXW-2314: fix buttin --- src/modules/wallet/modules/assets/less/toaster-tokenomica.less | 1 - 1 file changed, 1 deletion(-) diff --git a/src/modules/wallet/modules/assets/less/toaster-tokenomica.less b/src/modules/wallet/modules/assets/less/toaster-tokenomica.less index cd6e52be06..7be7854bf3 100644 --- a/src/modules/wallet/modules/assets/less/toaster-tokenomica.less +++ b/src/modules/wallet/modules/assets/less/toaster-tokenomica.less @@ -77,7 +77,6 @@ } @media screen and (max-width: 768px) { - display: flex; padding: 24px; border-radius: 16px 16px 0 0; align-items: flex-start; From f8259fe62a007e1843cb0673fb1df65c8c695cb0 Mon Sep 17 00:00:00 2001 From: vba2000 Date: Wed, 13 Nov 2019 10:44:56 +0300 Subject: [PATCH 09/11] DEXW-2346: return coinomat to BTC --- package-lock.json | 6 +++--- src/modules/utils/services/gateways/CoinomatService.js | 3 ++- src/modules/utils/services/gateways/WavesGatewayService.js | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index ccee284aa9..55acf7367a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "waves-client", - "version": "1.4.10", + "version": "1.4.11", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -5788,7 +5788,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true } @@ -11117,7 +11117,7 @@ }, "load-json-file": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { diff --git a/src/modules/utils/services/gateways/CoinomatService.js b/src/modules/utils/services/gateways/CoinomatService.js index 3173166cfd..30c850b49f 100644 --- a/src/modules/utils/services/gateways/CoinomatService.js +++ b/src/modules/utils/services/gateways/CoinomatService.js @@ -2,6 +2,7 @@ 'use strict'; const GATEWAYS = { + [WavesApp.defaultAssets.BTC]: { waves: 'WBTC', gateway: 'BTC' }, [WavesApp.defaultAssets.BSV]: { waves: 'WBSV', gateway: 'BSV' }, [WavesApp.defaultAssets.LTC]: { waves: 'WLTC', gateway: 'LTC' }, [WavesApp.defaultAssets.ZEC]: { waves: 'WZEC', gateway: 'ZEC' }, @@ -90,7 +91,7 @@ getSupportMap(asset) { if (GATEWAYS[asset.id]) { return { - deposit: true, + deposit: asset.id !== WavesApp.defaultAssets.BTC, withdraw: true, errorAddressMessage: true }; diff --git a/src/modules/utils/services/gateways/WavesGatewayService.js b/src/modules/utils/services/gateways/WavesGatewayService.js index 71030eaa63..0fd39bff4e 100644 --- a/src/modules/utils/services/gateways/WavesGatewayService.js +++ b/src/modules/utils/services/gateways/WavesGatewayService.js @@ -31,7 +31,7 @@ if (GATEWAYS[asset.id]) { return { deposit: true, - withdraw: true, + withdraw: asset.id !== WavesApp.defaultAssets.BTC, errorAddressMessage: true, wrongAddressMessage: true }; From 5a0e0de5f5499328ac58313042840bf152ec6181 Mon Sep 17 00:00:00 2001 From: vk Date: Wed, 13 Nov 2019 11:49:53 +0300 Subject: [PATCH 10/11] DEXW-2346: update version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 684d2e475d..3e482096be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "waves-client", - "version": "1.4.12", + "version": "1.4.13", "description": "The official client application for the Waves platform", "private": true, "repository": { From 729d4b58563caeb6e941cead12c6effcab08dd5b Mon Sep 17 00:00:00 2001 From: vba2000 Date: Wed, 13 Nov 2019 16:39:18 +0300 Subject: [PATCH 11/11] DEXW-2346: fix --- .../confirmGatewayTransaction/ConfirmGatewayTransaction.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/ui/directives/confirmGatewayTransaction/ConfirmGatewayTransaction.js b/src/modules/ui/directives/confirmGatewayTransaction/ConfirmGatewayTransaction.js index 47908e543e..12f9fdaf35 100644 --- a/src/modules/ui/directives/confirmGatewayTransaction/ConfirmGatewayTransaction.js +++ b/src/modules/ui/directives/confirmGatewayTransaction/ConfirmGatewayTransaction.js @@ -8,8 +8,8 @@ WavesApp.defaultAssets.WEST, WavesApp.defaultAssets.ERGO, WavesApp.defaultAssets.BNT, - WavesApp.defaultAssets.ETH, - WavesApp.defaultAssets.BTC + WavesApp.defaultAssets.ETH + // WavesApp.defaultAssets.BTC ]; /**