From b51a34617c7e73dc9d1fad9f56bb77ae6af2a3ca Mon Sep 17 00:00:00 2001
From: gitanjli525 <gitanjli525@gmail.com>
Date: Wed, 25 Sep 2024 15:22:48 +0530
Subject: [PATCH] chore: merge main & resolve conflict

---
 src/screens/APIUtils/APIUtils.res |  6 +++---
 src/screens/Refunds/Refund.res    | 12 +++++-------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/screens/APIUtils/APIUtils.res b/src/screens/APIUtils/APIUtils.res
index b9c05627e..4f495436e 100644
--- a/src/screens/APIUtils/APIUtils.res
+++ b/src/screens/APIUtils/APIUtils.res
@@ -184,9 +184,9 @@ let useGetURL = () => {
       | Get =>
         switch queryParamerters {
         | Some(queryParams) =>
-          switch (transactionEntity, userManagementRevamp) {
-          | (#Merchant, true) => `refunds/aggregate?${queryParams}`
-          | (#Profile, true) => `refunds/profile/aggregate?${queryParams}`
+          switch transactionEntity {
+          | #Merchant => `refunds/aggregate?${queryParams}`
+          | #Profile => `refunds/profile/aggregate?${queryParams}`
           | _ => `refunds/aggregate?${queryParams}`
           }
         | None => `refunds/aggregate`
diff --git a/src/screens/Refunds/Refund.res b/src/screens/Refunds/Refund.res
index 637c399e8..cd51bd0d1 100644
--- a/src/screens/Refunds/Refund.res
+++ b/src/screens/Refunds/Refund.res
@@ -69,13 +69,11 @@ let make = () => {
       <div className="flex justify-between items-center">
         <PageUtils.PageHeading title="Refunds" subTitle="" />
         <div className="flex gap-4">
-          <RenderIf condition={userManagementRevamp}>
-            <OMPSwitchHelper.OMPViews
-              views={OMPSwitchUtils.transactionViewList(~checkUserEntity)}
-              selectedEntity={transactionEntity}
-              onChange={updateTransactionEntity}
-            />
-          </RenderIf>
+          <OMPSwitchHelper.OMPViews
+            views={OMPSwitchUtils.transactionViewList(~checkUserEntity)}
+            selectedEntity={transactionEntity}
+            onChange={updateTransactionEntity}
+          />
           <RenderIf condition={generateReport && refundData->Array.length > 0}>
             <GenerateReport entityName={REFUND_REPORT} />
           </RenderIf>