From b013a80250fd9ab13f8b66f48b5128cf89d2ab93 Mon Sep 17 00:00:00 2001
From: nflnkr <molohov.eugeny@yandex.ru>
Date: Sat, 17 Jun 2023 19:01:02 +0300
Subject: [PATCH] fix types/imports

---
 src/api/tariff.ts                          | 4 +---
 src/pages/TariffConstructor/TariffItem.tsx | 2 +-
 src/pages/Tariffs/TariffsPage.tsx          | 2 +-
 src/utils/hooks/useCustomTariffs.ts        | 6 +++---
 src/utils/hooks/useTariffs.ts              | 6 ++----
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/api/tariff.ts b/src/api/tariff.ts
index e0b0ffc..0aa5fba 100644
--- a/src/api/tariff.ts
+++ b/src/api/tariff.ts
@@ -1,11 +1,9 @@
+import { makeRequest } from "@frontend/kitui";
 import { CustomTariff } from "@root/model/customTariffs";
 import { PrivilegeMap } from "@root/model/privilege";
-import { authStore } from "@root/stores/makeRequest";
 import axios, { AxiosResponse } from "axios";
 
 
-const makeRequest = authStore.getState().makeRequest;
-
 export async function fetchCustomTariffs(signal: AbortSignal) {
     const response = await axios<never, AxiosResponse<PrivilegeMap>>({
         url: "https://admin.pena.digital/strator/privilege/service",
diff --git a/src/pages/TariffConstructor/TariffItem.tsx b/src/pages/TariffConstructor/TariffItem.tsx
index 6d726f9..80765d8 100644
--- a/src/pages/TariffConstructor/TariffItem.tsx
+++ b/src/pages/TariffConstructor/TariffItem.tsx
@@ -1,3 +1,4 @@
+import { useThrottle } from "@frontend/kitui";
 import { Box, SliderProps, Typography, useMediaQuery, useTheme } from "@mui/material";
 import CustomSlider from "@root/components/CustomSlider";
 import CalendarIcon from "@root/components/icons/CalendarIcon";
@@ -6,7 +7,6 @@ import { Privilege, PrivilegeValueType } from "@root/model/privilege";
 import { setCustomTariffsUserValue, useCustomTariffsStore } from "@root/stores/customTariffs";
 import { formatDateWithDeclention } from "@root/utils/date";
 import { getDeclension } from "@root/utils/declension";
-import { useThrottle } from "@root/utils/hooks/useThrottle";
 import { useEffect, useState } from "react";
 
 
diff --git a/src/pages/Tariffs/TariffsPage.tsx b/src/pages/Tariffs/TariffsPage.tsx
index be4d98e..94d352b 100644
--- a/src/pages/Tariffs/TariffsPage.tsx
+++ b/src/pages/Tariffs/TariffsPage.tsx
@@ -6,12 +6,12 @@ import ComplexNavText from "@root/components/ComplexNavText";
 import { useTariffs } from "@root/utils/hooks/useTariffs";
 import { setTariffs, useTariffStore } from "@root/stores/tariffs";
 import { enqueueSnackbar } from "notistack";
-import { getMessageFromFetchError } from "@root/utils/backendMessageHandler";
 import { CustomTab } from "@root/components/CustomTab";
 import TariffCard from "./TariffCard";
 import NumberIcon from "@root/components/NumberIcon";
 import { currencyFormatter } from "@root/utils/currencyFormatter";
 import { calcTariffPrices } from "@root/utils/calcTariffPrices";
+import { getMessageFromFetchError } from "@frontend/kitui";
 
 
 export default function TariffPage() {
diff --git a/src/utils/hooks/useCustomTariffs.ts b/src/utils/hooks/useCustomTariffs.ts
index d3265a1..4666673 100644
--- a/src/utils/hooks/useCustomTariffs.ts
+++ b/src/utils/hooks/useCustomTariffs.ts
@@ -1,18 +1,18 @@
 import { devlog } from "@frontend/kitui";
-import { CustomTariffsMap } from "@root/model/customTariffs";
+import { PrivilegeMap } from "@root/model/privilege";
 import axios, { AxiosResponse } from "axios";
 import { useEffect } from "react";
 
 
 export function useCustomTariffs({ onError, onNewUser, url }: {
     url: string;
-    onNewUser: (response: CustomTariffsMap) => void;
+    onNewUser: (response: PrivilegeMap) => void;
     onError: (error: any) => void;
 }) {
     useEffect(function fetchUserData() {
         const controller = new AbortController();
 
-        axios<never, AxiosResponse<CustomTariffsMap>>({
+        axios<never, AxiosResponse<PrivilegeMap>>({
             url,
             signal: controller.signal,
         }).then(result => {
diff --git a/src/utils/hooks/useTariffs.ts b/src/utils/hooks/useTariffs.ts
index 767368f..021f1b5 100644
--- a/src/utils/hooks/useTariffs.ts
+++ b/src/utils/hooks/useTariffs.ts
@@ -1,10 +1,8 @@
+import { devlog, makeRequest } from "@frontend/kitui";
 import { GetTariffsResponse, Tariff } from "@root/model/tariff";
-import { authStore } from "@root/stores/makeRequest";
 import { useEffect, useState } from "react";
 
 
-const makeRequest = authStore.getState().makeRequest;
-
 export function useTariffs({ url, tariffsPerPage, apiPage, onNewTariffs, onError }: {
     url: string;
     tariffsPerPage: number;
@@ -24,7 +22,7 @@ export function useTariffs({ url, tariffsPerPage, apiPage, onNewTariffs, onError
             useToken: true,
             signal: controller.signal,
         }).then((result) => {
-            // devlog("GetTicketsResponse", result);
+            devlog("GetTicketsResponse", result);
             if (result.tariffs.length > 0) {
                 onNewTariffs(result.tariffs);
                 setFetchState("idle");