Add pubsubTopics fix

https://github.com/status-im/status-go/compare/abac55c7...e7d9f59d

Makefile

@@ -311,13 +311,14 @@ endef
 lint: export TARGET := clojure
 lint: export CLJ_LINTER_PRINT_WARNINGS ?= false
 lint: ##@test Run code style checks
-	@sh scripts/lint-re-frame-in-quo-components.sh && \
-	sh scripts/lint-direct-require-component-outside-quo.sh && \
+	@sh scripts/lint/re-frame-in-quo-components.sh && \
+	sh scripts/lint/direct-require-component-outside-quo.sh && \
+	sh scripts/lint/require-i18n-resource-first.sh && \
 	clj-kondo --config .clj-kondo/config.edn --cache false --fail-level error --lint src $(if $(filter $(CLJ_LINTER_PRINT_WARNINGS),true),,| grep -v ': warning: ') && \
 	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
-	scripts/lint_translations.clj && \
+	scripts/lint/translations.clj && \
 	zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES && \
-	sh scripts/lint-trailing-newline.sh && \
+	sh scripts/lint/trailing-newline.sh && \
 	node_modules/.bin/prettier --write .
 
 # NOTE: We run the linter twice because of https://github.com/kkinnear/zprint/issues/271
@@ -327,7 +328,7 @@ lint-fix: ##@test Run code style checks and fix issues
 	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
 	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
 	clojure-lsp --ns-exclude-regex ".*/src/status_im2/core\.cljs$$" clean-ns && \
-	sh scripts/lint-trailing-newline.sh --fix && \
+	sh scripts/lint/trailing-newline.sh --fix && \
 	node_modules/.bin/prettier --write .
 
 shadow-server: export TARGET := clojure

scripts/lint/require-i18n-resource-first.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+
+if rg --quiet --multiline '^\(ns.*\n^\s*\(:require\n(^\s*(;|#_).*\n)*(^\s*\[status-im2\.setup\.i18n-resources\W)' src/status_im2/core.cljs; then
+  exit 0
+elif [ $? -eq 1 ]; then
+  echo "status-im2.setup.i18n-resources must be loaded first (be the first one in ns :require form) in status-im2.core"
+  echo "For more info, check the comment here https://github.com/status-im/status-mobile/pull/17618#discussion_r1361275489"
+else
+  exit $?
+fi

src/status_im/chat/models/input.cljs

@@ -107,14 +107,15 @@
   [{:keys [db] :as cofx} message]
   (let [current-chat-id (:current-chat-id db)
         text            (get-in message [:content :text])]
-    {:db       (-> db
-                   (assoc-in [:chat/inputs current-chat-id :metadata :editing-message]
-                             message)
-                   (assoc-in [:chat/inputs current-chat-id :metadata :responding-to-message] nil)
-                   (update-in [:chat/inputs current-chat-id :metadata]
-                              dissoc
-                              :sending-image))
-     :dispatch [:mention/to-input-field text current-chat-id]}))
+    {:db         (-> db
+                     (assoc-in [:chat/inputs current-chat-id :metadata :editing-message]
+                               message)
+                     (assoc-in [:chat/inputs current-chat-id :metadata :responding-to-message] nil)
+                     (update-in [:chat/inputs current-chat-id :metadata]
+                                dissoc
+                                :sending-image))
+     :dispatch-n [[:chat.ui/set-chat-input-text nil current-chat-id]
+                  [:mention/to-input-field text current-chat-id]]}))
 
 (rf/defn show-contact-request-input
   "Sets reference to previous chat message and focuses on input"

src/status_im/ui/screens/browser/views.cljs

@@ -225,7 +225,9 @@
                                                                          (.. ^js % -nativeEvent -data)])
         :on-load                                    #(re-frame/dispatch [:browser/loading-started])
         :on-error                                   #(re-frame/dispatch [:browser/error-occured])
-        :injected-java-script-before-content-loaded (js-res/ethereum-provider (str network-id))}])]
+        :injected-java-script-before-content-loaded (js-res/ethereum-provider (str network-id))
+        ;; https://github.com/status-im/status-mobile/issues/17854
+        :allows-inline-media-playback               true}])]
    [navigation
     {:url             url-original
      :name            name

src/status_im/utils/test.cljs

@@ -15,6 +15,8 @@
 
 (def test-dir (.mkdtempSync fs test-dir-prefix))
 
+(def initialized? (atom false))
+
 (defn signal-received-callback
   [a]
   (re-frame/dispatch [:signals/signal-received a]))
@@ -22,10 +24,12 @@
 ;; We poll for signals, could not get callback working
 (defn init!
   []
-  (.setSignalEventCallback native-status)
-  (js/setInterval (fn []
-                    (.pollSignal native-status signal-received-callback)
-                    100)))
+  (when-not @initialized?
+    (.setSignalEventCallback native-status)
+    (reset! initialized? true)
+    (js/setInterval (fn []
+                      (.pollSignal native-status signal-received-callback)
+                      100))))
 
 (def status
   (clj->js

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

@@ -11,7 +11,7 @@
     [utils.re-frame :as rf]))
 
 (defn edit-message
-  [state]
+  [{:keys [text-value input-ref]}]
   [rn/view
    {:style               style/container
     :accessibility-label :edit-message}
@@ -30,20 +30,18 @@
     {:size                24
      :icon-only?          true
      :accessibility-label :edit-cancel-button
-     :on-press            (fn []
-                            (utils/cancel-edit-message state)
-                            (rf/dispatch [:chat.ui/cancel-message-edit]))
+     :on-press            #(utils/cancel-edit-message text-value input-ref)
      :type                :outline}
     :i/close]])
 
 (defn- f-view
-  [state]
+  [props]
   (let [edit   (rf/sub [:chats/edit-message])
         height (reanimated/use-shared-value (if edit constants/edit-container-height 0))]
     (rn/use-effect #(reanimated/animate height (if edit constants/edit-container-height 0)) [edit])
     [reanimated/view {:style (reanimated/apply-animations-to-style {:height height} {})}
-     (when edit [edit-message state])]))
+     (when edit [edit-message props])]))
 
 (defn view
-  [state]
-  [:f> f-view state])
+  [props]
+  [:f> f-view props])

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

