Merge branch 'ach-bank-debit' of https://github.com/juspay/hyperswitc…

…h-client-core into ach-bank-debit
juspay · Dec 24, 2024 · 0f56aa7 · 0f56aa7
2 parents 7b0b446 + 35f983e
commit 0f56aa7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/src/components/common/DynamicFields.res b/src/components/common/DynamicFields.res
@@ -136,7 +136,7 @@ module RenderField = {
             let arr = text->String.split(" ")
 
             let firstNameVal = arr->Array.get(0)->Option.getOr("")
-            let lastNameVal = arr->Array.filterWithIndex((_, index) => index !== 0)->Array.join("")
+            let lastNameVal = arr->Array.filterWithIndex((_, index) => index !== 0)->Array.join(" ")
             let isBillingFields =
               required_fields_type.field_type === BillingName ||
                 required_fields_type.field_type === ShippingName

diff --git a/src/routes/FullScreenSheetWrapper.res b/src/routes/FullScreenSheetWrapper.res
@@ -52,6 +52,16 @@ let make = (~children) => {
     None
   }, [loading])
 
+  let navigationBarHeight = React.useMemo(() => {
+    if Platform.os !== #android {
+      0.
+    } else {
+      let screenHeight = Dimensions.get(#screen).height
+      let windowHeight = Dimensions.get(#window).height
+      screenHeight -. windowHeight
+    }
+  }, [])
+
   <View
     style={viewStyle(
       ~flex=1.,
@@ -68,7 +78,10 @@ let make = (~children) => {
         (),
       )}>
       <CustomView onDismiss=onModalClose>
-        <CustomView.Wrapper onModalClose> {children} </CustomView.Wrapper>
+        <CustomView.Wrapper onModalClose>
+          {children}
+          <Space height={navigationBarHeight} />
+        </CustomView.Wrapper>
       </CustomView>
     </Animated.View>
     <LoadingOverlay />

diff --git a/src/routes/ParentPaymentSheet.res b/src/routes/ParentPaymentSheet.res
@@ -39,6 +39,6 @@ let make = () => {
     | (None, _) => <PaymentSheet setConfirmButtonDataRef />
     }}
     <GlobalConfirmButton confirmButtonDataRef />
-    <Space height=12. />
+    <Space height=15. />
   </FullScreenSheetWrapper>
 }