Skip to content

Commit

Permalink
+ add Volume ranking markets
Browse files Browse the repository at this point in the history
+ add gpEUR, gpRUB, gpCNY, gpGOLD, gpSILVER to default margin assets
+ add to Listing: Camino Token, OJA Coin, Donr, Dash
+ add token DEXBOT
+ disable sort for margin positions default
+ bug fix when set proxy vote
+ fix import Private key
+ change default market active Tab to "history". old: "my_orders"

+ add Blckchnd to knownProxies
+ make quote/base on price click switchable
+ add to scamAcconts

+ update translates
+ change image for Android app link
+ only download chart lib if it doesn't exist
+ UI estimated fee error
+ add separators for account update ops in proposals
+ fix vertical order book styles
+ refinement of the data description in the API Node  regions
+ LoadingIndicator to Listing, fix styles, more adaptive, new buttons
+ Improved Loading News with language change
+ delete BloomFilter/GenesisFilter for bts v0.9

+ upgrade Bots (Bot progenitor):
+ improved structure, easier to create new trading strategies
+ radio memorization fix!
+ SpreadTrade, PercentUp  - add cancelOrders for delete bots

+ change menu structure
+ change menu icons
+ edits in Help

+ Bump electron from 16.0.6 to 16.2.6
  • Loading branch information
