Merge branch 'develop' into 15563

Fix https://github.com/status-im/status-mobile/issues/15592

Notes:

- The red border around the icon has been reported in issue
  https://github.com/status-im/status-mobile/issues/15606
- The loading state doesn't have a spinning icon on purpose. This will be done
  separately.

nix/deps/nodejs-patched/default.nix

@@ -12,6 +12,7 @@ stdenv.mkDerivation {
     "patchBuildIdPhase"
     "patchHermesPhase"
     "patchJavaPhase"
+    "patchYogaNodePackagePhase"
     "installPhase"
   ];
 
@@ -66,6 +67,14 @@ stdenv.mkDerivation {
   patchJavaPhase = ''
     ${nodejs}/bin/node ./node_modules/jetifier/bin/jetify
   '';
+  # Patch React Native Yoga.cpp file
+  # FIXME: Remove this once release newer than 1.19.0 is used which includes:
+  # https://github.com/facebook/yoga/commit/f174de70
+  patchYogaNodePackagePhase = ''
+    substituteInPlace ./node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp --replace \
+        'node->getLayout().hadOverflow() |' \
+        'node->getLayout().hadOverflow() ||'
+  '';
   installPhase = ''
     mkdir -p $out
     cp -R node_modules $out/

nix/overlay.nix

@@ -53,9 +53,9 @@ in {
     version = "13.3";
     allowHigher = true;
   };
-  go = super.go_1_18;
-  buildGoPackage = super.buildGo118Package;
-  buildGoModule = super.buildGo118Module;
+  go = super.go_1_19;
+  buildGoPackage = super.buildGo119Package;
+  buildGoModule = super.buildGo119Module;
   gomobile = (super.gomobile.overrideAttrs (old: {
     patches = self.fetchurl { # https://github.com/golang/mobile/pull/84
       url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch";

nix/pkgs.nix

@@ -11,10 +11,11 @@ let
   # We follow the master branch of official nixpkgs.
   nixpkgsSrc = fetchFromGitHub {
     name = "nixpkgs-source";
-    owner = "status-im"; # FIXME: Fork used to get Cocoapods 1.12.0.
+    # FIXME: Fork used to get Cocoapods 1.12.0 and apksigner macOS build.
+    owner = "status-im";
     repo = "nixpkgs";
-    rev = "b9b2ed705edc00003d47625950602136be3e1ed5";
-    sha256 = "sha256-F0qOawdKx7kgiGqwVikYIawL2taJ1XfcgHy0Wn0mho8=";
+    rev = "d0c06fa3d3982a91aa01bd63ed84020cbde3d3ab";
+    sha256 = "sha256-8blvuUHnuf0hFr/PpBxVohJp5CaGXIXhgJlFN/cv7us=";
     # To get the compressed Nix sha256, use:
     # nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz
   };

src/js/worklets/bottom_sheet.js

@@ -6,10 +6,10 @@ export function useTranslateY(initialTranslationY, bottomSheetDy, panY) {
   })
 }
 
-export function useBackgroundOpacity(translateY, backgroundHeight, windowHeight) {
+export function useBackgroundOpacity(translateY, backgroundHeight, windowHeight, opacity) {
   return useDerivedValue(() => {
-    const opacity = ((translateY.value - windowHeight) / -backgroundHeight) * 0.5
+    const calculatedOpacity = ((translateY.value - windowHeight) / -backgroundHeight) * opacity
 
-    return Math.max(Math.min(opacity, 0.5), 0)
+    return Math.max(Math.min(calculatedOpacity, opacity), 0)
   })
 }

src/quo2/components/code/code/style.cljs

@@ -0,0 +1,87 @@
+(ns quo2.components.code.code.style
+  (:require [quo2.foundations.colors :as colors]))
+
+;; Example themes:
+;; https://github.com/react-syntax-highlighter/react-syntax-highlighter/tree/master/src/styles/hljs
+(defn theme
+  [theme-key]
+  (case theme-key
+    :hljs-comment (colors/theme-colors colors/neutral-40 colors/neutral-60)
+    :hljs-title   (colors/custom-color-by-theme :sky 50 60)
+    :hljs-keyword (colors/custom-color-by-theme :green 50 60)
+    :hljs-string  (colors/custom-color-by-theme :turquoise 50 60)
+    :hljs-literal (colors/custom-color-by-theme :turquoise 50 60)
+    :hljs-number  (colors/custom-color-by-theme :turquoise 50 60)
+    :line-number  colors/neutral-40
+    nil))
+
+(defn text-style
+  [class-names]
+  (let [text-color (->> class-names
+                        (map keyword)
+                        (some (fn [class-name]
+                                (when-let [text-color (theme class-name)]
+                                  text-color))))]
+    (cond-> {:flex-shrink 1
+             :line-height 18}
+      text-color (assoc :color text-color))))
+
+(defn border-color
+  []
+  (colors/theme-colors colors/neutral-20 colors/neutral-80))
+
+(defn container
+  []
+  {:overflow         :hidden
+   :padding          8
+   :background-color (colors/theme-colors colors/white colors/neutral-80-opa-40)
+   :border-color     (border-color)
+   :border-width     1
+   :border-radius    16})
+
+(def gradient-container
+  {:position :absolute
+   :bottom   0
+   :left     0
+   :right    0
+   :z-index  1})
+
+(def gradient {:height 48})
+
+(defn line-number-container
+  [line-number-width]
+  {:position         :absolute
+   :bottom           0
+   :top              0
+   :left             0
+   :width            (+ line-number-width 8 7)
+   :background-color (colors/theme-colors colors/neutral-5 colors/neutral-80)})
+
+(defn divider
+  [line-number-width]
+  {:position         :absolute
+   :bottom           0
+   :top              0
+   :left             (+ line-number-width 7 7)
+   :width            1
+   :z-index          2
+   :background-color (border-color)})
+
+(def line {:flex-direction :row})
+
+(defn line-number
+  [width]
+  {:margin-right 20 ; 8+12 margin
+   :width        width})
+
+(def copy-button
+  {:position :absolute
+   :bottom   8
+   :right    8
+   :z-index  1})
+
+(defn gradient-color [] (colors/theme-colors colors/white colors/neutral-80))
+
+(defn button-background-color
+  []
+  (colors/theme-colors colors/neutral-80-opa-5 colors/white-opa-5))

src/quo2/components/code/snippet.cljs

@@ -1,175 +1,110 @@
 (ns quo2.components.code.snippet
   (:require [cljs-bean.core :as bean]
             [clojure.string :as string]
-            [oops.core :as oops]
             [quo2.components.buttons.button :as button]
+            [quo2.components.code.code.style :as style]
             [quo2.components.markdown.text :as text]
-            [quo2.foundations.colors :as colors]
-            [quo2.theme :as theme]
             [react-native.core :as rn]
             [react-native.linear-gradient :as linear-gradient]
-            [react-native.masked-view :as masked-view]
             [react-native.syntax-highlighter :as highlighter]
             [reagent.core :as reagent]))
 
-;; Example themes:
-;; https://github.com/react-syntax-highlighter/react-syntax-highlighter/tree/master/src/styles/hljs
-(def ^:private themes
-  {:light {:hljs-comment {:color colors/neutral-40}
-           :hljs-title   {:color (colors/custom-color :blue 50)}
-           :hljs-keyword {:color (colors/custom-color :green 50)}
-           :hljs-string  {:color (colors/custom-color :turquoise 50)}
-           :hljs-literal {:color (colors/custom-color :turquoise 50)}
-           :hljs-number  {:color (colors/custom-color :turquoise 50)}
-           :line-number  {:color colors/neutral-40}}
-   :dark  {:hljs-comment {:color colors/neutral-60}
-           :hljs-title   {:color (colors/custom-color :blue 60)}
-           :hljs-keyword {:color (colors/custom-color :green 60)}
-           :hljs-string  {:color (colors/custom-color :turquoise 60)}
-           :hljs-literal {:color (colors/custom-color :turquoise 60)}
-           :hljs-number  {:color (colors/custom-color :turquoise 60)}
-           :line-number  {:color colors/neutral-40}}})
-
-(defn- text-style
-  [class-names]
-  (->> class-names
-       (map keyword)
-       (reduce #(merge %1 (get-in themes [(theme/get-theme) %2]))
-               {:flex-shrink 1
-                ;; Round to a nearest whole number to achieve consistent
-                ;; spacing (also important for calculating `max-text-height`).
-                ;; Line height seems to be inconsistent between text being
-                ;; wrapped and text being rendered on a newline using Flexbox
-                ;; layout.
-                :line-height 18})))
-
 (defn- render-nodes
   [nodes]
-  (map (fn [{:keys [children value] :as node}]
-         ;; Node can have :children or a :value.
+  (map (fn [{:keys [children value last-line?] :as node}]
          (if children
            (into [text/text
-                  {:weight :code
-                   :size   :paragraph-2
-                   :style  (text-style (get-in node [:properties :className]))}]
+                  (cond-> {:weight :code
+                           :size   :paragraph-2
+                           :style  (style/text-style (get-in node [:properties :className]))}
+                    last-line? (assoc :number-of-lines 1))]
                  (render-nodes children))
            ;; Remove newlines as we already render each line separately.
-           (-> value string/trim-newline)))
+           (string/trim-newline value)))
        nodes))
 
+(defn- line
+  [{:keys [line-number line-number-width]} children]
+  [rn/view {:style style/line}
+   [rn/view {:style (style/line-number line-number-width)}
+    [text/text
+     {:style  (style/text-style ["line-number"])
+      :weight :code
+      :size   :paragraph-2}
+     line-number]]
+   children])
+
 (defn- code-block
   [{:keys [rows line-number-width]}]
-  [into [:<>]
+  [rn/view
    (->> rows
         (render-nodes)
-        ;; Line numbers
-        (map-indexed (fn [idx row]
-                       (conj [rn/view {:style {:flex-direction :row}}
-                              [rn/view
-                               {:style {:width        line-number-width
-                                        ;; 8+12 margin
-                                        :margin-right 20}}
-                               [text/text
-                                {:weight :code
-                                 :size   :paragraph-2
-                                 :style  (text-style ["line-number"])}
-                                (inc idx)]]]
-                             row))))])
+        (map-indexed (fn [idx row-content]
+                       [line
+                        {:line-number       (inc idx)
+                         :line-number-width line-number-width}
+                        row-content]))
+        (into [:<>]))])
+
+(defn- mask-view
+  [{:keys [apply-mask?]} child]
+  (if apply-mask?
+    [:<>
+     [rn/view {:style style/gradient-container}
+      [linear-gradient/linear-gradient
+       {:style  style/gradient
+        :colors [:transparent (style/gradient-color)]}
+       [rn/view {:style style/gradient}]]]
+     child]
+    child))
+
+(defn- calc-line-number-width
+  [font-scale rows-to-show]
+  (let [max-line-digits (-> rows-to-show str count)]
+    (if (= 1 max-line-digits)
+      18 ;; ~ 9 is char width, 18 is width used in Figma.
+      (* 9 max-line-digits font-scale))))
 
 (defn- native-renderer
-  []
-  (let [text-height (reagent/atom nil)]
-    (fn [{:keys [rows max-lines on-copy-press]}]
-      (let [background-color      (colors/theme-colors
-                                   colors/white
-                                   colors/neutral-80-opa-40)
-            background-color-left (colors/theme-colors
-                                   colors/neutral-5
-                                   colors/neutral-80)
-            border-color          (colors/theme-colors
-                                   colors/neutral-20
-                                   colors/neutral-80)
-            rows                  (bean/->clj rows)
-            font-scale            (:font-scale (rn/use-window-dimensions))
-            max-rows              (or max-lines (count rows)) ;; Cut down on rows to process.
-            max-line-digits       (-> rows count (min max-rows) str count)
-            ;; ~ 9 is char width, 18 is width used in Figma.
-            line-number-width     (* font-scale (max 18 (* 9 max-line-digits)))
-            max-text-height       (some-> max-lines
-                                          (* font-scale 18)) ;; 18 is font's line height.
-            truncated?            (and max-text-height (< max-text-height @text-height))
-            maybe-mask-wrapper    (if truncated?
-                                    [masked-view/masked-view
-                                     {:mask-element
-                                      (reagent/as-element
-                                       [linear-gradient/linear-gradient
-                                        {:colors    ["black" "transparent"]
-                                         :locations [0.75 1]
-                                         :style     {:flex 1}}])}]
-                                    [:<>])]
-
-        [rn/view
-         {:style {:overflow         :hidden
-                  :padding          8
-                  :background-color background-color
-                  :border-color     border-color
-                  :border-width     1
-                  :border-radius    8
-                  ;; Hide on intial render to avoid flicker when mask-wrapper is shown.
-                  :opacity          (if @text-height 1 0)}}
-         ;; Line number container
-         [rn/view
-          {:style {:position           :absolute
-                   :bottom             0
-                   :top                0
-                   :left               0
-                   :width              (+ line-number-width 8 8)
-                   :background-color   background-color-left
-                   :border-right-color border-color
-                   :border-right-width 1}}]
-         (conj maybe-mask-wrapper
-               [rn/view {:max-height max-text-height}
-                [rn/view
-                 {:on-layout (fn [evt]
-                               (let [height (oops/oget evt "nativeEvent.layout.height")]
-                                 (reset! text-height height)))}
-                 [code-block
-                  {:rows              (take max-rows rows)
-                   :line-number-width line-number-width}]]])
-
-         ;; Copy button
-         [rn/view
-          {:style {:position :absolute
-                   :bottom   8
-                   :right    8}}
-          [button/button
-           {:icon     true
-            :type     :grey
-            :size     24
-            :on-press on-copy-press}
-           :main-icons/copy]]]))))
-
-(defn- wrap-renderer-fn
-  [f {:keys [max-lines on-copy-press]}]
-  (fn [^js props]
-    (reagent/as-element [:f> f
-                         {:rows          (.-rows props)
-                          :max-lines     max-lines
-                          :on-copy-press on-copy-press}])))
+  [{:keys [rows max-lines on-copy-press]
+    :or   {max-lines ##Inf}}]
+  (let [font-scale          (:font-scale (rn/use-window-dimensions))
+        total-rows          (count rows)
+        number-rows-to-show (min (count rows) max-lines)
+        line-number-width   (calc-line-number-width font-scale number-rows-to-show)
+        truncated?          (< number-rows-to-show total-rows)
+        rows-to-show-coll   (if truncated?
+                              (as-> rows $
+                                (update $ number-rows-to-show assoc :last-line? true)
+                                (take (inc number-rows-to-show) $))
+                              rows)]
+    [rn/view {:style (style/container)}
+     [rn/view {:style (style/line-number-container line-number-width)}]
+     [rn/view {:style (style/divider line-number-width)}]
+     [mask-view {:apply-mask? truncated?}
+      [code-block
+       {:rows              rows-to-show-coll
+        :line-number-width line-number-width}]]
+     [rn/view {:style style/copy-button}
+      [button/button
+       {:icon                      true
+        :type                      :grey
+        :size                      24
+        :on-press                  on-copy-press
+        :override-background-color (style/button-background-color)}
+       :main-icons/copy]]]))
 
 (defn snippet
   [{:keys [language max-lines on-copy-press]} children]
   [highlighter/highlighter
    {:language          language
-    :renderer          (wrap-renderer-fn
-                        native-renderer
-                        {:max-lines     max-lines
-                         :on-copy-press #(when on-copy-press
-                                           (on-copy-press children))})
-    ;; Default props to adapt Highlighter for react-native.
-    ;;:CodeTag           react-native/View
-    ;;:PreTag            react-native/View
+    :renderer          (fn [^js/Object props]
+                         (reagent/as-element
+                          [:f> native-renderer
+                           {:rows          (-> props .-rows bean/->clj)
+                            :on-copy-press #(when on-copy-press (on-copy-press children))
+                            :max-lines     max-lines}]))
     :show-line-numbers false
-    :style             #js {}
-    :custom-style      #js {:backgroundColor nil}}
+    :style             {}
+    :custom-style      {:background-color nil}}
    children])

src/quo2/components/common/unread_grey_dot/view.cljs

@@ -3,6 +3,7 @@
             [quo2.components.common.unread-grey-dot.style :as style]))
 
 (defn unread-grey-dot
-  []
+  [accessibility-label]
   [rn/view
-   {:style style/unread-grey-dot}])
+   (cond-> {:style style/unread-grey-dot}
+     accessibility-label (assoc :accessibility-label accessibility-label :accessible true))])

src/quo2/components/community/community_list_view.cljs

@@ -27,7 +27,7 @@
     [counter/counter {:type :default} unread-mentions-count]
 
     unread-messages?
-    [unread-grey-dot]))
+    [unread-grey-dot :unviewed-messages-public]))
 
 (defn communities-list-view-item
   [props

src/quo2/components/links/url_preview/component_spec.cljs

@@ -0,0 +1,29 @@
+(ns quo2.components.links.url-preview.component-spec
+  (:require
+    [quo2.components.links.url-preview.view :as view]
+    [test-helpers.component :as h]))
+
+(h/describe "Links - URL Preview"
+  (h/test "default render"
+    (h/render [view/view])
+    (h/is-truthy (h/query-by-label-text :title))
+    (h/is-truthy (h/query-by-label-text :logo))
+    (h/is-truthy (h/query-by-label-text :button-clear-preview))
+    (h/is-null (h/query-by-label-text :url-preview-loading)))
+
+  (h/test "on-clear event"
+    (let [on-clear (h/mock-fn)]
+      (h/render [view/view {:on-clear on-clear}])
+      (h/fire-event :press (h/get-by-label-text :button-clear-preview))
+      (h/was-called on-clear)))
+
+  (h/describe "loading state"
+    (h/test "shows a loading container"
+      (h/render [view/view {:loading? true :loading-message "Hello"}])
+      (h/is-null (h/query-by-label-text :title))
+      (h/is-truthy (h/query-by-label-text :url-preview-loading)))
+
+    (h/test "renders if `loading-message` is not passed"
+      (h/render [view/view {:loading? true}])
+      (h/is-null (h/query-by-label-text :title))
+      (h/is-truthy (h/query-by-label-text :url-preview-loading)))))

src/quo2/components/links/url_preview/style.cljs

@@ -0,0 +1,58 @@
+(ns quo2.components.links.url-preview.style
+  (:require [quo2.foundations.colors :as colors]))
+
+(def horizontal-padding 12)
+
+(defn container
+  []
+  {:height             56
+   :background-color   (colors/theme-colors colors/neutral-5 colors/neutral-90)
+   :padding-vertical   10
+   :padding-horizontal horizontal-padding
+   :border-radius      12
+   :align-self         :stretch
+   :flex-direction     :row})
+
+(defn loading-container
+  []
+  {:height          56
+   :border-width    1
+   :border-radius   12
+   :border-style    :dashed
+   :align-items     :center
+   :justify-content :center
+   :align-self      :stretch
+   :padding         horizontal-padding
+   :border-color    (colors/theme-colors colors/neutral-30 colors/neutral-80)})
+
+(defn loading-message
+  []
+  {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)})
+
+(def logo
+  {:width         16
+   :height        16
+   :top           1
+   :border-radius 8})
+
+(def content-container
+  {:margin-left 6
+   :flex        1})
+
+(defn title
+  []
+  {:color (colors/theme-colors colors/neutral-100 colors/white)})
+
+(defn body
+  []
+  {:text-transform :lowercase
+   :color          (colors/theme-colors colors/neutral-50 colors/neutral-40)})
+
+(def clear-button
+  {:border-color colors/danger-50
+   :border-width 1})
+
+(def clear-button-container
+  {:width       20
+   :height      20
+   :margin-left 6})

src/quo2/components/links/url_preview/view.cljs

@@ -0,0 +1,63 @@
+(ns quo2.components.links.url-preview.view
+  (:require
+    [quo2.components.icon :as icon]
+    [quo2.components.links.url-preview.style :as style]
+    [quo2.components.markdown.text :as text]
+    [quo2.foundations.colors :as colors]
+    [react-native.core :as rn]))
+
+(defn- logo-component
+  [{:keys [logo]}]
+  [rn/image
+   {:accessibility-label :logo
+    :source              logo
+    :style               style/logo}])
+
+(defn- content
+  [{:keys [title body]}]
+  [rn/view {:style style/content-container}
+   [text/text
+    {:accessibility-label :title
+     :size                :paragraph-2
+     :weight              :semi-bold
+     :number-of-lines     1
+     :style               (style/title)}
+    title]
+   [text/text
+    {:accessibility-label :body
+     :size                :paragraph-2
+     :weight              :medium
+     :number-of-lines     1
+     :style               (style/body)}
+    body]])
+
+(defn- clear-button
+  [{:keys [on-press]}]
+  [rn/touchable-opacity
+   {:on-press            on-press
+    :style               style/clear-button-container
+    :hit-slop            {:top 3 :right 3 :bottom 3 :left 3}
+    :accessibility-label :button-clear-preview}
+   [icon/icon :i/clear
+    {:size            20
+     :container-style style/clear-button
+     :color           (colors/theme-colors colors/neutral-50 colors/neutral-60)}]])
+
+(defn view
+  [{:keys [title body logo on-clear loading? loading-message container-style]}]
+  (if loading?
+    [rn/view
+     {:accessibility-label :url-preview-loading
+      :style               (merge (style/loading-container) container-style)}
+     [rn/text
+      {:size            :paragraph-2
+       :weight          :medium
+       :number-of-lines 1
+       :style           (style/loading-message)}
+      loading-message]]
+    [rn/view
+     {:accessibility-label :url-preview
+      :style               (merge (style/container) container-style)}
+     [logo-component {:logo logo}]
+     [content {:title title :body body}]
+     [clear-button {:on-press on-clear}]]))

src/quo2/components/list_items/channel.cljs

@@ -62,4 +62,4 @@
                 (not muted?)
                 (not (pos? (int mentions-count)))
                 unread-messages?)
-       [unread-grey-dot])]]])
+       [unread-grey-dot :unviewed-messages-public])]]])

src/quo2/components/tags/status_tags.cljs

@@ -11,12 +11,14 @@
 
 (def small-container-style
   (merge default-container-style
-         {:padding-horizontal 8
+         {:min-height         24
+          :padding-horizontal 8
           :padding-vertical   1}))
 
 (def large-container-style
   (merge default-container-style
-         {:padding-horizontal 11
+         {:min-height         32
+          :padding-horizontal 11
           :padding-vertical   4}))
 
 (defn base-tag
@@ -36,6 +38,7 @@
         :style               (assoc (if (= size :small)
                                       small-container-style
                                       large-container-style)
+                                    :align-self       :flex-start
                                     :border-width     1
                                     :border-color     border-color
                                     :background-color background-color)}
@@ -45,10 +48,11 @@
         [rn/view
          {:style {:justify-content :center
                   :align-items     :center}}
-         [icon/icon
-          icon
-          {:no-color true
-           :size     (if (= size :large) 20 12)}]]
+         (when icon
+           [icon/icon
+            icon
+            {:no-color true
+             :size     (if (= size :large) 20 12)}])]
         [text/text
          {:size   paragraph-size
           :weight :medium
@@ -56,11 +60,11 @@
                    :color        text-color}} label]]])))
 
 (defn- positive
-  [size theme label _]
+  [size theme label _ no-icon?]
   [base-tag
    {:accessibility-label :status-tag-positive
     :size                size
-    :icon                :i/positive-state
+    :icon                (when-not no-icon? :i/positive-state)
     :background-color    colors/success-50-opa-10
     :border-color        colors/success-50-opa-20
     :label               label
@@ -68,11 +72,11 @@
     :text-color          (if (= theme :dark) colors/success-60 colors/success-50)}])
 
 (defn- negative
-  [size theme label _]
+  [size theme label _ no-icon?]
   [base-tag
    {:accessibility-label :status-tag-negative
     :size                size
-    :icon                :i/negative-state
+    :icon                (when-not no-icon? :i/negative-state)
     :background-color    colors/danger-50-opa-10
     :border-color        colors/danger-50-opa-20
     :label               label
@@ -80,14 +84,15 @@
     :text-color          (if (= theme :light) colors/danger-50 colors/danger-60)}])
 
 (defn- pending
-  [size theme label blur?]
+  [size theme label blur? no-icon?]
   [base-tag
    {:accessibility-label :status-tag-pending
     :size                size
     :label               label
-    :icon                (if blur?
-                           :i/pending-dark-blur
-                           (if (= theme :light) :i/pending-light :i/pending-dark))
+    :icon                (when-not no-icon?
+                           (if blur?
+                             :i/pending-dark-blur
+                             (if (= theme :light) :i/pending-light :i/pending-dark)))
     :background-color    (if blur?
                            colors/white-opa-5
                            (colors/theme-colors colors/neutral-10 colors/neutral-80-opa-40 theme))
@@ -100,7 +105,7 @@
                            (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))}])
 
 (defn status-tag
-  [{:keys [status size override-theme label blur?]}]
+  [{:keys [status size override-theme label blur? no-icon?]}]
   (when status
     (when-let [status-component (case (:type status)
                                   :positive positive
@@ -111,4 +116,5 @@
        size
        (or override-theme (quo2.theme/get-theme))
        label
-       blur?])))
+       blur?
+       no-icon?])))

