some adjustments

status-im · Sep 15, 2023 · a8cba25 · a8cba25
1 parent f57e002
commit a8cba25
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/quo2/components/navigation/page_nav/view.cljs b/src/quo2/components/navigation/page_nav/view.cljs
@@ -56,7 +56,7 @@
    (cond
      ;; TODO: use account-switcher when available (issue #16456)
      (and support-account-switcher? (= content :account-switcher))
-     [rn/touchable-opacity
+     [rn/pressable
       {:style    style/account-switcher-placeholder
        :on-press #(js/alert "Not implemented yet")}]
 

diff --git a/src/quo2/components/tabs/tabs/view.cljs b/src/quo2/components/tabs/tabs/view.cljs
@@ -132,7 +132,7 @@
                scroll-on-press?
                scrollable?
                style
-               content-style
+               container-style
                size
                blur?
                in-scroll-view?
@@ -167,8 +167,8 @@
              ;; from ScrollView (e.g. FlatList). There are open issues, here's
              ;; just one about this topic:
              ;; https://github.com/facebook/react-native/issues/31218
-             :content-container-style           (merge content-style
-                                                       {:padding-top (dec unread-count-offset)})
+             :content-container-style
+               (assoc container-style :padding-top (dec unread-count-offset))
              :horizontal                        true
              :scroll-event-throttle             64
              :shows-horizontal-scroll-indicator false