From 9f30ac4ad0605ebf4a3f8c46117bd7e4b8053590 Mon Sep 17 00:00:00 2001
From: SmaginaOksana <ksushka57@gmail.com>
Date: Mon, 8 Jun 2026 13:55:44 +0300
Subject: [PATCH] YH-2023: added feature flag for open/close NY-modal

---
 src/app/layouts/MainLayout/MainLayout.tsx              |  2 +-
 .../featureFlag/api/__mocks__/data/featureFlagsMock.ts | 10 +++++-----
 src/entities/featureFlag/index.ts                      |  1 -
 .../featureFlag/model/constants/featureFlags.ts        |  5 -----
 src/entities/featureFlag/model/types/featureFlag.ts    |  2 +-
 src/entities/topic/index.ts                            |  4 ----
 6 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/app/layouts/MainLayout/MainLayout.tsx b/src/app/layouts/MainLayout/MainLayout.tsx
index 70ea8fbb2..254f75ddf 100644
--- a/src/app/layouts/MainLayout/MainLayout.tsx
+++ b/src/app/layouts/MainLayout/MainLayout.tsx
@@ -100,7 +100,7 @@ export const MainLayout = ({ sidebarItems, onlyAdmin }: MainLayoutProps) => {
 								<WithFeature featureId="nyBanner">
 									<NYBanner isOpenBanner={!isOpenNYBanner} lsKey={LS_BANNER_NY_DASHBOARD_KEY} />
 								</WithFeature>
-								<WithFeature featureId="nyModal">
+								<WithFeature featureId="dashboard.subscription.show-ny-modal">
 									<NYModal isOpenModal={!isOpenNYModal} />
 								</WithFeature>
 								<Breadcrumbs />
diff --git a/src/entities/featureFlag/api/__mocks__/data/featureFlagsMock.ts b/src/entities/featureFlag/api/__mocks__/data/featureFlagsMock.ts
index 886b1f415..3deaf6a14 100644
--- a/src/entities/featureFlag/api/__mocks__/data/featureFlagsMock.ts
+++ b/src/entities/featureFlag/api/__mocks__/data/featureFlagsMock.ts
@@ -15,14 +15,14 @@ export const featureFlagsMock: Response<FeatureFlagApiItem[]> = {
 			updatedAt: '2025-12-01T00:00:00.000Z',
 		},
 		{
-			id: 'nyModal',
-			flag: 'Новогодняя модалка',
+			id: '95268ab0-3ea7-43a0-b67c-66a621794220',
+			flag: 'dashboard.subscription.show-ny-modal',
 			enabled: false,
-			description: 'Попап-акция в начале года',
+			description: 'Фича флаг для показа новогоднего модального окна',
 			roles: ['admin'],
 			clientType: 'WEB',
-			createdAt: '2025-12-01T00:00:00.000Z',
-			updatedAt: '2025-12-01T00:00:00.000Z',
+			createdAt: '2026-06-08T10:28:12.296Z',
+			updatedAt: '2026-06-08T10:29:21.662Z',
 		},
 		{
 			id: '67003559-016b-4444-a1c4-9287dcfdfa50',
diff --git a/src/entities/featureFlag/index.ts b/src/entities/featureFlag/index.ts
index 98fa559cf..56d595419 100644
--- a/src/entities/featureFlag/index.ts
+++ b/src/entities/featureFlag/index.ts
@@ -15,6 +15,5 @@ export { featureFlagHandlers } from './api/__mocks__';
 export { featureFlagsMock } from './api/__mocks__';
 export { FeatureFlagForm } from './ui/FeatureFlagForm/FeatureFlagForm';
 export { clientTypes } from './model/constants/featureFlags';
-export { featureFlagsMock } from './api/__mocks__/data/featureFlagsMock';
 export { featureFlagReducer } from './model/slices/featureFlagSlice';
 export type { FeatureFlagState } from './model/slices/featureFlagSlice';
diff --git a/src/entities/featureFlag/model/constants/featureFlags.ts b/src/entities/featureFlag/model/constants/featureFlags.ts
index f08768623..c2d2cf7af 100644
--- a/src/entities/featureFlag/model/constants/featureFlags.ts
+++ b/src/entities/featureFlag/model/constants/featureFlags.ts
@@ -6,11 +6,6 @@ export const featureFlags: FeatureFlags = {
 		enabled: false,
 		description: 'Новогодний баннер со скидками на подписку',
 	},
-	nyModal: {
-		id: 'nyModal',
-		enabled: false,
-		description: 'Новогодняя модалка со скидками на подписку',
-	},
 };
 
 export const featureFlagApiUrls = {
diff --git a/src/entities/featureFlag/model/types/featureFlag.ts b/src/entities/featureFlag/model/types/featureFlag.ts
index 30909470d..83b520d18 100644
--- a/src/entities/featureFlag/model/types/featureFlag.ts
+++ b/src/entities/featureFlag/model/types/featureFlag.ts
@@ -4,7 +4,7 @@ import { RoleName } from '@/entities/auth/@x/featureFlag';
 
 export type FeatureFlagType =
 	| 'nyBanner'
-	| 'nyModal'
+	| 'dashboard.subscription.show-ny-modal'
 	| 'dashboard.analytic.user-rating'
 	| 'common.app.change-language'
 	| 'common.app.change-theme'
diff --git a/src/entities/topic/index.ts b/src/entities/topic/index.ts
index 1f37a4096..12d00321e 100644
--- a/src/entities/topic/index.ts
+++ b/src/entities/topic/index.ts
@@ -1,8 +1,6 @@
 export { TopicForm } from './ui/TopicForm/TopicForm';
 export { TopicFilterField } from './ui/TopicFilterField/TopicFilterField';
 
-export { TopicFilterField } from './ui/TopicFilterField/TopicFilterField';
-
 export type { Topic, CreateOrEditTopicFormValues } from './model/types/topic';
 
 export { useGetTopicsListQuery, useGetTopicByIdQuery } from './api/topicApi';
@@ -14,5 +12,3 @@ export { TopicCard } from './ui/TopicCard/TopicCard';
 export { topicHandlers } from './api/__mock__';
 
 export { topicsMocks } from './api/__mock__/data';
-
-export { TopicFilterField } from './ui/TopicFilterField/TopicFilterField';