Merge branch 'main' into detox-rn-setup

juspay · Dec 17, 2024 · 37f2213 · 37f2213
2 parents cb3b8d2 + edc0de8
commit 37f2213
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 12 deletions.
diff --git a/reactNativeWeb/DemoApp/DemoAppIndex.js b/reactNativeWeb/DemoApp/DemoAppIndex.js
@@ -14,7 +14,7 @@ let defaultProps = {
       countryCode: 'US',
       currencyCode: 'US',
     },
-    displaySavedPaymentMethodsCheckbox: false,
+    // displaySavedPaymentMethodsCheckbox: false,
     // shippingDetails: {
     //   address: {
     //     city: 'city',

diff --git a/src/components/common/Pager.res b/src/components/common/Pager.res
@@ -280,7 +280,7 @@ let make = (
     }
   }, (layout.width, panX))
 
-  let (height, setHeight) = React.useState(_ => 100.)
+  let (height, setHeight) = React.useState(_ => 0.)
 
   let setDynamicHeight = React.useCallback1(height => {
     setHeight(_ => height)

diff --git a/src/components/common/TopTabScreenWraper.res b/src/components/common/TopTabScreenWraper.res
@@ -3,7 +3,7 @@ open Style
 
 @react.component
 let make = (~children, ~setDynamicHeight, ~isScreenFocus) => {
-  let (viewHeight, setViewHeight) = React.useState(_ => 100.)
+  let (viewHeight, setViewHeight) = React.useState(_ => 0.)
   let updateTabHeight = (event: Event.layoutEvent) => {
     let {height} = event.nativeEvent.layout
     if height > 100. && (viewHeight -. height)->Math.abs > 10. {

diff --git a/src/components/elements/ModalHeader.res b/src/components/elements/ModalHeader.res
@@ -16,7 +16,7 @@ let make = (~onModalClose) => {
   <View
     style={viewStyle(
       ~display=#flex,
-      ~flexGrow=?{WebKit.platform !== #web ? Some(1.) : None},
+      ~flexGrow=?{ReactNative.Platform.os !== #web ? Some(1.) : None},
       ~flexDirection=#row,
       ~alignItems=#center,
       ~justifyContent=#"space-between",

diff --git a/src/headless/Headless.res b/src/headless/Headless.res
@@ -282,6 +282,7 @@ let registerHeadless = headless => {
             ~paymentExperience=None,
             ~timestamp=0.,
             ~latency=0.,
+            ~version=nativeProp.hyperParams.sdkVersion,
             (),
           )
           headlessModule.exitHeadless(getDefaultError->HyperModule.stringifiedResStatus)
@@ -324,6 +325,7 @@ let registerHeadless = headless => {
               ~paymentExperience=None,
               ~timestamp=0.,
               ~latency=0.,
+              ~version=nativeProp.hyperParams.sdkVersion,
               (),
             )
           },
@@ -455,6 +457,7 @@ let registerHeadless = headless => {
         ~paymentExperience=None,
         ~timestamp,
         ~latency=0.,
+        ~version=nativeProp.hyperParams.sdkVersion,
         (),
       )
       savedPaymentMethodAPICall(nativeProp)

diff --git a/src/headless/HeadlessUtils.res b/src/headless/HeadlessUtils.res
@@ -36,6 +36,7 @@ let logWrapper = (
   ~latency,
   ~env,
   ~customLogUrl,
+  ~version,
   (),
 ) => {
   let (value, internalMetadata) = switch apiLogType {
@@ -66,7 +67,7 @@ let logWrapper = (
     logType,
     timestamp: timestamp->Float.toString,
     sessionId: "",
-    version: "repoVersion",
+    version,
     codePushVersion: LoggerUtils.getCodePushVersionNoFromRef(),
     clientCoreVersion: LoggerUtils.getClientCoreVersionNoFromRef(),
     component: MOBILE,
@@ -124,6 +125,7 @@ let savedPaymentMethodAPICall = nativeProp => {
     ~paymentExperience=None,
     ~timestamp=initTimestamp,
     ~latency=0.,
+    ~version=nativeProp.hyperParams.sdkVersion,
     (),
   )
   CommonHooks.fetchApi(
@@ -155,6 +157,7 @@ let savedPaymentMethodAPICall = nativeProp => {
           ~paymentExperience=None,
           ~timestamp=respTimestamp,
           ~latency={respTimestamp -. initTimestamp},
+          ~version=nativeProp.hyperParams.sdkVersion,
           (),
         )
         Some(data)->Promise.resolve
@@ -188,6 +191,7 @@ let savedPaymentMethodAPICall = nativeProp => {
           ~paymentExperience=None,
           ~timestamp=respTimestamp,
           ~latency={respTimestamp -. initTimestamp},
+          ~version=nativeProp.hyperParams.sdkVersion,
           (),
         )
         Some(error)->Promise.resolve
@@ -212,6 +216,7 @@ let savedPaymentMethodAPICall = nativeProp => {
       ~paymentExperience=None,
       ~timestamp=respTimestamp,
       ~latency={respTimestamp -. initTimestamp},
+      ~version=nativeProp.hyperParams.sdkVersion,
       (),
     )
     None->Promise.resolve
@@ -250,6 +255,7 @@ let sessionAPICall = nativeProp => {
     ~paymentExperience=None,
     ~timestamp=initTimestamp,
     ~latency=0.,
+    ~version=nativeProp.hyperParams.sdkVersion,
     (),
   )
 
@@ -274,6 +280,7 @@ let sessionAPICall = nativeProp => {
         ~paymentExperience=None,
         ~timestamp=respTimestamp,
         ~latency={respTimestamp -. initTimestamp},
+        ~version=nativeProp.hyperParams.sdkVersion,
         (),
       )
       data->Fetch.Response.json
@@ -305,6 +312,7 @@ let sessionAPICall = nativeProp => {
           ~paymentExperience=None,
           ~timestamp=respTimestamp,
           ~latency={respTimestamp -. initTimestamp},
+          ~version=nativeProp.hyperParams.sdkVersion,
           (),
         )
         Promise.resolve(error)
@@ -329,6 +337,7 @@ let sessionAPICall = nativeProp => {
       ~paymentExperience=None,
       ~timestamp=respTimestamp,
       ~latency={respTimestamp -. initTimestamp},
+      ~version=nativeProp.hyperParams.sdkVersion,
       (),
     )
     Promise.resolve(JSON.Encode.null)
@@ -356,6 +365,7 @@ let confirmAPICall = (nativeProp, body) => {
     ~paymentExperience=None,
     ~timestamp=initTimestamp,
     ~latency=0.,
+    ~version=nativeProp.hyperParams.sdkVersion,
     (),
   )
 
@@ -380,6 +390,7 @@ let confirmAPICall = (nativeProp, body) => {
         ~paymentExperience=None,
         ~timestamp=respTimestamp,
         ~latency={respTimestamp -. initTimestamp},
+        ~version=nativeProp.hyperParams.sdkVersion,
         (),
       )
       data->Fetch.Response.json
@@ -412,6 +423,7 @@ let confirmAPICall = (nativeProp, body) => {
           ~paymentExperience=None,
           ~timestamp=respTimestamp,
           ~latency={respTimestamp -. initTimestamp},
+          ~version=nativeProp.hyperParams.sdkVersion,
           (),
         )
         Promise.resolve(error)
@@ -441,6 +453,7 @@ let confirmAPICall = (nativeProp, body) => {
       ~paymentExperience=None,
       ~timestamp=respTimestamp,
       ~latency={respTimestamp -. initTimestamp},
+      ~version=nativeProp.hyperParams.sdkVersion,
       (),
     )
     Promise.resolve(None)

diff --git a/src/pages/payment/Card.res b/src/pages/payment/Card.res
@@ -136,12 +136,7 @@ let make = (
     if isScreenFocus {
       setConfirmButtonDataRef(
         <ConfirmButton
-          loading=false
-          isAllValuesValid=true
-          handlePress
-          paymentMethod="CARD"
-          errorText=error
-          bottomSpace=10.
+          loading=false isAllValuesValid=true handlePress paymentMethod="CARD" errorText=error
         />,
       )
     }

diff --git a/src/pages/payment/Redirect.res b/src/pages/payment/Redirect.res
@@ -909,7 +909,6 @@ let make = (
       setConfirmButtonDataRef(
         <ConfirmButton
           loading=false
-          bottomSpace=50.
           isAllValuesValid=true
           handlePress
           hasSomeFields