Handle sync-settings

status-im · Mar 4, 2022 · 06ddaca · 06ddaca
1 parent 7f007f2
commit 06ddaca
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git 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
@@ -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
@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v0.94.10",
-    "commit-sha1": "598b83757cc8b27e3374e50de02187eacf0d4280",
-    "src-sha256": "0ncywjmpng7zdx707j45yxzj0m06c24mi0lgk3d2yzbp7gx3cygz"
+    "version": "feature/sync-settings",
+    "commit-sha1": "550c1e60847ac7759f4a6cfce652be11ac7aea43",
+    "src-sha256": "1slwnivpbvhgjyjmxx509z60fsj32mqhc892yzcg4vvs2fzvb0gx"
 }