From 21b21bb8ff64d31aafb34e4dafdf5ab92f112702 Mon Sep 17 00:00:00 2001 From: Samuel Hawksby-Robinson Date: Thu, 27 Jan 2022 11:00:18 +0000 Subject: [PATCH] Handle sync-settings https://github.com/status-im/status-go/compare/f0d3e0419da9357a07b2ed97a2741095798812dd...9f7fc78def512929499bc2fa610f3b0e0ea1835b Signed-off-by: Samuel Hawksby-Robinson --- src/status_im/multiaccounts/update/core.cljs | 10 ++++++++++ src/status_im/transport/message/core.cljs | 5 +++++ status-go-version.json | 6 +++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/status_im/multiaccounts/update/core.cljs b/src/status_im/multiaccounts/update/core.cljs index 352c774a7ba..8d9f3373ede 100644 --- a/src/status_im/multiaccounts/update/core.cljs +++ b/src/status_im/multiaccounts/update/core.cljs @@ -47,6 +47,16 @@ (assoc-in db [:multiaccount setting] setting-value) (update db :multiaccount dissoc setting))})) +(fx/defn set-many-js + [cofx settings-js] + (apply fx/merge + cofx + (map + #(optimistic + (keyword (.-name %)) + (.-value %)) + settings-js))) + (fx/defn toggle-backup-enabled {:events [:multiaccounts.ui/switch-backup-enabled]} [cofx enabled?] diff --git a/src/status_im/transport/message/core.cljs b/src/status_im/transport/message/core.cljs index d72f5a485b6..4dd3bc560e1 100644 --- a/src/status_im/transport/message/core.cljs +++ b/src/status_im/transport/message/core.cljs @@ -14,6 +14,7 @@ [status-im.data-store.activities :as data-store.activities] [status-im.data-store.messages :as data-store.messages] [status-im.group-chats.core :as models.group] + [status-im.multiaccounts.update.core :as update.core] [status-im.utils.fx :as fx] [status-im.utils.types :as types] [status-im.constants :as constants] @@ -47,6 +48,7 @@ ^js visibility-status-updates (.-statusUpdates response-js) ^js current-visibility-status (.-currentStatus response-js) ^js bookmarks (.-bookmarks response-js) + ^js settings (.-settings response-js) ^js cleared-histories (.-clearedHistories response-js) sync-handler (when-not process-async process-response)] (cond @@ -156,6 +158,9 @@ (models.visibility-status-updates/handle-visibility-status-updates visibility-status-updates-clj))) + (seq settings) + (update.core/set-many-js cofx settings) + (some? current-visibility-status) (let [current-visibility-status-clj (types/js->clj current-visibility-status)] (js-delete response-js "currentStatus") diff --git a/status-go-version.json b/status-go-version.json index 4efb5152ecc..67c3db7145b 100644 --- a/status-go-version.json +++ b/status-go-version.json @@ -3,7 +3,7 @@ "_comment": "Instead use: scripts/update-status-go.sh ", "owner": "status-im", "repo": "status-go", - "version": "v0.96.4", - "commit-sha1": "f0d3e0419da9357a07b2ed97a2741095798812dd", - "src-sha256": "0bxhh8k504x5yvvvli1hc6ia2qh4acnl77mqigvq35pjk1hr2zkn" + "version": "v0.97.0", + "commit-sha1": "9f7fc78def512929499bc2fa610f3b0e0ea1835b", + "src-sha256": "0glwvx166wkhy57ly1xwdx3657p13ckhq86zkaq0nn00wix35wqm" }