chore: merge main & resolve conflict

juspay · Sep 25, 2024 · b51a346 · b51a346
1 parent 5e66d50
commit b51a346
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git 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
@@ -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>