status-go-issue

Fixes the bug by explicitly passing all available addresses to be revealed
to wakuext_requestToJoinCommunity and picking up the first available address
as the airdrop address. This is a temporary solution while we work on the
feature to allow users to choose which addresses to expose.

Fixes https://github.com/status-im/status-mobile/issues/17861

*Areas that may be impacted*: join community flows.

    ----------------------------------------------------------------------
    Community "Request to join" option is enabled.
    User holds more than X ETH.
    Anyone who holds <X> ETH is allowed to Become member in <COMMUNITY>.
    
    Expected: request to join is received by desktop client and accepted,
    mobile user joins the community.
    ----------------------------------------------------------------------
    
    ----------------------------------------------------------------------
    Community "Request to join" option is enabled.
    User holds less than X ETH.
    Anyone who holds <X> ETH is allowed to View and post in <CHANNEL>.
    
    Expected: request to join is received by desktop client and accepted, mobile
    user joins the community, but can't post in <CHANNEL>.
    ----------------------------------------------------------------------
    
    ----------------------------------------------------------------------
    Community "Request to join" option is enabled.
    No token permissions.
    
    Expected: request to join is received by desktop client and accepted,
    mobile user joins the community.
    ----------------------------------------------------------------------

Makefile

@@ -311,14 +311,13 @@ 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/require-i18n-resource-first.sh && \
+	@sh scripts/lint-re-frame-in-quo-components.sh && \
+	sh scripts/lint-direct-require-component-outside-quo.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
@@ -328,7 +327,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

VERSION

@@ -1 +1 @@
-1.25.0
+1.26.0

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

@@ -1,10 +0,0 @@
-#!/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/quo/components/tags/summary_tag/component_spec.cljs

@@ -1,53 +0,0 @@
-(ns quo.components.tags.summary-tag.component-spec
-  (:require
-    [quo.components.tags.summary-tag.view :as summary-tag]
-    [test-helpers.component :as h]))
-
-(h/describe "Summary tag component tests"
-  (h/test "Basic render"
-    (h/render [summary-tag/view])
-    (h/is-truthy (h/query-by-label-text :container)))
-
-  (h/test "Account view render"
-    (h/render [summary-tag/view
-               {:type                :account
-                :label               "Alice's Account"
-                :customization-color "#ff0000"
-                :emoji               "🎉"}])
-    (h/is-truthy (h/get-by-text "Alice's Account")))
-
-  (h/test "Network view render"
-    (h/render [summary-tag/view
-               {:type         :network
-                :label        "Ethereum Network"
-                :image-source "path/to/ethereum-logo.png"}])
-    (h/is-truthy (h/get-by-text "Ethereum Network")))
-
-  (h/test "Saved address view render"
-    (h/render [summary-tag/view
-               {:type                :saved-address
-                :label               "Charlie's Wallet"
-                :customization-color "#00ff00"}])
-    (h/is-truthy (h/get-by-text "Charlie's Wallet")))
-
-  (h/test "Collectible view render"
-    (h/render [summary-tag/view
-               {:type         :collectible
-                :label        "Rare Artifact"
-                :image-source "path/to/artifact-image.png"}])
-    (h/is-truthy (h/get-by-text "Rare Artifact")))
-
-  (h/test "User view render"
-    (h/render [summary-tag/view
-               {:type                :user
-                :label               "Bob Smith"
-                :image-source        "path/to/profile-pic.png"
-                :customization-color "#0000ff"}])
-    (h/is-truthy (h/get-by-text "Bob Smith")))
-
-  (h/test "Token view render"
-    (h/render [summary-tag/view
-               {:type         :token
-                :label        "1,000 SNT"
-                :image-source "path/to/token-image.png"}])
-    (h/is-truthy (h/get-by-text "1,000 SNT"))))

src/quo/components/tags/summary_tag/style.cljs