@@ -6,6 +6,7 @@
     [react-native.core :as rn]
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
+    [reagent.core :as reagent]
     [status-im2.contexts.chat.composer.constants :as constants]
     [status-im2.contexts.chat.composer.keyboard :as kb]
     [status-im2.contexts.chat.composer.utils :as utils]
@@ -105,53 +106,62 @@
 
 (defn use-edit
   [{:keys [input-ref]}
-   {:keys [text-value saved-cursor-position]}
-   {:keys [edit]}]
-  (rn/use-effect
-   (fn []
-     (let [edit-text        (get-in edit [:content :text])
-           text-value-count (count @text-value)]
-       (when (and edit @input-ref)
-         ;; A small setTimeout is necessary to ensure the statement is enqueued and will get executed
-         ;; ASAP.
-         ;; https://github.com/software-mansion/react-native-screens/issues/472
-         (js/setTimeout #(.focus ^js @input-ref) 250)
-         (.setNativeProps ^js @input-ref (clj->js {:text edit-text}))
-         (reset! text-value edit-text)
-         (reset! saved-cursor-position (if (zero? text-value-count)
-                                         (count edit-text)
-                                         text-value-count)))))
-   [(:message-id edit)]))
+   {:keys [text-value saved-cursor-position cursor-position]}
+   {:keys [edit input-with-mentions]}
+   messages-list-on-layout-finished?]
+  (let [mention?              (some #(= :mention (first %)) (seq input-with-mentions))
+        composer-just-opened? (not @messages-list-on-layout-finished?)]
+    (rn/use-effect
+     (fn []
+       (let [mention-text     (reduce (fn [acc item]
+                                        (str acc (second item)))
+                                      ""
+                                      input-with-mentions)
+             edit-text        (cond
+                                mention? mention-text
+                                ;; NOTE: using text-value for cases when the user
+                                ;; leaves the app with an unfinished edit and re-opens
+                                ;; the chat.
+                                (and (seq @text-value) composer-just-opened?)
+                                @text-value
+                                :else (get-in edit [:content :text]))
+             selection-pos    (count edit-text)
+             inject-edit-text (fn []
+                                (reset! text-value edit-text)
+                                (reset! cursor-position selection-pos)
+                                (reset! saved-cursor-position selection-pos)
+                                (when @input-ref
+                                  (.setNativeProps ^js @input-ref
+                                                   (clj->js {:text edit-text}))))]
+
+         (when (and edit @input-ref)
+           ;; NOTE: A small setTimeout is necessary to ensure the focus is enqueued and is executed
+           ;; ASAP. Check https://github.com/software-mansion/react-native-screens/issues/472
+           ;;
+           ;; The nested setTimeout is necessary to avoid both `on-focus` and
+           ;; `on-content-size-change` handlers triggering the height animation simultaneously, as
+           ;; this causes a jump in the
+           ;; UI. This way, `on-focus` will trigger first without changing the height, after which
+           ;; `on-content-size-change` will animate the height of the input based on the injected
+           ;; text.
+           (js/setTimeout #(do (when @messages-list-on-layout-finished? (.focus ^js @input-ref))
+                               (reagent/next-tick inject-edit-text))
+                          600))))
+     [(:message-id edit)])))
 
 (defn use-reply
   [{:keys [input-ref]}
    {:keys [container-opacity]}
-   {:keys [reply]}]
+   {:keys [reply]}
+   messages-list-on-layout-finished?]
   (rn/use-effect
    (fn []
      (when reply
        (reanimated/animate container-opacity 1))
-     (when (and reply @input-ref)
-       (js/setTimeout #(.focus ^js @input-ref) 250)))
+     (when (and reply @input-ref @messages-list-on-layout-finished?)
+       (js/setTimeout #(.focus ^js @input-ref) 600)))
    [(:message-id reply)]))
 
-(defn edit-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)))
-                                            ""
-                                            input-with-mentions)]
-                     (reset! text-value input-text)
-                     (reset! cursor-position (count input-text))
-                     (js/setTimeout #(when @input-ref
-                                       (.setNativeProps ^js @input-ref
-                                                        (clj->js {:selection {:start (count input-text)
-                                                                              :end   (count
-                                                                                      input-text)}})))
-                                    300)))
-                 [(some #(= :mention (first %)) (seq input-with-mentions))]))
-
 (defn update-input-mention
   [{:keys [input-ref]}
    {:keys [text-value]}

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

@@ -43,8 +43,7 @@
     (reset! emoji-kb-extra-height nil))
   (reset! maximized? false)
   (rf/dispatch [:chat.ui/set-input-maximized false])
-  (when @input-ref
-    (.blur ^js @input-ref)))
+  (utils/blur-input input-ref))
 
 (defn bounce-back
   [{:keys [height saved-height opacity background-y]}
@@ -96,13 +95,13 @@
                                 max-height
                                 bounded-height
                                 saved-height))
-                 (when @input-ref ; sheet at min-height, collapse keyboard
-                   (.blur ^js @input-ref)))))))
+                 ; sheet at min-height, collapse keyboard
+                 (utils/blur-input input-ref))))))
         (gesture/on-end (fn []
                           (let [diff (- (reanimated/get-shared-value height)
                                         (reanimated/get-shared-value saved-height))]
                             (if @gesture-enabled?
-                              (if (>= diff 0)
+                              (if (and @expanding? (>= diff 0))
                                 (if (> diff constants/drag-threshold)
                                   (maximize state animations dimensions)
                                   (bounce-back animations dimensions starting-opacity))

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

@@ -23,12 +23,14 @@
    show-floating-scroll-down-button?]
   (reset! focused? true)
   (rf/dispatch [:chat.ui/set-input-focused true])
-  (reanimated/animate height (reanimated/get-shared-value last-height))
-  (reanimated/set-shared-value saved-height (reanimated/get-shared-value last-height))
-  (reanimated/animate container-opacity 1)
-  (when (> (reanimated/get-shared-value last-height) (* constants/background-threshold max-height))
-    (reanimated/animate opacity 1)
-    (reanimated/set-shared-value background-y 0))
+  (let [last-height-value (reanimated/get-shared-value last-height)]
+    (reanimated/animate height last-height-value)
+    (reanimated/set-shared-value saved-height last-height-value)
+    (reanimated/animate container-opacity 1)
+    (when (> last-height-value (* constants/background-threshold max-height))
+      (reanimated/animate opacity 1)
+      (reanimated/set-shared-value background-y 0)))
+
   (js/setTimeout #(reset! lock-selection? false) 300)
   (when (and (not-empty @text-value) @input-ref)
     (.setNativeProps ^js @input-ref
@@ -72,7 +74,7 @@
   "Save new text height, expand composer if possible, show background overlay if needed"
   [event
    {:keys [maximized? lock-layout? text-value]}
-   {:keys [height saved-height opacity background-y]}
+   {:keys [height saved-height last-height opacity background-y]}
    {:keys [content-height window-height max-height]}
    keyboard-shown]
   (when keyboard-shown
@@ -87,8 +89,9 @@
                                                     max-height)
           new-height   (min new-height max-height)]
       (reset! content-height content-size)
-      (when (utils/update-height? content-size height max-height maximized?)
+      (when (utils/update-height? content-size height max-height)
         (reanimated/animate height new-height)
+        (reanimated/set-shared-value last-height new-height)
         (reanimated/set-shared-value saved-height new-height))
       (when (= new-height max-height)
         (reset! maximized? true)

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

@@ -4,7 +4,8 @@
     [react-native.async-storage :as async-storage]
     [react-native.core :as rn]
     [react-native.platform :as platform]
-    [react-native.reanimated :as reanimated]))
+    [react-native.reanimated :as reanimated]
+    [status-im2.contexts.chat.composer.utils :as utils]))
 
 (defn get-kb-height
   [curr-height default-height]
@@ -20,18 +21,24 @@
       (async-storage/set-item! :kb-default-height (str height)))))
 
 (defn handle-emoji-kb-ios
-  "Opening emoji KB on iOS while maximized will cause a flicker up and down. This method handles that."
+  "Opening emoji KB on iOS will cause a flicker up and down due to height differences.
+  This method handles that by adding the extra difference between the keyboards. When the input is
+  expanded to a point where the added difference will make the composer go beyond the screen causing a flicker,
+  we're subtracting the difference so it only reaches the allowed max-height. We're not animating these
+  changes to make it appear seamless during transitions between keyboard types when maximized."
   [event
    {:keys [emoji-kb-extra-height]}
-   {:keys [text-value]}
+   {:keys [text-value kb-height]}
    {:keys [height saved-height]}
    {:keys [max-height]}]
-  (let [start-h         (oops/oget event "startCoordinates.height")
-        end-h           (oops/oget event "endCoordinates.height")
-        diff            (- end-h start-h)
-        max-height-diff (- max-height diff)
-        curr-text       @text-value]
-    (if (> (reanimated/get-shared-value height) max-height-diff)
+  (let [start-h                 (oops/oget event "startCoordinates.height")
+        end-h                   (oops/oget event "endCoordinates.height")
+        diff                    (- end-h start-h)
+        max-height-diff         (- max-height diff)
+        curr-text               @text-value
+        bigger-than-default-kb? (> end-h @kb-height)
+        almost-expanded?        (> (reanimated/get-shared-value height) max-height-diff)]
+    (if (and almost-expanded? bigger-than-default-kb? (pos? diff))
       (do
         (reanimated/set-shared-value height (- (reanimated/get-shared-value height) diff))
         (reanimated/set-shared-value saved-height (- (reanimated/get-shared-value saved-height) diff))
@@ -58,8 +65,8 @@
                                    #(handle-emoji-kb-ios % props state animations dimensions)))
   (reset! keyboard-hide-listener (.addListener rn/keyboard
                                                "keyboardDidHide"
-                                               #(when (and platform/android? @input-ref)
-                                                  (.blur ^js @input-ref)))))
+                                               #(when platform/android?
+                                                  (utils/blur-input input-ref)))))
 
 (defn handle-refocus-emoji-kb-ios
   [{:keys [saved-emoji-kb-extra-height]}

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

@@ -9,6 +9,7 @@
     [status-im2.constants :as constant]
     [status-im2.contexts.chat.composer.constants :as constants]
     [status-im2.contexts.chat.composer.reply.style :as style]
+    [status-im2.contexts.chat.composer.utils :as utils]
     [utils.ens.stateofus :as stateofus]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
@@ -85,7 +86,7 @@
 (defn quoted-message
   [{:keys [from content-type contentType parsed-text content deleted? deleted-for-me?
            album-images-count]}
-   in-chat-input? pin? recording-audio?]
+   in-chat-input? pin? recording-audio? input-ref]
   (let [[primary-name _]   (rf/sub [:contacts/contact-two-names-by-identity from])
         current-public-key (rf/sub [:multiaccount/public-key])
         content-type       (or content-type contentType)
@@ -136,7 +137,7 @@
         {:icon-only?          true
          :size                24
          :accessibility-label :reply-cancel-button
-         :on-press            #(rf/dispatch [:chat.ui/cancel-message-reply])
+         :on-press            #(utils/cancel-reply-message input-ref)
          :type                :outline}
         :i/close])
      (when (and in-chat-input? recording-audio?)
@@ -148,13 +149,13 @@
          :style  style/gradient}])]))
 
 (defn- f-view
-  [recording?]
+  [recording? input-ref]
   (let [reply  (rf/sub [:chats/reply-message])
         height (reanimated/use-shared-value (if reply constants/reply-container-height 0))]
     (rn/use-effect #(reanimated/animate height (if reply constants/reply-container-height 0)) [reply])
     [reanimated/view {:style (reanimated/apply-animations-to-style {:height height} {})}
-     (when reply [quoted-message reply true false recording?])]))
+     (when reply [quoted-message reply true false recording? input-ref])]))
 
 (defn view
-  [{:keys [recording?]}]
-  [:f> f-view @recording?])
+  [{:keys [recording?]} input-ref]
+  [:f> f-view @recording? input-ref])

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

