Trying to build x86_64 apk

* fix: suggestions list animation

android/gradle.properties

@@ -41,7 +41,7 @@ KEYSTORE_KEY_PASSWORD=password
 # By default we build a mostly universal APK
 ANDROID_ABI_SPLIT=false
 # Some platforms are excluded though
-ANDROID_ABI_INCLUDE=armeabi-v7a;arm64-v8a;x86
+ANDROID_ABI_INCLUDE=armeabi-v7a;arm64-v8a;x86_64
 
 org.gradle.jvmargs=-Xmx8704M
 

src/status_im/events.cljs

@@ -62,7 +62,8 @@
     [status-im2.common.theme.core :as theme]
     [react-native.core :as rn]
     [react-native.platform :as platform]
-    status-im2.contexts.chat.home.events))
+    status-im2.contexts.chat.home.events
+    status-im2.contexts.communities.home.events))
 
 (re-frame/reg-fx
  :dismiss-keyboard

src/status_im/multiaccounts/login/core.cljs

@@ -739,7 +739,8 @@
      (merge
       {:db (update db :keycard dissoc :application-info)}
       (when keycard-multiaccount? {:navigate-to :keycard-login-pin}))
-     (open-login (select-keys multiaccount [:key-uid :name :public-key :images])))))
+     (open-login (select-keys multiaccount
+                              [:key-uid :name :public-key :images :customization-color])))))
 
 (rf/defn hide-keycard-banner
   {:events [:hide-keycard-banner]}

src/status_im2/contexts/chat/composer/actions/view.cljs

@@ -58,9 +58,9 @@
     :i/arrow-up]])
 
 (defn send-button
-  [state animations window-height images?]
+  [{:keys [text-value] :as state} animations window-height images?]
   (let [btn-opacity (reanimated/use-shared-value 0)
-        z-index     (reagent/atom 0)]
+        z-index     (reagent/atom (if (and (empty? @text-value) (not images?)) 0 1))]
     [:f> f-send-button state animations window-height images? btn-opacity z-index]))
 
 (defn audio-button
@@ -176,7 +176,7 @@
    :i/format])
 
 (defn view
-  [props state animations window-height insets edit? images?]
+  [props state animations window-height insets {:keys [edit images]}]
   [rn/view {:style style/actions-container}
    [rn/view
     {:style {:flex-direction :row
@@ -185,6 +185,6 @@
     [image-button props animations insets]
     [reaction-button]
     [format-button]]
-   [:f> send-button state animations window-height images?]
-   (when (and (not edit?) (not images?))
+   [:f> send-button state animations window-height images]
+   (when (and (not edit) (not images))
      [audio-button props state animations])])

src/status_im2/contexts/chat/composer/effects.cljs

@@ -91,8 +91,7 @@
   (.remove ^js @keyboard-frame-listener))
 
 (defn initialize
-  [props state animations {:keys [max-height] :as dimensions} chat-input images? reply?
-   audio]
+  [props state animations {:keys [max-height] :as dimensions} {:keys [chat-input images reply audio]}]
   (rn/use-effect
    (fn []
      (maximized-effect state animations dimensions chat-input)
@@ -100,9 +99,9 @@
      (layout-effect state)
      (kb-default-height-effect state)
      (background-effect state animations dimensions chat-input)
-     (images-effect props animations images?)
+     (images-effect props animations images)
      (audio-effect state animations audio)
-     (empty-effect state animations images? reply? audio)
+     (empty-effect state animations images reply audio)
      (kb/add-kb-listeners props state animations dimensions)
      #(component-will-unmount props))
    [max-height]))
@@ -110,7 +109,7 @@
 (defn edit
   [{:keys [input-ref]}
    {:keys [text-value saved-cursor-position]}
-   edit]
+   {:keys [edit]}]
   (rn/use-effect
    (fn []
      (let [edit-text (get-in edit [:content :text])]
@@ -124,7 +123,7 @@
 (defn reply
   [{:keys [input-ref]}
    {:keys [container-opacity]}
-   reply]
+   {:keys [reply]}]
   (rn/use-effect
    (fn []
      (when reply
@@ -134,7 +133,7 @@
    [(:message-id reply)]))
 
 (defn edit-mentions
-  [{:keys [input-ref]} {:keys [text-value cursor-position]} input-with-mentions]
+  [{:keys [input-ref]} {:keys [text-value cursor-position]} {:keys [input-with-mentions]}]
   (rn/use-effect (fn []
                    (let [input-text (reduce (fn [acc item]
                                               (str acc (second item)))
@@ -153,7 +152,7 @@
 (defn update-input-mention
   [{:keys [input-ref]}
    {:keys [text-value]}
-   input-text]
+   {:keys [input-text]}]
   (rn/use-effect
    (fn []
      (when (and input-text (not= @text-value input-text))

src/status_im2/contexts/chat/composer/handlers.cljs

@@ -38,8 +38,7 @@
            maximized?]}
    {:keys [height saved-height last-height gradient-opacity container-opacity opacity background-y]}
    {:keys [content-height max-height window-height]}
-   images
-   reply]
+   {:keys [images reply]}]
   (let [lines         (utils/calc-lines (- @content-height constants/extra-content-offset))
         min-height    (utils/get-min-height lines)
         reopen-height (utils/calc-reopen-height text-value min-height content-height saved-height)]

src/status_im2/contexts/chat/composer/mentions/view.cljs

@@ -30,16 +30,17 @@
    user])
 
 (defn- f-view
-  [suggestions-atom props state animations max-height cursor-pos]
+  [suggestions-atom props state animations max-height cursor-pos images reply edit]
   (let [suggestions  (rf/sub [:chat/mention-suggestions])
         opacity      (reanimated/use-shared-value (if (seq suggestions) 1 0))
         size         (count suggestions)
         data         {:keyboard-height @(:kb-height state)
                       :insets          (safe-area/get-insets)
                       :curr-height     (reanimated/get-shared-value (:height animations))
-                      :window-height   (rf/sub [:dimensions/window-height])
-                      :reply           (rf/sub [:chats/reply-message])
-                      :edit            (rf/sub [:chats/edit-message])}
+                      :window-height   (:height (rn/get-window))
+                      :images          images
+                      :reply           reply
+                      :edit            edit}
         mentions-pos (utils/calc-suggestions-position cursor-pos max-height size state data)]
     (rn/use-effect
      (fn []
@@ -60,6 +61,6 @@
        :accessibility-label          :mentions-list}]]))
 
 (defn view
-  [props state animations max-height cursor-pos]
+  [props state animations max-height cursor-pos images reply edit]
   (let [suggestions-atom (reagent/atom {})]
-    [:f> f-view suggestions-atom props state animations max-height cursor-pos]))
+    [:f> f-view suggestions-atom props state animations max-height cursor-pos images reply edit]))

src/status_im2/contexts/chat/composer/sub_view.cljs

@@ -4,6 +4,7 @@
     [react-native.blur :as blur]
     [react-native.core :as rn]
     [react-native.reanimated :as reanimated]
+    [react-native.safe-area :as safe-area]
     [status-im2.contexts.chat.composer.style :as style]
     [status-im2.contexts.chat.composer.utils :as utils]
     [status-im2.contexts.chat.messages.list.view :as messages.list]
@@ -25,10 +26,16 @@
   [:f> f-blur-view layout-height focused?])
 
 (defn- f-shell-button
-  [insets height maximized?]
-  (let [translate-y (reanimated/use-shared-value (utils/calc-shell-neg-y insets maximized?))]
-    (rn/use-effect #(reanimated/animate translate-y (utils/calc-shell-neg-y insets maximized?))
-                   [@maximized?])
+  [{:keys [maximized?]} {:keys [height]} {:keys [images reply edit]}]
+  (let [insets       (safe-area/get-insets)
+        extra-height (utils/calc-extra-content-height images reply edit)
+        translate-y  (reanimated/use-shared-value
+                      (utils/calc-shell-neg-y insets maximized? extra-height))]
+    (rn/use-effect (fn []
+                     (let [extra-height (utils/calc-extra-content-height images reply edit)]
+                       (reanimated/animate translate-y
+                                           (utils/calc-shell-neg-y insets maximized? extra-height))))
+                   [@maximized? images reply edit])
     [reanimated/view
      {:style (reanimated/apply-animations-to-style
               {:bottom    height ; we use height of the input directly as bottom position
@@ -48,5 +55,5 @@
       {}]]))
 
 (defn shell-button
-  [insets {:keys [height]} {:keys [maximized?]}]
-  [:f> f-shell-button insets height maximized?])
+  [state animations subs]
+  [:f> f-shell-button state animations subs])

src/status_im2/contexts/chat/composer/utils.cljs

@@ -65,17 +65,22 @@
   (let [lines (Math/round (/ height constants/line-height))]
     (if platform/ios? lines (dec lines))))
 
+(defn calc-extra-content-height
+  [images? reply? edit?]
+  (let [height (if images? constants/images-container-height 0)
+        height (if reply? (+ height constants/reply-container-height) height)
+        height (if edit? (+ height constants/edit-container-height) height)]
+    height))
+
 (defn calc-max-height
-  [window-height kb-height insets images? reply? edit?]
+  [{:keys [images reply edit]} window-height kb-height insets]
   (let [margin-top (if platform/ios? (:top insets) (+ 10 (:top insets)))
         max-height (- window-height
                       margin-top
                       kb-height
                       constants/bar-container-height
                       constants/actions-container-height)
-        max-height (if images? (- max-height constants/images-container-height) max-height)
-        max-height (if reply? (- max-height constants/reply-container-height) max-height)
-        max-height (if edit? (- max-height constants/edit-container-height) max-height)]
+        max-height (- max-height (calc-extra-content-height images reply edit))]
     max-height))
 
 (defn empty-input?
@@ -108,22 +113,23 @@
     (* sub-text-lines-in-view constants/line-height)))
 
 (defn calc-shell-neg-y
-  [insets maximized?]
-  (let [neg-y (if @maximized? -50 0)]
-    (- (+ constants/bar-container-height constants/actions-container-height (:bottom insets) 6 neg-y))))
+  [insets maximized? extra-height]
+  (let [padding 6
+        neg-y   (if @maximized? -50 0)]
+    (- (+ constants/bar-container-height
+          constants/actions-container-height
+          (:bottom insets)
+          padding
+          extra-height
+          neg-y))))
 
 (defn calc-suggestions-position
   [cursor-pos max-height size
    {:keys [maximized?]}
-   {:keys [insets curr-height window-height keyboard-height edit reply]}]
+   {:keys [insets curr-height window-height keyboard-height images reply edit]}]
   (let [base             (+ constants/composer-default-height (:bottom insets) 8)
         base             (+ base (- curr-height constants/input-height))
-        base             (if edit
-                           (+ base constants/edit-container-height)
-                           base)
-        base             (if reply
-                           (+ base constants/reply-container-height)
-                           base)
+        base             (+ base (calc-extra-content-height images reply edit))
         view-height      (- window-height keyboard-height (:top insets))
         container-height (bounded-val
                           (* (/ constants/mentions-max-height 4) size)
@@ -170,8 +176,21 @@
    :recording?            (reagent/atom false)
    :first-level?          (reagent/atom true)
    :menu-items            (reagent/atom selection/first-level-menu-items)})
+
+(defn init-subs
+  []
+  (let [chat-input (rf/sub [:chats/current-chat-input])]
+    {:images               (seq (rf/sub [:chats/sending-image]))
+     :audio                (rf/sub [:chats/sending-audio])
+     :reply                (rf/sub [:chats/reply-message])
+     :edit                 (rf/sub [:chats/edit-message])
+     :input-with-mentions  (rf/sub [:chat/input-with-mentions])
+     :input-text           (:input-text chat-input)
+     :input-content-height (:input-content-height chat-input)}))
+
 (defn init-animations
-  [lines input-text images reply audio content-height max-height opacity background-y]
+  [{:keys [input-text images reply audio]}
+   lines content-height max-height opacity background-y]
   (let [initial-height (if (> lines 1)
                          constants/multiline-minimized-height
                          constants/input-height)]

src/status_im2/contexts/chat/composer/view.cljs

@@ -7,7 +7,6 @@
     [react-native.reanimated :as reanimated]
     [reagent.core :as reagent]
     [utils.i18n :as i18n]
-    [utils.re-frame :as rf]
     [status-im2.contexts.chat.composer.style :as style]
     [status-im2.contexts.chat.composer.images.view :as images]
     [status-im2.contexts.chat.composer.reply.view :as reply]
@@ -25,31 +24,20 @@
 
 (defn sheet-component
   [{:keys [insets window-height blur-height opacity background-y]} props state]
-  (let [images                   (rf/sub [:chats/sending-image])
-        audio                    (rf/sub [:chats/sending-audio])
-        reply                    (rf/sub [:chats/reply-message])
-        edit                     (rf/sub [:chats/edit-message])
-        input-with-mentions      (rf/sub [:chat/input-with-mentions])
-        {:keys [input-text input-content-height]
-         :as   chat-input}       (rf/sub [:chats/current-chat-input])
-        content-height           (reagent/atom (or input-content-height
+  (let [subs                     (utils/init-subs)
+        content-height           (reagent/atom (or (:input-content-height subs)
                                                    constants/input-height))
         {:keys [keyboard-shown]} (hooks/use-keyboard)
-        max-height               (utils/calc-max-height window-height
+        max-height               (utils/calc-max-height subs
+                                                        window-height
                                                         @(:kb-height state)
-                                                        insets
-                                                        (boolean (seq images))
-                                                        reply
-                                                        edit)
+                                                        insets)
         lines                    (utils/calc-lines (- @content-height
                                                       constants/extra-content-offset))
         max-lines                (utils/calc-lines max-height)
         animations               (utils/init-animations
+                                  subs
                                   lines
-                                  input-text
-                                  images
-                                  reply
-                                  audio
                                   content-height
                                   max-height
                                   opacity
@@ -67,17 +55,15 @@
                         state
                         animations
                         dimensions
-                        chat-input
-                        (boolean (seq images))
-                        reply
-                        audio)
-    (effects/edit props state edit)
-    (effects/reply props animations reply)
-    (effects/update-input-mention props state input-text)
-    (effects/edit-mentions props state input-with-mentions)
+                        subs)
+    (effects/edit props state subs)
+    (effects/reply props animations subs)
+    (effects/update-input-mention props state subs)
+    (effects/edit-mentions props state subs)
     [:<>
-     [sub-view/shell-button insets animations state]
-     [mentions/view props state animations max-height cursor-pos]
+     [sub-view/shell-button state animations subs]
+     [mentions/view props state animations max-height cursor-pos (:images subs) (:reply subs)
+      (:edit subs)]
      [gesture/gesture-detector
       {:gesture (drag-gesture/drag-gesture props state animations dimensions keyboard-shown)}
       [reanimated/view
@@ -99,12 +85,12 @@
           {:ref                      #(reset! (:input-ref props) %)
            :default-value            @(:text-value state)
            :on-focus                 #(handler/focus props state animations dimensions)
-           :on-blur                  #(handler/blur state animations dimensions images reply)
+           :on-blur                  #(handler/blur state animations dimensions subs)
            :on-content-size-change   #(handler/content-size-change %
                                                                    state
                                                                    animations
                                                                    dimensions
-                                                                   (or keyboard-shown edit))
+                                                                   (or keyboard-shown (:edit subs)))
            :on-scroll                #(handler/scroll % props state animations dimensions)
            :on-change-text           #(handler/change-text % props state)
            :on-selection-change      #(handler/selection-change % props state)
@@ -119,8 +105,7 @@
            :accessibility-label      :chat-message-input}]]
         [gradients/view props state animations show-bottom-gradient?]]
        [images/images-list]
-       [actions/view props state animations window-height insets edit
-        (boolean (seq images))]]]]))
+       [actions/view props state animations window-height insets subs]]]]))
 
 (defn composer
   [insets]

src/status_im2/contexts/chat/home/view.cljs

@@ -102,7 +102,8 @@
   []
   (fn []
     (let [pending-contact-requests (rf/sub [:activity-center/pending-contact-requests])
-          selected-tab             (or (rf/sub [:messages-home/selected-tab]) :tab/recent)
+          selected-tab             (or (rf/sub [:messages-home/selected-tab])
+                                       :tab/recent)
           top                      (safe-area/get-top)]
       [:<>
        (if (= selected-tab :tab/contacts)
@@ -122,6 +123,7 @@
         [quo/discover-card
          {:title       (i18n/label :t/invite-friends-to-status)
           :description (i18n/label :t/share-invite-link)}]
+        ^{:key (str "tabs-" selected-tab)}
         [quo/tabs
          {:style          style/tabs
           :size           32

src/status_im2/contexts/chat/messages/avatar/view.cljs

@@ -9,8 +9,10 @@
         contact      (rf/sub [:contacts/contact-by-address public-key])
         photo-path   (when (seq (:images contact)) (rf/sub [:chats/photo-path public-key]))
         online?      (rf/sub [:visibility-status-updates/online? public-key])]
-    [rn/touchable-without-feedback {:on-press #(rf/dispatch [:chat.ui/show-profile public-key])}
-     [rn/view {:padding-top 2}
+    [rn/view {:style {:padding-top 2}}
+     [rn/touchable-opacity
+      {:active-opacity 1
+       :on-press       #(rf/dispatch [:chat.ui/show-profile public-key])}
       [quo/user-avatar
        {:full-name         display-name
         :profile-picture   photo-path

src/status_im2/contexts/chat/messages/content/album/view.cljs

@@ -72,5 +72,6 @@
       [:<>
        (map-indexed
         (fn [index item]
-          [image/image-message index item context #(on-long-press message context)])
+          [:<> {:key (:message-id item)}
+           [image/image-message index item context #(on-long-press message context)]])
         (:album message))])))

src/status_im2/contexts/chat/messages/content/image/view.cljs

@@ -15,23 +15,21 @@
 
 (defn image-message
   [index {:keys [content image-width image-height message-id] :as message} context on-long-press]
-  (let [insets     (safe-area/get-insets)
-        dimensions (calculate-dimensions (or image-width 1000) (or image-height 1000))]
-    (fn []
-      (let [shared-element-id (rf/sub [:shared-element-id])]
-        [rn/touchable-opacity
-         {:active-opacity 1
-          :key            message-id
-          :style          {:margin-top (when (pos? index) 10)}
-          :on-long-press  on-long-press
-          :on-press       #(rf/dispatch [:chat.ui/navigate-to-lightbox
-                                         message-id
-                                         {:messages [message]
-                                          :index    0
-                                          :insets   insets}])}
-         (when (= index 0)
-           [rn/view {:style {:margin-bottom 10}} [text/text-content message context]])
-         [fast-image/fast-image
-          {:source    {:uri (:image content)}
-           :style     (merge dimensions {:border-radius 12})
-           :native-ID (when (= shared-element-id message-id) :shared-element)}]]))))
+  (let [insets            (safe-area/get-insets)
+        dimensions        (calculate-dimensions (or image-width 1000) (or image-height 1000))
+        shared-element-id (rf/sub [:shared-element-id])]
+    [rn/touchable-opacity
+     {:active-opacity 1
+      :style          {:margin-top (when (pos? index) 10)}
+      :on-long-press  on-long-press
+      :on-press       #(rf/dispatch [:chat.ui/navigate-to-lightbox
+                                     message-id
+                                     {:messages [message]
+                                      :index    0
+                                      :insets   insets}])}
+     (when (= index 0)
+       [rn/view {:style {:margin-bottom 10}} [text/text-content message context]])
+     [fast-image/fast-image
+      {:source    {:uri (:image content)}
+       :style     (merge dimensions {:border-radius 12})
+       :native-ID (when (= shared-element-id message-id) :shared-element)}]]))

src/status_im2/contexts/communities/home/events.cljs

@@ -0,0 +1,8 @@
+(ns status-im2.contexts.communities.home.events
+  (:require
+    [utils.re-frame :as rf]))
+
+(rf/defn communities-select-tab-event
+  {:events [:communities/select-tab]}
+  [{:keys [db]} tab]
+  {:db (assoc db :communities/selected-tab tab)})

src/status_im2/contexts/communities/home/view.cljs

@@ -1,7 +1,6 @@
 (ns status-im2.contexts.communities.home.view
   (:require [utils.i18n :as i18n]
             [quo2.core :as quo]
-            [reagent.core :as reagent]
             [react-native.core :as rn]
             [status-im2.common.home.view :as common.home]
             [status-im2.contexts.communities.actions.community-options.view :as options]
@@ -35,40 +34,42 @@
 
 (defn home
   []
-  (let [selected-tab (reagent/atom :joined)]
-    (fn []
-      (let [{:keys [joined pending opened]} (rf/sub [:communities/grouped-by-status])
-            selected-items                  (case @selected-tab
-                                              :joined  joined
-                                              :pending pending
-                                              :opened  opened)
-            top                             (safe-area/get-top)]
-        [:<>
-         [rn/flat-list
-          {:key-fn                            :id
-           :content-inset-adjustment-behavior :never
-           :header                            [rn/view {:height (+ 245 top)}]
-           :render-fn                         item-render
-           :data                              selected-items}]
-         [rn/view
-          {:style (style/blur-container top)}
-          [blur/view
-           {:blur-amount (if platform/ios? 20 10)
-            :blur-type   (if (colors/dark?) :dark (if platform/ios? :light :xlight))
-            :style       style/blur}]
-          [common.home/top-nav]
-          [common.home/title-column
-           {:label               (i18n/label :t/communities)
-            :handler             #(rf/dispatch [:show-bottom-sheet {:content actions.home-plus/view}])
-            :accessibility-label :new-chat-button}]
-          [quo/discover-card
-           {:on-press            #(rf/dispatch [:navigate-to :discover-communities])
-            :title               (i18n/label :t/discover)
-            :description         (i18n/label :t/whats-trending)
-            :accessibility-label :communities-home-discover-card}]
-          [quo/tabs
-           {:size           32
-            :style          style/tabs
-            :on-change      #(reset! selected-tab %)
-            :default-active @selected-tab
-            :data           tabs-data}]]]))))
+  (fn []
+    (let [selected-tab                    (or (rf/sub [:communities/selected-tab]) :joined)
+          {:keys [joined pending opened]} (rf/sub [:communities/grouped-by-status])
+          selected-items                  (case selected-tab
+                                            :joined  joined
+                                            :pending pending
+                                            :opened  opened)
+          top                             (safe-area/get-top)]
+      [:<>
+       [rn/flat-list
+        {:key-fn                            :id
+         :content-inset-adjustment-behavior :never
+         :header                            [rn/view {:height (+ 245 top)}]
+         :render-fn                         item-render
+         :data                              selected-items}]
+       [rn/view
+        {:style (style/blur-container top)}
+        [blur/view
+         {:blur-amount (if platform/ios? 20 10)
+          :blur-type   (if (colors/dark?) :dark (if platform/ios? :light :xlight))
+          :style       style/blur}]
+        [common.home/top-nav]
+        [common.home/title-column
+         {:label               (i18n/label :t/communities)
+          :handler             #(rf/dispatch [:show-bottom-sheet {:content actions.home-plus/view}])
+          :accessibility-label :new-chat-button}]
+        [quo/discover-card
+         {:on-press            #(rf/dispatch [:navigate-to :discover-communities])
+          :title               (i18n/label :t/discover)
+          :description         (i18n/label :t/whats-trending)
+          :accessibility-label :communities-home-discover-card}]
+        ^{:key (str "tabs-" selected-tab)}
+        [quo/tabs
+         {:size           32
+          :style          style/tabs
+          :on-change      (fn [tab]
+                            (rf/dispatch [:communities/select-tab tab]))
+          :default-active selected-tab
+          :data           tabs-data}]]])))

src/status_im2/contexts/onboarding/common/background/view.cljs

@@ -34,7 +34,7 @@
 
 (defn store-screen-height
   [evt]
-  (let [window-height (rf/sub [:dimensions/window-height])
+  (let [window-height (:height (rn/get-window))
         height        (or (oget evt "nativeEvent" "layout" "height") 0)
         width         (or (oget evt "nativeEvent" "layout" "width") 0)]
     ;; Layout height calculation

src/status_im2/contexts/onboarding/new_to_status/style.cljs

@@ -19,13 +19,12 @@
    :margin-bottom 20})
 
 (def subtitle-container
-  {:height         42
-   :padding-top    16
-   :padding-bottom 8})
+  {:height        20
+   :margin-top    16
+   :margin-bottom 4})
 
 (def subtitle
-  {:color         colors/white-opa-70
-   :margin-bottom 20})
+  {:color colors/white-opa-70})
 
 (def suboptions
   {:padding-top    4

src/status_im2/contexts/onboarding/profiles/view.cljs

@@ -228,7 +228,7 @@
      [quo/button
       {:size                40
        :type                :primary
-       :customization-color (or :primary customization-color)
+       :customization-color (or customization-color :primary)
        :accessibility-label :login-button
        :override-theme      :dark
        :before              :i/unlocked

src/status_im2/contexts/shell/bottom_tabs.cljs

@@ -31,25 +31,31 @@
 
 (defn- f-bottom-tabs
   []
-  (let [notifications-data          (rf/sub [:shell/bottom-tabs-notifications-data])
-        pass-through?               (rf/sub [:shell/shell-pass-through?])
-        shared-values               @animation/shared-values-atom
-        original-style              (style/bottom-tabs-container pass-through?)
-        animated-style              (reanimated/apply-animations-to-style
-                                     {:height (:bottom-tabs-height shared-values)}
-                                     original-style)
-        messages-double-tap-gesture (-> (gesture/gesture-tap)
-                                        (gesture/number-of-taps 2)
-                                        (gesture/on-start
-                                         (fn [_event]
-                                           (rf/dispatch [:messages-home/select-tab :tab/recent]))))]
+  (let [notifications-data             (rf/sub [:shell/bottom-tabs-notifications-data])
+        pass-through?                  (rf/sub [:shell/shell-pass-through?])
+        shared-values                  @animation/shared-values-atom
+        original-style                 (style/bottom-tabs-container pass-through?)
+        animated-style                 (reanimated/apply-animations-to-style
+                                        {:height (:bottom-tabs-height shared-values)}
+                                        original-style)
+        communities-double-tab-gesture (-> (gesture/gesture-tap)
+                                           (gesture/number-of-taps 2)
+                                           (gesture/on-start
+                                            (fn [_event]
+                                              (rf/dispatch [:communities/select-tab :joined]))))
+        messages-double-tap-gesture    (-> (gesture/gesture-tap)
+                                           (gesture/number-of-taps 2)
+                                           (gesture/on-start
+                                            (fn [_event]
+                                              (rf/dispatch [:messages-home/select-tab :tab/recent]))))]
     (animation/load-stack @animation/selected-stack-id)
     (reanimated/set-shared-value (:pass-through? shared-values) pass-through?)
     [reanimated/view {:style animated-style}
      (when pass-through?
        [blur/view (blur-overlay-params style/bottom-tabs-blur-overlay)])
      [rn/view {:style (style/bottom-tabs)}
-      [bottom-tab :i/communities :communities-stack shared-values notifications-data]
+      [gesture/gesture-detector {:gesture communities-double-tab-gesture}
+       [bottom-tab :i/communities :communities-stack shared-values notifications-data]]
       [gesture/gesture-detector {:gesture messages-double-tap-gesture}
        [bottom-tab :i/messages :chats-stack shared-values notifications-data]]
       [bottom-tab :i/wallet :wallet-stack shared-values notifications-data]

src/status_im2/events.cljs

@@ -43,7 +43,8 @@
         (rf/merge cofx
                   (multiaccounts.login/open-login (select-keys
                                                    multiaccount
-                                                   [:key-uid :name :public-key :images]))
+                                                   [:key-uid :name :public-key :images
+                                                    :customization-color]))
                   (keychain/get-auth-method (:key-uid multiaccount))))
       (navigation/init-root cofx :intro))))
 

src/status_im2/subs/root.cljs

@@ -249,6 +249,7 @@
 (reg-root-key-sub :communities/resolve-community-info :communities/resolve-community-info)
 (reg-root-key-sub :communities/my-pending-requests-to-join :communities/my-pending-requests-to-join)
 (reg-root-key-sub :communities/collapsed-categories :communities/collapsed-categories)
+(reg-root-key-sub :communities/selected-tab :communities/selected-tab)
 
 (reg-root-key-sub :activity-center :activity-center)