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/ethereum/json_rpc.cljs b/src/status_im/ethereum/json_rpc.cljs index 2058de94a4ae..665ee85bebef 100644 --- a/src/status_im/ethereum/json_rpc.cljs +++ b/src/status_im/ethereum/json_rpc.cljs @@ -265,6 +265,7 @@ (defn call [{:keys [method params on-success on-error js-response] :as arg}] + (if-let [method-options (json-rpc-api method)] (let [params (or params []) {:keys [id on-result subscription?] diff --git a/src/status_im/multiaccounts/update/core.cljs b/src/status_im/multiaccounts/update/core.cljs index 8d9f3373ede7..a8d9f959ef17 100644 --- a/src/status_im/multiaccounts/update/core.cljs +++ b/src/status_im/multiaccounts/update/core.cljs @@ -17,6 +17,7 @@ setting setting-value {:keys [dont-sync? on-success] :or {on-success #()}}] (let [current-multiaccount (:multiaccount db)] + (prn "------multiaccount-update------" setting setting-value) (if (empty? current-multiaccount) ;; NOTE: this should never happen, but if it does this is a critical error ;; and it is better to crash than risk having an unstable state @@ -42,7 +43,11 @@ (fx/defn optimistic [{:keys [db] :as cofx} setting setting-value] - (let [current-multiaccount (:multiaccount db)] + (prn "------todo remove---- " setting setting-value) + (let [current-multiaccount (:multiaccount db) + setting-value (if (= :currency setting) + (keyword setting-value) + setting-value)] {:db (if setting-value (assoc-in db [:multiaccount setting] setting-value) (update db :multiaccount dissoc setting))})) diff --git a/src/status_im/stickers/core.cljs b/src/status_im/stickers/core.cljs index 1713c11490fb..5e5ced0ac2f3 100644 --- a/src/status_im/stickers/core.cljs +++ b/src/status_im/stickers/core.cljs @@ -103,11 +103,13 @@ {:events [:stickers/install-pack]} [{{:keys [multiaccount] :as db} :db :as cofx} id] (let [pack (get-in db [:stickers/packs id])] + (fx/merge cofx {:db (-> db (assoc-in [:stickers/packs-installed id] pack))} ;;(assoc :stickers/selected-pack id))} TODO it doesn't scroll to selected pack on Android + (prn "-------------save to multi---"(pr-str (assoc (:stickers/packs-installed multiaccount) id pack) {})) (multiaccounts.update/multiaccount-update :stickers/packs-installed (assoc (:stickers/packs-installed multiaccount) id pack) diff --git a/status-go-version.json b/status-go-version.json index fe9808017aeb..3976c671ebf4 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.5", - "commit-sha1": "640793fe85d9a9eef9eb3712cda1c5a1ceea401a", - "src-sha256": "1k1iw69yw23k29y0b1yvnggjqlmfnwavk4mq1sf2h3wrlb8x47kd" + "version": "d3105a72c884d5787b99415792cb198e9cec4a32", + "commit-sha1": "d3105a72c884d5787b99415792cb198e9cec4a32", + "src-sha256": "03l59kayqi6x1njq0fcg4f6hnyaflc2qspmxshvnrdam1nrczm0r" }