diff --git a/app/assets/asset-symbols/rudex.xmr.png b/app/assets/asset-symbols/rudex.xmr.png new file mode 100644 index 0000000000..05acd802d0 Binary files /dev/null and b/app/assets/asset-symbols/rudex.xmr.png differ diff --git a/app/assets/asset-symbols/symbols.js b/app/assets/asset-symbols/symbols.js index b2a12946e2..5ac6d599c6 100644 --- a/app/assets/asset-symbols/symbols.js +++ b/app/assets/asset-symbols/symbols.js @@ -11,7 +11,6 @@ require("file-loader?name=asset-symbols/[name].png!./bts.png"); //require("file-loader?name=asset-symbols/silver.png!./silver.png"); // rudex assets -require("file-loader?name=asset-symbols/[name].png!./donate.png"); 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"); @@ -23,6 +22,7 @@ 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.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.dgb.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.gbg.png"); @@ -40,7 +40,8 @@ require("file-loader?name=asset-symbols/[name].png!./rudex.rub.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.oil.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.xau.png"); -//Lottery +//RuDEX others +require("file-loader?name=asset-symbols/[name].png!./donate.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.lottery.png"); // 3rd party assets diff --git a/app/assets/stylesheets/components/_exchange.scss b/app/assets/stylesheets/components/_exchange.scss index 654b7444a0..180e0d9437 100644 --- a/app/assets/stylesheets/components/_exchange.scss +++ b/app/assets/stylesheets/components/_exchange.scss @@ -731,6 +731,7 @@ input[type="number"]::-webkit-outer-spin-button { .mymarkets-list { padding: 0; + margin-bottom: 15px; font-size: 0.75rem; .table > thead tr th { font-size: 0.75rem; diff --git a/app/branding.js b/app/branding.js index 0edecf06eb..57d1ad2423 100644 --- a/app/branding.js +++ b/app/branding.js @@ -151,6 +151,7 @@ export function getMyMarketsQuotes() { "RUDEX.SMOKE", "RUDEX.PZM", "RUDEX.NBS", + "RUDEX.XMR", //RuDEX MPA-s "RUDEX.XBS", @@ -217,11 +218,12 @@ export function getFeaturedMarkets(quotes = []) { ["BTS", "RUDEX.BTC"], ["BTS", "RUDEX.USDT"], ["BTS", "RUDEX.ETH"], + ["BTS", "RUDEX.XMR"], ["BTS", "RUDEX.EOS"], ["BTS", "RUDEX.GOLOS"], ["BTS", "RUDEX.STEEM"], ["BTS", "RUDEX.WLS"], - ["BTS", "RUDEX.SMOKE"], //MPA + ["BTS", "RUDEX.SMOKE"], //USDT /*["RUBLE", "BTS"], ["RUBLE", "PPY"], @@ -233,8 +235,10 @@ export function getFeaturedMarkets(quotes = []) { ["RUBLE", "RUDEX.STEEM"], ["RUBLE", "RUDEX.WLS"], ["RUBLE", "RUDEX.SMOKE"], - ["RUBLE", "RUDEX.RUB"], */ //USDT - ["RUDEX.USDT", "BTS"], + ["RUBLE", "RUDEX.RUB"], */ [ + "RUDEX.USDT", + "BTS" + ], ["RUDEX.USDT", "PPY"], ["RUDEX.USDT", "RUDEX.NBS"], ["RUDEX.USDT", "RUDEX.BTC"], @@ -245,7 +249,9 @@ export function getFeaturedMarkets(quotes = []) { ["RUDEX.USDT", "RUDEX.WLS"], ["RUDEX.USDT", "RUDEX.SMOKE"], ["RUDEX.USDT", "RUDEX.PZM"], + ["RUDEX.USDT", "RUDEX.XMR"], //["RUDEX.USDT", "RUBLE"], + ["RUDEX.USDT", "RUDEX.XBS"], //MPA ["RUDEX.USDT", "RUDEX.XBT"], //MPA ["RUDEX.USDT", "RUDEX.OIL"], //MPA @@ -258,13 +264,14 @@ export function getFeaturedMarkets(quotes = []) { ["RUDEX.BTC", "RUDEX.NBS"], ["RUDEX.BTC", "RUDEX.USDT"], ["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"], ["RUDEX.BTC", "DONATE"], - ["RUDEX.BTC", "RUDEX.LOTTERY"], + //["RUDEX.BTC", "RUDEX.LOTTERY"], //["RUDEX.BTC", "RUBLE"], ["RUDEX.BTC", "RUDEX.XBT"] //MPA ].filter(a => { @@ -348,13 +355,13 @@ export function getConfigurationAsset() { export function getListingCoins() { return [ //soon: true, (for TON example) - { + /* { name: "Monero", ticker: "XMR", account: "rudex-monero", goal: 5000, votes: 0 - }, + },*/ { name: "Litecoin", ticker: "LTC", diff --git a/app/components/Account/AccountOverview.jsx b/app/components/Account/AccountOverview.jsx index 530537c5f4..e41458589e 100644 --- a/app/components/Account/AccountOverview.jsx +++ b/app/components/Account/AccountOverview.jsx @@ -49,6 +49,8 @@ class AccountOverview extends React.Component { "RUDEX.WLS", "RUDEX.SMOKE", "RUDEX.PZM", + "RUDEX.NBS", + "RUDEX.XMR", "RUDEX.GRC", "RUDEX.GBG", diff --git a/app/components/DepositWithdraw/rudex/RuDexGatewayDepositRequest.jsx b/app/components/DepositWithdraw/rudex/RuDexGatewayDepositRequest.jsx index 0d008c9bc8..14e7f3f35e 100644 --- a/app/components/DepositWithdraw/rudex/RuDexGatewayDepositRequest.jsx +++ b/app/components/DepositWithdraw/rudex/RuDexGatewayDepositRequest.jsx @@ -280,7 +280,16 @@ class RuDexGatewayDepositRequest extends React.Component { // This is a client that uses unique deposit addresses to select the output clipboardText = receive_address.address; deposit_address_fragment = ( - {receive_address.address} + + {receive_address.address} + ); } withdraw_memo_prefix = ""; diff --git a/app/components/DepositWithdraw/rudex/raido/RaidoDepositRequest.jsx b/app/components/DepositWithdraw/rudex/raido/RaidoDepositRequest.jsx index d0f2bb3c7b..5ef86e9a44 100644 --- a/app/components/DepositWithdraw/rudex/raido/RaidoDepositRequest.jsx +++ b/app/components/DepositWithdraw/rudex/raido/RaidoDepositRequest.jsx @@ -653,7 +653,7 @@ class RaidoDepositRequest extends React.Component { "gateway.rudex.buy_crypto.you_give_placeholder" )} style={{ - backgroundImage: `url(\/images\/raido-payment-${this.state.raido.give_raw.toLowerCase()}.png)` + backgroundImage: `url(${__BASE_URL__}images\/raido-payment-${this.state.raido.give_raw.toLowerCase()}.png)` }} /> @@ -675,7 +675,7 @@ class RaidoDepositRequest extends React.Component { "gateway.rudex.buy_crypto.you_get_placeholder" )} style={{ - backgroundImage: `url(\/asset-symbols\/rudex.${this.state.raido.get.toLowerCase()}.png)` + backgroundImage: `url(${__BASE_URL__}asset-symbols\/rudex.${this.state.raido.get.toLowerCase()}.png)` }} /> {title} - + ); diff --git a/app/components/Layout/Footer.jsx b/app/components/Layout/Footer.jsx index fd7c983808..d49f5611e3 100644 --- a/app/components/Layout/Footer.jsx +++ b/app/components/Layout/Footer.jsx @@ -612,7 +612,7 @@ class Footer extends React.Component { style={{ height: "22px" }} - src={"/images/google-play.png"} + src={`${__BASE_URL__}images/google-play.png`} /> diff --git a/app/components/Layout/MenuDataStructure.js b/app/components/Layout/MenuDataStructure.js index 9abb4c607b..95e46846a8 100644 --- a/app/components/Layout/MenuDataStructure.js +++ b/app/components/Layout/MenuDataStructure.js @@ -73,8 +73,7 @@ class MenuDataStructure { allItems.account, allItems.market, allItems.explorer, - /*allItems.bots*/ - allItems.lottery + allItems.bots ]; } @@ -260,8 +259,8 @@ class MenuDataStructure { target: "/bots", icon: "robot", text: "header.bots", - inHeaderBehavior: MenuItemType.Dynamic, - inDropdownBehavior: MenuItemType.Always + inHeaderBehavior: MenuItemType.Always, + inDropdownBehavior: MenuItemType.WhenNotInHeader }), listing: state => ({ includePattern: ["/listing"], @@ -296,7 +295,7 @@ class MenuDataStructure { target: "/lottery", icon: "lottery", text: "header.lottery", - inHeaderBehavior: MenuItemType.WhenAccount, + inHeaderBehavior: MenuItemType.Dynamic, inDropdownBehavior: MenuItemType.Always }), follow: state => ({ diff --git a/charting_library/install-charting-library.js b/charting_library/install-charting-library.js index 91d46732a7..c657733872 100644 --- a/charting_library/install-charting-library.js +++ b/charting_library/install-charting-library.js @@ -12,8 +12,9 @@ function getMD5Digest(file) { var outputFilePath = path.join(__dirname, "charting_library.zip"); const outputFile = fs.createWriteStream(outputFilePath); -http.get("https://bitshares.org/assets/charting_library.zip", (response) => { - response.pipe(outputFile); +//http.get("https://bitshares.org/assets/charting_library.zip", (response) => {= +http.get("https://files.rudex.org/rudex/charting_library_original.zip", (response) => { + response.pipe(outputFile); }).on("error", (err) => { console.error("Failed to download charting_library archive"); console.error(err); diff --git a/package-lock.json b/package-lock.json index 50a24e7d62..2b250d6978 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "RuDEX3-light", - "version": "3.3.201112", + "version": "3.3.210115", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 463cad6b9e..4ea1a5a709 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "RuDEX3-light", - "version": "3.3.201112", + "version": "3.3.210115", "description": "Advanced wallet interface for the BitShares financial blockchain.", "homepage": "https://github.com/blckchnd/rudex-ui", "author": "RuDEX Team ",