Merge branch 'dev' into 'staging'

Dev

See merge request frontend/squiz!314

src/ui_kit/CheckFastlink.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useLayoutEffect, useState } from "react";
+import {useEffect, useLayoutEffect, useRef, useState} from "react";
 import { Box, Button, Modal, Typography } from "@mui/material";
 import { enqueueSnackbar } from "notistack";
 import { mutate } from "swr";
@@ -6,13 +6,18 @@ import { mutate } from "swr";
 import makeRequest from "@api/makeRequest";
 import { getDiscounts } from "@api/discounts";
 
-import { useUserStore } from "@root/user";
+import {clearUserData, OriginalUserAccount, setUserAccount, useUserStore} from "@root/user";
 import { parseAxiosError } from "@utils/parse-error";
-
+import { useUserAccountFetcher } from "../App";
 import type { Discount } from "@model/discounts";
+import {clearAuthToken, createUserAccount, devlog, getMessageFromFetchError} from "@frontend/kitui";
+import {useNavigate} from "react-router-dom";
+import {isAxiosError} from "axios";
 
 export function CheckFastlink() {
   const user = useUserStore();
+  const userId = useUserStore((state) => state.userId);
+  const navigate = useNavigate();
   const [discounts, setDiscounts] = useState<Discount[]>([]);
   const [askToChange, setAskToChange] = useState(false);
   const [promocode, setPromocode] = useState("");
@@ -50,6 +55,16 @@ export function CheckFastlink() {
         });
         enqueueSnackbar("Промокод успешно применён");
         localStorage.setItem("fl", "");
+        const controller = new AbortController();
+        const responseAccount = await makeRequest<never, any>({
+          url: process.env.REACT_APP_DOMAIN + "/squiz/account/get",
+          contentType: true,
+          method: "GET",
+          useToken: true,
+          withCredentials: false,
+          signal: controller.signal,
+        })
+        setUserAccount(responseAccount)
         mutate("discounts");
         return response.greetings;
       } catch (nativeError) {
@@ -91,6 +106,7 @@ export function CheckFastlink() {
     }
   }, [user.userId, discounts, user.customerAccount?.createdAt, user.userAccount?.created_at]);
 
+
   return (
     <Modal
       open={askToChange}

yarn.lock

@@ -2593,6 +2593,13 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.97.tgz#d7926a8030f0d714d555b4550c0cc7731495cfe5"
   integrity sha512-4muilE1Lbfn57unR+/nT9AFjWk0MtWi5muwCEJqnOvfRQDbSfLCUdN7vCIg8TYuaANfhLOV85ve+FNpiUsbSRg==
 
+"@types/node@^20.11.17":
+  version "20.12.11"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.11.tgz#c4ef00d3507000d17690643278a60dc55a9dc9be"
+  integrity sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==
+  dependencies:
+    undici-types "~5.26.4"
+
 "@types/parse-json@^4.0.0":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239"