diff --git a/README.md b/README.md
index f7a6277cf..bedb7fc6c 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://eugene-kulish.github.io/react_keyboard/) and add it to the PR description.
diff --git a/src/App.tsx b/src/App.tsx
index f819cbdb9..f9bb2e49d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,7 +1,31 @@
 import React from 'react';
 
-export const App: React.FC = () => (
-  <div className="App">
-    <p className="App__message">The last pressed key is [Enter]</p>
-  </div>
-);
+export class App extends React.Component {
+  state = {
+    key: '',
+  };
+
+  componentDidMount(): void {
+    document.addEventListener('keyup', this.handleDocumentKeyPress);
+  }
+
+  componentWillUnmount(): void {
+    document.removeEventListener('keyup', this.handleDocumentKeyPress);
+  }
+
+  handleDocumentKeyPress = (event: KeyboardEvent) => {
+    this.setState({ key: event.key });
+  };
+
+  render() {
+    return (
+      <div className="App">
+        <p className="App__message">
+          {(this.state.key !== '')
+            ? `The last pressed key is [${this.state.key}]`
+            : 'Nothing was pressed yet'}
+        </p>
+      </div>
+    );
+  }
+}
diff --git a/src/AppAsFC/AppAsFC.tsx b/src/AppAsFC/AppAsFC.tsx
new file mode 100644
index 000000000..c9ec0923c
--- /dev/null
+++ b/src/AppAsFC/AppAsFC.tsx
@@ -0,0 +1,27 @@
+import React, { useEffect, useState } from 'react';
+
+export const AppAsFC: React.FC = () => {
+  const [key, setKey] = useState('');
+
+  useEffect(() => {
+    const handleDocumentKeyPress = (event: KeyboardEvent) => {
+      setKey(event.key);
+    };
+
+    document.addEventListener('keyup', handleDocumentKeyPress);
+
+    return () => {
+      document.removeEventListener('keyup', handleDocumentKeyPress);
+    };
+  }, []);
+
+  return (
+    <div className="App">
+      <p className="App__message">
+        {(key !== '')
+          ? `The last pressed key is [${key}]`
+          : 'Nothing was pressed yet'}
+      </p>
+    </div>
+  );
+};