@@ -1,29 +0,0 @@
-(ns quo.components.tags.summary-tag.style
-  (:require
-    [quo.foundations.colors :as colors]))
-
-(defn main
-  [{:keys [type theme customization-color]}]
-  {:justify-content  :center
-   :align-items      :center
-   :height           32
-   :padding-left     4
-   :padding-right    10
-   :flex-direction   :row
-   :border-radius    (if (#{:account :collectible} type) 10 16)
-   :background-color (colors/resolve-color customization-color theme 10)})
-
-(defn label
-  [type theme]
-  {:color       (colors/theme-colors colors/neutral-100 colors/white theme)
-   :margin-left (if (= type :address) 6 4)})
-
-(def collectible-image
-  {:width         24
-   :height        24
-   :border-radius 10})
-
-(def token-image
-  {:width         24
-   :height        24
-   :border-radius 12})

src/quo/components/tags/summary_tag/view.cljs

@@ -1,67 +0,0 @@
-(ns quo.components.tags.summary-tag.view
-  (:require
-    [quo.components.avatars.account-avatar.view :as account-avatar]
-    [quo.components.avatars.user-avatar.view :as user-avatar]
-    [quo.components.avatars.wallet-user-avatar.view :as wallet-user-avatar]
-    [quo.components.markdown.text :as text]
-    [quo.components.tags.summary-tag.style :as style]
-    [quo.foundations.colors :as colors]
-    [quo.theme :as quo.theme]
-    [react-native.core :as rn]))
-
-(defn- left-view
-  [{:keys [label type customization-color emoji image-source]}]
-  (case type
-    :account
-    [account-avatar/view
-     {:customization-color customization-color
-      :size                24
-      :emoji               emoji
-      :type                :default}]
-    :network
-    [rn/image
-     {:source image-source
-      :style  style/token-image}]
-    :saved-address
-    [wallet-user-avatar/wallet-user-avatar
-     {:full-name           label
-      :size                :size-24
-      :customization-color customization-color}]
-    :collectible
-    [rn/image
-     {:source image-source
-      :style  style/collectible-image}]
-    :user
-    [user-avatar/user-avatar
-     {:full-name           label
-      :size                :xs
-      :profile-picture     image-source
-      :customization-color customization-color}]
-    :token
-    [rn/image
-     {:source image-source
-      :style  style/token-image}]
-    nil))
-
-(defn- view-internal
-  "Options:
-    - :label - string - tag label
-    - :customization-color - color - It will be passed down to components that
-      should vary based on a custom color.
-    - :type - :token / :user / :collectible / :saved-address / :network / :account
-    - :emoji - string - emoji used for displaying account avatar
-    - :image-source - resource - image to display on :network, :collectible :user and :token
-    - :theme - :light / :dark"
-  [{:keys [label customization-color type theme]
-    :as   props
-    :or   {customization-color colors/neutral-80-opa-5}}]
-  [rn/view
-   {:accessibility-label :container
-    :style               (style/main (assoc props :customization-color customization-color))}
-   [left-view props]
-   [text/text
-    {:style  (style/label type theme)
-     :weight :semi-bold
-     :size   :heading-1} label]])
-
-(def view (quo.theme/with-theme view-internal))

src/quo/core.cljs

@@ -131,7 +131,6 @@
     quo.components.tags.number-tag.view
     quo.components.tags.permission-tag
     quo.components.tags.status-tags
-    quo.components.tags.summary-tag.view
     quo.components.tags.tag
     quo.components.tags.tags
     quo.components.tags.tiny-tag.view
@@ -361,7 +360,6 @@
 (def number-tag quo.components.tags.number-tag.view/view)
 (def permission-tag quo.components.tags.permission-tag/tag)
 (def status-tag quo.components.tags.status-tags/status-tag)
-(def summary-tag quo.components.tags.summary-tag.view/view)
 (def tag quo.components.tags.tag/tag)
 (def tags quo.components.tags.tags/tags)
 (def tiny-tag quo.components.tags.tiny-tag.view/view)

src/quo/core_spec.cljs

@@ -73,7 +73,6 @@
     [quo.components.switchers.group-messaging-card.component-spec]
     [quo.components.tags.network-tags.component-spec]
     [quo.components.tags.status-tags-component-spec]
-    [quo.components.tags.summary-tag.component-spec]
     [quo.components.tags.tiny-tag.component-spec]
     [quo.components.wallet.account-card.component-spec]
     [quo.components.wallet.account-origin.component-spec]

src/status_im/chat/models/input.cljs

@@ -107,15 +107,14 @@
   [{: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-n [[:chat.ui/set-chat-input-text nil current-chat-id]
-                  [: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 [: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,9 +225,7 @@
                                                                          (.. ^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))
-        ;; https://github.com/status-im/status-mobile/issues/17854
-        :allows-inline-media-playback               true}])]
+        :injected-java-script-before-content-loaded (js-res/ethereum-provider (str network-id))}])]
    [navigation
     {:url             url-original
      :name            name

src/status_im/utils/test.cljs

@@ -15,8 +15,6 @@
 
 (def test-dir (.mkdtempSync fs test-dir-prefix))
 
-(def initialized? (atom false))
-
 (defn signal-received-callback
   [a]
   (re-frame/dispatch [:signals/signal-received a]))
@@ -24,12 +22,10 @@
 ;; We poll for signals, could not get callback working
 (defn init!
   []
-  (when-not @initialized?
-    (.setSignalEventCallback native-status)
-    (reset! initialized? true)
-    (js/setInterval (fn []
-                      (.pollSignal native-status signal-received-callback)
-                      100))))
+  (.setSignalEventCallback native-status)
+  (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
-  [{:keys [text-value input-ref]}]
+  [state]
   [rn/view
    {:style               style/container
     :accessibility-label :edit-message}
@@ -30,18 +30,20 @@
     {:size                24
      :icon-only?          true
      :accessibility-label :edit-cancel-button
-     :on-press            #(utils/cancel-edit-message text-value input-ref)
+     :on-press            (fn []
+                            (utils/cancel-edit-message state)
+                            (rf/dispatch [:chat.ui/cancel-message-edit]))
      :type                :outline}
     :i/close]])
 
 (defn- f-view
-  [props]
+  [state]
   (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 props])]))
+     (when edit [edit-message state])]))
 
 (defn view
-  [props]
-  [:f> f-view props])
+  [state]
+  [:f> f-view state])

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

@@ -6,7 +6,6 @@
     [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]
@@ -106,62 +105,53 @@
 
 (defn use-edit
   [{:keys [input-ref]}
-   {: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)])))
+   {: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)]))
 
 (defn use-reply
   [{:keys [input-ref]}
    {:keys [container-opacity]}
-   {:keys [reply]}
-   messages-list-on-layout-finished?]
+   {:keys [reply]}]
   (rn/use-effect
    (fn []
      (when reply
        (reanimated/animate container-opacity 1))
-     (when (and reply @input-ref @messages-list-on-layout-finished?)
-       (js/setTimeout #(.focus ^js @input-ref) 600)))
+     (when (and reply @input-ref)
+       (js/setTimeout #(.focus ^js @input-ref) 250)))
    [(: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,7 +43,8 @@
     (reset! emoji-kb-extra-height nil))
   (reset! maximized? false)
   (rf/dispatch [:chat.ui/set-input-maximized false])
-  (utils/blur-input input-ref))
+  (when @input-ref
+    (.blur ^js @input-ref)))
 
 (defn bounce-back
   [{:keys [height saved-height opacity background-y]}
@@ -95,13 +96,13 @@
                                 max-height
                                 bounded-height
                                 saved-height))
-                 ; sheet at min-height, collapse keyboard
-                 (utils/blur-input input-ref))))))
+                 (when @input-ref ; sheet at min-height, collapse keyboard
+                   (.blur ^js @input-ref)))))))
         (gesture/on-end (fn []
                           (let [diff (- (reanimated/get-shared-value height)
                                         (reanimated/get-shared-value saved-height))]
                             (if @gesture-enabled?
-                              (if (and @expanding? (>= diff 0))
+                              (if (>= 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,14 +23,12 @@
    show-floating-scroll-down-button?]
   (reset! focused? true)
   (rf/dispatch [:chat.ui/set-input-focused true])
-  (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)))
-
+  (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))
   (js/setTimeout #(reset! lock-selection? false) 300)
   (when (and (not-empty @text-value) @input-ref)
     (.setNativeProps ^js @input-ref
@@ -74,7 +72,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 last-height opacity background-y]}
+   {:keys [height saved-height opacity background-y]}
    {:keys [content-height window-height max-height]}
    keyboard-shown]
   (when keyboard-shown
@@ -89,9 +87,8 @@
                                                     max-height)
           new-height   (min new-height max-height)]
       (reset! content-height content-size)
-      (when (utils/update-height? content-size height max-height)
+      (when (utils/update-height? content-size height max-height maximized?)
         (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,8 +4,7 @@
     [react-native.async-storage :as async-storage]
     [react-native.core :as rn]
     [react-native.platform :as platform]
-    [react-native.reanimated :as reanimated]
-    [status-im2.contexts.chat.composer.utils :as utils]))
+    [react-native.reanimated :as reanimated]))
 
 (defn get-kb-height
   [curr-height default-height]
@@ -21,24 +20,18 @@
       (async-storage/set-item! :kb-default-height (str height)))))
 
 (defn handle-emoji-kb-ios
-  "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."
+  "Opening emoji KB on iOS while maximized will cause a flicker up and down. This method handles that."
   [event
    {:keys [emoji-kb-extra-height]}
-   {:keys [text-value kb-height]}
+   {:keys [text-value]}
    {: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
-        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))
+  (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)
       (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))
