Merge branch 'clonestaging' into staging

package.json

@@ -33,8 +33,8 @@
         "moment": "^2.30.1",
         "notistack": "^3.0.1",
         "pdfjs-dist": "3.6.172",
-        "react": "^18.2.0",
+        "react": "^18.3.1",
-        "react-dom": "^18.2.0",
+        "react-dom": "^18.3.1",
         "react-error-boundary": "^4.0.11",
         "react-pdf": "^7.1.2",
         "react-router-dom": "^6.15.0",
@@ -60,6 +60,7 @@
         "@typescript-eslint/eslint-plugin": "^6.9.1",
         "@typescript-eslint/parser": "^6.9.1",
         "craco-alias": "^3.0.1",
+        "docz": "^2.4.0",
         "eslint": "^8.53.0",
         "eslint-plugin-react": "^7.33.2",
         "jest": "^29.5.0",

src/components/FloatingSupportChat/Chat.tsx

@@ -421,14 +421,14 @@ export default function Chat({ open = false, onclickArrow, sx }: Props) {
               >
                 онлайн-консультант
               </Typography>
-              <Typography
+              {/* <Typography
                 sx={{
                   fontSize: "16px",
                   lineHeight: "19px",
                 }}
               >
                 время работы 10:00-3:00 по мск
-              </Typography>
+              </Typography> */}
             </Box>
           </Box>
           <Box

src/components/ProtectedLayout.tsx

@@ -23,6 +23,8 @@ import { setPrivileges } from "@root/stores/privileges";
 import { useHistoryData } from "@root/utils/hooks/useHistoryData";
 import { useSSETab } from "@root/utils/hooks/useSSETab";
 
+const API_URL = `${process.env.REACT_APP_DOMAIN}/strator`;
+
 export default function ProtectedLayout() {
   const token = useToken();
   const ticketApiPage = useTicketStore((state) => state.apiPage);
@@ -65,6 +67,7 @@ export default function ProtectedLayout() {
   useAllTariffsFetcher({
     baseUrl: process.env.REACT_APP_DOMAIN + "/strator/tariff/getList",
     onSuccess: updateTariffs,
+    baseUrl: `${API_URL}/tariff/getList`,
     onError: (error) => {
       const errorMessage = getMessageFromFetchError(error);
       if (errorMessage) enqueueSnackbar(errorMessage);

src/index.tsx

@@ -125,10 +125,6 @@ const App = () => {
 
   useAfterPay()
 
-console.log("location")
-console.log(location)
-console.log("window.location")
-console.log(window.location)
 
   if (location.state?.redirectTo)
     return (

src/pages/Payment/Payment.tsx

@@ -128,6 +128,7 @@ export default function Payment() {
         setWarnModalOpen(true);
         return;
       }
+      
       startPayRS()
     } else {
       startPayCard()
@@ -140,12 +141,10 @@ export default function Payment() {
     );
 
     if (sendRSPaymentResponse) {
-      return enqueueSnackbar(sendRSPaymentResponse);
+      return enqueueSnackbar(sendRSPaymentResponse === "OK" ? "Cпасибо за заявку, в течении 24 часов вам будет выставлен счёт для оплаты услуг." : sendRSPaymentResponse);
     }
 
-    enqueueSnackbar(
+    enqueueSnackbar("Проверьте статус верификации или обратитесь в техподдержку");
-      "Cпасибо за заявку, в течении 24 часов вам будет выставлен счёт для оплаты услуг."
-    );
 
     navigate("/settings");
   }

src/utils/hooks/useAutoPay.ts

@@ -14,7 +14,6 @@ export const useAfterPay = () => {
   const userAccount = useUserStore(state => state.userAccount);
   const siteReadyPayCart = useNotEnoughMoneyAmount(state => state.siteReadyPayCart);
    const cartTariffs = useCartTariffs();
-  console.log("cartTariffs")
   // console.log(cartTariffs)
   // const isCC = cartTariffs !== null && cartTariffs !== undefined && cartTariffs.length > 0 && cartTariffs.some(t => t.privileges[0].privilegeId === "quizManual")
 

src/utils/jsonToFormdata.ts

@@ -26,8 +26,6 @@ export const jsonToFormdata = (
 ): FormData => {
 	const formData = new FormData()
 	if (json.egrule !== undefined) delete json.egrule
-	console.log("json")
-	console.log(json)
 
 	for (const key in json) {
 		if (!key) continue
@@ -43,7 +41,5 @@ export const jsonToFormdata = (
 
 		formData.append(key, value)
 	}
-console.log("formData")
-console.log(formData)
 	return formData
 }