diff --git a/src/Api/Api.ts b/src/Api/Api.ts
new file mode 100644
index 000000000..2e7770911
--- /dev/null
+++ b/src/Api/Api.ts
@@ -0,0 +1,39 @@
+import { Post } from '../types/Post';
+import { Comment } from '../types/Comment';
+import { client } from '../utils/fetchClient';
+
+export const getUsers = () => {
+  return client.get('/users');
+};
+
+export const getPosts = (id?: number) => {
+  return client.get(`/posts?userId=${id}`);
+};
+
+export const getPost = (id?: number) => {
+  return client.get(`/posts/${id}`);
+};
+
+export const getComments = (id?: number) => {
+  return client.get(`/comments?postId=${id}`);
+};
+
+export const postData = (url: string, data: Post) => {
+  return client.post(url, data);
+};
+
+export const updateComments = (data: Comment[]) => {
+  return client.patch('/comments', data);
+};
+
+export const deleteData = (url: string) => {
+  return client.delete(url);
+};
+
+export const deleteComment = (id: number) => {
+  return client.delete(`/comments/${id}`);
+};
+
+export const addComment = (postId: number, data: Comment) => {
+  return client.post(`/comments?postId=${postId}`, data);
+};
diff --git a/src/App.tsx b/src/App.tsx
index db56b44b0..267ec986a 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import 'bulma/bulma.sass';
 import '@fortawesome/fontawesome-free/css/all.css';
 import './App.scss';
@@ -8,8 +8,65 @@ import { PostsList } from './components/PostsList';
 import { PostDetails } from './components/PostDetails';
 import { UserSelector } from './components/UserSelector';
 import { Loader } from './components/Loader';
