diff --git a/app/assets/asset-symbols/rudex.ltc.png b/app/assets/asset-symbols/rudex.ltc.png new file mode 100644 index 0000000000..3b86cae8f7 Binary files /dev/null and b/app/assets/asset-symbols/rudex.ltc.png differ diff --git a/app/assets/asset-symbols/symbols.js b/app/assets/asset-symbols/symbols.js index c040652031..5b5065cc54 100644 --- a/app/assets/asset-symbols/symbols.js +++ b/app/assets/asset-symbols/symbols.js @@ -17,18 +17,22 @@ require("file-loader?name=asset-symbols/[name].png!./silver.png"); require("file-loader?name=asset-symbols/[name].png!./donate.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.btc.png"); +require("file-loader?name=asset-symbols/[name].png!./rudex.ltc.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.usdt.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.eos.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.eth.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.golos.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.steem.png"); -require("file-loader?name=asset-symbols/[name].png!./rudex.smoke.png"); -require("file-loader?name=asset-symbols/[name].png!./rudex.wls.png"); -require("file-loader?name=asset-symbols/[name].png!./rudex.ppy.png"); + require("file-loader?name=asset-symbols/[name].png!./rudex.pzm.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.nbs.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.xmr.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.bts.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.trx.png"); +//soon delisting +require("file-loader?name=asset-symbols/[name].png!./rudex.ppy.png"); +require("file-loader?name=asset-symbols/[name].png!./rudex.smoke.png"); +require("file-loader?name=asset-symbols/[name].png!./rudex.wls.png"); + // 3rd party assets diff --git a/app/assets/coins-logo/ark.png b/app/assets/coins-logo/ark.png new file mode 100644 index 0000000000..69507d62b2 Binary files /dev/null and b/app/assets/coins-logo/ark.png differ diff --git a/app/assets/coins-logo/coins.js b/app/assets/coins-logo/coins.js index 8b0318f8da..28e61c83f4 100644 --- a/app/assets/coins-logo/coins.js +++ b/app/assets/coins-logo/coins.js @@ -13,5 +13,6 @@ require("file-loader?name=coins-logo/[name].png!./zec.png"); require("file-loader?name=coins-logo/[name].png!./hive.png"); require("file-loader?name=coins-logo/[name].png!./rev.png"); require("file-loader?name=coins-logo/[name].png!./adm.png"); +require("file-loader?name=coins-logo/[name].png!./ark.png"); require("file-loader?name=coins-logo/[name].png!./pzm.png"); diff --git a/app/assets/icons/direct_debit.svg b/app/assets/icons/direct_debit.svg index 9a18499e55..b99fc5f7df 100644 --- a/app/assets/icons/direct_debit.svg +++ b/app/assets/icons/direct_debit.svg @@ -1,62 +1,47 @@ - - - - - - - - - - image/svg+xml - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/icons/prediction.svg b/app/assets/icons/prediction.svg index a881c2fe59..48bc749716 100644 --- a/app/assets/icons/prediction.svg +++ b/app/assets/icons/prediction.svg @@ -1,136 +1,46 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/app/assets/locales/locale-de.json b/app/assets/locales/locale-de.json index bfeb116336..28eeb35663 100644 --- a/app/assets/locales/locale-de.json +++ b/app/assets/locales/locale-de.json @@ -1149,7 +1149,7 @@ "asset_to_withdraw": "Anlage zur Auszahlung:", "asset_unavailable": "Das Gateway für %(asset)s ist nicht in Betrieb", "assets": { - "bit": "gp%(asset)s ist ein Derivat, das den echten Wert von %(backed)s verfolgt. Es ist 100% dezentralisiert, benötigt kein Vertrauen und wird durch eine Sicherheit auf der Blockchain in einem Smart Contrakt hinterlegt.", + "gp": "gp%(asset)s ist ein Derivat, das den echten Wert von %(backed)s verfolgt. Es ist 100% dezentralisiert, benötigt kein Vertrauen und wird durch eine Sicherheit auf der Blockchain in einem Smart Contrakt hinterlegt.", "bitcny": "gpCNY kann 1:1 zum echten Yuan ein- oder ausbezahlt werden, indem die Gateway des Magic Wallet Dienstes benutzt wird. Mehr Informationen auf https://www.magicw.net/", "bridge": "Die %(asset)s Anlage ist 1:1 durch echte %(backed)s hinterlegt und kann ein- oder ausgezahlt werden. Der Gateway-Dienst wird durch CryptoBridge bereitgestellt", "gdex": "Die %(asset)s Anlage ist 1:1 durch echte %(backed)s hinterlegt und kann ein- oder ausgezahlt werden. Der Gateway-Dienst wird durch Gdex bereitgestellt", diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json index 14ad297ee7..93dd20f736 100644 --- a/app/assets/locales/locale-en.json +++ b/app/assets/locales/locale-en.json @@ -1165,7 +1165,7 @@ "asset_to_withdraw": "Asset to withdraw:", "asset_unavailable": "The gateway for %(asset)s is not in service", "assets": { - "bit": "gp%(asset)s is a derivative that tracks the real value of %(backed)s. It is 100%% decentralized, trustless and backed by collateral held by the blockchain in a smart contract.", + "gp": "gp%(asset)s is a derivative that tracks the real value of %(backed)s. It is 100%% decentralized, trustless and backed by collateral held by the blockchain in a smart contract.", "bitcny": "gpCNY can be deposited or withdrawn 1:1 to real Yuan using a gateway service such as Magic Wallet. For more info, see https://www.magicw.net/", "bridge": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by CryptoBridge.", "gdex": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by GDEX.", @@ -1262,6 +1262,7 @@ "rudex": { "coming_soon": "Coming soon", "min_amount": "Minimum amount: %(minAmount)s %(symbol)s", + "min_amount_warn": "Any deposits less than the minimum will not be credited.", "min_amount_error": "Please enter number >= minimum", "support_block": "For support, please contact RuDEX at:", "under_construction": "Under Construction", @@ -1705,7 +1706,7 @@ "title": "Request settlement of %(asset)s" }, "withdraw": { - "address": "Withdraw to Address", + "address": "Withdraw to Address %(amount)s %(asset)s", "address_not_valid": "Invalid address", "amount": "Amount to Withdraw", "available": "Available: ", diff --git a/app/assets/locales/locale-es.json b/app/assets/locales/locale-es.json index dac8c29a2d..d15ea47da0 100644 --- a/app/assets/locales/locale-es.json +++ b/app/assets/locales/locale-es.json @@ -1149,7 +1149,7 @@ "asset_to_withdraw": "activos para retirar:", "asset_unavailable": "El porton para %(asset)s no esta en servicio", "assets": { - "bit": "gp%(asset)s es un derivado que rastrea el valor real de %(backed)s. esto es 100%% descentralizado, sin confianza y respaldado por garantías en poder de blockchain en un contrato inteligente.", + "gp": "gp%(asset)s es un derivado que rastrea el valor real de %(backed)s. esto es 100%% descentralizado, sin confianza y respaldado por garantías en poder de blockchain en un contrato inteligente.", "bitcny": "gpCNY se puede depositar o retirar 1:1 a Yuan real mediante un servicio de puerta de enlace como Magic Wallet. Para más información, consulte https://www.magicw.net/", "bridge": "El activo %(asset)s es respaldado 1:1 por real %(backed)s y puede ser depositado or retiado usando el servico de porton proporcionado por CryptoBridge.", "gdex": "El %(asset)s activo es respaldado 1:1 por real %(backed)s y puede ser depositado or retirado usando el servico de porton proporcionado por GDex.", diff --git a/app/assets/locales/locale-fr.json b/app/assets/locales/locale-fr.json index 2ecac8fb09..66f7932e7c 100644 --- a/app/assets/locales/locale-fr.json +++ b/app/assets/locales/locale-fr.json @@ -1143,7 +1143,7 @@ "asset_to_withdraw": "Asset to withdraw:", "asset_unavailable": "The gateway for %(asset)s is not in service", "assets": { - "bit": "gp%(asset)s is a derivative that tracks the real value of %(backed)s. It is 100%% decentralized, trustless and backed by collateral held by the blockchain in a smart contract.", + "gp": "gp%(asset)s is a derivative that tracks the real value of %(backed)s. It is 100%% decentralized, trustless and backed by collateral held by the blockchain in a smart contract.", "bitcny": "gpCNY can be deposited or withdrawn 1:1 to real Yuan using a gateway service such as Magic Wallet. For more info, see https://www.magicw.net/", "bridge": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by CryptoBridge.", "gdex": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by GDex.", diff --git a/app/assets/locales/locale-it.json b/app/assets/locales/locale-it.json index be94641c36..ceab124f5b 100644 --- a/app/assets/locales/locale-it.json +++ b/app/assets/locales/locale-it.json @@ -1143,7 +1143,7 @@ "asset_to_withdraw": "Asset da prelevare:", "asset_unavailable": "The gateway for %(asset)s is not in service", "assets": { - "bit": "gp%(asset)s è un derivato che segue il valore reale di %(backed)s. È decentralizzato al 100%%, trustless e supportato da una garanzia trattenuta dalla blockchain in uno smart contract.", + "gp": "gp%(asset)s è un derivato che segue il valore reale di %(backed)s. È decentralizzato al 100%%, trustless e supportato da una garanzia trattenuta dalla blockchain in uno smart contract.", "bitcny": "gpCNY v 1:1 verso veri Yuan usando un servizio di gateway come Magic Wallet. For more info, vedi https://www.magicw.net/", "bridge": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by CryptoBridge.", "gdex": "L'asset %(asset)s è garantito 1:1 da %(backed)s reali e può essere depositato o ritirato usando il servizio di gateway fornito da GDex.", diff --git a/app/assets/locales/locale-ja.json b/app/assets/locales/locale-ja.json index 12216967d2..9ea959131c 100644 --- a/app/assets/locales/locale-ja.json +++ b/app/assets/locales/locale-ja.json @@ -1143,7 +1143,7 @@ "asset_to_withdraw": "出金するアセット:", "asset_unavailable": "%(asset)sのゲートウェイはサービス外です。", "assets": { - "bit": "gp%(asset)s は実際の%(backed)sの価値に追随するデリバティブです。これは100%分散化されており、トラストレスであり、スマートコントラクトによってブロックチェーンに保持される担保に裏付けされています。", + "gp": "gp%(asset)s は実際の%(backed)sの価値に追随するデリバティブです。これは100%分散化されており、トラストレスであり、スマートコントラクトによってブロックチェーンに保持される担保に裏付けされています。", "bitcny": "gpCNY はMagic Walletが提供するゲートウェイサービスによって実際の元と1：1で入出金できます。詳細はこちらを見てください https://www.magicw.net/", "bridge": "%(asset)sアセットは実際の%(backed)sと1：1に対応し、CryptoBridgeによって提供されるゲートウェイサービスによって入出金が可能です。", "gdex": "%(asset)sアセットは実際の%(backed)sと1：1に対応し、Gdexによって提供されるゲートウェイサービスによって入出金が可能です。", diff --git a/app/assets/locales/locale-ko.json b/app/assets/locales/locale-ko.json index 541b3d0442..4a3d6eca14 100644 --- a/app/assets/locales/locale-ko.json +++ b/app/assets/locales/locale-ko.json @@ -1143,7 +1143,7 @@ "asset_to_withdraw": "Asset to withdraw:", "asset_unavailable": "The gateway for %(asset)s is not in service", "assets": { - "bit": "gp%(asset)s is a derivative that tracks the real value of %(backed)s. It is 100%% decentralized, trustless and backed by collateral held by the blockchain in a smart contract.", + "gp": "gp%(asset)s is a derivative that tracks the real value of %(backed)s. It is 100%% decentralized, trustless and backed by collateral held by the blockchain in a smart contract.", "bitcny": "gpCNY can be deposited or withdrawn 1:1 to real Yuan using a gateway service such as Magic Wallet. For more info, see https://www.magicw.net/", "bridge": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by CryptoBridge.", "gdex": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by GDex.", diff --git a/app/assets/locales/locale-ru.json b/app/assets/locales/locale-ru.json index 5714b682a9..0d482f04a1 100644 --- a/app/assets/locales/locale-ru.json +++ b/app/assets/locales/locale-ru.json @@ -1165,7 +1165,7 @@ "asset_to_withdraw": "Актив для вывода:", "asset_unavailable": "Шлюз для %(asset)s в данный момент не работает", "assets": { - "bit": "gp%(asset)s – это производный актив, отслеживающий реальную стоимость %(backed)s. Он на 100%% децентрализован, не требует доверия и обеспечен залогом, удерживаемым блокчейном в смарт-контракте.", + "gp": "gp%(asset)s – это производный актив, отслеживающий реальную стоимость %(backed)s. Он на 100%% децентрализован, не требует доверия и обеспечен залогом, удерживаемым блокчейном в смарт-контракте.", "bitcny": "gpCNY может быть депонирован или выведен в соотношении 1:1 к реальному юаню с помощью сервиса шлюза от Magic Wallet. Подробную информацию можно найти здесь https://www.magicw.net/", "bridge": " Актив %(asset)s обеспечен в соотношении 1:1 реальными %(backed)s и может быть размещен в депозите или выведен через шлюз, предоставляемый CryptoBridge.", "gdex": " Актив %(asset)s обеспечен в соотношении 1:1 реальными %(backed)s и может быть размещен в депозите или выведен через шлюз, предоставляемый GDex.", @@ -1262,6 +1262,7 @@ "rudex": { "coming_soon": "Скоро", "min_amount": "Минимальная сумма: %(minAmount)s %(symbol)s", + "min_amount_warn": "Любые депозиты, меньше минимального размера, не будут зачислены.", "min_amount_error": "Пожалуйста, введите число ≥ минимума", "support_block": "Для получения поддержки, пожалуйста, свяжитесь с RuDEX по адресу:", "under_construction": "Технические работы", @@ -1705,7 +1706,7 @@ "title": "Запросить погашение %(asset)s" }, "withdraw": { - "address": "Вывести на адрес", + "address": "Вывести на адрес %(amount)s %(asset)s", "address_not_valid": "Недействительный адрес", "amount": "Сумма к выводу", "available": "Доступно: ", diff --git a/app/assets/locales/locale-tr.json b/app/assets/locales/locale-tr.json index 0745555b31..1e2939d53e 100644 --- a/app/assets/locales/locale-tr.json +++ b/app/assets/locales/locale-tr.json @@ -1143,7 +1143,7 @@ "asset_to_withdraw": "Çekilecek dijital varlık:", "asset_unavailable": "The gateway for %(asset)s is not in service", "assets": { - "bit": "gp%(asset)s, fiyat olarak %(backed)s marketini takip eden bir türev araçtır. Bu hizmet hiçbir merkezi otorite tarafından değil, merkezsiz Graphene blokzinciri tarafından sağlanır.", + "gp": "gp%(asset)s, fiyat olarak %(backed)s marketini takip eden bir türev araçtır. Bu hizmet hiçbir merkezi otorite tarafından değil, merkezsiz Graphene blokzinciri tarafından sağlanır.", "bitcny": "gpCNY, Çin Yuanı'nın Graphene borsasındaki temsilidir. 1:1 Çin Yuanı ile değiştirilebilen bu dijital varlık Magic Wallet tarafından yürütülmektedir. Daha fazla bilgi için: https://www.magicw.net/", "bridge": "Bu dijital varlık Graphene üzerinde %(backed)s işlemleri yapmanız için CryptoBridge tarafından %%100 %(backed)s rezervi ile desteklenmektedir. İstediğiniz zaman 1:1 oranında %(asset)s-%(backed)s dönüşümü yapabilirsiniz.", "gdex": "Bu dijital varlık Graphene üzerinde %(backed)s işlemleri yapmanız için Gdex tarafından %%100 %(backed)s rezervi ile desteklenmektedir. İstediğiniz zaman 1:1 oranında %(asset)s-%(backed)s dönüşümü yapabilirsiniz.", diff --git a/app/assets/locales/locale-zh.json b/app/assets/locales/locale-zh.json index 0e918746e3..aefd1f2f34 100644 --- a/app/assets/locales/locale-zh.json +++ b/app/assets/locales/locale-zh.json @@ -1149,7 +1149,7 @@ "asset_to_withdraw": "提现资产：", "asset_unavailable": "%(asset)s 资产的网关暂停服务", "assets": { - "bit": "gp%(asset)s 是锚定 %(backed)s 价值的金融衍生品。它 100% 去中心化，无需信任第三方中心机构，并由锁定在区块链上智能合约中的抵押物进行价值背书。", + "gp": "gp%(asset)s 是锚定 %(backed)s 价值的金融衍生品。它 100% 去中心化，无需信任第三方中心机构，并由锁定在区块链上智能合约中的抵押物进行价值背书。", "bitcny": "gpCNY 通常可与真实CNY1：1兑换，可以通过例如 Magic Wallet 提供的网关服务进行充值提现。更多信息请访问 https://www.magicw.net/", "bridge": "资产 %(asset)s 由真实资产 %(backed)s 1:1 储备背书。可以通过 CryptoBridge 提供的网关服务进行充值提现。", "gdex": "资产 %(asset)s 由真实资产 %(backed)s 1:1 储备背书。可以通过 GDEX 提供的网关服务进行充值提现。", diff --git a/app/branding.js b/app/branding.js index 95545b3b03..a86847856d 100644 --- a/app/branding.js +++ b/app/branding.js @@ -113,7 +113,7 @@ export function getMyMarketsBases() { if (_isTestnet()) { return ["TEST"]; } - return ["GPH", "RUDEX.BTC", "RUDEX.USDT", "RUDEX.BTS"]; + return ["GPH", "RUDEX.USDT", "RUDEX.BTS", "RUDEX.BTC", "USD"]; } /** @@ -144,19 +144,21 @@ export function getMyMarketsQuotes() { "DONATE", "RUDEX.BTC", + "RUDEX.LTC", "RUDEX.ETH", "RUDEX.USDT", "RUDEX.EOS", "RUDEX.PZM", "RUDEX.GOLOS", "RUDEX.STEEM", - "RUDEX.WLS", - "RUDEX.SMOKE", "RUDEX.NBS", - "RUDEX.PPY", "RUDEX.XMR", "RUDEX.BTS", - "RUDEX.TRX" + "RUDEX.TRX", + + "RUDEX.PPY", + "RUDEX.SMOKE", + "RUDEX.WLS" //RuDEX MPA-s /* @@ -237,49 +239,46 @@ export function getFeaturedMarkets(quotes = []) { ["RUB", "SILVER"], ["RUB", "OIL"]*/ - ["GPH", "RUDEX.PPY"], ["GPH", "RUDEX.NBS"], ["GPH", "RUDEX.BTC"], + ["GPH", "RUDEX.LTC"], ["GPH", "RUDEX.USDT"], ["GPH", "RUDEX.ETH"], ["GPH", "RUDEX.XMR"], ["GPH", "RUDEX.EOS"], ["GPH", "RUDEX.GOLOS"], ["GPH", "RUDEX.STEEM"], - ["GPH", "RUDEX.WLS"], - //["GPH", "RUDEX.SMOKE"], delisted ["GPH", "RUDEX.BTS"], ["GPH", "RUDEX.TRX"], /*["RUBLE", "GPH"], - ["RUBLE", "RUDEX.PPY"], ["RUBLE", "RUDEX.BTC"], ["RUBLE", "RUDEX.USDT"], ["RUBLE", "RUDEX.ETH"], ["RUBLE", "RUDEX.EOS"], ["RUBLE", "RUDEX.GOLOS"], ["RUBLE", "RUDEX.STEEM"], - ["RUBLE", "RUDEX.WLS"], - ["RUBLE", "RUDEX.SMOKE"], delisted ["RUBLE", "RUDEX.RUB"], */ ["RUDEX.USDT", "GPH"], ["RUDEX.USDT", "USD"], ["RUDEX.USDT", "DONATE"], - ["RUDEX.USDT", "RUDEX.PPY"], ["RUDEX.USDT", "RUDEX.NBS"], ["RUDEX.USDT", "RUDEX.BTC"], + ["RUDEX.USDT", "RUDEX.LTC"], ["RUDEX.USDT", "RUDEX.ETH"], ["RUDEX.USDT", "RUDEX.EOS"], ["RUDEX.USDT", "RUDEX.GOLOS"], ["RUDEX.USDT", "RUDEX.STEEM"], - ["RUDEX.USDT", "RUDEX.WLS"], - //["RUDEX.USDT", "RUDEX.SMOKE"], delisted ["RUDEX.USDT", "RUDEX.PZM"], ["RUDEX.USDT", "RUDEX.XMR"], ["RUDEX.USDT", "RUDEX.BTS"], ["RUDEX.USDT", "RUDEX.TRX"], + + ["RUDEX.USDT", "RUDEX.PPY"], + ["RUDEX.USDT", "RUDEX.SMOKE"], + ["RUDEX.USDT", "RUDEX.WLS"], //["RUDEX.USDT", "RUBLE"], /* ["RUDEX.USDT", "RUDEX.XBS"], //MPA @@ -292,36 +291,44 @@ export function getFeaturedMarkets(quotes = []) { //["RUDEX.BTC", "DONATE"], ["RUDEX.BTC", "GPH"], - ["RUDEX.BTC", "RUDEX.PPY"], - //["RUDEX.BTC", "RUDEX.NBS"], + ["RUDEX.BTC", "RUDEX.LTC"], ["RUDEX.BTC", "RUDEX.ETH"], ["RUDEX.BTC", "RUDEX.XMR"], ["RUDEX.BTC", "RUDEX.EOS"], ["RUDEX.BTC", "RUDEX.GOLOS"], ["RUDEX.BTC", "RUDEX.STEEM"], - //["RUDEX.BTC", "RUDEX.WLS"], - //["RUDEX.BTC", "RUDEX.SMOKE"], delisted ["RUDEX.BTC", "RUDEX.BTS"], ["RUDEX.BTC", "RUDEX.TRX"], + ["RUDEX.BTC", "RUDEX.PPY"], + ["RUDEX.BTC", "RUDEX.SMOKE"], + ["RUDEX.BTC", "RUDEX.WLS"], + //["RUDEX.BTC", "RUDEX.LOTTERY"], //["RUDEX.BTC", "RUBLE"], //["RUDEX.BTC", "RUDEX.XBT"] //MPA //Bitshares ["RUDEX.BTS", "GPH"], - ["RUDEX.BTS", "RUDEX.PPY"], ["RUDEX.BTS", "RUDEX.NBS"], ["RUDEX.BTS", "RUDEX.BTC"], + ["RUDEX.BTS", "RUDEX.LTC"], ["RUDEX.BTS", "RUDEX.USDT"], ["RUDEX.BTS", "RUDEX.ETH"], ["RUDEX.BTS", "RUDEX.XMR"], ["RUDEX.BTS", "RUDEX.EOS"], ["RUDEX.BTS", "RUDEX.GOLOS"], ["RUDEX.BTS", "RUDEX.STEEM"], + ["RUDEX.BTS", "RUDEX.TRX"], + + ["RUDEX.BTS", "RUDEX.PPY"], + ["RUDEX.BTS", "RUDEX.SMOKE"], ["RUDEX.BTS", "RUDEX.WLS"], - //["RUDEX.BTS", "RUDEX.SMOKE"], delisted - ["RUDEX.BTS", "RUDEX.TRX"] + + //gpUSD + ["USD", "RUDEX.USDT"], + ["USD", "GPH"], + ["USD", "RUDEX.PZM"] ].filter(a => { if (!quotes.length) return true; return quotes.indexOf(a[0]) !== -1; @@ -430,13 +437,13 @@ export function getListingCoins() { goal: 3000, votes: 0 }, - { + /* { name: "Litecoin", ticker: "LTC", account: "rudex-litecoin", goal: 2000, votes: 0 - }, + },*/ { name: "Minter Network", ticker: "BIP", @@ -455,15 +462,22 @@ export function getListingCoins() { name: "Telos", ticker: "TLOS", account: "rudex-telos", - goal: 2000, + goal: 3000, votes: 0 }, - { + /* { name: "Dash", ticker: "DASH", account: "rudex-dash", goal: 2000, votes: 0 + },*/ + { + name: "Ark", + ticker: "ARK", + account: "rudex-ark", + goal: 3000, + votes: 0 } //Disabled diff --git a/app/components/Account/AccountOverview.jsx b/app/components/Account/AccountOverview.jsx index 0f92933d9b..334326028b 100644 --- a/app/components/Account/AccountOverview.jsx +++ b/app/components/Account/AccountOverview.jsx @@ -43,19 +43,21 @@ class AccountOverview extends React.Component { "DONATE", "RUDEX.BTC", + "RUDEX.LTC", "RUDEX.ETH", "RUDEX.USDT", "RUDEX.EOS", "RUDEX.PZM", "RUDEX.GOLOS", "RUDEX.STEEM", - "RUDEX.WLS", - "RUDEX.SMOKE", "RUDEX.NBS", - "RUDEX.PPY", "RUDEX.XMR", "RUDEX.BTS", - "RUDEX.TRX" + "RUDEX.TRX", + + "RUDEX.PPY", + "RUDEX.SMOKE", + "RUDEX.WLS" ], hideFishingProposals: true, question1: false, diff --git a/app/components/DepositWithdraw/rudex/RuDexGateway.jsx b/app/components/DepositWithdraw/rudex/RuDexGateway.jsx index 78dcddd1d7..b7a5e352c2 100644 --- a/app/components/DepositWithdraw/rudex/RuDexGateway.jsx +++ b/app/components/DepositWithdraw/rudex/RuDexGateway.jsx @@ -239,6 +239,7 @@ class RuDexGateway extends React.Component { deposit_coin_type={coin.backingCoin.toLowerCase()} deposit_account={coin.gatewayWallet} deposit_wallet_type={coin.walletType} + description={coin.description} receive_asset={coin.symbol} receive_coin_type={coin.symbol.toLowerCase()} supports_output_memos={coin.supportsMemos} diff --git a/app/components/DepositWithdraw/rudex/RuDexGatewayDepositRequest.jsx b/app/components/DepositWithdraw/rudex/RuDexGatewayDepositRequest.jsx index 14e7f3f35e..0704bdf7f7 100644 --- a/app/components/DepositWithdraw/rudex/RuDexGatewayDepositRequest.jsx +++ b/app/components/DepositWithdraw/rudex/RuDexGatewayDepositRequest.jsx @@ -31,6 +31,7 @@ class RuDexGatewayDepositRequest extends React.Component { issuer_account: ChainTypes.ChainAccount, deposit_asset: PropTypes.string, deposit_wallet_type: PropTypes.string, + description: PropTypes.string, receive_asset: ChainTypes.ChainAsset, deprecated_in_favor_of: ChainTypes.ChainAsset, deprecated_message: PropTypes.string, @@ -414,7 +415,7 @@ class RuDexGatewayDepositRequest extends React.Component { @@ -434,6 +435,22 @@ class RuDexGatewayDepositRequest extends React.Component { /> + + + + {depositConfirmation ? ( ({depositConfirmation}) @@ -639,7 +656,7 @@ class RuDexGatewayDepositRequest extends React.Component { @@ -672,6 +689,7 @@ class RuDexGatewayDepositRequest extends React.Component { output_coin_symbol={this.props.deposit_asset} output_coin_type={this.props.deposit_coin_type} output_wallet_type={this.props.deposit_wallet_type} + description={this.props.description} output_supports_memos={ this.props.supports_output_memos } diff --git a/app/components/DepositWithdraw/rudex/RuDexWithdrawModal.jsx b/app/components/DepositWithdraw/rudex/RuDexWithdrawModal.jsx index f0245c690f..a48ef0aa21 100644 --- a/app/components/DepositWithdraw/rudex/RuDexWithdrawModal.jsx +++ b/app/components/DepositWithdraw/rudex/RuDexWithdrawModal.jsx @@ -27,6 +27,7 @@ class RuDexWithdrawModal extends React.Component { output_coin_type: PropTypes.string.isRequired, url: PropTypes.string, output_wallet_type: PropTypes.string, + description: PropTypes.string, output_supports_memos: PropTypes.bool.isRequired, output_supportsPublicKey: PropTypes.bool.isRequired, amount_to_withdraw: PropTypes.string, @@ -207,7 +208,7 @@ class RuDexWithdrawModal extends React.Component { amount !== undefined && !parseFloat(amount) }, function() { - this._checkBalance; + this._checkBalance(); this._checkMinAmount(); } ); @@ -631,7 +632,7 @@ class RuDexWithdrawModal extends React.Component {
); @@ -853,6 +854,20 @@ class RuDexWithdrawModal extends React.Component {
diff --git a/app/components/Utility/ChainSelect.jsx b/app/components/Utility/ChainSelect.jsx index 565fd47f5c..e198de0e4c 100644 --- a/app/components/Utility/ChainSelect.jsx +++ b/app/components/Utility/ChainSelect.jsx @@ -16,7 +16,7 @@ class ChainSelectView extends React.Component { }; static defaultProps = { - chains: ["BitShares Blockchain"], + chains: ["Graphene Blockchain"], placeholder: null, style: {}, selectStyle: {} diff --git a/package-lock.json b/package-lock.json index d7feee40fe..9197f5ceec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "RuDEX3-light", - "version": "3.3.211011", + "version": "3.3.211206", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 41dc970807..6d09541bc6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "RuDEX3-light", - "version": "3.3.211011", + "version": "3.3.211206", "description": "Advanced wallet interface for the Graphene financial blockchain.", "homepage": "https://github.com/blckchnd/rudex-ui", "author": "RuDEX Team ",