@zeniai/client-epic-state 5.3.18-betaAK1 → 5.3.18

package/lib/entity/tenant/epic/fetchAllTenantsEpic.d.ts

@@ -3,10 +3,12 @@ import { Observable } from 'rxjs';
 import { ID } from '../../../commonStateTypes/common';
 import { MonthYearPeriod } from '../../../commonStateTypes/timePeriod';
 import { RootState } from '../../../rootStateTypes';
+import { initializeSelectedPeriodForTenants } from '../../../view/expenseAutomationView/expenseAutomationViewReducer';
 import { ZeniAPI } from '../../../zeniAPI';
+import { updateCompanies } from '../../company/companyReducer';
 import { TenantsData } from '../tenantPayload';
-import { fetchActiveTenant, fetchAllTenants, updateTenantFailure, updateTenantSuccess, updateTenantSummariesSuccess, updateTenantsFailure } from '../tenantReducer';
-export type ActionType = ReturnType<typeof fetchAllTenants> | ReturnType<typeof fetchActiveTenant> | ReturnType<typeof updateTenantSuccess> | ReturnType<typeof updateTenantFailure> | ReturnType<typeof updateTenantSummariesSuccess> | ReturnType<typeof updateTenantsFailure>;
+import { fetchAllTenants, updateTenantsFailure, updateTenantsSuccess } from '../tenantReducer';
+export type ActionType = ReturnType<typeof fetchAllTenants> | ReturnType<typeof updateCompanies> | ReturnType<typeof updateTenantsSuccess> | ReturnType<typeof initializeSelectedPeriodForTenants> | ReturnType<typeof updateTenantsFailure>;
 export declare const fetchAllTenantsEpic: (actions$: ActionsObservable<ActionType>, state: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
 export declare const defaultMonthYearPeriod: MonthYearPeriod;
 export declare const getDefaultSelectedPeriodsForTenants: (tenantsData: TenantsData) => Record<ID, MonthYearPeriod>;

package/lib/entity/tenant/epic/fetchAllTenantsEpic.js

@@ -6,63 +6,60 @@ const operators_1 = require("rxjs/operators");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const responsePayload_1 = require("../../../responsePayload");
 const sessionEndpointsLoader_1 = require("../../../sessionEndpointsLoader");
+const expenseAutomationViewReducer_1 = require("../../../view/expenseAutomationView/expenseAutomationViewReducer");
 const zeniDayJS_1 = require("../../../zeniDayJS");
+const companyReducer_1 = require("../../company/companyReducer");
 const tenantReducer_1 = require("../tenantReducer");
-// Only what the tenant switcher and tenant lookups read (~0.3 KB a tenant
-// instead of ~18 KB with full records and companies). A tenant's full record
-// comes from `fetchActiveTenant` when it is opened.
-const TENANT_SUMMARIES_QUERY = {
-    is_full: false,
-    is_include_companies_in_response: false,
-};
-/**
- * The tenant the app lands on: the selected one, or the most recently opened
- * when none is selected (sign-in, the root route).
- */
-function getLandingTenantId(tenants, currentTenantId) {
-    if (currentTenantId != null &&
-        tenants.some((tenant) => tenant.tenant_id === currentTenantId)) {
-        return currentTenantId;
-    }
-    const lastCheckIn = (tenant) => tenant.user_last_check_in_time_into_tenant != null
-        ? (0, zeniDayJS_1.date)(tenant.user_last_check_in_time_into_tenant).valueOf()
-        : 0;
-    return tenants.reduce((mostRecent, tenant) => mostRecent == null || lastCheckIn(tenant) > lastCheckIn(mostRecent)
-        ? tenant
-        : mostRecent, undefined)?.tenant_id;
-}
 const fetchAllTenantsEpic = (actions$, state, zeniAPI) => {
+    const queryParam = {
+        is_include_companies_in_response: true,
+    };
     return actions$.pipe((0, operators_1.filter)(tenantReducer_1.fetchAllTenants.match), (0, operators_1.switchMap)((action) => {
-        const { userId, zeniSessionId } = action.payload;
-        const fetchTenants$ = (0, rxjs_1.defer)(() => zeniAPI.getJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/users/${userId}/tenants?query=${encodeURIComponent(JSON.stringify(TENANT_SUMMARIES_QUERY))}`, Object.assign({ 'zeni-user-id': userId }, { 'zeni-tenant-id': '' }, zeniSessionId != null ? { 'zeni-session-id': zeniSessionId } : {}))).pipe((0, operators_1.mergeMap)((response) => {
-            if (!(0, responsePayload_1.isSuccessResponse)(response) || response.data == null) {
-                return (0, rxjs_1.of)((0, tenantReducer_1.updateTenantsFailure)(response.status));
+        const fetchTenants$ = (0, rxjs_1.defer)(() => zeniAPI.getJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/users/${action.payload.userId}/tenants?query=${encodeURIComponent(JSON.stringify(queryParam))}`, Object.assign({ 'zeni-user-id': action.payload.userId }, { 'zeni-tenant-id': '' }, action.payload.zeniSessionId != null
+            ? { 'zeni-session-id': action.payload.zeniSessionId }
+            : {}))).pipe((0, operators_1.mergeMap)((response) => {
+            const currentTenantId = state.value.tenantState.currentTenantId;
+            if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+                const defaultSelectedPeriodsForTenants = (0, exports.getDefaultSelectedPeriodsForTenants)(response.data);
+                let actions = [
+                    (0, tenantReducer_1.updateTenantsSuccess)(response.data),
+                    (0, expenseAutomationViewReducer_1.initializeSelectedPeriodForTenants)({
+                        selectedPeriodByTenantId: defaultSelectedPeriodsForTenants,
+                    }),
+                ];
+                if (response.data.companies != null) {
+                    let companiesPayload = response.data.companies;
+                    if (currentTenantId != null) {
+                        // filter out this tenant ID related company detail
+                        // Find companyID for this tenant
+                        const currentTenantPayload = response.data.tenants.find((tenant) => tenant.tenant_id === currentTenantId);
+                        if (currentTenantPayload != null) {
+                            companiesPayload = response.data.companies.filter((company) => company.company_id !== currentTenantPayload.company_id);
+                        }
+                        else {
+                            console.warn('Selected tenant record not found in response', currentTenantId);
+                        }
+                    }
+                    actions = [
+                        (0, companyReducer_1.updateCompanies)({
+                            payload: companiesPayload,
+                            schema: {},
+                        }),
+                        ...actions,
+                    ];
+                }
+                return (0, rxjs_1.from)(actions);
             }
-            const { tenants } = response.data;
-            if (tenants.length === 0) {
-                return (0, rxjs_1.of)((0, tenantReducer_1.updateTenantsFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected error', 'Empty list of tenants')));
-            }
-            const tenantsLoaded = (0, tenantReducer_1.updateTenantSummariesSuccess)(tenants);
-            const { tenantState } = state.value;
-            const landingTenantId = getLandingTenantId(tenants, tenantState.currentTenantId);
-            const isLandingTenantLoadedOrLoading = landingTenantId == null ||
-                tenantState.tenantsById[landingTenantId] != null ||
-                tenantState.activeTenantFetchState.fetchState === 'In-Progress';
-            if (isLandingTenantLoadedOrLoading) {
-                return (0, rxjs_1.of)(tenantsLoaded);
+            else {
+                return (0, rxjs_1.of)((0, tenantReducer_1.updateTenantsFailure)(response.status));
             }
-            // Screens that wait for this fetch (sign-in, the root route) read the
-            // landing tenant's roles and product settings, which the list does
-            // not carry, so it completes only once that tenant's record is in.
-            return (0, rxjs_1.merge)(actions$.pipe((0, operators_1.filter)((landingAction) => tenantReducer_1.updateTenantSuccess.match(landingAction) ||
-                tenantReducer_1.updateTenantFailure.match(landingAction)), (0, operators_1.take)(1), (0, operators_1.map)(() => tenantsLoaded)), (0, rxjs_1.of)((0, tenantReducer_1.fetchActiveTenant)(userId, landingTenantId, zeniSessionId)));
         }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, tenantReducer_1.updateTenantsFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected error', 'Fetch All Tenants REST API call errored out' +
             JSON.stringify(error))))));
         const sessionEndpointsLoader = (0, sessionEndpointsLoader_1.getSessionEndpointsLoader)();
         if (sessionEndpointsLoader == null) {
             return fetchTenants$;
         }
-        return (0, rxjs_1.defer)(() => (0, rxjs_1.from)(sessionEndpointsLoader(userId, zeniSessionId))).pipe((0, operators_1.switchMap)(() => fetchTenants$), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, tenantReducer_1.updateTenantsFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected error', 'Loading session endpoints errored out: ' +
+        return (0, rxjs_1.defer)(() => (0, rxjs_1.from)(sessionEndpointsLoader(action.payload.userId, action.payload.zeniSessionId))).pipe((0, operators_1.switchMap)(() => fetchTenants$), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, tenantReducer_1.updateTenantsFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected error', 'Loading session endpoints errored out: ' +
             JSON.stringify(error))))));
     }));
 };

