3.3.210901

- fix for scroll orders - fix for add markets - fix bug bots - add translates - fix unknown image for assets/Dashboard - add Headline notifications - add ES url + apiendpoint lex - fix membership stat + generateCSV from ES - trollbox only RU - del 3 coins for listing
blckchnd · Sep 1, 2021 · 697a9df · 697a9df
1 parent d7da170
commit 697a9df
Show file tree

Hide file tree

Showing 30 changed files with 314 additions and 268 deletions.
diff --git a/app/App.jsx b/app/App.jsx
@@ -455,7 +455,7 @@ 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">

diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js
@@ -67,6 +67,14 @@ export const settingsAPIs = {
             operator: "Witness: blckchnd",
             contact: "telegram:blckchnd"
         },
+        {
+            url: "wss://gph.lexai.host",
+            region: "Finland",
+            country: "Finland",
+            location: "Helsinki",
+            operator: "Witness: lex",
+            contact: "telegram:LexAi"
+        },
         {
             url: "wss://node.hk.graphene.fans",
             region: "Eastern Asia",
@@ -76,7 +84,15 @@ export const settingsAPIs = {
             contact: "telegram:minter_traders"
         }
     ],
-    ES_WRAPPER_LIST: [],
+    ES_WRAPPER_LIST: [
+        {
+            url: "https://es-wrapper.gph.ai",
+            region: "Western Europe",
+            country: "Germany",
+            operator: "Witness: blckchnd",
+            contact: "telegram:blckchnd"
+        }
+    ],
     DEFAULT_FAUCET: getFaucet().url,
     TESTNET_FAUCET: getTestFaucet().url
 };