@@ -65,8 +58,8 @@
                                    #(handle-emoji-kb-ios % props state animations dimensions)))
   (reset! keyboard-hide-listener (.addListener rn/keyboard
                                                "keyboardDidHide"
-                                               #(when platform/android?
-                                                  (utils/blur-input input-ref)))))
+                                               #(when (and platform/android? @input-ref)
+                                                  (.blur ^js @input-ref)))))
 
 (defn handle-refocus-emoji-kb-ios
   [{:keys [saved-emoji-kb-extra-height]}

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

@@ -9,7 +9,6 @@
     [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]))
@@ -86,7 +85,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? input-ref]
+   in-chat-input? pin? recording-audio?]
   (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)
@@ -137,7 +136,7 @@
         {:icon-only?          true
          :size                24
          :accessibility-label :reply-cancel-button
-         :on-press            #(utils/cancel-reply-message input-ref)
+         :on-press            #(rf/dispatch [:chat.ui/cancel-message-reply])
          :type                :outline}
         :i/close])
      (when (and in-chat-input? recording-audio?)
@@ -149,13 +148,13 @@
          :style  style/gradient}])]))
 
 (defn- f-view
-  [recording? input-ref]
+  [recording?]
   (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? input-ref])]))
+     (when reply [quoted-message reply true false recording?])]))
 
 (defn view
-  [{:keys [recording?]} input-ref]
-  [:f> f-view @recording? input-ref])
+  [{:keys [recording?]}]
+  [:f> f-view @recording?])

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

@@ -16,10 +16,11 @@
   (max min-v (min v max-v)))
 
 (defn update-height?
-  [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))))
+  [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)))))
 
 (defn show-top-gradient?
   [y lines max-lines gradient-opacity focused?]
@@ -99,28 +100,10 @@
        (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
-  [text-value input-ref]
+  [{:keys [text-value]}]
   (reset! text-value "")
-  ;; 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]))
+  (rf/dispatch [:chat.ui/set-input-content-height constants/input-height]))
 
 (defn count-lines
   [s]

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

@@ -33,8 +33,7 @@
            blur-height
            opacity
            background-y
-           theme
-           messages-list-on-layout-finished?]} props state]
+           theme]} props state]
   (let [{:keys [chat-screen-loaded?]
          :as   subscriptions}    (utils/init-subs)
         content-height           (reagent/atom (or (:input-content-height ; Actual text height
@@ -74,9 +73,10 @@
                         animations
                         dimensions
                         subscriptions)
-    (effects/use-edit props state subscriptions messages-list-on-layout-finished?)
-    (effects/use-reply props animations subscriptions messages-list-on-layout-finished?)
+    (effects/use-edit props state subscriptions)
+    (effects/use-reply props animations subscriptions)
     (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,10 +98,8 @@
         [sub-view/bar]
         (when chat-screen-loaded?
           [:<>
-           [reply/view state (:input-ref props)]
-           [edit/view
-            {:text-value (:text-value state)
-             :input-ref  (:input-ref props)}]])
+           [reply/view state]
+           [edit/view state]])
         [reanimated/touchable-opacity
          {:active-opacity      1
           :on-press            (fn []
@@ -149,13 +147,11 @@
          subscriptions]]]]]))
 
 (defn composer
-  [{:keys [insets scroll-to-bottom-fn show-floating-scroll-down-button?
-           messages-list-on-layout-finished?]}]
+  [{:keys [insets scroll-to-bottom-fn show-floating-scroll-down-button?]}]
   (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
@@ -165,8 +161,7 @@
                        :blur-height                       blur-height
                        :opacity                           opacity
                        :background-y                      background-y
-                       :theme                             theme
-                       :messages-list-on-layout-finished? messages-list-on-layout-finished?}
+                       :theme                             theme}
         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? messages-list-on-layout-finished?
+           big-name-visible? animate-topbar-opacity? composer-active?
            on-end-reached? animate-topbar-name?]}]
   (rn/use-effect (fn []
                    (if (and (not @on-end-reached?)
@@ -412,15 +412,6 @@
        ;;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? messages-list-on-layout-finished?]
+           big-name-visible? animate-topbar-opacity? on-end-reached?]
     :as   inner-state-atoms}]
   (let [insets                   (safe-area/get-insets)
         scroll-y                 (reanimated/use-shared-value 0)
@@ -53,19 +53,18 @@
       :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?
-       :messages-list-on-layout-finished? messages-list-on-layout-finished?}]
+      {: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.navigation/navigation-view
       {:scroll-y                scroll-y
@@ -87,8 +86,7 @@
          [: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?
-           :messages-list-on-layout-finished? messages-list-on-layout-finished?}]
+           :show-floating-scroll-down-button? show-floating-scroll-down-button?}]
          [contact-requests.bottom-drawer/view chat-id contact-request-state group-chat]))]))
 
 (defn chat
@@ -101,6 +99,5 @@
          :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)
-         :messages-list-on-layout-finished? (reagent/atom false)}]
+         :on-end-reached?                   (reagent/atom false)}]
     [:f> f-chat inner-state-atoms]))

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 token-permissions] :as community}
+  (fn [{:keys [name description joined images tags color id] :as community}
        pending?
        {:keys [on-category-layout
                collapsed?
@@ -273,14 +273,12 @@
             :last-item-style style/last-community-tag
             :container-style style/community-tag-container}])
         [join-community community pending?]]
