From b8df796262b6cb0c742454a3dc71b846cf54e9c8 Mon Sep 17 00:00:00 2001 From: serdrdoor Date: Mon, 6 Dec 2021 16:29:20 +0300 Subject: [PATCH] - fix for translate gp-assets - add LTC markets - add Ark to vote listing - add additional info for deposit/withdrawal network asset - add info real get amount after withdrawal (-gateFee) --- app/assets/asset-symbols/rudex.ltc.png | Bin 0 -> 1561 bytes app/assets/asset-symbols/symbols.js | 10 +- app/assets/coins-logo/ark.png | Bin 0 -> 8087 bytes app/assets/coins-logo/coins.js | 1 + app/assets/icons/direct_debit.svg | 107 +++++------ app/assets/icons/prediction.svg | 180 +++++------------- app/assets/locales/locale-de.json | 2 +- app/assets/locales/locale-en.json | 5 +- app/assets/locales/locale-es.json | 2 +- app/assets/locales/locale-fr.json | 2 +- app/assets/locales/locale-it.json | 2 +- app/assets/locales/locale-ja.json | 2 +- app/assets/locales/locale-ko.json | 2 +- app/assets/locales/locale-ru.json | 5 +- app/assets/locales/locale-tr.json | 2 +- app/assets/locales/locale-zh.json | 2 +- app/branding.js | 64 ++++--- app/components/Account/AccountOverview.jsx | 10 +- .../DepositWithdraw/rudex/RuDexGateway.jsx | 1 + .../rudex/RuDexGatewayDepositRequest.jsx | 22 ++- .../rudex/RuDexWithdrawModal.jsx | 19 +- app/components/Utility/ChainSelect.jsx | 2 +- package-lock.json | 2 +- package.json | 2 +- 24 files changed, 199 insertions(+), 247 deletions(-) create mode 100644 app/assets/asset-symbols/rudex.ltc.png create mode 100644 app/assets/coins-logo/ark.png diff --git a/app/assets/asset-symbols/rudex.ltc.png b/app/assets/asset-symbols/rudex.ltc.png new file mode 100644 index 0000000000000000000000000000000000000000..3b86cae8f7398a3ea10522c161d35ede021e9336 GIT binary patch literal 1561 zcmZ`(`CC#66vY`dcQKckXJ%LrEwZ%2q9FCEbdWP)$7F9IRq zn#}&Jk3i^)NqFBqXY{mc9J7RgzCZp(eE`I-U=q3_k2o6Hmd%vyOPBijW?Ks<=d0yL z`&bN)VQe+!-AZh3T9CW}ZQQlsbWfhTkv4WZzARz* z)5UBYC~7K7^?YyVs5{|%!8H!VYXseo0GmmCe12SbM01Lk^LT$vP1p}SLtzQ7k$g%- zqW5N$f9X!BNeO%)vLO0_`;1jL%!#|f{AswyfRDA^k>u{0rdrAtcmPyc1&S@e0()f@ z)@;FAz(ZDnW(!;Z8(D?U#{lE9A)UVhP|1d@*%)s?A{#=pF`h zm~Uxg8rzV28*V|Sk<)XnIZO(wW4Z!w<&AC$E4>7l8>Ep3TCABM1D-k}ZaZ zH8&H-k6osD@2yRhZriRE#l#%vCFluPZXnP-%T~Ipjs@D=Ln=&ORoY2)h)HxaGM5VdTi1=HToN%4=G2#(ukEKi z@H;mXW3;DN{#D@CPl*S5Y5qs_M+=&cq!pbm%sS)x$|}0u9X%N0aH9SRU9A#=3%fM4 zhj!=7>Z9|2sjjjd$cus^+;)(1qM)lf%8r6ItJU_Ikkdd)_=AvyCq7fC*MEfk)Tcb; zk`*T`dH3zi?+zyOa~B?_Cn~GhORL@2mu4{+3cCdY7|NNU0jDsl`R6KR$f4Hr9zH5?6ubvXFOnWJ+RM~}Y z&MWnDPn{lc_&6p?Lec_V(ODXPUD@e7Xb;1t(q-#J1h<`@QVwISrlajT&p5tQ{&Y%! zyBp1#Dqn8KE8>055_@lwNUy%0b`1^fJa@nB#_XpTV`K0Lvirc>i5%~1@?+}WyMLW1 zj9lm{kx3K9kMH5!PSR*qJfD%^w~tI?SK4Qe7I4nb{lLfAn+`sNQj`Xo^Ry-1p%|q> znm=haU?X}!J*7AYrNdVo16~p?i|@3}`j>sdUB(Xg4;~)H8pETa<2D8BVgw96H{0#* zjIm{$Z#>Iua@j-Tg;)3s{Ep*Yrqg22XIghIQQAPMwfC_&JE?fDTyrp@`FvBS>)=8yJ$qrFLs_>efO9cozcs6zJRc*)(IP&>J6#bb!8J8a` z{$#PC9oJ5gR_s!JE{QlTAH7I%S3%Yn||JI<|1W?Ozx>MXtU>3j4+o-E1ROPODs_) zR^tw(xUaKHmkrqQAC2a@V7cXD6DvzoKX*UF3T@VG=07({@;KG?cd-h))|*u-!!XfFg7 z!Paf^9(_fRKi}O}xE?Ls2((I|S{X!Dt>!XB=IJ7q^F?yu*Myr|Ocj|sv@bSj4MV3b x<8My1a<93x2j!sD^mR{7soTAB48QjvQJrS2?%t?fcT|ZBBP2oyUc8+`{~x`q&v*a; literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..69507d62b221abd93152cf7275dd3e7765e372f7 GIT binary patch literal 8087 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 - - - - - - - - - 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 ",