diff --git a/src/status_im/events.cljs b/src/status_im/events.cljs index fd5fe656b7..bb5166f90c 100644 --- a/src/status_im/events.cljs +++ b/src/status_im/events.cljs @@ -214,11 +214,6 @@ (fn [cofx [_ desktop-notifications?]] (multiaccounts/enable-notifications cofx desktop-notifications?))) -(handlers/register-handler-fx - :multiaccounts.ui/toggle-device-to-device - (fn [cofx [_ enabled?]] - (multiaccounts/toggle-device-to-device cofx enabled?))) - (handlers/register-handler-fx :multiaccounts.ui/toggle-datasync (fn [cofx [_ enabled?]] diff --git a/src/status_im/multiaccounts/core.cljs b/src/status_im/multiaccounts/core.cljs index 8df8909fae..b4496d441c 100644 --- a/src/status_im/multiaccounts/core.cljs +++ b/src/status_im/multiaccounts/core.cljs @@ -96,18 +96,6 @@ {:desktop-notifications? desktop-notifications?} {})) -(fx/defn toggle-device-to-device - [{:keys [db] :as cofx} enabled?] - (let [settings (get-in db [:multiaccount :settings]) - warning {:utils/show-popup {:title (i18n/label :t/device-to-device-warning-title) - :content (i18n/label :t/device-to-device-warning-content)}}] - - (fx/merge cofx - (when enabled? warning) - ;; Set to pfs? for backward compatibility - (multiaccounts.update/update-settings (assoc settings :pfs? enabled?) - {})))) - (fx/defn toggle-datasync [{:keys [db] :as cofx} enabled?] (let [settings (get-in db [:multiaccount :settings]) diff --git a/src/status_im/signals/core.cljs b/src/status_im/signals/core.cljs index 9a42bc9c73..1dece8d354 100644 --- a/src/status_im/signals/core.cljs +++ b/src/status_im/signals/core.cljs @@ -70,8 +70,8 @@ (case type "node.ready" (status-node-started cofx) "node.stopped" (status-node-stopped cofx) - "envelope.sent" (transport.message/update-envelope-status cofx (:hash event) :sent) - "envelope.expired" (transport.message/update-envelope-status cofx (:hash event) :not-sent) + "envelope.sent" (transport.message/update-envelopes-status cofx (:ids event) :sent) + "envelope.expired" (transport.message/update-envelopes-status cofx (:ids event) :not-sent) "bundles.added" (pairing/handle-bundles-added cofx event) "mailserver.request.completed" (mailserver/handle-request-completed cofx event) "mailserver.request.expired" (when (multiaccounts.model/logged-in? cofx) diff --git a/src/status_im/transport/message/core.cljs b/src/status_im/transport/message/core.cljs index e06f50c885..5defcd9ae8 100644 --- a/src/status_im/transport/message/core.cljs +++ b/src/status_im/transport/message/core.cljs @@ -144,6 +144,10 @@ (check-confirmations status chat-id message-id) (models.message/send-push-notification chat-id message-id fcm-tokens status))))))) +(fx/defn update-envelopes-status + [{:keys [db] :as cofx} envelope-hashes status] + (apply fx/merge cofx (map #(update-envelope-status % status) envelope-hashes))) + (fx/defn set-contact-message-envelope-hash [{:keys [db] :as cofx} chat-id envelope-hash] {:db (assoc-in db [:transport/message-envelopes envelope-hash] diff --git a/src/status_im/transport/message/protocol.cljs b/src/status_im/transport/message/protocol.cljs index 36b2692021..314795c80f 100644 --- a/src/status_im/transport/message/protocol.cljs +++ b/src/status_im/transport/message/protocol.cljs @@ -71,20 +71,10 @@ "Sends the payload using asymetric key (multiaccount `:public-key` in db) and fixed discovery topic" [{:keys [db] :as cofx} {:keys [payload chat-id success-event]}] (let [{:keys [web3]} db] - (let [pfs? (get-in db [:multiaccount :settings :pfs?])] - (if pfs? - (send-direct-message cofx - chat-id - success-event - payload) - (let [topic-hash (discovery-topic-hash)] - {:shh/post [{:web3 web3 - :success-event success-event - :message (merge {:sig (multiaccounts.model/current-public-key cofx) - :pubKey chat-id - :payload payload - :topic topic-hash} - whisper-opts)}]}))))) + (send-direct-message cofx + chat-id + success-event + payload))) (defrecord Message [content content-type message-type clock-value timestamp] StatusMessage diff --git a/src/status_im/ui/screens/desktop/main/tabs/profile/views.cljs b/src/status_im/ui/screens/desktop/main/tabs/profile/views.cljs index 2936108bdc..e3878ab948 100644 --- a/src/status_im/ui/screens/desktop/main/tabs/profile/views.cljs +++ b/src/status_im/ui/screens/desktop/main/tabs/profile/views.cljs @@ -164,7 +164,6 @@ (let [render-fn (offline-messaging.views/render-row current-mailserver-id preferred-mailserver-id) - pfs? (:pfs? settings) datasync? (:datasync? settings) v1-messages? (:datasync? settings) disable-discovery-topic? (:disable-discovery-topic? settings) @@ -213,21 +212,12 @@ [react/view {:style styles/title-separator}] [react/text {:style styles/adv-settings-subtitle} (i18n/label :t/logging)] [logging-display] - - [react/view {:style styles/title-separator}] - [react/text {:style styles/adv-settings-subtitle} (i18n/label :t/device-to-device)] - [react/view {:style (styles/profile-row false)} - [react/text {:style (styles/profile-row-text colors/black)} (i18n/label :t/device-to-device)] - [react/switch {:track-color #js {:true colors/blue :false nil} - :value pfs? - :on-value-change #(re-frame/dispatch [:multiaccounts.ui/toggle-device-to-device (not pfs?)])}]] - [react/view {:style styles/title-separator}] [react/text {:style styles/adv-settings-subtitle} (i18n/label :t/v1-messages)] [react/view {:style (styles/profile-row false)} [react/text {:style (styles/profile-row-text colors/black)} (i18n/label :t/v1-messages)] [react/switch {:track-color #js {:true colors/blue :false nil} - :value pfs? + :value v1-messages? :on-value-change #(re-frame/dispatch [:multiaccounts.ui/toggle-v1-messages (not v1-messages?)])}]] [react/view {:style styles/title-separator}] @@ -235,7 +225,7 @@ [react/view {:style (styles/profile-row false)} [react/text {:style (styles/profile-row-text colors/black)} (i18n/label :t/datasync)] [react/switch {:track-color #js {:true colors/blue :false nil} - :value pfs? + :value datasync? :on-value-change #(re-frame/dispatch [:multiaccounts.ui/toggle-datasync (not datasync?)])}]] [react/view {:style styles/title-separator}] @@ -243,7 +233,7 @@ [react/view {:style (styles/profile-row false)} [react/text {:style (styles/profile-row-text colors/black)} (i18n/label :t/disable-discovery-topic)] [react/switch {:track-color #js {:true colors/blue :false nil} - :value pfs? + :value disable-discovery-topic? :on-value-change #(re-frame/dispatch [:multiaccounts.ui/toggle-disable-discovery-topic (not disable-discovery-topic?)])}]]]))) (views/defview installations [] diff --git a/src/status_im/ui/screens/profile/user/views.cljs b/src/status_im/ui/screens/profile/user/views.cljs index 2e1ebf5c83..1e0f4bed5a 100644 --- a/src/status_im/ui/screens/profile/user/views.cljs +++ b/src/status_im/ui/screens/profile/user/views.cljs @@ -219,13 +219,6 @@ :accessibility-label :bootnodes-settings-button}]) (when dev-mode? [profile.components/settings-item-separator]) - (when dev-mode? - [profile.components/settings-switch-item - {:label-kw :t/device-to-device - :value (:pfs? settings) - :action-fn #(re-frame/dispatch [:multiaccounts.ui/toggle-device-to-device %])}]) - (when dev-mode? - [profile.components/settings-item-separator]) (when dev-mode? [profile.components/settings-switch-item {:label-kw :t/datasync diff --git a/status-go-version.json b/status-go-version.json index c88faea4b6..c5ccaa5aec 100644 --- a/status-go-version.json +++ b/status-go-version.json @@ -2,7 +2,7 @@ "_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh ' instead", "owner": "status-im", "repo": "status-go", - "version": "a3a413b5d98f227ff541ad9527c8d24e9c9ce653", - "commit-sha1": "a3a413b5d98f227ff541ad9527c8d24e9c9ce653", - "src-sha256": "07sgvpmmjiigga73gymbq1ifm047frmrxn3dr26ihw50p0kp0fwh" + "version": "8383feea04004adb967ce879e42adce7cbcd300c", + "commit-sha1": "8383feea04004adb967ce879e42adce7cbcd300c", + "src-sha256": "1sb0irq1h1xzclqfabhhmf680gia3v763kii6avsamv3r1yw0kx1" }