fix: update status-go to fix panic on logout

`react-native-reanimated` generates write protected files during build time which are problematic because we copy over `node_modules` from `nix` store and when replacing them with new node modules we are manually asked to confirm this overwrite.

This used to happen before with `.cxx` files but now it also happens with `.so` files. 

This commit fixes those permissions.

partially fixes #18211

Makefile

@@ -263,7 +263,7 @@ run-clojure: export TARGET := clojure
 run-clojure: ##@run Watch for and build Clojure changes for mobile
 	yarn shadow-cljs watch mobile
 
-run-metro: export TARGET := android
+run-metro: export TARGET := clojure
 run-metro: ##@run Start Metro to build React Native changes
 	@scripts/start-react-native.sh
 

ios/Podfile.lock

@@ -497,33 +497,10 @@ PODS:
     - React-Core
   - RNReactNativeHapticFeedback (1.9.0):
     - React
-  - RNReanimated (3.5.4):
-    - DoubleConversion
-    - FBLazyVector
-    - glog
-    - RCT-Folly
-    - RCTRequired
-    - RCTTypeSafety
-    - React-callinvoker
+  - RNReanimated (3.6.1):
+    - RCT-Folly (= 2021.07.22.00)
     - React-Core
-    - React-Core/DevSupport
-    - React-Core/RCTWebSocket
-    - React-CoreModules
-    - React-cxxreact
-    - React-jsi
-    - React-jsiexecutor
-    - React-jsinspector
-    - React-RCTActionSheet
-    - React-RCTAnimation
-    - React-RCTAppDelegate
-    - React-RCTBlob
-    - React-RCTImage
-    - React-RCTLinking
-    - React-RCTNetwork
-    - React-RCTSettings
-    - React-RCTText
     - ReactCommon/turbomodule/core
-    - Yoga
   - RNShare (8.2.2):
     - React-Core
   - RNStaticSafeAreaInsets (2.2.0):
@@ -823,7 +800,7 @@ SPEC CHECKSUMS:
   FBLazyVector: 71803c074f6325f10b5ec891c443b6bbabef0ca7
   FBReactNativeSpec: 448e08a759d29a96e15725ae532445bf4343567c
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: c5b451128f1a485ffb9be9df3f544b001bd1fde0
+  glog: cf171f517b828fdde711287b723e348da1ea0fc3
   HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
   Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
   libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
@@ -894,7 +871,7 @@ SPEC CHECKSUMS:
   RNLanguages: 962e562af0d34ab1958d89bcfdb64fafc37c513e
   RNPermissions: 215c54462104b3925b412b0fb3c9c497b21c358b
   RNReactNativeHapticFeedback: 2566b468cc8d0e7bb2f84b23adc0f4614594d071
-  RNReanimated: bdadbf5322d7894bb6016985d8ae5c9ed5fc83d0
+  RNReanimated: fdbaa9c964bbab7fac50c90862b6cc5f041679b9
   RNShare: d82e10f6b7677f4b0048c23709bd04098d5aee6c
   RNStaticSafeAreaInsets: 055ddbf5e476321720457cdaeec0ff2ba40ec1b8
   RNSVG: 80584470ff1ffc7994923ea135a3e5ad825546b9

nix/scripts/node_modules.sh

@@ -46,7 +46,7 @@ copyNodeModules() {
   # WARNING: We can't de-reference .bin symlinks
   cp -Rf ${src}/node_modules/.bin/. "${tmp}/.bin/"
   # Cmake called by react-native-reanimated 3.3.0 during build creates read-only temporary files.
-  chmod -R u+w node_modules/react-native-reanimated/android/.cxx -f || true
+  chmod -R u+w node_modules/react-native-reanimated/android/ -f || true
   rm -r "${dst}"
   mv -f "${tmp}" "${dst}"
 }

package.json

@@ -58,7 +58,7 @@
     "react-native-orientation-locker": "^1.5.0",
     "react-native-permissions": "3.8.0",
     "react-native-randombytes": "^3.6.1",
-    "react-native-reanimated": "3.5.4",
+    "react-native-reanimated": "3.6.1",
     "react-native-redash": "18.1.0",
     "react-native-shake": "^3.3.1",
     "react-native-share": "^8.2.2",

shadow-cljs.edn

@@ -155,7 +155,7 @@
                                       ;; setupFilesAfterEnv.
                                       status-im2.setup.schema-preload
 
-                                      quo.core-spec
+                                      ;;quo.core-spec
                                       status-im2.core-spec]
                    :ns-regexp        "component-spec$"
                    :output-dir       "component-spec"

src/mocks/js_dependencies.cljs

@@ -251,6 +251,7 @@
                               :onChange                nil
                               :View                    #js {}
                               :Image                   #js {}
+                              :FlatList                #js {}
                               :ScrollView              #js {}
                               :Text                    #js {}
                               :Extrapolate             #js {:CLAMP nil}

src/quo/components/drawers/drawer_top/view.cljs

@@ -14,6 +14,8 @@
     [react-native.core :as rn]
     [utils.i18n :as i18n]))
 
+(def ^:private left-image-supported-types #{:account :keypair :default-keypair})
+
 (defn- left-image
   [{:keys [type customization-color account-avatar-emoji icon-avatar profile-picture]}]
   (case type
@@ -165,13 +167,14 @@
            button-disabled? account-avatar-emoji customization-color icon-avatar
            profile-picture keycard? networks label]}]
   [rn/view {:style style/container}
-   [rn/view {:style style/left-container}
-    [left-image
-     {:type                 type
-      :customization-color  customization-color
-      :account-avatar-emoji account-avatar-emoji
-      :icon-avatar          icon-avatar
-      :profile-picture      profile-picture}]]
+   (when (left-image-supported-types type)
+     [rn/view {:style style/left-container}
+      [left-image
+       {:type                 type
+        :customization-color  customization-color
+        :account-avatar-emoji account-avatar-emoji
+        :icon-avatar          icon-avatar
+        :profile-picture      profile-picture}]])
    [rn/view {:style style/body-container}
     [left-title
      {:type  type

src/quo/components/list_items/token_value/component_spec.cljs

@@ -7,6 +7,7 @@
   (h/test "Token label renders"
     (h/render [token-value/view
                {:token               :snt
+                :token-name          "Status"
                 :state               :default
                 :status              :empty
                 :customization-color :blue
@@ -20,6 +21,7 @@
   (h/test "Status change"
     (h/render [token-value/view
                {:token               :snt
+                :token-name          "Status"
                 :state               :default
                 :status              :positive
                 :customization-color :blue

src/quo/components/list_items/token_value/view.cljs

@@ -6,7 +6,6 @@
     [quo.components.markdown.text :as text]
     [quo.components.utilities.token.view :as token]
     [quo.foundations.colors :as colors]
-    [quo.foundations.common :as common]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
     [reagent.core :as reagent]))
@@ -14,7 +13,8 @@
 (defn- internal-view
   []
   (let [state (reagent/atom :default)]
-    (fn [{:keys [theme customization-color status token metrics? values on-press on-long-press]}]
+    (fn [{:keys [theme customization-color status token metrics? values on-press on-long-press
+                 token-name]}]
       (let [bg-opacity                                                      (case @state
                                                                               :active  10
                                                                               :pressed 5
@@ -36,7 +36,7 @@
                    :flex           1}}
           [token/view {:token token :size :size-32}]
           [rn/view {:style {:margin-left 8}}
-           [text/text {:weight :semi-bold} (common/token-label token)]
+           [text/text {:weight :semi-bold} token-name]
            [text/text
             {:size  :paragraph-2
              :style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}

src/quo/components/messages/system_message/style.cljs

@@ -71,6 +71,7 @@
 (def system-message-contact-request-account-wrapper
   {:flex-direction :row
    :align-items    :center
+   :margin-left    4
    :flex-shrink    1})
 
 (def system-message-contact-request-account-name

src/quo/components/utilities/token/view.cljs

@@ -1,8 +1,11 @@
 (ns quo.components.utilities.token.view
-  (:require [quo.components.utilities.token.loader :as token-loader]
-            [react-native.core :as rn]
-            [schema.core :as schema]
-            [utils.number]))
+  (:require
+    [clojure.string :as string]
+    [quo.components.markdown.text :as quo]
+    [quo.components.utilities.token.loader :as token-loader]
+    [react-native.core :as rn]
+    [schema.core :as schema]
+    [utils.number]))
 
 (def ?schema
   [:=>
@@ -12,7 +15,7 @@
      [:token {:optional true} [:or keyword? string?]]
      [:style {:optional true} map?]
      ;; Ignores `token` and uses this as parameter to `rn/image`'s source.
-     [:image-source {:optional true} [:or string? map?]]
+     [:image-source {:optional true} [:or :schema.common/image-source :string]]
      ;; If true, adds `data:image/png;base64,` as prefix to the string passed as `image-source`
      [:add-b64-prefix? {:optional true} boolean?]]]
    :any])
@@ -33,6 +36,18 @@
 
 (def ^:private b64-png-image-prefix "data:image/png;base64,")
 
+(defn temp-empty-symbol
+  [token size]
+  [rn/view
+   {:style (token-style {:justify-content :center
+                         :align-items     :center
+                         :border-radius   20
+                         :border-width    1
+                         :border-color    :grey}
+                        size)}
+   [quo/text {:style {:color :grey}}
+    (string/capitalize (first (name token)))]])
+
 (defn view-internal
   "Render a token image.
    Props:
@@ -51,8 +66,10 @@
                      (str b64-png-image-prefix image-source)
                      image-source)
         source     (or b64-string (token-loader/get-token-image token))]
-    [rn/image
-     {:style  (token-style style size)
-      :source source}]))
+    (if source
+      [rn/image
+       {:style  (token-style style size)
+        :source source}]
+      [temp-empty-symbol token size])))
 
 (def view (schema/instrument #'view-internal ?schema))

src/quo/components/wallet/required_tokens/component_spec.cljs

@@ -0,0 +1,30 @@
+(ns quo.components.wallet.required-tokens.component-spec
+  (:require
+    [quo.components.wallet.required-tokens.view :as required-tokens]
+    [test-helpers.component :as h]))
+
+(defn render
+  [component]
+  (h/render-with-theme-provider component :light))
+
+(h/describe "Wallet: Required Tokens"
+  (h/test "basic render"
+    (render [required-tokens/view
+             {:token  "SNT"
+              :type   :token
+              :amount 100}])
+    (h/is-truthy (h/get-by-label-text :wallet-required-tokens)))
+
+  (h/test "render collectible"
+    (render [required-tokens/view
+             {:type                :collectible
+              :collectible-img-src (js/require "../resources/images/mock2/collectible.png")
+              :collectible-name    "Diamond"}])
+    (h/is-truthy (h/get-by-text "Diamond")))
+
+  (h/test "render token with correct amount & symbol"
+    (render [required-tokens/view
+             {:type   :token
+              :token  "ETH"
+              :amount 100}])
+    (h/is-truthy (h/get-by-text "100 ETH"))))

src/quo/components/wallet/required_tokens/style.cljs

@@ -0,0 +1,21 @@
+(ns quo.components.wallet.required-tokens.style
+  (:require [quo.foundations.colors :as colors]))
+
+(def container
+  {:align-items    :center
+   :flex-direction :row})
+
+(def collectible-img
+  {:width         14
+   :height        14
+   :border-radius 4})
+
+(defn divider
+  [theme]
+  {:width            2
+   :height           2
+   :border-radius    1
+   :margin-left      8
+   :background-color (colors/theme-colors colors/neutral-40
+                                          colors/neutral-50
+                                          theme)})

src/quo/components/wallet/required_tokens/view.cljs

@@ -0,0 +1,56 @@
+(ns quo.components.wallet.required-tokens.view
+  (:require [quo.components.markdown.text :as text]
+            [quo.components.utilities.token.view :as token]
+            [quo.components.wallet.required-tokens.style :as style]
+            quo.theme
+            [react-native.core :as rn]
+            [schema.core :as schema]))
+
+(def ?schema
+  [:=>
+   [:catn
+    [:props
+     [:map {:closed true}
+      [:type [:enum :token :collectible]]
+      [:amount {:optional true} [:maybe [:or :string :int]]]
+      [:token {:optional true} [:maybe :string]]
+      [:token-img-src {:optional true} [:maybe :schema.common/image-source]]
+      [:collectible-img-src {:optional true} :schema.common/image-source]
+      [:collectible-name {:optional true} [:maybe :string]]
+      [:divider? {:optional true} [:maybe :boolean]]
+      [:theme :schema.common/theme]
+      [:container-style {:optional true} [:maybe :map]]]]]
+   :any])
+
+(defn- view-internal
+  [{:keys [type amount token token-img-src collectible-img-src collectible-name divider? theme
+           container-style]}]
+  [rn/view
+   {:style               (merge style/container container-style)
+    :accessibility-label :wallet-required-tokens}
+   (case type
+     :token       [token/view
+                   (assoc (if token-img-src
+                            {:image-source token-img-src}
+                            {:token token})
+                          :size
+                          14)]
+     :collectible [rn/image
+                   {:style  style/collectible-img
+                    :source collectible-img-src}]
+     nil)
+   [text/text
+    {:size   :paragraph-2
+     :weight :medium
+     :style  {:margin-left 4}}
+    (case type
+      :token       (str amount " " token)
+      :collectible collectible-name
+      nil)]
+   (when divider?
+     [rn/view
+      {:style (style/divider theme)}])])
+
+(def view
+  (quo.theme/with-theme
+   (schema/instrument #'view-internal ?schema)))

src/quo/core.cljs

@@ -155,6 +155,7 @@
     quo.components.wallet.network-link.view
     quo.components.wallet.network-routing.view
     quo.components.wallet.progress-bar.view
+    quo.components.wallet.required-tokens.view
     quo.components.wallet.summary-info.view
     quo.components.wallet.token-input.view
     quo.components.wallet.transaction-progress.view
@@ -403,6 +404,7 @@
 (def network-bridge quo.components.wallet.network-bridge.view/view)
 (def network-routing quo.components.wallet.network-routing.view/view)
 (def progress-bar quo.components.wallet.progress-bar.view/view)
+(def required-tokens quo.components.wallet.required-tokens.view/view)
 (def summary-info quo.components.wallet.summary-info.view/view)
 (def network-link quo.components.wallet.network-link.view/view)
 (def token-input quo.components.wallet.token-input.view/view)

src/quo/core_spec.cljs

@@ -87,6 +87,7 @@
     [quo.components.wallet.network-bridge.component-spec]
     [quo.components.wallet.network-routing.component-spec]
     [quo.components.wallet.progress-bar.component-spec]
+    [quo.components.wallet.required-tokens.component-spec]
     [quo.components.wallet.summary-info.component-spec]
     [quo.components.wallet.token-input.component-spec]
     [quo.components.wallet.transaction-progress.component-spec]

src/quo/foundations/common.cljs

@@ -3,8 +3,3 @@
 (def currency-label
   {:eur "€"
    :usd "$"})
-
-(def token-label
-  {:eth "Ethereum"
-   :snt "Status"
-   :dai "Dai"})

src/react_native/reanimated.cljs

@@ -42,10 +42,7 @@
 (def scroll-view (reagent/adapt-react-class (.-ScrollView reanimated)))
 (def image (reagent/adapt-react-class (.-Image reanimated)))
 
-;; TODO: This one should use FlatList from Reanimated.
-;; Trying to use Flatlist from RA causes test to fail: "The first argument must be a component. Instead
-;; received: object"
-(def reanimated-flat-list (reagent/adapt-react-class (.-FlatList ^js rn)))
+(def reanimated-flat-list (reagent/adapt-react-class (.-FlatList reanimated)))
 (defn flat-list
   [props]
   [reanimated-flat-list (rn-flat-list/base-list-props props)])

src/react_native/share.cljs

@@ -3,8 +3,10 @@
     ["react-native-share" :default react-native-share]))
 
 (defn open
-  [options on-success on-error]
-  (-> ^js react-native-share
-      (.open (clj->js options))
-      (.then on-success)
-      (.catch on-error)))
+  ([options]
+   (open options #() #()))
+  ([options on-success on-error]
+   (-> ^js react-native-share
+       (.open (clj->js options))
+       (.then on-success)
+       (.catch on-error))))

src/schema/common.cljs

@@ -11,6 +11,12 @@
 (def ^:private ?public-key
   [:re #"^0x04[0-9a-f]{128}$"])
 
+(def ^:private ?image-source
+  [:or
+   [:int]
+   [:map
+    [:uri [:maybe [:string]]]]])
+
 (def ^:private ?rpc-call
   [:sequential
    {:min 1}
@@ -27,4 +33,5 @@
   (registry/register ::theme ?theme)
   (registry/register ::customization-color ?customization-color)
   (registry/register ::public-key ?public-key)
+  (registry/register ::image-source ?image-source)
   (registry/register ::rpc-call ?rpc-call))

src/status_im/browser/core.cljs

@@ -17,6 +17,7 @@
     [status-im.utils.deprecated-types :as types]
     [status-im.utils.random :as random]
     [status-im2.constants :as constants]
+    [status-im2.contexts.chat.events :as chat.events]
     [status-im2.navigation.events :as navigation]
     [taoensso.timbre :as log]
     [utils.address :as address]
@@ -310,6 +311,7 @@
                             {:browser-id (:browser-id browser)}
                             :browser/screen-id :browser)}
                 (navigation/pop-to-root :shell-stack)
+                (chat.events/close-chat)
                 (navigation/change-tab :browser-stack)
                 (update-browser browser)
                 (resolve-url nil)))))

src/status_im/chat/models/input_test.cljs

@@ -1,10 +0,0 @@
-(ns status-im.chat.models.input-test
-  (:require
-    [cljs.test :refer-macros [deftest is]]
-    [status-im.chat.models.input :as input]))
-
-(deftest text->emoji
-  (is (nil? (input/text->emoji nil)))
-  (is (= "" (input/text->emoji "")))
-  (is (= "test" (input/text->emoji "test")))
-  (is (= "word1 \uD83D\uDC4D word2" (input/text->emoji "word1 :+1: word2"))))

src/status_im/chat/models/mentions.cljs

@@ -161,3 +161,18 @@
                        :on-error   #(log/error "Error while calling wakuext_chatMentionClearMentions"
                                                {:error %})}]}
      (clear-suggestions))))
+
+(rf/defn select-mention
+  {:events [:chat.ui/select-mention]}
+  [{:keys [db]} {: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_chatMentionSelectMention"
+        params  [chat-id text primary-name public-key]]
+    {:json-rpc/call [{:method     method
+                      :params     params
+                      :on-success #(rf/dispatch [:mention/on-select-mention-success %
+                                                 primary-name match searched-text public-key])
+                      :on-error   #(rf/dispatch [:mention/on-error
+                                                 {:method method
+                                                  :params params} %])}]}))

