From 66b512d6c69c020257c475c95f7b60d7cc910ae4 Mon Sep 17 00:00:00 2001 From: Puneet Lath Date: Thu, 7 Aug 2025 13:59:22 -0700 Subject: [PATCH] Revert "Change Invite whisper actions" --- src/CONST/index.ts | 5 -- src/languages/de.ts | 3 +- src/languages/en.ts | 3 +- src/languages/es.ts | 3 +- src/languages/fr.ts | 3 +- src/languages/it.ts | 5 +- src/languages/ja.ts | 3 +- src/languages/nl.ts | 5 +- src/languages/pl.ts | 5 +- src/languages/pt-BR.ts | 3 +- src/languages/zh-hans.ts | 5 +- .../ResolveActionableMentionWhisperParams.ts | 2 +- src/libs/ReportActionsUtils.ts | 7 -- src/libs/actions/Report.ts | 45 +------------ .../home/report/PureReportActionItem.tsx | 64 ++++--------------- src/pages/home/report/ReportActionItem.tsx | 3 - src/types/onyx/OriginalMessage.ts | 16 ----- src/types/onyx/ReportAction.ts | 6 +- 18 files changed, 32 insertions(+), 154 deletions(-) diff --git a/src/CONST/index.ts b/src/CONST/index.ts index adeed5dc1aa41..55f6f2dfba473 100755 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -1128,7 +1128,6 @@ const CONST = { ACTIONABLE_ADD_PAYMENT_CARD: 'ACTIONABLEADDPAYMENTCARD', ACTIONABLE_JOIN_REQUEST: 'ACTIONABLEJOINREQUEST', ACTIONABLE_MENTION_WHISPER: 'ACTIONABLEMENTIONWHISPER', - ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER: 'ACTIONABLEMENTIONINVITETOSUBMITEXPENSECONFIRMWHISPER', ACTIONABLE_REPORT_MENTION_WHISPER: 'ACTIONABLEREPORTMENTIONWHISPER', ACTIONABLE_TRACK_EXPENSE_WHISPER: 'ACTIONABLETRACKEXPENSEWHISPER', POLICY_EXPENSE_CHAT_WELCOME_WHISPER: 'POLICYEXPENSECHATWELCOMEWHISPER', @@ -1312,12 +1311,8 @@ const CONST = { }, ACTIONABLE_MENTION_WHISPER_RESOLUTION: { INVITE: 'invited', - INVITE_TO_SUBMIT_EXPENSE: 'inviteToSubmitExpense', NOTHING: 'nothing', }, - ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER: { - DONE: 'done', - }, ACTIONABLE_TRACK_EXPENSE_WHISPER_RESOLUTION: { NOTHING: 'nothing', }, diff --git a/src/languages/de.ts b/src/languages/de.ts index 63d3d338bf38c..ae6a7542373f9 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -6296,8 +6296,7 @@ const translations = { levelThreeResult: 'Nachricht aus dem Kanal entfernt, anonyme Warnung gesendet und Nachricht zur Überprüfung gemeldet.', }, actionableMentionWhisperOptions: { - inviteToSubmitExpense: 'Zum Einreichen von Ausgaben einladen', - inviteToChat: 'Nur zum Chatten einladen', + invite: 'Lade sie ein', nothing: 'Nichts tun', }, actionableMentionJoinWorkspaceOptions: { diff --git a/src/languages/en.ts b/src/languages/en.ts index ed7d2d68c7ea4..ff9b23aaca7f7 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -6265,8 +6265,7 @@ const translations = { levelThreeResult: 'Message removed from channel plus anonymous warning and message is reported for review.', }, actionableMentionWhisperOptions: { - inviteToSubmitExpense: 'Invite to submit expenses', - inviteToChat: 'Invite to chat only', + invite: 'Invite them', nothing: 'Do nothing', }, actionableMentionJoinWorkspaceOptions: { diff --git a/src/languages/es.ts b/src/languages/es.ts index ec3951929c049..b599160808d94 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -6730,8 +6730,7 @@ const translations = { copied: '¡Copiado!', }, actionableMentionWhisperOptions: { - inviteToSubmitExpense: 'Invitar a enviar gastos', - inviteToChat: 'Invitar solo a chatear', + invite: 'Invitar', nothing: 'No hacer nada', }, actionableMentionJoinWorkspaceOptions: { diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 8c4bee30079d0..288374dcb7c96 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -6309,8 +6309,7 @@ const translations = { levelThreeResult: 'Message supprimé du canal avec un avertissement anonyme et le message est signalé pour examen.', }, actionableMentionWhisperOptions: { - inviteToSubmitExpense: 'Inviter à soumettre des dépenses', - inviteToChat: 'Inviter uniquement à discuter', + invite: 'Invitez-les', nothing: 'Ne rien faire', }, actionableMentionJoinWorkspaceOptions: { diff --git a/src/languages/it.ts b/src/languages/it.ts index 87abe43809db4..b66f052ac2197 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -6311,9 +6311,8 @@ const translations = { levelThreeResult: 'Messaggio rimosso dal canale più avviso anonimo e messaggio segnalato per revisione.', }, actionableMentionWhisperOptions: { - inviteToSubmitExpense: 'Invita a inviare le spese', - inviteToChat: 'Invita solo a chattare', - nothing: 'Non fare nulla', + invite: 'Invitali', + nothing: 'Do nothing', }, actionableMentionJoinWorkspaceOptions: { accept: 'Accetta', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index df742db858ece..05e99694c9871 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -6269,8 +6269,7 @@ const translations = { levelThreeResult: 'チャンネルからメッセージが削除され、匿名の警告が行われ、メッセージがレビューのために報告されました。', }, actionableMentionWhisperOptions: { - inviteToSubmitExpense: '経費の提出に招待する', - inviteToChat: 'チャットのみ招待', + invite: '招待する', nothing: '何もしない', }, actionableMentionJoinWorkspaceOptions: { diff --git a/src/languages/nl.ts b/src/languages/nl.ts index ae1289a06c6a5..eade2ff3431a3 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -6303,9 +6303,8 @@ const translations = { levelThreeResult: 'Bericht verwijderd uit kanaal plus anonieme waarschuwing en bericht is gerapporteerd voor beoordeling.', }, actionableMentionWhisperOptions: { - inviteToSubmitExpense: 'Uitnodigen om onkosten in te dienen', - inviteToChat: 'Alleen uitnodigen om te chatten', - nothing: 'Niets doen', + invite: 'Nodig hen uit', + nothing: 'Do nothing', }, actionableMentionJoinWorkspaceOptions: { accept: 'Accepteren', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 9967472e20e7f..af4bee1a58c20 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -6288,9 +6288,8 @@ const translations = { levelThreeResult: 'Wiadomość usunięta z kanału, dodano anonimowe ostrzeżenie, a wiadomość została zgłoszona do przeglądu.', }, actionableMentionWhisperOptions: { - inviteToSubmitExpense: 'Zaproś do przesyłania wydatków', - inviteToChat: 'Zaproś tylko do czatu', - nothing: 'Nie rób nic', + invite: 'Zaproś ich', + nothing: 'Do nothing', }, actionableMentionJoinWorkspaceOptions: { accept: 'Akceptuj', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index fde7dd7cf624d..1daae54067288 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -6302,8 +6302,7 @@ const translations = { levelThreeResult: 'Mensagem removida do canal, além de um aviso anônimo, e a mensagem foi relatada para revisão.', }, actionableMentionWhisperOptions: { - inviteToSubmitExpense: 'Convidar para enviar despesas', - inviteToChat: 'Convidar apenas para conversar', + invite: 'Convide-os', nothing: 'Não faça nada', }, actionableMentionJoinWorkspaceOptions: { diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 9a7543cd69449..6af7b9dffc993 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -6187,9 +6187,8 @@ const translations = { levelThreeResult: '消息已从频道中移除，并收到匿名警告，消息已提交审核。', }, actionableMentionWhisperOptions: { - inviteToSubmitExpense: '邀请提交费用', - inviteToChat: '仅邀请聊天', - nothing: '什么都不做', + invite: '邀请他们', + nothing: 'Do nothing', }, actionableMentionJoinWorkspaceOptions: { accept: '接受', diff --git a/src/libs/API/parameters/ResolveActionableMentionWhisperParams.ts b/src/libs/API/parameters/ResolveActionableMentionWhisperParams.ts index 3b6b05910a5be..87dfc934eb5fc 100644 --- a/src/libs/API/parameters/ResolveActionableMentionWhisperParams.ts +++ b/src/libs/API/parameters/ResolveActionableMentionWhisperParams.ts @@ -3,7 +3,7 @@ import type CONST from '@src/CONST'; type ResolveActionableMentionWhisperParams = { reportActionID: string; - resolution: ValueOf | ValueOf; + resolution: ValueOf; }; export default ResolveActionableMentionWhisperParams; diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts index 99421e4f794e2..6c0827a35e63a 100644 --- a/src/libs/ReportActionsUtils.ts +++ b/src/libs/ReportActionsUtils.ts @@ -733,12 +733,6 @@ function isActionableMentionWhisper(reportAction: OnyxEntry): repo return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_WHISPER); } -function isActionableMentionInviteToSubmitExpenseConfirmWhisper( - reportAction: OnyxEntry, -): reportAction is ReportAction { - return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER); -} - /** * Checks if a given report action corresponds to an actionable report mention whisper. * @param reportAction @@ -3030,7 +3024,6 @@ export { isActionableJoinRequest, isActionableJoinRequestPending, isActionableMentionWhisper, - isActionableMentionInviteToSubmitExpenseConfirmWhisper, isActionableReportMentionWhisper, isActionableTrackExpense, isExpenseChatWelcomeWhisper, diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts index 850fa037d5176..270df4f3c2957 100644 --- a/src/libs/actions/Report.ts +++ b/src/libs/actions/Report.ts @@ -202,7 +202,7 @@ import {setDownload} from './Download'; import {close} from './Modal'; import navigateFromNotification from './navigateFromNotification'; import {getAll} from './PersistedRequests'; -import {addMembersToWorkspace, buildAddMembersToWorkspaceOnyxData, buildRoomMembersOnyxData} from './Policy/Member'; +import {buildAddMembersToWorkspaceOnyxData, buildRoomMembersOnyxData} from './Policy/Member'; import {createPolicyExpenseChats} from './Policy/Policy'; import { createUpdateCommentMatcher, @@ -4341,39 +4341,10 @@ function clearNewRoomFormError() { function resolveActionableMentionWhisper( reportID: string | undefined, reportAction: OnyxEntry, - resolution: ValueOf | ValueOf, - formatPhoneNumber: LocaleContextProps['formatPhoneNumber'], - policy?: OnyxEntry, + resolution: ValueOf, ) { - if (!reportAction || !reportID) { - return; - } - - if (ReportActionsUtils.isActionableMentionWhisper(reportAction) && resolution === CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION.INVITE_TO_SUBMIT_EXPENSE) { - const actionOriginalMessage = ReportActionsUtils.getOriginalMessage(reportAction); - - const policyID = policy?.id; - - if (actionOriginalMessage && policyID) { - const currentUserDetails = allPersonalDetails?.[getCurrentUserAccountID()]; - const welcomeNoteSubject = `# ${currentUserDetails?.displayName ?? ''} invited you to ${policy?.name ?? 'a workspace'}`; - const welcomeNote = Localize.translateLocal('workspace.common.welcomeNote'); - const policyMemberAccountIDs = Object.values(getMemberAccountIDsForWorkspace(policy?.employeeList, false, false)); - - const invitees: Record = {}; - actionOriginalMessage.inviteeEmails?.forEach((email, index) => { - if (!email) { - return; - } - invitees[email] = actionOriginalMessage.inviteeAccountIDs?.at(index) ?? CONST.DEFAULT_NUMBER_ID; - }); - - addMembersToWorkspace(invitees, `${welcomeNoteSubject}\n\n${welcomeNote}`, policyID, policyMemberAccountIDs, CONST.POLICY.ROLE.USER, formatPhoneNumber); - } - } - const message = ReportActionsUtils.getReportActionMessage(reportAction); - if (!message) { + if (!message || !reportAction || !reportID) { return; } @@ -4447,15 +4418,6 @@ function resolveActionableMentionWhisper( API.write(WRITE_COMMANDS.RESOLVE_ACTIONABLE_MENTION_WHISPER, parameters, {optimisticData, failureData}); } -function resolveActionableMentionConfirmWhisper( - reportID: string | undefined, - reportAction: OnyxEntry, - resolution: ValueOf, - formatPhoneNumber: LocaleContextProps['formatPhoneNumber'], -) { - resolveActionableMentionWhisper(reportID, reportAction, resolution, formatPhoneNumber); -} - function resolveActionableReportMentionWhisper( reportId: string | undefined, reportAction: OnyxEntry, @@ -5939,7 +5901,6 @@ export { removeFromGroupChat, removeFromRoom, resolveActionableMentionWhisper, - resolveActionableMentionConfirmWhisper, resolveActionableReportMentionWhisper, resolveConciergeCategoryOptions, savePrivateNotesDraft, diff --git a/src/pages/home/report/PureReportActionItem.tsx b/src/pages/home/report/PureReportActionItem.tsx index 68b59b2376fc8..55a96bf4e594c 100644 --- a/src/pages/home/report/PureReportActionItem.tsx +++ b/src/pages/home/report/PureReportActionItem.tsx @@ -17,7 +17,6 @@ import Icon from '@components/Icon'; import {Eye} from '@components/Icon/Expensicons'; import InlineSystemMessage from '@components/InlineSystemMessage'; import KYCWall from '@components/KYCWall'; -import type {LocaleContextProps} from '@components/LocaleContextProvider'; import OfflineWithFeedback from '@components/OfflineWithFeedback'; import PressableWithSecondaryInteraction from '@components/PressableWithSecondaryInteraction'; import ReportActionItemEmojiReactions from '@components/Reactions/ReportActionItemEmojiReactions'; @@ -55,7 +54,7 @@ import {isReportMessageAttachment} from '@libs/isReportMessageAttachment'; import Navigation from '@libs/Navigation/Navigation'; import Permissions from '@libs/Permissions'; import {getDisplayNameOrDefault} from '@libs/PersonalDetailsUtils'; -import {getCleanedTagName, getPersonalPolicy, isPolicyAdmin, isPolicyOwner} from '@libs/PolicyUtils'; +import {getCleanedTagName} from '@libs/PolicyUtils'; import { extractLinksFromMessageHtml, getAddedApprovalRuleMessage, @@ -100,7 +99,6 @@ import { getWorkspaceUpdateFieldMessage, isActionableAddPaymentCard, isActionableJoinRequest, - isActionableMentionInviteToSubmitExpenseConfirmWhisper, isActionableMentionWhisper, isActionableReportMentionWhisper, isActionableTrackExpense, @@ -158,7 +156,7 @@ import variables from '@styles/variables'; import {openPersonalBankAccountSetupView} from '@userActions/BankAccounts'; import {hideEmojiPicker, isActive} from '@userActions/EmojiPickerAction'; import {acceptJoinRequest, declineJoinRequest} from '@userActions/Policy/Member'; -import {expandURLPreview, resolveActionableMentionConfirmWhisper, resolveConciergeCategoryOptions} from '@userActions/Report'; +import {expandURLPreview, resolveConciergeCategoryOptions} from '@userActions/Report'; import type {IgnoreDirection} from '@userActions/ReportActions'; import {isAnonymousUser, signOutAndRedirectToSignIn} from '@userActions/Session'; import {isBlockedFromConcierge} from '@userActions/User'; @@ -323,8 +321,6 @@ type PureReportActionItemProps = { reportId: string | undefined, reportAction: OnyxEntry, resolution: ValueOf, - formatPhoneNumber: LocaleContextProps['formatPhoneNumber'], - policy: OnyxEntry, ) => void; /** Whether the provided report is a closed expense report with no expenses */ @@ -362,9 +358,6 @@ type PureReportActionItemProps = { /** Whether to highlight the action for a few seconds */ shouldHighlight?: boolean; - - /** Current user's account id */ - currentUserAccountID?: number; }; // This is equivalent to returning a negative boolean in normal functions, but we can keep the element return type @@ -429,7 +422,6 @@ function PureReportActionItem({ userBillingFundID, shouldShowBorder, shouldHighlight = false, - currentUserAccountID, }: PureReportActionItemProps) { const actionSheetAwareScrollViewContext = useContext(ActionSheetAwareScrollView.ActionSheetAwareScrollViewContext); const {translate, datetimeToCalendarTime, formatPhoneNumber, localeCompare} = useLocalize(); @@ -453,8 +445,7 @@ function PureReportActionItem({ const prevDraftMessage = usePrevious(draftMessage); const isReportActionLinked = linkedReportActionID && action.reportActionID && linkedReportActionID === action.reportActionID; const [isReportActionActive, setIsReportActionActive] = useState(!!isReportActionLinked); - const isActionableWhisper = - isActionableMentionWhisper(action) || isActionableMentionInviteToSubmitExpenseConfirmWhisper(action) || isActionableTrackExpense(action) || isActionableReportMentionWhisper(action); + const isActionableWhisper = isActionableMentionWhisper(action) || isActionableTrackExpense(action) || isActionableReportMentionWhisper(action); const isReportArchived = useReportIsArchived(report?.reportID); const highlightedBackgroundColorIfNeeded = useMemo( @@ -810,59 +801,30 @@ function PureReportActionItem({ ]; } - if (isActionableMentionInviteToSubmitExpenseConfirmWhisper(action)) { - return [ - { - text: 'common.buttonConfirm', - key: `${action.reportActionID}-actionableReportMentionConfirmWhisper-${CONST.REPORT.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER.DONE}`, - onPress: () => resolveActionableMentionConfirmWhisper(reportID, action, CONST.REPORT.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER.DONE, formatPhoneNumber), - isPrimary: true, - }, - ]; - } - - const actionableMentionWhisperOptions = []; - const isReportInPolicy = !!report?.policyID && report.policyID !== CONST.POLICY.ID_FAKE && getPersonalPolicy()?.id !== report.policyID; - - if (isReportInPolicy && (isPolicyAdmin(policy) || isPolicyOwner(policy, currentUserAccountID))) { - actionableMentionWhisperOptions.push({ - text: 'actionableMentionWhisperOptions.inviteToSubmitExpense', - key: `${action.reportActionID}-actionableMentionWhisper-${CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION.INVITE_TO_SUBMIT_EXPENSE}`, - onPress: () => resolveActionableMentionWhisper(reportID, action, CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION.INVITE_TO_SUBMIT_EXPENSE, formatPhoneNumber, policy), - isMediumSized: true, - }); - } - - actionableMentionWhisperOptions.push( + return [ { - text: 'actionableMentionWhisperOptions.inviteToChat', + text: 'actionableMentionWhisperOptions.invite', key: `${action.reportActionID}-actionableMentionWhisper-${CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION.INVITE}`, - onPress: () => resolveActionableMentionWhisper(reportID, action, CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION.INVITE, formatPhoneNumber, policy), - isMediumSized: true, + onPress: () => resolveActionableMentionWhisper(reportID, action, CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION.INVITE), + isPrimary: true, }, { text: 'actionableMentionWhisperOptions.nothing', key: `${action.reportActionID}-actionableMentionWhisper-${CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION.NOTHING}`, - onPress: () => resolveActionableMentionWhisper(reportID, action, CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION.NOTHING, formatPhoneNumber, policy), - isMediumSized: true, + onPress: () => resolveActionableMentionWhisper(reportID, action, CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION.NOTHING), }, - ); - return actionableMentionWhisperOptions; + ]; }, [ action, - userBillingFundID, isActionableWhisper, - report?.policyID, - policy, - currentUserAccountID, reportID, - originalReportID, - isBetaEnabled, + userBillingFundID, createDraftTransactionAndNavigateToParticipantSelector, dismissTrackExpenseActionableWhisper, resolveActionableReportMentionWhisper, - formatPhoneNumber, resolveActionableMentionWhisper, + originalReportID, + isBetaEnabled, ]); /** @@ -1282,7 +1244,7 @@ function PureReportActionItem({ {actionableItemButtons.length > 0 && ( )} diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx index 3382c481cda8f..b02275a0f342a 100644 --- a/src/pages/home/report/ReportActionItem.tsx +++ b/src/pages/home/report/ReportActionItem.tsx @@ -1,7 +1,6 @@ import React, {useMemo} from 'react'; import type {OnyxCollection, OnyxEntry} from 'react-native-onyx'; import {useBlockedFromConcierge} from '@components/OnyxListItemProvider'; -import useOnyx from '@hooks/useOnyx'; import useReportIsArchived from '@hooks/useReportIsArchived'; import ModifiedExpenseMessage from '@libs/ModifiedExpenseMessage'; import {getIOUReportIDFromReportActionPreview, getOriginalMessage} from '@libs/ReportActionsUtils'; @@ -89,7 +88,6 @@ function ReportActionItem({ const originalReportID = useMemo(() => getOriginalReportID(reportID, action), [reportID, action]); const originalReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${originalReportID}`]; const isOriginalReportArchived = useReportIsArchived(originalReportID); - const [currentUserAccountID] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: false, selector: (session) => session?.accountID}); const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${getIOUReportIDFromReportActionPreview(action)}`]; const policy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]; // The app would crash due to subscribing to the entire report collection if parentReportID is an empty string. So we should have a fallback ID here. @@ -112,7 +110,6 @@ function ReportActionItem({ action={action} report={report} policy={policy} - currentUserAccountID={currentUserAccountID} draftMessage={draftMessage} iouReport={iouReport} taskReport={taskReport} diff --git a/src/types/onyx/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts index 3169d713ba65a..48aff18b4d018 100644 --- a/src/types/onyx/OriginalMessage.ts +++ b/src/types/onyx/OriginalMessage.ts @@ -122,9 +122,6 @@ type OriginalMessageAddComment = { /** Model of `actionable mention whisper` report action */ type OriginalMessageActionableMentionWhisper = { - /** Emails of users that aren't members of the room */ - inviteeEmails: string[]; - /** Account IDs of users that aren't members of the room */ inviteeAccountIDs: number[]; @@ -135,18 +132,6 @@ type OriginalMessageActionableMentionWhisper = { whisperedTo?: number[]; }; -/** Model of `actionable mention whisper` report action */ -type OriginalMessageActionableMentionInviteToSubmitExpenseConfirmWhisper = { - /** Account IDs of users that aren't members of the room */ - inviteeAccountIDs: number[]; - - /** Decision on whether to invite users that were mentioned but aren't members or do nothing */ - resolution?: ValueOf | null; - - /** Collection of accountIDs of users mentioned in message */ - whisperedTo?: number[]; -}; - /** Model of `actionable report mention whisper` report action */ type OriginalMessageActionableReportMentionWhisper = { /** Decision on whether to create a report that were mentioned but doesn't exist or do nothing */ @@ -887,7 +872,6 @@ type OriginalMessageMap = { [CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_ADD_PAYMENT_CARD]: OriginalMessageAddPaymentCard; [CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_JOIN_REQUEST]: OriginalMessageJoinPolicy; [CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_WHISPER]: OriginalMessageActionableMentionWhisper; - [CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_INVITE_TO_SUBMIT_EXPENSE_CONFIRM_WHISPER]: OriginalMessageActionableMentionInviteToSubmitExpenseConfirmWhisper; [CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_REPORT_MENTION_WHISPER]: OriginalMessageActionableReportMentionWhisper; [CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_TRACK_EXPENSE_WHISPER]: OriginalMessageActionableTrackedExpenseWhisper; [CONST.REPORT.ACTIONS.TYPE.POLICY_EXPENSE_CHAT_WELCOME_WHISPER]: OriginalMessagePolicyExpenseChatWelcomeWhisper; diff --git a/src/types/onyx/ReportAction.ts b/src/types/onyx/ReportAction.ts index 731e75f6511dc..417de849917ad 100644 --- a/src/types/onyx/ReportAction.ts +++ b/src/types/onyx/ReportAction.ts @@ -76,11 +76,7 @@ type Message = { currency?: string; /** resolution for actionable mention whisper */ - resolution?: - | ValueOf - | ValueOf - | ValueOf - | null; + resolution?: ValueOf | ValueOf | null; /** The time this report action was deleted */ deleted?: string;