From b1abf0ed30983db67cb84928c11a1de4e93181af Mon Sep 17 00:00:00 2001 From: Vijay Aravamudhan Date: Sat, 14 May 2022 18:08:26 -0500 Subject: Fix issue where the password got reset if any other setting was changed (#147) --- src/containers/settings/EditSettingsScreen.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 038497f0d..2c1c7f077 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -303,8 +303,10 @@ class EditSettingsScreen extends Component { workspaces: workspaceActions, } = this.props.actions; + const useOriginalPassword = settingsData.lockedPassword === ''; + this.setState({ - lockedPassword: settingsData.lockedPassword, + lockedPassword: useOriginalPassword ? '' : settingsData.lockedPassword, }); app.launchOnStartup({ @@ -339,7 +341,7 @@ class EditSettingsScreen extends Component { predefinedTodoServer: settingsData.predefinedTodoServer, customTodoServer: settingsData.customTodoServer, lockingFeatureEnabled: Boolean(settingsData.lockingFeatureEnabled), - lockedPassword: hash(String(settingsData.lockedPassword)), + lockedPassword: useOriginalPassword ? this.props.stores.settings.all.app.lockedPassword : hash(String(settingsData.lockedPassword)), useTouchIdToUnlock: Boolean(settingsData.useTouchIdToUnlock), inactivityLock: Number(settingsData.inactivityLock), scheduledDNDEnabled: Boolean(settingsData.scheduledDNDEnabled), -- cgit v1.2.3-70-g09d2