src/quo2/core.cljs

@@ -33,6 +33,7 @@
     quo2.components.inputs.input.view
     quo2.components.inputs.title-input.view
     quo2.components.inputs.profile-input.view
+    quo2.components.links.url-preview.view
     quo2.components.list-items.channel
     quo2.components.list-items.menu-item
     quo2.components.list-items.preview-list
@@ -182,3 +183,6 @@
 (def permission-tag quo2.components.tags.permission-tag/tag)
 (def status-tag quo2.components.tags.status-tags/status-tag)
 (def token-tag quo2.components.tags.token-tag/tag)
+
+;;;; LINKS
+(def url-preview quo2.components.links.url-preview.view/view)

src/quo2/core_spec.cljs

@@ -1,24 +1,26 @@
 (ns quo2.core-spec
-  (:require [quo2.components.avatars.user-avatar.component-spec]
-            [quo2.components.banners.banner.component-spec]
-            [quo2.components.buttons.--tests--.buttons-component-spec]
-            [quo2.components.colors.color-picker.component-spec]
-            [quo2.components.counter.--tests--.counter-component-spec]
-            [quo2.components.dividers.--tests--.divider-label-component-spec]
-            [quo2.components.dividers.strength-divider.component-spec]
-            [quo2.components.drawers.action-drawers.component-spec]
-            [quo2.components.drawers.drawer-buttons.component-spec]
-            [quo2.components.drawers.permission-context.component-spec]
-            [quo2.components.inputs.input.component-spec]
-            [quo2.components.inputs.profile-input.component-spec]
-            [quo2.components.inputs.title-input.component-spec]
-            [quo2.components.markdown.--tests--.text-component-spec]
-            [quo2.components.onboarding.small-option-card.component-spec]
-            [quo2.components.password.tips.component-spec]
-            [quo2.components.profile.select-profile.component-spec]
-            [quo2.components.record-audio.record-audio.--tests--.record-audio-component-spec]
-            [quo2.components.record-audio.soundtrack.--tests--.soundtrack-component-spec]
-            [quo2.components.selectors.--tests--.selectors-component-spec]
-            [quo2.components.selectors.disclaimer.component-spec]
-            [quo2.components.selectors.filter.component-spec]
-            [quo2.components.tags.--tests--.status-tags-component-spec]))
+  (:require
+    [quo2.components.avatars.user-avatar.component-spec]
+    [quo2.components.banners.banner.component-spec]
+    [quo2.components.buttons.--tests--.buttons-component-spec]
+    [quo2.components.colors.color-picker.component-spec]
+    [quo2.components.counter.--tests--.counter-component-spec]
+    [quo2.components.dividers.--tests--.divider-label-component-spec]
+    [quo2.components.dividers.strength-divider.component-spec]
+    [quo2.components.drawers.action-drawers.component-spec]
+    [quo2.components.drawers.drawer-buttons.component-spec]
+    [quo2.components.drawers.permission-context.component-spec]
+    [quo2.components.inputs.input.component-spec]
+    [quo2.components.inputs.profile-input.component-spec]
+    [quo2.components.inputs.title-input.component-spec]
+    [quo2.components.links.url-preview.component-spec]
+    [quo2.components.markdown.--tests--.text-component-spec]
+    [quo2.components.onboarding.small-option-card.component-spec]
+    [quo2.components.password.tips.component-spec]
+    [quo2.components.profile.select-profile.component-spec]
+    [quo2.components.record-audio.record-audio.--tests--.record-audio-component-spec]
+    [quo2.components.record-audio.soundtrack.--tests--.soundtrack-component-spec]
+    [quo2.components.selectors.--tests--.selectors-component-spec]
+    [quo2.components.selectors.disclaimer.component-spec]
+    [quo2.components.selectors.filter.component-spec]
+    [quo2.components.tags.--tests--.status-tags-component-spec]))

src/react_native/gesture.cljs

@@ -6,7 +6,8 @@
               Swipeable
               TouchableWithoutFeedback
               gestureHandlerRootHOC
-              FlatList)]
+              FlatList
+              ScrollView)]
             [react-native.flat-list :as rn-flat-list]
             [reagent.core :as reagent]))
 
@@ -69,6 +70,9 @@
         children))
 
 (def gesture-flat-list (reagent/adapt-react-class FlatList))
+
 (defn flat-list
   [props]
   [gesture-flat-list (rn-flat-list/base-list-props props)])
+
+(def scroll-view (reagent/adapt-react-class ScrollView))

src/react_native/reanimated.cljs

@@ -16,7 +16,8 @@
                              cancelAnimation
                              SlideInUp
                              SlideOutUp
-                             LinearTransition)]
+                             LinearTransition
+                             runOnJS)]
             [reagent.core :as reagent]
             ["react-native-redash" :refer (withPause)]
             [react-native.flat-list :as rn-flat-list]
@@ -64,6 +65,8 @@
 (def with-pause withPause)
 (def cancel-animation cancelAnimation)
 
+(def run-on-js runOnJS)
+
 ;; Easings
 (def bezier (.-bezier ^js Easing))
 

src/react_native/syntax_highlighter.cljs

@@ -1,5 +1,11 @@
 (ns react-native.syntax-highlighter
-  (:require ["react-syntax-highlighter" :default Highlighter]
-            [reagent.core :as reagent]))
+  (:require ["react-native" :as react-native]
+            ["react-syntax-highlighter" :default Highlighter]))
 
-(def highlighter (reagent/adapt-react-class Highlighter))
+
+(defn highlighter
+  [props code-string]
+  [:> Highlighter
+   ;; Default props to adapt Highlighter for react-native.
+   (assoc props :Code-tag react-native/View :Pre-tag react-native/View)
+   code-string])

src/status_im/add_new/core.cljs

@@ -83,7 +83,7 @@
       (if new-contact?
         (rf/merge cofx
                   (contact/add-contact chat-key nickname ens-name)
-                  (navigation/navigate-to-cofx :contacts-list {}))
+                  (navigation/navigate-to :contacts-list {}))
         (chat/start-chat cofx chat-key ens-name))
       {:utils/show-popup {:title      (i18n/label :t/unable-to-read-this-code)
                           :content    (case validation-result

src/status_im/bottom_sheet/events.cljs

@@ -0,0 +1,30 @@
+(ns status-im.bottom-sheet.events
+  (:require [utils.re-frame :as rf]))
+
+(rf/defn show-bottom-sheet-old
+  [{:keys [db]} {:keys [view options]}]
+  {:dismiss-keyboard              nil
+   :show-bottom-sheet-overlay-old nil
+   :db                            (assoc db
+                                         :bottom-sheet/show?   true
+                                         :bottom-sheet/view    view
+                                         :bottom-sheet/options options)})
+
+(rf/defn show-bottom-sheet-event
+  {:events [:bottom-sheet/show-sheet-old]}
+  [cofx view options]
+  (show-bottom-sheet-old
+   cofx
+   {:view    view
+    :options options}))
+
+(rf/defn hide-bottom-sheet-old
+  {:events [:bottom-sheet/hide-old]}
+  [{:keys [db]}]
+  {:db                               (assoc db :bottom-sheet/show? false)
+   :dismiss-bottom-sheet-overlay-old nil})
+
+(rf/defn hide-bottom-sheet-navigation-overlay
+  {:events [:bottom-sheet/hide-old-navigation-overlay]}
+  [{}]
+  {:dismiss-bottom-sheet-overlay-old nil})

src/status_im/bottom_sheet/sheets.cljs

@@ -1,4 +1,4 @@
-(ns status-im2.common.bottom-sheet.sheets
+(ns status-im.bottom-sheet.sheets
   (:require [utils.re-frame :as rf]
             [status-im.ui.screens.about-app.views :as about-app]
             [status-im.ui.screens.home.sheet.views :as home.sheet]
@@ -6,16 +6,15 @@
             [status-im.ui.screens.mobile-network-settings.view :as mobile-network-settings]
             [status-im.ui.screens.multiaccounts.key-storage.views :as key-storage]
             [status-im.ui.screens.multiaccounts.recover.views :as recover.views]
-            [status-im2.common.bottom-sheet.view :as bottom-sheet]
-            [status-im2.contexts.chat.menus.pinned-messages.view :as pinned-messages-menu]
+            [status-im.bottom-sheet.view :as bottom-sheet]
             [react-native.core :as rn]))
 
 (defn bottom-sheet
   []
   (let [dismiss-bottom-sheet-callback (fn []
-                                        (rf/dispatch [:bottom-sheet/hide])
+                                        (rf/dispatch [:bottom-sheet/hide-old])
                                         true)
-        {:keys [show? view options]} (rf/sub [:bottom-sheet])
+        {:keys [show? view options]} (rf/sub [:bottom-sheet-old])
         {:keys [content]
          :as   opts}
         (cond-> {:visible? show?}
@@ -31,12 +30,6 @@
           (= view :add-new)
           (merge home.sheet/add-new)
 
-          (= view :new-chat-bottom-sheet)
-          (merge home.sheet/new-chat-bottom-sheet-comp)
-
-          (= view :start-a-new-chat)
-          (merge home.sheet/start-a-new-chat)
-
           (= view :keycard.login/more)
           (merge keycard/more-sheet)
 
@@ -47,11 +40,8 @@
           (merge recover.views/bottom-sheet)
 
           (= view :migrate-account-password)
-          (merge key-storage/migrate-account-password)
+          (merge key-storage/migrate-account-password))]
 
-          (= view :pinned-messages-list)
-          (merge {:content                   pinned-messages-menu/pinned-messages
-                  :bottom-safe-area-spacing? false}))]
     [:f>
      (fn []
        (rn/use-effect (fn []

src/status_im/bottom_sheet/styles.cljs

@@ -0,0 +1,56 @@
+(ns status-im.bottom-sheet.styles
+  (:require [quo2.foundations.colors :as colors]))
+
+(def border-radius 20)
+
+(defn handle
+  [override-theme]
+  {:position         :absolute
+   :top              8
+   :width            32
+   :height           4
+   :background-color (colors/theme-colors colors/neutral-100 colors/white override-theme)
+   :opacity          0.1
+   :border-radius    100
+   :align-self       :center})
+
+(def backdrop
+  {:position         :absolute
+   :left             0
+   :right            0
+   :bottom           0
+   :top              0
+   :background-color colors/neutral-100})
+
+(def container
+  {:position :absolute
+   :left     0
+   :right    0
+   :top      0
+   :bottom   0
+   :overflow :hidden})
+
+(defn content-style
+  [insets bottom-safe-area-spacing?]
+  {:position       :absolute
+   :left           0
+   :right          0
+   :top            0
+   :padding-top    border-radius
+   :padding-bottom (if bottom-safe-area-spacing? (:bottom insets) 0)})
+
+(defn selected-background
+  [override-theme]
+  {:border-radius     12
+   :padding-left      12
+   :margin-horizontal 8
+   :margin-bottom     10
+   :height            48
+   :background-color  (colors/theme-colors colors/white colors/neutral-90 override-theme)})
+
+(defn background
+  [override-theme]
+  {:background-color        (colors/theme-colors colors/white colors/neutral-95 override-theme)
+   :flex                    1
+   :border-top-left-radius  border-radius
+   :border-top-right-radius border-radius})

src/status_im/bottom_sheet/view.cljs

@@ -0,0 +1,240 @@
+(ns status-im.bottom-sheet.view
+  (:require [oops.core :refer [oget]]
+            [quo.react :as react]
+            [status-im.bottom-sheet.styles :as styles]
+            [re-frame.core :as re-frame]
+            [react-native.background-timer :as timer]
+            [react-native.core :as rn]
+            [react-native.gesture :as gesture]
+            [react-native.hooks :as hooks]
+            [react-native.platform :as platform]
+            [react-native.reanimated :as reanimated]
+            [react-native.safe-area :as safe-area]
+            [reagent.core :as reagent]
+            [utils.worklets.bottom-sheet :as worklets.bottom-sheet]))
+
+(def animation-delay 450)
+
+(defn with-animation
+  [value & [options callback]]
+  (reanimated/with-spring
+   value
+   (clj->js (merge {:mass      2
+                    :stiffness 500
+                    :damping   200})
+            options)
+   callback))
+
+(defn get-bottom-sheet-gesture
+  [pan-y translate-y bg-height bg-height-expanded
+   window-height keyboard-shown disable-drag? expandable?
+   show-bottom-sheet? expanded? close-bottom-sheet gesture-running?]
+  (-> (gesture/gesture-pan)
+      (gesture/on-start
+       (fn [_]
+         (reset! gesture-running? true)
+         (when (and keyboard-shown (not disable-drag?) show-bottom-sheet?)
+           (re-frame/dispatch [:dismiss-keyboard]))))
+      (gesture/on-update
+       (fn [evt]
+         (when (and (not disable-drag?) show-bottom-sheet?)
+           (let [max-pan-up   (if (or @expanded? (not expandable?))
+                                0
+                                (- (- bg-height-expanded bg-height)))
+                 max-pan-down (if @expanded?
+                                bg-height-expanded
+                                bg-height)]
+             (reanimated/set-shared-value pan-y
+                                          (max
+                                           (min
+                                            (.-translationY evt)
+                                            max-pan-down)
+                                           max-pan-up))))))
+      (gesture/on-end
+       (fn [_]
+         (reset! gesture-running? false)
+         (when (and (not disable-drag?) show-bottom-sheet?)
+           (let [end-pan-y                  (- window-height (.-value translate-y))
+                 expand-threshold           (min (* bg-height 1.1) (+ bg-height 50))
+                 collapse-threshold         (max (* bg-height-expanded 0.9) (- bg-height-expanded 50))
+                 should-close-bottom-sheet? (< end-pan-y (max (* bg-height 0.7) 50))]
+             (cond
+               should-close-bottom-sheet?
+               (close-bottom-sheet)
+
+               (and (not @expanded?) (> end-pan-y expand-threshold))
+               (reset! expanded? true)
+
+               (and @expanded? (< end-pan-y collapse-threshold))
+               (reset! expanded? false))))))))
+
+(defn handle-comp
+  [window-width override-theme]
+  [rn/view
+   {:style {:width            window-width
+            :position         :absolute
+            :background-color :transparent
+            :top              0
+            :height           20}}
+   [rn/view {:style (styles/handle override-theme)}]])
+
+(defn bottom-sheet
+  [props children]
+  (let [{on-cancel                 :on-cancel
+         disable-drag?             :disable-drag?
+         show-handle?              :show-handle?
+         visible?                  :visible?
+         backdrop-dismiss?         :backdrop-dismiss?
+         expandable?               :expandable?
+         bottom-safe-area-spacing? :bottom-safe-area-spacing?
+         selected-item             :selected-item
+         is-initially-expanded?    :expanded?
+         override-theme            :override-theme
+         :or                       {show-handle?              true
+                                    backdrop-dismiss?         true
+                                    expandable?               false
+                                    bottom-safe-area-spacing? true
+                                    is-initially-expanded?    false}}
+        props
+        content-height (reagent/atom nil)
+        show-bottom-sheet? (reagent/atom nil)
+        keyboard-was-shown? (reagent/atom false)
+        expanded? (reagent/atom is-initially-expanded?)
+        gesture-running? (reagent/atom false)
+        reset-atoms (fn []
+                      (reset! show-bottom-sheet? nil)
+                      (reset! content-height nil)
+                      (reset! expanded? false)
+                      (reset! keyboard-was-shown? false)
+                      (reset! gesture-running? false))
+        close-bottom-sheet (fn []
+                             (reset! show-bottom-sheet? false)
+                             (when (fn? on-cancel) (on-cancel))
+                             (timer/set-timeout
+                              #(do
+                                 (re-frame/dispatch [:bottom-sheet/hide-old-navigation-overlay])
+                                 (reset-atoms))
+                              animation-delay))]
+    [safe-area/consumer
+     (fn [insets]
+       [:f>
+        (fn []
+          (let [{height       :height
+                 window-width :width}
+                (rn/use-window-dimensions)
+                window-height (if selected-item (- height 72) height)
+                {:keys [keyboard-shown]} (hooks/use-keyboard)
+                bg-height-expanded (- window-height (:top insets))
+                bg-height (max (min @content-height bg-height-expanded) 109)
+                bottom-sheet-dy (reanimated/use-shared-value 0)
+                pan-y (reanimated/use-shared-value 0)
+                translate-y (worklets.bottom-sheet/use-translate-y window-height bottom-sheet-dy pan-y)
+                bg-opacity
+                (worklets.bottom-sheet/use-background-opacity translate-y bg-height window-height 0.7)
+                on-content-layout (fn [evt]
+                                    (let [height (oget evt "nativeEvent" "layout" "height")]
+                                      (reset! content-height height)))
+                on-expanded (fn []
+                              (reanimated/set-shared-value bottom-sheet-dy bg-height-expanded)
+                              (reanimated/set-shared-value pan-y 0))
+                on-collapsed (fn []
+                               (reanimated/set-shared-value bottom-sheet-dy bg-height)
+                               (reanimated/set-shared-value pan-y 0))
+                bottom-sheet-gesture (get-bottom-sheet-gesture
+                                      pan-y
+                                      translate-y
+                                      bg-height
+                                      bg-height-expanded
+                                      window-height
+                                      keyboard-shown
+                                      disable-drag?
+                                      expandable?
+                                      show-bottom-sheet?
+                                      expanded?
+                                      close-bottom-sheet
+                                      gesture-running?)
+                handle-comp [gesture/gesture-detector {:gesture bottom-sheet-gesture}
+                             [handle-comp window-width override-theme]]]
+
+            (react/effect! #(do
+                              (cond
+                                (and
+                                 (nil? @show-bottom-sheet?)
+                                 visible?
+                                 (some? @content-height)
+                                 (> @content-height 0))
+                                (reset! show-bottom-sheet? true)
+
+                                (and @show-bottom-sheet? (not visible?))
+                                (close-bottom-sheet)))
+                           [@show-bottom-sheet? @content-height visible?])
+            (react/effect! #(do
+                              (when @show-bottom-sheet?
+                                (cond
+                                  keyboard-shown
+                                  (do
+                                    (reset! keyboard-was-shown? true)
+                                    (reset! expanded? true))
+                                  (and @keyboard-was-shown? (not keyboard-shown))
+                                  (reset! expanded? false))))
+                           [@show-bottom-sheet? @keyboard-was-shown? keyboard-shown])
+            (react/effect! #(do
+                              (when-not @gesture-running?
+                                (cond
+                                  @show-bottom-sheet?
+                                  (if @expanded?
+                                    (do
+                                      (reanimated/set-shared-value
+                                       bottom-sheet-dy
+                                       (with-animation (+ bg-height-expanded (.-value pan-y))))
+                                      ;; Workaround for
+                                      ;; https://github.com/software-mansion/react-native-reanimated/issues/1758#issue-817145741
+                                      ;; withTiming/withSpring callback not working
+                                      ;; on-expanded should be called as a callback of
+                                      ;; with-animation instead, once this issue has been resolved
+                                      (timer/set-timeout on-expanded animation-delay))
+                                    (do
+                                      (reanimated/set-shared-value
+                                       bottom-sheet-dy
+                                       (with-animation (+ bg-height (.-value pan-y))))
+                                      ;; Workaround for
+                                      ;; https://github.com/software-mansion/react-native-reanimated/issues/1758#issue-817145741
+                                      ;; withTiming/withSpring callback not working
+                                      ;; on-collapsed should be called as a callback of
+                                      ;; with-animation instead, once this issue has been resolved
+                                      (timer/set-timeout on-collapsed animation-delay)))
+
+                                  (= @show-bottom-sheet? false)
+                                  (reanimated/set-shared-value bottom-sheet-dy (with-animation 0)))))
+                           [@show-bottom-sheet? @expanded? @gesture-running?])
+
+            [:<>
+             [rn/touchable-without-feedback {:on-press (when backdrop-dismiss? close-bottom-sheet)}
+              [reanimated/view
+               {:style (reanimated/apply-animations-to-style
+                        {:opacity bg-opacity}
+                        styles/backdrop)}]]
+             (cond->> [reanimated/view
+                       {:style (reanimated/apply-animations-to-style
+                                {:transform [{:translateY translate-y}]}
+                                {:width  window-width
+                                 :height window-height})}
+                       [rn/view {:style styles/container}
+                        (when selected-item
+                          [rn/view {:style (styles/selected-background override-theme)}
+                           [selected-item]])
+                        [rn/view {:style (styles/background override-theme)}
+                         [rn/keyboard-avoiding-view
+                          {:behaviour (if platform/ios? :padding :height)
+                           :style     {:flex 1}}
+                          [rn/view
+                           {:style     (styles/content-style insets bottom-safe-area-spacing?)
+                            :on-layout (when-not (and
+                                                  (some? @content-height)
+                                                  (> @content-height 0))
+                                         on-content-layout)}
+                           children]]
+                         (when show-handle?
+                           handle-comp)]]]
+               (not show-handle?)
+               (conj [gesture/gesture-detector {:gesture bottom-sheet-gesture}]))]))])]))

src/status_im/browser/core.cljs

@@ -3,7 +3,7 @@
     ["eth-phishing-detect" :as eth-phishing-detect]
     [clojure.string :as string]
     [re-frame.core :as re-frame]
-    [status-im2.common.bottom-sheet.events :as bottom-sheet]
+    [status-im.bottom-sheet.events :as bottom-sheet]
     [status-im.browser.eip3085 :as eip3085]
     [status-im.browser.eip3326 :as eip3326]
     [status-im.browser.permissions :as browser.permissions]
@@ -572,7 +572,7 @@
   [{:keys [db] :as cofx} address]
   (rf/merge cofx
             {:browser/clear-web-data nil}
-            (bottom-sheet/hide-bottom-sheet)
+            (bottom-sheet/hide-bottom-sheet-old)
             (browser.permissions/clear-dapps-permissions)
             (multiaccounts.update/multiaccount-update :dapps-address address {})
             #(when (= (:view-id db) :browser)

src/status_im/browser/eip3085.cljs

@@ -28,7 +28,7 @@
                     :on-success #(re-frame/dispatch [:eip3085/send-success-call-to-bridge cofx id
                                                      message-id])
                     :on-error   #(log/error "failed to perform settings_saveSetting" %)}]
-   :dispatch      [:bottom-sheet/hide]})
+   :dispatch      [:bottom-sheet/hide-old]})
 
 (rf/defn deny-permission
   {:events [:eip3085.ui/dapp-permission-denied]}
@@ -37,7 +37,7 @@
                             :messageId message-id
                             :error     {:code    4001
                                         :message "User rejected the request."}}
-   :dispatch               [:bottom-sheet/hide]})
+   :dispatch               [:bottom-sheet/hide-old]})
 
 (rf/defn handle-add-ethereum-chain
   {:events [:eip3085/handle-add-ethereum-chain]}
@@ -64,7 +64,7 @@
                                                               :id           id
                                                               :new-network  network)]
         (if (network/chain-id-available? networks network)
-          {:dispatch [:bottom-sheet/show-sheet
+          {:dispatch [:bottom-sheet/show-sheet-old
                       {:content (fn []
                                   [sheet/permissions-panel dapp-name message-id params])}]}
           (send-success-call-to-bridge cofx id message-id)))

src/status_im/browser/eip3326.cljs

@@ -13,7 +13,7 @@
                             :messageId message-id
                             :error     {:code    4001
                                         :message "User rejected the request."}}
-   :dispatch               [:bottom-sheet/hide]})
+   :dispatch               [:bottom-sheet/hide-old]})
 
 (rf/defn handle-switch-ethereum-chain
   {:events [:eip3326/handle-switch-ethereum-chain]}
@@ -39,7 +39,7 @@
                                        :target-network-id target-network-id
                                        :network-from      network-from
                                        :network-to        network-to)]
