-
-
-
-
-
-
-
-
- {loadingMessageCount
- ? i18n('loadingMessages', {
- count: String(loadingMessageCount),
- })
- : i18n('loading')}
-
-
+
+
+
+ {envelopeTimestamp
+ ? i18n('icu:loadingMessages', {
+ daysAgo: Math.max(
+ 1,
+ Math.round((now - envelopeTimestamp) / DAY)
+ ),
+ })
+ : i18n('loading')}
+
+
);
}
diff --git a/ts/state/actions.ts b/ts/state/actions.ts
index 9b920da8e..0e3664204 100644
--- a/ts/state/actions.ts
+++ b/ts/state/actions.ts
@@ -13,6 +13,7 @@ import { actions as crashReports } from './ducks/crashReports';
import { actions as emojis } from './ducks/emojis';
import { actions as expiration } from './ducks/expiration';
import { actions as globalModals } from './ducks/globalModals';
+import { actions as inbox } from './ducks/inbox';
import { actions as items } from './ducks/items';
import { actions as lightbox } from './ducks/lightbox';
import { actions as linkPreviews } from './ducks/linkPreviews';
@@ -42,6 +43,7 @@ export const actionCreators: ReduxActions = {
emojis,
expiration,
globalModals,
+ inbox,
items,
lightbox,
linkPreviews,
@@ -71,6 +73,7 @@ export const mapDispatchToProps = {
...emojis,
...expiration,
...globalModals,
+ ...inbox,
...items,
...lightbox,
...linkPreviews,
diff --git a/ts/state/ducks/inbox.ts b/ts/state/ducks/inbox.ts
new file mode 100644
index 000000000..4e78cf043
--- /dev/null
+++ b/ts/state/ducks/inbox.ts
@@ -0,0 +1,83 @@
+// Copyright 2023 Signal Messenger, LLC
+// SPDX-License-Identifier: AGPL-3.0-only
+
+import type { ReadonlyDeep } from 'type-fest';
+
+// State
+
+// eslint-disable-next-line local-rules/type-alias-readonlydeep
+export type InboxStateType = Readonly<{
+ firstEnvelopeTimestamp: number | undefined;
+ envelopeTimestamp: number | undefined;
+}>;
+
+// Actions
+
+const SET_ENVELOPE_TIMESTAMP = 'INBOX/SET_INBOX_ENVELOPE_TIMESTAMP';
+
+type SetInboxEnvelopeTimestampActionType = ReadonlyDeep<{
+ type: typeof SET_ENVELOPE_TIMESTAMP;
+ payload: {
+ envelopeTimestamp: number | undefined;
+ };
+}>;
+
+export type InboxActionType = ReadonlyDeep
;
+
+// Action Creators
+
+export const actions = {
+ setInboxEnvelopeTimestamp,
+};
+
+function setInboxEnvelopeTimestamp(
+ envelopeTimestamp: number | undefined
+): SetInboxEnvelopeTimestampActionType {
+ return {
+ type: SET_ENVELOPE_TIMESTAMP,
+ payload: { envelopeTimestamp },
+ };
+}
+
+// Reducer
+
+export function getEmptyState(): InboxStateType {
+ return {
+ firstEnvelopeTimestamp: undefined,
+ envelopeTimestamp: undefined,
+ };
+}
+
+export function reducer(
+ state: Readonly = getEmptyState(),
+ action: Readonly
+): InboxStateType {
+ if (!state) {
+ return getEmptyState();
+ }
+
+ if (action.type === SET_ENVELOPE_TIMESTAMP) {
+ const { payload } = action;
+ const { envelopeTimestamp: providedTimestamp } = payload;
+
+ // Ensure monotonicity
+ let { envelopeTimestamp } = state;
+ if (providedTimestamp !== undefined) {
+ envelopeTimestamp = Math.max(
+ providedTimestamp,
+ envelopeTimestamp ?? providedTimestamp
+ );
+ }
+
+ const firstEnvelopeTimestamp =
+ state.firstEnvelopeTimestamp ?? envelopeTimestamp;
+
+ return {
+ ...state,
+ envelopeTimestamp,
+ firstEnvelopeTimestamp,
+ };
+ }
+
+ return state;
+}
diff --git a/ts/state/getInitialState.ts b/ts/state/getInitialState.ts
index 6c74879e4..b8ace8bf3 100644
--- a/ts/state/getInitialState.ts
+++ b/ts/state/getInitialState.ts
@@ -11,6 +11,7 @@ import { getEmptyState as conversations } from './ducks/conversations';
import { getEmptyState as crashReports } from './ducks/crashReports';
import { getEmptyState as expiration } from './ducks/expiration';
import { getEmptyState as globalModals } from './ducks/globalModals';
+import { getEmptyState as inbox } from './ducks/inbox';
import { getEmptyState as lightbox } from './ducks/lightbox';
import { getEmptyState as linkPreviews } from './ducks/linkPreviews';
import { getEmptyState as mediaGallery } from './ducks/mediaGallery';
@@ -115,6 +116,7 @@ export function getInitialState({
emojis: emojis(),
expiration: expiration(),
globalModals: globalModals(),
+ inbox: inbox(),
items,
lightbox: lightbox(),
linkPreviews: linkPreviews(),
diff --git a/ts/state/reducer.ts b/ts/state/reducer.ts
index 50c07d473..171cd0b48 100644
--- a/ts/state/reducer.ts
+++ b/ts/state/reducer.ts
@@ -15,6 +15,7 @@ import { reducer as crashReports } from './ducks/crashReports';
import { reducer as emojis } from './ducks/emojis';
import { reducer as expiration } from './ducks/expiration';
import { reducer as globalModals } from './ducks/globalModals';
+import { reducer as inbox } from './ducks/inbox';
import { reducer as items } from './ducks/items';
import { reducer as lightbox } from './ducks/lightbox';
import { reducer as linkPreviews } from './ducks/linkPreviews';
@@ -44,6 +45,7 @@ export const reducer = combineReducers({
emojis,
expiration,
globalModals,
+ inbox,
items,
lightbox,
linkPreviews,
diff --git a/ts/state/smart/Inbox.tsx b/ts/state/smart/Inbox.tsx
index cc7265b38..0cfc41117 100644
--- a/ts/state/smart/Inbox.tsx
+++ b/ts/state/smart/Inbox.tsx
@@ -37,6 +37,12 @@ export function SmartInbox(): JSX.Element {
const isCustomizingPreferredReactions = useSelector(
getIsCustomizingPreferredReactions
);
+ const envelopeTimestamp = useSelector(
+ state => state.inbox.envelopeTimestamp
+ );
+ const firstEnvelopeTimestamp = useSelector(
+ state => state.inbox.firstEnvelopeTimestamp
+ );
const { hasInitialLoadCompleted } = useSelector(
state => state.app
);
@@ -54,6 +60,8 @@ export function SmartInbox(): JSX.Element {
return (