From 129748a4d8d1b91b5a735908f41cd7a018d38044 Mon Sep 17 00:00:00 2001 From: Tamara Date: Sun, 12 May 2024 04:03:56 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20?= =?UTF-8?q?=D0=B0=D0=BA=D0=BA=D0=B0=D1=83=D0=BD=D1=82=D0=B0=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=20=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B8=20=D1=84=D0=B0=D1=81=D1=82=D0=BB=D0=B8=D0=BD=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ui_kit/CheckFastlink.tsx | 22 ++++++++-- yarn.lock | 81 +++++++++++++++++++++++++++++++++--- 2 files changed, 94 insertions(+), 9 deletions(-) diff --git a/src/ui_kit/CheckFastlink.tsx b/src/ui_kit/CheckFastlink.tsx index 416ddbb6..ce2a673d 100644 --- a/src/ui_kit/CheckFastlink.tsx +++ b/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([]); 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({ + 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 (