Return Promise from `editRpc` thunk

`editRpc` returned a thunk that didn't return a Promise, despite doing
async work. It now returns a Promise.

In the one place where this is used, it didn't seem important to update
the callsite to block on this finishing. Only one call followed it in
the event handler, and it didn't seem to depend on this.
feature/default_network_editable
Mark Stacey 5 years ago
parent 46d72d17a9
commit bd50dabad9
  1. 27
      ui/app/store/actions.js

@ -1461,25 +1461,30 @@ export function updateAndSetCustomRpc (newRpc, chainId, ticker = 'ETH', nickname
} }
export function editRpc (oldRpc, newRpc, chainId, ticker = 'ETH', nickname, rpcPrefs) { export function editRpc (oldRpc, newRpc, chainId, ticker = 'ETH', nickname, rpcPrefs) {
return (dispatch) => { return async (dispatch) => {
log.debug(`background.delRpcTarget: ${oldRpc}`) log.debug(`background.delRpcTarget: ${oldRpc}`)
background.delCustomRpc(oldRpc, (err) => { try {
if (err) { promisifiedBackground.delCustomRpc(oldRpc)
log.error(err) } catch (error) {
return dispatch(displayWarning('Had a problem removing network!')) log.error(error)
dispatch(displayWarning('Had a problem removing network!'))
return
} }
dispatch(setSelectedToken()) dispatch(setSelectedToken())
background.updateAndSetCustomRpc(newRpc, chainId, ticker, nickname || newRpc, rpcPrefs, (err) => {
if (err) { try {
log.error(err) await promisifiedBackground.updateAndSetCustomRpc(newRpc, chainId, ticker, nickname || newRpc, rpcPrefs)
return dispatch(displayWarning('Had a problem changing networks!')) } catch (error) {
log.error(error)
dispatch(displayWarning('Had a problem changing networks!'))
return
} }
dispatch({ dispatch({
type: actionConstants.SET_RPC_TARGET, type: actionConstants.SET_RPC_TARGET,
value: newRpc, value: newRpc,
}) })
})
})
} }
} }

Loading…
Cancel
Save