diff --git a/ui/app/store/actions.js b/ui/app/store/actions.js index 0a7ac8cae..e910cba65 100644 --- a/ui/app/store/actions.js +++ b/ui/app/store/actions.js @@ -1464,24 +1464,29 @@ export function updateAndSetCustomRpc (newRpc, chainId, ticker = 'ETH', nickname } export function editRpc (oldRpc, newRpc, chainId, ticker = 'ETH', nickname, rpcPrefs) { - return (dispatch) => { + return async (dispatch) => { log.debug(`background.delRpcTarget: ${oldRpc}`) - background.delCustomRpc(oldRpc, (err) => { - if (err) { - log.error(err) - return dispatch(displayWarning('Had a problem removing network!')) - } - dispatch(setSelectedToken()) - background.updateAndSetCustomRpc(newRpc, chainId, ticker, nickname || newRpc, rpcPrefs, (err) => { - if (err) { - log.error(err) - return dispatch(displayWarning('Had a problem changing networks!')) - } - dispatch({ - type: actionConstants.SET_RPC_TARGET, - value: newRpc, - }) - }) + try { + promisifiedBackground.delCustomRpc(oldRpc) + } catch (error) { + log.error(error) + dispatch(displayWarning('Had a problem removing network!')) + return + } + + dispatch(setSelectedToken()) + + try { + await promisifiedBackground.updateAndSetCustomRpc(newRpc, chainId, ticker, nickname || newRpc, rpcPrefs) + } catch (error) { + log.error(error) + dispatch(displayWarning('Had a problem changing networks!')) + return + } + + dispatch({ + type: actionConstants.SET_RPC_TARGET, + value: newRpc, }) } }