src/status_im/currency/core.cljs

@@ -15,5 +15,6 @@
             (multiaccounts.update/multiaccount-update
              :currency
              currency
-             {})
+             ;; on changing currency, we should fetch tokens prices again
+             {:on-success #(rf/dispatch [:wallet/get-wallet-token])})
             (prices/update-prices)))

src/status_im/ethereum/subscriptions.cljs

@@ -69,10 +69,10 @@
 
 (rf/defn new-wallet-event
   [cofx {:keys [type blockNumber accounts] :as event}]
-  (log/info "[wallet-subs] new-wallet-event"
-            "event-type"  type
-            "blockNumber" blockNumber
-            "accounts"    accounts)
+  (log/debug "[wallet-subs] new-wallet-event"
+             "event-type"  type
+             "blockNumber" blockNumber
+             "accounts"    accounts)
   (case type
     "new-transfers"                            (new-transfers cofx blockNumber accounts)
     "recent-history-fetching"                  (recent-history-fetching-started cofx accounts)
@@ -85,4 +85,4 @@
     "wallet-get-collectibles-details-done"     {:fx [[:dispatch
                                                       [:wallet/get-collectible-details-done
                                                        event]]]}
-    (log/warn ::unknown-wallet-event :type type :event event)))
+    (log/debug ::unknown-wallet-event :type type :event event)))

src/status_im/events.cljs

@@ -10,7 +10,6 @@
     status-im.bootnodes.core
     status-im.browser.core
     status-im.browser.permissions
-    status-im.chat.models.input
     status-im.chat.models.loading
     status-im.contact.block
     status-im.currency.core

src/status_im/group_chats/core.cljs

@@ -17,7 +17,7 @@
   {:events [:navigate-chat-updated]}
   [cofx chat-id]
   (when (get-in cofx [:db :chats chat-id])
-    (chat.events/navigate-to-chat cofx chat-id nil)))
+    (chat.events/pop-to-root-and-navigate-to-chat cofx chat-id nil)))
 
 (rf/defn handle-chat-removed
   {:events [:chat-removed]}
@@ -80,7 +80,7 @@
   {:events [:group-chats/create-from-link]}
   [cofx {:keys [chat-id invitation-admin chat-name]}]
   (if (get-in cofx [:db :chats chat-id])
-    {:dispatch [:chat/navigate-to-chat chat-id]}
+    {:dispatch [:chat/pop-to-root-and-navigate-to-chat chat-id]}
     {:json-rpc/call [{:method      "wakuext_createGroupChatFromInvitation"
                       :params      [chat-name chat-id invitation-admin]
                       :js-response true

src/status_im/multiaccounts/create/core.cljs

@@ -95,8 +95,9 @@
     accounts-data)))
 
 (rf/defn save-account-and-login
-  [_ key-uid multiaccount-data password settings node-config accounts-data]
-  {::save-account-and-login [key-uid
+  [{:keys [db]} key-uid multiaccount-data password settings node-config accounts-data]
+  {:db                      (assoc-in db [:syncing :login-sha3-password] password)
+   ::save-account-and-login [key-uid
                              (types/clj->json multiaccount-data)
                              password
                              (types/clj->json settings)

src/status_im/multiaccounts/logout/core.cljs

@@ -22,7 +22,8 @@
               :network/type              type
               :initials-avatar-font-file initials-avatar-font-file
               :keycard                   (dissoc keycard :secrets :pin :application-info)
-              :biometric/supported-type  supported-type)})
+              :biometric/supported-type  supported-type
+              :syncing                   nil)})
 
 (rf/defn logout-method
   {:events [::logout-method]}

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

@@ -19,7 +19,8 @@
            transactions-management-enabled?
            wakuv2-flag
            current-fleet
-           webview-debug]}]
+           webview-debug
+           test-networks-enabled?]}]
   (keep
    identity
    [{:size :small
@@ -100,6 +101,14 @@
        [:profile.settings/change-webview-debug (not webview-debug)])
      :accessory :switch
      :active webview-debug}
+    {:size :small
+     :title "Testnet mode"
+     :accessibility-label :test-networks-enabled
+     :container-margin-bottom 8
+     :on-press
+     #(re-frame/dispatch [:profile.settings/toggle-test-networks])
+     :accessory :switch
+     :active test-networks-enabled?}
     {:size :small
      :title (i18n/label :t/waku-bloom-filter-mode)
      :accessibility-label :waku-bloom-filter-mode-settings-switch
@@ -128,7 +137,8 @@
 
 (views/defview advanced-settings
   []
-  (views/letsubs [{:keys [webview-debug]}          [:profile/profile]
+  (views/letsubs [{:keys [webview-debug
+                          test-networks-enabled?]} [:profile/profile]
                   network-name                     [:network-name]
                   waku-bloom-filter-mode           [:waku/bloom-filter-mode]
                   wakuv2-flag                      [:waku/v2-flag]
@@ -144,6 +154,7 @@
                    :dev-mode?                        false
                    :wakuv2-flag                      wakuv2-flag
                    :waku-bloom-filter-mode           waku-bloom-filter-mode
-                   :webview-debug                    webview-debug})
+                   :webview-debug                    webview-debug
+                   :test-networks-enabled?           test-networks-enabled?})
       :key-fn    (fn [_ i] (str i))
       :render-fn render-item}]))

src/status_im/wallet/core.cljs

@@ -1153,26 +1153,18 @@
         #(async-storage/set-item! :invalid-ens-name-seen true)))))
   nil)
 
-(re-frame/reg-fx
- ::enable-local-notifications
- (fn []
-   (native-module/start-local-notifications)))
-
 (rf/defn initialize-wallet
   {:events [:wallet-legacy/initialize-wallet]}
   [{:keys [db] :as cofx} accounts tokens custom-tokens
    favourites scan-all-tokens? new-account?]
   (rf/merge
    cofx
-   {:db                          (assoc db
-                                        :profile/wallet-accounts
-                                        (rpc->accounts accounts))
-    ;; NOTE: Local notifications should be enabled only after wallet was started
-    ::enable-local-notifications nil
-    :dispatch-n                  [(when (or (not (utils.mobile-sync/syncing-allowed? cofx))
-                                            (chain/binance-chain? db))
-                                    [:transaction/get-fetched-transfers])]
-    :dispatch                    [:wallet/get-accounts-success accounts]}
+   {:db         (assoc db
+                       :profile/wallet-accounts
+                       (rpc->accounts accounts))
+    :dispatch-n [(when (or (not (utils.mobile-sync/syncing-allowed? cofx))
+                           (chain/binance-chain? db))
+                   [:transaction/get-fetched-transfers])]}
    (check-invalid-ens)
    (initialize-tokens tokens custom-tokens)
    (initialize-favourites favourites)

src/status_im2/common/data_store/wallet.cljs

@@ -15,6 +15,10 @@
   [ids]
   (string/join constants/chain-id-separator ids))
 
+(defn add-keys-to-account
+  [account]
+  (assoc account :watch-only? (= (:type account) :watch)))
+
 (defn rpc->account
   [account]
   (-> account
@@ -25,7 +29,8 @@
       (update :prod-preferred-chain-ids chain-ids-string->set)
       (update :test-preferred-chain-ids chain-ids-string->set)
       (update :type keyword)
-      (update :color #(if (seq %) (keyword %) constants/account-default-customization-color))))
+      (update :color #(if (seq %) (keyword %) constants/account-default-customization-color))
+      add-keys-to-account))
 
 (defn rpc->accounts
   [accounts]
@@ -40,7 +45,8 @@
                         :test-preferred-chain-ids :testPreferredChainIds
                         :color                    :colorId})
       (update :prodPreferredChainIds chain-ids-set->string)
-      (update :testPreferredChainIds chain-ids-set->string)))
+      (update :testPreferredChainIds chain-ids-set->string)
+      (dissoc :watch-only?)))
 
 (defn <-rpc
   [network]

src/status_im2/common/pairing/events.cljs

@@ -18,6 +18,8 @@
                                                 constants/local-pairing-event-connection-success)
                                              (= action
                                                 constants/local-pairing-action-connect))
+        connection-error?               (and (= type
+                                                constants/local-pairing-event-connection-error))
         error-on-pairing?               (contains? constants/local-pairing-event-errors type)
         completed-pairing?              (and (= type
                                                 constants/local-pairing-event-transfer-success)
@@ -30,8 +32,9 @@
                                              (and (some? account) (some? password)))
         multiaccount-data               (when received-account?
                                           (merge account {:password password}))
