From e4ba385b5234d14d357f634093a8944947810ef8 Mon Sep 17 00:00:00 2001
From: Ravi Soni <soniravi829@gmail.com>
Date: Mon, 14 Oct 2019 19:07:16 +0530
Subject: [PATCH] Refactor /Modals/FeedbackModal/index.js

---
 .../common/Modals/FeedbackModal/index.js      | 20 --------------
 .../common/Modals/FeedbackModal/index.tsx     | 27 +++++++++++++++++++
 .../app/src/app/pages/common/Modals/index.js  |  2 +-
 3 files changed, 28 insertions(+), 21 deletions(-)
 delete mode 100644 packages/app/src/app/pages/common/Modals/FeedbackModal/index.js
 create mode 100644 packages/app/src/app/pages/common/Modals/FeedbackModal/index.tsx

diff --git a/packages/app/src/app/pages/common/Modals/FeedbackModal/index.js b/packages/app/src/app/pages/common/Modals/FeedbackModal/index.js
deleted file mode 100644
index a189276cc1d..00000000000
--- a/packages/app/src/app/pages/common/Modals/FeedbackModal/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-
-import { inject, hooksObserver } from 'app/componentConnectors';
-import Loadable from 'app/utils/Loadable';
-
-import { Heading, Container } from '../elements';
-
-const Feedback = Loadable(() =>
-  import(/* webpackChunkName: 'feedback' */ './Feedback')
-);
-
-const FeedbackModal = ({ store }) => (
-  <Container>
-    <Heading>Submit Feedback</Heading>
-
-    <Feedback user={store.user} id={store.editor.currentId} />
-  </Container>
-);
-
-export default inject('store')(hooksObserver(FeedbackModal));
diff --git a/packages/app/src/app/pages/common/Modals/FeedbackModal/index.tsx b/packages/app/src/app/pages/common/Modals/FeedbackModal/index.tsx
new file mode 100644
index 00000000000..28216dfc5e3
--- /dev/null
+++ b/packages/app/src/app/pages/common/Modals/FeedbackModal/index.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+
+import { useOvermind } from 'app/overmind';
+import Loadable from 'app/utils/Loadable';
+
+import { Heading, Container } from '../elements';
+
+const Feedback = Loadable(() =>
+  import(/* webpackChunkName: 'feedback' */ './Feedback')
+);
+
+export const FeedbackModal: React.FC = () => {
+  const {
+    state: {
+      user,
+      editor: { currentId },
+    },
+  } = useOvermind();
+
+  return (
+    <Container>
+      <Heading>Submit Feedback</Heading>
+
+      <Feedback user={user} id={currentId} />
+    </Container>
+  );
+};
diff --git a/packages/app/src/app/pages/common/Modals/index.js b/packages/app/src/app/pages/common/Modals/index.js
index 62cdd565c85..5b8f0c8c037 100644
--- a/packages/app/src/app/pages/common/Modals/index.js
+++ b/packages/app/src/app/pages/common/Modals/index.js
@@ -28,7 +28,7 @@ import StorageManagementModal from './StorageManagementModal';
 import ForkServerModal from './ForkServerModal';
 import PrivacyServerWarning from './PrivacyServerWarning';
 import PickSandboxModal from './PickSandboxModal';
-import FeedbackModal from './FeedbackModal';
+import { FeedbackModal } from './FeedbackModal';
 import NetlifyLogs from './NetlifyLogs';
 // eslint-disable-next-line
 import SignInForTemplates from './SignInForTemplates/index.ts';