From e9af024e0d149a9aa44a3625bc74ebeebf7d65a4 Mon Sep 17 00:00:00 2001 From: Andrey Shovkoplyas Date: Thu, 5 Apr 2018 14:09:55 +0300 Subject: [PATCH] fixed help improve screen Signed-off-by: Andrey Shovkoplyas --- src/status_im/ui/screens/usage_data/events.cljs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/status_im/ui/screens/usage_data/events.cljs b/src/status_im/ui/screens/usage_data/events.cljs index 000e7079b0..06e3b9b305 100644 --- a/src/status_im/ui/screens/usage_data/events.cljs +++ b/src/status_im/ui/screens/usage_data/events.cljs @@ -4,9 +4,12 @@ (handlers/register-handler-fx :help-improve-handler - (fn [{db :db} [_ yes? address next]] - (merge (accounts/account-update {:sharing-usage-data? yes?} {:db db}) - {:dispatch-n [(if yes? - [:register-mixpanel-tracking address] - [:unregister-mixpanel-tracking]) - next]}))) + (fn [{{:accounts/keys [accounts current-account-id] :as db} :db} [_ yes? address next]] + (let [{:keys [sharing-usage-data?]} (get accounts current-account-id)] + (merge (accounts/account-update {:sharing-usage-data? yes?} {:db db}) + {:dispatch-n [(if yes? + [:register-mixpanel-tracking address] + (when (and next sharing-usage-data?) + [:unregister-mixpanel-tracking])) + (or next [:navigate-to-clean :home])]})))) +