Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Session timeout notification incorrectly says "Days" on iOS #7510

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+21 −7
Open

Session timeout notification incorrectly says "Days" on iOS #7510

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00a59b7
changed days to hours in notification
ShisuiMadara Aug 19, 2023
5f51c52
updated logic and en.json file
ShisuiMadara Aug 21, 2023
137bd3c
fixed trailing whitespace
ShisuiMadara Aug 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/utils/notification/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ export const emitNotificationError = (type: 'Team' | 'Channel' | 'Post' | 'Conne

export const scheduleExpiredNotification = (serverUrl: string, session: Session, serverName: string, locale = DEFAULT_LOCALE) => {
const expiresAt = session?.expires_at || 0;
const expiresInDays = Math.ceil(Math.abs(moment.duration(moment().diff(moment(expiresAt))).asDays()));
const expiresInHours = Math.ceil(Math.abs(moment.duration(moment().diff(moment(expiresAt))).asHours())); // Calculate expiresInHours
const intl = createIntl({locale, messages: getTranslations(locale)});
const body = intl.formatMessage({
id: 'mobile.session_expired',
defaultMessage: 'Please log in to continue receiving notifications. Sessions for {siteName} are configured to expire every {daysCount, number} {daysCount, plural, one {day} other {days}}.',
}, {siteName: serverName, daysCount: expiresInDays});
defaultMessage: 'Please log in to continue receiving notifications. Sessions for {siteName} are configured to expire every {hoursCount, number} {hoursCount, plural, one {hour} other {hours}}.', // Update the message to hours
}, {siteName: serverName, hoursCount: expiresInHours}); // Update daysCount to hoursCount
const title = intl.formatMessage({id: 'mobile.session_expired.title', defaultMessage: 'Session Expired'});

if (expiresAt) {
Expand Down