Merge pull request #115 from TokelPlatform/development

Changes for v 1.0.0
TokelPlatform · Jul 30, 2021 · 73945eb · 73945eb
2 parents fe9700e + f226099
commit 73945eb
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/src/components/Dashboard/Dashboard.tsx b/src/components/Dashboard/Dashboard.tsx
@@ -17,7 +17,7 @@ const DashboardRoot = styled.div`
   width: 100%;
   flex: 1;
   background-color: var(--color-black);
-  padding: 20px;
+  padding: 18px;
   margin: 0;
 `;
 

diff --git a/src/components/Dashboard/Portfolio/Portfolio.tsx b/src/components/Dashboard/Portfolio/Portfolio.tsx
@@ -40,7 +40,7 @@ const Portfolio = (): ReactElement => {
       {assets.map(asset => (
         <PortfolioItem
           key={asset.name}
-          name={`${asset.name} (${asset.ticker})`}
+          name={`${asset.name}`}
           subtitle={`${formatDec(asset.balance)} ≈ $TBA`}
           // subtitle={`${formatDec(asset.balance)} ≈ $${formatFiat(asset.balance * asset.usd_value)}`}
           percentage={100}

diff --git a/src/electron/package.json b/src/electron/package.json
@@ -1,11 +1,11 @@
 {
   "name": "tokel_app",
   "productName": "tokelPlatform",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "description": "Komodo ecosystem’s Token Platform",
   "main": "./main.js",
   "author": {
-    "name": "Daria Mikhailova",
+    "name": "Daria",
     "email": "[email protected]",
     "url": "https://daria.engineer"
   },

diff --git a/src/util/insightApi.ts b/src/util/insightApi.ts
@@ -1,12 +1,14 @@
 import axios from 'axios';
 
-const INSIGHT_SERVER = `https://kmd.explorer.dexstats.info/insight-api-komodo`;
+import { TICKER } from 'vars/defines';
+
+import links from './links';
 
 const http404 = 'Request failed with status code 404';
 
 const getTransactionDetail = async (txId, txInfo) => {
   try {
-    const resp = await axios(`${INSIGHT_SERVER}/tx/${txId}`);
+    const resp = await axios(`${links.insightApi[TICKER]}/tx/${txId}`);
     return resp.data;
   } catch (e) {
     if (e.message && e.message === http404) {

diff --git a/src/util/links.ts b/src/util/links.ts
@@ -1,10 +1,14 @@
 export default {
   explorers: {
     KMD: 'https://kmd.explorer.dexstats.info',
-    TKL: '',
+    TOKEL: 'https://tokel.explorer.dexstats.info',
     TKLTEST: 'https://tkltest.explorer.dexstats.info',
     TKLLIVE: '',
   },
+  insightApi: {
+    TOKEL: 'https://tokel.explorer.dexstats.info/insight-api-komodo',
+    KMD: 'https://kmd.explorer.dexstats.info/insight-api-komodo',
+  },
   discord: 'https://discord.gg/MHxJZVFkqa',
   website: 'https://tokel.io',
   websiteRoadmap: 'https://tokel.io/roadmap',

diff --git a/src/util/transactions.ts b/src/util/transactions.ts
@@ -1,6 +1,6 @@
 import moment from 'moment';
 
-import { FEE, TICKER, USD_VALUE } from 'vars/defines';
+import { FEE, INFORMATION_N_A, TICKER, USD_VALUE } from 'vars/defines';
 
 import getTransactionDetail from './insightApi';
 
@@ -17,8 +17,7 @@ export const parseListTxsRpcTx = tx => {
         height: tx[0].height,
         value: -(tx[0].value + (tx[1].value + FEE)),
         received: false,
-        recepient: 'See tx at the explorer for details',
-        recipient: 'See tx at the explorer for details',
+        recepient: INFORMATION_N_A,
       },
     ];
   }
@@ -32,8 +31,7 @@ export const parseListTxsRpcTx = tx => {
       {
         ...tx[0],
         received: false,
-        recepient: 'See tx at the explorer for details',
-        recipient: 'See tx at the explorer for details',
+        recepient: INFORMATION_N_A,
       },
     ];
   }