Transform to TS and refactored components w.r.t deletion if duplicated Input component (#729)

2 files changed, 15 insertions, 19 deletions

diff --git a/src/containers/auth/LockedScreen.tsx b/src/containers/auth/LockedScreen.tsx
index 611a0757c..a4cb43f73 100644
--- a/src/containers/auth/LockedScreen.tsx
+++ b/src/containers/auth/LockedScreen.tsx
@@ -12,16 +12,19 @@ interface IProps {
   stores?: RealStores;
 }
 
+interface IState {
+  error: boolean;
+}
+
 @inject('stores', 'actions')
 @observer
-class LockedScreen extends Component<IProps> {
-  state = {
-    error: false,
-  };
-
+class LockedScreen extends Component<IProps, IState> {
   constructor(props: StoresProps) {
     super(props);
 
+    this.state = {
+      error: false,
+    };
     this.onSubmit = this.onSubmit.bind(this);
     this.unlock = this.unlock.bind(this);
   }
@@ -43,9 +46,7 @@ class LockedScreen extends Component<IProps> {
       });
     } else {
       this.setState({
-        error: {
-          code: 'invalid-credentials',
-        },
+        error: true,
       });
     }
   }
@@ -71,7 +72,7 @@ class LockedScreen extends Component<IProps> {
             unlock={this.unlock}
             useTouchIdToUnlock={useTouchIdToUnlock}
             isSubmitting={stores!.user.loginRequest.isExecuting}
-            error={this.state.error || {}}
+            error={this.state.error}
           />
         </div>
       </div>
diff --git a/src/containers/settings/EditSettingsScreen.tsx b/src/containers/settings/EditSettingsScreen.tsx
index 162d422ce..0d8a0a758 100644
--- a/src/containers/settings/EditSettingsScreen.tsx
+++ b/src/containers/settings/EditSettingsScreen.tsx
@@ -1,7 +1,7 @@
 import { ipcRenderer } from 'electron';
 import { Component, ReactElement } from 'react';
 import { inject, observer } from 'mobx-react';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
 
 import { FormFields } from '../../@types/mobx-form.types';
 import { StoresProps } from '../../@types/ferdium-components.types';
@@ -314,10 +314,10 @@ const messages = defineMessages({
   },
 });
 
-interface EditSettingsScreenProps extends StoresProps {
-  intl: any;
-}
+interface EditSettingsScreenProps extends StoresProps, WrappedComponentProps {}
 
+@inject('stores', 'actions')
+@observer
 class EditSettingsScreen extends Component<EditSettingsScreenProps> {
   state = {
     lockedPassword: '',
@@ -962,9 +962,6 @@ class EditSettingsScreen extends Component<EditSettingsScreenProps> {
           }
           isSplitModeEnabled={this.props.stores.settings.app.splitMode}
           isTodosActivated={this.props.stores.todos.isFeatureEnabledByUser}
-          isUsingCustomTodoService={
-            this.props.stores.todos.isUsingCustomTodoService
-          }
           openProcessManager={() => this.openProcessManager()}
           isOnline={app.isOnline}
           serverURL={importExportURL()}
@@ -974,6 +971,4 @@ class EditSettingsScreen extends Component<EditSettingsScreenProps> {
   }
 }
 
-export default injectIntl(
-  inject('stores', 'actions')(observer(EditSettingsScreen)),
-);
+export default injectIntl(EditSettingsScreen);