diff --git a/lib/reducers/entry-reducer.js b/lib/reducers/entry-reducer.js --- a/lib/reducers/entry-reducer.js +++ b/lib/reducers/entry-reducer.js @@ -63,6 +63,7 @@ } from '../types/update-types.js'; import { dateString } from '../utils/date-utils.js'; import { values } from '../utils/objects.js'; +import { usingCommServicesAccessToken } from '../utils/services-utils.js'; function daysToEntriesFromEntryInfos( entryInfos: $ReadOnlyArray, @@ -177,11 +178,15 @@ const newEntryInfos = _pickBy( (entry: RawEntryInfo) => authorizedThreadInfos[entry.threadID], )(entryInfos); - const newLastUserInteractionCalendar = - action.type === logOutActionTypes.success || - action.type === deleteKeyserverAccountActionTypes.success - ? 0 - : lastUserInteractionCalendar; + let newLastUserInteractionCalendar = lastUserInteractionCalendar; + if ( + (action.type === logOutActionTypes.success || + action.type === deleteKeyserverAccountActionTypes.success) && + !usingCommServicesAccessToken + ) { + newLastUserInteractionCalendar = 0; + } + if (Object.keys(newEntryInfos).length === Object.keys(entryInfos).length) { return [ {