-        navigate-to-syncing-devices?    (and (or connection-success? error-on-pairing?) receiver?)
+        navigate-to-syncing-devices?    (and (or connection-success? connection-error?) receiver?)
         user-in-syncing-devices-screen? (or (= (:view-id db) :syncing-progress)
+                                            (= (:view-id db) :profiles)
                                             (= (:view-id db) :syncing-progress-intro))
         user-in-sign-in-intro-screen?   (= (:view-id db) :sign-in-intro)]
     (merge {:db (cond-> db

src/status_im2/common/resources.cljs

@@ -22,43 +22,27 @@
    :onboarding-illustration       (js/require "../resources/images/ui2/onboarding_illustration.png")
    :qr-code                       (js/require "../resources/images/ui2/qr-code.png")
    :keycard-logo                  (js/require "../resources/images/ui2/keycard-logo.png")
-   :keycard-chip-light            (js/require "../resources/images/ui2/keycard-chip-light.png")
-   :keycard-chip-dark             (js/require "../resources/images/ui2/keycard-chip-dark.png")
    :keycard-watermark             (js/require "../resources/images/ui2/keycard-watermark.png")
    :discover                      (js/require "../resources/images/ui2/discover.png")
    :invite-friends                (js/require "../resources/images/ui2/invite-friends.png")
-   :no-messages-light             (js/require "../resources/images/ui2/no-messages-light.png")
-   :no-messages-dark              (js/require "../resources/images/ui2/no-messages-dark.png")
-   :no-group-chats-light          (js/require "../resources/images/ui2/no-group-chats-light.png")
-   :no-group-chats-dark           (js/require "../resources/images/ui2/no-group-chats-dark.png")
-   :no-contacts-light             (js/require "../resources/images/ui2/no-contacts-light.png")
-   :no-contacts-dark              (js/require "../resources/images/ui2/no-contacts-dark.png")
-   :no-sent-requests-light        (js/require "../resources/images/ui2/no-sent-requests-light.png")
-   :no-sent-requests-dark         (js/require "../resources/images/ui2/no-sent-requests-dark.png")
-   :no-received-requests-light    (js/require "../resources/images/ui2/no-received-requests-light.png")
-   :no-received-requests-dark     (js/require "../resources/images/ui2/no-received-requests-dark.png")
-   :no-communities-light          (js/require "../resources/images/ui2/no-communities-light.png")
-   :no-communities-dark           (js/require "../resources/images/ui2/no-communities-dark.png")
-   :no-pending-communities-light  (js/require "../resources/images/ui2/no-pending-communities-light.png")
-   :no-pending-communities-dark   (js/require "../resources/images/ui2/no-pending-communities-dark.png")
-   :no-opened-communities-light   (js/require "../resources/images/ui2/no-opened-communities-light.png")
-   :no-opened-communities-dark    (js/require "../resources/images/ui2/no-opened-communities-dark.png")
-   :no-contacts-to-invite-light   (js/require "../resources/images/ui2/no-contacts-to-invite-light.png")
-   :no-contacts-to-invite-dark    (js/require "../resources/images/ui2/no-contacts-to-invite-dark.png")
-   :no-notifications-light        (js/require "../resources/images/ui2/no-notifications-light.png")
-   :no-notifications-dark         (js/require "../resources/images/ui2/no-notifications-dark.png")
    :welcome-illustration          (js/require "../resources/images/ui2/welcome_illustration.png")})
 
 (def ui-themed
-  {:no-messages
-   {:light (js/require "../resources/images/ui2/no-messages-light.png")
-    :dark  (js/require "../resources/images/ui2/no-messages-dark.png")}
-   :no-group-chats
-   {:light (js/require "../resources/images/ui2/no-group-chats-light.png")
-    :dark  (js/require "../resources/images/ui2/no-group-chats-dark.png")}
+  {:angry-man
+   {:light (js/require "../resources/images/ui2/angry-man-light.png")
+    :dark  (js/require "../resources/images/ui2/angry-man-dark.png")}
+   :cat-in-box
+   {:light (js/require "../resources/images/ui2/cat-in-box-light.png")
+    :dark  (js/require "../resources/images/ui2/cat-in-box-dark.png")}
    :no-contacts
    {:light (js/require "../resources/images/ui2/no-contacts-light.png")
     :dark  (js/require "../resources/images/ui2/no-contacts-dark.png")}
+   :keycard-chip
+   {:light (js/require "../resources/images/ui2/keycard-chip-light.png")
+    :dark  (js/require "../resources/images/ui2/keycard-chip-dark.png")}
+   :no-group-chats
+   {:light (js/require "../resources/images/ui2/no-group-chats-light.png")
+    :dark  (js/require "../resources/images/ui2/no-group-chats-dark.png")}
    :no-sent-requests
    {:light (js/require "../resources/images/ui2/no-sent-requests-light.png")
     :dark  (js/require "../resources/images/ui2/no-sent-requests-dark.png")}
@@ -91,7 +75,10 @@
     :dark  (js/require "../resources/images/ui2/no-dapps-dark.png")}
    :no-permissions
    {:light (js/require "../resources/images/ui2/no-permissions-light.png")
-    :dark  (js/require "../resources/images/ui2/no-permissions-dark.png")}})
+    :dark  (js/require "../resources/images/ui2/no-permissions-dark.png")}
+   :sweating-man
+   {:light (js/require "../resources/images/ui2/sweating-man-light.png")
+    :dark  (js/require "../resources/images/ui2/sweating-man-dark.png")}})
 
 (def mock-images
   {:bored-ape             (js/require "../resources/images/mock2/bored-ape.png")
@@ -138,7 +125,11 @@
                    (js/require "../resources/videos2/biometrics_04.mp4")]
    :generate-keys [(js/require "../resources/videos2/generating_keys_01.mp4")
                    (js/require "../resources/videos2/generating_keys_02.mp4")
-                   (js/require "../resources/videos2/generating_keys_03.mp4")]})
+                   (js/require "../resources/videos2/generating_keys_03.mp4")]
+   :notifications [(js/require "../resources/videos2/notifications_01.mp4")
+                   (js/require "../resources/videos2/notifications_02.mp4")
+                   (js/require "../resources/videos2/notifications_03.mp4")
+                   (js/require "../resources/videos2/notifications_04.mp4")]})
 
 (def services
   {:latamex (js/require "../resources/images/services/Latamex.png")

src/status_im2/common/universal_links.cljs

@@ -69,7 +69,7 @@
 (rf/defn handle-community-chat
   [cofx {:keys [chat-id]}]
   (log/info "universal-links: handling community chat" chat-id)
-  {:dispatch [:chat/navigate-to-chat chat-id]})
+  {:dispatch [:chat/pop-to-root-and-navigate-to-chat chat-id]})
 
 (rf/defn handle-view-profile
   [{:keys [db] :as cofx} {:keys [public-key ens-name]}]

src/status_im2/config.cljs

@@ -157,6 +157,4 @@
 
 (def default-kdf-iterations 3200)
 
-(def shell-navigation-disabled? false)
-
 (def community-accounts-selection-enabled? false)

src/status_im2/constants.cljs

@@ -105,6 +105,7 @@
 
 (def ^:const profile-default-color :blue)
 (def ^:const profile-name-max-length 24)
+(def ^:const profile-default-currency :usd)
 
 (def ^:const profile-pictures-show-to-contacts-only 1)
 (def ^:const profile-pictures-show-to-everyone 2)

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

@@ -32,7 +32,7 @@
   (js/setTimeout #(reanimated/set-shared-value background-y
                                                (- window-height))
                  300)
-  (rf/dispatch [:chat.ui/send-current-message])
+  (rf/dispatch [:chat.ui/replace-mentions-and-send-current-message])
   (rf/dispatch [:chat.ui/set-input-maximized false])
   (rf/dispatch [:chat.ui/set-input-content-height comp-constants/input-height])
   (rf/dispatch [:chat.ui/set-chat-input-text nil])

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

@@ -1,41 +1,25 @@
-(ns status-im.chat.models.input
-  (:require
-    ["emojilib" :as emojis]
-    [clojure.string :as string]
-    [goog.object :as object]
-    [re-frame.core :as re-frame]
-    [status-im.chat.models.mentions :as mentions]
-    [status-im.data-store.messages :as data-store-messages]
-    [status-im2.constants :as constants]
-    [status-im2.contexts.chat.composer.link-preview.events :as link-preview]
-    [status-im2.contexts.chat.messages.transport.events :as messages.transport]
-    [taoensso.timbre :as log]
-    [utils.i18n :as i18n]
-    [utils.re-frame :as rf]
-    [utils.string :as utils.string]))
-
-(defn text->emoji
-  "Replaces emojis in a specified `text`"
-  [text]
-  (utils.string/safe-replace text
-                             #":([a-z_\-+0-9]*):"
-                             (fn [[original emoji-id]]
-                               (if-let [emoji-map (object/get (.-lib emojis) emoji-id)]
-                                 (.-char ^js emoji-map)
-                                 original))))
-
-;; effects
+(ns status-im2.contexts.chat.composer.events
+  (:require [clojure.string :as string]
+            [status-im.chat.models.mentions :as mentions]
+            [status-im.data-store.messages :as data-store-messages]
+            [status-im2.constants :as constants]
+            [status-im2.contexts.chat.composer.link-preview.events :as link-preview]
+            [status-im2.contexts.chat.messages.transport.events :as messages.transport]
+            [taoensso.timbre :as log]
+            [utils.emojilib :as emoji]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]
+            utils.string))
 
 (rf/defn set-chat-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/set-chat-input-text]}
   [{:keys [db] :as cofx} new-input chat-id]
   (let [current-chat-id (or chat-id (:current-chat-id db))]
-    (rf/merge cofx
-              {:db (assoc-in db [:chat/inputs current-chat-id :input-text] (text->emoji new-input))}
-              (when (empty? new-input)
-                (mentions/clear-mentions)))))
+    (rf/merge
+     cofx
+     {:db (assoc-in db [:chat/inputs current-chat-id :input-text] (emoji/text->emoji new-input))}
+     (when (empty? new-input)
+       (mentions/clear-mentions)))))
 
 (rf/defn set-input-content-height
   {:events [:chat.ui/set-input-content-height]}
@@ -66,27 +50,6 @@
   [{db :db} recording?]
   {:db (assoc db :chats/recording? recording?)})
 
-(rf/defn select-mention
-  {:events [:chat.ui/select-mention]}
-  [{: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_chatMentionSelectMention"
-        params  [chat-id text primary-name public-key]]
-    {:json-rpc/call [{:method     method
-                      :params     params
-                      :on-success #(rf/dispatch [:mention/on-select-mention-success %
-                                                 primary-name 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)"
-  {:events [:chat/disable-cooldown]}
-  [{:keys [db]}]
-  {:db (assoc db :chat/cooldown-enabled? false)})
-
 (rf/defn reply-to-message
   "Sets reference to previous chat message and focuses on input"
   {:events [:chat.ui/reply-to-message]}
@@ -103,7 +66,7 @@
 (rf/defn edit-message
   "Sets reference to previous chat message and focuses on input"
   {:events [:chat.ui/edit-message]}
-  [{:keys [db] :as cofx} message]
+  [{:keys [db]} message]
   (let [current-chat-id (:current-chat-id db)
         text            (get-in message [:content :text])]
     {:db         (-> db
@@ -116,21 +79,6 @@
      :dispatch-n [[:chat.ui/set-chat-input-text nil current-chat-id]
                   [:mention/to-input-field text current-chat-id]]}))
 
-(rf/defn show-contact-request-input
-  "Sets reference to previous chat message and focuses on input"
-  {:events [:chat.ui/send-contact-request]}
-  [{:keys [db]}]
-  (let [current-chat-id (:current-chat-id db)]
-    {:db (-> db
-             (assoc-in [:chat/inputs current-chat-id :metadata :sending-contact-request]
-                       current-chat-id)
-             (assoc-in [:chat/inputs current-chat-id :metadata :responding-to-message]
-                       nil)
-             (assoc-in [:chat/inputs current-chat-id :metadata :editing-message] nil)
-             (update-in [:chat/inputs current-chat-id :metadata]
-                        dissoc
-                        :sending-image))}))
-
 (rf/defn cancel-message-reply
   "Cancels stage message reply"
   {:events [:chat.ui/cancel-message-reply]}
@@ -138,49 +86,6 @@
   (let [current-chat-id (:current-chat-id db)]
     {:db (assoc-in db [:chat/inputs current-chat-id :metadata :responding-to-message] nil)}))
 
-(defn emoji-only-content?
-  "Determines if text is just an emoji"
-  [{:keys [text response-to]}]
-  (and (not response-to)
-       (string? text)
-       (re-matches constants/regx-emoji text)))
-
-(defn build-text-message
-  [{:keys [db]} input-text current-chat-id]
-  (when-not (string/blank? input-text)
-    (let [{:keys [message-id]}
-          (get-in db [:chat/inputs current-chat-id :metadata :responding-to-message])
-          preferred-name (get-in db [:profile/profile :preferred-name])
-          emoji? (emoji-only-content? {:text        input-text
-                                       :response-to message-id})]
-      {:chat-id       current-chat-id
-       :content-type  (if emoji?
-                        constants/content-type-emoji
-                        constants/content-type-text)
-       :text          input-text
-       :response-to   message-id
-       :ens-name      preferred-name
-       :link-previews (map #(select-keys % [:url :title :description :thumbnail])
-                           (get-in db [:chat/link-previews :unfurled]))})))
-
-(defn build-image-messages
-  [{db :db} chat-id input-text]
-  (let [images               (get-in db [:chat/inputs chat-id :metadata :sending-image])
-        {:keys [message-id]} (get-in db [:chat/inputs chat-id :metadata :responding-to-message])
-        album-id             (str (random-uuid))]
-    (mapv (fn [[_ {:keys [resized-uri width height]}]]
-            {:chat-id       chat-id
-             :album-id      album-id
-             :content-type  constants/content-type-image
-             :image-path    (utils.string/safe-replace resized-uri #"file://" "")
-             :image-width   width
-             :image-height  height
-             :text          input-text
-             :link-previews (map #(select-keys % [:url :title :description :thumbnail])
-                                 (get-in db [:chat/link-previews :unfurled]))
-             :response-to   message-id})
-          images)))
-
 (rf/defn clean-input
   [{:keys [db] :as cofx} current-chat-id]
   (rf/merge cofx
@@ -201,6 +106,50 @@
               (link-preview/reset-unfurled)
               (mentions/clear-mentions))))
 
+
+(defn emoji-only-content?
+  "Determines if text is just an emoji"
+  [{:keys [text response-to]}]
+  (and (not response-to)
+       (string? text)
+       (re-matches constants/regx-emoji text)))
+
+(defn build-image-messages
+  [{db :db} chat-id input-text]
+  (let [images               (get-in db [:chat/inputs chat-id :metadata :sending-image])
+        {:keys [message-id]} (get-in db [:chat/inputs chat-id :metadata :responding-to-message])
+        album-id             (str (random-uuid))]
+    (mapv (fn [[_ {:keys [resized-uri width height]}]]
+            {:chat-id       chat-id
+             :album-id      album-id
+             :content-type  constants/content-type-image
+             :image-path    (utils.string/safe-replace resized-uri #"file://" "")
+             :image-width   width
+             :image-height  height
+             :text          input-text
+             :link-previews (map #(select-keys % [:url :title :description :thumbnail])
+                                 (get-in db [:chat/link-previews :unfurled]))
+             :response-to   message-id})
+          images)))
+
+(defn build-text-message
+  [{:keys [db]} input-text current-chat-id]
+  (when-not (string/blank? input-text)
+    (let [{:keys [message-id]}
+          (get-in db [:chat/inputs current-chat-id :metadata :responding-to-message])
+          preferred-name (get-in db [:profile/profile :preferred-name])
+          emoji? (emoji-only-content? {:text        input-text
+                                       :response-to message-id})]
+      {:chat-id       current-chat-id
+       :content-type  (if emoji?
+                        constants/content-type-emoji
+                        constants/content-type-text)
+       :text          input-text
+       :response-to   message-id
+       :ens-name      preferred-name
+       :link-previews (map #(select-keys % [:url :title :description :thumbnail])
+                           (get-in db [:chat/link-previews :unfurled]))})))
+
 (rf/defn send-messages
   [{:keys [db] :as cofx} input-text current-chat-id]
   (let [image-messages (build-image-messages cofx current-chat-id input-text)
@@ -214,8 +163,10 @@
                 (messages.transport/send-chat-messages messages)))))
 
 (rf/defn send-audio-message
-  [{:keys [db] :as cofx} audio-path duration current-chat-id]
-  (let [{:keys [message-id]}
+  {:events [:chat/send-audio]}
+  [{:keys [db] :as cofx} audio-path duration]
+  (let [{:keys [current-chat-id]} db
+        {:keys [message-id]}
         (get-in db [:chat/inputs current-chat-id :metadata :responding-to-message])]
     (when-not (string/blank? audio-path)
       (rf/merge
@@ -230,17 +181,6 @@
           (when message-id
             {:response-to message-id}))])))))
 
-(rf/defn send-sticker-message
-  [cofx {:keys [hash packID pack]} current-chat-id]
-  (when-not (or (string/blank? hash) (and (string/blank? packID) (string/blank? pack)))
-    (messages.transport/send-chat-messages
-     cofx
-     [{:chat-id      current-chat-id
-       :content-type constants/content-type-sticker
-       :sticker      {:hash hash
-                      :pack (int (if (string/blank? packID) pack packID))}
-       :text         (i18n/label :t/update-to-see-sticker {"locale" "en"})}])))
-
 (rf/defn send-edited-message
   [{:keys [db]
     :as   cofx} text {:keys [message-id quoted-message chat-id]}]
@@ -262,79 +202,29 @@
                      :js-response true
                      :on-error    #(log/error "failed to edit message " %)
                      :on-success  (fn [result]
-                                    (re-frame/dispatch [:sanitize-messages-and-process-response
-                                                        result]))}]}
+                                    (rf/dispatch [:sanitize-messages-and-process-response
+                                                  result]))}]}
    (link-preview/reset-unfurled)
    (cancel-message-edit)))
 
