Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7efd8cb
DEXW-2040: update version
jahsus-waves Aug 21, 2019
4fd04d9
DEXW-2040: update locale files
jahsus-waves Aug 21, 2019
98b7420
DEXW-2040: update locale files again
jahsus-waves Aug 21, 2019
6b492a4
Merge branch 'dexw-2038-bancor-gateway' into dexw-2040-release-1.3.19
jahsus-waves Aug 21, 2019
0f65ded
DEXW-2040: change gateway url
jahsus-waves Aug 21, 2019
a21df42
DEXW-2040: updated locale files
jahsus-waves Aug 21, 2019
df1471e
Merge branch 'dev' into dexw-2040-release-1.3.19
jahsus-waves Aug 21, 2019
f593feb
DEXW-2042: fix
Aug 21, 2019
3880b16
DEXW-2042: fix coinomat
Aug 21, 2019
e435059
DEXW-2042: change bancor ticker
Aug 21, 2019
8f75664
DEXW-2042:update locales files
jahsus-waves Aug 21, 2019
0afe582
DEXW-2042: changed mainnet config
jahsus-waves Aug 21, 2019
7e95e01
Merge branch 'dexw-2042-fox-deposit-gateway-modal' into dexw-2040-rel…
jahsus-waves Aug 21, 2019
4f76f92
DEXW-2040: add set unique name in migration map 1.3.19
Aug 22, 2019
f42adb7
DEXW-2040: pull
Aug 22, 2019
985ff33
DEXW-2042: refactor coinomat api
Aug 22, 2019
65003d7
Merge branch 'dexw-2042-fox-deposit-gateway-modal' into dexw-2040-rel…
jahsus-waves Aug 22, 2019
f478ee6
Merge branch 'dexw-2040-release-1.3.19' of github.com:wavesplatform/W…
jahsus-waves Aug 22, 2019
20e2945
DEXW-2040: fix
ekomarovskaya Aug 22, 2019
1978ed8
DEXW-2040: update locales
jahsus-waves Aug 22, 2019
02c732a
DEXW-2040: update locales BNT min deposit
Aug 22, 2019
ef91572
DEXW-2040:update locales
jahsus-waves Aug 22, 2019
2a2ee8a
Merge branch 'dexw-2046-fix-icon-orderBook' into dexw-2040-release-1.…
jahsus-waves Aug 22, 2019
0130a72
DEXW-2040: update locales
jahsus-waves Aug 22, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions configs/mainnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"api": "https://api.wavesplatform.com",
"explorer": "https://wavesexplorer.com",
"coinomat": "https://coinomat.com",
"wavesGateway": "https://gw-stagenet.wavesplatform.com",
"wavesGateway": "https://gw.wavesplatform.com",
"support": "https://support.wavesplatform.com",
"termsAndConditions": "https://wavesplatform.com/files/docs/Waves_terms_and_conditions.pdf",
"privacyPolicy": "https://wavesplatform.com/files/docs/Privacy%20Policy_SW.pdf",
Expand Down Expand Up @@ -45,7 +45,7 @@
"VST": "4LHHvYGNKJUg5hj65aGD5vgScvCBmLpdRFtjokvCjSL8",
"ERGO": "5dJj4Hn9t2Ve3tRpNGirUHy4yBK6qdJRAJYV21yPPuGz",
"WCT": "DHgwrRvVyqJsepd32YbBqUeDH4GJ1N984X8QoekjgH8J",
"BNCR": "F81SdfzBZr5ce8JArRWLPJEDg1V8yT257ohbcHk75yCp"
"BNT": "F81SdfzBZr5ce8JArRWLPJEDg1V8yT257ohbcHk75yCp"
},
"matcherPriorityList": [
{ "ticker": "USD", "id": "Ft8X1v1LTa1ABafufpaCWyVj8KkaxUWE6xBhW6sNFJck"},
Expand Down
2 changes: 1 addition & 1 deletion configs/stagenet.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"VST": "4TokpX1hU9YVS8ivZxpSJRWQssaGtYUprQgBXfipxmAZ",
"ERGO": "ERCyLzH7vgqZQkQUsLBBqy3EHqHTxMqzKMe5z8hQR6uL",
"WCT": "8AJ4g47qF7rVpYL1hi1FZaKWnQy5cxXsrpqiTgoy1SkZ",
"BNCR": "5oS1vs1x3pa6k9XrKuSoQHVs5zyQNakhHjXZAFUxYMS9"
"BNT": "5oS1vs1x3pa6k9XrKuSoQHVs5zyQNakhHjXZAFUxYMS9"
},
"matcherPriorityList": [
{ "ticker": "WAVES", "id": "WAVES"},
Expand Down
2 changes: 1 addition & 1 deletion configs/testnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"VST": "AMFteLfPzPhTsFc3NfvHG7fSRUnsp3tJXPH88G1PCisT",
"ERGO": "AvxDjVat8ErppBRxM56KewbQq3RMv8QibBNssqn6P7Fd",
"WCT": "EmcmfM27TPaemhuREZGD8WLvsuLCdqx8WovMrDQKbXS1",
"BNCR": "B6pP4SJY1aCXfVneF9P2hmBeQBPhNTVTGPDPZ57VGYQp"
"BNT": "B6pP4SJY1aCXfVneF9P2hmBeQBPhNTVTGPDPZ57VGYQp"
},
"matcherPriorityList": [
{ "ticker": "WAVES", "id": "WAVES"},
Expand Down
2 changes: 1 addition & 1 deletion data-service/classes/DataManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export class DataManager {
[WavesApp.defaultAssets.XMR]: true,
[WavesApp.defaultAssets.VST]: true,
[WavesApp.defaultAssets.ERGO]: true,
[WavesApp.defaultAssets.BNCR]: true,
[WavesApp.defaultAssets.BNT]: true,
};

const gatewaysSoon = (window as any).angular
Expand Down
21 changes: 21 additions & 0 deletions locale/de/app.migrate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"migrate": {
"btn": {
"unlock": "Unlock"
},
"description": {
"enterPass": "Enter your account password or",
"goBack": "return back",
"unlock": "Unlock your accounts. You can return to this step later"
},
"headers": {
"unlock": "Unlock your accounts",
"unlockAccount": "Unlock account"
},
"subtitle": {
"account": "Account",
"pending": "Pending unlock",
"unlocked": "Successfully unlocked"
}
}
}
12 changes: 12 additions & 0 deletions locale/de/app.signUp.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"signUp": {
"headers": {
"onePassBtn": "Let’s start!",
"onePassDesc": "Local data storage, seed phrases and encryption make WAVES DEX reliable. However, we are going further. It’s time to switch on a new security level. Log into your accounts and switch between them by a couple of taps.",
"onePassword": "One password for all your accounts",
"protect": "Protect Your Accounts",
"protectDesc": "Set a single password for all your accounts",
"protectPass": "Create a password"
}
}
}
7 changes: 4 additions & 3 deletions locale/de/app.utils.json
Original file line number Diff line number Diff line change
Expand Up @@ -264,11 +264,11 @@
"pleaseNote": "Bitte beachten sie, dass das Gateway für diesen Vorgang keine Gebühren verlangt.",
"scanQrCode": "QR-Code scannen",
"title": "Einzahlung {{assetName}}",
"wavesGatewayBNCR": {
"wavesGatewayBNT": {
"helpDescrText": "Once the transaction is confirmed, the gateway will process the transfer of Bancor to a token in your Waves account.",
"helpDescrTitle": "Enter this address into your client or wallet",
"warningMinAmountText": "If you will send less than 1 Bancor, you will lose that money.",
"warningMinAmountTitle": "The minimum amount of deposit is 1 Bancor, the maximum amount of deposit is 100 000 Bancor",
"warningMinAmountText": "If you will send less than 2 Bancor, you will lose that money.",
"warningMinAmountTitle": "The minimum amount of deposit is 2 Bancor, the maximum amount of deposit is 100 000 Bancor",
"warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Bancor. We do not accept such transactions and can’t refund them. You will lose that money.",
"warningTitle": "Please do not deposit BNT from smart contracts! Do not deposit other ERC20 tokens! Only Bancor is allowed."
},
Expand Down Expand Up @@ -909,6 +909,7 @@
"1_2_8": "{span.line}[1. Spam-Token und -Transaktionen wurden im Client ausgeblendet.] \n {span.line}[2. Verbesserte Benutzeroberfläche und zusätzliche kleinere Fehler wurden behoben.]",
"1_3_0": "{span.line}[1. Verbesserte App-Navigation und Startseitenoberfläche.]",
"1_3_18": "{span.line}[1. Added login to wallet using a private key.]\n{span.line}[2. The 24 hours price change of a token is now bound to token/WAVES pair.]",
"1_3_19": "{span.line}[1. Bancor gateway has been launched.]\n{span.line}[2. User menu interface has been improved.]",
"1_3_2": "{span.line}[1. Das Vostok-Gateway wurde gestartet.] \n {span.line}[2. Verbesserte Benutzeroberfläche und zusätzliche kleinere Fehler wurden behoben.]",
"1_3_5": "{span.line}[1. A tab with [wsoc.io](https://wsoc.io) contest tokens has been added.]\n{span.line}[2. French language support added.]\n{span.line}[3. Additional minor bugs have been fixed.]",
"1_3_7": "{span.line}[1. Integration with [tokenrating.wavesexplorer.com](https://tokenrating.wavesexplorer.com) Now you can rate tokens directly in the app.]\n{span.line}[2. Additional minor bugs have been fixed.]",
Expand Down
21 changes: 21 additions & 0 deletions locale/en/app.migrate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"migrate": {
"btn": {
"unlock": "Unlock"
},
"description": {
"enterPass": "Enter your account password or",
"goBack": "return back",
"unlock": "Unlock your accounts. You can return to this step later"
},
"headers": {
"unlock": "Unlock your accounts",
"unlockAccount": "Unlock account"
},
"subtitle": {
"account": "Account",
"pending": "Pending unlock",
"unlocked": "Successfully unlocked"
}
}
}
12 changes: 12 additions & 0 deletions locale/en/app.signUp.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"signUp": {
"headers": {
"onePassBtn": "Let’s start!",
"onePassDesc": "Local data storage, seed phrases and encryption make WAVES DEX reliable. However, we are going further. It’s time to switch on a new security level. Log into your accounts and switch between them by a couple of taps.",
"onePassword": "One password for all your accounts",
"protect": "Protect Your Accounts",
"protectDesc": "Set a single password for all your accounts",
"protectPass": "Create a password"
}
}
}
7 changes: 4 additions & 3 deletions locale/en/app.utils.json
Original file line number Diff line number Diff line change
Expand Up @@ -264,11 +264,11 @@
"pleaseNote": "Please note that the gateway doesn't apply any fees for this operation.",
"scanQrCode": "Scan QR Code",
"title": "Deposit {{assetName}}",
"wavesGatewayBNCR": {
"wavesGatewayBNT": {
"helpDescrText": "Once the transaction is confirmed, the gateway will process the transfer of Bancor to a token in your Waves account.",
"helpDescrTitle": "Enter this address into your client or wallet",
"warningMinAmountText": "If you will send less than 1 Bancor, you will lose that money.",
"warningMinAmountTitle": "The minimum amount of deposit is 1 Bancor, the maximum amount of deposit is 100 000 Bancor",
"warningMinAmountText": "If you will send less than 2 Bancor, you will lose that money.",
"warningMinAmountTitle": "The minimum amount of deposit is 2 Bancor, the maximum amount of deposit is 100 000 Bancor",
"warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Bancor. We do not accept such transactions and can’t refund them. You will lose that money.",
"warningTitle": "Please do not deposit BNT from smart contracts! Do not deposit other ERC20 tokens! Only Bancor is allowed."
},
Expand Down Expand Up @@ -909,6 +909,7 @@
"1_2_8": "{span.line}[1. Spam tokens and transactions have been hidden in client.]\n{span.line}[2. Improved UI and additional minor bugs have been fixed.]",
"1_3_0": "{span.line}[1. Improved app navigation and start page interface.]",
"1_3_18": "{span.line}[1. Added login to wallet using a private key.]\n{span.line}[2. The 24 hours price change of a token is now bound to token/WAVES pair.]",
"1_3_19": "{span.line}[1. Bancor gateway has been launched.]\n{span.line}[2. User menu interface has been improved.]",
"1_3_2": "{span.line}[1. Vostok gateway has been launched.]\n{span.line}[2. Improved UI and additional minor bugs have been fixed.]",
"1_3_5": "{span.line}[1. A tab with [wsoc.io](https://wsoc.io) contest tokens has been added.]\n{span.line}[2. French language support added.]\n{span.line}[3. Additional minor bugs have been fixed.]",
"1_3_7": "{span.line}[1. Integration with [tokenrating.wavesexplorer.com](https://tokenrating.wavesexplorer.com) Now you can rate tokens directly in the app.]\n{span.line}[2. Additional minor bugs have been fixed.]",
Expand Down
21 changes: 21 additions & 0 deletions locale/es/app.migrate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"migrate": {
"btn": {
"unlock": "Unlock"
},
"description": {
"enterPass": "Enter your account password or",
"goBack": "return back",
"unlock": "Unlock your accounts. You can return to this step later"
},
"headers": {
"unlock": "Unlock your accounts",
"unlockAccount": "Unlock account"
},
"subtitle": {
"account": "Account",
"pending": "Pending unlock",
"unlocked": "Successfully unlocked"
}
}
}
12 changes: 12 additions & 0 deletions locale/es/app.signUp.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"signUp": {
"headers": {
"onePassBtn": "Let’s start!",
"onePassDesc": "Local data storage, seed phrases and encryption make WAVES DEX reliable. However, we are going further. It’s time to switch on a new security level. Log into your accounts and switch between them by a couple of taps.",
"onePassword": "One password for all your accounts",
"protect": "Protect Your Accounts",
"protectDesc": "Set a single password for all your accounts",
"protectPass": "Create a password"
}
}
}
7 changes: 4 additions & 3 deletions locale/es/app.utils.json
Original file line number Diff line number Diff line change
Expand Up @@ -264,11 +264,11 @@
"pleaseNote": "Por favor, ten en cuenta que la pasarela no aplica ninguna Comisión por esta operación",
"scanQrCode": "Escanear Código QR",
"title": "Depósito {{assetName}}",
"wavesGatewayBNCR": {
"wavesGatewayBNT": {
"helpDescrText": "Once the transaction is confirmed, the gateway will process the transfer of Bancor to a token in your Waves account.",
"helpDescrTitle": "Enter this address into your client or wallet",
"warningMinAmountText": "If you will send less than 1 Bancor, you will lose that money.",
"warningMinAmountTitle": "The minimum amount of deposit is 1 Bancor, the maximum amount of deposit is 100 000 Bancor",
"warningMinAmountText": "If you will send less than 2 Bancor, you will lose that money.",
"warningMinAmountTitle": "The minimum amount of deposit is 2 Bancor, the maximum amount of deposit is 100 000 Bancor",
"warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Bancor. We do not accept such transactions and can’t refund them. You will lose that money.",
"warningTitle": "Please do not deposit BNT from smart contracts! Do not deposit other ERC20 tokens! Only Bancor is allowed."
},
Expand Down Expand Up @@ -909,6 +909,7 @@
"1_2_8": "\"span.line\" [1. Los tokens y transaccionesconsideradas spam han sido ocultadas en el cliente.]\n\"span.line\" [2. Se han corregido la interfaz de usuario y algunos errores menores.]",
"1_3_0": "\"span.line\" [1. Se ha mejorado la navegación de la aplicación y la interfaz de la página de inicio.]",
"1_3_18": "{span.line}[1. Added login to wallet using a private key.]\n{span.line}[2. The 24 hours price change of a token is now bound to token/WAVES pair.]",
"1_3_19": "{span.line}[1. Bancor gateway has been launched.]\n{span.line}[2. User menu interface has been improved.]",
"1_3_2": "\"span.line\" [1. Se ha puesto en marcha la puerta de enlace Vostok.]\n\"span.line\" [2. Se ha corregido la interfaz de usuario y algunos errores menores.]",
"1_3_5": "\"span.line\" [1. Se ha añadido una pestaña con tokens de concurso [wsoc.io](https://wsoc.io).\n\"span.line\" [2. Se ha añadido compatibilidad con el idioma francés.]\n\"span.line\" [3. Se han corregido errores menores adicionales.]",
"1_3_7": "\"span.line\" [1. Integración con [tokenrating.wavesexplorer.com](https://tokenrating.wavesexplorer.com) Ahora puede calificar tokens directamente en la aplicación.]\n\"span.line\" [2. Se han corregido errores menores.]",
Expand Down
21 changes: 21 additions & 0 deletions locale/et_EE/app.migrate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"migrate": {
"btn": {
"unlock": "Unlock"
},
"description": {
"enterPass": "Enter your account password or",
"goBack": "return back",
"unlock": "Unlock your accounts. You can return to this step later"
},
"headers": {
"unlock": "Unlock your accounts",
"unlockAccount": "Unlock account"
},
"subtitle": {
"account": "Account",
"pending": "Pending unlock",
"unlocked": "Successfully unlocked"
}
}
}
12 changes: 12 additions & 0 deletions locale/et_EE/app.signUp.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"signUp": {
"headers": {
"onePassBtn": "Let’s start!",
"onePassDesc": "Local data storage, seed phrases and encryption make WAVES DEX reliable. However, we are going further. It’s time to switch on a new security level. Log into your accounts and switch between them by a couple of taps.",
"onePassword": "One password for all your accounts",
"protect": "Protect Your Accounts",
"protectDesc": "Set a single password for all your accounts",
"protectPass": "Create a password"
}
}
}
7 changes: 4 additions & 3 deletions locale/et_EE/app.utils.json
Original file line number Diff line number Diff line change
Expand Up @@ -264,11 +264,11 @@
"pleaseNote": "Pange tähele, et gateway ei võta selle toimingu eest mingeid tasusid.",
"scanQrCode": "Skaneeri QR-koodi",
"title": "Sissemaksta {{assetName}}",
"wavesGatewayBNCR": {
"wavesGatewayBNT": {
"helpDescrText": "Once the transaction is confirmed, the gateway will process the transfer of Bancor to a token in your Waves account.",
"helpDescrTitle": "Enter this address into your client or wallet",
"warningMinAmountText": "If you will send less than 1 Bancor, you will lose that money.",
"warningMinAmountTitle": "The minimum amount of deposit is 1 Bancor, the maximum amount of deposit is 100 000 Bancor",
"warningMinAmountText": "If you will send less than 2 Bancor, you will lose that money.",
"warningMinAmountTitle": "The minimum amount of deposit is 2 Bancor, the maximum amount of deposit is 100 000 Bancor",
"warningText": "Check if your wallet or exchange uses smart-contracts to withdraw Bancor. We do not accept such transactions and can’t refund them. You will lose that money.",
"warningTitle": "Please do not deposit BNT from smart contracts! Do not deposit other ERC20 tokens! Only Bancor is allowed."
},
Expand Down Expand Up @@ -909,6 +909,7 @@
"1_2_8": "{span.line}[1. Spam tokens and transactions have been hidden in client.]\n{span.line}[2. Improved UI and additional minor bugs have been fixed.]",
"1_3_0": "{span.line}[1. Improved app navigation and start page interface.]",
"1_3_18": "{span.line}[1. Added login to wallet using a private key.]\n{span.line}[2. The 24 hours price change of a token is now bound to token/WAVES pair.]",
"1_3_19": "{span.line}[1. Bancor gateway has been launched.]\n{span.line}[2. User menu interface has been improved.]",
"1_3_2": "{span.line}[1. Vostok gateway has been launched.]\n{span.line}[2. Improved UI and additional minor bugs have been fixed.]",
"1_3_5": "{span.line}[1. A tab with [wsoc.io](https://wsoc.io) contest tokens has been added.]\n{span.line}[2. French language support added.]\n{span.line}[3. Additional minor bugs have been fixed.]",
"1_3_7": "{span.line}[1. Integration with [tokenrating.wavesexplorer.com](https://tokenrating.wavesexplorer.com) Now you can rate tokens directly in the app.]\n{span.line}[2. Additional minor bugs have been fixed.]",
Expand Down
Loading