diff --git a/src/components/ErrorNotification/ErrorNotification.tsx b/src/components/ErrorNotification/ErrorNotification.tsx
index 0fd6eff53..2ff1c5874 100644
--- a/src/components/ErrorNotification/ErrorNotification.tsx
+++ b/src/components/ErrorNotification/ErrorNotification.tsx
@@ -1,4 +1,4 @@
-import { FC } from 'react';
+import { FC, useEffect } from 'react';
 import { ErrorMessages } from '../../types/ErrorMessages';
 import cn from 'classnames';
 
@@ -11,6 +11,14 @@ export const ErrorNotification: FC<Props> = ({
   errorMessage,
   onResetError,
 }) => {
+  useEffect(() => {
+    const timerId = setTimeout(() => {
+      onResetError();
+    }, 3000);
+
+    return () => clearTimeout(timerId);
+  }, [errorMessage]);
+
   return (
     <div
       data-cy="ErrorNotification"
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index 85733c3b6..5c06cd87d 100644
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@@ -53,14 +53,16 @@ export const Header: FC<Props> = ({
 
   return (
     <header className="todoapp__header">
-      {todos.length > 0 && <button
-        type="button"
-        className={cn('todoapp__toggle-all', {
-          active: areAllCompleted,
-        })}
-        data-cy="ToggleAllButton"
-        onClick={onToggleAll}
-      />}
+      {todos.length > 0 && (
+        <button
+          type="button"
+          className={cn('todoapp__toggle-all', {
+            active: areAllCompleted,
+          })}
+          data-cy="ToggleAllButton"
+          onClick={onToggleAll}
+        />
+      )}
 
       <form onSubmit={handleSubmit}>
         <input
diff --git a/src/hooks/useTodos.ts b/src/hooks/useTodos.ts
index 499260c58..274c5b6f9 100644
--- a/src/hooks/useTodos.ts
+++ b/src/hooks/useTodos.ts
@@ -20,7 +20,6 @@ export const useTodos = () => {
 
   const handleErrorMessage = (error: ErrorMessages) => {
     setErrorMessage(error);
-    setTimeout(handleErrorReset, 3000);
   };
 
   useEffect(() => {
@@ -36,7 +35,7 @@ export const useTodos = () => {
     addTodo(newTodo)
       .then(todo => {
         setTodos(currentTodos => [...currentTodos, todo]);
-        setNewTitle('')
+        setNewTitle('');
       })
       .catch(() => handleErrorMessage(ErrorMessages.UNABLE_TO_ADD_TODO))
       .finally(() => {
@@ -68,7 +67,9 @@ export const useTodos = () => {
     updateTodo(id, updatedTodo)
       .then(todo => {
         setTodos(currentTodos =>
-          currentTodos.map(t => (t.id === id ? { ...t, ...todo } : t)),
+          currentTodos.map(updatedTodo =>
+            updatedTodo.id === id ? { ...updatedTodo, ...todo } : updatedTodo,
+          ),
         );
         setEditedTodoId(null);
       })
@@ -84,10 +85,6 @@ export const useTodos = () => {
   const handleCompletedDelete = () => {
     const completedTodos = todos.filter(todo => todo.completed);
     setIsReceivingAnswer(true);
-    setLoadingTodoIds(currentIds => [
-      ...currentIds,
-      ...completedTodos.map(todo => todo.id),
-    ]);
 
     Promise.all(
       completedTodos.map(completedTodo => handleTodoDelete(completedTodo.id)),
@@ -102,11 +99,6 @@ export const useTodos = () => {
       : todos.filter(todo => !todo.completed);
 
     setIsReceivingAnswer(true);
-    setLoadingTodoIds(currentIds => [
-      ...currentIds,
-      ...todosToUpdate.map(todo => todo.id),
-    ]);
-
     Promise.all(
       todosToUpdate.map(todo =>
         handleTodoUpdate(todo.id, { completed: newStatus }),