Merge branch 'main' into async-await-refactoring-1

CHANGELOG.md

@@ -1,3 +1,5 @@
+## [0.101.5](https://github.com/juspay/hyperswitch-web/compare/v0.101.4...v0.101.5) (2024-11-07)
+
 ## [0.101.4](https://github.com/juspay/hyperswitch-web/compare/v0.101.3...v0.101.4) (2024-11-07)
 
 ## [0.101.3](https://github.com/juspay/hyperswitch-web/compare/v0.101.2...v0.101.3) (2024-11-07)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "orca-payment-page",
-  "version": "0.101.4",
+  "version": "0.101.5",
   "main": "index.js",
   "private": true,
   "dependencies": {

src/Payments/BacsBankTransfer.res

@@ -11,7 +11,8 @@ let default = (~paymentType: CardThemeType.mode) => {
   let (email, _) = Recoil.useLoggedRecoilState(userEmailAddress, "email", loggerState)
   let (fullName, _) = Recoil.useLoggedRecoilState(userFullName, "fullName", loggerState)
   let setComplete = Recoil.useSetRecoilState(fieldsComplete)
-  let paymentMethodListValue = Recoil.useRecoilValueFromAtom(PaymentUtils.paymentMethodListValue)
+
+  let (requiredFieldsBody, setRequiredFieldsBody) = React.useState(_ => Dict.make())
 
   let complete = email.value != "" && fullName.value != "" && email.isValid->Option.getOr(false)
   let empty = email.value == "" || fullName.value == ""
@@ -28,13 +29,12 @@ let default = (~paymentType: CardThemeType.mode) => {
     let confirm = json->getDictFromJson->ConfirmType.itemToObjMapper
     if confirm.doSubmit {
       if complete {
-        let (connectors, _) = paymentMethodListValue->PaymentUtils.getConnectors(BankTransfer(Bacs))
+        let bodyArr =
+          PaymentBody.dynamicPaymentBody("bank_transfer", "bacs")->mergeAndFlattenToTuples(
+            requiredFieldsBody,
+          )
         intent(
-          ~bodyArr=PaymentBody.bacsBankTransferBody(
-            ~email=email.value,
-            ~name=fullName.value,
-            ~connectors,
-          ),
+          ~bodyArr,
           ~confirmParam=confirm.confirmParams,
           ~handleUserError=false,
           ~iframeId,
@@ -48,8 +48,9 @@ let default = (~paymentType: CardThemeType.mode) => {
   useSubmitPaymentData(submitCallback)
 
   <div className="flex flex-col animate-slowShow" style={gridGap: themeObj.spacingTab}>
-    <EmailPaymentInput paymentType />
-    <FullNamePaymentInput paymentType />
+    <DynamicFields
+      paymentType paymentMethod="bank_transfer" paymentMethodType="bacs" setRequiredFieldsBody
+    />
     <Surcharge paymentMethod="bank_transfer" paymentMethodType="bacs" />
     <InfoElement />
   </div>

src/Utilities/DynamicFieldsUtils.res

@@ -21,6 +21,7 @@ let dynamicFieldsEnabledPaymentMethods = [
   "sepa",
   "affirm",
   "ach",
+  "bacs",
 ]
 
 let getName = (item: PaymentMethodsRecord.required_fields, field: RecoilAtomTypes.field) => {

src/Utilities/PaymentBody.res

@@ -654,35 +654,6 @@ let epsBody = (~name, ~bankName) => [
   ),
 ]
 
-let bacsBankTransferBody = (~email, ~name, ~connectors) => {
-  let (firstName, lastName) = name->Utils.getFirstAndLastNameFromFullName
-
-  [
-    ("payment_method", "bank_transfer"->JSON.Encode.string),
-    ("connector", connectors->Utils.getArrofJsonString->JSON.Encode.array),
-    ("payment_method_type", "bacs"->JSON.Encode.string),
-    (
-      "payment_method_data",
-      [
-        (
-          "billing",
-          [
-            ("email", email->JSON.Encode.string),
-            (
-              "address",
-              [("first_name", firstName), ("last_name", lastName)]->Utils.getJsonFromArrayOfJson,
-            ),
-          ]->Utils.getJsonFromArrayOfJson,
-        ),
-        (
-          "bank_transfer",
-          [("bacs_bank_transfer", Dict.make()->JSON.Encode.object)]->Utils.getJsonFromArrayOfJson,
-        ),
-      ]->Utils.getJsonFromArrayOfJson,
-    ),
-  ]
-}
-
 let blikBody = (~blikCode) => [
   ("payment_method", "bank_redirect"->JSON.Encode.string),
   ("payment_method_type", "blik"->JSON.Encode.string),
@@ -930,7 +901,7 @@ let appendRedirectPaymentMethods = [
 ]
 
 let appendBankeDebitMethods = ["sepa"]
-let appendBankTransferMethods = ["sepa", "ach"]
+let appendBankTransferMethods = ["sepa", "ach", "bacs"]
 
 let getPaymentMethodSuffix = (~paymentMethodType, ~paymentMethod, ~isQrPaymentMethod) => {
   if isQrPaymentMethod {

src/Utilities/Utils.res

@@ -1020,13 +1020,8 @@ let unflattenObject = obj => {
   newDict
 }
 
-let mergeTwoFlattenedJsonDicts = (dict1, dict2) => {
-  dict1
-  ->Dict.toArray
-  ->Array.concat(dict2->Dict.toArray)
-  ->getJsonFromArrayOfJson
-  ->unflattenObject
-}
+let mergeTwoFlattenedJsonDicts = (dict1, dict2) =>
+  [...dict1->Dict.toArray, ...dict2->Dict.toArray]->getJsonFromArrayOfJson->unflattenObject
 
 open Identity