Merge pull request #2 from maxirmx/setup-3

kreel second attempt
leedex-chain · Oct 1, 2023 · 863ec2f · 863ec2f
2 parents 4f14a93 + 0b1a567
commit 863ec2f
Show file tree

Hide file tree

Showing 14 changed files with 72 additions and 133 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,4 +25,6 @@ charting_library/*
 !charting_library/scss
 !charting_library/charting_library.17.025.02b61a1c.zip.md5
 !charting_library/package-charting-library.js
-!charting_library/install-charting-library.cjs
+!charting_library/install-charting-library.cjs
+
+ui.tar.gz
diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js
@@ -7,7 +7,7 @@ export const rudexAPIs = {
 };
 
 export const bep20rudexAPIs = {
-    BASE: "http://gateway.ecolom.samsonov.net/api/rudex_new_bep20",
+    BASE: "https://gateway.ecolom.samsonov.net/api/rudex_new_bep20",
     COINS_LIST: "/coins",
     NEW_DEPOSIT_ADDRESS: "/simple-api/initiate-trade"
 };

diff --git a/app/assets/asset-symbols/kzt.png b/app/assets/asset-symbols/kzt.png
diff --git a/app/assets/asset-symbols/symbols.js b/app/assets/asset-symbols/symbols.js
@@ -5,6 +5,7 @@ require("file-loader?name=asset-symbols/[name].png!./unknown.png");
 require("file-loader?name=asset-symbols/[name].png!./kreel.png");
 
 // gpAssets
+require("file-loader?name=asset-symbols/[name].png!./kzt.png");
 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");

diff --git a/app/assets/index.hbs b/app/assets/index.hbs
@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width" />
     <meta name="format-detection" content="telephone=no">
     <title>{{title}}</title>
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self' blob:; worker-src 'self' blob:; script-src https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/ 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; connect-src 'self' *; font-src 'self' data: https://at.alicdn.com; img-src 'self' data:; frame-src 'self' https://kreel2.samsonov.net;">
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self' blob:; worker-src 'self' blob:; script-src https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/ 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; connect-src 'self' *; font-src 'self' data: https://at.alicdn.com; img-src 'self' data:; frame-src 'self' https://ecolom.samsonov.net;">
     <link rel="icon" type="image/x-icon" href="favicon.ico">
     <style>
         body {

diff --git a/app/assets/intl-data/en.json b/app/assets/intl-data/en.json
@@ -1,11 +1,7 @@
 {
     "locale": "en",
     "date": {
-        "ca": [
-            "gregory",
-            "chinese",
-            "generic"
-        ],
+        "ca": ["gregory", "chinese", "generic"],
         "hourNo0": true,
         "hour12": true,
         "formats": {
@@ -110,24 +106,8 @@
                     ]
                 },
                 "days": {
-                    "narrow": [
-                        "S",
-                        "M",
-                        "T",
-                        "W",
-                        "T",
-                        "F",
-                        "S"
-                    ],
-                    "short": [
-                        "Sun",
-                        "Mon",
-                        "Tue",
-                        "Wed",
-                        "Thu",
-                        "Fri",
-                        "Sat"
-                    ],
+                    "narrow": ["S", "M", "T", "W", "T", "F", "S"],
+                    "short": ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
                     "long": [
                         "Sunday",
                         "Monday",
@@ -189,24 +169,8 @@
                     ]
                 },
                 "days": {
-                    "narrow": [
-                        "S",
-                        "M",
-                        "T",
-                        "W",
-                        "T",
-                        "F",
-                        "S"
-                    ],
-                    "short": [
-                        "Sun",
-                        "Mon",
-                        "Tue",
-                        "Wed",
-                        "Thu",
-                        "Fri",
-                        "Sat"
-                    ],
+                    "narrow": ["S", "M", "T", "W", "T", "F", "S"],
+                    "short": ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
                     "long": [
                         "Sunday",
                         "Monday",
@@ -218,18 +182,9 @@
                     ]
                 },
                 "eras": {
-                    "narrow": [
-                        "ERA0",
-                        "ERA1"
-                    ],
-                    "short": [
-                        "ERA0",
-                        "ERA1"
-                    ],
-                    "long": [
-                        "ERA0",
-                        "ERA1"
-                    ]
+                    "narrow": ["ERA0", "ERA1"],
+                    "short": ["ERA0", "ERA1"],
+                    "long": ["ERA0", "ERA1"]
                 },
                 "dayPeriods": {
                     "am": "AM",
@@ -282,24 +237,8 @@
                     ]
                 },
                 "days": {
-                    "narrow": [
-                        "S",
-                        "M",
-                        "T",
-                        "W",
-                        "T",
-                        "F",
-                        "S"
-                    ],
-                    "short": [
-                        "Sun",
-                        "Mon",
-                        "Tue",
-                        "Wed",
-                        "Thu",
-                        "Fri",
-                        "Sat"
-                    ],
+                    "narrow": ["S", "M", "T", "W", "T", "F", "S"],
+                    "short": ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
                     "long": [
                         "Sunday",
                         "Monday",
@@ -311,18 +250,8 @@
                     ]
                 },
                 "eras": {
-                    "narrow": [
-                        "B",
-                        "A",
-                        "BCE",
-                        "CE"
-                    ],
-                    "short": [
-                        "BC",
-                        "AD",
-                        "BCE",
-                        "CE"
-                    ],
+                    "narrow": ["B", "A", "BCE", "CE"],
+                    "short": ["BC", "AD", "BCE", "CE"],
                     "long": [
                         "Before Christ",
                         "Anno Domini",
@@ -338,9 +267,7 @@
         }
     },
     "number": {
-        "nu": [
-            "latn"
-        ],
+        "nu": ["latn"],
         "patterns": {
             "decimal": {
                 "positivePattern": "{number}",
@@ -376,6 +303,7 @@
             "INR": "₹",
             "JPY": "¥",
             "KRW": "₩",
+            "KZT": "₸",
             "MXN": "MX$",
             "NZD": "NZ$",
             "TWD": "NT$",

diff --git a/app/branding.js b/app/branding.js
@@ -15,7 +15,7 @@ function _isTestnet() {
         //        "39f5e2ede1f8bc1a3a54a7914414e3779e33193f1f5693510e73cb7a87617447"; // just for the record
         " -- no test net --"; // just for the record
     const mainnet =
-        "230afd8e06cc690d78c3e37a17bf9e4b19bfd3f15aee2d14f4eb176a8146bf44";
+        "ac18b51afd7362084b476eb8bcefe706bccd3e71238a486013ca8352ecd0e068";
     // treat every other chain as testnet
     return Apis.instance().chain_id !== mainnet;
 }
@@ -94,15 +94,15 @@ export function getUnits() {
     if (_isTestnet()) {
         return ["KREEL_TEST"];
     }
-    return ["KREEL", "USD", "KREEL.USDT", "KREEL.BTC"];
+    return ["KREEL", "USD", "KZT"];
 }
 
 export function getDefaultMarket() {
     if (_isTestnet()) {
         return "USD_TEST";
     }
     // [market 0]
-    return "KREEL.USDT_KREEL";
+    return "KREEL.KZT";
     //return "KREEL.USD";
 }
 
@@ -115,15 +115,15 @@ export function getMyMarketsBases() {
     if (_isTestnet()) {
         return ["KREEL_TEST"];
     }
-    return ["KREEL", "USD", "KREEL.BTC", "KREEL.USDT"];
+    return ["KREEL", "USD", "KZT"];
 }
 
 /*
 All trusted tokens
  */
 export function get_allTokens() {
     return {
-        nativeTokens: ["KREEL"], //, "USD", "EUR", "RUB", "CNY", "GOLD", "SILVER"],
+        nativeTokens: ["KREEL", "USD", "KZT"], //,"EUR", "RUB", "CNY", "GOLD", "SILVER"],
         kreelTokens: [
             //            "DONATE",
             //            "DEXBOT",
@@ -198,33 +198,33 @@ export function getFeaturedMarkets(quotes = []) {
         return [["USD", "KREEL_TEST"]];
     }
     return [
-        //        ["KREEL", "USD"],
-        //        ["KREEL", "EUR"],
+        ["KREEL", "KZT"],
+        ["KREEL", "USD"]
         //        ["KREEL", "RUB"],
         //        ["KREEL", "CNY"],
         //        ["KREEL", "GOLD"],
         //        ["KREEL", "SILVER"],
-        ["KREEL", "KREEL.USDT"],
-        ["KREEL", "KREEL.BTC"],
-        ["KREEL", "KREEL.ETH"],
-        ["KREEL", "KREEL.TRX"],
-        ["KREEL", "KREEL.LIME"],
+        //        ["KREEL", "KREEL.USDT"],
+        //        ["KREEL", "KREEL.BTC"],
+        //        ["KREEL", "KREEL.ETH"],
+        //        ["KREEL", "KREEL.TRX"],
+        //        ["KREEL", "KREEL.LIME"],
 
-        ["KREEL.USDT", "KREEL"],
+        //        ["KREEL.USDT", "KREEL"],
         //        ["KREEL.USDT", "USD"],
         //        ["KREEL.USDT", "EUR"],
         //        ["KREEL.USDT", "RUB"],
         //        ["KREEL.USDT", "CNY"],
         //        ["KREEL.USDT", "GOLD"],
         //        ["KREEL.USDT", "SILVER"],
-        ["KREEL.USDT", "KREEL.BTC"],
-        ["KREEL.USDT", "KREEL.ETH"],
-        ["KREEL.USDT", "KREEL.TRX"],
-        ["KREEL.USDT", "KREEL.LIME"],
-        ["KREEL.USDT", "KREEL.BUSD"],
+        //        ["KREEL.USDT", "KREEL.BTC"],
+        //        ["KREEL.USDT", "KREEL.ETH"],
+        //        ["KREEL.USDT", "KREEL.TRX"],
+        //        ["KREEL.USDT", "KREEL.LIME"],
+        //        ["KREEL.USDT", "KREEL.BUSD"],
 
-        ["KREEL.BTC", "KREEL"],
-        ["KREEL.BTC", "KREEL.USDT"]
+        //        ["KREEL.BTC", "KREEL"],
+        //        ["KREEL.BTC", "KREEL.USDT"]
     ].filter(a => {
         if (!quotes.length) return true;
         return quotes.indexOf(a[0]) !== -1;

diff --git a/app/components/Exchange/ExchangeHeader.jsx b/app/components/Exchange/ExchangeHeader.jsx
@@ -87,7 +87,7 @@ export default class ExchangeHeader extends React.Component {
         )
             return false;
 
-        return true;
+        return false;
     }
 
     render() {

diff --git a/app/components/Layout/Header.jsx b/app/components/Layout/Header.jsx
@@ -420,7 +420,7 @@ class Header extends React.Component {
             <a
                 style={{padding: "12px 1.75rem"}}
                 className={cnames({active: false})}
-                href="https://kreel2.samsonov.net"
+                href="https://ecolom.samsonov.net"
                 target="_blank"
             >
                 <img style={{margin: 0, height: 40}} src={logo} />

diff --git a/app/components/Modal/SetDefaultFeeAssetModal.jsx b/app/components/Modal/SetDefaultFeeAssetModal.jsx
@@ -96,10 +96,12 @@ class SetDefaultFeeAssetModal extends React.Component {
             if (a.asset == "KREEL" || b.asset == "KREEL") {
                 return a.asset == "KREEL" ? 1 : -1;
             } else if (
-                ["USD", "CNY", "EUR", "RUB"].includes(a.asset) !==
-                ["USD", "CNY", "EUR", "RUB"].includes(b.asset)
+                ["USD", "CNY", "EUR", "RUB", "KZT"].includes(a.asset) !==
+                ["USD", "CNY", "EUR", "RUB", "KZT"].includes(b.asset)
             ) {
-                return ["USD", "CNY", "EUR", "RUB"].includes(a.asset) ? 1 : -1;
+                return ["USD", "CNY", "EUR", "RUB", "KZT"].includes(a.asset)
+                    ? 1
+                    : -1;
             }
             return a.asset < b.asset;
         };

diff --git a/app/lib/chain/chainIds.js b/app/lib/chain/chainIds.js
@@ -1,5 +1,5 @@
 export default {
     MAIN_NET:
-        "7fcf452d6bb058949cdc875b13c8908c8f54b0f264c39faf8152b682af0740ee",
+        "ac18b51afd7362084b476eb8bcefe706bccd3e71238a486013ca8352ecd0e068",
     TEST_NET: "39f5e2ede1f8bc1a3a54a7914414e3779e33193f1f5693510e73cb7a87617447"
 };
diff --git a/app/lib/common/gateways.js b/app/lib/common/gateways.js
@@ -118,7 +118,7 @@ export const availableGateways = {
             selected: false
         },
         landing: "https://ecolom.samsonov.net/",
-        wallet: "http://market.ecolom.samsonov.net/"
+        wallet: "https://market.ecolom.samsonov.net/"
     }
 };
 

diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "kreel-ui",
-  "version": "0.0.2",
-  "description": "Web wallet interface for Kazakhstan Recylabes Exchange EcoLom.",
-  "homepage": "https://github.com/ecolom-kz/kreel-ui",
+  "version": "0.0.3",
+  "description": "Web wallet interface for the kreel financial blockchain.",
+  "homepage": "https://github.com/maxirmx/kreel-ui",
   "author": "maxirmx <[email protected]>",
   "contributors": [
     "maxirmx <[email protected]>"
@@ -14,7 +14,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/ecolom-kz/kreel-ui"
+    "url": "git://github.com/maxirmx/kreel-ui"
   },
   "main": "build/electron/index.js",
   "scripts": {
@@ -86,8 +86,8 @@
   },
   "browsersList": "electron 1.7",
   "build": {
-    "productName": "Kazakhstan Recyclables Exchange EcoLom",
-    "appId": "kz.ecolom",
+    "productName": "kreel",
+    "appId": "net.kreel",
     "files": [
       "build/electron",
       "!node_modules"
@@ -131,7 +131,7 @@
         "AppImage",
         "snap"
       ],
-      "synopsis": "ecolom.kz: Decentralized Recyclables Exchange"
+      "synopsis": "kreel: Cryptocurrency and Decentralized Exchange"
     },
     "directories": {
       "buildResources": "resources",
@@ -145,6 +145,7 @@
     "bignumber.js": "^9.0.1",
     "bitshares-report": "https://github.com/graphene-blockchain/graphene-report.git",
     "bitshares-ui-style-guide": "https://github.com/graphene-blockchain/graphene-ui-style-guide.git",
+    "kreeljs": "0.0.2",
     "browser-locale": "^1.0.3",
     "classnames": "^2.2.1",
     "constants-browserify": "^1.0.0",
@@ -169,7 +170,6 @@
     "jsonschema": "^1.2.4",
     "jspdf": "^2.3.1",
     "jspdf-autotable": "^3.1.1",
-    "kreeljs": "0.0.1",
     "lodash-es": "^4.17.10",
     "lzma": "2.1.6",
     "moment": "^2.29.2",