diff options
| author | Hsuan Lee <hsuan@cobinhood.com> | 2018-12-11 18:00:37 +0800 |
|---|---|---|
| committer | Hsuan Lee <hsuan@cobinhood.com> | 2018-12-11 18:03:36 +0800 |
| commit | 5d23feae8d213bd234044955c68abbce106d02e9 (patch) | |
| tree | de3c070269a2e6518285b59ef5386fcba004d924 | |
| parent | 0862bb63a551e380a9ce4fc3a69b42d37fa66aa9 (diff) | |
| download | dexon-wallet-5d23feae8d213bd234044955c68abbce106d02e9.tar.gz dexon-wallet-5d23feae8d213bd234044955c68abbce106d02e9.tar.zst dexon-wallet-5d23feae8d213bd234044955c68abbce106d02e9.zip | |
Refine wording
71 files changed, 431 insertions, 416 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index caa07204..4587e018 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Develop Branch +## 1.2.1 Tue Dec 11 2018 + ## 1.2.0 Mon Dec 10 2018 ## 5.1.0 Mon Dec 03 2018 diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json index 59da5d88..71d89b19 100644 --- a/app/_locales/cs/messages.json +++ b/app/_locales/cs/messages.json @@ -202,8 +202,8 @@ "message": "Vložte $1 na níže uvedenou adresu", "description": "Tells the user what coin they have selected to deposit with shapeshift" }, - "depositDEX": { - "message": "Vložit DEX" + "depositDXN": { + "message": "Vložit DXN" }, "depositFiat": { "message": "Vklad s fiat měnou" @@ -215,7 +215,7 @@ "message": "Vklad přes ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Pokud vlastníte jiné kryptoměny, můžete je směnit DEX a vložit ho přímo do peněženky DekuSan. Bez založení účtu." + "message": "Pokud vlastníte jiné kryptoměny, můžete je směnit DXN a vložit ho přímo do peněženky DekuSan. Bez založení účtu." }, "details": { "message": "Podrobnosti" @@ -224,10 +224,10 @@ "message": "Přímý vklad" }, "directDepositDex": { - "message": "Vložit DEX přímo" + "message": "Vložit DXN přímo" }, "directDepositDexExplainer": { - "message": "Pokud už vlastníte nějaký DEX, nejrychleji ho dostanete do peněženky přímým vkladem." + "message": "Pokud už vlastníte nějaký DXN, nejrychleji ho dostanete do peněženky přímým vkladem." }, "done": { "message": "Hotovo" @@ -329,11 +329,11 @@ "message": "Cena paliva je povinná" }, "getDex": { - "message": "Získejte DEX" + "message": "Získejte DXN" }, "getDexFromFaucet": { - "message": "Získejte DEX z faucetu za $1.", - "description": "Displays network name for DEX faucet" + "message": "Získejte DXN z faucetu za $1.", + "description": "Displays network name for DXN faucet" }, "greaterThanMin": { "message": "musí být větší nebo roven $1.", @@ -356,7 +356,7 @@ "message": "Skrýt token?" }, "howToDeposit": { - "message": "Jakým způsobem chcete vložit DEX?" + "message": "Jakým způsobem chcete vložit DXN?" }, "holdDex": { "message": "Dovoluje vám držet dexon a tokeny a slouží jako most k decentralizovaným aplikacím." @@ -471,7 +471,7 @@ "message": "Zpráva" }, "dekusanDescription": { - "message": "DekuSan je bezpečný osobní trezor pro Dexon." + "message": "DekuSan je bezpečný osobní trezor pro DEXON." }, "min": { "message": "Minimum" @@ -483,7 +483,7 @@ "message": "Musíte zvolit aspoň 1 token." }, "needDexInWallet": { - "message": "Potřebujete DEX v peněžence, abyste mohli pomocí DekuSanu interagovat s decentralizovanými aplikacemi." + "message": "Potřebujete DXN v peněžence, abyste mohli pomocí DekuSanu interagovat s decentralizovanými aplikacemi." }, "needImportFile": { "message": "Musíte zvolit soubor k importu.", @@ -494,7 +494,7 @@ "description": "Password and file needed to import an account" }, "negativeDex": { - "message": "Nelze odeslat zápornou částku DEX." + "message": "Nelze odeslat zápornou částku DXN." }, "networks": { "message": "Sítě" @@ -708,14 +708,14 @@ "send": { "message": "Odeslat" }, - "sendDEX": { - "message": "Odeslat DEX" + "sendDXN": { + "message": "Odeslat DXN" }, "sendTokens": { "message": "Odeslat tokeny" }, "onlySendToDexonAddress": { - "message": "Posílejte jen DEX na DEXON adresu." + "message": "Posílejte jen DXN na DEXON adresu." }, "searchTokens": { "message": "Hledat tokeny" @@ -799,7 +799,7 @@ "message": "Komu" }, "toDEXviaShapeShift": { - "message": "$1 na DEX přes ShapeShift", + "message": "$1 na DXN přes ShapeShift", "description": "system will fill in deposit type in start of message" }, "tokenAddress": { diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index 7d44ac90..a2aebbac 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -187,7 +187,7 @@ "message": "Dezimalangabe der Präzision" }, "defaultNetwork": { - "message": "Das Standardnetzwerk für DEX Transaktionen ist das Main Net." + "message": "Das Standardnetzwerk für DXN Transaktionen ist das Main Net." }, "denExplainer": { "message": "Dein DEN ist dein passwortverschlüsselter Speicher innerhalb von DekuSan." @@ -202,7 +202,7 @@ "message": "Zahle deine $1 in die unten stehende Adresse ein", "description": "Teilt dem Benutzer mit welchen Token er beim Einzahlen mit Shapeshift ausgewählt hat" }, - "depositDEX": { + "depositDXN": { "message": "DEXON einzahlen" }, "depositFiat": { @@ -224,10 +224,10 @@ "message": "Sofortige Einzahlung" }, "directDepositDex": { - "message": "Sofort DEX einzahlen" + "message": "Sofort DXN einzahlen" }, "directDepositDexExplainer": { - "message": "Wenn du bereits DEX besitzt, ist die sofortige Einzahlung die schnellste Methode DEX in deine neue Wallet zu bekommen." + "message": "Wenn du bereits DXN besitzt, ist die sofortige Einzahlung die schnellste Methode DXN in deine neue Wallet zu bekommen." }, "done": { "message": "Fertig" @@ -333,7 +333,7 @@ }, "getDexFromFaucet": { "message": "DEXON für $1 vom Faucet holen", - "description": "Zeigt den Netzwerknamen für den DEX Faucet an" + "description": "Zeigt den Netzwerknamen für den DXN Faucet an" }, "greaterThanMin": { "message": "Muss größer oder gleich $1 sein.", @@ -356,7 +356,7 @@ "message": "Token ausblenden?" }, "howToDeposit": { - "message": "Wie möchtest du DEX einzahlen?" + "message": "Wie möchtest du DXN einzahlen?" }, "holdDex": { "message": "Es erlaubt dir dexon & Token zu halten und dient dir als Verbindung zu dezentralisierten Applikationen." @@ -471,7 +471,7 @@ "message": "Nachricht" }, "dekusanDescription": { - "message": "DekuSan ist ein sicherer Identitätssafe für Dexon." + "message": "DekuSan ist ein sicherer Identitätssafe für DEXON." }, "min": { "message": "Minimum" @@ -483,7 +483,7 @@ "message": "Du musst mindestens 1 Token auswählen." }, "needDexInWallet": { - "message": "Um dezentralisierte Applikationen mit DekuSan verwenden zu können, benötigst du DEX in deiner Wallet." + "message": "Um dezentralisierte Applikationen mit DekuSan verwenden zu können, benötigst du DXN in deiner Wallet." }, "needImportFile": { "message": "Für den Import musst du eine Datei auswählen.", @@ -494,7 +494,7 @@ "description": "Passwort und Datei sind notwendig um einen Account zu importieren" }, "negativeDex": { - "message": "Negative DEX Beträge können nicht versendet werden." + "message": "Negative DXN Beträge können nicht versendet werden." }, "networks": { "message": "Netzwerke" @@ -708,14 +708,14 @@ "send": { "message": "Senden" }, - "sendDEX": { - "message": "DEX senden" + "sendDXN": { + "message": "DXN senden" }, "sendTokens": { "message": "Token senden" }, "onlySendToDexonAddress": { - "message": "DEX unbedingt nur zu einer DEXON Adresse senden." + "message": "DXN unbedingt nur zu einer DEXON Adresse senden." }, "searchTokens": { "message": "" @@ -799,7 +799,7 @@ "message": "An" }, "toDEXviaShapeShift": { - "message": "$1 an DEX via ShapeShift", + "message": "$1 an DXN via ShapeShift", "description": "Das System wird den Einzahlungstyp im Beginn der Nachricht eintragen" }, "tokenAddress": { diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 601e1133..ac95c7db 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -187,7 +187,7 @@ "message": "Decimals of Precision" }, "defaultNetwork": { - "message": "The default network for DEX transactions is Main Net." + "message": "The default network for DXN transactions is Main Net." }, "denExplainer": { "message": "Your DEN is your password-encrypted storage within DekuSan." @@ -202,8 +202,8 @@ "message": "Deposit your $1 to the address below", "description": "Tells the user what coin they have selected to deposit with shapeshift" }, - "depositDEX": { - "message": "Deposit DEX" + "depositDXN": { + "message": "Deposit DXN" }, "depositFiat": { "message": "Deposit with Fiat" @@ -215,7 +215,7 @@ "message": "Deposit with ShapeShift" }, "depositShapeShiftExplainer": { - "message": "If you own other cryptocurrencies, you can trade and deposit DEX directly into your DekuSan wallet. No Account Needed." + "message": "If you own other cryptocurrencies, you can trade and deposit DXN directly into your DekuSan wallet. No Account Needed." }, "details": { "message": "Details" @@ -224,10 +224,10 @@ "message": "Direct Deposit" }, "directDepositDex": { - "message": "Directly Deposit DEX" + "message": "Directly Deposit DXN" }, "directDepositDexExplainer": { - "message": "If you already have some DEX, the quickest way to get DEX in your new wallet by direct deposit." + "message": "If you already have some DXN, the quickest way to get DXN in your new wallet by direct deposit." }, "done": { "message": "Done" @@ -263,7 +263,7 @@ "message": "Passwords Don't Match" }, "dexscanView": { - "message": "View account on DEXscan" + "message": "View account on DEXSCAN" }, "exchangeRate": { "message": "Exchange Rate" @@ -329,11 +329,11 @@ "message": "Gas Price Required" }, "getDex": { - "message": "Get DEX" + "message": "Get DXN" }, "getDexFromFaucet": { - "message": "Get DEX from a faucet for the $1", - "description": "Displays network name for DEX faucet" + "message": "Get DXN from a faucet for the $1", + "description": "Displays network name for DXN faucet" }, "greaterThanMin": { "message": "must be greater than or equal to $1.", @@ -356,7 +356,7 @@ "message": "Hide Token?" }, "howToDeposit": { - "message": "How would you like to deposit DEX?" + "message": "How would you like to deposit DXN?" }, "holdDex": { "message": "It allows you to hold dexon & tokens, and serves as your bridge to decentralized applications." @@ -471,7 +471,7 @@ "message": "Message" }, "dekusanDescription": { - "message": "DekuSan is a secure identity vault for Dexon." + "message": "DekuSan is a secure identity vault for DEXON." }, "min": { "message": "Minimum" @@ -483,7 +483,7 @@ "message": "Must select at least 1 token." }, "needDexInWallet": { - "message": "To interact with decentralized applications using DekuSan, you’ll need DEX in your wallet." + "message": "To interact with decentralized applications using DekuSan, you’ll need DXN in your wallet." }, "needImportFile": { "message": "You must select a file to import.", @@ -494,7 +494,7 @@ "description": "Password and file needed to import an account" }, "negativeDex": { - "message": "Can not send negative amounts of DEX." + "message": "Can not send negative amounts of DXN." }, "networks": { "message": "Networks" @@ -708,14 +708,14 @@ "send": { "message": "Send" }, - "sendDEX": { - "message": "Send DEX" + "sendDXN": { + "message": "Send DXN" }, "sendTokens": { "message": "Send Tokens" }, "onlySendToDexonAddress": { - "message": "Only send DEX to a DEXON address." + "message": "Only send DXN to a DEXON address." }, "searchTokens": { "message": "Search Tokens" @@ -799,7 +799,7 @@ "message": "To" }, "toDEXviaShapeShift": { - "message": "$1 to DEX via ShapeShift", + "message": "$1 to DXN via ShapeShift", "description": "system will fill in deposit type in start of message" }, "tokenAddress": { @@ -1000,7 +1000,7 @@ "message": "Enter password to continue" }, "dex": { - "message": "DEX" + "message": "DXN" }, "expandView": { "message": "Expand View" @@ -1112,7 +1112,7 @@ "message": "Primary Currency" }, "primaryCurrencySettingDescription": { - "message": "Select DEX to prioritize displaying values in DEX. Select Fiat to prioritize displaying values in your selected currency." + "message": "Select DXN to prioritize displaying values in DXN. Select Fiat to prioritize displaying values in your selected currency." }, "queue": { "message": "Queue" @@ -1238,7 +1238,7 @@ "message": "3. Start using dApps and more!" }, "step3HardwareWalletMsg": { - "message": "Use your hardware account like you would with any DEXON account. Log in to dApps, send DEX, buy and store ERC20 tokens and Non-Fungible tokens like CryptoKitties." + "message": "Use your hardware account like you would with any DEXON account. Log in to dApps, send DXN, buy and store ERC20 tokens and Non-Fungible tokens like CryptoKitties." }, "token": { "message": "Token" @@ -1304,7 +1304,7 @@ "message": "Updated $1" }, "viewOnDexScan": { - "message": "View on DEXscan" + "message": "View on DEXSCAN" }, "welcomeBack": { "message": "Welcome Back!" @@ -1409,7 +1409,7 @@ "message": "ETH" }, "etherscanView": { - "message": "View account on Etherscan" + "message": "View account on DEXSCAN" }, "fast": { "message": "Fast" @@ -1434,19 +1434,19 @@ "message": "It allows you to hold ether & tokens, and serves as your bridge to decentralized applications." }, "metamaskDescription": { - "message": "MetaMask is a secure identity vault for DEXON." + "message": "DekuSan is a secure identity vault for DEXON." }, "metamaskSeedWords": { - "message": "MetaMask Seed Words" + "message": "DekuSan Seed Words" }, "metamaskVersion": { - "message": "MetaMask Version" + "message": "DekuSan Version" }, "minutesShorthand": { "message": "Min" }, "needEtherInWallet": { - "message": "To interact with decentralized applications using MetaMask, you’ll need Ether in your wallet." + "message": "To interact with decentralized applications using DekuSan, you’ll need DXN in your wallet." }, "negativeETH": { "message": "Can not send negative amounts of ETH." @@ -1537,9 +1537,9 @@ "message": "Transaction Time" }, "viewOnEtherscan": { - "message": "View on Etherscan" + "message": "View on DEXSCAN" }, "welcome": { - "message": "Welcome to MetaMask" + "message": "Welcome to DekuSan" } }
\ No newline at end of file diff --git a/app/_locales/en_PH/messages.json b/app/_locales/en_PH/messages.json index 8435957e..da621a49 100644 --- a/app/_locales/en_PH/messages.json +++ b/app/_locales/en_PH/messages.json @@ -202,7 +202,7 @@ "message": "", "description": "" }, - "depositDEX": { + "depositDXN": { "message": "" }, "depositFiat": { @@ -708,7 +708,7 @@ "send": { "message": "" }, - "sendDEX": { + "sendDXN": { "message": "" }, "sendTokens": { diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 93b21060..85f4b727 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -187,7 +187,7 @@ "message": "Decimales de precisión" }, "defaultNetwork": { - "message": "La red por defecto para las transacciones de DEX es MainNet (red principal)" + "message": "La red por defecto para las transacciones de DXN es MainNet (red principal)" }, "denExplainer": { "message": "El DEN es tu contraseña encriptada almacenada dentro de DekuSan" @@ -202,8 +202,8 @@ "message": "Deposita tu $1 a la dirección de abajo", "description": "Informa al usuario que moneda ha elegido para depositar en shapeshift" }, - "depositDEX": { - "message": "Depositar DEX" + "depositDXN": { + "message": "Depositar DXN" }, "depositFiat": { "message": "Depositar con fiat (divisa nacional)" @@ -215,7 +215,7 @@ "message": "Depositar con ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Si posees otras criptomonedas, puedes intercambiar y depositar DEX directamente en tu billetera de DekuSan. No necesitas tener una cuenta." + "message": "Si posees otras criptomonedas, puedes intercambiar y depositar DXN directamente en tu billetera de DekuSan. No necesitas tener una cuenta." }, "details": { "message": "Detalles" @@ -224,10 +224,10 @@ "message": "Depósito directo" }, "directDepositDex": { - "message": "Depositar DEX directamente" + "message": "Depositar DXN directamente" }, "directDepositDexExplainer": { - "message": "Si posees DEX, la forma más rápida de transferirlo a tu nueva billetera es depositándolo directamente" + "message": "Si posees DXN, la forma más rápida de transferirlo a tu nueva billetera es depositándolo directamente" }, "done": { "message": "Completo" @@ -329,11 +329,11 @@ "message": "Precio del gas requerido" }, "getDex": { - "message": "Conseguir DEX" + "message": "Conseguir DXN" }, "getDexFromFaucet": { - "message": "Obtenga DEX de un faucet (grifo) por $1", - "description": "Muestra el nombre de la red para el faucet (grifo) de DEX" + "message": "Obtenga DXN de un faucet (grifo) por $1", + "description": "Muestra el nombre de la red para el faucet (grifo) de DXN" }, "greaterThanMin": { "message": "Debe ser mayor o igual a $1", @@ -356,7 +356,7 @@ "message": "¿Ocultar token?" }, "howToDeposit": { - "message": "¿Cómo te gustaria depositar DEX?" + "message": "¿Cómo te gustaria depositar DXN?" }, "holdDex": { "message": "Te permite mantener tus dexon y tokens, así como puente para aplicaciones descentralizadas" @@ -483,7 +483,7 @@ "message": "Debe seleccionar al menos un (1) token" }, "needDexInWallet": { - "message": "Para interactuar con una aplicación descentralizada usando DekuSan, necesitas tener DEX en tu billetera" + "message": "Para interactuar con una aplicación descentralizada usando DekuSan, necesitas tener DXN en tu billetera" }, "needImportFile": { "message": "Debes seleccionar un archivo para importar", @@ -494,7 +494,7 @@ "description": "Contraseña y archivo necesarios para importar una cuenta" }, "negativeDex": { - "message": "No se pueden mandar cantidades negativas de DEX" + "message": "No se pueden mandar cantidades negativas de DXN" }, "networks": { "message": "Redes" @@ -708,8 +708,8 @@ "send": { "message": "Enviar" }, - "sendDEX": { - "message": "Enviar DEX" + "sendDXN": { + "message": "Enviar DXN" }, "sendTokens": { "message": "Enviar tokens" @@ -799,7 +799,7 @@ "message": "Para" }, "toDEXviaShapeShift": { - "message": "$1 a DEX via ShapeShift", + "message": "$1 a DXN via ShapeShift", "description": "el sistema llenará el tipo de depósito al principio del mensaje" }, "tokenAddress": { @@ -1540,6 +1540,6 @@ "message": "" }, "welcome": { - "message": "Bienvenido a MetaMask" + "message": "Bienvenido a DekuSan" } }
\ No newline at end of file diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index 0cf0a50c..380c97a9 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -75,7 +75,7 @@ "message": "Emprunter avec Dharma (Bêta)" }, "builtInCalifornia": { - "message": "MetaMask est designé et developpé en Californie." + "message": "DekuSan est designé et developpé en Californie." }, "buy": { "message": "Acheter" @@ -187,7 +187,7 @@ "message": "Décimales de précision" }, "defaultNetwork": { - "message": "Le réseau par défaut pour les transactions DEX est Main Net." + "message": "Le réseau par défaut pour les transactions DXN est Main Net." }, "denExplainer": { "message": "Votre DEN est votre stockage crypté par mot de passe dans DekuSan." @@ -202,8 +202,8 @@ "message": "Déposer votre $1 à l'adresse ci-dessous", "description": "Indique à l'utilisateur quelle monnaie il a choisi de déposer avec Shapeshift" }, - "depositDEX": { - "message": "Déposer DEX" + "depositDXN": { + "message": "Déposer DXN" }, "depositFiat": { "message": "Déposer de la monnaie-fiat" @@ -227,7 +227,7 @@ "message": "Dépôt direct d'DEXON" }, "directDepositDexExplainer": { - "message": "Si vous avez déjà de l'DEXON, le moyen le plus rapide d'obtenir des DEX dans votre nouveau portefeuille est par dépôt direct." + "message": "Si vous avez déjà de l'DEXON, le moyen le plus rapide d'obtenir des DXN dans votre nouveau portefeuille est par dépôt direct." }, "done": { "message": "Terminé" @@ -329,7 +329,7 @@ "message": "Prix du gaz requis" }, "getDex": { - "message": "Obtenir des DEX" + "message": "Obtenir des DXN" }, "getDexFromFaucet": { "message": "Obtenir de l'DEXON d'une faucet pour $1", @@ -369,7 +369,7 @@ "message": "Importer un compte" }, "importAccountMsg": { - "message": " Les comptes importés ne seront pas associés avec votre phrase Seed que vous avez créé au départ dans MetaMask. Obtenir plus d'information sur les comptes importés" + "message": " Les comptes importés ne seront pas associés avec votre phrase Seed que vous avez créé au départ dans DekuSan. Obtenir plus d'information sur les comptes importés" }, "importAnAccount": { "message": "Importer un compte" @@ -416,7 +416,7 @@ "description": "format d'importation d'un compte" }, "keepTrackTokens": { - "message": "Garder la trace des jetons que vous avez acheté avec votre compte MetaMask." + "message": "Garder la trace des jetons que vous avez acheté avec votre compte DekuSan." }, "kovan": { "message": "Réseau de test Kovan" @@ -471,7 +471,7 @@ "message": "Message" }, "dekusanDescription": { - "message": "MetaMask est un coffre sécurisé pour votre identité sur DEXON." + "message": "DekuSan est un coffre sécurisé pour votre identité sur DEXON." }, "min": { "message": "Minimum" @@ -494,7 +494,7 @@ "description": "Mot de passe et fichier requis pour importer un compte" }, "negativeDex": { - "message": "Vous ne pouvez envoyer des montants négatifs d'DEX." + "message": "Vous ne pouvez envoyer des montants négatifs d'DXN." }, "networks": { "message": "Réseaux" @@ -708,8 +708,8 @@ "send": { "message": "Envoyer" }, - "sendDEX": { - "message": "Envoyer des DEX" + "sendDXN": { + "message": "Envoyer des DXN" }, "sendTokens": { "message": "Envoyer des jetons" @@ -799,7 +799,7 @@ "message": "Destinataire" }, "toDEXviaShapeShift": { - "message": "$1 à DEX via ShapeShift", + "message": "$1 à DXN via ShapeShift", "description": "le système remplira le type de dépôt au début du message" }, "tokenAddress": { @@ -818,7 +818,7 @@ "message": "Symbole du Jeton" }, "tokenWarning1": { - "message": "Garder la trace des jetons achetésvia MetaMask. Si vous en avez acheté avec un autre compte, ces jetons n'apparaîtront pas ici." + "message": "Garder la trace des jetons achetésvia DekuSan. Si vous en avez acheté avec un autre compte, ces jetons n'apparaîtront pas ici." }, "total": { "message": "Total" @@ -843,7 +843,7 @@ "description": "Suivi par un lien (ici) pour voir les soldes des jetons" }, "twelveWords": { - "message": "Ces 12 mots sont la seule manière de restaurer vos comptes MetaMask.\nEnregistrez les quelquepart de sûr et secret." + "message": "Ces 12 mots sont la seule manière de restaurer vos comptes DekuSan.\nEnregistrez les quelquepart de sûr et secret." }, "typePassword": { "message": "Entrez votre mot de passe" @@ -898,7 +898,7 @@ "message": "Avertissement" }, "welcomeBeta": { - "message": "Bienvenue dans la Beta de MetaMask" + "message": "Bienvenue dans la Beta de DekuSan" }, "whatsThis": { "message": "Qu'est-ce que c'est?" @@ -928,7 +928,7 @@ "message": "Ajouter les jetons suggérés" }, "addAcquiredTokens": { - "message": "Ajouter les jetons que vous avez acquis par l'intermédiaire de MetaMask" + "message": "Ajouter les jetons que vous avez acquis par l'intermédiaire de DekuSan" }, "approve": { "message": "Approuver" @@ -961,7 +961,7 @@ "message": "Fermer" }, "chromeRequiredForHardwareWallets": { - "message": "Pour connecter votre portefeuille hardware, vous devez utiliser MetaMask pour Google Chrome." + "message": "Pour connecter votre portefeuille hardware, vous devez utiliser DekuSan pour Google Chrome." }, "connectHardwareWallet": { "message": "Connecter un portefeuille hardware" @@ -1030,7 +1030,7 @@ "message": "Connecter un portefeuille hardware" }, "hardwareWalletsMsg": { - "message": "Selectionnez le portefeuille hardware que vous voulez utiliser avec MetaMask" + "message": "Selectionnez le portefeuille hardware que vous voulez utiliser avec DekuSan" }, "havingTroubleConnecting": { "message": "Un problème de connection ?" @@ -1057,10 +1057,10 @@ "message": "Menu" }, "dekusanSeedWords": { - "message": "Mots Seed pour MetaMask" + "message": "Mots Seed pour DekuSan" }, "dekusanVersion": { - "message": "Version de MetaMask" + "message": "Version de DekuSan" }, "missingYourTokens": { "message": "" @@ -1196,7 +1196,7 @@ "message": "Selectionner un compte" }, "selectAnAccountHelp": { - "message": "Selectionner le compte à afficher dans MetaMask" + "message": "Selectionner le compte à afficher dans DekuSan" }, "selectHdPath": { "message": "Selectioner le \"Path HD\"" @@ -1238,7 +1238,7 @@ "message": "3. Vous pouvez maintenant utiliser des dApps et autres... !" }, "step3HardwareWalletMsg": { - "message": "Utilisez ce compte de votre portefeuille hardware comme n'importe quel compte DEXON. Connectez vous à des dApps, envoyez de l'DEX, achetez et conservez des jetons ERC20 et Non-Fungible comme CryptoKitties." + "message": "Utilisez ce compte de votre portefeuille hardware comme n'importe quel compte DEXON. Connectez vous à des dApps, envoyez de l'DXN, achetez et conservez des jetons ERC20 et Non-Fungible comme CryptoKitties." }, "token": { "message": "Jeton" @@ -1433,13 +1433,13 @@ "holdEther": { "message": "" }, - "metamaskDescription": { + "DekuSanDescription": { "message": "" }, - "metamaskSeedWords": { + "DekuSanSeedWords": { "message": "" }, - "metamaskVersion": { + "DekuSanVersion": { "message": "" }, "minutesShorthand": { @@ -1540,6 +1540,6 @@ "message": "" }, "welcome": { - "message": "Bienvenue dans la Beta de MetaMask" + "message": "Bienvenue dans la Beta de DekuSan" } }
\ No newline at end of file diff --git a/app/_locales/hi_IN/messages.json b/app/_locales/hi_IN/messages.json index c1a94618..e494f87d 100644 --- a/app/_locales/hi_IN/messages.json +++ b/app/_locales/hi_IN/messages.json @@ -202,8 +202,8 @@ "message": "नीचे दिए गए पते पर अपना $1 जमा करें", "description": "उपयोगकर्ता को बताता है कि उन्होंने सिक्का के साथ जमा करने के लिए किस सिक्का का चयन किया है" }, - "depositDEX": { - "message": "जमा - DEX" + "depositDXN": { + "message": "जमा - DXN" }, "depositFiat": { "message": "फिएट के साथ जमा हो" @@ -708,8 +708,8 @@ "send": { "message": "भेजें" }, - "sendDEX": { - "message": "भेजें DEX" + "sendDXN": { + "message": "भेजें DXN" }, "sendTokens": { "message": "भेजें टोकन" @@ -799,7 +799,7 @@ "message": "के लिए" }, "toDEXviaShapeShift": { - "message": "शैपशैफ्ट द्वारा $1 से DEX में जमा", + "message": "शैपशैफ्ट द्वारा $1 से DXN में जमा", "description": "संदेश की शुरुआत में जमा प्रकार भर जाएगा" }, "tokenAddress": { diff --git a/app/_locales/hn/messages.json b/app/_locales/hn/messages.json index 7b1f85a1..b2052eba 100644 --- a/app/_locales/hn/messages.json +++ b/app/_locales/hn/messages.json @@ -684,7 +684,7 @@ "send": { "message": "भेजें" }, - "sendDEX": { + "sendDXN": { "message": "भेजें ETH" }, "sendTokens": { diff --git a/app/_locales/ht_HT/messages.json b/app/_locales/ht_HT/messages.json index 359a819b..64eca1ce 100644 --- a/app/_locales/ht_HT/messages.json +++ b/app/_locales/ht_HT/messages.json @@ -187,7 +187,7 @@ "message": "Presizyon desimal la" }, "defaultNetwork": { - "message": "Dfo rezo a pou tranzaksyon DEX se Mainnet." + "message": "Dfo rezo a pou tranzaksyon DXN se Mainnet." }, "denExplainer": { "message": "DEN ou se depo modpas avèk chif ou nan DekuSan." @@ -202,8 +202,8 @@ "message": "Depoze $1 ou nan adrès ki anba a", "description": "Tells the user what coin they have selected to deposit with shapeshift" }, - "depositDEX": { - "message": "Depo DEX" + "depositDXN": { + "message": "Depo DXN" }, "depositFiat": { "message": "Depo ak Fiat" @@ -215,7 +215,7 @@ "message": "Depo avèk ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Si ou posede lòt cryptocurrencies, ou ka chanje ak depo DEX dirèkteman nan Wallet DekuSan ou. Pa gen kont ki nesesè." + "message": "Si ou posede lòt cryptocurrencies, ou ka chanje ak depo DXN dirèkteman nan Wallet DekuSan ou. Pa gen kont ki nesesè." }, "details": { "message": "Detay yo" @@ -224,10 +224,10 @@ "message": "Depo Dirèk" }, "directDepositDex": { - "message": "Dirèkteman Depo DEX" + "message": "Dirèkteman Depo DXN" }, "directDepositDexExplainer": { - "message": "Si ou deja gen kèk DEX, fason ki pi rapid yo ka resevwa DEX nan nouvo Wallet ou pa depo dirèk." + "message": "Si ou deja gen kèk DXN, fason ki pi rapid yo ka resevwa DXN nan nouvo Wallet ou pa depo dirèk." }, "done": { "message": "Fini" @@ -329,11 +329,11 @@ "message": "Pri Gaz la Egzije" }, "getDex": { - "message": "Jwenn DEX" + "message": "Jwenn DXN" }, "getDexFromFaucet": { - "message": "Jwenn DEX nan yon tiyo pou $1 la", - "description": "Displays network name for DEX faucet" + "message": "Jwenn DXN nan yon tiyo pou $1 la", + "description": "Displays network name for DXN faucet" }, "greaterThanMin": { "message": "dwe pi gran pase oswa egal a $ 1.", @@ -356,7 +356,7 @@ "message": "Kache Token?" }, "howToDeposit": { - "message": "Ki jan ou ta renmen depo DEX?" + "message": "Ki jan ou ta renmen depo DXN?" }, "holdDex": { "message": "Li pèmèt ou kenbe dexon & tokens, epi sèvi kòm on pon pou desantralize aplikasyon." @@ -483,7 +483,7 @@ "message": "Ou dwe chwazi omwen 1 token." }, "needDexInWallet": { - "message": "Pou kominike avèk aplikasyon desantralize ou dwe itilize DekuSan, ou pral bezwen DEX nan Wallet ou." + "message": "Pou kominike avèk aplikasyon desantralize ou dwe itilize DekuSan, ou pral bezwen DXN nan Wallet ou." }, "needImportFile": { "message": "Ou dwe chwazi yon dosye pou enpòte.", @@ -494,7 +494,7 @@ "description": "Password and file needed to import an account" }, "negativeDex": { - "message": "Pa ka voye kantite lajan negatif DEX." + "message": "Pa ka voye kantite lajan negatif DXN." }, "networks": { "message": "Rezo" @@ -708,14 +708,14 @@ "send": { "message": "Voye" }, - "sendDEX": { - "message": "Voye DEX" + "sendDXN": { + "message": "Voye DXN" }, "sendTokens": { "message": "Voye Tokens" }, "onlySendToDexonAddress": { - "message": "Sèlman voye DEX nan yon adrès DEXeum." + "message": "Sèlman voye DXN nan yon adrès DEXeum." }, "searchTokens": { "message": "Rechèch Tokens" @@ -799,7 +799,7 @@ "message": "Pou" }, "toDEXviaShapeShift": { - "message": "$1 pou DEX pa ShapeShift", + "message": "$1 pou DXN pa ShapeShift", "description": "system will fill in deposit type in start of message" }, "tokenAddress": { @@ -1238,7 +1238,7 @@ "message": "3. Kòmanse itilize dApps ak plis ankò!" }, "step3HardwareWalletMsg": { - "message": "Sèvi ak kont materyèl ou menm jan ou t ap fè pou kont DEXum. Ouvri sesyon an nan dApps, voye DEX, achte ak stòke ERC20 tokens ak e ki pake chanje tokens tankou CryptoKitties." + "message": "Sèvi ak kont materyèl ou menm jan ou t ap fè pou kont DEXum. Ouvri sesyon an nan dApps, voye DXN, achte ak stòke ERC20 tokens ak e ki pake chanje tokens tankou CryptoKitties." }, "token": { "message": "Token" diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json index 55c3b1a8..4936b252 100644 --- a/app/_locales/it/messages.json +++ b/app/_locales/it/messages.json @@ -187,7 +187,7 @@ "message": "Precisione Decimali" }, "defaultNetwork": { - "message": "La rete predefinita per transazioni in DEX è la Rete DEXON Principale." + "message": "La rete predefinita per transazioni in DXN è la Rete DEXON Principale." }, "denExplainer": { "message": "Il DEN è il tuo archivio crittato con password dentro DekuSan." @@ -202,8 +202,8 @@ "message": "Deposita $1 all'indirizzo sotto", "description": "Dice all'utente quale moneta ha selezionato per depositare con Shapeshift" }, - "depositDEX": { - "message": "Deposita DEX" + "depositDXN": { + "message": "Deposita DXN" }, "depositFiat": { "message": "Deposita con moneta Fiat" @@ -215,7 +215,7 @@ "message": "Deposita con ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Se possiedi altre criptomonete, puoi scambiare e depositare DEX direttamente nel tuo portafoglio DekuSan. Nessun account richiesto." + "message": "Se possiedi altre criptomonete, puoi scambiare e depositare DXN direttamente nel tuo portafoglio DekuSan. Nessun account richiesto." }, "details": { "message": "Dettagli" @@ -224,10 +224,10 @@ "message": "Deposito Diretto" }, "directDepositDex": { - "message": "Deposita Direttamente DEX" + "message": "Deposita Direttamente DXN" }, "directDepositDexExplainer": { - "message": "Se possiedi già degli DEX, questa è la via più veloce per aggiungere DEX al tuo portafoglio con un deposito diretto." + "message": "Se possiedi già degli DXN, questa è la via più veloce per aggiungere DXN al tuo portafoglio con un deposito diretto." }, "done": { "message": "Finito" @@ -329,11 +329,11 @@ "message": "Prezzo Gas Richiesto" }, "getDex": { - "message": "Ottieni DEX" + "message": "Ottieni DXN" }, "getDexFromFaucet": { - "message": "Ottieni Get DEX da un faucet per $1", - "description": "Visualizza il nome della rete per il faucet DEX" + "message": "Ottieni Get DXN da un faucet per $1", + "description": "Visualizza il nome della rete per il faucet DXN" }, "greaterThanMin": { "message": "deve essere maggiore o uguale a $1.", @@ -356,7 +356,7 @@ "message": "Nascondi Token?" }, "howToDeposit": { - "message": "Come vuoi depositare DEX?" + "message": "Come vuoi depositare DXN?" }, "holdDex": { "message": "Ti permette di tenere dexon & token, e serve da ponte per le applicazioni decentralizzate." @@ -416,7 +416,7 @@ "description": "formato per importare un account" }, "keepTrackTokens": { - "message": "Tieni traccia dei tokens che hai acquistato con il tuo account MetaMask." + "message": "Tieni traccia dei tokens che hai acquistato con il tuo account DekuSan." }, "kovan": { "message": "Rete di test Kovan" @@ -471,7 +471,7 @@ "message": "Messaggio" }, "dekusanDescription": { - "message": "DekuSan è una cassaforte sicura per identità su Dexon." + "message": "DekuSan è una cassaforte sicura per identità su DEXON." }, "min": { "message": "Minimo" @@ -483,7 +483,7 @@ "message": "Devi selezionare almeno un token." }, "needDexInWallet": { - "message": "Per interagire con applicazioni decentralizzate con DekuSan, devi possedere DEX nel tuo portafoglio." + "message": "Per interagire con applicazioni decentralizzate con DekuSan, devi possedere DXN nel tuo portafoglio." }, "needImportFile": { "message": "Devi selezionare un file da importare.", @@ -494,7 +494,7 @@ "description": "Password e file necessari per importare un account" }, "negativeDex": { - "message": "Non puoi inviare una quantità di DEX negativa." + "message": "Non puoi inviare una quantità di DXN negativa." }, "networks": { "message": "Reti" @@ -708,14 +708,14 @@ "send": { "message": "Invia" }, - "sendDEX": { - "message": "Invia DEX" + "sendDXN": { + "message": "Invia DXN" }, "sendTokens": { "message": "Invia Tokens" }, "onlySendToDexonAddress": { - "message": "Invia DEX solamente ad un account DEXON." + "message": "Invia DXN solamente ad un account DEXON." }, "searchTokens": { "message": "Cerca Tokens" @@ -799,7 +799,7 @@ "message": "A" }, "toDEXviaShapeShift": { - "message": "$1 a DEX via ShapeShift", + "message": "$1 a DXN via ShapeShift", "description": "il sistema riempirà il tipo di deposito all'inizio del messaggio" }, "tokenAddress": { @@ -928,7 +928,7 @@ "message": "Aggiungi Token Suggeriti" }, "addAcquiredTokens": { - "message": "Aggiungi i token che hai acquistato usando MetaMask" + "message": "Aggiungi i token che hai acquistato usando DekuSan" }, "approve": { "message": "Approva" @@ -961,7 +961,7 @@ "message": "Chiudi" }, "chromeRequiredForHardwareWallets": { - "message": "Devi usare MetaMask con Google Chrome per connettere il tuo Portafoglio Hardware" + "message": "Devi usare DekuSan con Google Chrome per connettere il tuo Portafoglio Hardware" }, "connectHardwareWallet": { "message": "Connetti Portafoglio Hardware" @@ -1030,7 +1030,7 @@ "message": "Connetti portafoglio hardware" }, "hardwareWalletsMsg": { - "message": "Selezione un portafoglio hardware che vuoi utilizzare con MetaMask" + "message": "Selezione un portafoglio hardware che vuoi utilizzare con DekuSan" }, "havingTroubleConnecting": { "message": "Problemi di connessione?" @@ -1057,10 +1057,10 @@ "message": "Menu" }, "dekusanSeedWords": { - "message": "Parole Seed di MetaMask" + "message": "Parole Seed di DekuSan" }, "dekusanVersion": { - "message": "versione di MetaMask" + "message": "versione di DekuSan" }, "missingYourTokens": { "message": "" @@ -1196,7 +1196,7 @@ "message": "Seleziona un Account" }, "selectAnAccountHelp": { - "message": "Selezione l'account da visualizzare in MetaMask" + "message": "Selezione l'account da visualizzare in DekuSan" }, "selectHdPath": { "message": "Seleziona Percorso HD" @@ -1238,7 +1238,7 @@ "message": "3. Inizia a usare dApps e molto altro ancora!" }, "step3HardwareWalletMsg": { - "message": "Usa il tuo account hardware come utilizzeresti qualsiasi account DEXON. Accedi alle dApps, invia DEX, compra e conserva token ERC20 e token non fungibili come CryptoKitties" + "message": "Usa il tuo account hardware come utilizzeresti qualsiasi account DEXON. Accedi alle dApps, invia DXN, compra e conserva token ERC20 e token non fungibili come CryptoKitties" }, "token": { "message": "Token" @@ -1433,13 +1433,13 @@ "holdEther": { "message": "" }, - "metamaskDescription": { + "DekuSanDescription": { "message": "" }, - "metamaskSeedWords": { + "DekuSanSeedWords": { "message": "" }, - "metamaskVersion": { + "DekuSanVersion": { "message": "" }, "minutesShorthand": { @@ -1540,6 +1540,6 @@ "message": "" }, "welcome": { - "message": "Benvenuto nella Beta di MetaMask" + "message": "Benvenuto nella Beta di DekuSan" } }
\ No newline at end of file diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index f04a83be..61913f76 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -202,7 +202,7 @@ "message": "$1を下記のアドレスへ振込んでください", "description": "Tells the user what coin they have selected to deposit with shapeshift" }, - "depositDEX": { + "depositDXN": { "message": "DEXONを振込" }, "depositFiat": { @@ -333,7 +333,7 @@ }, "getDexFromFaucet": { "message": "フォーセットで $1のDEXONを得ることができます。", - "description": "Displays network name for DEX faucet" + "description": "Displays network name for DXN faucet" }, "greaterThanMin": { "message": " $1以上にして下さい。", @@ -708,14 +708,14 @@ "send": { "message": "送信" }, - "sendDEX": { + "sendDXN": { "message": "DEXの送信" }, "sendTokens": { "message": "トークンを送信" }, "onlySendToDexonAddress": { - "message": "DEX はイーサリウムアカウントのみに送信できます。" + "message": "DXN はイーサリウムアカウントのみに送信できます。" }, "searchTokens": { "message": "トークンの検索" @@ -1540,6 +1540,6 @@ "message": "" }, "welcome": { - "message": "MetaMask ベータ版へようこそ!" + "message": "DekuSan ベータ版へようこそ!" } }
\ No newline at end of file diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index 4d185d4f..d11c9b11 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -202,7 +202,7 @@ "message": "다음 주소로 $1 만큼 입금해주세요.", "description": "사용자에게 shapeshift에서 어떤 코인을 선택해 입금했는지 알려줍니다" }, - "depositDEX": { + "depositDXN": { "message": "이더리움 입금하기" }, "depositFiat": { @@ -708,8 +708,8 @@ "send": { "message": "전송" }, - "sendDEX": { - "message": "DEX 보내기" + "sendDXN": { + "message": "DXN 보내기" }, "sendTokens": { "message": "토큰 전송" diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json index a797df8a..f3341d90 100644 --- a/app/_locales/nl/messages.json +++ b/app/_locales/nl/messages.json @@ -202,8 +202,8 @@ "message": "Stort uw $1 op het onderstaande adres", "description": "Laat de gebruiker weten welk muntje ze hebben geselecteerd om te deponeren met shapeshift" }, - "depositDEX": { - "message": "Stort DEX" + "depositDXN": { + "message": "Stort DXN" }, "depositFiat": { "message": "Stort met Fiat" @@ -215,7 +215,7 @@ "message": "Stort met ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Als u andere cryptocurrencies bezit, kunt u DEX direct in uw DekuSan-portemonnee ruilen en storten. Geen account nodig." + "message": "Als u andere cryptocurrencies bezit, kunt u DXN direct in uw DekuSan-portemonnee ruilen en storten. Geen account nodig." }, "details": { "message": "Details" @@ -224,10 +224,10 @@ "message": "Directe storting" }, "directDepositDex": { - "message": "Directe DEX storten" + "message": "Directe DXN storten" }, "directDepositDexExplainer": { - "message": "Als je al wat DEX hebt, de snelste manier om DEX in je nieuwe portemonnee te krijgen door een directe storting." + "message": "Als je al wat DXN hebt, de snelste manier om DXN in je nieuwe portemonnee te krijgen door een directe storting." }, "done": { "message": "Gedaan" @@ -329,10 +329,10 @@ "message": "Gasprijs vereist" }, "getDex": { - "message": "Krijg DEX" + "message": "Krijg DXN" }, "getDexFromFaucet": { - "message": "Haal DEX uit een kraan voor de $1", + "message": "Haal DXN uit een kraan voor de $1", "description": "Geeft de netwerknaam voor DEX-kraan weer" }, "greaterThanMin": { @@ -356,7 +356,7 @@ "message": "Token verbergen?" }, "howToDeposit": { - "message": "Hoe zou je DEX willen deponeren?" + "message": "Hoe zou je DXN willen deponeren?" }, "holdDex": { "message": "Hiermee kunt u dexon & tokens bewaren en dient u als brug naar gedecentraliseerde applicaties." @@ -471,7 +471,7 @@ "message": "Bericht" }, "dekusanDescription": { - "message": "DekuSan is een veilige identiteitskluis voor Dexon." + "message": "DekuSan is een veilige identiteitskluis voor DEXON." }, "min": { "message": "Minimum" @@ -483,7 +483,7 @@ "message": "Moet ten minste één token selecteren." }, "needDexInWallet": { - "message": "Om te communiceren met gedecentraliseerde applicaties met DekuSan, heb je DEX nodig in je portemonnee." + "message": "Om te communiceren met gedecentraliseerde applicaties met DekuSan, heb je DXN nodig in je portemonnee." }, "needImportFile": { "message": "U moet een bestand selecteren om te importeren.", @@ -494,7 +494,7 @@ "description": "Wachtwoord en bestand nodig om een account te importeren" }, "negativeDex": { - "message": "Kan geen negatieve hoeveelheden DEX verzenden." + "message": "Kan geen negatieve hoeveelheden DXN verzenden." }, "networks": { "message": "netwerken" @@ -708,8 +708,8 @@ "send": { "message": "Sturen" }, - "sendDEX": { - "message": "Verzend DEX" + "sendDXN": { + "message": "Verzend DXN" }, "sendTokens": { "message": "Stuur tokens" @@ -799,7 +799,7 @@ "message": "Naar" }, "toDEXviaShapeShift": { - "message": "$1 tot DEX via ShapeShift", + "message": "$1 tot DXN via ShapeShift", "description": "systeem zal het aanbetalingstype invullen bij het begin van het bericht" }, "tokenAddress": { @@ -1540,6 +1540,6 @@ "message": "" }, "welcome": { - "message": "Welkom bij MetaMask" + "message": "Welkom bij DekuSan" } }
\ No newline at end of file diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json index ee9e1454..cd7bd662 100644 --- a/app/_locales/ph/messages.json +++ b/app/_locales/ph/messages.json @@ -181,7 +181,7 @@ "message": "Custom RPC" }, "defaultNetwork": { - "message": "Ang default network para sa DEX transactions ay ang Main Net." + "message": "Ang default network para sa DXN transactions ay ang Main Net." }, "denExplainer": { "message": "Ang iyong DEN ang nagsisilbing password-encrypted storage mo sa loob ng DekuSan." @@ -209,7 +209,7 @@ "message": "I-deposito gamit ang ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Kung ikaw ay nagmamay-ari ng iba pang cryptocurrencies, pwede kang mag-trade at mag-deposito ng DEX diretso sa iyong DekuSan wallet. Hindi mo na kailangan ng account." + "message": "Kung ikaw ay nagmamay-ari ng iba pang cryptocurrencies, pwede kang mag-trade at mag-deposito ng DXN diretso sa iyong DekuSan wallet. Hindi mo na kailangan ng account." }, "details": { "message": "Detalye" @@ -218,10 +218,10 @@ "message": "Direktang Deposito" }, "directDepositEther": { - "message": "Direktang I-deposito ang DEX" + "message": "Direktang I-deposito ang DXN" }, "directDepositEtherExplainer": { - "message": "Kung ika ay mayroon nang DEX, ang pinakamabilis na paraan upang makuha ang DEX sa iyong bagong wallet ay sa pamamagitan ng direktang deposito." + "message": "Kung ika ay mayroon nang DXN, ang pinakamabilis na paraan upang makuha ang DXN sa iyong bagong wallet ay sa pamamagitan ng direktang deposito." }, "done": { "message": "Tapos na" @@ -239,7 +239,7 @@ "message": "I-enter ang password" }, "etherscanView": { - "message": "Tingnan ang account sa DEXscan" + "message": "Tingnan ang account sa DEXSCAN" }, "exchangeRate": { "message": "Exchange Rate" @@ -296,11 +296,11 @@ "message": "Kailangan ang Gas Price" }, "getEther": { - "message": "Kumuha ng DEX" + "message": "Kumuha ng DXN" }, "getEtherFromFaucet": { - "message": "Kumuha ng DEX mula sa faucet para sa $1", - "description": "Ipinapakita ang pangalan ng network para sa DEX faucet" + "message": "Kumuha ng DXN mula sa faucet para sa $1", + "description": "Ipinapakita ang pangalan ng network para sa DXN faucet" }, "greaterThanMin": { "message": "dapat mas malaki o katumbas ng $1.", @@ -320,7 +320,7 @@ "message": "Itago ang Token?" }, "howToDeposit": { - "message": "Paano mo gustong mag-deposito ng DEX?" + "message": "Paano mo gustong mag-deposito ng DXN?" }, "import": { "message": "I-import", @@ -396,7 +396,7 @@ "message": "Aking mga Account" }, "needEtherInWallet": { - "message": "Upang makipag-ugnayan sa decentralized applications gamit ang DekuSan, kakailanganin mo ng DEX sa iyong wallet." + "message": "Upang makipag-ugnayan sa decentralized applications gamit ang DekuSan, kakailanganin mo ng DXN sa iyong wallet." }, "needImportFile": { "message": "Dapat kang pumili ng file para i-import.", diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json index 59a79a61..6ae6e9a6 100644 --- a/app/_locales/pl/messages.json +++ b/app/_locales/pl/messages.json @@ -75,7 +75,7 @@ "message": "Pożycz z Dharma (Beta)" }, "builtInCalifornia": { - "message": "MetaMask został zaprojektowany i stworzony w Kaliforni." + "message": "DekuSan został zaprojektowany i stworzony w Kaliforni." }, "buy": { "message": "Kup" @@ -190,7 +190,7 @@ "message": "Domyślna sieć dla Eteru to Main Net." }, "denExplainer": { - "message": "Twój DEN to chroniony hasłem schowek w MetaMasku." + "message": "Twój DEN to chroniony hasłem schowek w DekuSanu." }, "deposit": { "message": "Zdeponuj" @@ -202,8 +202,8 @@ "message": "Zdeponuj $1 na poniższy adres", "description": "Pokazuje użytkownikowi jakie waluty wybrał do zdeponowania w ShapeShift" }, - "depositDEX": { - "message": "Zdeponuj DEX" + "depositDXN": { + "message": "Zdeponuj DXN" }, "depositFiat": { "message": "Zdeponuj w Fiat" @@ -215,7 +215,7 @@ "message": "Zdeponuj przez ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Jeśli posiadasz inne kryptowaluty, możesz nimi handlować i deponować Eter bezpośrednio do swojego portfela MetaMask. Nie trzeba żadnego konta." + "message": "Jeśli posiadasz inne kryptowaluty, możesz nimi handlować i deponować Eter bezpośrednio do swojego portfela DekuSan. Nie trzeba żadnego konta." }, "details": { "message": "Szczegóły" @@ -369,7 +369,7 @@ "message": "Importuj konto" }, "importAccountMsg": { - "message": " Importowane konta nie będą powiązane z Twoją pierwotną frazą seed MetaMask. Dowiedz się więcej o importowaniu kont " + "message": " Importowane konta nie będą powiązane z Twoją pierwotną frazą seed DekuSan. Dowiedz się więcej o importowaniu kont " }, "importAnAccount": { "message": "Importuj konto" @@ -416,7 +416,7 @@ "description": "formatuj do importowania konta" }, "keepTrackTokens": { - "message": "Monitoruj stan tokenów kupionych przy pomocy konta MetaMask." + "message": "Monitoruj stan tokenów kupionych przy pomocy konta DekuSan." }, "kovan": { "message": "Sieć testowa Kovan" @@ -471,7 +471,7 @@ "message": "Wiadomość" }, "dekusanDescription": { - "message": "MetaMask to bezpieczny portfel dla DEXON." + "message": "DekuSan to bezpieczny portfel dla DEXON." }, "min": { "message": "Minimum" @@ -483,7 +483,7 @@ "message": "Należy wybrać co najmniej 1 token." }, "needDexInWallet": { - "message": "Żeby skorzystać ze zdecentraliowanych aplikacji (dApps) przy pomocy MetaMask, potrzebujesz Eteru w swoim portfelu." + "message": "Żeby skorzystać ze zdecentraliowanych aplikacji (dApps) przy pomocy DekuSan, potrzebujesz Eteru w swoim portfelu." }, "needImportFile": { "message": "Musisz wybrać plik do zaimportowania.", @@ -494,7 +494,7 @@ "description": "Hasło i plik niezbędne do zaimportowania konta" }, "negativeDex": { - "message": "Nie można wysłać ujemnych ilości DEX." + "message": "Nie można wysłać ujemnych ilości DXN." }, "networks": { "message": "Sieci" @@ -708,14 +708,14 @@ "send": { "message": "Wyślij" }, - "sendDEX": { - "message": "Wyślij DEX" + "sendDXN": { + "message": "Wyślij DXN" }, "sendTokens": { "message": "Wyślij tokeny" }, "onlySendToDexonAddress": { - "message": "Na adres DEXON wysyłaj tylko DEX." + "message": "Na adres DEXON wysyłaj tylko DXN." }, "searchTokens": { "message": "Szukaj tokenów" @@ -790,7 +790,7 @@ "message": "Regulamin" }, "testFaucet": { - "message": "Źródło testowego DEX" + "message": "Źródło testowego DXN" }, "testnet": { "message": "" @@ -799,7 +799,7 @@ "message": "Do" }, "toDEXviaShapeShift": { - "message": "$1 na DEX przez ShapeShift", + "message": "$1 na DXN przez ShapeShift", "description": "system uzupełni typ depozytu na początku wiadomości" }, "tokenAddress": { @@ -818,7 +818,7 @@ "message": "Symbol tokena" }, "tokenWarning1": { - "message": "Monitoruj stan tokenów kupionych przy pomocy konta MetaMask. Jeśli masz tokeny kupione przy pomocy innych kont, nie pojawią się tutaj." + "message": "Monitoruj stan tokenów kupionych przy pomocy konta DekuSan. Jeśli masz tokeny kupione przy pomocy innych kont, nie pojawią się tutaj." }, "total": { "message": "Suma" @@ -843,7 +843,7 @@ "description": "Z linkiem (tutaj) do informacji o stanie tokenów" }, "twelveWords": { - "message": "Tych 12 słów to jedyny sposób, żeby odzyskać konta w MetaMasku. Zapisz je w bezpiecznym miejscu." + "message": "Tych 12 słów to jedyny sposób, żeby odzyskać konta w DekuSanu. Zapisz je w bezpiecznym miejscu." }, "typePassword": { "message": "Wpisz hasło" @@ -852,7 +852,7 @@ "message": "Witamy w nowym interfejsie (Beta)" }, "uiWelcomeMessage": { - "message": "Używasz teraz nowego interfejsu MetaMask." + "message": "Używasz teraz nowego interfejsu DekuSan." }, "unapproved": { "message": "Niezatwierdzone" @@ -898,7 +898,7 @@ "message": "Uwaga" }, "welcomeBeta": { - "message": "Witaj w MetaMask Beta" + "message": "Witaj w DekuSan Beta" }, "whatsThis": { "message": "Co to jest?" @@ -928,7 +928,7 @@ "message": "Dodaj sugerowane tokeny." }, "addAcquiredTokens": { - "message": "Dodaj tokeny pozyskane przy pomocy MetaMask" + "message": "Dodaj tokeny pozyskane przy pomocy DekuSan" }, "approve": { "message": "Zatwierdź" @@ -961,7 +961,7 @@ "message": "Zamknij" }, "chromeRequiredForHardwareWallets": { - "message": "Żeby połączyć się z portfelem sprzętowym, należy uruchomić MetaMask z przeglądarką Google Chrome." + "message": "Żeby połączyć się z portfelem sprzętowym, należy uruchomić DekuSan z przeglądarką Google Chrome." }, "connectHardwareWallet": { "message": "Podłącz portfel sprzętowy" @@ -1030,7 +1030,7 @@ "message": "Podłącz sprzętowy portfel" }, "hardwareWalletsMsg": { - "message": "Wybierz portfel sprzętowy, którego chcesz użyć z MetaMaskiem" + "message": "Wybierz portfel sprzętowy, którego chcesz użyć z DekuSaniem" }, "havingTroubleConnecting": { "message": "Problem z połączeniem?" @@ -1057,7 +1057,7 @@ "message": "Menu" }, "dekusanSeedWords": { - "message": "Słowa Seed MetaMask" + "message": "Słowa Seed DekuSan" }, "dekusanVersion": { "message": "" @@ -1196,7 +1196,7 @@ "message": "Wybierz konto" }, "selectAnAccountHelp": { - "message": "Wybierz konto do przeglądania w MetaMask" + "message": "Wybierz konto do przeglądania w DekuSan" }, "selectHdPath": { "message": "Wybierz ścieżkę HD" @@ -1238,7 +1238,7 @@ "message": "3. Zacznij używać dystrybuowanych aplikacji (dApps) i wiele więcej!" }, "step3HardwareWalletMsg": { - "message": "Używaj swojego konta sprzętowego tak, jak używasz jakiegokolwiek konta z DEXON. Loguj się do dystrybuowanych aplikacji (dApps), wysyłaj DEX, kupuj i przechowaj tokeny ERC20 i niewymienne tokeny, jak np. CryptoKitties." + "message": "Używaj swojego konta sprzętowego tak, jak używasz jakiegokolwiek konta z DEXON. Loguj się do dystrybuowanych aplikacji (dApps), wysyłaj DXN, kupuj i przechowaj tokeny ERC20 i niewymienne tokeny, jak np. CryptoKitties." }, "token": { "message": "Token" @@ -1433,13 +1433,13 @@ "holdEther": { "message": "" }, - "metamaskDescription": { + "DekuSanDescription": { "message": "" }, - "metamaskSeedWords": { + "DekuSanSeedWords": { "message": "" }, - "metamaskVersion": { + "DekuSanVersion": { "message": "" }, "minutesShorthand": { diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index ef90e972..35b40f80 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -187,7 +187,7 @@ "message": "Precisão em Decimais" }, "defaultNetwork": { - "message": "A rede pré definida para transações em DEX é a Main Net." + "message": "A rede pré definida para transações em DXN é a Main Net." }, "denExplainer": { "message": " DEN é o armazenamento encriptado da sua palavra-passe no DekuSan." @@ -202,8 +202,8 @@ "message": "Deposite $1 no endereço abaixo", "description": "Diz ao usuário que moeda selecionou para depositar com shapeshift" }, - "depositDEX": { - "message": "Depositar DEX" + "depositDXN": { + "message": "Depositar DXN" }, "depositFiat": { "message": "Depositar moeda fiduciária" @@ -215,7 +215,7 @@ "message": "Depositar com ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Se tem criptomoedas, pode trocar e depositar DEX diretamente na sua carteira DekuSan. Não precisa de conta." + "message": "Se tem criptomoedas, pode trocar e depositar DXN diretamente na sua carteira DekuSan. Não precisa de conta." }, "details": { "message": "Detalhes" @@ -224,10 +224,10 @@ "message": "Depósito Direto" }, "directDepositDex": { - "message": "Depositar Diretamente DEX" + "message": "Depositar Diretamente DXN" }, "directDepositDexExplainer": { - "message": "Se já tem DEX, a forma mais rápida de ficar com DEX na sua carteira é através de depósito direto." + "message": "Se já tem DXN, a forma mais rápida de ficar com DXN na sua carteira é através de depósito direto." }, "done": { "message": "Finalizado" @@ -329,11 +329,11 @@ "message": "Preço Gas Necessário" }, "getDex": { - "message": "Obter DEX" + "message": "Obter DXN" }, "getDexFromFaucet": { - "message": "Obter DEX de um faucet por $1", - "description": "Mostra nome da rede para faucet de DEX" + "message": "Obter DXN de um faucet por $1", + "description": "Mostra nome da rede para faucet de DXN" }, "greaterThanMin": { "message": "tem de ser maior ou igual a $1.", @@ -356,7 +356,7 @@ "message": "Ocultar Token?" }, "howToDeposit": { - "message": "Como gostaria de depositar DEX?" + "message": "Como gostaria de depositar DXN?" }, "holdDex": { "message": "Permite ter dexon & tokens, e serve como uma ponte para aplicações descentralizadas." @@ -471,7 +471,7 @@ "message": "Mensagem" }, "dekusanDescription": { - "message": "O DekuSan é um lugar seguro para guardar a sua identidade em em Dexon." + "message": "O DekuSan é um lugar seguro para guardar a sua identidade em em DEXON." }, "min": { "message": "Mínimo" @@ -483,7 +483,7 @@ "message": "Deve escolher no mínimo 1 token." }, "needDexInWallet": { - "message": "Para interagir com applicações descentralizadas usando DekuSan tem de ter DEX na sua carteira." + "message": "Para interagir com applicações descentralizadas usando DekuSan tem de ter DXN na sua carteira." }, "needImportFile": { "message": "Deve selecionar um ficheiro para importar.", @@ -494,7 +494,7 @@ "description": "Palavra-passe e ficheiro necessários para importar uma conta" }, "negativeDex": { - "message": "Não é possível enviar valores negativos de DEX." + "message": "Não é possível enviar valores negativos de DXN." }, "networks": { "message": "Redes" @@ -708,8 +708,8 @@ "send": { "message": "Enviar" }, - "sendDEX": { - "message": "Enviar DEX" + "sendDXN": { + "message": "Enviar DXN" }, "sendTokens": { "message": "Enviar Tokens" @@ -799,7 +799,7 @@ "message": "Para" }, "toDEXviaShapeShift": { - "message": "$1 para DEX via ShapeShift", + "message": "$1 para DXN via ShapeShift", "description": "o sistema irá preencher o tipo de depósito no início da mensagem" }, "tokenAddress": { @@ -1540,6 +1540,6 @@ "message": "" }, "welcome": { - "message": "Bem-vindo ao MetaMask" + "message": "Bem-vindo ao DekuSan" } }
\ No newline at end of file diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index bd3abcc1..a9e8c86c 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -187,7 +187,7 @@ "message": "Количество десятичных разрядов" }, "defaultNetwork": { - "message": "Основная сеть DEXON – это сеть по умолчанию для DEX транзакций." + "message": "Основная сеть DEXON – это сеть по умолчанию для DXN транзакций." }, "denExplainer": { "message": "DEN – это зашифрованное паролем хранилище внутри DekuSan." @@ -202,8 +202,8 @@ "message": "Отправьте ваш $1 на адрес ниже", "description": "Tells the user what coin they have selected to deposit with shapeshift" }, - "depositDEX": { - "message": "Пополнить DEX" + "depositDXN": { + "message": "Пополнить DXN" }, "depositFiat": { "message": "Пополнить деньгами" @@ -215,7 +215,7 @@ "message": "Пополнить через ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Если у вас есть другие криптовалюты, вы можете торговать и пополнять DEX напрямую в ваш DekuSan кошелек. Нет необходимости в счете." + "message": "Если у вас есть другие криптовалюты, вы можете торговать и пополнять DXN напрямую в ваш DekuSan кошелек. Нет необходимости в счете." }, "details": { "message": "Детали" @@ -224,10 +224,10 @@ "message": "Прямое пополнение" }, "directDepositDex": { - "message": "Прямое пополнение DEX" + "message": "Прямое пополнение DXN" }, "directDepositDexExplainer": { - "message": "Если у вас уже есть DEX, то самый быстрый способ получить DEX в ваш новый кошелек – это прямое пополнение." + "message": "Если у вас уже есть DXN, то самый быстрый способ получить DXN в ваш новый кошелек – это прямое пополнение." }, "done": { "message": "Готово" @@ -329,11 +329,11 @@ "message": "Установите стоимость газа" }, "getDex": { - "message": "Получить DEX" + "message": "Получить DXN" }, "getDexFromFaucet": { - "message": "Получить DEX из крана для $1", - "description": "Displays network name for DEX faucet" + "message": "Получить DXN из крана для $1", + "description": "Displays network name for DXN faucet" }, "greaterThanMin": { "message": "должно быть больше или равно $1.", @@ -356,7 +356,7 @@ "message": "Скрыть токен?" }, "howToDeposit": { - "message": "Как бы вы хотели пополнить DEX?" + "message": "Как бы вы хотели пополнить DXN?" }, "holdDex": { "message": "Позволяет вам хранить dexon и токены и служит в качестве моста в децентрализированные приложения." @@ -471,7 +471,7 @@ "message": "Сообщение" }, "dekusanDescription": { - "message": "DekuSan – безопасный кошелек для Dexon." + "message": "DekuSan – безопасный кошелек для DEXON." }, "min": { "message": "Минимум" @@ -483,7 +483,7 @@ "message": "Необходимо выбрать как минимум 1 токен." }, "needDexInWallet": { - "message": "Для взаимодействия с децентрализованными приложениями с помощью DekuSan нужен DEX в вашем кошельке." + "message": "Для взаимодействия с децентрализованными приложениями с помощью DekuSan нужен DXN в вашем кошельке." }, "needImportFile": { "message": "Вы должны выбрать файл для импорта.", @@ -494,7 +494,7 @@ "description": "Password and file needed to import an account" }, "negativeDex": { - "message": "Невозможно отправить отрицательную сумму DEX." + "message": "Невозможно отправить отрицательную сумму DXN." }, "networks": { "message": "Сети" @@ -708,14 +708,14 @@ "send": { "message": "Отправить" }, - "sendDEX": { - "message": "Отправить DEX" + "sendDXN": { + "message": "Отправить DXN" }, "sendTokens": { "message": "Отправить токены" }, "onlySendToDexonAddress": { - "message": "Отправляйте DEX только на DEXON адреса." + "message": "Отправляйте DXN только на DEXON адреса." }, "searchTokens": { "message": "Поиск токенов" @@ -799,7 +799,7 @@ "message": "Получатель" }, "toDEXviaShapeShift": { - "message": "$1 в DEX через ShapeShift", + "message": "$1 в DXN через ShapeShift", "description": "system will fill in deposit type in start of message" }, "tokenAddress": { @@ -1540,6 +1540,6 @@ "message": "" }, "welcome": { - "message": "Добро пожаловать в MetaMask" + "message": "Добро пожаловать в DekuSan" } }
\ No newline at end of file diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json index f85d60d0..ae8b70b9 100644 --- a/app/_locales/sk/messages.json +++ b/app/_locales/sk/messages.json @@ -79,7 +79,7 @@ "description": "The description of the application" }, "appName": { - "message": "MetaMask", + "message": "DekuSan", "description": "The name of the application" }, "approved": { @@ -120,7 +120,7 @@ "message": "Pújčit si přes Dharma (Beta)" }, "builtInCalifornia": { - "message": "MetaMask je navržen a vytvořen v Kalifornii." + "message": "DekuSan je navržen a vytvořen v Kalifornii." }, "buy": { "message": "Koupit" @@ -235,7 +235,7 @@ "message": "Výchozí síť pro Etherové transakce je Main Net." }, "denExplainer": { - "message": "Váš DEN je heslem šifrované uložiště v MetaMasku." + "message": "Váš DEN je heslem šifrované uložiště v DekuSanu." }, "deposit": { "message": "Vklad" @@ -263,7 +263,7 @@ "message": "Vklad přes ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Pokud vlastníte jiné kryptoměny, můžete je směnit Ether a vložit ho přímo do peněženky MetaMask. Bez založení účtu." + "message": "Pokud vlastníte jiné kryptoměny, můžete je směnit Ether a vložit ho přímo do peněženky DekuSan. Bez založení účtu." }, "details": { "message": "Podrobnosti" @@ -417,7 +417,7 @@ "message": "Import účtu" }, "importAccountMsg": { - "message": "Importované účty nebudou spojeny s vaší původní MetaMaskovou klíčovou frází. Zjistěte více o importovaných účtech " + "message": "Importované účty nebudou spojeny s vaší původní DekuSanovou klíčovou frází. Zjistěte více o importovaných účtech " }, "importAnAccount": { "message": "Import účtu" @@ -464,7 +464,7 @@ "description": "format for importing an account" }, "keepTrackTokens": { - "message": "Udržujte si záznamy o tokenech, které jste koupili s účtem v MetaMasku." + "message": "Udržujte si záznamy o tokenech, které jste koupili s účtem v DekuSanu." }, "kovan": { "message": "Kovan Test Network" @@ -518,8 +518,8 @@ "message": { "message": "Zpráva" }, - "metamaskDescription": { - "message": "MetaMask je bezpečný osobní trezor pro DEXON." + "DekuSanDescription": { + "message": "DekuSan je bezpečný osobní trezor pro DEXON." }, "min": { "message": "Minimum" @@ -531,7 +531,7 @@ "message": "Musíte zvolit aspoň 1 token." }, "needEtherInWallet": { - "message": "Potřebujete Ether v peněžence, abyste mohli pomocí MetaMasku interagovat s decentralizovanými aplikacemi." + "message": "Potřebujete Ether v peněžence, abyste mohli pomocí DekuSanu interagovat s decentralizovanými aplikacemi." }, "needImportFile": { "message": "Musíte zvolit soubor k importu.", @@ -863,7 +863,7 @@ "message": "Symbol tokenu" }, "tokenWarning1": { - "message": "Mějte přehled o tokenech, které jste koupili s účtem MetaMasku. Pokud jste koupili tokeny s jiným účtem, tyto tokeny se zde nezobrazí." + "message": "Mějte přehled o tokenech, které jste koupili s účtem DekuSanu. Pokud jste koupili tokeny s jiným účtem, tyto tokeny se zde nezobrazí." }, "total": { "message": "Celkem" @@ -888,7 +888,7 @@ "description": "Followed by a link (here) to view token balances" }, "twelveWords": { - "message": "Těchto 12 slov je jedinou možností, jak obnovit MetaMask účet. \nUložte je na bezpečné a neveřejné místo." + "message": "Těchto 12 slov je jedinou možností, jak obnovit DekuSan účet. \nUložte je na bezpečné a neveřejné místo." }, "typePassword": { "message": "Zadejte své heslo" @@ -897,7 +897,7 @@ "message": "Vítejte v novém rozhraní (Beta)" }, "uiWelcomeMessage": { - "message": "Používáte nyní nové rozhraní MetaMasku. Rozhlédněte se kolem, vyzkoušejte nové funkce, jako jsou zasílání tokenů, a dejte nám vědět, pokud narazíte na problém." + "message": "Používáte nyní nové rozhraní DekuSanu. Rozhlédněte se kolem, vyzkoušejte nové funkce, jako jsou zasílání tokenů, a dejte nám vědět, pokud narazíte na problém." }, "unapproved": { "message": "Neschváleno" @@ -943,7 +943,7 @@ "message": "Varování" }, "welcomeBeta": { - "message": "Vítejte v MetaMask Beta" + "message": "Vítejte v DekuSan Beta" }, "whatsThis": { "message": "Co to je?" diff --git a/app/_locales/sl_SI/messages.json b/app/_locales/sl_SI/messages.json index e95a3f76..f7bfe1ee 100644 --- a/app/_locales/sl_SI/messages.json +++ b/app/_locales/sl_SI/messages.json @@ -202,7 +202,7 @@ "message": "Vplačajte $1 na spodnji naslov", "description": "Tells the user what coin they have selected to deposit with shapeshift" }, - "depositDEX": { + "depositDXN": { "message": "Vplačilo dexona" }, "depositFiat": { @@ -333,7 +333,7 @@ }, "getDexFromFaucet": { "message": "Pridobite dexon iz fauceta za $1", - "description": "Displays network name for DEX faucet" + "description": "Displays network name for DXN faucet" }, "greaterThanMin": { "message": "mora biti višji ali enak $1.", @@ -471,7 +471,7 @@ "message": "Sporočilo" }, "dekusanDescription": { - "message": "DekuSan je varen identitetni sklad za Dexon." + "message": "DekuSan je varen identitetni sklad za DEXON." }, "min": { "message": "Najmanj" @@ -494,7 +494,7 @@ "description": "Password and file needed to import an account" }, "negativeDex": { - "message": "Ni mogoče poslati negativne vsote DEX." + "message": "Ni mogoče poslati negativne vsote DXN." }, "networks": { "message": "Omrežja" @@ -708,8 +708,8 @@ "send": { "message": "Pošlji" }, - "sendDEX": { - "message": "Pošlji DEX" + "sendDXN": { + "message": "Pošlji DXN" }, "sendTokens": { "message": "Pošlji žetone" @@ -799,7 +799,7 @@ "message": "Za" }, "toDEXviaShapeShift": { - "message": "$1 v DEX prek ShapeShift", + "message": "$1 v DXN prek ShapeShift", "description": "system will fill in deposit type in start of message" }, "tokenAddress": { @@ -1409,7 +1409,7 @@ "message": "ETH" }, "etherscanView": { - "message": "Poglejte račun na DEXscan" + "message": "Poglejte račun na DEXSCAN" }, "fast": { "message": "" diff --git a/app/_locales/ta/messages.json b/app/_locales/ta/messages.json index 547dda62..a4799e48 100644 --- a/app/_locales/ta/messages.json +++ b/app/_locales/ta/messages.json @@ -202,7 +202,7 @@ "message": "உங்கள் முகவரிக்கு $ 1 ஐ கீழே உள்ளிடவும்", "description": "சேபஷிபிட் உடன் வைப்புக்குத் தேர்ந்தெடுக்கப்பட்ட நாணயத்தை பயனரிடம் கூறுகிறார்" }, - "depositDEX": { + "depositDXN": { "message": "வைப்புத்தொகை எதிர் " }, "depositFiat": { @@ -494,7 +494,7 @@ "description": "ஒரு கணக்கை இறக்குமதி செய்ய கடவுச்சொல் மற்றும் கோப்பு தேவை" }, "negativeDex": { - "message": "DEX எதிர்மறை அளவுகளை அனுப்ப முடியாது." + "message": "DXN எதிர்மறை அளவுகளை அனுப்ப முடியாது." }, "networks": { "message": "நெட்வொர்க்ஸ்" @@ -708,14 +708,14 @@ "send": { "message": "அனுப்பு" }, - "sendDEX": { - "message": "DEX ஐ அனுப்பு" + "sendDXN": { + "message": "DXN ஐ அனுப்பு" }, "sendTokens": { "message": "டோக்கன்களை அனுப்பவும்" }, "onlySendToDexonAddress": { - "message": "DEX ஐ ஒரு எதரியும் முகவரிக்கு மட்டும் அனுப்பவும்." + "message": "DXN ஐ ஒரு எதரியும் முகவரிக்கு மட்டும் அனுப்பவும்." }, "searchTokens": { "message": "தேடல் டோக்கன்ஸ்" @@ -799,7 +799,7 @@ "message": "பெறுநர்" }, "toDEXviaShapeShift": { - "message": "$ 1 முதல் DEX வரை வடிவம்", + "message": "$ 1 முதல் DXN வரை வடிவம்", "description": "செய்தி தொடக்கத்தில் வைப்பு வகைகளில் நிரப்பப்படும்" }, "tokenAddress": { diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json index 45f87c37..a6a8187e 100644 --- a/app/_locales/th/messages.json +++ b/app/_locales/th/messages.json @@ -202,7 +202,7 @@ "message": "ฝาก $1 ของคุณไปที่แอดเดรสด้านล่างนี้:", "description": "Tells the user what coin they have selected to deposit with shapeshift" }, - "depositDEX": { + "depositDXN": { "message": "การฝากอีเธอร์" }, "depositFiat": { @@ -333,7 +333,7 @@ }, "getDexFromFaucet": { "message": "รับอีเธอร์ที่ปล่อยจาก $1", - "description": "Displays network name for DEX faucet" + "description": "Displays network name for DXN faucet" }, "greaterThanMin": { "message": "ต้องมากกว่าหรือเท่ากับ $1.", @@ -708,7 +708,7 @@ "send": { "message": "ส่ง" }, - "sendDEX": { + "sendDXN": { "message": "ส่งอีเธอร์" }, "sendTokens": { @@ -1540,6 +1540,6 @@ "message": "" }, "welcome": { - "message": "ยินดีต้อนรับสู่ MetaMask เบต้า" + "message": "ยินดีต้อนรับสู่ DekuSan เบต้า" } }
\ No newline at end of file diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index dd75ff61..e6652c04 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -202,7 +202,7 @@ "message": "$1'nızı aşağıdaki adrese yatırın", "description": "Kullanıcıya hangi jetonu seçtiyse onu yatırmasını shapeshift ile söyler." }, - "depositDEX": { + "depositDXN": { "message": "DEXON yatır" }, "depositFiat": { @@ -215,7 +215,7 @@ "message": "ShapeShift ile yatır" }, "depositShapeShiftExplainer": { - "message": "Eğer başka kripto paralara sahipseniz, DekuSan cüzdanınıza direk olarak DEX yatırabilirsiniz. Hesaba gerek yoktur." + "message": "Eğer başka kripto paralara sahipseniz, DekuSan cüzdanınıza direk olarak DXN yatırabilirsiniz. Hesaba gerek yoktur." }, "details": { "message": "Ayrıntılar" @@ -224,10 +224,10 @@ "message": "Direk Yatırma" }, "directDepositDex": { - "message": "Direk DEX Yatırma" + "message": "Direk DXN Yatırma" }, "directDepositDexExplainer": { - "message": "Eğer çoktan DEXiniz varsa, yeni hesabınıza DEX aktarmanın en kolay yolu direk yatırmadır." + "message": "Eğer çoktan DEXiniz varsa, yeni hesabınıza DXN aktarmanın en kolay yolu direk yatırmadır." }, "done": { "message": "Bitti" @@ -332,7 +332,7 @@ "message": "DEXON Al" }, "getDexFromFaucet": { - "message": "Musluktan $1 karşılığı DEX alın", + "message": "Musluktan $1 karşılığı DXN alın", "description": "DEXON musluğunun ağ ismini gösterir" }, "greaterThanMin": { @@ -483,7 +483,7 @@ "message": "En az bir jeton seçilmeli" }, "needDexInWallet": { - "message": "DekuSan kullanarak merkezi olamayan uygulamalarla etkileşmek için cüzdanınızda DEX bulunmalıdır." + "message": "DekuSan kullanarak merkezi olamayan uygulamalarla etkileşmek için cüzdanınızda DXN bulunmalıdır." }, "needImportFile": { "message": "Almak için bir dosya seçmelisiniz.", @@ -494,7 +494,7 @@ "description": "Hesap almak için parola ve dosya gerekiyor." }, "negativeDex": { - "message": "Negatif DEX miktarları gönderilemez." + "message": "Negatif DXN miktarları gönderilemez." }, "networks": { "message": "Ağlar" @@ -708,14 +708,14 @@ "send": { "message": "Gönder" }, - "sendDEX": { - "message": "DEX Gönder" + "sendDXN": { + "message": "DXN Gönder" }, "sendTokens": { "message": "Jeton Gönder" }, "onlySendToDexonAddress": { - "message": "DEXON adresine sadece DEX gönder." + "message": "DEXON adresine sadece DXN gönder." }, "searchTokens": { "message": "Jeton ara" @@ -799,7 +799,7 @@ "message": "Kime" }, "toDEXviaShapeShift": { - "message": "ShapeShift üstünden $1'dan DEX'e", + "message": "ShapeShift üstünden $1'dan DXN'e", "description": "system will fill in deposit type in start of message" }, "tokenAddress": { diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index 2d470634..62130592 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -187,7 +187,7 @@ "message": "" }, "defaultNetwork": { - "message": "Mạng lưới mặc định dùng cho các giao dịch DEX là Main Net (tiền DEX thật)." + "message": "Mạng lưới mặc định dùng cho các giao dịch DXN là Main Net (tiền DXN thật)." }, "denExplainer": { "message": "Số DEN của bạn là mật khẩu đã được mã hóa và lưu trữ trong DekuSan" @@ -202,8 +202,8 @@ "message": "Ký gửi $1 đến địa chỉ sau:", "description": "Báo cho người dùng biết đồng tiền nào họ đã chọn để ký gửi với ShapeShift" }, - "depositDEX": { - "message": "Ký gửi DEX" + "depositDXN": { + "message": "Ký gửi DXN" }, "depositFiat": { "message": "Ký gửi bằng tiền Fiat (USD, GBP, ...)" @@ -215,7 +215,7 @@ "message": "Ký gửi với ShapeShift" }, "depositShapeShiftExplainer": { - "message": "Nếu bạn sở hữu các đồng tiền điện tử khác, bạn có thể giao dịch và ký gửi DEX trực tiếp vào ví DekuSan của bạn. Không cần tạo thêm tài khoản." + "message": "Nếu bạn sở hữu các đồng tiền điện tử khác, bạn có thể giao dịch và ký gửi DXN trực tiếp vào ví DekuSan của bạn. Không cần tạo thêm tài khoản." }, "details": { "message": "Chi tiết" @@ -224,10 +224,10 @@ "message": "Ký gửi trực tiếp" }, "directDepositDex": { - "message": "Ký gửi DEX trực tiếp" + "message": "Ký gửi DXN trực tiếp" }, "directDepositDexExplainer": { - "message": "Nếu bạn đã có sẵn vài DEX, cách nhanh nhất để thêm DEX vào ví tiền mới của bạn là bằng ký gửi trực tiếp." + "message": "Nếu bạn đã có sẵn vài DXN, cách nhanh nhất để thêm DXN vào ví tiền mới của bạn là bằng ký gửi trực tiếp." }, "done": { "message": "Hoàn tất" @@ -329,11 +329,11 @@ "message": "Giá ga được yêu cầu" }, "getDex": { - "message": "Lấy DEX" + "message": "Lấy DXN" }, "getDexFromFaucet": { - "message": "Lấy DEX từ vòi với giá $1", - "description": "Hiển thị tên mạng cho vòi DEX" + "message": "Lấy DXN từ vòi với giá $1", + "description": "Hiển thị tên mạng cho vòi DXN" }, "greaterThanMin": { "message": "phải nhiều hơn hoặc bằng $1", @@ -356,7 +356,7 @@ "message": "Ẩn mã token?" }, "howToDeposit": { - "message": "Bạn muốn ký gửi DEX bằng cách nào?" + "message": "Bạn muốn ký gửi DXN bằng cách nào?" }, "holdDex": { "message": "" @@ -465,7 +465,7 @@ "message": "" }, "mainnet": { - "message": "Mạng DEXON MainNet (tiền DEX thật)" + "message": "Mạng DEXON MainNet (tiền DXN thật)" }, "message": { "message": "Tin nhắn" @@ -483,7 +483,7 @@ "message": "" }, "needDexInWallet": { - "message": "Để tương tác với các ứng dụng phân tán bằng DekuSan, bạn sẽ phải cần có DEX trong ví của bạn." + "message": "Để tương tác với các ứng dụng phân tán bằng DekuSan, bạn sẽ phải cần có DXN trong ví của bạn." }, "needImportFile": { "message": "Bạn phải chọn một tập tin để nhập.", @@ -708,7 +708,7 @@ "send": { "message": "Gửi" }, - "sendDEX": { + "sendDXN": { "message": "" }, "sendTokens": { @@ -790,7 +790,7 @@ "message": "" }, "testFaucet": { - "message": "Vòi nhận tiền DEX ảo để thử nghiệm" + "message": "Vòi nhận tiền DXN ảo để thử nghiệm" }, "testnet": { "message": "" @@ -799,7 +799,7 @@ "message": "Đến" }, "toDEXviaShapeShift": { - "message": "$1 thành DEX qua ShapeShift", + "message": "$1 thành DXN qua ShapeShift", "description": "hệ thống sẽ điền vào loại tiền gửi khi bắt đầu tin nhắn" }, "tokenAddress": { diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 4d4dcee0..fa2233b2 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -202,8 +202,8 @@ "message": "将你的 $1 存入到下面的地址", "description": "Tells the user what coin they have selected to deposit with shapeshift" }, - "depositDEX": { - "message": "存入 DEX" + "depositDXN": { + "message": "存入 DXN" }, "depositFiat": { "message": "从 Fiat 存入" @@ -215,7 +215,7 @@ "message": "从 ShapeShift 存入" }, "depositShapeShiftExplainer": { - "message": "如果你拥有其他加密货币，你可以直接交易并存入 DEX 到你的 DekuSan 钱包。 不需要帐户。" + "message": "如果你拥有其他加密货币，你可以直接交易并存入 DXN 到你的 DekuSan 钱包。 不需要帐户。" }, "details": { "message": "详情" @@ -224,10 +224,10 @@ "message": "直接存入" }, "directDepositDex": { - "message": "直接存入 DEX" + "message": "直接存入 DXN" }, "directDepositDexExplainer": { - "message": "如果你已经有了一些 DEX，通过直接转入是你的新钱包获取 DEX 的最快捷方式。" + "message": "如果你已经有了一些 DEX，通过直接转入是你的新钱包获取 DXN 的最快捷方式。" }, "done": { "message": "完成" @@ -329,11 +329,11 @@ "message": "Gas Price 必填" }, "getDex": { - "message": "获取 DEX" + "message": "获取 DXN" }, "getDexFromFaucet": { - "message": "从水管获取$1网络的 DEX", - "description": "Displays network name for DEX faucet" + "message": "从水管获取$1网络的 DXN", + "description": "Displays network name for DXN faucet" }, "greaterThanMin": { "message": "必须要大于等于 $1。", @@ -471,7 +471,7 @@ "message": "消息" }, "dekusanDescription": { - "message": "DekuSan is a secure identity vault for Dexon." + "message": "DekuSan is a secure identity vault for DEXON." }, "min": { "message": "最小" @@ -494,7 +494,7 @@ "description": "Password and file needed to import an account" }, "negativeDex": { - "message": "Can not send negative amounts of DEX." + "message": "Can not send negative amounts of DXN." }, "networks": { "message": "网络" @@ -708,14 +708,14 @@ "send": { "message": "发送" }, - "sendDEX": { - "message": "发送 DEX" + "sendDXN": { + "message": "发送 DXN" }, "sendTokens": { "message": "发送 代币" }, "onlySendToDexonAddress": { - "message": "只发送 DEX 给一个DEXON地址" + "message": "只发送 DXN 给一个DEXON地址" }, "searchTokens": { "message": "搜索代币" @@ -799,7 +799,7 @@ "message": "至" }, "toDEXviaShapeShift": { - "message": "$1 DEX 通过 ShapeShift", + "message": "$1 DXN 通过 ShapeShift", "description": "system will fill in deposit type in start of message" }, "tokenAddress": { diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json index ea5a06bf..1ee82ef6 100644 --- a/app/_locales/zh_TW/messages.json +++ b/app/_locales/zh_TW/messages.json @@ -187,7 +187,7 @@ "message": "小數點精度" }, "defaultNetwork": { - "message": "預設 DEX 交易網路為主網路（Main Net）。" + "message": "預設 DXN 交易網路為主網路（Main Net）。" }, "denExplainer": { "message": "你的 DEN 是在你的 DekuSan 中的加密密碼儲存庫。" @@ -202,8 +202,8 @@ "message": "將你的 $1 存入到下面的地址", "description": "Tells the user what coin they have selected to deposit with shapeshift" }, - "depositDEX": { - "message": "存入 DEX" + "depositDXN": { + "message": "存入 DXN" }, "depositFiat": { "message": "從法定貨幣存入" @@ -215,7 +215,7 @@ "message": "從 ShapeShift 存入" }, "depositShapeShiftExplainer": { - "message": "如果你擁有其他加密貨幣，你可以直接交易並存入 DEX 到你的 DekuSan 錢包。不需要開帳戶。" + "message": "如果你擁有其他加密貨幣，你可以直接交易並存入 DXN 到你的 DekuSan 錢包。不需要開帳戶。" }, "details": { "message": "詳情" @@ -224,10 +224,10 @@ "message": "直接存入" }, "directDepositDex": { - "message": "直接存入 DEX" + "message": "直接存入 DXN" }, "directDepositDexExplainer": { - "message": "如果你已經擁有了一些 DEX，使用直接存入功能是讓你的新錢包最快取得 DEX 的方式。" + "message": "如果你已經擁有了一些 DEX，使用直接存入功能是讓你的新錢包最快取得 DXN 的方式。" }, "done": { "message": "完成" @@ -329,11 +329,11 @@ "message": "必需填寫 Gas 價格" }, "getDex": { - "message": "取得 DEX" + "message": "取得 DXN" }, "getDexFromFaucet": { - "message": "從水管取得$1 DEX", - "description": "Displays network name for DEX faucet" + "message": "從水管取得$1 DXN", + "description": "Displays network name for DXN faucet" }, "greaterThanMin": { "message": "必須要大於等於 $1。", @@ -708,14 +708,14 @@ "send": { "message": "發送" }, - "sendDEX": { - "message": "發送 DEX" + "sendDXN": { + "message": "發送 DXN" }, "sendTokens": { "message": "發送代幣" }, "onlySendToDexonAddress": { - "message": "只發送 DEX 到乙太坊地址." + "message": "只發送 DXN 到乙太坊地址." }, "searchTokens": { "message": "搜尋代幣" @@ -799,7 +799,7 @@ "message": "目的帳號" }, "toDEXviaShapeShift": { - "message": "$1 DEX 透過 ShapeShift", + "message": "$1 DXN 透過 ShapeShift", "description": "system will fill in deposit type in start of message" }, "tokenAddress": { diff --git a/app/manifest.json b/app/manifest.json index 634a159d..3d9967d1 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_appName__", "short_name": "__MSG_appName__", - "version": "1.2.0", + "version": "1.2.1", "manifest_version": 2, "author": "https://dexon.org", "description": "__MSG_appDescription__", diff --git a/app/scripts/controllers/currency.js b/app/scripts/controllers/currency.js index ebefe6ba..6ce86476 100644 --- a/app/scripts/controllers/currency.js +++ b/app/scripts/controllers/currency.js @@ -29,7 +29,7 @@ class CurrencyController { currentCurrency: 'usd', conversionRate: 0, conversionDate: 'N/A', - nativeCurrency: 'DEX', + nativeCurrency: 'DXN', }, opts.initState) this.store = new ObservableStore(initState) } @@ -135,7 +135,7 @@ class CurrencyController { nativeCurrency = this.getNativeCurrency() // select api let apiUrl - if (nativeCurrency === 'DEX') { + if (nativeCurrency === 'DXN') { // DEX apiUrl = `https://api.infura.io/v1/ticker/eth${currentCurrency.toLowerCase()}` } else { @@ -161,7 +161,7 @@ class CurrencyController { return } // set conversion rate - if (nativeCurrency === 'DEX') { + if (nativeCurrency === 'DXN') { // DEX this.setConversionRate(Number(parsedResponse.bid)) this.setConversionDate(Number(parsedResponse.timestamp)) diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js index 777dcb1f..f29f6d14 100644 --- a/app/scripts/controllers/network/network.js +++ b/app/scripts/controllers/network/network.js @@ -35,7 +35,7 @@ const defaultProviderConfig = { } const defaultNetworkConfig = { - ticker: 'DEX', + ticker: 'DXN', } module.exports = class NetworkController extends EventEmitter { @@ -123,7 +123,7 @@ module.exports = class NetworkController extends EventEmitter { }) } - setRpcTarget (rpcTarget, chainId, ticker = 'DEX', nickname = '') { + setRpcTarget (rpcTarget, chainId, ticker = 'DXN', nickname = '') { const providerConfig = { type: 'rpc', rpcTarget, @@ -186,7 +186,7 @@ module.exports = class NetworkController extends EventEmitter { this._setNetworkClient(networkClient) // setup networkConfig var settings = { - ticker: 'DEX', + ticker: 'DXN', } this.networkConfig.putState(settings) } @@ -210,7 +210,7 @@ module.exports = class NetworkController extends EventEmitter { networks.networkList['rpc'] = { chainId: chainId, rpcUrl, - ticker: ticker || 'DEX', + ticker: ticker || 'DXN', nickname, } // setup networkConfig diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js index 1ab62814..cb1b40c9 100644 --- a/app/scripts/controllers/preferences.js +++ b/app/scripts/controllers/preferences.js @@ -401,7 +401,7 @@ class PreferencesController { * @returns {Promise<array>} Promise resolving to updated frequentRpcList. * */ - addToFrequentRpcList (url, chainId, ticker = 'DEX', nickname = '') { + addToFrequentRpcList (url, chainId, ticker = 'DXN', nickname = '') { const rpcList = this.getFrequentRpcListDetail() const index = rpcList.findIndex((element) => { return element.rpcUrl === url }) if (index !== -1) { diff --git a/app/scripts/controllers/token-rates.js b/app/scripts/controllers/token-rates.js index 255f92b6..30efcbb2 100644 --- a/app/scripts/controllers/token-rates.js +++ b/app/scripts/controllers/token-rates.js @@ -28,7 +28,7 @@ class TokenRatesController { async updateExchangeRates () { if (!this.isActive) { return } const contractExchangeRates = {} - const nativeCurrency = this.currency ? this.currency.getState().nativeCurrency.toUpperCase() : 'DEX' + const nativeCurrency = this.currency ? this.currency.getState().nativeCurrency.toUpperCase() : 'DXN' const pairs = this._tokens.map(token => `pairs[]=${token.address}/${nativeCurrency}`) const query = pairs.join('&') if (this._tokens.length > 0) { @@ -40,7 +40,7 @@ class TokenRatesController { contractExchangeRates[normalizeAddress(address)] = typeof price === 'number' ? price : 0 }) } catch (error) { - log.warn(`MetaMask - TokenRatesController exchange rate fetch failed.`, error) + log.warn(`DekuSan - TokenRatesController exchange rate fetch failed.`, error) } } this.store.putState({ contractExchangeRates }) diff --git a/app/scripts/controllers/transactions/lib/recipient-blacklist.js b/app/scripts/controllers/transactions/lib/recipient-blacklist.js index 08e1a2cc..ae804523 100644 --- a/app/scripts/controllers/transactions/lib/recipient-blacklist.js +++ b/app/scripts/controllers/transactions/lib/recipient-blacklist.js @@ -1,6 +1,6 @@ module.exports = { 'blacklist': [ - // IDEX phisher + // IDXN phisher '0x9bcb0A9d99d815Bb87ee3191b1399b1Bcc46dc77', // Ganache default seed phrases '0x627306090abab3a6e1400e9345bc60c78a8bef57', diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 1c5fd8dd..471a6e80 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -1476,7 +1476,7 @@ module.exports = class MetamaskController extends EventEmitter { this.currencyController.setCurrentCurrency(currencyCode) this.currencyController.updateConversionRate() const data = { - nativeCurrency: ticker || 'DEX', + nativeCurrency: ticker || 'DXN', conversionRate: this.currencyController.getConversionRate(), currentCurrency: this.currencyController.getCurrentCurrency(), conversionDate: this.currencyController.getConversionDate(), @@ -1520,7 +1520,7 @@ module.exports = class MetamaskController extends EventEmitter { * @param {string} nickname - Optional nickname of the selected network. * @returns {Promise<String>} - The RPC Target URL confirmed. */ - async setCustomRpc(rpcTarget, chainId, ticker = 'DEX', nickname = '') { + async setCustomRpc(rpcTarget, chainId, ticker = 'DXN', nickname = '') { this.networkController.setRpcTarget(rpcTarget, chainId, ticker, nickname) await this.preferencesController.addToFrequentRpcList(rpcTarget, chainId, ticker, nickname) return rpcTarget diff --git a/mascara/src/app/shapeshift-form/index.js b/mascara/src/app/shapeshift-form/index.js index 0916211d..56b0f315 100644 --- a/mascara/src/app/shapeshift-form/index.js +++ b/mascara/src/app/shapeshift-form/index.js @@ -168,7 +168,7 @@ export class ShapeShiftForm extends Component { Receive </div> <div className="shapeshift-form__selector-input"> - DEX + DXN </div> </div> </div> diff --git a/notices/archive/notice_0.md b/notices/archive/notice_0.md index 6f58a6e7..825b5ddc 100644 --- a/notices/archive/notice_0.md +++ b/notices/archive/notice_0.md @@ -6,7 +6,7 @@ _Our Terms of Use have been updated as of September 5, 2016_ ## 1. Acceptance of Terms ## -DekuSan provides a platform for managing DEXON (or "ETH") accounts, and allowing ordinary websites to interact with the DEXON blockchain, while keeping the user in control over what transactions they approve, through our website located at[ ](http://metamask.io)[https://metamask.io/](https://metamask.io/) and browser plugin (the "Site") — which includes text, images, audio, code and other materials (collectively, the “Content”) and all of the features, and services provided. The Site, and any other features, tools, materials, or other services offered from time to time by DekuSan are referred to here as the “Service.” Please read these Terms of Use (the “Terms” or “Terms of Use”) carefully before using the Service. By using or otherwise accessing the Services, or clicking to accept or agree to these Terms where that option is made available, you (1) accept and agree to these Terms (2) consent to the collection, use, disclosure and other handling of information as described in our Privacy Policy and (3) any additional terms, rules and conditions of participation issued by DekuSan from time to time. If you do not agree to the Terms, then you may not access or use the Content or Services. +DekuSan provides a platform for managing DEXON (or "DXN") accounts, and allowing ordinary websites to interact with the DEXON blockchain, while keeping the user in control over what transactions they approve, through our website located at[ ](http://testnet.dexscan.app)[https://testnet.dexscan.app/](https://testnet.dexscan.app/) and browser plugin (the "Site") — which includes text, images, audio, code and other materials (collectively, the “Content”) and all of the features, and services provided. The Site, and any other features, tools, materials, or other services offered from time to time by DekuSan are referred to here as the “Service.” Please read these Terms of Use (the “Terms” or “Terms of Use”) carefully before using the Service. By using or otherwise accessing the Services, or clicking to accept or agree to these Terms where that option is made available, you (1) accept and agree to these Terms (2) consent to the collection, use, disclosure and other handling of information as described in our Privacy Policy and (3) any additional terms, rules and conditions of participation issued by DekuSan from time to time. If you do not agree to the Terms, then you may not access or use the Content or Services. ## 2. Modification of Terms of Use ## diff --git a/test/data/mock-state.json b/test/data/mock-state.json index 12a9ae5a..a909217f 100644 --- a/test/data/mock-state.json +++ b/test/data/mock-state.json @@ -113,7 +113,7 @@ }, "ticker": "ETH", "currentCurrency": "usd", - "nativeCurrency": "DEX", + "nativeCurrency": "DXN", "conversionRate": 556.12, "addressBook": [ { diff --git a/test/integration/lib/mascara-first-time.js b/test/integration/lib/mascara-first-time.js index 5f5e2868..3b119c2d 100644 --- a/test/integration/lib/mascara-first-time.js +++ b/test/integration/lib/mascara-first-time.js @@ -66,8 +66,8 @@ async function runFirstTimeUsageTest (assert, done) { ;(await findAsync(app, '.first-time-flow__button')).click() // Deposit Ether Screen - const depositDEXTitle = (await findAsync(app, '.page-container__title'))[0] - assert.equal(depositDEXTitle.textContent, 'Deposit Ether', 'deposit ether screen') + const depositDXNTitle = (await findAsync(app, '.page-container__title'))[0] + assert.equal(depositDXNTitle.textContent, 'Deposit Ether', 'deposit ether screen') ;(await findAsync(app, '.page-container__header-close')).click() const menu = (await findAsync(app, '.account-menu__icon'))[0] diff --git a/test/integration/lib/send-new-ui.js b/test/integration/lib/send-new-ui.js index ebfa80a4..7e5864ab 100644 --- a/test/integration/lib/send-new-ui.js +++ b/test/integration/lib/send-new-ui.js @@ -32,10 +32,10 @@ async function runSendFlowTest (assert, done) { sendScreenButton[1].click() const sendTitle = await queryAsync($, '.page-container__title') - assert.equal(sendTitle[0].textContent, 'Send DEX', 'Send screen title is correct') + assert.equal(sendTitle[0].textContent, 'Send DXN', 'Send screen title is correct') const sendCopy = await queryAsync($, '.page-container__subtitle') - assert.equal(sendCopy[0].textContent, 'Only send DEX to an DEXON address.', 'Send screen has copy') + assert.equal(sendCopy[0].textContent, 'Only send DXN to an DEXON address.', 'Send screen has copy') const sendFromField = await queryAsync($, '.send-v2__form-field') assert.ok(sendFromField[0], 'send screen has a from field') diff --git a/ui/app/actions.js b/ui/app/actions.js index cca44d03..1aa9e00a 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -1925,7 +1925,7 @@ function updateProviderType (type) { } } -function setRpcTarget (newRpc, chainId, ticker = 'DEX', nickname = '') { +function setRpcTarget (newRpc, chainId, ticker = 'DXN', nickname = '') { return (dispatch) => { log.debug(`background.setRpcTarget: ${newRpc} ${chainId} ${ticker} ${nickname}`) background.setCustomRpc(newRpc, chainId, ticker, nickname, (err, result) => { diff --git a/ui/app/components/currency-display/currency-display.component.js b/ui/app/components/currency-display/currency-display.component.js index fc37fd66..b31645a3 100644 --- a/ui/app/components/currency-display/currency-display.component.js +++ b/ui/app/components/currency-display/currency-display.component.js @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react' import PropTypes from 'prop-types' import classnames from 'classnames' -import { ETH, DEX, GWEI } from '../../constants/common' +import { ETH, DXN, GWEI } from '../../constants/common' export default class CurrencyDisplay extends PureComponent { static propTypes = { @@ -12,7 +12,7 @@ export default class CurrencyDisplay extends PureComponent { style: PropTypes.object, suffix: PropTypes.string, // Used in container - currency: PropTypes.oneOf([ETH, DEX]), + currency: PropTypes.oneOf([ETH, DXN]), denomination: PropTypes.oneOf([GWEI]), value: PropTypes.string, numberOfDecimals: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), diff --git a/ui/app/components/currency-display/tests/currency-display.container.test.js b/ui/app/components/currency-display/tests/currency-display.container.test.js index 59cb8e72..5124b401 100644 --- a/ui/app/components/currency-display/tests/currency-display.container.test.js +++ b/ui/app/components/currency-display/tests/currency-display.container.test.js @@ -69,18 +69,18 @@ describe('CurrencyDisplay container', () => { { props: { value: '0x1193461d01595930', - currency: 'DEX', + currency: 'DXN', numberOfDecimals: 3, }, result: { displayValue: '1.266', - suffix: 'DEX', + suffix: 'DXN', }, }, { props: { value: '0x1193461d01595930', - currency: 'DEX', + currency: 'DXN', numberOfDecimals: 3, hideLabel: true, }, @@ -93,7 +93,7 @@ describe('CurrencyDisplay container', () => { { props: { value: '0x3b9aca00', - currency: 'DEX', + currency: 'DXN', denomination: 'GWEI', hideLabel: true, }, @@ -106,7 +106,7 @@ describe('CurrencyDisplay container', () => { { props: { value: '0x3b9aca00', - currency: 'DEX', + currency: 'DXN', denomination: 'WEI', hideLabel: true, }, @@ -119,7 +119,7 @@ describe('CurrencyDisplay container', () => { { props: { value: '0x3b9aca00', - currency: 'DEX', + currency: 'DXN', numberOfDecimals: 100, hideLabel: true, }, diff --git a/ui/app/components/currency-input/currency-input.component.js b/ui/app/components/currency-input/currency-input.component.js index 8a12851d..3f441fcc 100644 --- a/ui/app/components/currency-input/currency-input.component.js +++ b/ui/app/components/currency-input/currency-input.component.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types' import UnitInput from '../unit-input' import CurrencyDisplay from '../currency-display' import { getValueFromWeiHex, getWeiHexFromDecimalValue } from '../../helpers/conversions.util' -import { DEX } from '../../constants/common' +import { DXN } from '../../constants/common' /** * Component that allows user to enter currency values as a number, and props receive a converted @@ -52,7 +52,7 @@ export default class CurrencyInput extends PureComponent { value: hexValue, toCurrency: currentCurrency, conversionRate, numberOfDecimals: 2, }) : getValueFromWeiHex({ - value: hexValue, toCurrency: DEX, numberOfDecimals: 6, + value: hexValue, toCurrency: DXN, numberOfDecimals: 6, }) return Number(decimalValueString) || 0 @@ -66,7 +66,7 @@ export default class CurrencyInput extends PureComponent { value: decimalValue, fromCurrency, conversionRate, invertConversionRate: true, }) : getWeiHexFromDecimalValue({ - value: decimalValue, fromCurrency: DEX, fromDenomination: DEX, conversionRate, + value: decimalValue, fromCurrency: DXN, fromDenomination: DXN, conversionRate, }) this.setState({ hexValue, decimalValue }) @@ -84,7 +84,7 @@ export default class CurrencyInput extends PureComponent { if (useFiat) { // Display DEX - currency = DEX + currency = DXN numberOfDecimals = 6 } else { // Display Fiat diff --git a/ui/app/components/currency-input/currency-input.container.js b/ui/app/components/currency-input/currency-input.container.js index a5d40730..84d06b6f 100644 --- a/ui/app/components/currency-input/currency-input.container.js +++ b/ui/app/components/currency-input/currency-input.container.js @@ -1,6 +1,6 @@ import { connect } from 'react-redux' import CurrencyInput from './currency-input.component' -import { DEX } from '../../constants/common' +import { DXN } from '../../constants/common' const mapStateToProps = state => { const { dekusan: { nativeCurrency, currentCurrency, conversionRate } } = state @@ -15,7 +15,7 @@ const mapStateToProps = state => { const mergeProps = (stateProps, dispatchProps, ownProps) => { const { currentCurrency } = stateProps const { useFiat } = ownProps - const suffix = useFiat ? currentCurrency.toUpperCase() : DEX + const suffix = useFiat ? currentCurrency.toUpperCase() : DXN return { ...stateProps, diff --git a/ui/app/components/currency-input/tests/currency-input.container.test.js b/ui/app/components/currency-input/tests/currency-input.container.test.js index feb5a8eb..52a328b6 100644 --- a/ui/app/components/currency-input/tests/currency-input.container.test.js +++ b/ui/app/components/currency-input/tests/currency-input.container.test.js @@ -52,8 +52,8 @@ describe('CurrencyInput container', () => { assert.deepEqual(mergeProps(mockStateProps, mockDispatchProps, {}), { conversionRate: 280.45, currentCurrency: 'usd', - nativeCurrency: 'DEX', - suffix: 'DEX', + nativeCurrency: 'DXN', + suffix: 'DXN', }) }) }) diff --git a/ui/app/components/dropdowns/network-dropdown.js b/ui/app/components/dropdowns/network-dropdown.js index 9110c81f..9190947a 100644 --- a/ui/app/components/dropdowns/network-dropdown.js +++ b/ui/app/components/dropdowns/network-dropdown.js @@ -233,7 +233,7 @@ NetworkDropdown.prototype.renderCommonRpc = function (rpcListDetail, provider) { return reversedRpcListDetail.map((entry) => { const rpc = entry.rpcUrl - const ticker = entry.ticker || 'DEX' + const ticker = entry.ticker || 'DXN' const nickname = entry.nickname || '' const currentRpcTarget = provider.type === 'rpc' && rpc === provider.rpcTarget diff --git a/ui/app/components/modals/deposit-ether-modal.js b/ui/app/components/modals/deposit-ether-modal.js index 5610440c..6f1600c9 100644 --- a/ui/app/components/modals/deposit-ether-modal.js +++ b/ui/app/components/modals/deposit-ether-modal.js @@ -124,7 +124,7 @@ DepositEtherModal.prototype.render = function () { h('div.page-container__header', [ - h('div.page-container__title', [this.context.t('depositDEX')]), + h('div.page-container__title', [this.context.t('depositDXN')]), h('div.page-container__subtitle', [ this.context.t('needDexInWallet'), diff --git a/ui/app/components/page-container/page-container.component.js b/ui/app/components/page-container/page-container.component.js index 45dfff51..7dc9b11a 100644 --- a/ui/app/components/page-container/page-container.component.js +++ b/ui/app/components/page-container/page-container.component.js @@ -60,7 +60,7 @@ export default class PageContainer extends PureComponent { renderActiveTabContent () { const { tabsComponent } = this.props - let { children } = tabsComponent.props + let { children = [] } = tabsComponent.props children = children.filter(child => child) const { activeTabIndex } = this.state diff --git a/ui/app/components/pages/add-token/add-token.component.js b/ui/app/components/pages/add-token/add-token.component.js index bd0a48f3..7b1d0bb2 100644 --- a/ui/app/components/pages/add-token/add-token.component.js +++ b/ui/app/components/pages/add-token/add-token.component.js @@ -304,7 +304,7 @@ class AddToken extends Component { return ( <PageContainer title={this.context.t('addTokens')} - tabsComponent={this.renderTabs()} + contentComponent={this.renderCustomTokenForm()} onSubmit={() => this.handleNext()} disabled={this.hasError() || !this.hasSelected()} onCancel={() => { @@ -313,6 +313,19 @@ class AddToken extends Component { }} /> ) + + // return ( + // <PageContainer + // title={this.context.t('addTokens')} + // tabsComponent={this.renderTabs()} + // onSubmit={() => this.handleNext()} + // disabled={this.hasError() || !this.hasSelected()} + // onCancel={() => { + // clearPendingTokens() + // history.push(DEFAULT_ROUTE) + // }} + // /> + // ) } } diff --git a/ui/app/components/pages/confirm-token-transaction-base/confirm-token-transaction-base.component.js b/ui/app/components/pages/confirm-token-transaction-base/confirm-token-transaction-base.component.js index 05e03a58..0c4db2c2 100644 --- a/ui/app/components/pages/confirm-token-transaction-base/confirm-token-transaction-base.component.js +++ b/ui/app/components/pages/confirm-token-transaction-base/confirm-token-transaction-base.component.js @@ -9,7 +9,7 @@ import { roundExponential, } from '../../../helpers/confirm-transaction/util' import { getWeiHexFromDecimalValue } from '../../../helpers/conversions.util' -import { DEX, PRIMARY } from '../../../constants/common' +import { DXN, PRIMARY } from '../../../constants/common' export default class ConfirmTokenTransactionBase extends Component { static contextTypes = { @@ -45,8 +45,8 @@ export default class ConfirmTokenTransactionBase extends Component { const decimalEthValue = (tokenAmount * contractExchangeRate) || 0 const hexWeiValue = getWeiHexFromDecimalValue({ value: decimalEthValue, - fromCurrency: DEX, - fromDenomination: DEX, + fromCurrency: DXN, + fromDenomination: DXN, }) return typeof contractExchangeRate === 'undefined' diff --git a/ui/app/components/pages/settings/settings-tab/index.scss b/ui/app/components/pages/settings/settings-tab/index.scss index 46553f91..41ee8d19 100644 --- a/ui/app/components/pages/settings/settings-tab/index.scss +++ b/ui/app/components/pages/settings/settings-tab/index.scss @@ -14,7 +14,7 @@ align-self: flex-end; padding: 5px; text-transform: uppercase; - color: $dusty-gray; + color: $white; cursor: pointer; width: 25%; min-width: 80px; diff --git a/ui/app/components/pages/settings/settings-tab/settings-tab.component.js b/ui/app/components/pages/settings/settings-tab/settings-tab.component.js index ceb24c50..ce9ed8d7 100644 --- a/ui/app/components/pages/settings/settings-tab/settings-tab.component.js +++ b/ui/app/components/pages/settings/settings-tab/settings-tab.component.js @@ -228,7 +228,7 @@ export default class SettingsTab extends PureComponent { ) } - validateRpc (newRpc, chainId, ticker = 'DEX', nickname) { + validateRpc (newRpc, chainId, ticker = 'DXN', nickname) { const { setRpcTarget, displayWarning } = this.props if (validUrl.isWebUri(newRpc)) { diff --git a/ui/app/components/send/account-list-item/tests/account-list-item-component.test.js b/ui/app/components/send/account-list-item/tests/account-list-item-component.test.js index 8e241269..496dfa35 100644 --- a/ui/app/components/send/account-list-item/tests/account-list-item-component.test.js +++ b/ui/app/components/send/account-list-item/tests/account-list-item-component.test.js @@ -28,7 +28,7 @@ describe('AccountListItem Component', function () { className={'mockClassName'} conversionRate={4} currentCurrency={'mockCurrentyCurrency'} - nativeCurrency={'DEX'} + nativeCurrency={'DXN'} displayAddress={false} displayBalance={false} handleClick={propsMethodSpies.handleClick} diff --git a/ui/app/components/send/send-header/send-header.selectors.js b/ui/app/components/send/send-header/send-header.selectors.js index 3d5ca404..5bdecdd5 100644 --- a/ui/app/components/send/send-header/send-header.selectors.js +++ b/ui/app/components/send/send-header/send-header.selectors.js @@ -19,7 +19,7 @@ function getTitleKey (state) { } else if (isToken) { return 'sendTokens' } else { - return 'sendDEX' + return 'sendDXN' } } diff --git a/ui/app/components/send/send-header/tests/send-header-selectors.test.js b/ui/app/components/send/send-header/tests/send-header-selectors.test.js index d6d090ae..51c1e13c 100644 --- a/ui/app/components/send/send-header/tests/send-header-selectors.test.js +++ b/ui/app/components/send/send-header/tests/send-header-selectors.test.js @@ -23,7 +23,7 @@ describe('send-header selectors', () => { }) it('should return the correct key when getSendEditingTransactionId is falsy and getSelectedToken is falsy', () => { - assert.equal(getTitleKey({ e: null }), 'sendDEX') + assert.equal(getTitleKey({ e: null }), 'sendDXN') }) }) diff --git a/ui/app/components/send/tests/send-selectors.test.js b/ui/app/components/send/tests/send-selectors.test.js index 89ee1f00..9214eccf 100644 --- a/ui/app/components/send/tests/send-selectors.test.js +++ b/ui/app/components/send/tests/send-selectors.test.js @@ -183,7 +183,7 @@ describe('send selectors', () => { it('should return the ticker symbol of the selected network', () => { assert.equal( getNativeCurrency(mockState), - 'DEX' + 'DXN' ) }) }) diff --git a/ui/app/components/shapeshift-form.js b/ui/app/components/shapeshift-form.js index ab04d98a..562c7219 100644 --- a/ui/app/components/shapeshift-form.js +++ b/ui/app/components/shapeshift-form.js @@ -58,7 +58,7 @@ function ShapeshiftForm () { } ShapeshiftForm.prototype.getCoinPair = function () { - return `${this.state.depositCoin.toUpperCase()}_DEX` + return `${this.state.depositCoin.toUpperCase()}_DXN` } ShapeshiftForm.prototype.componentWillMount = function () { @@ -211,7 +211,7 @@ ShapeshiftForm.prototype.render = function () { this.context.t('receive'), ]), - h('div.shapeshift-form__selector-input', ['DEX']), + h('div.shapeshift-form__selector-input', ['DXN']), ]), diff --git a/ui/app/components/signature-request.js b/ui/app/components/signature-request.js index 1c031ef8..7a179cc1 100644 --- a/ui/app/components/signature-request.js +++ b/ui/app/components/signature-request.js @@ -122,7 +122,7 @@ SignatureRequest.prototype.renderBalance = function () { h('div.request-signature__balance-text', `${this.context.t('balance')}:`), - h('div.request-signature__balance-value', `${balanceInEther} DEX`), + h('div.request-signature__balance-value', `${balanceInEther} DXN`), ]) } diff --git a/ui/app/components/token-input/token-input.component.js b/ui/app/components/token-input/token-input.component.js index e85436b7..4d957237 100644 --- a/ui/app/components/token-input/token-input.component.js +++ b/ui/app/components/token-input/token-input.component.js @@ -5,7 +5,7 @@ import CurrencyDisplay from '../currency-display' import { getWeiHexFromDecimalValue } from '../../helpers/conversions.util' import ethUtil from 'ethereumjs-util' import { conversionUtil, multiplyCurrencies } from '../../conversion-util' -import { DEX } from '../../constants/common' +import { DXN } from '../../constants/common' /** * Component that allows user to enter token values as a number, and props receive a converted @@ -91,15 +91,15 @@ export default class TokenInput extends PureComponent { numberOfDecimals = 2 } else { // Display ETH - currency = DEX + currency = DXN numberOfDecimals = 6 } const decimalEthValue = (decimalValue * selectedTokenExchangeRate) || 0 const hexWeiValue = getWeiHexFromDecimalValue({ value: decimalEthValue, - fromCurrency: DEX, - fromDenomination: DEX, + fromCurrency: DXN, + fromDenomination: DXN, }) return selectedTokenExchangeRate diff --git a/ui/app/components/transaction-activity-log/index.scss b/ui/app/components/transaction-activity-log/index.scss index 27a56b28..60dda998 100644 --- a/ui/app/components/transaction-activity-log/index.scss +++ b/ui/app/components/transaction-activity-log/index.scss @@ -58,7 +58,7 @@ cursor: pointer; &:hover { - color: $black; + color: $white; } } diff --git a/ui/app/components/transaction-activity-log/transaction-activity-log.component.js b/ui/app/components/transaction-activity-log/transaction-activity-log.component.js index d6f90860..4cc7e905 100644 --- a/ui/app/components/transaction-activity-log/transaction-activity-log.component.js +++ b/ui/app/components/transaction-activity-log/transaction-activity-log.component.js @@ -29,7 +29,7 @@ export default class TransactionActivityLog extends PureComponent { const { metamaskNetworkId } = primaryTransaction const prefix = prefixForNetwork(metamaskNetworkId) - const etherscanUrl = `https://${prefix}etherscan.io/tx/${hash}` + const etherscanUrl = `https://${prefix}dexscan.app/transaction/${hash}` global.platform.openWindow({ url: etherscanUrl }) } diff --git a/ui/app/components/transaction-breakdown/transaction-breakdown.component.js b/ui/app/components/transaction-breakdown/transaction-breakdown.component.js index addb4006..0537076a 100644 --- a/ui/app/components/transaction-breakdown/transaction-breakdown.component.js +++ b/ui/app/components/transaction-breakdown/transaction-breakdown.component.js @@ -5,7 +5,7 @@ import TransactionBreakdownRow from './transaction-breakdown-row' import CurrencyDisplay from '../currency-display' import UserPreferencedCurrencyDisplay from '../user-preferenced-currency-display' import HexToDecimal from '../hex-to-decimal' -import { DEX, GWEI, PRIMARY, SECONDARY } from '../../constants/common' +import { DXN, GWEI, PRIMARY, SECONDARY } from '../../constants/common' import { getHexGasTotal } from '../../helpers/confirm-transaction/util' import { sumHexes } from '../../helpers/transactions.util' @@ -86,7 +86,7 @@ export default class TransactionBreakdown extends PureComponent { /> <UserPreferencedCurrencyDisplay className="transaction-breakdown__value" - currency={DEX} + currency={DXN} denomination={GWEI} value={gasPrice} hideLabel diff --git a/ui/app/components/transaction-list-item-details/index.scss b/ui/app/components/transaction-list-item-details/index.scss index 2e3a06f8..7fc1a488 100644 --- a/ui/app/components/transaction-list-item-details/index.scss +++ b/ui/app/components/transaction-list-item-details/index.scss @@ -7,7 +7,7 @@ } &__body { - background: #fafbfc; + background: $black; padding: 8px 16px; } diff --git a/ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.container.test.js b/ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.container.test.js index deb055fe..1af59004 100644 --- a/ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.container.test.js +++ b/ui/app/components/user-preferenced-currency-display/tests/user-preferenced-currency-display.container.test.js @@ -46,7 +46,7 @@ describe('UserPreferencedCurrencyDisplay container', () => { }, result: { nativeCurrency: 'ETH', - currency: 'DEX', + currency: 'DXN', numberOfDecimals: 6, prefix: undefined, }, @@ -96,7 +96,7 @@ describe('UserPreferencedCurrencyDisplay container', () => { prefix: 'b', }, result: { - currency: 'DEX', + currency: 'DXN', numberOfDecimals: 3, prefix: 'b', }, diff --git a/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.component.js b/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.component.js index 40158a8d..6136ca00 100644 --- a/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.component.js +++ b/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.component.js @@ -1,6 +1,6 @@ import React, { PureComponent } from 'react' import PropTypes from 'prop-types' -import { PRIMARY, SECONDARY, DEX } from '../../constants/common' +import { PRIMARY, SECONDARY, DXN } from '../../constants/common' import CurrencyDisplay from '../currency-display' export default class UserPreferencedCurrencyDisplay extends PureComponent { @@ -27,7 +27,7 @@ export default class UserPreferencedCurrencyDisplay extends PureComponent { renderEthLogo () { const { currency, showEthLogo, ethLogoHeight = 12 } = this.props - return currency === DEX && showEthLogo && ( + return currency === DXN && showEthLogo && ( <img src="/images/dexon-invert.svg" height={ethLogoHeight} diff --git a/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.container.js b/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.container.js index f5aae92c..33152025 100644 --- a/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.container.js +++ b/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.container.js @@ -1,7 +1,7 @@ import { connect } from 'react-redux' import UserPreferencedCurrencyDisplay from './user-preferenced-currency-display.component' import { preferencesSelector } from '../../selectors' -import { DEX, PRIMARY, SECONDARY } from '../../constants/common' +import { DXN, PRIMARY, SECONDARY } from '../../constants/common' const mapStateToProps = (state, ownProps) => { const { useNativeCurrencyAsPrimaryCurrency } = preferencesSelector(state) @@ -30,7 +30,7 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => { if (type === PRIMARY && useNativeCurrencyAsPrimaryCurrency || type === SECONDARY && !useNativeCurrencyAsPrimaryCurrency) { // Display ETH - currency = nativeCurrency || DEX + currency = nativeCurrency || DXN numberOfDecimals = propsNumberOfDecimals || ethNumberOfDecimals || 6 prefix = propsPrefix || ethPrefix } else if (type === SECONDARY && useNativeCurrencyAsPrimaryCurrency || diff --git a/ui/app/constants/common.js b/ui/app/constants/common.js index 3472ae0a..731ce9c2 100644 --- a/ui/app/constants/common.js +++ b/ui/app/constants/common.js @@ -1,5 +1,5 @@ export const ETH = 'ETH' -export const DEX = 'DEX' +export const DXN = 'DXN' export const GWEI = 'GWEI' export const WEI = 'WEI' diff --git a/ui/app/conversion-util.js b/ui/app/conversion-util.js index 6e08b50d..f936548e 100644 --- a/ui/app/conversion-util.js +++ b/ui/app/conversion-util.js @@ -53,12 +53,12 @@ const toBigNumber = { const toNormalizedDenomination = { WEI: bigNumber => bigNumber.div(BIG_NUMBER_WEI_MULTIPLIER), GWEI: bigNumber => bigNumber.div(BIG_NUMBER_GWEI_MULTIPLIER), - DEX: bigNumber => bigNumber.div(BIG_NUMBER_ETH_MULTIPLIER), + DXN: bigNumber => bigNumber.div(BIG_NUMBER_ETH_MULTIPLIER), } const toSpecifiedDenomination = { WEI: bigNumber => bigNumber.times(BIG_NUMBER_WEI_MULTIPLIER).round(), GWEI: bigNumber => bigNumber.times(BIG_NUMBER_GWEI_MULTIPLIER).round(9), - DEX: bigNumber => bigNumber.times(BIG_NUMBER_ETH_MULTIPLIER).round(9), + DXN: bigNumber => bigNumber.times(BIG_NUMBER_ETH_MULTIPLIER).round(9), } const baseChange = { hex: n => n.toString(16), diff --git a/ui/app/helpers/confirm-transaction/util.js b/ui/app/helpers/confirm-transaction/util.js index f3a9620f..62a31f09 100644 --- a/ui/app/helpers/confirm-transaction/util.js +++ b/ui/app/helpers/confirm-transaction/util.js @@ -64,7 +64,7 @@ export function getValueFromWeiHex ({ return conversionUtil(value, { fromNumericBase: 'hex', toNumericBase: 'dec', - fromCurrency: 'DEX', + fromCurrency: 'DXN', toCurrency, numberOfDecimals, fromDenomination: 'WEI', @@ -84,7 +84,7 @@ export function getTransactionFee ({ fromNumericBase: 'BN', toNumericBase: 'dec', fromDenomination: 'WEI', - fromCurrency: 'DEX', + fromCurrency: 'DXN', toCurrency, numberOfDecimals, conversionRate, diff --git a/ui/app/helpers/conversions.util.js b/ui/app/helpers/conversions.util.js index fee340c3..eef54640 100644 --- a/ui/app/helpers/conversions.util.js +++ b/ui/app/helpers/conversions.util.js @@ -1,6 +1,6 @@ import ethUtil from 'ethereumjs-util' import { conversionUtil, addCurrencies } from '../conversion-util' -import { DEX, GWEI, WEI } from '../constants/common' +import { DXN, GWEI, WEI } from '../constants/common' export function bnToHex (inputBn) { return ethUtil.addHexPrefix(inputBn.toString(16)) @@ -20,8 +20,8 @@ export function decimalToHex (decimal) { }) } -export function getEthConversionFromWeiHex ({ value, conversionRate, numberOfDecimals = 6, fromCurrency = DEX }) { - const denominations = [DEX, GWEI, WEI] +export function getEthConversionFromWeiHex ({ value, conversionRate, numberOfDecimals = 6, fromCurrency = DXN }) { + const denominations = [DXN, GWEI, WEI] let nonZeroDenomination @@ -46,7 +46,7 @@ export function getEthConversionFromWeiHex ({ value, conversionRate, numberOfDec export function getValueFromWeiHex ({ value, - fromCurrency = DEX, + fromCurrency = DXN, toCurrency, conversionRate, numberOfDecimals, @@ -74,7 +74,7 @@ export function getWeiHexFromDecimalValue ({ return conversionUtil(value, { fromNumericBase: 'dec', toNumericBase: 'hex', - toCurrency: DEX, + toCurrency: DXN, fromCurrency, conversionRate, invertConversionRate, diff --git a/ui/app/helpers/formatters.js b/ui/app/helpers/formatters.js index f7499eaf..64ea38fa 100644 --- a/ui/app/helpers/formatters.js +++ b/ui/app/helpers/formatters.js @@ -1,3 +1,3 @@ export function formatETHFee (ethFee) { - return ethFee + ' DEX' + return ethFee + ' DXN' } diff --git a/ui/app/util.js b/ui/app/util.js index 558a7d19..5318c58a 100644 --- a/ui/app/util.js +++ b/ui/app/util.js @@ -128,7 +128,7 @@ function parseBalance (balance) { // Takes wei hex, returns an object with three properties. // Its "formatted" property is what we generally use to render values. -function formatBalance (balance, decimalsToKeep, needsParse = true, ticker = 'DEX') { +function formatBalance (balance, decimalsToKeep, needsParse = true, ticker = 'DXN') { var parsed = needsParse ? parseBalance(balance) : balance.split('.') var beforeDecimal = parsed[0] var afterDecimal = parsed[1] |