-          {:dispatch [:bottom-sheet/show-sheet
+          {:dispatch [:bottom-sheet/show-sheet-old
                       {:content (fn []
                                   [sheet/permissions-panel dapp-name message-id params])}]}))
       {:browser/send-to-bridge {:type constants/web3-send-async-callback

src/status_im/chat/models/input.cljs

@@ -41,36 +41,19 @@
 
 (rf/defn select-mention
   {:events [:chat.ui/select-mention]}
-  [{:keys [db] :as cofx} text-input-ref {:keys [primary-name searched-text match] :as user}]
-  (let [chat-id     (:current-chat-id db)
-        new-text    (mentions/new-input-text-with-mention cofx user)
-        at-sign-idx (get-in db [:chats/mentions chat-id :mentions :at-sign-idx])
-        cursor      (+ at-sign-idx (count primary-name) 2)]
-    (rf/merge
-     cofx
-     {:db                   (-> db
-                                (assoc-in [:chats/cursor chat-id] cursor)
-                                (assoc-in [:chats/mention-suggestions chat-id] nil))
-      :set-text-input-value [chat-id new-text text-input-ref]}
-     (set-chat-input-text new-text chat-id)
-     ;; NOTE(rasom): Some keyboards do not react on selection property passed to
-     ;; text input (specifically Samsung keyboard with predictive text set on).
-     ;; In this case, if the user continues typing after the programmatic change,
-     ;; the new text is added to the last known cursor position before
-     ;; programmatic change. By calling `reset-text-input-cursor` we force the
-     ;; keyboard's cursor position to be changed before the next input.
-     (mentions/reset-text-input-cursor text-input-ref cursor)
-     ;; NOTE(roman): on-text-input event is not dispatched when we change input
-     ;; programmatically, so we have to call `on-text-input` manually
-     (mentions/on-text-input
-      (let [match-len (count match)
-            start     (inc at-sign-idx)
-            end       (+ start match-len)]
-        {:new-text      match
-         :previous-text searched-text
-         :start         start
-         :end           end}))
-     (mentions/recheck-at-idxs {primary-name user}))))
+  [{:keys [db] :as cofx} text-input-ref {:keys [primary-name searched-text match public-key] :as user}]
+  (let [chat-id (:current-chat-id db)
+        text    (get-in db [:chat/inputs chat-id :input-text])
+        method  "wakuext_chatMentionNewInputTextWithMention"
+        params  [chat-id text primary-name]]
+    {:json-rpc/call [{:method     method
+                      :params     params
+                      :on-success #(rf/dispatch [:mention/on-new-input-text-with-mentions-success %
+                                                 primary-name text-input-ref match searched-text
+                                                 public-key])
+                      :on-error   #(rf/dispatch [:mention/on-error
+                                                 {:method method
+                                                  :params params} %])}]}))
 
 (rf/defn disable-chat-cooldown
   "Turns off chat cooldown (protection against message spamming)"
@@ -182,8 +165,7 @@
     (rf/merge cofx
               {:set-text-input-value [current-chat-id ""]}
               (clean-input current-chat-id)
-              (mentions/clear-mentions)
-              (mentions/clear-cursor))))
+              (mentions/clear-mentions))))
 
 (rf/defn send-messages
   [{:keys [db] :as cofx} input-text current-chat-id]
@@ -251,13 +233,29 @@
   [{{:keys [current-chat-id] :as db} :db :as cofx}]
   (let [{:keys [input-text metadata]} (get-in db [:chat/inputs current-chat-id])
         editing-message               (:editing-message metadata)
-        input-text-with-mentions      (mentions/check-mentions cofx input-text)]
-    (rf/merge cofx
-              (if editing-message
-                (send-edited-message input-text-with-mentions editing-message)
-                (send-messages input-text-with-mentions current-chat-id))
-              (mentions/clear-mentions)
-              (mentions/clear-cursor))))
+        method                        "wakuext_chatMentionCheckMentions"
+        params                        [current-chat-id input-text]]
+    {:json-rpc/call [{:method     method
+                      :params     params
+                      :on-error   #(rf/dispatch [:mention/on-error {:method method :params params} %])
+                      :on-success #(rf/dispatch [:mention/on-check-mentions-success
+                                                 current-chat-id
+                                                 editing-message
+                                                 input-text
+                                                 %])}]}))
+
+(rf/defn on-check-mentions-success
+  {:events [:mention/on-check-mentions-success]}
+  [{:keys [db] :as cofx} current-chat-id editing-message input-text new-text]
+  (log/debug "[mentions] on-check-mentions-success"
+             {:chat-id         current-chat-id
+              :editing-message editing-message
+              :input-text      input-text
+              :new-text        new-text})
+  (rf/merge cofx
+            (if editing-message
+              (send-edited-message new-text editing-message)
+              (send-messages new-text current-chat-id))))
 
 (rf/defn send-contact-request
   {:events [:contacts/send-contact-request]}
@@ -271,7 +269,6 @@
                                          :on-error    #(log/warn "failed to send a contact request" %)
                                          :on-success  #(re-frame/dispatch [:transport/message-sent %])}]}
             (mentions/clear-mentions)
-            (mentions/clear-cursor)
             (clean-input (:current-chat-id db))))
 
 (rf/defn cancel-contact-request
@@ -282,7 +279,6 @@
     (rf/merge cofx
               {:db (assoc-in db [:chat/inputs current-chat-id :metadata :sending-contact-request] nil)}
               (mentions/clear-mentions)
-              (mentions/clear-cursor)
               (clean-input (:current-chat-id db)))))
 
 (rf/defn chat-send-sticker

src/status_im/chat/models/mentions_test.cljs

@@ -1,323 +0,0 @@
-(ns status-im.chat.models.mentions-test
-  (:require [cljs.test :as test]
-            [clojure.string :as string]
-            [status-im.chat.models.mentions :as mentions]))
-
-(def ->info-input
-  [[:text "H."]
-   [:mention
-    "@helpinghand.eth"]
-   [:text
-    " "]])
-
-(def ->info-expected
-  {:at-sign-idx   2
-   :mention-end   19
-   :new-text      " "
-   :previous-text ""
-   :start         18
-   :end           18
-   :at-idxs       [{:mention? true
-                    :from     2
-                    :to       17
-                    :checked? true}]})
-
-(test/deftest test->info
-  (test/testing "->info base case"
-    (test/is (= ->info-expected (mentions/->info ->info-input)))))
-
-;; No mention
-(def mention-text-1 "parse-text")
-(def mention-text-result-1 [[:text "parse-text"]])
-
-;; Mention in the middle
-(def mention-text-2
-  "hey @0x04fbce10971e1cd7253b98c7b7e54de3729ca57ce41a2bfb0d1c4e0a26f72c4b6913c3487fa1b4bb86125770f1743fb4459da05c1cbe31d938814cfaf36e252073 he")
-(def mention-text-result-2
-  [[:text "hey "]
-   [:mention
-    "0x04fbce10971e1cd7253b98c7b7e54de3729ca57ce41a2bfb0d1c4e0a26f72c4b6913c3487fa1b4bb86125770f1743fb4459da05c1cbe31d938814cfaf36e252073"]
-   [:text " he"]])
-
-;; Mention at the beginning
-(def mention-text-3
-  "@0x04fbce10971e1cd7253b98c7b7e54de3729ca57ce41a2bfb0d1c4e0a26f72c4b6913c3487fa1b4bb86125770f1743fb4459da05c1cbe31d938814cfaf36e252073 he")
-(def mention-text-result-3
-  [[:mention
-    "0x04fbce10971e1cd7253b98c7b7e54de3729ca57ce41a2bfb0d1c4e0a26f72c4b6913c3487fa1b4bb86125770f1743fb4459da05c1cbe31d938814cfaf36e252073"]
-   [:text " he"]])
-
-;; Mention at the end
-(def mention-text-4
-  "hey @0x04fbce10971e1cd7253b98c7b7e54de3729ca57ce41a2bfb0d1c4e0a26f72c4b6913c3487fa1b4bb86125770f1743fb4459da05c1cbe31d938814cfaf36e252073")
-(def mention-text-result-4
-  [[:text "hey "]
-   [:mention
-    "0x04fbce10971e1cd7253b98c7b7e54de3729ca57ce41a2bfb0d1c4e0a26f72c4b6913c3487fa1b4bb86125770f1743fb4459da05c1cbe31d938814cfaf36e252073"]])
-
-;; Invalid mention
-(def mention-text-5
-  "invalid @0x04fBce10971e1cd7253b98c7b7e54de3729ca57ce41a2bfb0d1c4e0a26f72c4b6913c3487fa1b4bb86125770f1743fb4459da05c1cbe31d938814cfaf36e252073")
-(def mention-text-result-5
-  [[:text
-    "invalid @0x04fBce10971e1cd7253b98c7b7e54de3729ca57ce41a2bfb0d1c4e0a26f72c4b6913c3487fa1b4bb86125770f1743fb4459da05c1cbe31d938814cfaf36e252073"]])
-
-(test/deftest test-to-input
-  (test/testing "only text"
-    (test/is (= mention-text-result-1 (mentions/->input-field mention-text-1))))
-  (test/testing "in the middle"
-    (test/is (= mention-text-result-2 (mentions/->input-field mention-text-2))))
-  (test/testing "at the beginning"
-    (test/is (= mention-text-result-3 (mentions/->input-field mention-text-3))))
-  (test/testing "at the end"
-    (test/is (= mention-text-result-4 (mentions/->input-field mention-text-4))))
-  (test/testing "invalid"
-    (test/is (= mention-text-result-5 (mentions/->input-field mention-text-5)))))
-
-(test/deftest test-replace-mentions
-  (let [users {"User Number One"
-               {:primary-name "User Number One"
-                :public-key   "0xpk1"}
-               "User Number Two"
-               {:primary-name   "user2"
-                :secondary-name "User Number Two"
-                :public-key     "0xpk2"}
-               "User Number Three"
-               {:primary-name   "user3"
-                :secondary-name "User Number Three"
-                :public-key     "0xpk3"}}]
-    (test/testing "empty string"
-      (let [text   ""
-            result (mentions/replace-mentions text users)]
-        (test/is (= result text) (pr-str text))))
-
-    (test/testing "no text"
-      (let [text   nil
-            result (mentions/replace-mentions text users)]
-        (test/is (= result text) (pr-str text))))
-
-    (test/testing "incomlepte mention 1"
-      (let [text   "@"
-            result (mentions/replace-mentions text users)]
-        (test/is (= result text) (pr-str text))))
-
-    (test/testing "incomplete mention 2"
-      (let [text   "@r"
-            result (mentions/replace-mentions text users)]
-        (test/is (= result text) (pr-str text))))
-
-    (test/testing "no mentions"
-      (let [text   "foo bar @buzz kek @foo"
-            result (mentions/replace-mentions text users)]
-        (test/is (= result text) (pr-str text))))
-
-    (test/testing "starts with mention"
-      (let [text   "@User Number One"
-            result (mentions/replace-mentions text users)]
-        (test/is (= result "@0xpk1") (pr-str text))))
-
-    (test/testing "starts with mention, comma after mention"
-      (let [text   "@User Number One,"
-            result (mentions/replace-mentions text users)]
-        (test/is (= result "@0xpk1,") (pr-str text))))
-
-    (test/testing "starts with mention but no space after"
-      (let [text   "@User Number Onefoo"
-            result (mentions/replace-mentions text users)]
-        (test/is (= result text) (pr-str text))))
-
-    (test/testing "starts with mention, some text after mention"
-      (let [text   "@User Number One foo"
-            result (mentions/replace-mentions text users)]
-        (test/is (= result "@0xpk1 foo") (pr-str text))))
-
-    (test/testing "starts with some text, then mention"
-      (let [text   "text @User Number One"
-            result (mentions/replace-mentions text users)]
-        (test/is (= result "text @0xpk1") (pr-str text))))
-
-    (test/testing "starts with some text, then mention, then more text"
-      (let [text   "text @User Number One foo"
-            result (mentions/replace-mentions text users)]
-        (test/is (= result "text @0xpk1 foo") (pr-str text))))
-
-    (test/testing "no space before mention"
-      (let [text   "text@User Number One"
-            result (mentions/replace-mentions text users)]
-        (test/is (= result "text@0xpk1") (pr-str text))))
-
-    (test/testing "two different mentions"
-      (let [text   "@User Number One @User Number two"
-            result (mentions/replace-mentions text users)]
-        (test/is (= result "@0xpk1 @0xpk2") (pr-str text))))
-
-    (test/testing "two different mentions, separated with comma"
-      (let [text   "@User Number One,@User Number two"
-            result (mentions/replace-mentions text users)]
-        (test/is (= result "@0xpk1,@0xpk2") (pr-str text))))
-
-    (test/testing "two different mentions inside text"
-      (let [text   "foo@User Number One bar @User Number two baz"
-            result (mentions/replace-mentions text users)]
-        (test/is (= result "foo@0xpk1 bar @0xpk2 baz") (pr-str text))))
-
-    (test/testing "ens mention"
-      (let [text   "@user2"
-            result (mentions/replace-mentions text users)]
-        (test/is (= result "@0xpk2") (pr-str text))))
-
-    (test/testing "multiple mentions"
-      (let [text             (string/join
-                              " "
-                              (repeat 1000 "@User Number One @User Number two"))
-            result           (mentions/replace-mentions text users)
-            exprected-result (string/join
-                              " "
-                              (repeat 1000 "@0xpk1 @0xpk2"))]
-        (test/is (= exprected-result result))))
-    (test/testing "markdown"
-      (test/testing "single * case 1"
-        (let [text   "*@user2*"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result text) (pr-str text))))
-
-      (test/testing "single * case 2"
-        (let [text   "*@user2 *"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result "*@0xpk2 *") (pr-str text))))
-
-      (test/testing "single * case 3"
-        (let [text   "a*@user2*"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result text) (pr-str text))))
-
-      (test/testing "single * case 4"
-        (let [text   "*@user2 foo*foo"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result "*@0xpk2 foo*foo") (pr-str text))))
-
-      (test/testing "single * case 5"
-        (let [text   "a *@user2*"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result text) (pr-str text))))
-
-      (test/testing "single * case 6"
-        (let [text   "*@user2 foo*"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result text) (pr-str text))))
-
-      (test/testing "single * case 7"
-        (let [text   "@user2 *@user2 foo* @user2"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result "@0xpk2 *@user2 foo* @0xpk2") (pr-str text))))
-
-      (test/testing "single * case 8"
-        (let [text   "*@user2 foo**@user2 foo*"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result text) (pr-str text))))
-
-      (test/testing "single * case 9"
-        (let [text   "*@user2 foo***@user2 foo* @user2"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result "*@user2 foo***@user2 foo* @0xpk2") (pr-str text))))
-
-      (test/testing "double * case 1"
-        (let [text   "**@user2**"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result text) (pr-str text))))
-
-      (test/testing "double * case 2"
-        (let [text   "**@user2 **"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result "**@0xpk2 **") (pr-str text))))
-
-      (test/testing "double * case 3"
-        (let [text   "a**@user2**"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result text) (pr-str text))))
-
-      (test/testing "double * case 4"
-        (let [text   "**@user2 foo**foo"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result "**@user2 foo**foo") (pr-str text))))
-
-      (test/testing "double * case 5"
-        (let [text   "a **@user2**"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result text) (pr-str text))))
-
-      (test/testing "double * case 6"
-        (let [text   "**@user2 foo**"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result text) (pr-str text))))
-
-      (test/testing "double * case 7"
-        (let [text   "@user2 **@user2 foo** @user2"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result "@0xpk2 **@user2 foo** @0xpk2") (pr-str text))))
-
-      (test/testing "double * case 8"
-        (let [text   "**@user2 foo****@user2 foo**"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result text) (pr-str text))))
-
-      (test/testing "double * case 9"
-        (let [text   "**@user2 foo*****@user2 foo** @user2"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result "**@user2 foo*****@user2 foo** @0xpk2") (pr-str text))))
-
-      (test/testing "tripple * case 1"
-        (let [text   "***@user2 foo***@user2 foo*"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result "***@user2 foo***@0xpk2 foo*") (pr-str text))))
-
-      (test/testing "tripple ~ case 1"
-        (let [text   "~~~@user2 foo~~~@user2 foo~"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result text) (pr-str text))))
-
-      (test/testing "quote case 1"
-        (let [text   ">@user2"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result text) (pr-str text))))
-
-      (test/testing "quote case 2"
-        (let [text   "\n>@user2"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result text) (pr-str text))))
-
-      (test/testing "quote case 3"
-        (let [text   "\n> @user2 \n   \n @user2"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result "\n> @user2 \n   \n @0xpk2") (pr-str text))))
-
-      (test/testing "quote case 4"
-        (let [text   ">@user2\n\n>@user2"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result text) (pr-str text))))
-
-      (test/testing "quote case 5"
-        (let [text   "***hey\n\n>@user2\n\n@user2 foo***"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result "***hey\n\n>@user2\n\n@0xpk2 foo***")
-                   (pr-str text))))
-
-      (test/testing "code case 1"
-        (let [text   "` @user2 `"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result text) (pr-str text))))
-
-      (test/testing "code case 2"
-        (let [text   "` @user2 `"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result text) (pr-str text))))
-
-      (test/testing "code case 3"
-        (let [text   "``` @user2 ```"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result text) (pr-str text))))
-
-      (test/testing "code case 4"
-        (let [text   "` ` @user2 ``"
-              result (mentions/replace-mentions text users)]
-          (test/is (= result "` ` @0xpk2 ``") (pr-str text)))))))

src/status_im/communities/core.cljs

@@ -8,7 +8,7 @@
             [status-im.async-storage.core :as async-storage]
             [status-im.ui.components.emoji-thumbnail.styles :as emoji-thumbnail-styles]
             [status-im.utils.universal-links.core :as universal-links]
-            [status-im2.common.bottom-sheet.events :as bottom-sheet]
+            [status-im.bottom-sheet.events :as bottom-sheet]
             [status-im2.common.toasts.events :as toasts]
             [status-im2.constants :as constants]
             [status-im2.contexts.activity-center.events :as activity-center]
@@ -445,7 +445,7 @@
   [cofx id]
   (rf/merge cofx
             (reset-community-id-input id)
-            (bottom-sheet/hide-bottom-sheet)
+            (bottom-sheet/hide-bottom-sheet-old)
             (navigation/open-modal :invite-people-community {:invite? true})))
 
 (rf/defn share-community-pressed
@@ -453,7 +453,7 @@
   [cofx id]
   (rf/merge cofx
             (reset-community-id-input id)
-            (bottom-sheet/hide-bottom-sheet)
+            (bottom-sheet/hide-bottom-sheet-old)
             (navigation/open-modal :invite-people-community {})))
 
 (rf/defn create-channel-pressed
@@ -575,7 +575,7 @@
   {:events [::member-banned]}
   [cofx response-js]
   (rf/merge cofx
-            (bottom-sheet/hide-bottom-sheet)
+            (bottom-sheet/hide-bottom-sheet-old)
             (handle-response response-js)
             (activity-center/notifications-fetch-unread-count)))
 
@@ -596,7 +596,7 @@
   {:events [::member-kicked]}
   [cofx response-js]
   (rf/merge cofx
-            (bottom-sheet/hide-bottom-sheet)
+            (bottom-sheet/hide-bottom-sheet-old)
             (handle-response response-js)))
 
 (rf/defn member-kick
@@ -817,13 +817,13 @@
   [cofx community-id]
   (rf/merge cofx
             (navigation/pop-to-root :shell-stack)
-            (navigation/navigate-to-cofx :community-overview community-id)))
+            (navigation/navigate-to :community-overview community-id)))
 
 (rf/defn member-role-updated
   {:events [:community.member/role-updated]}
   [cofx response-js]
   (rf/merge cofx
-            (bottom-sheet/hide-bottom-sheet)
+            (bottom-sheet/hide-bottom-sheet-old)
             (handle-response response-js)))
 
 (rf/defn add-role-to-member

src/status_im/contact/core.cljs

@@ -9,4 +9,4 @@
             {:db (assoc db
                         :group/selected-contacts #{}
                         :new-chat-name           "")}
-            (navigation/navigate-to-cofx :contact-toggle-list nil)))
+            (navigation/navigate-to :contact-toggle-list nil)))

src/status_im/data_store/messages.cljs

@@ -41,7 +41,8 @@
         :albumId                  :album-id
         :imageWidth               :image-width
         :imageHeight              :image-height
-        :new                      :new?})
+        :new                      :new?
+        :albumImagesCount         :album-images-count})
 
       (update :quoted-message
               set/rename-keys

src/status_im/ens/core.cljs

@@ -2,7 +2,7 @@
   (:refer-clojure :exclude [name])
   (:require [clojure.string :as string]
             [re-frame.core :as re-frame]
-            [status-im2.common.bottom-sheet.events :as bottom-sheet]
+            [status-im.bottom-sheet.events :as bottom-sheet]
             [status-im.ethereum.core :as ethereum]
             [status-im.ethereum.eip55 :as eip55]
             [status-im.ethereum.ens :as ens]
@@ -121,7 +121,7 @@
   (let [{:keys [state username custom-domain?]} (:ens/registration db)]
     (case state
       (:available :owned)
-      (navigation/navigate-to-cofx cofx :ens-checkout {})
+      (navigation/navigate-to cofx :ens-checkout {})
       :connected-with-different-key
       (re-frame/dispatch [::set-pub-key])
       :connected
@@ -261,7 +261,7 @@
   [{:keys [db] :as cofx} _ {:keys [address]}]
   (rf/merge cofx
             {:db (assoc-in db [:ens/registration :address] address)}
-            (bottom-sheet/hide-bottom-sheet)))
+            (bottom-sheet/hide-bottom-sheet-old)))
 
 (rf/defn save-preferred-name
   {:events [::save-preferred-name]}
@@ -311,14 +311,14 @@
                ::resolve-pubkey
                [chain-id username
                 #(re-frame/dispatch [::public-key-resolved username %])]}
-              (navigation/navigate-to-cofx :ens-name-details username))))
+              (navigation/navigate-to :ens-name-details username))))
 
 (rf/defn start-registration
   {:events [::add-username-pressed ::get-started-pressed]}
   [{:keys [db] :as cofx}]
   (rf/merge cofx
             (set-username-candidate (get-in db [:ens/registration :username] ""))
-            (navigation/navigate-to-cofx :ens-search {})))
+            (navigation/navigate-to :ens-search {})))
 
 (rf/defn remove-username
   {:events [::remove-username]}

src/status_im/events.cljs

@@ -115,7 +115,7 @@
   {:events [:system-theme-mode-changed]}
   [{:keys [db] :as cofx} _]
   (let [current-theme-type (get-in cofx [:db :multiaccount :appearance])]
-    (when (and (multiaccounts.model/logged-in? cofx)
+    (when (and (multiaccounts.model/logged-in? db)
                (= current-theme-type status-im2.constants/theme-type-system))
       {:multiaccounts.ui/switch-theme-fx
        [(get-in db [:multiaccount :appearance])

src/status_im/group_chats/core.cljs

@@ -245,7 +245,7 @@
             {:db (-> db
                      (assoc :new-chat-name (get-in db [:chats chat-id :name]))
                      (assoc :current-chat-id chat-id))}
-            (navigation/navigate-to-cofx :group-chat-profile nil)))
+            (navigation/navigate-to :group-chat-profile nil)))
 
 (rf/defn ui-leave-chat-pressed
   {:events [:group-chats.ui/leave-chat-pressed]}
@@ -256,5 +256,5 @@
       :content             (i18n/label :t/leave-chat-confirmation)
       :confirm-button-text (i18n/label :t/leave)
       :on-accept           #(do
-                              (re-frame/dispatch [:bottom-sheet/hide])
+                              (re-frame/dispatch [:bottom-sheet/hide-old])
                               (re-frame/dispatch [:group-chats.ui/leave-chat-confirmed chat-id]))}}))

src/status_im/keycard/backup_key.cljs

@@ -18,8 +18,8 @@
             {:db (-> db
                      (assoc-in [:keycard :creating-backup?] backup-type))}
             (when (:multiaccount db)
-              (navigation/navigate-to-cofx :my-profile nil))
-            (navigation/navigate-to-cofx :seed-phrase nil)))
+              (navigation/navigate-to :my-profile nil))
+            (navigation/navigate-to :seed-phrase nil)))
 
 (rf/defn recovery-card-pressed
   {:events [:keycard-settings.ui/recovery-card-pressed]}
@@ -69,4 +69,4 @@
                                    (update :multiaccounts/key-storage dissoc :seed-phrase))
              :dismiss-keyboard nil}
             (common/listen-to-hardware-back-button)
-            (navigation/navigate-to-cofx :keycard-onboarding-intro nil)))
+            (navigation/navigate-to :keycard-onboarding-intro nil)))

src/status_im/keycard/change_pin.cljs

@@ -59,7 +59,7 @@
             (common/clear-pin)
             (common/hide-connection-sheet)
             (if (get-in db [:keycard :pin :puk-restore?])
-              (navigation/navigate-to-cofx :multiaccounts nil)
+              (navigation/navigate-to :multiaccounts nil)
               (navigation/set-stack-root :profile-stack [:my-profile :keycard-settings]))))
 
 (rf/defn change-pin
@@ -150,7 +150,7 @@
                                   :content (i18n/label :t/pin-changed)}}
               (common/hide-connection-sheet)
               (if puk-restore?
-                (navigation/navigate-to-cofx :multiaccounts nil)
+                (navigation/navigate-to :multiaccounts nil)
                 (navigation/set-stack-root :profile-stack [:my-profile :keycard-settings]))
               (when (:multiaccounts/login db)
                 (common/get-keys-from-keycard)))))
