Skip to content

Commit

Permalink
Add handling to a new exception, and add some file names to the ignor…
Browse files Browse the repository at this point in the history
…e liast.
  • Loading branch information
Lucio Montero committed Oct 27, 2018
1 parent c7c39f8 commit aa82c06
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,5 @@ build
#MacOSX hidden cache files
__MACOSX
package-lock.json
package.json
react/package.json
2 changes: 1 addition & 1 deletion gui/EasyDEX-GUI
Submodule EasyDEX-GUI updated 84 files
+2 −1 react/package.json
+9 −2 react/src/actions/actionCreators.js
+1 −1 react/src/actions/actions/addCoin.js
+4 −1 react/src/actions/actions/coinList.js
+25 −1 react/src/actions/actions/dice.js
+12 −3 react/src/actions/actions/electrum.js
+2 −2 react/src/actions/actions/getTxDetails.js
+1 −1 react/src/actions/actions/interest.js
+3 −1 react/src/actions/actions/nativeDashboardUpdate.js
+41 −2 react/src/actions/actions/nativeSend.js
+5 −3 react/src/actions/actions/nativeSyncInfo.js
+1 −1 react/src/actions/actions/prices.js
+ react/src/assets/images/cryptologo/kmdice.png
+61 −13 react/src/components/addcoin/addcoin.js
+24 −20 react/src/components/addcoin/addcoin.render.js
+22 −11 react/src/components/addcoin/addcoinOptionsAC.js
+7 −6 react/src/components/addcoin/addcoinOptionsCrypto.js
+1 −1 react/src/components/addcoin/coin-selectors.render.js
+56 −38 react/src/components/dashboard/claimInterestModal/claimInterestModal.js
+12 −3 react/src/components/dashboard/claimInterestModal/claimInterestModal.render.js
+58 −44 react/src/components/dashboard/coinTile/coinTileItem.js
+16 −10 react/src/components/dashboard/coinTile/coinTileItem.render.js
+11 −7 react/src/components/dashboard/coindDownModal/coindDownModal.js
+1 −1 react/src/components/dashboard/dice/dice.js
+17 −13 react/src/components/dashboard/importKeyModal/importKeyModal.js
+11 −5 react/src/components/dashboard/importKeyModal/importKeyModal.render.js
+4 −4 react/src/components/dashboard/invoiceModal/invoiceModal.js
+10 −4 react/src/components/dashboard/jumblr/jumblr.js
+36 −39 react/src/components/dashboard/jumblr/jumblr.render.js
+7 −5 react/src/components/dashboard/loginSettingsModal/loginSettingsModal.js
+25 −21 react/src/components/dashboard/main/dashboard.js
+21 −16 react/src/components/dashboard/navbar/navbar.js
+8 −6 react/src/components/dashboard/navbar/navbar.render.js
+2 −1 react/src/components/dashboard/navbar/navbar.scss
+18 −11 react/src/components/dashboard/notaryElectionsModal/notaryElectionsModal.js
+23 −10 react/src/components/dashboard/receiveCoin/receiveCoin.js
+24 −21 react/src/components/dashboard/receiveCoin/receiveCoin.render.js
+166 −104 react/src/components/dashboard/sendCoin/sendCoin.js
+375 −315 react/src/components/dashboard/sendCoin/sendCoin.render.js
+41 −24 react/src/components/dashboard/settings/settings.addressBookPanel.js
+17 −15 react/src/components/dashboard/settings/settings.appInfoPanel.js
+57 −68 react/src/components/dashboard/settings/settings.appSettingsPanel.js
+7 −5 react/src/components/dashboard/settings/settings.appUpdatePanel.js
+8 −4 react/src/components/dashboard/settings/settings.bip39KeysPanel.js
+25 −8 react/src/components/dashboard/settings/settings.cliPanel.js
+12 −4 react/src/components/dashboard/settings/settings.coindClearDataDirPanel.js
+6 −3 react/src/components/dashboard/settings/settings.daemonStdoutPanel.js
+39 −19 react/src/components/dashboard/settings/settings.debugLogPanel.js
+17 −7 react/src/components/dashboard/settings/settings.exportKeysPanel.js
+3 −1 react/src/components/dashboard/settings/settings.importKeysPanel.js
+8 −5 react/src/components/dashboard/settings/settings.js
+15 −6 react/src/components/dashboard/settings/settings.nativeWalletDatKeysPanel.js
+17 −15 react/src/components/dashboard/settings/settings.render.js
+19 −6 react/src/components/dashboard/settings/settings.seedEncryptPanel.js
+27 −11 react/src/components/dashboard/settings/settings.spvServersPanel.js
+21 −11 react/src/components/dashboard/settings/settings.sweepKeysPanel.js
+6 −2 react/src/components/dashboard/tools/toolsGetBalance.js
+6 −2 react/src/components/dashboard/tools/toolsGetBalanceMulti.js
+3 −1 react/src/components/dashboard/tools/toolsGetUtxos.js
+19 −8 react/src/components/dashboard/tools/toolsMergeUtxo.js
+18 −6 react/src/components/dashboard/tools/toolsOfflineSigCreate.js
+1 −1 react/src/components/dashboard/tools/toolsOfflineSigScan.js
+3 −1 react/src/components/dashboard/tools/toolsPubCheck.js
+8 −3 react/src/components/dashboard/tools/toolsSeedToWif.js
+17 −9 react/src/components/dashboard/tools/toolsSplitUtxo.js
+6 −2 react/src/components/dashboard/tools/toolsWifToWif.js
+57 −47 react/src/components/dashboard/walletsBalance/walletsBalance.js
+48 −48 react/src/components/dashboard/walletsBalance/walletsBalance.render.js
+78 −40 react/src/components/dashboard/walletsData/walletsData.js
+26 −18 react/src/components/dashboard/walletsData/walletsData.render.js
+11 −8 react/src/components/dashboard/walletsInfo/walletsInfo.render.js
+7 −5 react/src/components/dashboard/walletsMain/walletsMain.js
+8 −6 react/src/components/dashboard/walletsMain/walletsMain.render.js
+8 −6 react/src/components/dashboard/walletsNav/walletsNav.render.js
+51 −38 react/src/components/dashboard/walletsProgress/walletsProgress.js
+17 −10 react/src/components/dashboard/walletsProgress/walletsProgress.render.js
+35 −26 react/src/components/dashboard/walletsTxInfo/walletsTxInfo.js
+10 −8 react/src/components/dashboard/walletsTxInfo/walletsTxInfo.render.js
+8 −5 react/src/components/dashboard/zcparamsFetchModal/zcparamsFetchModal.js
+14 −3 react/src/components/login/login.js
+2 −0 react/src/reducers/main.js
+9 −2 react/src/translate/en.js
+0 −24 react/src/util/formatBytes.js
+3 −0 react/src/util/mainWindow.js
9 changes: 9 additions & 0 deletions routes/api/electrum/createtx.js
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,15 @@ module.exports = (api) => {
result: 'Missing fee',
};

res.end(JSON.stringify(retObj));
} else if (
json &&
JSON.stringify(json).indexOf('the transaction was rejected by network rules') > -1
) {
const retObj = {
msg: 'error',
result: json,
};
res.end(JSON.stringify(retObj));
} else if (
json &&
Expand Down

0 comments on commit aa82c06

Please sign in to comment.