-       (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)])])))
+       [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/contexts/profile/login/events.cljs

@@ -73,12 +73,12 @@
         (data-store.settings/rpc->settings settings)
         profile-overview (profile.rpc/rpc->profiles-overview account)]
     (rf/merge cofx
-              {:db (-> db
-                       (assoc :chats/loading?           true
-                              :networks/current-network current-network
-                              :networks/networks        (merge networks config/default-networks-by-id)
-                              :profile/profile          (merge profile-overview settings))
-                       (assoc-in [:wallet :ui :tokens-loading?] true))}
+              {:db (assoc db
+                          :chats/loading?           true
+                          :networks/current-network current-network
+                          :wallet/tokens-loading?   true
+                          :networks/networks        (merge networks config/default-networks-by-id)
+                          :profile/profile          (merge profile-overview settings))}
               (notifications/load-preferences)
               (data-store.chats/fetch-chats-preview
                {:on-success

src/status_im2/contexts/quo_preview/main.cljs

@@ -153,7 +153,6 @@
     [status-im2.contexts.quo-preview.tags.number-tag :as number-tag]
     [status-im2.contexts.quo-preview.tags.permission-tag :as permission-tag]
     [status-im2.contexts.quo-preview.tags.status-tags :as status-tags]
-    [status-im2.contexts.quo-preview.tags.summary-tag :as summary-tag]
     [status-im2.contexts.quo-preview.tags.tag :as tag]
     [status-im2.contexts.quo-preview.tags.tags :as tags]
     [status-im2.contexts.quo-preview.tags.tiny-tag :as tiny-tag]
@@ -434,8 +433,6 @@
                         :component permission-tag/view}
                        {:name      :status-tags
                         :component status-tags/view}
-                       {:name      :summary-tag
-                        :component summary-tag/view}
                        {:name      :tag
                         :component tag/view}
                        {:name      :tags

src/status_im2/contexts/quo_preview/tags/summary_tag.cljs

@@ -1,66 +0,0 @@
-(ns status-im2.contexts.quo-preview.tags.summary-tag
-  (:require
-    [quo.core :as quo]
-    [quo.foundations.resources :as quo.resources]
-    [react-native.core :as rn]
-    [reagent.core :as reagent]
-    [status-im2.common.resources :as resources]
-    [status-im2.contexts.quo-preview.preview :as preview]))
-
-(defn data
-  [type]
-  (case type
-    :token
-    {:customization-color "#9999991A"
-     :label               "150 ETH"
-     :image-source        (quo.resources/get-token :eth)}
-    :address
-    {:label "0x39c...Bd2"}
-    :user
-    {:image-source        (resources/mock-images :user-picture-male4)
-     :customization-color :blue
-     :label               "Mark Libot"}
-    :collectible
-    {:label               "Isekai #1"
-     :image-source        (resources/mock-images :collectible2)
-     :customization-color :yellow}
-    :network
-    {:image-source (quo.resources/get-network :ethereum)
-     :label        "Mainnet"}
-    :saved-address
-    {:customization-color :flamingo
-     :label               "Peter Lambo"}
-    :account
-    {:label               "Account"
-     :emoji               "🍿"
-     :customization-color :purple}))
-
-(def descriptor
-  [{:key     :type
-    :type    :select
-    :options [{:value "Token"
-               :key   :token}
-              {:value "Address"
-               :key   :address}
-              {:value "User"
-               :key   :user}
-              {:value "Collectible"
-               :key   :collectible}
-              {:value "Network"
-               :key   :network}
-              {:value "Saved address"
-               :key   :saved-address}
-              {:value "Account"
-               :key   :account}]}])
-
-(defn view
-  []
-  (let [state (reagent/atom
-               (merge {:type :token}
-                      (data :token)))]
-    (fn []
-      [preview/preview-container
-       {:state      state
-        :descriptor descriptor}
-       [rn/view {:style {:align-items :center}}
-        [quo/summary-tag (merge @state (data (:type @state)))]]])))

src/status_im2/contexts/wallet/common/utils.cljs

@@ -1,12 +1,22 @@
 (ns status-im2.contexts.wallet.common.utils
   (:require [clojure.string :as string]
-            [status-im2.constants :as constants]
-            [utils.number]))
+            [status-im2.constants :as constants]))
 
 (defn get-first-name
   [full-name]
   (first (string/split full-name #" ")))
 
+(defn get-balance-by-address
+  [balances address]
+  (->> balances
+       (filter #(= (:address %) address))
+       first
+       :balance))
+
+(defn get-account-by-address
+  [accounts address]
+  (some #(when (= (:address %) address) %) accounts))
+
 (defn prettify-balance
   [balance]
   (str "$" (.toFixed (if (number? balance) balance 0) 2)))
@@ -22,24 +32,3 @@
   [number-of-accounts]
   (let [path (get-derivation-path number-of-accounts)]
     (format-derivation-path path)))
-
-(defn- calculate-raw-balance
-  [raw-balance decimals]
-  (if-let [n (utils.number/parse-int raw-balance nil)]
-    (/ n (Math/pow 10 (utils.number/parse-int decimals)))
-    0))
-
-(defn- total-token-value-in-all-chains
-  [{:keys [balances-per-chain decimals]}]
-  (->> balances-per-chain
-       (vals)
-       (map #(calculate-raw-balance (:raw-balance %) decimals))
-       (reduce +)))
-
-(defn calculate-balance
-  [tokens-in-account]
-  (->> tokens-in-account
-       (map (fn [token]
-              (* (total-token-value-in-all-chains token)
-                 (-> token :market-values-per-currency :usd :price))))
-       (reduce +)))

src/status_im2/contexts/wallet/edit_account/view.cljs

@@ -4,33 +4,29 @@
             [quo.theme :as quo.theme]
             [react-native.core :as rn]
             [reagent.core :as reagent]
-            [status-im2.contexts.wallet.common.screen-base.create-or-edit-account.view
-             :as create-or-edit-account]
-            [status-im2.contexts.wallet.common.sheets.network-preferences.view
-             :as network-preferences]
+            [status-im2.contexts.wallet.common.screen-base.create-or-edit-account.view :as
+             create-or-edit-account]
+            [status-im2.contexts.wallet.common.sheets.network-preferences.view :as network-preferences]
             [status-im2.contexts.wallet.edit-account.style :as style]
             [utils.i18n :as i18n]
             [utils.re-frame :as rf]))
 
-(defn- show-save-account-toast
-  [updated-key theme]
-  (let [message (case updated-key
-                  :name  :t/edit-wallet-account-name-updated-message
-                  :color :t/edit-wallet-account-colour-updated-message
-                  :emoji :t/edit-wallet-account-emoji-updated-message
-                  nil)]
-    (rf/dispatch [:toasts/upsert
-                  {:id         :edit-account
-                   :icon       :i/correct
-                   :icon-color (colors/resolve-color :success theme)
-                   :text       (i18n/label message)}])))
-
 (defn- save-account
-  [{:keys [account updated-key new-value theme]}]
-  (let [edited-account-data (assoc account updated-key new-value)]
+  [{:keys [theme type value account]}]
+  (let [edited-account-data (assoc account type value)
+        message             (case type
+                              :name  :t/edit-wallet-account-name-updated-message
+                              :color :t/edit-wallet-account-colour-updated-message
+                              :emoji :t/edit-wallet-account-emoji-updated-message
+                              nil)
+        callback            #(rf/dispatch [:toasts/upsert
+                                           {:id         :edit-account
+                                            :icon       :i/correct
+                                            :icon-color (colors/resolve-color :success theme)
+                                            :text       (i18n/label message)}])]
     (rf/dispatch [:wallet/save-account
-                  {:account    edited-account-data
-                   :on-success #(show-save-account-toast updated-key theme)}])))
+                  {:account  edited-account-data
+                   :callback callback}])))
 
 (defn- view-internal
   [{:keys [theme]}]
@@ -38,22 +34,22 @@
         show-confirm-button? (reagent/atom false)
         on-change-color      (fn [edited-color {:keys [color] :as account}]
                                (when (not= edited-color color)
-                                 (save-account {:account     account
-                                                :updated-key :color
-                                                :new-value   edited-color
-                                                :theme       theme})))
+                                 (save-account {:account account
+                                                :type    :color
+                                                :value   edited-color
+                                                :theme   theme})))
         on-change-emoji      (fn [edited-emoji {:keys [emoji] :as account}]
                                (when (not= edited-emoji emoji)
-                                 (save-account {:account     account
-                                                :updated-key :emoji
-                                                :new-value   edited-emoji
-                                                :theme       theme})))
+                                 (save-account {:account account
+                                                :type    :emoji
+                                                :value   edited-emoji
+                                                :theme   theme})))
         on-confirm-name      (fn [account]
                                (rn/dismiss-keyboard!)
-                               (save-account {:account     account
-                                              :updated-key :name
-                                              :new-value   @edited-account-name
-                                              :theme       theme}))]
+                               (save-account {:account account
+                                              :type    :name
+                                              :value   @edited-account-name
+                                              :theme   theme}))]
     (fn []
       (let [{:keys [name emoji address color]
              :as   account}  (rf/sub [:wallet/current-viewing-account])
@@ -86,18 +82,17 @@
            :right-icon      :i/advanced
            :card?           true
            :title           (i18n/label :t/address)
-           :custom-subtitle (fn []
-                              [quo/address-text
-                               {:networks [{:network-name :ethereum :short-name "eth"}
-                                           {:network-name :optimism :short-name "opt"}
-                                           {:network-name :arbitrum :short-name "arb1"}]
-                                :address  address
-                                :format   :long}])
+           :custom-subtitle (fn [] [quo/address-text
+                                    {:networks [{:network-name :ethereum :short-name "eth"}
+                                                {:network-name :optimism :short-name "opt"}
+                                                {:network-name :arbitrum :short-name "arb1"}]
+                                     :address  address
+                                     :format   :long}])
            :on-press        (fn []
                               (rf/dispatch [:show-bottom-sheet
-                                            {:content (fn []
-                                                        [network-preferences/view
-                                                         {:on-save #(js/alert "calling on save")}])}]))
+                                            {:content (fn [] [network-preferences/view
+                                                              {:on-save #(js/alert
+                                                                          "calling on save")}])}]))
            :container-style style/data-item}]]))))
 
 (def view (quo.theme/with-theme view-internal))