@@ -211,5 +211,5 @@
                                        :sign         []
                                        :error-label  :t/pin-mismatch))}
                    (when (zero? pin-retries) (common/frozen-keycard-popup))
-                   (navigation/navigate-to-cofx :enter-pin-settings nil))
+                   (navigation/navigate-to :enter-pin-settings nil))
          (common/show-wrong-keycard-alert))))))

src/status_im/keycard/common.cljs

@@ -1,7 +1,7 @@
 (ns status-im.keycard.common
   (:require [clojure.string :as string]
             [re-frame.core :as re-frame]
-            [status-im2.common.bottom-sheet.events :as bottom-sheet]
+            [status-im.bottom-sheet.events :as bottom-sheet]
             [status-im.ethereum.core :as ethereum]
             [utils.i18n :as i18n]
             [status-im.keycard.nfc :as nfc]
@@ -195,8 +195,7 @@
                connected?)
     (rf/merge
      cofx
-     {:dismiss-keyboard true}
-     (bottom-sheet/show-bottom-sheet
+     (bottom-sheet/show-bottom-sheet-old
       {:view {:transparent        platform/ios?
               :show-handle?       false
               :backdrop-dismiss?  false
@@ -231,7 +230,7 @@
             {:db (assoc-in db [:keycard :card-read-in-progress?] false)}
             (restore-on-card-connected)
             (restore-on-card-read)
-            (bottom-sheet/hide-bottom-sheet)))
+            (bottom-sheet/hide-bottom-sheet-old)))
 
 (rf/defn hide-connection-sheet
   [cofx]
@@ -309,7 +308,7 @@
   [{:keys [db] :as cofx}]
   (rf/merge cofx
             {:db (assoc-in db [:keycard :pin :current] [])}
-            (navigation/navigate-to-cofx :enter-pin-settings nil)))
+            (navigation/navigate-to :enter-pin-settings nil)))
 
 (defn- tag-lost-exception?
   [code error]
@@ -492,7 +491,7 @@
       (if login?
         (rf/merge cofx
                   (clear-on-card-read)
-                  (navigation/navigate-to-cofx :not-keycard nil))
+                  (navigation/navigate-to :not-keycard nil))
         (rf/merge cofx
                   {:db (assoc-in db [:keycard :application-info-error] error)}
 

src/status_im/keycard/core.cljs

@@ -40,7 +40,7 @@
                                {:enter-step   :original
                                 :original     []
                                 :confirmation []}))}
-            (navigation/navigate-to-cofx :keycard-onboarding-pin nil)))
+            (navigation/navigate-to :keycard-onboarding-pin nil)))
 
 (rf/defn load-recovery-pin-screen
   [{:keys [db] :as cofx}]
@@ -66,7 +66,7 @@
              "instance-uid"
              instance-uid)
   (if (= flow :import)
-    (navigation/navigate-to-cofx cofx :keycard-recovery-no-key nil)
+    (navigation/navigate-to cofx :keycard-recovery-no-key nil)
     (if paired?
       (rf/merge cofx
                 (common/listen-to-hardware-back-button)
@@ -86,7 +86,7 @@
                      (assoc-in [:keycard :pin :on-verified] nil)
                      (assoc-in [:keycard :setup-step] nil))}
             (common/clear-on-card-connected)
-            (navigation/navigate-to-cofx :keycard-settings nil)))
+            (navigation/navigate-to :keycard-settings nil)))
 
 (rf/defn password-option-pressed
   {:eevents [:keycard.ui/password-option-pressed]}
@@ -272,7 +272,7 @@
                              (not on-verified-failure))
                     (when exporting?
                       (navigation/navigate-back)))
-                  ;(navigation/navigate-to-cofx :enter-pin-settings nil)))
+                  ;(navigation/navigate-to :enter-pin-settings nil)))
                   (when (zero? pin-retries) (common/frozen-keycard-popup))
                   (when on-verified-failure
                     (fn [_]
@@ -505,7 +505,7 @@
               (when multiaccount
                 (set-multiaccount-pairing multiaccount pairing paired-on))
               (when (= flow :login)
-                (navigation/navigate-to-cofx :multiaccounts nil))
+                (navigation/navigate-to :multiaccounts nil))
               (when (= flow :recovery)
                 (onboarding/proceed-with-generating-key))
               (when (= flow :import)
@@ -531,7 +531,7 @@
                                                 :keycard/pair))
                 (common/hide-connection-sheet)
                 (when (= flow :import)
-                  (navigation/navigate-to-cofx :keycard-recovery-pair nil))
+                  (navigation/navigate-to :keycard-recovery-pair nil))
                 (when (not= setup-step :enter-pair-code)
                   (common/process-error code error))))))
 
@@ -579,7 +579,7 @@
 
               (when (= card-state :pre-init)
                 (if (= flow :import)
-                  (navigation/navigate-to-cofx :keycard-recovery-no-key nil)
+                  (navigation/navigate-to :keycard-recovery-no-key nil)
                   (fn [cofx]
                     (rf/merge
                      cofx
@@ -596,7 +596,7 @@
 
               (when (= card-state :blank)
                 (if (= flow :import)
-                  (navigation/navigate-to-cofx :keycard-recovery-no-key nil)
+                  (navigation/navigate-to :keycard-recovery-no-key nil)
                   (show-no-keycard-applet-alert)))
 
               (when (and (= card-state :multiaccount)

src/status_im/keycard/delete_key.cljs

@@ -6,7 +6,7 @@
 (rf/defn reset-card-pressed
   {:events [:keycard-settings.ui/reset-card-pressed]}
   [cofx]
-  (navigation/navigate-to-cofx cofx :reset-card nil))
+  (navigation/navigate-to cofx :reset-card nil))
 
 (rf/defn delete-card
   [{:keys [db] :as cofx}]
@@ -20,7 +20,7 @@
 (rf/defn navigate-to-reset-card-screen
   {:events [:keycard/navigate-to-reset-card-screen]}
   [cofx]
-  (navigation/navigate-to-cofx cofx :reset-card nil))
+  (navigation/navigate-to cofx :reset-card nil))
 
 (rf/defn reset-card-next-button-pressed
   {:events [:keycard-settings.ui/reset-card-next-button-pressed]}

src/status_im/keycard/login.cljs

@@ -1,5 +1,5 @@
 (ns status-im.keycard.login
-  (:require [status-im2.common.bottom-sheet.events :as bottom-sheet]
+  (:require [status-im.bottom-sheet.events :as bottom-sheet]
             [status-im.ethereum.core :as ethereum]
             [status-im.keycard.common :as common]
             status-im.keycard.fx
@@ -22,13 +22,13 @@
 (rf/defn login-pin-more-icon-pressed
   {:events [:keycard.login.pin.ui/more-icon-pressed]}
   [cofx]
-  (bottom-sheet/show-bottom-sheet cofx {:view :keycard.login/more}))
+  (bottom-sheet/hide-bottom-sheet-old cofx))
 
 (rf/defn login-create-key-pressed
   {:events [:keycard.login.ui/create-new-key-pressed]}
   [cofx]
   (rf/merge cofx
-            (bottom-sheet/hide-bottom-sheet)
+            (bottom-sheet/hide-bottom-sheet-old)
             (onboarding/start-onboarding-flow)))
 
 (rf/defn login-add-key-pressed
@@ -48,7 +48,7 @@
   (log/debug "[keycard] load-pair-card-pressed")
   (rf/merge cofx
             {:db (assoc-in db [:keycard :flow] :login)}
-            (navigation/navigate-to-cofx :keycard-recovery-pair nil)))
+            (navigation/navigate-to :keycard-recovery-pair nil)))
 
 (rf/defn reset-pin
   {:events [::reset-pin]}
@@ -70,11 +70,11 @@
                                    :status     nil))
       :hide-popover nil})
    (when (:multiaccount db)
-     (navigation/navigate-to-cofx :my-profile nil))
+     (navigation/navigate-to :my-profile nil))
    (when-not (:multiaccounts/login db)
      (if (:popover/popover db)
        (navigation/navigate-replace :keycard-pin nil)
-       (navigation/navigate-to-cofx :keycard-pin nil)))))
+       (navigation/navigate-to :keycard-pin nil)))))
 
 (rf/defn dismiss-frozen-keycard-popover
   {:events [::frozen-keycard-popover-dismissed]}
@@ -107,22 +107,22 @@
       (empty? application-info)
       (rf/merge cofx
                 (common/hide-connection-sheet)
-                (navigation/navigate-to-cofx :not-keycard nil))
+                (navigation/navigate-to :not-keycard nil))
 
       (empty? key-uid)
       (rf/merge cofx
                 (common/hide-connection-sheet)
-                (navigation/navigate-to-cofx :keycard-blank nil))
+                (navigation/navigate-to :keycard-blank nil))
 
       multiaccount-mismatch?
       (rf/merge cofx
                 (common/hide-connection-sheet)
-                (navigation/navigate-to-cofx :keycard-wrong nil))
+                (navigation/navigate-to :keycard-wrong nil))
 
       (not paired?)
       (rf/merge cofx
                 (common/hide-connection-sheet)
-                (navigation/navigate-to-cofx :keycard-unpaired nil))
+                (navigation/navigate-to :keycard-unpaired nil))
 
       (and (zero? pin-retry-counter)
            (or (nil? puk-retry-counter)

src/status_im/keycard/onboarding.cljs

@@ -36,7 +36,7 @@
         (rf/merge cofx
                   {:utils/show-popup {:title   (i18n/label :t/error)
                                       :content (i18n/label :t/something-went-wrong)}}
-                  (navigation/navigate-to-cofx :keycard-authentication-method nil))))))
+                  (navigation/navigate-to :keycard-authentication-method nil))))))
 
 (rf/defn load-preparing-screen
   {:events [:keycard/load-preparing-screen]}
@@ -120,7 +120,7 @@
   [cofx]
   (rf/merge cofx
             (recovery-phrase-start-confirmation)
-            (navigation/navigate-to-cofx :keycard-onboarding-recovery-phrase-confirm-word1 nil)))
+            (navigation/navigate-to :keycard-onboarding-recovery-phrase-confirm-word1 nil)))
 
 (rf/defn recovery-phrase-next-word
   [{:keys [db]}]
@@ -143,7 +143,7 @@
                                     :on-verified :keycard/generate-and-load-key
                                     :current     []})
                          (assoc-in [:keycard :setup-step] :loading-keys))}
-                (navigation/navigate-to-cofx :keycard-onboarding-pin nil))
+                (navigation/navigate-to :keycard-onboarding-pin nil))
       (load-finishing-screen cofx))))
 
 (rf/defn recovery-phrase-confirm-word-next-pressed
@@ -178,10 +178,10 @@
     (rf/merge cofx
               {:keycard/check-nfc-enabled nil}
               (if (= flow :import)
-                (navigation/navigate-to-cofx :keycard-recovery-intro nil)
+                (navigation/navigate-to :keycard-recovery-intro nil)
                 (do
                   (common/listen-to-hardware-back-button)
-                  (navigation/navigate-to-cofx :keycard-onboarding-intro nil))))))
+                  (navigation/navigate-to :keycard-onboarding-intro nil))))))
 
 (rf/defn start-onboarding-flow
   {:events [:keycard/start-onboarding-flow]}
@@ -190,7 +190,7 @@
             {:db                        (assoc-in db [:keycard :flow] :create)
              :keycard/check-nfc-enabled nil}
             (common/listen-to-hardware-back-button)
-            (navigation/navigate-to-cofx :keycard-onboarding-intro nil)))
+            (navigation/navigate-to :keycard-onboarding-intro nil)))
 
 (rf/defn open-nfc-settings-pressed
   {:events [:keycard.onboarding.nfc-on/open-nfc-settings-pressed]}

src/status_im/keycard/recovery.cljs

@@ -1,7 +1,7 @@
 (ns status-im.keycard.recovery
   (:require [clojure.string :as string]
             [re-frame.core :as re-frame]
-            [status-im2.common.bottom-sheet.events :as bottom-sheet]
+            [status-im.bottom-sheet.events :as bottom-sheet]
             [status-im2.constants :as constants]
             [status-im.ethereum.core :as ethereum]
             [status-im.ethereum.eip55 :as eip55]
@@ -54,16 +54,16 @@
   (rf/merge cofx
             {:db       (-> db
                            (assoc-in [:keycard :setup-step] :pair))
-             :dispatch [:bottom-sheet/hide]}
+             :dispatch [:bottom-sheet/hide-old]}
             (common/listen-to-hardware-back-button)
-            (navigation/navigate-to-cofx :keycard-recovery-pair nil)))
+            (navigation/navigate-to :keycard-recovery-pair nil)))
 
 (rf/defn keycard-storage-selected-for-recovery
   {:events [:recovery.ui/keycard-storage-selected]}
   [{:keys [db] :as cofx}]
   (rf/merge cofx
             {:db (assoc-in db [:keycard :flow] :recovery)}
-            (navigation/navigate-to-cofx :keycard-recovery-enter-mnemonic nil)))
+            (navigation/navigate-to :keycard-recovery-enter-mnemonic nil)))
 
 (rf/defn start-import-flow
   {:events [::recover-with-keycard-pressed]}
@@ -74,13 +74,13 @@
                  (assoc-in [:keycard :flow] :import)
                  (assoc :recovered-account? true))
              :keycard/check-nfc-enabled nil}
-            (bottom-sheet/hide-bottom-sheet)
-            (navigation/navigate-to-cofx :keycard-recovery-intro nil)))
+            (bottom-sheet/hide-bottom-sheet-old)
+            (navigation/navigate-to :keycard-recovery-intro nil)))
 
 (rf/defn access-key-pressed
   {:events [:multiaccounts.recover.ui/recover-multiaccount-button-pressed]}
   [_]
-  {:dispatch [:bottom-sheet/show-sheet :recover-sheet]})
+  {:dispatch [:bottom-sheet/show-sheet-old :recover-sheet]})
 
 (rf/defn recovery-keycard-selected
   {:events [:recovery.ui/keycard-option-pressed]}
@@ -89,7 +89,7 @@
             {:db                        (assoc-in db [:keycard :flow] :recovery)
              :keycard/check-nfc-enabled nil}
             (common/listen-to-hardware-back-button)
-            (navigation/navigate-to-cofx :keycard-onboarding-intro nil)))
+            (navigation/navigate-to :keycard-onboarding-intro nil)))
 
 (rf/defn cancel-pressed
   {:events [::cancel-pressed]}
@@ -126,10 +126,10 @@
                          :keycard dissoc
                          :multiaccount-wallet-address
                          :multiaccount-whisper-public-key)}
-            (navigation/navigate-to-cofx (if platform/android?
-                                           :notifications-settings
-                                           :welcome)
-                                         nil)))
+            (navigation/navigate-to (if platform/android?
+                                      :notifications-settings
+                                      :welcome)
+                                    nil)))
 
 (rf/defn intro-wizard
   {:events [:multiaccounts.create.ui/intro-wizard]}
@@ -141,7 +141,7 @@
                        (dissoc :restored-account?))}
               (multiaccounts.create/prepare-intro-wizard)
               (if (pos? (count accs))
-                (navigation/navigate-to-cofx :get-your-keys nil)
+                (navigation/navigate-to :get-your-keys nil)
                 (navigation/set-stack-root :onboarding [:get-your-keys])))))
 
 (rf/defn recovery-no-key
@@ -238,7 +238,7 @@
                                                        :t/keycard-can-use-with-new-passcode
                                                        :t/keycard-backup-success-body))}}
             (cond
-              (multiaccounts.model/logged-in? cofx)
+              (multiaccounts.model/logged-in? db)
               (navigation/set-stack-root :profile-stack [:my-profile :keycard-settings])
 
               (:multiaccounts/login db)

src/status_im/keycard/unpair.cljs

@@ -87,7 +87,7 @@
                                  :content (i18n/label :t/card-unpaired)}}
      (common/clear-on-card-connected)
      (remove-pairing-from-multiaccount nil)
-     (navigation/navigate-to-cofx :keycard-settings nil))))
+     (navigation/navigate-to :keycard-settings nil))))
 
 (rf/defn on-unpair-error
   {:events [:keycard.callback/on-unpair-error]}
@@ -103,7 +103,7 @@
              :utils/show-popup             {:title   ""
                                             :content (i18n/label :t/something-went-wrong)}}
             (common/clear-on-card-connected)
-            (navigation/navigate-to-cofx :keycard-settings nil)))
+            (navigation/navigate-to :keycard-settings nil)))
 
 (rf/defn remove-key-with-unpair
   {:events [:keycard/remove-key-with-unpair]}

src/status_im/keycard/wallet.cljs

@@ -1,5 +1,5 @@
 (ns status-im.keycard.wallet
-  (:require [status-im2.common.bottom-sheet.events :as bottom-sheet]
+  (:require [status-im.bottom-sheet.events :as bottom-sheet]
             [status-im2.constants :as constants]
             [status-im.ethereum.core :as ethereum]
             [status-im.ethereum.eip55 :as eip55]
@@ -17,7 +17,7 @@
                           (assoc-in [:keycard :pin :enter-step] :export-key)
                           (update-in [:keycard :pin] dissoc :export-key))
     :dismiss-keyboard nil}
-   (bottom-sheet/show-bottom-sheet {:view {:content add-new.views/pin}})))
+   (bottom-sheet/show-bottom-sheet-old {:view {:content add-new.views/pin}})))
 
 (rf/defn verify-pin-with-delay
   [cofx]
@@ -29,7 +29,7 @@
 (rf/defn hide-pin-sheet
   {:events [:keycard/new-account-pin-sheet-hide]}
   [cofx]
-  (bottom-sheet/hide-bottom-sheet cofx))
+  (bottom-sheet/hide-bottom-sheet-old cofx))
 
 (rf/defn generate-new-keycard-account
   {:events [:wallet.accounts/generate-new-keycard-account]}

src/status_im/mailserver/core.cljs

@@ -255,7 +255,7 @@
               (set-input :id id)
               (set-input :url (str url))
               (set-input :name (str name))
-              (navigation/navigate-to-cofx :edit-mailserver nil))))
+              (navigation/navigate-to :edit-mailserver nil))))
 
 (defn mailserver->rpc
   [mailserver current-fleet]
@@ -411,4 +411,4 @@
   [{:keys [db] :as cofx}]
   (rf/merge cofx
             {:db (dissoc db :mailserver.edit/mailserver)}
-            (navigation/navigate-to-cofx :edit-mailserver nil)))
+            (navigation/navigate-to :edit-mailserver nil)))

src/status_im/mobile_sync_settings/core.cljs

@@ -1,5 +1,5 @@
 (ns status-im.mobile-sync-settings.core
-  (:require [status-im2.common.bottom-sheet.events :as bottom-sheet]
+  (:require [status-im.bottom-sheet.events :as bottom-sheet]
             [status-im2.contexts.add-new-contact.events :as add-new-contact]
             [status-im.mailserver.core :as mailserver]
             [status-im.multiaccounts.model :as multiaccounts.model]
@@ -21,7 +21,7 @@
 (rf/defn on-network-status-change
   [{:keys [db] :as cofx}]
   (let [initialized?                       (get db :network-status/initialized?)
-        logged-in?                         (multiaccounts.model/logged-in? cofx)
+        logged-in?                         (multiaccounts.model/logged-in? db)
         {:keys [remember-syncing-choice?]} (:multiaccount db)]
     (apply
      rf/merge
@@ -33,7 +33,7 @@
             (not remember-syncing-choice?)
             (not= :create-multiaccount (:view-id db)))
 
-       [(bottom-sheet/show-bottom-sheet
+       [(bottom-sheet/show-bottom-sheet-old
          {:view :mobile-network})
         (sheet-defaults)]
 
@@ -42,13 +42,13 @@
        ;; no reason to restart wallet.
        (and logged-in? initialized?)
        [(mailserver/process-next-messages-request)
-        (bottom-sheet/hide-bottom-sheet)
+        (bottom-sheet/hide-bottom-sheet-old)
         (wallet/restart-wallet-service nil)
         (add-new-contact/set-new-identity-reconnected)]
 
        logged-in?
        [(mailserver/process-next-messages-request)
-        (bottom-sheet/hide-bottom-sheet)]))))
+        (bottom-sheet/hide-bottom-sheet-old)]))))
 
 (defn apply-settings
   ([sync?] (apply-settings sync? :default))
@@ -115,12 +115,10 @@
   [cofx]
   (rf/merge
    cofx
-   (bottom-sheet/hide-bottom-sheet)
-   (navigation/navigate-to-cofx :mobile-network-settings nil)))
+   (bottom-sheet/hide-bottom-sheet-old)
+   (navigation/navigate-to :mobile-network-settings nil)))
 
 (rf/defn mobile-network-show-offline-sheet
   {:events [:mobile-network/show-offline-sheet]}
   [cofx]
-  (bottom-sheet/show-bottom-sheet
-   cofx
-   {:view :mobile-network-offline}))
+  (bottom-sheet/hide-bottom-sheet-old cofx))

src/status_im/multiaccounts/core.cljs

@@ -2,7 +2,7 @@
   (:require [clojure.string :as string]
             [quo.platform :as platform]
             [re-frame.core :as re-frame]
-            [status-im2.common.bottom-sheet.events :as bottom-sheet]
+            [status-im.bottom-sheet.events :as bottom-sheet]
             [status-im.multiaccounts.update.core :as multiaccounts.update]
             [status-im.native-module.core :as native-module]
             [utils.re-frame :as rf]
@@ -147,12 +147,12 @@
            [:dark :light colors/neutral-100]
            [:light :dark colors/white])]
      (theme/set-theme theme)