-(rf/defn send-current-message
+(rf/defn replace-mentions-and-send-current-message
   "Sends message from current chat input"
-  {:events [:chat.ui/send-current-message]}
-  [{{: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)
-        method                        "wakuext_chatMentionReplaceWithPublicKey"
-        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-replace-with-public-key-success
+  {:events [:chat.ui/replace-mentions-and-send-current-message]}
+  [{{:keys [current-chat-id] :as db} :db}]
+  (let [{:keys [input-text metadata]} (get-in db [:chat/inputs current-chat-id])]
+    {:json-rpc/call [{:method     "wakuext_chatMentionReplaceWithPublicKey"
+                      :params     [current-chat-id input-text]
+                      :on-error   #(log/error "[wakuext_chatMentionReplaceWithPublicKey] on-error" %)
+                      :on-success #(rf/dispatch [:chat.ui/send-current-message-with-mentions
                                                  current-chat-id
-                                                 editing-message
+                                                 (:editing-message metadata)
                                                  input-text
                                                  %])}]}))
 
-(rf/defn on-replace-with-public-key-success
-  {:events [:mention/on-replace-with-public-key-success]}
+(rf/defn send-current-message-with-mentions
+  {:events [:chat.ui/send-current-message-with-mentions]}
   [{:keys [db] :as cofx} current-chat-id editing-message input-text new-text]
-  (log/debug "[mentions] on-replace-with-public-key-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]}
-  [{:keys [db] :as cofx} public-key message]
-  (rf/merge cofx
-            {:chat.ui/clear-inputs nil
-             :json-rpc/call        [{:method      "wakuext_sendContactRequest"
-                                     :js-response true
-                                     :params      [{:id public-key :message message}]
-                                     :on-error    #(log/warn "failed to send a contact request" %)
-                                     :on-success  #(re-frame/dispatch [:transport/message-sent %])}]}
-            (mentions/clear-mentions)
-            (clean-input (:current-chat-id db))))
-
-(rf/defn cancel-contact-request
-  "Cancels contact request"
-  {:events [:chat.ui/cancel-contact-request]}
-  [{:keys [db] :as cofx}]
-  (let [current-chat-id (:current-chat-id db)]
-    (rf/merge cofx
-              {:db (assoc-in db [:chat/inputs current-chat-id :metadata :sending-contact-request] nil)}
-              (mentions/clear-mentions)
-              (clean-input (:current-chat-id db)))))
-
-(rf/defn chat-send-sticker
-  {:events [:chat/send-sticker]}
-  [{{:keys [current-chat-id] :as db} :db :as cofx} {:keys [hash packID pack] :as sticker}]
-  (rf/merge
-   cofx
-   {:db            (update db
-                           :stickers/recent-stickers
-                           (fn [recent]
-                             (conj (remove #(= hash (:hash %)) recent) sticker)))
-    :json-rpc/call [{:method     "stickers_addRecent"
-                     :params     [(int (if (string/blank? packID) pack packID)) hash]
-                     :on-success #()}]}
-   (send-sticker-message sticker current-chat-id)))
-
-(rf/defn chat-send-audio
-  {:events [:chat/send-audio]}
-  [{{:keys [current-chat-id] :as db} :db :as cofx} audio-path duration]
-  (send-audio-message cofx audio-path duration current-chat-id))

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

@@ -25,7 +25,7 @@
   [user _ _ render-data]
   [contact-list-item/contact-list-item
    {:on-press (fn []
-                (rf/dispatch [:chat.ui/select-mention nil user])
+                (rf/dispatch [:chat.ui/select-mention user])
                 (update-cursor user render-data))}
    user])
 

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

@@ -4,7 +4,6 @@
     [react-native.blur :as blur]
     [react-native.core :as rn]
     [react-native.reanimated :as reanimated]
-    [status-im2.config :as config]
     [status-im2.contexts.chat.composer.style :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
@@ -40,8 +39,6 @@
       [quo/floating-shell-button
        {:jump-to
         {:on-press            (fn []
-                                (when config/shell-navigation-disabled?
-                                  (rf/dispatch [:chat/close true]))
                                 (rf/dispatch [:shell/navigate-to-jump-to]))
          :customization-color customization-color
          :label               (i18n/label :t/jump-to)

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

@@ -133,7 +133,7 @@
             :max-font-size-multiplier 1
             :multiline true
             :placeholder (i18n/label :t/type-something)
-            :placeholder-text-color (colors/theme-colors colors/neutral-30 colors/neutral-50)
+            :placeholder-text-color (colors/theme-colors colors/neutral-40 colors/neutral-50)
             :style (style/input-text props
                                      state
                                      {:max-height max-height

src/status_im2/contexts/chat/effects.cljs

@@ -14,5 +14,5 @@
          :key-uid
          (fn [stored-key-uid]
            (when (= stored-key-uid key-uid)
-             (rf/dispatch [:chat/navigate-to-chat chat-id
+             (rf/dispatch [:chat/pop-to-root-and-navigate-to-chat chat-id
                            shell.constants/open-screen-without-animation])))))))))

src/status_im2/contexts/chat/events.cljs

@@ -7,7 +7,6 @@
     [status-im.chat.models.loading :as loading]
     [status-im.data-store.chats :as chats-store]
     [status-im2.common.muting.helpers :refer [format-mute-till]]
-    [status-im2.config :as config]
     [status-im2.constants :as constants]
     [status-im2.contexts.chat.composer.link-preview.events :as link-preview]
     status-im2.contexts.chat.effects
@@ -168,7 +167,7 @@
 
 (rf/defn close-chat
   {:events [:chat/close]}
-  [{:keys [db] :as cofx} navigate-to-shell?]
+  [{:keys [db] :as cofx}]
   (when-let [chat-id (:current-chat-id db)]
     (chat.state/reset-visible-item)
     (rf/merge cofx
@@ -177,15 +176,7 @@
                                                (dissoc :current-chat-id)
                                                (assoc-in [:chat/inputs chat-id :focused?] false))
                 :effects.async-storage/set {:chat-id nil
-                                            :key-uid nil}}
-               (let [community-id (get-in db [:chats chat-id :community-id])]
-                 ;; When navigating back from community chat to community, update switcher card
-                 ;; A close chat event is also called while opening any chat.
-                 ;; That might lead to duplicate :dispatch keys in fx/merge, that's why dispatch-n
-                 ;; is used here.
-                 (when (and community-id config/shell-navigation-disabled? (not navigate-to-shell?))
-                   {:dispatch-n [[:shell/add-switcher-card
-                                  :community-overview community-id]]})))
+                                            :key-uid nil}})
               (link-preview/reset-all)
               (delete-for-me/sync-all)
               (delete-message/send-all)
@@ -217,9 +208,7 @@
   [{db :db :as cofx} chat-id animation]
   (rf/merge cofx
             {:dispatch [(if animation :shell/navigate-to :navigate-to) :chat chat-id animation]}
-            (when-not (#{:community :community-overview :shell} (:view-id db))
-              (navigation/pop-to-root :shell-stack))
-            (close-chat false)
+            (close-chat)
             (force-close-chat chat-id)
             (fn [{:keys [db]}]
               {:db (assoc db :current-chat-id chat-id)})
@@ -227,6 +216,14 @@
             #(when (group-chat? cofx chat-id)
                (loading/load-chat % chat-id))))
 
+(rf/defn pop-to-root-and-navigate-to-chat
+  {:events [:chat/pop-to-root-and-navigate-to-chat]}
+  [cofx chat-id animation]
+  (rf/merge
+   cofx
+   (navigation/pop-to-root :shell-stack)
+   (navigate-to-chat chat-id animation)))
+
 (rf/defn handle-clear-history-response
   {:events [:chat/history-cleared]}
   [{:keys [db]} chat-id response]
@@ -246,7 +243,7 @@
                  (assoc-in [:chats chat-id] chat)
                  :always
                  (update :chats-home-list conj chat-id))
-     :dispatch [:chat/navigate-to-chat chat-id]}))
+     :dispatch [:chat/pop-to-root-and-navigate-to-chat chat-id]}))
 
 (rf/defn decrease-unviewed-count
   {:events [:chat/decrease-unviewed-count]}

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

@@ -20,7 +20,9 @@
     :icon-only?          true
     :container-style     {:margin-left 20}
     :accessibility-label :back-button
-    :on-press            #(rf/dispatch [:navigate-back])}
+    :on-press            (fn []
+                           (rf/dispatch [:navigate-back])
+                           (rf/dispatch [:chat/close]))}
    :i/arrow-left])
 
 (defn options-button
@@ -149,77 +151,84 @@
                         :on-press show-profile-actions}})
      item]))
 
+(defn f-group-details
+  []
+  (fn []
+    (rn/use-effect (fn []
+                     #(rf/dispatch [:chat/close])))
+    (let [{:keys [admins chat-id chat-name color public?
+                  muted contacts]} (rf/sub [:chats/current-chat])
+          members                  (rf/sub [:contacts/group-members-sections])
+          pinned-messages          (rf/sub [:chats/pinned chat-id])
+          current-pk               (rf/sub [:multiaccount/public-key])
+          admin?                   (get admins current-pk)]
+      [rn/view
+       {:style {:flex             1
+                :background-color (colors/theme-colors colors/white colors/neutral-95)}}
+       [quo/header
+        {:left-component  [back-button]
+         :right-component [options-button]
+         :background      (colors/theme-colors colors/white colors/neutral-95)}]
+       [rn/view
+        {:style {:flex-direction     :row
+                 :margin-top         24
+                 :padding-horizontal 20}}
+        [quo/group-avatar
+         {:customization-color color
+          :size                :size-32}]
+        [quo/text
+         {:weight :semi-bold
+          :size   :heading-1
+          :style  {:margin-horizontal 8}} chat-name]
+        [rn/view {:style {:margin-top 8}}
+         [quo/icon (if public? :i/world :i/privacy)
+          {:size 20 :color (colors/theme-colors colors/neutral-50 colors/neutral-40)}]]]
+       [rn/view {:style (style/actions-view)}
+        [rn/touchable-opacity
+         {:style               (style/action-container color)
+          :accessibility-label :pinned-messages
+          :on-press            (fn []
+                                 (rf/dispatch [:dismiss-keyboard])
+                                 (rf/dispatch [:pin-message/show-pins-bottom-sheet chat-id]))}
+         [rn/view
+          {:style {:flex-direction  :row
+                   :justify-content :space-between}}
+          [quo/icon :i/pin {:size 20 :color (colors/theme-colors colors/neutral-100 colors/white)}]
+          [count-container (count pinned-messages) :pinned-count]]
+         [quo/text {:style {:margin-top 16} :size :paragraph-1 :weight :medium}
+          (i18n/label :t/pinned-messages)]]
+        [rn/touchable-opacity
+         {:style               (style/action-container color)
+          :accessibility-label :toggle-mute
+          :on-press            #(rf/dispatch [:chat.ui/mute chat-id (not muted)
+                                              (when-not muted constants/mute-till-unmuted)])}
+         [quo/icon (if muted :i/muted :i/activity-center)
+          {:size 20 :color (colors/theme-colors colors/neutral-100 colors/white)}]
+         [quo/text {:style {:margin-top 16} :size :paragraph-1 :weight :medium}
+          (i18n/label (if muted :unmute-group :mute-group))]]
+        [rn/touchable-opacity
+         {:style               (style/action-container color)
+          :accessibility-label :manage-members
+          :on-press            (fn []
+                                 (rf/dispatch [:group/clear-added-participants])
+                                 (rf/dispatch [:group/clear-removed-members])
+                                 (rf/dispatch [:open-modal :group-add-manage-members]))}
+         [rn/view
+          {:style {:flex-direction  :row
+                   :justify-content :space-between}}
+          [quo/icon :i/add-user {:size 20 :color (colors/theme-colors colors/neutral-100 colors/white)}]
+          [count-container (count contacts) :members-count]]
+         [quo/text {:style {:margin-top 16} :size :paragraph-1 :weight :medium}
+          (i18n/label (if admin? :t/manage-members :t/add-members))]]]
+       [rn/section-list
+        {:key-fn                         :title
+         :sticky-section-headers-enabled false
+         :sections                       members
+         :render-section-header-fn       contacts-section-header
+         :render-data                    {:chat-id chat-id
+                                          :admin?  admin?}
+         :render-fn                      contact-item-render}]])))
+
 (defn group-details
   []
-  (let [{:keys [admins chat-id chat-name color public?
-                muted contacts]} (rf/sub [:chats/current-chat])
-        members                  (rf/sub [:contacts/group-members-sections])
-        pinned-messages          (rf/sub [:chats/pinned chat-id])
-        current-pk               (rf/sub [:multiaccount/public-key])
-        admin?                   (get admins current-pk)]
-    [rn/view
-     {:style {:flex             1
-              :background-color (colors/theme-colors colors/white colors/neutral-95)}}
-     [quo/header
-      {:left-component  [back-button]
-       :right-component [options-button]
-       :background      (colors/theme-colors colors/white colors/neutral-95)}]
-     [rn/view
-      {:style {:flex-direction     :row
-               :margin-top         24
-               :padding-horizontal 20}}
-      [quo/group-avatar
-       {:customization-color color
-        :size                :size-32}]
-      [quo/text
-       {:weight :semi-bold
-        :size   :heading-1
-        :style  {:margin-horizontal 8}} chat-name]
-      [rn/view {:style {:margin-top 8}}
-       [quo/icon (if public? :i/world :i/privacy)
-        {:size 20 :color (colors/theme-colors colors/neutral-50 colors/neutral-40)}]]]
-     [rn/view {:style (style/actions-view)}
-      [rn/touchable-opacity
-       {:style               (style/action-container color)
-        :accessibility-label :pinned-messages
-        :on-press            (fn []
-                               (rf/dispatch [:dismiss-keyboard])
-                               (rf/dispatch [:pin-message/show-pins-bottom-sheet chat-id]))}
-       [rn/view
-        {:style {:flex-direction  :row
-                 :justify-content :space-between}}
-        [quo/icon :i/pin {:size 20 :color (colors/theme-colors colors/neutral-100 colors/white)}]
-        [count-container (count pinned-messages) :pinned-count]]
-       [quo/text {:style {:margin-top 16} :size :paragraph-1 :weight :medium}
-        (i18n/label :t/pinned-messages)]]
-      [rn/touchable-opacity
-       {:style               (style/action-container color)
-        :accessibility-label :toggle-mute
-        :on-press            #(rf/dispatch [:chat.ui/mute chat-id (not muted)
-                                            (when-not muted constants/mute-till-unmuted)])}
-       [quo/icon (if muted :i/muted :i/activity-center)
-        {:size 20 :color (colors/theme-colors colors/neutral-100 colors/white)}]
-       [quo/text {:style {:margin-top 16} :size :paragraph-1 :weight :medium}
-        (i18n/label (if muted :unmute-group :mute-group))]]
-      [rn/touchable-opacity
-       {:style               (style/action-container color)
-        :accessibility-label :manage-members
-        :on-press            (fn []
-                               (rf/dispatch [:group/clear-added-participants])
-                               (rf/dispatch [:group/clear-removed-members])
-                               (rf/dispatch [:open-modal :group-add-manage-members]))}
-       [rn/view
-        {:style {:flex-direction  :row
-                 :justify-content :space-between}}
-        [quo/icon :i/add-user {:size 20 :color (colors/theme-colors colors/neutral-100 colors/white)}]
-        [count-container (count contacts) :members-count]]
-       [quo/text {:style {:margin-top 16} :size :paragraph-1 :weight :medium}
-        (i18n/label (if admin? :t/manage-members :t/add-members))]]]
-     [rn/section-list
-      {:key-fn                         :title
-       :sticky-section-headers-enabled false
-       :sections                       members
-       :render-section-header-fn       contacts-section-header
-       :render-data                    {:chat-id chat-id
-                                        :admin?  admin?}
-       :render-fn                      contact-item-render}]]))
+  [:f> f-group-details])

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

