chore: remove default values of hooks and using directly

juspay · Mar 20, 2024 · abf4589 · abf4589
1 parent 32d3717
commit abf4589
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 65 deletions.
diff --git a/src/CardUtils.res b/src/CardUtils.res
@@ -578,65 +578,6 @@ let postalRegex = (postalCodes: array<PostalCodeType.postalCodes>, ~country=?, (
   countryPostal.regex == "" ? "" : countryPostal.regex
 }
 
-let useGetCardDetailsFromCardProps = cardProps => {
-  let defaultCardProps = (
-    None,
-    _ => (),
-    "",
-    _ => (),
-    _ => (),
-    React.useRef(Nullable.null),
-    React.null,
-    "",
-    _ => (),
-    0,
-  )
-
-  switch cardProps {
-  | Some(cardProps) => cardProps
-  | None => defaultCardProps
-  }
-}
-
-let useGetExpiryDetailsFromExpiryProps = expiryProps => {
-  let defaultExpiryProps = (
-    None,
-    _ => (),
-    "",
-    _ => (),
-    _ => (),
-    React.useRef(Nullable.null),
-    _ => (),
-    "",
-    _ => (),
-  )
-
-  switch expiryProps {
-  | Some(expiryProps) => expiryProps
-  | None => defaultExpiryProps
-  }
-}
-
-let useGetCvcDetailsFromCvcProps = cvcProps => {
-  let defaultCvcProps = (
-    None,
-    _ => (),
-    "",
-    _ => (),
-    _ => (),
-    _ => (),
-    React.useRef(Nullable.null),
-    _ => (),
-    "",
-    _ => (),
-  )
-
-  switch cvcProps {
-  | Some(cvcProps) => cvcProps
-  | None => defaultCvcProps
-  }
-}
-
 let setRightIconForCvc = (~cardEmpty, ~cardInvalid, ~color, ~cardComplete) => {
   if cardEmpty {
     <Icon size=Utils.brandIconSize name="cvc-empty" />

diff --git a/src/Components/DynamicFields.res b/src/Components/DynamicFields.res
@@ -85,6 +85,44 @@ let make = (
   let (selectedBank, setSelectedBank) = Recoil.useRecoilState(userBank)
   let (country, setCountry) = Recoil.useRecoilState(userCountry)
 
+  let defaultCardProps = (
+    None,
+    _ => (),
+    "",
+    _ => (),
+    _ => (),
+    React.useRef(Nullable.null),
+    React.null,
+    "",
+    _ => (),
+    0,
+  )
+
+  let defaultExpiryProps = (
+    None,
+    _ => (),
+    "",
+    _ => (),
+    _ => (),
+    React.useRef(Nullable.null),
+    _ => (),
+    "",
+    _ => (),
+  )
+
+  let defaultCvcProps = (
+    None,
+    _ => (),
+    "",
+    _ => (),
+    _ => (),
+    _ => (),
+    React.useRef(Nullable.null),
+    _ => (),
+    "",
+    _ => (),
+  )
+
   let (stateJson, setStatesJson) = React.useState(_ => None)
 
   let bankNames =
@@ -112,8 +150,10 @@ let make = (
     cardError,
     _,
     maxCardLength,
-  ) =
-    cardProps->CardUtils.useGetCardDetailsFromCardProps
+  ) = switch cardProps {
+  | Some(cardProps) => cardProps
+  | None => defaultCardProps
+  }
 
   let (
     isExpiryValid,
@@ -125,8 +165,10 @@ let make = (
     _,
     expiryError,
     _,
-  ) =
-    expiryProps->CardUtils.useGetExpiryDetailsFromExpiryProps
+  ) = switch expiryProps {
+  | Some(expiryProps) => expiryProps
+  | None => defaultExpiryProps
+  }
 
   let (
     isCVCValid,
@@ -139,8 +181,10 @@ let make = (
     _,
     cvcError,
     _,
-  ) =
-    cvcProps->CardUtils.useGetCvcDetailsFromCvcProps
+  ) = switch cvcProps {
+  | Some(cvcProps) => cvcProps
+  | None => defaultCvcProps
+  }
 
   let isCvcValidValue = CardUtils.getBoolOptionVal(isCVCValid)
   let (cardEmpty, cardComplete, cardInvalid) = CardUtils.useCardDetails(