Skip to content

Workspace switcher: Expensify is no longer bolded and missing RBR after refreshing the page #40197

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

Merged
iwiznia merged 8 commits into from
Apr 18, 2024
Merged

Workspace switcher: Expensify is no longer bolded and missing RBR after refreshing the page #40197

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5f09ff1
Workspace switcher: Expensify is no longer bolded and missing RBR aft…
ikevin127 Apr 12, 2024
6a3fd51
resolved comments
ikevin127 Apr 15, 2024
97e29c3
Merge branch 'main' of https://github.com/Expensify/App into fix/39928
ikevin127 Apr 15, 2024
476f0f7
removed redundant JSDoc
ikevin127 Apr 16, 2024
8dd71e7
Merge branch 'main' of https://github.com/Expensify/App into fix/39928
ikevin127 Apr 17, 2024
aece8db
resolved conflicts
ikevin127 Apr 17, 2024
ac7a461
made reportActions required
ikevin127 Apr 18, 2024
c39c100
removed isEmptyObject check
ikevin127 Apr 18, 2024
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
Prev Previous commit
removed isEmptyObject check
  • Loading branch information
@ikevin127
ikevin127 committed Apr 18, 2024
commit c39c100084a8eba78221ed22ed6a933a40b2c802
4 changes: 1 addition & 3 deletions src/libs/WorkspacesSettingsUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import type {TranslationPaths} from '@src/languages/types';
import ONYXKEYS from '@src/ONYXKEYS';
import type {Policy, ReimbursementAccount, Report, ReportActions} from '@src/types/onyx';
import type {Unit} from '@src/types/onyx/Policy';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
import * as CurrencyUtils from './CurrencyUtils';
import type {Phrase, PhraseParameters} from './Localize';
import * as OptionsListUtils from './OptionsListUtils';
Expand Down Expand Up @@ -59,8 +58,7 @@ Onyx.connect({
* @returns BrickRoad for the policy passed as a param and optionally actionsByReport (if passed)
*/
const getBrickRoadForPolicy = (report: Report, altReportActions?: OnyxCollection<ReportActions>): BrickRoad => {
const finalReportActions = isEmptyObject(altReportActions) ? allReportActions : altReportActions;
const reportActions = finalReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`] ?? {};
const reportActions = (altReportActions ?? allReportActions)?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`] ?? {};
const reportErrors = OptionsListUtils.getAllReportErrors(report, reportActions);
const doesReportContainErrors = Object.keys(reportErrors ?? {}).length !== 0 ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined;
if (doesReportContainErrors) {
Expand Down