, policy: OnyxEntry, policy: OnyxEntry | undefined = undefined): string {
const moneyRequestTotal = getMoneyRequestReimbursableTotal(report);
const formattedAmount = CurrencyUtils.convertToDisplayString(moneyRequestTotal, report?.currency, hasOnlyDistanceRequestTransactions(report?.reportID));
- const payerName = isExpenseReport(report) ? getPolicyName(report, false, policy) : getDisplayNameForParticipant(report?.managerID) ?? '';
+ const payerOrApproverName = isExpenseReport(report) ? getPolicyName(report, false, policy) : getDisplayNameForParticipant(report?.managerID) ?? '';
const payerPaidAmountMessage = Localize.translateLocal('iou.payerPaidAmount', {
- payer: payerName,
+ payer: payerOrApproverName,
amount: formattedAmount,
});
+ if (isReportApproved(report)) {
+ return Localize.translateLocal('iou.managerApprovedAmount', {
+ manager: payerOrApproverName,
+ amount: formattedAmount,
+ });
+ }
+
if (report?.isWaitingOnBankAccount) {
return `${payerPaidAmountMessage} • ${Localize.translateLocal('iou.pending')}`;
}
@@ -1725,11 +1755,11 @@ function getMoneyRequestReportName(report: OnyxEntry, policy: OnyxEntry<
}
if (hasNonReimbursableTransactions(report?.reportID)) {
- return Localize.translateLocal('iou.payerSpentAmount', {payer: payerName, amount: formattedAmount});
+ return Localize.translateLocal('iou.payerSpentAmount', {payer: payerOrApproverName, amount: formattedAmount});
}
- if (!!report?.hasOutstandingIOU || isDraftExpenseReport(report) || moneyRequestTotal === 0) {
- return Localize.translateLocal('iou.payerOwesAmount', {payer: payerName, amount: formattedAmount});
+ if (isProcessingReport(report) || isDraftExpenseReport(report) || moneyRequestTotal === 0) {
+ return Localize.translateLocal('iou.payerOwesAmount', {payer: payerOrApproverName, amount: formattedAmount});
}
return payerPaidAmountMessage;
@@ -1783,6 +1813,10 @@ function canEditMoneyRequest(reportAction: OnyxEntry, fieldToEdit
return true;
}
+ if (reportAction.originalMessage.type !== CONST.IOU.REPORT_ACTION_TYPE.CREATE) {
+ return false;
+ }
+
const moneyRequestReportID = reportAction?.originalMessage?.IOUReportID ?? 0;
if (!moneyRequestReportID) {
@@ -1791,6 +1825,7 @@ function canEditMoneyRequest(reportAction: OnyxEntry, fieldToEdit
const moneyRequestReport = getReport(String(moneyRequestReportID));
const isReportSettled = isSettled(moneyRequestReport?.reportID);
+ const isApproved = isReportApproved(moneyRequestReport);
const isAdmin = isExpenseReport(moneyRequestReport) && (getPolicy(moneyRequestReport?.policyID ?? '')?.role ?? '') === CONST.POLICY.ROLE.ADMIN;
const isRequestor = currentUserAccountID === reportAction?.actorAccountID;
@@ -1802,7 +1837,7 @@ function canEditMoneyRequest(reportAction: OnyxEntry, fieldToEdit
return true;
}
- return !isReportSettled && isRequestor;
+ return !isApproved && !isReportSettled && isRequestor;
}
/**
@@ -1962,8 +1997,11 @@ function getReportPreviewMessage(
const payerName = isExpenseReport(report) ? getPolicyName(report, false, policy) : getDisplayNameForParticipant(report.managerID, true);
const formattedAmount = CurrencyUtils.convertToDisplayString(totalAmount, report.currency);
- if (isReportApproved(report) && getPolicyType(report, allPolicies) === CONST.POLICY.TYPE.CORPORATE) {
- return `approved ${formattedAmount}`;
+ if (isReportApproved(report) && isGroupPolicy(report)) {
+ return Localize.translateLocal('iou.managerApprovedAmount', {
+ manager: payerName ?? '',
+ amount: formattedAmount,
+ });
}
if (isNotEmptyObject(reportAction) && shouldConsiderReceiptBeingScanned && reportAction && ReportActionsUtils.isMoneyRequestAction(reportAction)) {
@@ -2085,7 +2123,7 @@ function getModifiedExpenseMessage(reportAction: OnyxEntry): strin
const hasModifiedCreated = reportActionOriginalMessage && 'oldCreated' in reportActionOriginalMessage && 'created' in reportActionOriginalMessage;
if (hasModifiedCreated) {
// Take only the YYYY-MM-DD value as the original date includes timestamp
- let formattedOldCreated: Date | string = new Date(reportActionOriginalMessage?.oldCreated ?? 0);
+ let formattedOldCreated: Date | string = new Date(reportActionOriginalMessage?.oldCreated ? reportActionOriginalMessage.oldCreated : 0);
formattedOldCreated = format(formattedOldCreated, CONST.DATE.FNS_FORMAT_STRING);
return getProperSchemaForModifiedExpenseMessage(reportActionOriginalMessage?.created ?? '', formattedOldCreated?.toString?.(), Localize.translateLocal('common.date'), false);
@@ -2394,7 +2432,7 @@ function getParsedComment(text: string): string {
return text.length <= CONST.MAX_MARKUP_LENGTH ? parser.replace(text) : lodashEscape(text);
}
-function buildOptimisticAddCommentReportAction(text?: string, file?: File & {source: string; uri: string}): OptimisticReportAction {
+function buildOptimisticAddCommentReportAction(text?: string, file?: File): OptimisticReportAction {
const parser = new ExpensiMark();
const commentText = getParsedComment(text ?? '');
const isAttachment = !text && file !== undefined;
@@ -2553,8 +2591,6 @@ function buildOptimisticIOUReport(payeeAccountID: number, payerAccountID: number
const personalDetails = getPersonalDetailsForAccountID(payerAccountID);
const payerEmail = 'login' in personalDetails ? personalDetails.login : '';
return {
- // If we're sending money, hasOutstandingIOU should be false
- hasOutstandingIOU: !isSendingMoney,
type: CONST.REPORT.TYPE.IOU,
cachedTotal: formattedTotal,
chatReportID,
@@ -2608,7 +2644,6 @@ function buildOptimisticExpenseReport(chatReportID: string, policyID: string, pa
policyID,
type: CONST.REPORT.TYPE.EXPENSE,
ownerAccountID: payeeAccountID,
- hasOutstandingIOU: true,
currency: outputCurrency,
// We don't translate reportName because the server response is always in English
@@ -3077,7 +3112,7 @@ function buildOptimisticChatReport(
oldPolicyName = '',
visibility: ValueOf | undefined = undefined,
writeCapability: ValueOf | undefined = undefined,
- notificationPreference: string | number = CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS,
+ notificationPreference: NotificationPreference = CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS,
parentReportActionID = '',
parentReportID = '',
welcomeMessage = '',
@@ -3087,7 +3122,6 @@ function buildOptimisticChatReport(
return {
type: CONST.REPORT.TYPE.CHAT,
chatType,
- hasOutstandingIOU: false,
isOwnPolicyExpenseChat,
isPinned: reportName === CONST.REPORT.WORKSPACE_CHAT_ROOMS.ADMINS || isNewlyCreatedWorkspaceChat,
lastActorAccountID: 0,
@@ -3648,8 +3682,8 @@ function getRouteFromLink(url: string | null): string {
// Get the reportID from URL
let route = url;
+ const localWebAndroidRegEx = /^(https:\/\/([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3}))/;
linkingConfig.prefixes.forEach((prefix) => {
- const localWebAndroidRegEx = /^(http:\/\/([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3}))/;
if (route.startsWith(prefix)) {
route = route.replace(prefix, '');
} else if (localWebAndroidRegEx.test(route)) {
@@ -4149,15 +4183,15 @@ function getIOUReportActionDisplayMessage(reportAction: OnyxEntry)
return '';
}
const originalMessage = reportAction.originalMessage;
+ const {IOUReportID} = originalMessage;
+ const iouReport = getReport(IOUReportID);
let translationKey: TranslationPaths;
if (originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY) {
- const {IOUReportID} = originalMessage;
// The `REPORT_ACTION_TYPE.PAY` action type is used for both fulfilling existing requests and sending money. To
// differentiate between these two scenarios, we check if the `originalMessage` contains the `IOUDetails`
// property. If it does, it indicates that this is a 'Send money' action.
const {amount, currency} = originalMessage.IOUDetails ?? originalMessage;
const formattedAmount = CurrencyUtils.convertToDisplayString(amount, currency) ?? '';
- const iouReport = getReport(IOUReportID);
const payerName = isExpenseReport(iouReport) ? getPolicyName(iouReport) : getDisplayNameForParticipant(iouReport?.managerID, true);
switch (originalMessage.paymentType) {
@@ -4179,11 +4213,17 @@ function getIOUReportActionDisplayMessage(reportAction: OnyxEntry)
const transactionDetails = getTransactionDetails(isNotEmptyObject(transaction) ? transaction : null);
const formattedAmount = CurrencyUtils.convertToDisplayString(transactionDetails?.amount ?? 0, transactionDetails?.currency);
const isRequestSettled = isSettled(originalMessage.IOUReportID);
+ const isApproved = isReportApproved(iouReport);
if (isRequestSettled) {
return Localize.translateLocal('iou.payerSettled', {
amount: formattedAmount,
});
}
+ if (isApproved) {
+ return Localize.translateLocal('iou.approvedAmount', {
+ amount: formattedAmount,
+ });
+ }
translationKey = ReportActionsUtils.isSplitBillAction(reportAction) ? 'iou.didSplitAmount' : 'iou.requestedAmount';
return Localize.translateLocal(translationKey, {
formattedAmount,
@@ -4191,44 +4231,6 @@ function getIOUReportActionDisplayMessage(reportAction: OnyxEntry)
});
}
-/**
- * Return room channel log display message
- */
-function getChannelLogMemberMessage(reportAction: OnyxEntry): string {
- const verb =
- reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ROOMCHANGELOG.INVITE_TO_ROOM || reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICYCHANGELOG.INVITE_TO_ROOM
- ? 'invited'
- : 'removed';
-
- const mentions = (reportAction?.originalMessage as ChangeLog)?.targetAccountIDs?.map(() => {
- const personalDetail = allPersonalDetails?.accountID;
- const displayNameOrLogin = LocalePhoneNumber.formatPhoneNumber(personalDetail?.login ?? '') || (personalDetail?.displayName ?? '') || Localize.translateLocal('common.hidden');
- return `@${displayNameOrLogin}`;
- });
-
- const lastMention = mentions?.pop();
- let message = '';
-
- if (mentions?.length === 0) {
- message = `${verb} ${lastMention}`;
- } else if (mentions?.length === 1) {
- message = `${verb} ${mentions?.[0]} and ${lastMention}`;
- } else {
- message = `${verb} ${mentions?.join(', ')}, and ${lastMention}`;
- }
-
- const roomName = (reportAction?.originalMessage as ChangeLog)?.roomName ?? '';
- if (roomName) {
- const preposition =
- reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ROOMCHANGELOG.INVITE_TO_ROOM || reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICYCHANGELOG.INVITE_TO_ROOM
- ? ' to'
- : ' from';
- message += `${preposition} ${roomName}`;
- }
-
- return message;
-}
-
/**
* Checks if a report is a group chat.
*
@@ -4306,12 +4308,12 @@ function shouldAutoFocusOnKeyPress(event: KeyboardEvent): boolean {
* Navigates to the appropriate screen based on the presence of a private note for the current user.
*/
function navigateToPrivateNotes(report: Report, session: Session) {
- if (isEmpty(report) || isEmpty(session)) {
+ if (isEmpty(report) || isEmpty(session) || !session.accountID) {
return;
}
- const currentUserPrivateNote = report.privateNotes?.[String(session.accountID)]?.note ?? '';
+ const currentUserPrivateNote = report.privateNotes?.[session.accountID]?.note ?? '';
if (isEmpty(currentUserPrivateNote)) {
- Navigation.navigate(ROUTES.PRIVATE_NOTES_EDIT.getRoute(report.reportID, String(session.accountID)));
+ Navigation.navigate(ROUTES.PRIVATE_NOTES_EDIT.getRoute(report.reportID, session.accountID));
return;
}
Navigation.navigate(ROUTES.PRIVATE_NOTES_LIST.getRoute(report.reportID));
@@ -4346,6 +4348,7 @@ export {
isPublicRoom,
isPublicAnnounceRoom,
isConciergeChatReport,
+ isProcessingReport,
isCurrentUserTheOnlyParticipant,
hasAutomatedExpensifyAccountIDs,
hasExpensifyGuidesEmails,
@@ -4359,6 +4362,8 @@ export {
isPolicyExpenseChat,
isControlPolicyExpenseChat,
isControlPolicyExpenseReport,
+ isGroupPolicyExpenseChat,
+ isGroupPolicyExpenseReport,
getIconsForParticipants,
getIcons,
getRoomWelcomeMessage,
@@ -4479,7 +4484,6 @@ export {
getReimbursementQueuedActionMessage,
getReimbursementDeQueuedActionMessage,
getPersonalDetailsForAccountID,
- getChannelLogMemberMessage,
getRoom,
shouldDisableWelcomeMessage,
navigateToPrivateNotes,
@@ -4488,4 +4492,4 @@ export {
shouldAutoFocusOnKeyPress,
};
-export type {OptionData};
+export type {OptionData, OptimisticChatReport};
diff --git a/src/libs/SessionUtils.ts b/src/libs/SessionUtils.ts
index 6cd20e0b56b2..c73513c747af 100644
--- a/src/libs/SessionUtils.ts
+++ b/src/libs/SessionUtils.ts
@@ -35,8 +35,9 @@ Onyx.connect({
if (loggedInDuringSession) {
return;
}
-
- if (session?.authToken) {
+ // We are incorporating a check for 'signedInWithShortLivedAuthToken' to handle cases where login is performed using a ShortLivedAuthToken
+ // This check is necessary because, with ShortLivedAuthToken, 'authToken' gets populated, leading to 'loggedInDuringSession' being assigned a false value
+ if (session?.authToken && !session?.signedInWithShortLivedAuthToken) {
loggedInDuringSession = false;
} else {
loggedInDuringSession = true;
@@ -45,7 +46,7 @@ Onyx.connect({
});
function resetDidUserLogInDuringSession() {
- loggedInDuringSession = undefined;
+ loggedInDuringSession = true;
}
function didUserLogInDuringSession() {
diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index 1da1469a2687..1813d4f0a795 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -185,7 +185,8 @@ function getOrderedReportIDs(
report.iouReportAmount = ReportUtils.getMoneyRequestReimbursableTotal(report, allReports);
const isPinned = report.isPinned ?? false;
- if (isPinned || ReportUtils.requiresAttentionFromCurrentUser(report)) {
+ const reportAction = ReportActionsUtils.getReportAction(report.parentReportID ?? '', report.parentReportActionID ?? '');
+ if (isPinned || ReportUtils.requiresAttentionFromCurrentUser(report, reportAction)) {
pinnedAndGBRReports.push(report);
} else if (report.hasDraft) {
draftReports.push(report);
@@ -245,7 +246,6 @@ function getOptionData(
const result: ReportUtils.OptionData = {
alternateText: null,
- pendingAction: null,
allReportErrors: null,
brickRoadIndicator: null,
tooltipText: null,
@@ -260,7 +260,6 @@ function getOptionData(
keyForList: null,
searchText: null,
isPinned: false,
- hasOutstandingIOU: false,
hasOutstandingChildRequest: false,
isIOUReportOwner: null,
iouReportAmount: 0,
@@ -285,7 +284,7 @@ function getOptionData(
result.isExpenseRequest = ReportUtils.isExpenseRequest(report);
result.isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
result.shouldShowSubscript = ReportUtils.shouldReportShowSubscript(report);
- result.pendingAction = report.pendingFields ? report.pendingFields.addWorkspaceRoom || report.pendingFields.createChat : null;
+ result.pendingAction = report.pendingFields ? report.pendingFields.addWorkspaceRoom || report.pendingFields.createChat : undefined;
result.allReportErrors = OptionsListUtils.getAllReportErrors(report, reportActions) as OnyxCommon.Errors;
result.brickRoadIndicator = Object.keys(result.allReportErrors ?? {}).length !== 0 ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : '';
result.ownerAccountID = report.ownerAccountID;
@@ -301,11 +300,10 @@ function getOptionData(
result.iouReportID = report.iouReportID;
result.keyForList = String(report.reportID);
result.tooltipText = ReportUtils.getReportParticipantsTitle(report.participantAccountIDs ?? []);
- result.hasOutstandingIOU = report.hasOutstandingIOU;
result.hasOutstandingChildRequest = report.hasOutstandingChildRequest;
result.parentReportID = report.parentReportID ?? '';
result.isWaitingOnBankAccount = report.isWaitingOnBankAccount;
- result.notificationPreference = report.notificationPreference ?? '';
+ result.notificationPreference = report.notificationPreference;
result.isAllowedToComment = ReportUtils.canUserPerformWriteAction(report);
result.chatType = report.chatType;
@@ -373,17 +371,17 @@ function getOptionData(
const targetAccountIDs = lastAction?.originalMessage?.targetAccountIDs ?? [];
const verb =
lastAction.actionName === CONST.REPORT.ACTIONS.TYPE.ROOMCHANGELOG.INVITE_TO_ROOM || lastAction.actionName === CONST.REPORT.ACTIONS.TYPE.POLICYCHANGELOG.INVITE_TO_ROOM
- ? 'invited'
- : 'removed';
- const users = targetAccountIDs.length > 1 ? 'users' : 'user';
+ ? Localize.translate(preferredLocale, 'workspace.invite.invited')
+ : Localize.translate(preferredLocale, 'workspace.invite.removed');
+ const users = Localize.translate(preferredLocale, targetAccountIDs.length > 1 ? 'workspace.invite.users' : 'workspace.invite.user');
result.alternateText = `${verb} ${targetAccountIDs.length} ${users}`;
const roomName = lastAction?.originalMessage?.roomName ?? '';
if (roomName) {
const preposition =
lastAction.actionName === CONST.REPORT.ACTIONS.TYPE.ROOMCHANGELOG.INVITE_TO_ROOM || lastAction.actionName === CONST.REPORT.ACTIONS.TYPE.POLICYCHANGELOG.INVITE_TO_ROOM
- ? ' to'
- : ' from';
+ ? ` ${Localize.translate(preferredLocale, 'workspace.invite.to')}`
+ : ` ${Localize.translate(preferredLocale, 'workspace.invite.from')}`;
result.alternateText += `${preposition} ${roomName}`;
}
} else if (lastAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.REPORTPREVIEW && lastActorDisplayName && lastMessageTextFromReport) {
diff --git a/src/libs/UserUtils.ts b/src/libs/UserUtils.ts
index 29a43bcf711d..e95b62cc2437 100644
--- a/src/libs/UserUtils.ts
+++ b/src/libs/UserUtils.ts
@@ -1,9 +1,13 @@
import Str from 'expensify-common/lib/str';
+import _ from 'lodash';
+import Onyx, {OnyxEntry} from 'react-native-onyx';
import {SvgProps} from 'react-native-svg';
import {ValueOf} from 'type-fest';
import * as defaultAvatars from '@components/Icon/DefaultAvatars';
import {ConciergeAvatar, FallbackAvatar} from '@components/Icon/Expensicons';
import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import {PersonalDetails} from '@src/types/onyx';
import Login from '@src/types/onyx/Login';
import hashCode from './hashCode';
@@ -13,6 +17,12 @@ type AvatarSource = React.FC | string;
type LoginListIndicator = ValueOf | '';
+let allPersonalDetails: OnyxEntry>;
+Onyx.connect({
+ key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+ callback: (val) => (allPersonalDetails = _.isEmpty(val) ? {} : val),
+});
+
/**
* Searches through given loginList for any contact method / login with an error.
*
@@ -68,12 +78,19 @@ function hashText(text: string, range: number): number {
return Math.abs(hashCode(text.toLowerCase())) % range;
}
+/**
+ * Generate a random accountID base on searchValue.
+ */
+function generateAccountID(searchValue: string): number {
+ return hashText(searchValue, 2 ** 32);
+}
+
/**
* Helper method to return the default avatar associated with the given accountID
* @param [accountID]
* @returns
*/
-function getDefaultAvatar(accountID = -1): React.FC {
+function getDefaultAvatar(accountID = -1, avatarURL?: string): React.FC {
if (accountID <= 0) {
return FallbackAvatar;
}
@@ -83,22 +100,35 @@ function getDefaultAvatar(accountID = -1): React.FC {
// There are 24 possible default avatars, so we choose which one this user has based
// on a simple modulo operation of their login number. Note that Avatar count starts at 1.
- const accountIDHashBucket = ((accountID % CONST.DEFAULT_AVATAR_COUNT) + 1) as AvatarRange;
+ // When creating a chat, we generate an avatar using an ID and the backend response will modify the ID to the actual user ID.
+ // But the avatar link still corresponds to the original ID-generated link. So we extract the SVG image number from the backend's link instead of using the user ID directly
+ let accountIDHashBucket: AvatarRange;
+ if (avatarURL) {
+ const match = avatarURL.match(/(?<=default-avatar_)\d+(?=\.)/);
+ const lastDigit = match && parseInt(match[0], 10);
+ accountIDHashBucket = lastDigit as AvatarRange;
+ } else {
+ accountIDHashBucket = ((accountID % CONST.DEFAULT_AVATAR_COUNT) + 1) as AvatarRange;
+ }
return defaultAvatars[`Avatar${accountIDHashBucket}`];
}
/**
* Helper method to return default avatar URL associated with login
*/
-function getDefaultAvatarURL(accountID: string | number = '', isNewDot = false): string {
+function getDefaultAvatarURL(accountID: string | number = ''): string {
if (Number(accountID) === CONST.ACCOUNT_ID.CONCIERGE) {
return CONST.CONCIERGE_ICON_URL;
}
+ // To ensure that the avatar remains unchanged and matches the one returned by the backend,
+ // utilize an optimistic ID generated from the email instead of directly using the user ID.
+ const email = allPersonalDetails?.[accountID]?.login;
+ const originalOptimisticAccountID = email ? generateAccountID(email) : accountID;
// Note that Avatar count starts at 1 which is why 1 has to be added to the result (or else 0 would result in a broken avatar link)
- const accountIDHashBucket = (Number(accountID) % (isNewDot ? CONST.DEFAULT_AVATAR_COUNT : CONST.OLD_DEFAULT_AVATAR_COUNT)) + 1;
- const avatarPrefix = isNewDot ? `default-avatar` : `avatar`;
+ const accountIDHashBucket = (Number(originalOptimisticAccountID) % CONST.DEFAULT_AVATAR_COUNT) + 1;
+ const avatarPrefix = `default-avatar`;
return `${CONST.CLOUDFRONT_URL}/images/avatars/${avatarPrefix}_${accountIDHashBucket}.png`;
}
@@ -135,7 +165,7 @@ function isDefaultAvatar(avatarSource?: AvatarSource): boolean {
* @param accountID - the accountID of the user
*/
function getAvatar(avatarSource: AvatarSource, accountID?: number): AvatarSource {
- return isDefaultAvatar(avatarSource) ? getDefaultAvatar(accountID) : avatarSource;
+ return isDefaultAvatar(avatarSource) ? getDefaultAvatar(accountID, avatarSource as string) : avatarSource;
}
/**
@@ -146,7 +176,7 @@ function getAvatar(avatarSource: AvatarSource, accountID?: number): AvatarSource
* @param accountID - the accountID of the user
*/
function getAvatarUrl(avatarURL: string, accountID: number): string {
- return isDefaultAvatar(avatarURL) ? getDefaultAvatarURL(accountID, true) : avatarURL;
+ return isDefaultAvatar(avatarURL) ? getDefaultAvatarURL(accountID) : avatarURL;
}
/**
@@ -184,13 +214,6 @@ function getSmallSizeAvatar(avatarSource: AvatarSource, accountID?: number): Ava
return `${source.substring(0, lastPeriodIndex)}_128${source.substring(lastPeriodIndex)}`;
}
-/**
- * Generate a random accountID base on searchValue.
- */
-function generateAccountID(searchValue: string): number {
- return hashText(searchValue, 2 ** 32);
-}
-
/**
* Gets the secondary phone login number
*/
diff --git a/src/libs/ValidationUtils.ts b/src/libs/ValidationUtils.ts
index 388020bc0d6d..ba977312fcfb 100644
--- a/src/libs/ValidationUtils.ts
+++ b/src/libs/ValidationUtils.ts
@@ -1,5 +1,5 @@
import {parsePhoneNumber} from 'awesome-phonenumber';
-import {addYears, endOfMonth, format, isAfter, isBefore, isSameDay, isValid, isWithinInterval, parse, startOfDay, subYears} from 'date-fns';
+import {addYears, endOfMonth, format, isAfter, isBefore, isSameDay, isValid, isWithinInterval, parse, parseISO, startOfDay, subYears} from 'date-fns';
import {URL_REGEX_WITH_REQUIRED_PROTOCOL} from 'expensify-common/lib/Url';
import isDate from 'lodash/isDate';
import isEmpty from 'lodash/isEmpty';
@@ -8,6 +8,7 @@ import CONST from '@src/CONST';
import {Report} from '@src/types/onyx';
import * as OnyxCommon from '@src/types/onyx/OnyxCommon';
import * as CardUtils from './CardUtils';
+import DateUtils from './DateUtils';
import * as LoginUtils from './LoginUtils';
import StringUtils from './StringUtils';
@@ -195,6 +196,28 @@ function getAgeRequirementError(date: string, minimumAge: number, maximumAge: nu
return ['privatePersonalDetails.error.dateShouldBeAfter', {dateString: format(minimalDate, CONST.DATE.FNS_FORMAT_STRING)}];
}
+/**
+ * Validate that given date is not in the past.
+ */
+function getDatePassedError(inputDate: string): string {
+ const currentDate = new Date();
+ const parsedDate = new Date(`${inputDate}T00:00:00`); // set time to 00:00:00 for accurate comparison
+
+ // If input date is not valid, return an error
+ if (!isValid(parsedDate)) {
+ return 'common.error.dateInvalid';
+ }
+
+ // Clear time for currentDate so comparison is based solely on the date
+ currentDate.setHours(0, 0, 0, 0);
+
+ if (parsedDate < currentDate) {
+ return 'common.error.dateInvalid';
+ }
+
+ return '';
+}
+
/**
* Similar to backend, checks whether a website has a valid URL or not.
* http/https/ftp URL scheme required.
@@ -361,6 +384,27 @@ function isValidAccountRoute(accountID: number): boolean {
return CONST.REGEX.NUMBER.test(String(accountID)) && accountID > 0;
}
+/**
+ * Validates that the date and time are at least one minute in the future.
+ * data - A date and time string in 'YYYY-MM-DD HH:mm:ss.sssZ' format
+ * returns an object containing the error messages for the date and time
+ */
+const validateDateTimeIsAtLeastOneMinuteInFuture = (data: string): {dateValidationErrorKey: string; timeValidationErrorKey: string} => {
+ if (!data) {
+ return {
+ dateValidationErrorKey: '',
+ timeValidationErrorKey: '',
+ };
+ }
+ const parsedInputData = parseISO(data);
+
+ const dateValidationErrorKey = DateUtils.getDayValidationErrorKey(parsedInputData);
+ const timeValidationErrorKey = DateUtils.getTimeValidationErrorKey(parsedInputData);
+ return {
+ dateValidationErrorKey,
+ timeValidationErrorKey,
+ };
+};
type ValuesType = Record;
/**
@@ -412,7 +456,9 @@ export {
doesContainReservedWord,
isNumeric,
isValidAccountRoute,
+ getDatePassedError,
isValidRecoveryCode,
+ validateDateTimeIsAtLeastOneMinuteInFuture,
prepareValues,
isValidPersonName,
};
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 744f3f4c575b..802f0f00fffd 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -15,6 +15,7 @@ import * as Localize from '@libs/Localize';
import Navigation from '@libs/Navigation/Navigation';
import * as NumberUtils from '@libs/NumberUtils';
import * as OptionsListUtils from '@libs/OptionsListUtils';
+import Permissions from '@libs/Permissions';
import * as ReportActionsUtils from '@libs/ReportActionsUtils';
import * as ReportUtils from '@libs/ReportUtils';
import * as TransactionUtils from '@libs/TransactionUtils';
@@ -25,6 +26,12 @@ import ROUTES from '@src/ROUTES';
import * as Policy from './Policy';
import * as Report from './Report';
+let betas;
+Onyx.connect({
+ key: ONYXKEYS.BETAS,
+ callback: (val) => (betas = val || []),
+});
+
let allPersonalDetails;
Onyx.connect({
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
@@ -54,6 +61,29 @@ Onyx.connect({
},
});
+let allTransactionDrafts = {};
+Onyx.connect({
+ key: ONYXKEYS.COLLECTION.TRANSACTION_DRAFT,
+ waitForCollectionCallback: true,
+ callback: (val) => {
+ allTransactionDrafts = val || {};
+ },
+});
+
+let allTransactionViolations;
+Onyx.connect({
+ key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
+ waitForCollectionCallback: true,
+ callback: (val) => {
+ if (!val) {
+ allTransactionViolations = {};
+ return;
+ }
+
+ allTransactionViolations = val;
+ },
+});
+
let allDraftSplitTransactions;
Onyx.connect({
key: ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT,
@@ -89,12 +119,22 @@ Onyx.connect({
},
});
+let nextSteps = {};
+Onyx.connect({
+ key: ONYXKEYS.COLLECTION.NEXT_STEP,
+ waitForCollectionCallback: true,
+ callback: (val) => {
+ nextSteps = val || {};
+ },
+});
+
/**
* Initialize money request info
* @param {String} reportID to attach the transaction to
+ * @param {Boolean} isFromGlobalCreate
* @param {String} [iouRequestType] one of manual/scan/distance
*/
-function startMoneyRequest_temporaryForRefactor(reportID, iouRequestType = CONST.IOU.REQUEST_TYPE.MANUAL) {
+function startMoneyRequest_temporaryForRefactor(reportID, isFromGlobalCreate, iouRequestType = CONST.IOU.REQUEST_TYPE.MANUAL) {
// Generate a brand new transactionID
const newTransactionID = CONST.IOU.OPTIMISTIC_TRANSACTION_ID;
const created = currentDate || format(new Date(), 'yyyy-MM-dd');
@@ -118,6 +158,7 @@ function startMoneyRequest_temporaryForRefactor(reportID, iouRequestType = CONST
iouRequestType,
reportID,
transactionID: newTransactionID,
+ isFromGlobalCreate,
});
}
@@ -177,6 +218,13 @@ function setMoneyRequestCategory_temporaryForRefactor(transactionID, category) {
Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {category});
}
+/*
+ * @param {String} transactionID
+ */
+function resetMoneyRequestCategory_temporaryForRefactor(transactionID) {
+ Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {category: null});
+}
+
/*
* @param {String} transactionID
* @param {String} tag
@@ -264,7 +312,6 @@ function buildOnyxDataForMoneyRequest(
...chatReport,
lastReadTime: DateUtils.getDBTime(),
lastMessageTranslationKey: '',
- hasOutstandingIOU: iouReport.total !== 0,
iouReportID: iouReport.reportID,
...(isNewChatReport ? {pendingFields: {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}} : {}),
},
@@ -409,7 +456,6 @@ function buildOnyxDataForMoneyRequest(
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
value: {
- hasOutstandingIOU: chatReport.hasOutstandingIOU,
iouReportID: chatReport.iouReportID,
lastReadTime: chatReport.lastReadTime,
pendingFields: null,
@@ -633,11 +679,12 @@ function getMoneyRequestInformation(
// data. This is a big can of worms to change it to `Onyx.merge()` as explored in https://expensify.slack.com/archives/C05DWUDHVK7/p1692139468252109.
// I want to clean this up at some point, but it's possible this will live in the code for a while so I've created https://github.com/Expensify/App/issues/25417
// to remind me to do this.
- const existingTransaction = existingTransactionID && TransactionUtils.getTransaction(existingTransactionID);
- if (existingTransaction) {
+ const existingTransaction = allTransactionDrafts[`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`];
+ if (existingTransaction && existingTransaction.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE) {
optimisticTransaction = {
...optimisticTransaction,
...existingTransaction,
+ transactionID: optimisticTransaction.transactionID,
};
}
@@ -789,18 +836,17 @@ function createDistanceRequest(report, participant, comment, created, category,
}
/**
- * Edits an existing distance request
- *
* @param {String} transactionID
* @param {Number} transactionThreadReportID
* @param {Object} transactionChanges
- * @param {String} [transactionChanges.created]
- * @param {Number} [transactionChanges.amount]
- * @param {Object} [transactionChanges.comment]
- * @param {Object} [transactionChanges.waypoints]
- *
+ * @param {String} [transactionChanges.created] Present when updated the date field
+ * @param {Boolean} onlyIncludeChangedFields
+ * When 'true', then the returned params will only include the transaction details for the fields that were changed.
+ * When `false`, then the returned params will include all the transaction details, regardless of which fields were changed.
+ * This setting is necessary while the UpdateDistanceRequest API is refactored to be fully 1:1:1 in https://github.com/Expensify/App/issues/28358
+ * @returns {object}
*/
-function editDistanceMoneyRequest(transactionID, transactionThreadReportID, transactionChanges) {
+function getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, onlyIncludeChangedFields) {
const optimisticData = [];
const successData = [];
const failureData = [];
@@ -820,11 +866,15 @@ function editDistanceMoneyRequest(transactionID, transactionThreadReportID, tran
const updatedTransaction = TransactionUtils.getUpdatedTransaction(transaction, transactionChanges, isFromExpenseReport);
const transactionDetails = ReportUtils.getTransactionDetails(updatedTransaction);
+ // This needs to be a JSON string since we're sending this to the MapBox API
+ transactionDetails.waypoints = JSON.stringify(transactionDetails.waypoints);
+
+ const dataToIncludeInParams = onlyIncludeChangedFields ? _.pick(transactionDetails, _.keys(transactionChanges)) : transactionDetails;
+
const params = {
- ...transactionDetails,
+ ...dataToIncludeInParams,
+ reportID: iouReport.reportID,
transactionID,
- // This needs to be a JSON string since we're sending this to the MapBox API
- waypoints: JSON.stringify(transactionDetails.waypoints),
};
// Step 3: Build the modified expense report actions
@@ -885,8 +935,7 @@ function editDistanceMoneyRequest(transactionID, transactionThreadReportID, tran
// Optimistically modify the transaction
optimisticData.push({
- // We need to use SET method to save updated waypoint instead MERGE method to avoid wrong update of waypoints. More detail: https://github.com/Expensify/App/issues/30290#issuecomment-1778957070
- onyxMethod: Onyx.METHOD.SET,
+ onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
value: {
...updatedTransaction,
@@ -896,6 +945,30 @@ function editDistanceMoneyRequest(transactionID, transactionThreadReportID, tran
},
});
+ // Update recently used categories if the category is changed
+ if (_.has(transactionChanges, 'category')) {
+ const optimisticPolicyRecentlyUsedCategories = Policy.buildOptimisticPolicyRecentlyUsedCategories(iouReport.policyID, transactionChanges.category);
+ if (!_.isEmpty(optimisticPolicyRecentlyUsedCategories)) {
+ optimisticData.push({
+ onyxMethod: Onyx.METHOD.SET,
+ key: `${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${iouReport.policyID}`,
+ value: optimisticPolicyRecentlyUsedCategories,
+ });
+ }
+ }
+
+ // Update recently used categories if the tag is changed
+ if (_.has(transactionChanges, 'tag')) {
+ const optimisticPolicyRecentlyUsedTags = Policy.buildOptimisticPolicyRecentlyUsedTags(iouReport.policyID, transactionChanges.tag);
+ if (!_.isEmpty(optimisticPolicyRecentlyUsedTags)) {
+ optimisticData.push({
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS}${iouReport.policyID}`,
+ value: optimisticPolicyRecentlyUsedTags,
+ });
+ }
+ }
+
// Clear out the error fields and loading states on success
successData.push({
onyxMethod: Onyx.METHOD.MERGE,
@@ -934,7 +1007,42 @@ function editDistanceMoneyRequest(transactionID, transactionThreadReportID, tran
value: iouReport,
});
- API.write('UpdateDistanceRequest', params, {optimisticData, successData, failureData});
+ return {
+ params,
+ onyxData: {optimisticData, successData, failureData},
+ };
+}
+
+/**
+ * Updates the created date of a money request
+ *
+ * @param {String} transactionID
+ * @param {Number} transactionThreadReportID
+ * @param {String} val
+ */
+function updateMoneyRequestDate(transactionID, transactionThreadReportID, val) {
+ const transactionChanges = {
+ created: val,
+ };
+ const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, true);
+ API.write('UpdateMoneyRequestDate', params, onyxData);
+}
+
+/**
+ * Edits an existing distance request
+ *
+ * @param {String} transactionID
+ * @param {Number} transactionThreadReportID
+ * @param {Object} transactionChanges
+ * @param {String} [transactionChanges.created]
+ * @param {Number} [transactionChanges.amount]
+ * @param {Object} [transactionChanges.comment]
+ * @param {Object} [transactionChanges.waypoints]
+ *
+ */
+function updateDistanceRequest(transactionID, transactionThreadReportID, transactionChanges) {
+ const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, false);
+ API.write('UpdateDistanceRequest', params, onyxData);
}
/**
@@ -1963,8 +2071,6 @@ function editRegularMoneyRequest(transactionID, transactionThreadReportID, trans
updatedChatReport.lastMessageHtml = messageText;
}
- const optimisticPolicyRecentlyUsedTags = Policy.buildOptimisticPolicyRecentlyUsedTags(iouReport.policyID, transactionChanges.tag);
-
const isScanning = TransactionUtils.hasReceipt(updatedTransaction) && TransactionUtils.isReceiptBeingScanned(updatedTransaction);
// STEP 4: Compose the optimistic data
@@ -2024,12 +2130,28 @@ function editRegularMoneyRequest(transactionID, transactionThreadReportID, trans
: []),
];
- if (!_.isEmpty(optimisticPolicyRecentlyUsedTags)) {
- optimisticData.push({
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS}${iouReport.policyID}`,
- value: optimisticPolicyRecentlyUsedTags,
- });
+ // Update recently used categories if the category is changed
+ if (_.has(transactionChanges, 'category')) {
+ const optimisticPolicyRecentlyUsedCategories = Policy.buildOptimisticPolicyRecentlyUsedCategories(iouReport.policyID, transactionChanges.category);
+ if (!_.isEmpty(optimisticPolicyRecentlyUsedCategories)) {
+ optimisticData.push({
+ onyxMethod: Onyx.METHOD.SET,
+ key: `${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${iouReport.policyID}`,
+ value: optimisticPolicyRecentlyUsedCategories,
+ });
+ }
+ }
+
+ // Update recently used categories if the tag is changed
+ if (_.has(transactionChanges, 'tag')) {
+ const optimisticPolicyRecentlyUsedTags = Policy.buildOptimisticPolicyRecentlyUsedTags(iouReport.policyID, transactionChanges.tag);
+ if (!_.isEmpty(optimisticPolicyRecentlyUsedTags)) {
+ optimisticData.push({
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS}${iouReport.policyID}`,
+ value: optimisticPolicyRecentlyUsedTags,
+ });
+ }
}
const successData = [
@@ -2125,7 +2247,7 @@ function editRegularMoneyRequest(transactionID, transactionThreadReportID, trans
*/
function editMoneyRequest(transaction, transactionThreadReportID, transactionChanges) {
if (TransactionUtils.isDistanceRequest(transaction)) {
- editDistanceMoneyRequest(transaction.transactionID, transactionThreadReportID, transactionChanges);
+ updateDistanceRequest(transaction.transactionID, transactionThreadReportID, transactionChanges);
} else {
editRegularMoneyRequest(transaction.transactionID, transactionThreadReportID, transactionChanges);
}
@@ -2142,6 +2264,7 @@ function deleteMoneyRequest(transactionID, reportAction, isSingleTransactionView
const chatReport = allReports[`${ONYXKEYS.COLLECTION.REPORT}${iouReport.chatReportID}`];
const reportPreviewAction = ReportActionsUtils.getReportPreviewAction(iouReport.chatReportID, iouReport.reportID);
const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
+ const transactionViolations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`];
const transactionThreadID = reportAction.childReportID;
let transactionThread = null;
if (transactionThreadID) {
@@ -2222,6 +2345,15 @@ function deleteMoneyRequest(transactionID, reportAction, isSingleTransactionView
key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
value: null,
},
+ ...(Permissions.canUseViolations(betas)
+ ? [
+ {
+ onyxMethod: Onyx.METHOD.SET,
+ key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
+ value: null,
+ },
+ ]
+ : []),
...(shouldDeleteTransactionThread
? [
{
@@ -2253,13 +2385,23 @@ function deleteMoneyRequest(transactionID, reportAction, isSingleTransactionView
[reportPreviewAction.reportActionID]: updatedReportPreviewAction,
},
},
+ ...(!shouldDeleteIOUReport && updatedReportPreviewAction.childMoneyRequestCount === 0
+ ? [
+ {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
+ value: {
+ hasOutstandingChildRequest: false,
+ },
+ },
+ ]
+ : []),
...(shouldDeleteIOUReport
? [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
value: {
- hasOutstandingIOU: false,
hasOutstandingChildRequest: false,
iouReportID: null,
lastMessageText: ReportActionsUtils.getLastVisibleMessage(iouReport.chatReportID, {[reportPreviewAction.reportActionID]: null}).lastMessageText,
@@ -2286,6 +2428,15 @@ function deleteMoneyRequest(transactionID, reportAction, isSingleTransactionView
key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
value: transaction,
},
+ ...(Permissions.canUseViolations(betas)
+ ? [
+ {
+ onyxMethod: Onyx.METHOD.SET,
+ key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
+ value: transactionViolations,
+ },
+ ]
+ : []),
...(shouldDeleteTransactionThread
? [
{
@@ -2326,6 +2477,17 @@ function deleteMoneyRequest(transactionID, reportAction, isSingleTransactionView
},
]
: []),
+ ...(!shouldDeleteIOUReport && updatedReportPreviewAction.childMoneyRequestCount === 0
+ ? [
+ {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
+ value: {
+ hasOutstandingChildRequest: true,
+ },
+ },
+ ]
+ : []),
];
// STEP 6: Make the API request
@@ -2596,6 +2758,8 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
optimisticReportPreviewAction = ReportUtils.updateReportPreview(iouReport, reportPreviewAction, true);
}
+ const currentNextStep = lodashGet(nextSteps, `${ONYXKEYS.COLLECTION.NEXT_STEP}${iouReport.reportID}`, null);
+
const optimisticData = [
{
onyxMethod: Onyx.METHOD.MERGE,
@@ -2604,7 +2768,6 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
...chatReport,
lastReadTime: DateUtils.getDBTime(),
lastVisibleActionCreated: optimisticIOUReportAction.created,
- hasOutstandingIOU: false,
hasOutstandingChildRequest: false,
iouReportID: null,
lastMessageText: optimisticIOUReportAction.message[0].text,
@@ -2628,7 +2791,6 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
...iouReport,
lastMessageText: optimisticIOUReportAction.message[0].text,
lastMessageHtml: optimisticIOUReportAction.message[0].html,
- hasOutstandingIOU: false,
hasOutstandingChildRequest: false,
statusNum: CONST.REPORT.STATUS.REIMBURSED,
},
@@ -2664,6 +2826,19 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
},
];
+ if (!_.isNull(currentNextStep)) {
+ optimisticData.push({
+ onyxMethod: Onyx.METHOD.SET,
+ key: `${ONYXKEYS.COLLECTION.NEXT_STEP}${iouReport.reportID}`,
+ value: null,
+ });
+ failureData.push({
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.NEXT_STEP}${iouReport.reportID}`,
+ value: currentNextStep,
+ });
+ }
+
// In case the report preview action is loaded locally, let's update it.
if (optimisticReportPreviewAction) {
optimisticData.push({
@@ -2734,6 +2909,8 @@ function sendMoneyWithWallet(report, amount, currency, comment, managerID, recip
}
function approveMoneyRequest(expenseReport) {
+ const currentNextStep = lodashGet(nextSteps, `${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`, null);
+
const optimisticApprovedReportAction = ReportUtils.buildOptimisticApprovedReportAction(expenseReport.total, expenseReport.currency, expenseReport.reportID);
const optimisticReportActionsData = {
@@ -2783,6 +2960,19 @@ function approveMoneyRequest(expenseReport) {
},
];
+ if (!_.isNull(currentNextStep)) {
+ optimisticData.push({
+ onyxMethod: Onyx.METHOD.SET,
+ key: `${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`,
+ value: null,
+ });
+ failureData.push({
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`,
+ value: currentNextStep,
+ });
+ }
+
API.write('ApproveMoneyRequest', {reportID: expenseReport.reportID, approvedReportActionID: optimisticApprovedReportAction.reportActionID}, {optimisticData, successData, failureData});
}
@@ -2790,6 +2980,8 @@ function approveMoneyRequest(expenseReport) {
* @param {Object} expenseReport
*/
function submitReport(expenseReport) {
+ const currentNextStep = lodashGet(nextSteps, `${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`, null);
+
const optimisticSubmittedReportAction = ReportUtils.buildOptimisticSubmittedReportAction(expenseReport.total, expenseReport.currency, expenseReport.reportID);
const parentReport = ReportUtils.getReport(expenseReport.parentReportID);
@@ -2823,7 +3015,6 @@ function submitReport(expenseReport) {
key: `${ONYXKEYS.COLLECTION.REPORT}${parentReport.reportID}`,
value: {
...parentReport,
- hasOutstandingIOU: false,
hasOutstandingChildRequest: false,
iouReportID: null,
},
@@ -2868,7 +3059,6 @@ function submitReport(expenseReport) {
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${parentReport.reportID}`,
value: {
- hasOutstandingIOU: parentReport.hasOutstandingIOU,
hasOutstandingChildRequest: parentReport.hasOutstandingChildRequest,
iouReportID: expenseReport.reportID,
},
@@ -2877,6 +3067,19 @@ function submitReport(expenseReport) {
: []),
];
+ if (!_.isNull(currentNextStep)) {
+ optimisticData.push({
+ onyxMethod: Onyx.METHOD.SET,
+ key: `${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`,
+ value: null,
+ });
+ failureData.push({
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`,
+ value: currentNextStep,
+ });
+ }
+
API.write(
'SubmitReport',
{
@@ -3171,6 +3374,7 @@ export {
startMoneyRequest,
startMoneyRequest_temporaryForRefactor,
resetMoneyRequestCategory,
+ resetMoneyRequestCategory_temporaryForRefactor,
resetMoneyRequestInfo,
resetMoneyRequestTag,
resetMoneyRequestTag_temporaryForRefactor,
@@ -3198,6 +3402,7 @@ export {
setMoneyRequestTag,
setUpDistanceTransaction,
navigateToNextPage,
+ updateMoneyRequestDate,
replaceReceipt,
detachReceipt,
getIOUReportID,
diff --git a/src/libs/actions/PaymentMethods.ts b/src/libs/actions/PaymentMethods.ts
index b3d1e3e23a24..3547a3053a02 100644
--- a/src/libs/actions/PaymentMethods.ts
+++ b/src/libs/actions/PaymentMethods.ts
@@ -1,12 +1,14 @@
import {createRef} from 'react';
import Onyx, {OnyxUpdate} from 'react-native-onyx';
+import {OnyxEntry} from 'react-native-onyx/lib/types';
import {ValueOf} from 'type-fest';
import * as API from '@libs/API';
import * as CardUtils from '@libs/CardUtils';
import Navigation from '@libs/Navigation/Navigation';
import CONST from '@src/CONST';
-import ONYXKEYS, {OnyxValues} from '@src/ONYXKEYS';
+import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
+import type {BankAccountList, FundList} from '@src/types/onyx';
import PaymentMethod from '@src/types/onyx/PaymentMethod';
import {FilterMethodPaymentType} from '@src/types/onyx/WalletTransfer';
@@ -304,7 +306,7 @@ function dismissSuccessfulTransferBalancePage() {
* Looks through each payment method to see if there is an existing error
*
*/
-function hasPaymentMethodError(bankList: OnyxValues[typeof ONYXKEYS.BANK_ACCOUNT_LIST], fundList: OnyxValues[typeof ONYXKEYS.FUND_LIST]): boolean {
+function hasPaymentMethodError(bankList: OnyxEntry, fundList: OnyxEntry): boolean {
const combinedPaymentMethods = {...bankList, ...fundList};
return Object.values(combinedPaymentMethods).some((item) => Object.keys(item.errors ?? {}).length);
diff --git a/src/libs/actions/PersistedRequests.ts b/src/libs/actions/PersistedRequests.ts
index c35de9ee94c4..22242ed6cbc5 100644
--- a/src/libs/actions/PersistedRequests.ts
+++ b/src/libs/actions/PersistedRequests.ts
@@ -17,14 +17,18 @@ function clear() {
return Onyx.set(ONYXKEYS.PERSISTED_REQUESTS, []);
}
-function save(requestsToPersist: Request[]) {
- let requests: Request[] = [];
- if (persistedRequests.length) {
- requests = persistedRequests.concat(requestsToPersist);
+function save(requestToPersist: Request) {
+ const requests = [...persistedRequests];
+ const existingRequestIndex = requests.findIndex((request) => request.data?.idempotencyKey && request.data?.idempotencyKey === requestToPersist.data?.idempotencyKey);
+ if (existingRequestIndex > -1) {
+ // Merge the new request into the existing one, keeping its place in the queue
+ requests.splice(existingRequestIndex, 1, requestToPersist);
} else {
- requests = requestsToPersist;
+ // If not, push the new request to the end of the queue
+ requests.push(requestToPersist);
}
persistedRequests = requests;
+
Onyx.set(ONYXKEYS.PERSISTED_REQUESTS, requests);
}
diff --git a/src/libs/actions/PersonalDetails.ts b/src/libs/actions/PersonalDetails.ts
index 29d18d543a11..02b5f70db285 100644
--- a/src/libs/actions/PersonalDetails.ts
+++ b/src/libs/actions/PersonalDetails.ts
@@ -9,7 +9,7 @@ import * as UserUtils from '@libs/UserUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
-import {DateOfBirthForm, PersonalDetails, PrivatePersonalDetails} from '@src/types/onyx';
+import {DateOfBirthForm, PersonalDetails, PersonalDetailsList, PrivatePersonalDetails} from '@src/types/onyx';
import {SelectedTimezone, Timezone} from '@src/types/onyx/PersonalDetails';
type FirstAndLastName = {
@@ -27,7 +27,7 @@ Onyx.connect({
},
});
-let allPersonalDetails: OnyxEntry> = null;
+let allPersonalDetails: OnyxEntry = null;
Onyx.connect({
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
callback: (val) => (allPersonalDetails = val),
diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 04f62ab0c393..f33e6637e2de 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -112,13 +112,6 @@ Onyx.connect({
callback: (val) => (allRecentlyUsedTags = val),
});
-let networkStatus = {};
-Onyx.connect({
- key: ONYXKEYS.NETWORK,
- waitForCollectionCallback: true,
- callback: (val) => (networkStatus = val),
-});
-
/**
* Stores in Onyx the policy ID of the last workspace that was accessed by the user
* @param {String|null} policyID
@@ -957,7 +950,7 @@ function updateWorkspaceCustomUnitAndRate(policyID, currentCustomUnit, newCustom
'UpdateWorkspaceCustomUnitAndRate',
{
policyID,
- ...(!networkStatus.isOffline && {lastModified}),
+ lastModified,
customUnit: JSON.stringify(newCustomUnitParam),
customUnitRate: JSON.stringify(newCustomUnitParam.rates),
},
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.ts
similarity index 60%
rename from src/libs/actions/Report.js
rename to src/libs/actions/Report.ts
index 22d2eb2d723b..135e616f7691 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.ts
@@ -2,10 +2,12 @@ import {format as timezoneFormat, utcToZonedTime} from 'date-fns-tz';
import ExpensiMark from 'expensify-common/lib/ExpensiMark';
import Str from 'expensify-common/lib/str';
import lodashDebounce from 'lodash/debounce';
-import lodashGet from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
import {DeviceEventEmitter, InteractionManager} from 'react-native';
-import Onyx from 'react-native-onyx';
-import _ from 'underscore';
+import Onyx, {OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
+import {NullishDeep} from 'react-native-onyx/lib/types';
+import {PartialDeep, ValueOf} from 'type-fest';
+import {Emoji} from '@assets/emojis/types';
import * as ActiveClientManager from '@libs/ActiveClientManager';
import * as API from '@libs/API';
import * as CollectionUtils from '@libs/CollectionUtils';
@@ -15,7 +17,9 @@ import * as Environment from '@libs/Environment/Environment';
import * as ErrorUtils from '@libs/ErrorUtils';
import Log from '@libs/Log';
import Navigation from '@libs/Navigation/Navigation';
+import clearReportNotifications from '@libs/Notification/clearReportNotifications';
import LocalNotification from '@libs/Notification/LocalNotification';
+import * as OptionsListUtils from '@libs/OptionsListUtils';
import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
import * as Pusher from '@libs/Pusher/pusher';
import * as ReportActionsUtils from '@libs/ReportActionsUtils';
@@ -25,70 +29,84 @@ import Visibility from '@libs/Visibility';
import CONFIG from '@src/CONFIG';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
+import ROUTES, {Route} from '@src/ROUTES';
+import {PersonalDetails, PersonalDetailsList, ReportActionReactions, ReportUserIsTyping} from '@src/types/onyx';
+import {Decision, OriginalMessageIOU} from '@src/types/onyx/OriginalMessage';
+import Report, {NotificationPreference, WriteCapability} from '@src/types/onyx/Report';
+import ReportAction, {Message, ReportActionBase, ReportActions} from '@src/types/onyx/ReportAction';
+import {EmptyObject, isEmptyObject, isNotEmptyObject} from '@src/types/utils/EmptyObject';
import * as Session from './Session';
import * as Welcome from './Welcome';
-let currentUserAccountID;
+type SubscriberCallback = (isFromCurrentUser: boolean, reportActionID: string | undefined) => void;
+
+type ActionSubscriber = {
+ reportID: string;
+ callback: SubscriberCallback;
+};
+
+let currentUserAccountID = -1;
Onyx.connect({
key: ONYXKEYS.SESSION,
- callback: (val) => {
+ callback: (value) => {
// When signed out, val is undefined
- if (!val) {
+ if (!value?.accountID) {
return;
}
- currentUserAccountID = val.accountID;
+ currentUserAccountID = value.accountID;
},
});
-let preferredSkinTone;
+let preferredSkinTone: number = CONST.EMOJI_DEFAULT_SKIN_TONE;
Onyx.connect({
key: ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE,
- callback: (val) => {
- preferredSkinTone = EmojiUtils.getPreferredSkinToneIndex(val);
+ callback: (value) => {
+ preferredSkinTone = EmojiUtils.getPreferredSkinToneIndex(value);
},
});
-const allReportActions = {};
+const allReportActions: OnyxCollection = {};
Onyx.connect({
key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
- callback: (actions, key) => {
- if (!key || !actions) {
+ callback: (action, key) => {
+ if (!key || !action) {
return;
}
const reportID = CollectionUtils.extractCollectionItemID(key);
- allReportActions[reportID] = actions;
+ allReportActions[reportID] = action;
},
});
-const currentReportData = {};
+const currentReportData: OnyxCollection = {};
Onyx.connect({
key: ONYXKEYS.COLLECTION.REPORT,
- callback: (data, key) => {
- if (!key || !data) {
+ callback: (report, key) => {
+ if (!key || !report) {
return;
}
const reportID = CollectionUtils.extractCollectionItemID(key);
- currentReportData[reportID] = data;
+ currentReportData[reportID] = report;
},
});
let isNetworkOffline = false;
Onyx.connect({
key: ONYXKEYS.NETWORK,
- callback: (val) => (isNetworkOffline = lodashGet(val, 'isOffline', false)),
+ callback: (value) => {
+ isNetworkOffline = value?.isOffline ?? false;
+ },
});
-let allPersonalDetails;
+let allPersonalDetails: OnyxEntry = {};
Onyx.connect({
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
- callback: (val) => {
- allPersonalDetails = val || {};
+ callback: (value) => {
+ allPersonalDetails = value ?? {};
},
});
-const draftNoteMap = {};
+const draftNoteMap: OnyxCollection = {};
Onyx.connect({
key: ONYXKEYS.COLLECTION.PRIVATE_NOTES_DRAFT,
callback: (value, key) => {
@@ -101,17 +119,12 @@ Onyx.connect({
},
});
-const allReports = {};
-let conciergeChatReportID;
-const typingWatchTimers = {};
+const allReports: OnyxCollection = {};
+let conciergeChatReportID: string | undefined;
+const typingWatchTimers: Record = {};
-/**
- * Get the private pusher channel name for a Report.
- *
- * @param {String} reportID
- * @returns {String}
- */
-function getReportChannelName(reportID) {
+/** Get the private pusher channel name for a Report. */
+function getReportChannelName(reportID: string): string {
return `${CONST.PUSHER.PRIVATE_REPORT_CHANNEL_PREFIX}${reportID}${CONFIG.PUSHER.SUFFIX}`;
}
@@ -122,26 +135,21 @@ function getReportChannelName(reportID) {
* 2. The "old" way from e.com which is passed as {userLogin: login} (e.g. {userLogin: bstites@expensify.com})
*
* This method makes sure that no matter which we get, we return the "new" format
- *
- * @param {Object} status
- * @returns {Object}
*/
-function getNormalizedStatus(status) {
- let normalizedStatus = status;
+function getNormalizedStatus(typingStatus: Pusher.UserIsTypingEvent | Pusher.UserIsLeavingRoomEvent): ReportUserIsTyping {
+ let normalizedStatus: ReportUserIsTyping;
- if (_.first(_.keys(status)) === 'userLogin') {
- normalizedStatus = {[status.userLogin]: true};
+ if (typingStatus.userLogin) {
+ normalizedStatus = {[typingStatus.userLogin]: true};
+ } else {
+ normalizedStatus = typingStatus;
}
return normalizedStatus;
}
-/**
- * Initialize our pusher subscriptions to listen for someone typing in a report.
- *
- * @param {String} reportID
- */
-function subscribeToReportTypingEvents(reportID) {
+/** Initialize our pusher subscriptions to listen for someone typing in a report. */
+function subscribeToReportTypingEvents(reportID: string) {
if (!reportID) {
return;
}
@@ -155,7 +163,7 @@ function subscribeToReportTypingEvents(reportID) {
// login OR by 'Concierge'. If the pusher message comes from NewDot, it is keyed by accountID
// since personal details are keyed by accountID.
const normalizedTypingStatus = getNormalizedStatus(typingStatus);
- const accountIDOrLogin = _.first(_.keys(normalizedTypingStatus));
+ const accountIDOrLogin = Object.keys(normalizedTypingStatus)[0];
if (!accountIDOrLogin) {
return;
@@ -173,22 +181,18 @@ function subscribeToReportTypingEvents(reportID) {
// Wait for 1.5s of no additional typing events before setting the status back to false.
typingWatchTimers[reportUserIdentifier] = setTimeout(() => {
- const typingStoppedStatus = {};
+ const typingStoppedStatus: ReportUserIsTyping = {};
typingStoppedStatus[accountIDOrLogin] = false;
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_USER_IS_TYPING}${reportID}`, typingStoppedStatus);
delete typingWatchTimers[reportUserIdentifier];
}, 1500);
}).catch((error) => {
- Log.hmmm('[Report] Failed to initially subscribe to Pusher channel', false, {errorType: error.type, pusherChannelName});
+ Log.hmmm('[Report] Failed to initially subscribe to Pusher channel', {errorType: error.type, pusherChannelName});
});
}
-/**
- * Initialize our pusher subscriptions to listen for someone leaving a room.
- *
- * @param {String} reportID
- */
-function subscribeToReportLeavingEvents(reportID) {
+/** Initialize our pusher subscriptions to listen for someone leaving a room. */
+function subscribeToReportLeavingEvents(reportID: string) {
if (!reportID) {
return;
}
@@ -197,12 +201,12 @@ function subscribeToReportLeavingEvents(reportID) {
Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_USER_IS_LEAVING_ROOM}${reportID}`, false);
const pusherChannelName = getReportChannelName(reportID);
- Pusher.subscribe(pusherChannelName, Pusher.TYPE.USER_IS_LEAVING_ROOM, (leavingStatus) => {
+ Pusher.subscribe(pusherChannelName, Pusher.TYPE.USER_IS_LEAVING_ROOM, (leavingStatus: Pusher.UserIsLeavingRoomEvent) => {
// If the pusher message comes from OldDot, we expect the leaving status to be keyed by user
// login OR by 'Concierge'. If the pusher message comes from NewDot, it is keyed by accountID
// since personal details are keyed by accountID.
const normalizedLeavingStatus = getNormalizedStatus(leavingStatus);
- const accountIDOrLogin = _.first(_.keys(normalizedLeavingStatus));
+ const accountIDOrLogin = Object.keys(normalizedLeavingStatus)[0];
if (!accountIDOrLogin) {
return;
@@ -214,16 +218,14 @@ function subscribeToReportLeavingEvents(reportID) {
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_USER_IS_LEAVING_ROOM}${reportID}`, true);
}).catch((error) => {
- Log.hmmm('[Report] Failed to initially subscribe to Pusher channel', false, {errorType: error.type, pusherChannelName});
+ Log.hmmm('[Report] Failed to initially subscribe to Pusher channel', {errorType: error.type, pusherChannelName});
});
}
/**
* Remove our pusher subscriptions to listen for someone typing in a report.
- *
- * @param {String} reportID
*/
-function unsubscribeFromReportChannel(reportID) {
+function unsubscribeFromReportChannel(reportID: string) {
if (!reportID) {
return;
}
@@ -235,10 +237,8 @@ function unsubscribeFromReportChannel(reportID) {
/**
* Remove our pusher subscriptions to listen for someone leaving a report.
- *
- * @param {String} reportID
*/
-function unsubscribeFromLeavingRoomReportChannel(reportID) {
+function unsubscribeFromLeavingRoomReportChannel(reportID: string) {
if (!reportID) {
return;
}
@@ -249,31 +249,23 @@ function unsubscribeFromLeavingRoomReportChannel(reportID) {
}
// New action subscriber array for report pages
-let newActionSubscribers = [];
+let newActionSubscribers: ActionSubscriber[] = [];
/**
* Enables the Report actions file to let the ReportActionsView know that a new comment has arrived in realtime for the current report
* Add subscriber for report id
- * @param {String} reportID
- * @param {Function} callback
- * @returns {Function} Remove subscriber for report id
+ * @returns Remove subscriber for report id
*/
-function subscribeToNewActionEvent(reportID, callback) {
+function subscribeToNewActionEvent(reportID: string, callback: SubscriberCallback): () => void {
newActionSubscribers.push({callback, reportID});
return () => {
- newActionSubscribers = _.filter(newActionSubscribers, (subscriber) => subscriber.reportID !== reportID);
+ newActionSubscribers = newActionSubscribers.filter((subscriber) => subscriber.reportID !== reportID);
};
}
-/**
- * Notify the ReportActionsView that a new comment has arrived
- *
- * @param {String} reportID
- * @param {Number} accountID
- * @param {String} reportActionID
- */
-function notifyNewAction(reportID, accountID, reportActionID) {
- const actionSubscriber = _.find(newActionSubscribers, (subscriber) => subscriber.reportID === reportID);
+/** Notify the ReportActionsView that a new comment has arrived */
+function notifyNewAction(reportID: string, accountID?: number, reportActionID?: string) {
+ const actionSubscriber = newActionSubscribers.find((subscriber) => subscriber.reportID === reportID);
if (!actionSubscriber) {
return;
}
@@ -287,15 +279,11 @@ function notifyNewAction(reportID, accountID, reportActionID) {
* - Adding one comment
* - Adding one attachment
* - Add both a comment and attachment simultaneously
- *
- * @param {String} reportID
- * @param {String} [text]
- * @param {Object} [file]
*/
-function addActions(reportID, text = '', file) {
+function addActions(reportID: string, text = '', file?: File) {
let reportCommentText = '';
- let reportCommentAction;
- let attachmentAction;
+ let reportCommentAction: Partial | undefined;
+ let attachmentAction: Partial | undefined;
let commandName = 'AddComment';
if (text) {
@@ -313,43 +301,53 @@ function addActions(reportID, text = '', file) {
}
// Always prefer the file as the last action over text
- const lastAction = attachmentAction || reportCommentAction;
-
+ const lastAction = attachmentAction ?? reportCommentAction;
const currentTime = DateUtils.getDBTime();
+ const lastComment = lastAction?.message?.[0];
+ const lastCommentText = ReportUtils.formatReportLastMessageText(lastComment?.text ?? '');
- const lastCommentText = ReportUtils.formatReportLastMessageText(lastAction.message[0].text);
-
- const optimisticReport = {
+ const optimisticReport: Partial = {
lastVisibleActionCreated: currentTime,
- lastMessageTranslationKey: lodashGet(lastAction, 'message[0].translationKey', ''),
+ lastMessageTranslationKey: lastComment?.translationKey ?? '',
lastMessageText: lastCommentText,
lastMessageHtml: lastCommentText,
lastActorAccountID: currentUserAccountID,
lastReadTime: currentTime,
};
- if (ReportUtils.getReportNotificationPreference(ReportUtils.getReport(reportID)) === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN) {
+ const report = ReportUtils.getReport(reportID);
+
+ if (isNotEmptyObject(report) && ReportUtils.getReportNotificationPreference(report) === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN) {
optimisticReport.notificationPreference = CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS;
}
// Optimistically add the new actions to the store before waiting to save them to the server
- const optimisticReportActions = {};
- if (text) {
+ const optimisticReportActions: OnyxCollection> = {};
+ if (text && reportCommentAction?.reportActionID) {
optimisticReportActions[reportCommentAction.reportActionID] = reportCommentAction;
}
- if (file) {
+ if (file && attachmentAction?.reportActionID) {
optimisticReportActions[attachmentAction.reportActionID] = attachmentAction;
}
- const parameters = {
+ type AddCommentOrAttachementParameters = {
+ reportID: string;
+ reportActionID?: string;
+ commentReportActionID?: string | null;
+ reportComment?: string;
+ file?: File;
+ timezone?: string;
+ };
+
+ const parameters: AddCommentOrAttachementParameters = {
reportID,
- reportActionID: file ? attachmentAction.reportActionID : reportCommentAction.reportActionID,
+ reportActionID: file ? attachmentAction?.reportActionID : reportCommentAction?.reportActionID,
commentReportActionID: file && reportCommentAction ? reportCommentAction.reportActionID : null,
reportComment: reportCommentText,
file,
};
- const optimisticData = [
+ const optimisticData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
@@ -362,15 +360,21 @@ function addActions(reportID, text = '', file) {
},
];
- const successData = [
+ const successReportActions: OnyxCollection> = {};
+
+ Object.entries(optimisticReportActions).forEach(([actionKey]) => {
+ successReportActions[actionKey] = {pendingAction: null};
+ });
+
+ const successData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
- value: _.mapObject(optimisticReportActions, () => ({pendingAction: null})),
+ value: successReportActions,
},
];
- let failureReport = {
+ let failureReport: Partial = {
lastMessageTranslationKey: '',
lastMessageText: '',
lastVisibleActionCreated: '',
@@ -378,8 +382,8 @@ function addActions(reportID, text = '', file) {
const {lastMessageText = '', lastMessageTranslationKey = ''} = ReportActionsUtils.getLastVisibleMessage(reportID);
if (lastMessageText || lastMessageTranslationKey) {
const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(reportID);
- const lastVisibleActionCreated = lodashGet(lastVisibleAction, 'created');
- const lastActorAccountID = lodashGet(lastVisibleAction, 'actorAccountID');
+ const lastVisibleActionCreated = lastVisibleAction?.created;
+ const lastActorAccountID = lastVisibleAction?.actorAccountID;
failureReport = {
lastMessageTranslationKey,
lastMessageText,
@@ -387,7 +391,17 @@ function addActions(reportID, text = '', file) {
lastActorAccountID,
};
}
- const failureData = [
+
+ const failureReportActions: OnyxCollection> = {};
+
+ Object.entries(optimisticReportActions).forEach(([actionKey, action]) => {
+ failureReportActions[actionKey] = {
+ ...action,
+ errors: ErrorUtils.getMicroSecondOnyxError('report.genericAddCommentFailureMessage'),
+ };
+ });
+
+ const failureData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
@@ -396,21 +410,18 @@ function addActions(reportID, text = '', file) {
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
- value: _.mapObject(optimisticReportActions, (action) => ({
- ...action,
- errors: ErrorUtils.getMicroSecondOnyxError('report.genericAddCommentFailureMessage'),
- })),
+ value: failureReportActions,
},
];
// Update optimistic data for parent report action if the report is a child report
const optimisticParentReportData = ReportUtils.getOptimisticDataForParentReportAction(reportID, currentTime, CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
- if (!_.isEmpty(optimisticParentReportData)) {
+ if (isNotEmptyObject(optimisticParentReportData)) {
optimisticData.push(optimisticParentReportData);
}
// Update the timezone if it's been 5 minutes from the last time the user added a comment
- if (DateUtils.canUpdateTimezone()) {
+ if (DateUtils.canUpdateTimezone() && currentUserAccountID) {
const timezone = DateUtils.getCurrentTimezone();
parameters.timezone = JSON.stringify(timezone);
optimisticData.push({
@@ -426,59 +437,60 @@ function addActions(reportID, text = '', file) {
successData,
failureData,
});
- notifyNewAction(reportID, lastAction.actorAccountID, lastAction.reportActionID);
+ notifyNewAction(reportID, lastAction?.actorAccountID, lastAction?.reportActionID);
}
-/**
- *
- * Add an attachment and optional comment.
- *
- * @param {String} reportID
- * @param {File} file
- * @param {String} [text]
- */
-function addAttachment(reportID, file, text = '') {
+/** Add an attachment and optional comment. */
+function addAttachment(reportID: string, file: File, text = '') {
addActions(reportID, text, file);
}
-/**
- * Add a single comment to a report
- *
- * @param {String} reportID
- * @param {String} text
- */
-function addComment(reportID, text) {
+/** Add a single comment to a report */
+function addComment(reportID: string, text: string) {
addActions(reportID, text);
}
-function reportActionsExist(reportID) {
- return allReportActions[reportID] !== undefined;
+function reportActionsExist(reportID: string): boolean {
+ return allReportActions?.[reportID] !== undefined;
}
/**
* Gets the latest page of report actions and updates the last read message
* If a chat with the passed reportID is not found, we will create a chat based on the passed participantList
*
- * @param {String} reportID
- * @param {Array} participantLoginList The list of users that are included in a new chat, not including the user creating it
- * @param {Object} newReportObject The optimistic report object created when making a new chat, saved as optimistic data
- * @param {String} parentReportActionID The parent report action that a thread was created from (only passed for new threads)
- * @param {Boolean} isFromDeepLink Whether or not this report is being opened from a deep link
- * @param {Array} participantAccountIDList The list of accountIDs that are included in a new chat, not including the user creating it
- */
-function openReport(reportID, participantLoginList = [], newReportObject = {}, parentReportActionID = '0', isFromDeepLink = false, participantAccountIDList = []) {
+ * @param participantLoginList The list of users that are included in a new chat, not including the user creating it
+ * @param newReportObject The optimistic report object created when making a new chat, saved as optimistic data
+ * @param parentReportActionID The parent report action that a thread was created from (only passed for new threads)
+ * @param isFromDeepLink Whether or not this report is being opened from a deep link
+ * @param participantAccountIDList The list of accountIDs that are included in a new chat, not including the user creating it
+ */
+function openReport(
+ reportID: string,
+ participantLoginList: string[] = [],
+ newReportObject: Partial = {},
+ parentReportActionID = '0',
+ isFromDeepLink = false,
+ participantAccountIDList: number[] = [],
+) {
if (!reportID) {
return;
}
- const optimisticReportData = [
+
+ clearReportNotifications(reportID);
+
+ const optimisticReport = reportActionsExist(reportID)
+ ? {}
+ : {
+ reportName: allReports?.[reportID]?.reportName ?? CONST.REPORT.DEFAULT_REPORT_NAME,
+ };
+
+ const commandName = 'OpenReport';
+
+ const optimisticData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
- value: reportActionsExist(reportID)
- ? {}
- : {
- reportName: lodashGet(allReports, [reportID, 'reportName'], CONST.REPORT.DEFAULT_REPORT_NAME),
- },
+ value: optimisticReport,
},
{
onyxMethod: Onyx.METHOD.MERGE,
@@ -491,7 +503,7 @@ function openReport(reportID, participantLoginList = [], newReportObject = {}, p
},
];
- const reportSuccessData = [
+ const successData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
@@ -514,7 +526,7 @@ function openReport(reportID, participantLoginList = [], newReportObject = {}, p
},
];
- const reportFailureData = [
+ const failureData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
@@ -524,37 +536,44 @@ function openReport(reportID, participantLoginList = [], newReportObject = {}, p
},
];
- const onyxData = {
- optimisticData: optimisticReportData,
- successData: reportSuccessData,
- failureData: reportFailureData,
+ type OpenReportParameters = {
+ reportID: string;
+ emailList?: string;
+ accountIDList?: string;
+ parentReportActionID?: string;
+ shouldRetry?: boolean;
+ createdReportActionID?: string;
+ clientLastReadTime?: string;
+ idempotencyKey?: string;
};
- const params = {
+ const parameters: OpenReportParameters = {
reportID,
emailList: participantLoginList ? participantLoginList.join(',') : '',
accountIDList: participantAccountIDList ? participantAccountIDList.join(',') : '',
parentReportActionID,
+ idempotencyKey: `${commandName}_${reportID}`,
};
if (isFromDeepLink) {
- params.shouldRetry = false;
+ parameters.shouldRetry = false;
}
+ const report = ReportUtils.getReport(reportID);
// If we open an exist report, but it is not present in Onyx yet, we should change the method to set for this report
// and we need data to be available when we navigate to the chat page
- if (_.isEmpty(ReportUtils.getReport(reportID))) {
- onyxData.optimisticData[0].onyxMethod = Onyx.METHOD.SET;
+ if (isEmptyObject(report)) {
+ optimisticData[0].onyxMethod = Onyx.METHOD.SET;
}
// If we are creating a new report, we need to add the optimistic report data and a report action
- if (!_.isEmpty(newReportObject)) {
+ if (isNotEmptyObject(newReportObject)) {
// Change the method to set for new reports because it doesn't exist yet, is faster,
// and we need the data to be available when we navigate to the chat page
- onyxData.optimisticData[0].onyxMethod = Onyx.METHOD.SET;
- onyxData.optimisticData[0].value = {
+ optimisticData[0].onyxMethod = Onyx.METHOD.SET;
+ optimisticData[0].value = {
+ ...optimisticReport,
reportName: CONST.REPORT.DEFAULT_REPORT_NAME,
- ...onyxData.optimisticData[0].value,
...newReportObject,
pendingFields: {
createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
@@ -562,28 +581,33 @@ function openReport(reportID, participantLoginList = [], newReportObject = {}, p
isOptimisticReport: true,
};
- let emailCreatingAction = CONST.REPORT.OWNER_EMAIL_FAKE;
+ let emailCreatingAction: string = CONST.REPORT.OWNER_EMAIL_FAKE;
if (newReportObject.ownerAccountID && newReportObject.ownerAccountID !== CONST.REPORT.OWNER_ACCOUNT_ID_FAKE) {
- emailCreatingAction = lodashGet(allPersonalDetails, [newReportObject.ownerAccountID, 'login'], '');
+ emailCreatingAction = allPersonalDetails?.[newReportObject.ownerAccountID]?.login ?? '';
}
const optimisticCreatedAction = ReportUtils.buildOptimisticCreatedReportAction(emailCreatingAction);
- onyxData.optimisticData.push({
+ optimisticData.push({
onyxMethod: Onyx.METHOD.SET,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
value: {[optimisticCreatedAction.reportActionID]: optimisticCreatedAction},
});
- onyxData.successData.push({
+ successData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
value: {[optimisticCreatedAction.reportActionID]: {pendingAction: null}},
});
// Add optimistic personal details for new participants
- const optimisticPersonalDetails = {};
- const settledPersonalDetails = {};
- _.map(participantLoginList, (login, index) => {
- const accountID = newReportObject.participantAccountIDs[index];
- optimisticPersonalDetails[accountID] = allPersonalDetails[accountID] || {
+ const optimisticPersonalDetails: OnyxCollection = {};
+ const settledPersonalDetails: OnyxCollection = {};
+ participantLoginList.forEach((login, index) => {
+ const accountID = newReportObject?.participantAccountIDs?.[index];
+
+ if (!accountID) {
+ return;
+ }
+
+ optimisticPersonalDetails[accountID] = allPersonalDetails?.[accountID] ?? {
login,
accountID,
avatar: UserUtils.getDefaultAvatarURL(accountID),
@@ -591,36 +615,37 @@ function openReport(reportID, participantLoginList = [], newReportObject = {}, p
isOptimisticPersonalDetail: true,
};
- settledPersonalDetails[accountID] = allPersonalDetails[accountID] || null;
+ settledPersonalDetails[accountID] = allPersonalDetails?.[accountID] ?? null;
});
- onyxData.optimisticData.push({
+
+ optimisticData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
value: optimisticPersonalDetails,
});
-
- onyxData.successData.push({
+ successData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
value: settledPersonalDetails,
});
- onyxData.failureData.push({
+ failureData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
value: settledPersonalDetails,
});
// Add the createdReportActionID parameter to the API call
- params.createdReportActionID = optimisticCreatedAction.reportActionID;
+ parameters.createdReportActionID = optimisticCreatedAction.reportActionID;
+ parameters.idempotencyKey = `${parameters.idempotencyKey}_NewReport_${optimisticCreatedAction.reportActionID}`;
// If we are creating a thread, ensure the report action has childReportID property added
if (newReportObject.parentReportID && parentReportActionID) {
- onyxData.optimisticData.push({
+ optimisticData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${newReportObject.parentReportID}`,
value: {[parentReportActionID]: {childReportID: reportID, childType: CONST.REPORT.TYPE.CHAT}},
});
- onyxData.failureData.push({
+ failureData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${newReportObject.parentReportID}`,
value: {[parentReportActionID]: {childReportID: '0', childType: ''}},
@@ -628,27 +653,27 @@ function openReport(reportID, participantLoginList = [], newReportObject = {}, p
}
}
- params.clientLastReadTime = lodashGet(currentReportData, [reportID, 'lastReadTime'], '');
+ parameters.clientLastReadTime = currentReportData?.[reportID]?.lastReadTime ?? '';
if (isFromDeepLink) {
// eslint-disable-next-line rulesdir/no-api-side-effects-method
- API.makeRequestWithSideEffects('OpenReport', params, onyxData).finally(() => {
+ API.makeRequestWithSideEffects(commandName, parameters, {optimisticData, successData, failureData}).finally(() => {
Onyx.set(ONYXKEYS.IS_CHECKING_PUBLIC_ROOM, false);
});
} else {
// eslint-disable-next-line rulesdir/no-multiple-api-calls
- API.write('OpenReport', params, onyxData);
+ API.write(commandName, parameters, {optimisticData, successData, failureData});
}
}
/**
* This will find an existing chat, or create a new one if none exists, for the given user or set of users. It will then navigate to this chat.
*
- * @param {Array} userLogins list of user logins to start a chat report with.
- * @param {Boolean} shouldDismissModal a flag to determine if we should dismiss modal before navigate to report or navigate to report directly.
+ * @param userLogins list of user logins to start a chat report with.
+ * @param shouldDismissModal a flag to determine if we should dismiss modal before navigate to report or navigate to report directly.
*/
-function navigateToAndOpenReport(userLogins, shouldDismissModal = true) {
- let newChat = {};
+function navigateToAndOpenReport(userLogins: string[], shouldDismissModal = true) {
+ let newChat: ReportUtils.OptimisticChatReport | EmptyObject = {};
const participantAccountIDs = PersonalDetailsUtils.getAccountIDsByLogins(userLogins);
const chat = ReportUtils.getChatByParticipants(participantAccountIDs);
@@ -670,10 +695,10 @@ function navigateToAndOpenReport(userLogins, shouldDismissModal = true) {
/**
* This will find an existing chat, or create a new one if none exists, for the given accountID or set of accountIDs. It will then navigate to this chat.
*
- * @param {Array} participantAccountIDs of user logins to start a chat report with.
+ * @param participantAccountIDs of user logins to start a chat report with.
*/
-function navigateToAndOpenReportWithAccountIDs(participantAccountIDs) {
- let newChat = {};
+function navigateToAndOpenReportWithAccountIDs(participantAccountIDs: number[]) {
+ let newChat: ReportUtils.OptimisticChatReport | EmptyObject = {};
const chat = ReportUtils.getChatByParticipants(participantAccountIDs);
if (!chat) {
newChat = ReportUtils.buildOptimisticChatReport(participantAccountIDs);
@@ -688,23 +713,22 @@ function navigateToAndOpenReportWithAccountIDs(participantAccountIDs) {
/**
* This will navigate to an existing thread, or create a new one if necessary
*
- * @param {String} childReportID The reportID we are trying to open
- * @param {Object} parentReportAction the parent comment of a thread
- * @param {String} parentReportID The reportID of the parent
- *
+ * @param childReportID The reportID we are trying to open
+ * @param parentReportAction the parent comment of a thread
+ * @param parentReportID The reportID of the parent
*/
-function navigateToAndOpenChildReport(childReportID = '0', parentReportAction = {}, parentReportID = '0') {
+function navigateToAndOpenChildReport(childReportID = '0', parentReportAction: Partial = {}, parentReportID = '0') {
if (childReportID !== '0') {
openReport(childReportID);
Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(childReportID));
} else {
- const participantAccountIDs = _.uniq([currentUserAccountID, Number(parentReportAction.actorAccountID)]);
- const parentReport = allReports[parentReportID];
+ const participantAccountIDs = [...new Set([currentUserAccountID, Number(parentReportAction.actorAccountID)])];
+ const parentReport = allReports?.[parentReportID];
const newChat = ReportUtils.buildOptimisticChatReport(
participantAccountIDs,
- lodashGet(parentReportAction, ['message', 0, 'text']),
- lodashGet(parentReport, 'chatType', ''),
- lodashGet(parentReport, 'policyID', CONST.POLICY.OWNER_EMAIL_FAKE),
+ parentReportAction?.message?.[0]?.text,
+ parentReport?.chatType,
+ parentReport?.policyID ?? CONST.POLICY.OWNER_EMAIL_FAKE,
CONST.POLICY.OWNER_ACCOUNT_ID_FAKE,
false,
'',
@@ -715,242 +739,246 @@ function navigateToAndOpenChildReport(childReportID = '0', parentReportAction =
parentReportID,
);
- const participantLogins = PersonalDetailsUtils.getLoginsByAccountIDs(newChat.participantAccountIDs);
+ const participantLogins = PersonalDetailsUtils.getLoginsByAccountIDs(newChat?.participantAccountIDs ?? []);
openReport(newChat.reportID, participantLogins, newChat, parentReportAction.reportActionID);
Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(newChat.reportID));
}
}
-/**
- * Get the latest report history without marking the report as read.
- *
- * @param {String} reportID
- */
-function reconnect(reportID) {
- API.write(
- 'ReconnectToReport',
+/** Get the latest report history without marking the report as read. */
+function reconnect(reportID: string) {
+ const optimisticData: OnyxUpdate[] = [
{
- reportID,
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+ value: {
+ reportName: allReports?.[reportID]?.reportName ?? CONST.REPORT.DEFAULT_REPORT_NAME,
+ },
},
{
- optimisticData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
- value: {
- reportName: lodashGet(allReports, [reportID, 'reportName'], CONST.REPORT.DEFAULT_REPORT_NAME),
- },
- },
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
- value: {
- isLoadingInitialReportActions: true,
- isLoadingNewerReportActions: false,
- isLoadingOlderReportActions: false,
- },
- },
- ],
- successData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
- value: {
- isLoadingInitialReportActions: false,
- },
- },
- ],
- failureData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
- value: {
- isLoadingInitialReportActions: false,
- },
- },
- ],
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
+ value: {
+ isLoadingInitialReportActions: true,
+ isLoadingNewerReportActions: false,
+ isLoadingOlderReportActions: false,
+ },
},
- );
+ ];
+
+ const successData: OnyxUpdate[] = [
+ {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
+ value: {
+ isLoadingInitialReportActions: false,
+ },
+ },
+ ];
+
+ const failureData: OnyxUpdate[] = [
+ {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
+ value: {
+ isLoadingInitialReportActions: false,
+ },
+ },
+ ];
+
+ type ReconnectToReportParameters = {
+ reportID: string;
+ };
+
+ const parameters: ReconnectToReportParameters = {
+ reportID,
+ };
+
+ API.write('ReconnectToReport', parameters, {optimisticData, successData, failureData});
}
/**
* Gets the older actions that have not been read yet.
* Normally happens when you scroll up on a chat, and the actions have not been read yet.
- *
- * @param {String} reportID
- * @param {String} reportActionID
*/
-function getOlderActions(reportID, reportActionID) {
- API.read(
- 'GetOlderActions',
+function getOlderActions(reportID: string, reportActionID: string) {
+ const optimisticData: OnyxUpdate[] = [
{
- reportID,
- reportActionID,
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
+ value: {
+ isLoadingOlderReportActions: true,
+ },
},
+ ];
+
+ const successData: OnyxUpdate[] = [
{
- optimisticData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
- value: {
- isLoadingOlderReportActions: true,
- },
- },
- ],
- successData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
- value: {
- isLoadingOlderReportActions: false,
- },
- },
- ],
- failureData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
- value: {
- isLoadingOlderReportActions: false,
- },
- },
- ],
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
+ value: {
+ isLoadingOlderReportActions: false,
+ },
},
- );
+ ];
+
+ const failureData: OnyxUpdate[] = [
+ {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
+ value: {
+ isLoadingOlderReportActions: false,
+ },
+ },
+ ];
+
+ type GetOlderActionsParameters = {
+ reportID: string;
+ reportActionID: string;
+ };
+
+ const parameters: GetOlderActionsParameters = {
+ reportID,
+ reportActionID,
+ };
+
+ API.read('GetOlderActions', parameters, {optimisticData, successData, failureData});
}
/**
* Gets the newer actions that have not been read yet.
* Normally happens when you are not located at the bottom of the list and scroll down on a chat.
- *
- * @param {String} reportID
- * @param {String} reportActionID
*/
-function getNewerActions(reportID, reportActionID) {
- API.read(
- 'GetNewerActions',
+function getNewerActions(reportID: string, reportActionID: string) {
+ const optimisticData: OnyxUpdate[] = [
{
- reportID,
- reportActionID,
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
+ value: {
+ isLoadingNewerReportActions: true,
+ },
},
+ ];
+
+ const successData: OnyxUpdate[] = [
{
- optimisticData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
- value: {
- isLoadingNewerReportActions: true,
- },
- },
- ],
- successData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
- value: {
- isLoadingNewerReportActions: false,
- },
- },
- ],
- failureData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
- value: {
- isLoadingNewerReportActions: false,
- },
- },
- ],
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
+ value: {
+ isLoadingNewerReportActions: false,
+ },
},
- );
+ ];
+
+ const failureData: OnyxUpdate[] = [
+ {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
+ value: {
+ isLoadingNewerReportActions: false,
+ },
+ },
+ ];
+
+ type GetNewerActionsParameters = {
+ reportID: string;
+ reportActionID: string;
+ };
+
+ const parameters: GetNewerActionsParameters = {
+ reportID,
+ reportActionID,
+ };
+
+ API.read('GetNewerActions', parameters, {optimisticData, successData, failureData});
}
/**
* Gets metadata info about links in the provided report action
- *
- * @param {String} reportID
- * @param {String} reportActionID
*/
-function expandURLPreview(reportID, reportActionID) {
- API.read('ExpandURLPreview', {
+function expandURLPreview(reportID: string, reportActionID: string) {
+ type ExpandURLPreviewParameters = {
+ reportID: string;
+ reportActionID: string;
+ };
+
+ const parameters: ExpandURLPreviewParameters = {
reportID,
reportActionID,
- });
+ };
+
+ API.read('ExpandURLPreview', parameters);
}
-/**
- * Marks the new report actions as read
- *
- * @param {String} reportID
- */
-function readNewestAction(reportID) {
+/** Marks the new report actions as read */
+function readNewestAction(reportID: string) {
const lastReadTime = DateUtils.getDBTime();
- API.write(
- 'ReadNewestAction',
- {
- reportID,
- lastReadTime,
- },
+
+ const optimisticData: OnyxUpdate[] = [
{
- optimisticData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
- value: {
- lastReadTime,
- },
- },
- ],
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+ value: {
+ lastReadTime,
+ },
},
- );
+ ];
+
+ type ReadNewestActionParameters = {
+ reportID: string;
+ lastReadTime: string;
+ };
+
+ const parameters: ReadNewestActionParameters = {
+ reportID,
+ lastReadTime,
+ };
+
+ API.write('ReadNewestAction', parameters, {optimisticData});
}
/**
* Sets the last read time on a report
- *
- * @param {String} reportID
- * @param {String} reportActionCreated
*/
-function markCommentAsUnread(reportID, reportActionCreated) {
+function markCommentAsUnread(reportID: string, reportActionCreated: string) {
// If no action created date is provided, use the last action's
- const actionCreationTime = reportActionCreated || lodashGet(allReports, [reportID, 'lastVisibleActionCreated'], DateUtils.getDBTime(new Date(0)));
+ const actionCreationTime = reportActionCreated || (allReports?.[reportID]?.lastVisibleActionCreated ?? DateUtils.getDBTime(0));
// We subtract 1 millisecond so that the lastReadTime is updated to just before a given reportAction's created date
// For example, if we want to mark a report action with ID 100 and created date '2014-04-01 16:07:02.999' unread, we set the lastReadTime to '2014-04-01 16:07:02.998'
// Since the report action with ID 100 will be the first with a timestamp above '2014-04-01 16:07:02.998', it's the first one that will be shown as unread
const lastReadTime = DateUtils.subtractMillisecondsFromDateTime(actionCreationTime, 1);
- API.write(
- 'MarkAsUnread',
- {
- reportID,
- lastReadTime,
- },
+
+ const optimisticData: OnyxUpdate[] = [
{
- optimisticData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
- value: {
- lastReadTime,
- },
- },
- ],
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+ value: {
+ lastReadTime,
+ },
},
- );
+ ];
+
+ type MarkAsUnreadParameters = {
+ reportID: string;
+ lastReadTime: string;
+ };
+
+ const parameters: MarkAsUnreadParameters = {
+ reportID,
+ lastReadTime,
+ };
+
+ API.write('MarkAsUnread', parameters, {optimisticData});
DeviceEventEmitter.emit(`unreadAction_${reportID}`, lastReadTime);
}
-/**
- * Toggles the pinned state of the report.
- *
- * @param {Object} reportID
- * @param {Boolean} isPinnedChat
- */
-function togglePinnedState(reportID, isPinnedChat) {
+/** Toggles the pinned state of the report. */
+function togglePinnedState(reportID: string, isPinnedChat: boolean) {
const pinnedValue = !isPinnedChat;
// Optimistically pin/unpin the report before we send out the command
- const optimisticData = [
+ const optimisticData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
@@ -958,76 +986,57 @@ function togglePinnedState(reportID, isPinnedChat) {
},
];
- API.write(
- 'TogglePinnedChat',
- {
- reportID,
- pinnedValue,
- },
- {optimisticData},
- );
+ type TogglePinnedChatParameters = {
+ reportID: string;
+ pinnedValue: boolean;
+ };
+
+ const parameters: TogglePinnedChatParameters = {
+ reportID,
+ pinnedValue,
+ };
+
+ API.write('TogglePinnedChat', parameters, {optimisticData});
}
/**
* Saves the comment left by the user as they are typing. By saving this data the user can switch between chats, close
* tab, refresh etc without worrying about loosing what they typed out.
- *
- * @param {String} reportID
- * @param {String} comment
*/
-function saveReportComment(reportID, comment) {
+function saveReportComment(reportID: string, comment: string) {
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`, comment);
}
-/**
- * Saves the number of lines for the comment
- * @param {String} reportID
- * @param {Number} numberOfLines
- */
-function saveReportCommentNumberOfLines(reportID, numberOfLines) {
+/** Saves the number of lines for the comment */
+function saveReportCommentNumberOfLines(reportID: string, numberOfLines: number) {
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT_NUMBER_OF_LINES}${reportID}`, numberOfLines);
}
-/**
- * Immediate indication whether the report has a draft comment.
- *
- * @param {String} reportID
- * @param {Boolean} hasDraft
- * @returns {Promise}
- */
-function setReportWithDraft(reportID, hasDraft) {
+/** Immediate indication whether the report has a draft comment. */
+function setReportWithDraft(reportID: string, hasDraft: boolean): Promise {
return Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {hasDraft});
}
-/**
- * Broadcasts whether or not a user is typing on a report over the report's private pusher channel.
- *
- * @param {String} reportID
- */
-function broadcastUserIsTyping(reportID) {
+/** Broadcasts whether or not a user is typing on a report over the report's private pusher channel. */
+function broadcastUserIsTyping(reportID: string) {
const privateReportChannelName = getReportChannelName(reportID);
- const typingStatus = {};
- typingStatus[currentUserAccountID] = true;
+ const typingStatus: Pusher.UserIsTypingEvent = {
+ [currentUserAccountID]: true,
+ };
Pusher.sendEvent(privateReportChannelName, Pusher.TYPE.USER_IS_TYPING, typingStatus);
}
-/**
- * Broadcasts to the report's private pusher channel whether a user is leaving a report
- *
- * @param {String} reportID
- */
-function broadcastUserIsLeavingRoom(reportID) {
+
+/** Broadcasts to the report's private pusher channel whether a user is leaving a report */
+function broadcastUserIsLeavingRoom(reportID: string) {
const privateReportChannelName = getReportChannelName(reportID);
- const leavingStatus = {};
- leavingStatus[currentUserAccountID] = true;
+ const leavingStatus: Pusher.UserIsLeavingRoomEvent = {
+ [currentUserAccountID]: true,
+ };
Pusher.sendEvent(privateReportChannelName, Pusher.TYPE.USER_IS_LEAVING_ROOM, leavingStatus);
}
-/**
- * When a report changes in Onyx, this fetches the report from the API if the report doesn't have a name
- *
- * @param {Object} report
- */
-function handleReportChanged(report) {
+/** When a report changes in Onyx, this fetches the report from the API if the report doesn't have a name */
+function handleReportChanged(report: OnyxEntry) {
if (!report) {
return;
}
@@ -1035,7 +1044,7 @@ function handleReportChanged(report) {
// It is possible that we optimistically created a DM/group-DM for a set of users for which a report already exists.
// In this case, the API will let us know by returning a preexistingReportID.
// We should clear out the optimistically created report and re-route the user to the preexisting report.
- if (report && report.reportID && report.preexistingReportID) {
+ if (report?.reportID && report.preexistingReportID) {
Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`, null);
// Only re-route them if they are still looking at the optimistically created report
@@ -1046,7 +1055,7 @@ function handleReportChanged(report) {
return;
}
- if (report && report.reportID) {
+ if (allReports && report?.reportID) {
allReports[report.reportID] = report;
if (ReportUtils.isConciergeChatReport(report)) {
@@ -1066,16 +1075,16 @@ Onyx.connect({
callback: handleReportChanged,
});
-/**
- * Deletes a comment from the report, basically sets it as empty string
- *
- * @param {String} reportID
- * @param {Object} reportAction
- */
-function deleteReportComment(reportID, reportAction) {
+/** Deletes a comment from the report, basically sets it as empty string */
+function deleteReportComment(reportID: string, reportAction: ReportAction) {
const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
const reportActionID = reportAction.reportActionID;
- const deletedMessage = [
+
+ if (!reportActionID || !originalReportID) {
+ return;
+ }
+
+ const deletedMessage: Message[] = [
{
translationKey: '',
type: 'COMMENT',
@@ -1085,7 +1094,7 @@ function deleteReportComment(reportID, reportAction) {
isDeletedParentAction: ReportActionsUtils.isThreadParentMessage(reportAction, reportID),
},
];
- const optimisticReportActions = {
+ const optimisticReportActions: NullishDeep = {
[reportActionID]: {
pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
previousMessage: reportAction.message,
@@ -1097,16 +1106,16 @@ function deleteReportComment(reportID, reportAction) {
// If we are deleting the last visible message, let's find the previous visible one (or set an empty one if there are none) and update the lastMessageText in the LHN.
// Similarly, if we are deleting the last read comment we will want to update the lastVisibleActionCreated to use the previous visible message.
- let optimisticReport = {
+ let optimisticReport: Partial = {
lastMessageTranslationKey: '',
lastMessageText: '',
lastVisibleActionCreated: '',
};
- const {lastMessageText = '', lastMessageTranslationKey = ''} = ReportUtils.getLastVisibleMessage(originalReportID, optimisticReportActions);
+ const {lastMessageText = '', lastMessageTranslationKey = ''} = ReportUtils.getLastVisibleMessage(originalReportID, optimisticReportActions as ReportActions);
if (lastMessageText || lastMessageTranslationKey) {
- const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(originalReportID, optimisticReportActions);
- const lastVisibleActionCreated = lodashGet(lastVisibleAction, 'created');
- const lastActorAccountID = lodashGet(lastVisibleAction, 'actorAccountID');
+ const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(originalReportID, optimisticReportActions as ReportActions);
+ const lastVisibleActionCreated = lastVisibleAction?.created;
+ const lastActorAccountID = lastVisibleAction?.actorAccountID;
optimisticReport = {
lastMessageTranslationKey,
lastMessageText,
@@ -1117,7 +1126,7 @@ function deleteReportComment(reportID, reportAction) {
// If the API call fails we must show the original message again, so we revert the message content back to how it was
// and and remove the pendingAction so the strike-through clears
- const failureData = [
+ const failureData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${originalReportID}`,
@@ -1131,7 +1140,7 @@ function deleteReportComment(reportID, reportAction) {
},
];
- const successData = [
+ const successData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${originalReportID}`,
@@ -1144,7 +1153,7 @@ function deleteReportComment(reportID, reportAction) {
},
];
- const optimisticData = [
+ const optimisticData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${originalReportID}`,
@@ -1158,32 +1167,28 @@ function deleteReportComment(reportID, reportAction) {
];
// Update optimistic data for parent report action if the report is a child report and the reportAction has no visible child
- const childVisibleActionCount = reportAction.childVisibleActionCount || 0;
+ const childVisibleActionCount = reportAction.childVisibleActionCount ?? 0;
if (childVisibleActionCount === 0) {
const optimisticParentReportData = ReportUtils.getOptimisticDataForParentReportAction(
originalReportID,
- optimisticReport.lastVisibleActionCreated,
+ optimisticReport?.lastVisibleActionCreated ?? '',
CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
);
- if (!_.isEmpty(optimisticParentReportData)) {
+ if (isNotEmptyObject(optimisticParentReportData)) {
optimisticData.push(optimisticParentReportData);
}
}
- // Check to see if the report action we are deleting is the first comment on a thread report. In this case, we need to trigger
- // an update to let the LHN know that the parentReportAction is now deleted.
- if (ReportUtils.isThreadFirstChat(reportAction, reportID)) {
- optimisticData.push({
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
- value: {updateReportInLHN: true},
- });
- }
+ type DeleteCommentParameters = {
+ reportID: string;
+ reportActionID: string;
+ };
- const parameters = {
+ const parameters: DeleteCommentParameters = {
reportID: originalReportID,
reportActionID,
};
+
API.write('DeleteComment', parameters, {optimisticData, successData, failureData});
}
@@ -1193,29 +1198,24 @@ function deleteReportComment(reportID, reportAction) {
* html="test https://www.google.com test"
* links=["https://www.google.com"]
* returns: "test https://www.google.com test"
- *
- * @param {String} html
- * @param {Array} links
- * @returns {String}
*/
-const removeLinksFromHtml = (html, links) => {
+function removeLinksFromHtml(html: string, links: string[]): string {
let htmlCopy = html.slice();
- _.forEach(links, (link) => {
+ links.forEach((link) => {
// We want to match the anchor tag of the link and replace the whole anchor tag with the text of the anchor tag
const regex = new RegExp(`<(a)[^><]*href\\s*=\\s*(['"])(${Str.escapeForRegExp(link)})\\2(?:".*?"|'.*?'|[^'"><])*>([\\s\\S]*?)<\\/\\1>(?![^<]*(<\\/pre>|<\\/code>))`, 'g');
htmlCopy = htmlCopy.replace(regex, '$4');
});
return htmlCopy;
-};
+}
/**
* This function will handle removing only links that were purposely removed by the user while editing.
*
- * @param {String} newCommentText text of the comment after editing.
- * @param {String} originalCommentMarkdown original markdown of the comment before editing.
- * @returns {String}
+ * @param newCommentText text of the comment after editing.
+ * @param originalCommentMarkdown original markdown of the comment before editing.
*/
-const handleUserDeletedLinksInHtml = (newCommentText, originalCommentMarkdown) => {
+function handleUserDeletedLinksInHtml(newCommentText: string, originalCommentMarkdown: string): string {
const parser = new ExpensiMark();
if (newCommentText.length > CONST.MAX_MARKUP_LENGTH) {
return newCommentText;
@@ -1223,24 +1223,22 @@ const handleUserDeletedLinksInHtml = (newCommentText, originalCommentMarkdown) =
const htmlForNewComment = parser.replace(newCommentText);
const removedLinks = parser.getRemovedMarkdownLinks(originalCommentMarkdown, newCommentText);
return removeLinksFromHtml(htmlForNewComment, removedLinks);
-};
+}
-/**
- * Saves a new message for a comment. Marks the comment as edited, which will be reflected in the UI.
- *
- * @param {String} reportID
- * @param {Object} originalReportAction
- * @param {String} textForNewComment
- */
-function editReportComment(reportID, originalReportAction, textForNewComment) {
+/** Saves a new message for a comment. Marks the comment as edited, which will be reflected in the UI. */
+function editReportComment(reportID: string, originalReportAction: OnyxEntry, textForNewComment: string) {
const parser = new ExpensiMark();
const originalReportID = ReportUtils.getOriginalReportID(reportID, originalReportAction);
+ if (!originalReportID || !originalReportAction) {
+ return;
+ }
+
// Do not autolink if someone explicitly tries to remove a link from message.
// https://github.com/Expensify/App/issues/9090
// https://github.com/Expensify/App/issues/13221
- const originalCommentHTML = lodashGet(originalReportAction, 'message[0].html');
- const originalCommentMarkdown = parser.htmlToMarkdown(originalCommentHTML).trim();
+ const originalCommentHTML = originalReportAction.message?.[0]?.html;
+ const originalCommentMarkdown = parser.htmlToMarkdown(originalCommentHTML ?? '').trim();
// Skip the Edit if draft is not changed
if (originalCommentMarkdown === textForNewComment) {
@@ -1254,12 +1252,12 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
// For longer comments, skip parsing and display plaintext for performance reasons. It takes over 40s to parse a 100k long string!!
let parsedOriginalCommentHTML = originalCommentHTML;
if (textForNewComment.length <= CONST.MAX_MARKUP_LENGTH) {
- const autolinkFilter = {filterRules: _.filter(_.pluck(parser.rules, 'name'), (name) => name !== 'autolink')};
+ const autolinkFilter = {filterRules: parser.rules.map((rule) => rule.name).filter((name) => name !== 'autolink')};
parsedOriginalCommentHTML = parser.replace(originalCommentMarkdown, autolinkFilter);
}
// Delete the comment if it's empty
- if (_.isEmpty(htmlForNewComment)) {
+ if (!htmlForNewComment) {
deleteReportComment(originalReportID, originalReportAction);
return;
}
@@ -1271,13 +1269,14 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
// Optimistically update the reportAction with the new message
const reportActionID = originalReportAction.reportActionID;
- const originalMessage = lodashGet(originalReportAction, ['message', 0]);
- const optimisticReportActions = {
+ const originalMessage = originalReportAction?.message?.[0];
+ const optimisticReportActions: PartialDeep = {
[reportActionID]: {
pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
message: [
{
...originalMessage,
+ type: CONST.REPORT.MESSAGE.TYPE.COMMENT,
isEdited: true,
html: htmlForNewComment,
text: reportComment,
@@ -1286,7 +1285,7 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
},
};
- const optimisticData = [
+ const optimisticData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${originalReportID}`,
@@ -1294,8 +1293,8 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
},
];
- const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(originalReportID, optimisticReportActions);
- if (reportActionID === lodashGet(lastVisibleAction, 'reportActionID')) {
+ const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(originalReportID, optimisticReportActions as ReportActions);
+ if (reportActionID === lastVisibleAction?.reportActionID) {
const lastMessageText = ReportUtils.formatReportLastMessageText(reportComment);
const optimisticReport = {
lastMessageTranslationKey: '',
@@ -1308,7 +1307,7 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
});
}
- const failureData = [
+ const failureData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${originalReportID}`,
@@ -1321,7 +1320,7 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
},
];
- const successData = [
+ const successData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${originalReportID}`,
@@ -1333,66 +1332,64 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
},
];
- const parameters = {
+ type UpdateCommentParameters = {
+ reportID: string;
+ reportComment: string;
+ reportActionID: string;
+ };
+
+ const parameters: UpdateCommentParameters = {
reportID: originalReportID,
reportComment: htmlForNewComment,
reportActionID,
};
+
API.write('UpdateComment', parameters, {optimisticData, successData, failureData});
}
-/**
- * Saves the draft for a comment report action. This will put the comment into "edit mode"
- *
- * @param {String} reportID
- * @param {Object} reportAction
- * @param {String} draftMessage
- */
-function saveReportActionDraft(reportID, reportAction, draftMessage) {
+/** Saves the draft for a comment report action. This will put the comment into "edit mode" */
+function saveReportActionDraft(reportID: string, reportAction: ReportAction, draftMessage: string) {
const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${originalReportID}`, {[reportAction.reportActionID]: draftMessage});
}
-/**
- * Saves the number of lines for the report action draft
- * @param {String} reportID
- * @param {Number} reportActionID
- * @param {Number} numberOfLines
- */
-function saveReportActionDraftNumberOfLines(reportID, reportActionID, numberOfLines) {
+/** Saves the number of lines for the report action draft */
+function saveReportActionDraftNumberOfLines(reportID: string, reportActionID: string, numberOfLines: number) {
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT_NUMBER_OF_LINES}${reportID}_${reportActionID}`, numberOfLines);
}
-/**
- * @param {String} reportID
- * @param {String} previousValue
- * @param {String} newValue
- * @param {boolean} navigate
- * @param {String} parentReportID
- * @param {String} parentReportActionID
- * @param {Object} report
- */
-function updateNotificationPreference(reportID, previousValue, newValue, navigate, parentReportID = 0, parentReportActionID = 0, report = {}) {
+function updateNotificationPreference(
+ reportID: string,
+ previousValue: NotificationPreference | undefined,
+ newValue: NotificationPreference,
+ navigate: boolean,
+ parentReportID?: string,
+ parentReportActionID?: string,
+ report: OnyxEntry | EmptyObject = {},
+) {
if (previousValue === newValue) {
- if (navigate && report.reportID) {
+ if (navigate && isNotEmptyObject(report) && report.reportID) {
ReportUtils.goBackToDetailsPage(report);
}
return;
}
- const optimisticData = [
+
+ const optimisticData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
value: {notificationPreference: newValue},
},
];
- const failureData = [
+
+ const failureData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
value: {notificationPreference: previousValue},
},
];
+
if (parentReportID && parentReportActionID) {
optimisticData.push({
onyxMethod: Onyx.METHOD.MERGE,
@@ -1405,8 +1402,16 @@ function updateNotificationPreference(reportID, previousValue, newValue, navigat
value: {[parentReportActionID]: {childReportNotificationPreference: previousValue}},
});
}
- API.write('UpdateReportNotificationPreference', {reportID, notificationPreference: newValue}, {optimisticData, failureData});
- if (navigate) {
+
+ type UpdateReportNotificationPreferenceParameters = {
+ reportID: string;
+ notificationPreference: NotificationPreference;
+ };
+
+ const parameters: UpdateReportNotificationPreferenceParameters = {reportID, notificationPreference: newValue};
+
+ API.write('UpdateReportNotificationPreference', parameters, {optimisticData, failureData});
+ if (navigate && isNotEmptyObject(report)) {
ReportUtils.goBackToDetailsPage(report);
}
}
@@ -1414,29 +1419,28 @@ function updateNotificationPreference(reportID, previousValue, newValue, navigat
/**
* This will subscribe to an existing thread, or create a new one and then subsribe to it if necessary
*
- * @param {String} childReportID The reportID we are trying to open
- * @param {Object} parentReportAction the parent comment of a thread
- * @param {String} parentReportID The reportID of the parent
- * @param {String} prevNotificationPreference The previous notification preference for the child report
- *
+ * @param childReportID The reportID we are trying to open
+ * @param parentReportAction the parent comment of a thread
+ * @param parentReportID The reportID of the parent
+ * @param prevNotificationPreference The previous notification preference for the child report
*/
-function toggleSubscribeToChildReport(childReportID = '0', parentReportAction = {}, parentReportID = '0', prevNotificationPreference) {
+function toggleSubscribeToChildReport(childReportID = '0', parentReportAction: Partial = {}, parentReportID = '0', prevNotificationPreference?: NotificationPreference) {
if (childReportID !== '0') {
openReport(childReportID);
- const parentReportActionID = lodashGet(parentReportAction, 'reportActionID', '0');
+ const parentReportActionID = parentReportAction?.reportActionID ?? '0';
if (!prevNotificationPreference || prevNotificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN) {
updateNotificationPreference(childReportID, prevNotificationPreference, CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS, false, parentReportID, parentReportActionID);
} else {
updateNotificationPreference(childReportID, prevNotificationPreference, CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN, false, parentReportID, parentReportActionID);
}
} else {
- const participantAccountIDs = _.uniq([currentUserAccountID, Number(parentReportAction.actorAccountID)]);
- const parentReport = allReports[parentReportID];
+ const participantAccountIDs = [...new Set([currentUserAccountID, Number(parentReportAction?.actorAccountID)])];
+ const parentReport = allReports?.[parentReportID];
const newChat = ReportUtils.buildOptimisticChatReport(
participantAccountIDs,
- lodashGet(parentReportAction, ['message', 0, 'text']),
- lodashGet(parentReport, 'chatType', ''),
- lodashGet(parentReport, 'policyID', CONST.POLICY.OWNER_EMAIL_FAKE),
+ parentReportAction?.message?.[0]?.text,
+ parentReport?.chatType,
+ parentReport?.policyID ?? CONST.POLICY.OWNER_EMAIL_FAKE,
CONST.POLICY.OWNER_ACCOUNT_ID_FAKE,
false,
'',
@@ -1447,20 +1451,15 @@ function toggleSubscribeToChildReport(childReportID = '0', parentReportAction =
parentReportID,
);
- const participantLogins = PersonalDetailsUtils.getLoginsByAccountIDs(newChat.participantAccountIDs);
+ const participantLogins = PersonalDetailsUtils.getLoginsByAccountIDs(participantAccountIDs);
openReport(newChat.reportID, participantLogins, newChat, parentReportAction.reportActionID);
const notificationPreference =
prevNotificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN ? CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS : CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN;
- updateNotificationPreference(newChat.reportID, prevNotificationPreference, notificationPreference, false, parentReportID, parentReportAction.reportActionID);
+ updateNotificationPreference(newChat.reportID, prevNotificationPreference, notificationPreference, false, parentReportID, parentReportAction?.reportActionID);
}
}
-/**
- * @param {String} reportID
- * @param {String} previousValue
- * @param {String} newValue
- */
-function updateWelcomeMessage(reportID, previousValue, newValue) {
+function updateWelcomeMessage(reportID: string, previousValue: string, newValue: string) {
// No change needed, navigate back
if (previousValue === newValue) {
Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(reportID));
@@ -1468,49 +1467,62 @@ function updateWelcomeMessage(reportID, previousValue, newValue) {
}
const parsedWelcomeMessage = ReportUtils.getParsedComment(newValue);
- const optimisticData = [
+
+ const optimisticData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
value: {welcomeMessage: parsedWelcomeMessage},
},
];
- const failureData = [
+ const failureData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
value: {welcomeMessage: previousValue},
},
];
- API.write('UpdateWelcomeMessage', {reportID, welcomeMessage: parsedWelcomeMessage}, {optimisticData, failureData});
+
+ type UpdateWelcomeMessageParameters = {
+ reportID: string;
+ welcomeMessage: string;
+ };
+
+ const parameters: UpdateWelcomeMessageParameters = {reportID, welcomeMessage: parsedWelcomeMessage};
+
+ API.write('UpdateWelcomeMessage', parameters, {optimisticData, failureData});
Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(reportID));
}
-/**
- * @param {Object} report
- * @param {String} newValue
- */
-function updateWriteCapabilityAndNavigate(report, newValue) {
+function updateWriteCapabilityAndNavigate(report: Report, newValue: WriteCapability) {
if (report.writeCapability === newValue) {
Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(report.reportID));
return;
}
- const optimisticData = [
+ const optimisticData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`,
value: {writeCapability: newValue},
},
];
- const failureData = [
+ const failureData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`,
value: {writeCapability: report.writeCapability},
},
];
- API.write('UpdateReportWriteCapability', {reportID: report.reportID, writeCapability: newValue}, {optimisticData, failureData});
+
+ type UpdateReportWriteCapabilityParameters = {
+ reportID: string;
+ writeCapability: WriteCapability;
+ };
+
+ const parameters: UpdateReportWriteCapabilityParameters = {reportID: report.reportID, writeCapability: newValue};
+
+ API.write('UpdateReportWriteCapability', parameters, {optimisticData, failureData});
// Return to the report settings page since this field utilizes push-to-page
Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(report.reportID));
}
@@ -1518,7 +1530,7 @@ function updateWriteCapabilityAndNavigate(report, newValue) {
/**
* Navigates to the 1:1 report with Concierge
*
- * @param {Boolean} ignoreConciergeReportID - Flag to ignore conciergeChatReportID during navigation. The default behavior is to not ignore.
+ * @param ignoreConciergeReportID - Flag to ignore conciergeChatReportID during navigation. The default behavior is to not ignore.
*/
function navigateToConciergeChat(ignoreConciergeReportID = false) {
// If conciergeChatReportID contains a concierge report ID, we navigate to the concierge chat using the stored report ID.
@@ -1537,18 +1549,14 @@ function navigateToConciergeChat(ignoreConciergeReportID = false) {
}
}
-/**
- * Add a policy report (workspace room) optimistically and navigate to it.
- *
- * @param {Object} policyReport
- */
-function addPolicyReport(policyReport) {
+/** Add a policy report (workspace room) optimistically and navigate to it. */
+function addPolicyReport(policyReport: ReportUtils.OptimisticChatReport) {
const createdReportAction = ReportUtils.buildOptimisticCreatedReportAction(CONST.POLICY.OWNER_EMAIL_FAKE);
// Onyx.set is used on the optimistic data so that it is present before navigating to the workspace room. With Onyx.merge the workspace room reportID is not present when
// fetchReportIfNeeded is called on the ReportScreen, so openReport is called which is unnecessary since the optimistic data will be stored in Onyx.
// Therefore, Onyx.set is used instead of Onyx.merge.
- const optimisticData = [
+ const optimisticData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.SET,
key: `${ONYXKEYS.COLLECTION.REPORT}${policyReport.reportID}`,
@@ -1570,7 +1578,7 @@ function addPolicyReport(policyReport) {
value: {isLoading: true},
},
];
- const successData = [
+ const successData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${policyReport.reportID}`,
@@ -1595,7 +1603,7 @@ function addPolicyReport(policyReport) {
value: {isLoading: false},
},
];
- const failureData = [
+ const failureData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${policyReport.reportID}`,
@@ -1612,53 +1620,61 @@ function addPolicyReport(policyReport) {
},
];
- API.write(
- 'AddWorkspaceRoom',
- {
- policyID: policyReport.policyID,
- reportName: policyReport.reportName,
- visibility: policyReport.visibility,
- reportID: policyReport.reportID,
- createdReportActionID: createdReportAction.reportActionID,
- writeCapability: policyReport.writeCapability,
- welcomeMessage: policyReport.welcomeMessage,
- },
- {optimisticData, successData, failureData},
- );
+ type AddWorkspaceRoomParameters = {
+ reportID: string;
+ createdReportActionID: string;
+ policyID?: string;
+ reportName?: string;
+ visibility?: ValueOf;
+ writeCapability?: WriteCapability;
+ welcomeMessage?: string;
+ };
+
+ const parameters: AddWorkspaceRoomParameters = {
+ policyID: policyReport.policyID,
+ reportName: policyReport.reportName,
+ visibility: policyReport.visibility,
+ reportID: policyReport.reportID,
+ createdReportActionID: createdReportAction.reportActionID,
+ writeCapability: policyReport.writeCapability,
+ welcomeMessage: policyReport.welcomeMessage,
+ };
+
+ API.write('AddWorkspaceRoom', parameters, {optimisticData, successData, failureData});
+ Navigation.dismissModal(policyReport.reportID);
}
-/**
- * Deletes a report, along with its reportActions, any linked reports, and any linked IOU report.
- *
- * @param {String} reportID
- */
-function deleteReport(reportID) {
- const report = allReports[reportID];
- const onyxData = {
+/** Deletes a report, along with its reportActions, any linked reports, and any linked IOU report. */
+function deleteReport(reportID: string) {
+ const report = allReports?.[reportID];
+ const onyxData: Record = {
[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]: null,
[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`]: null,
};
// Delete linked transactions
- const reportActionsForReport = allReportActions[reportID];
- _.chain(reportActionsForReport)
- .filter((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU)
- .map((reportAction) => reportAction.originalMessage.IOUTransactionID)
- .uniq()
- .each((transactionID) => (onyxData[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] = null));
+ const reportActionsForReport = allReportActions?.[reportID];
+
+ const transactionIDs = Object.values(reportActionsForReport ?? {})
+ .filter((reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU)
+ .map((reportAction) => reportAction.originalMessage.IOUTransactionID);
+
+ [...new Set(transactionIDs)].forEach((transactionID) => {
+ onyxData[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] = null;
+ });
Onyx.multiSet(onyxData);
// Delete linked IOU report
- if (report && report.iouReportID) {
+ if (report?.iouReportID) {
deleteReport(report.iouReportID);
}
}
/**
- * @param {String} reportID The reportID of the policy report (workspace room)
+ * @param reportID The reportID of the policy report (workspace room)
*/
-function navigateToConciergeChatAndDeleteReport(reportID) {
+function navigateToConciergeChatAndDeleteReport(reportID: string) {
// Dismiss the current report screen and replace it with Concierge Chat
Navigation.goBack(ROUTES.HOME);
navigateToConciergeChat();
@@ -1666,12 +1682,9 @@ function navigateToConciergeChatAndDeleteReport(reportID) {
}
/**
- * @param {Object} policyRoomReport
- * @param {Number} policyRoomReport.reportID
- * @param {String} policyRoomReport.reportName
- * @param {String} policyRoomName The updated name for the policy room
+ * @param policyRoomName The updated name for the policy room
*/
-function updatePolicyRoomNameAndNavigate(policyRoomReport, policyRoomName) {
+function updatePolicyRoomNameAndNavigate(policyRoomReport: Report, policyRoomName: string) {
const reportID = policyRoomReport.reportID;
const previousName = policyRoomReport.reportName;
@@ -1680,7 +1693,8 @@ function updatePolicyRoomNameAndNavigate(policyRoomReport, policyRoomName) {
Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(reportID));
return;
}
- const optimisticData = [
+
+ const optimisticData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
@@ -1695,7 +1709,7 @@ function updatePolicyRoomNameAndNavigate(policyRoomReport, policyRoomName) {
},
},
];
- const successData = [
+ const successData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
@@ -1706,7 +1720,7 @@ function updatePolicyRoomNameAndNavigate(policyRoomReport, policyRoomName) {
},
},
];
- const failureData = [
+ const failureData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
@@ -1715,14 +1729,22 @@ function updatePolicyRoomNameAndNavigate(policyRoomReport, policyRoomName) {
},
},
];
- API.write('UpdatePolicyRoomName', {reportID, policyRoomName}, {optimisticData, successData, failureData});
+
+ type UpdatePolicyRoomNameParameters = {
+ reportID: string;
+ policyRoomName: string;
+ };
+
+ const parameters: UpdatePolicyRoomNameParameters = {reportID, policyRoomName};
+
+ API.write('UpdatePolicyRoomName', parameters, {optimisticData, successData, failureData});
Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(reportID));
}
/**
- * @param {String} reportID The reportID of the policy room.
+ * @param reportID The reportID of the policy room.
*/
-function clearPolicyRoomNameErrors(reportID) {
+function clearPolicyRoomNameErrors(reportID: string) {
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {
errorFields: {
reportName: null,
@@ -1733,21 +1755,15 @@ function clearPolicyRoomNameErrors(reportID) {
});
}
-/**
- * @param {String} reportID
- * @param {Boolean} isComposerFullSize
- */
-function setIsComposerFullSize(reportID, isComposerFullSize) {
+function setIsComposerFullSize(reportID: string, isComposerFullSize: boolean) {
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_IS_COMPOSER_FULL_SIZE}${reportID}`, isComposerFullSize);
}
/**
- * @param {String} reportID
- * @param {Object|null} action the associated report action (optional)
- * @param {Boolean} isRemote whether or not this notification is a remote push notification
- * @returns {Boolean}
+ * @param action the associated report action (optional)
+ * @param isRemote whether or not this notification is a remote push notification
*/
-function shouldShowReportActionNotification(reportID, action = null, isRemote = false) {
+function shouldShowReportActionNotification(reportID: string, action: ReportAction | null = null, isRemote = false): boolean {
const tag = isRemote ? '[PushNotification]' : '[LocalNotification]';
// Due to payload size constraints, some push notifications may have their report action stripped
@@ -1763,7 +1779,7 @@ function shouldShowReportActionNotification(reportID, action = null, isRemote =
}
// We don't want to send a local notification if the user preference is daily, mute or hidden.
- const notificationPreference = lodashGet(allReports, [reportID, 'notificationPreference'], CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS);
+ const notificationPreference = allReports?.[reportID]?.notificationPreference ?? CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS;
if (notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS) {
Log.info(`${tag} No notification because user preference is to be notified: ${notificationPreference}`);
return false;
@@ -1781,76 +1797,63 @@ function shouldShowReportActionNotification(reportID, action = null, isRemote =
return false;
}
- const report = allReports[reportID];
+ const report = allReports?.[reportID];
if (!report || (report && report.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)) {
Log.info(`${tag} No notification because the report does not exist or is pending deleted`, false);
return false;
}
// If this notification was delayed and the user saw the message already, don't show it
- if (action && report && report.lastReadTime >= action.created) {
+ if (action && report?.lastReadTime && report.lastReadTime >= action.created) {
Log.info(`${tag} No notification because the comment was already read`, false, {created: action.created, lastReadTime: report.lastReadTime});
return false;
}
// Only show notifications for supported types of report actions
if (!ReportActionsUtils.isNotifiableReportAction(action)) {
- Log.info(`${tag} No notification because this action type is not supported`, false, {actionName: lodashGet(action, 'actionName')});
+ Log.info(`${tag} No notification because this action type is not supported`, false, {actionName: action?.actionName});
return false;
}
return true;
}
-/**
- * @param {String} reportID
- * @param {Object} reportAction
- */
-function showReportActionNotification(reportID, reportAction) {
+function showReportActionNotification(reportID: string, reportAction: ReportAction) {
if (!shouldShowReportActionNotification(reportID, reportAction)) {
return;
}
Log.info('[LocalNotification] Creating notification');
- const report = allReports[reportID];
- const notificationParams = {
- report,
- reportAction,
- onClick: () => Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID)),
- };
+ const report = allReports?.[reportID] ?? null;
+ if (!report) {
+ Log.hmmm("[LocalNotification] couldn't show report action notification because the report wasn't found", {reportID, reportActionID: reportAction.reportActionID});
+ return;
+ }
+
+ const onClick = () => Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
+
if (reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.MODIFIEDEXPENSE) {
- LocalNotification.showModifiedExpenseNotification(notificationParams);
+ LocalNotification.showModifiedExpenseNotification(report, reportAction, onClick);
} else {
- LocalNotification.showCommentNotification(notificationParams);
+ LocalNotification.showCommentNotification(report, reportAction, onClick);
}
notifyNewAction(reportID, reportAction.actorAccountID, reportAction.reportActionID);
}
-/**
- * Clear the errors associated with the IOUs of a given report.
- *
- * @param {String} reportID
- */
-function clearIOUError(reportID) {
+/** Clear the errors associated with the IOUs of a given report. */
+function clearIOUError(reportID: string) {
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {errorFields: {iou: null}});
}
/**
* Adds a reaction to the report action.
* Uses the NEW FORMAT for "emojiReactions"
- * @param {String} reportID
- * @param {String} reportActionID
- * @param {Object} emoji
- * @param {String} emoji.name
- * @param {String} emoji.code
- * @param {String[]} [emoji.types]
- * @param {Number} [skinTone]
*/
-function addEmojiReaction(reportID, reportActionID, emoji, skinTone = preferredSkinTone) {
+function addEmojiReaction(reportID: string, reportActionID: string, emoji: Emoji, skinTone: string | number = preferredSkinTone) {
const createdAt = timezoneFormat(utcToZonedTime(new Date(), 'UTC'), CONST.DATE.FNS_DB_FORMAT_STRING);
- const optimisticData = [
+ const optimisticData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`,
@@ -1861,7 +1864,7 @@ function addEmojiReaction(reportID, reportActionID, emoji, skinTone = preferredS
users: {
[currentUserAccountID]: {
skinTones: {
- [!_.isUndefined(skinTone) ? skinTone : -1]: createdAt,
+ [skinTone ?? CONST.EMOJI_DEFAULT_SKIN_TONE]: createdAt,
},
},
},
@@ -1870,7 +1873,7 @@ function addEmojiReaction(reportID, reportActionID, emoji, skinTone = preferredS
},
];
- const failureData = [
+ const failureData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`,
@@ -1882,7 +1885,7 @@ function addEmojiReaction(reportID, reportActionID, emoji, skinTone = preferredS
},
];
- const successData = [
+ const successData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`,
@@ -1894,7 +1897,16 @@ function addEmojiReaction(reportID, reportActionID, emoji, skinTone = preferredS
},
];
- const parameters = {
+ type AddEmojiReactionParameters = {
+ reportID: string;
+ skinTone: string | number;
+ emojiCode: string;
+ reportActionID: string;
+ createdAt: string;
+ useEmojiReactions: boolean;
+ };
+
+ const parameters: AddEmojiReactionParameters = {
reportID,
skinTone,
emojiCode: emoji.name,
@@ -1903,21 +1915,16 @@ function addEmojiReaction(reportID, reportActionID, emoji, skinTone = preferredS
// This will be removed as part of https://github.com/Expensify/App/issues/19535
useEmojiReactions: true,
};
+
API.write('AddEmojiReaction', parameters, {optimisticData, successData, failureData});
}
/**
* Removes a reaction to the report action.
* Uses the NEW FORMAT for "emojiReactions"
- * @param {String} reportID
- * @param {String} reportActionID
- * @param {Object} emoji
- * @param {String} emoji.name
- * @param {String} emoji.code
- * @param {String[]} [emoji.types]
*/
-function removeEmojiReaction(reportID, reportActionID, emoji) {
- const optimisticData = [
+function removeEmojiReaction(reportID: string, reportActionID: string, emoji: Emoji) {
+ const optimisticData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`,
@@ -1931,37 +1938,51 @@ function removeEmojiReaction(reportID, reportActionID, emoji) {
},
];
- const parameters = {
+ type RemoveEmojiReactionParameters = {
+ reportID: string;
+ reportActionID: string;
+ emojiCode: string;
+ useEmojiReactions: boolean;
+ };
+
+ const parameters: RemoveEmojiReactionParameters = {
reportID,
reportActionID,
emojiCode: emoji.name,
// This will be removed as part of https://github.com/Expensify/App/issues/19535
useEmojiReactions: true,
};
+
API.write('RemoveEmojiReaction', parameters, {optimisticData});
}
/**
* Calls either addEmojiReaction or removeEmojiReaction depending on if the current user has reacted to the report action.
* Uses the NEW FORMAT for "emojiReactions"
- * @param {String} reportID
- * @param {Object} reportAction
- * @param {Object} reactionObject
- * @param {Object} existingReactions
- * @param {Number} [paramSkinTone]
*/
-function toggleEmojiReaction(reportID, reportAction, reactionObject, existingReactions, paramSkinTone = preferredSkinTone) {
+function toggleEmojiReaction(
+ reportID: string,
+ reportAction: ReportAction,
+ reactionObject: Emoji,
+ existingReactions: ReportActionReactions | undefined,
+ paramSkinTone: number = preferredSkinTone,
+) {
const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
+
+ if (!originalReportID) {
+ return;
+ }
+
const originalReportAction = ReportActionsUtils.getReportAction(originalReportID, reportAction.reportActionID);
- if (_.isEmpty(originalReportAction)) {
+ if (isEmptyObject(originalReportAction)) {
return;
}
// This will get cleaned up as part of https://github.com/Expensify/App/issues/16506 once the old emoji
// format is no longer being used
const emoji = EmojiUtils.findEmojiByCode(reactionObject.code);
- const existingReactionObject = lodashGet(existingReactions, [emoji.name]);
+ const existingReactionObject = existingReactions?.[emoji.name];
// Only use skin tone if emoji supports it
const skinTone = emoji.types === undefined ? -1 : paramSkinTone;
@@ -1974,11 +1995,7 @@ function toggleEmojiReaction(reportID, reportAction, reactionObject, existingRea
addEmojiReaction(originalReportID, reportAction.reportActionID, emoji, skinTone);
}
-/**
- * @param {String|null} url
- * @param {Boolean} isAuthenticated
- */
-function openReportFromDeepLink(url, isAuthenticated) {
+function openReportFromDeepLink(url: string, isAuthenticated: boolean) {
const reportID = ReportUtils.getReportIDFromLink(url);
if (reportID && !isAuthenticated) {
@@ -2015,25 +2032,23 @@ function openReportFromDeepLink(url, isAuthenticated) {
return;
}
- Navigation.navigate(route, CONST.NAVIGATION.ACTION_TYPE.PUSH);
+ Navigation.navigate(route as Route, CONST.NAVIGATION.ACTION_TYPE.PUSH);
});
});
});
}
-function getCurrentUserAccountID() {
+function getCurrentUserAccountID(): number {
return currentUserAccountID;
}
-/**
- * Leave a report by setting the state to submitted and closed
- *
- * @param {String} reportID
- * @param {Boolean} isWorkspaceMemberLeavingWorkspaceRoom
- */
-function leaveRoom(reportID, isWorkspaceMemberLeavingWorkspaceRoom = false) {
- const report = lodashGet(allReports, [reportID], {});
- const reportKeys = _.keys(report);
+/** Leave a report by setting the state to submitted and closed */
+function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = false) {
+ const report = allReports?.[reportID];
+
+ if (!report) {
+ return;
+ }
// Pusher's leavingStatus should be sent earlier.
// Place the broadcast before calling the LeaveRoom API to prevent a race condition
@@ -2042,192 +2057,198 @@ function leaveRoom(reportID, isWorkspaceMemberLeavingWorkspaceRoom = false) {
// If a workspace member is leaving a workspace room, they don't actually lose the room from Onyx.
// Instead, their notification preference just gets set to "hidden".
- const optimisticData = [
- isWorkspaceMemberLeavingWorkspaceRoom
- ? {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
- value: {
+ const optimisticData: OnyxUpdate[] = [
+ {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+ value: isWorkspaceMemberLeavingWorkspaceRoom
+ ? {
notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
- },
- }
- : {
- onyxMethod: Onyx.METHOD.SET,
- key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
- value: {
+ }
+ : {
+ reportID: null,
stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
statusNum: CONST.REPORT.STATUS.CLOSED,
- chatType: report.chatType,
- parentReportID: report.parentReportID,
- parentReportActionID: report.parentReportActionID,
- policyID: report.policyID,
- type: report.type,
+ notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
},
- },
+ },
];
- const successData = [
+ const successData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
- value: isWorkspaceMemberLeavingWorkspaceRoom ? {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN} : _.object(reportKeys, Array(reportKeys.length).fill(null)),
+ value: isWorkspaceMemberLeavingWorkspaceRoom
+ ? {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN}
+ : Object.keys(report).reduce>((acc, key) => {
+ acc[key] = null;
+ return acc;
+ }, {}),
},
];
- API.write(
- 'LeaveRoom',
- {
- reportID,
- },
+ const failureData: OnyxUpdate[] = [
{
- optimisticData,
- successData,
- failureData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
- value: report,
- },
- ],
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+ value: report,
},
- );
+ ];
+
+ type LeaveRoomParameters = {
+ reportID: string;
+ };
+
+ const parameters: LeaveRoomParameters = {
+ reportID,
+ };
+
+ API.write('LeaveRoom', parameters, {optimisticData, successData, failureData});
if (isWorkspaceMemberLeavingWorkspaceRoom) {
const participantAccountIDs = PersonalDetailsUtils.getAccountIDsByLogins([CONST.EMAIL.CONCIERGE]);
const chat = ReportUtils.getChatByParticipants(participantAccountIDs);
- Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(chat.reportID));
+ if (chat?.reportID) {
+ Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(chat.reportID));
+ }
}
}
-/**
- * Invites people to a room
- *
- * @param {String} reportID
- * @param {Object} inviteeEmailsToAccountIDs
- */
-function inviteToRoom(reportID, inviteeEmailsToAccountIDs) {
- const report = lodashGet(allReports, [reportID], {});
+/** Invites people to a room */
+function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: Record) {
+ const report = allReports?.[reportID];
+
+ if (!report) {
+ return;
+ }
+
+ const inviteeEmails = Object.keys(inviteeEmailsToAccountIDs);
+ const inviteeAccountIDs = Object.values(inviteeEmailsToAccountIDs);
+ const participantAccountIDsAfterInvitation = [...new Set([...(report?.participantAccountIDs ?? []), ...inviteeAccountIDs])].filter(
+ (accountID): accountID is number => typeof accountID === 'number',
+ );
- const inviteeEmails = _.keys(inviteeEmailsToAccountIDs);
- const inviteeAccountIDs = _.values(inviteeEmailsToAccountIDs);
+ type PersonalDetailsOnyxData = {
+ optimisticData: OnyxUpdate[];
+ successData: OnyxUpdate[];
+ failureData: OnyxUpdate[];
+ };
- const {participantAccountIDs} = report;
- const participantAccountIDsAfterInvitation = _.uniq([...participantAccountIDs, ...inviteeAccountIDs]);
+ const logins = inviteeEmails.map((memberLogin) => OptionsListUtils.addSMSDomainIfPhoneNumber(memberLogin));
+ const newPersonalDetailsOnyxData = PersonalDetailsUtils.getNewPersonalDetailsOnyxData(logins, inviteeAccountIDs) as PersonalDetailsOnyxData;
- API.write(
- 'InviteToRoom',
+ const optimisticData: OnyxUpdate[] = [
{
- reportID,
- inviteeEmails,
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+ value: {
+ participantAccountIDs: participantAccountIDsAfterInvitation,
+ },
},
+ ...newPersonalDetailsOnyxData.optimisticData,
+ ];
+
+ const successData: OnyxUpdate[] = newPersonalDetailsOnyxData.successData;
+
+ const failureData: OnyxUpdate[] = [
{
- optimisticData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
- value: {
- participantAccountIDs: participantAccountIDsAfterInvitation,
- },
- },
- ],
- failureData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
- value: {
- participantAccountIDs,
- },
- },
- ],
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+ value: {
+ participantAccountIDs: report.participantAccountIDs,
+ },
},
- );
+ ...newPersonalDetailsOnyxData.failureData,
+ ];
+
+ type InviteToRoomParameters = {
+ reportID: string;
+ inviteeEmails: string[];
+ };
+
+ const parameters: InviteToRoomParameters = {
+ reportID,
+ inviteeEmails,
+ };
+
+ API.write('InviteToRoom', parameters, {optimisticData, successData, failureData});
}
-/**
- * Removes people from a room
- *
- * @param {String} reportID
- * @param {Array} targetAccountIDs
- */
-function removeFromRoom(reportID, targetAccountIDs) {
- const report = lodashGet(allReports, [reportID], {});
+/** Removes people from a room */
+function removeFromRoom(reportID: string, targetAccountIDs: number[]) {
+ const report = allReports?.[reportID];
- const {participantAccountIDs} = report;
- const participantAccountIDsAfterRemoval = _.difference(participantAccountIDs, targetAccountIDs);
+ const participantAccountIDsAfterRemoval = report?.participantAccountIDs?.filter((id: number) => !targetAccountIDs.includes(id));
- API.write(
- 'RemoveFromRoom',
+ const optimisticData: OnyxUpdate[] = [
{
- reportID,
- targetAccountIDs,
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+ value: {
+ participantAccountIDs: participantAccountIDsAfterRemoval,
+ },
},
+ ];
+
+ const failureData: OnyxUpdate[] = [
{
- optimisticData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
- value: {
- participantAccountIDs: participantAccountIDsAfterRemoval,
- },
- },
- ],
- failureData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
- value: {
- participantAccountIDs,
- },
- },
- ],
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+ value: {
+ participantAccountIDs: report?.participantAccountIDs,
+ },
+ },
+ ];
- // We need to add success data here since in high latency situations,
- // the OpenRoomMembersPage call has the chance of overwriting the optimistic data we set above.
- successData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
- value: {
- participantAccountIDs: participantAccountIDsAfterRemoval,
- },
- },
- ],
+ // We need to add success data here since in high latency situations,
+ // the OpenRoomMembersPage call has the chance of overwriting the optimistic data we set above.
+ const successData: OnyxUpdate[] = [
+ {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+ value: {
+ participantAccountIDs: participantAccountIDsAfterRemoval,
+ },
},
- );
+ ];
+
+ type RemoveFromRoomParameters = {
+ reportID: string;
+ targetAccountIDs: number[];
+ };
+
+ const parameters: RemoveFromRoomParameters = {
+ reportID,
+ targetAccountIDs,
+ };
+
+ API.write('RemoveFromRoom', parameters, {optimisticData, failureData, successData});
}
-/**
- * @param {String} reportID
- */
-function setLastOpenedPublicRoom(reportID) {
+function setLastOpenedPublicRoom(reportID: string) {
Onyx.set(ONYXKEYS.LAST_OPENED_PUBLIC_ROOM_ID, reportID);
}
-/**
- * Navigates to the last opened public room
- *
- * @param {String} lastOpenedPublicRoomID
- */
-function openLastOpenedPublicRoom(lastOpenedPublicRoomID) {
+/** Navigates to the last opened public room */
+function openLastOpenedPublicRoom(lastOpenedPublicRoomID: string) {
Navigation.isNavigationReady().then(() => {
setLastOpenedPublicRoom('');
Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(lastOpenedPublicRoomID));
});
}
-/**
- * Flag a comment as offensive
- *
- * @param {String} reportID
- * @param {Object} reportAction
- * @param {String} severity
- */
-function flagComment(reportID, reportAction, severity) {
+/** Flag a comment as offensive */
+function flagComment(reportID: string, reportAction: OnyxEntry, severity: string) {
const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
- const message = reportAction.message[0];
- let updatedDecision;
+ const message = reportAction?.message?.[0];
+
+ if (!message) {
+ return;
+ }
+
+ let updatedDecision: Decision;
if (severity === CONST.MODERATION.FLAG_SEVERITY_SPAM || severity === CONST.MODERATION.FLAG_SEVERITY_INCONSIDERATE) {
- if (!message.moderationDecision) {
+ if (!message?.moderationDecision) {
updatedDecision = {
decision: CONST.MODERATION.MODERATOR_DECISION_PENDING,
};
@@ -2246,12 +2267,12 @@ function flagComment(reportID, reportAction, severity) {
const reportActionID = reportAction.reportActionID;
- const updatedMessage = {
+ const updatedMessage: Message = {
...message,
moderationDecision: updatedDecision,
};
- const optimisticData = [
+ const optimisticData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${originalReportID}`,
@@ -2264,7 +2285,7 @@ function flagComment(reportID, reportAction, severity) {
},
];
- const failureData = [
+ const failureData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${originalReportID}`,
@@ -2277,7 +2298,7 @@ function flagComment(reportID, reportAction, severity) {
},
];
- const successData = [
+ const successData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${originalReportID}`,
@@ -2289,7 +2310,13 @@ function flagComment(reportID, reportAction, severity) {
},
];
- const parameters = {
+ type FlagCommentParameters = {
+ severity: string;
+ reportActionID: string;
+ isDevRequest: boolean;
+ };
+
+ const parameters: FlagCommentParameters = {
severity,
reportActionID,
// This check is to prevent flooding Concierge with test flags
@@ -2300,15 +2327,9 @@ function flagComment(reportID, reportAction, severity) {
API.write('FlagComment', parameters, {optimisticData, successData, failureData});
}
-/**
- * Updates a given user's private notes on a report
- *
- * @param {String} reportID
- * @param {Number} accountID
- * @param {String} note
- */
-const updatePrivateNotes = (reportID, accountID, note) => {
- const optimisticData = [
+/** Updates a given user's private notes on a report */
+const updatePrivateNotes = (reportID: string, accountID: number, note: string) => {
+ const optimisticData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
@@ -2324,7 +2345,7 @@ const updatePrivateNotes = (reportID, accountID, note) => {
},
];
- const successData = [
+ const successData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
@@ -2339,7 +2360,7 @@ const updatePrivateNotes = (reportID, accountID, note) => {
},
];
- const failureData = [
+ const failureData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
@@ -2353,152 +2374,134 @@ const updatePrivateNotes = (reportID, accountID, note) => {
},
];
- API.write(
- 'UpdateReportPrivateNote',
- {
- reportID,
- privateNotes: note,
- },
- {optimisticData, successData, failureData},
- );
+ type UpdateReportPrivateNoteParameters = {
+ reportID: string;
+ privateNotes: string;
+ };
+
+ const parameters: UpdateReportPrivateNoteParameters = {reportID, privateNotes: note};
+
+ API.write('UpdateReportPrivateNote', parameters, {optimisticData, successData, failureData});
};
-/**
- * Fetches all the private notes for a given report
- *
- * @param {String} reportID
- */
-function getReportPrivateNote(reportID) {
- if (_.isEmpty(reportID)) {
+/** Fetches all the private notes for a given report */
+function getReportPrivateNote(reportID: string) {
+ if (!reportID) {
return;
}
- API.read(
- 'GetReportPrivateNote',
+
+ const optimisticData: OnyxUpdate[] = [
{
- reportID,
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+ value: {
+ isLoadingPrivateNotes: true,
+ },
},
+ ];
+
+ const successData: OnyxUpdate[] = [
{
- optimisticData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
- value: {
- isLoadingPrivateNotes: true,
- },
- },
- ],
- successData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
- value: {
- isLoadingPrivateNotes: false,
- },
- },
- ],
- failureData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
- value: {
- isLoadingPrivateNotes: false,
- },
- },
- ],
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+ value: {
+ isLoadingPrivateNotes: false,
+ },
},
- );
+ ];
+
+ const failureData: OnyxUpdate[] = [
+ {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+ value: {
+ isLoadingPrivateNotes: false,
+ },
+ },
+ ];
+
+ type GetReportPrivateNoteParameters = {
+ reportID: string;
+ };
+
+ const parameters: GetReportPrivateNoteParameters = {reportID};
+
+ API.read('GetReportPrivateNote', parameters, {optimisticData, successData, failureData});
}
-/**
- * Loads necessary data for rendering the RoomMembersPage
- *
- * @param {String|Number} reportID
- */
-function openRoomMembersPage(reportID) {
- API.read('OpenRoomMembersPage', {
- reportID,
- });
+/** Loads necessary data for rendering the RoomMembersPage */
+function openRoomMembersPage(reportID: string) {
+ type OpenRoomMembersPageParameters = {
+ reportID: string;
+ };
+
+ const parameters: OpenRoomMembersPageParameters = {reportID};
+
+ API.read('OpenRoomMembersPage', parameters);
}
/**
* Checks if there are any errors in the private notes for a given report
*
- * @param {Object} report
- * @returns {Boolean} Returns true if there are errors in any of the private notes on the report
+ * @returns Returns true if there are errors in any of the private notes on the report
*/
-function hasErrorInPrivateNotes(report) {
- const privateNotes = lodashGet(report, 'privateNotes', {});
- return _.some(privateNotes, (privateNote) => !_.isEmpty(privateNote.errors));
+function hasErrorInPrivateNotes(report: OnyxEntry): boolean {
+ const privateNotes = report?.privateNotes ?? {};
+ return Object.values(privateNotes).some((privateNote) => !isEmpty(privateNote.errors));
}
-/**
- * Clears all errors associated with a given private note
- *
- * @param {String} reportID
- * @param {Number} accountID
- */
-function clearPrivateNotesError(reportID, accountID) {
+/** Clears all errors associated with a given private note */
+function clearPrivateNotesError(reportID: string, accountID: number) {
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {privateNotes: {[accountID]: {errors: null}}});
}
-function getDraftPrivateNote(reportID) {
- return draftNoteMap[reportID] || '';
+function getDraftPrivateNote(reportID: string): string {
+ return draftNoteMap?.[reportID] ?? '';
}
/**
* Saves the private notes left by the user as they are typing. By saving this data the user can switch between chats, close
* tab, refresh etc without worrying about loosing what they typed out.
- *
- * @param {String} reportID
- * @param {String} note
*/
-function savePrivateNotesDraft(reportID, note) {
+function savePrivateNotesDraft(reportID: string, note: string) {
Onyx.merge(`${ONYXKEYS.COLLECTION.PRIVATE_NOTES_DRAFT}${reportID}`, note);
}
-/**
- * @private
- * @param {string} searchInput
- */
-function searchForReports(searchInput) {
+function searchForReports(searchInput: string) {
// We do not try to make this request while offline because it sets a loading indicator optimistically
if (isNetworkOffline) {
Onyx.set(ONYXKEYS.IS_SEARCHING_FOR_REPORTS, false);
return;
}
- API.read(
- 'SearchForReports',
- {searchInput},
+ const successData: OnyxUpdate[] = [
{
- successData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: ONYXKEYS.IS_SEARCHING_FOR_REPORTS,
- value: false,
- },
- ],
- failureData: [
- {
- onyxMethod: Onyx.METHOD.MERGE,
- key: ONYXKEYS.IS_SEARCHING_FOR_REPORTS,
- value: false,
- },
- ],
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: ONYXKEYS.IS_SEARCHING_FOR_REPORTS,
+ value: false,
},
- );
+ ];
+
+ const failureData: OnyxUpdate[] = [
+ {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: ONYXKEYS.IS_SEARCHING_FOR_REPORTS,
+ value: false,
+ },
+ ];
+
+ type SearchForReportsParameters = {
+ searchInput: string;
+ };
+
+ const parameters: SearchForReportsParameters = {searchInput};
+
+ API.read('SearchForReports', parameters, {successData, failureData});
}
-/**
- * @private
- * @param {string} searchInput
- */
const debouncedSearchInServer = lodashDebounce(searchForReports, CONST.TIMING.SEARCH_FOR_REPORTS_DEBOUNCE_TIME, {leading: false});
-/**
- * @param {string} searchInput
- */
-function searchInServer(searchInput) {
+function searchInServer(searchInput: string) {
if (isNetworkOffline || !searchInput.trim().length) {
Onyx.set(ONYXKEYS.IS_SEARCHING_FOR_REPORTS, false);
return;
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index 82b51651cacc..d7043ee7b3eb 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -4,14 +4,20 @@ import {ChannelAuthorizationCallback} from 'pusher-js/with-encryption';
import {Linking} from 'react-native';
import Onyx, {OnyxUpdate} from 'react-native-onyx';
import {ValueOf} from 'type-fest';
+import * as PersistedRequests from '@libs/actions/PersistedRequests';
import * as API from '@libs/API';
import * as Authentication from '@libs/Authentication';
import * as ErrorUtils from '@libs/ErrorUtils';
+import HttpUtils from '@libs/HttpUtils';
import Log from '@libs/Log';
import Navigation from '@libs/Navigation/Navigation';
+import navigationRef from '@libs/Navigation/navigationRef';
+import * as MainQueue from '@libs/Network/MainQueue';
import * as NetworkStore from '@libs/Network/NetworkStore';
+import NetworkConnection from '@libs/NetworkConnection';
import * as Pusher from '@libs/Pusher/pusher';
import * as ReportUtils from '@libs/ReportUtils';
+import * as SessionUtils from '@libs/SessionUtils';
import Timers from '@libs/Timers';
import {hideContextMenu} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
import * as Device from '@userActions/Device';
@@ -23,6 +29,7 @@ import CONFIG from '@src/CONFIG';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
import Credentials from '@src/types/onyx/Credentials';
import {AutoAuthState} from '@src/types/onyx/Session';
import clearCache from './clearCache';
@@ -332,19 +339,19 @@ function signInWithShortLivedAuthToken(email: string, authToken: string) {
isLoading: true,
},
},
- ];
-
- const successData: OnyxUpdate[] = [
+ // We are making a temporary modification to 'signedInWithShortLivedAuthToken' to ensure that 'App.openApp' will be called at least once
{
onyxMethod: Onyx.METHOD.MERGE,
- key: ONYXKEYS.ACCOUNT,
+ key: ONYXKEYS.SESSION,
value: {
- isLoading: false,
+ signedInWithShortLivedAuthToken: true,
},
},
];
- const failureData: OnyxUpdate[] = [
+ // Subsequently, we revert it back to the default value of 'signedInWithShortLivedAuthToken' in 'successData' or 'failureData' to ensure the user is logged out on refresh
+ // We are combining both success and failure data params into one const as they are identical
+ const resolutionData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.ACCOUNT,
@@ -352,8 +359,18 @@ function signInWithShortLivedAuthToken(email: string, authToken: string) {
isLoading: false,
},
},
+ {
+ onyxMethod: Onyx.METHOD.MERGE,
+ key: ONYXKEYS.SESSION,
+ value: {
+ signedInWithShortLivedAuthToken: null,
+ },
+ },
];
+ const successData = resolutionData;
+ const failureData = resolutionData;
+
// If the user is signing in with a different account from the current app, should not pass the auto-generated login as it may be tied to the old account.
// scene 1: the user is transitioning to newDot from a different account on oldDot.
// scene 2: the user is transitioning to desktop app from a different account on web app.
@@ -583,14 +600,40 @@ function clearSignInData() {
});
}
+/**
+ * Reset all current params of the Home route
+ */
+function resetHomeRouteParams() {
+ Navigation.isNavigationReady().then(() => {
+ const routes = navigationRef.current?.getState().routes;
+ const homeRoute = routes?.find((route) => route.name === SCREENS.HOME);
+
+ const emptyParams: Record = {};
+ Object.keys(homeRoute?.params ?? {}).forEach((paramKey) => {
+ emptyParams[paramKey] = undefined;
+ });
+
+ Navigation.setParams(emptyParams, homeRoute?.key ?? '');
+ Onyx.set(ONYXKEYS.IS_CHECKING_PUBLIC_ROOM, false);
+ });
+}
+
/**
* Put any logic that needs to run when we are signed out here. This can be triggered when the current tab or another tab signs out.
+ * - Cancels pending network calls - any lingering requests are discarded to prevent unwanted storage writes
+ * - Clears all current params of the Home route - the login page URL should not contain any parameter
*/
function cleanupSession() {
Pusher.disconnect();
Timers.clearAll();
Welcome.resetReadyCheck();
PriorityMode.resetHasReadRequiredDataFromStorage();
+ MainQueue.clear();
+ HttpUtils.cancelPendingRequests();
+ PersistedRequests.clear();
+ NetworkConnection.clearReconnectionCallbacks();
+ SessionUtils.resetDidUserLogInDuringSession();
+ resetHomeRouteParams();
}
function clearAccountMessages() {
diff --git a/src/libs/actions/SignInRedirect.ts b/src/libs/actions/SignInRedirect.ts
index 9ca4e6813567..6c9e7f55d887 100644
--- a/src/libs/actions/SignInRedirect.ts
+++ b/src/libs/actions/SignInRedirect.ts
@@ -1,14 +1,6 @@
import Onyx from 'react-native-onyx';
import * as ErrorUtils from '@libs/ErrorUtils';
-import HttpUtils from '@libs/HttpUtils';
-import Navigation from '@libs/Navigation/Navigation';
-import navigationRef from '@libs/Navigation/navigationRef';
-import * as MainQueue from '@libs/Network/MainQueue';
-import NetworkConnection from '@libs/NetworkConnection';
-import * as SessionUtils from '@libs/SessionUtils';
import ONYXKEYS, {OnyxKey} from '@src/ONYXKEYS';
-import SCREENS from '@src/SCREENS';
-import * as PersistedRequests from './PersistedRequests';
let currentIsOffline: boolean | undefined;
let currentShouldForceOffline: boolean | undefined;
@@ -45,42 +37,16 @@ function clearStorageAndRedirect(errorMessage?: string) {
});
}
-/**
- * Reset all current params of the Home route
- */
-function resetHomeRouteParams() {
- Navigation.isNavigationReady().then(() => {
- const routes = navigationRef.current?.getState().routes;
- const homeRoute = routes?.find((route) => route.name === SCREENS.HOME);
-
- const emptyParams: Record = {};
- Object.keys(homeRoute?.params ?? {}).forEach((paramKey) => {
- emptyParams[paramKey] = undefined;
- });
-
- Navigation.setParams(emptyParams, homeRoute?.key ?? '');
- Onyx.set(ONYXKEYS.IS_CHECKING_PUBLIC_ROOM, false);
- });
-}
-
/**
* Cleanup actions resulting in the user being redirected to the Sign-in page
* - Clears the Onyx store - removing the authToken redirects the user to the Sign-in page
- * - Cancels pending network calls - any lingering requests are discarded to prevent unwanted storage writes
- * - Clears all current params of the Home route - the login page URL should not contain any parameter
*
* Normally this method would live in Session.js, but that would cause a circular dependency with Network.js.
*
* @param [errorMessage] error message to be displayed on the sign in page
*/
function redirectToSignIn(errorMessage?: string) {
- MainQueue.clear();
- HttpUtils.cancelPendingRequests();
- PersistedRequests.clear();
- NetworkConnection.clearReconnectionCallbacks();
clearStorageAndRedirect(errorMessage);
- resetHomeRouteParams();
- SessionUtils.resetDidUserLogInDuringSession();
}
export default redirectToSignIn;
diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js
index e5037d250d2e..0fe6a528cda1 100644
--- a/src/libs/actions/Task.js
+++ b/src/libs/actions/Task.js
@@ -747,7 +747,6 @@ function cancelTask(taskReportID, taskTitle, originalStateNum, originalStatusNum
lastVisibleActionCreated: optimisticCancelReportAction.created,
lastMessageText: message,
lastActorAccountID: optimisticCancelReportAction.actorAccountID,
- updateReportInLHN: true,
isDeletedParentAction: true,
},
},
@@ -865,9 +864,11 @@ function getTaskOwnerAccountID(taskReport) {
* Check if you're allowed to modify the task - anyone that has write access to the report can modify the task
* @param {Object} taskReport
* @param {Number} sessionAccountID
+ * @param {String} policyRole
+ *
* @returns {Boolean}
*/
-function canModifyTask(taskReport, sessionAccountID) {
+function canModifyTask(taskReport, sessionAccountID, policyRole = '') {
if (ReportUtils.isCanceledTaskReport(taskReport)) {
return false;
}
@@ -876,10 +877,15 @@ function canModifyTask(taskReport, sessionAccountID) {
return true;
}
+ const parentReport = ReportUtils.getParentReport(taskReport);
+
+ if (policyRole && (ReportUtils.isChatRoom(parentReport) || ReportUtils.isPolicyExpenseChat(parentReport)) && policyRole !== CONST.POLICY.ROLE.ADMIN) {
+ return false;
+ }
+
// If you don't have access to the task report (maybe haven't opened it yet), check if you can access the parent report
// - If the parent report is an #admins only room
// - If you are a policy admin
- const parentReport = ReportUtils.getParentReport(taskReport);
return ReportUtils.isAllowedToComment(parentReport);
}
diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js
index 3aa0e9642cdb..b1e46ec40861 100644
--- a/src/libs/actions/User.js
+++ b/src/libs/actions/User.js
@@ -17,7 +17,6 @@ import * as OnyxUpdates from './OnyxUpdates';
import * as PersonalDetails from './PersonalDetails';
import * as Report from './Report';
import * as Session from './Session';
-import redirectToSignIn from './SignInRedirect';
let currentUserAccountID = '';
let currentEmail = '';
@@ -69,8 +68,6 @@ function closeAccount(message) {
],
},
);
- // Run cleanup actions to prevent reconnection callbacks from blocking logging in again
- redirectToSignIn();
}
/**
@@ -859,7 +856,7 @@ function updateDraftCustomStatus(status) {
*
*/
function clearDraftCustomStatus() {
- Onyx.merge(ONYXKEYS.CUSTOM_STATUS_DRAFT, {text: '', emojiCode: '', clearAfter: ''});
+ Onyx.merge(ONYXKEYS.CUSTOM_STATUS_DRAFT, {text: '', emojiCode: '', clearAfter: '', customDateTemporary: ''});
}
export {
diff --git a/src/pages/AddPersonalBankAccountPage.js b/src/pages/AddPersonalBankAccountPage.js
index a4d75a7c73a0..09b73ea158f9 100644
--- a/src/pages/AddPersonalBankAccountPage.js
+++ b/src/pages/AddPersonalBankAccountPage.js
@@ -9,9 +9,9 @@ import FormProvider from '@components/Form/FormProvider';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import ScreenWrapper from '@components/ScreenWrapper';
import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
import getPlaidOAuthReceivedRedirectURI from '@libs/getPlaidOAuthReceivedRedirectURI';
import Navigation from '@libs/Navigation/Navigation';
-import useThemeStyles from '@styles/useThemeStyles';
import * as BankAccounts from '@userActions/BankAccounts';
import * as PaymentMethods from '@userActions/PaymentMethods';
import ONYXKEYS from '@src/ONYXKEYS';
diff --git a/src/pages/DetailsPage.js b/src/pages/DetailsPage.js
index 66345107dbb1..b0362a69b4d6 100755
--- a/src/pages/DetailsPage.js
+++ b/src/pages/DetailsPage.js
@@ -20,10 +20,10 @@ import ScreenWrapper from '@components/ScreenWrapper';
import Text from '@components/Text';
import UserDetailsTooltip from '@components/UserDetailsTooltip';
import withLocalize, {withLocalizePropTypes} from '@components/withLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
import compose from '@libs/compose';
import * as ReportUtils from '@libs/ReportUtils';
import * as UserUtils from '@libs/UserUtils';
-import useThemeStyles from '@styles/useThemeStyles';
import * as Report from '@userActions/Report';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
@@ -142,7 +142,7 @@ function DetailsPage(props) {
style={[styles.noOutline]}
onPress={show}
accessibilityLabel={props.translate('common.details')}
- role={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
+ accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
>
{
if (!el) {
return;
diff --git a/src/pages/EditRequestMerchantPage.js b/src/pages/EditRequestMerchantPage.js
index 53cb4946d640..5fa14d850f45 100644
--- a/src/pages/EditRequestMerchantPage.js
+++ b/src/pages/EditRequestMerchantPage.js
@@ -8,7 +8,7 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
import ScreenWrapper from '@components/ScreenWrapper';
import TextInput from '@components/TextInput';
import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@styles/useThemeStyles';
+import useThemeStyles from '@hooks/useThemeStyles';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
@@ -59,7 +59,7 @@ function EditRequestMerchantPage({defaultMerchant, onSubmit}) {
defaultValue={defaultMerchant}
label={translate('common.merchant')}
accessibilityLabel={translate('common.merchant')}
- role={CONST.ACCESSIBILITY_ROLE.TEXT}
+ role={CONST.ROLE.PRESENTATION}
ref={(e) => (merchantInputRef.current = e)}
/>
-