diff --git a/lib/types/redux-types.js b/lib/types/redux-types.js --- a/lib/types/redux-types.js +++ b/lib/types/redux-types.js @@ -117,27 +117,27 @@ import type { NotifPermissionAlertInfo } from '../utils/push-alerts.js'; export type BaseAppState = { - navInfo: NavInfo, - currentUserInfo: ?CurrentUserInfo, - draftStore: DraftStore, - entryStore: EntryStore, - threadStore: ThreadStore, - userStore: UserStore, - messageStore: MessageStore, - updatesCurrentAsOf: number, // millisecond timestamp - loadingStatuses: { [key: string]: { [idx: number]: LoadingStatus } }, - calendarFilters: $ReadOnlyArray, - urlPrefix: string, - notifPermissionAlertInfo: NotifPermissionAlertInfo, - connection: ConnectionInfo, - watchedThreadIDs: $ReadOnlyArray, - lifecycleState: LifecycleState, - enabledApps: EnabledApps, - reportStore: ReportStore, - nextLocalID: number, - dataLoaded: boolean, - userPolicies: UserPolicies, - deviceToken: ?string, + +navInfo: NavInfo, + +currentUserInfo: ?CurrentUserInfo, + +draftStore: DraftStore, + +entryStore: EntryStore, + +threadStore: ThreadStore, + +userStore: UserStore, + +messageStore: MessageStore, + +updatesCurrentAsOf: number, // millisecond timestamp + +loadingStatuses: { [key: string]: { [idx: number]: LoadingStatus } }, + +calendarFilters: $ReadOnlyArray, + +urlPrefix: string, + +notifPermissionAlertInfo: NotifPermissionAlertInfo, + +connection: ConnectionInfo, + +watchedThreadIDs: $ReadOnlyArray, + +lifecycleState: LifecycleState, + +enabledApps: EnabledApps, + +reportStore: ReportStore, + +nextLocalID: number, + +dataLoaded: boolean, + +userPolicies: UserPolicies, + +deviceToken: ?string, +commServicesAccessToken: ?string, +inviteLinksStore: InviteLinksStore, +lastCommunicatedPlatformDetails: LastCommunicatedPlatformDetails, @@ -148,13 +148,13 @@ // Web JS runtime doesn't have access to the cookie for security reasons. // Native JS doesn't have a sessionID because the cookieID is used instead. export type NativeAppState = BaseAppState<*> & { - sessionID?: void, + +sessionID?: void, ... }; export type WebAppState = BaseAppState<*> & { - sessionID: ?string, - cryptoStore: CryptoStore, - pushApiPublicKey: ?string, + +sessionID: ?string, + +cryptoStore: CryptoStore, + +pushApiPublicKey: ?string, ... }; export type AppState = NativeAppState | WebAppState; diff --git a/native/redux/state-types.js b/native/redux/state-types.js --- a/native/redux/state-types.js +++ b/native/redux/state-types.js @@ -27,37 +27,37 @@ import type { GlobalThemeInfo } from '../types/themes.js'; export type AppState = { - navInfo: NavInfo, - currentUserInfo: ?CurrentUserInfo, - draftStore: DraftStore, - entryStore: EntryStore, - threadStore: ThreadStore, - userStore: UserStore, - messageStore: MessageStore, - storeLoaded: boolean, - updatesCurrentAsOf: number, - loadingStatuses: { [key: string]: { [idx: number]: LoadingStatus } }, - calendarFilters: $ReadOnlyArray, - deviceToken: ?string, - dataLoaded: boolean, - urlPrefix: string, - customServer: ?string, - notifPermissionAlertInfo: NotifPermissionAlertInfo, - connection: ConnectionInfo, - watchedThreadIDs: $ReadOnlyArray, - lifecycleState: LifecycleState, - enabledApps: EnabledApps, - reportStore: ReportStore, - nextLocalID: number, - _persist: ?PersistState, - sessionID?: void, - dimensions: DimensionsInfo, - connectivity: ConnectivityInfo, - globalThemeInfo: GlobalThemeInfo, - deviceCameraInfo: DeviceCameraInfo, - deviceOrientation: Orientations, - frozen: boolean, - userPolicies: UserPolicies, + +navInfo: NavInfo, + +currentUserInfo: ?CurrentUserInfo, + +draftStore: DraftStore, + +entryStore: EntryStore, + +threadStore: ThreadStore, + +userStore: UserStore, + +messageStore: MessageStore, + +storeLoaded: boolean, + +updatesCurrentAsOf: number, + +loadingStatuses: { [key: string]: { [idx: number]: LoadingStatus } }, + +calendarFilters: $ReadOnlyArray, + +deviceToken: ?string, + +dataLoaded: boolean, + +urlPrefix: string, + +customServer: ?string, + +notifPermissionAlertInfo: NotifPermissionAlertInfo, + +connection: ConnectionInfo, + +watchedThreadIDs: $ReadOnlyArray, + +lifecycleState: LifecycleState, + +enabledApps: EnabledApps, + +reportStore: ReportStore, + +nextLocalID: number, + +_persist: ?PersistState, + +sessionID?: void, + +dimensions: DimensionsInfo, + +connectivity: ConnectivityInfo, + +globalThemeInfo: GlobalThemeInfo, + +deviceCameraInfo: DeviceCameraInfo, + +deviceOrientation: Orientations, + +frozen: boolean, + +userPolicies: UserPolicies, +commServicesAccessToken: ?string, +inviteLinksStore: InviteLinksStore, +lastCommunicatedPlatformDetails: LastCommunicatedPlatformDetails, diff --git a/web/redux/redux-setup.js b/web/redux/redux-setup.js --- a/web/redux/redux-setup.js +++ b/web/redux/redux-setup.js @@ -67,36 +67,36 @@ }; export type AppState = { - navInfo: NavInfo, - deviceID: ?string, - currentUserInfo: ?CurrentUserInfo, - draftStore: DraftStore, - sessionID: ?string, - entryStore: EntryStore, - threadStore: ThreadStore, - userStore: UserStore, - messageStore: MessageStore, - updatesCurrentAsOf: number, - loadingStatuses: { [key: string]: { [idx: number]: LoadingStatus } }, - calendarFilters: $ReadOnlyArray, - communityPickerStore: CommunityPickerStore, - urlPrefix: string, - windowDimensions: WindowDimensions, - deviceToken: ?string, - baseHref: string, - notifPermissionAlertInfo: NotifPermissionAlertInfo, - connection: ConnectionInfo, - watchedThreadIDs: $ReadOnlyArray, - lifecycleState: LifecycleState, - enabledApps: EnabledApps, - reportStore: ReportStore, - nextLocalID: number, - dataLoaded: boolean, - windowActive: boolean, - userPolicies: UserPolicies, - cryptoStore: CryptoStore, - pushApiPublicKey: ?string, - _persist: ?PersistState, + +navInfo: NavInfo, + +deviceID: ?string, + +currentUserInfo: ?CurrentUserInfo, + +draftStore: DraftStore, + +sessionID: ?string, + +entryStore: EntryStore, + +threadStore: ThreadStore, + +userStore: UserStore, + +messageStore: MessageStore, + +updatesCurrentAsOf: number, + +loadingStatuses: { [key: string]: { [idx: number]: LoadingStatus } }, + +calendarFilters: $ReadOnlyArray, + +communityPickerStore: CommunityPickerStore, + +urlPrefix: string, + +windowDimensions: WindowDimensions, + +deviceToken: ?string, + +baseHref: string, + +notifPermissionAlertInfo: NotifPermissionAlertInfo, + +connection: ConnectionInfo, + +watchedThreadIDs: $ReadOnlyArray, + +lifecycleState: LifecycleState, + +enabledApps: EnabledApps, + +reportStore: ReportStore, + +nextLocalID: number, + +dataLoaded: boolean, + +windowActive: boolean, + +userPolicies: UserPolicies, + +cryptoStore: CryptoStore, + +pushApiPublicKey: ?string, + +_persist: ?PersistState, +commServicesAccessToken: ?string, +inviteLinksStore: InviteLinksStore, +lastCommunicatedPlatformDetails: LastCommunicatedPlatformDetails,