Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.4.13 to master #1769

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
13e5eb8
DEXW-2314: add-toaster
ekomarovskaya Nov 8, 2019
64fcaf0
DEXW-2314: add locale
ekomarovskaya Nov 8, 2019
b8ea229
DEXW-2314: add link
ekomarovskaya Nov 8, 2019
3444c9e
DEXW-2316: fix fetch asset from node
Nov 8, 2019
0958a8e
DEXW-2314: add close button behaviour
Nov 8, 2019
ae351f7
DEXW-2330: fixes
vba2000 Nov 11, 2019
eef5ada
Merge pull request #1747 from wavesplatform/dexw-2311-release-1.4.11
jahsus-waves Nov 11, 2019
26f7f34
Merge pull request #1749 from wavesplatform/dexw-2314-add-toaster-tok…
jahsus-waves Nov 11, 2019
858d47d
DEXW-2322: added auuid
Nov 11, 2019
4c01eb2
Merge pull request #1750 from wavesplatform/dexw-2316-fix-node-asset-…
jahsus-waves Nov 11, 2019
e0cdd0c
Merge pull request #1752 from wavesplatform/dexw-2330-fix-favourites
jahsus-waves Nov 11, 2019
1f939b2
Merge pull request #1754 from wavesplatform/dexw-2322-auuid-into-anal…
jahsus-waves Nov 11, 2019
cad32f3
DEXW-2331: update ver and locales
jahsus-waves Nov 11, 2019
7b64933
DEXW-2314: fix buttin
Nov 11, 2019
1c99179
Merge pull request #1755 from wavesplatform/dexw-2314-add-toaster-tok…
jahsus-waves Nov 11, 2019
f8259fe
DEXW-2346: return coinomat to BTC
vba2000 Nov 13, 2019
8d5bec1
Merge pull request #1763 from wavesplatform/dexw-2331-release-1.4.12
vba2000 Nov 13, 2019
e8c83af
Merge branch 'dev' of github.com:wavesplatform/WavesGUI into dexw-234…
vba2000 Nov 13, 2019
5a0e0de
DEXW-2346: update version
jahsus-waves Nov 13, 2019
729d4b5
DEXW-2346: fix
vba2000 Nov 13, 2019
6dc60f6
Merge pull request #1764 from wavesplatform/dexw-2346-coinomat-btc
GIvanovWaves Nov 13, 2019
a039193
Merge branch 'master' into dexw-2346-release-1.4.13
GIvanovWaves Nov 13, 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
20 changes: 17 additions & 3 deletions data-service/api/assets/assets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,17 @@ export function getAssetFromNode(assetId: string): Promise<Asset> {
return Promise.resolve(wavesAsset);
}

return request<INodeAssetData>({ url: `${configGet('node')}/assets/details/${assetId}` })
return request<INodeAssetInfo>({ url: `${configGet('node')}/assets/details/${assetId}` })
.then((data) => new Asset({
id: data.assetId,
name: data.name,
description: data.description,
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)
}));
Expand Down Expand Up @@ -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;
}
1 change: 1 addition & 0 deletions locale/de/app.dex.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@
"noMarkets": "Keine Märkte, die ihren Filtern entsprechen"
},
"price": "Preis",
"vol": "Vol",
"volume": "Volumen"
}
},
Expand Down
7 changes: 5 additions & 2 deletions locale/de/app.migrate.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
14 changes: 14 additions & 0 deletions locale/de/app.utils.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down Expand Up @@ -912,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": {
Expand Down Expand Up @@ -999,5 +1010,8 @@
"byte": {
"help": "Bytes übrig: {{bytes}}"
}
},
"warningPlate": {
"startMoving": "Start moving"
}
}
2 changes: 2 additions & 0 deletions locale/de/app.welcome.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions locale/en/app.dex.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@
"noMarkets": "No markets matching your filters"
},
"price": "Price",
"vol": "Vol",
"volume": "Volume"
}
},
Expand Down
7 changes: 5 additions & 2 deletions locale/en/app.migrate.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
14 changes: 14 additions & 0 deletions locale/en/app.utils.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -912,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": {
Expand Down Expand Up @@ -999,5 +1010,8 @@
"byte": {
"help": "Bytes left: {{bytes}}"
}
},
"warningPlate": {
"startMoving": "Start moving"
}
}
2 changes: 2 additions & 0 deletions locale/en/app.welcome.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions locale/es/app.dex.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@
"noMarkets": "No hay mercados en base a sus filtros"
},
"price": "Precio",
"vol": "Vol",
"volume": "Volumen"
}
},
Expand Down
7 changes: 5 additions & 2 deletions locale/es/app.migrate.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
14 changes: 14 additions & 0 deletions locale/es/app.utils.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -912,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": {
Expand Down Expand Up @@ -999,5 +1010,8 @@
"byte": {
"help": "Quedan: {{bytes}}"
}
},
"warningPlate": {
"startMoving": "Start moving"
}
}
2 changes: 2 additions & 0 deletions locale/es/app.welcome.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions locale/et_EE/app.dex.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@
"noMarkets": "Teie filtritele vastavaid turge ei leitud"
},
"price": "Hind",
"vol": "Vol",
"volume": "Maht"
}
},
Expand Down
7 changes: 5 additions & 2 deletions locale/et_EE/app.migrate.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
14 changes: 14 additions & 0 deletions locale/et_EE/app.utils.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -912,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": {
Expand Down Expand Up @@ -999,5 +1010,8 @@
"byte": {
"help": "Baite vasakul: {{bytes}}"
}
},
"warningPlate": {
"startMoving": "Start moving"
}
}
2 changes: 2 additions & 0 deletions locale/et_EE/app.welcome.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions locale/fr/app.dex.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@
"noMarkets": "Aucun marché ne correspond à vos filtres"
},
"price": "Prix",
"vol": "Vol",
"volume": "Volume"
}
},
Expand Down
7 changes: 5 additions & 2 deletions locale/fr/app.migrate.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
14 changes: 14 additions & 0 deletions locale/fr/app.utils.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -912,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": {
Expand Down Expand Up @@ -999,5 +1010,8 @@
"byte": {
"help": "Octets restants : {{bytes}}"
}
},
"warningPlate": {
"startMoving": "Start moving"
}
}
2 changes: 2 additions & 0 deletions locale/fr/app.welcome.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading