Skip to content

fix: app crashes when change focus modal while creating distance expense #76581

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
tylerkaraszewski merged 3 commits into from
Dec 9, 2025
+2 −2
Merged

fix: app crashes when change focus modal while creating distance expense #76581

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4d1b49
fix: App crashes when change focus modal while creating distance expense
daledah Dec 3, 2025
9087302
Merge branch 'main' into fix/74230
daledah Dec 4, 2025
db4c048
resolve conflict
daledah Dec 8, 2025
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
4 changes: 2 additions & 2 deletions src/components/OptionListContextProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ function OptionsListContextProvider({children}: OptionsListProviderProps) {
return prevOptions;
}

const updatedReportsMap = new Map(prevOptions.reports.map((report) => [report.reportID, report]));
const updatedReportsMap = new Map(prevOptions.reports.filter((report) => report && report.reportID).map((report) => [report.reportID, report]));
for (const reportKey of changedReportKeys) {
const report = changedReportsEntries[reportKey];
const reportID = reportKey.replace(ONYXKEYS.COLLECTION.REPORT, '');
Expand Down Expand Up @@ -145,7 +145,7 @@ function OptionsListContextProvider({children}: OptionsListProviderProps) {
return prevOptions;
}

const updatedReportsMap = new Map(prevOptions.reports.map((report) => [report.reportID, report]));
const updatedReportsMap = new Map(prevOptions.reports.filter((report) => report && report.reportID).map((report) => [report.reportID, report]));
for (const [key, reportAction] of changedReportActionsEntries) {
if (!reportAction) {
continue;
Expand Down
Loading