Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: RocketChat/Rocket.Chat.ReactNative
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7960916067ebab0a5d6f597c64829b37815d0afd
Choose a base ref
..
head repository: RocketChat/Rocket.Chat.ReactNative
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 00da394edf5408cfc266badbdc11cef9230c081f
Choose a head ref
Showing with 1 addition and 1 deletion.
  1. +1 −1 app/lib/methods/getSettings.js
2 changes: 1 addition & 1 deletion app/lib/methods/getSettings.js
View file
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ const serverInfoUpdate = async(serverInfo, iconSetting) => {
return { ...allSettings, autoLock };
}
if (setting._id === 'Force_Screen_Lock_After') {
const forceScreenLock = allSettings.find(s => s._id === 'Force_Screen_Lock')?.valueAsBoolean;
const forceScreenLock = serverInfo.find(s => s._id === 'Force_Screen_Lock')?.valueAsBoolean;

// if Force_Screen_Lock_After === 0 and autoLockTime is null, set app's default value
if (setting.valueAsNumber === 0 && !server.autoLockTime) {