diff --git a/README.md b/README.md
index 415bb6e4e..b017389c6 100644
--- a/README.md
+++ b/README.md
@@ -22,4 +22,4 @@ Make the `App` a class component with `pressedKey` in the `state`.
 - Implement a solution following the [React task guideline](https://github.com/mate-academy/react_task-guideline#react-tasks-guideline).
 - Use the [React TypeScript cheat sheet](https://mate-academy.github.io/fe-program/js/extra/react-typescript).
 - Open one more terminal and run tests with `npm test` to ensure your solution is correct.
-- Replace `<your_account>` with your Github username in the [DEMO LINK](https://<your_account>.github.io/react_keyboard/) and add it to the PR description.
+- Replace `<your_account>` with your Github username in the [DEMO LINK](https://AndriiZakharenko.github.io/react_keyboard/) and add it to the PR description.
diff --git a/src/App.tsx b/src/App.tsx
index f819cbdb9..27cfabba4 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,7 +1,27 @@
-import React from 'react';
+// import { event } from 'cypress/types/jquery';
+import React, { useEffect, useState } from 'react';
 
-export const App: React.FC = () => (
-  <div className="App">
-    <p className="App__message">The last pressed key is [Enter]</p>
-  </div>
-);
+export const App: React.FC = () => {
+  const [key, setKey] = useState('');
+  const title = !key
+    ? 'Nothing was pressed yet'
+    : `The last pressed key is [${key}]`;
+
+  const handleKeyUp = (event: KeyboardEvent) => {
+    setKey(event.key);
+  };
+
+  useEffect(() => {
+    document.addEventListener('keyup', handleKeyUp);
+
+    return () => {
+      document.removeEventListener('keyup', handleKeyUp);
+    };
+  }, []);
+
+  return (
+    <div className="App">
+      <p className="App__message">{title}</p>
+    </div>
+  );
+};