-     (re-frame/dispatch [:change-root-status-bar-style
+     (re-frame/dispatch [:change-shell-status-bar-style
                          (if (shell.animation/home-stack-open?) status-bar-theme :light)])
      (when reload-ui?
        (hot-reload/reload)
        (when-not (= view-id :shell-stack)
-         (re-frame/dispatch [:change-root-nav-bar-color nav-bar-color]))))))
+         (re-frame/dispatch [:change-shell-nav-bar-color nav-bar-color]))))))
 
 (rf/defn switch-appearance
   {:events [:multiaccounts.ui/appearance-switched]}
@@ -198,7 +198,7 @@
                                 :params     [key-uid (clean-path path) ax ay bx by]
                                 ;; NOTE: In case of an error we can show a toast error
                                 :on-success #(re-frame/dispatch [::update-local-picture %])}]}
-              (bottom-sheet/hide-bottom-sheet))))
+              (bottom-sheet/hide-bottom-sheet-old))))
 
 (rf/defn save-profile-picture-from-url
   {:events [::save-profile-picture-from-url]}
@@ -209,7 +209,7 @@
                                 :params     [key-uid url]
                                 :on-error   #(log/error "::save-profile-picture-from-url error" %)
                                 :on-success #(re-frame/dispatch [::update-local-picture %])}]}
-              (bottom-sheet/hide-bottom-sheet))))
+              (bottom-sheet/hide-bottom-sheet-old))))
 
 (comment
   (re-frame/dispatch
@@ -227,7 +227,7 @@
                                 ;; with a toast error
                                 :on-success #(log/info "[multiaccount] Delete profile image" %)}]}
               (multiaccounts.update/optimistic :images nil)
-              (bottom-sheet/hide-bottom-sheet))))
+              (bottom-sheet/hide-bottom-sheet-old))))
 
 (rf/defn get-profile-picture
   [cofx]

src/status_im/multiaccounts/create/core.cljs

@@ -94,16 +94,16 @@
 (rf/defn multiaccount-generate-and-derive-addresses-success
   {:events [:multiaccount-generate-and-derive-addresses-success]}
   [{:keys [db]} result]
-  {:db             (update db
-                           :intro-wizard
-                           (fn [data]
-                             (-> data
-                                 (dissoc :processing?)
-                                 (assoc :multiaccounts         result
-                                        :selected-storage-type :default
-                                        :selected-id           (-> result first :id)
-                                        :step                  :choose-key))))
-   :navigate-to-fx :choose-name})
+  {:db          (update db
+                        :intro-wizard
+                        (fn [data]
+                          (-> data
+                              (dissoc :processing?)
+                              (assoc :multiaccounts         result
+                                     :selected-storage-type :default
+                                     :selected-id           (-> result first :id)
+                                     :step                  :choose-key))))
+   :navigate-to :choose-name})
 
 (rf/defn generate-and-derive-addresses
   {:events [:generate-and-derive-addresses]}

src/status_im/multiaccounts/key_storage/core.cljs

@@ -1,7 +1,7 @@
 (ns status-im.multiaccounts.key-storage.core
   (:require [clojure.string :as string]
             [re-frame.core :as re-frame]
-            [status-im2.common.bottom-sheet.events :as bottom-sheet]
+            [status-im.bottom-sheet.events :as bottom-sheet]
             [status-im.ethereum.core :as ethereum]
             [status-im.ethereum.mnemonic :as mnemonic]
             [utils.i18n :as i18n]
@@ -21,10 +21,10 @@
 (rf/defn key-and-storage-management-pressed
   "This event can be dispatched before login and from profile and needs to redirect accordingly"
   {:events [::key-and-storage-management-pressed]}
-  [cofx]
-  (navigation/navigate-to-cofx
+  [{:keys [db] :as cofx}]
+  (navigation/navigate-to
    cofx
-   (if (multiaccounts.model/logged-in? cofx)
+   (if (multiaccounts.model/logged-in? db)
      :actions-logged-in
      :actions-not-logged-in)
    nil))
@@ -60,7 +60,7 @@
   (rf/merge
    cofx
    {:db (assoc db :recovered-account? true)}
-   (navigation/navigate-to-cofx :seed-phrase nil)))
+   (navigation/navigate-to :seed-phrase nil)))
 
 (rf/defn seed-phrase-input-changed
   {:events [::seed-phrase-input-changed]}
@@ -85,7 +85,7 @@
   (let [backup? (get-in db [:keycard :creating-backup?])]
     (if backup?
       (keycard.backup/start-keycard-backup cofx)
-      (navigation/navigate-to-cofx cofx :storage nil))))
+      (navigation/navigate-to cofx :storage nil))))
 
 (defn validate-seed-against-key-uid
   "Check if the key-uid was generated with the given seed-phrase"
@@ -173,7 +173,7 @@ We don't need to take the exact steps, just set the required state and redirect
 "
 (rf/defn import-multiaccount
   [{:keys [db] :as cofx}]
-  {:dispatch [:bottom-sheet/hide]
+  {:dispatch [:bottom-sheet/hide-old]
    ::multiaccounts.recover/import-multiaccount
    {:passphrase    (get-in db [:multiaccounts/key-storage :seed-phrase])
     :password      nil
@@ -183,7 +183,7 @@ We don't need to take the exact steps, just set the required state and redirect
   {:events [::delete-multiaccount-and-init-keycard-onboarding]}
   [{:keys [db] :as cofx}]
   (rf/merge
-   {:dispatch [:bottom-sheet/hide]
+   {:dispatch [:bottom-sheet/hide-old]
     :db       (assoc-in db [:multiaccounts/key-storage :reset-db-checked?] true)}
    (import-multiaccount)))
 
@@ -192,7 +192,7 @@ We don't need to take the exact steps, just set the required state and redirect
   [{:keys [db] :as cofx}]
   (if (get-in db [:multiaccounts/key-storage :reset-db-checked?])
     (popover/show-popover cofx {:view :transfer-multiaccount-to-keycard-warning})
-    (bottom-sheet/show-bottom-sheet cofx {:view :migrate-account-password})))
+    (bottom-sheet/hide-bottom-sheet-old cofx)))
 
 (rf/defn skip-password-pressed
   {:events [::skip-password-pressed]}
@@ -248,14 +248,14 @@ We don't need to take the exact steps, just set the required state and redirect
                      (dissoc :multiaccounts/key-storage))}
             (popover/hide-popover)
             (common/listen-to-hardware-back-button)
-            (navigation/navigate-to-cofx :keycard-onboarding-intro nil)))
+            (navigation/navigate-to :keycard-onboarding-intro nil)))
 
 (rf/defn goto-multiaccounts-screen
   {:events [::hide-popover-and-goto-multiaccounts-screen]}
   [cofx _]
   (rf/merge cofx
             (popover/hide-popover)
-            (navigation/navigate-to-cofx :multiaccounts nil)))
+            (navigation/navigate-to :multiaccounts nil)))
 
 (rf/defn confirm-logout-and-goto-key-storage
   {:events [::confirm-logout-and-goto-key-storage]}

src/status_im/multiaccounts/login/core.cljs

@@ -365,25 +365,6 @@
   [_]
   (status/get-node-config #(re-frame/dispatch [::get-node-config-callback %])))
 
-(rf/defn redirect-to-root
-  "Decides which root should be initialised depending on user and app state"
-  [{:keys [db] :as cofx}]
-  (cond
-    (get db :local-pairing/completed-pairing?)
-    {:dispatch [:syncing/pairing-completed]}
-
-    (get db :onboarding-2/new-account?)
-    {:dispatch [:onboarding-2/finalize-setup]}
-
-    (get db :tos/accepted?)
-    (rf/merge
-     cofx
-     (multiaccounts/switch-theme nil :shell-stack)
-     (navigation/init-root :shell-stack))
-
-    :else
-    {:dispatch [:init-root :tos]}))
-
 (rf/defn get-settings-callback
   {:events [::get-settings-callback]}
   [{:keys [db] :as cofx} settings]
@@ -416,8 +397,7 @@
               (logging/set-log-level (:log-level multiaccount))
               (activity-center/notifications-fetch-pending-contact-requests)
               (activity-center/update-seen-state)
-              (activity-center/notifications-fetch-unread-count)
-              (redirect-to-root))))
+              (activity-center/notifications-fetch-unread-count))))
 
 (re-frame/reg-fx
  ::open-last-chat
@@ -492,10 +472,24 @@
         keychain/auth-method-biometric
         keychain/auth-method-password))))
 
+(defn redirect-to-root
+  "Decides which root should be initialised depending on user and app state"
+  [db]
+  (cond
+    (get db :onboarding-2/new-account?)
+    (re-frame/dispatch [:onboarding-2/finalize-setup])
+
+    (get db :tos/accepted?)
+    (re-frame/dispatch [:init-root :shell-stack])
+
+    :else
+    (re-frame/dispatch [:init-root :tos])))
+
 (rf/defn login-only-events
   [{:keys [db] :as cofx} key-uid password save-password?]
-  (let [auth-method     (:auth-method db)
-        new-auth-method (get-new-auth-method auth-method save-password?)]
+  (let [auth-method          (:auth-method db)
+        new-auth-method      (get-new-auth-method auth-method save-password?)
+        pairing-in-progress? (get-in db [:syncing :pairing-in-progress?])]
     (log/debug "[login] login-only-events"
                "auth-method"     auth-method
                "new-auth-method" new-auth-method)
@@ -503,7 +497,9 @@
               {:db (assoc db :chats/loading? true)
                :json-rpc/call
                [{:method     "settings_getSettings"
-                 :on-success #(re-frame/dispatch [::get-settings-callback %])}]}
+                 :on-success #(do (re-frame/dispatch [::get-settings-callback %])
+                                  (when-not pairing-in-progress?
+                                    (redirect-to-root db)))}]}
               (notifications/load-notification-preferences)
               (when save-password?
                 (keychain/save-user-password key-uid password))
@@ -624,12 +620,12 @@
     (if password
       (rf/merge
        cofx
-       {:db           (update-in db
-                                 [:multiaccounts/login]
-                                 assoc
-                                 :password       password
-                                 :save-password? true)
-        :init-root-fx :progress}
+       {:db       (update-in db
+                             [:multiaccounts/login]
+                             assoc
+                             :password       password
+                             :save-password? true)
+        :set-root :progress}
        login)
       (rf/merge
        cofx
@@ -639,10 +635,10 @@
                   (assoc-in [:keycard :pin :status] nil)
                   (assoc-in [:keycard :pin :login] []))})
        #(if keycard-account?
-          {:init-root-fx :multiaccounts-keycard}
-          {:init-root-fx :profiles})
+          {:set-root :multiaccounts-keycard}
+          {:set-root :profiles})
        #(when goto-key-storage?
-          (navigation/navigate-to-cofx % :actions-not-logged-in nil))))))
+          (navigation/navigate-to % :actions-not-logged-in nil))))))
 
 (rf/defn get-credentials
   [{:keys [db] :as cofx} key-uid]
@@ -728,7 +724,7 @@
 (rf/defn welcome-lets-go
   {:events [:welcome-lets-go]}
   [_]
-  {:init-root-fx :shell-stack})
+  {:set-root :shell-stack})
 
 (rf/defn multiaccount-selected
   {:events [:multiaccounts.login.ui/multiaccount-selected]}
@@ -741,7 +737,7 @@
      cofx
      (merge
       {:db (update db :keycard dissoc :application-info)}
-      (when keycard-multiaccount? {:navigate-to-fx :keycard-login-pin}))
+      (when keycard-multiaccount? {:navigate-to :keycard-login-pin}))
      (open-login (select-keys multiaccount [:key-uid :name :public-key :identicon :images])))))
 
 (rf/defn hide-keycard-banner

src/status_im/multiaccounts/logout/core.cljs

@@ -14,7 +14,7 @@
   [{:keys [db] :as cofx} {:keys [auth-method logout?]}]
   (let [key-uid (get-in db [:multiaccount :key-uid])]
     (rf/merge cofx
-              {:init-root-fx                         :progress
+              {:set-root                             :progress
                :chat.ui/clear-inputs                 nil
                :chat.ui/clear-inputs-old             nil
                :shell/reset-bottom-tabs              nil

src/status_im/multiaccounts/model.cljs

@@ -1,9 +1,8 @@
 (ns status-im.multiaccounts.model)
 
 (defn logged-in?
-  [cofx]
-  (boolean
-   (get-in cofx [:db :multiaccount])))
+  [{:keys [multiaccount]}]
+  (boolean multiaccount))
 
 (defn credentials
   [cofx]

src/status_im/multiaccounts/model_test.cljs

@@ -4,6 +4,6 @@
 
 (deftest logged-in-test
   (testing "multiaccount is defined"
-    (is (multiaccounts.model/logged-in? {:db {:multiaccount {}}})))
+    (is (multiaccounts.model/logged-in? {:multiaccount {}})))
   (testing "multiaccount is not there"
-    (is (not (multiaccounts.model/logged-in? {:db {}})))))
+    (is (not (multiaccounts.model/logged-in? {})))))

src/status_im/multiaccounts/recover/core.cljs

@@ -1,7 +1,7 @@
 (ns status-im.multiaccounts.recover.core
   (:require [clojure.string :as string]
             [re-frame.core :as re-frame]
-            [status-im2.common.bottom-sheet.events :as bottom-sheet]
+            [status-im.bottom-sheet.events :as bottom-sheet]
             [status-im2.constants :as constants]
             [status-im.ethereum.core :as ethereum]
             [status-im.ethereum.mnemonic :as mnemonic]
@@ -142,7 +142,7 @@
                   :step :recovery-success)}
      (when (existing-account? multiaccounts key-uid)
        (show-existing-multiaccount-alert key-uid))
-     (navigation/navigate-to-cofx :recover-multiaccount-success nil))))
+     (navigation/navigate-to :recover-multiaccount-success nil))))
 
 (rf/defn enter-phrase-pressed
   {:events [::enter-phrase-pressed]}
@@ -159,8 +159,8 @@
                     :forward-action         :multiaccounts.recover/enter-phrase-next-pressed}
                    :recovered-account? true)
             (update :keycard dissoc :flow))}
-   (bottom-sheet/hide-bottom-sheet)
-   (navigation/navigate-to-cofx :recover-multiaccount-enter-phrase nil)))
+   (bottom-sheet/hide-bottom-sheet-old)
+   (navigation/navigate-to :recover-multiaccount-enter-phrase nil)))
 
 (rf/defn proceed-to-import-mnemonic
   {:events [:multiaccounts.recover/phrase-validated]}
@@ -234,7 +234,7 @@
       {:dispatch [:recovery.ui/keycard-option-pressed]}
       (rf/merge cofx
                 {:db (update db :intro-wizard assoc :step :create-code)}
-                (navigation/navigate-to-cofx :create-password nil)))))
+                (navigation/navigate-to :create-password nil)))))
 
 (rf/defn re-encrypt-pressed
   {:events [:multiaccounts.recover/re-encrypt-pressed]}
@@ -246,7 +246,7 @@
                          :step :select-key-storage
                          :selected-storage-type :default)}
             (if (nfc/nfc-supported?)
-              (navigation/navigate-to-cofx :select-key-storage nil)
+              (navigation/navigate-to :select-key-storage nil)
               (select-storage-next-pressed))))
 
 (rf/defn confirm-password-next-button-pressed

src/status_im/multiaccounts/update/core.cljs

@@ -1,17 +1,29 @@
 (ns status-im.multiaccounts.update.core
-  (:require [status-im2.constants :as constants]
-            [utils.re-frame :as rf]
-            [status-im.utils.types :as types]
-            [taoensso.timbre :as log]))
+  (:require [status-im.utils.types :as types]
+            [status-im2.constants :as constants]
+            [taoensso.timbre :as log]
+            [utils.re-frame :as rf]))
 
-(rf/defn send-multiaccount-update
-  [{:keys [db] :as cofx}]
-  (let [multiaccount                          (:multiaccount db)
-        {:keys [name preferred-name address]} multiaccount]
+(rf/defn send-contact-update
+  [{:keys [db]}]
+  (let [{:keys [name preferred-name display-name address]} (:multiaccount db)]
     {:json-rpc/call [{:method     "wakuext_sendContactUpdates"
-                      :params     [(or preferred-name name) ""]
+                      :params     [(or preferred-name display-name name) ""]
                       :on-success #(log/debug "sent contact update")}]}))
 
+(rf/defn update-multiaccount-account-name
+  "This updates the profile name in the profile list before login"
+  {:events [:multiaccounts.ui/update-name]}
+  [{:keys [db] :as cofx} raw-multiaccounts-from-status-go]
+  (let [{:keys [key-uid name preferred-name
+                display-name]} (:multiaccount db)
+        account                (some #(and (= (:key-uid %) key-uid) %) raw-multiaccounts-from-status-go)]
+    (when-let [new-name (and account (or preferred-name display-name name))]
+      (rf/merge cofx
+                {:json-rpc/call [{:method     "multiaccounts_updateAccount"
+                                  :params     [(assoc account :name new-name)]
+                                  :on-success #(log/debug "sent multiaccount update")}]}))))
+
 (rf/defn multiaccount-update
   "Takes effects (containing :db) + new multiaccount fields, adds all effects necessary for multiaccount update.
   Optionally, one can specify a success-event to be dispatched after fields are persisted."
@@ -25,17 +37,21 @@
       (throw
        (js/Error.
         "Please shake the phone to report this error and restart the app. multiaccount is currently empty, which means something went wrong when trying to update it with"))
-      (rf/merge cofx
-                {:db (if setting-value
-                       (assoc-in db [:multiaccount setting] setting-value)
-                       (update db :multiaccount dissoc setting))
-                 :json-rpc/call
-                 [{:method     "settings_saveSetting"
-                   :params     [setting setting-value]
-                   :on-success on-success}]}
-                (when (and (not dont-sync?)
-                           (#{:name :prefered-name} setting))
-                  (send-multiaccount-update))))))
+      (rf/merge
+       cofx
+       {:db (if setting-value
+              (assoc-in db [:multiaccount setting] setting-value)
+              (update db :multiaccount dissoc setting))
+        :json-rpc/call
+        [{:method     "settings_saveSetting"
+          :params     [setting setting-value]
+          :on-success on-success}]}
+
+       (when (#{:name :preferred-name} setting)
+         (constantly {:setup/open-multiaccounts #(rf/dispatch [:multiaccounts.ui/update-name %])}))
+
+       (when (and (not dont-sync?) (#{:name :preferred-name} setting))
+         (send-contact-update))))))
 
 (rf/defn clean-seed-phrase
   "A helper function that removes seed phrase from storage."
@@ -44,7 +60,7 @@
 
 (defn augment-synchronized-recent-stickers
   "Add 'url' parameter to stickers that are synchronized from other devices.
-   It is not sent from aanother devices but we have it in our db."
+   It is not sent from another devices but we have it in our db."
   [synced-stickers stickers-from-db]
   (mapv #(assoc %
                 :url

src/status_im/multiaccounts/update/core_test.cljs

@@ -1,5 +1,5 @@
 (ns status-im.multiaccounts.update.core-test
-  (:require [clojure.test :refer-macros [deftest is]]
+  (:require [clojure.test :refer-macros [deftest is testing]]
             [status-im.multiaccounts.update.core :as multiaccounts.update]))
 
 (deftest test-multiaccount-update
@@ -21,3 +21,36 @@
         json-rpc (into #{} (map :method (:json-rpc/call efx)))]
     (is (json-rpc "settings_saveSetting"))
     (is (nil? (get-in efx [:db :multiaccount :mnemonic])))))
+
+(deftest test-update-multiaccount-account-name
+  (let [cofx                             {:db {:multiaccount {:key-uid        1
+                                                              :name           "name"
+                                                              :preferred-name "preferred-name"
+                                                              :display-name   "display-name"}}}
+        raw-multiaccounts-from-status-go [{:key-uid 1 :name "old-name"}]]
+    (testing "wrong account"
+      (is (nil? (multiaccounts.update/update-multiaccount-account-name cofx []))))
+    (testing "name priority preferred-name > display-name > name"
+      (let [new-account-name= (fn [efx new-name]
+                                (-> efx
+                                    :json-rpc/call
+                                    first
+                                    :params
+                                    first
+                                    :name
+                                    (= new-name)))]
+        (is (new-account-name=
+             (multiaccounts.update/update-multiaccount-account-name
+              cofx
+              raw-multiaccounts-from-status-go)
+             "preferred-name"))
+        (is (new-account-name=
+             (multiaccounts.update/update-multiaccount-account-name
+              (update-in cofx [:db :multiaccount] dissoc :preferred-name)
+              raw-multiaccounts-from-status-go)
+             "display-name"))
+        (is (new-account-name=
+             (multiaccounts.update/update-multiaccount-account-name
+              (update-in cofx [:db :multiaccount] dissoc :preferred-name :display-name)
+              raw-multiaccounts-from-status-go)
+             "name"))))))

src/status_im/network/core.cljs

@@ -202,4 +202,4 @@
 (rf/defn open-network-details
   {:events [::network-entry-pressed]}
   [cofx network]
-  (navigation/navigate-to-cofx cofx :network-details {:networks/selected-network network}))
+  (navigation/navigate-to cofx :network-details {:networks/selected-network network}))

src/status_im/pairing/core.cljs

@@ -73,7 +73,7 @@
   [{:keys [db] :as cofx}]
   (rf/merge cofx
             {:db (assoc-in db [:pairing/prompt-user-pop-up] false)}
-            (navigation/navigate-to-cofx :installations nil)))
+            (navigation/navigate-to :installations nil)))
 
 (rf/defn prompt-user-on-new-installation
   [{:keys [db]}]
@@ -247,11 +247,11 @@
   [cofx installation-id]
   (rf/merge cofx
             (enable installation-id)
-            (multiaccounts.update/send-multiaccount-update)))
+            (multiaccounts.update/send-contact-update)))
 
 (rf/defn disable-installation-success
   {:events [:pairing.callback/disable-installation-success]}
   [cofx installation-id]
   (rf/merge cofx
             (disable installation-id)
-            (multiaccounts.update/send-multiaccount-update)))
+            (multiaccounts.update/send-contact-update)))

src/status_im/qr_scanner/core.cljs

@@ -66,7 +66,7 @@
       (and public-key own)
       (rf/merge cofx
                 {:pop-to-root-fx :shell-stack}
-                (navigation/navigate-to-cofx :my-profile nil))
+                (navigation/navigate-to :my-profile nil))
 
       (and public-key (not own))
       (rf/merge cofx

src/status_im/signals/core.cljs

@@ -60,27 +60,29 @@
   [{:keys [db] :as cofx} event]
   (log/info "local pairing signal received"
             {:event event})
-  (let [connection-success?             (= (:type event)
-                                           constants/local-pairing-event-connection-success)
+  (let [connection-success?             (and (= (:type event)
+                                                constants/local-pairing-event-connection-success)
+                                             (= (:action event)
+                                                constants/local-pairing-action-connect))
         error-on-pairing?               (contains? constants/local-pairing-event-errors (:type event))
         completed-pairing?              (and (= (:type event)
-                                                constants/local-pairing-event-process-success)
+                                                constants/local-pairing-event-transfer-success)
                                              (= (:action event)
-                                                constants/local-pairing-action-pairing-account))
-        logged-in?                      (multiaccounts.model/logged-in? cofx)
+                                                constants/local-pairing-action-pairing-installation))
+        logged-in?                      (multiaccounts.model/logged-in? db)
         ;; since `connection-success` event is received on both sender and receiver devices
         ;; we check the `logged-in?` status to identify the receiver and take the user to next screen
         navigate-to-syncing-devices?    (and connection-success? (not logged-in?))
         user-in-syncing-devices-screen? (= (:view-id db) :syncing-devices)]
     (merge {:db (cond-> db
                   connection-success?
-                  (assoc :local-pairing/completed-pairing? false)
+                  (assoc-in [:syncing :pairing-in-progress?] true)
 
                   error-on-pairing?
-                  (dissoc :local-pairing/completed-pairing?)
+                  (update-in [:syncing :pairing-in-progress?] dissoc)
 
                   completed-pairing?
-                  (assoc :local-pairing/completed-pairing? true))}
+                  (assoc-in [:syncing :pairing-in-progress?] false))}
            (when navigate-to-syncing-devices?
              {:dispatch [:navigate-to :syncing-devices]})
            (when (and error-on-pairing? user-in-syncing-devices-screen?)
@@ -89,7 +91,9 @@
                              :icon-color     colors/danger-50
                              :override-theme :light
                              :text           (i18n/label :t/error-syncing-connection-failed)}]
-                           [:navigate-back]]}))))
+                           [:navigate-back]]})
+           (when completed-pairing?
+             {:dispatch [:syncing/pairing-completed]}))))
 
 (rf/defn process
   {:events [:signals/signal-received]}

src/status_im/signing/gas.cljs

@@ -1,7 +1,7 @@
 (ns status-im.signing.gas
   (:require [clojure.string :as string]
             [re-frame.core :as re-frame]
-            [status-im2.common.bottom-sheet.events :as bottom-sheet]
+            [status-im.bottom-sheet.events :as bottom-sheet]
             [status-im.ethereum.core :as ethereum]
             [utils.i18n :as i18n]
             [status-im.popover.core :as popover]
@@ -277,7 +277,7 @@
                                                                    max-priority-fee})]
     (rf/merge cofx
               {:db (assoc db :signing/edit-fee edit-fee)}
-              (bottom-sheet/show-bottom-sheet {:view sheet-opts}))))
+              (bottom-sheet/show-bottom-sheet-old {:view sheet-opts}))))
 
 (rf/defn submit-fee
   {:events [:signing.edit-fee.ui/submit]}
@@ -300,14 +300,14 @@
                              :maxFeePerGas         (money/->wei :gwei (:value-number maxFeePerGas))
                              :maxPriorityFeePerGas (money/->wei :gwei
                                                                 (:value-number maxPriorityFeePerGas)))}
-                (bottom-sheet/hide-bottom-sheet)))))
+                (bottom-sheet/hide-bottom-sheet-old)))))
 
 (rf/defn submit-nonce
   {:events [:signing.nonce/submit]}
   [{db :db :as cofx} nonce]
   (rf/merge cofx
             {:db (assoc-in db [:signing/tx :nonce] (if (string/blank? nonce) nil nonce))}
-            (bottom-sheet/hide-bottom-sheet)))
+            (bottom-sheet/hide-bottom-sheet-old)))
 
 (re-frame/reg-fx
  :signing/update-gas-price

src/status_im/ui/components/connectivity/view.cljs

@@ -80,7 +80,7 @@
 
 (defn hide-sheet-and-dispatch
   [event]
-  (re-frame/dispatch [:bottom-sheet/hide])
+  (re-frame/dispatch [:bottom-sheet/hide-old])
   (re-frame/dispatch event))
 
 (defview connectivity-sheet
@@ -187,6 +187,6 @@
       [quo/button
        {:type                :icon
         :accessibility-label (str "conn-button-" (name icon))
-        :on-press            #(re-frame/dispatch [:bottom-sheet/show-sheet
+        :on-press            #(re-frame/dispatch [:bottom-sheet/show-sheet-old
                                                   {:content connectivity-sheet}])
         :theme               (if (= (:peers state) :offline) :negative :secondary)} icon])))

src/status_im/ui/components/invite/views.cljs

@@ -19,7 +19,7 @@
     :icon                :main-icons/share
     :accessibility-label accessibility-label
     :on-press            (fn []
-                           (re-frame/dispatch [:bottom-sheet/hide])
+                           (re-frame/dispatch [:bottom-sheet/hide-old])
                            (js/setTimeout
                             #(re-frame/dispatch [::invite.events/share-link nil])
                             250))}])

src/status_im/ui/components/topbar.cljs

