feat: remove old design for articles

extractedTranslations/en/profile.json

@@ -1,30 +1,30 @@
 {
-  "": "",
-  "Age": "",
-  "Avatar": "",
-  "City": "",
-  "Edit": "",
-  "Error": "",
-  "Error with getting profile data": "",
-  "Error with profile ": "",
-  "Incorrect age": "",
-  "Incorrect country": "",
-  "Incorrect user data": "",
-  "Lastname": "",
-  "Name": "",
-  "No data": "",
-  "Profile": "",
-  "Server error": "",
-  "Try to reload page": "",
-  "Username": "",
-  "Username>": "",
-  "Your age": "",
-  "Your avatar": "",
-  "Your city": "",
-  "Your lastname": "",
-  "Your name": "",
-  "Your surname": "",
-  "Your username": "",
-  "Попробуйте обновить страницу": "",
-  "Произошла ошибка при загрузке профиля": ""
+    "": "",
+    "Age": "",
+    "Avatar": "",
+    "City": "",
+    "Edit": "",
+    "Error": "",
+    "Error with getting profile data": "",
+    "Error with profile ": "",
+    "Incorrect age": "",
+    "Incorrect country": "",
+    "Incorrect user data": "",
+    "Lastname": "",
+    "Name": "",
+    "No data": "",
+    "Profile": "",
+    "Server error": "",
+    "Try to reload page": "",
+    "Username": "",
+    "Username>": "",
+    "Your age": "",
+    "Your avatar": "",
+    "Your city": "",
+    "Your lastname": "",
+    "Your name": "",
+    "Your surname": "",
+    "Your username": "",
+    "Попробуйте обновить страницу": "",
+    "Произошла ошибка при загрузке профиля": ""
 }

src/features/ArticleTypeTabs/ui/ArticleTypeTabs.tsx

@@ -1,9 +1,8 @@
 import { useTranslation } from 'react-i18next';
 import { memo, useCallback, useMemo } from 'react';
 import { classNames } from '@/shared/lib/classNames/classNames';
-import { TabItem, Tabs as TabsDeprecated } from '@/shared/ui/deprecated/Tabs';
+import { TabItem } from '@/shared/ui/deprecated/Tabs';
 import { ArticleType } from '@/entities/Article';
-import { ToggleFeatures } from '@/shared/lib/features';
 import { Tabs } from '@/shared/ui/redesigned/Tabs';
 
 interface ArticleTypeTabsProps {
@@ -46,25 +45,12 @@ export const ArticleTypeTabs = memo((props: ArticleTypeTabsProps) => {
     );
 
     return (
-        <ToggleFeatures
-            feature="isAppRedesigned"
-            on={
-                <Tabs
-                    direction="column"
-                    tabs={typeTabs}
-                    value={value}
-                    onTabClick={onTabClick}
-                    className={classNames('', {}, [className])}
-                />
-            }
-            off={
-                <TabsDeprecated
-                    tabs={typeTabs}
-                    value={value}
-                    onTabClick={onTabClick}
-                    className={classNames('', {}, [className])}
-                />
-            }
+        <Tabs
+            direction="column"
+            tabs={typeTabs}
+            value={value}
+            onTabClick={onTabClick}
+            className={classNames('', {}, [className])}
         />
     );
 });

src/features/ArticleViewSelector/ui/ArticleViewSelector.tsx

@@ -1,19 +1,10 @@
 import { memo } from 'react';
 import { classNames } from '@/shared/lib/classNames/classNames';
-import ListIconDeprecated from '@/shared/assets/icons/list-24-24.svg';
-import TiledIconDeprecated from '@/shared/assets/icons/tiled-24-24.svg';
 
 import ListIcon from '@/shared/assets/icons/burger.svg';
 import TiledIcon from '@/shared/assets/icons/tile.svg';
-
-import { Icon as IconDeprecated } from '@/shared/ui/deprecated/Icon';
-import {
-    Button as ButtonDeprecated,
-    ButtonTheme,
-} from '@/shared/ui/deprecated/Button';
 import cls from './ArticleViewSelector.module.scss';
 import { ArticleView } from '@/entities/Article';
-import { ToggleFeatures, toggleFeatures } from '@/shared/lib/features';
 import { Icon } from '@/shared/ui/redesigned/Icon';
 import { Card } from '@/shared/ui/redesigned/Card';
 import { HStack } from '@/shared/ui/redesigned/Stack';