diff --git a/app/assets/create-notification-string.js b/app/assets/create-notification-string.js
@@ -4,17 +4,17 @@ function createNotifcationString() {
         notifications: [
             {
                 type: "warning",
-                begin_date: "16.05.2019",
-                end_date: "31.12.2019",
+                begin_date: "15.08.2021",
+                end_date: "31.12.2025",
                 content:
                     "Please be aware of scam attempts using Proposed Transactions in your Dashboard. Never approve a proposal if you are not expecting one!"
             },
             {
-                type: "info",
-                begin_date: "02.07.2019",
-                end_date: "09.07.2019",
+                type: "critical",
+                begin_date: "15.08.2021",
+                end_date: "31.12.2025",
                 content:
-                    "2nd Global Graphene Blockchain Developer Conference is happening on 6th-7th July 2019 in Shanghai. Get more information here http://gbacenter.org/event/index_en.html/!"
+                    "WARNING: Users of the Graphene blockchain, DO NOT ACCEPT suspicious offers to trade tokens on private markets or tokens that are not listed in Withdrawals section of the Wallet UI or in default market pairs."
             }
         ],
         blacklists: {

diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json
@@ -1072,7 +1072,9 @@
             "create": "Create a new worker proposal",
             "create_text_1": "In order to create your new worker, please fill in the form below. The worker will be created using your currently active account, which must already be a lifetime member.",
             "create_text_2": "Consider carefully the parameters you choose as they can not be changed once you've published your worker.",
-            "daily_pay": "Daily pay (BTS)",
+            "daily_pay": "Daily pay (GPH)",
+            "time_start": "Time start",
+            "time_finish": "Time finish",
             "date_text": "The start date should be at least a week into the future in order to allow people the time to discover, evaluate and vote for your worker.",
             "name_text": "The name of your worker should be short and descriptive, something like this: 'Worker Purpose - Account Name'",
             "pay_text": "The daily pay defines how much you want to be paid per day and is defined in BTS. The current best practice is to define a salary in USD/CNY, and commit to burning whatever surplus you receive as a result of the BTS price increasing. As long as your worker is active and has sufficient votes to be above the refund worker, you will receive this daily salary.",

diff --git a/app/assets/locales/locale-ru.json b/app/assets/locales/locale-ru.json
@@ -1073,6 +1073,8 @@
             "create_text_1": "Чтобы создать нового работника, пожалуйста, заполните форму ниже. Работник будет создан с использованием вашего текущего активного аккаунта, который должен уже обладать пожизненным членством.",
             "create_text_2": "Тщательно продумайте параметры, которые выбираете, так как они не могут быть изменены после того, как вы опубликовали своё предложение.",
             "daily_pay": "Ежедневная плата (GPH)",
+            "time_start": "Время начала",
+            "time_finish": "Время окончания",
             "date_text": "Дата начала должна быть назначена как минимум на неделю вперед, чтобы у людей было время найти, оценить и проголосовать за вашего работника.",
             "name_text": "Имя вашего работника должно быть кратким и характеризующим его назначение, нечто вроде \"Цель работника – имя аккаунта\"",
             "pay_text": "Ежедневная плата определяет, сколько вы хотите получать в день, и указывается в GPH. В настоящее время сложилась практика указания зарплаты в USD/CNY и сжигания любых излишков, полученных в результате роста цены GPH. До тех пор, пока ваш работник активен и имеет достаточно голосов, чтобы быть выше работника по возвратам, вы будете продолжать получать эту зарплату.",

diff --git a/app/branding.js b/app/branding.js
@@ -127,9 +127,9 @@ export function getMyMarketsQuotes() {
     }
     let tokens = {
         nativeTokens: [
-            "GPH",
+            "GPH"
 
-            "USD"
+            //"USD"
 
             /* ,
             "EUR",
@@ -374,13 +374,13 @@ export function getConfigurationAsset() {
     if (_isTestnet()) {
         assetSymbol = "NOTIFICATIONS";
     } else {
-        assetSymbol = "TEST";
+        assetSymbol = "RUDEX";
     }
     // explanation will be parsed out of the asset description (via split)
     return {
         symbol: assetSymbol,
         explanation:
-            "This asset is used for decentralized configuration of the RuDEX UI placed under market.rudex.org."
+            "This asset is used for decentralized configuration of the RuDEX UI placed under https://market.rudex.org/."
     };
 }
 
@@ -420,13 +420,13 @@ export function getListingCoins() {
             goal: 5000,
             votes: 0
         },
-        {
+        /*        {
             name: "Waves",
             ticker: "WAVES",
             account: "rudex-waves",
             goal: 10000,
             votes: 0
-        },
+        },*/
         {
             name: "Telos",
             ticker: "TLOS",
@@ -448,13 +448,13 @@ export function getListingCoins() {
             goal: 5000,
             votes: 0
         },
-        {
+        /*        {
             name: "Neo",
             ticker: "NEO",
             account: "rudex-neo",
             goal: 10000,
             votes: 0
-        },
+        },*/
         {
             name: "Idena",
             ticker: "DNA",
@@ -475,14 +475,14 @@ export function getListingCoins() {
             account: "rudex-hive",
             goal: 10000,
             votes: 0
-        },
-        {
+        }
+        /*        {
             name: "Revain",
             ticker: "REV",
             account: "rudex-revain",
             goal: 10000,
             votes: 0
-        }
+        }*/
     ];
 }
 

diff --git a/app/components/Account/AccountOverview.jsx b/app/components/Account/AccountOverview.jsx
@@ -31,7 +31,6 @@ class AccountOverview extends React.Component {
                 "USD",
 
                 /*
-                 "USD",
                  "EUR",
                  "CNY",
                  "RUB",

diff --git a/app/components/Account/AccountPortfolioList.jsx b/app/components/Account/AccountPortfolioList.jsx
@@ -535,16 +535,17 @@ class AccountPortfolioList extends React.Component {
 
             if (
                 symbol == "DONATE" ||
-                symbol == "GPH"
-
-                /*                symbol == "USD" ||
-                symbol == "EUR" ||
-                symbol == "CNY" ||
-                symbol == "RUB" ||
-                symbol == "BTC" ||
-                symbol == "GOLD" ||
-                symbol == "SILVER" ||
-                symbol == "OIL"*/
+                symbol == "GPH" ||
+                symbol == "USD"
+
+                /* ||
+            symbol == "EUR" ||
+            symbol == "CNY" ||
+            symbol == "RUB" ||
+            symbol == "BTC" ||
+            symbol == "GOLD" ||
+            symbol == "SILVER" ||
+            symbol == "OIL"*/
             )
                 return symbol;
 

diff --git a/app/components/Account/AccountReferralsTable.jsx b/app/components/Account/AccountReferralsTable.jsx
@@ -72,8 +72,9 @@ class AccountReferralsTable extends React.Component {
                             esNode
                     );
                 }
+                let referralsCountRaw = await referralsCountResponse.json();
                 this.setState({
-                    referralsCount: await referralsCountResponse.json()
+                    referralsCount: referralsCountRaw.value
                 });
             }
 

diff --git a/app/components/Account/CreateAccountPassword.jsx b/app/components/Account/CreateAccountPassword.jsx
@@ -70,7 +70,7 @@ class CreateAccountPassword extends React.Component {
     }
 
     scrollToInput() {
-        scroller.scrollTo(`scrollToInput`, {
+        scroller.scrollTo("scrollToInput", {
             duration: 1500,
             delay: 100,
             smooth: true,

diff --git a/app/components/Account/CreateWorker.jsx b/app/components/Account/CreateWorker.jsx
@@ -120,7 +120,7 @@ class CreateWorker extends React.Component {
                             }}
                         >
                             <label>
-                                <Translate content="Time start" />
+                                <Translate content="explorer.workers.time_start" />
                                 <input
                                     defaultValue={this.state.start_time}
                                     onChange={e => {
@@ -178,7 +178,7 @@ class CreateWorker extends React.Component {
                             }}
                         >
                             <label>
-                                <Translate content="Time END" />
+                                <Translate content="explorer.workers.time_finish" />
                                 <input
                                     defaultValue={this.state.end_time}
                                     onChange={e => {

diff --git a/app/components/Account/MarginPositionsTable.jsx b/app/components/Account/MarginPositionsTable.jsx
@@ -226,6 +226,7 @@ ListGenerator = AssetWrapper(ListGenerator, {
     defaultProps: {
         bitAssets: [
             //gpAssets
+            "1.3.1"
             /*            "1.3.103",
             "1.3.120",
             "1.3.121",

diff --git a/app/components/Blockchain/OperationAnt.js b/app/components/Blockchain/OperationAnt.js
@@ -1211,10 +1211,6 @@ class Operation {
                 break;
 
             case "committee_member_update_global_parameters":
-                console.log(
-                    "committee_member_update_global_parameters op:",
-                    op
-                );
                 column = (
                     <span>
                         <TranslateWithLinks

diff --git a/app/components/Chat/ChatBro.js b/app/components/Chat/ChatBro.js
@@ -10,7 +10,8 @@ class ChatBro extends React.Component {
     render() {
         let frameHeight = this.props.height || "30%";
 
-        let currentLocale = SettingsStore.getState().settings.get("locale");
+        //let currentLocale = SettingsStore.getState().settings.get("locale");
+        let currentLocale = "ru";
 
         let chatUrl = null;
         switch (currentLocale) {

diff --git a/app/components/Dashboard/DashboardPage.jsx b/app/components/Dashboard/DashboardPage.jsx
@@ -50,7 +50,7 @@ class DashboardPage extends React.Component {
                                     <Tab title="dashboard.starred_markets">
                                         <StarredMarkets />
                                     </Tab>
-                                    {preferredBases.map(q => {
+                                    {preferredBases.map(imgName => {
                                         let title = (
                                             <span>
                                                 <img
@@ -59,24 +59,33 @@ class DashboardPage extends React.Component {
                                                         maxWidth: 30,
                                                         marginRight: 5
                                                     }}
-                                                    src={`${__BASE_URL__}asset-symbols/${q
-                                                        .replace(
-                                                            /^BTC/,
-                                                            "OPEN.BTC"
-                                                        )
-                                                        .toLowerCase()}.png`}
+                                                    src={
+                                                        imgName.indexOf(
+                                                            "RUDEX"
+                                                        ) !== -1 ||
+                                                        imgName.indexOf(
+                                                            "GPH"
+                                                        ) !== -1
+                                                            ? `${__BASE_URL__}asset-symbols/${imgName
+                                                                  .replace(
+                                                                      /^BTC/,
+                                                                      "OPEN.BTC"
+                                                                  )
+                                                                  .toLowerCase()}.png`
+                                                            : "asset-symbols/unknown.png"
+                                                    }
                                                 />
                                                 &nbsp;
-                                                {q.replace("RUDEX.", "")}
+                                                {imgName.replace("RUDEX.", "")}
                                             </span>
                                         );
 
                                         return (
-                                            <Tab key={q} title={title}>
+                                            <Tab key={imgName} title={title}>
                                                 <FeaturedMarkets
-                                                    quotes={[q].concat(
+                                                    quotes={[imgName].concat(
                                                         getPossibleGatewayPrefixes(
-                                                            [q]
+                                                            [imgName]
                                                         )
                                                     )}
                                                 />

diff --git a/app/components/Exchange/MarketPicker.jsx b/app/components/Exchange/MarketPicker.jsx
@@ -193,7 +193,7 @@ class MarketPickerWrapper extends Component {
                         value={inputValue}
                         onChange={this._onInputName.bind(this, true)}
                         placeholder={counterpart.translate(placeHolderKey)}
-                        maxLength="16"
+                        maxLength={16}
                         tabIndex={2}
                     />
                 </Form.Item>

diff --git a/app/components/Exchange/MarketRow.jsx b/app/components/Exchange/MarketRow.jsx
@@ -31,7 +31,10 @@ class MarketRow extends React.Component {
 
     componentDidMount() {
         this.statsChecked = new Date();
+
         if (
+            this.props.base &&
+            this.props.quote &&
             this.props.base.get &&
             this.props.base.get("id") &&
             this.props.quote.get &&

diff --git a/app/components/Exchange/OrderBook.jsx b/app/components/Exchange/OrderBook.jsx
@@ -1058,7 +1058,8 @@ class OrderBook extends React.Component {
                                     paddingRight: "0.6rem",
                                     overflow: "hidden",
                                     maxHeight: 260,
-                                    lineHeight: "13px"
+                                    lineHeight: "13px",
+                                    flexWrap: "wrap"
                                 }}
                             >
                                 <table
@@ -1218,7 +1219,8 @@ class OrderBook extends React.Component {
                                     paddingRight: "0.6rem",
                                     overflow: "hidden",
                                     maxHeight: 260,
-                                    lineHeight: "13px"
+                                    lineHeight: "13px",
+                                    flexWrap: "wrap"
                                 }}
                             >
                                 <table

diff --git a/app/components/Exchange/View/MarketHistoryView.jsx b/app/components/Exchange/View/MarketHistoryView.jsx
@@ -131,10 +131,11 @@ class MarketHistoryView extends React.Component {
                         className="table-container grid-block market-right-padding-only no-overflow"
                         ref="history"
                         style={{
-                            minHeight: !tinyScreen ? 260 : 0,
+                            //minHeight: !tinyScreen ? 260 : 0,
                             maxHeight: 260,
                             overflow: "hidden",
-                            lineHeight: "13px"
+                            lineHeight: "13px",
+                            flexWrap: "wrap"
                         }}
                     >
                         <table className="table order-table no-stripes table-hover fixed-table text-right no-overflow">

diff --git a/app/components/Exchange/View/MarketOrdersView.jsx b/app/components/Exchange/View/MarketOrdersView.jsx
@@ -192,9 +192,10 @@ class MarketsOrderView extends React.Component {
                         ref="container"
                         style={{
                             overflow: "hidden",
-                            minHeight: tinyScreen ? 260 : 0,
+                            //minHeight: tinyScreen ? 260 : 0,
                             maxHeight: 260,
-                            lineHeight: "13px"
+                            lineHeight: "13px",
+                            flexWrap: "wrap"
                         }}
                     >
                         <table className="table order-table table-highlight-hover table-hover no-stripes text-right fixed-table market-right-padding">
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,6 @@ class AccountOverview extends React.Component { @@
                     "USD",
                     /*
-                     "USD",
                      "EUR",
                      "CNY",
                      "RUB",
@@ Expand Down @@