@@ -35,18 +35,15 @@
   #:tab{:contacts
         {:title       (i18n/label :t/no-contacts)
          :description (i18n/label :t/no-contacts-description)
-         :image       (resources/get-image
-                       (quo.theme/theme-value :no-contacts-light :no-contacts-dark theme))}
+         :image       (resources/get-themed-image :no-contacts theme)}
         :groups
         {:title       (i18n/label :t/no-group-chats)
          :description (i18n/label :t/no-group-chats-description)
-         :image       (resources/get-image
-                       (quo.theme/theme-value :no-group-chats-light :no-group-chats-dark theme))}
+         :image       (resources/get-themed-image :no-group-chats theme)}
         :recent
         {:title       (i18n/label :t/no-messages)
          :description (i18n/label :t/no-messages-description)
-         :image       (resources/get-image
-                       (quo.theme/theme-value :no-messages-light :no-messages-dark theme))}})
+         :image       (resources/get-themed-image :cat-in-box theme)}})
 
 (defn chats
   [{:keys [theme selected-tab set-scroll-ref scroll-shared-value]}]

src/status_im2/contexts/chat/messages/contact_requests/bottom_drawer.cljs

@@ -2,7 +2,6 @@
   (:require
     [quo.core :as quo]
     [react-native.core :as rn]
-    [status-im2.config :as config]
     [status-im2.constants :as constants]
     [status-im2.contexts.shell.jump-to.constants :as jump-to.constants]
     [utils.i18n :as i18n]
@@ -40,8 +39,6 @@
      [quo/floating-shell-button
       {:jump-to
        {:on-press            (fn []
-                               (when config/shell-navigation-disabled?
-                                 (rf/dispatch [:chat/close true]))
                                (rf/dispatch [:shell/navigate-to-jump-to]))
         :customization-color customization-color
         :label               (i18n/label :t/jump-to)}}

src/status_im2/contexts/chat/messages/content/style.cljs

@@ -16,12 +16,10 @@
      (assoc :margin-top 4))))
 
 (defn user-message-content
-  [{:keys [first-in-group? outgoing outgoing-status]}]
+  [{:keys [outgoing outgoing-status]}]
   {:border-radius      16
    :padding-horizontal 8
-   :padding-vertical   (if first-in-group?
-                         8
-                         4)
+   :padding-vertical   4
    :opacity            (if (and outgoing (= outgoing-status :sending))
                          0.5
                          1)})

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

@@ -32,10 +32,11 @@
 
 (defn avatar-container
   [{:keys [content last-in-group? pinned-by quoted-message from]} show-reactions?
-   in-reaction-and-action-menu? in-pinned-view?]
+   in-reaction-and-action-menu? show-user-info? in-pinned-view?]
   (if (or (and (seq (:response-to content))
                quoted-message)
           last-in-group?
+          show-user-info?
           pinned-by
           (not show-reactions?)
           in-reaction-and-action-menu?)
@@ -54,10 +55,12 @@
            from
            timestamp]}
    show-reactions?
-   in-reaction-and-action-menu?]
+   in-reaction-and-action-menu?
+   show-user-info?]
   (when (or (and (seq response-to) quoted-message)
             last-in-group?
             pinned-by
+            show-user-info?
             (not show-reactions?)
             in-reaction-and-action-menu?)
     (let [[primary-name secondary-name] (rf/sub [:contacts/contact-two-names-by-identity from])
@@ -116,7 +119,7 @@
   []
   (let [show-delivery-state? (reagent/atom false)]
     (fn [{:keys [message-data context keyboard-shown? show-reactions? in-reaction-and-action-menu?
-                 theme]}]
+                 show-user-info? theme]}]
       (let [{:keys [content-type quoted-message content
                     outgoing outgoing-status pinned-by]} message-data
             first-image                                  (first (:album message-data))
@@ -170,7 +173,7 @@
           [rn/view
            {:style {:padding-horizontal 4
                     :flex-direction     :row}}
-           [avatar-container message-data show-reactions? in-reaction-and-action-menu?
+           [avatar-container message-data show-reactions? in-reaction-and-action-menu? show-user-info?
             (:in-pinned-view? context)]
            (into
             (if show-reactions?
@@ -180,7 +183,7 @@
                       :flex        1
                       :max-height  (when-not show-reactions?
                                      (* 0.4 height))}}
-             [author message-data show-reactions? in-reaction-and-action-menu?]
+             [author message-data show-reactions? in-reaction-and-action-menu? show-user-info?]
              (condp = content-type
                constants/content-type-text
                [content.text/text-content message-data context]

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

@@ -1,19 +1,14 @@
 (ns status-im2.contexts.chat.messages.list.style
   (:require
     [quo.foundations.colors :as colors]
-    [react-native.reanimated :as reanimated]
-    [status-im2.config :as config]))
+    [react-native.reanimated :as reanimated]))
 
 (defonce ^:const cover-height 168)
 (defonce ^:const overscroll-cover-height 2000)
 (defonce ^:const header-avatar-top-offset -36)
 
-(defn keyboard-avoiding-container
-  [{:keys [top]}]
-  {:position      :relative
-   :flex          1
-   :top           (if config/shell-navigation-disabled? (- top) 0)
-   :margin-bottom (if config/shell-navigation-disabled? (- top) 0)})
+(def keyboard-avoiding-container
+  {:flex 1})
 
 (def list-container
   {:padding-vertical 16})
@@ -50,12 +45,11 @@
    :margin-bottom     header-avatar-top-offset})
 
 (defn header-image
-  [scale-animation top-margin-animation side-margin-animation]
+  [scale-animation side-animation bottom-animation]
   (reanimated/apply-animations-to-style
-   {:transform     [{:scale scale-animation}]
-    :margin-top    top-margin-animation
-    :margin-left   side-margin-animation
-    :margin-bottom side-margin-animation}
+   {:transform [{:scale scale-animation}
+                {:translate-x side-animation}
+                {:translate-y bottom-animation}]}
    {:align-items :flex-start}))
 
 (def bio

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

@@ -6,11 +6,11 @@
     [quo.theme :as quo.theme]
     [react-native.background-timer :as background-timer]
     [react-native.core :as rn]
-    [react-native.hooks :as hooks]
     [react-native.platform :as platform]
     [react-native.react-native-intersection-observer :as rnio]
     [react-native.reanimated :as reanimated]
     [status-im.ui.screens.chat.group :as chat.group]
+    [status-im2.common.home.actions.view :as home.actions]
     [status-im2.constants :as constants]
     [status-im2.contexts.chat.composer.constants :as composer.constants]
     [status-im2.contexts.chat.messages.content.view :as message]
@@ -21,12 +21,13 @@
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
+(defonce ^:const card-border-radius 16)
 (defonce ^:const threshold-percentage-to-show-floating-scroll-down-button 75)
 (defonce ^:const loading-indicator-extra-spacing 250)
 (defonce ^:const loading-indicator-page-loading-height 100)
 (defonce ^:const scroll-animation-input-range [0 50])
 (defonce ^:const min-message-height 32)
-(defonce ^:const topbar-visible-scroll-y-value 85)
+(defonce ^:const topbar-visible-scroll-y-value 50)
 (defonce ^:const topbar-invisible-scroll-y-value 135)
 (defonce ^:const minimum-scroll-y-topbar-overlaying-avatar 400)
 (def root-margin-for-big-name-visibility-detector {:bottom -35})
@@ -131,36 +132,38 @@
        ;; https://github.com/status-im/status-mobile/issues/17426
        [quo/skeleton-list (skeleton-list-props :messages parent-height platform/ios?)]])))
 
+(defn calc-list-header-height
+  [insets able-to-send-message? images]
+  (if able-to-send-message?
+    (+ composer.constants/composer-default-height
+       jump-to.constants/floating-shell-button-height
+       (if (seq images) composer.constants/images-container-height 0)
+       (:bottom insets))
+    (- 70 (:bottom insets))))
+
 (defn list-header
-  [insets able-to-send-message? theme]
-  (let [images (rf/sub [:chats/sending-image])]
+  [insets able-to-send-message? images theme]
+  (let [height (calc-list-header-height insets able-to-send-message? images)]
     [rn/view
      {:background-color (colors/theme-colors colors/white colors/neutral-95 theme)
-      :height           (if able-to-send-message?
-                          (+ composer.constants/composer-default-height
-                             jump-to.constants/floating-shell-button-height
-                             (if (seq images) composer.constants/images-container-height 0)
-                             (:bottom insets))
-                          (- 70 (:bottom insets)))}]))
+      :height           height}]))
 
 (defn f-list-footer-avatar
   [{:keys [scroll-y display-name online? profile-picture]}]
-  (let [image-scale-animation       (reanimated/interpolate scroll-y
-                                                            scroll-animation-input-range
-                                                            [1 0.5]
-                                                            header-extrapolation-option)
-        image-top-margin-animation  (reanimated/interpolate scroll-y
-                                                            scroll-animation-input-range
-                                                            [0 40]
-                                                            header-extrapolation-option)
-        image-side-margin-animation (reanimated/interpolate scroll-y
-                                                            scroll-animation-input-range
-                                                            [0 -20]
-                                                            header-extrapolation-option)]
+  (let [image-scale-animation  (reanimated/interpolate scroll-y
+                                                       scroll-animation-input-range
+                                                       [1 0.5]
+                                                       header-extrapolation-option)
+        image-bottom-animation (reanimated/interpolate scroll-y
+                                                       scroll-animation-input-range
+                                                       [0 56]
+                                                       header-extrapolation-option)
+        image-side-animation   (reanimated/interpolate scroll-y
+                                                       scroll-animation-input-range
+                                                       [0 -40]
+                                                       header-extrapolation-option)]
     [reanimated/view
-     {:style (style/header-image image-scale-animation
-                                 image-top-margin-animation
-                                 image-side-margin-animation)}
+     {:style (style/header-image image-scale-animation image-side-animation image-bottom-animation)}
      [quo/user-avatar
       {:full-name       display-name
        :online?         online?
@@ -174,8 +177,13 @@
 
 (defn actions
   [chat-id cover-bg-color]
-  (let [latest-pin-text (rf/sub [:chats/last-pinned-message-text chat-id])
-        pins-count      (rf/sub [:chats/pin-messages-count chat-id])]
+  (let [latest-pin-text                      (rf/sub [:chats/last-pinned-message-text chat-id])
+        pins-count                           (rf/sub [:chats/pin-messages-count chat-id])
+        {:keys [muted muted-till chat-type]} (rf/sub [:chat-by-id chat-id])
+        community-channel?                   (= constants/community-chat-type chat-type)
+        muted?                               (and muted (some? muted-till))
+        mute-chat-label                      (if community-channel? :t/mute-channel :t/mute-chat)
+        unmute-chat-label                    (if community-channel? :t/unmute-channel :t/unmute-chat)]
     [quo/channel-actions
      {:style   {:margin-top 16}
       :actions [{:accessibility-label :action-button-pinned
@@ -187,7 +195,19 @@
                  :on-press            (fn []
                                         (rf/dispatch [:dismiss-keyboard])
                                         (rf/dispatch [:pin-message/show-pins-bottom-sheet
-                                                      chat-id]))}]}]))
+                                                      chat-id]))}
+                {:accessibility-label :action-button-mute
+                 :label               (i18n/label (if muted
+                                                    unmute-chat-label
+                                                    mute-chat-label))
+                 :color               cover-bg-color
+                 :icon                (if muted? :i/muted :i/activity-center)
+                 :on-press            (fn []
+                                        (if muted?
+                                          (home.actions/unmute-chat-action chat-id)
+                                          (home.actions/mute-chat-action chat-id
+                                                                         chat-type
+                                                                         muted?)))}]}]))
 
 (defn f-list-footer
   [{:keys [chat scroll-y cover-bg-color on-layout theme messages-view-height
@@ -207,8 +227,8 @@
                                (rf/sub [:contacts/contact-by-address chat-id]))
         photo-path           (rf/sub [:chats/photo-path chat-id])
         border-animation     (reanimated/interpolate scroll-y
-                                                     [30 125]
-                                                     [14 0]
+                                                     [30 50]
+                                                     [card-border-radius 0]
                                                      header-extrapolation-option)]
     [rn/view {:flex 1}
      [rn/view
@@ -269,21 +289,23 @@
        :else
        [message/message message-data context keyboard-shown?])]))
 
