m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 18:00:18 +01:00
Code

Return Promise from editRpc thunk (#8441)

Browse Source 
`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.
This commit is contained in:
Mark Stacey 2020-04-28 13:56:35 -03:00 committed by GitHub
commit 627fc2f93c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ui/app/store/actions.js
View File

@ -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,
})
}
}