diff --git a/src/legacy/status_im/subs/root.cljs b/src/legacy/status_im/subs/root.cljs index 817c375892..674e781cfe 100644 --- a/src/legacy/status_im/subs/root.cljs +++ b/src/legacy/status_im/subs/root.cljs @@ -22,7 +22,6 @@ (reg-root-key-sub :peers-count :peers-count) (reg-root-key-sub :peers-summary :peers-summary) (reg-root-key-sub :web3-node-version :web3-node-version) -(reg-root-key-sub :alert-banners :alert-banners) ;;keycard (reg-root-key-sub :keycard :keycard) diff --git a/src/status_im/contexts/chat/messenger/composer/utils.cljs b/src/status_im/contexts/chat/messenger/composer/utils.cljs index 8d54fdd389..7d325a2eaa 100644 --- a/src/status_im/contexts/chat/messenger/composer/utils.cljs +++ b/src/status_im/contexts/chat/messenger/composer/utils.cljs @@ -200,7 +200,8 @@ [] (let [chat-input (rf/sub [:chats/current-chat-input])] {:images (seq (rf/sub [:chats/sending-image])) - :link-previews? (rf/sub [:chats/link-previews?]) + :link-previews? (or (rf/sub [:chats/link-previews?]) + (rf/sub [:chats/status-link-previews?])) :audio (rf/sub [:chats/sending-audio]) :reply (rf/sub [:chats/reply-message]) :edit (rf/sub [:chats/edit-message]) diff --git a/src/status_im/contexts/communities/events.cljs b/src/status_im/contexts/communities/events.cljs index 18076f3eff..023e58ff44 100644 --- a/src/status_im/contexts/communities/events.cljs +++ b/src/status_im/contexts/communities/events.cljs @@ -235,10 +235,10 @@ [:cofx :schema.re-frame/cofx] [:args [:schema - [:catn - [:map - [:community-id [:? :string]] - [:update-last-opened-at? [:? :boolean]]]]]]] + [:vector + [:map {:closed true} + [:community-id {:optional true} :string] + [:update-last-opened-at? {:optional true} [:maybe :boolean]]]]]]] [:maybe [:map [:db map?] diff --git a/src/status_im/contexts/communities/events_test.cljs b/src/status_im/contexts/communities/events_test.cljs index cb1f171258..ddf3a0a7f4 100644 --- a/src/status_im/contexts/communities/events_test.cljs +++ b/src/status_im/contexts/communities/events_test.cljs @@ -24,7 +24,7 @@ (testing "do nothing" (is (match? nil - (events/fetch-community {} [])))))) + (events/fetch-community {} [{}])))))) (deftest community-failed-to-fetch (testing "given a community id" diff --git a/src/status_im/contexts/profile/settings/events.cljs b/src/status_im/contexts/profile/settings/events.cljs index 9f6eb0d4ed..d4714ca890 100644 --- a/src/status_im/contexts/profile/settings/events.cljs +++ b/src/status_im/contexts/profile/settings/events.cljs @@ -32,11 +32,6 @@ :params [(or preferred-name display-name name) ""] :on-success #(log/debug "sent contact update")}]]))]})) -(rf/reg-event-fx :profile.settings/change-preview-privacy - (fn [{:keys [db]}] - (let [private? (get-in db [:profile/profile :preview-privacy?])] - {:fx [[:profile.settings/blank-preview-flag-changed private?]]}))) - (rf/reg-event-fx :profile.settings/change-webview-debug (fn [_ [value]] (let [value' (boolean value)] diff --git a/src/status_im/subs/chats.cljs b/src/status_im/subs/chats.cljs index adaa33737d..76b44b25ef 100644 --- a/src/status_im/subs/chats.cljs +++ b/src/status_im/subs/chats.cljs @@ -433,10 +433,14 @@ (re-frame/reg-sub :chats/link-previews? :<- [:chats/link-previews-unfurled] + (fn [previews] + (boolean (seq previews)))) + +(re-frame/reg-sub + :chats/status-link-previews? :<- [:chats/status-link-previews-unfurled] - (fn [previews status-link-previews] - (boolean (or (seq status-link-previews) - (seq previews))))) + (fn [status-link-previews] + (boolean (seq status-link-previews)))) (re-frame/reg-sub :chat/check-channel-muted?