diff options
author | Dan Finlay <dan@danfinlay.com> | 2017-03-09 07:19:33 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2017-03-09 07:19:33 +0800 |
commit | e3f6c010abb5cec35910dc4ea83f451287d25f11 (patch) | |
tree | bcc8f6b5e70b136d45644ae56024b253086e8b64 /ui/app/actions.js | |
parent | 69d4aafc3e8fd62875e5da2c2c6c7b3bdac5bf9f (diff) | |
parent | 1fbe4a801a05523cbdf97f7d8491affb49ed9bc6 (diff) | |
download | tangerine-wallet-browser-e3f6c010abb5cec35910dc4ea83f451287d25f11.tar.gz tangerine-wallet-browser-e3f6c010abb5cec35910dc4ea83f451287d25f11.tar.zst tangerine-wallet-browser-e3f6c010abb5cec35910dc4ea83f451287d25f11.zip |
Get basic ENS working
& merge master into ENS branch.
Diffstat (limited to 'ui/app/actions.js')
-rw-r--r-- | ui/app/actions.js | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index 7f972fb37..d4fd7553b 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -112,11 +112,13 @@ var actions = { // config screen SHOW_CONFIG_PAGE: 'SHOW_CONFIG_PAGE', SET_RPC_TARGET: 'SET_RPC_TARGET', + SET_DEFAULT_RPC_TARGET: 'SET_DEFAULT_RPC_TARGET', SET_PROVIDER_TYPE: 'SET_PROVIDER_TYPE', USE_ETHERSCAN_PROVIDER: 'USE_ETHERSCAN_PROVIDER', useEtherscanProvider: useEtherscanProvider, showConfigPage: showConfigPage, setRpcTarget: setRpcTarget, + setDefaultRpcTarget: setDefaultRpcTarget, setProviderType: setProviderType, // loading overlay SHOW_LOADING: 'SHOW_LOADING_INDICATION', @@ -669,12 +671,28 @@ function markAccountsFound() { // config // +// default rpc target refers to localhost:8545 in this instance. +function setDefaultRpcTarget (rpcList) { + log.debug(`background.setDefaultRpcTarget`) + return (dispatch) => { + background.setDefaultRpc((err, result) => { + if (err) { + log.error(err) + return dispatch(self.displayWarning('Had a problem changing networks.')) + } + }) + } +} + function setRpcTarget (newRpc) { log.debug(`background.setRpcTarget`) - background.setRpcTarget(newRpc) - return { - type: actions.SET_RPC_TARGET, - value: newRpc, + return (dispatch) => { + background.setCustomRpc(newRpc, (err, result) => { + if (err) { + log.error(err) + return dispatch(self.displayWarning('Had a problem changing networks!')) + } + }) } } @@ -750,7 +768,7 @@ function exportAccount (address) { dispatch(self.hideLoadingIndication()) if (err) { - console.error(err) + log.error(err) return dispatch(self.displayWarning('Had a problem exporting the account.')) } |