@@ -16,11 +16,10 @@
   (max min-v (min v max-v)))
 
 (defn update-height?
-  [content-size height max-height maximized?]
-  (when-not @maximized?
-    (let [diff (Math/abs (- content-size (reanimated/get-shared-value height)))]
-      (and (not= (reanimated/get-shared-value height) max-height)
-           (> diff constants/content-change-threshold)))))
+  [content-size height max-height]
+  (let [diff (Math/abs (- content-size (reanimated/get-shared-value height)))]
+    (and (not= (reanimated/get-shared-value height) max-height)
+         (> diff constants/content-change-threshold))))
 
 (defn show-top-gradient?
   [y lines max-lines gradient-opacity focused?]
@@ -100,10 +99,28 @@
        (not reply?)
        (not audio?)))
 
+(defn blur-input
+  [input-ref]
+  (when @input-ref
+    (rf/dispatch [:chat.ui/set-input-focused false])
+    (.blur ^js @input-ref)))
+
+(defn cancel-reply-message
+  [input-ref]
+  (js/setTimeout #(blur-input input-ref) 100)
+  (rf/dispatch [:chat.ui/set-input-content-height constants/input-height])
+  (rf/dispatch [:chat.ui/cancel-message-reply]))
+
 (defn cancel-edit-message
-  [{:keys [text-value]}]
+  [text-value input-ref]
   (reset! text-value "")
-  (rf/dispatch [:chat.ui/set-input-content-height constants/input-height]))
+  ;; NOTE: adding a timeout to assure the input is blurred on the next tick
+  ;; after the `text-value` was cleared. Otherwise the height will be calculated
+  ;; with the old `text-value`, leading to wrong composer height after blur.
+  (js/setTimeout #(blur-input input-ref) 100)
+  (.setNativeProps ^js @input-ref (clj->js {:text ""}))
+  (rf/dispatch [:chat.ui/set-input-content-height constants/input-height])
+  (rf/dispatch [:chat.ui/cancel-message-edit]))
 
 (defn count-lines
   [s]

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

@@ -33,7 +33,8 @@
            blur-height
            opacity
            background-y
-           theme]} props state]
+           theme
+           messages-list-on-layout-finished?]} props state]
   (let [{:keys [chat-screen-loaded?]
          :as   subscriptions}    (utils/init-subs)
         content-height           (reagent/atom (or (:input-content-height ; Actual text height
@@ -73,10 +74,9 @@
                         animations
                         dimensions
                         subscriptions)
-    (effects/use-edit props state subscriptions)
-    (effects/use-reply props animations subscriptions)
+    (effects/use-edit props state subscriptions messages-list-on-layout-finished?)
+    (effects/use-reply props animations subscriptions messages-list-on-layout-finished?)
     (effects/update-input-mention props state subscriptions)
-    (effects/edit-mentions props state subscriptions)
     (effects/link-previews props state animations subscriptions)
     (effects/use-images props state animations subscriptions)
     [:<>
@@ -98,8 +98,10 @@
         [sub-view/bar]
         (when chat-screen-loaded?
           [:<>
-           [reply/view state]
-           [edit/view state]])
+           [reply/view state (:input-ref props)]
+           [edit/view
+            {:text-value (:text-value state)
+             :input-ref  (:input-ref props)}]])
         [reanimated/touchable-opacity
          {:active-opacity      1
           :on-press            (fn []
@@ -147,11 +149,13 @@
          subscriptions]]]]]))
 
 (defn composer
-  [{:keys [insets scroll-to-bottom-fn show-floating-scroll-down-button?]}]
+  [{:keys [insets scroll-to-bottom-fn show-floating-scroll-down-button?
+           messages-list-on-layout-finished?]}]
   (let [window-height (:height (rn/get-window))
         theme         (quo.theme/use-theme-value)
         opacity       (reanimated/use-shared-value 0)
-        background-y  (reanimated/use-shared-value (- window-height)) ; Y position of background overlay
+        background-y  (reanimated/use-shared-value (- window-height)) ; Y position of background
+                                                                      ; overlay
         blur-height   (reanimated/use-shared-value (+ constants/composer-default-height
                                                       (:bottom insets)))
         extra-params  {:insets                            insets
@@ -161,7 +165,8 @@
                        :blur-height                       blur-height
                        :opacity                           opacity
                        :background-y                      background-y
-                       :theme                             theme}
+                       :theme                             theme
+                       :messages-list-on-layout-finished? messages-list-on-layout-finished?}
         props         (utils/init-non-reactive-state)
         state         (utils/init-reactive-state)]
     [rn/view (when platform/ios? {:style {:z-index 1}})

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

@@ -298,7 +298,7 @@
 
 (defn f-messages-list-content
   [{:keys [chat insets scroll-y content-height cover-bg-color keyboard-shown? inner-state-atoms
-           big-name-visible? animate-topbar-opacity? composer-active?
+           big-name-visible? animate-topbar-opacity? composer-active? messages-list-on-layout-finished?
            on-end-reached? animate-topbar-name?]}]
   (rn/use-effect (fn []
                    (if (and (not @on-end-reached?)
@@ -412,6 +412,15 @@
        ;;TODO(rasom) https://github.com/facebook/react-native/issues/30034
        :inverted                          (when platform/ios? true)
        :on-layout                         (fn [e]
+                                            ;; FIXME: the 1s timeout is to assure all effects with
+                                            ;; timeouts that depend on the value are considered.
+                                            ;; Hacky, but we're heavily relying on timeouts in the
+                                            ;; composer and need to react to differently (e.g.
+                                            ;; inside effects/use-edit) when the chat has just
+                                            ;; opened and the subsequent times.
+                                            (js/setTimeout #(reset! messages-list-on-layout-finished?
+                                                              true)
+                                                           1000)
                                             (let [layout-height (oops/oget e
                                                                            "nativeEvent.layout.height")]
                                               (reset! messages-view-height layout-height)))

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

@@ -15,7 +15,7 @@
 
 (defn f-chat
   [{:keys [show-floating-scroll-down-button? animate-topbar-name?
-           big-name-visible? animate-topbar-opacity? on-end-reached?]
+           big-name-visible? animate-topbar-opacity? on-end-reached? messages-list-on-layout-finished?]
     :as   inner-state-atoms}]
   (let [insets                   (safe-area/get-insets)
         scroll-y                 (reanimated/use-shared-value 0)
@@ -53,18 +53,19 @@
       :keyboard-vertical-offset (- (:bottom insets))}
 
      [list.view/message-list-content-view
-      {:chat                    chat
-       :insets                  insets
-       :scroll-y                scroll-y
-       :content-height          content-height
-       :cover-bg-color          :turquoise
-       :keyboard-shown?         keyboard-shown
-       :inner-state-atoms       inner-state-atoms
-       :animate-topbar-name?    animate-topbar-name?
-       :big-name-visible?       big-name-visible?
-       :animate-topbar-opacity? animate-topbar-opacity?
-       :composer-active?        focused?
-       :on-end-reached?         on-end-reached?}]
+      {:chat                              chat
+       :insets                            insets
+       :scroll-y                          scroll-y
+       :content-height                    content-height
+       :cover-bg-color                    :turquoise
+       :keyboard-shown?                   keyboard-shown
+       :inner-state-atoms                 inner-state-atoms
+       :animate-topbar-name?              animate-topbar-name?
+       :big-name-visible?                 big-name-visible?
+       :animate-topbar-opacity?           animate-topbar-opacity?
+       :composer-active?                  focused?
+       :on-end-reached?                   on-end-reached?
+       :messages-list-on-layout-finished? messages-list-on-layout-finished?}]
 
      [messages.navigation/navigation-view
       {:scroll-y                scroll-y
@@ -86,7 +87,8 @@
          [:f> composer.view/composer
           {:insets                            insets
            :scroll-to-bottom-fn               list.view/scroll-to-bottom
-           :show-floating-scroll-down-button? show-floating-scroll-down-button?}]
+           :show-floating-scroll-down-button? show-floating-scroll-down-button?
+           :messages-list-on-layout-finished? messages-list-on-layout-finished?}]
          [contact-requests.bottom-drawer/view chat-id contact-request-state group-chat]))]))
 
 (defn chat
@@ -99,5 +101,6 @@
          :animate-topbar-name?              (reagent/atom false)
          :big-name-visible?                 (reagent/atom :initial-render)
          :animate-topbar-opacity?           (reagent/atom false)
-         :on-end-reached?                   (reagent/atom false)}]
+         :on-end-reached?                   (reagent/atom false)
+         :messages-list-on-layout-finished? (reagent/atom false)}]
     [:f> f-chat inner-state-atoms]))

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

