diff --git a/.gitignore b/.gitignore index 1ed4d14f072c..b72632c8dd43 100644 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,7 @@ local.properties # VS Code .vscode/ipch/ .vscode/settings.json +workspace.code-workspace # node.js # diff --git a/src/status_im/multiaccounts/update/core.cljs b/src/status_im/multiaccounts/update/core.cljs index 8d9f3373ede7..70d05eedab79 100644 --- a/src/status_im/multiaccounts/update/core.cljs +++ b/src/status_im/multiaccounts/update/core.cljs @@ -1,5 +1,6 @@ (ns status-im.multiaccounts.update.core - (:require [status-im.ethereum.json-rpc :as json-rpc] + (:require [status-im.constants :as constants] + [status-im.ethereum.json-rpc :as json-rpc] [status-im.utils.fx :as fx] [taoensso.timbre :as log])) @@ -42,7 +43,15 @@ (fx/defn optimistic [{:keys [db] :as cofx} setting setting-value] - (let [current-multiaccount (:multiaccount db)] + (let [current-multiaccount (:multiaccount db) + setting-value (if (= :currency setting) + (keyword setting-value) + setting-value) + db (if (= :stickers/packs-installed setting) + ;;updating :stickers/packs for installed stickers + (let [packs-installed-keys (keys (js->clj setting-value))] + (reduce #(assoc-in %1 [:stickers/packs %2 :status] constants/sticker-pack-status-installed) db packs-installed-keys)) + db)] {:db (if setting-value (assoc-in db [:multiaccount setting] setting-value) (update db :multiaccount dissoc setting))})) diff --git a/status-go-version.json b/status-go-version.json index f2578c3ed02e..77efd2ebaf0f 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.98.6", - "commit-sha1": "0048aaebcc7859a6f0dd7cdf0266fe029f3066fc", - "src-sha256": "1px3ddfbpnlqyzkbp8v4bb8dh5f69cx4lwif8vspw60rr4gpppys" + "version": "6e9aaa5a217caa80f091446763eed47625e67684", + "commit-sha1": "6e9aaa5a217caa80f091446763eed47625e67684", + "src-sha256": "0dzz4zjqsv61jy46j76v60vn53z9j0724splyv4q1sww5azdn8q0" }