diff --git a/src/app/article/index.js b/src/app/article/index.js
index caea26492..89b09a6bc 100644
--- a/src/app/article/index.js
+++ b/src/app/article/index.js
@@ -13,31 +13,49 @@ import TopHead from '../../containers/top-head';
 import { useDispatch, useSelector } from 'react-redux';
 import shallowequal from 'shallowequal';
 import articleActions from '../../store-redux/article/actions';
-import Reviews from '../reviews';
+import commentsActions from '../../store-redux/comments/actions';
+import CommentContainer from '../../containers/comment';
 
 function Article() {
   const store = useStore();
+
   const dispatch = useDispatch();
+  // Параметры из пути /articles/:id
+
   const params = useParams();
+
   useInit(() => {
     //store.actions.article.load(params.id);
     dispatch(articleActions.load(params.id));
+    dispatch(commentsActions.load(params.id));
   }, [params.id]);
+
   const select = useSelector(
     state => ({
       article: state.article.data,
       waiting: state.article.waiting,
+      comments: state.comments.data,
+      waitingComments: state.comments.waiting
     }),
     shallowequal,
-  );
+  ); // Нужно указать функцию для сравнения свойства объекта, так как хуком вернули объект
 
   const { t } = useTranslate();
-
+ 
   const callbacks = {
     // Добавление в корзину
     addToBasket: useCallback(_id => store.actions.basket.addToBasket(_id), [store]),
   };
 
+  const handleReply = commentId => {
+    dispatch(commentsActions.setReplyTo(commentId));
+  };
+  //const tree = listToTree(select.comments.items)
+ // const commentsArray = treeToList(listToTree(select.comments.items)) ;
+  console.log('select.comments.items=',select.comments.items)
+  //const commentsArray = select.comments.items.map(comment => (
+  //  <CommentContainer key={comment._id} comment={comment} onReply={handleReply} level={0}/>
+  //))
   return (
     <PageLayout>
       <TopHead />
@@ -47,9 +65,12 @@ function Article() {
       <Navigation />
       <Spinner active={select.waiting}>
         <ArticleCard article={select.article} onAdd={callbacks.addToBasket} t={t} />
-        <Reviews/>
       </Spinner>
+      <h3 style={{ margin: '30px 0 25px 30px'}}>Комментарии ({select.comments.count})</h3>
+      <div>{select.comments.items && select.comments.items.map(comment => (<CommentContainer key={comment._id} comment={comment} onReply={handleReply} level={0}/>))} </div> 
+      
     </PageLayout>
   );
 }
-export default memo(Article);
\ No newline at end of file
+
+export default memo(Article);
diff --git a/src/app/index.js b/src/app/index.js
index 6fe9ae3fb..c54c2afc5 100644
--- a/src/app/index.js
+++ b/src/app/index.js
@@ -1,5 +1,6 @@
-
+import { useCallback, useContext, useEffect, useState } from 'react';
 import { Routes, Route } from 'react-router-dom';
+import useSelector from '../hooks/use-selector';
 import useStore from '../hooks/use-store';
 import useInit from '../hooks/use-init';
 import Main from './main';
@@ -9,6 +10,7 @@ import Login from './login';
 import Profile from './profile';
 import Protected from '../containers/protected';
 import { useSelector as useSelectorRedux } from 'react-redux';