serdrdoor committed Jul 13, 2022
1 parent f184518 commit 06e9b5c
Show file tree
Hide file tree
Showing 168 changed files with 4,365 additions and 3,237 deletions.
4 changes: 2 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
["@babel/preset-react",{ "targets": { "node": "current"}}]
],
"plugins": [
"react-hot-loader/babel",
"lodash"
"react-hot-loader/babel",
"lodash"
],
"env": {
"test": {
Expand Down
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
bloom_filter
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"react", "json"
],
"extends": ["plugin:react/recommended"],
"parser": "babel-eslint",
"parser": "@babel/eslint-parser",
"env": {
"browser": true,
"node": true,
Expand Down
95 changes: 73 additions & 22 deletions app/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,25 @@ import Page404 from "./components/Page404/Page404";

const Invoice = Loadable({
loader: () =>
import(/* webpackChunkName: "exchange" */ "./components/Transfer/Invoice"),
import(
/* webpackChunkName: "exchange" */ "./components/Transfer/Invoice"
),
loading: LoadingIndicator
});

const Exchange = Loadable({
loader: () =>
import(/* webpackChunkName: "exchange" */ "./components/Exchange/ExchangeContainer"),
import(
/* webpackChunkName: "exchange" */ "./components/Exchange/ExchangeContainer"
),
loading: LoadingIndicator
});

const Explorer = Loadable({
loader: () =>
import(/* webpackChunkName: "explorer" */ "./components/Explorer/Explorer"),
import(
/* webpackChunkName: "explorer" */ "./components/Explorer/Explorer"
),
loading: LoadingIndicator
});

Expand All @@ -54,19 +60,25 @@ const Bots = Loadable({

const PredictionMarketsPage = Loadable({
loader: () =>
import(/* webpackChunkName: "pm" */ "./components/PredictionMarkets/PMAssetsContainer"),
import(
/* webpackChunkName: "pm" */ "./components/PredictionMarkets/PMAssetsContainer"
),
loading: LoadingIndicator
});

const AccountPage = Loadable({
loader: () =>
import(/* webpackChunkName: "account" */ "./components/Account/AccountPage"),
import(
/* webpackChunkName: "account" */ "./components/Account/AccountPage"
),
loading: LoadingIndicator
});

const AccountDepositWithdraw = Loadable({
loader: () =>
import(/* webpackChunkName: "deposit-withdraw" */ "./components/Account/AccountDepositWithdraw"),
import(
/* webpackChunkName: "deposit-withdraw" */ "./components/Account/AccountDepositWithdraw"
),
loading: LoadingIndicator
});

Expand All @@ -77,7 +89,9 @@ const News = Loadable({

const Settings = Loadable({
loader: () =>
import(/* webpackChunkName: "settings" */ "./components/Settings/SettingsContainer"),
import(
/* webpackChunkName: "settings" */ "./components/Settings/SettingsContainer"
),
loading: LoadingIndicator
});

Expand All @@ -94,73 +108,105 @@ const Asset = Loadable({

const Block = Loadable({
loader: () =>
import(/* webpackChunkName: "block" */ "./components/Blockchain/BlockContainer"),
import(
/* webpackChunkName: "block" */ "./components/Blockchain/BlockContainer"
),
loading: LoadingIndicator
});

const DashboardAccountsOnly = Loadable({
loader: () =>
import(/* webpackChunkName: "dashboard-accounts" */ "./components/Dashboard/DashboardAccountsOnly"),
import(
/* webpackChunkName: "dashboard-accounts" */ "./components/Dashboard/DashboardAccountsOnly"
),
loading: LoadingIndicator
});

const DashboardPage = Loadable({
loader: () =>
import(/* webpackChunkName: "dashboard" */ "./components/Dashboard/DashboardPage"),
import(
/* webpackChunkName: "dashboard" */ "./components/Dashboard/DashboardPage"
),
loading: LoadingIndicator
});

const WalletManager = Loadable({
loader: () =>
import(/* webpackChunkName: "wallet" */ "./components/Wallet/WalletManager"),
import(
/* webpackChunkName: "wallet" */ "./components/Wallet/WalletManager"
),
loading: LoadingIndicator
});

const ExistingAccount = Loadable({
loader: () =>
import(/* webpackChunkName: "existing-account" */ "./components/Wallet/ExistingAccount"),
import(
/* webpackChunkName: "existing-account" */ "./components/Wallet/ExistingAccount"
),
loading: LoadingIndicator
});

const CreateWorker = Loadable({
loader: () =>
import(/* webpackChunkName: "create-worker" */ "./components/Account/CreateWorker"),
import(
/* webpackChunkName: "create-worker" */ "./components/Account/CreateWorker"
),
loading: LoadingIndicator
});

const Barter = Loadable({
loader: () =>
import(/* webpackChunkName: "settings" */ "./components/Showcases/Barter"),
import(
/* webpackChunkName: "settings" */ "./components/Showcases/Barter"
),
loading: LoadingIndicator
});

const Borrow = Loadable({
loader: () =>
import(/* webpackChunkName: "settings" */ "./components/Showcases/Borrow"),
import(
/* webpackChunkName: "settings" */ "./components/Showcases/Borrow"
),
loading: LoadingIndicator
});

const Htlc = Loadable({
loader: () =>
import(/* webpackChunkName: "settings" */ "./components/Showcases/Htlc"),
import(
/* webpackChunkName: "settings" */ "./components/Showcases/Htlc"
),
loading: LoadingIndicator
});

const DirectDebit = Loadable({
loader: () =>
import(/* webpackChunkName: "settings" */ "./components/Showcases/DirectDebit"),
import(
/* webpackChunkName: "settings" */ "./components/Showcases/DirectDebit"
),
loading: LoadingIndicator
});

const QuickTrade = Loadable({
loader: () =>
import(/* webpackChunkName: "QuickTrade" */ "./components/QuickTrade/QuickTradeRouter"),
import(
/* webpackChunkName: "QuickTrade" */ "./components/QuickTrade/QuickTradeRouter"
),
loading: LoadingIndicator
});

const Listing = Loadable({
loader: () =>
import(/* webpackChunkName: "listing" */ "./components/Listing/ListingPage"),
import(
/* webpackChunkName: "QuickTrade" */ "./components/Listing/ListingPage"
),
loading: LoadingIndicator
});

const Volume_ranking = Loadable({
loader: () =>
import(
/* webpackChunkName: "QuickTrade" */ "./components/DashboardRuDEX/Dashboard"
),
loading: LoadingIndicator
});

Expand Down Expand Up @@ -439,7 +485,7 @@ class App extends React.Component {
content = (
<div className="grid-frame vertical">
<LoadingIndicator
loadingText={"Connecting to APIs and starting app"}
loadingText={"app_init.connecting_start"}
/>
</div>
);
Expand All @@ -455,13 +501,13 @@ class App extends React.Component {
: "committee-account";
content = (
<div className="grid-frame vertical">
{<NewsHeadline />}
<NewsHeadline />
<Header height={this.state.height} {...others} />
<div id="mainContainer" className="grid-block">
<div className="grid-block vertical">
<Switch>
<Route
path="/"
path="/dashboard"
exact
component={DashboardPage}
/>
Expand Down Expand Up @@ -518,6 +564,11 @@ class App extends React.Component {
exact
component={Listing}
/>{" "}
<Route
path="/"
exact
component={Volume_ranking}
/>{" "}
<Redirect
path={"/voting"}
to={{
Expand Down
11 changes: 10 additions & 1 deletion app/AppInit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ import {HashRouter, BrowserRouter} from "react-router-dom";

const Router = __HASH_HISTORY__ ? HashRouter : BrowserRouter;

// DEPRECATED / WARNING: this is deactivated because there is a race condition for some components when log is saved,
// since it calls setState. If the subcomponent does not have a tailored rerendering logic, this may a WSOD
const allowPersistentLog = false;

class RootIntl extends React.Component {
UNSAFE_componentWillMount() {
IntlActions.switchLocale(this.props.locale);
Expand Down Expand Up @@ -67,7 +71,11 @@ class AppInit extends React.Component {
* @param error
*/
componentDidCatch(error) {
this.saveExtendedLog("error", [error]);
if (this.persistentLogEnabled) {
this.saveExtendedLog("error", [error]);
} else {
console.error(error);
}
}

componentDidUpdate(nextProps, nextState) {
Expand Down Expand Up @@ -97,6 +105,7 @@ class AppInit extends React.Component {
}

_enablePersistingLog() {
if (!allowPersistentLog) return;
if (this.persistentLogEnabled) return;

if (!this.state.extendeLogText.length) {
Expand Down
4 changes: 3 additions & 1 deletion app/actions/AssetActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,9 @@ class AssetActions {
blacklist_markets: [],
description: description,
extensions: {
reward_percent: createObject.reward_percent * 100 || 0,
reward_percent: createObject.reward_percent
? createObject.reward_percent * 100
: undefined,
whitelist_market_fee_sharing: []
}
},
Expand Down
13 changes: 13 additions & 0 deletions app/actions/IntlActions.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import alt from "alt-instance";

import localeCodes from "assets/locales";
import counterpart from "counterpart";

var locale_en = require("assets/locales/locale-en.json");

var locales = {};
if (__ELECTRON__) {
Expand All @@ -14,6 +17,16 @@ class IntlActions {
if (locale === "en") {
return {locale};
}

if (locale !== "ru") {
counterpart.registerTranslations(
"en",
require("counterpart/locales/en")
);
counterpart.registerTranslations("en", locale_en);
counterpart.setFallbackLocale("en");
}

if (__ELECTRON__) {
return {
locale: locale,
Expand Down
2 changes: 1 addition & 1 deletion app/actions/TransactionConfirmActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class TransactionConfirmActions {
trx_block_num: res[0].block_num,
broadcasted_transaction: true
});
if (resolve) resolve();
if (resolve) resolve(res);
})
.catch(error => {
console.error(error);
Expand Down
13 changes: 10 additions & 3 deletions app/api/apiConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,28 +54,35 @@ export const settingsAPIs = {
},
{
url: "wss://gph.lexai.host",
region: "Finland",
region: "Northern Europe",
country: "Finland",
location: "Helsinki",
operator: "Witness: lex",
contact: "telegram:LexAi"
},
{
url: "wss://node.graphenelab.io",
region: "Finland",
region: "Northern Europe",
country: "Finland",
location: "Helsinki",
operator: "Witness: graphene-lab",
contact: "telegram:Denis_GL"
},
{
url: "wss://gph-api.xchng.finance",
region: "Finland",
region: "Northern Europe",
country: "Finland",
location: "Helsinki",
operator: "Witness: xchng",
contact: "telegram:Lososeg"
},
{
url: "wss://fin.marshmallow-cake.icu",
region: "Northern Europe",
country: "Holland",
location: "Amsterdam",
operator: "Witness: marshmallow-cake"
},
{
url: "wss://node.hk.graphene.fans",
region: "Eastern Asia",
Expand Down
Binary file added app/assets/asset-symbols/dexbot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/asset-symbols/rudex.eos.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion app/assets/asset-symbols/symbols.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ require("file-loader?name=asset-symbols/[name].png!./usd.png");
require("file-loader?name=asset-symbols/[name].png!./eur.png");
require("file-loader?name=asset-symbols/[name].png!./rub.png");
require("file-loader?name=asset-symbols/[name].png!./cny.png");
require("file-loader?name=asset-symbols/[name].png!./btc.png");
require("file-loader?name=asset-symbols/[name].png!./gold.png");
require("file-loader?name=asset-symbols/[name].png!./silver.png");
//require("file-loader?name=asset-symbols/[name].png!./btc.png");

// RuDEX assets
require("file-loader?name=asset-symbols/[name].png!./donate.png");
require("file-loader?name=asset-symbols/[name].png!./dexbot.png");

require("file-loader?name=asset-symbols/[name].png!./rudex.btc.png");
require("file-loader?name=asset-symbols/[name].png!./rudex.ltc.png");
Expand Down
Binary file removed app/assets/bts_genesiskeys_bloom.dat
Binary file not shown.
Binary file added app/assets/coins-logo/camino.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/coins-logo/coins.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,8 @@ require("file-loader?name=coins-logo/[name].png!./rat.png");
require("file-loader?name=coins-logo/[name].png!./ttt.png");
require("file-loader?name=coins-logo/[name].png!./ctw.png");
require("file-loader?name=coins-logo/[name].png!./wca.png");
require("file-loader?name=coins-logo/[name].png!./camino.png");
require("file-loader?name=coins-logo/[name].png!./ojx.png");
require("file-loader?name=coins-logo/[name].png!./donr.png");

require("file-loader?name=coins-logo/[name].png!./pzm.png");
Binary file added app/assets/coins-logo/donr.png
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/coins-logo/ojx.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/coins-logo/ttt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 06e9b5c

Please sign in to comment.