From c43374a553c28459be4cac116a72a4f34dddba72 Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Wed, 20 Mar 2019 20:26:48 -0500 Subject: Clear notices when setCompletedOnboarding is called --- ui/app/actions.js | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'ui/app/actions.js') diff --git a/ui/app/actions.js b/ui/app/actions.js index d8363eba6..65070fc8c 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -2487,16 +2487,29 @@ function setCompletedOnboarding () { return dispatch => { dispatch(actions.showLoadingIndication()) return new Promise((resolve, reject) => { - background.completeOnboarding(err => { - dispatch(actions.hideLoadingIndication()) + background.markAllNoticesRead(err => { if (err) { dispatch(actions.displayWarning(err.message)) return reject(err) } - dispatch(actions.completeOnboarding()) - resolve() + dispatch(actions.clearNotices()) + resolve(false) + }) + }) + .then(() => { + return new Promise((resolve, reject) => { + background.completeOnboarding(err => { + if (err) { + dispatch(actions.displayWarning(err.message)) + return reject(err) + } + + dispatch(actions.completeOnboarding()) + dispatch(actions.hideLoadingIndication()) + resolve() + }) }) }) } -- cgit