+
 /**
  * Приложение
  * @returns {React.ReactElement}
@@ -18,7 +20,9 @@ function App() {
   useInit(async () => {
     await store.actions.session.remind();
   });
+
   const activeModal = useSelectorRedux(state => state.modals.name);
+
   return (
     <>
       <Routes>
@@ -34,8 +38,10 @@ function App() {
           }
         />
       </Routes>
+
       {activeModal === 'basket' && <Basket />}
     </>
   );
 }
-export default App;
\ No newline at end of file
+
+export default App;
diff --git a/src/app/login/index.js b/src/app/login/index.js
index 8ccf151a8..9cecc31a4 100644
--- a/src/app/login/index.js
+++ b/src/app/login/index.js
@@ -18,22 +18,27 @@ function Login() {
   const location = useLocation();
   const navigate = useNavigate();
   const store = useStore();
+
   useInit(() => {
     store.actions.session.resetErrors();
   });
+
   const select = useSelector(state => ({
     waiting: state.session.waiting,
     errors: state.session.errors,
   }));
+
   const [data, setData] = useState({
     login: '',
     password: '',
   });
+
   const callbacks = {
     // Колбэк на ввод в элементах формы
     onChange: useCallback((value, name) => {
       setData(prevData => ({ ...prevData, [name]: value }));
     }, []),
+
     // Отправка данных формы для авторизации
     onSubmit: useCallback(
       e => {
@@ -47,9 +52,7 @@ function Login() {
           navigate(back);
         });
       },
-
-      [data, location.state, navigate, store.actions.session]
-      // [data, location.state],
+      [data, location.state],
     ),
   };
 
@@ -83,4 +86,5 @@ function Login() {
     </PageLayout>
   );
 }
-export default memo(Login);
\ No newline at end of file
+
+export default memo(Login);
diff --git a/src/app/reviews/index.js b/src/app/reviews/index.js
deleted file mode 100644
index 2587ad16b..000000000
--- a/src/app/reviews/index.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import { memo } from 'react';
-import React, { useRef, useEffect } from 'react';
-import { useParams } from 'react-router-dom';
-import { Link, useLocation } from 'react-router-dom';
-import useInit from '../../hooks/use-init';
-import { useSelector as useReduxSelector } from 'react-redux';
-import { useDispatch } from 'react-redux';
-import useSelector from '../../hooks/use-selector';
-import reviewsActions from '../../store-redux/reviews/actions';
-import listToTree from '../../utils/list-to-tree';
-import CommentsForm from '../../containers/comments-form';
-import CommentContainer from '../../containers/comment';
-import NoComments from '../../components/no-comments';
-import Spinner from '../../components/spinner';
-
-function Reviews() {
-  const location = useLocation();
-  const dispatch = useDispatch();
-  const { id: articleId } = useParams();
-  const select = useSelector(state => ({
-    exists: state.session.exists,
-  }));
-
-  useInit(() => {
-    dispatch(reviewsActions.load(articleId));
-  }, []);
-
-  const { reviews, waiting, replyTo } = useReduxSelector(state => ({
-    reviews: state.reviews.data || [],
-    waiting: state.reviews.waiting,
-    replyTo: state.reviews.replyTo,
-  }));
-
-  const commentsArray = reviews || [];
-  const commentsTree = listToTree(commentsArray, '_id');
-
-  const handleReply = commentId => {
-    dispatch(reviewsActions.setReplyTo(commentId));
-  };
-
-  if (waiting) {
-    return <Spinner />;
-  }
-
-  if (commentsArray.length === 0) {
-    return <NoComments articleId={articleId} exists={select.exists} />;
-  }
-
-  const totalComments=commentsArray.length
-
-  return (
-    <div style={{ marginLeft: '10px', marginRight: '40px' }}>
-      {totalComments && <h3 style={{ margin: '30px 0 25px 30px'}}>Комментарии ({totalComments})</h3>}
-      {commentsTree.map(comment => (
-        <CommentContainer key={comment._id} comment={comment} onReply={handleReply} level={0}/>
-      ))}
-
-      <div>{!replyTo && select.exists && <CommentsForm parentId={articleId} />}</div>
-      {!replyTo && !select.exists && (
-        <p style={{ marginLeft: '30px' }}>
-          <Link
-            to="/login"
-            className="comment-warn"
-            state={{ back: location.pathname + location.search }}
-          >
-            Войдите
-          </Link>
-          , чтобы иметь возможность комментировать
-        </p>
-      )}
-    </div>
-  );
-}
-export default memo(Reviews);
\ No newline at end of file
diff --git a/src/components/comment-view/index.js b/src/components/comment-view/index.js
index 5ebfd06fc..b23b905b1 100644
--- a/src/components/comment-view/index.js
+++ b/src/components/comment-view/index.js
@@ -30,7 +30,7 @@ const CommentView = ({
     : 'comment-author';
 
   return (
-    <div className="comment" style={{ marginLeft: `${indent}px` }}>
+    <div className="comment" style={{ marginLeft: `${indent}px`, marginRight: `${indent}px`}}>
       <div className="comment-item" style={{ marginBottom: '30px' }}>
         <strong className={authorClassName}>{comment.author?.profile?.name || 'Аноним'}</strong>{' '}
         <span className="comment-date">
diff --git a/src/components/comment-view/style.css b/src/components/comment-view/style.css
index f1d5b9969..e6e233f8b 100644
--- a/src/components/comment-view/style.css
+++ b/src/components/comment-view/style.css
@@ -1,4 +1,3 @@
-
 .comment-author--current {
   color: #666666;
 }
diff --git a/src/components/comment/index.js b/src/components/comment/index.js
deleted file mode 100644
index beb4f31ff..000000000
--- a/src/components/comment/index.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import { memo } from 'react';
-import PropTypes from 'prop-types';
-import { cn as bem } from '@bem-react/classname';
-import CommentList from '../comment_list';
-import CommentForm from '../comment_form';
-import { toCommentDate } from '../../utils/date';
-//import CommentNoAuth from '../comment-no-auth';
-import './style.css';
-
-function Comment({comment, openCommentId, onCancel, onAdd, onOpen, isAuth, t = text => text }) {
-  const { author, text, dateCreate, isDeleted, children, _id } = comment;
-  const cn = bem('Comment');
-  //const onAddAnswer = (text, onSuccess) => onAdd({parent: {_id, _type: 'comment'}, text}, onSuccess)
-  console.log('author.profile.name=',author.profile.name )
-  console.log('_id, openCommentId =',_id, openCommentId)
-  return (
-    <div className={cn()}>
-      <div className={cn('user-date')}>
-        <div className={cn('user')}>{author.profile.name}</div>
-        <div className={cn('date')}>{toCommentDate(dateCreate)}</div>
-      </div>
-      <p className={cn('text')}>{ isDeleted ? t('comments.deleted-comment') : text}</p>
-      <button className={cn('answer-btn')} onClick={() => onOpen(_id)}>
-        {t('comments.answer')}
-      </button>
-      {isAuth && openCommentId === _id && (
-        <CommentForm
-          author={author.profile.name}
-          parentId ={_id}
-          onAdd={onAdd}
-          onCancel={onCancel}
-          title={t('comments.new-answer')}
-          cancelButtonText={t('comments.cancel')}
-          t={t}
-        />
-      )}
-
-      {!!children?.length && (
-        <CommentList
-          comments={children}
-          onAdd={onAdd}
-          openCommentId={openCommentId}
-          onCancel={onCancel}
-          onOpen={onOpen}
-          isAuth={isAuth}
-          isChildList
-          t={t}
-        />
-        )}
-    </div>
-  );
-}
-// {!isAuth && openCommentId === _id && (
-//     <CommentNoAuth
-//       onCancel={onCancel}
-//       buttonText={t('comments.cancel')}
-//       text={t('comments.not-auth-text-answer')}
-//       t={t}
-//     />
-//   )}
-Comment.propTypes = {
-  comment: PropTypes.shape({
-    children: PropTypes.array,
-    _id: PropTypes.string.isRequired,
-    parent: PropTypes.shape({
-      _id: PropTypes.string,
-      _type: PropTypes.oneOf(['article', 'comment']),
-    }),
-    text: PropTypes.string.isRequired,
-    dateCreate: PropTypes.string.isRequired,
-    isDeleted: PropTypes.bool,
-    author: PropTypes.shape({
-      profile: PropTypes.shape({
-        name: PropTypes.string.isRequired,
-      }).isRequired,
-    }).isRequired,
-  }),
-  onCancel: PropTypes.func,
-  onAdd: PropTypes.func,
-  onOpen: PropTypes.func,
-  isAuth: PropTypes.bool,
-  t: PropTypes.func,
-};
-
-export default memo(Comment);
\ No newline at end of file
diff --git a/src/components/comment/style.css b/src/components/comment/style.css
deleted file mode 100644
index c15b49da2..000000000
--- a/src/components/comment/style.css
+++ /dev/null
@@ -1,33 +0,0 @@
-.Comment-user-date {
-    display: flex;
-    gap: 10px;
-    font-size: 12px;
-  }
-  
-  .Comment-user {
-    font-weight: bold;
-  }
-  
-  .Comment-date {
-    color: #666666;
-  }
-  
-  .Comment-text {
-    font-size: 14px;
-    margin: 10px 0;
-    padding-right: 20px;
-  }
-  
-  .Comment-answer-btn {
-    color: #0087e9;
-    border: none;
-    background-color: transparent;
-    cursor: pointer;
-    margin-bottom: 26px;
-    padding: 0;
-    font-size: 12px;
-  }
-  
-  .Comment-answer-btn:hover {
-    text-decoration: underline;
-  }
\ No newline at end of file
diff --git a/src/components/comment_footer/index.js b/src/components/comment_footer/index.js
deleted file mode 100644
index 270c29e1c..000000000
--- a/src/components/comment_footer/index.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import { memo } from 'react';
-import PropTypes from 'prop-types';
-import { cn as bem } from '@bem-react/classname';
-import { Link } from 'react-router-dom';
-//import './style.css';
-
-function CommentFooter(props) {
-  const { t = text => text } = props;
-  const cn = bem('CommentFooter');
-  return (
-    <div className={cn()}>
-      <Link to="/login">{t("comment.login" )}</Link>
-      {t("comment.footer" )}
-    </div>
-  );
-}
-
-CommentFooter.propTypes = {
-  t: PropTypes.func,
-};
-
-export default memo(CommentFooter);
\ No newline at end of file
diff --git a/src/components/comment_form/index.js b/src/components/comment_form/index.js
deleted file mode 100644
index aeaed9cf5..000000000
--- a/src/components/comment_form/index.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import { memo, useRef } from 'react';
-import PropTypes from 'prop-types';
-import { cn as bem } from '@bem-react/classname';
-import './style.css';
-
-function CommentForm({author, parentId, onAdd, onCancel, title, cancelButtonText, t}) {
-  const cn = bem('CommentForm');
-  const ref  = useRef(null)
-
-  const onSend = (e) => {
-    e.preventDefault();
-    const value = ref.current?.value;
-    if (!value.trim()) {
-      console.error('Нельзя оставлять пустые комментарии');
-      return;
-    }
-    const onSuccess = () => {
-      ref.current.value = '';
-      onCancel()
-    }
-    // {
-    //   "text": "Первый ответ на коммент!",
-    //   "parent": {"_id":  "670429839c74519426f378bd", "_type":  "comment"}
-    // }
-    onAdd({"text": value, "parent": {parentId, "_type": 'comment'}},author , onSuccess)
-
-  }
-
-  return (
-    <form className={cn()} onSubmit={onSend}>
-      <h3 className={cn('title')}>{title}</h3>
-      <textarea ref={ref} className={cn('textarea')} placeholder={t('comments.placeholder')} />
-      <div className={cn('actions')}>
-        <button>{t('comments.send')}</button>
-        {cancelButtonText && <button onClick={onCancel}>{cancelButtonText}</button>}
-      </div>
-    </form>
-  );
-}
-
-CommentForm.propTypes = {
-  onAdd: PropTypes.func,
-  onCancel: PropTypes.func,
-  t: PropTypes.func,
-  title: PropTypes.string.isRequired,
-  cancelButtonText: PropTypes.string,
-};
-
-export default memo(CommentForm);
\ No newline at end of file
diff --git a/src/components/comment_form/style.css b/src/components/comment_form/style.css
deleted file mode 100644
index bfef56255..000000000
--- a/src/components/comment_form/style.css
+++ /dev/null
@@ -1,24 +0,0 @@
-.CommentForm {
-  margin-bottom: 30px;
-  width: 100%;
-}
-
-.CommentForm-title {
-  font-size: 12px;
-  margin-bottom: 10px;
-  margin-top: 0;
-}
-
-.CommentForm-textarea {
-  width: 100%;
-  min-height: 76px;
-  resize: vertical;
-  margin-bottom: 10px;
-  padding: 4px;
-  box-sizing: border-box;
-}
-
-.CommentForm-actions {
-  display: flex;
-  gap: 10px;
-}
\ No newline at end of file
diff --git a/src/components/comment_header/index.js b/src/components/comment_header/index.js
deleted file mode 100644
index 7c53de96f..000000000
--- a/src/components/comment_header/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { memo } from 'react';
-import PropTypes from 'prop-types';
-import { cn as bem } from '@bem-react/classname';
-//import './style.css';
-
-function CommentHeader(props) {
-  const { count = 0, t = text => text } = props;
-  const cn = bem('CommentHeader');
-  return (
-    <div className={cn()}>{t("comment.header" )} ({count})</div>
-  );
-}
-
-CommentHeader.propTypes = {
-  count: PropTypes.number,
-  t: PropTypes.func,
-};
-
-export default memo(CommentHeader);
\ No newline at end of file
diff --git a/src/components/comment_list/index.js b/src/components/comment_list/index.js
deleted file mode 100644
index ab1b71ed6..000000000
--- a/src/components/comment_list/index.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { memo, useMemo, useState } from 'react';
-import PropTypes from 'prop-types';
-import { cn as bem } from '@bem-react/classname';
-import Comment from '../comment';
-import './style.css';
-  
-function CommentList({comments, onAdd, openCommentId, onCancel, onOpen, t, isChildList, isAuth}) {
-  const cn = bem('CommentList');
-  return (
-      <ul className={cn({child: isChildList})}>
-        {comments?.map(comment => (
-          <li key={comment._id}>
-            <Comment
-              openCommentId={openCommentId}
-              comment={comment}
-              onAdd={onAdd}
-              onCancel={onCancel}
-              onOpen={onOpen}
-              isAuth={isAuth}
-              t={t}
-            />
-          </li>
-        ))}
-      </ul>
-    );
-  }
-  
-  CommentList.propTypes = {
-    openCommentId: PropTypes.string,
-    comments: PropTypes.array,
-    onAdd: PropTypes.func,
-    onCancel: PropTypes.func,
-    onOpen: PropTypes.func,
-    isChildList: PropTypes.bool,
-    isAuth: PropTypes.bool,
-    t: PropTypes.func,
-  };
-  
-  export default memo(CommentList);
\ No newline at end of file
diff --git a/src/components/comment_list/style.css b/src/components/comment_list/style.css
deleted file mode 100644
index 09e47d849..000000000
--- a/src/components/comment_list/style.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.CommentList {
-  list-style: none;
-  padding: 0;
-  margin: 0;
-}
-
-.CommentList_child {
-  list-style: none;
-  padding-left: 30px;
-}
-
-.CommentsSection {
-  padding: 0 40px 40px 40px;
-  margin-top: 30px;
-}
\ No newline at end of file
diff --git a/src/components/no-comments/index.js b/src/components/no-comments/index.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/components/page-layout/style.css b/src/components/page-layout/style.css
index 45892cde1..18bcd9d78 100644
--- a/src/components/page-layout/style.css
+++ b/src/components/page-layout/style.css
@@ -6,11 +6,10 @@ body {
 }
 
 .PageLayout {
-  width: 1024px;
+  max-width: 1024px;
   min-height: 100vh;
   margin: 0 auto;
   background: #fff;
   box-sizing: border-box;
   box-shadow: 0 0 15px 5px #0000003b;
-  padding-bottom: 92px;
-}
\ No newline at end of file
+}
diff --git a/src/containers/comment/index.js b/src/containers/comment/index.js
index 20d8894e7..f2baa9f8f 100644
--- a/src/containers/comment/index.js
+++ b/src/containers/comment/index.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { useDispatch } from 'react-redux';
 import useSelector from '../../hooks/use-selector';
 import { useSelector as useReduxSelector } from 'react-redux';
-import reviewsActions from '../../store-redux/reviews/actions';
+import commentsActions from '../../store-redux/comments/actions';
 import CommentView from '../../components/comment-view';
 
 const CommentContainer = ({ comment, onReply, level = 0 }) => {
@@ -14,11 +14,11 @@ const CommentContainer = ({ comment, onReply, level = 0 }) => {
     userId: state.session.user?.['_id'] || null,
   }));
 
-  const replyTo = useReduxSelector(state => state.reviews.replyTo);
+  const replyTo = useReduxSelector(state => state.comments.replyTo);
   const isReplying = replyTo === comment._id;
   const isCurrentUser = comment.author?.['_id'] === select.userId;
   const handleCancel = () => {
-    dispatch(reviewsActions.clearReplyTo());
+    dispatch(commentsActions.clearReplyTo());
   };
 
   const renderReply = (reply, newLevel) => (
diff --git a/src/containers/comments-form/index.js b/src/containers/comments-form/index.js
index 7070015f6..f9597d6ad 100644
--- a/src/containers/comments-form/index.js
+++ b/src/containers/comments-form/index.js
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { useParams } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
-import reviewsActions from '../../store-redux/reviews/actions';
+import commentsActions from '../../store-redux/comments/actions';
 import CommentsFormView from '../../components/comments-form-view';
 import useSelector from '../../hooks/use-selector';
 
@@ -21,13 +21,13 @@ const CommentsForm = ({ parentId }) => {
     e.preventDefault();
     console.log('Форма отправлена');
     const targetType = targetId === articleId ? 'article' : 'comment';
-    dispatch(reviewsActions.addNewComment(targetId, text, targetType, select.name, select._id));
+    dispatch(commentsActions.addNewComment(targetId, text, targetType, select.name, select._id));
     setText('');
-    dispatch(reviewsActions.clearReplyTo());
+    dispatch(commentsActions.clearReplyTo());
   };
 
   const handleCancel = () => {
-    dispatch(reviewsActions.clearReplyTo());
+    dispatch(commentsActions.clearReplyTo());
   };
 
   return (
diff --git a/src/i18n/translations/en.json b/src/i18n/translations/en.json
index b57c58650..171a28882 100644
--- a/src/i18n/translations/en.json
+++ b/src/i18n/translations/en.json
@@ -20,14 +20,5 @@
   "auth.password": "Password",
   "auth.signIn": "Sign in",
   "session.signIn": "Sign In",
-  "session.signOut": "Sign Out",
-  "comment.header": "Comments",
-  "comment.login": "Log in",
-  "comment.footer":"to be able to comment",
-  "comments.placeholder": "Text",
-  "comments.new-comment": "New comment",
-  "comments.send": "Send",
-  "comments.answer": "Answer",
-  "comments.new-answer": "New answer",
-  "comments.cancel": "Cancel"
+  "session.signOut": "Sign Out"
 }
diff --git a/src/i18n/translations/ru.json b/src/i18n/translations/ru.json
index 7235d0ddf..b2a32bfe1 100644
--- a/src/i18n/translations/ru.json
+++ b/src/i18n/translations/ru.json
@@ -22,14 +22,5 @@
   "auth.password": "Пароль",
   "auth.signIn": "Войти",
   "session.signIn": "Вход",
-  "session.signOut": "Выход",
-  "comment.header": "Комментарии",
-  "comment.login": "Войдите",
-  "comment.footer":", чтобы иметь возможность комментировать",
-  "comments.placeholder": "Текст",
-  "comments.new-comment": "Новый комментарий",
-  "comments.send": "Отправить",
-  "comments.answer": "Ответить",
-  "comments.new-answer": "Новый ответ",
-  "comments.cancel": "Отмена"
+  "session.signOut": "Выход"
 }
diff --git a/src/store-redux/article/actions.js b/src/store-redux/article/actions.js
index 8c98d1478..04f1c4b1d 100644
--- a/src/store-redux/article/actions.js
+++ b/src/store-redux/article/actions.js
@@ -13,14 +13,8 @@ export default {
         const res = await services.api.request({
           url: `/api/v1/articles/${id}?fields=*,madeIn(title,code),category(title)`,
         });
-
-        const comments = await services.api.request({
-          url: `/api/v1/comments?fields=items(_id,text,dateCreate,author(profile(name)),parent(_id,_type),isDeleted),count&limit=*&search[parent]=${id}`,
-        });    
-        
-        console.log("store-redux article - comments=",comments.data.result)
         // Товар загружен успешно
-        dispatch({ type: 'article/load-success', payload: { data: res.data.result, comments: comments.data.result } });
+        dispatch({ type: 'article/load-success', payload: { data: res.data.result } });
       } catch (e) {
         //Ошибка загрузки
         dispatch({ type: 'article/load-error' });
diff --git a/src/store-redux/article/reducer.js b/src/store-redux/article/reducer.js
index 4c873b532..1df8020ce 100644
--- a/src/store-redux/article/reducer.js
+++ b/src/store-redux/article/reducer.js
@@ -1,7 +1,6 @@
 // Начальное состояние
 export const initialState = {
   data: {},
-  comments: {},
   waiting: false, // признак ожидания загрузки
 };
 
@@ -9,13 +8,13 @@ export const initialState = {
 function reducer(state = initialState, action) {
   switch (action.type) {
     case 'article/load-start':
-      return { ...state, data: {}, comments: {}, waiting: true };
+      return { ...state, data: {}, waiting: true };
 
     case 'article/load-success':
-      return { ...state, data: action.payload.data, comments: action.payload.comments, waiting: false };
+      return { ...state, data: action.payload.data, waiting: false };
 
     case 'article/load-error':
-      return { ...state, data: {}, comments: {}, waiting: false }; //@todo текст ошибки сохранять?
+      return { ...state, data: {}, waiting: false }; //@todo текст ошибки сохранять?
 
     default:
       // Нет изменений
diff --git a/src/store-redux/comments/actions.js b/src/store-redux/comments/actions.js
index cd5153cf9..c22730590 100644
--- a/src/store-redux/comments/actions.js
+++ b/src/store-redux/comments/actions.js
@@ -1,47 +1,92 @@
+import listToTree from '../../utils/list-to-tree';
+import treeToList from '../../utils/tree-to-list';
 export default {
-    /**
-     * Загрузка комментариев
-     * @param id
-     * @return {Function}
-     */
-    load: id => {
-      return async (dispatch, _, services) => {
-        dispatch({ type: 'comments/load-start' });
-        try {
-          const url = `/api/v1/comments?fields=items(_id,text,dateCreate,author(profile(name)),parent(_id,_type),isDeleted),count&limit=*&search[parent]=${id}`
-          const res = await services.api.request({ url });
-          const { count, items } = res.data.result;
-          dispatch({ type: 'comments/load-success', payload: { items, count } });
-        } catch (e) {
-          dispatch({ type: 'comments/load-error' });
+  /**
+   * Загрузка товара
+   * @param id
+   * @return {Function}
+   */
+  load: id => {
+    return async (dispatch, getState, services) => {
+      // Сброс текущего товара и установка признака ожидания загрузки
+      dispatch({ type: 'comments/load-start' });
+
+      try {
+        const res = await services.api.request({
+          url: `/api/v1/comments?fields=items(_id,text,dateCreate,author(profile(name)),parent(_id,_type),isDeleted),count&limit=*&search[parent]=${id}`,
+        });
+        let tree = listToTree(res.data.result.items)
+        console.log('tree= ',tree)
+        let newList = treeToList(tree)
+        console.log('newList= ',newList)
+        res.data.result.items = newList;
+        // Товар загружен успешно
+        dispatch({ type: 'comments/load-success', payload: { data: {...res.data.result} } });
+      } catch (e) {
+        //Ошибка загрузки
+        dispatch({ type: 'comments/load-error' });
+      }
+    };
+  },
+
+  addNewComment: (targetId, text, targetType, currentUser, id) => {
+    const token = localStorage.getItem('token');
+    return async dispatch => {
+      dispatch({ type: 'comments/add-start' });
+
+      try {
+        const res = await axios.post(
+          '/api/v1/comments',
+          {
+            text: text,
+            parent: { _id: targetId, _type: targetType },
+          },
+          {
+            headers: {
+              'Content-Type': 'application/json',
+              'X-Token': token,
+            },
+          },
+        );
+        const newComment = res.data.result;
+        if (currentUser) {
+          newComment.author = {
+            _id: id,
+            profile: {
+              name: currentUser,
+            },
+          };
         }
-      };
-    },
-  
-      /**
-     * Добавление комментария
-     * @param data {{text: string, parent: { _id: string, _type: string } }}
-     * @return {Function}
-     */
-    add: (data, userName, onSuccess) => {
-      console.log("post data=",data)
-      console.log("userName=",userName)
-      return async (dispatch, _, services) => {
-        try {
-          const res = await services.api.request({
-            method: 'POST',
-            url: `/api/v1/comments`,
-            body: JSON.stringify(data),
-          });
-          console.log("post comment res=",res)
-          const payload = {...res.data.result, author: { profile: { name: userName.name } } };
-          dispatch({ type: 'comments/add-success', payload });
-          if (onSuccess) 
-            ()=>onSuccess();
-        } catch (e) {
-          console.error({e})
-          dispatch({ type: 'comments/add-error' });
+
+        if (!newComment.dateCreate) {
+          newComment.dateCreate = new Date().toISOString();
         }
-      };
-    },
-  };
\ No newline at end of file
+        dispatch({ type: 'comments/add-success', payload: newComment });
+      } catch (error) {
+        console.error('Ошибка при добавлении комментария:', error);
+        dispatch({ type: 'comments/add-error' });
+      }
+    };
+  },
+
+  /**
+   * Установка ID комментария, на который происходит ответ
+   * @param commentId - ID комментария для ответа
+   * @return {Function}
+   */
+  setReplyTo: commentId => {
+    return dispatch => {
+      dispatch({ type: 'comments/set-reply-to', payload: commentId });
+    };
+  },
+
+  /**
+   * Сброс состояния ответа на комментарий
+   * @return {Function}
+   */
+  clearReplyTo: () => {
+    return dispatch => {
+      dispatch({ type: 'comments/clear-reply-to' });
+    };
+  },  
+};
diff --git a/src/store-redux/comments/reducer.js b/src/store-redux/comments/reducer.js
index 60e11c9f8..c2f6aa4db 100644
--- a/src/store-redux/comments/reducer.js
+++ b/src/store-redux/comments/reducer.js
@@ -1,28 +1,44 @@
+// Начальное состояние
 export const initialState = {
-    items: [],
-    count: 0,
-    waiting: false,
-    error: ''
-  };
+  data: {},
+  waiting: false, // признак ожидания загрузки
+};
+
+// Обработчик действий
+function reducer(state = initialState, action) {
+  switch (action.type) {
+    case 'comments/load-start':
+      return { ...state, data: {}, waiting: true };
+
+    case 'comments/load-success':
+      return { ...state, data: action.payload.data, waiting: false };
+
+    case 'comments/load-error':
+      return { ...state, data: {}, waiting: false }; //@todo текст ошибки сохранять?
+
+    case 'comments/set-reply-to':
+        return { ...state, replyTo: action.payload };
+  
+    case 'comments/clear-reply-to':
+        return { ...state, replyTo: null };
+  
+    case 'comments/add-start':
+        return { ...state};
+  
+    case 'comments/add-success':
+        return produce(state, draft => {
+          draft.data.push(action.payload);
+          draft.data.sort(
+            (a, b) => new Date(a.dateCreate) - new Date(b.dateCreate)
+          );
+        });
   
-  function reducer(state = initialState, action) {
-    switch (action.type) {
-      case 'comments/load-start': return { ...state, items: [], waiting: true };
-      case 'comments/load-success': {
-        const { items, count } = action.payload;
-        return { ...state, items, count, waiting: false, error: '' };
-      }
-      case 'comments/load-error':
-        return { ...state, items: [], waiting: false, error: 'Ошибка загрузки комментариев' };
-      case 'comments/add-success': {
-        const count = state.count + 1;
-        const items = [...state.items, action.payload];
-        return { ...state, items, count, waiting: false, error: '' };
-      }
       case 'comments/add-error':
-        return { ...state, waiting: false, error: 'Ошибка добавления комментария' };
-      default: return state;
-    }
+        return { ...state};
+    default:
+      // Нет изменений
+      return state;
   }
-  
-  export default reducer;
\ No newline at end of file
+}
+
+export default reducer;
diff --git a/src/store-redux/exports.js b/src/store-redux/exports.js
index 82a2c14c4..0e936a938 100644
--- a/src/store-redux/exports.js
+++ b/src/store-redux/exports.js
@@ -1,4 +1,3 @@
 export { default as article } from './article/reducer';
 export { default as modals } from './modals/reducer';
-export { default as comments } from './comments/reducer';
-export { default as reviews } from './reviews/reducer';
\ No newline at end of file
+export { default as comments } from './comments/reducer';
\ No newline at end of file
diff --git a/src/store-redux/reviews/actions.js b/src/store-redux/reviews/actions.js
deleted file mode 100644
index 14dc996b4..000000000
--- a/src/store-redux/reviews/actions.js
+++ /dev/null
@@ -1,87 +0,0 @@
-import axios from 'axios';
-
-export default {
-  /**
-   * Загрузка комментариев
-   * @param parentId - ID товара или комментария
-   * @return {Function}
-   */
-  load: parentId => {
-    return async (dispatch, getState, services) => {
-      dispatch({ type: 'reviews/load-start' });
-
-      try {
-        const res = await services.api.request({
-          url: `api/v1/comments?fields=items(_id,text,dateCreate,author(profile(name)),parent(_id,_type),isDeleted),count&limit=*&search[parent]=${parentId}`,
-        });
-
-        console.log('Загруженные комментарии:', res.data.result.items);
-        dispatch({ type: 'reviews/load-success', payload: { data: res.data.result.items } });
-      } catch (error) {
-        console.error('Ошибка при загрузке комментариев:', error);
-        dispatch({ type: 'reviews/load-error' });
-      }
-    };
-  },
-
-  addNewComment: (targetId, text, targetType, currentUser, id) => {
-    const token = localStorage.getItem('token');
-    return async dispatch => {
-      dispatch({ type: 'reviews/add-start' });
-
-      try {
-        const res = await axios.post(
-          '/api/v1/comments',
-          {
-            text: text,
-            parent: { _id: targetId, _type: targetType },
-          },
-          {
-            headers: {
-              'Content-Type': 'application/json',
-              'X-Token': token,
-            },
-          },
-        );
-        const newComment = res.data.result;
-        if (currentUser) {
-          newComment.author = {
-            _id: id,
-            profile: {
-              name: currentUser,
-            },
-          };
-        }
-
-        if (!newComment.dateCreate) {
-          newComment.dateCreate = new Date().toISOString();
-        }
-        dispatch({ type: 'reviews/add-success', payload: newComment });
-      } catch (error) {
-        console.error('Ошибка при добавлении комментария:', error);
-        dispatch({ type: 'reviews/add-error' });
-      }
-    };
-  },
-
-  /**
-   * Установка ID комментария, на который происходит ответ
-   * @param commentId - ID комментария для ответа
-   * @return {Function}
-   */
-  setReplyTo: commentId => {
-    return dispatch => {
-      dispatch({ type: 'reviews/set-reply-to', payload: commentId });
-    };
-  },
-
-  /**
-   * Сброс состояния ответа на комментарий
-   * @return {Function}
-   */
-  clearReplyTo: () => {
-    return dispatch => {
-      dispatch({ type: 'reviews/clear-reply-to' });
-    };
-  },
-};
\ No newline at end of file
diff --git a/src/store-redux/reviews/reducer.js b/src/store-redux/reviews/reducer.js
deleted file mode 100644
index 097de4ed3..000000000
--- a/src/store-redux/reviews/reducer.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import { produce } from 'immer';
-
-export const initialState = {
-  data: [],
-  waiting: false,
-  replyTo: null,
-};
-
-function reducer(state = initialState, action) {
-  switch (action.type) {
-    case 'reviews/load-start':
-      return { ...state, data: [], waiting: true };
-
-    case 'reviews/load-success':
-      return { ...state, data: action.payload.data, waiting: false };
-
-    case 'reviews/load-error':
-      return { ...state, data: [], waiting: false };
-
-    case 'reviews/set-reply-to':
-      return { ...state, replyTo: action.payload };
-
-    case 'reviews/clear-reply-to':
-      return { ...state, replyTo: null };
-
-    case 'reviews/add-start':
-      return { ...state};
-
-    case 'reviews/add-success':
-      return produce(state, draft => {
-        draft.data.push(action.payload);
-        draft.data.sort(
-          (a, b) => new Date(a.dateCreate) - new Date(b.dateCreate)
-        );
-      });
-
-    case 'reviews/add-error':
-      return { ...state};
-
-    default:
-      return state;
-  }
-}
-export default reducer;
\ No newline at end of file
diff --git a/src/store/article/index.js b/src/store/article/index.js
index 5c6ec2773..f86ed801f 100644
--- a/src/store/article/index.js
+++ b/src/store/article/index.js
@@ -1,14 +1,16 @@
 import StoreModule from '../module';
+
 /**
  * Детальная ифнормация о товаре для страницы товара
  */
 class ArticleState extends StoreModule {
   initState() {
     return {
-      data: [],
+      data: {},
       waiting: false, // признак ожидания загрузки
     };
   }
+
   /**
    * Загрузка товаров по id
    * @param id {String}
@@ -17,7 +19,7 @@ class ArticleState extends StoreModule {
   async load(id) {
     // Сброс текущего товара и установка признака ожидания загрузки
     this.setState({
-      data: [],
+      data: {},
       waiting: true,
     });
 
@@ -25,6 +27,7 @@ class ArticleState extends StoreModule {
       const res = await this.services.api.request({
         url: `/api/v1/articles/${id}?fields=*,madeIn(title,code),category(title)`,
       });
+
       // Товар загружен успешно
       this.setState(
         {
@@ -37,10 +40,11 @@ class ArticleState extends StoreModule {
       // Ошибка при загрузке
       // @todo В стейт можно положить информацию об ошибке
       this.setState({
-        data: [],
+        data: {},
         waiting: false,
       });
     }
   }
 }
-export default ArticleState;
\ No newline at end of file
+
+export default ArticleState;
diff --git a/src/store/comments/index.js b/src/store/comments/index.js
new file mode 100644
index 000000000..3c7f3466e
--- /dev/null
+++ b/src/store/comments/index.js
@@ -0,0 +1,50 @@
+import StoreModule from '../module';
+
+/**
+ * Детальная ифнормация о товаре для страницы товара
+ */
+class CommentsState extends StoreModule {
+  initState() {
+    return {
+      data: {},
+      waiting: false, // признак ожидания загрузки
+    };
+  }
+
+  /**
+   * Загрузка товаров по id
+   * @param id {String}
+   * @return {Promise<void>}
+   */
+  async load(id) {
+    // Сброс текущего товара и установка признака ожидания загрузки
+    this.setState({
+      data: {},
+      waiting: true,
+    });
+
+    try {
+      const res = await this.services.api.request({
+        url: `/api/v1/comments?fields=items(_id,text,dateCreate,author(profile(name)),parent(_id,_type),isDeleted),count&limit=*&search[parent]=${id}`,
+      });
+
+      // Товар загружен успешно
+      this.setState(
+        {
+          data: res.data.result,
+          waiting: false,
+        },
+        'Загружены комментарии из АПИ',
+      );
+    } catch (e) {
+      // Ошибка при загрузке
+      // @todo В стейт можно положить информацию об ошибке
+      this.setState({
+        data: {},
+        waiting: false,
+      });
+    }
+  }
+}
+
+export default CommentsState;
\ No newline at end of file
diff --git a/src/store/exports.js b/src/store/exports.js
index 4e703991a..55c3a2960 100644
--- a/src/store/exports.js
+++ b/src/store/exports.js
@@ -5,4 +5,3 @@ export { default as article } from './article';
 export { default as categories } from './categories';
 export { default as session } from './session';
 export { default as profile } from './profile';
-export { default as reviews } from './review';
\ No newline at end of file
diff --git a/src/store/review/index.js b/src/store/review/index.js
deleted file mode 100644
index d8e0799d4..000000000
--- a/src/store/review/index.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import StoreModule from '../module';
-
-class ReviewsState extends StoreModule {
-  initState() {
-    return {
-      data: [],
-      waiting: false,
-    };
-  }
-
-  /**
-   * Загрузка комментариев
-   * @param id {String}
-   * @return {Promise<void>}
-   */
-  async load(id) {
-    this.setState({
-      data: [],
-      waiting: true,
-    });
-
-    try {
-      const res = await this.services.api.request({
-        url: `api/v1/comments?fields=items(_id,text,dateCreate,author(profile(name)),parent(_id,_type),isDeleted),count&limit=*&search[parent]=670260bb7dd498df5525e5ed`,
-      });
-
-      this.setState(
-        {
-          data: res.data.result.items,
-          waiting: false,
-        },
-        'Загружен товар из АПИ',
-      );
-    } catch (e) {
-      this.setState({
-        data: [],
-        waiting: false,
-      });
-    }
-  }
-}
-
-export default ReviewsState;
\ No newline at end of file
diff --git a/src/utils/comments-to-tree.js b/src/utils/comments-to-tree.js
deleted file mode 100644
index 8362969d5..000000000
--- a/src/utils/comments-to-tree.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
-* Преобразование списка комментариев в иерархию
- * @param {Array} data
- * @returns
- */
-export const commentsToTree = (data) => {
-    const roots = [];
-    const map = data.reduce((acc, item) => {
-      acc[item._id] = { ...item, children: [] };
-      return acc;
-    }, {});
-  
-    data.forEach(item => {
-      if (item.parent._type === 'comment') {
-        const parent = map[item.parent._id];
-        if (parent) {
-          parent.children.push(map[item._id]);
-        }
-      } else {
-        roots.push(map[item._id]);
-      }
-    });
-    return roots;
-  };
\ No newline at end of file
diff --git a/src/utils/date.js b/src/utils/date.js
deleted file mode 100644
index 9878c5c7e..000000000
--- a/src/utils/date.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export const toCommentDate = (isoDate) => {
-    const date = new Date(isoDate);
-    const dateOptions = {day: 'numeric', month: 'long', year: 'numeric'}
-    const formattedDate = date.toLocaleDateString('ru-RU', dateOptions);
-    const timeOptions = {hour: '2-digit', minute: '2-digit'}
-    const formattedTime = date.toLocaleTimeString('ru-RU', timeOptions);
-    return `${formattedDate.slice(0, -3)} в ${formattedTime}`;
-  };
\ No newline at end of file
diff --git a/src/utils/tree-to-list/index.js b/src/utils/tree-to-list/index.js
index bd6af284d..3a79c0b06 100644
--- a/src/utils/tree-to-list/index.js
+++ b/src/utils/tree-to-list/index.js
@@ -1,54 +1,15 @@
-/** 
-* Преобразование списка в иерархию с учётом типов родителей, сортировкой
- * @param {Array} list
- * @param {Object} [options]
- * @param {String} [options.key='_id']
- * @param {String} [options.typeKey='_type']
- * @param {Array} [options.rootTypes=['article']]
- * @param {String} [options.childrenKey='replies']
- * @param {String} [options.sortKey='dateCreate']
- * @returns {Array}
+/**
+ * Преобразование иерархии в список.
+ * @param tree {Array} Иерархия - список узлов со свойством children.
+ * @param [callback] {Function} Для пользовательского преобразования элемента.
+ * @param [level] {Number} Начальный уровень вложенности.
+ * @param [result] {Array} Результат функции (используется рекурсией).
+ * @returns {Array} Корневые узлы
  */
-
-export default function listToTree(list, options = {}) {
-  const {
-    key = '_id',
-    typeKey = '_type',
-    rootTypes = ['article'],
-    childrenKey = 'replies',
-    sortKey = 'dateCreate',
-  } = options;
-  if (!Array.isArray(list)) {
-    console.error('Expected an array, got:', list);
-    return [];
+export default function treeToList(tree, callback, level = 0, result = []) {
+  for (const item of tree) {
+    result.push(callback ? callback(item, level) : item);
+    if (item.children?.length) treeToList(item.children, callback, level + 1, result);
   }
-  const sortedList = [...list].sort((a, b) => new Date(a[sortKey]) - new Date(b[sortKey]));
-  const map = {};
-  const roots = [];
-  sortedList.forEach(item => {
-    map[item[key]] = { ...item, [childrenKey]: [] };
-  });
-  sortedList.forEach(item => {
-    const parent = item.parent;
-    if (parent && parent[typeKey] && !rootTypes.includes(parent[typeKey])) {
-      const parentId = parent[key];
-      if (map[parentId]) {
-        map[parentId][childrenKey].push(map[item[key]]);
-      } else {
-        roots.push(map[item[key]]);
-      }
-    } else {
-      roots.push(map[item[key]]);
-    }
-  });
-  const sortChildren = node => {
-    if (node[childrenKey] && node[childrenKey].length > 0) {
-      node[childrenKey].sort((a, b) => new Date(a[sortKey]) - new Date(b[sortKey]));
-      node[childrenKey].forEach(child => sortChildren(child));
-    }
-  };
-
-  roots.forEach(root => sortChildren(root));
-
-  return roots;
-}
\ No newline at end of file
+  return result;
+}