From 33eca812ec7506ec662808ec50f1a40d807ca0df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adem=C3=ADlson=20F=2E=20Tonato?= <ademilsonft@outlook.com>
Date: Tue, 15 Oct 2019 17:47:42 +0100
Subject: [PATCH 1/5] refactor /app/pages/common/Modals/PRModal/index.js:
 convert to tsx and uses overmind

---
 .../app/components/GitProgress/GitProgress.tsx |  6 +++---
 .../Modals/PRModal/{index.js => index.tsx}     | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)
 rename packages/app/src/app/pages/common/Modals/PRModal/{index.js => index.tsx} (68%)

diff --git a/packages/app/src/app/components/GitProgress/GitProgress.tsx b/packages/app/src/app/components/GitProgress/GitProgress.tsx
index 701cda72120..87d26cbc8d2 100644
--- a/packages/app/src/app/components/GitProgress/GitProgress.tsx
+++ b/packages/app/src/app/components/GitProgress/GitProgress.tsx
@@ -1,16 +1,16 @@
 import React from 'react';
 import {
   Container,
+  Cube,
   DeployAnimationContainer,
+  DeployText,
   GitHubLogo,
-  Cube,
   OpaqueLogo,
-  DeployText,
   Result,
 } from './elements';
 
 interface IGitProgressProps {
-  result: string;
+  result: string | null;
   message: string;
 }
 
diff --git a/packages/app/src/app/pages/common/Modals/PRModal/index.js b/packages/app/src/app/pages/common/Modals/PRModal/index.tsx
similarity index 68%
rename from packages/app/src/app/pages/common/Modals/PRModal/index.js
rename to packages/app/src/app/pages/common/Modals/PRModal/index.tsx
index fddfb5f39e9..65751b65dee 100644
--- a/packages/app/src/app/pages/common/Modals/PRModal/index.js
+++ b/packages/app/src/app/pages/common/Modals/PRModal/index.tsx
@@ -1,12 +1,16 @@
-import React from 'react';
-import { inject, observer } from 'app/componentConnectors';
 import { GitProgress } from 'app/components/GitProgress';
