diff --git a/CHANGELOG.md b/CHANGELOG.md
index 913787d01..d9e322091 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,33 @@ All notable changes to this project will be documented in this file. See [conven
 
 - - -
 
+## 1.10.0 (2023-12-15)
+
+### Features
+
+- Show Details Paymentb Enhancement ([#104](https://github.com/juspay/hyperswitch-control-center/pull/104)) ([`134d470`](https://github.com/juspay/hyperswitch-control-center/commit/134d470ceadef14e02c5ca6b31d1475b25212d0d))
+
+**Full Changelog:** [`v1.9.0...v1.10.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.9.0...v1.10.0)
+
+- - -
+
+
+## 1.9.0 (2023-12-15)
+
+### Features
+
+- Show Orders Enhancements & sidebar value changes ([#103](https://github.com/juspay/hyperswitch-control-center/pull/103)) ([`a1631f3`](https://github.com/juspay/hyperswitch-control-center/commit/a1631f3b1f3e6021053cae934146ca09368ab333))
+
+### Refactors
+
+- Refactoring key errors ([#98](https://github.com/juspay/hyperswitch-control-center/pull/98)) ([`50b86b9`](https://github.com/juspay/hyperswitch-control-center/commit/50b86b9670ecec63ddc6ed8221e55b9ae593e20a))
+- Refactoring key errors ([#100](https://github.com/juspay/hyperswitch-control-center/pull/100)) ([`1ddbe68`](https://github.com/juspay/hyperswitch-control-center/commit/1ddbe6874c93dccee2cfc1d73281ba6ce9008323))
+
+**Full Changelog:** [`v1.8.0...v1.9.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.8.0...v1.9.0)
+
+- - -
+
+
 ## 1.8.0 (2023-12-14)
 
 ### Features
diff --git a/src/components/BreadCrumb.res b/src/components/BreadCrumb.res
deleted file mode 100644
index ae374f060..000000000
--- a/src/components/BreadCrumb.res
+++ /dev/null
@@ -1,91 +0,0 @@
-type status = Active | Disabled | Completed
-
-type breadCrumb_options = {
-  status: status,
-  position: int,
-}
-
-type breadCrumb = {
-  key: string,
-  status: status,
-  position: int,
-}
-@react.component
-let make = (
-  ~breadCrumb: Js.Dict.t<breadCrumb_options>,
-  ~containerStyle="",
-  ~breadCrumbStyle="",
-  ~container: React.element=<> </>,
-) => {
-  let (breadCrumbArray, setBreadcrumbArray) = React.useState(_ => [])
-  let (arrayLength, setArrayLength) = React.useState(_ => 0)
-  let sortByPosition = (a, b) => {
-    if a.position < b.position {
-      -1
-    } else if a.position > b.position {
-      1
-    } else {
-      0
-    }
-  }
-
-  React.useEffect1(() => {
-    let arr =
-      breadCrumb
-      ->Js.Dict.entries
-      ->Belt.Array.keepMap(val => {
-        let (key, obj) = val
-        let breadObj: breadCrumb = {
-          key,
-          status: obj.status,
-          position: obj.position,
-        }
-        Some(breadObj)
-      })
-      ->Js.Array2.sortInPlaceWith(sortByPosition)
-    setArrayLength(_ => Js.Array2.length(arr))
-    setBreadcrumbArray(_ => arr)
-    None
-  }, [breadCrumb])
-
-  <div className={`px-2 pb-4 left-1/2 ${containerStyle}`}>
-    <div className={` flex ${breadCrumbStyle}`}>
-      {breadCrumbArray
-      ->Js.Array2.mapi((val, index) => {
-        let t = switch val.status {
-        | Active => "blue-800"
-        | Disabled => "gray-400"
-        | Completed => "green-800"
-        }
-        <div key={string_of_int(index)}>
-          <div className="flex">
-            {if val.status == Completed {
-              <div
-                className={`ml-3 rounded-full w-8 text-white h-8 flex items-center justify-center text-sm bg-${t}`}>
-                <Icon className="align-middle" name="check" size=12 />
-              </div>
-            } else {
-              <div
-                className={`ml-4 rounded-full w-8 text-white h-8 text-center flex items-center justify-center text-sm bg-${t}`}>
-                {val.position->Belt.Int.toString->React.string}
-              </div>
-            }}
-            <div className={`ml-3 font-semibold flex items-center text-${t}`}>
-              {val.key->React.string}
-            </div>
-            {if val.position != arrayLength {
-              <div className="flex items-center justify-center mx-6 text-gray-200">
-                // {React.string(">")}
-                <Icon className="" name="finops-rightarrow" size=15 />
-              </div>
-            } else {
-              React.null
-            }}
-          </div>
-        </div>
-      })
-      ->React.array}
-      {container}
-    </div>
-  </div>
-}
diff --git a/src/components/CardList.res b/src/components/CardList.res
deleted file mode 100644
index d71b4fc7e..000000000
--- a/src/components/CardList.res
+++ /dev/null
@@ -1,95 +0,0 @@
-type cardListInfo = {
-  id: string,
-  label: string,
-  imageUrl: option<string>,
-  secondaryLabel: option<string>,
-  primaryTag: option<string>,
-  tagsList: array<string>,
-  description: option<string>,
-  tertiaryText: option<string>,
-  isLive: option<string>,
-}
-
-@react.component
-let make = (~listInfo: array<cardListInfo>, ~onClickHandler) => {
-  <div className="flex flex-row items-center flex-wrap overflow-scroll">
-    {listInfo
-    ->Js.Array2.mapi((item, index) => {
-      <div
-        key={item.label ++ index->Belt.Int.toString}
-        onClick={_ => onClickHandler(item.id, item.label)}
-        className="border border-solid border-[#E1E1E1] dark:!border-[#48484d] dark:hover:border-sky-300 hover:bg-[#E9F1FF] dark:bg-[#252626] cursor-pointer bg-[#F6F6F6] dark:hover:bg-[#111010] rounded-lg min-w-[300px] w-[calc(32%-20px)] overflow-hidden items-center mt-8 mr-4">
-        {item.imageUrl->Belt.Option.mapWithDefault(React.null, imageUrl =>
-          <ImageViewer
-            shimmerClass="w-full h-[211px]"
-            imageClass="h-[211px] w-auto object-cover"
-            imageUrl={imageUrl}
-            alt={item.label}
-          />
-        )}
-        <div
-          className="bg-white border-t border-[#E1E1E1] flex flex-col justify-between  min-h-[190px] dark:bg-[#111010]  pb-2 px-4 relative ">
-          <div>
-            {switch item.primaryTag {
-            | None | Some("") => React.null
-            | Some(tag) =>
-              <div
-                className=" flex bg-[#D0F1E1] text-[#0B6E40] px-1 pr-2 py-1 font-semibold rounded-2xl absolute -top-3 text-xs">
-                <Icon className="p-1" size=16 name="bolt" />
-                {React.string(tag)}
-              </div>
-            }}
-            <div
-              className="text-[#111111] dark:text-white pt-5 flex relative  font-semibold text-base">
-              {React.string(item.label)}
-              {item.isLive->Belt.Option.mapWithDefault(React.null, integrationStatus => {
-                if integrationStatus->Js.String2.toLowerCase === "live" {
-                  <div
-                    className="ml-3 flex bg-[#D1E7FF] text-[#105099] px-1 pr-2 py-1 font-semibold rounded-2xl w-fit text-xs">
-                    <Icon className="p-1" size=16 name="check" />
-                    {React.string("LIVE")}
-                  </div>
-                } else if integrationStatus->Js.String2.toLowerCase === "integrating" {
-                  <div
-                    className="ml-3 flex bg-[#FDE9CE] text-[#945605] px-1 pr-2 py-1 font-semibold rounded-2xl w-fit text-xs">
-                    <Icon className="p-1 relative -top-[1px]" size=16 name="exclamation" />
-                    {React.string("Integrating")}
-                  </div>
-                } else {
-                  React.null
-                }
-              })}
-            </div>
-            <div className="pt-2 text-jp-2-light-gray-1200  jb-subtitle-2 !leading-[20px]">
-              {React.string(
-                item.description->Belt.Option.getWithDefault("No description available"),
-              )}
-              {switch item.tertiaryText {
-              | Some("") | None => React.null
-              | Some(text) =>
-                <div className="text-[#0E9225] font-semibold flex mt-3 text-sm">
-                  <Icon
-                    className="text-white bg-[#0E9255] p-[3px] rounded-xl mr-2 "
-                    size=15
-                    name="check"
-                  />
-                  {React.string(text)}
-                </div>
-              }}
-            </div>
-          </div>
-          <div className="pt-2 w-full flex flex-row flex-wrap mb-1">
-            {item.tagsList
-            ->Js.Array2.mapi((tag, index) => {
-              <div key={tag ++ index->Belt.Int.toString} className=" mt-2 w-fit flex mr-2 ">
-                <Tag labelText=tag labelColor={LabelGray} isFill=true />
-              </div>
-            })
-            ->React.array}
-          </div>
-        </div>
-      </div>
-    })
-    ->React.array}
-  </div>
-}
diff --git a/src/components/Dropdown.res b/src/components/Dropdown.res
deleted file mode 100644
index b724858f4..000000000
--- a/src/components/Dropdown.res
+++ /dev/null
@@ -1,114 +0,0 @@
-type dropdownOptions = {
-  label: string,
-  value: Js.Json.t,
-}
-
-type action<'string> = ItemClick(dropdownOptions)
-
-module Chevron = {
-  @react.component
-  let make = (~color="#354052") => {
-    <svg
-      width="12"
-      height="12"
-      viewBox="0 0 12 12"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      className="fill-current">
-      <mask id="mask0" maskUnits="userSpaceOnUse" x="2" y="4" width="8" height="5">
-        <path
-          fillRule="evenodd"
-          clipRule="evenodd"
-          d="M2.81803 4.64645C2.62277 4.84171 2.62277 5.15829 2.81803 5.35355L5.64646 8.18198C5.84172 8.37724 6.1583 8.37724 6.35356 8.18198L9.18199 5.35355C9.37725 5.15829 9.37725 4.84171 9.18199 4.64645C8.98673 4.45118 8.67015 4.45118 8.47489 4.64645L6.00001 7.12132L3.52514 4.64645C3.32988 4.45118 3.01329 4.45118 2.81803 4.64645Z"
-          fill="#A8AAB7"
-        />
-      </mask>
-      <g mask="url(#mask0)">
-        <rect x="12" width="12" height="12" transform="rotate(90 12 0)" fill=color />
-      </g>
-    </svg>
-  }
-}
-
-@react.component
-let make = (
-  ~title="Gateway",
-  ~list=["Gateway1", "Gateway2"],
-  ~titleclass="text-jp-gray-900 text-xs text-white",
-  ~mapper=Js.Dict.empty(),
-  ~labelVal="All Merchants",
-  ~customContainerStyle="py-3",
-) => {
-  let (clickedItem, setClickedItem) = React.useState(_ => None)
-  let (showTitle, setshowTitle) = React.useState(_ => title)
-  let (showList, setShowList) = React.useState(_ => false)
-  let listOptions = list->Belt.Array.keepMap(val => {
-    let statusObj = {
-      label: val,
-      value: Js.Dict.get(mapper, val)->Belt.Option.getWithDefault(val)->Js.Json.string,
-    }
-    Some(statusObj)
-  })
-
-  let listOptions = listOptions->Js.Array.concat([{label: labelVal, value: Js.Json.null}])
-  let dropDownClassName = listOptions->Js.Array2.length < 3 ? "hidden" : ""
-
-  let (_, dispatch) = React.useReducer((_, action) =>
-    switch action {
-    | ItemClick(item: dropdownOptions) => {
-        let value = item.value->Js.Json.decodeString->Belt.Option.getWithDefault("")
-        if value === "" {
-          setClickedItem(_ => None)
-          setshowTitle(_ => labelVal)
-        } else {
-          setClickedItem(_ => Some(value))
-          setshowTitle(_ => item.label)
-        }
-        setShowList(_ => false)
-      }
-    }
-  , ())
-
-  let ref = React.useRef(Js.Nullable.null)
-  OutsideClick.useOutsideClick(
-    ~refs=ArrayOfRef([ref]),
-    ~isActive=showList,
-    ~callback=() => {
-      setShowList(_ => false)
-    },
-    (),
-  )
-  <div ref={ref->ReactDOM.Ref.domRef} className={`relative inline-block ${dropDownClassName}`}>
-    <div
-      className={`flex flex-row items-center text-sm ] cursor-pointer rounded-md px-4 mr-4 bg-[#B3E8FF]/[.1] ${customContainerStyle}`}
-      onClick={_evt => setShowList(prev => !prev)}>
-      <div className={`mr-2 ${titleclass}`}> {React.string(showTitle)} </div>
-      <div className="">
-        <Icon name={showList ? "chevron-up" : "chevron-down"} size=10 className="text-[#0099FF]" />
-      </div>
-    </div>
-    {showList
-      ? <AddDataAttributes attributes=[("data-dropdown-for", title)]>
-          <ul
-            className="m-0 w-40 bg-white border border-jp-gray-100 absolute shadow-md rounded-md z-10 my-3">
-            {listOptions
-            ->Js.Array2.mapi((item, i) => {
-              let value = item.value->Js.Json.decodeString->Belt.Option.getWithDefault("")
-              <>
-                <div
-                  className="flex flex-row justify-between px-4 py-2 bg-white hover:bg-jp-gray-100 cursor-pointer text-sm text-jp-gray-700 "
-                  key={string_of_int(i)}
-                  onClick={_evt => dispatch(ItemClick(item))}>
-                  {React.string(item.label)}
-                  <div className="my-auto">
-                    <Tick isSelected={clickedItem === Some(value)} />
-                  </div>
-                </div>
-              </>
-            })
-            ->React.array}
-          </ul>
-        </AddDataAttributes>
-      : React.null}
-  </div>
-}
diff --git a/src/components/priority-logics/AddDefaultPLGateway.res b/src/components/priority-logics/AddDefaultPLGateway.res
deleted file mode 100644
index ff84b46e7..000000000
--- a/src/components/priority-logics/AddDefaultPLGateway.res
+++ /dev/null
@@ -1,78 +0,0 @@
-open LogicUtils
-
-@react.component
-let make = (
-  ~gatewayOptions,
-  ~dropDownbuttonText="Default Gateways",
-  ~dropDownSidetext="Default Gateways",
-) => {
-  let input = ReactFinalForm.useField(`json.default_gateways`).input
-  let isMobileView = MatchMedia.useMobileChecker()
-
-  let selected = input.value->getStrArryFromJson
-
-  let length = selected->Js.Array2.length
-
-  let buttonText =
-    length === 0
-      ? dropDownbuttonText
-      : `${length->string_of_int} ${isMobileView ? "" : dropDownbuttonText} Selected`
-
-  <div
-    className="flex flex-col p-4 bg-white dark:bg-jp-gray-lightgray_background rounded-md border border-jp-gray-600 dark:border-jp-gray-850">
-    <div
-      className={`flex flex-row items-center gap-2 md:gap-6 mt-2 
-        ${isMobileView ? "justify-between" : "justify-start"}`}>
-      <div className={`flex flex-row items-center gap-2`}>
-        <Icon
-          name="arrow-rotate"
-          size=14
-          className="cursor-pointer text-jp-gray-700 dark:text-jp-gray-700"
-          onClick={ev => ()}
-        />
-        <div className="text-jp-gray-700 dark:text-jp-gray-700">
-          {React.string(dropDownSidetext)}
-          <span className="text-red-500"> {React.string(" *")} </span>
-        </div>
-      </div>
-      <AddDataAttributes attributes=[("data-gateway-dropdown", "DefaultGateways")]>
-        <div>
-          <SelectBox.BaseDropdown
-            allowMultiSelect=true
-            buttonText
-            buttonType=Button.SecondaryFilled
-            hideMultiSelectButtons=true
-            input
-            options={gatewayOptions}
-            searchable=true
-            fixedDropDownDirection=SelectBox.TopRight
-            defaultLeftIcon={FontAwesome("plus")}
-          />
-        </div>
-      </AddDataAttributes>
-    </div>
-    <div className="flex flex-wrap items-center gap-4 mt-4">
-      {selected
-      ->Array.mapWithIndex((op, i) => {
-        <div className="flex flex-row items-center gap-2 my-1" key={i->Belt.Int.toString}>
-          <div
-            className="px-2 rounded-full bg-jp-gray-300 dark:bg-jp-gray-800 text-jp-gray-800 dark:text-white font-semibold text-sm md:text-md">
-            {React.string(string_of_int(i + 1))}
-          </div>
-          <div> {React.string(op)} </div>
-          {if i !== length - 1 {
-            <Icon
-              name="chevron-right"
-              size=14
-              className="cursor-pointer text-jp-gray-800"
-              onClick={ev => ()}
-            />
-          } else {
-            React.null
-          }}
-        </div>
-      })
-      ->React.array}
-    </div>
-  </div>
-}
diff --git a/src/components/priority-logics/PriorityLogicUtils.res b/src/components/priority-logics/PriorityLogicUtils.res
index 83f1337b9..e516b8d6c 100644
--- a/src/components/priority-logics/PriorityLogicUtils.res
+++ b/src/components/priority-logics/PriorityLogicUtils.res
@@ -1,66 +1,7 @@
-type val =
-  StringArray(array<string>) | String(string) | IntArray(array<int>) | Int(int) | Bool(bool)
-
 type gateway = {
   gateway_name: string,
   distribution: int,
   disableFallback: bool,
 }
-type volumeBasedDistribution = {
-  gateways: array<gateway>,
-  isEnforceGatewayPriority: bool,
-}
-
-type formState = CreateConfig | EditConfig | EditReplica | ViewConfig
-
-let getGateways = dict => {
-  dict
-  ->LogicUtils.getArrayFromDict("gateways", [])
-  ->Belt.Array.keepMap(Js.Json.decodeObject)
-  ->Js.Array2.map(ob => {
-    {
-      gateway_name: LogicUtils.getString(ob, "gateway_name", ""),
-      distribution: LogicUtils.getInt(ob, "distribution", 0),
-      disableFallback: LogicUtils.getBool(ob, "disableFallback", false),
-    }
-  })
-}
 
-let volumeBasedDistributionMapper = dict => {
-  switch Js.Dict.get(dict, "volumeBasedDistribution")->Belt.Option.flatMap(Js.Json.decodeObject) {
-  | Some(dict) => {
-      gateways: dict->getGateways,
-      isEnforceGatewayPriority: dict->LogicUtils.getBool("isEnforceGatewayPriority", false),
-    }
-  | None => {
-      gateways: [],
-      isEnforceGatewayPriority: false,
-    }
-  }
-}
-
-type status = ACTIVE | APPROVED | PENDING | REJECTED
-type configType = RuleBased | CodeBased
-
-let logicStatusToStr = status =>
-  switch status {
-  | ACTIVE => "ACTIVE"
-  | APPROVED => "APPROVED"
-  | PENDING => "PENDING"
-  | REJECTED => "REJECTED"
-  }
-
-let getColorOnStatus = status =>
-  switch status {
-  | ACTIVE => Table.LabelGreen
-  | APPROVED => Table.LabelGreen
-  | PENDING => Table.LabelOrange
-  | REJECTED => Table.LabelRed
-  }
-
-let getAvailableName = (presentNames, name) => {
-  let index = Belt.Array.range(0, presentNames->Js.Array2.length)->Js.Array2.findIndex(index => {
-    !Js.Array2.includes(presentNames, `${name}-copy-${index->string_of_int}`)
-  })
-  `${name}-copy-${index->string_of_int}`
-}
+type formState = CreateConfig | EditConfig | ViewConfig
diff --git a/src/entryPoints/hyperswitch/SidebarValues.res b/src/entryPoints/hyperswitch/SidebarValues.res
index 2e7b100cd..5ee5949a6 100644
--- a/src/entryPoints/hyperswitch/SidebarValues.res
+++ b/src/entryPoints/hyperswitch/SidebarValues.res
@@ -260,12 +260,9 @@ let proFeatures = isProFeaturesEnabled =>
 
 let fraudAndRisk = isfraudAndRiskEnabled =>
   isfraudAndRiskEnabled
-    ? LinkWithTag({
+    ? Link({
         name: "Fraud & Risk",
         icon: "shield-alt",
-        iconTag: "sidebar-lock",
-        iconStyles: "w-15 h-15",
-        iconSize: 15,
         link: `/fraud-risk-management`,
         access: isfraudAndRiskEnabled ? ReadWrite : NoAccess,
         searchOptions: [],
@@ -274,13 +271,10 @@ let fraudAndRisk = isfraudAndRiskEnabled =>
 
 let payoutConnectors = isPayoutConnectorsEnabled =>
   isPayoutConnectorsEnabled
-    ? LinkWithTag({
+    ? Link({
         name: "Payout Processors",
         link: `/payoutconnectors`,
         icon: "connectors",
-        iconTag: "sidebar-lock",
-        iconStyles: "w-15 h-15",
-        iconSize: 15,
         access: ReadWrite,
         searchOptions: HSwitchUtils.getSearchOptionsForProcessors(
           ~processorList=ConnectorUtils.payoutConnectorList,
@@ -291,12 +285,9 @@ let payoutConnectors = isPayoutConnectorsEnabled =>
 
 let reconTag = (recon, isReconEnabled) =>
   recon
-    ? LinkWithTag({
+    ? Link({
         name: "Reconcilation",
         icon: isReconEnabled ? "recon" : "recon-lock",
-        iconTag: "sidebar-lock",
-        iconStyles: "w-15 h-15",
-        iconSize: 15,
         link: `/recon`,
         access: ReadWrite,
       })
@@ -326,16 +317,15 @@ let getHyperSwitchAppSidebars = (
     default->analytics,
     default->connectors,
     default->workflow,
+    frm->fraudAndRisk,
+    payOut->payoutConnectors,
+    recon->reconTag(isReconEnabled),
     default->developers(userRole, systemMetrics),
     settings(
       ~isUserManagementEnabled=userManagement,
       ~isBusinessProfileEnabled=businessProfile,
       ~isSampleDataEnabled=sampleData,
     ),
-    [frm, payOut, recon]->Js.Array2.includes(true)->proFeatures,
-    frm->fraudAndRisk,
-    payOut->payoutConnectors,
-    recon->reconTag(isReconEnabled),
   ]
   sidebar
 }
diff --git a/src/screens/HyperSwitch/Connectors/ConnectorAccountDetailsHelper.res b/src/screens/HyperSwitch/Connectors/ConnectorAccountDetailsHelper.res
index 60c21e1e1..95730cc8e 100644
--- a/src/screens/HyperSwitch/Connectors/ConnectorAccountDetailsHelper.res
+++ b/src/screens/HyperSwitch/Connectors/ConnectorAccountDetailsHelper.res
@@ -39,7 +39,7 @@ let inputField = (
   ~getPlaceholder,
   ~checkRequiredFields,
   ~disabled,
-  ~description="",
+  ~description,
   ~toolTipPosition: ToolTip.toolTipPosition=ToolTip.Right,
   (),
 ) =>
diff --git a/src/screens/HyperSwitch/Connectors/ConnectorHome.res b/src/screens/HyperSwitch/Connectors/ConnectorHome.res
index 4d027a959..3d71d1e40 100644
--- a/src/screens/HyperSwitch/Connectors/ConnectorHome.res
+++ b/src/screens/HyperSwitch/Connectors/ConnectorHome.res
@@ -100,7 +100,7 @@ let make = (~isPayoutFlow=false, ~showStepIndicator=true, ~showBreadCrumb=true)
   let getDetails = async () => {
     try {
       setScreenState(_ => Loading)
-      let _wasmResult = await Window.connectorWasmInit()
+      let _ = await Window.connectorWasmInit()
       if isUpdateFlow {
         await getConnectorDetails()
       }
diff --git a/src/screens/HyperSwitch/Connectors/ConnectorPreview.res b/src/screens/HyperSwitch/Connectors/ConnectorPreview.res
index e9473d7e3..e25277fe0 100644
--- a/src/screens/HyperSwitch/Connectors/ConnectorPreview.res
+++ b/src/screens/HyperSwitch/Connectors/ConnectorPreview.res
@@ -273,8 +273,7 @@ let make = (
       showToast(~message=`Successfully Saved the Changes`, ~toastType=ToastSuccess, ())
       RescriptReactRouter.push("/connectors")
     } catch {
-    | Js.Exn.Error(e) =>
-      let _err = Js.Exn.message(e)->Belt.Option.getWithDefault("Failed to Disable connector!")
+    | Js.Exn.Error(_) =>
       showToast(~message=`Failed to Disable connector!`, ~toastType=ToastError, ())
     }
   }
diff --git a/src/screens/HyperSwitch/Connectors/ConnectorTableUtils.res b/src/screens/HyperSwitch/Connectors/ConnectorTableUtils.res
index 5e0002d78..561e75600 100644
--- a/src/screens/HyperSwitch/Connectors/ConnectorTableUtils.res
+++ b/src/screens/HyperSwitch/Connectors/ConnectorTableUtils.res
@@ -14,34 +14,6 @@ let defaultColumns = [
   PaymentMethods,
 ]
 
-module ConnectorActions = {
-  @react.component
-  let make = () => {
-    let onClick = e => {
-      e->ReactEvent.Mouse.stopPropagation
-    }
-
-    <div>
-      <div className="invisible cursor-pointer group-hover:visible flex">
-        <div className="mr-5">
-          <ToolTip
-            tooltipWidthClass="w-fit"
-            description="Delete"
-            toolTipFor={<Icon
-              name="delete"
-              size=15
-              className="text-jp-gray-700 dark:hover:text-white hover:text-jp-gray-900 "
-              onClick
-            />}
-            toolTipPosition=Left
-            tooltipPositioning=#absolute
-          />
-        </div>
-      </div>
-    </div>
-  }
-}
-
 let parsePaymentMethodType = paymentMethodType => {
   open LogicUtils
 
diff --git a/src/screens/HyperSwitch/Connectors/ConnectorUtils.res b/src/screens/HyperSwitch/Connectors/ConnectorUtils.res
index 36623e45e..3a2b0f762 100644
--- a/src/screens/HyperSwitch/Connectors/ConnectorUtils.res
+++ b/src/screens/HyperSwitch/Connectors/ConnectorUtils.res
@@ -20,121 +20,6 @@ let getStepName = step => {
 let toLCase = str => str->Js.String2.toLowerCase
 let len = arr => arr->Js.Array2.length
 
-let subLabelOptions: array<SelectBox.dropdownOption> = [
-  {
-    label: "AIBMS",
-    value: "aibms",
-  },
-  {
-    label: "American Express Brighton",
-    value: "amex_brighton",
-  },
-  {
-    label: "American Express Direct",
-    value: "amex_direct",
-  },
-  {
-    label: "Asia-Mideast Processing",
-    value: "asia_mideast",
-  },
-  {
-    label: "Barclays",
-    value: "barclays",
-  },
-  {
-    label: "CCS (CAFIS)",
-    value: "ccs",
-  },
-  {
-    label: "Chase Paymentech Solutions",
-    value: "chase",
-  },
-  {
-    label: "Citibank",
-    value: "citi",
-  },
-  {
-    label: "Comercio Latino",
-    value: "comercio_latino",
-  },
-  {
-    label: "CyberSource ACH Service",
-    value: "cybs_ach",
-  },
-  {
-    label: "Visa Platform Connect",
-    value: "visa",
-  },
-  {
-    label: "FDC Compass",
-    value: "fdc_compass",
-  },
-  {
-    label: "FDC Nashville Global",
-    value: "fdc_nashville",
-  },
-  {
-    label: "FDMS Nashville",
-    value: "fdms_nashville",
-  },
-  {
-    label: "FDMS South",
-    value: "fdms_south",
-  },
-  {
-    label: "Ingenico ePayments",
-    value: "ingenico",
-  },
-  {
-    label: "GPN",
-    value: "gpn",
-  },
-  {
-    label: "HSBC",
-    value: "hsbc",
-  },
-  {
-    label: "Litle",
-    value: "litle",
-  },
-  {
-    label: "LloydsTSB Cardnet",
-    value: "lloyds",
-  },
-  {
-    label: "Moneris",
-    value: "moneris",
-  },
-  {
-    label: "Omnipay Direct",
-    value: "omnipay",
-  },
-  {
-    label: "OmniPay-Ireland",
-    value: "omnipay_ireland",
-  },
-  {
-    label: "RBS WorldPay Atlanta",
-    value: "rbs_worldpay",
-  },
-  {
-    label: "Streamline",
-    value: "streamline",
-  },
-  {
-    label: "SIX",
-    value: "six",
-  },
-  {
-    label: "TeleCheck",
-    value: "telecheck",
-  },
-  {
-    label: "TSYS Acquiring Solutions",
-    value: "tsys",
-  },
-]
-
 let payoutConnectorList: array<connectorName> = [ADYEN, WISE]
 
 let connectorList: array<connectorName> = [
@@ -649,13 +534,6 @@ let getPaymentMethodEnabled: Js.Json.t => array<paymentMethodEnabled> = json =>
   getArrayDataFromJson(json, itemToObjMapper)
 }
 
-let getMetaData = json => {
-  open LogicUtils
-  let val = json->Js.Json.decodeObject->Belt.Option.getWithDefault(Js.Dict.empty())
-  let _apple_pay = val->getJsonObjectFromDict("apple_pay")
-  let _goole_pay = val->getJsonObjectFromDict("apple_pay")
-}
-
 let connectorIgnoredField = [
   "business_country",
   "business_label",
@@ -699,14 +577,6 @@ let ignoreFields = (json, id, fields) => {
   }
 }
 
-let getPayoutConnectorAuthType = connector => {
-  switch connector {
-  | ADYEN => (#SignatureKey: authType :> string)
-  | WISE => (#BodyKey: authType :> string)
-  | _ => (#Nokey: authType :> string)
-  }
-}
-
 let mapAuthType = (authType: string) => {
   switch authType->toLCase {
   | "bodykey" => #BodyKey
@@ -718,7 +588,7 @@ let mapAuthType = (authType: string) => {
   }
 }
 
-let getConnectorType = (connector, ~isPayoutFlow=false, ()) => {
+let getConnectorType = (connector, ~isPayoutFlow, ()) => {
   isPayoutFlow
     ? "payout_processor"
     : switch connector {
@@ -956,26 +826,6 @@ let validateConnectorRequiredFields = (
   newDict->Js.Json.object_
 }
 
-let getFirstLabelViaCountryKey = (dict, country) => {
-  dict
-  ->Js.Dict.get(country)
-  ->Belt.Option.getWithDefault([])
-  ->Belt.Array.get(0)
-  ->Belt.Option.getWithDefault("")
-}
-
-let getDefaultCountryAndLabel = dict => {
-  let defaultCountry = dict->Js.Dict.keys->Belt.Array.get(0)->Belt.Option.getWithDefault("")
-
-  let defaultLabel =
-    dict
-    ->Js.Dict.get(defaultCountry)
-    ->Belt.Option.getWithDefault([])
-    ->Belt.Array.get(0)
-    ->Belt.Option.getWithDefault("")
-  (defaultCountry, defaultLabel)
-}
-
 let getPlaceHolder = (connector: connectorName, fieldName, label) => {
   switch (connector, fieldName) {
   | (KLARNA, "api_key") => "Enter as:-Basic{API Key}"
diff --git a/src/screens/HyperSwitch/Developer/PaymentSettings/PaymentSettings.res b/src/screens/HyperSwitch/Developer/PaymentSettings/PaymentSettings.res
index f6e9911ad..8e7d4669e 100644
--- a/src/screens/HyperSwitch/Developer/PaymentSettings/PaymentSettings.res
+++ b/src/screens/HyperSwitch/Developer/PaymentSettings/PaymentSettings.res
@@ -165,53 +165,6 @@ let make = (~webhookOnly=false, ~showFormOnly=false, ~profileId="") => {
             }}
           />
         </div>
-        /*
-        <UIUtils.RenderIf
-          condition={businessProfileDetails.webhook_details.webhook_url
-          ->Belt.Option.getWithDefault("")
-          ->Js.String2.length > 0 && !webhookOnly}>
-          <SectionAccordion title="Webhook Events" hideHeaderWeb={true}>
-            {<div className="w-full mt-5 md:mt-10 ">
-              <h2
-                className="font-bold text-xl pb-3 text-black text-opacity-75 dark:text-white dark:text-opacity-75">
-                {"Configured Webhook Events"->React.string}
-              </h2>
-              <div
-                className="flex flex-col md:flex-row border border-jp-gray-500 dark:border-jp-gray-960 bg-white dark:bg-jp-gray-lightgray_background rounded-md p-4 md:p-7">
-                {webhookEventsDict
-                ->Js.Dict.entries
-                ->Js.Array2.map(webhookSection => {
-                  let (heading, events) = webhookSection
-                  <div
-                    className="flex flex-col w-full md:w-1/3 m-2 border border-jp-gray-500 dark:border-jp-gray-960 bg-white dark:bg-jp-gray-lightgray_background rounded-md">
-                    <div className="flex m-2 font-semibold items-center p-4">
-                      {React.string((heading ++ " Events")->LogicUtils.snakeToTitle)}
-                    </div>
-                    <div className="w-full md:border-b dark:opacity-20 " />
-                    <div className="m-6 flex flex-col">
-                      {events
-                      ->LogicUtils.getArrayFromJson([])
-                      ->Js.Array2.map(event => {
-                        <div className="flex my-2 cursor-not-allowed">
-                          <CheckBoxIcon isSelected=true isDisabled=true />
-                          <span className="font-medium ml-2">
-                            {event
-                            ->LogicUtils.getStringFromJson("")
-                            ->LogicUtils.snakeToTitle
-                            ->React.string}
-                          </span>
-                        </div>
-                      })
-                      ->React.array}
-                    </div>
-                  </div>
-                })
-                ->React.array}
-              </div>
-            </div>}
-          </SectionAccordion>
-        </UIUtils.RenderIf>
- */
       </div>
     </div>
   </PageLoaderWrapper>
diff --git a/src/screens/HyperSwitch/Home/HomeUtils.res b/src/screens/HyperSwitch/Home/HomeUtils.res
index 6a8e17293..cabfb3900 100644
--- a/src/screens/HyperSwitch/Home/HomeUtils.res
+++ b/src/screens/HyperSwitch/Home/HomeUtils.res
@@ -16,7 +16,7 @@ let subtextStyle = `${getTextClass(
   )} text-grey-700 opacity-50`
 let cardHeaderText = `${getTextClass(~textVariant=H3, ~h3TextVariant=Leading_2, ())} `
 let hoverStyle = "cursor-pointer group-hover:shadow hover:shadow-homePageBoxShadow group"
-let boxCssHover = (~ishoverStyleRequired=true, ()) =>
+let boxCssHover = (~ishoverStyleRequired, ()) =>
   `flex flex-col  bg-white border rounded-md pt-10 pl-10 gap-2 h-12.5-rem ${ishoverStyleRequired
       ? hoverStyle
       : ""}`
@@ -161,43 +161,6 @@ module MerchantAuthInfo = {
   }
 }
 
-module InputText = {
-  @react.component
-  let make = (~setAmount) => {
-    let (value, setValue) = React.useState(_ => "100")
-    let showPopUp = PopUpState.useShowPopUp()
-    let input: ReactFinalForm.fieldRenderPropsInput = {
-      name: "-",
-      onBlur: _ev => (),
-      onChange: ev => {
-        let value = {ev->ReactEvent.Form.target}["value"]
-        if value->Js.String2.includes("<script>") || value->Js.String2.includes("</script>") {
-          showPopUp({
-            popUpType: (Warning, WithIcon),
-            heading: `Script Tags are not allowed`,
-            description: React.string(`Input cannot contain <script>, </script> tags`),
-            handleConfirm: {text: "OK"},
-          })
-        }
-        let value = value->Js.String2.replace("<script>", "")->Js.String2.replace("</script>", "")
-        if Js.Re.test_(%re("/^[0-9]*$/"), value) && value->Js.String2.length <= 8 {
-          setValue(_ => value)
-          setAmount(_ => value->Belt.Int.fromString->Belt.Option.getWithDefault(100) * 100)
-        }
-      },
-      onFocus: _ev => (),
-      value: Js.Json.string(value),
-      checked: false,
-    }
-
-    <TextInput
-      input
-      placeholder={"Enter amount"}
-      onDisabledStyle="bg-jp-gray-300 dark:bg-gray-800 dark:bg-opacity-10"
-    />
-  }
-}
-
 module CheckoutCard = {
   @react.component
   let make = () => {
@@ -477,7 +440,7 @@ let responseDataMapper = (res: Js.Json.t) => {
   let arrayFromJson = res->getArrayFromJson([])
   let resDict = Js.Dict.empty()
 
-  let _a = arrayFromJson->Js.Array2.map(value => {
+  arrayFromJson->Js.Array2.forEach(value => {
     let value1 = value->getDictFromJsonObject
     let key = value1->Js.Dict.keys->Belt.Array.get(0)->Belt.Option.getWithDefault("")
     resDict->Js.Dict.set(key, value1->getValueMapped(key))
diff --git a/src/screens/HyperSwitch/Home/HomeV2.res b/src/screens/HyperSwitch/Home/HomeV2.res
index e715aede1..df5532bdb 100644
--- a/src/screens/HyperSwitch/Home/HomeV2.res
+++ b/src/screens/HyperSwitch/Home/HomeV2.res
@@ -16,19 +16,6 @@ module HomePageHorizontalStepper = {
       2
     }
 
-    // let step = if !(typedValueOfEnum.firstProcessorConnected.processorID->Js.String2.length > 0) {
-    //   0
-    // } else if (
-    //   typedValueOfEnum.isMultipleConfiguration &&
-    //   !(typedValueOfEnum.configuredRouting.routing_id->Js.String2.length > 0)
-    // ) {
-    //   0
-    // } else if !typedValueOfEnum.integrationCompleted {
-    //   1
-    // } else {
-    //   2
-    // }
-
     let getStepperStyle = index => {
       index <= step ? "bg-blue-700 text-white border-transparent" : "border-blue-700 text-blue-700 "
     }
@@ -115,12 +102,12 @@ module QuickStart = {
               processorName: secondConnectorValue.connector_name,
             }
 
-            let _isMultipleConnectorSetup = await ConnectorChoice({
+            let _ = await ConnectorChoice({
               isMultipleConfiguration: true,
             })->usePostEnumDetails(#IsMultipleConfiguration)
-            let _firstEnumSetupValues =
+            let _ =
               await ProcesorType(bodyOfFirstConnector)->usePostEnumDetails(#FirstProcessorConnected)
-            let _secondEnumSetupValues =
+            let _ =
               await ProcesorType(bodyOfSecondConnector)->usePostEnumDetails(
                 #SecondProcessorConnected,
               )
@@ -141,10 +128,10 @@ module QuickStart = {
               processorName: firstConnectorValue.connector_name,
             }
 
-            let _isMultipleConnectorSetup = await ConnectorChoice({
+            let _ = await ConnectorChoice({
               isMultipleConfiguration: true,
             })->usePostEnumDetails(#IsMultipleConfiguration)
-            let _firstEnumSetupValues =
+            let _ =
               await ProcesorType(bodyOfFirstConnector)->usePostEnumDetails(#FirstProcessorConnected)
             let _ = updateEnumInRecoil([
               (ConnectorChoice({isMultipleConfiguration: true}), #IsMultipleConfiguration),
diff --git a/src/screens/HyperSwitch/Home/ProdIntent/ProdVerifyModalUtils.res b/src/screens/HyperSwitch/Home/ProdIntent/ProdVerifyModalUtils.res
index 5ff289839..d1b1d1b83 100644
--- a/src/screens/HyperSwitch/Home/ProdIntent/ProdVerifyModalUtils.res
+++ b/src/screens/HyperSwitch/Home/ProdIntent/ProdVerifyModalUtils.res
@@ -1,5 +1,4 @@
 let errorClass = "text-sm leading-4 font-medium text-start ml-1 mt-2"
-let selectedClass = "bg-green-900 text-white font-semibold"
 
 type prodFormColumnType =
   | POCemail
@@ -22,28 +21,6 @@ let getStringFromVariant = key => {
   }
 }
 
-let getVarientFromString = stringVal => {
-  switch stringVal {
-  | "poc_email" => POCemail
-  | "legal_business_name" => BusinessName
-  | "business_location" => Country
-  | "business_website" => Website
-  | "poc_name" => POCName
-  | "comments" => BusinessTAN
-  | _ => IsCompleted
-  }
-}
-
-type prodFieldsObjType = {
-  poc_email: string,
-  comments: string,
-  legal_business_name: string,
-  business_location: string,
-  is_complated: bool,
-  business_website: string,
-  poc_name: string,
-}
-
 let businessName = FormRenderer.makeFieldInfo(
   ~label="Legal Business Name",
   ~name=BusinessName->getStringFromVariant,
diff --git a/src/screens/HyperSwitch/Home/QuickStart/QuickStartUtils.res b/src/screens/HyperSwitch/Home/QuickStart/QuickStartUtils.res
index 7de1e90e6..17204cb71 100644
--- a/src/screens/HyperSwitch/Home/QuickStart/QuickStartUtils.res
+++ b/src/screens/HyperSwitch/Home/QuickStart/QuickStartUtils.res
@@ -1,7 +1,5 @@
 open QuickStartTypes
 
-let testConnectors = [ConnectorTypes.STRIPE, ConnectorTypes.PAYPAL]
-
 let getTestConnectorName = (connector, quickStartPageState) => {
   open ConnectorUtils
   open QuickStartTypes
@@ -31,13 +29,7 @@ let quickStartEnumIntialArray: array<sectionHeadingVariant> = [
   #PaypalConnected,
   #SPTestPayment,
 ]
-let getInitalEnumArray: bool => array<sectionHeadingVariant> = isMultipleConfiguration => {
-  if isMultipleConfiguration {
-    quickStartEnumIntialArray
-  } else {
-    [#FirstProcessorConnected, #TestPayment, #IntegrationMethod, #IntegrationCompleted]
-  }
-}
+
 let defaultChoiceStateValue: landingChoiceType = {
   displayText: "Not Selected",
   description: "Not Selected",
@@ -511,27 +503,6 @@ let textToVariantMapperForBuildHS = str => {
   }
 }
 
-let getBackButtonState = quickStartPageState => {
-  switch quickStartPageState {
-  | ConnectProcessor(connect_processor) =>
-    switch connect_processor {
-    | CONFIGURE_PRIMARY => ConnectProcessor(LANDING)
-    | CONFIGURE_SECONDARY => ConnectProcessor(CONFIGURE_PRIMARY)
-    | CONFIGURE_SMART_ROUTING => ConnectProcessor(CONFIGURE_SECONDARY)
-    | CHECKOUT => ConnectProcessor(CONFIGURE_SMART_ROUTING)
-    | _ => ConnectProcessor(LANDING)
-    }
-  | IntegrateApp(integrate_app) =>
-    switch integrate_app {
-    | CHOOSE_INTEGRATION => ConnectProcessor(CHECKOUT)
-    | CUSTOM_INTEGRATION => IntegrateApp(CHOOSE_INTEGRATION)
-    | _ => IntegrateApp(LANDING)
-    }
-  | GoLive(_) => IntegrateApp(CUSTOM_INTEGRATION)
-  | FinalLandingPage => GoLive(GO_LIVE)
-  }
-}
-
 let stringToVariantMapperForUserData = str =>
   switch str {
   | "ProductionAgreement" => #ProductionAgreement
diff --git a/src/screens/HyperSwitch/Order/OrderEntity.res b/src/screens/HyperSwitch/Order/OrderEntity.res
index 348fe61a9..65583afef 100644
--- a/src/screens/HyperSwitch/Order/OrderEntity.res
+++ b/src/screens/HyperSwitch/Order/OrderEntity.res
@@ -1,35 +1,6 @@
 open OrderTypes
 open LogicUtils
 
-let getDateCreatedObject = () => {
-  let currentDate = Js.Date.now()
-  let filterCreatedDict = Js.Dict.empty()
-  let currentTimestamp = currentDate->Js.Date.fromFloat->Js.Date.toISOString
-  Js.Dict.set(
-    filterCreatedDict,
-    "lte",
-    Js.Json.string(currentTimestamp->TimeZoneHook.formattedISOString("YYYY-MM-DDTHH:mm:[00][Z]")),
-  )
-
-  let prevMins = {
-    let presentDayInString = Js.Date.fromFloat(currentDate)
-    let prevDateInFloat = Js.Date.getMinutes(presentDayInString) -. 30.0
-    Js.Date.setMinutes(presentDayInString, prevDateInFloat)
-  }
-
-  Js.Dict.set(
-    filterCreatedDict,
-    "gte",
-    Js.Json.string(
-      prevMins
-      ->Js.Date.fromFloat
-      ->Js.Date.toISOString
-      ->TimeZoneHook.formattedISOString("YYYY-MM-DDTHH:mm:[00][Z]"),
-    ),
-  )
-
-  Js.Json.object_(filterCreatedDict)
-}
 module CurrencyCell = {
   @react.component
   let make = (~amount, ~currency) => {
@@ -521,7 +492,14 @@ let getHeadingForSummary = summaryColType => {
     Table.makeHeaderInfo(~key="last_updated", ~title="Last Updated", ~showSort=true, ())
   | PaymentId => Table.makeHeaderInfo(~key="payment_id", ~title="Payment ID", ~showSort=true, ())
   | Currency => Table.makeHeaderInfo(~key="currency", ~title="Currency", ~showSort=true, ())
-  | ErrorCode => Table.makeHeaderInfo(~key="error_code", ~title="Error Code", ~showSort=true, ())
+  | AmountReceived =>
+    Table.makeHeaderInfo(
+      ~key="amount_received",
+      ~title="Amount Received",
+      ~description="Amount captured by the payment processor for this payment.",
+      ~showSort=true,
+      (),
+    )
   | ClientSecret =>
     Table.makeHeaderInfo(~key="client_secret", ~title="Client Secret", ~showSort=true, ())
   | ConnectorTransactionID =>
@@ -612,8 +590,7 @@ let getHeadingForOtherDetails = otherDetailsColType => {
   | Billing => Table.makeHeaderInfo(~key="billing", ~title="Billing Address", ~showSort=true, ())
   | AmountCapturable =>
     Table.makeHeaderInfo(~key="amount_capturable", ~title="AmountCapturable", ~showSort=true, ())
-  | AmountReceived =>
-    Table.makeHeaderInfo(~key="amount_received", ~title="Amount Received", ~showSort=true, ())
+  | ErrorCode => Table.makeHeaderInfo(~key="error_code", ~title="Error Code", ~showSort=true, ())
   | MandateData =>
     Table.makeHeaderInfo(~key="mandate_data", ~title="Mandate Data", ~showSort=true, ())
   | FRMName => Table.makeHeaderInfo(~key="frm_name", ~title="FRM Tag", ~showSort=true, ())
@@ -635,7 +612,13 @@ let getCellForSummary = (order, summaryColType): Table.cell => {
   | LastUpdated => Date(order.last_updated)
   | PaymentId => CustomCell(<CopyTextCustomComp displayValue=order.payment_id />, "")
   | Currency => Text(order.currency)
-  | ErrorCode => Text(order.error_code)
+  | AmountReceived =>
+    CustomCell(
+      <CurrencyCell
+        amount={(order.amount_received /. 100.0)->Belt.Float.toString} currency={order.currency}
+      />,
+      "",
+    )
   | ClientSecret => Text(order.client_secret)
   | OrderQuantity => Text(order.order_quantity)
   | ProductName => Text(order.product_name)
@@ -690,7 +673,7 @@ let getCellForOtherDetails = (order, aboutPaymentColType): Table.cell => {
   | Shipping => Text(order.shipping)
   | Billing => Text(order.billing)
   | AmountCapturable => Currency(order.amount_capturable /. 100.0, order.currency)
-  | AmountReceived => Currency(order.amount_received /. 100.0, order.currency)
+  | ErrorCode => Text(order.error_code)
   | MandateData => Text(order.mandate_data)
   | FRMName => Text(order.frm_message.frm_name)
   | FRMTransactionType => Text(order.frm_message.frm_transaction_type)
@@ -773,38 +756,7 @@ let getCell = (order, colType: colType): Table.cell => {
   }
 }
 
-let ordersDefaultCols = Recoil.atom(. "hyperSwitchOrderDefaultCols", defaultColumns)
-
-let getOptionsArr = optionObjArr => {
-  optionObjArr->Js.Array2.map(item => {
-    let temp: EntityType.optionType<'t> = {
-      urlKey: item.urlKey,
-      field: FormRenderer.makeFieldInfo(
-        ~label=item.label,
-        ~name=item.urlKey,
-        ~customInput=InputFields.textInput(),
-        (),
-      ),
-      parser: val => {
-        val
-      },
-      localFilter: None,
-    }
-    temp
-  })
-}
-
-// let options: array<EntityType.optionType<'t>> = getOptionsArr(optionObj)
-
-let getDefaultFilters = dateCreatedObject => {
-  let dict = Js.Dict.empty()
-  let filtersDict = Js.Dict.empty()
-  Js.Dict.set(filtersDict, "dateCreated", dateCreatedObject)
-  Js.Dict.set(dict, "offset", Js.Json.number(0.0))
-  Js.Dict.set(dict, "filters", Js.Json.object_(filtersDict))
-
-  Js.Json.object_(dict)
-}
+let _ = Recoil.atom(. "hyperSwitchOrderDefaultCols", defaultColumns)
 
 let itemToObjMapperForFRMDetails = dict => {
   {
@@ -876,58 +828,6 @@ let itemToObjMapper = dict => {
   }
 }
 
-let datePickerField = (~limit) => {
-  FormRenderer.makeMultiInputFieldInfo(
-    ~label="Date Range",
-    ~comboCustomInput=InputFields.dateRangeField(
-      ~startKey="filters.dateCreated.gte",
-      ~endKey="filters.dateCreated.lte",
-      ~format="YYYY-MM-DDTHH:mm:ss[Z]",
-      ~showTime=true,
-      ~disablePastDates={false},
-      ~disableFutureDates={true},
-      ~predefinedDays=[
-        Hour(0.5),
-        Hour(1.0),
-        Hour(6.0),
-        Today,
-        Yesterday,
-        Day(2.0),
-        Day(7.0),
-        Day(30.0),
-        ThisMonth,
-        LastMonth,
-      ],
-      ~numMonths=2,
-      ~disableApply=false,
-      ~dateRangeLimit=limit,
-      ~optFieldKey="filters.dateCreated.opt",
-      (),
-    ),
-    ~inputFields=[],
-    ~isRequired=true,
-    (),
-  )
-}
-
-/* let initialFilterFields: array<EntityType.initialFilters<'t>> = [
-  {
-    field: makeFieldInfo(
-      ~label="Customer Id",
-      ~name="customer_id",
-      ~customInput=orderFilterInput(),
-      ~parse=Parsers.arrayParser,
-      ~format=Formatter.numericArrayStringFormat,
-      (),
-    ),
-    localFilter: None,
-  },
-  {
-    localFilter: None,
-    field: datePickerField(~limit=7),
-  },
-] */
-
 let getOrders: Js.Json.t => array<order> = json => {
   getArrayDataFromJson(json, itemToObjMapper)
 }
diff --git a/src/screens/HyperSwitch/Order/OrderTypes.res b/src/screens/HyperSwitch/Order/OrderTypes.res
index 1bc4abf94..7981027d3 100644
--- a/src/screens/HyperSwitch/Order/OrderTypes.res
+++ b/src/screens/HyperSwitch/Order/OrderTypes.res
@@ -184,7 +184,7 @@ type summaryColType =
   | LastUpdated
   | PaymentId
   | Currency
-  | ErrorCode
+  | AmountReceived
   | ClientSecret
   | OrderQuantity
   | ProductName
@@ -206,7 +206,7 @@ type aboutPaymentColType =
 type otherDetailsColType =
   | MandateData
   | AmountCapturable
-  | AmountReceived
+  | ErrorCode
   | Shipping
   | Billing
   | Email
diff --git a/src/screens/HyperSwitch/Order/OrderUIUtils.res b/src/screens/HyperSwitch/Order/OrderUIUtils.res
index 2514bd116..51fd74096 100644
--- a/src/screens/HyperSwitch/Order/OrderUIUtils.res
+++ b/src/screens/HyperSwitch/Order/OrderUIUtils.res
@@ -19,16 +19,12 @@ module PaymentLogs = {
   let make = (~id, ~createdAt) => {
     let {auditTrail} = HyperswitchAtom.featureFlagAtom->Recoil.useRecoilValueFromAtom
     let isSmallDevice = MatchMedia.useMatchMedia("(max-width: 700px)")
-    let showPaymentLogsComp = auditTrail
 
     <div className="overflow-x-scroll">
-      <UIUtils.RenderIf condition={!isSmallDevice && showPaymentLogsComp}>
-        {HSwitchOrderUtils.eventLogHeader}
-      </UIUtils.RenderIf>
       <UIUtils.RenderIf condition={isSmallDevice}>
         <EventLogMobileView />
       </UIUtils.RenderIf>
-      <UIUtils.RenderIf condition={!isSmallDevice && showPaymentLogsComp}>
+      <UIUtils.RenderIf condition={!isSmallDevice && auditTrail}>
         <PaymentLogs paymentId=id createdAt />
       </UIUtils.RenderIf>
     </div>
@@ -46,7 +42,7 @@ module GenerateSampleDataButton = {
     let generateSampleData = async () => {
       try {
         let generateSampleDataUrl = getURL(~entityName=GENERATE_SAMPLE_DATA, ~methodType=Post, ())
-        let _generateSampleData = await updateDetails(
+        let _ = await updateDetails(
           generateSampleDataUrl,
           [("record", 50.0->Js.Json.number)]->Js.Dict.fromArray->Js.Json.object_,
           Post,
diff --git a/src/screens/HyperSwitch/Order/ShowOrder.res b/src/screens/HyperSwitch/Order/ShowOrder.res
index a159f346f..2760f41e1 100644
--- a/src/screens/HyperSwitch/Order/ShowOrder.res
+++ b/src/screens/HyperSwitch/Order/ShowOrder.res
@@ -23,15 +23,23 @@ module OrderInfo = {
       ~paymentStatus,
       ~openRefundModal,
       ~paymentId,
+      ~border="border border-jp-gray-940 border-opacity-75 dark:border-jp-gray-960",
     ) => {
       let hyperswitchMixPanel = HSMixPanel.useSendEvent()
       let typedPaymentStatus = paymentStatus->statusVariantMapper
-      <Section
-        customCssClass={`border border-jp-gray-940 border-opacity-75 dark:border-jp-gray-960 ${bgColor} rounded-md p-5 h-full`}>
+      <Section customCssClass={`${border} ${bgColor} rounded-md p-5 h-full`}>
         <UIUtils.RenderIf condition=isButtonEnabled>
           <div className="flex items-center flex-wrap gap-3 m-3">
-            <div className="md:text-5xl font-bold">
-              {`${(data.amount /. 100.00)->Belt.Float.toString} ${data.currency} `->React.string}
+            <div className="flex items-start">
+              <div className="md:text-5xl font-bold">
+                {`${(data.amount /. 100.00)->Belt.Float.toString} ${data.currency} `->React.string}
+              </div>
+              <ToolTip
+                description="Original amount that was authorized for the payment"
+                toolTipFor={<Icon name="tooltip_info" className={`mt-1 ml-1`} />}
+                toolTipPosition=Top
+                tooltipWidthClass="w-fit"
+              />
             </div>
             {getStatus(data)}
             <Button
@@ -99,11 +107,11 @@ module OrderInfo = {
               detailsFields=[
                 Created,
                 LastUpdated,
+                AmountReceived,
                 PaymentId,
                 Currency,
                 ConnectorTransactionID,
                 ClientSecret,
-                ErrorCode,
                 ErrorMessage,
               ]
               isButtonEnabled=true
@@ -139,20 +147,8 @@ module OrderInfo = {
           </div>
         </div>
       </UIUtils.RenderIf>
-      <UIUtils.RenderIf condition={isMetadata && !(order.metadata->LogicUtils.isEmptyDict)}>
-        <div className="mb-10">
-          <div className="bg-white p-5 border rounded-md">
-            <PaymentLogs.PrettyPrintJson
-              jsonToDisplay={order.metadata->Js.Json.stringifyAny->Belt.Option.getWithDefault("")}
-              headerText="Payment Metadata"
-              overrideBackgroundColor="bg-white"
-            />
-          </div>
-        </div>
-      </UIUtils.RenderIf>
       <UIUtils.RenderIf condition={isMetadata}>
         <div className="mb-10">
-          <div className={`${headingStyles}`}> {"More Payment Details"->React.string} </div>
           <Details
             data=order
             getHeading=getHeadingForOtherDetails
@@ -167,7 +163,7 @@ module OrderInfo = {
               Shipping,
               Billing,
               AmountCapturable,
-              AmountReceived,
+              ErrorCode,
               MandateData,
               MerchantId,
               ReturnUrl,
@@ -188,6 +184,7 @@ module OrderInfo = {
             openRefundModal
             widthClass="md:w-1/4 w-full"
             paymentId
+            border=""
           />
         </div>
       </UIUtils.RenderIf>
@@ -257,7 +254,7 @@ module DisputesSection = {
 module Refunds = {
   open OrderEntity
   @react.component
-  let make = (~refundDict, ~isNonRefundConnector) => {
+  let make = (~refundData) => {
     let expand = -1
     let (expandedRowIndexArray, setExpandedRowIndexArray) = React.useState(_ => [-1])
     let heading = refundColumns->Js.Array2.map(getRefundHeading)
@@ -291,8 +288,6 @@ module Refunds = {
       }
     }
 
-    let refundData =
-      refundDict->getArrayFromDict("refunds", [])->Js.Json.array->OrderEntity.getRefunds
     let rows = refundData->Js.Array2.map(item => {
       refundColumns->Js.Array2.map(colType => getRefundCell(item, colType))
     })
@@ -304,26 +299,15 @@ module Refunds = {
       }
     }
 
-    <div className="flex flex-col gap-4">
-      <p className="font-bold text-fs-16 text-jp-gray-900"> {"Refunds"->React.string} </p>
-      <CustomExpandableTable
-        title="Refunds"
-        heading
-        rows
-        onExpandIconClick
-        expandedRowIndexArray
-        getRowDetails
-        showSerial=true
-      />
-      {!isNonRefundConnector && rows->Js.Array2.length === 0
-        ? <NoDataFound message="No Refund data available" />
-        : React.null}
-      {isNonRefundConnector
-        ? <NoDataFound
-            message="Coming soon! - We are currently working on the Refund Integration with this Connector."
-          />
-        : React.null}
-    </div>
+    <CustomExpandableTable
+      title="Refunds"
+      heading
+      rows
+      onExpandIconClick
+      expandedRowIndexArray
+      getRowDetails
+      showSerial=true
+    />
   }
 }
 
@@ -438,7 +422,6 @@ module Disputes = {
       }
     }
 
-    let disputesData = disputesData->getArrayFromDict("disputes", [])->Js.Json.array->getDisputes
     let rows = disputesData->Js.Array2.map(item => {
       columnsInPaymentPage->Js.Array2.map(colType => getCell(item, colType))
     })
@@ -450,21 +433,15 @@ module Disputes = {
       }
     }
 
-    <div className="flex flex-col gap-4">
-      <p className="font-bold text-fs-16 text-jp-gray-900"> {"Disputes"->React.string} </p>
-      <CustomExpandableTable
-        title="Disputes"
-        heading
-        rows
-        onExpandIconClick
-        expandedRowIndexArray
-        getRowDetails
-        showSerial=true
-      />
-      <UIUtils.RenderIf condition={rows->Js.Array2.length === 0}>
-        <NoDataFound message="No Disputes available" />
-      </UIUtils.RenderIf>
-    </div>
+    <CustomExpandableTable
+      title="Disputes"
+      heading
+      rows
+      onExpandIconClick
+      expandedRowIndexArray
+      getRowDetails
+      showSerial=true
+    />
   }
 }
 
@@ -530,11 +507,7 @@ module FraudRiskBannerDetails = {
             (),
           )}/${decision->Js.String2.toLowerCase}`
 
-        let _decisonResponse = await updateDetails(
-          ordersDecisionUrl,
-          Js.Dict.empty()->Js.Json.object_,
-          Post,
-        )
+        let _ = await updateDetails(ordersDecisionUrl, Js.Dict.empty()->Js.Json.object_, Post)
         showToast(~message="Details Updated", ~toastType=ToastSuccess, ())
         refetch()
       } catch {
@@ -561,7 +534,7 @@ module FraudRiskBannerDetails = {
     }
 
     <div
-      className="w-full border border-jp-gray-940 border-opacity-75 dark:border-jp-gray-960 bg-white dark:bg-jp-gray-lightgray_background rounded-md p-5 h-full">
+      className="w-full bg-white dark:bg-jp-gray-lightgray_background rounded-md px-4 pb-5 h-full">
       <div
         className={`flex flex-wrap dark:bg-jp-gray-lightgray_background dark:border-jp-gray-no_data_border`}>
         {frmColumns
@@ -633,6 +606,20 @@ module FraudRiskBanner = {
   }
 }
 
+module RenderAccordian = {
+  @react.component
+  let make = (~initialExpandedArray=[], ~accordion) => {
+    <Accordion
+      initialExpandedArray
+      accordion
+      accordianTopContainerCss="border"
+      accordianBottomContainerCss="p-5"
+      contentExpandCss="px-4 py-3 !border-t-0"
+      titleStyle="font-semibold text-bold text-md"
+    />
+  }
+}
+
 @react.component
 let make = (~id) => {
   open APIUtils
@@ -650,6 +637,24 @@ let make = (~id) => {
   let orderData = OrderHooks.getOrdersData(id, refetchCounter, setScreenState)
   let order = OrderEntity.itemToObjMapper(orderData->getDictFromJsonObject)
 
+  let refundData =
+    orderData
+    ->getDictFromJsonObject
+    ->getArrayFromDict("refunds", [])
+    ->Js.Json.array
+    ->OrderEntity.getRefunds
+
+  let isRefundDataAvailable = refundData->Js.Array2.length !== 0
+
+  let disputesData =
+    orderData
+    ->getDictFromJsonObject
+    ->getArrayFromDict("disputes", [])
+    ->Js.Json.array
+    ->DisputesEntity.getDisputes
+
+  let isDisputeDataVisible = disputesData->Js.Array2.length !== 0
+
   let createdAt = React.useMemo1(() => {
     orderData->getDictFromJsonObject->getString("created", "")
   }, [orderData])
@@ -730,7 +735,7 @@ let make = (~id) => {
       customUI={<NoDataFound
         message="Payment does not exists in out record" renderType=NotFound
       />}>
-      <div className="flex flex-col gap-14">
+      <div className="flex flex-col gap-8">
         <OrderInfo
           paymentId=id
           orderDict={orderData->getDictFromJsonObject}
@@ -740,28 +745,102 @@ let make = (~id) => {
         <div className="overflow-scroll">
           <Attempts orderDict={orderData->getDictFromJsonObject} />
         </div>
+        <UIUtils.RenderIf condition={isRefundDataAvailable}>
+          <div className="overflow-scroll">
+            <RenderAccordian
+              initialExpandedArray={isRefundDataAvailable ? [0] : []}
+              accordion={[
+                {
+                  title: "Refunds",
+                  renderContent: () => {
+                    <Refunds refundData />
+                  },
+                  renderContentOnTop: None,
+                },
+              ]}
+            />
+          </div>
+        </UIUtils.RenderIf>
+        <UIUtils.RenderIf condition={isDisputeDataVisible}>
+          <div className="overflow-scroll">
+            <RenderAccordian
+              initialExpandedArray={isDisputeDataVisible ? [0] : []}
+              accordion={[
+                {
+                  title: "Disputes",
+                  renderContent: () => {
+                    <Disputes disputesData />
+                  },
+                  renderContentOnTop: None,
+                },
+              ]}
+            />
+          </div>
+        </UIUtils.RenderIf>
         <div className="overflow-scroll">
-          <Refunds
-            refundDict={orderData->getDictFromJsonObject}
-            isNonRefundConnector={isNonRefundConnector(orderData)}
+          <RenderAccordian
+            accordion={[
+              {
+                title: "FRM Details",
+                renderContent: () => {
+                  <div ref={frmDetailsRef->ReactDOM.Ref.domRef}>
+                    <FraudRiskBannerDetails order refetch />
+                  </div>
+                },
+                renderContentOnTop: None,
+              },
+            ]}
           />
         </div>
-        <div className="overflow-scroll">
-          <Disputes disputesData={orderData->getDictFromJsonObject} />
-        </div>
-        <div ref={frmDetailsRef->ReactDOM.Ref.domRef}>
-          <div className={`font-bold text-lg mb-5`}> {"FRM Details"->React.string} </div>
-          <FraudRiskBannerDetails order refetch />
-        </div>
         <UIUtils.RenderIf condition={featureFlagDetails.auditTrail}>
-          <OrderUIUtils.PaymentLogs id createdAt />
+          <RenderAccordian
+            accordion={[
+              {
+                title: "Events and logs",
+                renderContent: () => {
+                  <OrderUIUtils.PaymentLogs id createdAt />
+                },
+                renderContentOnTop: None,
+              },
+            ]}
+          />
         </UIUtils.RenderIf>
-        <OrderInfo
-          paymentId=id
-          orderDict={orderData->getDictFromJsonObject}
-          openRefundModal
-          isNonRefundConnector={isNonRefundConnector(orderData)}
-          isMetadata=true
+        <UIUtils.RenderIf condition={!(order.metadata->LogicUtils.isEmptyDict)}>
+          <RenderAccordian
+            accordion={[
+              {
+                title: "Payment Metadata",
+                renderContent: () => {
+                  <div className="bg-white p-2">
+                    <PaymentLogs.PrettyPrintJson
+                      jsonToDisplay={order.metadata
+                      ->Js.Json.stringifyAny
+                      ->Belt.Option.getWithDefault("")}
+                      overrideBackgroundColor="bg-white"
+                    />
+                  </div>
+                },
+                renderContentOnTop: None,
+              },
+            ]}
+          />
+        </UIUtils.RenderIf>
+        <RenderAccordian
+          accordion={[
+            {
+              title: "More Payment Details",
+              renderContent: () => {
+                <OrderInfo
+                  paymentId=id
+                  orderDict={orderData->getDictFromJsonObject}
+                  openRefundModal
+                  isNonRefundConnector={isNonRefundConnector(orderData)}
+                  isMetadata=true
+                />
+              },
+              renderContentOnTop: None,
+            },
+          ]}
         />
       </div>
     </PageLoaderWrapper>
diff --git a/src/screens/HyperSwitch/PaymentLogs/PaymentLogs.res b/src/screens/HyperSwitch/PaymentLogs/PaymentLogs.res
index c7de1280b..89b94d128 100644
--- a/src/screens/HyperSwitch/PaymentLogs/PaymentLogs.res
+++ b/src/screens/HyperSwitch/PaymentLogs/PaymentLogs.res
@@ -6,7 +6,7 @@ module PrettyPrintJson = {
   @react.component
   let make = (
     ~jsonToDisplay,
-    ~headerText,
+    ~headerText=None,
     ~maxHeightClass="max-h-25-rem",
     ~overrideBackgroundColor="bg-hyperswitch_background",
   ) => {
@@ -34,30 +34,37 @@ module PrettyPrintJson = {
       showToast(~message="Copied to Clipboard!", ~toastType=ToastSuccess, ())
       hyperswitchMixPanel(
         ~pageName=`${url.path->getListHead}`,
-        ~contextName=`${headerText->toCamelCase}`,
+        ~contextName=`${headerText->Belt.Option.getWithDefault("")->toCamelCase}`,
         ~actionName="copied",
         (),
       )
     }
 
+    let copyParsedJson =
+      <div onClick={_ => handleOnClickCopy(~parsedValue=parsedJson)} className="cursor-pointer">
+        <img src={`/assets/CopyToClipboard.svg`} />
+      </div>
+
     <div className="flex flex-col gap-2  my-2">
       <UIUtils.RenderIf condition={parsedJson->Js.String2.length > 0}>
         {<>
-          <div className="flex justify-between items-center">
-            <p className="font-bold text-fs-16 text-jp-gray-900 text-opacity-75">
-              {headerText->React.string}
-            </p>
-            <div
-              onClick={_ => handleOnClickCopy(~parsedValue=parsedJson)} className="cursor-pointer">
-              <img src={`/assets/CopyToClipboard.svg`} />
+          <UIUtils.RenderIf condition={headerText->Belt.Option.isSome}>
+            <div className="flex justify-between items-center">
+              <p className="font-bold text-fs-16 text-jp-gray-900 text-opacity-75">
+                {headerText->Belt.Option.getWithDefault("")->React.string}
+              </p>
+              {copyParsedJson}
             </div>
+          </UIUtils.RenderIf>
+          <div className="flex items-start justify-between">
+            <pre
+              className={`${overrideBackgroundColor} p-3 text-jp-gray-900 dark:bg-jp-gray-950 dark:bg-opacity-100 ${isTextVisible
+                  ? "overflow-visible "
+                  : `overflow-clip  h-fit ${maxHeightClass}`} text-fs-13 text font-medium`}>
+              {parsedJson->React.string}
+            </pre>
+            {copyParsedJson}
           </div>
-          <pre
-            className={`${overrideBackgroundColor} p-3 text-jp-gray-900 dark:bg-jp-gray-950 dark:bg-opacity-100 ${isTextVisible
-                ? "overflow-visible "
-                : `overflow-clip  h-fit ${maxHeightClass}`} text-fs-13 text font-medium`}>
-            {parsedJson->React.string}
-          </pre>
           <Button
             text={isTextVisible ? "Hide" : "See more"}
             customButtonStyle="h-6 w-8 flex flex-1 justify-center m-1"
@@ -68,7 +75,7 @@ module PrettyPrintJson = {
       <UIUtils.RenderIf condition={parsedJson->Js.String2.length === 0}>
         <div className="flex flex-col justify-start items-start gap-2 h-25-rem">
           <p className="font-bold text-fs-16 text-jp-gray-900 text-opacity-75">
-            {headerText->React.string}
+            {headerText->Belt.Option.getWithDefault("")->React.string}
           </p>
           <p className="font-normal text-fs-14 text-jp-gray-900 text-opacity-50">
             {"Failed to load!"->React.string}
@@ -343,7 +350,7 @@ let make = (~paymentId, ~createdAt) => {
   }
   let getDetails = async () => {
     try {
-      let _wasmResult = await Window.connectorWasmInit()
+      let _ = await Window.connectorWasmInit()
       if !(paymentId->HSwitchOrderUtils.isTestPayment) {
         fetchPaymentLogsData()->ignore
         fetchSdkLogsData()->ignore
@@ -405,7 +412,7 @@ let make = (~paymentId, ~createdAt) => {
       </div>
     } else {
       <Section
-        customCssClass={`border border-jp-gray-940 border-opacity-75 bg-white dark:bg-jp-gray-lightgray_background rounded-md p-10 flex gap-16 justify-between h-48-rem !max-h-50-rem !min-w-[55rem] overflow-scroll`}>
+        customCssClass={`bg-white dark:bg-jp-gray-lightgray_background rounded-md pt-2 pb-4 px-10 flex gap-16 justify-between h-48-rem !max-h-50-rem !min-w-[55rem] overflow-scroll`}>
         <div className="flex flex-col w-1/2 gap-12 overflow-y-scroll">
           <p className="text-lightgray_background font-semibold text-fs-16">
             {"Audit Trail"->React.string}
@@ -436,14 +443,14 @@ let make = (~paymentId, ~createdAt) => {
             <UIUtils.RenderIf condition={requestObject->Js.String2.length > 0}>
               <PrettyPrintJson
                 jsonToDisplay=requestObject
-                headerText={currentSelectedType === Payment ? "Request body" : "Event"}
+                headerText={Some(currentSelectedType === Payment ? "Request body" : "Event")}
                 maxHeightClass={responseObject->Js.String2.length > 0 ? "max-h-25-rem" : ""}
               />
             </UIUtils.RenderIf>
             <UIUtils.RenderIf condition={responseObject->Js.String2.length > 0}>
               <PrettyPrintJson
                 jsonToDisplay=responseObject
-                headerText={currentSelectedType === Payment ? "Response body" : "Metadata"}
+                headerText={Some(currentSelectedType === Payment ? "Response body" : "Metadata")}
               />
             </UIUtils.RenderIf>
           </div>
diff --git a/src/screens/HyperSwitch/PaymentLogs/PaymentUtils.res b/src/screens/HyperSwitch/PaymentLogs/PaymentUtils.res
index 0d445df67..c0b1be064 100644
--- a/src/screens/HyperSwitch/PaymentLogs/PaymentUtils.res
+++ b/src/screens/HyperSwitch/PaymentLogs/PaymentUtils.res
@@ -1,5 +1,5 @@
 // will be removed once the backend does the URl mapping
-let nameToURLMapper = (urlName, ~payment_id="", ~merchant_id="", ()) => {
+let nameToURLMapper = (urlName, ~payment_id, ~merchant_id="", ()) => {
   switch urlName {
   | "PaymentsCreate" => "/payments"
   | "PaymentsStart" => `/payments/redirect/${payment_id}/${merchant_id}`
diff --git a/src/screens/HyperSwitch/PaymentMethodDetails.res b/src/screens/HyperSwitch/PaymentMethodDetails.res
deleted file mode 100644
index 43e206387..000000000
--- a/src/screens/HyperSwitch/PaymentMethodDetails.res
+++ /dev/null
@@ -1,95 +0,0 @@
-type paymentDetails = {
-  type_: string,
-  icon: option<React.element>,
-  displayName: string,
-}
-let defaultPaymentDetails = {
-  type_: "",
-  icon: None,
-  displayName: "",
-}
-let icon = (~size=22, ~width as _=size, name) => {
-  <Icon name size=14 className="cursor-pointer" />
-}
-let details = [
-  {
-    type_: "card",
-    icon: Some(icon("default-card", ~size=19)),
-    displayName: "Card",
-  },
-  {
-    type_: "crypto_currency",
-    icon: Some(icon("crypto", ~size=19)),
-    displayName: "Crypto",
-  },
-  {
-    type_: "klarna",
-    icon: Some(icon("klarna", ~size=19)),
-    displayName: "Klarna",
-  },
-  {
-    type_: "afterpay_clearpay",
-    icon: Some(icon("afterpay", ~size=19)),
-    displayName: "After Pay",
-  },
-  {
-    type_: "affirm",
-    icon: Some(icon("affirm", ~size=19)),
-    displayName: "Affirm",
-  },
-  {
-    type_: "sofort",
-    icon: Some(icon("sofort", ~size=19)),
-    displayName: "Sofort",
-  },
-  {
-    type_: "bank_transfer",
-    icon: Some(icon("default-card", ~size=19)),
-    displayName: "ACH Bank Transfer",
-  },
-  {
-    type_: "sepa_debit",
-    icon: None,
-    displayName: "SEPA Debit",
-  },
-  {
-    type_: "giropay",
-    icon: Some(icon("giropay", ~size=19, ~width=25)),
-    displayName: "GiroPay",
-  },
-  {
-    type_: "eps",
-    icon: Some(icon("eps", ~size=19, ~width=25)),
-    displayName: "EPS",
-  },
-  {
-    type_: "ideal",
-    icon: Some(icon("ideal", ~size=19, ~width=25)),
-    displayName: "iDEAL",
-  },
-  {
-    type_: "ban_connect",
-    icon: None,
-    displayName: "Ban Connect",
-  },
-  {
-    type_: "ach_bank_debit",
-    icon: Some(icon("ach-bank-debit", ~size=19, ~width=25)),
-    displayName: "ACH Direct Debit",
-  },
-  {
-    type_: "google_pay",
-    icon: Some(icon("google_pay", ~size=25)),
-    displayName: "Google Pay",
-  },
-  // {
-  //   type_: "apple_pay",
-  //   icon: Some(icon("default-card", ~size=19)),
-  //   displayName: "Apple Pay",
-  // },
-  {
-    type_: "paypal",
-    icon: Some(icon("paypal", ~size=19)),
-    displayName: "PayPal",
-  },
-]
diff --git a/src/screens/HyperSwitch/PaymentMethodListType.res b/src/screens/HyperSwitch/PaymentMethodListType.res
index 8b70b9b75..06c7df7a6 100644
--- a/src/screens/HyperSwitch/PaymentMethodListType.res
+++ b/src/screens/HyperSwitch/PaymentMethodListType.res
@@ -28,19 +28,6 @@ type methods = {
   payment_method_types: array<paymentMethodTypes>,
 }
 
-type list = {
-  redirect_url: string,
-  payment_methods: array<methods>,
-}
-
-let defaultList = {
-  redirect_url: "",
-  payment_methods: [],
-}
-let defaultBankNames = {
-  bank_name: [],
-  eligible_connectors: [],
-}
 let getMethod = str => {
   switch str {
   | "card" => Cards
@@ -54,19 +41,6 @@ let getMethod = str => {
   }
 }
 
-let getPaymentMethodType = str => {
-  switch str {
-  | "afterpay_clearpay" => AfterPay
-  | "klarna" => Klarna
-  | "affirm" => Affirm
-  | "apple_pay" => ApplePay
-  | "google_pay" => Gpay
-  | "credit" => Card(Credit)
-  | "debit" => Card(Debit)
-  | "crypto_currency" => CryptoCurrency
-  | _ => NONE
-  }
-}
 let getPaymentExperienceType = str => {
   switch str {
   | "redirect_to_url" => RedirectToURL
@@ -146,47 +120,3 @@ let getMethodsArr = (dict, str) => {
     }
   })
 }
-
-let itemToObjMapper = dict => {
-  {
-    redirect_url: getString(dict, "redirect_url", ""),
-    payment_methods: getMethodsArr(dict, "payment_methods"),
-  }
-}
-
-let paymentListLookup = (arr: array<methods>, ~order) => {
-  let (otherPaymentList, walletsList) = arr->Array.reduce(([], []), (
-    (otherPaymentList, walletsList),
-    method,
-  ) => {
-    switch method.payment_method {
-    | Cards => otherPaymentList->Array.push("card")
-    | Wallets =>
-      method.payment_method_types
-      ->Js.Array2.map(item => walletsList->Array.push(item.payment_method_type))
-      ->ignore
-    | PayLater =>
-      method.payment_method_types
-      ->Js.Array2.map(item => otherPaymentList->Array.push(item.payment_method_type))
-      ->ignore
-    | BankDebit
-    | BankTransfer
-    | BankRedirect =>
-      method.payment_method_types
-      ->Js.Array2.map(item => otherPaymentList->Array.push(item.payment_method_type))
-      ->ignore
-    | Crypto =>
-      method.payment_method_types
-      ->Js.Array2.map(item => otherPaymentList->Array.push(item.payment_method_type))
-      ->ignore
-    | NONE => ()
-    }
-    (otherPaymentList, walletsList)
-  })
-
-  (
-    walletsList->LogicUtils.removeDuplicate->LogicUtils.sortBasedOnPriority(order),
-    otherPaymentList->LogicUtils.removeDuplicate->LogicUtils.sortBasedOnPriority(order),
-    // ["card", "bank_transfer"],
-  )
-}
diff --git a/src/screens/HyperSwitch/PostLoginScreen/PostLoginScreen.res b/src/screens/HyperSwitch/PostLoginScreen/PostLoginScreen.res
index 333ddc14b..774f22dd0 100644
--- a/src/screens/HyperSwitch/PostLoginScreen/PostLoginScreen.res
+++ b/src/screens/HyperSwitch/PostLoginScreen/PostLoginScreen.res
@@ -111,7 +111,7 @@ let make = () => {
         (),
       )
 
-      let _responseJson = await updateDetails(
+      let _ = await updateDetails(
         postLoginSurveyUrl,
         values->generateSurveyJson->Js.Json.object_,
         Post,
diff --git a/src/screens/HyperSwitch/PostLoginScreen/PostLoginUtils.res b/src/screens/HyperSwitch/PostLoginScreen/PostLoginUtils.res
index 311351d32..59c0ae490 100644
--- a/src/screens/HyperSwitch/PostLoginScreen/PostLoginUtils.res
+++ b/src/screens/HyperSwitch/PostLoginScreen/PostLoginUtils.res
@@ -8,7 +8,6 @@ let defaultValueForQuestions: questionsType = {
   options: [],
   key: "",
 }
-let userName = HSLocalStorage.getFromUserDetails("name")
 let userRoleQuestions: questionsType = {
   question: `What role fits you well?`,
   options: [
diff --git a/src/screens/HyperSwitch/Recon/Recon.res b/src/screens/HyperSwitch/Recon/Recon.res
index af84b8b66..58e070606 100644
--- a/src/screens/HyperSwitch/Recon/Recon.res
+++ b/src/screens/HyperSwitch/Recon/Recon.res
@@ -17,7 +17,7 @@ let make = () => {
     try {
       let url = getURL(~entityName=RECON, ~reconType=#REQUEST, ~methodType=Get, ())
       let _ = await updateDetails(url, Js.Json.null, Post)
-      let _merchantDetails = await fetchMerchantAccountDetails()
+      let _ = await fetchMerchantAccountDetails()
       showToast(
         ~message=`Thank you for your interest in our reconciliation module. We are currently reviewing your request for access. We will follow up with you soon regarding next steps.`,
         ~toastType=ToastSuccess,
diff --git a/src/screens/HyperSwitch/Refunds/RefundEntity.res b/src/screens/HyperSwitch/Refunds/RefundEntity.res
index 45b6d9991..a54da52c2 100644
--- a/src/screens/HyperSwitch/Refunds/RefundEntity.res
+++ b/src/screens/HyperSwitch/Refunds/RefundEntity.res
@@ -2,11 +2,6 @@ open LogicUtils
 open HelperComponents
 open HSwitchOrderUtils
 
-type refundMetaData = {
-  udf1: string,
-  new_customer: string,
-  login_date: string,
-}
 type refunds = {
   refund_id: string,
   payment_id: string,
@@ -36,21 +31,6 @@ type refundsColType =
   | MetaData
   | ConnectorName
 
-let refunditemToObjMapper = dict => {
-  amount: getFloat(dict, "amount", 0.0),
-  created_at: getString(dict, "created_at", ""),
-  currency: getString(dict, "currency", ""),
-  error_message: getString(dict, "error_message", ""),
-  metadata: getString(dict, "metadata", ""),
-  payment_id: getString(dict, "payment_id", ""),
-  reason: getString(dict, "reason", ""),
-  refund_id: getString(dict, "refund_id", ""),
-  status: getString(dict, "status", ""),
-  updated_at: getString(dict, "updated_at", ""),
-  error_code: getString(dict, "error_code", ""),
-  connector: getString(dict, "connector", ""),
-}
-
 let defaultColumns = [RefundId, Amount, RefundStatus, PaymentId, Created]
 
 let refundsMapDefaultCols = Recoil.atom(. "refundsMapDefaultCols", defaultColumns)
@@ -167,8 +147,6 @@ let getCell = (refundData, colType): Table.cell => {
   }
 }
 
-let refundDefaultCols = Recoil.atom(. "hyperSwitchRefundDefaultCols", defaultColumns)
-
 let itemToObjMapper = dict => {
   {
     amount: getFloat(dict, "amount", 0.0),
diff --git a/src/screens/HyperSwitch/SDKPayment/TestCredentials.res b/src/screens/HyperSwitch/SDKPayment/TestCredentials.res
index 80878a989..fefab5baf 100644
--- a/src/screens/HyperSwitch/SDKPayment/TestCredentials.res
+++ b/src/screens/HyperSwitch/SDKPayment/TestCredentials.res
@@ -38,7 +38,9 @@ let make = () => {
         <div
           className="flex items-center cursor-pointer text-blue-600 dark:text-blue-500 hover:underline"
           onClick={_ => {
-            Window._open("https://hyperswitch.io/docs/paymentMethods/testCredentials")
+            Window._open(
+              "https://docs.hyperswitch.io/hyperswitch-cloud/connectors/test-a-payment-with-connector",
+            )
           }}>
           {"Test creds for other connectors here"->React.string}
           <img src={`/icons/open-new-tab.svg`} />
diff --git a/src/screens/HyperSwitch/SelfServe/HSwitchProdOnboarding/ProdOnboardingLanding.res b/src/screens/HyperSwitch/SelfServe/HSwitchProdOnboarding/ProdOnboardingLanding.res
index 1d8234161..2f80756c5 100644
--- a/src/screens/HyperSwitch/SelfServe/HSwitchProdOnboarding/ProdOnboardingLanding.res
+++ b/src/screens/HyperSwitch/SelfServe/HSwitchProdOnboarding/ProdOnboardingLanding.res
@@ -2,7 +2,6 @@ let unselectedNormalText = "text-base font-normal text-grey-700 opacity-50"
 let selectedNormalText = "text-base font-medium text-grey-700 "
 let dividerColor = "bg-grey-700 bg-opacity-20 h-px w-full"
 let unselectedSubHeading = "text-lg font-normal text-grey-700 "
-let selectedSubHeading = "text-lg font-normal text-blue-700 "
 
 module CheckListSection = {
   open ProdOnboardingUtils
diff --git a/src/screens/HyperSwitch/SelfServe/HSwitchProdOnboarding/ProdOnboardingUtils.res b/src/screens/HyperSwitch/SelfServe/HSwitchProdOnboarding/ProdOnboardingUtils.res
index fb5620301..0753b4031 100644
--- a/src/screens/HyperSwitch/SelfServe/HSwitchProdOnboarding/ProdOnboardingUtils.res
+++ b/src/screens/HyperSwitch/SelfServe/HSwitchProdOnboarding/ProdOnboardingUtils.res
@@ -27,7 +27,6 @@ let getPageView = index => {
   | SETUP_WEBHOOK_PROCESSOR => REPLACE_API_KEYS
   | REPLACE_API_KEYS => SETUP_WEBHOOK_USER
   | SETUP_WEBHOOK_USER => SETUP_COMPLETED
-  // | TEST_LIVE_PAYMENT => SETUP_COMPLETED
   | _ => SETUP_COMPLETED
   }
 }
@@ -39,8 +38,6 @@ let getBackPageView = index => {
   | SETUP_WEBHOOK_PROCESSOR => SETUP_CREDS
   | REPLACE_API_KEYS => SETUP_WEBHOOK_PROCESSOR
   | SETUP_WEBHOOK_USER => REPLACE_API_KEYS
-  // | TEST_LIVE_PAYMENT => SETUP_WEBHOOK_USER
-  // | SETUP_COMPLETED => TEST_LIVE_PAYMENT
   | _ => SETUP_COMPLETED
   }
 }
@@ -138,16 +135,6 @@ let getWarningBlockForConnector = connectorName => {
   }
 }
 
-let getFirstSubVariant = (parentVariant: ProdOnboardingTypes.sectionHeadingVariant) => {
-  open ProdOnboardingTypes
-  switch parentVariant {
-  | #SetupProcessor => SELECT_PROCESSOR
-  | #ConfigureEndpoint => REPLACE_API_KEYS
-  | #SetupComplete => SETUP_COMPLETED
-  | #ProductionAgreement => SELECT_PROCESSOR
-  }
-}
-
 let getProdApiBody = (
   ~parentVariant: ProdOnboardingTypes.sectionHeadingVariant,
   ~connectorId="",
@@ -176,15 +163,6 @@ let getProdApiBody = (
     ]
     ->Js.Dict.fromArray
     ->Js.Json.object_
-  // | #SetupComplete =>
-  //   [
-  //     (
-  //       (parentVariant :> string),
-  //       [("paymentId", paymentId->Js.Json.string)]->Js.Dict.fromArray->Js.Json.object_,
-  //     ),
-  //   ]
-  //   ->Js.Dict.fromArray
-  //   ->Js.Json.object_
   | _ => (parentVariant :> string)->Js.Json.string
   }
 }
diff --git a/src/screens/HyperSwitch/SelfServe/HSwitchProdOnboarding/SetupConnectorCredentials.res b/src/screens/HyperSwitch/SelfServe/HSwitchProdOnboarding/SetupConnectorCredentials.res
index d2168fcd0..53a8e51a1 100644
--- a/src/screens/HyperSwitch/SelfServe/HSwitchProdOnboarding/SetupConnectorCredentials.res
+++ b/src/screens/HyperSwitch/SelfServe/HSwitchProdOnboarding/SetupConnectorCredentials.res
@@ -1,7 +1,6 @@
 let headerTextStyle = "text-xl font-semibold text-grey-700"
 let subTextStyle = "text-base font-normal text-grey-700 opacity-50"
 let dividerColor = "bg-grey-700 bg-opacity-20 h-px w-full"
-let highlightedText = "text-base font-normal text-blue-700 underline"
 
 module ConnectorDetailsForm = {
   open ConnectorUtils
@@ -124,10 +123,16 @@ let make = (~selectedConnector, ~pageView, ~setPageView, ~setConnectorID) => {
   let (initialValues, setInitialValues) = React.useState(_ => Js.Json.null)
 
   let getDetails = async () => {
-    let _wasmResult = await Window.connectorWasmInit()
-    let val = connectorName->Window.getConnectorConfig
-    setConnectorDetails(_ => val)
-    setScreenState(_ => Success)
+    try {
+      let _ = await Window.connectorWasmInit()
+      let val = connectorName->Window.getConnectorConfig
+      setConnectorDetails(_ => val)
+      setScreenState(_ => Success)
+    } catch {
+    | Js.Exn.Error(e) =>
+      let err = Js.Exn.message(e)->Belt.Option.getWithDefault("Something went wrong!")
+      setScreenState(_ => PageLoaderWrapper.Error(err))
+    }
   }
   let url = RescriptReactRouter.useUrl()
   let updateDetails = useUpdateMethod(~showErrorToast=false, ())
diff --git a/src/screens/HyperSwitch/SelfServe/HSwitchSandboxOnboarding/UserOnboardingUIUtils.res b/src/screens/HyperSwitch/SelfServe/HSwitchSandboxOnboarding/UserOnboardingUIUtils.res
index d07bd6a18..4b0f88bf5 100644
--- a/src/screens/HyperSwitch/SelfServe/HSwitchSandboxOnboarding/UserOnboardingUIUtils.res
+++ b/src/screens/HyperSwitch/SelfServe/HSwitchSandboxOnboarding/UserOnboardingUIUtils.res
@@ -1034,7 +1034,7 @@ let getTabsForIntegration = (
             }
           }
           let skipOnboarding = async path => {
-            let _skipOnboarding = await skipAndContinue()
+            let _ = await skipAndContinue()
             Window._open(path)
           }
           <div>
diff --git a/src/screens/HyperSwitch/SelfServe/HSwitchSandboxOnboarding/UserOnboardingUtils.res b/src/screens/HyperSwitch/SelfServe/HSwitchSandboxOnboarding/UserOnboardingUtils.res
index 261db46a0..7f65456f3 100644
--- a/src/screens/HyperSwitch/SelfServe/HSwitchSandboxOnboarding/UserOnboardingUtils.res
+++ b/src/screens/HyperSwitch/SelfServe/HSwitchSandboxOnboarding/UserOnboardingUtils.res
@@ -16,8 +16,6 @@ let integrateFromScratchBackEndlang: array<languages> = [
 
 let platforms: array<platforms> = [#Web, #IOS, #Android, #BigCommerce, #ReactNative]
 let requestOnlyPlatforms: array<platforms> = [#BigCommerce, #IOS, #Android, #ReactNative]
-let frontendLangForGithub: array<languages> = [#ReactJs, #HTML, #Next]
-let backendLangForGithub: array<languages> = [#Node, #Ruby, #Java, #Python, #Net, #Php]
 
 let getContentBasedOnIndex = (~currentRoute, ~tabIndex) =>
   switch currentRoute {
diff --git a/src/screens/HyperSwitch/Settings/HSwitchSettings.res b/src/screens/HyperSwitch/Settings/HSwitchSettings.res
index 325a76cb0..e1e752991 100644
--- a/src/screens/HyperSwitch/Settings/HSwitchSettings.res
+++ b/src/screens/HyperSwitch/Settings/HSwitchSettings.res
@@ -30,11 +30,7 @@ module TileComponent = {
     let deleteSampleData = async () => {
       try {
         let generateSampleDataUrl = getURL(~entityName=GENERATE_SAMPLE_DATA, ~methodType=Delete, ())
-        let _generateSampleData = await updateDetails(
-          generateSampleDataUrl,
-          Js.Dict.empty()->Js.Json.object_,
-          Delete,
-        )
+        let _ = await updateDetails(generateSampleDataUrl, Js.Dict.empty()->Js.Json.object_, Delete)
         showToast(~message="Sample data deleted successfully", ~toastType=ToastSuccess, ())
       } catch {
       | _ => ()
diff --git a/src/screens/HyperSwitch/Settings/MerchantAccountUtils.res b/src/screens/HyperSwitch/Settings/MerchantAccountUtils.res
index e942288ba..e8f7e80b8 100644
--- a/src/screens/HyperSwitch/Settings/MerchantAccountUtils.res
+++ b/src/screens/HyperSwitch/Settings/MerchantAccountUtils.res
@@ -498,15 +498,6 @@ let businessProfileNameDropDownOption = arrBusinessProfile =>
     obj
   })
 
-let businessProfileIdDropDownOption = arrBusinessProfile =>
-  arrBusinessProfile->Js.Array2.map(ele => {
-    let obj: SelectBox.dropdownOption = {
-      label: ele.profile_id,
-      value: ele.profile_id,
-    }
-    obj
-  })
-
 let useFetchBusinessProfiles = () => {
   open APIUtils
   let fetchDetails = useGetMethod()
diff --git a/src/screens/HyperSwitch/SetupAccount/HSwitchSetupAccount.res b/src/screens/HyperSwitch/SetupAccount/HSwitchSetupAccount.res
index 3e2b9b72a..60a9a6b4e 100644
--- a/src/screens/HyperSwitch/SetupAccount/HSwitchSetupAccount.res
+++ b/src/screens/HyperSwitch/SetupAccount/HSwitchSetupAccount.res
@@ -82,11 +82,7 @@ let make = () => {
 
       // *GENERATE_SAMPLE_DATA
       let generateSampleDataUrl = getURL(~entityName=GENERATE_SAMPLE_DATA, ~methodType=Post, ())
-      let _generateSampleData = await updateDetails(
-        generateSampleDataUrl,
-        Js.Dict.empty()->Js.Json.object_,
-        Post,
-      )
+      let _ = await updateDetails(generateSampleDataUrl, Js.Dict.empty()->Js.Json.object_, Post)
       setStepCounter(_ => #GENERATE_SAMPLE_DATA)
       await delay(delayTime)
       setStepCounter(_ => #COMPLETED)
diff --git a/src/screens/HyperSwitch/Utils/HSwitchGlobalSearchBar.res b/src/screens/HyperSwitch/Utils/HSwitchGlobalSearchBar.res
index 568902e8f..5e0dbd867 100644
--- a/src/screens/HyperSwitch/Utils/HSwitchGlobalSearchBar.res
+++ b/src/screens/HyperSwitch/Utils/HSwitchGlobalSearchBar.res
@@ -1,29 +1,25 @@
-let matchInSearchOption = (searchOptions, searchText, name, link, ~sectionName="", ()) => {
+let matchInSearchOption = (searchOptions, searchText, name, link, ~sectionName, ()) => {
   open LogicUtils
-
-  let valueReturned =
-    searchOptions
-    ->Belt.Option.getWithDefault([])
-    ->Js.Array2.filter(item => {
-      let (searchKey, _redirection) = item
-      checkStringStartsWithSubstring(~itemToCheck=searchKey, ~searchText)
-    })
-    ->Js.Array2.map(item => {
-      let (searchKey, redirection) = item
-      [
-        (
-          "elements",
-          [
-            sectionName->Js.Json.string,
-            name->Js.Json.string,
-            searchKey->Js.Json.string,
-          ]->Js.Json.array,
-        ),
-        ("redirect_link", `${link}${redirection}`->Js.Json.string),
-      ]->Js.Dict.fromArray
-    })
-
-  valueReturned
+  searchOptions
+  ->Belt.Option.getWithDefault([])
+  ->Js.Array2.filter(item => {
+    let (searchKey, _redirection) = item
+    checkStringStartsWithSubstring(~itemToCheck=searchKey, ~searchText)
+  })
+  ->Js.Array2.map(item => {
+    let (searchKey, redirection) = item
+    [
+      (
+        "elements",
+        [
+          sectionName->Js.Json.string,
+          name->Js.Json.string,
+          searchKey->Js.Json.string,
+        ]->Js.Json.array,
+      ),
+      ("redirect_link", `${link}${redirection}`->Js.Json.string),
+    ]->Js.Dict.fromArray
+  })
 }
 
 module RenderedComponent = {
diff --git a/src/screens/HyperSwitch/Utils/MilestoneAchievedCard.res b/src/screens/HyperSwitch/Utils/MilestoneAchievedCard.res
deleted file mode 100644
index c36b52bac..000000000
--- a/src/screens/HyperSwitch/Utils/MilestoneAchievedCard.res
+++ /dev/null
@@ -1,59 +0,0 @@
-open LottieFiles
-let confettiJson = "successConfetti.json"
-@react.component
-let make = (
-  ~headingModule="",
-  ~subText="",
-  ~buttonText: option<string>=?,
-  ~customBackButtonRoute,
-) => {
-  let confettiGif = useLottieJson(confettiJson)
-  let url = RescriptReactRouter.useUrl()
-  let hyperswitchMixPanel = HSMixPanel.useSendEvent()
-  let currentPageName = url.path->LogicUtils.getListHead
-
-  <div
-    className="relative flex flex-row border-l-4 border-milestone_card_border bg-white gap-4 rounded-md px-8  pt-4 pb-8 w-10/12 lg:w-successCardWidth h-fit my-6 items-center">
-    <div className="flex flex-col  gap-2">
-      <Icon name="successTag" size=30 className="w-40" />
-      <div className=" flex flex-col w-full gap-4 flex-wrap">
-        <p className="text-grey-700 text-fs-20 font-semibold ">
-          {`Congrats on your ${headingModule}`->React.string}
-        </p>
-        <p className="text-grey-700 opacity-50 font-medium"> {subText->React.string} </p>
-        <div className="flex mt-4 gap-4 flex-col lg:flex-row ">
-          <ProdIntentForm isFromMilestoneCard=true />
-          {switch buttonText {
-          | Some(buttonText) =>
-            <Button
-              text=buttonText
-              buttonType=Secondary
-              customButtonStyle="py-1 px-14 !bg-jp-gray-button_gray rounded-sm border-jp-gray-border_gray"
-              buttonSize={Small}
-              onClick={_ => {
-                if Js.String.startsWith("https", customBackButtonRoute) {
-                  Window._open(customBackButtonRoute)
-                } else if currentPageName->Js.String2.length > 0 {
-                  [currentPageName, "global"]->Js.Array2.forEach(ele =>
-                    hyperswitchMixPanel(
-                      ~pageName=ele,
-                      ~contextName="milestoneachieved",
-                      ~actionName="makeapayment",
-                      (),
-                    )
-                  )
-                }
-              }}
-            />
-          | None => React.null
-          }}
-        </div>
-      </div>
-    </div>
-    <div className=" hidden lg:block">
-      <ReactSuspenseWrapper>
-        <Lottie autoplay=true loop=true animationData=confettiGif />
-      </ReactSuspenseWrapper>
-    </div>
-  </div>
-}