From 753b29d99cf0229a25c4e77dedaecc0629cbd0af Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Wed, 20 Jul 2022 16:02:14 +0200 Subject: [PATCH] Settings / Sessions: Fix session termination options (#1956) --- .../left/settings/SettingsActiveSessions.tsx | 10 ++++++---- src/components/left/settings/SettingsMain.tsx | 4 +--- src/components/left/settings/SettingsPrivacy.tsx | 4 +++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/components/left/settings/SettingsActiveSessions.tsx b/src/components/left/settings/SettingsActiveSessions.tsx index 02a052e6a..445626ecf 100644 --- a/src/components/left/settings/SettingsActiveSessions.tsx +++ b/src/components/left/settings/SettingsActiveSessions.tsx @@ -50,6 +50,8 @@ const SettingsActiveSessions: FC = ({ const [isModalOpen, openModal, closeModal] = useFlag(); const autoTerminateValue = useMemo(() => { + // eslint-disable-next-line max-len + // https://github.com/DrKLO/Telegram/blob/96dce2c9aabc33b87db61d830aa087b6b03fe397/TMessagesProj/src/main/java/org/telegram/ui/SessionsActivity.java#L195 if (ttlDays === undefined) { return undefined; } @@ -59,11 +61,11 @@ const SettingsActiveSessions: FC = ({ if (ttlDays <= 30) { return '30'; } - if (ttlDays <= 90) { + if (ttlDays <= 93) { return '90'; } - if (ttlDays <= 180) { - return '180'; + if (ttlDays <= 183) { + return '183'; } return undefined; @@ -80,7 +82,7 @@ const SettingsActiveSessions: FC = ({ value: '90', }, { label: lang('Months', 6, 'i'), - value: '180', + value: '183', }], [lang]); const handleTerminateSessionClick = useCallback((hash: string) => { diff --git a/src/components/left/settings/SettingsMain.tsx b/src/components/left/settings/SettingsMain.tsx index ce81635f2..36ca40505 100644 --- a/src/components/left/settings/SettingsMain.tsx +++ b/src/components/left/settings/SettingsMain.tsx @@ -39,7 +39,6 @@ const SettingsMain: FC = ({ const { loadProfilePhotos, loadAuthorizations, - loadWebAuthorizations, openPremiumModal, } = getActions(); @@ -60,9 +59,8 @@ const SettingsMain: FC = ({ useEffect(() => { if (lastSyncTime) { loadAuthorizations(); - loadWebAuthorizations(); } - }, [lastSyncTime, loadAuthorizations, loadWebAuthorizations]); + }, [lastSyncTime, loadAuthorizations]); return (
diff --git a/src/components/left/settings/SettingsPrivacy.tsx b/src/components/left/settings/SettingsPrivacy.tsx index c81a25af3..1b7e56374 100644 --- a/src/components/left/settings/SettingsPrivacy.tsx +++ b/src/components/left/settings/SettingsPrivacy.tsx @@ -61,6 +61,7 @@ const SettingsPrivacy: FC = ({ updateContentSettings, loadGlobalPrivacySettings, updateGlobalPrivacySettings, + loadWebAuthorizations, } = getActions(); useEffect(() => { @@ -68,7 +69,8 @@ const SettingsPrivacy: FC = ({ loadAuthorizations(); loadPrivacySettings(); loadContentSettings(); - }, [loadBlockedContacts, loadAuthorizations, loadPrivacySettings, loadContentSettings]); + loadWebAuthorizations(); + }, [loadBlockedContacts, loadAuthorizations, loadPrivacySettings, loadContentSettings, loadWebAuthorizations]); useEffect(() => { if (isActive) {