rpc/cli config switch

react/src/actions/actions/getTxDetails.js

@@ -11,6 +11,7 @@ export function getTxDetails(coin, txid, type) {
       params: [
         txid
       ],
+      rpc2cli: Config.rpc2cli,
     };
 
     if (type === 'raw') {
@@ -22,6 +23,7 @@ export function getTxDetails(coin, txid, type) {
           txid,
           1
         ],
+        rpc2cli: Config.rpc2cli,
       };
     }
 

react/src/actions/actions/interest.js

@@ -8,6 +8,7 @@ export function getListUnspent(coin) {
       mode: null,
       chain: coin,
       cmd: 'listunspent',
+      rpc2cli: Config.rpc2cli,
     };
 
     const _fetchConfig = {
@@ -63,6 +64,7 @@ export function getRawTransaction(coin, txid) {
         txid,
         1
       ],
+      rpc2cli: Config.rpc2cli,
     };
 
     const _fetchConfig = {

react/src/actions/actions/jumblr.js

@@ -1,6 +1,6 @@
 import {
   triggerToaster,
-  getNewKMDAddresses
+  getNewKMDAddresses,
 } from '../actionCreators';
 import Config from '../../config';
 import Store from '../../store';
@@ -11,6 +11,7 @@ function getNewAddress(coin) { // TODO: remove(?)
       mode: null,
       chain: coin,
       cmd: 'getnewaddress',
+      rpc2cli: Config.rpc2cli,
     };
 
     const _fetchConfig = {
@@ -49,6 +50,7 @@ export function setJumblrAddress(coin, type, address) {
       chain: coin,
       cmd: type === 'deposit' ? 'jumblr_deposit' : 'jumblr_secret',
       params: [address],
+      rpc2cli: Config.rpc2cli,
     };
 
     const _fetchConfig = {
@@ -87,6 +89,7 @@ export function pauseJumblr(coin) {
       chain: coin,
       cmd: 'jumblr_pause',
       params: [],
+      rpc2cli: Config.rpc2cli,
     };
 
     const _fetchConfig = {
@@ -125,6 +128,7 @@ export function resumeJumblr(coin) {
       chain: coin,
       cmd: 'jumblr_resume',
       params: [],
+      rpc2cli: Config.rpc2cli,
     };
 
     const _fetchConfig = {
@@ -163,6 +167,7 @@ function dumpPrivkey(coin, key) {
       chain: coin,
       cmd: 'dumpprivkey',
       params: [key],
+      rpc2cli: Config.rpc2cli,
     };
 
     const _fetchConfig = {
@@ -205,6 +210,7 @@ export function importPrivkey(coin, key, rescan = false) {
         '',
         rescan
       ],
+      rpc2cli: Config.rpc2cli,
     };
 
     const _fetchConfig = {

react/src/actions/actions/nativeDashboardUpdate.js

@@ -9,7 +9,10 @@ export function getDashboardUpdate(coin, activeCoinProps) {
       headers: {
         'Content-Type': 'application/json',
       },
-      body: JSON.stringify({ coin: coin }),
+      body: JSON.stringify({
+        coin: coin,
+        rpc2cli: Config.rpc2cli,
+      }),
     };
 
     return fetch(

react/src/actions/actions/nativeNetwork.js

@@ -12,6 +12,7 @@ export function getNativePeers(coin) {
       mode: null,
       chain: coin,
       cmd: 'getpeerinfo',
+      rpc2cli: Config.rpc2cli,
     };
 
     const _fetchConfig = {
@@ -50,6 +51,7 @@ export function getNativeNettotals(coin) {
       mode: null,
       chain: coin,
       cmd: 'getnettotals',
+      rpc2cli: Config.rpc2cli,
     };
 
     const _fetchConfig = {

react/src/actions/actions/nativeNewAddress.js

@@ -11,6 +11,7 @@ export function getNewKMDAddresses(coin, pubpriv, mode) {
       mode: null,
       chain: coin,
       cmd: pubpriv === 'public' ? 'getnewaddress' : 'z_getnewaddress',
+      rpc2cli: Config.rpc2cli,
     };
 
     const _fetchConfig = {

react/src/actions/actions/nativeSend.js

@@ -1,6 +1,6 @@
 import {
   DASHBOARD_ACTIVE_COIN_NATIVE_OPIDS,
-  DASHBOARD_ACTIVE_COIN_SENDTO
+  DASHBOARD_ACTIVE_COIN_SENDTO,
 } from '../storeType';
 import { translate } from '../../translate/translate';
 import { triggerToaster } from '../actionCreators';
@@ -23,6 +23,7 @@ export function sendNativeTx(coin, _payload) {
       mode: null,
       chain: coin,
       cmd: _apiMethod,
+      rpc2cli: Config.rpc2cli,
       params:
         (_payload.addressType === 'public' && _payload.sendTo.length !== 95) || !_payload.sendFrom ?
         (_payload.substractFee ?
@@ -77,8 +78,8 @@ export function sendNativeTx(coin, _payload) {
     })
     .then((json) => {
       if (json.indexOf('"code":') > -1) {
-        const _message = json.substring(
-          `${json.indexOf('"message":"')}11`,
+        let _message = json.substring(
+          `${json.indexOf('"message":"') + 11}`,
           json.indexOf('"},"id":"jl777"')
         );
 
@@ -100,6 +101,10 @@ export function sendNativeTx(coin, _payload) {
             )
           );
         } else {
+          if (Config.rpc2cli) {
+            _message = JSON.parse(json).error.message;
+          }
+
           dispatch(
             triggerToaster(
               _message,
@@ -136,6 +141,7 @@ export function getKMDOPID(opid, coin) {
       mode: null,
       chain: coin,
       cmd: 'z_getoperationstatus',
+      rpc2cli: Config.rpc2cli,
     };
 
     const _fetchConfig = {
@@ -174,6 +180,7 @@ export function sendToAddressPromise(coin, address, amount) {
       mode: null,
       chain: coin,
       cmd: 'sendtoaddress',
+      rpc2cli: Config.rpc2cli,
       params: [
         address,
         amount,
@@ -233,6 +240,7 @@ export function validateAddressPromise(coin, address) {
       chain: coin,
       cmd: 'validateaddress',
       params: [ address ],
+      rpc2cli: Config.rpc2cli,
     };
 
     const _fetchConfig = {

react/src/actions/actions/nativeSyncInfo.js

@@ -97,6 +97,7 @@ export function getSyncInfoNative(coin, skipDebug, skipRemote, suppressErrors) {
       mode: null,
       chain: coin,
       cmd: 'getinfo',
+      rpc2cli: Config.rpc2cli,
     };
     const _fetchConfig = {
       method: 'POST',
@@ -206,6 +207,7 @@ export function getBlockTemplate(_json, coin) {
     mode: null,
     chain: coin,
     cmd: 'getblocktemplate',
+    rpc2cli: Config.rpc2cli,
   };
 
   return dispatch => {

react/src/actions/actions/settings.js

@@ -449,7 +449,8 @@ export function dumpPrivKey(coin, address, isZaddr) {
       mode: null,
       chain: coin,
       cmd: isZaddr ? 'z_exportkey' : 'dumpprivkey',
-      params: [ address ]
+      params: [ address ],
+      rpc2cli: Config.rpc2cli,
     };
 
     const _fetchConfig = {

react/src/actions/actions/walletAuth.js

@@ -1,6 +1,6 @@
 import {
   LOGIN,
-  ACTIVE_HANDLE
+  ACTIVE_HANDLE,
 } from '../storeType';
 import { translate } from '../../translate/translate';
 import Config from '../../config';

react/src/components/dashboard/sendCoin/sendCoin.render.js

@@ -275,14 +275,16 @@ export const SendRender = function() {
                           <span className="label label-success">{ translate('SEND.SUCCESS_SM') }</span>
                         </td>
                       </tr>
-                      <tr>
-                        <td className="padding-left-30">
-                        { translate('INDEX.SEND_FROM') }
-                        </td>
-                        <td className="padding-left-30">
-                          { this.props.ActiveCoin.mode === 'spv' ? this.props.Dashboard.electrumCoins[this.props.ActiveCoin.coin].pub : this.state.sendFrom }
-                        </td>
-                      </tr>
+                      { this.state.sendFrom &&
+                        <tr>
+                          <td className="padding-left-30">
+                          { translate('INDEX.SEND_FROM') }
+                          </td>
+                          <td className="padding-left-30">
+                            { this.props.ActiveCoin.mode === 'spv' ? this.props.Dashboard.electrumCoins[this.props.ActiveCoin.coin].pub : this.state.sendFrom }
+                          </td>
+                        </tr>
+                      }
                       <tr>
                         <td className="padding-left-30">
                         { translate('INDEX.SEND_TO') }

react/src/components/dashboard/walletsInfo/walletsInfo.render.js

@@ -28,7 +28,7 @@ const WalletsInfoRender = function() {
                 </td>
               </tr>
               <tr>
-                <td>{ translate('WALLETS_INFO.ADRESS_LOCAL') }</td>
+                <td>{ translate('WALLETS_INFO.ADDRESS_LOCAL') }</td>
                 <td>
                   { _netPeers[i].addrlocal }
                 </td>

react/src/translate/en.js

@@ -515,7 +515,7 @@ export const LANG_EN = {
     'ERROR': 'Error',
     'FAILED_TO_VERIFY_ADDR': 'Failed to verify address',
     'COIN_UNABLE_TO_STOP': 'Unable to stop @template@. Try again.',
-    'COIN_IS_STOPED': 'is stopped',
+    'COIN_IS_STOPPED': 'is stopped',
     'COIN_IS_REMOVED': 'is removed',
     'JUMBLR_RESUMED': 'Jumblr resumed',
     'JUMBLR_PAUSED': 'Jumblr paused',