diff options
author | muhamedsalih-tw <104364298+muhamedsalih-tw@users.noreply.github.com> | 2022-11-02 06:31:36 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-02 01:01:36 +0000 |
commit | 302d595f7c289387e53a0ef7df4d574ed4e25d70 (patch) | |
tree | 2385e59eaca9c78921d9b0b3681cfba1b3eef168 /src/containers | |
parent | Re-enable editing of the address bar to manually access a different url withi... (diff) | |
download | ferdium-app-302d595f7c289387e53a0ef7df4d574ed4e25d70.tar.gz ferdium-app-302d595f7c289387e53a0ef7df4d574ed4e25d70.tar.zst ferdium-app-302d595f7c289387e53a0ef7df4d574ed4e25d70.zip |
Transform to TS and refactored components w.r.t deletion if duplicated Input component (#729)
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/auth/LockedScreen.tsx | 19 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.tsx | 15 |
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 { | |||
12 | stores?: RealStores; | 12 | stores?: RealStores; |
13 | } | 13 | } |
14 | 14 | ||
15 | interface IState { | ||
16 | error: boolean; | ||
17 | } | ||
18 | |||
15 | @inject('stores', 'actions') | 19 | @inject('stores', 'actions') |
16 | @observer | 20 | @observer |
17 | class LockedScreen extends Component<IProps> { | 21 | class LockedScreen extends Component<IProps, IState> { |
18 | state = { | ||
19 | error: false, | ||
20 | }; | ||
21 | |||
22 | constructor(props: StoresProps) { | 22 | constructor(props: StoresProps) { |
23 | super(props); | 23 | super(props); |
24 | 24 | ||
25 | this.state = { | ||
26 | error: false, | ||
27 | }; | ||
25 | this.onSubmit = this.onSubmit.bind(this); | 28 | this.onSubmit = this.onSubmit.bind(this); |
26 | this.unlock = this.unlock.bind(this); | 29 | this.unlock = this.unlock.bind(this); |
27 | } | 30 | } |
@@ -43,9 +46,7 @@ class LockedScreen extends Component<IProps> { | |||
43 | }); | 46 | }); |
44 | } else { | 47 | } else { |
45 | this.setState({ | 48 | this.setState({ |
46 | error: { | 49 | error: true, |
47 | code: 'invalid-credentials', | ||
48 | }, | ||
49 | }); | 50 | }); |
50 | } | 51 | } |
51 | } | 52 | } |
@@ -71,7 +72,7 @@ class LockedScreen extends Component<IProps> { | |||
71 | unlock={this.unlock} | 72 | unlock={this.unlock} |
72 | useTouchIdToUnlock={useTouchIdToUnlock} | 73 | useTouchIdToUnlock={useTouchIdToUnlock} |
73 | isSubmitting={stores!.user.loginRequest.isExecuting} | 74 | isSubmitting={stores!.user.loginRequest.isExecuting} |
74 | error={this.state.error || {}} | 75 | error={this.state.error} |
75 | /> | 76 | /> |
76 | </div> | 77 | </div> |
77 | </div> | 78 | </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 @@ | |||
1 | import { ipcRenderer } from 'electron'; | 1 | import { ipcRenderer } from 'electron'; |
2 | import { Component, ReactElement } from 'react'; | 2 | import { Component, ReactElement } from 'react'; |
3 | import { inject, observer } from 'mobx-react'; | 3 | import { inject, observer } from 'mobx-react'; |
4 | import { defineMessages, injectIntl } from 'react-intl'; | 4 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; |
5 | 5 | ||
6 | import { FormFields } from '../../@types/mobx-form.types'; | 6 | import { FormFields } from '../../@types/mobx-form.types'; |
7 | import { StoresProps } from '../../@types/ferdium-components.types'; | 7 | import { StoresProps } from '../../@types/ferdium-components.types'; |
@@ -314,10 +314,10 @@ const messages = defineMessages({ | |||
314 | }, | 314 | }, |
315 | }); | 315 | }); |
316 | 316 | ||
317 | interface EditSettingsScreenProps extends StoresProps { | 317 | interface EditSettingsScreenProps extends StoresProps, WrappedComponentProps {} |
318 | intl: any; | ||
319 | } | ||
320 | 318 | ||
319 | @inject('stores', 'actions') | ||
320 | @observer | ||
321 | class EditSettingsScreen extends Component<EditSettingsScreenProps> { | 321 | class EditSettingsScreen extends Component<EditSettingsScreenProps> { |
322 | state = { | 322 | state = { |
323 | lockedPassword: '', | 323 | lockedPassword: '', |
@@ -962,9 +962,6 @@ class EditSettingsScreen extends Component<EditSettingsScreenProps> { | |||
962 | } | 962 | } |
963 | isSplitModeEnabled={this.props.stores.settings.app.splitMode} | 963 | isSplitModeEnabled={this.props.stores.settings.app.splitMode} |
964 | isTodosActivated={this.props.stores.todos.isFeatureEnabledByUser} | 964 | isTodosActivated={this.props.stores.todos.isFeatureEnabledByUser} |
965 | isUsingCustomTodoService={ | ||
966 | this.props.stores.todos.isUsingCustomTodoService | ||
967 | } | ||
968 | openProcessManager={() => this.openProcessManager()} | 965 | openProcessManager={() => this.openProcessManager()} |
969 | isOnline={app.isOnline} | 966 | isOnline={app.isOnline} |
970 | serverURL={importExportURL()} | 967 | serverURL={importExportURL()} |
@@ -974,6 +971,4 @@ class EditSettingsScreen extends Component<EditSettingsScreenProps> { | |||
974 | } | 971 | } |
975 | } | 972 | } |
976 | 973 | ||
977 | export default injectIntl( | 974 | export default injectIntl(EditSettingsScreen); |
978 | inject('stores', 'actions')(observer(EditSettingsScreen)), | ||
979 | ); | ||