fix merge error

src/main/frontend/components/block.cljs

@@ -2350,8 +2350,6 @@
           (str (:block/uuid block)))))
 
 (rum/defc ^:large-vars/cleanup-todo block-container-inner < rum/reactive db-mixins/query
-  (rum/local false ::show-block-left-menu?) 
-  (rum/local false ::show-block-right-menu?)
   [state repo config block]
   (let [ref? (:ref? config)
         custom-query? (boolean (:custom-query? config))
@@ -2459,7 +2457,7 @@
                          (block-mouse-leave e *control-show? block-id doc-mode?))}
       (when (not slide?)
         (block-control config block uuid block-id collapsed? *control-show? edit?))
-
+      
       (when @*show-left-menu?
         (block-left-menu config block))
       (block-content-or-editor config block edit-input-id block-id heading-level edit?)
@@ -2471,6 +2469,8 @@
      (dnd-separator-wrapper block block-id slide? false false)]))
 
 (rum/defcs block-container < rum/reactive
+  (rum/local false ::show-block-left-menu?) 
+  (rum/local false ::show-block-right-menu?)
   {:init (fn [state]
            (let [[config block] (:rum/args state)
                  block-id (:block/uuid block)]

src/main/frontend/components/sidebar.cljs

@@ -25,6 +25,7 @@
             [frontend.handler.route :as route-handler]
             [frontend.handler.user :as user-handler]
             [frontend.mixins :as mixins]
+            [frontend.mobile.action-bar :as action-bar]
             [frontend.mobile.footer :as footer]
             [frontend.mobile.util :as mobile-util]
             [frontend.mobile.mobile-bar :refer [mobile-bar]]
@@ -35,13 +36,6 @@
             [goog.dom :as gdom]
             [goog.object :as gobj]
             [rum.core :as rum]
-            [frontend.extensions.srs :as srs]
-            [frontend.extensions.pdf.assets :as pdf-assets]
-            [frontend.mobile.util :as mobile-util]
-            [frontend.handler.mobile.swipe :as swipe]
-            [frontend.components.onboarding :as onboarding]
-            [frontend.mobile.footer :as footer]
-            [frontend.mobile.action-bar :as action-bar]))
             [reitit.frontend.easy :as rfe]))
 
 (rum/defc nav-content-item
@@ -562,7 +556,8 @@
                :indexeddb-support?  indexeddb-support?
                :light?              light?
                :db-restoring?       db-restoring?
-               :main-content        main-content})]
+               :main-content        main-content
+               :show-action-bar?    show-action-bar?})]
 
        (right-sidebar/sidebar)
 

src/main/frontend/state.cljs

@@ -859,9 +859,8 @@
            (when move-cursor?
              (cursor/move-cursor-to input pos))
 
-           (when (or (util/mobile?) (mobile-util/is-native-platform?))
-             (set-state! :mobile/show-action-bar? false)
-             (util/make-el-center-if-near-top input))))))))
+           (when (or (util/mobile?) (mobile-util/native-platform?))
+             (set-state! :mobile/show-action-bar? false))))))))
 
 (defn clear-edit!
   []