fix: back button

src/pages/Payment/Payment.tsx

@@ -65,6 +65,7 @@ export default function Payment() {
   const [paymentLink, setPaymentLink] = useState<string>("");
   const [fromSquiz, setIsFromSquiz] = useState<boolean>(false);
   const location = useLocation();
+  console.log("location", location);
   const verificationStatus = useUserStore((state) => state.verificationStatus);
   const userId = useUserStore((state) => state.userId);
   const navigate = useNavigate();
@@ -85,7 +86,9 @@ export default function Payment() {
       setIsFromSquiz(true);
       setPaymentValueField((Number(params.get("dif") || "0") / 100).toString());
     }
-    history.pushState(null, document.title, "/payment");
+    navigate(`/payment`, {
+      replace: true,
+    });
   }, []);
 
   async function handleChoosePaymentClick() {
@@ -181,14 +184,12 @@ export default function Payment() {
           gap: "10px",
         }}
       >
-        {!upMd && location.key !== "default" && (
         <IconButton
           onClick={handleCustomBackNavigation}
           sx={{ p: 0, height: "28px", width: "28px", color: "black" }}
         >
           <ArrowBackIcon />
         </IconButton>
-        )}
         <Typography variant="h4">Способ оплаты</Typography>
       </Box>
       {!upMd && (

src/pages/QuizPayment/QuizPayment.tsx

@@ -60,7 +60,9 @@ export default function QuizPayment() {
 
 
   if (first) {
-    history.pushState(null, document.title, "/quizpayment");
+    navigate(`/quizpayment`, {
+      replace: true,
+    });
     try {
       first = false;
 

src/utils/hooks/useHistoryTracker.ts

@@ -16,7 +16,6 @@ export const useHistoryTracker = () => {
 
   const handleCustomBackNavigation = () => {
     const historyJSON = localStorage.getItem("history");
-    // debugger;
 
     if (historyJSON) {
       const history = JSON.parse(historyJSON);
@@ -28,15 +27,13 @@ export const useHistoryTracker = () => {
           return;
         }
 
-        if (location.search.includes("squizpay")) {
+        navigate(-1);
-          navigate(-3);
+      }
 
       return;
     }
 
     navigate(-1);
-      }
-    }
   };
 
   return handleCustomBackNavigation;