2 files changed, 28 insertions, 26 deletions

diff --git a/src/features/workspaces/containers/EditWorkspaceScreen.js b/src/features/workspaces/containers/EditWorkspaceScreen.tsx
index bd9e235e3..8e8f8179d 100644
--- a/src/features/workspaces/containers/EditWorkspaceScreen.js
+++ b/src/features/workspaces/containers/EditWorkspaceScreen.tsx
@@ -1,26 +1,26 @@
 import { Component } from 'react';
 import { inject, observer } from 'mobx-react';
-import PropTypes from 'prop-types';
 
 import ErrorBoundary from '../../../components/util/ErrorBoundary';
 import EditWorkspaceForm from '../components/EditWorkspaceForm';
-import ServicesStore from '../../../stores/ServicesStore';
 import Workspace from '../models/Workspace';
 import { workspaceStore } from '../index';
 import { deleteWorkspaceRequest, updateWorkspaceRequest } from '../api';
-import WorkspacesStore from '../store';
+import { ServicesStore, WorkspacesStore } from '../../../stores.types';
 
-@inject('stores', 'actions') @observer
-class EditWorkspaceScreen extends Component {
-  static propTypes = {
-    actions: PropTypes.shape({
-      workspaces: PropTypes.instanceOf(WorkspacesStore),
-    }).isRequired,
-    stores: PropTypes.shape({
-      services: PropTypes.instanceOf(ServicesStore).isRequired,
-    }).isRequired,
+type Props = {
+  actions: {
+    workspaces: WorkspacesStore;
   };
+  stores: {
+    services: ServicesStore;
+  };
+};
 
+@inject('stores', 'actions')
+@observer
+class EditWorkspaceScreen extends Component<Props> {
+  // @ts-expect-error Not all code paths return a value.
   onDelete = () => {
     const { workspaceBeingEdited } = workspaceStore;
     const { actions } = this.props;
@@ -28,12 +28,14 @@ class EditWorkspaceScreen extends Component {
     actions.workspaces.delete({ workspace: workspaceBeingEdited });
   };
 
-  onSave = (values) => {
+  onSave = values => {
     const { workspaceBeingEdited } = workspaceStore;
     const { actions } = this.props;
-    const workspace = new Workspace(
-      ({ saving: true, ...workspaceBeingEdited, ...values }),
-    );
+    const workspace = new Workspace({
+      saving: true,
+      ...workspaceBeingEdited,
+      ...values,
+    });
     actions.workspaces.update({ workspace });
   };
 
diff --git a/src/features/workspaces/containers/WorkspacesScreen.js b/src/features/workspaces/containers/WorkspacesScreen.tsx
index 2ba3784cb..a07e92439 100644
--- a/src/features/workspaces/containers/WorkspacesScreen.js
+++ b/src/features/workspaces/containers/WorkspacesScreen.tsx
@@ -1,6 +1,5 @@
 import { Component } from 'react';
 import { inject, observer } from 'mobx-react';
-import PropTypes from 'prop-types';
 import WorkspacesDashboard from '../components/WorkspacesDashboard';
 import ErrorBoundary from '../../../components/util/ErrorBoundary';
 import { workspaceStore } from '../index';
@@ -10,16 +9,17 @@ import {
   getUserWorkspacesRequest,
   updateWorkspaceRequest,
 } from '../api';
-import WorkspacesStore from '../store';
+import { WorkspacesStore } from '../../../stores.types';
 
-@inject('stores', 'actions') @observer
-class WorkspacesScreen extends Component {
-  static propTypes = {
-    actions: PropTypes.shape({
-      workspaces: PropTypes.instanceOf(WorkspacesStore),
-    }).isRequired,
+type Props = {
+  actions: {
+    workspaces: WorkspacesStore;
   };
+};
 
+@inject('stores', 'actions')
+@observer
+class WorkspacesScreen extends Component<Props> {
   render() {
     const { actions } = this.props;
     return (
@@ -30,8 +30,8 @@ class WorkspacesScreen extends Component {
           createWorkspaceRequest={createWorkspaceRequest}
           deleteWorkspaceRequest={deleteWorkspaceRequest}
           updateWorkspaceRequest={updateWorkspaceRequest}
-          onCreateWorkspaceSubmit={(data) => actions.workspaces.create(data)}
-          onWorkspaceClick={(w) => actions.workspaces.edit({ workspace: w })}
+          onCreateWorkspaceSubmit={data => actions.workspaces.create(data)}
+          onWorkspaceClick={w => actions.workspaces.edit({ workspace: w })}
         />
       </ErrorBoundary>
     );