@@ -9,7 +9,7 @@
   [modal? {:keys [on-press label icon]}]
   (cond-> {:icon                (if modal? :i/close :i/arrow-left)
            :accessibility-label :back-button
-           :on-press            #(re-frame/dispatch [:navigate-back :bottom-sheet/hide])}
+           :on-press            #(re-frame/dispatch [:navigate-back :bottom-sheet/hide-old])}
     on-press
     (assoc :on-press on-press)
 

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

@@ -18,7 +18,7 @@
 
 (defn hide-sheet-and-dispatch
   [event]
-  (re-frame/dispatch [:bottom-sheet/hide])
+  (re-frame/dispatch [:bottom-sheet/hide-old])
   (js/setTimeout #(re-frame/dispatch event) 200))
 
 (defn list-item
@@ -30,7 +30,7 @@
         :on-press            #(re-frame/dispatch [:browser.ui/open-url url])
         :on-long-press       (fn []
                                (re-frame/dispatch
-                                [:bottom-sheet/show-sheet
+                                [:bottom-sheet/show-sheet-old
                                  {:content (fn []
                                              [react/view {:flex 1}
                                               [quo/list-item
@@ -109,7 +109,7 @@
      [quo/button
       {:accessibility-label :select-account
        :type                :scale
-       :on-press            #(re-frame/dispatch [:bottom-sheet/show-sheet
+       :on-press            #(re-frame/dispatch [:bottom-sheet/show-sheet-old
                                                  {:content (accounts/accounts-list accounts
                                                                                    dapps-account)}])}
       [react/view (styles/dapps-account color)

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

@@ -15,7 +15,7 @@
 
 (defn hide-sheet-and-dispatch
   [event]
-  (re-frame/dispatch [:bottom-sheet/hide])
+  (re-frame/dispatch [:bottom-sheet/hide-old])
   (re-frame/dispatch event))
 
 (defn wallet-connection
@@ -81,7 +81,7 @@
             :accessibility-label :share
             :icon                :main-icons/share
             :on-press            (fn []
-                                   (re-frame/dispatch-sync [:bottom-sheet/hide])
+                                   (re-frame/dispatch-sync [:bottom-sheet/hide-old])
                                    (js/setTimeout
                                     #(browser/share-link url)
                                     200))}]
@@ -103,7 +103,7 @@
            :accessibility-label :connected-account
            :chevron             true
            :on-press            #(hide-sheet-and-dispatch
-                                  [:bottom-sheet/show-sheet
+                                  [:bottom-sheet/show-sheet-old
                                    {:content (wallet-connection (http/url-host url) account)}])}]
          [quo/list-item
           {:theme               :accent

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

@@ -2,13 +2,18 @@
   (:require [utils.re-frame :as rf]
             [status-im.ui.screens.browser.empty-tab.views :as empty-tab]
             [status-im.ui.screens.browser.views :as browser]
-            [status-im.ui.screens.browser.tabs.views :as tabs]))
+            [status-im.ui.screens.browser.tabs.views :as tabs]
+            [react-native.safe-area :as safe-area]
+            [react-native.core :as rn]))
 
 (defn browser-stack
   []
   (let [screen-id (rf/sub [:browser/screen-id])]
-    (case screen-id
-      :empty-tab    [empty-tab/empty-tab]
-      :browser      [browser/browser]
-      :browser-tabs [tabs/tabs]
-      [empty-tab/empty-tab])))
+    [safe-area/consumer
+     (fn [{:keys [top]}]
+       [rn/view {:padding-top top :flex 1}
+        (case screen-id
+          :empty-tab    [empty-tab/empty-tab]
+          :browser      [browser/browser]
+          :browser-tabs [tabs/tabs]
+          [empty-tab/empty-tab])])]))

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

@@ -93,7 +93,7 @@
       [icons/icon :main-icons/arrow-right {:color colors/black}]]
      [react/touchable-highlight
       {:accessibility-label :select-account
-       :on-press            #(re-frame/dispatch [:bottom-sheet/show-sheet
+       :on-press            #(re-frame/dispatch [:bottom-sheet/show-sheet-old
                                                  {:content (accounts/accounts-list accounts
                                                                                    dapps-account)}])}
       [chat-icon/custom-icon-view-list (:name dapps-account) (:color dapps-account) 32]]
@@ -112,7 +112,7 @@
         [icons/icon :main-icons/qr {:color colors/black}]]
        [react/touchable-highlight
         {:on-press            #(re-frame/dispatch
-                                [:bottom-sheet/show-sheet
+                                [:bottom-sheet/show-sheet-old
                                  {:content (options/browser-options
                                             url
                                             dapps-account
@@ -143,7 +143,7 @@
                     {:permissions (map resources-to-permissions-map resources)
                      :on-allowed  #(.answerPermissionRequest ^js webview-ref true resources)
                      :on-denied   #(.answerPermissionRequest ^js webview-ref false)})
-                   (re-frame/dispatch [:bottom-sheet/hide]))}
+                   (re-frame/dispatch [:bottom-sheet/hide-old]))}
       (i18n/label :t/allow)]]
     [react/view styles/blocked-access-button-wrapper
      [quo/button
@@ -151,7 +151,7 @@
        :style    styles/blocked-access-button
        :on-press (fn []
                    (.answerPermissionRequest ^js webview-ref false)
-                   (re-frame/dispatch [:bottom-sheet/hide]))}
+                   (re-frame/dispatch [:bottom-sheet/hide-old]))}
       (i18n/label :t/deny)]]]])
 
 (views/defview block-resources-panel
@@ -166,7 +166,7 @@
 (defn request-resources-access-for-page
   [resources url webview-ref]
   (re-frame/dispatch
-   [:bottom-sheet/show-sheet
+   [:bottom-sheet/show-sheet-old
     {:content            (fn [] [request-resources-panel resources url webview-ref])
      :show-handle?       false
      :backdrop-dismiss?  false
@@ -176,7 +176,7 @@
 (defn block-resources-access-and-notify-user
   [url]
   (.answerPermissionRequest ^js @webview-ref/webview-ref false)
-  (re-frame/dispatch [:bottom-sheet/show-sheet
+  (re-frame/dispatch [:bottom-sheet/show-sheet-old
                       {:content (fn [] [block-resources-panel url])}]))
 
 ;; should-component-update is called only when component's props are changed,

src/status_im/ui/screens/chat/components/input.cljs

@@ -10,9 +10,7 @@
             [re-frame.core :as re-frame]
             [reagent.core :as reagent]
             [status-im2.constants :as chat.constants]
-            [status-im.chat.models.mentions :as mentions]
             [utils.i18n :as i18n]
-            [status-im.multiaccounts.core :as multiaccounts]
             [status-im.ui.components.icons.icons :as icons]
             [status-im.ui.components.list.views :as list]
             [status-im.ui.screens.chat.components.reply :as reply]
@@ -95,7 +93,7 @@
         :color               (styles/send-icon-color)}])]])
 
 (defn on-selection-change
-  [timeout-id last-text-change mentionable-users args]
+  [timeout-id last-text-change args]
   (let [selection (.-selection ^js (.-nativeEvent ^js args))
         start     (.-start selection)
         end       (.-end selection)]
@@ -106,10 +104,9 @@
       (reset!
         timeout-id
         (utils.utils/set-timeout
-         #(re-frame/dispatch [::mentions/on-selection-change
+         #(re-frame/dispatch [:mention/on-selection-change
                               {:start start
-                               :end   end}
-                              mentionable-users])
+                               :end   end}])
          50)))
     ;; NOTE(rasom): on Android we dispatch event only in case if there
     ;; was no text changes during last 50ms. `on-selection-change` is
@@ -118,10 +115,9 @@
     (when (and platform/android?
                (or (not @last-text-change)
                    (< 50 (- (js/Date.now) @last-text-change))))
-      (re-frame/dispatch [::mentions/on-selection-change
+      (re-frame/dispatch [:mention/on-selection-change
                           {:start start
-                           :end   end}
-                          mentionable-users]))))
+                           :end   end}]))))
 
 (defonce input-texts (atom {}))
 (defonce mentions-enabled (reagent/atom {}))
@@ -183,7 +179,7 @@
   (re-frame/dispatch [:chat.ui/set-chat-input-text val]))
 
 (defn on-change
-  [last-text-change timeout-id mentionable-users refs chat-id sending-image args]
+  [last-text-change timeout-id refs chat-id sending-image args]
   (let [text      (.-text ^js (.-nativeEvent ^js args))
         prev-text (get @input-texts chat-id)]
     (when (and (seq prev-text) (empty? text) (not sending-image))
@@ -206,46 +202,24 @@
     ;; NOTE(rasom): on iOS `on-change` is dispatched after `on-text-input`,
     ;; that's why mention suggestions are calculated on `on-change`
     (when platform/ios?
-      (re-frame/dispatch [::mentions/calculate-suggestions mentionable-users]))))
+      (re-frame/dispatch [:mention/calculate-suggestions]))))
 
 (rf/defn set-input-text
   "Set input text for current-chat. Takes db and input text and cofx
   as arguments and returns new fx. Always clear all validation messages."
   {:events [:chat.ui.input/set-chat-input-text]}
   [{:keys [db]} text chat-id]
-  (let [text-with-mentions   (mentions/->input-field text)
-        all-contacts         (:contacts/contacts db)
-        chat                 (get-in db [:chats chat-id])
-        current-multiaccount (:multiaccount db)
-        community-members    (when (= (:chat-type chat) chat.constants/community-chat-type)
-                               (get-in db [:communities (:community-id chat) :members]))
-        mentionable-users    (mentions/get-mentionable-users
-                              chat
-                              all-contacts
-                              current-multiaccount
-                              community-members)
-        hydrated-mentions    (map
-                              (fn [[t mention :as e]]
-                                (if (= t :mention)
-                                  (let [mention (multiaccounts/displayed-name
-                                                 (get mentionable-users mention))]
-                                    [:mention
-                                     (if (string/starts-with? mention "@")
-                                       mention
-                                       (str "@" mention))])
-                                  e))
-                              text-with-mentions)
-        info                 (mentions/->info hydrated-mentions)
-        new-text             (string/join (map second hydrated-mentions))]
-    {:set-text-input-value [chat-id new-text]
-     :db
-     (-> db
-         (assoc-in [:chats/cursor chat-id] (:mention-end info))
-         (assoc-in [:chat/inputs-with-mentions chat-id] hydrated-mentions)
-         (assoc-in [:chats/mentions chat-id :mentions] info))}))
+  (let [params [chat-id text]
+        method "wakuext_chatMentionToInputField"]
+    {:json-rpc/call [{:method     method
+                      :params     params
+                      :on-success #(rf/dispatch [:mention/on-to-input-field-success %])
+                      :on-error   #(rf/dispatch [:mention/on-error
+                                                 {:method method
+                                                  :params params} %])}]}))
 
 (defn on-text-input
-  [mentionable-users chat-id args]
+  [chat-id args]
   (let [native-event  (.-nativeEvent ^js args)
         text          (.-text ^js native-event)
         previous-text (.-previousText ^js native-event)
@@ -256,7 +230,7 @@
       (swap! mentions-enabled assoc chat-id true))
 
     (re-frame/dispatch
-     [::mentions/on-text-input
+     [:mention/on-text-input
       {:new-text      text
        :previous-text previous-text
        :start         start
@@ -265,12 +239,11 @@
     ;; `on-change`, that's why mention suggestions are calculated
     ;; on `on-change`
     (when platform/android?
-      (re-frame/dispatch [::mentions/calculate-suggestions mentionable-users]))))
+      (re-frame/dispatch [:mention/calculate-suggestions]))))
 
 (defn text-input
   [{:keys [set-active-panel refs chat-id sending-image]}]
   (let [cooldown-enabled? @(re-frame/subscribe [:chats/current-chat-cooldown-enabled?])
-        mentionable-users @(re-frame/subscribe [:chats/mentionable-users])
         timeout-id        (atom nil)
         last-text-change  (atom nil)
         mentions-enabled  (get @mentions-enabled chat-id)
@@ -296,11 +269,10 @@
       :auto-capitalize :sentences
       :on-selection-change (partial on-selection-change
                                     timeout-id
-                                    last-text-change
-                                    mentionable-users)
+                                    last-text-change)
       :on-change
-      (partial on-change last-text-change timeout-id mentionable-users refs chat-id sending-image)
-      :on-text-input (partial on-text-input mentionable-users chat-id)}
+      (partial on-change last-text-change timeout-id refs chat-id sending-image)
+      :on-text-input (partial on-text-input chat-id)}
      (if mentions-enabled
        (for [[idx [type text]] (map-indexed
                                 (fn [idx item]

src/status_im/ui/screens/chat/sheets.cljs

@@ -11,7 +11,7 @@
 
 (defn hide-sheet-and-dispatch
   [event]
-  (re-frame/dispatch [:bottom-sheet/hide])
+  (re-frame/dispatch [:bottom-sheet/hide-old])
   (re-frame/dispatch event))
 
 (defn one-to-one-chat-accents
@@ -53,7 +53,7 @@
        :accessibility-label :share-chat-button
        :icon                :main-icons/share
        :on-press            (fn []
-                              (re-frame/dispatch [:bottom-sheet/hide])
+                              (re-frame/dispatch [:bottom-sheet/hide-old])
                               ;; https://github.com/facebook/react-native/pull/26839
                               (js/setTimeout
                                #(list-selection/open-share {:message message})

src/status_im/ui/screens/communities/channel_details.cljs

@@ -1,7 +1,6 @@
 (ns status-im.ui.screens.communities.channel-details
   (:require [clojure.string :as string]
             [quo.core :as quo]
-            [re-frame.core :as re-frame]
             [status-im.communities.core :as communities]
             [utils.i18n :as i18n]
             [status-im.ui.components.profile-header.view :as profile-header]
@@ -64,5 +63,4 @@
               :accessory      :text
               :accessory-text (count pinned-messages)
               :chevron        true
-              :on-press       #(re-frame/dispatch [:bottom-sheet/show-sheet :pinned-messages-list
-                                                   chat-id])}]])]))))
+              :on-press       #(rf/dispatch [:pin-message/show-pins-bottom-sheet chat-id])}]])]))))

src/status_im/ui/screens/communities/community.cljs

@@ -3,8 +3,7 @@
     [utils.i18n :as i18n]
     [quo.core :as quo]
     [quo.design-system.colors :as colors]
-    [quo2.components.community.style :as styles] ;; TODO reimplement with quo2 library and new
-                                                 ;; designs
+    [quo2.components.community.style :as styles]
     [quo2.components.navigation.floating-shell-button :as floating-shell-button]
     [react-native.core :as rn]
     [status-im.communities.core :as communities]
@@ -69,7 +68,7 @@
 
 (defn hide-sheet-and-dispatch
   [event]
-  (rf/dispatch [:bottom-sheet/hide])
+  (rf/dispatch [:bottom-sheet/hide-old])
   (rf/dispatch event))
 
 (defn community-plus-actions
@@ -173,7 +172,7 @@
                      (rf/dispatch [:dismiss-keyboard])
                      (rf/dispatch [:chat/navigate-to-chat chat-id])
                      (rf/dispatch [:search/home-filter-changed nil]))
-    :on-long-press #(rf/dispatch [:bottom-sheet/show-sheet
+    :on-long-press #(rf/dispatch [:bottom-sheet/show-sheet-old
                                   {:content (fn []
                                               [sheets/actions home-item])}])}])
 
@@ -292,7 +291,7 @@
              (when (or admin joined)
                [{:icon                :main-icons/more
                  :accessibility-label :community-menu-button
-                 :on-press            #(rf/dispatch [:bottom-sheet/show-sheet
+                 :on-press            #(rf/dispatch [:bottom-sheet/show-sheet-old
                                                      {:content (fn []
                                                                  [community-actions community])}])}])}]
            (if joined
@@ -300,7 +299,7 @@
              [community-channel-preview-list id chats])
            (when admin
              [components.plus-button/plus-button-old
-              {:on-press            #(rf/dispatch [:bottom-sheet/show-sheet
+              {:on-press            #(rf/dispatch [:bottom-sheet/show-sheet-old
                                                    {:content (fn []
                                                                [community-plus-actions community])}])
                :accessibility-label :new-chat-button}])

src/status_im/ui/screens/communities/create.cljs

@@ -63,7 +63,7 @@
        :icon                :main-icons/camera
        :title               (i18n/label :t/community-image-take)
        :on-press            #(do
-                               (rf/dispatch [:bottom-sheet/hide])
+                               (rf/dispatch [:bottom-sheet/hide-old])
                                (take-pic))}]
      [quo/list-item
       {:accessibility-label :pick-photo
@@ -71,7 +71,7 @@
        :theme               :accent
        :title               (i18n/label :t/community-image-pick)
        :on-press            #(do
-                               (rf/dispatch [:bottom-sheet/hide])
+                               (rf/dispatch [:bottom-sheet/hide-old])
                                (pick-pic))}]
      (when (and has-picture (not editing?))
        [quo/list-item
@@ -80,7 +80,7 @@
          :theme               :accent
          :title               (i18n/label :t/community-image-remove)
          :on-press            #(do
-                                 (rf/dispatch [:bottom-sheet/hide])
+                                 (rf/dispatch [:bottom-sheet/hide-old])
                                  (rf/dispatch [::communities/remove-field :image]))}])]))
 
 (defn photo-picker
@@ -92,7 +92,7 @@
      [rn/touchable-opacity
       {:on-press (fn []
                    (rn/dismiss-keyboard!)
-                   (rf/dispatch [:bottom-sheet/show-sheet
+                   (rf/dispatch [:bottom-sheet/show-sheet-old
                                  {:content (bottom-sheet (boolean image) editing?)}]))}
       [rn/view
        {:style {:width  128

src/status_im/ui/screens/communities/members.cljs

@@ -14,7 +14,7 @@
 
 (defn hide-sheet-and-dispatch
   [event]
-  (rf/dispatch [:bottom-sheet/hide])
+  (rf/dispatch [:bottom-sheet/hide-old])
   (rf/dispatch event))
 
 (defn member-sheet
@@ -72,7 +72,7 @@
       :accessory           (when (not= public-key my-public-key)
                              [quo/button
                               {:on-press
-                               #(rf/dispatch [:bottom-sheet/show-sheet
+                               #(rf/dispatch [:bottom-sheet/show-sheet-old
                                               {:content (fn []
                                                           [member-sheet primary-name member community-id
                                                            can-kick-users? can-manage-users? admin?])}])

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

@@ -17,7 +17,7 @@
 
 (defn hide-sheet-and-dispatch
   [event]
-  (rf/dispatch [:bottom-sheet/hide])
+  (rf/dispatch [:bottom-sheet/hide-old])
   (rf/dispatch event))
 
 (defn community-unviewed-count
@@ -49,7 +49,7 @@
                      (rf/dispatch [:communities/load-category-states id])
                      (rf/dispatch [:dismiss-keyboard])
                      (rf/dispatch [:navigate-to :community-overview id]))
-    :on-long-press #(rf/dispatch [:bottom-sheet/show-sheet
+    :on-long-press #(rf/dispatch [:bottom-sheet/show-sheet-old
                                   {:content (fn []
                                               [community/community-actions community])}])}
    [:<>
@@ -150,7 +150,7 @@
        [{:icon :main-icons/more
          :accessibility-label :chat-menu-button
          :on-press
-         #(rf/dispatch [:bottom-sheet/show-sheet
+         #(rf/dispatch [:bottom-sheet/show-sheet-old
                         {:content (fn []
                                     [communities-actions])
                          :height  256}])}]}]

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

@@ -292,7 +292,7 @@
       :title    (:name account)
       :subtitle (utils/get-shortened-checksum-address (:address account))
       :chevron  true
-      :on-press #(re-frame/dispatch [:bottom-sheet/show-sheet
+      :on-press #(re-frame/dispatch [:bottom-sheet/show-sheet-old
                                      {:content (fn [] [sheets/accounts-list :from
                                                        ::ens/change-address])}])}]))
 
@@ -681,7 +681,7 @@
    [react/view {:style {:flex 1 :margin-top 8}}
     (for [name names]
       (let [action             #(do (re-frame/dispatch [::ens/save-preferred-name name])
-                                    (re-frame/dispatch [:bottom-sheet/hide]))
+                                    (re-frame/dispatch [:bottom-sheet/hide-old]))
             stateofus-username (stateofus/username name)
             s                  (or stateofus-username name)]
         ^{:key name}
@@ -755,7 +755,7 @@
         [profile.components/settings-item
          {:label-kw  :ens-primary-username
           :value     preferred-name
-          :action-fn #(re-frame/dispatch [:bottom-sheet/show-sheet
+          :action-fn #(re-frame/dispatch [:bottom-sheet/show-sheet-old
                                           {:content
                                            (fn [] (name-list names preferred-name))}])}]])]]])
 

src/status_im/ui/screens/home/sheet/views.cljs

@@ -1,19 +1,16 @@
 (ns status-im.ui.screens.home.sheet.views
   (:require [quo.core :as quo]
-            [quo2.foundations.colors :as colors]
             [utils.re-frame :as rf]
             [utils.i18n :as i18n]
             [status-im.qr-scanner.core :as qr-scanner]
             [status-im.ui.components.invite.views :as invite]
             [status-im.ui.components.react :as rn]
-            [status-im.ui2.screens.chat.components.new-chat.view :as new-chat-aio]
             [status-im2.config :as config]
-            [quo2.core :as quo2]
             [status-im.ui.screens.home.sheet.styles :as style]))
 
 (defn- hide-sheet-and-dispatch
   [event]
-  (rf/dispatch [:bottom-sheet/hide])
+  (rf/dispatch [:bottom-sheet/hide-old])
   (rf/dispatch event))
 
 (defn add-new-view
@@ -60,48 +57,6 @@
    [invite/list-item
     {:accessibility-label :chats-menu-invite-friends-button}]])
 
-(defn new-chat-bottom-sheet
-  []
-  [rn/view
-   [quo2/menu-item
-    {:type                       :transparent
-     :title                      (i18n/label :t/new-chat)
-     :icon-bg-color              :transparent
-     :container-padding-vertical 12
-     :title-column-style         {:margin-left 2}
-     :style-props                {:border-bottom-width 1
-                                  :border-bottom-color (colors/theme-colors colors/neutral-10
-                                                                            colors/neutral-90)}
-     :icon-color                 (colors/theme-colors colors/neutral-50 colors/neutral-40)
-     :accessibility-label        :start-a-new-chat
-     :icon                       :i/new-message
-     :on-press                   (fn []
-                                   (rf/dispatch [:group-chat/clear-contacts])
-                                   (hide-sheet-and-dispatch [:bottom-sheet/show-sheet
-                                                             :start-a-new-chat {}]))}]
-   [quo2/menu-item
-    {:type                         :transparent
-     :title                        (i18n/label :t/add-a-contact)
-     :icon-bg-color                :transparent
-     :icon-container-style         {:padding-horizontal 0}
-     :container-padding-horizontal {:padding-horizontal 4}
-     :style-props                  {:margin-top    18
-                                    :margin-bottom 9}
-     :container-padding-vertical   12
-     :title-column-style           {:margin-left 2}
-     :icon-color                   (colors/theme-colors colors/neutral-50 colors/neutral-40)
-     :accessibility-label          :add-a-contact
-     :subtitle                     (i18n/label :t/enter-a-chat-key)
-     :subtitle-color               colors/neutral-50
-     :icon                         :i/add-user
-     :on-press                     #(hide-sheet-and-dispatch [:open-modal :new-contact])}]])
-
-(def new-chat-bottom-sheet-comp
-  {:content new-chat-bottom-sheet})
-
 ;; Deprecated
 (def add-new
   {:content add-new-view})
-
-(def start-a-new-chat
-  {:content new-chat-aio/contact-selection-list})

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

@@ -154,7 +154,7 @@
                        (re-frame/dispatch [:dismiss-keyboard])
                        (re-frame/dispatch [:chat/navigate-to-chat chat-id])
                        (re-frame/dispatch [:search/home-filter-changed nil]))
-      :on-long-press #(re-frame/dispatch [:bottom-sheet/show-sheet
+      :on-long-press #(re-frame/dispatch [:bottom-sheet/show-sheet-old
                                           {:content (fn []
                                                       [sheets/actions home-item])}])}]
     [communities.views/community-home-list-item home-item]))
@@ -169,7 +169,7 @@
                        (re-frame/dispatch [:dismiss-keyboard])
                        (re-frame/dispatch [:chat/navigate-to-chat chat-id])
                        (re-frame/dispatch [:search/home-filter-changed nil]))
-      :on-long-press #(re-frame/dispatch [:bottom-sheet/show-sheet
+      :on-long-press #(re-frame/dispatch [:bottom-sheet/show-sheet-old
                                           {:content (fn []
                                                       [sheets/actions home-item])}])}]
     [communities.views/community-home-list-item home-item]))
@@ -261,7 +261,7 @@
      {:on-press            (when-not logging-in?
                              (fn []
                                (re-frame/dispatch [:group-chat/clear-contacts])
-                               (re-frame/dispatch [:bottom-sheet/show-sheet :start-a-new-chat {}])))
+                               (re-frame/dispatch [:bottom-sheet/show-sheet-old :start-a-new-chat {}])))
       :loading             logging-in?
       :accessibility-label :new-chat-button}]))
 