@@ -27,19 +18,11 @@ interface ArticleViewSelectorProps {
 const viewTypes = [
     {
         view: ArticleView.SMALL,
-        icon: toggleFeatures({
-            name: 'isAppRedesigned',
-            on: () => TiledIcon,
-            off: () => TiledIconDeprecated,
-        }),
+        icon: TiledIcon,
     },
     {
         view: ArticleView.BIG,
-        icon: toggleFeatures({
-            name: 'isAppRedesigned',
-            on: () => ListIcon,
-            off: () => ListIconDeprecated,
-        }),
+        icon: ListIcon,
     },
 ];
 
@@ -51,55 +34,24 @@ export const ArticleViewSelector = memo((props: ArticleViewSelectorProps) => {
     };
 
     return (
-        <ToggleFeatures
-            feature="isAppRedesigned"
-            on={
-                <Card
-                    className={classNames(
-                        cls.ArticleViewSelectorRedesigned,
-                        {},
-                        [className],
-                    )}
-                    border="round"
-                >
-                    <HStack gap="8">
-                        {viewTypes.map((viewType) => (
-                            <Icon
-                                clickable
-                                onClick={() => onClick(viewType.view)}
-                                Svg={viewType.icon}
-                                className={classNames('', {
-                                    [cls.notSelected]: viewType.view !== view,
-                                })}
-                            />
-                        ))}
-                    </HStack>
-                </Card>
-            }
-            off={
-                <div
-                    className={classNames(cls.ArticleViewSelector, {}, [
-                        className,
-                    ])}
-                >
-                    {viewTypes.map((viewType) => (
-                        <ButtonDeprecated
-                            key={viewType.view}
-                            theme={ButtonTheme.CLEAR}
-                            onClick={() => onClick(viewType.view)}
-                        >
-                            <IconDeprecated
-                                width={24}
-                                height={24}
-                                Svg={viewType.icon}
-                                className={classNames('', {
-                                    [cls.notSelected]: viewType.view !== view,
-                                })}
-                            />
-                        </ButtonDeprecated>
-                    ))}
-                </div>
-            }
-        />
+        <Card
+            className={classNames(cls.ArticleViewSelectorRedesigned, {}, [
+                className,
+            ])}
+            border="round"
+        >
+            <HStack gap="8">
+                {viewTypes.map((viewType) => (
+                    <Icon
+                        clickable
+                        onClick={() => onClick(viewType.view)}
+                        Svg={viewType.icon}
+                        className={classNames('', {
+                            [cls.notSelected]: viewType.view !== view,
+                        })}
+                    />
+                ))}
+            </HStack>
+        </Card>
     );
 });

src/features/ArtilcleSortSelector/ui/ArticleSortSelector.tsx

@@ -1,11 +1,10 @@
 import { useTranslation } from 'react-i18next';
 import { memo, useMemo } from 'react';
 import { classNames } from '@/shared/lib/classNames/classNames';
-import { Select, SelectOption } from '@/shared/ui/deprecated/Select';
+import { SelectOption } from '@/shared/ui/deprecated/Select';
 import { SortOrder } from '@/shared/types/sort';
 import cls from './ArticleSortSelector.module.scss';
 import { ArticleSortField } from '@/entities/Article';
-import { ToggleFeatures } from '@/shared/lib/features';
 import { ListBox } from '@/shared/ui/redesigned/Popups';
 import { VStack } from '@/shared/ui/redesigned/Stack';
 import { Text } from '@/shared/ui/redesigned/Text';
@@ -55,52 +54,24 @@ export const ArticleSortSelector = memo((props: ArticleSortSelectorProps) => {
     );
 
     return (
-        <ToggleFeatures
-            feature="isAppRedesigned"
-            on={
-                <div
-                    className={classNames(
-                        cls.ArticleSortSelectorRedesigned,
-                        {},
-                        [className],
-                    )}
-                >
-                    <VStack gap="8">
-                        <Text text={t('Sort by:')} />
-                        <ListBox
-                            items={sortFieldOptions}
-                            value={sort}
-                            onChange={onChangeSort}
-                        />
-                        <ListBox
-                            items={orderOptions}
-                            value={order}
-                            onChange={onChangeOrder}
-                        />
-                    </VStack>
-                </div>
-            }
-            off={
-                <div
-                    className={classNames(cls.ArticleSortSelector, {}, [
-                        className,
-                    ])}
-                >
-                    <Select<ArticleSortField>
-                        options={sortFieldOptions}
-                        label={t('Sort by')}
-                        value={sort}
-                        onChange={onChangeSort}
-                    />
-                    <Select
-                        options={orderOptions}
-                        label={t('by')}
-                        value={order}
-                        onChange={onChangeOrder}
-                        className={cls.order}
-                    />
-                </div>
-            }
-        />
+        <div
+            className={classNames(cls.ArticleSortSelectorRedesigned, {}, [
+                className,
+            ])}
+        >
+            <VStack gap="8">
+                <Text text={t('Sort by:')} />
+                <ListBox
+                    items={sortFieldOptions}
+                    value={sort}
+                    onChange={onChangeSort}
+                />
+                <ListBox
+                    items={orderOptions}
+                    value={order}
+                    onChange={onChangeOrder}
+                />
+            </VStack>
+        </div>
     );
 });

