Skip to content

Commit a009db0

Browse files
committed
fix: set notification to always instead of hidden
1 parent 33d7a30 commit a009db0

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

src/libs/actions/Policy/Member.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import type {InvitedEmailsToAccountIDs, PersonalDetailsList, Policy, PolicyEmplo
3232
import type {PendingAction} from '@src/types/onyx/OnyxCommon';
3333
import type {JoinWorkspaceResolution} from '@src/types/onyx/OriginalMessage';
3434
import type {ApprovalRule} from '@src/types/onyx/Policy';
35-
import type {Participant} from '@src/types/onyx/Report';
35+
import type {NotificationPreference, Participant} from '@src/types/onyx/Report';
3636
import type {OnyxData} from '@src/types/onyx/Request';
3737
import {isEmptyObject} from '@src/types/utils/EmptyObject';
3838
import {createPolicyExpenseChats} from './Policy';
@@ -880,6 +880,7 @@ function buildAddMembersToWorkspaceOnyxData(
880880
policyMemberAccountIDs: number[],
881881
role: string,
882882
formatPhoneNumber: LocaleContextProps['formatPhoneNumber'],
883+
policyExpenseChatNotificationPreference?: NotificationPreference,
883884
) {
884885
const logins = Object.keys(invitedEmailsToAccountIDs).map((memberLogin) => PhoneNumber.addSMSDomainIfPhoneNumber(memberLogin));
885886
const accountIDs = Object.values(invitedEmailsToAccountIDs);
@@ -899,7 +900,7 @@ function buildAddMembersToWorkspaceOnyxData(
899900
const announceRoomChat = optimisticAnnounceChat.announceChatData;
900901

901902
// create onyx data for policy expense chats for each new member
902-
const membersChats = createPolicyExpenseChats(policyID, invitedEmailsToAccountIDs);
903+
const membersChats = createPolicyExpenseChats(policyID, invitedEmailsToAccountIDs, undefined, policyExpenseChatNotificationPreference);
903904

904905
const optimisticMembersState: OnyxCollectionInputValue<PolicyEmployee> = {};
905906
const successMembersState: OnyxCollectionInputValue<PolicyEmployee> = {};

src/libs/actions/Policy/Policy.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ import type {
109109
import type {Errors} from '@src/types/onyx/OnyxCommon';
110110
import type {Attributes, CompanyAddress, CustomUnit, NetSuiteCustomList, NetSuiteCustomSegment, ProhibitedExpenses, Rate, TaxRate} from '@src/types/onyx/Policy';
111111
import type {CustomFieldType} from '@src/types/onyx/PolicyEmployee';
112+
import type {NotificationPreference} from '@src/types/onyx/Report';
112113
import type {OnyxData} from '@src/types/onyx/Request';
113114
import {isEmptyObject} from '@src/types/utils/EmptyObject';
114115
import {buildOptimisticMccGroup, buildOptimisticPolicyCategories} from './Category';
@@ -1158,7 +1159,12 @@ function verifySetupIntentAndRequestPolicyOwnerChange(policyID: string) {
11581159
*
11591160
* @returns - object with onyxSuccessData, onyxOptimisticData, and optimisticReportIDs (map login to reportID)
11601161
*/
1161-
function createPolicyExpenseChats(policyID: string, invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs, hasOutstandingChildRequest = false): WorkspaceMembersChats {
1162+
function createPolicyExpenseChats(
1163+
policyID: string,
1164+
invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs,
1165+
hasOutstandingChildRequest = false,
1166+
notificationPreference: NotificationPreference = CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
1167+
): WorkspaceMembersChats {
11621168
const workspaceMembersChats: WorkspaceMembersChats = {
11631169
onyxSuccessData: [],
11641170
onyxOptimisticData: [],
@@ -1221,7 +1227,7 @@ function createPolicyExpenseChats(policyID: string, invitedEmailsToAccountIDs: I
12211227
chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT,
12221228
policyID,
12231229
ownerAccountID: cleanAccountID,
1224-
notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
1230+
notificationPreference,
12251231
});
12261232

12271233
// Set correct notification preferences: visible for the submitter, hidden for others until there's activity

src/libs/actions/Report.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5790,6 +5790,7 @@ function changeReportPolicyAndInviteSubmitter(report: Report, policyID: string,
57905790
policyMemberAccountIDs,
57915791
CONST.POLICY.ROLE.USER,
57925792
formatPhoneNumber,
5793+
CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS,
57935794
);
57945795
const optimisticPolicyExpenseChatReportID = membersChats.reportCreationData[submitterEmail].reportID;
57955796
const optimisticPolicyExpenseChatCreatedReportActionID = membersChats.reportCreationData[submitterEmail].reportActionID;

0 commit comments

Comments
 (0)