@@ -272,7 +272,7 @@
      {:on-press            (when-not logging-in?
                              (fn []
                                (re-frame/dispatch [:group-chat/clear-contacts])
-                               (re-frame/dispatch [:bottom-sheet/show-sheet :start-a-new-chat {}])))
+                               (re-frame/dispatch [:bottom-sheet/show-sheet-old :start-a-new-chat {}])))
       :loading             logging-in?
       :accessibility-label :new-chat-button}]))
 

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

@@ -4,7 +4,7 @@
             [quo.design-system.colors :as colors]
             [re-frame.core :as re-frame]
             [reagent.core :as reagent]
-            [status-im2.common.bottom-sheet.events :as bottom-sheet]
+            [status-im.bottom-sheet.events :as bottom-sheet]
             [status-im2.constants :as constants]
             [utils.i18n :as i18n]
             [status-im.keycard.login :as keycard.login]
@@ -447,8 +447,8 @@
   [{:keys [db] :as cofx}]
   (rf/merge cofx
             (multiaccounts.create/prepare-intro-wizard)
-            (bottom-sheet/hide-bottom-sheet)
-            (navigation/navigate-to-cofx :get-your-keys nil)))
+            (bottom-sheet/hide-bottom-sheet-old)
+            (navigation/navigate-to :get-your-keys nil)))
 
 (defn- more-sheet-content
   []

src/status_im/ui/screens/mobile_network_settings/sheets.cljs

@@ -63,7 +63,7 @@
 
 (defn hide-sheet-and-dispatch
   [event]
-  (re-frame/dispatch [:bottom-sheet/hide])
+  (re-frame/dispatch [:bottom-sheet/hide-old])
   (re-frame/dispatch event))
 
 (views/defview settings-sheet

src/status_im/ui/screens/mobile_network_settings/view.cljs

@@ -10,7 +10,7 @@
 
 (defn hide-sheet-and-dispatch
   [event]
-  (re-frame/dispatch [:bottom-sheet/hide])
+  (re-frame/dispatch [:bottom-sheet/hide-old])
   (re-frame/dispatch event))
 
 (defn settings-separator

src/status_im/ui/screens/multiaccounts/recover/views.cljs

@@ -16,7 +16,7 @@
 
 (defn hide-sheet-and-dispatch
   [event]
-  (re-frame/dispatch [:bottom-sheet/hide])
+  (re-frame/dispatch [:bottom-sheet/hide-old])
   (re-frame/dispatch event))
 
 (defview custom-seed-phrase

src/status_im/ui/screens/multiaccounts/sheets.cljs

@@ -5,7 +5,7 @@
 
 (defn- hide-sheet-and-dispatch
   [event]
-  (re-frame/dispatch [:bottom-sheet/hide])
+  (re-frame/dispatch [:bottom-sheet/hide-old])
   (re-frame/dispatch event))
 
 (defn actions-sheet

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

@@ -41,7 +41,7 @@
 
 (defn topbar-button
   []
-  (re-frame/dispatch [:bottom-sheet/show-sheet
+  (re-frame/dispatch [:bottom-sheet/show-sheet-old
                       {:content sheets/actions-sheet}]))
 (defview multiaccounts
   []

src/status_im/ui/screens/onboarding/keys/views.cljs

@@ -103,7 +103,7 @@
           (i18n/label :t/generate-a-key)]]
         [react/view {:padding-vertical 8}
          [quo/button
-          {:on-press #(re-frame/dispatch [:bottom-sheet/show-sheet :recover-sheet])
+          {:on-press #(re-frame/dispatch [:bottom-sheet/show-sheet-old :recover-sheet])
            :type     :secondary}
           (i18n/label :t/access-existing-keys)]]
         [react/text {:style (assoc (styles/wizard-text) :margin-top 20 :margin-bottom 16)}

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

@@ -10,7 +10,7 @@
 (defn learn-more
   [title content]
   [react/text
-   {:on-press            #(re-frame/dispatch [:bottom-sheet/show-sheet :learn-more
+   {:on-press            #(re-frame/dispatch [:bottom-sheet/show-sheet-old :learn-more
                                               {:title   (i18n/label title)
                                                :content (i18n/label content)}])
     :style               (merge (styles/wizard-text) {:color colors/blue})

src/status_im/ui/screens/profile/contact/views.cljs

@@ -67,7 +67,7 @@
     :accessory           :text
     :accessory-text      pin-count
     :disabled            (zero? pin-count)
-    :on-press            #(re-frame/dispatch [:bottom-sheet/show-sheet :pinned-messages-list public-key])
+    :on-press            #(rf/dispatch [:pin-message/show-pins-bottom-sheet public-key])
     :chevron             true}])
 
 (defn nickname-settings

src/status_im/ui/screens/profile/group_chat/views.cljs

@@ -71,7 +71,7 @@
                  (not= public-key current-user-identity))
         {:accessory [quo/button
                      {:on-press            #(re-frame/dispatch
-                                             [:bottom-sheet/show-sheet
+                                             [:bottom-sheet/show-sheet-old
                                               {:content (fn []
                                                           [member-sheet chat-id member admin?])}])
                       :type                :icon
@@ -105,7 +105,7 @@
 
 (defn hide-sheet-and-dispatch
   [event]
-  (re-frame/dispatch [:bottom-sheet/hide])
+  (re-frame/dispatch [:bottom-sheet/hide-old])
   (debounce/dispatch-and-chill event 2000))
 
 (defn invitation-sheet
@@ -142,7 +142,7 @@
      {:title    (multiaccounts/displayed-name contact)
       :icon     [chat-icon/contact-icon-contacts-tab
                  (multiaccounts/displayed-photo contact)]
-      :on-press #(re-frame/dispatch [:bottom-sheet/show-sheet
+      :on-press #(re-frame/dispatch [:bottom-sheet/show-sheet-old
                                      {:content (fn []
                                                  [invitation-sheet invitation contact])}])}]))
 
@@ -214,8 +214,7 @@
              :accessory      :text
              :accessory-text (count pinned-messages)
              :chevron        true
-             :on-press       #(re-frame/dispatch [:bottom-sheet/show-sheet :pinned-messages-list
-                                                  chat-id])}]
+             :on-press       #(re-frame/dispatch [:pin-message/show-pins-bottom-sheet chat-id])}]
            (when member?
              [quo/list-item
               {:theme               :negative

src/status_im/ui/screens/profile/user/edit_picture.cljs

@@ -15,14 +15,14 @@
 
 (defn pick-pic
   []
-  (re-frame/dispatch [:bottom-sheet/hide])
+  (re-frame/dispatch [:bottom-sheet/hide-old])
   (react/show-image-picker
    #(re-frame/dispatch [::multiaccounts/save-profile-picture (.-path ^js %) 0 0 crop-size crop-size])
    crop-opts))
 
 (defn take-pic
   []
-  (re-frame/dispatch [:bottom-sheet/hide])
+  (re-frame/dispatch [:bottom-sheet/hide-old])
   (react/show-image-picker-camera
    #(re-frame/dispatch [::multiaccounts/save-profile-picture (.-path ^js %) 0 0 crop-size crop-size])
    crop-opts))

src/status_im/ui/screens/profile/user/views.cljs

@@ -210,7 +210,7 @@
          :use-insets        true
          :extended-header   (profile-header/extended-header
                              {:on-press  on-share
-                              :on-edit   #(re-frame/dispatch [:bottom-sheet/show-sheet
+                              :on-edit   #(re-frame/dispatch [:bottom-sheet/show-sheet-old
                                                               {:content (edit/bottom-sheet
                                                                          has-picture)}])
                               :title     (multiaccounts/displayed-name account)

src/status_im/ui/screens/screens.cljs

@@ -113,25 +113,29 @@
 
    ;Multiaccounts
    {:name          :multiaccounts
-    :insets        {:bottom true}
-    :options       {:topBar {:title        {:text (i18n/label :t/your-keys)}
+    :options       {:insets {:bottom? true
+                             :top?    true}
+                    :topBar {:title        {:text (i18n/label :t/your-keys)}
                              :rightButtons (right-button-options :multiaccounts :more)}}
     :right-handler multiaccounts/topbar-button
     :component     multiaccounts/multiaccounts}
 
    ;Login
    {:name          :login
-    :insets        {:bottom true}
-    :options       {:topBar {:rightButtons (right-button-options :login :more)}}
+    :options       {:insets {:bottom? true
+                             :top?    true}
+                    :topBar {:rightButtons (right-button-options :login :more)}}
     :right-handler login/topbar-button
     :component     login/login}
 
    {:name      :progress
+    :options   {:insets {:top? true}}
     :component progress/progress}
 
    ;[Onboarding]
    {:name      :get-your-keys
-    :insets    {:bottom true}
+    :options   {:insets {:bottom? true
+                         :top?    true}}
     :component onboarding.keys/get-your-keys}
 
    ;[Onboarding]
@@ -139,377 +143,435 @@
     :options   {:topBar             {:visible false}
                 :popGesture         false
                 :hardwareBackButton {:dismissModalOnPress false
-                                     :popStackOnPress     false}}
-    :insets    {:bottom true}
+                                     :popStackOnPress     false}
+                :insets             {:bottom? true
+                                     :top?    true}}
     :component onboarding.keys/choose-a-chat-name}
 
    ;[Onboarding]
    {:name      :select-key-storage
-    :insets    {:bottom true}
     :options   {:popGesture         false
                 :hardwareBackButton {:dismissModalOnPress false
-                                     :popStackOnPress     false}}
+                                     :popStackOnPress     false}
+                :insets             {:bottom? true
+                                     :top?    true}}
     :component onboarding.storage/select-key-storage}
 
    ;[Onboarding] Create Password
    {:name      :create-password
     :options   {:popGesture         false
                 :hardwareBackButton {:dismissModalOnPress false
-                                     :popStackOnPress     false}}
-    :insets    {:bottom true}
+                                     :popStackOnPress     false}
+                :insets             {:bottom? true
+                                     :top?    true}}
     :component onboarding.password/screen}
 
    ;[Onboarding] Welcome
    {:name      :welcome
     :options   {:popGesture         false
                 :hardwareBackButton {:dismissModalOnPress false
-                                     :popStackOnPress     false}}
-    :insets    {:bottom true}
+                                     :popStackOnPress     false}
+                :insets             {:bottom? true
+                                     :top?    true}}
     :component onboarding.welcome/welcome}
 
    ;[Onboarding] Notification
    {:name      :onboarding-notification
     :options   {:popGesture         false
                 :hardwareBackButton {:dismissModalOnPress false
-                                     :popStackOnPress     false}}
-    :insets    {:bottom true}
+                                     :popStackOnPress     false}
+                :insets             {:bottom? true
+                                     :top?    true}}
     :component onboarding.notifications/notifications-onboarding}
 
    ;[Onboarding] Recovery
    {:name      :recover-multiaccount-enter-phrase
-    :insets    {:bottom true}
+    :options   {:insets {:top? true :bottom? true}}
     :component onboarding.phrase/enter-phrase}
    {:name      :recover-multiaccount-success
     :options   {:popGesture         false
                 :hardwareBackButton {:dismissModalOnPress false
-                                     :popStackOnPress     false}}
-    :insets    {:bottom true}
+                                     :popStackOnPress     false}
+                :insets             {:bottom? true
+                                     :top?    true}}
     :component onboarding.phrase/wizard-recovery-success}
 
    ;;CHAT
+   {:name      :start-a-new-chat
+    :options   {:sheet? true :insets {:top? true}}
+    :component new-chat-aio/contact-selection-list}
 
    {:name      :group-chat-profile
     ;;TODO animated-header
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component group-details/group-details}
    {:name      :group-chat-invite
     ;;TODO parameter in the event
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component profile.group-chat/group-chat-invite}
 
    {:name      :stickers
-    :options   {:topBar {:title {:text (i18n/label :t/sticker-market)}}}
+    :options   {:insets {:top? true}
+                :topBar {:title {:text (i18n/label :t/sticker-market)}}}
     :component stickers/packs}
 
    {:name      :stickers-pack
+    :options   {:insets {:top? true}}
     :component stickers/pack}
 
    ;; Community
    {:name      :community
     ;;TODO custom
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component community/community}
    {:name      :community-management
-    :insets    {:top false}
     ;;TODO animated-header
     :options   {:topBar {:visible false}}
     :component community.profile/management-container}
    {:name      :community-members
     ;;TODO custom subtitle
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component members/members-container}
    {:name      :community-requests-to-join
     ;;TODO custom subtitle
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component requests-to-join/requests-to-join-container}
    {:name      :create-community-channel
-    :insets    {:bottom true}
-    :options   {:topBar {:title {:text (i18n/label :t/create-channel-title)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/create-channel-title)}}
+                :insets {:bottom? true
+                         :top?    true}}
     :component create-channel/view}
    {:name      :community-emoji-thumbnail-picker
-    :insets    {:bottom true}
-    :options   {:topBar {:title {:text (i18n/label :t/community-emoji-thumbnail-title)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/community-emoji-thumbnail-title)}}
+                :insets {:bottom? true
+                         :top?    true}}
     :component community-emoji-thumbnail-picker/view}
    {:name      :create-community-category
-    :insets    {:bottom true}
-    :options   {:topBar {:title {:text (i18n/label :t/new-category)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/new-category)}}
+                :insets {:bottom? true
+                         :top?    true}}
     :component create-category/view}
    {:name      :select-category
-    :insets    {:bottom true}
     ;;TODO custom
-    :options   {:topBar {:visible false}}
+    :options   {:topBar {:visible false}
+                :insets {:bottom? true
+                         :top?    true}}
     :component select-category/view}
    {:name      :community-reorder-categories
-    :insets    {:top false}
     :options   {:topBar {:visible false}}
     :component reorder-categories/view}
    {:name      :community-channel-details
-    :insets    {:top false}
     ;;TODO custom
     :options   {:topBar {:visible false}}
     :component communities.channel-details/view}
    {:name      :edit-community-channel
-    :options   {:topBar {:title {:text (i18n/label :t/edit-channel-title)}}}
-    :insets    {:bottom true}
+    :options   {:topBar {:title {:text (i18n/label :t/edit-channel-title)}}
+                :insets {:bottom? true
+                         :top?    true}}
     :component edit-channel/view}
    {:name      :contact-toggle-list
     ;;TODO custom subtitle
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component group-chat/contact-toggle-list}
    {:name      :new-group
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     ;;TODO custom subtitle
     :component group-chat/new-group}
    {:name      :communities
     ;;TODO custom
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component communities/communities}
    {:name      :community-import
-    :options   {:topBar {:title {:text (i18n/label :t/import-community-title)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/import-community-title)}}
+                :insets {:top? true}}
     :component communities.import/view}
    {:name      :community-edit
-    :options   {:topBar {:title {:text (i18n/label :t/community-edit-title)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/community-edit-title)}}
+                :insets {:top? true}}
     :component community.edit/edit}
    {:name      :community-create
-    :options   {:topBar {:title {:text (i18n/label :t/new-community-title)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/new-community-title)}}
+                :insets {:top? true}}
     :component communities.create/view}
    {:name      :community-membership
-    :options   {:topBar {:title {:text (i18n/label :t/membership-title)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/membership-title)}}
+                :insets {:top? true}}
     :component membership/membership}
 
    ;;WALLET
 
    {:name      :wallet
-    :insets    {:top false}
     :on-focus  [:wallet/tab-opened]
     ;;TODO wallet redesign
     ;;:options   {:statusBar {:backgroundColor quo2.colors/neutral-5}}
     :component wallet.accounts/accounts-overview-old}
    {:name      :wallet-account
     ;;TODO dynamic titleaccounts-overview
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component wallet.account/account}
    {:name      :add-new-account
     ;;TODO dynamic title
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component add-account/add-account}
    {:name      :add-new-account-pin
     ;;TODO dynamic title
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component add-account/pin}
    {:name      :account-settings
     ;;TODO dynamic title
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component account-settings/account-settings}
    {:name      :wallet-transaction-details
     ;;TODO dynamic title
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component wallet-transactions/transaction-details}
    {:name      :wallet-settings-assets
     ;;TODO dynamic title
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component wallet-settings/manage-assets}
    {:name      :wallet-add-custom-token
     :on-focus  [:wallet/wallet-add-custom-token]
-    :options   {:topBar {:title {:text (i18n/label :t/add-custom-token)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/add-custom-token)}}
+                :insets {:top? true}}
     :component custom-tokens/add-custom-token}
    {:name      :wallet-custom-token-details
     ;;TODO dynamic title
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component custom-tokens/custom-token-details}
    {:name      :currency-settings
-    :options   {:topBar {:title {:text (i18n/label :t/main-currency)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/main-currency)}}
+                :insets {:top? true}}
     :component currency-settings/currency-settings}
 
    {:name      :manage-accounts
-    :options   {:topBar {:title {:text (i18n/label :t/wallet-manage-accounts)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/wallet-manage-accounts)}}
+                :insets {:top? true}}
     :component accounts-manage/manage}
 
    {:name      :token-swap
     ;;TODO dynamic title
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component wallet.swap/swap}
 
    {:name      :token-swap-advanced-nonce
-    :options   {:topBar {:title {:text (i18n/label :t/nonce)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/nonce)}}
+                :insets {:top? true}}
     :component wallet.swap/nonce-modal}
 
    {:name      :token-swap-advanced-approve-token
-    :options   {:topBar {:title {:text (i18n/label :t/approve-token)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/approve-token)}}
+                :insets {:top? true}}
     :component wallet.swap/approve-token-modal}
 
    {:name      :token-swap-advanced-transaction-fee
-    :options   {:topBar {:title {:text (i18n/label :t/transaction-fee)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/transaction-fee)}}
+                :insets {:top? true}}
     :component wallet.swap/transaction-fee-modal}
 
    {:name      :token-swap-advanced-swap-details
-    :options   {:topBar {:title {:text (i18n/label :t/swap-details)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/swap-details)}}
+                :insets {:top? true}}
     :component wallet.swap/swap-details-modal}
 
    {:name      :swap-asset-selector
     ;;TODO dynamic title
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component wallet.swap/asset-selector}
 
    ;;PROFILE
 
    {:name      :my-profile
-    :insets    {:top false}
     :options   {:topBar {:visible false}}
     :component profile.user/my-profile}
    {:name      :contacts-list
-    :options   {:topBar {:title {:text (i18n/label :t/contacts)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/contacts)}}
+                :insets {:top? true}}
     :component contacts-list/contacts-list}
    {:name      :ens-main
-    :options   {:topBar {:title {:text (i18n/label :t/ens-usernames)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/ens-usernames)}}
+                :insets {:top? true}}
     :component ens/main}
    {:name      :ens-search
-    :options   {:topBar {:title {:text (i18n/label :t/ens-your-username)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/ens-your-username)}}
+                :insets {:top? true}}
     :component ens/search}
    {:name      :ens-checkout
-    :options   {:topBar {:title {:text (i18n/label :t/ens-your-username)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/ens-your-username)}}
+                :insets {:top? true}}
     :component ens/checkout}
    {:name      :ens-confirmation
-    :options   {:topBar {:title {:text (i18n/label :t/ens-your-username)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/ens-your-username)}}
+                :insets {:top? true}}
     :component ens/confirmation}
    {:name      :ens-terms
-    :options   {:topBar {:title {:text (i18n/label :t/ens-terms-registration)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/ens-terms-registration)}}
+                :insets {:top? true}}
     :component ens/terms}
    {:name      :ens-name-details
     ;;TODO dynamic title
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component ens/name-details}
    {:name      :blocked-users-list
-    :options   {:topBar {:title {:text (i18n/label :t/blocked-users)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/blocked-users)}}
+                :insets {:top? true}}
     :component contacts-list/blocked-users-list}
    {:name      :wakuv2-settings
     ;;TODO dynamic title
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component wakuv2-settings/wakuv2-settings}
    {:name      :edit-wakuv2-node
     ;;TODO dynamic title
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component edit-wakuv2-node/edit-node}
    {:name      :bootnodes-settings
     ;;TODO dynamic title
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component bootnodes-settings/bootnodes-settings}
    {:name      :installations
-    :options   {:topBar {:title {:text (i18n/label :t/devices)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/devices)}}
+                :insets {:top? true}}
     :component pairing/installations}
    {:name      :edit-bootnode
     ;;TODO dynamic title
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component edit-bootnode/edit-bootnode}
    {:name      :offline-messaging-settings
     ;;TODO dynamic title
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component offline-messaging-settings/offline-messaging-settings}
    {:name      :edit-mailserver
     ;;TODO dynamic title
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component edit-mailserver/edit-mailserver}
    {:name      :dapps-permissions
-    :options   {:topBar {:title {:text (i18n/label :t/dapps-permissions)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/dapps-permissions)}}
+                :insets {:top? true}}
     :component dapps-permissions/dapps-permissions}
    {:name      :link-previews-settings
-    :options   {:topBar {:title {:text (i18n/label :t/chat-link-previews)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/chat-link-previews)}}
+                :insets {:top? true}}
     :component link-previews-settings/link-previews-settings}
    {:name      :privacy-and-security
-    :options   {:topBar {:title {:text (i18n/label :t/privacy-and-security)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/privacy-and-security)}}
+                :insets {:top? true}}
     :component privacy-and-security/privacy-and-security}
    {:name      :messages-from-contacts-only
-    :options   {:topBar {:title {:text (i18n/label :t/accept-new-chats-from)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/accept-new-chats-from)}}
+                :insets {:top? true}}
     :component messages-from-contacts-only/messages-from-contacts-only}
    {:name      :appearance
-    :options   {:topBar {:title {:text (i18n/label :t/appearance)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/appearance)}}
+                :insets {:top? true}}
     :component appearance/appearance}
    {:name      :privacy-and-security-profile-pic-show-to
-    :options   {:topbar {:title {:text (i18n/label :t/show-profile-pictures-to)}}}
+    :options   {:topbar {:title {:text (i18n/label :t/show-profile-pictures-to)}}
+                :insets {:top? true}}
     :component privacy-and-security/profile-pic-show-to}
    {:name      :privacy-and-security-profile-pic
-    :options   {:topBar {:title {:text (i18n/label :t/show-profile-pictures)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/show-profile-pictures)}}
+                :insets {:top? true}}
     :component privacy-and-security/profile-pic}
    {:name      :notifications
-    :options   {:topBar {:title {:text (i18n/label :t/notification-settings)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/notification-settings)}}
+                :insets {:top? true}}
     :component notifications-settings/notifications-settings}
    {:name      :notifications-servers
-    :options   {:topBar {:title {:text (i18n/label :t/notifications-servers)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/notifications-servers)}}
+                :insets {:top? true}}
     :component notifications-settings/notifications-servers}
    {:name      :sync-settings
-    :options   {:topBar {:title {:text (i18n/label :t/sync-settings)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/sync-settings)}}
+                :insets {:top? true}}
     :component sync-settings/sync-settings}
    {:name      :advanced-settings
-    :options   {:topBar {:title {:text (i18n/label :t/advanced)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/advanced)}}
+                :insets {:top? true}}
     :component advanced-settings/advanced-settings}
    {:name      :help-center
-    :options   {:topBar {:title {:text (i18n/label :t/need-help)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/need-help)}}
+                :insets {:top? true}}
     :component help-center/help-center}
    {:name      :glossary
-    :options   {:topBar {:title {:text (i18n/label :t/glossary)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/glossary)}}
+                :insets {:top? true}}
     :component glossary/glossary}
    {:name      :about-app
-    :options   {:topBar {:title {:text (i18n/label :t/about-app)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/about-app)}}
+                :insets {:top? true}}
     :component about-app/about-app}
    {:name      :privacy-policy
-    :options   {:topBar {:title {:text (i18n/label :t/privacy-policy)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/privacy-policy)}}
+                :insets {:top? true}}
     :component about-app/privacy-policy}
    {:name      :terms-of-service
-    :options   {:topBar {:title {:text (i18n/label :t/terms-of-service)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/terms-of-service)}}
+                :insets {:top? true}}
     :component about-app/tos}
    {:name      :principles
-    :options   {:topBar {:title {:text (i18n/label :t/principles)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/principles)}}
+                :insets {:top? true}}
     :component about-app/principles}
    {:name      :force-accept-tos
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component terms-of-service/force-accept-tos}
    {:name      :manage-dapps-permissions
     ;;TODO dynamic title
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component dapps-permissions/manage}
    {:name      :network-settings
     ;;TODO accessories
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component network/network-settings}
    {:name      :network-details
-    :options   {:topBar {:title {:text (i18n/label :t/network-details)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/network-details)}}
+                :insets {:top? true}}
     :component network-details/network-details}
    {:name      :network-info
-    :options   {:topBar {:title {:text (i18n/label :t/network-info)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/network-info)}}
+                :insets {:top? true}}
     :component network-info/network-info}
    {:name      :rpc-usage-info
-    :options   {:topBar {:title {:text (i18n/label :t/rpc-usage-info)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/rpc-usage-info)}}
+                :insets {:top? true}}
     :component rpc-usage-info/usage-info}
    {:name      :peers-stats
-    :options   {:topBar {:title {:text (i18n/label :t/peers-stats)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/peers-stats)}}
+                :insets {:top? true}}
     :component peers-stats/peers-stats}
    {:name      :edit-network
-    :options   {:topBar {:title {:text (i18n/label :t/add-network)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/add-network)}}
+                :insets {:top? true}}
     :component edit-network/edit-network}
    {:name      :log-level-settings
-    :options   {:topBar {:title {:text (i18n/label :t/log-level-settings)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/log-level-settings)}}
+                :insets {:top? true}}
     :component log-level-settings/log-level-settings}
    {:name      :fleet-settings
-    :options   {:topBar {:title {:text (i18n/label :t/fleet-settings)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/fleet-settings)}}
+                :insets {:top? true}}
     :component fleet-settings/fleet-settings}
    {:name      :mobile-network-settings
-    :options   {:topBar {:title {:text (i18n/label :t/mobile-network-settings)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/mobile-network-settings)}}
+                :insets {:top? true}}
     :component mobile-network-settings/mobile-network-settings}
    {:name      :backup-settings
-    :options   {:topBar {:title {:text (i18n/label :t/backup-settings)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/backup-settings)}}
+                :insets {:top? true}}
     :component backup-settings/backup-settings}
    {:name      :backup-seed
     ;;TODO dynamic navigation
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component profile.seed/backup-seed}
    {:name      :reset-password
-    :options   {:topBar {:title {:text (i18n/label :t/reset-password)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/reset-password)}}
+                :insets {:top? true}}
     :component reset-password/reset-password}
    {:name      :delete-profile
-    :insets    {:bottom true}
+    :insets    {:bottom? true}
     :component delete-profile/delete-profile}
    {:name      :default-sync-period-settings
-    :options   {:topBar {:title {:text (i18n/label :t/default-sync-period)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/default-sync-period)}}
+                :insets {:top? true}}
     :component default-sync-period-settings/default-sync-period-settings}
 
    ;;MODALS
