3.3.210910

- add ADAMANT to listing vote - gpUSD to Margin Position table default and to Borrow Modal - add api node (graphene-lab) - some fixes
blckchnd · Sep 10, 2021 · 53f03a0 · 53f03a0
1 parent 697a9df
commit 53f03a0
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 23 deletions.
diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js
@@ -75,6 +75,14 @@ export const settingsAPIs = {
             operator: "Witness: lex",
             contact: "telegram:LexAi"
         },
+        {
+            url: "wss://node.graphenelab.io",
+            region: "Finland",
+            country: "Finland",
+            location: "Helsinki",
+            operator: "Witness: graphene-lab",
+            contact: "telegram:Denis_GL"
+        },
         {
             url: "wss://node.hk.graphene.fans",
             region: "Eastern Asia",

diff --git a/app/assets/coins-logo/adm.png b/app/assets/coins-logo/adm.png
diff --git a/app/assets/coins-logo/coins.js b/app/assets/coins-logo/coins.js
@@ -12,5 +12,6 @@ require("file-loader?name=coins-logo/[name].png!./dna.png");
 require("file-loader?name=coins-logo/[name].png!./zec.png");
 require("file-loader?name=coins-logo/[name].png!./hive.png");
 require("file-loader?name=coins-logo/[name].png!./rev.png");
+require("file-loader?name=coins-logo/[name].png!./adm.png");
 
 require("file-loader?name=coins-logo/[name].png!./pzm.png");
diff --git a/app/branding.js b/app/branding.js
@@ -94,7 +94,7 @@ export function getUnits() {
     if (_isTestnet()) {
         return ["TEST"];
     }
-    return ["GPH", "RUDEX.BTC", "RUDEX.USDT"];
+    return ["GPH", "USD", "RUDEX.BTC", "RUDEX.USDT"];
 }
 
 export function getDefaultMarket() {
@@ -127,9 +127,8 @@ export function getMyMarketsQuotes() {
     }
     let tokens = {
         nativeTokens: [
-            "GPH"
-
-            //"USD"
+            "GPH",
+            "USD"
 
             /* ,
             "EUR",
@@ -210,7 +209,9 @@ export function getFeaturedMarkets(quotes = []) {
     }
     return [
         //GPH
-        /*["GPH", "USD"],
+        ["GPH", "USD"],
+
+        /*
         ["GPH", "EUR"],
         ["GPH", "CNY"],
         ["GPH", "RUB"],
@@ -262,8 +263,10 @@ export function getFeaturedMarkets(quotes = []) {
         ["RUBLE", "RUDEX.SMOKE"], delisted
         ["RUBLE", "RUDEX.RUB"], */
 
-        ["RUDEX.USDT", "DONATE"],
         ["RUDEX.USDT", "GPH"],
+        ["RUDEX.USDT", "USD"],
+
+        ["RUDEX.USDT", "DONATE"],
         ["RUDEX.USDT", "RUDEX.PPY"],
         ["RUDEX.USDT", "RUDEX.NBS"],
         ["RUDEX.USDT", "RUDEX.BTC"],
@@ -475,14 +478,21 @@ export function getListingCoins() {
             account: "rudex-hive",
             goal: 10000,
             votes: 0
-        }
+        },
         /*        {
             name: "Revain",
             ticker: "REV",
             account: "rudex-revain",
             goal: 10000,
             votes: 0
         }*/
+        {
+            name: "ADAMANT Messenger",
+            ticker: "ADM",
+            account: "rudex-adamant",
+            goal: 8000,
+            votes: 0
+        }
     ];
 }
 

diff --git a/app/components/Account/MarginPositionsTable.jsx b/app/components/Account/MarginPositionsTable.jsx
@@ -226,14 +226,7 @@ ListGenerator = AssetWrapper(ListGenerator, {
     defaultProps: {
         bitAssets: [
             //gpAssets
-            "1.3.1"
-            /*            "1.3.103",
-            "1.3.120",
-            "1.3.121",
-            "1.3.1325",
-            "1.3.105",
-            "1.3.106",
-            "1.3.113",*/
+            "1.3.27" //gpUSD
             //RuDEX MPA-s
             /*            "1.3.5747",
             "1.3.5748",

diff --git a/app/components/Dashboard/DashboardPage.jsx b/app/components/Dashboard/DashboardPage.jsx
@@ -65,6 +65,9 @@ class DashboardPage extends React.Component {
                                                         ) !== -1 ||
                                                         imgName.indexOf(
                                                             "GPH"
+                                                        ) !== -1 ||
+                                                        imgName.indexOf(
+                                                            "USD"
                                                         ) !== -1
                                                             ? `${__BASE_URL__}asset-symbols/${imgName
                                                                   .replace(

diff --git a/app/components/Dashboard/MarketsTable.jsx b/app/components/Dashboard/MarketsTable.jsx
@@ -342,6 +342,22 @@ class MarketsTable extends React.Component {
             //if (symbol === "OPEN.BTC" || symbol === "GDEX.BTC") return symbol;
             if (symbol.startsWith("RUDEX.")) return symbol;
 
+            if (
+                symbol == "DONATE" ||
+                symbol == "GPH" ||
+                symbol == "USD"
+
+                /* ||
+        symbol == "EUR" ||
+        symbol == "CNY" ||
+        symbol == "RUB" ||
+        symbol == "BTC" ||
+        symbol == "GOLD" ||
+        symbol == "SILVER" ||
+        symbol == "OIL"*/
+            )
+                return symbol;
+
             let imgName = symbol.split(".");
             return imgName.length === 2 ? imgName[1] : imgName[0];
         }

diff --git a/app/components/PredictionMarkets/CreateMarketModal.jsx b/app/components/PredictionMarkets/CreateMarketModal.jsx
@@ -421,9 +421,10 @@ export default class CreateMarketModal extends Modal {
                                 <AssetSelect
                                     assets={[
                                         "1.3.0",
-                                        "1.3.113",
-                                        "1.3.120",
-                                        "1.3.121"
+                                        "1.3.27" //gpUSD
+                                        //"1.3.113",
+                                        //"1.3.120",
+                                        //"1.3.121"
                                     ]}
                                     value={
                                         this.state.bitasset_opts

diff --git a/app/components/Showcases/Borrow.jsx b/app/components/Showcases/Borrow.jsx
@@ -147,7 +147,7 @@ class Borrow extends Component {
                                     marginBottom: "1rem"
                                 }}
                                 assets={[
-                                    "1.3.1"
+                                    "1.3.27" // gpUSD
                                     /*                                    "1.3.120",
                                     "1.3.121",
                                     "1.3.1325",

diff --git a/app/lib/common/utils.js b/app/lib/common/utils.js
@@ -136,8 +136,8 @@ var Utils = {
         let baseID = base.toJS ? base.get("id") : base.id;
         let basePrecision = base.toJS ? base.get("precision") : base.precision;
         let fixedPrecisionAssets = {
-            "1.3.113": 5, // gpCNY
-            "1.3.121": 5 // gpUSD
+            //"1.3.113": 5, // bitCNY
+            "1.3.27": 5 // gpUSD
         };
         if (quoteID === "1.3.0") {
             priceText = this.format_number(price, quotePrecision);

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "RuDEX3-light",
-  "version": "3.3.210901",
+  "version": "3.3.210910",
   "description": "Advanced wallet interface for the Graphene financial blockchain.",
   "homepage": "https://github.com/blckchnd/rudex-ui",
   "author": "RuDEX Team <[email protected]>",