Skip to content

fix: Duplicate Self DM chat displayed in LHN after unreporting an expense #77727

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
Gonals merged 3 commits into from
Dec 18, 2025
Merged

fix: Duplicate Self DM chat displayed in LHN after unreporting an expense #77727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fcff5b
Revert "[CP Staging] Revert "fix: Duplicate Self DM chat displayed in…
nkdengineer Dec 16, 2025
aeb2cab
Merge branch 'main' into revert-77686-revert-76966-fix/74793
nkdengineer Dec 17, 2025
33e2a46
fix can't move expense to selfDM
nkdengineer Dec 17, 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: 4 additions & 0 deletions src/ONYXKEYS.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,9 @@ const ONYXKEYS = {
/** The user's Concierge reportID */
CONCIERGE_REPORT_ID: 'conciergeReportID',

/** The user's Self DM reportID */
SELF_DM_REPORT_ID: 'selfDMReportID',

/** The details of unknown user while sharing a file - we don't know if they exist */
SHARE_UNKNOWN_USER_DETAILS: 'shareUnknownUserDetails',

Expand Down Expand Up @@ -1301,6 +1304,7 @@ type OnyxValuesMapping = {
[ONYXKEYS.IS_USING_IMPORTED_STATE]: boolean;
[ONYXKEYS.NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES]: Record<string, string>;
[ONYXKEYS.CONCIERGE_REPORT_ID]: string;
[ONYXKEYS.SELF_DM_REPORT_ID]: string;
[ONYXKEYS.SHARE_UNKNOWN_USER_DETAILS]: Participant;
[ONYXKEYS.SHARE_TEMP_FILE]: OnyxTypes.ShareTempFile;
[ONYXKEYS.VALIDATED_FILE_OBJECT]: OnyxTypes.FileObject | undefined;
Expand Down
9 changes: 9 additions & 0 deletions src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1199,6 +1199,12 @@ Onyx.connectWithoutView({
},
});

let cachedSelfDMReportID: OnyxEntry<string>;
Onyx.connectWithoutView({
key: ONYXKEYS.SELF_DM_REPORT_ID,
callback: (value) => (cachedSelfDMReportID = value),
});

let hiddenTranslation = '';
let unavailableTranslation = '';

Expand Down Expand Up @@ -1862,6 +1868,9 @@ function isConciergeChatReport(report: OnyxInputOrEntry<Report>): boolean {
}

function findSelfDMReportID(): string | undefined {
if (cachedSelfDMReportID) {
return cachedSelfDMReportID;
}
if (!allReports) {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/libs/actions/Transaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
import {getCurrentUserAccountID} from './Report';

const allTransactions: Record<string, Transaction> = {};
Onyx.connect({

Check warning on line 56 in src/libs/actions/Transaction.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION,
callback: (transaction, key) => {
if (!key || !transaction) {
Expand All @@ -65,7 +65,7 @@
});

let allTransactionDrafts: OnyxCollection<Transaction> = {};
Onyx.connect({

Check warning on line 68 in src/libs/actions/Transaction.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION_DRAFT,
waitForCollectionCallback: true,
callback: (value) => {
Expand All @@ -74,7 +74,7 @@
});

let allReports: OnyxCollection<Report> = {};
Onyx.connect({

Check warning on line 77 in src/libs/actions/Transaction.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.REPORT,
waitForCollectionCallback: true,
callback: (value) => {
Expand All @@ -86,7 +86,7 @@
});

const allTransactionViolation: OnyxCollection<TransactionViolation[]> = {};
Onyx.connect({

Check warning on line 89 in src/libs/actions/Transaction.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
callback: (transactionViolation, key) => {
if (!key || !transactionViolation) {
Expand All @@ -98,7 +98,7 @@
});

let allTransactionViolations: TransactionViolations = [];
Onyx.connect({

Check warning on line 101 in src/libs/actions/Transaction.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
callback: (val) => (allTransactionViolations = val ?? []),
});
Expand Down Expand Up @@ -1313,7 +1313,7 @@
(affectedReportID === selfDMReport?.reportID ? selfDMReport : undefined);

if (!affectedReport) {
return;
continue;

@bernhardoj bernhardoj Dec 17, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this to fix the regression? If yes, can you explain why it happens and how this fix it?

@nkdengineer nkdengineer Dec 17, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With our change, the selfDMReport is undefined, then this function returned early here. That is the reason the regression happens.

@nkdengineer nkdengineer Dec 17, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If affectedReport is undefined, we should skip updating the total/violation logic below instead of returning early here.

}

const updatedTotal = updatedReportTotals[affectedReportID] ?? affectedReport.total;
Expand Down
Loading