From 3cbc6adf289b0144afc83245c17956c901f3f965 Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <pritish.budhiraja@gmail.com>
Date: Mon, 8 Jul 2024 13:09:52 +0530
Subject: [PATCH 1/8] fix: date of birth null value

---
 src/Payments/DateOfBirth.res         | 28 ++++++++++++++++++++++++++++
 src/Utilities/DynamicFieldsUtils.res | 14 +++++++++++---
 src/Utilities/RecoilAtoms.res        |  2 +-
 src/libraries/DatePicker.res         |  4 ++--
 4 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/Payments/DateOfBirth.res b/src/Payments/DateOfBirth.res
index c1637f260..e53d31825 100644
--- a/src/Payments/DateOfBirth.res
+++ b/src/Payments/DateOfBirth.res
@@ -21,8 +21,23 @@ let years = Array.fromInitializer(~length=currentYear - startYear, i => currentY
 
 @react.component
 let make = () => {
+  open Utils
   let {themeObj, localeString} = Recoil.useRecoilValueFromAtom(RecoilAtoms.configAtom)
   let (selectedDate, setSelectedDate) = Recoil.useRecoilState(RecoilAtoms.dateOfBirth)
+  let (error, setError) = React.useState(_ => false)
+
+  let submitCallback = React.useCallback((ev: Window.event) => {
+    let json = ev.data->JSON.parseExn
+    let confirm = json->getDictFromJson->ConfirmType.itemToObjMapper
+    if confirm.doSubmit {
+      switch selectedDate->Nullable.toOption {
+      | Some(_) => setError(_ => false)
+      | None => setError(_ => true)
+      }
+    }
+  }, [selectedDate])
+
+  useSubmitPaymentData(submitCallback)
 
   <div className="flex flex-col gap-1">
     <div
@@ -42,6 +57,7 @@ let make = () => {
       onChange={date => setSelectedDate(_ => date)}
       dateFormat="dd-MM-yyyy"
       wrapperClassName="datepicker"
+      placeholderText="Enter Date of Birth"
       renderCustomHeader={val => {
         <div className="flex gap-4 items-center justify-center m-2">
           <select
@@ -75,5 +91,17 @@ let make = () => {
         </div>
       }}
     />
+    <RenderIf condition={error}>
+      <div
+        className="Error pt-1"
+        style={
+          color: themeObj.colorDangerText,
+          fontSize: themeObj.fontSizeSm,
+          alignSelf: "start",
+          textAlign: "left",
+        }>
+        {React.string("Date of birth is required")}
+      </div>
+    </RenderIf>
   </div>
 }
diff --git a/src/Utilities/DynamicFieldsUtils.res b/src/Utilities/DynamicFieldsUtils.res
index 52650ceb9..f041db44d 100644
--- a/src/Utilities/DynamicFieldsUtils.res
+++ b/src/Utilities/DynamicFieldsUtils.res
@@ -382,8 +382,12 @@ let useSetInitialRequiredFields = (
           setCryptoCurrencyNetworks(_ => value)
         }
       | DateOfBirth =>
-        if value !== "" && dateOfBirth->Date.toDateString === "" {
-          setDateOfBirth(_ => dateOfBirth)
+        switch dateOfBirth->Nullable.toOption {
+        | Some(x) =>
+          if value !== "" && x->Date.toDateString === "" {
+            setDateOfBirth(_ => Nullable.make(x))
+          }
+        | None => ()
         }
       | SpecialField(_)
       | InfoElement
@@ -470,7 +474,11 @@ let useRequiredFieldsBody = (
       let (_, year) = CardUtils.getExpiryDates(cardExpiry)
       year
     | CryptoCurrencyNetworks => cryptoCurrencyNetworks
-    | DateOfBirth => dateOfBirth->Date.toISOString->String.slice(~start=0, ~end=10)
+    | DateOfBirth =>
+      switch dateOfBirth->Nullable.toOption {
+      | Some(x) => x->Date.toISOString->String.slice(~start=0, ~end=10)
+      | None => ""
+      }
     | CardCvc => cvcNumber
     | StateAndCity
     | CountryAndPincode(_)
diff --git a/src/Utilities/RecoilAtoms.res b/src/Utilities/RecoilAtoms.res
index 0d9e2e359..1e3dd1c7a 100644
--- a/src/Utilities/RecoilAtoms.res
+++ b/src/Utilities/RecoilAtoms.res
@@ -61,7 +61,7 @@ let cryptoCurrencyNetworks = Recoil.atom("cryptoCurrencyNetworks", "")
 let isShowOrPayUsing = Recoil.atom("isShowOrPayUsing", false)
 let areRequiredFieldsValid = Recoil.atom("areRequiredFieldsValid", true)
 let areRequiredFieldsEmpty = Recoil.atom("areRequiredFieldsEmpty", false)
-let dateOfBirth = Recoil.atom("dateOfBirth", Date.make())
+let dateOfBirth = Recoil.atom("dateOfBirth", Nullable.null)
 let userBillingName = Recoil.atom("userBillingName", defaultFieldValues)
 
 type areOneClickWalletsRendered = {
diff --git a/src/libraries/DatePicker.res b/src/libraries/DatePicker.res
index a6bd909ee..2bebcee34 100644
--- a/src/libraries/DatePicker.res
+++ b/src/libraries/DatePicker.res
@@ -18,8 +18,8 @@ type customHeaderProps = {
 
 @module("react-datepicker") @react.component
 external make: (
-  ~selected: Date.t,
-  ~onChange: Date.t => unit,
+  ~selected: Nullable.t<Date.t>,
+  ~onChange: Nullable.t<Date.t> => unit,
   ~showIcon: bool=?,
   ~icon: React.element=?,
   ~dateFormat: string=?,

From 40ad59876c338f2aaa81fcd9b201499570e75d7e Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <pritish.budhiraja@gmail.com>
Date: Mon, 8 Jul 2024 14:33:21 +0530
Subject: [PATCH 2/8] fix: dob validations

---
 src/Utilities/DynamicFieldsUtils.res | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Utilities/DynamicFieldsUtils.res b/src/Utilities/DynamicFieldsUtils.res
index f041db44d..24cebf1cb 100644
--- a/src/Utilities/DynamicFieldsUtils.res
+++ b/src/Utilities/DynamicFieldsUtils.res
@@ -126,6 +126,7 @@ let useRequiredFieldsEmptyAndValid = (
   let setAreRequiredFieldsEmpty = Recoil.useSetRecoilState(areRequiredFieldsEmpty)
   let {billingAddress} = Recoil.useRecoilValueFromAtom(optionAtom)
   let cryptoCurrencyNetworks = Recoil.useRecoilValueFromAtom(cryptoCurrencyNetworks)
+  let dateOfBirth = Recoil.useRecoilValueFromAtom(dateOfBirth)
 
   let fieldsArrWithBillingAddress = fieldsArr->addBillingAddressIfUseBillingAddress(billingAddress)
 
@@ -159,6 +160,7 @@ let useRequiredFieldsEmptyAndValid = (
         isExpiryValid->Option.getOr(false)
       | CardCvc => isCVCValid->Option.getOr(false)
       | CardExpiryAndCvc => isExpiryValid->Option.getOr(false) && isCVCValid->Option.getOr(false)
+      | DateOfBirth => !(dateOfBirth->Js.Nullable.isNullable)
       | _ => true
       }
     })
@@ -203,6 +205,7 @@ let useRequiredFieldsEmptyAndValid = (
       | CardExpiryAndCvc =>
         let (month, year) = getExpiryDates(cardExpiry)
         month === "" || year === "" || cvcNumber === ""
+      | DateOfBirth => dateOfBirth->Js.Nullable.isNullable
       | _ => false
       }
     })
@@ -215,6 +218,7 @@ let useRequiredFieldsEmptyAndValid = (
     country,
     billingName.value,
     line1.value,
+    dateOfBirth,
     (
       email,
       line2.value,

From bbe5ec8e98f5dab7e21fab5786ea5965e03712aa Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <pritish.budhiraja@gmail.com>
Date: Mon, 8 Jul 2024 14:36:16 +0530
Subject: [PATCH 3/8] fix: shouldCloseOnSelect added

---
 src/Payments/DateOfBirth.res | 1 +
 src/libraries/DatePicker.res | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Payments/DateOfBirth.res b/src/Payments/DateOfBirth.res
index e53d31825..db8ef7178 100644
--- a/src/Payments/DateOfBirth.res
+++ b/src/Payments/DateOfBirth.res
@@ -57,6 +57,7 @@ let make = () => {
       onChange={date => setSelectedDate(_ => date)}
       dateFormat="dd-MM-yyyy"
       wrapperClassName="datepicker"
+      shouldCloseOnSelect=true
       placeholderText="Enter Date of Birth"
       renderCustomHeader={val => {
         <div className="flex gap-4 items-center justify-center m-2">
diff --git a/src/libraries/DatePicker.res b/src/libraries/DatePicker.res
index 2bebcee34..13a3205cc 100644
--- a/src/libraries/DatePicker.res
+++ b/src/libraries/DatePicker.res
@@ -31,4 +31,5 @@ external make: (
   ~className: string=?,
   ~wrapperClassName: string=?,
   ~closeOnScroll: bool=?,
+  ~shouldCloseOnSelect: bool=?,
 ) => React.element = "default"

From efabd1e66f7c0f951bb8dc221024898b2610e27c Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <pritish.budhiraja@gmail.com>
Date: Mon, 8 Jul 2024 17:16:06 +0530
Subject: [PATCH 4/8] fix: validations added

---
 src/Payments/DateOfBirth.res         | 28 +++++++++++++++++++++++++---
 src/Utilities/DynamicFieldsUtils.res |  6 +++++-
 src/Utilities/Utils.res              |  8 ++++++++
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/Payments/DateOfBirth.res b/src/Payments/DateOfBirth.res
index db8ef7178..f8d7e0e2b 100644
--- a/src/Payments/DateOfBirth.res
+++ b/src/Payments/DateOfBirth.res
@@ -25,6 +25,7 @@ let make = () => {
   let {themeObj, localeString} = Recoil.useRecoilValueFromAtom(RecoilAtoms.configAtom)
   let (selectedDate, setSelectedDate) = Recoil.useRecoilState(RecoilAtoms.dateOfBirth)
   let (error, setError) = React.useState(_ => false)
+  let (isNotEligible, setIsNotEligible) = React.useState(_ => false)
 
   let submitCallback = React.useCallback((ev: Window.event) => {
     let json = ev.data->JSON.parseExn
@@ -32,13 +33,22 @@ let make = () => {
     if confirm.doSubmit {
       switch selectedDate->Nullable.toOption {
       | Some(_) => setError(_ => false)
-      | None => setError(_ => true)
+      | None => setError(_ => !isNotEligible)
       }
     }
-  }, [selectedDate])
+  }, (selectedDate, isNotEligible))
 
   useSubmitPaymentData(submitCallback)
 
+  let onChange = date => {
+    let isAbove18 = switch date->Nullable.toOption {
+    | Some(val) => val->check18AboveOrNot
+    | None => false
+    }
+    setSelectedDate(_ => date)
+    setIsNotEligible(_ => !isAbove18)
+  }
+
   <div className="flex flex-col gap-1">
     <div
       className={`Label`}
@@ -54,7 +64,7 @@ let make = () => {
       icon={<Icon name="calander" size=13 className="!px-[6px] !py-[10px]" />}
       className="w-full border border-gray-300 rounded p-2"
       selected={selectedDate}
-      onChange={date => setSelectedDate(_ => date)}
+      onChange={date => onChange(date)}
       dateFormat="dd-MM-yyyy"
       wrapperClassName="datepicker"
       shouldCloseOnSelect=true
@@ -104,5 +114,17 @@ let make = () => {
         {React.string("Date of birth is required")}
       </div>
     </RenderIf>
+    <RenderIf condition={isNotEligible}>
+      <div
+        className="Error pt-1"
+        style={
+          color: themeObj.colorDangerText,
+          fontSize: themeObj.fontSizeSm,
+          alignSelf: "start",
+          textAlign: "left",
+        }>
+        {React.string("Age should be greater than 18 years")}
+      </div>
+    </RenderIf>
   </div>
 }
diff --git a/src/Utilities/DynamicFieldsUtils.res b/src/Utilities/DynamicFieldsUtils.res
index 24cebf1cb..0871cf588 100644
--- a/src/Utilities/DynamicFieldsUtils.res
+++ b/src/Utilities/DynamicFieldsUtils.res
@@ -160,7 +160,11 @@ let useRequiredFieldsEmptyAndValid = (
         isExpiryValid->Option.getOr(false)
       | CardCvc => isCVCValid->Option.getOr(false)
       | CardExpiryAndCvc => isExpiryValid->Option.getOr(false) && isCVCValid->Option.getOr(false)
-      | DateOfBirth => !(dateOfBirth->Js.Nullable.isNullable)
+      | DateOfBirth =>
+        switch dateOfBirth->Nullable.toOption {
+        | Some(val) => val->Utils.check18AboveOrNot
+        | None => false
+        }
       | _ => true
       }
     })
diff --git a/src/Utilities/Utils.res b/src/Utilities/Utils.res
index c3e79a6c2..c254a93a0 100644
--- a/src/Utilities/Utils.res
+++ b/src/Utilities/Utils.res
@@ -1339,3 +1339,11 @@ let handleFailureResponse = (~message, ~errorType) =>
 
 let getPaymentId = clientSecret =>
   String.split(clientSecret, "_secret_")->Array.get(0)->Option.getOr("")
+
+let check18AboveOrNot = date => {
+  let currentDate = Date.make()
+  let year = currentDate->Date.getFullYear - 18
+  let month = currentDate->Date.getMonth
+  let compareDate = Date.makeWithYMD(~year, ~month, ~date=currentDate->Date.getDate)
+  date < compareDate
+}

From f9127debc632aaa4440d89757e4f45dbc6586d08 Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <pritish.budhiraja@gmail.com>
Date: Mon, 8 Jul 2024 17:21:24 +0530
Subject: [PATCH 5/8] fix: single render component

---
 src/Payments/DateOfBirth.res | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/Payments/DateOfBirth.res b/src/Payments/DateOfBirth.res
index f8d7e0e2b..925d8fabf 100644
--- a/src/Payments/DateOfBirth.res
+++ b/src/Payments/DateOfBirth.res
@@ -48,6 +48,7 @@ let make = () => {
     setSelectedDate(_ => date)
     setIsNotEligible(_ => !isAbove18)
   }
+  let errorString = error ? "Date of birth is required" : "Age should be greater than 18 years"
 
   <div className="flex flex-col gap-1">
     <div
@@ -102,7 +103,7 @@ let make = () => {
         </div>
       }}
     />
-    <RenderIf condition={error}>
+    <RenderIf condition={error || isNotEligible}>
       <div
         className="Error pt-1"
         style={
@@ -111,19 +112,7 @@ let make = () => {
           alignSelf: "start",
           textAlign: "left",
         }>
-        {React.string("Date of birth is required")}
-      </div>
-    </RenderIf>
-    <RenderIf condition={isNotEligible}>
-      <div
-        className="Error pt-1"
-        style={
-          color: themeObj.colorDangerText,
-          fontSize: themeObj.fontSizeSm,
-          alignSelf: "start",
-          textAlign: "left",
-        }>
-        {React.string("Age should be greater than 18 years")}
+        {React.string(errorString)}
       </div>
     </RenderIf>
   </div>

From 886a48cc76f3fc31234b57173c0817a23aa13f08 Mon Sep 17 00:00:00 2001
From: vsrivatsa-juspay <vrishab.srivatsa@juspay.in>
Date: Mon, 8 Jul 2024 17:47:50 +0530
Subject: [PATCH 6/8] fix: logging api latencies without explicitly mentioning
 every api request event name

---
 src/Utilities/PaymentHelpers.res    |  2 +-
 src/orca-log-catcher/OrcaLogger.res | 15 +++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/Utilities/PaymentHelpers.res b/src/Utilities/PaymentHelpers.res
index b27ee91c5..d6b5591b9 100644
--- a/src/Utilities/PaymentHelpers.res
+++ b/src/Utilities/PaymentHelpers.res
@@ -227,7 +227,7 @@ let retrieveStatus = (~headers, ~switchToCustomPod, pollID, logger) => {
     ~optLogger=Some(logger),
     ~url=uri,
     ~apiLogType=Request,
-    ~eventName=POLL_STATUS_INIT,
+    ~eventName=POLL_STATUS_CALL_INIT,
     ~logType=INFO,
     ~logCategory=API,
     (),
diff --git a/src/orca-log-catcher/OrcaLogger.res b/src/orca-log-catcher/OrcaLogger.res
index 876b1672a..f673588ef 100644
--- a/src/orca-log-catcher/OrcaLogger.res
+++ b/src/orca-log-catcher/OrcaLogger.res
@@ -70,7 +70,7 @@ type eventName =
   | PAYMENT_METHODS_RESPONSE
   | LOADER_CHANGED
   | PAYMENT_SESSION_INITIATED
-  | POLL_STATUS_INIT
+  | POLL_STATUS_CALL_INIT
   | POLL_STATUS_CALL
   | COMPLETE_AUTHORIZE_CALL_INIT
   | COMPLETE_AUTHORIZE_CALL
@@ -151,7 +151,7 @@ let eventNameToStrMapper = eventName => {
   | PAYMENT_METHODS_RESPONSE => "PAYMENT_METHODS_RESPONSE"
   | LOADER_CHANGED => "LOADER_CHANGED"
   | PAYMENT_SESSION_INITIATED => "PAYMENT_SESSION_INITIATED"
-  | POLL_STATUS_INIT => "POLL_STATUS_INIT"
+  | POLL_STATUS_CALL_INIT => "POLL_STATUS_CALL_INIT"
   | POLL_STATUS_CALL => "POLL_STATUS_CALL"
   | COMPLETE_AUTHORIZE_CALL_INIT => "COMPLETE_AUTHORIZE_CALL_INIT"
   | COMPLETE_AUTHORIZE_CALL => "COMPLETE_AUTHORIZE_CALL"
@@ -649,15 +649,7 @@ let make = (
         | _ => 0.
         }
       }
-    | AUTHENTICATION_CALL
-    | RETRIEVE_CALL
-    | CONFIRM_CALL
-    | SESSIONS_CALL
-    | PAYMENT_METHODS_CALL
-    | CUSTOMER_PAYMENT_METHODS_CALL
-    | PAYMENT_METHODS_AUTH_EXCHANGE_CALL
-    | PAYMENT_METHODS_AUTH_LINK_CALL
-    | CREATE_CUSTOMER_PAYMENT_METHODS_CALL => {
+    | _ => {
         let logRequestTimestamp =
           events.contents->Dict.get(eventName->eventNameToStrMapper ++ "_INIT")
         switch (logRequestTimestamp, apiLogType) {
@@ -666,7 +658,6 @@ let make = (
         | _ => 0.
         }
       }
-    | _ => 0.
     }
     latency > 0. ? latency->Float.toString : ""
   }

From cd1b64bdb304751f8d51445918b42bac6d224f9a Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <pritish.budhiraja@gmail.com>
Date: Mon, 8 Jul 2024 17:54:38 +0530
Subject: [PATCH 7/8] fix: comments addressed

---
 src/Payments/DateOfBirth.res         | 8 +++++---
 src/Utilities/DynamicFieldsUtils.res | 2 +-
 src/Utilities/Utils.res              | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Payments/DateOfBirth.res b/src/Payments/DateOfBirth.res
index 925d8fabf..c7e10ccdb 100644
--- a/src/Payments/DateOfBirth.res
+++ b/src/Payments/DateOfBirth.res
@@ -33,7 +33,7 @@ let make = () => {
     if confirm.doSubmit {
       switch selectedDate->Nullable.toOption {
       | Some(_) => setError(_ => false)
-      | None => setError(_ => !isNotEligible)
+      | None => ()
       }
     }
   }, (selectedDate, isNotEligible))
@@ -42,13 +42,15 @@ let make = () => {
 
   let onChange = date => {
     let isAbove18 = switch date->Nullable.toOption {
-    | Some(val) => val->check18AboveOrNot
+    | Some(val) => val->checkIs18OrAbove
     | None => false
     }
     setSelectedDate(_ => date)
     setIsNotEligible(_ => !isAbove18)
   }
-  let errorString = error ? "Date of birth is required" : "Age should be greater than 18 years"
+  let errorString = error
+    ? "Date of birth is required"
+    : "Age should be equal or greater than 18 years"
 
   <div className="flex flex-col gap-1">
     <div
diff --git a/src/Utilities/DynamicFieldsUtils.res b/src/Utilities/DynamicFieldsUtils.res
index 0871cf588..ffeb3a9d6 100644
--- a/src/Utilities/DynamicFieldsUtils.res
+++ b/src/Utilities/DynamicFieldsUtils.res
@@ -162,7 +162,7 @@ let useRequiredFieldsEmptyAndValid = (
       | CardExpiryAndCvc => isExpiryValid->Option.getOr(false) && isCVCValid->Option.getOr(false)
       | DateOfBirth =>
         switch dateOfBirth->Nullable.toOption {
-        | Some(val) => val->Utils.check18AboveOrNot
+        | Some(val) => val->Utils.checkIs18OrAbove
         | None => false
         }
       | _ => true
diff --git a/src/Utilities/Utils.res b/src/Utilities/Utils.res
index ca6e0659e..5c9542d90 100644
--- a/src/Utilities/Utils.res
+++ b/src/Utilities/Utils.res
@@ -1342,10 +1342,10 @@ let handleFailureResponse = (~message, ~errorType) =>
 let getPaymentId = clientSecret =>
   String.split(clientSecret, "_secret_")->Array.get(0)->Option.getOr("")
 
-let check18AboveOrNot = date => {
+let checkIs18OrAbove = date => {
   let currentDate = Date.make()
   let year = currentDate->Date.getFullYear - 18
   let month = currentDate->Date.getMonth
   let compareDate = Date.makeWithYMD(~year, ~month, ~date=currentDate->Date.getDate)
-  date < compareDate
+  date <= compareDate
 }

From 0dad68a91ee60f1dbe3bf7acd8e459eb85800d73 Mon Sep 17 00:00:00 2001
From: Pritish Budhiraja <pritish.budhiraja@gmail.com>
Date: Tue, 9 Jul 2024 12:15:27 +0530
Subject: [PATCH 8/8] fix: comments addressed

---
 src/Payments/DateOfBirth.res | 13 +++++++------
 src/Utilities/Utils.res      |  7 ++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Payments/DateOfBirth.res b/src/Payments/DateOfBirth.res
index c7e10ccdb..8992a1abe 100644
--- a/src/Payments/DateOfBirth.res
+++ b/src/Payments/DateOfBirth.res
@@ -25,7 +25,13 @@ let make = () => {
   let {themeObj, localeString} = Recoil.useRecoilValueFromAtom(RecoilAtoms.configAtom)
   let (selectedDate, setSelectedDate) = Recoil.useRecoilState(RecoilAtoms.dateOfBirth)
   let (error, setError) = React.useState(_ => false)
-  let (isNotEligible, setIsNotEligible) = React.useState(_ => false)
+  let isNotEligible = React.useMemo(() => {
+    let isAbove18 = switch selectedDate->Nullable.toOption {
+    | Some(val) => val->checkIs18OrAbove
+    | None => false
+    }
+    !isAbove18
+  }, [selectedDate])
 
   let submitCallback = React.useCallback((ev: Window.event) => {
     let json = ev.data->JSON.parseExn
@@ -41,12 +47,7 @@ let make = () => {
   useSubmitPaymentData(submitCallback)
 
   let onChange = date => {
-    let isAbove18 = switch date->Nullable.toOption {
-    | Some(val) => val->checkIs18OrAbove
-    | None => false
-    }
     setSelectedDate(_ => date)
-    setIsNotEligible(_ => !isAbove18)
   }
   let errorString = error
     ? "Date of birth is required"
diff --git a/src/Utilities/Utils.res b/src/Utilities/Utils.res
index 5c9542d90..ecaafd04f 100644
--- a/src/Utilities/Utils.res
+++ b/src/Utilities/Utils.res
@@ -1342,10 +1342,11 @@ let handleFailureResponse = (~message, ~errorType) =>
 let getPaymentId = clientSecret =>
   String.split(clientSecret, "_secret_")->Array.get(0)->Option.getOr("")
 
-let checkIs18OrAbove = date => {
+let checkIs18OrAbove = dateOfBirth => {
   let currentDate = Date.make()
   let year = currentDate->Date.getFullYear - 18
   let month = currentDate->Date.getMonth
-  let compareDate = Date.makeWithYMD(~year, ~month, ~date=currentDate->Date.getDate)
-  date <= compareDate
+  let date = currentDate->Date.getDate
+  let compareDate = Date.makeWithYMD(~year, ~month, ~date)
+  dateOfBirth <= compareDate
 }