src/status_im2/contexts/wallet/events.cljs

@@ -11,7 +11,6 @@
     [taoensso.timbre :as log]
     [utils.ethereum.chain :as chain]
     [utils.i18n :as i18n]
-    [utils.number]
     [utils.re-frame :as rf]
     [utils.security.core :as security]
     [utils.transforms :as types]))
@@ -41,8 +40,7 @@
    {:db (update db :wallet dissoc :current-viewing-account-address)
     :fx [[:dispatch [:navigate-back]]]}))
 
-(rf/reg-event-fx
- :wallet/get-accounts-success
+(rf/reg-event-fx :wallet/get-accounts-success
  (fn [{:keys [db]} [accounts]]
    (let [wallet-db           (get db :wallet)
          new-account?        (:new-account? wallet-db)
@@ -63,8 +61,7 @@
                  {:dispatch [:wallet/navigate-to-account navigate-to-account]
                   :ms       300}]])))))
 
-(rf/reg-event-fx
- :wallet/get-accounts
+(rf/reg-event-fx :wallet/get-accounts
  (fn [_]
    {:fx [[:json-rpc/call
           [{:method     "accounts_getAccounts"
@@ -75,54 +72,35 @@
 
 (rf/reg-event-fx
  :wallet/save-account
- (fn [_ [{:keys [account on-success]}]]
+ (fn [_ [{:keys [account callback]}]]
    {:fx [[:json-rpc/call
           [{:method     "accounts_saveAccount"
             :params     [(data-store/<-account account)]
             :on-success (fn []
                           (rf/dispatch [:wallet/get-accounts])
-                          (when (fn? on-success)
-                            (on-success)))
+                          (when (fn? callback)
+                            (callback)))
             :on-error   #(log/info "failed to save account "
                                    {:error %
                                     :event :wallet/save-account})}]]]}))
 
-(rf/reg-event-fx
- :wallet/get-wallet-token
+(rf/reg-event-fx :wallet/get-wallet-token
  (fn [{:keys [db]}]
-   (let [addresses (->> (get-in db [:wallet :accounts])
-                        vals
-                        (map :address))]
+   (let [addresses (map :address (vals (get-in db [:wallet :accounts])))]
      {:fx [[:json-rpc/call
             [{:method     "wallet_getWalletToken"
               :params     [addresses]
-              :on-success [:wallet/store-wallet-token]
+              :on-success [:wallet/get-wallet-token-success]
               :on-error   #(log/info "failed to get wallet token "
                                      {:error  %
                                       :event  :wallet/get-wallet-token
                                       :params addresses})}]]]})))
 
-(defn- fix-chain-id-keys
-  [token]
-  (update token :balances-per-chain update-keys (comp utils.number/parse-int name)))
-
-(rf/reg-event-fx
- :wallet/store-wallet-token
- (fn [{:keys [db]} [raw-tokens-data]]
-   (let [tokens     (-> raw-tokens-data
-                        (update-keys name)
-                        (update-vals #(cske/transform-keys csk/->kebab-case %))
-                        (update-vals #(mapv fix-chain-id-keys %)))
-         add-tokens (fn [stored-accounts tokens-per-account]
-                      (reduce-kv (fn [accounts address tokens-data]
-                                   (if (accounts address)
-                                     (update accounts address assoc :tokens tokens-data)
-                                     accounts))
-                                 stored-accounts
-                                 tokens-per-account))]
-     {:db (-> db
-              (update-in [:wallet :accounts] add-tokens tokens)
-              (assoc-in [:wallet :ui :tokens-loading?] false))})))
+(rf/reg-event-fx :wallet/get-wallet-token-success
+ (fn [{:keys [db]} [tokens]]
+   {:db (assoc db
+               :wallet/tokens          tokens
+               :wallet/tokens-loading? false)}))
 
 (rf/defn scan-address-success
   {:events [:wallet/scan-address-success]}
@@ -144,8 +122,7 @@
               :on-success on-success
               :on-error   #(log/info "failed to derive address " %)}]]]})))
 
-(rf/reg-event-fx
- :wallet/add-account
+(rf/reg-event-fx :wallet/add-account
  (fn [{:keys [db]} [password {:keys [emoji account-name color]} {:keys [public-key address path]}]]
    (let [key-uid        (get-in db [:profile/profile :key-uid])
          sha3-pwd       (native-module/sha3 (security/safe-unmask-data password))
@@ -169,12 +146,11 @@
               :on-success [:wallet/get-accounts]
               :on-error   #(log/info "failed to create account " %)}]]]})))
 
-(rf/reg-event-fx
- :wallet/derive-address-and-add-account
+(rf/reg-event-fx :wallet/derive-address-and-add-account
  (fn [_ [password account-details]]
-   (let [on-success (fn [derived-address-details]
+   (let [on-success (fn [derived-adress-details]
                       (rf/dispatch [:wallet/add-account password account-details
-                                    (first derived-address-details)]))]
+                                    (first derived-adress-details)]))]
      {:fx [[:dispatch [:wallet/create-derived-addresses password account-details on-success]]]})))
 
 (rf/defn get-ethereum-chains
@@ -223,8 +199,7 @@
 
 (rf/reg-event-fx :wallet/clear-stored-collectibles clear-stored-collectibles)
 
-(rf/reg-event-fx
- :wallet/request-collectibles
+(rf/reg-event-fx :wallet/request-collectibles
  (fn [{:keys [db]} [{:keys [start-at-index new-request?]}]]
    (let [request-id          0
          collectibles-filter nil

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

@@ -8,6 +8,7 @@
     [status-im2.contexts.wallet.common.activity-tab.view :as activity]
     [status-im2.contexts.wallet.common.collectibles-tab.view :as collectibles]
     [status-im2.contexts.wallet.common.temp :as temp]
+    [status-im2.contexts.wallet.common.utils :as utils]
     [status-im2.contexts.wallet.home.style :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
@@ -27,9 +28,9 @@
       :on-press            #(rf/dispatch [:navigate-to :add-address-to-watch])
       :add-divider?        true}]]])
 
-(defn- new-account-card-data
-  []
-  {:customization-color (rf/sub [:profile/customization-color])
+(defn- add-account-placeholder
+  [color]
+  {:customization-color color
    :on-press            #(rf/dispatch [:show-bottom-sheet {:content new-account}])
    :type                :add-account})
 
@@ -38,6 +39,21 @@
    {:id :collectibles :label (i18n/label :t/collectibles) :accessibility-label :collectibles-tab}
    {:id :activity :label (i18n/label :t/activity) :accessibility-label :activity-tab}])
 
+(defn account-cards
+  [{:keys [accounts loading? balances profile-color]}]
+  (let [accounts-with-balances
+        (mapv
+         (fn [{:keys [color address] :as account}]
+           (assoc account
+                  :customization-color color
+                  :type                :empty
+                  :on-press            #(rf/dispatch [:wallet/navigate-to-account address])
+                  :loading?            loading?
+                  :balance             (utils/prettify-balance
+                                        (utils/get-balance-by-address balances address))))
+         accounts)]
+    (conj accounts-with-balances (add-account-placeholder profile-color))))
+
 (defn view
   []
   (rf/dispatch [:wallet/request-collectibles
@@ -46,10 +62,14 @@
   (let [top          (safe-area/get-top)
         selected-tab (reagent/atom (:id (first tabs-data)))]
     (fn []
-      (let [networks           (rf/sub [:wallet/network-details])
-            account-cards-data (rf/sub [:wallet/account-cards-data])
-            cards              (conj account-cards-data (new-account-card-data))]
-        [rn/view {:style {:margin-top top :flex 1}}
+      (let [accounts      (rf/sub [:wallet/accounts])
+            loading?      (rf/sub [:wallet/tokens-loading?])
+            balances      (rf/sub [:wallet/balances])
+            profile-color (rf/sub [:profile/customization-color])
+            networks      (rf/sub [:wallet/network-details])]
+        [rn/view
+         {:style {:margin-top top
+                  :flex       1}}
          [common.top-nav/view]
          [rn/view {:style style/overview-container}
           [quo/wallet-overview (temp/wallet-overview-state networks)]]
@@ -60,7 +80,10 @@
          [rn/flat-list
           {:style                             style/accounts-list
            :content-container-style           style/accounts-list-container
-           :data                              cards
+           :data                              (account-cards {:accounts      accounts
+                                                              :loading?      loading?
+                                                              :balances      balances
+                                                              :profile-color profile-color})
            :horizontal                        true
            :separator                         [rn/view {:style {:width 12}}]
            :render-fn                         quo/account-card

src/status_im2/integration_test/chat.cljs

@@ -1,4 +1,4 @@
-(ns status-im2.integration-test.chat-test
+(ns status-im2.integration-test.chat
   (: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.cljs

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

src/status_im2/integration_test/core.cljs

@@ -1,4 +1,4 @@
-(ns status-im2.integration-test.core-test
+(ns status-im2.integration-test.core
   (:require
     [cljs.test :refer [deftest]]
     [day8.re-frame.test :as rf-test]
@@ -8,14 +8,17 @@
     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.cljs

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

src/status_im2/subs/root.cljs

@@ -145,6 +145,10 @@
 (reg-root-key-sub :communities/selected-tab :communities/selected-tab)
 (reg-root-key-sub :contract-communities :contract-communities)
 
+;;wallet
+(reg-root-key-sub :wallet/tokens :wallet/tokens)
+(reg-root-key-sub :wallet/tokens-loading? :wallet/tokens-loading?)
+
 ;;activity center
 (reg-root-key-sub :activity-center :activity-center)
 

src/status_im2/subs/wallet/wallet.cljs

@@ -1,19 +1,36 @@
 (ns status-im2.subs.wallet.wallet
-  (:require [re-frame.core :as rf]
+  (:require [re-frame.core :as re-frame]
             [status-im2.contexts.wallet.common.utils :as utils]
             [utils.number]))
 
-(rf/reg-sub
- :wallet/ui
- :<- [:wallet]
- :-> :ui)
+(defn- calculate-raw-balance
+  [raw-balance decimals]
+  (if-let [n (utils.number/parse-int raw-balance nil)]
+    (/ n (Math/pow 10 (utils.number/parse-int decimals)))
+    0))
 
-(rf/reg-sub
- :wallet/tokens-loading?
- :<- [:wallet/ui]
- :-> :tokens-loading?)
+(defn- total-per-token
+  [item]
+  (reduce (fn [ac balances]
+            (+ (calculate-raw-balance (:rawBalance balances)
+                                      (:decimals item))
+               ac))
+          0
+          (vals (:balancesPerChain item))))
 
-(rf/reg-sub
+(defn- calculate-balance
+  [address tokens]
+  (let [token  (get tokens (keyword address))
+        result (reduce
+                (fn [acc item]
+                  (let [total-values (* (total-per-token item)
+                                        (get-in item [:marketValuesPerCurrency :USD :price]))]
+                    (+ acc total-values)))
+                0
+                token)]
+    result))
+
+(re-frame/reg-sub
  :wallet/accounts
  :<- [:wallet]
  :-> #(->> %
@@ -21,33 +38,20 @@
            vals
            (sort-by :position)))
 
-(rf/reg-sub
+(re-frame/reg-sub
  :wallet/balances
  :<- [:wallet/accounts]
- (fn [accounts]
-   (zipmap (map :address accounts)
-           (map #(-> % :tokens utils/calculate-balance) accounts))))
+ :<- [:wallet/tokens]
+ (fn [[accounts tokens]]
+   (for [{:keys [address]} accounts]
+     {:address address
+      :balance (calculate-balance address tokens)})))
 
-(rf/reg-sub
- :wallet/account-cards-data
- :<- [:wallet/accounts]
- :<- [:wallet/balances]
- :<- [:wallet/tokens-loading?]
- (fn [[accounts balances tokens-loading?]]
-   (mapv (fn [{:keys [color address] :as account}]
-           (assoc account
-                  :customization-color color
-                  :type                :empty
-                  :on-press            #(rf/dispatch [:wallet/navigate-to-account address])
-                  :loading?            tokens-loading?
-                  :balance             (utils/prettify-balance (get balances address))))
-         accounts)))
-
-(rf/reg-sub
+(re-frame/reg-sub
  :wallet/current-viewing-account
  :<- [:wallet]
  :<- [:wallet/balances]
  (fn [[{:keys [current-viewing-account-address] :as wallet} balances]]
    (-> wallet
        (get-in [:accounts current-viewing-account-address])
-       (assoc :balance (get balances current-viewing-account-address)))))
+       (assoc :balance (utils/get-balance-by-address balances current-viewing-account-address)))))

src/status_im2/subs/wallet/wallet_test.cljs

@@ -8,35 +8,43 @@
 (use-fixtures :each
               {:before #(reset! rf-db/app-db {})})
 
-(def tokens-0x1
-  [{:decimals                   1
-    :symbol                     "ETH"
-    :name                       "Ether"
-    :balances-per-chain         {1 {:raw-balance "20" :has-error false}
-                                 2 {:raw-balance "10" :has-error false}}
-    :market-values-per-currency {:usd {:price 1000}}}
-   {:decimals                   2
-    :symbol                     "DAI"
-    :name                       "Dai Stablecoin"
-    :balances-per-chain         {1 {:raw-balance "100" :has-error false}
-                                 2 {:raw-balance "150" :has-error false}}
-    :market-values-per-currency {:usd {:price 100}}}])
-
-(def tokens-0x2
-  [{:decimals                   3
-    :symbol                     "ETH"
-    :name                       "Ether"
-    :balances-per-chain         {1 {:raw-balance "2500" :has-error false}
-                                 2 {:raw-balance "3000" :has-error false}
-                                 3 {:raw-balance "<nil>" :has-error false}}
-    :market-values-per-currency {:usd {:price 200}}}
-   {:decimals                   10
-    :symbol                     "DAI"
-    :name                       "Dai Stablecoin"
-    :balances-per-chain         {1 {:raw-balance "10000000000" :has-error false}
-                                 2 {:raw-balance "0" :has-error false}
-                                 3 {:raw-balance "<nil>" :has-error false}}
-    :market-values-per-currency {:usd {:price 1000}}}])
+(def tokens
+  {:0x1 [{:decimals                1
+          :symbol                  "ETH"
+          :name                    "Ether"
+          :balancesPerChain        {:1 {:rawBalance "20"
+                                        :hasError   false}
+                                    :2 {:rawBalance "10"
+                                        :hasError   false}}
+          :marketValuesPerCurrency {:USD {:price 1000}}} ;; total should be 3000
+         {:decimals                2
+          :symbol                  "DAI"
+          :name                    "Dai Stablecoin"
+          :balancesPerChain        {:1 {:rawBalance "100"
+                                        :hasError   false}
+                                    :2 {:rawBalance "150"
+                                        :hasError   false}}
+          :marketValuesPerCurrency {:USD {:price 100}}}] ;; total should be 250
+   :0x2 [{:decimals                3
+          :symbol                  "ETH"
+          :name                    "Ether"
+          :balancesPerChain        {:1 {:rawBalance "2500"
+                                        :hasError   false}
+                                    :2 {:rawBalance "3000"
+                                        :hasError   false}
+                                    :3 {:rawBalance "<nil>"
+                                        :hasError   false}}
+          :marketValuesPerCurrency {:USD {:price 200}}} ;; total should be 1100
+         {:decimals                10
+          :symbol                  "DAI"
+          :name                    "Dai Stablecoin"
+          :balancesPerChain        {:1 {:rawBalance "10000000000"
+                                        :hasError   false}
+                                    :2 {:rawBalance "0"
+                                        :hasError   false}
+                                    :3 {:rawBalance "<nil>"
+                                        :hasError   false}}
+          :marketValuesPerCurrency {:USD {:price 1000}}}]}) ;; total should be 1000
 
 (def accounts
   {"0x1" {:path                     "m/44'/60'/0'/0/0"
@@ -57,8 +65,7 @@
           :operable                 "fully"
           :mixedcase-address        "0x7bcDfc75c431"
           :public-key               "0x04371e2d9d66b82f056bc128064"
-          :removed                  false
-          :tokens                   tokens-0x1}
+          :removed                  false}
    "0x2" {:path                     "m/44'/60'/0'/0/1"
           :emoji                    "💎"
           :key-uid                  "0x2f5ea39"
@@ -77,63 +84,66 @@
           :operable                 "fully"
           :mixedcase-address        "0x7bcDfc75c431"
           :public-key               "0x04371e2d9d66b82f056bc128064"
-          :removed                  false
-          :tokens                   tokens-0x2}})
+          :removed                  false}})
 
 (h/deftest-sub :wallet/balances
   [sub-name]
-  (testing "a map: address->balance"
-    (swap! rf-db/app-db #(assoc-in % [:wallet :accounts] accounts))
-
-    (is (= {"0x1" 3250 "0x2" 2100}
+  (testing "returns seq of maps containing :address and :balance"
+    (swap! rf-db/app-db #(-> %
+                             (assoc-in [:wallet :accounts] accounts)
+                             (assoc :wallet/tokens tokens)))
+    (is (= `({:address "0x1"
+              :balance 3250}
+             {:address "0x2"
+              :balance 2100})
            (rf/sub [sub-name])))))
 
 (h/deftest-sub :wallet/accounts
   [sub-name]
   (testing "returns all accounts without balance"
-    (swap! rf-db/app-db #(assoc-in % [:wallet :accounts] accounts))
-
+    (swap! rf-db/app-db
+      #(-> %
+           (assoc-in [:wallet :accounts] accounts)
+           (assoc :wallet/tokens tokens)))
     (is
-     (= (list {:path                     "m/44'/60'/0'/0/0"
-               :emoji                    "😃"
-               :key-uid                  "0x2f5ea39"
-               :address                  "0x1"
-               :wallet                   false
-               :name                     "Account One"
-               :type                     :generated
-               :chat                     false
-               :test-preferred-chain-ids #{5 420 421613}
-               :color                    :blue
-               :hidden                   false
-               :prod-preferred-chain-ids #{1 10 42161}
-               :position                 0
-               :clock                    1698945829328
-               :created-at               1698928839000
-               :operable                 "fully"
-               :mixedcase-address        "0x7bcDfc75c431"
-               :public-key               "0x04371e2d9d66b82f056bc128064"
-               :removed                  false
-               :tokens                   tokens-0x1}
-              {:path                     "m/44'/60'/0'/0/1"
-               :emoji                    "💎"
-               :key-uid                  "0x2f5ea39"
-               :address                  "0x2"
-               :wallet                   false
-               :name                     "Account Two"
-               :type                     :generated
-               :chat                     false
-               :test-preferred-chain-ids #{5 420 421613}
-               :color                    :purple
-               :hidden                   false
-               :prod-preferred-chain-ids #{1 10 42161}
-               :position                 1
-               :clock                    1698945829328
-               :created-at               1698928839000
-               :operable                 "fully"
-               :mixedcase-address        "0x7bcDfc75c431"
-               :public-key               "0x04371e2d9d66b82f056bc128064"
-               :removed                  false
-               :tokens                   tokens-0x2})
+     (= `({:path                     "m/44'/60'/0'/0/0"
+           :emoji                    "😃"
+           :key-uid                  "0x2f5ea39"
+           :address                  "0x1"
+           :wallet                   false
+           :name                     "Account One"
+           :type                     :generated
+           :chat                     false
+           :test-preferred-chain-ids #{5 420 421613}
+           :color                    :blue
+           :hidden                   false
+           :prod-preferred-chain-ids #{1 10 42161}
+           :position                 0
+           :clock                    1698945829328
+           :created-at               1698928839000
+           :operable                 "fully"
+           :mixedcase-address        "0x7bcDfc75c431"
+           :public-key               "0x04371e2d9d66b82f056bc128064"
+           :removed                  false}
+          {:path                     "m/44'/60'/0'/0/1"
+           :emoji                    "💎"
+           :key-uid                  "0x2f5ea39"
+           :address                  "0x2"
+           :wallet                   false
+           :name                     "Account Two"
+           :type                     :generated
+           :chat                     false
+           :test-preferred-chain-ids #{5 420 421613}
+           :color                    :purple
+           :hidden                   false
+           :prod-preferred-chain-ids #{1 10 42161}
+           :position                 1
+           :clock                    1698945829328
+           :created-at               1698928839000
+           :operable                 "fully"
+           :mixedcase-address        "0x7bcDfc75c431"
+           :public-key               "0x04371e2d9d66b82f056bc128064"
+           :removed                  false})
         (rf/sub [sub-name])))))
 
 (h/deftest-sub :wallet/current-viewing-account
@@ -142,8 +152,8 @@
     (swap! rf-db/app-db
       #(-> %
            (assoc-in [:wallet :accounts] accounts)
-           (assoc-in [:wallet :current-viewing-account-address] "0x1")))
-
+           (assoc-in [:wallet :current-viewing-account-address] "0x1")
+           (assoc :wallet/tokens tokens)))
     (is
      (= {:path                     "m/44'/60'/0'/0/0"
          :emoji                    "😃"
@@ -164,6 +174,5 @@
          :mixedcase-address        "0x7bcDfc75c431"
          :public-key               "0x04371e2d9d66b82f056bc128064"
          :removed                  false
-         :balance                  3250
-         :tokens                   tokens-0x1}
+         :balance                  3250}
         (rf/sub [sub-name])))))

src/test_helpers/integration.clj

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

src/test_helpers/integration.cljs

@@ -1,5 +1,4 @@
 (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": "fix/shards-pubsub-topic",
-    "commit-sha1": "e7d9f59db4ccbf2c301d5b8dd705943be8c73097",
-    "src-sha256": "0hwy10ycjgbh332h1fl5hyw8j9nds0idqk980svaj76ckgsi7dlv"
+    "version": "debug/revert-logout",
+    "commit-sha1": "cdb4bb30af634776cafaed25f1586684ffe39ed9",
+    "src-sha256": "1zcxfk07ldllmwv7vr9ki1w2lgx3jd6i5kw8mq5c3pgiclw84gn5"
 }

test/appium/tests/conftest.py

@@ -1,7 +1,7 @@
 import os
 import re
 import signal
-import requests
+import urllib.request
 from contextlib import contextmanager
 from dataclasses import dataclass
 from datetime import datetime
@@ -161,57 +161,6 @@ 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
@@ -231,49 +180,75 @@ 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':
-        return
+    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)
 
-    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
+                            signal.signal(signal.SIGALRM, signal_handler)
+                            signal.alarm(seconds)
+                            try:
+                                yield
+                            finally:
+                                signal.alarm(0)
 
-    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 _upload_time_limit(600):
+                            class UploadApkException(Exception):
+                                pass
 
-    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'
-        )
+                            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 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
+                    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
 
-        _upload_and_check_response_with_retries(apk_path)
-        if apk_src.startswith('http'):
-            os.remove(apk_path)
+                    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)
 
 
 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") # ToDo: temp
+        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.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.wait_and_click()
+        self.sign_in.show_profiles_button.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.wait_and_click()
+        self.sign_in.show_profiles_button.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.wait_and_click()
+        self.sign_in.show_profiles_button.click()
         if self.sign_in.element_by_text(self.username).is_element_displayed():
             self.errors.append("Removed user is re-appeared after relogin!")