diff --git a/Hyperswitch-React-Demo-App/src/Payment.js b/Hyperswitch-React-Demo-App/src/Payment.js
index 3e34ac890..20414a048 100644
--- a/Hyperswitch-React-Demo-App/src/Payment.js
+++ b/Hyperswitch-React-Demo-App/src/Payment.js
@@ -101,7 +101,6 @@ function Payment() {
               ? clientSecretQueryParam
               : clientSecret,
             appearance: {
-              // theme: "midnight",
               labels: "floating",
             },
           }}
diff --git a/src/App.res b/src/App.res
index dbcd1557b..eec095614 100644
--- a/src/App.res
+++ b/src/App.res
@@ -17,7 +17,7 @@ let make = () => {
   }, [logger])
 
   React.useEffect0(() => {
-    let handleApplePayMessages = (ev: Window.event) => {
+    let handleMetaDataPostMessage = (ev: Window.event) => {
       let json = ev.data->Utils.safeParse
       let dict = json->Utils.getDictFromJson
 
@@ -43,21 +43,9 @@ let make = () => {
         | None => ()
         }
       }
-
-      // if dict->Dict.get("fullScreenIframeMounted")->Option.isSome {
-      //   let metadata = dict->getJsonObjectFromDict("metadata")
-      //   setStateMetadata(_ => metadata)
-      //   let metaDataDict = metadata->JSON.Decode.object->Option.getOr(Dict.make())
-
-      // let metadata = dict->getJsonObjectFromDict("metadata")
-      // if dict->
     }
-    Window.addEventListener("message", handleApplePayMessages)
-    Some(
-      () => {
-        Window.removeEventListener("message", handleApplePayMessages)
-      },
-    )
+    Window.addEventListener("message", handleMetaDataPostMessage)
+    Some(() => Window.removeEventListener("message", handleMetaDataPostMessage))
   })
 
   let renderFullscreen = switch paymentMode {
diff --git a/src/Components/PayNowButton.res b/src/Components/PayNowButton.res
index 9efcc0387..55c73b11c 100644
--- a/src/Components/PayNowButton.res
+++ b/src/Components/PayNowButton.res
@@ -21,7 +21,7 @@ let make = (~onClickHandler=?, ~label=?) => {
   let confirmPayload = sdkHandleConfirmPayment->PaymentBody.confirmPayloadForSDKButton
   let buttonText = switch label {
   | Some(val) => val
-  | _ => sdkHandleConfirmPayment.buttonText->Option.getOr(localeString.payNowButton)
+  | None => sdkHandleConfirmPayment.buttonText->Option.getOr(localeString.payNowButton)
   }
 
   let handleMessage = (event: Types.event) => {
diff --git a/src/Payments/BankDebitModal.res b/src/Payments/BankDebitModal.res
index 0b003f8f7..86e9a6d88 100644
--- a/src/Payments/BankDebitModal.res
+++ b/src/Payments/BankDebitModal.res
@@ -116,11 +116,7 @@ let make = (~setModalData, ~paymentType: CardThemeType.mode) => {
   let {themeObj, config, localeString} = Recoil.useRecoilValueFromAtom(RecoilAtoms.configAtom)
   let (accountType, setAccountType) = React.useState(() => "Savings")
 
-  let {config} = Recoil.useRecoilValueFromAtom(RecoilAtoms.configAtom)
-
   let (requiredFieldsBody, setRequiredFieldsBody) = React.useState(_ => Dict.make())
-  let areRequiredFieldsValid = Recoil.useRecoilValueFromAtom(RecoilAtoms.areRequiredFieldsValid)
-  let areRequiredFieldsEmpty = Recoil.useRecoilValueFromAtom(RecoilAtoms.areRequiredFieldsEmpty)
 
   let (openModal, setOpenModal) = React.useState(_ => false)
 
@@ -202,34 +198,103 @@ let make = (~setModalData, ~paymentType: CardThemeType.mode) => {
     Modal.close(setOpenModal)
   }
 
-  <Modal loader=false testMode=true openModal setOpenModal>
-    <div className="flex flex-col w-full h-auto overflow-scroll">
-      <div className={`flex flex-col`}>
-        {if isSepaDebit {
-          <>
-            <DynamicFields
-              paymentType paymentMethod="bank_debit" paymentMethodType="sepa" setRequiredFieldsBody
-            />
-            <PayNowButton onClickHandler label="Done" />
-          </>
-        } else {
-          <>
-            <div
-              style={color: themeObj.colorPrimary, marginBottom: "5px"}
-              className="self-start font-semibold text-lg text-[#151A1F]">
-              {React.string(localeString.billingDetailsText)}
-            </div>
-            <div className="my-4">
-              <AddressPaymentInput
-                paymentType=CardThemeType.Payment
-                className="focus:outline-none border border-gray-300 focus:border-[#006DF9] rounded-md text-sm"
-              />
-            </div>
+  let dynamicFieldsModalBody =
+    <>
+      <DynamicFields
+        paymentType paymentMethod="bank_debit" paymentMethodType="sepa" setRequiredFieldsBody
+      />
+      <PayNowButton onClickHandler label="Done" />
+    </>
+
+  let nonDynamicFieldsModalBody =
+    <>
+      <div
+        style={color: themeObj.colorPrimary, marginBottom: "5px"}
+        className="self-start font-semibold text-lg text-[#151A1F]">
+        {React.string(localeString.billingDetailsText)}
+      </div>
+      <div className="my-4">
+        <AddressPaymentInput
+          paymentType=CardThemeType.Payment
+          className="focus:outline-none border border-gray-300 focus:border-[#006DF9] rounded-md text-sm"
+        />
+      </div>
+      <div
+        style={color: themeObj.colorPrimary, marginBottom: "5px"}
+        className="self-start font-semibold text-lg text-[#151A1F]">
+        {React.string("Bank Details")}
+      </div>
+      <div
+        className={`Label mb-1 mt-5`}
+        style={
+          fontWeight: themeObj.fontWeightNormal,
+          fontSize: themeObj.fontSizeLg,
+          color: themeObj.colorText,
+          marginBottom: "5px",
+        }>
+        {React.string("Account Holder Name")}
+      </div>
+      <Input
+        value=accountHolderName
+        inputRef=nameRef
+        onChange=handleAccountHolderNameChange
+        type_="tel"
+        className={`p-2 text-base px-4`}
+        maxLength=17
+        placeholder="eg: John Doe"
+        onBlur={_ => setInputFocus(_ => NONE)}
+      />
+      <RenderIf condition={isSepaDebit}>
+        <div
+          className={`Label mb-1 mt-5`}
+          style={
+            fontWeight: themeObj.fontWeightNormal,
+            fontSize: themeObj.fontSizeLg,
+            color: themeObj.colorText,
+            marginBottom: "5px",
+          }>
+          {React.string("IBAN")}
+        </div>
+        <Input
+          value=iban
+          onChange=changeIBAN
+          type_="text"
+          maxLength=42
+          inputRef=ibanRef
+          placeholder="eg: DE00 0000 0000 0000 0000 00"
+        />
+      </RenderIf>
+      <div className="flex flex-row items-center w-full justify-between">
+        <RenderIf condition={isAchDebit}>
+          <div className="w-full" style={marginRight: "1rem"}>
             <div
-              style={color: themeObj.colorPrimary, marginBottom: "5px"}
-              className="self-start font-semibold text-lg text-[#151A1F]">
-              {React.string("Bank Details")}
+              className={`Label mb-1 mt-5`}
+              style={
+                fontWeight: themeObj.fontWeightNormal,
+                fontSize: themeObj.fontSizeLg,
+                color: themeObj.colorText,
+                marginBottom: "5px",
+              }>
+              {React.string("Routing number")}
             </div>
+            <Input
+              value=routingNumber
+              inputRef=routeref
+              isValid=isRoutingValid
+              setIsValid=setIsRoutingValid
+              onChange=handleRoutingChange
+              type_="tel"
+              className={` p-2 text-base px-4`}
+              maxLength=9
+              placeholder="123456789"
+              errorString=routingError
+              onBlur=routingBlur
+              onFocus={_ => setInputFocus(_ => Routing)}
+            />
+          </div>
+        </RenderIf>
+        <RenderIf condition={isAchDebit || isBecsDebit}>
+          <div className="w-full ">
             <div
               className={`Label mb-1 mt-5`}
               style={
@@ -238,157 +303,90 @@ let make = (~setModalData, ~paymentType: CardThemeType.mode) => {
                 color: themeObj.colorText,
                 marginBottom: "5px",
               }>
-              {React.string("Account Holder Name")}
+              {React.string("Account number")}
             </div>
             <Input
-              value=accountHolderName
-              inputRef=nameRef
-              onChange=handleAccountHolderNameChange
+              value=accountNum
+              inputRef=accountRef
+              onChange=handleAccountNumChange
               type_="tel"
               className={`p-2 text-base px-4`}
-              maxLength=17
-              placeholder="eg: John Doe"
+              maxLength={isBecsDebit ? 9 : 17}
+              placeholder="000123456789"
+              onFocus={_ => setInputFocus(_ => Account)}
               onBlur={_ => setInputFocus(_ => NONE)}
             />
-            <RenderIf condition={isSepaDebit}>
-              <div
-                className={`Label mb-1 mt-5`}
-                style={
-                  fontWeight: themeObj.fontWeightNormal,
-                  fontSize: themeObj.fontSizeLg,
-                  color: themeObj.colorText,
-                  marginBottom: "5px",
-                }>
-                {React.string("IBAN")}
-              </div>
-              <Input
-                value=iban
-                onChange=changeIBAN
-                type_="text"
-                maxLength=42
-                inputRef=ibanRef
-                placeholder="eg: DE00 0000 0000 0000 0000 00"
-              />
-            </RenderIf>
-            <div className="flex flex-row items-center w-full justify-between">
-              <RenderIf condition={isAchDebit}>
-                <div className="w-full" style={marginRight: "1rem"}>
-                  <div
-                    className={`Label mb-1 mt-5`}
-                    style={
-                      fontWeight: themeObj.fontWeightNormal,
-                      fontSize: themeObj.fontSizeLg,
-                      color: themeObj.colorText,
-                      marginBottom: "5px",
-                    }>
-                    {React.string("Routing number")}
-                  </div>
-                  <Input
-                    value=routingNumber
-                    inputRef=routeref
-                    isValid=isRoutingValid
-                    setIsValid=setIsRoutingValid
-                    onChange=handleRoutingChange
-                    type_="tel"
-                    className={` p-2 text-base px-4`}
-                    maxLength=9
-                    placeholder="123456789"
-                    errorString=routingError
-                    onBlur=routingBlur
-                    onFocus={_ => setInputFocus(_ => Routing)}
-                  />
-                </div>
-              </RenderIf>
-              <RenderIf condition={isAchDebit || isBecsDebit}>
-                <div className="w-full ">
-                  <div
-                    className={`Label mb-1 mt-5`}
-                    style={
-                      fontWeight: themeObj.fontWeightNormal,
-                      fontSize: themeObj.fontSizeLg,
-                      color: themeObj.colorText,
-                      marginBottom: "5px",
-                    }>
-                    {React.string("Account number")}
-                  </div>
-                  <Input
-                    value=accountNum
-                    inputRef=accountRef
-                    onChange=handleAccountNumChange
-                    type_="tel"
-                    className={`p-2 text-base px-4`}
-                    maxLength={isBecsDebit ? 9 : 17}
-                    placeholder="000123456789"
-                    onFocus={_ => setInputFocus(_ => Account)}
-                    onBlur={_ => setInputFocus(_ => NONE)}
-                  />
-                </div>
-              </RenderIf>
-            </div>
-            <RenderIf condition={isAchDebit}>
-              <div
-                className="w-full mb-1 mt-5"
-                style={
-                  fontWeight: themeObj.fontWeightNormal,
-                  fontSize: themeObj.fontSizeLg,
-                  color: themeObj.colorText,
-                  marginBottom: "5px",
-                }>
-                <DropdownField
-                  appearance=config.appearance
-                  fieldName="Account type"
-                  value=accountType
-                  setValue=setAccountType
-                  disabled=false
-                  options=[
-                    {
-                      value: "Savings",
-                    },
-                    {
-                      value: "Checking",
-                    },
-                  ]
-                  className=" focus:outline-none border border-gray-300 focus:border-[#006DF9] rounded-md text-sm"
-                />
-              </div>
-            </RenderIf>
-            <RenderIf condition={isBecsDebit}>
-              <div
-                className={`Label mb-1 mt-5`}
-                style={
-                  fontWeight: themeObj.fontWeightNormal,
-                  fontSize: themeObj.fontSizeLg,
-                  color: themeObj.colorText,
-                  marginBottom: "5px",
-                }>
-                {React.string("BSB")}
-              </div>
-              <Input
-                value=sortCode
-                inputRef=sortCodeRef
-                onChange=changeSortCode
-                type_="tel"
-                className={`p-2 text-base px-4`}
-                maxLength=7
-                placeholder="eg: 000-000"
-              />
-            </RenderIf>
-            <Button
-              active=submitActive
-              onclick={_ => {
-                setModalData(_ => Some({
-                  routingNumber,
-                  accountNumber: accountNum,
-                  accountHolderName,
-                  accountType: accountType->String.toLowerCase,
-                  iban,
-                  sortCode,
-                }))
-                Modal.close(setOpenModal)
-              }}
-            />
-          </>
+          </div>
+        </RenderIf>
+      </div>
+      <RenderIf condition={isAchDebit}>
+        <div
+          className="w-full mb-1 mt-5"
+          style={
+            fontWeight: themeObj.fontWeightNormal,
+            fontSize: themeObj.fontSizeLg,
+            color: themeObj.colorText,
+            marginBottom: "5px",
+          }>
+          <DropdownField
+            appearance=config.appearance
+            fieldName="Account type"
+            value=accountType
+            setValue=setAccountType
+            disabled=false
+            options=[
+              {
+                value: "Savings",
+              },
+              {
+                value: "Checking",
+              },
+            ]
+            className=" focus:outline-none border border-gray-300 focus:border-[#006DF9] rounded-md text-sm"
+          />
+        </div>
+      </RenderIf>
+      <RenderIf condition={isBecsDebit}>
+        <div
+          className={`Label mb-1 mt-5`}
+          style={
+            fontWeight: themeObj.fontWeightNormal,
+            fontSize: themeObj.fontSizeLg,
+            color: themeObj.colorText,
+            marginBottom: "5px",
+          }>
+          {React.string("BSB")}
+        </div>
+        <Input
+          value=sortCode
+          inputRef=sortCodeRef
+          onChange=changeSortCode
+          type_="tel"
+          className={`p-2 text-base px-4`}
+          maxLength=7
+          placeholder="eg: 000-000"
+        />
+      </RenderIf>
+      <Button
+        active=submitActive
+        onclick={_ => {
+          setModalData(_ => Some({
+            routingNumber,
+            accountNumber: accountNum,
+            accountHolderName,
+            accountType: accountType->String.toLowerCase,
+            iban,
+            sortCode,
+          }))
+          Modal.close(setOpenModal)
         }}
+      />
+    </>
+
+  <Modal loader=false testMode=true openModal setOpenModal>
+    <div className="flex flex-col w-full h-auto overflow-scroll">
+      <div className={`flex flex-col`}>
+        {isSepaDebit ? dynamicFieldsModalBody : nonDynamicFieldsModalBody}
         <PoweredBy className="mt-5" />
       </div>
     </div>
diff --git a/src/Payments/PaymentMethodsWrapper.res b/src/Payments/PaymentMethodsWrapper.res
index ffc96eeec..857a796e8 100644
--- a/src/Payments/PaymentMethodsWrapper.res
+++ b/src/Payments/PaymentMethodsWrapper.res
@@ -59,7 +59,7 @@ let make = (~paymentType: CardThemeType.mode, ~paymentMethodName: string) => {
     let json = ev.data->safeParse
     let confirm = json->getDictFromJson->ConfirmType.itemToObjMapper
     if confirm.doSubmit {
-      if true {
+      if complete {
         let countryCode =
           Country.getCountry(paymentMethodName)
           ->Array.filter(item => item.countryName == country)
@@ -91,7 +91,6 @@ let make = (~paymentType: CardThemeType.mode, ~paymentMethodName: string) => {
           ->mergeTwoFlattenedJsonDicts(requiredFieldsBody)
           ->getArrayOfTupleFromDict
 
-        Js.log3("dcsidcksdncsdjcusd", body, requiredFieldsBody)
         intent(
           ~bodyArr=body,
           ~confirmParam=confirm.confirmParams,
diff --git a/src/Payments/SepaBankDebit.res b/src/Payments/SepaBankDebit.res
index b205f724d..15dfc32aa 100644
--- a/src/Payments/SepaBankDebit.res
+++ b/src/Payments/SepaBankDebit.res
@@ -17,17 +17,10 @@ let make = (~paymentType: CardThemeType.mode) => {
 
   let (fullName, _) = Recoil.useLoggedRecoilState(userFullName, "fullName", loggerState)
   let (email, _) = Recoil.useLoggedRecoilState(userEmailAddress, "email", loggerState)
-  let (line1, _) = Recoil.useLoggedRecoilState(userAddressline1, "line1", loggerState)
-  let (line2, _) = Recoil.useLoggedRecoilState(userAddressline2, "line2", loggerState)
-  let (country, _) = Recoil.useLoggedRecoilState(userAddressCountry, "country", loggerState)
-  let (city, _) = Recoil.useLoggedRecoilState(userAddressCity, "city", loggerState)
-  let (postalCode, _) = Recoil.useLoggedRecoilState(userAddressPincode, "postal_code", loggerState)
-  let (state, _) = Recoil.useLoggedRecoilState(userAddressState, "state", loggerState)
+
   let setComplete = Recoil.useSetRecoilState(fieldsComplete)
   let paymentMethodListValue = Recoil.useRecoilValueFromAtom(PaymentUtils.paymentMethodListValue)
 
-  let requiredFields = Recoil.useRecoilValueFromAtom(RecoilAtoms.areRequiredFieldsValid)
-
   let pmAuthMapper = React.useMemo1(
     () =>
       PmAuthConnectorUtils.findPmAuthAllPMAuthConnectors(paymentMethodListValue.payment_methods),
@@ -56,7 +49,7 @@ let make = (~paymentType: CardThemeType.mode) => {
   UtilityHooks.useHandlePostMessages(~complete, ~empty, ~paymentType="sepa_bank_debit")
 
   React.useEffect(() => {
-    setComplete(_ => true)
+    setComplete(_ => complete)
     None
   }, [complete])
 
@@ -65,7 +58,7 @@ let make = (~paymentType: CardThemeType.mode) => {
     let confirm = json->Utils.getDictFromJson->ConfirmType.itemToObjMapper
 
     if confirm.doSubmit {
-      if true {
+      if complete {
         switch modalData {
         | Some(data: ACHTypes.data) =>
           let bodyFields = data.requiredFieldsBody->Option.getOr(Dict.make())
@@ -137,8 +130,6 @@ let make = (~paymentType: CardThemeType.mode) => {
         style={
           gridGap: {config.appearance.innerLayout === Spaced ? themeObj.spacingGridColumn : ""},
         }>
-        // <EmailPaymentInput paymentType />
-        // <FullNamePaymentInput paymentType />
         <AddBankAccount modalData setModalData />
         <FullScreenPortal>
           <BankDebitModal setModalData paymentType />
diff --git a/src/Utilities/DynamicFieldsUtils.res b/src/Utilities/DynamicFieldsUtils.res
index 532b044b5..53ef2ce25 100644
--- a/src/Utilities/DynamicFieldsUtils.res
+++ b/src/Utilities/DynamicFieldsUtils.res
@@ -833,7 +833,7 @@ let useSubmitCallback = () => {
         })
       }
       if bankAccountNumber.value === "" {
-        setCity(prev => {
+        setBankAccountNumber(prev => {
           ...prev,
           errorString: localeString.cityEmptyText,
         })
diff --git a/src/Utilities/PaymentHelpers.res b/src/Utilities/PaymentHelpers.res
index 14f58b11a..af404ea10 100644
--- a/src/Utilities/PaymentHelpers.res
+++ b/src/Utilities/PaymentHelpers.res
@@ -1479,942 +1479,7 @@ let fetchPaymentMethodList = (
         ~logType=INFO,
         ~logCategory=API,
       )
-      // Fetch.Response.json(resp)
-      let val = {
-        "redirect_url": "https://google.com/",
-        "currency": "EUR",
-        "payment_methods": [
-          {
-            "payment_method": "crypto",
-            "payment_method_types": [
-              {
-                "payment_method_type": "crypto_currency",
-                "payment_experience": [
-                  {
-                    "payment_experience_type": "redirect_to_url",
-                    "eligible_connectors": ["cryptopay", "bitpay"],
-                  },
-                ],
-                "card_networks": null,
-                "bank_names": null,
-                "bank_debits": null,
-                "bank_transfers": null,
-                "required_fields": {
-                  "payment_method_data.crypto.pay_currency": {
-                    "required_field": "payment_method_data.crypto.pay_currency",
-                    "display_name": "currency",
-                    "field_type": {
-                      "user_currency": {
-                        "options": [
-                          "BTC",
-                          "LTC",
-                          "ETH",
-                          "XRP",
-                          "XLM",
-                          "BCH",
-                          "ADA",
-                          "SOL",
-                          "SHIB",
-                          "TRX",
-                          "DOGE",
-                          "BNB",
-                          "USDT",
-                          "USDC",
-                          "DAI",
-                        ],
-                      },
-                    },
-                    "value": null,
-                  },
-                  "payment_method_data.crypto.network": {
-                    "required_field": "payment_method_data.crypto.network",
-                    "display_name": "network",
-                    "field_type": "user_crypto_currency_network",
-                    "value": null,
-                  },
-                },
-                "surcharge_details": null,
-                "pm_auth_connector": null,
-              },
-            ],
-          }->Identity.anyTypeToJson,
-          {
-            "payment_method": "wallet",
-            "payment_method_types": [
-              {
-                "payment_method_type": "ali_pay",
-                "payment_experience": [
-                  {
-                    "payment_experience_type": "redirect_to_url",
-                    "eligible_connectors": ["adyen", "stripe"],
-                  },
-                ],
-                "card_networks": null,
-                "bank_names": null,
-                "bank_debits": null,
-                "bank_transfers": null,
-                "required_fields": null,
-                "surcharge_details": null,
-                "pm_auth_connector": null,
-              },
-              {
-                "payment_method_type": "we_chat_pay",
-                "payment_experience": [
-                  {
-                    "payment_experience_type": "display_qr_code",
-                    "eligible_connectors": ["stripe"],
-                  },
-                  {
-                    "payment_experience_type": "redirect_to_url",
-                    "eligible_connectors": ["adyen"],
-                  },
-                ],
-                "card_networks": null,
-                "bank_names": null,
-                "bank_debits": null,
-                "bank_transfers": null,
-                "required_fields": null,
-                "surcharge_details": null,
-                "pm_auth_connector": null,
-              },
-            ],
-          }->Identity.anyTypeToJson,
-          {
-            "payment_method": "bank_debit",
-            "payment_method_types": [
-              {
-                "payment_method_type": "becs",
-                "payment_experience": [
-                  {
-                    "payment_experience_type": "redirect_to_url",
-                    "eligible_connectors": ["stripe"],
-                  },
-                ],
-                "card_networks": null,
-                "bank_names": null,
-                "bank_debits": null,
-                "bank_transfers": null,
-                "required_fields": {
-                  "billing.address.first_name": {
-                    "required_field": "payment_method_data.billing.address.first_name",
-                    "display_name": "billing_first_name",
-                    "field_type": "user_billing_name",
-                    "value": null,
-                  },
-                  "billing.address.last_name": {
-                    "required_field": "payment_method_data.billing.address.last_name",
-                    "display_name": "owner_name",
-                    "field_type": "user_billing_name",
-                    "value": null,
-                  },
-                  "payment_method_data.bank_debit.becs.account_number": {
-                    "required_field": "payment_method_data.bank_debit.becs.account_number",
-                    "display_name": "bank_account_number",
-                    "field_type": "user_bank_account_number",
-                    "value": null,
-                  },
-                  "billing.email": {
-                    "required_field": "payment_method_data.billing.email",
-                    "display_name": "email",
-                    "field_type": "user_email_address",
-                    "value": "hyperswitch_sdk_demo_id@gmail.com",
-                  },
-                  "payment_method_data.bank_debit.becs.bsb_number": {
-                    "required_field": "payment_method_data.bank_debit.becs.bsb_number",
-                    "display_name": "bsb_number",
-                    "field_type": "text",
-                    "value": null,
-                  },
-                },
-                "surcharge_details": null,
-                "pm_auth_connector": null,
-              }->Identity.anyTypeToJson,
-              {
-                "payment_method_type": "sepa",
-                "payment_experience": [
-                  {
-                    "payment_experience_type": "redirect_to_url",
-                    "eligible_connectors": ["adyen"],
-                  },
-                ],
-                "card_networks": null,
-                "bank_names": null,
-                "bank_debits": null,
-                "bank_transfers": null,
-                "required_fields": {
-                  "billing.address.first_name": {
-                    "required_field": "payment_method_data.billing.address.first_name",
-                    "display_name": "owner_name",
-                    "field_type": "user_billing_name",
-                    "value": null,
-                  },
-                  "payment_method_data.bank_debit.sepa.iban": {
-                    "required_field": "payment_method_data.bank_debit.sepa.iban",
-                    "display_name": "iban",
-                    "field_type": "user_iban",
-                    "value": null,
-                  },
-                  "billing.address.last_name": {
-                    "required_field": "payment_method_data.billing.address.last_name",
-                    "display_name": "owner_name",
-                    "field_type": "user_billing_name",
-                    "value": null,
-                  },
-                  // "billing.address.city": {
-                  //   "required_field": "payment_method_data.billing.address.city",
-                  //   "display_name": "owner_name",
-                  //   "field_type": "user_address_city",
-                  //   "value": null,
-                  // },
-                  // "billing.address.state": {
-                  //   "required_field": "payment_method_data.billing.address.state",
-                  //   "display_name": "owner_name",
-                  //   "field_type": "user_address_state",
-                  //   "value": null,
-                  // },
-                },
-                "surcharge_details": null,
-                "pm_auth_connector": null,
-              }->Identity.anyTypeToJson,
-            ],
-          }->Identity.anyTypeToJson,
-          {
-            "payment_method": "gift_card",
-            "payment_method_types": [
-              {
-                "payment_method_type": "pay_safe_card",
-                "payment_experience": [
-                  {
-                    "payment_experience_type": "redirect_to_url",
-                    "eligible_connectors": ["adyen"],
-                  },
-                ],
-                "card_networks": null,
-                "bank_names": null,
-                "bank_debits": null,
-                "bank_transfers": null,
-                "required_fields": null,
-                "surcharge_details": null,
-                "pm_auth_connector": null,
-              }->Identity.anyTypeToJson,
-              {
-                "payment_method_type": "givex",
-                "payment_experience": [
-                  {
-                    "payment_experience_type": "redirect_to_url",
-                    "eligible_connectors": ["adyen"],
-                  },
-                ],
-                "card_networks": null,
-                "bank_names": null,
-                "bank_debits": null,
-                "bank_transfers": null,
-                "required_fields": {
-                  "payment_method_data.gift_card.cvc": {
-                    "required_field": "payment_method_data.gift_card.cvc",
-                    "display_name": "gift_card_cvc",
-                    "field_type": "user_card_cvc",
-                    "value": null,
-                  },
-                  "payment_method_data.gift_card.number": {
-                    "required_field": "payment_method_data.gift_card.number",
-                    "display_name": "gift_card_number",
-                    "field_type": "user_card_number",
-                    "value": null,
-                  },
-                },
-                "surcharge_details": null,
-                "pm_auth_connector": null,
-              }->Identity.anyTypeToJson,
-            ],
-          }->Identity.anyTypeToJson,
-          {
-            "payment_method": "bank_transfer",
-            "payment_method_types": [
-              {
-                "payment_method_type": "multibanco",
-                "payment_experience": [
-                  {
-                    "payment_experience_type": "redirect_to_url",
-                    "eligible_connectors": ["stripe"],
-                  },
-                ],
-                "card_networks": null,
-                "bank_names": null,
-                "bank_debits": null,
-                "bank_transfers": null,
-                "required_fields": {
-                  "billing.email": {
-                    "required_field": "payment_method_data.billing.email",
-                    "display_name": "email",
-                    "field_type": "user_email_address",
-                    "value": "hyperswitch_sdk_demo_id@gmail.com",
-                  },
-                },
-                "surcharge_details": null,
-                "pm_auth_connector": null,
-              }->Identity.anyTypeToJson,
-              {
-                "payment_method_type": "pix",
-                "payment_experience": [
-                  {
-                    "payment_experience_type": "redirect_to_url",
-                    "eligible_connectors": ["itaubank"],
-                  },
-                ],
-                "card_networks": null,
-                "bank_names": null,
-                "bank_debits": null,
-                "bank_transfers": null,
-                "required_fields": {
-                  "billing.address.first_name": {
-                    "required_field": "payment_method_data.billing.address.first_name",
-                    "display_name": "card_holder_name",
-                    "field_type": "user_full_name",
-                    "value": null,
-                  },
-                  "payment_method_data.bank_transfer.pix.cpf": {
-                    "required_field": "payment_method_data.bank_transfer.pix.cpf",
-                    "display_name": "cpf",
-                    "field_type": "user_cpf",
-                    "value": null,
-                  },
-                  "payment_method_data.bank_transfer.pix.pix_key": {
-                    "required_field": "payment_method_data.bank_transfer.pix.pix_key",
-                    "display_name": "pix_key",
-                    "field_type": "user_pix_key",
-                    "value": null,
-                  },
-                  "payment_method_data.bank_transfer.pix.cnpj": {
-                    "required_field": "payment_method_data.bank_transfer.pix.cnpj",
-                    "display_name": "cnpj",
-                    "field_type": "user_cnpj",
-                    "value": null,
-                  },
-                  "billing.address.last_name": {
-                    "required_field": "payment_method_data.billing.address.last_name",
-                    "display_name": "card_holder_name",
-                    "field_type": "user_full_name",
-                    "value": null,
-                  },
-                },
-                "surcharge_details": null,
-                "pm_auth_connector": null,
-              }->Identity.anyTypeToJson,
-            ],
-          }->Identity.anyTypeToJson,
-          {
-            "payment_method": "card",
-            "payment_method_types": [
-              {
-                "payment_method_type": "debit",
-                "payment_experience": null,
-                "card_networks": [
-                  {
-                    "card_network": "JCB",
-                    "surcharge_details": null,
-                    "eligible_connectors": [
-                      "placetopay",
-                      "aci",
-                      "nmi",
-                      "noon",
-                      "trustpay",
-                      "checkout",
-                      "bluesnap",
-                      "adyen",
-                      "cybersource",
-                      "paypal",
-                      "bambora",
-                      "stripe",
-                    ],
-                  },
-                  {
-                    "card_network": "Visa",
-                    "surcharge_details": null,
-                    "eligible_connectors": [
-                      "placetopay",
-                      "aci",
-                      "nmi",
-                      "noon",
-                      "trustpay",
-                      "checkout",
-                      "bluesnap",
-                      "adyen",
-                      "cybersource",
-                      "paypal",
-                      "bambora",
-                      "stripe",
-                    ],
-                  },
-                  {
-                    "card_network": "DinersClub",
-                    "surcharge_details": null,
-                    "eligible_connectors": [
-                      "placetopay",
-                      "aci",
-                      "nmi",
-                      "noon",
-                      "trustpay",
-                      "checkout",
-                      "bluesnap",
-                      "adyen",
-                      "cybersource",
-                      "paypal",
-                      "bambora",
-                      "stripe",
-                    ],
-                  },
-                  {
-                    "card_network": "UnionPay",
-                    "surcharge_details": null,
-                    "eligible_connectors": [
-                      "placetopay",
-                      "aci",
-                      "nmi",
-                      "noon",
-                      "trustpay",
-                      "checkout",
-                      "bluesnap",
-                      "adyen",
-                      "cybersource",
-                      "paypal",
-                      "bambora",
-                      "stripe",
-                    ],
-                  },
-                  {
-                    "card_network": "Discover",
-                    "surcharge_details": null,
-                    "eligible_connectors": [
-                      "placetopay",
-                      "aci",
-                      "nmi",
-                      "noon",
-                      "trustpay",
-                      "checkout",
-                      "bluesnap",
-                      "adyen",
-                      "cybersource",
-                      "paypal",
-                      "bambora",
-                      "stripe",
-                    ],
-                  },
-                  {
-                    "card_network": "CartesBancaires",
-                    "surcharge_details": null,
-                    "eligible_connectors": [
-                      "placetopay",
-                      "aci",
-                      "nmi",
-                      "noon",
-                      "trustpay",
-                      "checkout",
-                      "bluesnap",
-                      "adyen",
-                      "cybersource",
-                      "paypal",
-                      "bambora",
-                      "stripe",
-                    ],
-                  },
-                  {
-                    "card_network": "AmericanExpress",
-                    "surcharge_details": null,
-                    "eligible_connectors": [
-                      "placetopay",
-                      "aci",
-                      "nmi",
-                      "noon",
-                      "trustpay",
-                      "checkout",
-                      "bluesnap",
-                      "adyen",
-                      "cybersource",
-                      "paypal",
-                      "bambora",
-                      "stripe",
-                    ],
-                  },
-                  {
-                    "card_network": "Interac",
-                    "surcharge_details": null,
-                    "eligible_connectors": [
-                      "placetopay",
-                      "aci",
-                      "nmi",
-                      "noon",
-                      "trustpay",
-                      "checkout",
-                      "bluesnap",
-                      "adyen",
-                      "cybersource",
-                      "paypal",
-                      "bambora",
-                      "stripe",
-                    ],
-                  },
-                  {
-                    "card_network": "Mastercard",
-                    "surcharge_details": null,
-                    "eligible_connectors": [
-                      "placetopay",
-                      "aci",
-                      "nmi",
-                      "noon",
-                      "trustpay",
-                      "checkout",
-                      "bluesnap",
-                      "adyen",
-                      "cybersource",
-                      "paypal",
-                      "bambora",
-                      "stripe",
-                    ],
-                  },
-                ],
-                "bank_names": null,
-                "bank_debits": null,
-                "bank_transfers": null,
-                "required_fields": {
-                  "payment_method_data.card.card_exp_year": {
-                    "required_field": "payment_method_data.card.card_exp_year",
-                    "display_name": "card_exp_year",
-                    "field_type": "user_card_expiry_year",
-                    "value": null,
-                  },
-                  "payment_method_data.card.card_exp_month": {
-                    "required_field": "payment_method_data.card.card_exp_month",
-                    "display_name": "card_exp_month",
-                    "field_type": "user_card_expiry_month",
-                    "value": null,
-                  },
-                  "billing.address.city": {
-                    "required_field": "payment_method_data.billing.address.city",
-                    "display_name": "city",
-                    "field_type": "user_address_city",
-                    "value": "San Fransico",
-                  },
-                  "billing.address.first_name": {
-                    "required_field": "payment_method_data.billing.address.first_name",
-                    "display_name": "card_holder_name",
-                    "field_type": "user_full_name",
-                    "value": null,
-                  },
-                  "billing.address.country": {
-                    "required_field": "payment_method_data.billing.address.country",
-                    "display_name": "country",
-                    "field_type": {
-                      "user_address_country": {
-                        "options": ["ALL"],
-                      },
-                    },
-                    "value": "NL",
-                  },
-                  "billing.address.state": {
-                    "required_field": "payment_method_data.billing.address.state",
-                    "display_name": "state",
-                    "field_type": "user_address_state",
-                    "value": "California",
-                  },
-                  "payment_method_data.card.card_cvc": {
-                    "required_field": "payment_method_data.card.card_cvc",
-                    "display_name": "card_cvc",
-                    "field_type": "user_card_cvc",
-                    "value": null,
-                  },
-                  "email": {
-                    "required_field": "email",
-                    "display_name": "email",
-                    "field_type": "user_email_address",
-                    "value": "hyperswitch_sdk_demo_id@gmail.com",
-                  },
-                  "billing.address.line1": {
-                    "required_field": "payment_method_data.billing.address.line1",
-                    "display_name": "line1",
-                    "field_type": "user_address_line1",
-                    "value": null,
-                  },
-                  "billing.address.zip": {
-                    "required_field": "payment_method_data.billing.address.zip",
-                    "display_name": "zip",
-                    "field_type": "user_address_pincode",
-                    "value": "94122",
-                  },
-                  "billing.address.last_name": {
-                    "required_field": "payment_method_data.billing.address.last_name",
-                    "display_name": "card_holder_name",
-                    "field_type": "user_full_name",
-                    "value": null,
-                  },
-                  "payment_method_data.card.card_number": {
-                    "required_field": "payment_method_data.card.card_number",
-                    "display_name": "card_number",
-                    "field_type": "user_card_number",
-                    "value": null,
-                  },
-                  "billing.email": {
-                    "required_field": "payment_method_data.billing.email",
-                    "display_name": "email",
-                    "field_type": "user_email_address",
-                    "value": "hyperswitch_sdk_demo_id@gmail.com",
-                  },
-                },
-                "surcharge_details": null,
-                "pm_auth_connector": null,
-              }->Identity.anyTypeToJson,
-              {
-                "payment_method_type": "credit",
-                "payment_experience": null,
-                "card_networks": [
-                  {
-                    "card_network": "CartesBancaires",
-                    "surcharge_details": null,
-                    "eligible_connectors": [
-                      "placetopay",
-                      "aci",
-                      "nmi",
-                      "noon",
-                      "trustpay",
-                      "checkout",
-                      "bluesnap",
-                      "adyen",
-                      "cybersource",
-                      "paypal",
-                      "bambora",
-                      "stripe",
-                    ],
-                  },
-                  {
-                    "card_network": "Visa",
-                    "surcharge_details": null,
-                    "eligible_connectors": [
-                      "placetopay",
-                      "aci",
-                      "nmi",
-                      "noon",
-                      "trustpay",
-                      "checkout",
-                      "bluesnap",
-                      "adyen",
-                      "cybersource",
-                      "paypal",
-                      "bambora",
-                      "stripe",
-                    ],
-                  },
-                  {
-                    "card_network": "UnionPay",
-                    "surcharge_details": null,
-                    "eligible_connectors": [
-                      "placetopay",
-                      "aci",
-                      "nmi",
-                      "noon",
-                      "trustpay",
-                      "checkout",
-                      "bluesnap",
-                      "adyen",
-                      "cybersource",
-                      "paypal",
-                      "bambora",
-                      "stripe",
-                    ],
-                  },
-                  {
-                    "card_network": "JCB",
-                    "surcharge_details": null,
-                    "eligible_connectors": [
-                      "placetopay",
-                      "aci",
-                      "nmi",
-                      "noon",
-                      "trustpay",
-                      "checkout",
-                      "bluesnap",
-                      "adyen",
-                      "cybersource",
-                      "paypal",
-                      "bambora",
-                      "stripe",
-                    ],
-                  },
-                  {
-                    "card_network": "Interac",
-                    "surcharge_details": null,
-                    "eligible_connectors": [
-                      "placetopay",
-                      "aci",
-                      "nmi",
-                      "noon",
-                      "trustpay",
-                      "checkout",
-                      "bluesnap",
-                      "adyen",
-                      "cybersource",
-                      "paypal",
-                      "bambora",
-                      "stripe",
-                    ],
-                  },
-                  {
-                    "card_network": "DinersClub",
-                    "surcharge_details": null,
-                    "eligible_connectors": [
-                      "placetopay",
-                      "aci",
-                      "nmi",
-                      "noon",
-                      "trustpay",
-                      "checkout",
-                      "bluesnap",
-                      "adyen",
-                      "cybersource",
-                      "paypal",
-                      "bambora",
-                      "stripe",
-                    ],
-                  },
-                  {
-                    "card_network": "Mastercard",
-                    "surcharge_details": null,
-                    "eligible_connectors": [
-                      "placetopay",
-                      "aci",
-                      "nmi",
-                      "noon",
-                      "trustpay",
-                      "checkout",
-                      "bluesnap",
-                      "adyen",
-                      "cybersource",
-                      "paypal",
-                      "bambora",
-                      "stripe",
-                    ],
-                  },
-                  {
-                    "card_network": "Discover",
-                    "surcharge_details": null,
-                    "eligible_connectors": [
-                      "placetopay",
-                      "aci",
-                      "nmi",
-                      "noon",
-                      "trustpay",
-                      "checkout",
-                      "bluesnap",
-                      "adyen",
-                      "cybersource",
-                      "paypal",
-                      "bambora",
-                      "stripe",
-                    ],
-                  },
-                  {
-                    "card_network": "AmericanExpress",
-                    "surcharge_details": null,
-                    "eligible_connectors": [
-                      "placetopay",
-                      "aci",
-                      "nmi",
-                      "noon",
-                      "trustpay",
-                      "checkout",
-                      "bluesnap",
-                      "adyen",
-                      "cybersource",
-                      "paypal",
-                      "bambora",
-                      "stripe",
-                    ],
-                  },
-                ],
-                "bank_names": null,
-                "bank_debits": null,
-                "bank_transfers": null,
-                "required_fields": {
-                  "billing.address.line1": {
-                    "required_field": "payment_method_data.billing.address.line1",
-                    "display_name": "line1",
-                    "field_type": "user_address_line1",
-                    "value": null,
-                  },
-                  "billing.address.zip": {
-                    "required_field": "payment_method_data.billing.address.zip",
-                    "display_name": "zip",
-                    "field_type": "user_address_pincode",
-                    "value": "94122",
-                  },
-                  "billing.address.country": {
-                    "required_field": "payment_method_data.billing.address.country",
-                    "display_name": "country",
-                    "field_type": {
-                      "user_address_country": {
-                        "options": ["ALL"],
-                      },
-                    },
-                    "value": "NL",
-                  },
-                  "payment_method_data.card.card_exp_month": {
-                    "required_field": "payment_method_data.card.card_exp_month",
-                    "display_name": "card_exp_month",
-                    "field_type": "user_card_expiry_month",
-                    "value": null,
-                  },
-                  "email": {
-                    "required_field": "email",
-                    "display_name": "email",
-                    "field_type": "user_email_address",
-                    "value": "hyperswitch_sdk_demo_id@gmail.com",
-                  },
-                  "billing.address.first_name": {
-                    "required_field": "payment_method_data.billing.address.first_name",
-                    "display_name": "card_holder_name",
-                    "field_type": "user_full_name",
-                    "value": null,
-                  },
-                  "billing.address.state": {
-                    "required_field": "payment_method_data.billing.address.state",
-                    "display_name": "state",
-                    "field_type": "user_address_state",
-                    "value": "California",
-                  },
-                  "billing.address.city": {
-                    "required_field": "payment_method_data.billing.address.city",
-                    "display_name": "city",
-                    "field_type": "user_address_city",
-                    "value": "San Fransico",
-                  },
-                  "billing.email": {
-                    "required_field": "payment_method_data.billing.email",
-                    "display_name": "email",
-                    "field_type": "user_email_address",
-                    "value": "hyperswitch_sdk_demo_id@gmail.com",
-                  },
-                  "payment_method_data.card.card_number": {
-                    "required_field": "payment_method_data.card.card_number",
-                    "display_name": "card_number",
-                    "field_type": "user_card_number",
-                    "value": null,
-                  },
-                  "billing.address.last_name": {
-                    "required_field": "payment_method_data.billing.address.last_name",
-                    "display_name": "card_holder_name",
-                    "field_type": "user_full_name",
-                    "value": null,
-                  },
-                  "payment_method_data.card.card_exp_year": {
-                    "required_field": "payment_method_data.card.card_exp_year",
-                    "display_name": "card_exp_year",
-                    "field_type": "user_card_expiry_year",
-                    "value": null,
-                  },
-                  "payment_method_data.card.card_cvc": {
-                    "required_field": "payment_method_data.card.card_cvc",
-                    "display_name": "card_cvc",
-                    "field_type": "user_card_cvc",
-                    "value": null,
-                  },
-                },
-                "surcharge_details": null,
-                "pm_auth_connector": null,
-              }->Identity.anyTypeToJson,
-            ],
-          }->Identity.anyTypeToJson,
-          {
-            "payment_method": "bank_debit",
-            "payment_method_types": [
-              {
-                "payment_method_type": "becs",
-                "payment_experience": null,
-                "card_networks": null,
-                "bank_names": null,
-                "bank_debits": {
-                  "eligible_connectors": ["stripe"],
-                },
-                "bank_transfers": null,
-                "required_fields": {
-                  "billing.address.first_name": {
-                    "required_field": "payment_method_data.billing.address.first_name",
-                    "display_name": "billing_first_name",
-                    "field_type": "user_billing_name",
-                    "value": null,
-                  },
-                  "billing.address.last_name": {
-                    "required_field": "payment_method_data.billing.address.last_name",
-                    "display_name": "owner_name",
-                    "field_type": "user_billing_name",
-                    "value": null,
-                  },
-                  "payment_method_data.bank_debit.becs.account_number": {
-                    "required_field": "payment_method_data.bank_debit.becs.account_number",
-                    "display_name": "bank_account_number",
-                    "field_type": "user_bank_account_number",
-                    "value": null,
-                  },
-                  "billing.email": {
-                    "required_field": "payment_method_data.billing.email",
-                    "display_name": "email",
-                    "field_type": "user_email_address",
-                    "value": "hyperswitch_sdk_demo_id@gmail.com",
-                  },
-                  "payment_method_data.bank_debit.becs.bsb_number": {
-                    "required_field": "payment_method_data.bank_debit.becs.bsb_number",
-                    "display_name": "bsb_number",
-                    "field_type": "text",
-                    "value": null,
-                  },
-                },
-                "surcharge_details": null,
-                "pm_auth_connector": null,
-              }->Identity.anyTypeToJson,
-              {
-                "payment_method_type": "sepa",
-                "payment_experience": null,
-                "card_networks": null,
-                "bank_names": null,
-                "bank_debits": {
-                  "eligible_connectors": ["adyen"],
-                },
-                "bank_transfers": null,
-                "required_fields": {
-                  "billing.address.first_name": {
-                    "required_field": "payment_method_data.billing.address.first_name",
-                    "display_name": "owner_name",
-                    "field_type": "user_billing_name",
-                    "value": null,
-                  },
-                  "payment_method_data.bank_debit.sepa.iban": {
-                    "required_field": "payment_method_data.bank_debit.sepa.iban",
-                    "display_name": "iban",
-                    "field_type": "user_iban",
-                    "value": null,
-                  },
-                  "billing.address.last_name": {
-                    "required_field": "payment_method_data.billing.address.last_name",
-                    "display_name": "owner_name",
-                    "field_type": "user_billing_name",
-                    "value": null,
-                  },
-                },
-                "surcharge_details": null,
-                "pm_auth_connector": null,
-              }->Identity.anyTypeToJson,
-            ],
-          }->Identity.anyTypeToJson,
-        ],
-        "mandate_payment": null,
-        "merchant_name": "sandboxtesterjp",
-        "show_surcharge_breakup_screen": true,
-        "payment_type": "normal",
-        "request_external_three_ds_authentication": false,
-        "collect_shipping_details_from_wallets": true,
-        "collect_billing_details_from_wallets": true,
-        "is_tax_calculation_enabled": false,
-      }->Identity.anyTypeToJson
-
-      val->resolve
+      Fetch.Response.json(resp)
     }
   })
   ->catch(err => {
diff --git a/src/orca-loader/Elements.res b/src/orca-loader/Elements.res
index 66fc0ab60..a493e6ed7 100644
--- a/src/orca-loader/Elements.res
+++ b/src/orca-loader/Elements.res
@@ -93,7 +93,7 @@ let make = (
 
     let unMountPreMountLoaderIframe = () => {
       switch preMountLoaderIframeDiv->Nullable.toOption {
-      | Some(iframe) => () //iframe->remove
+      | Some(iframe) => iframe->remove
       | None => ()
       }
     }