diff --git a/app/assets/asset-symbols/rudex.usdt.png b/app/assets/asset-symbols/rudex.usdt.png new file mode 100644 index 0000000000..e670dee813 Binary files /dev/null and b/app/assets/asset-symbols/rudex.usdt.png differ diff --git a/app/assets/asset-symbols/rudex.usdt2.png b/app/assets/asset-symbols/rudex.usdt2.png new file mode 100644 index 0000000000..1f5798c905 Binary files /dev/null and b/app/assets/asset-symbols/rudex.usdt2.png differ diff --git a/app/assets/asset-symbols/symbols.js b/app/assets/asset-symbols/symbols.js index a44c78a5c1..e56363109d 100644 --- a/app/assets/asset-symbols/symbols.js +++ b/app/assets/asset-symbols/symbols.js @@ -12,6 +12,7 @@ require("file-loader?name=asset-symbols/silver.png!./silver.png"); // rudex assets require("file-loader?name=asset-symbols/[name].png!./ppy.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.btc.png"); +require("file-loader?name=asset-symbols/[name].png!./rudex.usdt.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.dgb.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.eos.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.eth.png"); diff --git a/app/branding.js b/app/branding.js index d25aa913b5..390cb26d07 100644 --- a/app/branding.js +++ b/app/branding.js @@ -77,8 +77,15 @@ export function getUnits(chainId = "4018d784") { */ export function getMyMarketsBases() { - //return ["BTS", "RUDEX.BTC", "RUDEX.EOS", "RUBLE", "USD", "CNY"]; - return ["BTS", "RUDEX.BTC", "RUDEX.EOS"]; + return [ + "BTS", + "RUDEX.BTC", + "RUDEX.USDT", + "RUDEX.EOS", + "RUBLE", + "USD", + "CNY" + ]; } /** @@ -89,14 +96,14 @@ export function getMyMarketsBases() { export function getMyMarketsQuotes() { let tokens = { nativeTokens: [ - //"BTC", - "BTS" - ///"CNY", - //"EUR", - //"GOLD", - //"RUBLE", - //"SILVER", - //"USD" + "BTC", + "BTS", + "CNY", + "EUR", + "GOLD", + "RUBLE", + "SILVER", + "USD" ], //bridgeTokens: ["BRIDGE.BCO", "BRIDGE.BTC", "BRIDGE.MONA", "BRIDGE.ZNY"], //gdexTokens: ["GDEX.BTC", "GDEX.BTO", "GDEX.EOS", "GDEX.ETH"], @@ -132,20 +139,20 @@ export function getMyMarketsQuotes() { rudexTokens: [ "RUDEX.BTC", "RUDEX.ETH", - "RUDEX.EOS", - "PPY", - "RUDEX.STEEM", - "RUDEX.SBD", + "RUDEX.USDT", "RUDEX.GOLOS", "RUDEX.GBG", + "RUDEX.STEEM", + "RUDEX.SBD", "RUDEX.KRM", + "RUDEX.EOS", "RUDEX.GRC", + "RUDEX.SMOKE", "RUDEX.WLS", - "RUDEX.SMOKE" + "PPY" ], // winTokens: ["WIN.ETC", "WIN.ETH", "WIN.HSR"], - //otherTokens: ["HERTZ"] - otherTokens: [] + otherTokens: ["HERTZ"] }; let allTokens = []; @@ -162,10 +169,15 @@ export function getMyMarketsQuotes() { */ export function getFeaturedMarkets(quotes = []) { return [ + ["RUDEX.USDT", "RUDEX.BTC"], + ["RUDEX.USDT", "RUDEX.EOS"], + ["RUDEX.USDT", "RUDEX.ETH"], + ["BTS", "RUDEX.USDT"], + ["RUDEX.BTC", "RUDEX.EOS"], ["RUDEX.BTC", "BTS"], ["RUDEX.BTC", "RUDEX.ETH"], - ["RUDEX.BTC", "PPY"], + ["RUDEX.BTC", "RUDEX.STEEM"], //["BTS", "CNY"], //["BTS", "USD"], @@ -173,10 +185,10 @@ export function getFeaturedMarkets(quotes = []) { //["BTS", "RUBLE"], //["BTS", "GOLD"], - ["BTS", "RUDEX.EOS"], ["BTS", "RUDEX.BTC"], - ["BTS", "RUDEX.ETH"], + ["BTS", "RUDEX.EOS"], ["BTS", "PPY"], + ["BTS", "RUDEX.ETH"], ["BTS", "RUDEX.GOLOS"], ["RUDEX.BTC", "RUDEX.GOLOS"], @@ -185,12 +197,15 @@ export function getFeaturedMarkets(quotes = []) { //["RUBLE", "RUDEX.GOLOS"], //["RUBLE", "RUDEX.GBG"], + //["BTS", "RUDEX.STEEM"], + //["BTS", "RUDEX.SBD"], + ["RUDEX.USDT", "RUDEX.GOLOS"], + ["RUDEX.USDT", "RUDEX.GBG"], ["BTS", "RUDEX.STEEM"], - ["RUDEX.BTC", "RUDEX.STEEM"], ["BTS", "RUDEX.SBD"], - ["RUDEX.BTC", "RUDEX.SBD"], - ["BTS", "RUDEX.KRM"], + //["BTS", "RUDEX.KRM"], + ["RUDEX.USDT", "RUDEX.STEEM"], ["BTS", "RUDEX.GRC"], ["BTS", "RUDEX.SMOKE"], ["BTS", "RUDEX.WLS"] diff --git a/app/components/Account/AccountDepositWithdraw.jsx b/app/components/Account/AccountDepositWithdraw.jsx index b5c5f27a11..dfbfa9b1f5 100644 --- a/app/components/Account/AccountDepositWithdraw.jsx +++ b/app/components/Account/AccountDepositWithdraw.jsx @@ -262,13 +262,14 @@ class AccountDepositWithdraw extends React.Component { ) }); + /* serList.push({ name: "Openledger (OPEN.X)", template: (
- {/*
+ {/!*
-
*/} +
*!/}
- - +
+ + https://blog.openledger.info/2017/12/18/openledger-official-web-sites-get-updates-by-the-first - - -
- {" "} + + +
+ {" "} -{" "} - -
-
+ + +
-
- {olNotice1Informed ? ( - - ) : null} -
- ) : null} +
+ {olNotice1Informed ? ( + + ) : null} +
+ ) : null} {olService === "fiat" ? (
@@ -373,6 +374,7 @@ class AccountDepositWithdraw extends React.Component {
) }); +*/ // serList.push({ // name: "BlockTrades", diff --git a/package-lock.json b/package-lock.json index 6dbd495b43..c3b447bb59 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "RuDEX-light", - "version": "2.2.191002", + "version": "2.2.191126", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 514c2be83c..62def6c918 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "RuDEX-light", - "version": "2.2.191002", + "version": "2.2.191126", "description": "Advanced wallet interface for the BitShares financial blockchain.", "homepage": "https://github.com/blckchnd/rudex-ui", "author": "RuDEX Team ",