@@ -42,26 +42,31 @@
                                                community-id %])
                     :on-error   #(log/error "failed to request to join community" community-id %)}]})
 
+(defn request-to-join
+  [{:keys [db]} [{:keys [community-id password]}]]
+  (let [pub-key             (get-in db [:profile/profile :public-key])
+        addresses-to-reveal []]
+    {:fx [[:json-rpc/call
+           [{:method     "wakuext_generateJoiningCommunityRequestsForSigning"
+             :params     [pub-key community-id addresses-to-reveal]
+             :on-success [:communities/sign-data community-id password]
+             :on-error   [:communities/requested-to-join-error community-id]}]]]}))
+
 ;; Event to be called to request to join a community.
 ;; This event will generate the data to be signed and then call the sign-data event.
 ;; This is the only event that should be called from the UI.
-(rf/reg-event-fx :communities/request-to-join
- (fn [{:keys [db]} [{:keys [community-id password]}]]
-   (let [pub-key             (get-in db [:profile/profile :public-key])
-         addresses-to-reveal []]
-     {:fx [[:json-rpc/call
-            [{:method     "wakuext_generateJoiningCommunityRequestsForSigning"
-              :params     [pub-key community-id addresses-to-reveal]
-              :on-success [:communities/sign-data community-id password]
-              :on-error   [:communities/requested-to-join-error community-id]}]]]})))
+(rf/reg-event-fx :communities/request-to-join request-to-join)
 