+import { useOvermind } from 'app/overmind';
+import React, { FunctionComponent } from 'react';
+
+export const PRModal: FunctionComponent = () => {
+  const {
+    state: { git },
+  } = useOvermind();
 
-function PRModal({ store }) {
   let result = null;
 
-  if (!store.git.isCreatingPr) {
-    const newUrl = store.git.pr.prURL;
+  if (!git.isCreatingPr) {
+    const newUrl = git.pr.prURL;
 
     result = (
       <div>
@@ -27,6 +31,4 @@ function PRModal({ store }) {
       message="Forking Repository & Creating PR..."
     />
   );
-}
-
-export default inject('store')(observer(PRModal));
+};

From 04062bd374b42c326bcd3951db295cb936f6e75a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adem=C3=ADlson=20F=2E=20Tonato?= <ademilsonft@outlook.com>
Date: Wed, 16 Oct 2019 11:27:38 +0100
Subject: [PATCH 2/5] refactor
 /app/pages/common/Modals/LiveSessionEnded/index.js: convert to tsx and uses
 overmind

Co-authored-by: Eliamar Tani <eliamartani@gmail.com>
---
 .../LiveSessionEnded/{index.js => index.tsx}  | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)
 rename packages/app/src/app/pages/common/Modals/LiveSessionEnded/{index.js => index.tsx} (58%)

diff --git a/packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.js b/packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.tsx
similarity index 58%
rename from packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.js
rename to packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.tsx
index dc7d8733a0a..f10025909ed 100644
--- a/packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.js
+++ b/packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.tsx
@@ -1,22 +1,29 @@
-import React from 'react';
-import { inject, hooksObserver } from 'app/componentConnectors';
-
 import { Button } from '@codesandbox/common/lib/components/Button';
 import Row from '@codesandbox/common/lib/components/flex/Row';
-
+import { useOvermind } from 'app/overmind';
+import React, { FunctionComponent } from 'react';
+import { Explanation, Heading } from '../elements';
 import { Container } from './elements';
-import { Heading, Explanation } from '../elements';
 
-function LiveModeEnded({ signals, store }) {
-  const suggestion = store.editor.currentSandbox.owned
+export const LiveModeEnded: FunctionComponent = () => {
+  const {
+    state: { editor, currentModalMessage },
+    actions: {
+      modalClosed,
+      editor: { forkSandboxClicked },
+    },
+  } = useOvermind();
+
+  const suggestion = editor.currentSandbox.owned
     ? 'you can continue working on the current sandbox.'
     : 'you can continue working by forking the sandbox or by creating a new sandbox.';
+
   return (
     <Container>
       <Heading>The live session has ended</Heading>
       <Explanation css={{ marginBottom: '1rem' }}>
-        {store.currentModalMessage || 'The session has ended due to inactivity'}
-        , {suggestion}
+        {currentModalMessage || 'The session has ended due to inactivity'},{' '}
+        {suggestion}
       </Explanation>
 
       <Row justifyContent="space-around">
@@ -24,11 +31,11 @@ function LiveModeEnded({ signals, store }) {
           Create Sandbox
         </Button>
 
-        {store.editor.currentSandbox.owned ? (
+        {editor.currentSandbox.owned ? (
           <Button
             small
             onClick={() => {
-              signals.modalClosed();
+              modalClosed();
             }}
           >
             Close Modal
@@ -37,8 +44,8 @@ function LiveModeEnded({ signals, store }) {
           <Button
             small
             onClick={() => {
-              signals.editor.forkSandboxClicked();
-              signals.modalClosed();
+              forkSandboxClicked();
+              modalClosed();
             }}
           >
             Fork Sandbox
@@ -47,6 +54,4 @@ function LiveModeEnded({ signals, store }) {
       </Row>
     </Container>
   );
-}
-
-export default inject('signals', 'store')(hooksObserver(LiveModeEnded));
+};

From 4bfbfc3a272a5ec3b52b8da2fc5f0edd6496e692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adem=C3=ADlson=20F=2E=20Tonato?= <ademilsonft@outlook.com>
Date: Wed, 16 Oct 2019 11:35:01 +0100
Subject: [PATCH 3/5] refactor
 /app/pages/common/Modals/LiveSessionEnded/index.js: convert to tsx and uses
 overmind

Co-authored-by: Eliamar Tani <eliamartani@gmail.com>
---
 .../LiveSessionEnded/{index.js => index.tsx}  | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)
 rename packages/app/src/app/pages/common/Modals/LiveSessionEnded/{index.js => index.tsx} (58%)

diff --git a/packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.js b/packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.tsx
similarity index 58%
rename from packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.js
rename to packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.tsx
index dc7d8733a0a..f10025909ed 100644
--- a/packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.js
+++ b/packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.tsx
@@ -1,22 +1,29 @@
-import React from 'react';
-import { inject, hooksObserver } from 'app/componentConnectors';
-
 import { Button } from '@codesandbox/common/lib/components/Button';
 import Row from '@codesandbox/common/lib/components/flex/Row';
-
+import { useOvermind } from 'app/overmind';
+import React, { FunctionComponent } from 'react';
+import { Explanation, Heading } from '../elements';
 import { Container } from './elements';
-import { Heading, Explanation } from '../elements';
 
-function LiveModeEnded({ signals, store }) {
-  const suggestion = store.editor.currentSandbox.owned
+export const LiveModeEnded: FunctionComponent = () => {
+  const {
+    state: { editor, currentModalMessage },
+    actions: {
+      modalClosed,
+      editor: { forkSandboxClicked },
+    },
+  } = useOvermind();
+
+  const suggestion = editor.currentSandbox.owned
     ? 'you can continue working on the current sandbox.'
     : 'you can continue working by forking the sandbox or by creating a new sandbox.';
+
   return (
     <Container>
       <Heading>The live session has ended</Heading>
       <Explanation css={{ marginBottom: '1rem' }}>
-        {store.currentModalMessage || 'The session has ended due to inactivity'}
-        , {suggestion}
+        {currentModalMessage || 'The session has ended due to inactivity'},{' '}
+        {suggestion}
       </Explanation>
 
       <Row justifyContent="space-around">
@@ -24,11 +31,11 @@ function LiveModeEnded({ signals, store }) {
           Create Sandbox
         </Button>
 
-        {store.editor.currentSandbox.owned ? (
+        {editor.currentSandbox.owned ? (
           <Button
             small
             onClick={() => {
-              signals.modalClosed();
+              modalClosed();
             }}
           >
             Close Modal
@@ -37,8 +44,8 @@ function LiveModeEnded({ signals, store }) {
           <Button
             small
             onClick={() => {
-              signals.editor.forkSandboxClicked();
-              signals.modalClosed();
+              forkSandboxClicked();
+              modalClosed();
             }}
           >
             Fork Sandbox
@@ -47,6 +54,4 @@ function LiveModeEnded({ signals, store }) {
       </Row>
     </Container>
   );
-}
-
-export default inject('signals', 'store')(hooksObserver(LiveModeEnded));
+};

From 6596757faed918409527ae7cced8944c7e95ef27 Mon Sep 17 00:00:00 2001
From: Sara Vieira <hey@iamsaravieira.com>
Date: Sat, 19 Oct 2019 22:31:10 +0200
Subject: [PATCH 4/5] Update index.tsx

---
 .../app/src/app/pages/common/Modals/LiveSessionEnded/index.tsx   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.tsx b/packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.tsx
index 04add01cce2..dd88f0589ac 100644
--- a/packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.tsx
+++ b/packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.tsx
@@ -4,6 +4,7 @@ import { useOvermind } from 'app/overmind';
 import React, { FunctionComponent } from 'react';
 import { Explanation, Heading } from '../elements';
 import { Container } from './elements';
+
 export const LiveModeEnded: FunctionComponent = () => {
   const {
     state: {

From 85ab2e6486aabd3481265af15ae82ba11cdc64fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adem=C3=ADlson=20F=2E=20Tonato?= <ademilsonft@outlook.com>
Date: Sun, 20 Oct 2019 15:13:36 +0100
Subject: [PATCH 5/5] fix update imports

---
 .../src/app/pages/common/Modals/LiveSessionEnded/index.tsx    | 4 +++-
 packages/app/src/app/pages/common/Modals/PRModal/index.tsx    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.tsx b/packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.tsx
index dd88f0589ac..ea825231b21 100644
--- a/packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.tsx
+++ b/packages/app/src/app/pages/common/Modals/LiveSessionEnded/index.tsx
@@ -5,7 +5,7 @@ import React, { FunctionComponent } from 'react';
 import { Explanation, Heading } from '../elements';
 import { Container } from './elements';
 
-export const LiveModeEnded: FunctionComponent = () => {
+const LiveModeEnded: FunctionComponent = () => {
   const {
     state: {
       editor: {
@@ -60,3 +60,5 @@ export const LiveModeEnded: FunctionComponent = () => {
     </Container>
   );
 };
+
+export default LiveModeEnded;
diff --git a/packages/app/src/app/pages/common/Modals/PRModal/index.tsx b/packages/app/src/app/pages/common/Modals/PRModal/index.tsx
index 65751b65dee..f585af6d616 100644
--- a/packages/app/src/app/pages/common/Modals/PRModal/index.tsx
+++ b/packages/app/src/app/pages/common/Modals/PRModal/index.tsx
@@ -2,7 +2,7 @@ import { GitProgress } from 'app/components/GitProgress';
 import { useOvermind } from 'app/overmind';
 import React, { FunctionComponent } from 'react';
 
-export const PRModal: FunctionComponent = () => {
+const PRModal: FunctionComponent = () => {
   const {
     state: { git },
   } = useOvermind();
@@ -32,3 +32,5 @@ export const PRModal: FunctionComponent = () => {
     />
   );
 };
+
+export default PRModal;