Merge branch 'develop' into cl-19226-remove-not-implemented-box

Author: clauxx

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)

src/status_im/common/bottom_sheet/view.cljs

@@ -66,26 +66,35 @@
            gradient-cover? customization-color hide-handle? blur-radius]
     :or   {border-radius 12}}]
   (let [theme                             (quo.theme/use-theme-value)
-        sheet-height                      (rn/use-ref-atom 0)
-        item-height                       (rn/use-ref-atom 0)
-        set-sheet-height                  (rn/use-callback #(reset! sheet-height (get-layout-height %)))
-        set-item-height                   (rn/use-callback #(reset! item-height (get-layout-height %)))
+        [sheet-height set-sheet-height]   (rn/use-state 0)
+        handle-sheet-height               (rn/use-callback (fn [e]
+                                                             (when (= sheet-height 0)
+                                                               (set-sheet-height
+                                                                (get-layout-height e))))
+                                                           [sheet-height])
+        [item-height set-item-height]     (rn/use-state 0)
+        handle-item-height                (rn/use-callback (fn [e]
+                                                             (when (= item-height 0)
+                                                               (set-item-height
+                                                                (get-layout-height e))))
+                                                           [item-height])
         {window-height :height}           (rn/get-window)
         bg-opacity                        (reanimated/use-shared-value 0)
         translate-y                       (reanimated/use-shared-value window-height)
-        sheet-gesture                     (get-sheet-gesture translate-y
-                                                             bg-opacity
-                                                             window-height
-                                                             on-close)
-        selected-item-smaller-than-sheet? (< @item-height
+        sheet-gesture                     (rn/use-memo #(get-sheet-gesture translate-y
+                                                                           bg-opacity
+                                                                           window-height
+                                                                           on-close)
+                                                       [window-height on-close])
+        selected-item-smaller-than-sheet? (< item-height
                                              (- window-height
-                                                @sheet-height
+                                                sheet-height
                                                 (:top insets)
                                                 (:bottom insets)
                                                 bottom-margin))
-        top                               (- window-height (:top insets) @sheet-height)
+        top                               (- window-height (:top insets) sheet-height)
         bottom                            (if selected-item-smaller-than-sheet?
-                                            (+ @sheet-height bottom-margin)
+                                            (+ sheet-height bottom-margin)
                                             (:bottom insets))
         sheet-max-height                  (- window-height (:top insets))
         content-padding-bottom            (or padding-bottom-override
@@ -123,11 +132,12 @@
            :overlay-color :transparent}])
        (when selected-item
          [rn/view
-          {:on-layout set-item-height
-           :style (style/selected-item theme top bottom selected-item-smaller-than-sheet? border-radius)}
+          {:on-layout handle-item-height
+           :style
+           (style/selected-item theme top bottom selected-item-smaller-than-sheet? border-radius)}
           [selected-item]])
        [rn/view
-        {:on-layout set-sheet-height
+        {:on-layout handle-sheet-height
          :style     (style/sheet-content {:theme          theme
                                           :shell?         shell?
                                           :padding-bottom content-padding-bottom})}

src/status_im/contexts/chat/group_details/style.cljs

@@ -40,3 +40,6 @@
    :background-color   (colors/theme-colors colors/white colors/neutral-95-opa-70)
    :flex-direction     :row})
 
+(def floating-shell-button
+  {:position :absolute
+   :bottom   21})

src/status_im/contexts/chat/group_details/view.cljs

@@ -113,6 +113,7 @@
         members         (rf/sub [:contacts/group-members-sections chat-id])
         pinned-messages (rf/sub [:chats/pinned chat-id])
         current-pk      (rf/sub [:multiaccount/public-key])
+        profile-color   (rf/sub [:profile/customization-color])
         admin?          (get admins current-pk)]
     [:<>
      [quo/gradient-cover
@@ -127,7 +128,6 @@
                                                                  group])}])}]
        :icon-name  :i/arrow-left
        :on-press   #(rf/dispatch [:navigate-back])}]
-
      [quo/page-top
       {:title  chat-name
        :avatar {:customization-color color}}]
@@ -167,4 +167,12 @@
        :render-section-footer-fn       contacts-section-footer
        :render-data                    {:chat-id chat-id
                                         :admin?  admin?}
