Merge branch 'develop' into 16092

temporary hide mutual update's messages (#16290 )
2023-06-18 14:19:17 +03:00 · 2023-06-16 18:41:21 +02:00 · 2023-06-13 15:16:45 +03:00 · 2023-06-12 13:01:14 +03:00 · 2023-06-10 17:21:15 +03:00 · 2023-06-10 17:18:30 +03:00
3 changed files with 20 additions and 14 deletions
@@ -14,6 +14,7 @@
 (def ^:const content-type-gap 10)
 (def ^:const content-type-contact-request 11) ;; TODO: temp, will be removed
 (def ^:const content-type-system-pinned-message 14)
+(def ^:const content-type-system-mutual-state-update 15)

 ;; Not implemented in status-go, only used for testing/ui work
 (def ^:const content-type-gif 100)
@@ -236,17 +236,19 @@
 (defn render-fn
  [{:keys [type value deleted? deleted-for-me? content-type] :as message-data} _ _
   {:keys [context keyboard-shown?]}]
-  [rn/view
-   (add-inverted-y-android {:background-color (colors/theme-colors colors/white colors/neutral-95)})
-   (if (= type :datemark)
-     [quo/divider-date value]
-     (if (= content-type constants/content-type-gap)
-       [not-implemented/not-implemented
-        [message.gap/gap message-data]]
-       [rn/view {:padding-horizontal 8}
-        (if (or deleted? deleted-for-me?)
-          [content.deleted/deleted-message message-data context]
-          [message/message-with-reactions message-data context keyboard-shown?])]))])
+  ;;TODO temporary hide mutual-state-updates https://github.com/status-im/status-mobile/issues/16254
+  (when (not= content-type constants/content-type-system-mutual-state-update)
+    [rn/view
+     (add-inverted-y-android {:background-color (colors/theme-colors colors/white colors/neutral-95)})
+     (if (= type :datemark)
+       [quo/divider-date value]
+       (if (= content-type constants/content-type-gap)
+         [not-implemented/not-implemented
+          [message.gap/gap message-data]]
+         [rn/view {:padding-horizontal 8}
+          (if (or deleted? deleted-for-me?)
+            [content.deleted/deleted-message message-data context]
+            [message/message-with-reactions message-data context keyboard-shown?])]))]))

 (defn scroll-handler
  [event scroll-y]
@@ -53,7 +53,8 @@

    {:name      :chat
     :options   {:insets     {:top? true}
-                 :popGesture false}
+                 :popGesture false
+                 :layout     {:orientation ["portrait"]}}
     :component chat/chat}

    {:name      :start-a-new-chat
@@ -85,10 +86,12 @@
     :component how-to-pair/instructions}

    {:name      :discover-communities
-     :component communities.discover/discover}
+     :component communities.discover/discover
+     :options   {:layout {:orientation ["portrait"]}}}

    {:name      :community-overview
-     :component communities.overview/overview}
+     :component communities.overview/overview
+     :options   {:layout {:orientation ["portrait"]}}}

    {:name      :settings-syncing
     :options   (merge options/dark-screen {:insets {:top? true}})
Author	SHA1	Message	Date
Ibrahem Khalil	f67292201f	Merge branch 'develop' into 16092	2023-06-18 14:19:17 +03:00
flexsurfer	5214f34b31	temporary hide mutual update's messages (#16290 )	2023-06-16 18:41:21 +02:00
Ibrahem Khalil	cb7e22b0e3	Merge branch 'develop' into 16092	2023-06-13 15:16:45 +03:00
Ibrahem Khalil	a4c5c57d4a	Merge branch 'develop' into 16092	2023-06-12 13:01:14 +03:00
Ibrahem	8bd3f7bde1	Add fix for discord communities	2023-06-10 17:21:15 +03:00
Ibrahem Khalil	188f763412	Merge branch 'develop' into 16092	2023-06-10 17:18:30 +03:00
Ibrahem Khalil	0105e3651c	Merge branch 'develop' into 16092	2023-06-05 11:42:19 +03:00
Ibrahem	4e119e13c9	Prevent orientation changing on chat screen and community overview component	2023-06-04 09:55:44 +03:00