-(defn scroll-handler
-  [event scroll-y animate-topbar-opacity? on-end-reached? animate-topbar-name?]
-  (let [content-size-y  (- (oops/oget event "nativeEvent.contentSize.height")
-                           (oops/oget event "nativeEvent.layoutMeasurement.height"))
-        current-y       (oops/oget event "nativeEvent.contentOffset.y")
-        scroll-distance (- content-size-y current-y)]
-    (when (and @on-end-reached? (pos? scroll-distance))
+(defn use-scroll-handler
+  [{:keys [scroll-y-animated-value
+           content-size-animated-value
+           animate-topbar-opacity?
+           on-end-reached?
+           animate-topbar-name?]}]
+  (fn [new-scroll-y new-content-size]
+    (when (and @on-end-reached? (pos? new-scroll-y))
       (reset! on-end-reached? false))
-    (if (< topbar-visible-scroll-y-value scroll-distance)
+    (if (< topbar-visible-scroll-y-value new-scroll-y)
       (reset! animate-topbar-opacity? true)
       (reset! animate-topbar-opacity? false))
-    (if (< topbar-invisible-scroll-y-value scroll-distance)
+    (if (< topbar-invisible-scroll-y-value new-scroll-y)
       (reset! animate-topbar-name? true)
       (reset! animate-topbar-name? false))
-    (reanimated/set-shared-value scroll-y scroll-distance)))
+    (reanimated/set-shared-value content-size-animated-value new-content-size)
+    (reanimated/set-shared-value scroll-y-animated-value (max new-scroll-y 0))))
 
 (defn f-messages-list-content
   [{:keys [chat insets scroll-y content-height cover-bg-color keyboard-shown? inner-state-atoms
@@ -297,14 +319,21 @@
                  [composer-active? @on-end-reached? @animate-topbar-opacity?])
   (let [theme                                 (quo.theme/use-theme-value)
         {window-height :height}               (rn/get-window)
-        {:keys [keyboard-height]}             (hooks/use-keyboard)
         context                               (rf/sub [:chats/current-chat-message-list-view-context])
         messages                              (rf/sub [:chats/raw-chat-messages-stream (:chat-id chat)])
+        images                                (rf/sub [:chats/sending-image])
         recording?                            (rf/sub [:chats/recording?])
-        all-loaded?                           (rf/sub [:chats/all-loaded? (:chat-id chat)])
         {:keys [show-floating-scroll-down-button?
+                messages-scroll-y-value-initialized?
                 messages-view-height
-                messages-view-header-height]} inner-state-atoms]
+                messages-view-header-height]} inner-state-atoms
+        scroll-handler                        (use-scroll-handler
+                                               {:animate-topbar-name? animate-topbar-name?
+                                                :animate-topbar-opacity? animate-topbar-opacity?
+                                                :on-end-reached? on-end-reached?
+                                                :scroll-y-animated-value scroll-y
+                                                :content-size-animated-value
+                                                content-height})]
     [rn/view {:style {:flex 1}}
      [rnio/flat-list
       {:root-margin root-margin-for-big-name-visibility-detector
@@ -312,7 +341,7 @@
        :ref list-ref
        :bounces false
        :header [:<>
-                [list-header insets (:able-to-send-message? context) theme]
+                [list-header insets (:able-to-send-message? context) images theme]
                 (when (= (:chat-type chat) constants/private-group-chat-type)
                   [list-group-chat-header chat])]
        :footer [list-footer
@@ -333,37 +362,61 @@
                      :insets          insets}
        :render-fn render-fn
        :on-viewable-items-changed on-viewable-items-changed
-       :on-content-size-change (fn [_ y]
-                                 (if (or
-                                      (< minimum-scroll-y-topbar-overlaying-avatar
-                                         (reanimated/get-shared-value scroll-y))
-                                      (< topbar-visible-scroll-y-value
-                                         (reanimated/get-shared-value scroll-y)))
-                                   (reset! animate-topbar-opacity? true)
-                                   (reset! animate-topbar-opacity? false))
-                                 (when-not (or
-                                            (not @big-name-visible?)
-                                            (= :initial-render @big-name-visible?)
-                                            (pos? (reanimated/get-shared-value
-                                                   scroll-y)))
-                                   (reset! on-end-reached? false))
-                                 ;; NOTE(alwx): here we set the initial value of
-                                 ;; `scroll-y` which is needed because by default the
-                                 ;; chat is scrolled to the bottom and no initial
-                                 ;; `on-scroll` event is getting triggered
-                                 (let [scroll-y-shared       (reanimated/get-shared-value
-                                                              scroll-y)
-                                       content-height-shared (reanimated/get-shared-value
-                                                              content-height)]
-                                   (when (or (= scroll-y-shared 0)
-                                             (> (Math/abs (- content-height-shared y))
-                                                min-message-height))
-                                     (reanimated/set-shared-value scroll-y
-                                                                  (- y
-                                                                     window-height
-                                                                     (- (when keyboard-shown?
-                                                                          keyboard-height))))
-                                     (reanimated/set-shared-value content-height y))))
+       :on-content-size-change
+       (fn [_ y]
+         (if (or
+              (< minimum-scroll-y-topbar-overlaying-avatar
+                 (reanimated/get-shared-value scroll-y))
+              (< topbar-visible-scroll-y-value
+                 (reanimated/get-shared-value scroll-y)))
+           (reset! animate-topbar-opacity? true)
+           (reset! animate-topbar-opacity? false))
+         (when-not (or
+                    (not @big-name-visible?)
+                    (= :initial-render @big-name-visible?)
+                    (pos? (reanimated/get-shared-value
+                           scroll-y)))
+           (reset! on-end-reached? false))
+         ;; NOTE(alwx): here we set the initial value of `scroll-y` which is needed because by
+         ;; default the chat is scrolled to the bottom and no initial `on-scroll` event is getting
+         ;; triggered. Also makes sure changes in the content size are reflected in `scroll-y` e.g.
+         ;; incoming messages scrolling the content up, which should affect the header
+         ;; animations/interpolations.
+         (let [content-size-shared                (reanimated/get-shared-value
+                                                   content-height)
+               scroll-y-shared                    (if
+                                                    @messages-scroll-y-value-initialized?
+                                                    (reanimated/get-shared-value
+                                                     scroll-y)
+                                                    y)
+               ;; NOTE: when the keyboard is shown and the message list
+               ;; doesn't fill the screen, we use a different value for
+               ;; scroll-y, which would make sure the avatar is minimized
+               ;; appropriately and the header is shown.
+               keyboard-shown-with-unfilled-list? (< y window-height)
+               keyboard-space                     (- window-height y)
+               keyboard-scroll-value              (- y keyboard-space keyboard-space)
+               ;; NOTE: doing the calculations as we would in `on-scroll`, so the animations
+               ;; and interpolations are triggered properly.
+               content-size                       (- y
+                                                     window-height
+                                                     ;; NOTE: for some reason android insets are
+                                                     ;; included in the content size `y`, while iOS
+                                                     ;; are not.
+                                                     (when platform/android? (:top insets)))
+               current-y                          (max (- content-size-shared
+                                                          scroll-y-shared)
+                                                       0)
+               new-scroll-value                   (if keyboard-shown-with-unfilled-list?
+                                                    keyboard-scroll-value
+                                                    (- content-size
+                                                       current-y))]
+           (when (and (>= new-scroll-value 0)
+                      (or (= scroll-y-shared 0)
+                          (> (Math/abs (- content-size-shared y))
+                             min-message-height)))
+             (reset! messages-scroll-y-value-initialized? true)
+             (scroll-handler new-scroll-value content-size))))
        :on-end-reached #(list-on-end-reached scroll-y on-end-reached?)
        :on-scroll-to-index-failed identity
        :scroll-indicator-insets {:top (if (:able-to-send-message? context)
@@ -378,26 +431,21 @@
        :on-momentum-scroll-end state/stop-scrolling
        :scroll-event-throttle 16
        :on-scroll (fn [event]
-                    (scroll-handler event
-                                    scroll-y
-                                    animate-topbar-opacity?
-                                    on-end-reached?
-                                    animate-topbar-name?)
+                    (let [content-size-y
+                          (- (oops/oget event "nativeEvent.contentSize.height")
+                             (oops/oget event
+                                        "nativeEvent.layoutMeasurement.height"))
+                          current-y (oops/oget event
+                                               "nativeEvent.contentOffset.y")
+                          scroll-distance (- content-size-y current-y)]
+                      (scroll-handler scroll-distance content-size-y))
                     (on-scroll event show-floating-scroll-down-button?))
-       :style
-       {:background-color (if all-loaded?
-                            (colors/theme-colors
-                             (colors/custom-color cover-bg-color
-                                                  50
-                                                  20)
-                             (colors/custom-color cover-bg-color
-                                                  50
-                                                  40)
-                             theme)
-                            (colors/theme-colors
-                             colors/white
-                             colors/neutral-95
-                             theme))}
+       :content-container-style {:justify-content :flex-end
+                                 :min-height      @messages-view-height}
+       :style {:background-color (colors/theme-colors
+                                  colors/white
+                                  colors/neutral-95
+                                  theme)}
        :inverted true
        :on-layout (fn [e]
                     ;; FIXME: the 1s timeout is to assure all effects with

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

@@ -9,7 +9,6 @@
     [react-native.platform :as platform]
     [react-native.reanimated :as reanimated]
     [status-im2.common.home.actions.view :as actions]
-    [status-im2.config :as config]
     [status-im2.contexts.chat.messages.list.view :refer [topbar-invisible-scroll-y-value]]
     [status-im2.contexts.chat.messages.navigation.style :as style]
     [status-im2.contexts.chat.messages.pin.banner.view :as pin.banner]
@@ -100,7 +99,6 @@
     [rn/view {:style (style/navigation-view chat-screen-loaded?)}
      [reanimated/view
       {:style (style/animated-background-view all-loaded? opacity-animation nil)}]
-
      [reanimated/view {:style (style/animated-blur-view all-loaded? opacity-animation)}
       [blur/view
        {:blur-amount   20
@@ -116,10 +114,7 @@
         :background          :blur
         :size                32
         :accessibility-label :back-button
-        :on-press            #(do
-                                (when config/shell-navigation-disabled?
-                                  (rf/dispatch [:chat/close]))
-                                (rf/dispatch [:navigate-back]))}
+        :on-press            #(rf/dispatch [:navigate-back])}
        back-icon]
       [reanimated/view
        {:style (style/animated-header all-loaded? translate-animation title-opacity-animation)}

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

@@ -13,6 +13,10 @@
     [status-im2.contexts.chat.messages.navigation.view :as messages.navigation]
     [utils.re-frame :as rf]))
 
+;; NOTE(parvesh) - I am working on refactoring/optimization of the chat screen for performance
+;; improvement. Please avoid refactoring these files. Also if you are not already working on bug
+;; fixes related to the chat navigation bar, please skip them.
+;; And ping me, so I can address them while refactoring
 (defn f-chat
   [{:keys [show-floating-scroll-down-button? animate-topbar-name?
            big-name-visible? animate-topbar-opacity? on-end-reached? messages-list-on-layout-finished?]
@@ -49,7 +53,7 @@
     ;; Note - Don't pass `behavior :height` to keyboard avoiding view,. It breaks composer -
     ;; https://github.com/status-im/status-mobile/issues/16595
     [rn/keyboard-avoiding-view
-     {:style                    (style/keyboard-avoiding-container insets)
+     {:style                    style/keyboard-avoiding-container
       :keyboard-vertical-offset (- (:bottom insets))}
 
      [list.view/message-list-content-view
@@ -94,13 +98,14 @@
 (defn chat
   []
   (let [inner-state-atoms
-        {:extra-keyboard-height             (reagent/atom 0)
-         :show-floating-scroll-down-button? (reagent/atom false)
-         :messages-view-height              (reagent/atom 0)
-         :messages-view-header-height       (reagent/atom 0)
-         :animate-topbar-name?              (reagent/atom false)
-         :big-name-visible?                 (reagent/atom :initial-render)
-         :animate-topbar-opacity?           (reagent/atom false)
-         :on-end-reached?                   (reagent/atom false)
-         :messages-list-on-layout-finished? (reagent/atom false)}]
+        {:extra-keyboard-height                (reagent/atom 0)
+         :show-floating-scroll-down-button?    (reagent/atom false)
+         :messages-scroll-y-value-initialized? (reagent/atom false)
+         :messages-view-height                 (reagent/atom 0)
+         :messages-view-header-height          (reagent/atom 0)
+         :animate-topbar-name?                 (reagent/atom false)
+         :big-name-visible?                    (reagent/atom :initial-render)
+         :animate-topbar-opacity?              (reagent/atom false)
+         :on-end-reached?                      (reagent/atom false)
+         :messages-list-on-layout-finished?    (reagent/atom false)}]
     [:f> f-chat inner-state-atoms]))

src/status_im2/contexts/communities/actions/accounts_selection/view.cljs

@@ -62,7 +62,8 @@
        [quo/category
         {:list-type :settings
          :data      [{:title             (i18n/label :t/join-as-a-member)
-                      :on-press          not-implemented/alert
+                      :on-press          #(rf/dispatch [:open-modal :addresses-for-permissions
+                                                        {:community-id id}])
                       :description       :text
                       :action            :arrow
                       :label             :preview

src/status_im2/contexts/communities/actions/addresses_for_permissions/style.cljs

@@ -0,0 +1,22 @@
+(ns status-im2.contexts.communities.actions.addresses-for-permissions.style
+  (:require [quo.foundations.colors :as colors]))
+
+(def container {:flex 1})
+
+(def account-item-container
+  {:font-size          30
+   :border-radius      16
+   :flex-direction     :row
+   :border-width       1
+   :height             56
+   :padding-horizontal 12
+   :align-items        :center
+   :margin-bottom      8
+   :gap                8
+   :border-color       colors/neutral-90})
+
+(def buttons
+  {:flex-direction     :row
+   :gap                12
+   :padding-horizontal 20
+   :padding-vertical   12})

src/status_im2/contexts/communities/actions/addresses_for_permissions/view.cljs

@@ -0,0 +1,58 @@
+(ns status-im2.contexts.communities.actions.addresses-for-permissions.view
+  (:require [quo.core :as quo]
+            [react-native.core :as rn]
+            [status-im2.common.not-implemented :as not-implemented]
+            [status-im2.contexts.communities.actions.addresses-for-permissions.style :as style]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]))
+
+(defn- account-item
+  [item]
+  [rn/view
+   {:style style/account-item-container}
+   [quo/account-avatar (assoc item :size 32)]
+   [rn/view
+    [quo/text
+     {:size   :paragraph-1
+      :weight :semi-bold}
+     (:name item)]
+    [quo/address-text
+     {:address (:address item)
+      :format  :short}]]])
+
+(defn view
+  []
+  (let [{id :community-id}          (rf/sub [:get-screen-params])
+        {:keys [name color images]} (rf/sub [:communities/community id])
+        accounts                    (->> (rf/sub [:wallet])
+                                         :accounts
+                                         vals
+                                         (map #(assoc % :customization-color (:color %))))]
+    [rn/safe-area-view {:style style/container}
+
+     [quo/drawer-top
+      {:type                :context-tag
+       :title               (i18n/label :t/addresses-for-permissions)
+       :community-name      name
+       :button-icon         :i/info
+       :on-button-press     not-implemented/alert
+       :community-logo      (get-in images [:thumbnail :uri])
+       :customization-color color}]
+
+     [rn/flat-list
+      {:render-fn               account-item
+       :content-container-style {:padding 20}
+       :key-fn                  :key-uid
+       :data                    accounts}]
+
+     [rn/view {:style style/buttons}
+      [quo/button
+       {:type            :grey
+        :container-style {:flex 1}
+        :on-press        #(rf/dispatch [:navigate-back])}
+       (i18n/label :t/cancel)]
+      [quo/button
+       {:container-style     {:flex 1}
+        :customization-color color
+        :on-press            #(rf/dispatch [:navigate-back])}
+       (i18n/label :t/confirm-changes)]]]))

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

@@ -242,6 +242,7 @@
 
 (defn- internal-discover-view
   [params]
+  (rf/dispatch [:fetch-contract-communities])
   [:f> f-view-internal params])
 
 (def view (quo.theme/with-theme internal-discover-view))

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

@@ -49,21 +49,15 @@
                    (i18n/label :t/no-communities-description-strikethrough)]
                   " "
                   (i18n/label :t/no-communities-description)]
-    :image       (resources/get-image (quo.theme/theme-value :no-communities-light
-                                                             :no-communities-dark
-                                                             theme))}
+    :image       (resources/get-themed-image :no-communities theme)}
    :pending
    {:title       (i18n/label :t/no-pending-communities)
     :description (i18n/label :t/no-pending-communities-description)
-    :image       (resources/get-image (quo.theme/theme-value :no-pending-communities-light
-                                                             :no-pending-communities-dark
-                                                             theme))}
+    :image       (resources/get-themed-image :no-pending-communities theme)}
    :opened
    {:title       (i18n/label :t/no-opened-communities)
     :description (i18n/label :t/no-opened-communities-description)
-    :image       (resources/get-image (quo.theme/theme-value :no-opened-communities-light
-                                                             :no-opened-communities-dark
-                                                             theme))}})
+    :image       (resources/get-themed-image :no-opened-communities theme)}})
 
 (def ^:private banner-data
   {:title-props

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

@@ -1,22 +1,19 @@
-(ns status-im2.contexts.onboarding.enable-notifications.style
-  (:require
-    [quo.foundations.colors :as colors]))
+(ns status-im2.contexts.onboarding.enable-notifications.style)
 
 (def default-margin 20)
 
 (defn page-container
   [insets]
-  {:flex        1
-   :padding-top (:top insets)})
+  {:flex            1
+   :justify-content :space-between
+   :padding-top     (:top insets)})
 
-(def page-illustration
-  {:flex              1
-   :background-color  colors/danger-50
-   :align-items       :center
-   :margin-horizontal default-margin
-   :border-radius     20
-   :margin-top        default-margin
-   :justify-content   :center})
+(defn page-illustration
+  [width]
+  {:flex  1
+   :width width})
+
+(def page-heading {:z-index 1})
 
 (defn buttons
   [insets]

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

@@ -4,6 +4,9 @@
     [react-native.core :as rn]
     [react-native.platform :as platform]
     [react-native.safe-area :as safe-area]
+    [status-im2.common.parallax.view :as parallax]
+    [status-im2.common.parallax.whitelist :as whitelist]
+    [status-im2.common.resources :as resources]
     [status-im2.contexts.onboarding.enable-notifications.style :as style]
     [status-im2.contexts.shell.jump-to.utils :as shell.utils]
     [taoensso.timbre :as log]
@@ -35,7 +38,7 @@
                               (rf/dispatch [:navigate-to-within-stack
                                             [:welcome :enable-notifications]]))
        :type                :primary
-       :before              :i/notifications
+       :icon-left           :i/notifications
        :accessibility-label :enable-notifications-button
        :customization-color profile-color}
       (i18n/label :t/intro-wizard-title6)]
@@ -50,16 +53,36 @@
        :container-style     {:margin-top 12}}
       (i18n/label :t/maybe-later)]]))
 
-(defn enable-notifications
+(defn enable-notifications-parallax
+  []
+  (let [stretch (if rn/small-screen? -40 -25)]
+    [parallax/video
+     {:layers  (:notifications resources/parallax-video)
+      :stretch stretch}]))
+
+(defn enable-notifications-simple
+  []
+  (let [width (:width (rn/get-window))]
+    [rn/image
+     {:resize-mode :contain
+      :style       (style/page-illustration width)
+      :source      (resources/get-image :notifications)}]))
+
+(defn f-enable-notifications
   []
   (let [insets (safe-area/get-insets)]
     [rn/view {:style (style/page-container insets)}
-     [quo/page-nav
-      {:background :blur
-       :icon-name  :i/arrow-left
-       :on-press   #(rf/dispatch [:navigate-back-within-stack :enable-biometrics])}]
-     [page-title]
-     [rn/view {:style style/page-illustration}
-      [quo/text
-       "Illustration here"]]
+     [rn/view {:style style/page-heading}
+      [quo/page-nav
+       {:background :blur
+        :icon-name  :i/arrow-left
+        :on-press   #(rf/dispatch [:navigate-back-within-stack :enable-biometrics])}]
+      [page-title]]
+     (if whitelist/whitelisted?
+       [enable-notifications-parallax]
+       [enable-notifications-simple])
      [enable-notification-buttons {:insets insets}]]))
+
+(defn view
+  []
+  [:f> f-enable-notifications])

src/status_im2/contexts/onboarding/syncing/progress/view.cljs

@@ -4,6 +4,7 @@
     [react-native.core :as rn]
     [status-im2.contexts.onboarding.common.background.view :as background]
     [status-im2.contexts.onboarding.syncing.progress.style :as style]
+    [utils.debounce :as debounce]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
@@ -25,12 +26,17 @@
     :description-accessibility-label :progress-screen-sub-title}])
 
 (defn try-again-button
-  [profile-color in-onboarding?]
+  [profile-color in-onboarding? logged-in?]
   [quo/button
    {:on-press            (fn []
                            (rf/dispatch [:syncing/clear-states])
-                           (rf/dispatch [:navigate-back-to
-                                         (if in-onboarding? :sign-in-intro :sign-in)]))
+                           (cond
+                             logged-in?     (rf/dispatch [:navigate-back])
+                             in-onboarding? (rf/dispatch [:navigate-back-to :sign-in-intro])
+                             :else          (do
+                                              (rf/dispatch [:navigate-back])
+                                              (debounce/dispatch-and-chill [:open-modal :sign-in]
+                                                                           1000))))
     :accessibility-label :try-again-later-button
     :customization-color profile-color
     :container-style     style/try-again-button}
@@ -39,7 +45,8 @@
 (defn view
   [in-onboarding?]
   (let [pairing-status (rf/sub [:pairing/pairing-status])
-        profile-color  (:color (rf/sub [:onboarding/profile]))]
+        profile-color  (:color (rf/sub [:onboarding/profile]))
+        logged-in?     (rf/sub [:multiaccount/logged-in?])]
     [rn/view {:style (style/page-container in-onboarding?)}
      (when-not in-onboarding? [background/view true])
      [quo/page-nav {:type :no-title :background :blur}]
@@ -50,7 +57,7 @@
        [rn/view {:style style/page-illustration}
         [quo/text "[Error here]"]])
      (when-not (pairing-progress pairing-status)
-       [try-again-button profile-color in-onboarding?])]))
+       [try-again-button profile-color in-onboarding? logged-in?])]))
 
 (defn view-onboarding
   []

src/status_im2/contexts/profile/create/events.cljs

@@ -9,11 +9,13 @@
 
 (rf/defn create-profile-and-login
   {:events [:profile.create/create-and-login]}
-  [_ {:keys [display-name password image-path color]}]
-  {:effects.profile/create-and-login
-   (assoc (profile.config/create)
-          :displayName        display-name
-          :password           (native-module/sha3 (security/safe-unmask-data password))
-          :imagePath          (profile.config/strip-file-prefix image-path)
-          :customizationColor color
-          :emoji              (emoji-picker.utils/random-emoji))})
+  [{:keys [db]} {:keys [display-name password image-path color]}]
+  (let [login-sha3-password (native-module/sha3 (security/safe-unmask-data password))]
+    {:db (assoc-in db [:syncing :login-sha3-password] login-sha3-password)
+     :effects.profile/create-and-login
+     (assoc (profile.config/create)
+            :displayName        display-name
+            :password           login-sha3-password
+            :imagePath          (profile.config/strip-file-prefix image-path)
+            :customizationColor color
+            :emoji              (emoji-picker.utils/random-emoji))}))

src/status_im2/contexts/profile/login/effects.cljs

@@ -9,3 +9,7 @@
    ;;"node.login" signal will be triggered as a callback
    (native-module/login-account
     (assoc (profile.config/login) :keyUid key-uid :password hashed-password))))