-       :render-fn                      contact-item-render}]]))
+       :render-fn                      contact-item-render}]
+     [quo/floating-shell-button
+      {:jump-to {:on-press            (fn []
+                                        (rf/dispatch [:navigate-back])
+                                        (rf/dispatch [:shell/navigate-to-jump-to])
+                                      )
+                 :customization-color profile-color
+                 :label               (i18n/label :t/jump-to)}}
+      style/floating-shell-button]]))

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])

src/status_im/contexts/chat/messenger/messages/content/style.cljs

@@ -31,3 +31,7 @@
    :opacity            (if (and outgoing (= outgoing-status :sending))
                          0.5
                          1)})
+
+(def drawer-message-container
+  {:padding-top    4
+   :padding-bottom 8})

src/status_im/contexts/chat/messenger/messages/content/view.cljs

@@ -79,11 +79,11 @@
 
 (defn system-message-contact-request
   [{:keys [chat-id timestamp-str from]} type]
-  (let [[primary-name _]     (rf/sub [:contacts/contact-two-names-by-identity chat-id])
-        contact              (rf/sub [:contacts/contact-by-address chat-id])
-        photo-path           (when (seq (:images contact)) (rf/sub [:chats/photo-path chat-id]))
-        customization-color  (rf/sub [:profile/customization-color])
-        {:keys [public-key]} (rf/sub [:profile/profile])]
+  (let [[primary-name _]    (rf/sub [:contacts/contact-two-names-by-identity chat-id])
+        contact             (rf/sub [:contacts/contact-by-address chat-id])
+        photo-path          (when (seq (:images contact)) (rf/sub [:chats/photo-path chat-id]))
+        customization-color (rf/sub [:profile/customization-color])
+        public-key          (rf/sub [:profile/public-key])]
     [quo/system-message
      {:type                type
       :timestamp           timestamp-str
@@ -283,14 +283,14 @@
        (fn []
          [rn/view
           {:pointer-events :none
-           :padding-top    4}
+           :style          style/drawer-message-container}
           [user-message-content
-           {:message-data    message-data
-            :context         context
-            :keyboard-shown? keyboard-shown?
-            :show-reactions? true
-            :show-user-info? true
-            :preview?        true}]]))}]))
+           {:message-data                 message-data
+            :context                      context
+            :keyboard-shown?              keyboard-shown?
+            :in-reaction-and-action-menu? true
+            :show-user-info?              false
+            :show-reactions?              true}]]))}]))
 
 (defn system-message?
   [content-type]

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?]

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"

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)]

src/status_im/contexts/profile/settings/view.cljs

@@ -70,8 +70,7 @@
        :on-scroll                       #(scroll-handler % scroll-y)
        :bounces                         false}]
      [quo/floating-shell-button
-      {:key :shell
-       :jump-to
+      {:jump-to
        {:on-press            (fn []
                                (rf/dispatch [:navigate-back])
                                (debounce/throttle-and-dispatch [:shell/navigate-to-jump-to] 500))

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?

src/status_im/subs/profile.cljs

@@ -82,12 +82,20 @@
             :override-ring?  override-ring?
             :font-file       font-file}))}))))
 
+;; DEPRECATED
+;; use `:profile/public-key` instead
 (re-frame/reg-sub
  :multiaccount/public-key
  :<- [:profile/profile]
  (fn [{:keys [public-key]}]
    public-key))
 
+(re-frame/reg-sub
+ :profile/public-key
+ :<- [:profile/profile]
+ (fn [{:keys [public-key]}]
+   public-key))
+
 (re-frame/reg-sub
  :profile/webview-debug
  :<- [:profile/profile]

src/status_im/subs/profile_test.cljs

@@ -112,3 +112,9 @@
   (testing "returns the symbol of the user's selected currency"
     (swap! rf-db/app-db #(assoc % :profile/profile sample-profile))
     (is (match? "$" (rf/sub [sub-name])))))
+
+(h/deftest-sub :profile/public-key
+  [sub-name]
+  (testing "returns the user's public key"
+    (swap! rf-db/app-db #(assoc % :profile/profile sample-profile))
+    (is (match? (:public-key sample-profile) (rf/sub [sub-name])))))