Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Force background state update after removing an account #7840

Merged
merged 2 commits into from
Jan 16, 2020
Merged

Force background state update after removing an account #7840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22440f9
Force background state update after removing an account
Gudahtt Jan 15, 2020
e33de32
Remove unnecessary `async`
Gudahtt Jan 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions test/unit/ui/app/actions.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,25 +239,29 @@ describe('Actions', () => {
const store = mockStore(devState)

const expectedActions = [
{ type: 'SHOW_LOADING_INDICATION', value: undefined },
{ type: 'HIDE_LOADING_INDICATION' },
{ type: 'SHOW_ACCOUNTS_PAGE' },
'SHOW_LOADING_INDICATION',
'UPDATE_METAMASK_STATE',
'HIDE_LOADING_INDICATION',
'SHOW_ACCOUNTS_PAGE',
]

removeAccountSpy = sinon.spy(background, 'removeAccount')

await store.dispatch(actions.removeAccount('0xe18035bf8712672935fdb4e5e431b1a0183d2dfc'))
assert(removeAccountSpy.calledOnce)
assert.deepEqual(store.getActions(), expectedActions)
const actionTypes = store
.getActions()
.map(action => action.type)
assert.deepEqual(actionTypes, expectedActions)
})

it('displays warning error message when removeAccount callback errors', async () => {
const store = mockStore()

const expectedActions = [
{ type: 'SHOW_LOADING_INDICATION', value: undefined },
{ type: 'HIDE_LOADING_INDICATION' },
{ type: 'DISPLAY_WARNING', value: 'error' },
'SHOW_LOADING_INDICATION',
'DISPLAY_WARNING',
'HIDE_LOADING_INDICATION',
]

removeAccountSpy = sinon.stub(background, 'removeAccount')
Expand All @@ -269,7 +273,10 @@ describe('Actions', () => {
await store.dispatch(actions.removeAccount('0xe18035bf8712672935fdb4e5e431b1a0183d2dfc'))
assert.fail('Should have thrown error')
} catch (_) {
assert.deepEqual(store.getActions(), expectedActions)
const actionTypes = store
.getActions()
.map(action => action.type)
assert.deepEqual(actionTypes, expectedActions)
}

})
Expand Down
32 changes: 19 additions & 13 deletions ui/app/store/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,22 +385,28 @@ export function resetAccount () {
}

export function removeAccount (address) {
return dispatch => {
return async dispatch => {
dispatch(showLoadingIndication())

return new Promise((resolve, reject) => {
background.removeAccount(address, (err, account) => {
dispatch(hideLoadingIndication())
if (err) {
dispatch(displayWarning(err.message))
return reject(err)
}

log.info('Account removed: ' + account)
dispatch(showAccountsPage())
resolve()
try {
await new Promise((resolve, reject) => {
background.removeAccount(address, (error, account) => {
if (error) {
return reject(error)
}
return resolve(account)
})
})
})
await forceUpdateMetamaskState(dispatch)
} catch (error) {
dispatch(displayWarning(error.message))
throw error
} finally {
dispatch(hideLoadingIndication())
}

log.info('Account removed: ' + address)
dispatch(showAccountsPage())
}
}

Expand Down