+
+(rf/reg-fx :effects.profile/enable-local-notifications
+ (fn []
+   (native-module/start-local-notifications)))

src/status_im2/contexts/profile/login/events.cljs

@@ -33,9 +33,12 @@
 (rf/defn login
   {:events [:profile.login/login]}
   [{:keys [db]}]
-  (let [{:keys [key-uid password]} (:profile/login db)]
-    {:db                    (assoc-in db [:profile/login :processing] true)
-     :effects.profile/login [key-uid (native-module/sha3 (security/safe-unmask-data password))]}))
+  (let [{:keys [key-uid password]} (:profile/login db)
+        login-sha3-password        (native-module/sha3 (security/safe-unmask-data password))]
+    {:db                    (-> db
+                                (assoc-in [:profile/login :processing] true)
+                                (assoc-in [:syncing :login-sha3-password] login-sha3-password))
+     :effects.profile/login [key-uid login-sha3-password]}))
 
 (rf/defn biometrics-login
   {:events [:profile.login/biometrics-login]}
@@ -48,6 +51,10 @@
   {:events [:profile.login/local-paired-user]}
   [{:keys [db]}]
   (let [{:keys [key-uid password]} (get-in db [:syncing :profile])
+        login-sha3-password        (get-in db [:syncing :login-sha3-password])
+        password                   (if-not (nil? login-sha3-password) ;; already logged in
+                                     login-sha3-password
+                                     password)
         masked-password            (security/mask-data password)]
     {:db                    (-> db
                                 (assoc-in [:onboarding/profile :password] masked-password)
@@ -112,31 +119,29 @@
         current-network-config                      (get networks current-network)
         network-id                                  (str (get-in networks
                                                                  [current-network :config :NetworkId]))]
-    (rf/merge cofx
-              (cond-> {:json-rpc/call [{:method     "wakuext_startMessenger"
-                                        :on-success #(re-frame/dispatch [:messenger-started %])
-                                        :on-error   #(log/error "failed to start messenger")}]
-                       :wallet-legacy/initialize-transactions-management-enabled nil
-                       :wallet-legacy/initialize-wallet
-                       [network-id
-                        current-network-config
-                        (fn [accounts tokens custom-tokens favourites]
-                          (re-frame/dispatch [:wallet-legacy/initialize-wallet
-                                              accounts tokens custom-tokens favourites]))]
-                       :check-eip1559-activation {:network-id network-id}}
-                (not (:universal-links/handling db))
-                (assoc :effects.chat/open-last-chat (get-in db [:profile/profile :key-uid]))
-                notifications-enabled?
-                (assoc :effects/push-notifications-enable nil))
-              (contacts/initialize-contacts)
-              (browser/initialize-browser)
-              (mobile-network/on-network-status-change)
-              (group-chats/get-group-chat-invitations)
-              (profile.settings.events/get-profile-picture)
-              (profile.settings.events/change-preview-privacy)
-              (link-preview/request-link-preview-whitelist)
-              (visibility-status-updates-store/fetch-visibility-status-updates-rpc)
-              (switcher-cards-store/fetch-switcher-cards-rpc))))
+    (rf/merge
+     cofx
+     (cond-> {:json-rpc/call                              [{:method     "wakuext_startMessenger"
+                                                            :on-success #(re-frame/dispatch
+                                                                          [:messenger-started %])
+                                                            :on-error   #(log/error
+                                                                          "failed to start messenger")}]
+              :check-eip1559-activation                   {:network-id network-id}
+              :effects.profile/enable-local-notifications nil
+              :dispatch-n                                 [[:wallet/get-accounts]]}
+       (not (:universal-links/handling db))
+       (assoc :effects.chat/open-last-chat (get-in db [:profile/profile :key-uid]))
+       notifications-enabled?
+       (assoc :effects/push-notifications-enable nil))
+     (contacts/initialize-contacts)
+     (browser/initialize-browser)
+     (mobile-network/on-network-status-change)
+     (group-chats/get-group-chat-invitations)
+     (profile.settings.events/get-profile-picture)
+     (profile.settings.events/change-preview-privacy)
+     (link-preview/request-link-preview-whitelist)
+     (visibility-status-updates-store/fetch-visibility-status-updates-rpc)
+     (switcher-cards-store/fetch-switcher-cards-rpc))))
 
 (rf/defn messenger-started
   {:events [:messenger-started]}

src/status_im2/contexts/profile/recover/events.cljs

@@ -10,14 +10,17 @@
 (rf/defn recover-profile-and-login
   {:events [:profile.recover/recover-and-login]}
   [{:keys [db]} {:keys [display-name password image-path color seed-phrase]}]
-  {:db
-   (assoc db :onboarding/recovered-account? true)
+  (let [login-sha3-password (native-module/sha3 (security/safe-unmask-data password))]
+    {:db
+     (-> db
+         (assoc :onboarding/recovered-account? true)
+         (assoc-in [:syncing :login-sha3-password] login-sha3-password))
 
-   :effects.profile/restore-and-login
-   (merge (profile.config/create)
-          {:displayName        display-name
-           :mnemonic           (security/safe-unmask-data seed-phrase)
-           :password           (native-module/sha3 (security/safe-unmask-data password))
-           :imagePath          (profile.config/strip-file-prefix image-path)
-           :customizationColor color
-           :emoji              (emoji-picker.utils/random-emoji)})})
+     :effects.profile/restore-and-login
+     (merge (profile.config/create)
+            {:displayName        display-name
+             :mnemonic           (security/safe-unmask-data seed-phrase)
+             :password           login-sha3-password
+             :imagePath          (profile.config/strip-file-prefix image-path)
+             :customizationColor color
+             :emoji              (emoji-picker.utils/random-emoji)})}))

src/status_im2/contexts/profile/settings/events.cljs

@@ -4,6 +4,7 @@
             [status-im2.constants :as constants]
             status-im2.contexts.profile.settings.effects
             [taoensso.timbre :as log]
+            [utils.i18n :as i18n]
             [utils.re-frame :as rf]))
 
 (rf/defn send-contact-update
@@ -14,6 +15,7 @@
                       :on-success #(log/debug "sent contact update")}]}))
 
 (rf/defn profile-update
+  {:events [:profile.settings/profile-update]}
   [{:keys [db] :as cofx}
    setting setting-value
    {:keys [dont-sync? on-success] :or {on-success #()}}]
@@ -56,6 +58,18 @@
             {:profile.settings/webview-debug-changed value}
             (profile-update :webview-debug (boolean value) {})))
 
+(rf/reg-event-fx :profile.settings/toggle-test-networks
+ (fn [{:keys [db]}]
+   (let [value      (get-in db [:profile/profile :test-networks-enabled?])
+         on-success #(rf/dispatch [:logout])]
+     {:fx [[:ui/show-confirmation
+            {:title     (i18n/label :t/testnet-mode-prompt-title)
+             :content   (i18n/label :t/testnet-mode-prompt-content)
+             :on-accept #(rf/dispatch [:profile.settings/profile-update :test-networks-enabled?
+                                       (not value)
+                                       {:on-success on-success}])
+             :on-cancel nil}]]})))
+
 (rf/defn change-preview-privacy-flag
   {:events [:profile.settings/change-preview-privacy]}
   [{:keys [db] :as cofx} private?]

src/status_im2/contexts/quo_preview/empty_state/empty_state.cljs

@@ -1,6 +1,7 @@
 (ns status-im2.contexts.quo-preview.empty-state.empty-state
   (:require
     [quo.core :as quo]
+    [quo.theme]
     [reagent.core :as reagent]
     [status-im2.common.resources :as resources]
     [status-im2.contexts.quo-preview.preview :as preview]))
@@ -12,10 +13,8 @@
     :type :text}
    {:key     :image
     :type    :select
-    :options [{:key :no-contacts-light}
-              {:key :no-contacts-dark}
-              {:key :no-messages-light}
-              {:key :no-messages-dark}]}
+    :options [{:key :cat-in-box}
+              {:key :no-contacts}]}
    {:key  :upper-button-text
     :type :text}
    {:key  :lower-button-text
@@ -23,9 +22,9 @@
    {:key  :blur?
     :type :boolean}])
 
-(defn view
-  []
-  (let [state (reagent/atom {:image             :no-messages-light
+(defn view-internal
+  [{:keys [theme]}]
+  (let [state (reagent/atom {:image             :no-contacts
                              :title             "A big friendly title"
                              :description       "Some cool description will be here"
                              :blur?             false
@@ -46,4 +45,6 @@
             (assoc :lower-button
                    {:text     (:lower-button-text @state)
                     :on-press #(js/alert "Lower button")})
-            (update :image resources/get-image))]])))
+            (assoc :image (resources/get-themed-image (:image @state) theme)))]])))
+
+(def view (quo.theme/with-theme view-internal))

src/status_im2/contexts/quo_preview/list_items/token_value.cljs

