diff --git a/src/App.tsx b/src/App.tsx
index d46111e825..2b724c5dad 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable max-len */
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import 'bulma/css/bulma.css';
 import '@fortawesome/fontawesome-free/css/all.css';
 
@@ -7,8 +7,20 @@ import { TodoList } from './components/TodoList';
 import { TodoFilter } from './components/TodoFilter';
 import { TodoModal } from './components/TodoModal';
 import { Loader } from './components/Loader';
+import { Todo } from './types/Todo';
 
 export const App: React.FC = () => {
+  const [isLoading, setIsLoading] = useState(true);
+  const [isModalVisible, setIsModalVisible] = useState(false);
+  const [todos, setTodos] = useState<Todo[] | null>(null);
+  const [todo, setTodo] = useState<Todo | null>(null);
+
+  useEffect(() => {
+    setTimeout(() => {
+      setIsLoading(false);
+    }, 1000);
+  }, []);
+
   return (
     <>
       <div className="section">
@@ -17,18 +29,32 @@ export const App: React.FC = () => {
             <h1 className="title">Todos:</h1>
 
             <div className="block">
-              <TodoFilter />
+              <TodoFilter setTodos={setTodos} />
             </div>
 
             <div className="block">
-              <Loader />
-              <TodoList />
+              {isLoading ? (
+                <Loader />
+              ) : (
+                <TodoList
+                  setModalVisible={setIsModalVisible}
+                  setSelectedTodo={setTodo}
+                  todos={todos}
+                  selectedTodo={todo}
+                />
+              )}
             </div>
           </div>
         </div>
       </div>
 
-      <TodoModal />
+      {isModalVisible && (
+        <TodoModal
+          setVisible={setIsModalVisible}
+          todo={todo}
+          setTodo={setTodo}
+        />
+      )}
     </>
   );
 };
diff --git a/src/api.ts b/src/api.ts
index 4bf9d3eccb..c7cdac6c05 100644
--- a/src/api.ts
+++ b/src/api.ts
@@ -1,3 +1,32 @@
+// import { Todo } from './types/Todo';
+// import { User } from './types/User';
+
+// // eslint-disable-next-line operator-linebreak
+// const BASE_URL =
+//   'https://mate-academy.github.io/react_dynamic-list-of-todos/api';
+
+// // This function creates a promise
+// // that is resolved after a given delay
+// function wait(delay: number): Promise<void> {
+//   return new Promise(resolve => {
+//     setTimeout(resolve, delay);
+//   });
+// }
+
+// function get<T>(url: string): Promise<T> {
+//   // eslint-disable-next-line prefer-template
+//   const fullURL = BASE_URL + url + '.json';
+
+//   // we add some delay to see how the loader works
+//   return wait(300)
+//     .then(() => fetch(fullURL))
+//     .then(res => res.json());
+// }
+
+// export const getTodos = () => get<Todo[]>('/todos');
+
+// export const getUser = (userId: number) => get<User>(`/users/${userId}`);
+
 import { Todo } from './types/Todo';
 import { User } from './types/User';
 
diff --git a/src/components/TodoFilter/TodoFilter.tsx b/src/components/TodoFilter/TodoFilter.tsx
index 193f1cd2b2..9c2350c435 100644
--- a/src/components/TodoFilter/TodoFilter.tsx
+++ b/src/components/TodoFilter/TodoFilter.tsx
@@ -1,30 +1,78 @@
-export const TodoFilter = () => (
-  <form className="field has-addons">
-    <p className="control">
-      <span className="select">
-        <select data-cy="statusSelect">
-          <option value="all">All</option>
-          <option value="active">Active</option>
-          <option value="completed">Completed</option>
-        </select>
-      </span>
-    </p>
-
-    <p className="control is-expanded has-icons-left has-icons-right">
-      <input
-        data-cy="searchInput"
-        type="text"
-        className="input"
-        placeholder="Search..."
-      />
-      <span className="icon is-left">
-        <i className="fas fa-magnifying-glass" />
-      </span>
-
-      <span className="icon is-right" style={{ pointerEvents: 'all' }}>
-        {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
-        <button data-cy="clearSearchButton" type="button" className="delete" />
-      </span>
-    </p>
-  </form>
-);
+import React, { useEffect, useState } from 'react';
+import { Todo } from '../../types/Todo';
+import { getTodos } from '../../api';
+
+type Props = {
+  setTodos: React.Dispatch<React.SetStateAction<Todo[] | null>>;
+};
+
+export const TodoFilter: React.FC<Props> = ({ setTodos }) => {
+  const [qwerty, setQwerty] = useState('');
+  const [status, setStatus] = useState('');
+
+  useEffect(() => {
+    getTodos().then(serverTodos => {
+      let currentTodos: Todo[] | null = serverTodos.filter(todo =>
+        todo.title.toLocaleLowerCase().includes(qwerty.toLocaleLowerCase()),
+      );
+
+      switch (status) {
+        case 'active':
+          currentTodos = currentTodos.filter(todo => !todo.completed);
+          break;
+        case 'completed':
+          currentTodos = currentTodos.filter(todo => todo.completed);
+          break;
+      }
+
+      setTodos(currentTodos);
+    });
+  }, [qwerty, status, setTodos]);
+
+  return (
+    <form className="field has-addons">
+      <p className="control">
+        <span className="select">
+          <select
+            data-cy="statusSelect"
+            onChange={e => setStatus(e.target.value)}
+          >
+            <option value="all">All</option>
+            <option value="active">Active</option>
+            <option value="completed">Completed</option>
+          </select>
+        </span>
+      </p>
+
+      <p className="control is-expanded has-icons-left has-icons-right">
+        <input
+          data-cy="searchInput"
+          type="text"
+          className="input"
+          placeholder="Search..."
+          value={qwerty}
+          onChange={e => {
+            setQwerty(e.target.value);
+          }}
+        />
+        <span className="icon is-left">
+          <i className="fas fa-magnifying-glass" />
+        </span>
+
+        <span className="icon is-right" style={{ pointerEvents: 'all' }}>
+          {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
+          {qwerty && (
+            <button
+              data-cy="clearSearchButton"
+              type="button"
+              className="delete"
+              onClick={() => {
+                setQwerty('');
+              }}
+            />
+          )}
+        </span>
+      </p>
+    </form>
+  );
+};
diff --git a/src/components/TodoList/TodoList.tsx b/src/components/TodoList/TodoList.tsx
index 84dbcf3c0e..0b8b0dea56 100644
--- a/src/components/TodoList/TodoList.tsx
+++ b/src/components/TodoList/TodoList.tsx
@@ -1,100 +1,86 @@
 import React from 'react';
+import { Todo } from '../../types/Todo';
 
-export const TodoList: React.FC = () => (
-  <table className="table is-narrow is-fullwidth">
-    <thead>
-      <tr>
-        <th>#</th>
-        <th>
-          <span className="icon">
-            <i className="fas fa-check" />
-          </span>
-        </th>
-        <th>Title</th>
-        <th> </th>
-      </tr>
-    </thead>
+type Props = {
+  todos: Todo[] | null;
+  setModalVisible: React.Dispatch<React.SetStateAction<boolean>>;
+  setSelectedTodo: React.Dispatch<React.SetStateAction<Todo | null>>;
+  selectedTodo: Todo | null;
+};
 
-    <tbody>
-      <tr data-cy="todo" className="">
-        <td className="is-vcentered">1</td>
-        <td className="is-vcentered" />
-        <td className="is-vcentered is-expanded">
-          <p className="has-text-danger">delectus aut autem</p>
-        </td>
-        <td className="has-text-right is-vcentered">
-          <button data-cy="selectButton" className="button" type="button">
-            <span className="icon">
-              <i className="far fa-eye" />
-            </span>
-          </button>
-        </td>
-      </tr>
-      <tr data-cy="todo" className="has-background-info-light">
-        <td className="is-vcentered">2</td>
-        <td className="is-vcentered" />
-        <td className="is-vcentered is-expanded">
-          <p className="has-text-danger">quis ut nam facilis et officia qui</p>
-        </td>
-        <td className="has-text-right is-vcentered">
-          <button data-cy="selectButton" className="button" type="button">
-            <span className="icon">
-              <i className="far fa-eye-slash" />
-            </span>
-          </button>
-        </td>
-      </tr>
+export const TodoList: React.FC<Props> = ({
+  setModalVisible,
+  todos,
+  setSelectedTodo,
+  selectedTodo,
+}) => {
+  // console.log(todos);
 
-      <tr data-cy="todo" className="">
-        <td className="is-vcentered">1</td>
-        <td className="is-vcentered" />
-        <td className="is-vcentered is-expanded">
-          <p className="has-text-danger">delectus aut autem</p>
-        </td>
-        <td className="has-text-right is-vcentered">
-          <button data-cy="selectButton" className="button" type="button">
-            <span className="icon">
-              <i className="far fa-eye" />
+  function mapTodos() {
+    return todos?.map(todo => (
+      <tr
+        data-cy="todo"
+        className={
+          selectedTodo?.id === todo.id ? 'has-background-info-light' : undefined
+        }
+        key={todo.id}
+      >
+        <td className="is-vcentered">{todo.id}</td>
+        <td className="is-vcentered">
+          {todo.completed && (
+            <span className="icon" data-cy="iconCompleted">
+              <i className="fas fa-check" />
             </span>
-          </button>
+          )}
         </td>
-      </tr>
-
-      <tr data-cy="todo" className="">
-        <td className="is-vcentered">6</td>
-        <td className="is-vcentered" />
         <td className="is-vcentered is-expanded">
-          <p className="has-text-danger">
-            qui ullam ratione quibusdam voluptatem quia omnis
+          <p
+            className={todo.completed ? 'has-text-success' : 'has-text-danger'}
+          >
+            {todo.title}
           </p>
         </td>
         <td className="has-text-right is-vcentered">
-          <button data-cy="selectButton" className="button" type="button">
+          <button
+            data-cy="selectButton"
+            className="button"
+            type="button"
+            onClick={() => {
+              setModalVisible(true);
+              setSelectedTodo(todo);
+            }}
+          >
             <span className="icon">
-              <i className="far fa-eye" />
+              <i
+                className={
+                  selectedTodo && selectedTodo.id === todo.id
+                    ? 'far fa-eye-slash'
+                    : 'far fa-eye'
+                }
+              />
             </span>
           </button>
         </td>
       </tr>
+    ));
+  }
 
-      <tr data-cy="todo" className="">
-        <td className="is-vcentered">8</td>
-        <td className="is-vcentered">
-          <span className="icon" data-cy="iconCompleted">
-            <i className="fas fa-check" />
-          </span>
-        </td>
-        <td className="is-vcentered is-expanded">
-          <p className="has-text-success">quo adipisci enim quam ut ab</p>
-        </td>
-        <td className="has-text-right is-vcentered">
-          <button data-cy="selectButton" className="button" type="button">
+  return (
+    <table className="table is-narrow is-fullwidth">
+      <thead>
+        <tr>
+          <th>#</th>
+          <th>
             <span className="icon">
-              <i className="far fa-eye" />
+              <i className="fas fa-check" />
             </span>
-          </button>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-);
+          </th>
+          <th>Title</th>
+          <th> </th>
+        </tr>
+      </thead>
+
+      <tbody>{mapTodos()}</tbody>
+    </table>
+  );
+};
diff --git a/src/components/TodoModal/TodoModal.tsx b/src/components/TodoModal/TodoModal.tsx
index 0fbe6dae99..3291b02422 100644
--- a/src/components/TodoModal/TodoModal.tsx
+++ b/src/components/TodoModal/TodoModal.tsx
@@ -1,12 +1,38 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import { Loader } from '../Loader';
+import { Todo } from '../../types/Todo';
+import { User } from '../../types/User';
+import { getUser } from '../../api';
+
+type Props = {
+  todo: Todo | null;
+  setVisible: React.Dispatch<React.SetStateAction<boolean>>;
+  setTodo: React.Dispatch<React.SetStateAction<Todo | null>>;
+};
+
+export const TodoModal: React.FC<Props> = ({ setVisible, todo, setTodo }) => {
+  const [isLoading, setIsLoading] = useState(true);
+  const [user, setUser] = useState<User | null>(null);
+
+  useEffect(() => {
+    setTimeout(() => {
+      setIsLoading(false);
+    }, 1000);
+
+    if (todo) {
+      getUser(todo.userId).then(setUser);
+    }
+  }, [todo]);
+
+  if (!todo) {
+    return null;
+  }
 
-export const TodoModal: React.FC = () => {
   return (
     <div className="modal is-active" data-cy="modal">
       <div className="modal-background" />
 
-      {true ? (
+      {isLoading ? (
         <Loader />
       ) : (
         <div className="modal-card">
@@ -15,25 +41,36 @@ export const TodoModal: React.FC = () => {
               className="modal-card-title has-text-weight-medium"
               data-cy="modal-header"
             >
-              Todo #2
+              Todo #{todo.id}
             </div>
 
             {/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
-            <button type="button" className="delete" data-cy="modal-close" />
+            <button
+              type="button"
+              className="delete"
+              data-cy="modal-close"
+              onClick={() => {
+                setVisible(false);
+                setTodo(null);
+              }}
+            />
           </header>
 
           <div className="modal-card-body">
             <p className="block" data-cy="modal-title">
-              quis ut nam facilis et officia qui
+              {todo.title}
             </p>
 
             <p className="block" data-cy="modal-user">
-              {/* <strong className="has-text-success">Done</strong> */}
-              <strong className="has-text-danger">Planned</strong>
+              {todo.completed ? (
+                <strong className="has-text-success">Done</strong>
+              ) : (
+                <strong className="has-text-danger">Planned</strong>
+              )}
 
               {' by '}
 
-              <a href="mailto:Sincere@april.biz">Leanne Graham</a>
+              <a href="mailto:Sincere@april.biz">{user ? user.name : null}</a>
             </p>
           </div>
         </div>