refactor: convert AppLayout to typescript

2 files changed, 18 insertions, 20 deletions

diff --git a/src/containers/auth/LockedScreen.tsx b/src/containers/auth/LockedScreen.tsx
index 1b703207f..611a0757c 100644
--- a/src/containers/auth/LockedScreen.tsx
+++ b/src/containers/auth/LockedScreen.tsx
@@ -4,8 +4,17 @@ import { StoresProps } from '../../@types/ferdium-components.types';
 import Locked from '../../components/auth/Locked';
 
 import { hash } from '../../helpers/password-helpers';
+import { Actions } from '../../actions/lib/actions';
+import { RealStores } from '../../stores';
 
-class LockedScreen extends Component<StoresProps> {
+interface IProps {
+  actions?: Actions;
+  stores?: RealStores;
+}
+
+@inject('stores', 'actions')
+@observer
+class LockedScreen extends Component<IProps> {
   state = {
     error: false,
   };
@@ -20,13 +29,13 @@ class LockedScreen extends Component<StoresProps> {
   onSubmit(values: any): void {
     const { password } = values;
 
-    let correctPassword = this.props.stores.settings.all.app.lockedPassword;
+    let correctPassword = this.props.stores!.settings.all.app.lockedPassword;
     if (!correctPassword) {
       correctPassword = '';
     }
 
     if (hash(String(password)) === String(correctPassword)) {
-      this.props.actions.settings.update({
+      this.props.actions!.settings.update({
         type: 'app',
         data: {
           locked: false,
@@ -42,7 +51,7 @@ class LockedScreen extends Component<StoresProps> {
   }
 
   unlock(): void {
-    this.props.actions.settings.update({
+    this.props.actions!.settings.update({
       type: 'app',
       data: {
         locked: false,
@@ -52,7 +61,7 @@ class LockedScreen extends Component<StoresProps> {
 
   render(): ReactElement {
     const { stores } = this.props;
-    const { useTouchIdToUnlock } = this.props.stores.settings.all.app;
+    const { useTouchIdToUnlock } = this.props.stores!.settings.all.app;
 
     return (
       <div className="auth">
@@ -61,7 +70,7 @@ class LockedScreen extends Component<StoresProps> {
             onSubmit={this.onSubmit}
             unlock={this.unlock}
             useTouchIdToUnlock={useTouchIdToUnlock}
-            isSubmitting={stores.user.loginRequest.isExecuting}
+            isSubmitting={stores!.user.loginRequest.isExecuting}
             error={this.state.error || {}}
           />
         </div>
@@ -70,4 +79,4 @@ class LockedScreen extends Component<StoresProps> {
   }
 }
 
-export default inject('stores', 'actions')(observer(LockedScreen));
+export default LockedScreen;
diff --git a/src/containers/layout/AppLayoutContainer.tsx b/src/containers/layout/AppLayoutContainer.tsx
index 9c03b0ba4..a5fea52cd 100644
--- a/src/containers/layout/AppLayoutContainer.tsx
+++ b/src/containers/layout/AppLayoutContainer.tsx
@@ -15,17 +15,8 @@ interface AppLayoutContainerProps extends StoresProps {}
 
 class AppLayoutContainer extends Component<AppLayoutContainerProps> {
   render(): ReactElement {
-    const {
-      app,
-      features,
-      services,
-      ui,
-      settings,
-      globalError,
-      requests,
-      user,
-      router,
-    } = this.props.stores;
+    const { app, features, services, ui, settings, requests, user, router } =
+      this.props.stores;
 
     /* HOTFIX for:
       [mobx] Encountered an uncaught exception that was thrown by a reaction or observer component, in: 'Reaction[bound ]' TypeError: Cannot read properties of null (reading 'push')
@@ -142,7 +133,6 @@ class AppLayoutContainer extends Component<AppLayoutContainerProps> {
         <AppLayout
           settings={settings}
           isFullScreen={app.isFullScreen}
-          isOnline={app.isOnline}
           showServicesUpdatedInfoBar={ui.showServicesUpdatedInfoBar}
           appUpdateIsDownloaded={
             app.updateStatus === app.updateStatusTypes.DOWNLOADED
@@ -152,7 +142,6 @@ class AppLayoutContainer extends Component<AppLayoutContainerProps> {
           workspacesDrawer={workspacesDrawer}
           services={servicesContainer}
           installAppUpdate={installUpdate}
-          globalError={globalError.error}
           showRequiredRequestsError={requests.showRequiredRequestsError}
           areRequiredRequestsSuccessful={requests.areRequiredRequestsSuccessful}
           retryRequiredRequests={retryRequiredRequests}