Skip to content

Commit

Permalink
Merge branch 'develop' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan Schiessl committed May 10, 2020
2 parents 53cdc34 + d0d8c45 commit 54bcc19
Show file tree
Hide file tree
Showing 39 changed files with 2,711 additions and 2,209 deletions.
2 changes: 1 addition & 1 deletion app/api/apiConfig.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const openledgerAPIs = {
};

export const rudexAPIs = {
BASE: "https://gateway.rudex.org/api/v3_0",
BASE: "https://gateway.rudex.org/api/rudex",
COINS_LIST: "/coins",
NEW_DEPOSIT_ADDRESS: "/simple-api/initiate-trade"
};
Expand Down
Binary file added app/assets/asset-symbols/rudex.pzm.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/asset-symbols/rudex.usdt.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions app/assets/asset-symbols/symbols.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ require("file-loader?name=asset-symbols/[name].png!./nmc.png");
// 3rd party assets (RuDEX)
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.eos.png");
require("file-loader?name=asset-symbols/[name].png!./rudex.eth.png");
require("file-loader?name=asset-symbols/[name].png!./rudex.gbg.png");
Expand All @@ -97,3 +98,4 @@ require("file-loader?name=asset-symbols/[name].png!./rudex.sbd.png");
require("file-loader?name=asset-symbols/[name].png!./rudex.smoke.png");
require("file-loader?name=asset-symbols/[name].png!./rudex.steem.png");
require("file-loader?name=asset-symbols/[name].png!./rudex.wls.png");
require("file-loader?name=asset-symbols/[name].png!./rudex.pzm.png");
2 changes: 1 addition & 1 deletion app/assets/index.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
{{/if}}
</head>

<body>
<body spellcheck="false">
<main id="content">
<h1 class="centerDiv" style="">Loading...</h1>
</main>
Expand Down
1 change: 1 addition & 0 deletions app/assets/locales/locale-en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1675,6 +1675,7 @@
"no_assets": "No withdrawable assets available",
"no_estimate": "No estimate available for this object",
"no_gateways": "Sorry, but there are no gateways available to handle this withdrawal",
"public_key": "Public key",
"quantity": "Quantity",
"submit": "Withdraw",
"withdraw": "Withdraw"
Expand Down
619 changes: 310 additions & 309 deletions app/assets/locales/locale-ru.json
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions app/assets/stylesheets/components/_header.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ div.header-right-menu {
}
}

ul.top-stats {
margin-bottom: 0px !important; // remove margin for top-bar
}