-(rf/reg-event-fx :communities/sign-data
- (fn [_ [community-id password sign-params]]
-   {:fx [[:json-rpc/call
-          [{:method     "wakuext_signData"
-            :params     [(map #(assoc % :password password) sign-params)]
-            :on-success [:communities/request-to-join-with-signatures community-id]
-            :on-error   [:communities/requested-to-join-error community-id]}]]]}))
+(defn sign-data
+  [_ [community-id password sign-params]]
+  (let [addresses-to-reveal (map :account sign-params)]
+    {:fx [[:json-rpc/call
+           [{:method     "wakuext_signData"
+             :params     [(map #(assoc % :password password) sign-params)]
+             :on-success [:communities/request-to-join-with-signatures community-id addresses-to-reveal]
+             :on-error   [:communities/requested-to-join-error community-id]}]]]}))
+
+(rf/reg-event-fx :communities/sign-data sign-data)
 
 (rf/reg-event-fx :communities/requested-to-join-error
  (fn [{:keys [db]} [community-id error]]
@@ -71,11 +76,19 @@
                :event        :communities/requested-to-join-error})
    {:db (assoc-in db [:password-authentication :error] error)}))
 
-(rf/reg-event-fx :communities/request-to-join-with-signatures
- (fn [_ [community-id signatures]]
-   {:fx [[:json-rpc/call
-          [{:method      "wakuext_requestToJoinCommunity"
-            :params      [{:communityId community-id :signatures signatures}]
-            :js-response true
-            :on-success  [:communities/requested-to-join]
-            :on-error    [:communities/requested-to-join-error community-id]}]]]}))
+(defn request-to-join-with-signatures
+  [_ [community-id addresses-to-reveal signatures]]
+  {:fx [[:json-rpc/call
+         [{:method      "wakuext_requestToJoinCommunity"
+           :params      [{:communityId       community-id
+                          :signatures        signatures
+                          :addressesToReveal addresses-to-reveal
+                          ;; NOTE: At least one airdrop address is required.
+                          ;; This is a temporary solution while the address
+                          ;; selection feature is not implemented in mobile.
+                          :airdropAddress    (first addresses-to-reveal)}]
+           :js-response true
+           :on-success  [:communities/requested-to-join]
+           :on-error    [:communities/requested-to-join-error community-id]}]]]})
+
+(rf/reg-event-fx :communities/request-to-join-with-signatures request-to-join-with-signatures)

src/status_im2/contexts/communities/overview/events_test.cljs

@@ -0,0 +1,53 @@
+(ns status-im2.contexts.communities.overview.events-test
+  (:require [cljs.test :refer [deftest is]]
+            [native-module.core :as native-module]
+            [status-im2.contexts.communities.overview.events :as sut]))
+
+(def password (native-module/sha3 "password123"))
+(def community-id "0x99")
+(def account-pub-key "0x1")
+
+(deftest request-to-join-test
+  (let [cofx     {:db {:profile/profile {:public-key account-pub-key}}}
+        expected {:fx [[:json-rpc/call
+                        [{:method     "wakuext_generateJoiningCommunityRequestsForSigning"
+                          :params     [account-pub-key community-id []]
+                          :on-success [:communities/sign-data community-id password]
+                          :on-error   [:communities/requested-to-join-error community-id]}]]]}]
+    (is (= expected
+           (sut/request-to-join cofx
+                                [{:community-id community-id
+                                  :password     password}])))))
+
+(deftest sign-data-test
+  (let [cofx                {:db {}}
+        sign-params         [{:data "123" :account account-pub-key}
+                             {:data "456" :account "0x2"}]
+        addresses-to-reveal [account-pub-key "0x2"]
+        expected            {:fx
+                             [[:json-rpc/call
+                               [{:method     "wakuext_signData"
+                                 :params     [[{:data "123" :account account-pub-key :password password}
+                                               {:data "456" :account "0x2" :password password}]]
+                                 :on-success [:communities/request-to-join-with-signatures
+                                              community-id addresses-to-reveal]
+                                 :on-error   [:communities/requested-to-join-error community-id]}]]]}]
+    (is (= expected
+           (sut/sign-data cofx [community-id password sign-params])))))
+
+(deftest request-to-join-with-signatures-test
+  (let [cofx                {:db {}}
+        addresses-to-reveal [account-pub-key "0x2"]
+        signatures          ["11111" "222222"]
+        expected            {:fx [[:json-rpc/call
+                                   [{:method      "wakuext_requestToJoinCommunity"
+                                     :params      [{:communityId       community-id
+                                                    :signatures        signatures
+                                                    :addressesToReveal addresses-to-reveal
+                                                    :airdropAddress    "0x1"}]
+                                     :js-response true
+                                     :on-success  [:communities/requested-to-join]
+                                     :on-error    [:communities/requested-to-join-error
+                                                   community-id]}]]]}]
+    (is (= expected
+           (sut/request-to-join-with-signatures cofx [community-id addresses-to-reveal signatures])))))

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

@@ -255,7 +255,7 @@
 (defn community-content
   [community]
   (rf/dispatch [:communities/check-all-community-channels-permissions (:id community)])
-  (fn [{:keys [name description joined images tags color id] :as community}
+  (fn [{:keys [name description joined images tags color id token-permissions] :as community}
        pending?
        {:keys [on-category-layout
                collapsed?
@@ -273,12 +273,14 @@
             :last-item-style style/last-community-tag
             :container-style style/community-tag-container}])
         [join-community community pending?]]
-       [channel-list-component
-        {:on-category-layout              on-category-layout
-         :community-id                    id
-         :community-color                 color
-         :on-first-channel-height-changed on-first-channel-height-changed}
-        (add-handlers-to-categorized-chats id chats-by-category joined)]])))
+       (when (or (and (seq token-permissions) joined)
+                 (empty? token-permissions))
+         [channel-list-component
+          {:on-category-layout              on-category-layout
+           :community-id                    id
+           :community-color                 color
+           :on-first-channel-height-changed on-first-channel-height-changed}
+          (add-handlers-to-categorized-chats id chats-by-category joined)])])))
 
 (defn sticky-category-header
   [_]

src/status_im2/integration_test/chat_test.cljs

@@ -1,4 +1,4 @@
-(ns status-im2.integration-test.chat
+(ns status-im2.integration-test.chat-test
   (:require
     [cljs.test :refer [deftest is]]
     [day8.re-frame.test :as rf-test]
@@ -16,7 +16,7 @@
   "0x0402905bed83f0bbf993cee8239012ccb1a8bc86907ead834c1e38476a0eda71414eed0e25f525f270592a2eebb01c9119a4ed6429ba114e51f5cb0a28dae1adfd")
 
 (deftest one-to-one-chat-test
-  (h/log-headline one-to-one-chat-test)
+  (h/log-headline :one-to-one-chat-test)
   (rf-test/run-test-async
    (h/with-app-initialized
     (h/with-account

src/status_im2/integration_test/community_test.cljs

@@ -1,4 +1,4 @@
-(ns status-im2.integration-test.community
+(ns status-im2.integration-test.community-test
   (:require [cljs.test :refer [deftest]]
             [day8.re-frame.test :as rf-test]
             [re-frame.core :as rf]

src/status_im2/integration_test/core_test.cljs

@@ -1,4 +1,4 @@
-(ns status-im2.integration-test.core
+(ns status-im2.integration-test.core-test
   (:require
     [cljs.test :refer [deftest]]
     [day8.re-frame.test :as rf-test]
@@ -8,17 +8,14 @@
     status-im.subs.root
     [status-im.utils.test :as utils.test]
     status-im2.events
-    status-im2.integration-test.chat
-    status-im2.integration-test.wallet
     status-im2.navigation.core
     status-im2.subs.root
     [test-helpers.integration :as h]))
 
-(utils.test/init!)
-
 (deftest initialize-app-test
   (h/log-headline :initialize-app-test)
   (rf-test/run-test-async
+   (utils.test/init!)
    (rf/dispatch [:app-started])
    (rf-test/wait-for
      ;; use initialize-view because it has the longest avg. time and

src/status_im2/integration_test/wallet_test.cljs

@@ -1,6 +1,6 @@
-(ns status-im2.integration-test.wallet
+(ns status-im2.integration-test.wallet-test
   (:require
-    [cljs.test :refer [deftest is]]
+    [cljs.test :refer [is]]
     [clojure.string :as string]
     [day8.re-frame.test :as rf-test]
     [re-frame.core :as rf]
@@ -12,7 +12,9 @@
     status-im2.subs.root
     [test-helpers.integration :as h]))
 
-(deftest create-wallet-account-test
+;; Workaround to skip test. Switch to `deftest` when test is fixed.
+(defn create-wallet-account-test
+  []
   (h/log-headline :create-wallet-account-test)
   (rf-test/run-test-async
    (h/with-app-initialized
@@ -24,7 +26,9 @@
        (h/logout)
        (rf-test/wait-for [::logout/logout-method]))))))
 
-(deftest back-up-seed-phrase-test
+;; Workaround to skip test. Switch to `deftest` when test is fixed.
+(defn back-up-seed-phrase-test
+  []
   (h/log-headline :back-up-seed-phrase-test)
   (rf-test/run-test-async
    (h/with-app-initialized

src/test_helpers/integration.clj

@@ -4,21 +4,21 @@
 
 (defmacro with-app-initialized
   [& body]
-  `(if (app-initialized)
-     (do ~@body)
-     (do
-       (rf/dispatch [:app-started])
-       (rf-test/wait-for
-         [:profile/get-profiles-overview-success]
-         ~@body))))
+  `(do
+     (status-im.utils.test/init!)
+     (if (test-helpers.integration/app-initialized)
+       (do ~@body)
+       (do
+         (rf/dispatch [:app-started])
+         (rf-test/wait-for [:profile/get-profiles-overview-success]
+           ~@body)))))
 
 (defmacro with-account
   [& body]
-  `(if (messenger-started)
+  `(if (test-helpers.integration/messenger-started)
      (do ~@body)
      (do
-       (create-multiaccount!)
-       (rf-test/wait-for
-         [:status-im.transport.core/messenger-started]
-         (assert-messenger-started)
+       (test-helpers.integration/create-multiaccount!)
+       (rf-test/wait-for [:status-im.transport.core/messenger-started]
+         (test-helpers.integration/assert-messenger-started)
          ~@body))))

src/test_helpers/integration.cljs

@@ -1,4 +1,5 @@
 (ns test-helpers.integration
+  (:require-macros [test-helpers.integration])
   (:require
     [cljs.test :refer [is]]
     [native-module.core :as native-module]

status-go-version.json

@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v0.171.11",
-    "commit-sha1": "8a4c2d8d2f17117aa0a00338e83b0f753ebf1328",
-    "src-sha256": "160qnl9dsl1ypvqg9w6z8wps4fvgq3qxi16piymhrlzgssdwkz8h"
+    "version": "fix/shards-pubsub-topic",
+    "commit-sha1": "e7d9f59db4ccbf2c301d5b8dd705943be8c73097",
+    "src-sha256": "0hwy10ycjgbh332h1fl5hyw8j9nds0idqk980svaj76ckgsi7dlv"
 }

test/appium/tests/conftest.py

@@ -1,7 +1,7 @@
 import os
 import re
 import signal
-import urllib.request
+import requests
 from contextlib import contextmanager
 from dataclasses import dataclass
 from datetime import datetime
@@ -161,6 +161,57 @@ def is_uploaded():
             return True
 
 
+@contextmanager
+def _upload_time_limit(seconds):
+    def signal_handler(signum, frame):
+        raise TimeoutError("Apk upload took more than %s seconds" % seconds)
+
+    signal.signal(signal.SIGALRM, signal_handler)
+    signal.alarm(seconds)
+    try:
+        yield
+    finally:
+        signal.alarm(0)
+
+class UploadApkException(Exception):
+    pass
+
+def _upload_and_check_response(apk_file_path):
+    with _upload_time_limit(600):
+        with open(apk_file_path, 'rb') as f:
+            resp = sauce.storage._session.request('post', '/v1/storage/upload', files={'payload': f})
+
+    try:
+        if resp['item']['name'] != test_suite_data.apk_name:
+            raise UploadApkException("Incorrect apk was uploaded to Sauce storage, response:\n%s" % resp)
+    except KeyError:
+        raise UploadApkException("Error when uploading apk to Sauce storage, response:\n%s" % resp)
+
+def _upload_and_check_response_with_retries(apk_file_path, retries=3):
+    for _ in range(retries):
+        try:
+            _upload_and_check_response(apk_file_path)
+            break
+        except (ConnectionError, RemoteDisconnected):
+            sleep(10)
+
+def _download_apk(url):
+    # Absolute path adde to handle CI runs.
+    apk_path = os.path.join(os.path.dirname(__file__), test_suite_data.apk_name)
+
+    print('Downloading: %s' % url)
+    try:
+        resp = requests.get(url)
+        resp.raise_for_status()
+    except requests.RequestException as err:
+        print(resp.text)
+        raise err
+
+    with open(apk_path, 'wb') as f:
+        f.write(resp.content)
+
+    return apk_path
+
 def pytest_configure(config):
     global option
     option = config.option
@@ -180,75 +231,49 @@ def pytest_configure(config):
         apibase = 'eu-central-1.saucelabs.com'
     else:
         raise NotImplementedError("Unknown SauceLabs datacenter")
+
     global sauce
     sauce = SauceLab('https://api.' + apibase + '/', sauce_username, sauce_access_key)
     if config.getoption('log_steps'):
         import logging
         logging.basicConfig(level=logging.INFO)
-    if config.getoption('env') != 'api':
-        test_suite_data.apk_name = ([i for i in [i for i in config.getoption('apk').split('/')
-                                                 if '.apk' in i]])[0]
-        if is_master(config):
-            pr_number = config.getoption('pr_number')
-            if config.getoption('testrail_report'):
-                if pr_number:
-                    run_number = len(testrail_report.get_runs(pr_number)) + 1
-                    run_name = 'PR-%s run #%s' % (pr_number, run_number)
-                else:
-                    run_name = test_suite_data.apk_name
-                testrail_report.add_run(run_name)
-            if pr_number:
-                from github import Github
-                repo = Github(github_token).get_user('status-im').get_repo('status-mobile')
-                pull = repo.get_pull(int(pr_number))
-                pull.get_commits()[0].create_status(state='pending', context='Mobile e2e tests',
-                                                    description='e2e tests are running')
-            if config.getoption('env') == 'sauce':
-                if not is_uploaded():
-                    def _upload_and_check_response(apk_file_path):
-                        @contextmanager
-                        def _upload_time_limit(seconds):
-                            def signal_handler(signum, frame):
-                                raise TimeoutError("Apk upload took more than %s seconds" % seconds)
+    if config.getoption('env') == 'api':
+        return
 
-                            signal.signal(signal.SIGALRM, signal_handler)
-                            signal.alarm(seconds)
-                            try:
-                                yield
-                            finally:
-                                signal.alarm(0)
+    test_suite_data.apk_name = ([i for i in [i for i in config.getoption('apk').split('/')
+                                             if '.apk' in i]])[0]
+    if not is_master(config):
+        return
 
-                        with _upload_time_limit(600):
-                            class UploadApkException(Exception):
-                                pass
+    pr_number = config.getoption('pr_number')
+    if config.getoption('testrail_report'):
+        if pr_number:
+            run_number = len(testrail_report.get_runs(pr_number)) + 1
+            run_name = 'PR-%s run #%s' % (pr_number, run_number)
+        else:
+            run_name = test_suite_data.apk_name
+        testrail_report.add_run(run_name)
 
-                            with open(apk_file_path, 'rb') as f:
-                                resp = sauce.storage._session.request('post', '/v1/storage/upload',
-                                                                      files={'payload': f})
-                                try:
-                                    if resp['item']['name'] != test_suite_data.apk_name:
-                                        raise UploadApkException(
-                                            "Incorrect apk was uploaded to Sauce storage, response:\n%s" % resp)
-                                except KeyError:
-                                    raise UploadApkException(
-                                        "Error when uploading apk to Sauce storage, response:\n%s" % resp)
+    if pr_number:
+        from github import Github
+        repo = Github(github_token).get_user('status-im').get_repo('status-mobile')
+        pull = repo.get_pull(int(pr_number))
+        pull.get_commits()[0].create_status(
+            state='pending',
+            context='Mobile e2e tests',
+            description='e2e tests are running'
+        )
 
-                    if 'http' in config.getoption('apk'):
-                        # it works with just a file_name, but I've added full path because not sure how it'll behave on the remote run (Jenkins)
-                        file_path, to_remove = os.path.join(os.path.dirname(__file__), test_suite_data.apk_name), True
-                        urllib.request.urlretrieve(config.getoption('apk'),
-                                                   filename=file_path)  # if url is not valid it raises an error
-                    else:
-                        file_path, to_remove = config.getoption('apk'), False
+    if config.getoption('env') == 'sauce' and not is_uploaded():
+        apk_src = config.getoption('apk')
+        if apk_src.startswith('http'):
+            apk_path = _download_apk(apk_src)
+        else:
+            apk_path = apk_src
 
-                    for _ in range(3):
-                        try:
-                            _upload_and_check_response(apk_file_path=file_path)
-                            break
-                        except (ConnectionError, RemoteDisconnected):
-                            sleep(10)
-                    if to_remove:
-                        os.remove(file_path)
+        _upload_and_check_response_with_retries(apk_path)
+        if apk_src.startswith('http'):
+            os.remove(apk_path)
 
 
 def pytest_unconfigure(config):

test/appium/tests/critical/chats/test_1_1_public_chats.py

@@ -158,20 +158,20 @@ class TestOneToOneChatMultipleSharedDevicesNewUi(MultipleSharedDeviceTestCase):
         except Failed:
             self.errors.append("Link message reaction is not shown for the sender")
 
-        self.home_2.just_fyi("Check 'Open in Status' option")
-        # url_to_open = 'http://status.im' # ToDo: enable when a bug with Status link is fixed
-        url_to_open = 'https://coinmarketcap.com/'
-        self.chat_1.send_message(url_to_open)
-        chat_element = self.chat_2.chat_element_by_text(url_to_open)
-        if chat_element.is_element_displayed(120):
-            chat_element.click_on_link_inside_message_body()
-            web_view = self.chat_2.open_in_status_button.click()
-            # if not web_view.element_by_text('Private, Secure Communication').is_element_displayed(60):
-            if not web_view.element_by_text_part(
-                    "Today's Cryptocurrency Prices by Market Cap").is_element_displayed(30):
-                self.errors.append('URL was not opened from 1-1 chat')
-        else:
-            self.errors.append("Message with URL was not received")
+        # self.home_2.just_fyi("Check 'Open in Status' option")
+        # # url_to_open = 'http://status.im' # ToDo: enable when a bug with Status link is fixed
+        # url_to_open = 'https://coinmarketcap.com/'
+        # self.chat_1.send_message(url_to_open)
+        # chat_element = self.chat_2.chat_element_by_text(url_to_open)
+        # if chat_element.is_element_displayed(120):
+        #     chat_element.click_on_link_inside_message_body()
+        #     web_view = self.chat_2.open_in_status_button.click()
+        #     # if not web_view.element_by_text('Private, Secure Communication').is_element_displayed(60):
+        #     if not web_view.element_by_text_part(
+        #             "Today's Cryptocurrency Prices by Market Cap").is_element_displayed(30):
+        #         self.errors.append('URL was not opened from 1-1 chat')
+        # else:
+        #     self.errors.append("Message with URL was not received") # ToDo: temp
 
         self.errors.verify_no_errors()
 
@@ -293,7 +293,7 @@ class TestOneToOneChatMultipleSharedDevicesNewUi(MultipleSharedDeviceTestCase):
             sent_time_variants = self.chat_2.convert_device_time_to_chat_timestamp()
             if timestamp not in sent_time_variants:
                 self.errors.append(
-                    'Timestamp on message %s does not correspond expected [%s]' % (timestamp, *sent_time_variants))
+                    'Timestamp on message %s does not correspond expected %s' % (timestamp, sent_time_variants))
         except NoSuchElementException:
             self.errors.append("No timestamp on message %s" % messages[0])
         for message in [messages[1], messages[2]]:

test/appium/tests/critical/chats/test_public_chat_browsing.py

@@ -248,7 +248,7 @@ class TestCommunityOneDeviceMerged(MultipleSharedDeviceTestCase):
 
         self.home.just_fyi("Check that can login with different user")
         self.home.reopen_app(sign_in=False)
-        self.sign_in.show_profiles_button.click()
+        self.sign_in.show_profiles_button.wait_and_click()
         self.sign_in.element_by_text(self.username).click()
         self.sign_in.sign_in()
         self.home.communities_tab.click()
@@ -257,7 +257,7 @@ class TestCommunityOneDeviceMerged(MultipleSharedDeviceTestCase):
 
         self.home.just_fyi("Check that can remove user from logged out state")
         self.home.reopen_app(sign_in=False)
-        self.sign_in.show_profiles_button.click()
+        self.sign_in.show_profiles_button.wait_and_click()
         user_card = self.sign_in.get_user(username=self.username)
         user_card.open_user_options()
         self.sign_in.remove_profile_button.click()
@@ -267,7 +267,7 @@ class TestCommunityOneDeviceMerged(MultipleSharedDeviceTestCase):
 
         self.home.just_fyi("Check that removed user is not shown in the list anymore")
         self.home.reopen_app(sign_in=False)
-        self.sign_in.show_profiles_button.click()
+        self.sign_in.show_profiles_button.wait_and_click()
         if self.sign_in.element_by_text(self.username).is_element_displayed():
             self.errors.append("Removed user is re-appeared after relogin!")