🔨 Refactor, 🧠 Overmind, Hacktoberfest - /app/pages/common/Modals/PRModal/index.js: convert to tsx and uses overmind (#2803)

* refactor /app/pages/common/Modals/PRModal/index.js: convert to tsx and uses overmind

* refactor /app/pages/common/Modals/LiveSessionEnded/index.js: convert to tsx and uses overmind

Co-authored-by: Eliamar Tani <[email protected]>

* fix import and name

Author: ftonato

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;
 }
 

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';
 
-const LiveModeEnded: FunctionComponent = () => {
+export const LiveSessionEnded: FunctionComponent = () => {
   const {
     state: {
       editor: {
@@ -18,9 +18,11 @@ const LiveModeEnded: FunctionComponent = () => {
       editor: { forkSandboxClicked },
     },
   } = useOvermind();
+
   const suggestion = 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>
@@ -58,5 +60,3 @@ const LiveModeEnded: FunctionComponent = () => {
     </Container>
   );
 };
-
-export default LiveModeEnded;

packages/app/src/app/pages/common/Modals/PRModal/index.tsx

@@ -1,16 +1,16 @@
-import React from 'react';
+import React, { FunctionComponent } from 'react';
 import { useOvermind } from 'app/overmind';
 import { GitProgress } from 'app/components/GitProgress';
 
-const PRModal: React.FC = () => {
-  let result = null;
-
+const PRModal: FunctionComponent = () => {
   const {
     state: {
       git: { isCreatingPr, pr },
     },
   } = useOvermind();
 
+  let result = null;
+
   if (!isCreatingPr) {
     result = (
       <div>
@@ -33,4 +33,4 @@ const PRModal: React.FC = () => {
   );
 };
 
-export default PRModal;
+export default PRModal

packages/app/src/app/pages/common/Modals/index.js

@@ -17,7 +17,7 @@ import { EmptyTrash } from './EmptyTrash';
 import ExportGitHubModal from './ExportGitHubModal';
 import { FeedbackModal } from './FeedbackModal';
 import { ForkServerModal } from './ForkServerModal';
-import LiveSessionEnded from './LiveSessionEnded';
+import { LiveSessionEnded } from './LiveSessionEnded';
 import LiveSessionVersionMismatch from './LiveSessionVersionMismatch';
 import NetlifyLogs from './NetlifyLogs';
 import NewSandbox from './NewSandbox';