6 files changed, 47 insertions, 17 deletions

diff --git a/src/app.jsx b/src/app.tsx
index 87297c664..4782bb778 100644
--- a/src/app.jsx
+++ b/src/app.tsx
@@ -24,6 +24,7 @@ window.addEventListener('load', () => {
   const api = apiFactory(serverApi, new LocalApi());
   const history = createHashHistory();
   const router = new RouterStore(history);
+  // @ts-ignore - Need to provide proper typings for actions
   const stores = storeFactory(api, actions, router);
   const menu = new MenuFactory(stores, actions);
   const touchBar = new TouchBarFactory(stores, actions);
diff --git a/src/components/settings/releaseNotes/ReleaseNotesLayout.tsx b/src/components/settings/releaseNotes/ReleaseNotesLayout.tsx
index ee0ba75a8..00c618913 100644
--- a/src/components/settings/releaseNotes/ReleaseNotesLayout.tsx
+++ b/src/components/settings/releaseNotes/ReleaseNotesLayout.tsx
@@ -1,14 +1,15 @@
 import { Component } from 'react';
 import { inject, observer } from 'mobx-react';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 
 import { mdiClose } from '@mdi/js';
 import { Outlet } from 'react-router-dom';
-import { StoresProps } from '../../../@types/ferdium-components.types';
 import ErrorBoundary from '../../util/ErrorBoundary';
 import Appear from '../../ui/effects/Appear';
 import Icon from '../../ui/icon';
 import { isEscKeyPress } from '../../../jsUtils';
+import { Actions } from '../../../actions/lib/actions';
+import { RealStores } from '../../../stores';
 
 const messages = defineMessages({
   closeSettings: {
@@ -17,10 +18,13 @@ const messages = defineMessages({
   },
 });
 
-interface IProps extends StoresProps {
-  intl: any;
+interface IProps extends WrappedComponentProps {
+  actions?: Actions;
+  stores?: RealStores;
 }
 
+@inject('stores', 'actions')
+@observer
 class ReleaseNotesLayout extends Component<IProps> {
   componentDidMount() {
     document.addEventListener('keydown', this.handleKeyDown.bind(this), false);
@@ -37,12 +41,12 @@ class ReleaseNotesLayout extends Component<IProps> {
 
   handleKeyDown(e) {
     if (isEscKeyPress(e.keyCode)) {
-      this.props.actions.ui.closeSettings();
+      this.props.actions!.ui.closeSettings();
     }
   }
 
   render() {
-    const { closeSettings } = this.props.actions.ui;
+    const { closeSettings } = this.props.actions!.ui;
 
     const { intl } = this.props;
 
@@ -74,6 +78,4 @@ class ReleaseNotesLayout extends Component<IProps> {
   }
 }
 
-export default injectIntl<'intl', IProps>(
-  inject('stores', 'actions')(observer(ReleaseNotesLayout)),
-);
+export default injectIntl<'intl', IProps>(ReleaseNotesLayout);
diff --git a/src/containers/layout/AppLayoutContainer.tsx b/src/containers/layout/AppLayoutContainer.tsx
index a5fea52cd..0864fa027 100644
--- a/src/containers/layout/AppLayoutContainer.tsx
+++ b/src/containers/layout/AppLayoutContainer.tsx
@@ -13,6 +13,8 @@ import { workspaceStore } from '../../features/workspaces';
 
 interface AppLayoutContainerProps extends StoresProps {}
 
+@inject('stores', 'actions')
+@observer
 class AppLayoutContainer extends Component<AppLayoutContainerProps> {
   render(): ReactElement {
     const { app, features, services, ui, settings, requests, user, router } =
@@ -155,4 +157,4 @@ class AppLayoutContainer extends Component<AppLayoutContainerProps> {
   }
 }
 
-export default inject('stores', 'actions')(observer(AppLayoutContainer));
+export default AppLayoutContainer;
diff --git a/src/containers/settings/ReleaseNotesWindow.tsx b/src/containers/settings/ReleaseNotesWindow.tsx
index 3e43727d0..ea7b952d2 100644
--- a/src/containers/settings/ReleaseNotesWindow.tsx
+++ b/src/containers/settings/ReleaseNotesWindow.tsx
@@ -6,8 +6,17 @@ import { Outlet } from 'react-router-dom';
 import { StoresProps } from '../../@types/ferdium-components.types';
 import Layout from '../../components/settings/releaseNotes/ReleaseNotesLayout';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
+import { Actions } from '../../actions/lib/actions';
+import { RealStores } from '../../stores';
 
-class SettingsContainer extends Component<StoresProps> {
+interface IProps {
+  actions?: Actions;
+  stores?: RealStores;
+}
+
+@inject('stores', 'actions')
+@observer
+class SettingsContainer extends Component<IProps> {
   portalRoot: any;
 
   el: HTMLDivElement;
@@ -30,7 +39,7 @@ class SettingsContainer extends Component<StoresProps> {
   render(): ReactPortal {
     return ReactDOM.createPortal(
       <ErrorBoundary>
-        <Layout {...this.props}>
+        <Layout>
           <Outlet />
         </Layout>
       </ErrorBoundary>,
@@ -39,4 +48,4 @@ class SettingsContainer extends Component<StoresProps> {
   }
 }
 
-export default inject('stores', 'actions')(observer(SettingsContainer));
+export default SettingsContainer;
diff --git a/src/index.html b/src/index.html
index e50ec8777..72b131f04 100644
--- a/src/index.html
+++ b/src/index.html
@@ -11,7 +11,10 @@
       href="./styles/animations.css"
       media="(prefers-reduced-motion: no-preference)"
     />
-    <script type="text/javascript" src="./app.js"></script>
+    <script>
+      require("./app.js")
+    </script>
+
   </head>
   <body>
     <div class="dev-warning">DEV MODE</div>
diff --git a/src/routes.tsx b/src/routes.tsx
index e757de72b..27ed6259c 100644
--- a/src/routes.tsx
+++ b/src/routes.tsx
@@ -34,9 +34,14 @@ import WorkspacesScreen from './features/workspaces/containers/WorkspacesScreen'
 import EditWorkspaceScreen from './features/workspaces/containers/EditWorkspaceScreen';
 import { WORKSPACES_ROUTES } from './features/workspaces/constants';
 import { StoresProps } from './@types/ferdium-components.types';
+import { Actions } from './actions/lib/actions';
+import { RealStores } from './stores';
 
-interface IProps extends StoresProps {
+interface IProps {
   history: HashHistory;
+
+  actions?: Actions;
+  stores?: RealStores;
 }
 
 @inject('stores', 'actions')
@@ -44,8 +49,8 @@ interface IProps extends StoresProps {
 class FerdiumRoutes extends Component<IProps> {
   render(): ReactElement {
     const { history, stores, actions } = this.props;
-    const routeProps: StoresProps = { stores, actions };
-    const errorProps = { error: this.props.stores.globalError.error || {} };
+    const routeProps: StoresProps = { stores: stores!, actions: actions! };
+    const errorProps = { error: routeProps.stores.globalError.error || {} };
 
     return (
       <HistoryRouter history={history}>
@@ -129,6 +134,7 @@ class FerdiumRoutes extends Component<IProps> {
               />
               <Route
                 path="/settings/services"
+                /* @ts-ignore */
                 element={<ServicesScreen {...this.props} />}
               />
               <Route
@@ -137,30 +143,37 @@ class FerdiumRoutes extends Component<IProps> {
               />
               <Route
                 path={WORKSPACES_ROUTES.ROOT}
+                /* @ts-ignore */
                 element={<WorkspacesScreen {...this.props} />}
               />
               <Route
                 path={WORKSPACES_ROUTES.EDIT}
+                /* @ts-ignore */
                 element={<EditWorkspaceScreen {...this.props} />}
               />
               <Route
                 path="/settings/user"
+                /* @ts-ignore */
                 element={<AccountScreen {...this.props} />}
               />
               <Route
                 path="/settings/user/edit"
+                /* @ts-ignore */
                 element={<EditUserScreen {...this.props} />}
               />
               <Route
                 path="/settings/team"
+                /* @ts-ignore */
                 element={<TeamScreen {...this.props} />}
               />
               <Route
                 path="/settings/app"
+                /* @ts-ignore */
                 element={<EditSettingsScreen {...this.props} />}
               />
               <Route
                 path="/settings/invite"
+                /* @ts-ignore */
                 element={<InviteSettingsScreen {...this.props} />}
               />
               <Route