src/pages/ArticlesPage/ui/ArticlesPage/ArticlesPage.tsx

@@ -8,13 +8,11 @@ import {
 import { useInitialEffect } from '@/shared/lib/hook/useInitialEffect/useInitialEffect';
 import { useAppDispatch } from '@/shared/lib/hook/useAppDispatch/useAppDispatch';
 import { ArticleInfiniteList } from '../../ui/ArticleInfiniteList/ArticleInfiniteList';
-import { ArticlesPageFilters } from '../../ui/ArticlesPageFilters/ArticlesPageFilters';
 import { fetchNextArticlePage } from '../../model/services/fetchNextArticlePage/fetchNextArticlePage';
 import { initArticlesPage } from '../../model/services/initArticlesPage/initArticlesPage';
 import { articlesPageReducer } from '../../model/slices/articlesPageSlice';
 import { Page } from '@/widgets/Page';
 import { ArticlePageGreeting } from '@/features/articlePageGreeting';
-import { ToggleFeatures } from '@/shared/lib/features';
 import { StickyContentLayout } from '@/shared/layouts/StickyContentLayout';
 import cls from './ArticlesPage.module.scss';
 import { ViewSelectorContainer } from '../ViewSelectorContainer/ViewSelectorContainer';
@@ -42,35 +40,17 @@ const ArticlesPage = ({ className }: ArticlesPageProps) => {
     });
 
     const content = (
-        <ToggleFeatures
-            feature="isAppRedesigned"
-            on={
-                <StickyContentLayout
-                    left={<ViewSelectorContainer />}
-                    right={<FiltersContainer />}
-                    content={
-                        <Page
-                            data-testid="ArticlesPage"
-                            onScrollEnd={onLoadNextPart}
-                            className={classNames(
-                                cls.ArticlesPageRedesigned,
-                                {},
-                                [className],
-                            )}
-                        >
-                            <ArticleInfiniteList />
-                            <ArticlePageGreeting />
-                        </Page>
-                    }
-                />
-            }
-            off={
+        <StickyContentLayout
+            left={<ViewSelectorContainer />}
+            right={<FiltersContainer />}
+            content={
                 <Page
                     data-testid="ArticlesPage"
                     onScrollEnd={onLoadNextPart}
-                    className={classNames('', {}, [className])}
+                    className={classNames(cls.ArticlesPageRedesigned, {}, [
+                        className,
+                    ])}
                 >
-                    <ArticlesPageFilters />
                     <ArticleInfiniteList />
                     <ArticlePageGreeting />
                 </Page>

src/widgets/Page/ui/Page/Page.tsx

@@ -1,4 +1,4 @@
-import { memo, MutableRefObject, ReactNode, useRef, UIEvent } from 'react';
+import { memo, MutableRefObject, ReactNode, UIEvent, useRef } from 'react';
 import { useLocation } from 'react-router-dom';
 import { useSelector } from 'react-redux';
 import { classNames } from '@/shared/lib/classNames/classNames';
@@ -13,7 +13,6 @@ import { StateSchema } from '@/app/providers/StoreProvider';
 import { useThrottle } from '@/shared/lib/hook/useThrottle/useThrottle';
 import cls from './Page.module.scss';
 import { TestProps } from '@/shared/types/testProps';
-import { toggleFeatures } from '@/shared/lib/features';
 
 interface PageProps extends TestProps {
     className?: string;
@@ -34,13 +33,10 @@ export const Page = memo((props: PageProps) => {
         getScrollRestorationByPath(state, pathname),
     );
 
+    // wrapperRef undefined because scroll on window element (undefined for default settings)
     useInfiniteScroll({
         triggerRef,
-        wrapperRef: toggleFeatures({
-            name: 'isAppRedesigned',
-            on: () => undefined,
-            off: () => wrapperRef,
-        }),
+        wrapperRef: undefined,
         callback: onScrollEnd,
     });