.grp-menu-items-group {
flex-flow: row nowrap;
display: flex;
Expand Down
175 changes: 51 additions & 124 deletions app/branding.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,19 +136,13 @@ export function getMyMarketsQuotes() {
"SILVER",
"USD"
],
bridgeTokens: ["BRIDGE.BCO", "BRIDGE.BTC", "BRIDGE.MONA", "BRIDGE.ZNY"],
gdexTokens: [
"GDEX.BTC",
"GDEX.BTO",
"GDEX.EOS",
"GDEX.ETH",
"GDEX.BTM",
"GDEX.NEO",
"GDEX.GAS",
"GDEX.QTUM",
"GDEX.BKBT",
"GDEX.GXC",
"GDEX.HPB",
"GDEX.SEER",
"GDEX.FOTA",
"GDEX.JRC",
Expand All @@ -159,58 +153,22 @@ export function getMyMarketsQuotes() {
"GDEX.NULS",
"GDEX.USDT"
],
openledgerTokens: [
"OBITS",
"OPEN.BTC",
"OPEN.DASH",
"OPEN.DGD",
"OPEN.DOGE",
"OPEN.EOS",
"OPEN.EOSDAC",
"OPEN.ETH",
"OPEN.EURT",
"OPEN.GRC",
"OPEN.INCNT",
"OPEN.KRM",
"OPEN.LISK",
"OPEN.LTC",
"OPEN.MAID",
"OPEN.MKR",
"OPEN.NEO",
"OPEN.OMG",
"OPEN.SBD",
"OPEN.STEEM",
"OPEN.TUSD",
"OPEN.USDT",
"OPEN.WAVES",
"OPEN.XMR",
"OPEN.ZEC",
"OPEN.ZRX"
],
openledgerTokens: ["OBITS"],
rudexTokens: [
"PPY",
"RUDEX.GBG",
"RUDEX.GOLOS",
"RUDEX.KRM",
"RUDEX.SBD",
"RUDEX.STEEM",
"RUDEX.BTC",
"RUDEX.ETH",
"RUDEX.USDT",
"RUDEX.EOS",
"RUDEX.GOLOS",
"RUDEX.GBG",
"RUDEX.STEEM",
"RUDEX.SBD",
"RUDEX.KRM",
"RUDEX.WLS",
"RUDEX.SMOKE",
"RUDEX.GRC"
],
sparkTokens: [
"ZEPH",
"PEG.PHP",
"SPARKDEX.ETH",
"SPARKDEX.BTC",
"SPARKDEX.HKD",
"SPARKDEX.SGD",
"SPARKDEX.AUD",
"SPARKDEX.EUR",
"SPARKDEX.GBP"
"RUDEX.GRC",
"RUDEX.PZM"
],
xbtsxTokens: [
"XBTSX.STH",
Expand All @@ -221,7 +179,6 @@ export function getMyMarketsQuotes() {
"XBTSX.BCH",
"XBTSX.LTC",
"XBTSX.DASH",
"XBTSX.XSPEC",
"XBTSX.NVC",
"XBTSX.UNI",
"XBTSX.NMC",
Expand All @@ -231,19 +188,7 @@ export function getMyMarketsQuotes() {
"XBTSX.ETH",
"XBTSX.EXR"
],
otherTokens: [
"BTWTY",
"TWENTIX",

"CVCOIN",
"HERO",
"OCT",
"HERTZ",
"ICOO",
"SMOKE",
"STEALTH",
"YOYOW"
]
otherTokens: ["CVCOIN", "HERO", "OCT", "HERTZ", "YOYOW"]
};

let allTokens = [];
Expand All @@ -264,94 +209,81 @@ export function getFeaturedMarkets(quotes = []) {
}
return [
["USD", "BTS"],
["USD", "OPEN.BTC"],
["USD", "OPEN.USDT"],
["USD", "OPEN.ETH"],
["USD", "OPEN.DASH"],
["USD", "GOLD"],
["USD", "HERO"],
["USD", "GDEX.BTC"],
["USD", "GDEX.ETH"],
["USD", "GDEX.EOS"],
["USD", "GDEX.BTO"],
["USD", "OPEN.EOSDAC"],
["USD", "RUDEX.BTC"],
["USD", "RUDEX.GOLOS"],
["USD", "RUDEX.STEEM"],
["USD", "RUDEX.EOS"],
["USD", "RUDEX.BTC"],
["USD", "RUDEX.ETH"],
["USD", "RUDEX.USDT"],
["USD", "RUDEX.WLS"],
["USD", "RUDEX.SMOKE"],
["CNY", "BTS"],
["CNY", "OPEN.BTC"],
["CNY", "USD"],
["CNY", "OPEN.ETH"],
["CNY", "YOYOW"],
["CNY", "OCT"],
["CNY", "GDEX.BTC"],
["CNY", "GDEX.ETH"],
["CNY", "GDEX.EOS"],
["CNY", "GDEX.BTO"],
["CNY", "GDEX.BTM"],
["CNY", "GDEX.SEER"],
["CNY", "GDEX.BKBT"],
["CNY", "GDEX.USDT"],
["CNY", "GDEX.GXC"],
["CNY", "RUDEX.GOLOS"],
["CNY", "RUDEX.GBG"],
["CNY", "RUDEX.BTC"],
["CNY", "RUDEX.STEEM"],
["CNY", "RUDEX.EOS"],
["OPEN.BTC", "BTS"],
["OPEN.BTC", "OPEN.ETH"],
["OPEN.BTC", "OPEN.DASH"],
["OPEN.BTC", "OPEN.DGD"],
["OPEN.BTC", "OPEN.STEEM"],
["BTS", "OPEN.ETH"],
["BTS", "OPEN.EOS"],
["CNY", "RUDEX.BTC"],
["CNY", "RUDEX.ETH"],
["CNY", "RUDEX.USDT"],
["CNY", "RUDEX.WLS"],
["CNY", "RUDEX.SMOKE"],
["BTS", "PPY"],
["BTS", "OPEN.STEEM"],
["BTS", "OBITS"],
["BTS", "RUBLE"],
["BTS", "HERO"],
["BTS", "OCT"],
["BTS", "SILVER"],
["BTS", "GOLD"],
["BTS", "BTWTY"],
["BTS", "SMOKE"],
["BTS", "GDEX.BTC"],
["BTS", "GDEX.ETH"],
["BTS", "GDEX.EOS"],
["BTS", "GDEX.BTO"],
["BTS", "GDEX.USDT"],
["BTS", "OPEN.EOSDAC"],
["USD", "OPEN.STEEM"],
["USD", "OPEN.MAID"],
["OPEN.USDT", "OPEN.BTC"],
["OPEN.BTC", "OPEN.MAID"],
["BTS", "OPEN.MAID"],
["BTS", "OPEN.HEAT"],
["BTS", "OPEN.INCENT"],
["RUDEX.USDT", "RUDEX.BTC"],
["RUDEX.USDT", "RUDEX.ETH"],
["RUDEX.USDT", "RUDEX.EOS"],
["RUDEX.USDT", "RUDEX.PZM"],
["RUDEX.USDT", "PPY"],
["RUDEX.USDT", "RUBLE"],
["RUDEX.BTC", "RUDEX.ETH"],
["RUDEX.BTC", "RUDEX.EOS"],
["RUDEX.BTC", "RUDEX.STEEM"],
["RUDEX.BTC", "RUDEX.GOLOS"],
["RUDEX.BTC", "RUDEX.WLS"],
["RUDEX.BTC", "PPY"],
["RUBLE", "RUDEX.BTC"],
["RUBLE", "RUDEX.ETH"],
["RUBLE", "RUDEX.USDT"],
["RUBLE", "RUDEX.GOLOS"],
["RUDEX.BTC", "RUDEX.PZM"],
["RUB", "RUDEX.GOLOS"],
["RUB", "RUDEX.GBG"],
["BTS", "RUDEX.GOLOS"],
["BTS", "RUDEX.STEEM"],
["BTS", "RUDEX.SBD"],
["BTS", "RUDEX.KRM"],
["BTS", "RUDEX.EOS"],
["BTS", "RUDEX.BTC"],
["BTS", "RUDEX.ETH"],
["BTS", "RUDEX.USDT"],
["BTS", "RUDEX.WLS"],
["BTS", "RUDEX.SMOKE"],
["BTS", "RUDEX.GRC"],
["BTS", "RUDEX.PZM"],
["BTS", "XBTSX.STH"],
["BTS", "XBTSX.WAVES"],
["BTS", "ZEPH"],
["BTS", "HERTZ"],
["BTS", "SPARKDEX.BTC"],
["BTS", "SPARKDEX.ETH"],
["BTS", "SPARKDEX.HKD"],
["SPARKDEX.HKD", "SPARKDEX.BTC"],
["SPARKDEX.HKD", "SPARKDEX.ETH"],
["BTS", "SPARKDEX.SGD"],
["BTS", "SPARKDEX.AUD"],
["BTS", "SPARKDEX.EUR"],
["BTS", "SPARKDEX.GBP"],
["BTS", "PEG.PHP"]
["BTS", "HERTZ"]
].filter(a => {
if (!quotes.length) return true;
return quotes.indexOf(a[0]) !== -1;
Expand All @@ -367,15 +299,7 @@ export function getAssetNamespaces() {
if (_isTestnet()) {
return [];
}
return [
"OPEN.",
"RUDEX.",
"BRIDGE.",
"GDEX.",
"XBTSX.",
"SPARKDEX.",
"CITADEL."
];
return ["OPEN.", "RUDEX.", "GDEX.", "XBTSX.", "CITADEL."];
}

/**
Expand All @@ -395,13 +319,12 @@ export function getAssetHideNamespaces() {
export function allowedGateway(gateway) {
const allowedGateways = [
"TRADE",
"OPEN",
"OPEN", // keep to display the warning icon, permanently disabled in gateways.js
"RUDEX",
"BRIDGE",
"GDEX",
"XBTSX",
"SPARKDEX",
"CITADEL"
"CITADEL",
"BRIDGE" // keep to display the warning icon, permanently disabled in gateways.js
];
if (!gateway) {
// answers the question: are any allowed?
Expand Down Expand Up @@ -433,3 +356,7 @@ export function getConfigurationAsset() {
"This asset is used for decentralized configuration of the BitShares UI placed under bitshares.org."
};
}

export function getSteemNewsTag() {
return null;
}
8 changes: 1 addition & 7 deletions app/components/Account/AccountOverview.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,7 @@ class AccountOverview extends React.Component {
alwaysShowAssets: [
"BTS"
// "USD",
// "CNY",
// "OPEN.BTC",
// "OPEN.USDT",
// "OPEN.ETH",
// "OPEN.MAID",
// "OPEN.STEEM",
// "OPEN.DASH"
// "CNY"
],
hideFishingProposals: true,
question1: false,
Expand Down
7 changes: 3 additions & 4 deletions app/components/Account/AccountPortfolioList.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ class AccountPortfolioList extends React.Component {

let balances = [];
const emptyCell = "-";
balanceList.forEach(balance => {
(balanceList || []).forEach(balance => {
let balanceObject = ChainStore.getObject(balance);
if (!balanceObject) return;
let asset_type = balanceObject.get("asset_type");
Expand Down Expand Up @@ -982,7 +982,7 @@ class AccountPortfolioList extends React.Component {
// Collateral
let collateralBalances = [];

this.props.callOrders.forEach(order => {
(this.props.callOrders || []).forEach(order => {
let collateralObject = ChainStore.getObject(order);
if (
collateralObject.getIn([
Expand Down Expand Up @@ -1071,8 +1071,7 @@ class AccountPortfolioList extends React.Component {
const totalValue =
balanceToAsset(balanceObject).amount +
(orders[asset.get("id")] ? orders[asset.get("id")] : 0) +
this._sumVestingBalances(vestingBalances) +
this._sumCollateralBalances(collateralBalances);
this._sumVestingBalances(vestingBalances);

balances.push({
key: asset.get("symbol"),
Expand Down
Loading

0 comments on commit 54bcc19

Please sign in to comment.