Merge branch 'develop' into 17871

src/status_im/common/scroll_page/view.cljs

@@ -4,7 +4,6 @@
     [quo.core :as quo]
     [react-native.core :as rn]
     [react-native.reanimated :as reanimated]
-    [react-native.safe-area :as safe-area]
     [reagent.core :as reagent]
     [status-im.common.scroll-page.style :as style]
     [utils.re-frame :as rf]))
@@ -60,7 +59,7 @@
         [rn/view {:style {:margin-top 0}}
          top-nav]
         [quo/page-nav
-         (cond-> {:margin-top     (safe-area/get-top)
+         (cond-> {:margin-top     44
                   :type           :no-title
                   :background     (if (= 1 (reanimated/get-shared-value opacity-animation))
                                     :blur

src/status_im/contexts/communities/discover/style.cljs

@@ -1,16 +1,13 @@
 (ns status-im.contexts.communities.discover.style
   (:require
+    [react-native.platform :as platform]
     [status-im.contexts.shell.jump-to.constants :as jump-to.constants]))
 
-(def header-height 56)
-
-(defn screen-title-container
-  [safe-area-top]
-  {:height            header-height
+(def screen-title-container
+  {:height            56
    :padding-vertical  12
    :justify-content   :center
-   :margin-horizontal 20
-   :margin-top        (+ header-height safe-area-top)})
+   :margin-horizontal 20})
 
 (def featured-communities-header
   {:flex-direction  :row
@@ -43,7 +40,7 @@
   [fixed?]
   (merge
    {:padding-vertical 12
-    :height           header-height
+    :height           56
     :background-color :transparent}
    (when-not fixed?
      {:margin-top        12
@@ -63,12 +60,15 @@
   {:align-items     :center
    :justify-content :center})
 
+(def render-communities-container
+  {:margin-top (if platform/ios? 57 104)})
+
 (defn blur-tabs-header
-  [safe-area-top]
+  []
   {:padding-horizontal 20
    :position           :absolute
-   :top                (+ header-height safe-area-top)
-   :height             header-height
+   :top                (if platform/ios? 100 104)
+   :height             56
    :right              0
    :left               0
    :justify-content    :center

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

@@ -5,7 +5,6 @@
     [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
-    [react-native.safe-area :as safe-area]
     [reagent.core :as reagent]
     [status-im.common.scroll-page.view :as scroll-page]
     [status-im.contexts.communities.actions.community-options.view :as options]
@@ -34,7 +33,7 @@
 (defn screen-title
   []
   [rn/view
-   {:style (style/screen-title-container (safe-area/get-top))}
+   {:style style/screen-title-container}
    [quo/text
     {:accessibility-label :communities-screen-title
      :weight              :semi-bold
@@ -184,6 +183,7 @@
    view-type]
   (fn []
     [rn/view
+     {:style style/render-communities-container}
      [discover-communities-header
       {:selected-tab               selected-tab
        :view-type                  view-type
@@ -196,7 +196,7 @@
   (fn []
     (when (> @scroll-height 360)
       [rn/view
-       {:style (style/blur-tabs-header (safe-area/get-top))}
+       {:style (style/blur-tabs-header)}
        [discover-communities-segments selected-tab true]])))
 
 (defn discover-screen-content
@@ -209,7 +209,6 @@
       [scroll-page/scroll-page
        {:theme            theme
         :on-scroll        #(reset! scroll-height %)
-        :page-nav-props   {:background :blur}
         :navigate-back?   :true
         :height           (if (> @scroll-height 360)
                             208

src/status_im/subs/communities.cljs

@@ -4,7 +4,8 @@
     [legacy.status-im.ui.screens.profile.visibility-status.utils :as visibility-status-utils]
     [re-frame.core :as re-frame]
     [status-im.constants :as constants]
-    [utils.i18n :as i18n]))
+    [utils.i18n :as i18n]
+    [utils.money :as money]))
 
 (re-frame/reg-sub
  :communities/fetching-community

status-go-version.json

@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "1256d8121e6fae4fc4517736a271624e473d5417",
-    "commit-sha1": "1256d8121e6fae4fc4517736a271624e473d5417",
-    "src-sha256": "0v9pbb79r8avvlx6ss7czj2j3s8csb2j2gkwavjbya6bys80hqmf"
+    "version": "v0.172.10",
+    "commit-sha1": "69948a7024df8c4537fc4986b39aded22e89179b",
+    "src-sha256": "0xg32k3f4yy7gwqzh60qdgrgi2zvm8s1w7sisqmcn5vw90jya70w"
 }