From 3a4caceeb30c495e1f358e1e9da6040b334f2996 Mon Sep 17 00:00:00 2001
From: sriharsh05 <sriharsh.harsha5@gmail.com>
Date: Wed, 10 Jan 2024 21:32:17 +0530
Subject: [PATCH 1/2] fix close Button in Treatment Summary

---
 src/Components/Facility/TreatmentSummary.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Components/Facility/TreatmentSummary.tsx b/src/Components/Facility/TreatmentSummary.tsx
index 8f1589cdf6f..6142417399d 100644
--- a/src/Components/Facility/TreatmentSummary.tsx
+++ b/src/Components/Facility/TreatmentSummary.tsx
@@ -11,6 +11,8 @@ import { PatientModel } from "../Patient/models";
 
 import { GENDER_TYPES } from "../../Common/constants";
 import { formatAge, formatDate, formatDateTime } from "../../Utils/utils";
+import useSlug from "../../Common/hooks/useSlug";
+import { navigate } from "raviger";
 
 const Loading = lazy(() => import("../Common/Loading"));
 
@@ -25,6 +27,7 @@ const TreatmentSummary = (props: any) => {
   const [isLoading, setIsLoading] = useState(false);
   const [investigations, setInvestigations] = useState<Array<any>>([]);
   const [dailyRounds, setDailyRounds] = useState<any>({});
+  const facilityId = useSlug("facility");
 
   const fetchPatientData = useCallback(
     async (status: statusType) => {
@@ -105,7 +108,11 @@ const TreatmentSummary = (props: any) => {
               <i className="fas fa-print mr-2"></i> Print Treatment Summary
             </button>
             <button
-              onClick={(_) => window.history.go(-1)}
+              onClick={(_) =>
+                navigate(
+                  `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}`
+                )
+              }
               className="btn btn-default"
             >
               <i className="fas fa-times mr-2"></i> Close

From 836a281ab8c0bd21d0b2564157914b1865738b2e Mon Sep 17 00:00:00 2001
From: sriharsh05 <sriharsh.harsha5@gmail.com>
Date: Thu, 11 Jan 2024 18:01:29 +0530
Subject: [PATCH 2/2] replace navigate with goBack from appHistory for close
 button

---
 src/Components/Facility/TreatmentSummary.tsx | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/Components/Facility/TreatmentSummary.tsx b/src/Components/Facility/TreatmentSummary.tsx
index 6142417399d..f41f540a12d 100644
--- a/src/Components/Facility/TreatmentSummary.tsx
+++ b/src/Components/Facility/TreatmentSummary.tsx
@@ -12,7 +12,7 @@ import { PatientModel } from "../Patient/models";
 import { GENDER_TYPES } from "../../Common/constants";
 import { formatAge, formatDate, formatDateTime } from "../../Utils/utils";
 import useSlug from "../../Common/hooks/useSlug";
-import { navigate } from "raviger";
+import useAppHistory from "../../Common/hooks/useAppHistory";
 
 const Loading = lazy(() => import("../Common/Loading"));
 
@@ -28,6 +28,8 @@ const TreatmentSummary = (props: any) => {
   const [investigations, setInvestigations] = useState<Array<any>>([]);
   const [dailyRounds, setDailyRounds] = useState<any>({});
   const facilityId = useSlug("facility");
+  const { goBack } = useAppHistory();
+  const url = `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}`;
 
   const fetchPatientData = useCallback(
     async (status: statusType) => {
@@ -107,14 +109,7 @@ const TreatmentSummary = (props: any) => {
             >
               <i className="fas fa-print mr-2"></i> Print Treatment Summary
             </button>
-            <button
-              onClick={(_) =>
-                navigate(
-                  `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}`
-                )
-              }
-              className="btn btn-default"
-            >
+            <button onClick={(_) => goBack(url)} className="btn btn-default">
               <i className="fas fa-times mr-2"></i> Close
             </button>
           </div>