refactor: convert global app to typescript (#723)

2 files changed, 15 insertions, 4 deletions

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;