diff --git a/lib/plugins/common/json-rpc.js b/lib/plugins/common/json-rpc.js index 50372116..43163200 100644 --- a/lib/plugins/common/json-rpc.js +++ b/lib/plugins/common/json-rpc.js @@ -7,6 +7,7 @@ const request = require('request-promise') const { utils: coinUtils } = require('@lamassu/coins') const options = require('../../options') +const logger = require('../../logger') const blockchainDir = options.blockchainDir @@ -116,6 +117,9 @@ function rpcConfig (cryptoRec) { port: config.rpcport || cryptoRec.defaultPort } } catch (err) { - throw new Error('Wallet is currently not installed') + logger.error('Wallet is currently not installed!') + return { + port: cryptoRec.defaultPort + } } } diff --git a/lib/plugins/wallet/monerod/monerod.js b/lib/plugins/wallet/monerod/monerod.js index 2bc4f58d..e70b32ad 100644 --- a/lib/plugins/wallet/monerod/monerod.js +++ b/lib/plugins/wallet/monerod/monerod.js @@ -6,7 +6,7 @@ const { default: PQueue } = require('p-queue') const BN = require('../../../bn') const E = require('../../../error') -const { logger } = require('../../../blockchain/common') +const logger = require('../../../logger') const options = require('../../../options') const jsonRpc = require('../../common/json-rpc') @@ -40,7 +40,12 @@ function rpcConfig () { port: cryptoRec.walletPort || cryptoRec.defaultPort } } catch (err) { - throw new Error('wallet is currently not installed') + logger.error('Wallet is currently not installed!') + return { + username: '', + password: '', + port: cryptoRec.walletPort || cryptoRec.defaultPort + } } } diff --git a/new-lamassu-admin/src/pages/Funding.js b/new-lamassu-admin/src/pages/Funding.js index cf59519f..13f2a6c8 100644 --- a/new-lamassu-admin/src/pages/Funding.js +++ b/new-lamassu-admin/src/pages/Funding.js @@ -26,6 +26,9 @@ import { primaryColor } from 'src/styling/variables' import styles from './Funding.styles' +const NODE_NOT_CONNECTED_ERR = + "Couldn't establish connection with the node. Make sure it is installed and try again" + const useStyles = makeStyles(styles) const sizes = { big: 165, @@ -176,7 +179,11 @@ const Funding = () => { {selected && !viewHistory && selected.errorMsg && (