m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Return Promise from setSelectedAddress thunk (#8426)

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

This action creator was only called in two places, and neither benefit
from using the Promise now returned. They were both event handlers. In
both cases there was an existing Promise chain, but the only thing
after this set was a `catch` block that displayed any error
encountered. I decided not to return the result of `setSelectedAddress`
to this chain, because all it would do is set the warning a second
time in the event of failure.
This commit is contained in:
Mark Stacey 2020-04-27 18:56:17 -03:00 committed by GitHub
parent 21d62e3adc
commit 3ab00b48df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/unit/ui/app/actions.spec.js
View File

@ -949,22 +949,22 @@ describe('Actions', function () {
describe('#setSelectedAddress', function () {
let setSelectedAddressSpy
beforeEach(function () {
setSelectedAddressSpy = sinon.stub(background, 'setSelectedAddress')
})
afterEach(function () {
setSelectedAddressSpy.restore()
})
it('calls setSelectedAddress in background', function () {
it('calls setSelectedAddress in background', async function () {
setSelectedAddressSpy = sinon.stub(background, 'setSelectedAddress')
.callsArgWith(1, null)
const store = mockStore({ metamask: devState })
store.dispatch(actions.setSelectedAddress('0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'))
await store.dispatch(actions.setSelectedAddress('0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'))
assert(setSelectedAddressSpy.calledOnce)
})
it('errors when setSelectedAddress throws', function () {
it('errors when setSelectedAddress throws', async function () {
setSelectedAddressSpy = sinon.stub(background, 'setSelectedAddress')
.callsArgWith(1, new Error('error'))
const store = mockStore()
const expectedActions = [
{ type: 'SHOW_LOADING_INDICATION', value: undefined },
@ -972,11 +972,7 @@ describe('Actions', function () {
{ type: 'DISPLAY_WARNING', value: 'error' },
]
setSelectedAddressSpy.callsFake((_, callback) => {
callback(new Error('error'))
})
store.dispatch(actions.setSelectedAddress())
await store.dispatch(actions.setSelectedAddress())
assert.deepEqual(store.getActions(), expectedActions)
})

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

@ -1178,15 +1178,17 @@ export function setSelectedToken (tokenAddress) {
}
export function setSelectedAddress (address) {
return (dispatch) => {
return async (dispatch) => {
dispatch(showLoadingIndication())
log.debug(`background.setSelectedAddress`)
background.setSelectedAddress(address, (err) => {
try {
await promisifiedBackground.setSelectedAddress(address)
} catch (error) {
dispatch(hideLoadingIndication())
if (err) {
return dispatch(displayWarning(err.message))
}
})
dispatch(displayWarning(error.message))
return
}
dispatch(hideLoadingIndication())
}
}