From 010aa5baf3cdf76fdeb4e3476e13bb731bb7f6ed Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sun, 26 Apr 2026 17:08:46 +0100
Subject: [PATCH 1/4] warn about travel data on domain delete
---
src/languages/en.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 6075d8a72038..2dcbba4eba70 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -9079,7 +9079,7 @@ const translations = {
resetDomain: 'Reset domain',
resetDomainExplanation: ({domainName}: {domainName?: string}) => `Please type ${domainName} to confirm the domain reset.`,
enterDomainName: 'Enter your domain name here',
- resetDomainInfo: `This action is permanent and the following data will be deleted:
Company card connections and any unreported expenses from those cardsSAML and group settings All accounts, workspaces, reports, expenses, and other data will remain.
Note: You can clear this domain from your domains list by removing the associated email from your contact methods.`,
+ resetDomainInfo: `This action is permanent and the following data will be deleted:
Company card connections and any unreported expenses from those cardsSAML and group settingsTravel data and access to Expensify Travel All accounts, workspaces, reports, expenses, and other data will remain.
Note: You can clear this domain from your domains list by removing the associated email from your contact methods.`,
},
domainMembers: 'Domain members',
members: {
From f2fa2ab85b7c862bdaa99badac07b98de57dedad Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Mon, 27 Apr 2026 19:15:35 +0100
Subject: [PATCH 2/4] pass submitter in OpenReport when creating transaction
thread to share report with them
---
src/libs/actions/Report/index.ts | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index b9df8ebb3986..0b3fa1ed017c 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -1949,10 +1949,16 @@ function createTransactionThreadReport(
const optimisticTransactionThreadReportID = generateReportID();
const optimisticTransactionThread = buildTransactionThread(iouReportAction, reportToUse, undefined, optimisticTransactionThreadReportID);
const shouldAddPendingFields = transaction?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD || iouReportAction?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
+ const participantAccountIDsForDetails = [currentUserAccountID];
+ if (iouReportAction?.actorAccountID) {
+ participantAccountIDsForDetails.push(iouReportAction.actorAccountID);
+ }
+ const participantLogins = PersonalDetailsUtils.getLoginsByAccountIDs(participantAccountIDsForDetails);
+ const participants = buildParticipantInfoFromLogins(participantLogins);
openReport({
reportID: optimisticTransactionThreadReportID,
introSelected,
- participants: currentUserLogin ? [{login: currentUserLogin, accountID: currentUserAccountID}] : [],
+ participants,
// TODO: allPersonalDetails fallback should be removed in follow-up PRs https://github.com/Expensify/App/issues/73656
personalDetails: personalDetails ?? allPersonalDetails,
newReportObject: optimisticTransactionThread,
From 9ed60f0199b82fa0321b1d6bde727cbcfd7bfc7a Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Mon, 27 Apr 2026 19:47:56 +0100
Subject: [PATCH 3/4] revert unintended change
---
src/languages/en.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 2dcbba4eba70..6075d8a72038 100644
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -9079,7 +9079,7 @@ const translations = {
resetDomain: 'Reset domain',
resetDomainExplanation: ({domainName}: {domainName?: string}) => `Please type ${domainName} to confirm the domain reset.`,
enterDomainName: 'Enter your domain name here',
- resetDomainInfo: `This action is permanent and the following data will be deleted:
Company card connections and any unreported expenses from those cardsSAML and group settingsTravel data and access to Expensify Travel All accounts, workspaces, reports, expenses, and other data will remain.
Note: You can clear this domain from your domains list by removing the associated email from your contact methods.`,
+ resetDomainInfo: `This action is permanent and the following data will be deleted:
Company card connections and any unreported expenses from those cardsSAML and group settings All accounts, workspaces, reports, expenses, and other data will remain.
Note: You can clear this domain from your domains list by removing the associated email from your contact methods.`,
},
domainMembers: 'Domain members',
members: {
From 866660c193191a330290bbfdb1b8722b21616412 Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Thu, 30 Apr 2026 00:05:22 +0100
Subject: [PATCH 4/4] do not include your email as submitter twice
---
src/libs/actions/Report/index.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
index 8d288e4e4299..50bbde3fb8e1 100644
--- a/src/libs/actions/Report/index.ts
+++ b/src/libs/actions/Report/index.ts
@@ -1968,7 +1968,7 @@ function createTransactionThreadReport(
const optimisticTransactionThread = buildTransactionThread(iouReportAction, reportToUse, undefined, optimisticTransactionThreadReportID);
const shouldAddPendingFields = transaction?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD || iouReportAction?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
const participantAccountIDsForDetails = [currentUserAccountID];
- if (iouReportAction?.actorAccountID) {
+ if (iouReportAction?.actorAccountID && iouReportAction.actorAccountID !== currentUserAccountID) {
participantAccountIDsForDetails.push(iouReportAction.actorAccountID);
}
const participantLogins = PersonalDetailsUtils.getLoginsByAccountIDs(participantAccountIDsForDetails);