+import { Post } from './types/Post';
+import { User } from './types/User';
+import { getPosts, getUsers } from './Api/Api';
 
 export const App: React.FC = () => {
+  const [posts, setPosts] = useState<Post[]>([]);
+  const [isShowPostDetails, setIsShowPostDetails] = useState<boolean>(false);
+  const [isError, setIsError] = useState<boolean>(false);
+
+  const [users, setUsers] = useState<User[]>([]);
+
+  const [selectedUserId, setSelectedUserId] = useState<number>();
+  const [selectPostId, setSelectPostId] = useState<number>();
+
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+
+  const getUsersFromServer = () => {
+    getUsers()
+      .then(data => {
+        const user = data as User[];
+
+        setUsers(user);
+      })
+      .catch(() => {
+        setIsError(true);
+      });
+  };
+
+  const selectUser = users.find(person => person.id === selectedUserId);
+
+  const getPostsFromSelectedUser = () => {
+    setIsLoading(true);
+    if (selectUser) {
+      getPosts(selectedUserId)
+        .then(data => {
+          const selectedPosts = data as Post[];
+
+          setPosts(selectedPosts);
+          setIsLoading(false);
+        })
+        .catch(error => {
+          // eslint-disable-next-line no-console
+          console.error('Error:', error);
+          setIsError(true);
+          setIsLoading(false);
+        });
+    }
+  };
+
+  useEffect(() => {
+    getUsersFromServer();
+  }, []);
+
+  useEffect(() => {
+    if (selectedUserId) {
+      getPostsFromSelectedUser();
+    }
+  }, [selectUser]);
+
   return (
     <main className="section">
       <div className="container">
@@ -17,29 +74,57 @@ export const App: React.FC = () => {
           <div className="tile is-parent">
             <div className="tile is-child box is-success">
               <div className="block">
-                <UserSelector />
+                <UserSelector
+                  selectUser={selectUser}
+                  selectedUserId={selectedUserId}
+                  setSelectedUserId={setSelectedUserId}
+                  users={users}
+                />
               </div>
 
-              <div className="block" data-cy="MainContent">
-                <p data-cy="NoSelectedUser">
-                  No user selected
-                </p>
-
-                <Loader />
+              <div className="block " data-cy="MainContent">
+                {isError && (
+                  <>
+                    <div
+                      className="notification is-danger"
+                      data-cy="PostsLoadingError"
+                    >
+                      Something went wrong!
+                    </div>
+                  </>
+                )}
 
-                <div
-                  className="notification is-danger"
-                  data-cy="PostsLoadingError"
-                >
-                  Something went wrong!
-                </div>
+                {isLoading && <Loader />}
 
-                <div className="notification is-warning" data-cy="NoPostsYet">
-                  No posts yet
-                </div>
+                {!selectedUserId && !isLoading
+                  ? (
+                    <p data-cy="NoSelectedUser">
+                      No user selected
+                    </p>
+                  )
+                  : (posts.length > 0
+                    && (
+                      <PostsList
+                        posts={posts}
+                        isShowPostDetails={isShowPostDetails}
+                        setIsShowPostDetails={setIsShowPostDetails}
+                        selectedPostId={selectPostId}
+                        setSelectPostId={setSelectPostId}
+                      />
+                    )
+                  )}
+                {(selectedUserId && posts.length === 0 && !isLoading)
+                  && (
+                    <div
+                      className="notification is-warning"
+                      data-cy="NoPostsYet"
+                    >
+                      No posts yet
+                    </div>
+                  )}
 
-                <PostsList />
               </div>
+
             </div>
           </div>
 
@@ -50,12 +135,18 @@ export const App: React.FC = () => {
               'is-parent',
               'is-8-desktop',
               'Sidebar',
-              'Sidebar--open',
+              { 'Sidebar--open': isShowPostDetails },
             )}
           >
-            <div className="tile is-child box is-success ">
-              <PostDetails />
-            </div>
+            {isShowPostDetails && (
+              <div className="tile is-child box is-success ">
+                <PostDetails
+                  isError={isError}
+                  setIsError={setIsError}
+                  selectedPostId={selectPostId}
+                />
+              </div>
+            )}
           </div>
         </div>
       </div>
diff --git a/src/components/NewCommentForm.tsx b/src/components/NewCommentForm.tsx
index 73a8a0b45..cd53f74a4 100644
--- a/src/components/NewCommentForm.tsx
+++ b/src/components/NewCommentForm.tsx
@@ -1,8 +1,115 @@
-import React from 'react';
+import React, { useState } from 'react';
+import classNames from 'classnames';
+import { addComment } from '../Api/Api';
+import { Comment } from '../types/Comment';
+
+type Props = {
+  selectedPostId: number | undefined
+  setComments: React.Dispatch<React.SetStateAction<Comment[]>>
+};
+
+export const NewCommentForm: React.FC<Props> = ({
+  selectedPostId,
+  setComments,
+}) => {
+  const [name, setName] = useState<string>('');
+  const [email, setEmail] = useState<string>('');
+  const [text, setText] = useState<string>('');
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+
+  const [isErrorName, setIsErrorName] = useState<boolean>(false);
+  const [isErrorEmail, setIsErrorEmail] = useState<boolean>(false);
+  const [isErrorText, setIsErrorText] = useState<boolean>(false);
+
+  const handleChangeName = (
+    event: React.ChangeEvent<HTMLInputElement>,
+  ) => {
+    event.preventDefault();
+    setIsErrorName(false);
+    const newValue: string = event.target.value;
+
+    setName(newValue);
+  };
+
+  const handleChangeEmail = (
+    event: React.ChangeEvent<HTMLInputElement>,
+  ) => {
+    event.preventDefault();
+    setIsErrorEmail(false);
+    const newValue: string = event.target.value;
+
+    setEmail(newValue);
+  };
+
+  const handleChangeText = (
+    event: React.ChangeEvent<HTMLTextAreaElement>,
+  ) => {
+    event.preventDefault();
+    setIsErrorText(false);
+    const newValue: string = event.target.value;
+
+    setText(newValue);
+  };
+
+  const addNewComment = async () => {
+    if (!name.trim() || !email.trim() || !text.trim()) {
+      return;
+    }
+
+    setIsLoading(true);
+
+    const id = selectedPostId as number;
+
+    const newComment = {
+      name,
+      email,
+      body: text,
+      postId: id,
+    };
+
+    try {
+      if (selectedPostId) {
+        const addedComment = await addComment(selectedPostId, newComment);
+
+        setComments(
+          (currentComments: Comment[]) => [...currentComments, addedComment],
+        );
+        setText('');
+        setIsLoading(false);
+      }
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error('Error adding comment:', error);
+    }
+  };
+
+  const errorInput = () => {
+    if (name.trim().length === 0) {
+      setIsErrorName(true);
+    }
+
+    if (email.trim().length === 0) {
+      setIsErrorEmail(true);
+    }
+
+    if (text.trim().length === 0) {
+      setIsErrorText(true);
+    }
+  };
+
+  const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault();
+
+    errorInput();
+    addNewComment();
+  };
+
+  const clearAllInput = () => {
+    setText('');
+  };
 
-export const NewCommentForm: React.FC = () => {
   return (
-    <form data-cy="NewCommentForm">
+    <form data-cy="NewCommentForm" onSubmit={handleSubmit}>
       <div className="field" data-cy="NameField">
         <label className="label" htmlFor="comment-author-name">
           Author Name
@@ -14,24 +121,35 @@ export const NewCommentForm: React.FC = () => {
             name="name"
             id="comment-author-name"
             placeholder="Name Surname"
-            className="input is-danger"
+            className={classNames(
+              'input',
+              { 'is-danger': isErrorName },
+            )}
+            value={name}
+            onChange={handleChangeName}
           />
 
           <span className="icon is-small is-left">
             <i className="fas fa-user" />
           </span>
 
-          <span
-            className="icon is-small is-right has-text-danger"
-            data-cy="ErrorIcon"
-          >
-            <i className="fas fa-exclamation-triangle" />
-          </span>
+          {isErrorName
+            && (
+              <span
+                className="icon is-small is-right has-text-danger"
+                data-cy="ErrorIcon"
+              >
+                <i className="fas fa-exclamation-triangle" />
+              </span>
+            )}
         </div>
 
-        <p className="help is-danger" data-cy="ErrorMessage">
-          Name is required
-        </p>
+        {isErrorName
+          && (
+            <p className="help is-danger" data-cy="ErrorMessage">
+              Name is required
+            </p>
+          )}
       </div>
 
       <div className="field" data-cy="EmailField">
@@ -41,28 +159,38 @@ export const NewCommentForm: React.FC = () => {
 
         <div className="control has-icons-left has-icons-right">
           <input
-            type="text"
+            type="email"
             name="email"
             id="comment-author-email"
             placeholder="email@test.com"
-            className="input is-danger"
+            value={email}
+            onChange={handleChangeEmail}
+            className={classNames(
+              'input',
+              { 'is-danger': isErrorEmail },
+            )}
           />
 
           <span className="icon is-small is-left">
             <i className="fas fa-envelope" />
           </span>
 
-          <span
-            className="icon is-small is-right has-text-danger"
-            data-cy="ErrorIcon"
-          >
-            <i className="fas fa-exclamation-triangle" />
-          </span>
+          {isErrorEmail
+            && (
+              <span
+                className="icon is-small is-right has-text-danger"
+                data-cy="ErrorIcon"
+              >
+                <i className="fas fa-exclamation-triangle" />
+              </span>
+            )}
         </div>
-
-        <p className="help is-danger" data-cy="ErrorMessage">
-          Email is required
-        </p>
+        {isErrorEmail
+          && (
+            <p className="help is-danger" data-cy="ErrorMessage">
+              Email is required
+            </p>
+          )}
       </div>
 
       <div className="field" data-cy="BodyField">
@@ -75,25 +203,45 @@ export const NewCommentForm: React.FC = () => {
             id="comment-body"
             name="body"
             placeholder="Type comment here"
-            className="textarea is-danger"
+            className={classNames(
+              'textarea',
+              { 'is-danger': isErrorText },
+            )}
+            value={text}
+            onChange={handleChangeText}
           />
         </div>
-
-        <p className="help is-danger" data-cy="ErrorMessage">
-          Enter some text
-        </p>
+        {isErrorText
+          && (
+            <p className="help is-danger" data-cy="ErrorMessage">
+              Enter some text
+            </p>
+          )}
       </div>
 
       <div className="field is-grouped">
         <div className="control">
-          <button type="submit" className="button is-link is-loading">
+          <button
+            type="submit"
+            className={classNames(
+              'button',
+              'is-link',
+              {
+                'is-loading': isLoading,
+              },
+            )}
+          >
             Add
           </button>
         </div>
 
         <div className="control">
           {/* eslint-disable-next-line react/button-has-type */}
-          <button type="reset" className="button is-link is-light">
+          <button
+            type="reset"
+            className="button is-link is-light"
+            onClick={clearAllInput}
+          >
             Clear
           </button>
         </div>
diff --git a/src/components/PostDetails.tsx b/src/components/PostDetails.tsx
index ace945f0a..d92f610c5 100644
--- a/src/components/PostDetails.tsx
+++ b/src/components/PostDetails.tsx
@@ -1,117 +1,154 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { Loader } from './Loader';
 import { NewCommentForm } from './NewCommentForm';
+import { getComments, getPost, deleteComment } from '../Api/Api';
+import { Post } from '../types/Post';
+import { Comment } from '../types/Comment';
 
-export const PostDetails: React.FC = () => {
-  return (
-    <div className="content" data-cy="PostDetails">
-      <div className="content" data-cy="PostDetails">
-        <div className="block">
-          <h2 data-cy="PostTitle">
-            #18: voluptate et itaque vero tempora molestiae
-          </h2>
+type Props = {
+  selectedPostId: number | undefined
+  isError: boolean
+  setIsError: (a: boolean) => void
+};
 
-          <p data-cy="PostBody">
-            eveniet quo quis
-            laborum totam consequatur non dolor
-            ut et est repudiandae
-            est voluptatem vel debitis et magnam
-          </p>
-        </div>
+export const PostDetails: React.FC<Props> = ({
+  selectedPostId,
+  isError,
+  setIsError,
+}) => {
+  const [post, setPosts] = useState<Post>();
+  const [comments, setComments] = useState<Comment[]>([]);
+  const [isOpen, setIsOpen] = useState<boolean>(false);
+  const [isLoading, setIsLoading] = useState<boolean>(false);
 
-        <div className="block">
-          <Loader />
+  const thisPost = post as Post;
 
-          <div className="notification is-danger" data-cy="CommentsError">
-            Something went wrong
-          </div>
+  const handleGetComments = () => {
+    setIsLoading(true);
+    getComments(selectedPostId)
+      .then(data => {
+        const commentsArr = data as Comment[];
 
-          <p className="title is-4" data-cy="NoCommentsMessage">
-            No comments yet
-          </p>
+        setIsLoading(false);
+        setComments(commentsArr);
+      });
+  };
 
-          <p className="title is-4">Comments:</p>
+  const deleteSelectComment = (id: number | undefined) => {
+    if (id) {
+      deleteComment(id);
+      setComments((prevComments: Comment[]) => prevComments.filter(
+        comment => comment.id !== id,
+      ));
+    }
+  };
 
-          <article className="message is-small" data-cy="Comment">
-            <div className="message-header">
-              <a href="mailto:misha@mate.academy" data-cy="CommentAuthor">
-                Misha Hrynko
-              </a>
-              <button
-                data-cy="CommentDelete"
-                type="button"
-                className="delete is-small"
-                aria-label="delete"
-              >
-                delete button
-              </button>
-            </div>
+  useEffect(() => {
+    setIsLoading(true);
+    if (selectedPostId) {
+      getPost(selectedPostId)
+        .then(data => {
+          const postData = data as Post;
 
-            <div className="message-body" data-cy="CommentBody">
-              Some comment
-            </div>
-          </article>
+          setPosts(postData);
+          setIsLoading(false);
+        })
+        .catch(error => {
+          // eslint-disable-next-line no-console
+          console.error('Error fetching post:', error);
 
-          <article className="message is-small" data-cy="Comment">
-            <div className="message-header">
-              <a
-                href="mailto:misha@mate.academy"
-                data-cy="CommentAuthor"
-              >
-                Misha Hrynko
-              </a>
+          setIsError(true);
+          setIsLoading(false);
+        });
 
-              <button
-                data-cy="CommentDelete"
-                type="button"
-                className="delete is-small"
-                aria-label="delete"
-              >
-                delete button
-              </button>
-            </div>
-            <div
-              className="message-body"
-              data-cy="CommentBody"
-            >
-              One more comment
-            </div>
-          </article>
+      handleGetComments();
+    }
+  }, [selectedPostId, setComments]);
 
-          <article className="message is-small" data-cy="Comment">
-            <div className="message-header">
-              <a
-                href="mailto:misha@mate.academy"
-                data-cy="CommentAuthor"
-              >
-                Misha Hrynko
-              </a>
+  return (
+    <div className="content" data-cy="PostDetails">
+      <div className="block">
+        {thisPost ? (
+          <div className="block">
+            <h2 data-cy="PostTitle">
+              {`#${selectedPostId}: ${thisPost.title}`}
+            </h2>
+            <p data-cy="PostBody">{thisPost.body}</p>
+          </div>
+        ) : null}
 
-              <button
-                data-cy="CommentDelete"
-                type="button"
-                className="delete is-small"
-                aria-label="delete"
-              >
-                delete button
-              </button>
-            </div>
+        {isLoading ? (
+          <Loader />
+        ) : (
+          <>
+            {isError && (
+              <div className="notification is-danger" data-cy="CommentsError">
+                Something went wrong
+              </div>
+            )}
+            {comments.length === 0 ? (
+              <p className="title is-4" data-cy="NoCommentsMessage">
+                No comments yet
+              </p>
+            ) : (
+              <>
+                <p className="title is-4">Comments:</p>
+                {comments.map(comment => {
+                  const {
+                    email,
+                    name,
+                    body,
+                    id,
+                  } = comment;
 
-            <div className="message-body" data-cy="CommentBody">
-              {'Multi\nline\ncomment'}
-            </div>
-          </article>
+                  return (
+                    <article
+                      className="message is-small"
+                      data-cy="Comment"
+                    >
+                      <div className="message-header">
+                        <a href={`mailto:${email}`} data-cy="CommentAuthor">
+                          {name}
+                        </a>
+                        <button
+                          data-cy="CommentDelete"
+                          type="button"
+                          className="delete is-small"
+                          aria-label="delete"
+                          onClick={() => deleteSelectComment(id)}
+                        >
+                          delete button
+                        </button>
+                      </div>
+                      <div className="message-body" data-cy="CommentBody">
+                        {body}
+                      </div>
+                    </article>
+                  );
+                })}
+              </>
+            )}
+          </>
+        )}
 
+        {!isLoading && !isOpen ? (
           <button
             data-cy="WriteCommentButton"
             type="button"
             className="button is-link"
+            onClick={() => setIsOpen(true)}
           >
             Write a comment
           </button>
-        </div>
+        ) : null}
 
-        <NewCommentForm />
+        {isOpen && (
+          <NewCommentForm
+            setComments={setComments}
+            selectedPostId={selectedPostId}
+            key={selectedPostId}
+          />
+        )}
       </div>
     </div>
   );
diff --git a/src/components/PostsList.tsx b/src/components/PostsList.tsx
index 6e6efc0f3..1f7fd3df1 100644
--- a/src/components/PostsList.tsx
+++ b/src/components/PostsList.tsx
@@ -1,85 +1,84 @@
 import React from 'react';
+import classNames from 'classnames';
+import { Post } from '../types/Post';
 
-export const PostsList: React.FC = () => (
-  <div data-cy="PostsList">
-    <p className="title">Posts:</p>
+type Props = {
+  posts: Post[];
+  isShowPostDetails: boolean;
+  setIsShowPostDetails: (a: boolean) => void;
+  selectedPostId: number | undefined;
+  setSelectPostId: (n: number) => void;
+};
 
-    <table className="table is-fullwidth is-striped is-hoverable is-narrow">
-      <thead>
-        <tr className="has-background-link-light">
-          <th>#</th>
-          <th>Title</th>
-          <th> </th>
-        </tr>
-      </thead>
+export const PostsList: React.FC<Props> = ({
+  posts,
+  setIsShowPostDetails,
+  isShowPostDetails,
+  selectedPostId,
+  setSelectPostId,
+}) => {
+  const handleShowDetails = (id: number) => {
+    if (selectedPostId === id) {
+      setIsShowPostDetails(!isShowPostDetails);
+    } else {
+      setIsShowPostDetails(true);
+    }
 
-      <tbody>
-        <tr data-cy="Post">
-          <td data-cy="PostId">17</td>
+    setSelectPostId(id);
+  };
 
-          <td data-cy="PostTitle">
-            fugit voluptas sed molestias voluptatem provident
-          </td>
+  return (
+    <div data-cy="PostsList">
+      <p className="title">Posts:</p>
 
-          <td className="has-text-right is-vcentered">
-            <button
-              type="button"
-              data-cy="PostButton"
-              className="button is-link is-light"
-            >
-              Open
-            </button>
-          </td>
-        </tr>
+      <table className="table is-fullwidth is-striped is-hoverable is-narrow">
+        <thead>
+          <tr className="has-background-link-light">
+            <th>#</th>
+            <th>Title</th>
+            <th> </th>
+          </tr>
+        </thead>
 
-        <tr data-cy="Post">
-          <td data-cy="PostId">18</td>
+        <tbody>
+          {posts.map(post => {
+            const { id, title } = post;
 
-          <td data-cy="PostTitle">
-            voluptate et itaque vero tempora molestiae
-          </td>
+            const buttonText = ((selectedPostId === id)
+              && isShowPostDetails)
+              ? 'Close'
+              : 'Open';
 
-          <td className="has-text-right is-vcentered">
-            <button
-              type="button"
-              data-cy="PostButton"
-              className="button is-link"
-            >
-              Close
-            </button>
-          </td>
-        </tr>
+            return (
+              <tr data-cy="Post" key={id}>
+                <td data-cy="PostId">{id}</td>
 
-        <tr data-cy="Post">
-          <td data-cy="PostId">19</td>
-          <td data-cy="PostTitle">adipisci placeat illum aut reiciendis qui</td>
+                <td data-cy="PostTitle">
+                  {title}
+                </td>
 
-          <td className="has-text-right is-vcentered">
-            <button
-              type="button"
-              data-cy="PostButton"
-              className="button is-link is-light"
-            >
-              Open
-            </button>
-          </td>
-        </tr>
-
-        <tr data-cy="Post">
-          <td data-cy="PostId">20</td>
-          <td data-cy="PostTitle">doloribus ad provident suscipit at</td>
-
-          <td className="has-text-right is-vcentered">
-            <button
-              type="button"
-              data-cy="PostButton"
-              className="button is-link is-light"
-            >
-              Open
-            </button>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-);
+                <td className="has-text-right is-vcentered">
+                  <button
+                    type="button"
+                    data-cy="PostButton"
+                    className={classNames(
+                      'button',
+                      'is-link',
+                      {
+                        'is-light': !((selectedPostId === id)
+                          && isShowPostDetails),
+                      },
+                    )}
+                    onClick={() => handleShowDetails(id)}
+                  >
+                    {buttonText}
+                  </button>
+                </td>
+              </tr>
+            );
+          })}
+        </tbody>
+      </table>
+    </div>
+  );
+};
diff --git a/src/components/UserSelector.tsx b/src/components/UserSelector.tsx
index cb83a8f68..2e7b92a79 100644
--- a/src/components/UserSelector.tsx
+++ b/src/components/UserSelector.tsx
@@ -1,19 +1,50 @@
-import React from 'react';
+import React, { useState } from 'react';
+import classNames from 'classnames';
+import { User } from '../types/User';
+
+type Props = {
+  users: User[]
+  selectUser: User | undefined
+  selectedUserId: number | undefined
+  setSelectedUserId: (a: number) => void
+};
+
+export const UserSelector: React.FC<Props> = ({
+  users,
+  selectUser,
+  selectedUserId,
+  setSelectedUserId,
+}) => {
+  const [isOpen, setIsOpen] = useState<boolean>(false);
+  let text = '';
+  const myUser = selectUser as User;
+
+  if (myUser) {
+    text = myUser.name;
+  } else {
+    text = 'Choose a user';
+  }
+
+  const handleChangeUser = (id: number) => {
+    setSelectedUserId(id);
+    setIsOpen(false);
+  };
 
-export const UserSelector: React.FC = () => {
   return (
     <div
       data-cy="UserSelector"
       className="dropdown is-active"
     >
+
       <div className="dropdown-trigger">
         <button
           type="button"
           className="button"
           aria-haspopup="true"
           aria-controls="dropdown-menu"
+          onClick={() => setIsOpen(!isOpen)}
         >
-          <span>Choose a user</span>
+          <span>{text}</span>
 
           <span className="icon is-small">
             <i className="fas fa-angle-down" aria-hidden="true" />
@@ -21,15 +52,24 @@ export const UserSelector: React.FC = () => {
         </button>
       </div>
 
-      <div className="dropdown-menu" id="dropdown-menu" role="menu">
-        <div className="dropdown-content">
-          <a href="#user-1" className="dropdown-item">Leanne Graham</a>
-          <a href="#user-2" className="dropdown-item is-active">Ervin Howell</a>
-          <a href="#user-3" className="dropdown-item">Clementine Bauch</a>
-          <a href="#user-4" className="dropdown-item">Patricia Lebsack</a>
-          <a href="#user-5" className="dropdown-item">Chelsey Dietrich</a>
+      {isOpen && (
+        <div className="dropdown-menu" id="dropdown-menu" role="menu">
+          <div className="dropdown-content">
+            {users.map(user => {
+              return (
+                <a
+                  onClick={() => handleChangeUser(user.id)}
+                  href={`#user-${user.id}`}
+                  className={classNames('dropdown-item',
+                    { 'is-active': user.id === selectedUserId })}
+                >
+                  {user.name}
+                </a>
+              );
+            })}
+          </div>
         </div>
-      </div>
+      )}
     </div>
   );
 };
diff --git a/src/types/Comment.ts b/src/types/Comment.ts
index 61c98619c..1430b0e81 100644
--- a/src/types/Comment.ts
+++ b/src/types/Comment.ts
@@ -1,5 +1,5 @@
 export interface Comment {
-  id: number;
+  id?: number;
   postId: number;
   name: string;
   email: string;
diff --git a/src/utils/fetchClient.ts b/src/utils/fetchClient.ts
index 93208df11..3d662e64c 100644
--- a/src/utils/fetchClient.ts
+++ b/src/utils/fetchClient.ts
@@ -13,7 +13,7 @@ type RequestMethod = 'GET' | 'POST' | 'PATCH' | 'DELETE';
 function request<T>(
   url: string,
   method: RequestMethod = 'GET',
-  data: any = null, // we can send any data to the server
+  data?: T, // we can send any data to the server
 ): Promise<T> {
   const options: RequestInit = { method };
 
@@ -33,7 +33,7 @@ function request<T>(
 
 export const client = {
   get: <T>(url: string) => request<T>(url),
-  post: <T>(url: string, data: any) => request<T>(url, 'POST', data),
-  patch: <T>(url: string, data: any) => request<T>(url, 'PATCH', data),
+  post: <T>(url: string, data: T) => request<T>(url, 'POST', data),
+  patch: <T>(url: string, data: T) => request<T>(url, 'PATCH', data),
   delete: (url: string) => request(url, 'DELETE'),
 };