From edec6cb81d24dbe07aba53c772ff762da92399d1 Mon Sep 17 00:00:00 2001 From: kumavis Date: Fri, 29 Mar 2019 12:40:04 +0800 Subject: actions - setCompletedOnboarding - make async with pify --- ui/app/store/actions.js | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) (limited to 'ui') diff --git a/ui/app/store/actions.js b/ui/app/store/actions.js index 785cadc3c..db3427ee6 100644 --- a/ui/app/store/actions.js +++ b/ui/app/store/actions.js @@ -2488,34 +2488,27 @@ function setShowFiatConversionOnTestnetsPreference (value) { } function setCompletedOnboarding () { - return dispatch => { + return async dispatch => { dispatch(actions.showLoadingIndication()) - return new Promise((resolve, reject) => { - background.markAllNoticesRead(err => { + + try { + await pify(background.markAllNoticesRead).call(background) + } catch (err) { + dispatch(actions.displayWarning(err.message)) + throw err + } - if (err) { - dispatch(actions.displayWarning(err.message)) - return reject(err) - } + dispatch(actions.clearNotices()) - dispatch(actions.clearNotices()) - resolve(false) - }) - }) - .then(() => { - return new Promise((resolve, reject) => { - background.completeOnboarding(err => { - if (err) { - dispatch(actions.displayWarning(err.message)) - return reject(err) - } + try { + await pify(background.completeOnboarding).call(background) + } catch (err) { + dispatch(actions.displayWarning(err.message)) + throw err + } - dispatch(actions.completeOnboarding()) - dispatch(actions.hideLoadingIndication()) - resolve() - }) - }) - }) + dispatch(actions.completeOnboarding()) + dispatch(actions.hideLoadingIndication()) } } -- cgit v1.2.3