diff --git a/src/legacy/status_im/multiaccounts/logout/core.cljs b/src/legacy/status_im/multiaccounts/logout/core.cljs
index 20c12a473d..30e10ee458 100644
--- a/src/legacy/status_im/multiaccounts/logout/core.cljs
+++ b/src/legacy/status_im/multiaccounts/logout/core.cljs
@@ -31,7 +31,6 @@
   (let [key-uid (get-in db [:profile/profile :key-uid])]
     (rf/merge cofx
               {:set-root                               :progress
-               :chat.ui/clear-inputs                   nil
                :effects.shell/reset-state              nil
                :hide-popover                           nil
                ::logout                                nil
diff --git a/src/quo/components/navigation/bottom_nav_tab/view.cljs b/src/quo/components/navigation/bottom_nav_tab/view.cljs
index a7c8065c14..5b071e1a08 100644
--- a/src/quo/components/navigation/bottom_nav_tab/view.cljs
+++ b/src/quo/components/navigation/bottom_nav_tab/view.cljs
@@ -32,7 +32,7 @@
   "
   [{:keys [icon new-notifications? notification-indicator counter-label
            on-press pass-through? icon-color-anim accessibility-label test-ID
-           customization-color on-long-press]
+           customization-color]
     :or   {customization-color :blue}}]
   (let [icon-animated-style       (reanimated/apply-animations-to-style
                                    {:tint-color icon-color-anim}
@@ -48,7 +48,6 @@
                                     :border-radius 10})]
     [rn/touchable-without-feedback
      {:test-ID                 test-ID
-      :on-long-press           on-long-press ;;NOTE - this is temporary while supporting old wallet
       :allow-multiple-presses? true
       :on-press                on-press
       :on-press-in             #(toggle-background-color background-color false pass-through?)
diff --git a/src/status_im/contexts/shell/jump_to/view.cljs b/src/status_im/contexts/shell/jump_to/view.cljs
index c4ab7fac93..b64041ad09 100644
--- a/src/status_im/contexts/shell/jump_to/view.cljs
+++ b/src/status_im/contexts/shell/jump_to/view.cljs
@@ -15,12 +15,10 @@
 
 (defn navigate-back-handler
   []
-  (if (and (not @navigation.state/curr-modal)
-           (seq (utils/open-floating-screens)))
-    (do
-      (rf/dispatch [:navigate-back])
-      true)
-    false))
+  (when (and (not @navigation.state/curr-modal)
+             (seq (utils/open-floating-screens)))
+    (rf/dispatch [:navigate-back])
+    true))
 
 (defn floating-button
   [shared-values]