package/lib/entity/tenant/tenantPayload.d.ts

@@ -7,22 +7,6 @@ import { SubscriptionSummaryPayload } from '../subscription/subscriptionSummary/
 import { MasterTOSInfoPayload } from '../userRole/userRolePayload';
 import { CapitalizableClassificationType, CapitalizableMatchPattern, CapitalizableThresholdSource } from './tenantState';
 type TenantsResponse = ZeniAPIResponse<TenantsData>;
-type TenantSummariesResponse = ZeniAPIResponse<TenantSummariesData>;
-/**
- * The tenants list requested with `is_full: false`: only what the tenant
- * switcher and tenant lookups need. A tenant's full record comes from the
- * active-tenant fetch.
- */
-export interface TenantSummariesData {
-    tenants: TenantSummaryPayload[];
-}
-export interface TenantSummaryPayload {
-    company_id: ID;
-    company_name: string;
-    tenant_email_domain: string;
-    tenant_id: ID;
-    user_last_check_in_time_into_tenant: string | null;
-}
 export interface TenantsData {
     tenants: TenantPayload[];
     user: TenantUserPayload;
@@ -213,4 +197,4 @@ type SaveConnectionResponse = ZeniAPIResponse<ConnectionDataPayload>;
 type SubscriptionSummaryForTenantResponse = ZeniAPIResponse<SubscriptionSummaryPayload>;
 type OnboardingTenantResponse = ZeniAPIResponse<TenantPayload>;
 /** Lets export interfaces and types */
-export { TenantSummariesResponse, TenantsResponse, TenantPayload, LoggedInUserPayload, UserData, SignInResponse, SignOutResponse, RoleResourcePayload, RoleResourcesResponse, ConnectionsPayload, ConnectionWithMetaPayload, ConnectionsResponse, SaveConnectionResponse, SubscriptionSummaryForTenantResponse, OnboardingTenantResponse, MagicLinkSignInResponse, sendEmailMagicLinkToUserResponse, VerifyDeviceWithTwoFAResponse, };
+export { TenantsResponse, TenantPayload, LoggedInUserPayload, UserData, SignInResponse, SignOutResponse, RoleResourcePayload, RoleResourcesResponse, ConnectionsPayload, ConnectionWithMetaPayload, ConnectionsResponse, SaveConnectionResponse, SubscriptionSummaryForTenantResponse, OnboardingTenantResponse, MagicLinkSignInResponse, sendEmailMagicLinkToUserResponse, VerifyDeviceWithTwoFAResponse, };

package/lib/entity/tenant/tenantReducer.d.ts

@@ -3,7 +3,7 @@ import { ZeniAPIStatus } from '../../responsePayload';
 import ZeniUrl from '../../zeniUrl';
 import { SubscriptionSummaryPayload } from '../subscription/subscriptionSummary/subscriptionSummaryPayload';
 import { UserRolePayload } from '../userRole/userRolePayload';
-import { CapitalizableAccountsPayload, ConnectionDataPayload, ConnectionWithMetaPayload, ConnectionsPayload, LoggedInUserPayload, RoleResourcePayload, TenantPayload, TenantSummaryPayload, TenantUserPayload, TenantsData } from './tenantPayload';
+import { CapitalizableAccountsPayload, ConnectionDataPayload, ConnectionWithMetaPayload, ConnectionsPayload, LoggedInUserPayload, RoleResourcePayload, TenantPayload, TenantUserPayload, TenantsData } from './tenantPayload';
 import { CapitalizableAccounts, Connection, RoleResource, TenantState } from './tenantState';
 import { AuthProvider } from './tenantTypes';
 export interface DoSignInPayload {
@@ -40,7 +40,7 @@ export declare const updateTenants: import("@reduxjs/toolkit").ActionCreatorWith
 }, "tenant/updateTenants", never, never>, fetchAllTenants: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[userId: string, zeniSessionId?: string | undefined], {
     userId: string;
     zeniSessionId: string | undefined;
-}, "tenant/fetchAllTenants", never, never>, updateTenantSummariesSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<TenantSummaryPayload[], "tenant/updateTenantSummariesSuccess">, updateTenantsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "tenant/updateTenantsFailure">, fetchActiveTenant: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[userId: string, tenantId: string, zeniSessionId?: string | undefined], {
+}, "tenant/fetchAllTenants", never, never>, updateTenantsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<TenantsData, "tenant/updateTenantsSuccess">, updateTenantsFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "tenant/updateTenantsFailure">, fetchActiveTenant: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[userId: string, tenantId: string, zeniSessionId?: string | undefined], {
     userId: string;
     tenantId: string;
     zeniSessionId: string | undefined;

package/lib/entity/tenant/tenantReducer.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateSubscriptionSummaryForTenantSuccess = exports.fetchSubscriptionSummaryForTenant = exports.deleteConnectionFailure = exports.deleteConnectionSuccess = exports.deleteConnection = exports.initEmailConnectOAuthFailure = exports.initEmailConnectOAuthSuccess = exports.initEmailConnectOAuth = exports.saveConnectorCredentialsFailure = exports.saveConnectorCredentialsSuccess = exports.saveConnectorCredentials = exports.saveOAuthConnectionFailure = exports.saveOAuthConnectionSuccess = exports.saveOAuthConnection = exports.saveAPIKeyConnectionFailure = exports.saveAPIKeyConnectionSuccess = exports.saveAPIKeyConnection = exports.fetchExternalConnectionsSuccess = exports.fetchExternalConnectionsFailure = exports.saveExternalConnectionFailure = exports.saveExternalConnectionSuccess = exports.saveExternalConnection = exports.fetchExternalConnections = exports.updateLoggedInUser = exports.sessionHeartbeatFailure = exports.sessionHeartbeatSuccess = exports.sendSessionHeartbeat = exports.signOutSuccess = exports.doSignOut = exports.updateSignInState = exports.sendEmailMagicLinkToUserFailure = exports.sendEmailMagicLinkToUserSuccess = exports.sendEmailMagicLinkToUser = exports.magicLinkSignInFailure = exports.magicLinkSignInSuccess = exports.doMagicLinkSignIn = exports.doSignIn = exports.updateExcludedResourcesFailure = exports.updateExcludedResourcesSuccess = exports.fetchExcludedResources = exports.updateCurrentTenant = exports.updateTenantFailure = exports.updateTenantSuccess = exports.fetchActiveTenant = exports.updateTenantsFailure = exports.updateTenantSummariesSuccess = exports.fetchAllTenants = exports.updateTenants = exports.initialState = exports.toExternalIntegrationType = void 0;
+exports.updateSubscriptionSummaryForTenantSuccess = exports.fetchSubscriptionSummaryForTenant = exports.deleteConnectionFailure = exports.deleteConnectionSuccess = exports.deleteConnection = exports.initEmailConnectOAuthFailure = exports.initEmailConnectOAuthSuccess = exports.initEmailConnectOAuth = exports.saveConnectorCredentialsFailure = exports.saveConnectorCredentialsSuccess = exports.saveConnectorCredentials = exports.saveOAuthConnectionFailure = exports.saveOAuthConnectionSuccess = exports.saveOAuthConnection = exports.saveAPIKeyConnectionFailure = exports.saveAPIKeyConnectionSuccess = exports.saveAPIKeyConnection = exports.fetchExternalConnectionsSuccess = exports.fetchExternalConnectionsFailure = exports.saveExternalConnectionFailure = exports.saveExternalConnectionSuccess = exports.saveExternalConnection = exports.fetchExternalConnections = exports.updateLoggedInUser = exports.sessionHeartbeatFailure = exports.sessionHeartbeatSuccess = exports.sendSessionHeartbeat = exports.signOutSuccess = exports.doSignOut = exports.updateSignInState = exports.sendEmailMagicLinkToUserFailure = exports.sendEmailMagicLinkToUserSuccess = exports.sendEmailMagicLinkToUser = exports.magicLinkSignInFailure = exports.magicLinkSignInSuccess = exports.doMagicLinkSignIn = exports.doSignIn = exports.updateExcludedResourcesFailure = exports.updateExcludedResourcesSuccess = exports.fetchExcludedResources = exports.updateCurrentTenant = exports.updateTenantFailure = exports.updateTenantSuccess = exports.fetchActiveTenant = exports.updateTenantsFailure = exports.updateTenantsSuccess = exports.fetchAllTenants = exports.updateTenants = exports.initialState = exports.toExternalIntegrationType = void 0;
 exports.toConnection = exports.toRoleResource = exports.resendVerifyDeviceOTPFailure = exports.resendVerifyDeviceOTPSuccess = exports.resendVerifyDeviceOTP = exports.updateTreasuryPromoIntroClosedByOutsideClickForLoggedInUser = exports.updateTreasuryPromoRemindMeLaterClickedForLoggedInUser = exports.updateTreasuryVideoViewedForLoggedInUser = exports.verifyDeviceWithTwoFAFailure = exports.verifyDeviceWithTwoFASuccess = exports.verifyDeviceWithTwoFA = exports.updateTenantMasterTOSInfo = exports.updateTenantCapitalizationAccountOverride = exports.updateTenantCapitalizationOnboardingDismissed = exports.updateTenantProductSettings = exports.updateTenantAutoReviewIncomeWithoutCustomer = exports.updateTenantAccountingProjectsEnabled = exports.updateTenantAccountingClassesEnabled = exports.trigger2FA = exports.resetSignInState = exports.updateReferViewedForLoggedInUser = exports.updateTenantReimbursementInfo = exports.removeOnboardingTenant = exports.updateOnboardingTenants = exports.updateSubscriptionSummaryForTenantFailure = void 0;
 exports.mapCapitalizableAccountsPayload = mapCapitalizableAccountsPayload;
 exports.mapConnectionsPayloadToState = mapConnectionsPayloadToState;
@@ -28,7 +28,6 @@ exports.initialState = {
     error: undefined,
     accountLocked: false,
     tenantsById: {},
-    tenantSummariesById: {},
     onboardingTenantsById: {},
     tenantIds: [],
     signInState: 'Not-Started',
@@ -119,24 +118,26 @@ const tenant = (0, toolkit_1.createSlice)({
                 });
             },
         },
-        updateTenantSummariesSuccess(draft, action) {
+        updateTenantsSuccess(draft, action) {
+            const { tenants, user } = action.payload;
             draft.fetchState = 'Completed';
             draft.error = undefined;
-            const tenantSummariesById = {};
-            action.payload.forEach((payload) => {
-                tenantSummariesById[payload.tenant_id] =
-                    mapTenantSummaryPayloadToTenantSummary(payload);
-            });
-            draft.tenantSummariesById = tenantSummariesById;
-            draft.tenantIds = Object.keys(tenantSummariesById);
-            // A tenant missing from the list is no longer accessible to the user.
-            const accessibleTenantsById = {};
-            Object.values(draft.tenantsById).forEach((tenant) => {
-                if (tenantSummariesById[tenant.tenantId] != null) {
-                    accessibleTenantsById[tenant.tenantId] = tenant;
+            const [tenantsbyId, tenantIds, firstUser] = mapTenantsPayloadToState(tenants, user);
+            tenantIds.forEach((tenantId) => {
+                const existingTenant = draft.tenantsById[tenantId];
+                tenantsbyId[tenantId] = applyTreasuryPromoUserFieldsFromPayload(existingTenant, tenantsbyId[tenantId], user);
+                if (existingTenant != null) {
+                    tenantsbyId[tenantId].capitalizableAccountOverrides =
+                        tenantsbyId[tenantId].capitalizableAccountOverrides ??
+                            existingTenant.capitalizableAccountOverrides;
+                    tenantsbyId[tenantId].capitalizationOnboardingDismissedAccounts =
+                        tenantsbyId[tenantId].capitalizationOnboardingDismissedAccounts ??
+                            existingTenant.capitalizationOnboardingDismissedAccounts;
                 }
             });
-            draft.tenantsById = accessibleTenantsById;
+            draft.tenantsById = tenantsbyId;
+            draft.tenantIds = tenantIds;
+            draft.loggedInUser = (0, assignWith_1.default)(draft.loggedInUser ?? {}, firstUser, (objValue, srcValue) => srcValue ?? objValue);
         },
         updateTenantsFailure(draft, action) {
             draft.fetchState = 'Error';
@@ -144,7 +145,6 @@ const tenant = (0, toolkit_1.createSlice)({
             draft.error = action.payload;
             draft.tenantIds = [];
             draft.tenantsById = {};
-            draft.tenantSummariesById = {};
         },
         updateTenantSuccess(draft, action) {
             const { tenants, user } = action.payload;
@@ -253,7 +253,6 @@ const tenant = (0, toolkit_1.createSlice)({
             draft.signInState = 'Error';
             draft.tenantIds = [];
             draft.tenantsById = {};
-            draft.tenantSummariesById = {};
         },
         updateTenantReimbursementInfo(draft, action) {
             const { tenant_id, reimbursement_info } = action.payload;
@@ -946,7 +945,7 @@ const tenant = (0, toolkit_1.createSlice)({
         });
     },
 });
-_a = tenant.actions, exports.updateTenants = _a.updateTenants, exports.fetchAllTenants = _a.fetchAllTenants, exports.updateTenantSummariesSuccess = _a.updateTenantSummariesSuccess, exports.updateTenantsFailure = _a.updateTenantsFailure, exports.fetchActiveTenant = _a.fetchActiveTenant, exports.updateTenantSuccess = _a.updateTenantSuccess, exports.updateTenantFailure = _a.updateTenantFailure, exports.updateCurrentTenant = _a.updateCurrentTenant, exports.fetchExcludedResources = _a.fetchExcludedResources, exports.updateExcludedResourcesSuccess = _a.updateExcludedResourcesSuccess, exports.updateExcludedResourcesFailure = _a.updateExcludedResourcesFailure, exports.doSignIn = _a.doSignIn, exports.doMagicLinkSignIn = _a.doMagicLinkSignIn, exports.magicLinkSignInSuccess = _a.magicLinkSignInSuccess, exports.magicLinkSignInFailure = _a.magicLinkSignInFailure, exports.sendEmailMagicLinkToUser = _a.sendEmailMagicLinkToUser, exports.sendEmailMagicLinkToUserSuccess = _a.sendEmailMagicLinkToUserSuccess, exports.sendEmailMagicLinkToUserFailure = _a.sendEmailMagicLinkToUserFailure, exports.updateSignInState = _a.updateSignInState, exports.doSignOut = _a.doSignOut, exports.signOutSuccess = _a.signOutSuccess, exports.sendSessionHeartbeat = _a.sendSessionHeartbeat, exports.sessionHeartbeatSuccess = _a.sessionHeartbeatSuccess, exports.sessionHeartbeatFailure = _a.sessionHeartbeatFailure, exports.updateLoggedInUser = _a.updateLoggedInUser, exports.fetchExternalConnections = _a.fetchExternalConnections, exports.saveExternalConnection = _a.saveExternalConnection, exports.saveExternalConnectionSuccess = _a.saveExternalConnectionSuccess, exports.saveExternalConnectionFailure = _a.saveExternalConnectionFailure, exports.fetchExternalConnectionsFailure = _a.fetchExternalConnectionsFailure, exports.fetchExternalConnectionsSuccess = _a.fetchExternalConnectionsSuccess, exports.saveAPIKeyConnection = _a.saveAPIKeyConnection, exports.saveAPIKeyConnectionSuccess = _a.saveAPIKeyConnectionSuccess, exports.saveAPIKeyConnectionFailure = _a.saveAPIKeyConnectionFailure, exports.saveOAuthConnection = _a.saveOAuthConnection, exports.saveOAuthConnectionSuccess = _a.saveOAuthConnectionSuccess, exports.saveOAuthConnectionFailure = _a.saveOAuthConnectionFailure, exports.saveConnectorCredentials = _a.saveConnectorCredentials, exports.saveConnectorCredentialsSuccess = _a.saveConnectorCredentialsSuccess, exports.saveConnectorCredentialsFailure = _a.saveConnectorCredentialsFailure, exports.initEmailConnectOAuth = _a.initEmailConnectOAuth, exports.initEmailConnectOAuthSuccess = _a.initEmailConnectOAuthSuccess, exports.initEmailConnectOAuthFailure = _a.initEmailConnectOAuthFailure, exports.deleteConnection = _a.deleteConnection, exports.deleteConnectionSuccess = _a.deleteConnectionSuccess, exports.deleteConnectionFailure = _a.deleteConnectionFailure, exports.fetchSubscriptionSummaryForTenant = _a.fetchSubscriptionSummaryForTenant, exports.updateSubscriptionSummaryForTenantSuccess = _a.updateSubscriptionSummaryForTenantSuccess, exports.updateSubscriptionSummaryForTenantFailure = _a.updateSubscriptionSummaryForTenantFailure, exports.updateOnboardingTenants = _a.updateOnboardingTenants, exports.removeOnboardingTenant = _a.removeOnboardingTenant, exports.updateTenantReimbursementInfo = _a.updateTenantReimbursementInfo, exports.updateReferViewedForLoggedInUser = _a.updateReferViewedForLoggedInUser, exports.resetSignInState = _a.resetSignInState, exports.trigger2FA = _a.trigger2FA, exports.updateTenantAccountingClassesEnabled = _a.updateTenantAccountingClassesEnabled, exports.updateTenantAccountingProjectsEnabled = _a.updateTenantAccountingProjectsEnabled, exports.updateTenantAutoReviewIncomeWithoutCustomer = _a.updateTenantAutoReviewIncomeWithoutCustomer, exports.updateTenantProductSettings = _a.updateTenantProductSettings, exports.updateTenantCapitalizationOnboardingDismissed = _a.updateTenantCapitalizationOnboardingDismissed, exports.updateTenantCapitalizationAccountOverride = _a.updateTenantCapitalizationAccountOverride, exports.updateTenantMasterTOSInfo = _a.updateTenantMasterTOSInfo, exports.verifyDeviceWithTwoFA = _a.verifyDeviceWithTwoFA, exports.verifyDeviceWithTwoFASuccess = _a.verifyDeviceWithTwoFASuccess, exports.verifyDeviceWithTwoFAFailure = _a.verifyDeviceWithTwoFAFailure, exports.updateTreasuryVideoViewedForLoggedInUser = _a.updateTreasuryVideoViewedForLoggedInUser, exports.updateTreasuryPromoRemindMeLaterClickedForLoggedInUser = _a.updateTreasuryPromoRemindMeLaterClickedForLoggedInUser, exports.updateTreasuryPromoIntroClosedByOutsideClickForLoggedInUser = _a.updateTreasuryPromoIntroClosedByOutsideClickForLoggedInUser, exports.resendVerifyDeviceOTP = _a.resendVerifyDeviceOTP, exports.resendVerifyDeviceOTPSuccess = _a.resendVerifyDeviceOTPSuccess, exports.resendVerifyDeviceOTPFailure = _a.resendVerifyDeviceOTPFailure;
+_a = tenant.actions, exports.updateTenants = _a.updateTenants, exports.fetchAllTenants = _a.fetchAllTenants, exports.updateTenantsSuccess = _a.updateTenantsSuccess, exports.updateTenantsFailure = _a.updateTenantsFailure, exports.fetchActiveTenant = _a.fetchActiveTenant, exports.updateTenantSuccess = _a.updateTenantSuccess, exports.updateTenantFailure = _a.updateTenantFailure, exports.updateCurrentTenant = _a.updateCurrentTenant, exports.fetchExcludedResources = _a.fetchExcludedResources, exports.updateExcludedResourcesSuccess = _a.updateExcludedResourcesSuccess, exports.updateExcludedResourcesFailure = _a.updateExcludedResourcesFailure, exports.doSignIn = _a.doSignIn, exports.doMagicLinkSignIn = _a.doMagicLinkSignIn, exports.magicLinkSignInSuccess = _a.magicLinkSignInSuccess, exports.magicLinkSignInFailure = _a.magicLinkSignInFailure, exports.sendEmailMagicLinkToUser = _a.sendEmailMagicLinkToUser, exports.sendEmailMagicLinkToUserSuccess = _a.sendEmailMagicLinkToUserSuccess, exports.sendEmailMagicLinkToUserFailure = _a.sendEmailMagicLinkToUserFailure, exports.updateSignInState = _a.updateSignInState, exports.doSignOut = _a.doSignOut, exports.signOutSuccess = _a.signOutSuccess, exports.sendSessionHeartbeat = _a.sendSessionHeartbeat, exports.sessionHeartbeatSuccess = _a.sessionHeartbeatSuccess, exports.sessionHeartbeatFailure = _a.sessionHeartbeatFailure, exports.updateLoggedInUser = _a.updateLoggedInUser, exports.fetchExternalConnections = _a.fetchExternalConnections, exports.saveExternalConnection = _a.saveExternalConnection, exports.saveExternalConnectionSuccess = _a.saveExternalConnectionSuccess, exports.saveExternalConnectionFailure = _a.saveExternalConnectionFailure, exports.fetchExternalConnectionsFailure = _a.fetchExternalConnectionsFailure, exports.fetchExternalConnectionsSuccess = _a.fetchExternalConnectionsSuccess, exports.saveAPIKeyConnection = _a.saveAPIKeyConnection, exports.saveAPIKeyConnectionSuccess = _a.saveAPIKeyConnectionSuccess, exports.saveAPIKeyConnectionFailure = _a.saveAPIKeyConnectionFailure, exports.saveOAuthConnection = _a.saveOAuthConnection, exports.saveOAuthConnectionSuccess = _a.saveOAuthConnectionSuccess, exports.saveOAuthConnectionFailure = _a.saveOAuthConnectionFailure, exports.saveConnectorCredentials = _a.saveConnectorCredentials, exports.saveConnectorCredentialsSuccess = _a.saveConnectorCredentialsSuccess, exports.saveConnectorCredentialsFailure = _a.saveConnectorCredentialsFailure, exports.initEmailConnectOAuth = _a.initEmailConnectOAuth, exports.initEmailConnectOAuthSuccess = _a.initEmailConnectOAuthSuccess, exports.initEmailConnectOAuthFailure = _a.initEmailConnectOAuthFailure, exports.deleteConnection = _a.deleteConnection, exports.deleteConnectionSuccess = _a.deleteConnectionSuccess, exports.deleteConnectionFailure = _a.deleteConnectionFailure, exports.fetchSubscriptionSummaryForTenant = _a.fetchSubscriptionSummaryForTenant, exports.updateSubscriptionSummaryForTenantSuccess = _a.updateSubscriptionSummaryForTenantSuccess, exports.updateSubscriptionSummaryForTenantFailure = _a.updateSubscriptionSummaryForTenantFailure, exports.updateOnboardingTenants = _a.updateOnboardingTenants, exports.removeOnboardingTenant = _a.removeOnboardingTenant, exports.updateTenantReimbursementInfo = _a.updateTenantReimbursementInfo, exports.updateReferViewedForLoggedInUser = _a.updateReferViewedForLoggedInUser, exports.resetSignInState = _a.resetSignInState, exports.trigger2FA = _a.trigger2FA, exports.updateTenantAccountingClassesEnabled = _a.updateTenantAccountingClassesEnabled, exports.updateTenantAccountingProjectsEnabled = _a.updateTenantAccountingProjectsEnabled, exports.updateTenantAutoReviewIncomeWithoutCustomer = _a.updateTenantAutoReviewIncomeWithoutCustomer, exports.updateTenantProductSettings = _a.updateTenantProductSettings, exports.updateTenantCapitalizationOnboardingDismissed = _a.updateTenantCapitalizationOnboardingDismissed, exports.updateTenantCapitalizationAccountOverride = _a.updateTenantCapitalizationAccountOverride, exports.updateTenantMasterTOSInfo = _a.updateTenantMasterTOSInfo, exports.verifyDeviceWithTwoFA = _a.verifyDeviceWithTwoFA, exports.verifyDeviceWithTwoFASuccess = _a.verifyDeviceWithTwoFASuccess, exports.verifyDeviceWithTwoFAFailure = _a.verifyDeviceWithTwoFAFailure, exports.updateTreasuryVideoViewedForLoggedInUser = _a.updateTreasuryVideoViewedForLoggedInUser, exports.updateTreasuryPromoRemindMeLaterClickedForLoggedInUser = _a.updateTreasuryPromoRemindMeLaterClickedForLoggedInUser, exports.updateTreasuryPromoIntroClosedByOutsideClickForLoggedInUser = _a.updateTreasuryPromoIntroClosedByOutsideClickForLoggedInUser, exports.resendVerifyDeviceOTP = _a.resendVerifyDeviceOTP, exports.resendVerifyDeviceOTPSuccess = _a.resendVerifyDeviceOTPSuccess, exports.resendVerifyDeviceOTPFailure = _a.resendVerifyDeviceOTPFailure;
 exports.default = tenant.reducer;
 /**
  * Applies treasury promo user fields from the tenants API user block when present.
@@ -988,16 +987,6 @@ function mapTenantsPayloadToState(tenantsPayload, userTenantPayload) {
     const firstUser = mapTenantPayloadToUser(tenantsPayload[0]);
     return [tenantsById, tenantIds, firstUser];
 }
-function mapTenantSummaryPayloadToTenantSummary(payload) {
-    return {
-        companyId: payload.company_id,
-        companyName: payload.company_name,
-        tenantEmailDomain: payload.tenant_email_domain,
-        tenantId: payload.tenant_id,
-        // A tenant never opened sorts last, as in `mapTenantPayloadToTenant`.
-        userLastCheckInTime: (0, zeniDayJS_1.date)(payload.user_last_check_in_time_into_tenant ?? '1970-01-01'),
-    };
-}
 function mapTenantPayloadToTenant(payload, userTenantPayload) {
     const tenant = {
         accountingClassIDs: payload.accounting_class_ids,

package/lib/entity/tenant/tenantSelector.d.ts

@@ -22,14 +22,11 @@ export interface TenantBaseView extends TenantCoreDetailsView {
 }
 export declare function getTenant(tenantState: TenantState, companyState: CompanyState, tenantId: ID): TenantView | undefined;
 export declare function getTenantIdByCompanyId(tenantState: TenantState, companyId: ID): ID | undefined;
-/** Whether the tenant's full record is loaded, not just its list entry. */
-export declare const isTenantLoaded: (state: RootState, tenantId: ID) => boolean;
-/**
- * Whether the selected tenant's full record is loaded. Screens that act on
- * roles or product settings wait for this rather than for either tenant fetch
- * to complete: the tenants list alone carries neither.
- */
-export declare const isCurrentTenantLoaded: (state: RootState) => boolean;
+declare function getTenantsByCheckInDate(tenantState: TenantState, companyState: CompanyState): {
+    order: "descending_last_check_in";
+    tenantsInOrder: TenantView[];
+};
+export type TenantsOrdered = ReturnType<typeof getTenantsByCheckInDate>;
 export declare const getTenantBaseViewForTenantId: (state: RootState, tenantId: ID) => TenantBaseView | undefined;
 export type TenantsBaseOrdered = {
     order: 'descending_last_check_in';
@@ -77,12 +74,7 @@ declare const getCurrentTenantHelper: (tenantState: TenantState, companyState: C
 };
 export type CurrentTenant = ReturnType<typeof getCurrentTenantHelper>;
 export declare const getCurrentTenant: (state: RootState) => CurrentTenant;
-/**
- * The selected tenant's id as soon as it is chosen. Unlike `getCurrentTenant`,
- * it is set before the tenant fetch lands (boot reads it from the cached
- * tenant list).
- */
-export declare const getCurrentTenantId: (state: RootState) => ID | undefined;
+export declare const getTenantsByCheckInDateSelector: (state: RootState) => TenantsOrdered;
 export declare function getOnboardingTenantByTenantId(tenantState: TenantState, tenantId: ID): Tenant | undefined;
 export declare const getTenantBaseById: (state: RootState) => TenantBaseView[];
 export declare const getTenantsBaseByCheckInDateSelector: (state: RootState) => TenantsBaseOrdered;

package/lib/entity/tenant/tenantSelector.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_RECEIPTS_EMAIL = exports.isTenantTreasuryEnabled = exports.isOtherProductsEnabledForTenant = exports.isTenantBookkeepingEnabled = exports.getIsAutoReviewIncomeWithoutCustomerEnabled = exports.getIsAccountingProjectsEnabled = exports.getIsAccountingClassesEnabled = exports.isTenantAccountingServicesEnabled = exports.isTenantCardsOnly = exports.isTenantBankingOnly = exports.toTenantCoreDetailsView = exports.getCurrentTenantExternalConnections = exports.isTenantUsingZeniCOA = exports.isZeniDomainTenant = exports.getTenantBaseViewForTenantView = exports.getTenantsCoreDetailsByCheckInDateSelector = exports.getTenantsBaseByCheckInDateSelector = exports.getTenantBaseById = exports.getCurrentTenantId = exports.getCurrentTenant = exports.getTenantBaseViewForTenantId = exports.isCurrentTenantLoaded = exports.isTenantLoaded = void 0;
+exports.DEFAULT_RECEIPTS_EMAIL = exports.isTenantTreasuryEnabled = exports.isOtherProductsEnabledForTenant = exports.isTenantBookkeepingEnabled = exports.getIsAutoReviewIncomeWithoutCustomerEnabled = exports.getIsAccountingProjectsEnabled = exports.getIsAccountingClassesEnabled = exports.isTenantAccountingServicesEnabled = exports.isTenantCardsOnly = exports.isTenantBankingOnly = exports.toTenantCoreDetailsView = exports.getCurrentTenantExternalConnections = exports.isTenantUsingZeniCOA = exports.isZeniDomainTenant = exports.getTenantBaseViewForTenantView = exports.getTenantsCoreDetailsByCheckInDateSelector = exports.getTenantsBaseByCheckInDateSelector = exports.getTenantBaseById = exports.getTenantsByCheckInDateSelector = exports.getCurrentTenant = exports.getTenantBaseViewForTenantId = void 0;
 exports.getTenant = getTenant;
 exports.getTenantIdByCompanyId = getTenantIdByCompanyId;
 exports.getOnboardingTenantByTenantId = getOnboardingTenantByTenantId;
@@ -26,77 +26,50 @@ function getTenant(tenantState, companyState, tenantId) {
     }
 }
 function getTenantIdByCompanyId(tenantState, companyId) {
-    return (Object.values(tenantState.tenantsById).find((tenant) => tenant.companyId === companyId) ??
-        Object.values(tenantState.tenantSummariesById).find((tenantSummary) => tenantSummary.companyId === companyId))?.tenantId;
+    return Object.values(tenantState.tenantsById).find((tenant) => tenant.companyId === companyId)?.tenantId;
 }
-/**
- * Every tenant in the list, most recently opened first. Roles are known only
- * for tenants whose full record is loaded; the list itself carries none.
- */
-function getTenantListEntriesByCheckInDate(tenantState) {
-    const entries = tenantState.tenantIds
-        .map((tenantId) => {
-        const tenant = tenantState.tenantsById[tenantId];
-        const tenantSummary = tenantState.tenantSummariesById[tenantId];
-        if (tenant != null) {
-            return {
-                companyId: tenant.companyId,
-                companyName: tenant.companyName,
-                tenantEmailDomain: tenant.tenantEmailDomain,
-                tenantId: tenant.tenantId,
-                userLastCheckInTime: tenant.userLastCheckInTime,
-                userRole: tenant.userRole,
-            };
-        }
-        return tenantSummary != null
-            ? { ...tenantSummary, userRole: [] }
-            : undefined;
-    })
-        .filter((entry) => entry != null);
-    return (0, orderBy_1.default)(entries, (entry) => entry.userLastCheckInTime.valueOf(), 'desc');
-}
-/**
- * The selected tenant's full record. With no tenant selected, or one the user
- * can no longer open, it is the most recently opened loaded tenant. A selected
- * tenant that is in the list but not loaded yet reads as no tenant until its
- * fetch lands, so nothing renders another tenant's record in its place.
- */
-function getCurrentTenantView(tenantState, companyState) {
-    const { currentTenantId } = tenantState;
-    if (currentTenantId != null) {
-        const tenant = getTenant(tenantState, companyState, currentTenantId);
-        if (tenant != null ||
-            tenantState.tenantSummariesById[currentTenantId] != null) {
-            return tenant;
-        }
-    }
-    const mostRecentLoadedTenant = getTenantListEntriesByCheckInDate(tenantState).find((entry) => tenantState.tenantsById[entry.tenantId] != null);
-    return mostRecentLoadedTenant != null
-        ? getTenant(tenantState, companyState, mostRecentLoadedTenant.tenantId)
-        : undefined;
+function getTenantsByCheckInDate(tenantState, companyState) {
+    const tenants = tenantState.tenantIds
+        .map((tenantId) => getTenant(tenantState, companyState, tenantId))
+        .filter((value) => value != null);
+    const tenantsOrdered = (0, orderBy_1.default)(tenants, (value) => value.userLastCheckInTime.valueOf(), 'desc');
+    return {
+        order: 'descending_last_check_in',
+        tenantsInOrder: tenantsOrdered,
+    };
 }
-/** Whether the tenant's full record is loaded, not just its list entry. */
-const isTenantLoaded = (state, tenantId) => state.tenantState.tenantsById[tenantId] != null;
-exports.isTenantLoaded = isTenantLoaded;
-/**
- * Whether the selected tenant's full record is loaded. Screens that act on
- * roles or product settings wait for this rather than for either tenant fetch
- * to complete: the tenants list alone carries neither.
- */
-const isCurrentTenantLoaded = (state) => {
-    const { currentTenantId } = state.tenantState;
-    return currentTenantId != null && (0, exports.isTenantLoaded)(state, currentTenantId);
-};
-exports.isCurrentTenantLoaded = isCurrentTenantLoaded;
 exports.getTenantBaseViewForTenantId = (0, toolkit_1.createSelector)((state) => state.tenantState, (state) => state.companyState, (_state, tenantId) => tenantId, (tenantState, companyState, tenantId) => {
-    const entry = getTenantListEntriesByCheckInDate(tenantState).find((listEntry) => listEntry.tenantId === tenantId);
-    return entry != null
-        ? getTenantBaseViewForEntry(entry, companyState)
-        : undefined;
+    const tenant = tenantState.tenantsById[tenantId];
+    if (tenant != null) {
+        const companyId = tenant.companyId;
+        const companyName = companyState.companiesById[companyId]?.companyInfo.name;
+        const tenantName = tenant.companyName ?? companyName;
+        const tenantEmailDomain = tenant.tenantEmailDomain;
+        const userRole = tenant.userRole;
+        const companyLocaleInfo = companyState.companiesById[companyId]?.companyLocaleInfo;
+        return {
+            tenantId,
+            tenantName,
+            tenantEmailDomain,
+            companyId,
+            companyName,
+            userRole,
+            companyLocaleInfo,
+        };
+    }
+    return undefined;
 });
 const getCurrentTenantHelper = (tenantState, companyState) => {
-    const { currentTenantId, excludedResourcesByTenant, subscriptionSummaryByTenant, } = tenantState;
-    const tenant = getCurrentTenantView(tenantState, companyState);
+    const { tenantIds, currentTenantId, excludedResourcesByTenant, subscriptionSummaryByTenant, } = tenantState;
+    let tenant = undefined;
+    if (currentTenantId != null) {
+        tenant = getTenant(tenantState, companyState, currentTenantId);
+    }
+    if (tenant == null && tenantIds.length > 0) {
+        const tenants = getTenantsByCheckInDate(tenantState, companyState);
+        tenant =
+            tenants.tenantsInOrder.length > 0 ? tenants.tenantsInOrder[0] : undefined;
+    }
     let excludedResources = undefined;
     if (tenant != null) {
         excludedResources = excludedResourcesByTenant[tenant.tenantId];
@@ -157,13 +130,9 @@ const getCurrentTenantHelper = (tenantState, companyState) => {
 exports.getCurrentTenant = (0, toolkit_1.createSelector)((state) => state.tenantState, (state) => state.companyState, (tenantState, companyState) => {
     return getCurrentTenantHelper(tenantState, companyState);
 });
-/**
- * The selected tenant's id as soon as it is chosen. Unlike `getCurrentTenant`,
- * it is set before the tenant fetch lands (boot reads it from the cached
- * tenant list).
- */
-const getCurrentTenantId = (state) => state.tenantState.currentTenantId;
-exports.getCurrentTenantId = getCurrentTenantId;
+exports.getTenantsByCheckInDateSelector = (0, toolkit_1.createSelector)((state) => state.tenantState, (state) => state.companyState, (tenantState, companyState) => {
+    return getTenantsByCheckInDate(tenantState, companyState);
+});
 function getOnboardingTenantByTenantId(tenantState, tenantId) {
     const tenant = tenantState.onboardingTenantsById[tenantId];
     if (tenant != null) {
@@ -174,7 +143,10 @@ function getOnboardingTenantByTenantId(tenantState, tenantId) {
     }
 }
 exports.getTenantBaseById = (0, toolkit_1.createSelector)((state) => state.tenantState, (state) => state.companyState, (tenantState, companyState) => {
-    return getTenantListEntriesByCheckInDate(tenantState).map((entry) => getTenantBaseViewForEntry(entry, companyState));
+    return tenantState.tenantIds.map((tenantId) => {
+        const tenant = tenantState.tenantsById[tenantId];
+        return getTenantBaseViewForTenant(tenant, companyState);
+    });
 });
 exports.getTenantsBaseByCheckInDateSelector = (0, toolkit_1.createSelector)((state) => state.tenantState, (state) => state.companyState, (tenantState, companyState) => {
     return getTenantsBaseByCheckInDate(tenantState, companyState);
@@ -206,8 +178,16 @@ const isTenantUsingZeniCOA = (currentTenant) => {
 };
 exports.isTenantUsingZeniCOA = isTenantUsingZeniCOA;
 const getCurrentTenantExternalConnections = (tenantState, companyState) => {
-    const { externalConnectionsByTenant, currentTenantId } = tenantState;
-    const tenant = getCurrentTenantView(tenantState, companyState);
+    const { externalConnectionsByTenant, tenantIds, currentTenantId } = tenantState;
+    let tenant = undefined;
+    if (currentTenantId != null) {
+        tenant = getTenant(tenantState, companyState, currentTenantId);
+    }
+    if (tenant == null && tenantIds.length > 0) {
+        const tenants = getTenantsByCheckInDate(tenantState, companyState);
+        tenant =
+            tenants.tenantsInOrder.length > 0 ? tenants.tenantsInOrder[0] : undefined;
+    }
     let externalConnections = undefined;
     if (tenant != null) {
         externalConnections = externalConnectionsByTenant[tenant.tenantId];
@@ -222,39 +202,58 @@ exports.getCurrentTenantExternalConnections = getCurrentTenantExternalConnection
  * Helpers
  */
 function getTenantsBaseByCheckInDate(tenantState, companyState) {
+    const tenants = tenantState.tenantIds
+        .map((tenantId) => getTenant(tenantState, companyState, tenantId))
+        .filter((value) => value != null);
+    const tenantsOrdered = (0, orderBy_1.default)(tenants, (value) => value.userLastCheckInTime.valueOf(), 'desc');
+    const tenantsBaseOrdered = tenantsOrdered.map((tenant) => getTenantBaseViewForTenant(tenant, companyState));
     return {
         order: 'descending_last_check_in',
-        tenantsBaseInOrder: getTenantListEntriesByCheckInDate(tenantState).map((entry) => getTenantBaseViewForEntry(entry, companyState)),
+        tenantsBaseInOrder: tenantsBaseOrdered,
     };
 }
-const getTenantBaseViewForEntry = (entry, companyState) => {
-    const company = companyState.companiesById[entry.companyId];
+const getTenantBaseViewForTenant = (tenant, companyState) => {
+    const tenantId = tenant.tenantId;
+    const companyId = tenant.companyId;
+    const companyName = companyState.companiesById[companyId]?.companyInfo.name;
+    const tenantName = tenant.companyName ?? companyName ?? tenant.tenantEmailDomain ?? '';
+    const tenantEmailDomain = tenant.tenantEmailDomain;
+    const userRole = tenant.userRole;
+    const companyLocaleInfo = companyState.companiesById[companyId]?.companyLocaleInfo;
     return {
-        tenantId: entry.tenantId,
-        tenantName: entry.companyName ??
-            company?.companyInfo.name ??
-            entry.tenantEmailDomain ??
-            '',
-        tenantEmailDomain: entry.tenantEmailDomain,
-        companyId: entry.companyId,
-        // Companies are loaded only for opened tenants; the list carries the name.
-        companyName: company?.companyInfo.name ?? entry.companyName,
-        userRole: entry.userRole,
-        companyLocaleInfo: company?.companyLocaleInfo,
+        tenantId,
+        tenantName,
+        tenantEmailDomain,
+        companyId,
+        companyName,
+        userRole,
+        companyLocaleInfo,
     };
 };
 function getTenantCoreDetailsByCheckInDate(tenantState, companyState) {
+    const tenants = tenantState.tenantIds
+        .map((tenantId) => getTenant(tenantState, companyState, tenantId))
+        .filter((value) => value != null);
+    const tenantsOrdered = (0, orderBy_1.default)(tenants, (value) => value.userLastCheckInTime.valueOf(), 'desc');
+    const tenantsCoreDetailsOrdered = tenantsOrdered.map((tenant) => getTenantCoreDetailsViewForTenant(tenant, companyState));
     return {
         order: 'descending_last_check_in',
-        tenantsCoreDetailsInOrder: getTenantListEntriesByCheckInDate(tenantState).map((entry) => ({
-            tenantId: entry.tenantId,
-            tenantName: entry.companyName ??
-                companyState.companiesById[entry.companyId]?.companyInfo.name,
-            tenantEmailDomain: entry.tenantEmailDomain,
-            companyId: entry.companyId,
-        })),
+        tenantsCoreDetailsInOrder: tenantsCoreDetailsOrdered,
     };
 }
+const getTenantCoreDetailsViewForTenant = (tenant, companyState) => {
+    const tenantId = tenant.tenantId;
+    const companyId = tenant.companyId;
+    const companyName = companyState.companiesById[companyId]?.companyInfo.name;
+    const tenantName = tenant.companyName ?? companyName;
+    const tenantEmailDomain = tenant.tenantEmailDomain;
+    return {
+        tenantId,
+        tenantName,
+        tenantEmailDomain,
+        companyId,
+    };
+};
 const toTenantCoreDetailsView = (tenantsBaseView) => {
     return tenantsBaseView.map(({ tenantId, tenantName, tenantEmailDomain, companyId }) => {
         return {

package/lib/entity/tenant/tenantState.d.ts

@@ -46,10 +46,7 @@ export interface TenantState extends FetchedState {
         summary?: SubscriptionSummary;
     } | undefined>;
     tenantIds: ID[];
-    /** Full records, loaded per tenant by the active-tenant fetch. */
     tenantsById: Record<ID, Tenant>;
-    /** Every tenant the user can open, from the tenants list. */
-    tenantSummariesById: Record<ID, TenantSummary>;
     verifyDeviceFetchState: FetchStateAndError;
     accountLockTime?: ZeniDate;
     accountUnlockTime?: ZeniDate;
@@ -61,13 +58,6 @@ export interface TenantState extends FetchedState {
     sessionExpiresAt?: string;
     twoFAPhoneNumber?: string;
 }
-export interface TenantSummary {
-    companyId: ID;
-    companyName: string;
-    tenantEmailDomain: string;
-    tenantId: ID;
-    userLastCheckInTime: ZeniDate;
-}
 export interface TenantProductSettings {
     isBankingEnabled: boolean;
     isBookkeepingEnabled: boolean;