From 9b3fb2ac69d3585768de1cfe35c48298cac003f6 Mon Sep 17 00:00:00 2001 From: andrey Date: Tue, 2 Nov 2021 14:14:18 +0100 Subject: [PATCH] fix custom fee bottom sheet Signed-off-by: andrey --- src/quo/components/bottom_sheet/view.cljs | 6 +++++- src/status_im/ui/screens/signing/sheets.cljs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/quo/components/bottom_sheet/view.cljs b/src/quo/components/bottom_sheet/view.cljs index c021bab84c..18403d96b8 100644 --- a/src/quo/components/bottom_sheet/view.cljs +++ b/src/quo/components/bottom_sheet/view.cljs @@ -47,7 +47,11 @@ {window-height :height} (rn/use-window-dimensions) {:keys [keyboard-shown keyboard-height]} (rn/use-keyboard) + keyboard-height-android-delta (if (and platform/android? keyboard-shown) (+ keyboard-height 20) 0) safe-area (safe-area/use-safe-area) + window-height (- window-height (if platform/android? + (+ 50 keyboard-height-android-delta) + 0)) min-height (+ (* styles/vertical-padding 2) (:bottom safe-area)) max-height (- window-height (:top safe-area) styles/margin-top) visible (react/state false) @@ -199,7 +203,7 @@ {:opacity opacity :background-color (:backdrop @colors/theme)}))}]] [animated/view {:style (merge (styles/content-container window-height) - {:transform [{:translateY translate-y} + {:transform [{:translateY (animated/add translate-y keyboard-height-android-delta)} {:translateY (* window-height 2)}]})} [gesture-handler/pan-gesture-handler (merge on-master-event {:ref master-ref diff --git a/src/status_im/ui/screens/signing/sheets.cljs b/src/status_im/ui/screens/signing/sheets.cljs index 438999968a..1bd615083d 100644 --- a/src/status_im/ui/screens/signing/sheets.cljs +++ b/src/status_im/ui/screens/signing/sheets.cljs @@ -87,7 +87,7 @@ (money/->wei :gwei (:value-number max-fee-per-gas-edit))) (:value-number gas-edit)) (money/bignumber 0))] - [react/view + [:<> [react/view {:style {:margin-horizontal 16 :margin-top 8}} [react/text {:style {:typography :title-bold}} (i18n/label :t/max-priority-fee)] [react/text {:style {:color (colors/get-color :text-02)