resolve merge conflict

pbca26 · Dec 8, 2020 · b3f0db2 · b3f0db2
2 parents a05649b + 480242a
commit b3f0db2
Show file tree

Hide file tree

Showing 9 changed files with 139 additions and 186 deletions.
diff --git a/README.md b/README.md
@@ -38,6 +38,9 @@ Also, make sure that you close Ledger Live or any other apps that might be using
 Add udev rules
 `wget -q -O - https://raw.githubusercontent.com/LedgerHQ/udev-rules/master/add_udev_rules.sh | sudo bash`
 
+### Ledger on Latest Chrome browser
+If you're experiencing issues connecting your Ledger device open the following url chrome://flags#new-usb-backend in Chrome browser and disable it. Alternatively you can try Chromium or Brave browsers.
+
 ## Build/compile issues
 If you are experiencing build issues that lead to minify errors add required modules to [config-overrides.js](https://github.com/pbca26/hw-kmd-wallet/blob/master/config-overrides.js#L19) file.
 

diff --git a/electron/main.js b/electron/main.js
@@ -172,32 +172,32 @@ function createWindow() {
     mainWindow = null;
   });
 
-  ipcMain.on('getAddress', (e, derivationPath) => {
+  ipcMain.on('getAddress', (e, {ruid, derivationPath}) => {
     console.log(derivationPath);
 
     if (mainWindow) {
       getAddress(derivationPath, false).then(result => {
-        mainWindow.webContents.send('getAddress', result);
+        mainWindow.webContents.send('getAddress', {ruid, result});
       });
     }
   });
 
-  ipcMain.on('createPaymentTransactionNew', (e, txData) => {
+  ipcMain.on('createPaymentTransactionNew', (e, {ruid, txData}) => {
     console.log(txData);
 
     if (mainWindow) {
       createPaymentTransactionNew(txData).then(result => {
-        mainWindow.webContents.send('createPaymentTransactionNew', result);
+        mainWindow.webContents.send('createPaymentTransactionNew', {ruid, result});
       });
     }
   });
 
-  ipcMain.on('splitTransaction', (e, txData) => {
+  ipcMain.on('splitTransaction', (e, {ruid, txData}) => {
     console.log(txData);
 
     if (mainWindow) {
       splitTransaction(txData).then(result => {
-        mainWindow.webContents.send('splitTransaction', result);
+        mainWindow.webContents.send('splitTransaction', {ruid, result});
       });
     }
   });

diff --git a/src/App.js b/src/App.js
@@ -34,7 +34,7 @@ import {
 } from './lib/blockchain';
 import accountDiscovery from './lib/account-discovery';
 import blockchain from './lib/blockchain';
-import apiEndpoints from './lib/insight-endpoints';
+import apiEndpoints from './lib/coins';
 import getKomodoRewards from './lib/get-komodo-rewards';
 import {osName} from 'react-device-detect';
 import {
@@ -135,34 +135,36 @@ class App extends React.Component {
   }
 
   checkExplorerEndpoints = async () => {
-    const getInfoRes =  await Promise.all(apiEndpoints[this.state.coin].map((value, index) => {
+    const getInfoRes =  await Promise.all(apiEndpoints[this.state.coin].api.map((value, index) => {
       return getInfo(value);
     }));
     let isExplorerEndpointSet = false;
 
     console.warn('checkExplorerEndpoints', getInfoRes);
 
-    for (let i = 0; i < apiEndpoints[this.state.coin].length; i++) {
+    for (let i = 0; i < apiEndpoints[this.state.coin].api.length; i++) {
       if (getInfoRes[i] &&
           getInfoRes[i].hasOwnProperty('info') &&
           getInfoRes[i].info.hasOwnProperty('version')) {
-        console.warn('set api endpoint to ' + apiEndpoints[this.state.coin][i]);
-        setExplorerUrl(apiEndpoints[this.state.coin][i]);
+        console.warn('set api endpoint to ' + apiEndpoints[this.state.coin].api[i]);
+        setExplorerUrl(apiEndpoints[this.state.coin].api[i]);
         isExplorerEndpointSet = true;
 
         this.setState({
-          explorerEndpoint: apiEndpoints[this.state.coin][i],
+          explorerEndpoint: apiEndpoints[this.state.coin].api[i],
         });
 
         break;
       }
     }
 
-    if (!isExplorerEndpointSet) {
-      this.setState({
-        explorerEndpoint: false,
-      });
-    }
+    setTimeout(() => {
+      if (!isExplorerEndpointSet) {
+        this.setState({
+          explorerEndpoint: false,
+        });
+      }
+    }, 50);
   };
 
   resetState = () => {

diff --git a/src/Transactions.js b/src/Transactions.js
@@ -1,5 +1,9 @@
 import React from 'react';
-import explorerLink from './lib/explorer-link';
+import explorerLink from './lib/coins';
+import {
+  isElectron,
+  shell,
+} from './Electron';
 
 const headings = [
   'Type',
@@ -36,9 +40,16 @@ const Transactions = ({transactions, coin}) => {
               {Number(tx.height) === -1 || Number(tx.height) === 0 ? '' : tx.date}
             </td>
             <td className="wb--all">
-              <a
-                target="_blank"
-                href={`${explorerLink[coin]}tx/${tx.txid}`}>{tx.txid}</a>
+            {isElectron &&
+                <a
+                  href="#"
+                  onClick={() => shell.openExternal(`${explorerLink[coin].explorer}tx/${tx.txid}`)}>{tx.txid}</a>
+              }
+              {!isElectron &&
+                <a
+                  target="_blank"
+                  href={`${explorerLink[coin].explorer}tx/${tx.txid}`}>{tx.txid}</a>
+              }
             </td>
           </tr>
         ))}

diff --git a/src/TxidLink.js b/src/TxidLink.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import explorerLink from './lib/explorer-link';
+import explorerLink from './lib/coins';
 import {
   isElectron,
   shell,
@@ -9,11 +9,11 @@ const TxidLink = ({txid, coin}) => !isElectron ? (
   <a
     target="_blank"
     rel="noopener noreferrer"
-    href={`${explorerLink[coin]}tx/${txid}`}>{txid}</a>
+    href={`${explorerLink[coin].explorer}tx/${txid}`}>{txid}</a>
 ) : (
   <a
     href="#"
-    onClick={() => shell.openExternal(`${explorerLink[coin]}tx/${txid}`)}>{txid}</a>
+    onClick={() => shell.openExternal(`${explorerLink[coin].explorer}tx/${txid}`)}>{txid}</a>
 );
 
 export default TxidLink;
diff --git a/src/lib/coins.js b/src/lib/coins.js
@@ -155,22 +155,25 @@ const coins = {
   RICK: {
     explorer: 'https://rick.kmd.dev/',
     api: [
-      'https://rick.kmd.dev/insight-api-komodo/',
+      'https://explorer.komodoplatform.com:10000/rick/api/',
       'https://rick.explorer.dexstats.info/insight-api-komodo/',
+      'https://rick.kmd.dev/insight-api-komodo/',
     ],
   },
   MORTY: {
     explorer: 'https://morty.kmd.dev/',
     api: [
       'https://morty.kmd.dev/insight-api-komodo/',
       'https://morty.explorer.dexstats.info/insight-api-komodo/',
+      'https://explorer.komodoplatform.com:10000/morty/api/',
     ],
   },
   VRSC: {
     explorer: 'https://vrsc.explorer.dexstats.info/',
     api: [
       'https://explorer.komodoplatform.com:10000/vrsc/api/',
       'https://vrsc.explorer.dexstats.info/insight-api-komodo/',
+      'https://insight.vrsc.0x03.services/insight-api-komodo/',
     ],
   },
   // DP: '',

diff --git a/src/lib/explorer-link.js b/src/lib/explorer-link.js
diff --git a/src/lib/insight-endpoints.js b/src/lib/insight-endpoints.js