From 8f14bd5f10e0e2e2290f5f08147cd7dcb80b95b6 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Mon, 3 Jun 2024 10:18:14 +0700 Subject: [PATCH 1/3] fix: User is shown option to submit expense using group --- src/libs/OptionsListUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts index bdf10f41cf890..f6a11cc032328 100644 --- a/src/libs/OptionsListUtils.ts +++ b/src/libs/OptionsListUtils.ts @@ -787,7 +787,7 @@ function createOption( result.isIOUReportOwner = ReportUtils.isIOUOwnedByCurrentUser(result); result.iouReportAmount = ReportUtils.getMoneyRequestSpendBreakdown(result).totalDisplaySpend; - if (!hasMultipleParticipants) { + if (!hasMultipleParticipants && !ReportUtils.isGroupChat(report)) { result.login = personalDetail?.login; result.accountID = Number(personalDetail?.accountID); result.phoneNumber = personalDetail?.phoneNumber; From 67f1e9a8eea2341044d1d985771858213dc1e8af Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Mon, 3 Jun 2024 15:34:19 +0700 Subject: [PATCH 2/3] fix: add check chat room --- src/libs/OptionsListUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts index f6a11cc032328..67aaced6f6190 100644 --- a/src/libs/OptionsListUtils.ts +++ b/src/libs/OptionsListUtils.ts @@ -787,7 +787,7 @@ function createOption( result.isIOUReportOwner = ReportUtils.isIOUOwnedByCurrentUser(result); result.iouReportAmount = ReportUtils.getMoneyRequestSpendBreakdown(result).totalDisplaySpend; - if (!hasMultipleParticipants && !ReportUtils.isGroupChat(report)) { + if (!hasMultipleParticipants && !ReportUtils.isGroupChat(report) && !ReportUtils.isChatRoom(report)) { result.login = personalDetail?.login; result.accountID = Number(personalDetail?.accountID); result.phoneNumber = personalDetail?.phoneNumber; From 4beb40b7dba70e1d593c04b99535b89d40b82853 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Mon, 3 Jun 2024 16:15:50 +0700 Subject: [PATCH 3/3] fix lint --- src/libs/OptionsListUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts index 67aaced6f6190..f896c2d817e50 100644 --- a/src/libs/OptionsListUtils.ts +++ b/src/libs/OptionsListUtils.ts @@ -787,7 +787,7 @@ function createOption( result.isIOUReportOwner = ReportUtils.isIOUOwnedByCurrentUser(result); result.iouReportAmount = ReportUtils.getMoneyRequestSpendBreakdown(result).totalDisplaySpend; - if (!hasMultipleParticipants && !ReportUtils.isGroupChat(report) && !ReportUtils.isChatRoom(report)) { + if (!hasMultipleParticipants && !ReportUtils.isGroupChat(report) && !ReportUtils.isChatRoom(report)) { result.login = personalDetail?.login; result.accountID = Number(personalDetail?.accountID); result.phoneNumber = personalDetail?.phoneNumber;