@@ -20,6 +20,7 @@
 (defn view
   []
   (let [state (reagent/atom {:token               :snt
+                             :token-name          "Status"
                              :state               :default
                              :status              :empty
                              :customization-color :blue

src/status_im2/contexts/quo_preview/main.cljs

@@ -178,6 +178,7 @@
     [status-im2.contexts.quo-preview.wallet.network-link :as network-link]
     [status-im2.contexts.quo-preview.wallet.network-routing :as network-routing]
     [status-im2.contexts.quo-preview.wallet.progress-bar :as progress-bar]
+    [status-im2.contexts.quo-preview.wallet.required-tokens :as required-tokens]
     [status-im2.contexts.quo-preview.wallet.summary-info :as summary-info]
     [status-im2.contexts.quo-preview.wallet.token-input :as token-input]
     [status-im2.contexts.quo-preview.wallet.transaction-progress :as transaction-progress]
@@ -477,6 +478,8 @@
                        {:name :network-link :component network-link/view}
                        {:name :network-routing :component network-routing/view}
                        {:name :progress-bar :component progress-bar/view}
+                       {:name      :required-tokens
+                        :component required-tokens/view}
                        {:name :summary-info :component summary-info/view}
                        {:name :token-input :component token-input/view}
                        {:name :wallet-activity :component wallet-activity/view}

src/status_im2/contexts/quo_preview/preview.cljs

@@ -5,6 +5,7 @@
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
+    [re-frame.core :as rf]
     [react-native.blur :as blur]
     [react-native.core :as rn]
     [react-native.safe-area :as safe-area]
@@ -320,9 +321,10 @@
   [{:keys [title state descriptor blur? blur-dark-only?
            component-container-style
            blur-container-style blur-view-props blur-height show-blur-background?]
-    :or   {blur-height 200 title "quo component"}}
+    :or   {blur-height 200}}
    & children]
-  (let [theme (quo.theme/use-theme-value)]
+  (let [theme (quo.theme/use-theme-value)
+        title (or title @(rf/subscribe [:view-id]))]
     (rn/use-effect (fn []
                      (when blur-dark-only?
                        (if blur?

src/status_im2/contexts/quo_preview/settings/reorder_item.cljs

@@ -8,8 +8,7 @@
 (def mock-data
   [{:id   1
     :type types/item
-    :data {:on-press   (println "pressed")
-           :image      (resources/get-mock-image :diamond)
+    :data {:image      (resources/get-mock-image :diamond)
            :image-size 21
            :right-icon :i/world
            :title      "Trip to Bahamas"}}

src/status_im2/contexts/quo_preview/wallet/required_tokens.cljs

@@ -0,0 +1,47 @@
+(ns status-im2.contexts.quo-preview.wallet.required-tokens
+  (:require
+    [quo.core :as quo]
+    [reagent.core :as reagent]
+    [status-im2.common.resources :as resources]
+    [status-im2.contexts.quo-preview.preview :as preview]))
+
+(def descriptor
+  [{:key     :type
+    :type    :select
+    :options [{:key :token}
+              {:key :collectible}]}
+   {:key  :divider?
+    :type :boolean}])
+
+(def token-descriptor
+  [{:key  :amount
+    :type :text}
+   {:key     :token
+    :type    :select
+    :options [{:key "SNT"}
+              {:key "ETH"}]}])
+
+(def collectible-descriptor
+  [{:key  :collectible-name
+    :type :text}])
+
+(defn view
+  []
+  (let
+    [state
+     (reagent/atom
+      {:type                :token
+       :collectible-img-src (resources/mock-images :collectible)
+       :collectible-name    "Collectible name"
+       :token               "SNT"
+       :amount              "100"
+       :divider?            false})]
+    (fn []
+      [preview/preview-container
+       {:state      state
+        :descriptor (concat descriptor
+                            (case (:type @state)
+                              :token       token-descriptor
+                              :collectible collectible-descriptor
+                              nil))}
+       [quo/required-tokens @state]])))

src/status_im2/contexts/shell/activity_center/notification/membership/view.cljs

@@ -14,7 +14,7 @@
     [gesture/touchable-without-feedback
      {:on-press (fn []
                   (rf/dispatch [:hide-popover])
-                  (rf/dispatch [:chat/navigate-to-chat chat-id]))}
+                  (rf/dispatch [:chat/pop-to-root-and-navigate-to-chat chat-id]))}
      child]
     child))
 

src/status_im2/contexts/shell/activity_center/notification/mentions/view.cljs

@@ -52,7 +52,7 @@
      [gesture/touchable-without-feedback
       {:on-press (fn []
                    (rf/dispatch [:hide-popover])
-                   (rf/dispatch [:chat/navigate-to-chat chat-id]))}
+                   (rf/dispatch [:chat/pop-to-root-and-navigate-to-chat chat-id]))}
       [quo/activity-log
        {:title               (i18n/label :t/mention)
         :customization-color customization-color

src/status_im2/contexts/shell/activity_center/notification/reply/view.cljs

@@ -74,7 +74,7 @@
      [gesture/touchable-without-feedback
       {:on-press (fn []
                    (rf/dispatch [:hide-popover])
-                   (rf/dispatch [:chat/navigate-to-chat chat-id]))}
+                   (rf/dispatch [:chat/pop-to-root-and-navigate-to-chat chat-id]))}
       [quo/activity-log
        {:title               (i18n/label :t/message-reply)
         :customization-color customization-color

src/status_im2/contexts/shell/activity_center/tabs/empty_tab/view.cljs

@@ -1,6 +1,7 @@
 (ns status-im2.contexts.shell.activity-center.tabs.empty-tab.view
   (:require
     [quo.core :as quo]
+    [quo.theme]
     [react-native.core :as rn]
     [status-im2.common.resources :as resources]
     [status-im2.contexts.shell.activity-center.notification-types :as types]
@@ -8,7 +9,7 @@
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
-(def empty-tab-description
+(def ^:private empty-tab-description
   {types/no-type              (i18n/label :t/empty-notifications-all-tab)
    types/admin                (i18n/label :t/empty-notifications-admin-tab)
    types/mention              (i18n/label :t/empty-notifications-mentions-tab)
@@ -19,13 +20,15 @@
    types/membership           (i18n/label :t/empty-notifications-membership-tab)
    types/system               (i18n/label :t/empty-notifications-system-tab)})
 
-(defn empty-tab
-  []
+(defn empty-tab-internal
+  [{:keys [theme]}]
   (let [filter-type (rf/sub [:activity-center/filter-type])
         description (get empty-tab-description filter-type nil)]
     [rn/view {:style style/empty-container}
      [quo/empty-state
       {:blur?       true
-       :image       (resources/get-image :no-notifications-dark)
+       :image       (resources/get-themed-image :no-notifications theme)
        :title       (i18n/label :t/empty-notifications-title-unread)
        :description description}]]))
+
+(def empty-tab (quo.theme/with-theme empty-tab-internal))

src/status_im2/contexts/shell/jump_to/components/bottom_tabs/view.cljs

@@ -33,10 +33,6 @@
          (assoc :test-ID             stack-id
                 :icon                icon
                 :icon-color-anim     icon-color
-                ;NOTE temporary use of on long press while we support old wallet
-                :on-long-press       #(when (= stack-id :wallet-stack)
-                                        (swap! state/load-new-wallet? not)
-                                        (animation/bottom-tab-on-press stack-id true))
                 :on-press            #(animation/bottom-tab-on-press stack-id true)
                 :accessibility-label (str (name stack-id) "-tab")
                 :customization-color customization-color))]))

src/status_im2/contexts/shell/jump_to/components/home_stack/view.cljs

@@ -3,7 +3,6 @@
     [quo.theme :as quo.theme]
     [react-native.reanimated :as reanimated]
     [status-im.ui.screens.browser.stack :as browser.stack]
-    [status-im.ui.screens.wallet.accounts.views :as wallet.accounts]
     [status-im2.contexts.chat.home.view :as chat]
     [status-im2.contexts.communities.home.view :as communities]
     [status-im2.contexts.shell.jump-to.components.home-stack.style :as style]
@@ -32,10 +31,7 @@
    (case stack-id
      :communities-stack [:f> communities/view]
      :chats-stack       [:f> chat/view]
-     ;NOTE temporary while we support old wallet
-     :wallet-stack      (if @state/load-new-wallet?
-                          [wallet-new/view]
-                          [wallet.accounts/accounts-overview-old])
+     :wallet-stack      [wallet-new/view]
      :browser-stack     [browser.stack/browser-stack]
      [:<>])])
 

src/status_im2/contexts/shell/jump_to/components/switcher_cards/view.cljs

@@ -5,7 +5,6 @@
     [quo.foundations.colors :as colors]
     [react-native.core :as rn]
     [react-native.fast-image :as fast-image]
-    [status-im2.config :as config]
     [status-im2.constants :as constants]
     [status-im2.contexts.chat.messages.resolver.message-resolver :as resolver]
     [status-im2.contexts.shell.jump-to.animation :as animation]
@@ -198,13 +197,7 @@
     (rf/dispatch [:chat/navigate-to-chat id])
 
     (= card-type shell.constants/community-channel-card)
-    (if config/shell-navigation-disabled?
-      (do
-        (rf/dispatch [:navigate-to :community-overview id])
-        (js/setTimeout
-         #(rf/dispatch [:chat/navigate-to-chat channel-id])
-         100))
-      (rf/dispatch [:chat/navigate-to-chat channel-id]))
+    (rf/dispatch [:chat/navigate-to-chat channel-id])
 
     (= card-type shell.constants/community-card)
     (rf/dispatch [:navigate-to :community-overview id])))

src/status_im2/contexts/shell/jump_to/effects.cljs

@@ -1,6 +1,5 @@
 (ns status-im2.contexts.shell.jump-to.effects
   (:require
-    [status-im2.config :as config]
     [status-im2.contexts.shell.jump-to.animation :as animation]
     [status-im2.contexts.shell.jump-to.constants :as shell.constants]
     [status-im2.contexts.shell.jump-to.state :as state]
@@ -15,9 +14,8 @@
 (rf/reg-fx :effects.shell/navigate-to-jump-to
  (fn []
    (animation/close-home-stack false)
-   (when-not config/shell-navigation-disabled?
-     (some-> ^js @state/jump-to-list-ref
-             (.scrollToOffset #js {:y 0 :animated false})))))
+   (some-> ^js @state/jump-to-list-ref
+           (.scrollToOffset #js {:y 0 :animated false}))))
 
 ;; Note - pop-to-root resets currently opened screens to `close-screen-without-animation`.
 ;; This might take some time. So don't directly merge the effect of `pop-to-root` and

src/status_im2/contexts/shell/jump_to/events.cljs

@@ -2,7 +2,6 @@
   (:require
     [status-im.data-store.switcher-cards :as switcher-cards-store]
     [status-im.utils.core :as utils]
-    [status-im2.config :as config]
     [status-im2.constants :as constants]
     [status-im2.contexts.shell.jump-to.constants :as shell.constants]
     status-im2.contexts.shell.jump-to.effects
@@ -66,19 +65,10 @@
     (when card-data
       (rf/merge
        cofx
-       (merge
-        {:db (assoc-in
-              db
-              [:shell/switcher-cards (:card-id card-data)]
-              switcher-card)}
-        (when config/shell-navigation-disabled?
-          {:effects.shell/change-tab (cond
-                                       (#{shell.constants/one-to-one-chat-card
-                                          shell.constants/private-group-chat-card}
-                                        card-type)
-                                       :chats-stack
-
-                                       :else :communities-stack)}))
+       {:db (assoc-in
+             db
+             [:shell/switcher-cards (:card-id card-data)]
+             switcher-card)}
        (switcher-cards-store/upsert-switcher-card-rpc switcher-card)))))
 
 (rf/defn close-switcher-card
@@ -94,32 +84,29 @@
   {:events [:shell/navigate-to-jump-to]}
   [{:keys [db]}]
   (let [open-floating-screens (shell.utils/open-floating-screens)]
-    (merge
-     (if config/shell-navigation-disabled?
-       {:pop-to-root-fx :shell-stack}
-       {:db
-        (cond-> db
+    {:db
+     (cond-> db
 
-          (get open-floating-screens shell.constants/chat-screen)
-          (assoc-in [:shell/floating-screens shell.constants/chat-screen :animation]
-           shell.constants/close-screen-with-shell-animation)
+       (get open-floating-screens shell.constants/chat-screen)
+       (assoc-in [:shell/floating-screens shell.constants/chat-screen :animation]
+        shell.constants/close-screen-with-shell-animation)
 
-          (and (get open-floating-screens shell.constants/chat-screen)
-               (get open-floating-screens shell.constants/community-screen))
-          (assoc-in [:shell/floating-screens shell.constants/community-screen :animation]
-           shell.constants/close-screen-without-animation)
+       (and (get open-floating-screens shell.constants/chat-screen)
+            (get open-floating-screens shell.constants/community-screen))
+       (assoc-in [:shell/floating-screens shell.constants/community-screen :animation]
+        shell.constants/close-screen-without-animation)
 
-          (and (not (get open-floating-screens shell.constants/chat-screen))
-               (get open-floating-screens shell.constants/community-screen))
-          (assoc-in [:shell/floating-screens shell.constants/community-screen :animation]
-           shell.constants/close-screen-with-shell-animation)
+       (and (not (get open-floating-screens shell.constants/chat-screen))
+            (get open-floating-screens shell.constants/community-screen))
+       (assoc-in [:shell/floating-screens shell.constants/community-screen :animation]
+        shell.constants/close-screen-with-shell-animation)
 
-          (get open-floating-screens shell.constants/discover-communities-screen)
-          (assoc-in [:shell/floating-screens shell.constants/discover-communities-screen :animation]
-           shell.constants/close-screen-without-animation))
+       (get open-floating-screens shell.constants/discover-communities-screen)
+       (assoc-in [:shell/floating-screens shell.constants/discover-communities-screen :animation]
+        shell.constants/close-screen-without-animation))
 
-        :dispatch [:set-view-id :shell]})
-     {:effects.shell/navigate-to-jump-to nil})))
+     :dispatch [:set-view-id :shell]
+     :effects.shell/navigate-to-jump-to nil}))
 
 (rf/defn change-shell-status-bar-style
   {:events [:change-shell-status-bar-style]}
@@ -162,15 +149,8 @@
                           (not hidden-screen?)
                           (:current-chat-id db))
                      (conj [:chat/close]))})
-    (merge
-     {:db          (assoc db :view-id go-to-view-id)
-      :navigate-to go-to-view-id}
-     (when (and config/shell-navigation-disabled?
-                (#{:chat :community-overview} go-to-view-id))
-       {:dispatch-later
-        ;; 300 ms delay because, navigation is priority over shell card update
-        [{:dispatch [:shell/add-switcher-card go-to-view-id screen-params]
-          :ms       300}]}))))
+    {:db          (assoc db :view-id go-to-view-id)
+     :navigate-to go-to-view-id}))
 
 (rf/defn shell-navigate-back
   {:events [:shell/navigate-back]}

src/status_im2/contexts/shell/jump_to/state.cljs

@@ -17,5 +17,3 @@
 (def load-chats-stack? (reagent/atom false))
 (def load-wallet-stack? (reagent/atom false))
 (def load-browser-stack? (reagent/atom false))
-;NOTE temporary while we support old wallet
-(def load-new-wallet? (reagent/atom true))