From e18b086b3cbca47b495c4bbad68382890252ec11 Mon Sep 17 00:00:00 2001
From: ArtChaos189 <tvolkiska967@gmail.com>
Date: Thu, 8 Jun 2023 17:01:40 +0300
Subject: [PATCH] fix mergedPrivilegeStore

---
 src/hooks/useCombinedPrivileges.hook.ts                    | 4 ++--
 .../dashboard/Content/Tariffs/Privileges/Privileges.tsx    | 7 +++++--
 src/stores/mergedPrivileges.ts                             | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/hooks/useCombinedPrivileges.hook.ts b/src/hooks/useCombinedPrivileges.hook.ts
index fc54284..8ed53da 100644
--- a/src/hooks/useCombinedPrivileges.hook.ts
+++ b/src/hooks/useCombinedPrivileges.hook.ts
@@ -24,7 +24,7 @@ export const useCombinedPrivileges = () => {
 
   if (privilegies) {
     mergedPrivileges.push(...privilegies.Шаблонизатор, ...examplePrivileges);
-
-    addMergedPrivileges(mergedPrivileges, isError, errorMessage);
   }
+
+  return { mergedPrivileges, isError, errorMessage };
 };
diff --git a/src/pages/dashboard/Content/Tariffs/Privileges/Privileges.tsx b/src/pages/dashboard/Content/Tariffs/Privileges/Privileges.tsx
index 754a567..cc1cdd5 100644
--- a/src/pages/dashboard/Content/Tariffs/Privileges/Privileges.tsx
+++ b/src/pages/dashboard/Content/Tariffs/Privileges/Privileges.tsx
@@ -1,7 +1,8 @@
 import { GridColDef } from "@mui/x-data-grid";
 import DataGrid from "@kitUI/datagrid";
 import { Typography } from "@mui/material";
-import { mergedPrivilegeStore } from "@root/stores/mergedPrivileges";
+import { useCombinedPrivileges } from "@root/hooks/useCombinedPrivileges.hook";
+import { addMergedPrivileges } from "@root/stores/mergedPrivileges";
 
 const columns: GridColDef[] = [
   { field: "id", headerName: "id", width: 40 },
@@ -12,7 +13,7 @@ const columns: GridColDef[] = [
 ];
 
 export default function Privileges() {
-  const { mergedPrivileges, isError, errorMessage } = mergedPrivilegeStore();
+  const { mergedPrivileges, isError, errorMessage } = useCombinedPrivileges();
   const privilegesGridData = mergedPrivileges.map((privilege) => ({
     id: privilege.privilegeId,
     name: privilege.name,
@@ -21,6 +22,8 @@ export default function Privileges() {
     price: privilege.price,
   }));
 
+  addMergedPrivileges(mergedPrivileges, isError, errorMessage);
+
   return (
     <>
       {isError ? (
diff --git a/src/stores/mergedPrivileges.ts b/src/stores/mergedPrivileges.ts
index 241c229..b89da09 100644
--- a/src/stores/mergedPrivileges.ts
+++ b/src/stores/mergedPrivileges.ts
@@ -36,7 +36,7 @@ export const mergedPrivilegeStore = create<MergedPrivilegeType>()(
 
 export const addMergedPrivileges = (newPrivileges: mergedPrivilege[], isError: boolean, errorMessage: string) => {
   mergedPrivilegeStore.setState((state) => ({
-    mergedPrivileges: [...state.mergedPrivileges, ...newPrivileges],
+    mergedPrivileges: [...newPrivileges],
     isError: isError,
     errorMessage: errorMessage,
   }));