@@ -518,70 +580,75 @@
    {:name      :new-chat
     :on-focus  [:contacts/new-chat-focus]
     ;;TODO accessories
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component new-chat/new-chat}
 
    ;[Chat] New Public chat
    {:name      :new-public-chat
-    :insets    {:bottom true}
-    :options   {:topBar {:title {:text (i18n/label :t/new-public-group-chat)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/new-public-group-chat)}}
+                :insets {:bottom? true
+                         :top?    true}}
     :component new-public-chat/new-public-chat}
 
    ;[Chat] Link preview settings
    {:name      :link-preview-settings
-    :options   {:topBar {:title {:text (i18n/label :t/chat-link-previews)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/chat-link-previews)}}
+                :insets {:top? true}}
     :component link-previews-settings/link-previews-settings}
 
    ;[Chat] Edit nickname
    {:name      :nickname
-    :insets    {:bottom true}
     ;;TODO dyn subtitle
-    :options   {:topBar {:visible false}}
+    :options   {:topBar {:visible false}
+                :insets {:bottom? true
+                         :top?    true}}
     :component contact/nickname-view}
 
    {:name      :new-chat-aio
     :on-focus  [:contacts/new-chat-focus]
     ;;TODO accessories
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component new-chat-aio/contact-selection-list}
 
    ;[Chat] New Public chat
    {:name      :new-public-chat
-    :insets    {:bottom true}
-    :options   {:topBar {:title {:text (i18n/label :t/new-public-group-chat)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/new-public-group-chat)}}
+                :insets {:bottom? true
+                         :top?    true}}
     :component new-public-chat/new-public-chat}
 
    ;[Group chat] Add participants
    {:name      :add-participants-toggle-list
     :on-focus  [:group/add-participants-toggle-list]
-    :insets    {:bottom true}
     ;;TODO dyn subtitle
-    :options   {:topBar {:visible false}}
+    :options   {:topBar {:visible false}
+                :insets {:bottom? true
+                         :top?    true}}
     :component group-chat/add-participants-toggle-list}
 
    ;[Communities] Invite people
    {:name      :invite-people-community
     ;;TODO dyn title
-    :options   {:topBar {:visible false}}
-    :component communities.invite/invite
-    :insets    {:bottom true}}
+    :options   {:insets {:bottom? true
+                         :top?    true}}
+    :component communities.invite/invite}
 
    ;[Wallet] Recipient
    {:name      :recipient
-    :insets    {:bottom true}
     ;;TODO accessories
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:bottom? true
+                         :top?    true}}
     :component recipient/recipient}
 
    ;[Wallet] New favourite
    {:name      :new-favourite
-    :insets    {:bottom true}
-    :options   {:topBar {:title {:text (i18n/label :t/new-favourite)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/new-favourite)}}
+                :insets {:bottom? true
+                         :top?    true}}
     :component recipient/new-favourite}
 
    ;QR Scanner
    {:name      :qr-scanner
-    :insets    {:top false :bottom false}
     ;;TODO custom topbar
     :options   {:topBar        {:visible false}
                 :navigationBar {:backgroundColor colors/black-persist}
@@ -595,8 +662,9 @@
     :options   {:topBar             {:title {:text (i18n/label :t/notification-settings)}}
                 :popGesture         false
                 :hardwareBackButton {:dismissModalOnPress false
-                                     :popStackOnPress     false}}
-    :insets    {:bottom true}
+                                     :popStackOnPress     false}
+                :insets             {:bottom? true
+                                     :top?    true}}
     :component notifications-settings/notifications-settings}
 
    ;;TODO WHY MODAL?
@@ -605,211 +673,218 @@
     :options   {:topBar             {:title {:text (i18n/label :t/notification-settings)}}
                 :popGesture         false
                 :hardwareBackButton {:dismissModalOnPress false
-                                     :popStackOnPress     false}}
-    :insets    {:bottom true}
+                                     :popStackOnPress     false}
+                :insets             {:bottom? true
+                                     :top?    true}}
     :component notifications-settings/notifications-advanced-settings}
 
    ;[Wallet] Prepare Transaction
    {:name        :prepare-send-transaction
-    :insets      {:bottom true}
     :on-dissmiss [:wallet/cancel-transaction-command]
     :options     {:topBar             {:title {:text (i18n/label :t/send-transaction)}}
                   :swipeToDismiss     false
-                  :hardwareBackButton {:dismissModalOnPress false}}
+                  :hardwareBackButton {:dismissModalOnPress false}
+                  :insets             {:bottom? true
+                                       :top?    true}}
     :component   wallet.send/prepare-send-transaction}
 
    ;[Wallet] Request Transaction
    {:name        :request-transaction
-    :insets      {:bottom true}
     :on-dissmiss [:wallet/cancel-transaction-command]
     :options     {:topBar             {:title {:text (i18n/label :t/request-transaction)}}
                   :swipeToDismiss     false
-                  :hardwareBackButton {:dismissModalOnPress false}}
+                  :hardwareBackButton {:dismissModalOnPress false}
+                  :insets             {:bottom? true
+                                       :top?    true}}
     :component   wallet.send/request-transaction}
 
    ;[Wallet] Buy crypto
    {:name      :buy-crypto
-    :insets    {:bottom true}
+    :insets    {:bottom? true}
     :component wallet.buy-crypto/container}
 
    ;[Wallet] Buy crypto website
    {:name      :buy-crypto-website
-    :insets    {:bottom true}
     ;;TODO subtitle
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:bottom? true
+                         :top?    true}}
     :component wallet.buy-crypto/website}
 
    {:name      :nft-details
-    :insets    {:bottom true}
     ;;TODO dynamic title
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:bottom? true
+                         :top?    true}}
     :component wallet.collectibles/nft-details-modal}
 
    ;[Browser] New bookmark
    {:name      :new-bookmark
-    :insets    {:bottom true}
     ;;TODO dynamic title
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:bottom? true
+                         :top?    true}}
     :component bookmarks/new-bookmark}
 
    ;Profile
    {:name      :profile
-    :insets    {:bottom true}
     ;;TODO custom toolbar
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:bottom? true
+                         :top?    true}}
     :component contact/profile}
 
    ;KEYCARD
    {:name      :keycard-onboarding-intro
-    :insets    {:bottom true}
-    :options   {:topBar             {:visible false}
+    :options   {:insets             {:bottom? true
+                                     :top?    true}
                 :popGesture         false
                 :hardwareBackButton {:dismissModalOnPress false
                                      :popStackOnPress     false}}
     :component keycard.onboarding/intro}
    {:name      :keycard-onboarding-puk-code
-    :insets    {:bottom true}
-    :options   {:topBar             {:visible false}
+    :options   {:insets             {:bottom? true
+                                     :top?    true}
                 :popGesture         false
                 :hardwareBackButton {:dismissModalOnPress false
                                      :popStackOnPress     false}}
     ;;TODO dynamic
     :component keycard.onboarding/puk-code}
    {:name      :keycard-onboarding-pin
-    :insets    {:bottom true}
-    :options   {:topBar             {:visible false}
+    :options   {:insets             {:bottom? true
+                                     :top?    true}
                 :popGesture         false
                 :hardwareBackButton {:dismissModalOnPress false
                                      :popStackOnPress     false}}
     ;;TODO dynamic
     :component keycard.onboarding/pin}
    {:name      :keycard-recovery-pair
-    :insets    {:bottom true}
     :options   {:topBar             {:title {:text (i18n/label :t/step-i-of-n {:number 2 :step 1})}}
+                :insets             {:bottom? true
+                                     :top?    true}
                 :popGesture         false
                 :hardwareBackButton {:dismissModalOnPress false
                                      :popStackOnPress     false}}
     :component keycard.recovery/pair}
    {:name      :seed-phrase
-    :insets    {:bottom true}
     ;;TODO subtitle
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:bottom? true
+                         :top?    true}}
     :component key-storage.views/seed-phrase}
    {:name      :keycard-recovery-pin
-    :insets    {:bottom true}
     ;;TODO dynamic
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:bottom? true
+                         :top?    true}}
     :component keycard.recovery/pin}
    {:name      :keycard-wrong
-    :insets    {:bottom true}
     ;;TODO move to popover?
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:bottom? true
+                         :top?    true}}
     :component keycard/wrong}
    {:name      :not-keycard
-    :insets    {:bottom true}
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:bottom? true
+                         :top?    true}}
     ;;TODO move to popover?
     :component keycard/not-keycard}
    {:name      :keycard-onboarding-recovery-phrase
-    :insets    {:bottom true}
-    :options   {:topBar             {:visible false}
+    :options   {:insets             {:bottom? true
+                                     :top?    true}
                 :popGesture         false
                 :hardwareBackButton {:dismissModalOnPress false
                                      :popStackOnPress     false}}
     :component keycard.onboarding/recovery-phrase}
    {:name      :keycard-onboarding-recovery-phrase-confirm-word1
-    :insets    {:bottom true}
-    :options   {:topBar             {:visible false}
+    :options   {:insets             {:bottom? true
+                                     :top?    true}
                 :popGesture         false
                 :hardwareBackButton {:dismissModalOnPress false
                                      :popStackOnPress     false}}
     :component keycard.onboarding/recovery-phrase-confirm-word}
    {:name      :keycard-onboarding-recovery-phrase-confirm-word2
-    :insets    {:bottom true}
-    :options   {:topBar             {:visible false}
+    :options   {:insets             {:bottom? true
+                                     :top?    true}
                 :popGesture         false
                 :hardwareBackButton {:dismissModalOnPress false
                                      :popStackOnPress     false}}
     :component keycard.onboarding/recovery-phrase-confirm-word}
    {:name      :keycard-recovery-intro
-    :insets    {:bottom true}
+    :insets    {:bottom? true}
     :component keycard.recovery/intro}
    {:name      :keycard-recovery-success
-    :insets    {:bottom true}
-    :options   {:topBar             {:visible false}
+    :options   {:insets             {:bottom? true
+                                     :top?    true}
                 :popGesture         false
                 :hardwareBackButton {:dismissModalOnPress false
                                      :popStackOnPress     false}}
     :component keycard.recovery/success}
    {:name      :keycard-recovery-no-key
-    :insets    {:bottom true}
-    :options   {:topBar             {:visible false}
+    :options   {:insets             {:bottom? true
+                                     :top?    true}
                 :popGesture         false
                 :hardwareBackButton {:dismissModalOnPress false
                                      :popStackOnPress     false}}
     :component keycard.recovery/no-key}
    {:name      :keycard-authentication-method
-    :insets    {:bottom true}
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:bottom? true
+                         :top?    true}}
     :component keycard.authentication/keycard-authentication-method}
    {:name      :keycard-login-pin
-    :insets    {:bottom true}
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:bottom? true
+                         :top?    true}}
     :component keycard/login-pin}
    {:name      :keycard-blank
-    :insets    {:bottom true}
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:bottom? true
+                         :top?    true}}
     :component keycard/blank}
    {:name      :keycard-unpaired
-    :insets    {:bottom true}
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:bottom? true
+                         :top?    true}}
     :component keycard/unpaired}
    {:name      :keycard-settings
-    :insets    {:bottom true}
-    :options   {:topBar {:title {:text (i18n/label :t/status-keycard)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/status-keycard)}}
+                :insets {:bottom? true
+                         :top?    true}}
     :component keycard.settings/keycard-settings}
    {:name      :reset-card
-    :insets    {:bottom true}
-    :options   {:topBar {:title {:text (i18n/label :t/reset-card)}}}
+    :options   {:topBar {:title {:text (i18n/label :t/reset-card)}}
+                :insets {:bottom? true
+                         :top?    true}}
     :component keycard.settings/reset-card}
    {:name      :keycard-pin
-    :insets    {:bottom true}
     ;;TODO dynamic title
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:bottom? true
+                         :top?    true}}
     :component keycard.settings/reset-pin}
    {:name      :enter-pin-settings
-    :insets    {:bottom true}
+    :insets    {:bottom? true}
     :component keycard.pin/enter-pin}
    {:name      :change-pairing-code
-    :insets    {:bottom true}
+    :insets    {:bottom? true}
     :component keycard.pairing/change-pairing-code}
 
    ;;KEYSTORAGE
    {:name      :actions-not-logged-in
     ;;TODO: topbar
-    :insets    {:bottom true}
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:bottom? true
+                         :top?    true}}
     ;;TODO move to popover?
     :component key-storage.views/actions-not-logged-in}
    {:name      :actions-logged-in
     ;;TODO: topbar
-    :options   {:topBar {:visible false}}
-    :insets    {:bottom true}
+    :options   {:insets {:bottom? true
+                         :top?    true}}
     ;;TODO move to popover?
     :component key-storage.views/actions-logged-in}
    {:name      :storage
     ;;TODO: topbar
-    :options   {:topBar {:visible false}}
-    :insets    {:bottom true}
+    :options   {:insets {:bottom? true
+                         :top?    true}}
     ;;TODO move to popover?
     :component key-storage.views/storage}
 
    {:name      :show-all-connections
-    :insets    {:bottom true}
-    :options   {:topBar {:title {:text (i18n/label :all-connections)}}}
+    :options   {:topBar {:title {:text (i18n/label :all-connections)}}
+                :insets {:bottom? true
+                         :top?    true}}
     :component manage-all-connections/views}
 
    ;; BUG REPORT
    {:name      :bug-report
-    :options   {:topBar {:visible false}}
+    :options   {:insets {:top? true}}
     :component bug-report/bug-report}])

src/status_im/ui/screens/signing/sheets.cljs

@@ -67,7 +67,7 @@
        :margin-top        6}
       [quo/button
        {:type     :secondary
-        :on-press #(re-frame/dispatch [:bottom-sheet/hide])}
+        :on-press #(re-frame/dispatch [:bottom-sheet/hide-old])}
        (i18n/label :t/cancel)]
       [quo/button
        {:type     :secondary
@@ -201,7 +201,7 @@
         :accessibility-label :see-fee-suggestions
         ;;:on-press
         #_(re-frame/dispatch
-           [:bottom-sheet/show-sheet
+           [:bottom-sheet/show-sheet-old
             {:content        (fn []
                                [fee-bottom-sheet-eip1559 fee-display-symbol])
              :content-height 270}])}
@@ -285,7 +285,7 @@
        {:type                :secondary
         :accessibility-label :set-custom-fee
         :on-press            #(re-frame/dispatch
-                               [:bottom-sheet/show-sheet
+                               [:bottom-sheet/show-sheet-old
                                 {:content        (fn []
                                                    [fee-bottom-sheet-eip1559-custom fee-display-symbol])
                                  :content-height 270}])}

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

@@ -470,7 +470,7 @@
     {:size     :small
      :title    (i18n/label :t/advanced)
      :chevron  true
-     :on-press #(re-frame/dispatch [:bottom-sheet/show-sheet {:content sheets/advanced}])}]])
+     :on-press #(re-frame/dispatch [:bottom-sheet/show-sheet-old {:content sheets/advanced}])}]])
 
 (views/defview sheet
   [{:keys [from contact amount token cancel?] :as tx}]

src/status_im/ui/screens/wallet/account/views.cljs

@@ -316,7 +316,7 @@
         {:title name
          :right-accessories
          [{:icon     :main-icons/more
-           :on-press #(re-frame/dispatch [:bottom-sheet/show-sheet
+           :on-press #(re-frame/dispatch [:bottom-sheet/show-sheet-old
                                           {:content        sheets/account-settings
                                            :content-height 60}])}]}]
        [react/animated-scroll-view

src/status_im/ui/screens/wallet/accounts/sheets.cljs

@@ -6,7 +6,7 @@
 
 (defn hide-sheet-and-dispatch
   [event]
-  (re-frame/dispatch [:bottom-sheet/hide])
+  (re-frame/dispatch [:bottom-sheet/hide-old])
   (re-frame/dispatch event))
 
 (defn accounts-options

src/status_im/ui/screens/wallet/accounts/views.cljs

@@ -17,7 +17,8 @@
             [status-im.ui.screens.wallet.accounts.common :as common]
             [status-im.ui.screens.wallet.accounts.sheets :as sheets]
             [status-im.ui.screens.wallet.accounts.styles :as styles]
-            [status-im.ui.screens.wallet.buy-crypto.views :as buy-crypto])
+            [status-im.ui.screens.wallet.buy-crypto.views :as buy-crypto]
+            [react-native.safe-area :as safe-area])
   (:require-macros [status-im.utils.views :as views]))
 
 (views/defview account-card
@@ -54,7 +55,7 @@
        [react/touchable-highlight
         {:style    styles/card-icon-more
          :on-press #(re-frame/dispatch
-                     [:bottom-sheet/show-sheet
+                     [:bottom-sheet/show-sheet-old
                       {:content        (fn [] [sheets/account-card-actions account type wallet])
                        :content-height 130}])}
         [icons/icon :main-icons/more {:color colors/white-persist}]]]]]))
@@ -62,7 +63,7 @@
 (defn add-card
   [card-width]
   [react/touchable-highlight
-   {:on-press            #(re-frame/dispatch [:bottom-sheet/show-sheet
+   {:on-press            #(re-frame/dispatch [:bottom-sheet/show-sheet-old
                                               {:content        sheets/add-account
                                                :content-height 260}])
     :accessibility-label "add-new-account"}
@@ -290,7 +291,7 @@
           [quo2.button/button
            {:type     :grey
             :size     32
-            :on-press #(re-frame/dispatch [:bottom-sheet/show-sheet
+            :on-press #(re-frame/dispatch [:bottom-sheet/show-sheet-old
                                            {:content        sheets/add-account
                                             :content-height 260}])}
            "Add account"]]]))))
@@ -301,33 +302,36 @@
         ;mainnet? @(re-frame/subscribe [:mainnet?])
         selected-account-atom (reagent/atom nil)]
     (fn []
-      [react/view
-       {:style {:flex             1
-                :background-color (quo2.colors/theme-colors quo2.colors/neutral-5
-                                                            quo2.colors/neutral-95)}}
-       [react/view {:padding-horizontal 20}
-        [react/view {:flex-direction :row :height 56 :align-items :center :justify-content :flex-end}
-         [quo2.button/button
-          {:icon                true
-           :size                32
-           :type                :grey
-           :accessibility-label :accounts-qr-code
-           :on-press            #(re-frame/dispatch
-                                  [::qr-scanner/scan-code
-                                   {:handler :wallet.send/qr-scanner-result}])}
-          :i/placeholder]
-         [react/view {:width 12}]
-         [quo2.button/button
-          {:icon                true
-           :size                32
-           :type                :grey
-           :on-press            #(re-frame/dispatch [:bottom-sheet/show-sheet
-                                                     {:content (sheets/accounts-options mnemonic)}])
-           :accessibility-label :accounts-more-options}
-          :i/placeholder]]
-        [total-value]
-        [accounts selected-account-atom]]
-       [account.views/account-new @selected-account-atom]])))
+      [safe-area/consumer
+       (fn [{:keys [top]}]
+         [react/view
+          {:style {:flex             1
+                   :padding-top      top
+                   :background-color (quo2.colors/theme-colors quo2.colors/neutral-5
+                                                               quo2.colors/neutral-95)}}
+          [react/view {:padding-horizontal 20}
+           [react/view {:flex-direction :row :height 56 :align-items :center :justify-content :flex-end}
+            [quo2.button/button
+             {:icon                true
+              :size                32
+              :type                :grey
+              :accessibility-label :accounts-qr-code
+              :on-press            #(re-frame/dispatch
+                                     [::qr-scanner/scan-code
+                                      {:handler :wallet.send/qr-scanner-result}])}
+             :i/placeholder]
+            [react/view {:width 12}]
+            [quo2.button/button
+             {:icon                true
+              :size                32
+              :type                :grey
+              :on-press            #(re-frame/dispatch [:bottom-sheet/show-sheet-old
+                                                        {:content (sheets/accounts-options mnemonic)}])
+              :accessibility-label :accounts-more-options}
+             :i/placeholder]]
+           [total-value]
+           [accounts selected-account-atom]]
+          [account.views/account-new @selected-account-atom]])])))
 
 (defn accounts-overview-old
   []
@@ -346,7 +350,7 @@
                                                      {:handler :wallet.send/qr-scanner-result}])
                              :icon                :main-icons/qr
                              :accessibility-label :accounts-qr-code}
-                            {:on-press            #(re-frame/dispatch [:bottom-sheet/show-sheet
+                            {:on-press            #(re-frame/dispatch [:bottom-sheet/show-sheet-old
                                                                        {:content (sheets/accounts-options
                                                                                   mnemonic)}])
                              :icon                :main-icons/more

src/status_im/ui/screens/wallet/send/sheets.cljs

@@ -39,8 +39,8 @@
 
 (defn show-accounts-list
   []
-  (re-frame/dispatch [:bottom-sheet/hide])
-  (js/setTimeout #(re-frame/dispatch [:bottom-sheet/show-sheet
+  (re-frame/dispatch [:bottom-sheet/hide-old])
+  (js/setTimeout #(re-frame/dispatch [:bottom-sheet/show-sheet-old
                                       {:content        (fn [] [accounts-list :to :wallet.send/set-field])
                                        :content-height 300}])
                  400))

src/status_im/ui/screens/wallet/send/views.cljs

@@ -35,7 +35,7 @@
      {:on-press (when-not request?
                   #(do
                      (re-frame/dispatch [:dismiss-keyboard])
-                     (re-frame/dispatch [:bottom-sheet/show-sheet
+                     (re-frame/dispatch [:bottom-sheet/show-sheet-old
                                          {:content        (fn [] [sheets/assets (:address from)])
                                           :content-height 300}])))}
      [react/view
@@ -70,7 +70,7 @@
     :chevron  true
     :on-press #(do
                  (re-frame/dispatch [:dismiss-keyboard])
-                 (re-frame/dispatch [:bottom-sheet/show-sheet
+                 (re-frame/dispatch [:bottom-sheet/show-sheet-old
                                      {:content        (fn [] [sheets/accounts-list :from event])
                                       :content-height 300}]))}])
 

src/status_im/ui/screens/wallet/settings/views.cljs

@@ -23,7 +23,7 @@
 
 (defn hide-sheet-and-dispatch
   [event]
-  (re-frame/dispatch [:bottom-sheet/hide])
+  (re-frame/dispatch [:bottom-sheet/hide-old])
   (re-frame/dispatch event))
 
 (defn custom-token-actions-view
@@ -65,7 +65,7 @@
         :on-press            #(re-frame/dispatch
                                [:wallet.settings/toggle-visible-token (keyword symbol) (not checked?)])
         :on-long-press       #(re-frame/dispatch
-                               [:bottom-sheet/show-sheet
+                               [:bottom-sheet/show-sheet-old
                                 {:content (custom-token-actions-view token)}])}])}))
 
 (defn- render-token-wrapper