refactor: refactor

refactor
juspay · Sep 13, 2024 · 421ba6b · 421ba6b
1 parent f9e27c1
commit 421ba6b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/Types/ApplePayTypes.res b/src/Types/ApplePayTypes.res
@@ -28,7 +28,7 @@ type event = {validationURL: string, payment: paymentResult}
 type lineItem = {
   label: string,
   amount: string,
-  @optional \"type": string,
+  \"type": string,
 }
 type shippingAddressChangeEvent = {shippingContact: JSON.t}
 type updatedOrderDetails = {newTotal: lineItem, newLineItems: array<lineItem>}

diff --git a/src/Utilities/ApplePayHelpers.res b/src/Utilities/ApplePayHelpers.res
@@ -113,12 +113,10 @@ let startApplePaySession = (
         ->shippingContactItemToObjMapper
       let newShippingAddress =
         [
-          ("state", newShippingContact.locality),
-          ("country", newShippingContact.countryCode),
-          ("zip", newShippingContact.postalCode),
-        ]
-        ->Array.map(((key, val)) => (key, val->Js.Json.string))
-        ->getJsonFromArrayOfJson
+          ("state", newShippingContact.locality->JSON.Encode.string),
+          ("country", newShippingContact.countryCode->JSON.Encode.string),
+          ("zip", newShippingContact.postalCode->JSON.Encode.string),
+        ]->getJsonFromArrayOfJson
 
       let paymentMethodType = "apple_pay"->JSON.Encode.string
 
@@ -328,9 +326,9 @@ let useSubmitCallback = (~isWallet, ~sessionObj, ~componentName) => {
       let json = ev.data->safeParse
       let confirm = json->getDictFromJson->ConfirmType.itemToObjMapper
       if confirm.doSubmit && areRequiredFieldsValid && !areRequiredFieldsEmpty {
-        options.readOnly
-          ? ()
-          : handleApplePayButtonClicked(~sessionObj, ~componentName, ~paymentMethodListValue)
+        if !options.readOnly {
+          handleApplePayButtonClicked(~sessionObj, ~componentName, ~paymentMethodListValue)
+        }
       } else if areRequiredFieldsEmpty {
         postFailedSubmitResponse(
           ~errortype="validation_error",

diff --git a/src/Utilities/TaxCalculation.res b/src/Utilities/TaxCalculation.res
@@ -16,7 +16,7 @@ let taxResponseToObjMapper = dict => {
 
 let calculateTax = (~shippingAddress, ~logger, ~clientSecret, ~publishableKey, ~paymentMethodType) => {
   PaymentHelpers.calculateTax(
-    ~clientSecret=clientSecret->Js.Json.string,
+    ~clientSecret=clientSecret->JSON.Encode.string,
     ~apiKey=publishableKey,
     ~paymentId=clientSecret->getPaymentId,
     ~paymentMethodType,