From ae0ebff842ec4bff31ef76f93ceadad464878342 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 31 Jul 2025 08:37:17 +0000 Subject: [PATCH 1/3] Update version to 9.1.87-11 (cherry picked from commit f9b0e80894b61c8205a4f79065ab93f7a5f8b82f) (cherry-picked to staging by grgia) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NotificationServiceExtension/Info.plist | 2 +- ios/ShareViewController/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 104dd84a419df..8b209b161a52e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -114,8 +114,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1009018709 - versionName "9.1.87-9" + versionCode 1009018711 + versionName "9.1.87-11" // Supported language variants must be declared here to avoid from being removed during the compilation. // This also helps us to not include unnecessary language variants in the APK. resConfigs "en", "es" diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 23a53980ce796..8e0055b383e6a 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -44,7 +44,7 @@ CFBundleVersion - 9.1.87.9 + 9.1.87.11 FullStory OrgId diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index 4abd04ac0bf77..7c2189978378c 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.1.87 CFBundleVersion - 9.1.87.9 + 9.1.87.11 NSExtension NSExtensionPointIdentifier diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist index ab3e5f67e9cf9..e5dc5f7bf2d0d 100644 --- a/ios/ShareViewController/Info.plist +++ b/ios/ShareViewController/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.1.87 CFBundleVersion - 9.1.87.9 + 9.1.87.11 NSExtension NSExtensionAttributes diff --git a/package-lock.json b/package-lock.json index 25fcf298711cf..ed5ee983405ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.1.87-9", + "version": "9.1.87-11", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.1.87-9", + "version": "9.1.87-11", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 3d6c81d2e7bff..63910421bc9e4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.1.87-9", + "version": "9.1.87-11", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", From 350db74ccb9813c571170ab04cc914b08dbd4903 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 31 Jul 2025 08:37:56 +0000 Subject: [PATCH 2/3] Update Mobile-Expensify submodule version to 9.1.87-11 --- Mobile-Expensify | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mobile-Expensify b/Mobile-Expensify index d63f12c0bdbaa..ee93fff832e27 160000 --- a/Mobile-Expensify +++ b/Mobile-Expensify @@ -1 +1 @@ -Subproject commit d63f12c0bdbaa3ff7b95041f647d141f95186320 +Subproject commit ee93fff832e27fdb9bbfcf1e4afd36a593a6de08 From 93517bdfd78143d0cd9f35a57e46f98573ac40ec Mon Sep 17 00:00:00 2001 From: Chuck Dries Date: Tue, 29 Jul 2025 14:47:08 -0700 Subject: [PATCH 3/3] Merge pull request #67361 from Expensify/chuckdries/revert-66049 Revert workspace-chat-invite-whisper (cherry picked from commit 942ac32a031dc110a513c9de637ddaeaffcf81ee) (cherry-picked to staging by grgia) --- 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 | 42 +------------ .../home/report/PureReportActionItem.tsx | 62 +++++-------------- src/pages/home/report/ReportActionItem.tsx | 2 - src/types/onyx/OriginalMessage.ts | 16 ----- src/types/onyx/ReportAction.ts | 6 +- 18 files changed, 33 insertions(+), 147 deletions(-) diff --git a/src/CONST/index.ts b/src/CONST/index.ts index 732b53c262440..0325c6ccb870e 100755 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -1104,7 +1104,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', @@ -1289,12 +1288,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 01641b41b0762..8d639b4654709 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -6304,8 +6304,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 01eac43d6b76f..bc98b2f4c3ab9 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -6273,8 +6273,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 75b29c8082bc7..79178a01c2dcd 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -6737,8 +6737,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 7ebd9afa5cdc9..1d43d3a4211ee 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -6316,8 +6316,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 4d142f10e1dba..aed4c722ae324 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -6319,9 +6319,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 b764681c4d688..6c395d3e5c74d 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -6277,8 +6277,7 @@ const translations = { levelThreeResult: 'チャンネルからメッセージが削除され、匿名の警告が行われ、メッセージがレビューのために報告されました。', }, actionableMentionWhisperOptions: { - inviteToSubmitExpense: '経費の提出に招待する', - inviteToChat: 'チャットのみ招待', + invite: '招待する', nothing: '何もしない', }, actionableMentionJoinWorkspaceOptions: { diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 575bfe75fa8e7..d68151bf9c02a 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -6311,9 +6311,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 390ea10d533ec..a99f8f643e7b8 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -6296,9 +6296,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 ee4ecda3ef846..8eaa09c1c0231 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -6309,8 +6309,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 3d185cef6e12a..ca70ebb15394f 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -6197,9 +6197,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 a909bad543e0b..40d12e88f016d 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 @@ -2997,7 +2991,6 @@ export { isActionableJoinRequest, isActionableJoinRequestPending, isActionableMentionWhisper, - isActionableMentionInviteToSubmitExpenseConfirmWhisper, isActionableReportMentionWhisper, isActionableTrackExpense, isExpenseChatWelcomeWhisper, diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts index 2d13952d3655c..6711e6a0c2da8 100644 --- a/src/libs/actions/Report.ts +++ b/src/libs/actions/Report.ts @@ -200,7 +200,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, @@ -4362,37 +4362,10 @@ function clearNewRoomFormError() { function resolveActionableMentionWhisper( reportID: string | undefined, reportAction: OnyxEntry, - resolution: ValueOf | ValueOf, - 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)); - addMembersToWorkspace( - { - [`${actionOriginalMessage.inviteeEmails?.at(0)}`]: actionOriginalMessage.inviteeAccountIDs?.at(0) ?? CONST.DEFAULT_NUMBER_ID, - }, - `${welcomeNoteSubject}\n\n${welcomeNote}`, - policyID, - policyMemberAccountIDs, - CONST.POLICY.ROLE.USER, - ); - } - } - const message = ReportActionsUtils.getReportActionMessage(reportAction); - if (!message) { + if (!message || !reportAction || !reportID) { return; } @@ -4466,14 +4439,6 @@ function resolveActionableMentionWhisper( API.write(WRITE_COMMANDS.RESOLVE_ACTIONABLE_MENTION_WHISPER, parameters, {optimisticData, failureData}); } -function resolveActionableMentionConfirmWhisper( - reportID: string | undefined, - reportAction: OnyxEntry, - resolution: ValueOf, -) { - resolveActionableMentionWhisper(reportID, reportAction, resolution); -} - function resolveActionableReportMentionWhisper( reportId: string | undefined, reportAction: OnyxEntry, @@ -5921,7 +5886,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 dc6f16e1dd82f..ccd42f64ca1a5 100644 --- a/src/pages/home/report/PureReportActionItem.tsx +++ b/src/pages/home/report/PureReportActionItem.tsx @@ -54,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, @@ -99,7 +99,6 @@ import { getWorkspaceUpdateFieldMessage, isActionableAddPaymentCard, isActionableJoinRequest, - isActionableMentionInviteToSubmitExpenseConfirmWhisper, isActionableMentionWhisper, isActionableReportMentionWhisper, isActionableTrackExpense, @@ -158,7 +157,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'; @@ -326,7 +325,6 @@ type PureReportActionItemProps = { reportId: string | undefined, reportAction: OnyxEntry, resolution: ValueOf, - policy: OnyxEntry, ) => void; /** Whether the provided report is a closed expense report with no expenses */ @@ -361,9 +359,6 @@ type PureReportActionItemProps = { /** Whether to show border for MoneyRequestReportPreviewContent */ shouldShowBorder?: 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 @@ -427,8 +422,7 @@ function PureReportActionItem({ clearAllRelatedReportActionErrors = () => {}, dismissTrackExpenseActionableWhisper = () => {}, userBillingFundID, - shouldShowBorder, - currentUserAccountID, + shouldShowBorder }: PureReportActionItemProps) { const actionSheetAwareScrollViewContext = useContext(ActionSheetAwareScrollView.ActionSheetAwareScrollViewContext); const {translate, datetimeToCalendarTime, formatPhoneNumber} = useLocalize(); @@ -452,8 +446,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( @@ -808,57 +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), - 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, 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, 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, policy), - isMediumSized: true, + onPress: () => resolveActionableMentionWhisper(reportID, action, CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION.NOTHING), }, - ); - return actionableMentionWhisperOptions; + ]; }, [ action, - userBillingFundID, isActionableWhisper, - policy, - currentUserAccountID, reportID, - originalReportID, - isBetaEnabled, + userBillingFundID, createDraftTransactionAndNavigateToParticipantSelector, dismissTrackExpenseActionableWhisper, resolveActionableReportMentionWhisper, resolveActionableMentionWhisper, + originalReportID, + isBetaEnabled, ]); /** @@ -1263,7 +1229,7 @@ function PureReportActionItem({ {actionableItemButtons.length > 0 && ( )} diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx index aadfc53409737..8ed65d756be0e 100644 --- a/src/pages/home/report/ReportActionItem.tsx +++ b/src/pages/home/report/ReportActionItem.tsx @@ -53,7 +53,6 @@ function ReportActionItem({allReports, policies, action, report, transactions, s 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 [draftMessage] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${originalReportID}`, { canBeMissing: true, selector: (draftMessagesForReport) => { @@ -96,7 +95,6 @@ function ReportActionItem({allReports, policies, action, report, transactions, s 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 cea4803cd6fb1..09cd4797b973c 100644 --- a/src/types/onyx/OriginalMessage.ts +++ b/src/types/onyx/OriginalMessage.ts @@ -116,9 +116,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[]; @@ -129,18 +126,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 */ @@ -872,7 +857,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 339745e6291d5..5667284fdba17 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;