Bump onyx to 2.0.48 (after revert)

package.json

@@ -155,7 +155,7 @@
  "react-native-linear-gradient": "^2.8.1",
  "react-native-localize": "^2.2.6",
  "react-native-modal": "^13.0.0",
- "react-native-onyx": "2.0.32",
+ "react-native-onyx": "2.0.48",
  "react-native-pager-view": "6.2.3",
  "react-native-pdf": "6.7.3",
  "react-native-performance": "^5.1.0",
@@ -293,7 +293,7 @@
  "ts-jest": "^29.1.2",
  "ts-node": "^10.9.2",
  "type-fest": "^4.10.2",
- "typescript": "^5.3.2",
+ "typescript": "^5.4.5",
  "wait-port": "^0.2.9",
  "webpack": "^5.76.0",
  "webpack-bundle-analyzer": "^4.5.0",

src/components/AddressForm.tsx

@@ -4,7 +4,6 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import type {MaybePhraseKey} from '@libs/Localize';
-import Navigation from '@libs/Navigation/Navigation';
 import * as ValidationUtils from '@libs/ValidationUtils';
 import CONST from '@src/CONST';
 import type {Country} from '@src/CONST';
@@ -149,8 +148,6 @@ function AddressForm({
  label={translate('common.addressLine', {lineNumber: 1})}
  onValueChange={(data: unknown, key: unknown) => {
  onAddressChanged(data, key);
- // This enforces the country selector to use the country from address instead of the country from URL
- Navigation.setParams({country: undefined});
  }}
  defaultValue={street1}
  renamedInputKeys={{

src/components/AttachmentModal.tsx

@@ -620,7 +620,6 @@ export default withOnyx<AttachmentModalProps, AttachmentModalOnyxProps>({
  const transactionID = parentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? parentReportAction?.originalMessage.IOUTransactionID ?? '0' : '0';
  return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
  },
- initWithStoredValues: false,
  },
 })(memo(AttachmentModal));
 

src/components/AvatarWithDisplayName.tsx

@@ -1,6 +1,6 @@
 import React, {useCallback, useEffect, useRef} from 'react';
 import {View} from 'react-native';
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import useStyleUtils from '@hooks/useStyleUtils';
@@ -12,7 +12,7 @@ import * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {PersonalDetails, Policy, Report, ReportActions} from '@src/types/onyx';
+import type {PersonalDetails, PersonalDetailsList, Policy, Report, ReportActions} from '@src/types/onyx';
 import CaretWrapper from './CaretWrapper';
 import DisplayNames from './DisplayNames';
 import MultipleAvatars from './MultipleAvatars';
@@ -26,7 +26,7 @@ type AvatarWithDisplayNamePropsWithOnyx = {
  parentReportActions: OnyxEntry<ReportActions>;
 
  /** Personal details of all users */
- personalDetails: OnyxCollection<PersonalDetails>;
+ personalDetails: OnyxEntry<PersonalDetailsList>;
 };
 
 type AvatarWithDisplayNameProps = AvatarWithDisplayNamePropsWithOnyx & {

src/components/HeaderWithBackButton/index.tsx

@@ -30,7 +30,7 @@ function HeaderWithBackButton({
  onCloseButtonPress = () => Navigation.dismissModal(),
  onDownloadButtonPress = () => {},
  onThreeDotsButtonPress = () => {},
- report = null,
+ report,
  policy,
  policyAvatar,
  shouldShowReportAvatarWithDisplay = false,

src/components/KYCWall/BaseKYCWall.tsx

@@ -166,7 +166,7 @@ function KYCWall({
 
  transferBalanceButtonRef.current = targetElement;
 
- const isExpenseReport = ReportUtils.isExpenseReport(iouReport ?? null);
+ const isExpenseReport = ReportUtils.isExpenseReport(iouReport);
  const paymentCardList = fundList ?? {};
 
  // Check to see if user has a valid payment method on file and display the add payment popover if they don't

src/components/KeyboardAvoidingView/index.ios.tsx

@@ -3,7 +3,7 @@
  */
 import React from 'react';
 import {KeyboardAvoidingView as KeyboardAvoidingViewComponent} from 'react-native';
-import type KeyboardAvoidingViewProps from './types';
+import type {KeyboardAvoidingViewProps} from './types';
 
 function KeyboardAvoidingView(props: KeyboardAvoidingViewProps) {
  // eslint-disable-next-line react/jsx-props-no-spreading

src/components/KeyboardAvoidingView/index.tsx

@@ -3,7 +3,7 @@
  */
 import React from 'react';
 import {View} from 'react-native';
-import type KeyboardAvoidingViewProps from './types';
+import type {KeyboardAvoidingViewProps} from './types';
 
 function KeyboardAvoidingView(props: KeyboardAvoidingViewProps) {
  const {behavior, contentContainerStyle, enabled, keyboardVerticalOffset, ...rest} = props;

src/components/KeyboardAvoidingView/types.ts

@@ -1,3 +1,4 @@
-import {KeyboardAvoidingViewProps} from 'react-native';
+import type {KeyboardAvoidingViewProps} from 'react-native';
 
-export default KeyboardAvoidingViewProps;
+// eslint-disable-next-line import/prefer-default-export
+export type {KeyboardAvoidingViewProps};

src/components/LHNOptionsList/LHNOptionsList.tsx

@@ -98,13 +98,13 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
  */
  const renderItem = useCallback(
  ({item: reportID}: RenderItemProps): ReactElement => {
- const itemFullReport = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`] ?? null;
- const itemReportActions = reportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? null;
- const itemParentReportActions = reportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${itemFullReport?.parentReportID}`] ?? null;
- const itemParentReportAction = itemParentReportActions?.[itemFullReport?.parentReportActionID ?? ''] ?? null;
- const itemPolicy = policy?.[`${ONYXKEYS.COLLECTION.POLICY}${itemFullReport?.policyID}`] ?? null;
+ const itemFullReport = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+ const itemReportActions = reportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`];
+ const itemParentReportActions = reportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${itemFullReport?.parentReportID}`];
+ const itemParentReportAction = itemParentReportActions?.[itemFullReport?.parentReportActionID ?? ''];
+ const itemPolicy = policy?.[`${ONYXKEYS.COLLECTION.POLICY}${itemFullReport?.policyID}`];
  const transactionID = itemParentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? itemParentReportAction.originalMessage.IOUTransactionID ?? '' : '';
- const itemTransaction = transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] ?? null;
+ const itemTransaction = transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
  const hasDraftComment = DraftCommentUtils.isValidDraftComment(draftComments?.[`${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`]);
  const sortedReportActions = ReportActionsUtils.getSortedReportActionsForDisplay(itemReportActions);
  const lastReportAction = sortedReportActions[0];

src/components/LHNOptionsList/OptionRowLHN.tsx

@@ -123,7 +123,7 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti
  const formattedDate = DateUtils.getStatusUntilDate(statusClearAfterDate);
  const statusContent = formattedDate ? `${statusText ? `${statusText} ` : ''}(${formattedDate})` : statusText;
  const report = ReportUtils.getReport(optionItem.reportID ?? '');
- const isStatusVisible = !!emojiCode && ReportUtils.isOneOnOneChat(!isEmptyObject(report) ? report : null);
+ const isStatusVisible = !!emojiCode && ReportUtils.isOneOnOneChat(!isEmptyObject(report) ? report : undefined);
 
  const isGroupChat = ReportUtils.isGroupChat(optionItem) || ReportUtils.isDeprecatedGroupDM(optionItem);
 

src/components/LHNOptionsList/OptionRowLHNData.tsx

@@ -35,7 +35,7 @@ function OptionRowLHNData({
 
  const optionItemRef = useRef<OptionData>();
 
- const shouldDisplayViolations = canUseViolations && ReportUtils.shouldDisplayTransactionThreadViolations(fullReport, transactionViolations, parentReportAction ?? null);
+ const shouldDisplayViolations = canUseViolations && ReportUtils.shouldDisplayTransactionThreadViolations(fullReport, transactionViolations, parentReportAction);
 
  const optionItem = useMemo(() => {
  // Note: ideally we'd have this as a dependent selector in onyx!

src/components/MoneyRequestConfirmationList.tsx

@@ -133,7 +133,7 @@ type MoneyRequestConfirmationListProps = MoneyRequestConfirmationListOnyxProps &
  selectedParticipants: Participant[];
 
  /** Payee of the expense with login */
- payeePersonalDetails?: OnyxEntry<OnyxTypes.PersonalDetails>;
+ payeePersonalDetails?: OnyxEntry<OnyxTypes.PersonalDetails> | null;
 
  /** Should the list be read only, and not editable? */
  isReadOnly?: boolean;
@@ -184,7 +184,7 @@ type MoneyRequestConfirmationListProps = MoneyRequestConfirmationListOnyxProps &
 type MoneyRequestConfirmationListItem = Participant | ReportUtils.OptionData;
 
 function MoneyRequestConfirmationList({
- transaction = null,
+ transaction,
  onSendMoney,
  onConfirm,
  iouType = CONST.IOU.TYPE.SUBMIT,
@@ -709,7 +709,7 @@ function MoneyRequestConfirmationList({
  if (selectedParticipants.length === 0) {
  return;
  }
- if (!isEditingSplitBill && isMerchantRequired && (isMerchantEmpty || (shouldDisplayFieldError && TransactionUtils.isMerchantMissing(transaction ?? null)))) {
+ if (!isEditingSplitBill && isMerchantRequired && (isMerchantEmpty || (shouldDisplayFieldError && TransactionUtils.isMerchantMissing(transaction)))) {
  setFormError('iou.error.invalidMerchant');
  return;
  }
@@ -739,7 +739,7 @@ function MoneyRequestConfirmationList({
  return;
  }
 
- if (isEditingSplitBill && TransactionUtils.areRequiredFieldsEmpty(transaction ?? null)) {
+ if (isEditingSplitBill && TransactionUtils.areRequiredFieldsEmpty(transaction)) {
  setDidConfirmSplit(true);
  setFormError('iou.error.genericSmartscanFailureMessage');
  return;
@@ -861,8 +861,8 @@ function MoneyRequestConfirmationList({
  style={[styles.moneyRequestMenuItem, styles.mt2]}
  titleStyle={styles.moneyRequestConfirmationAmount}
  disabled={didConfirm}
- brickRoadIndicator={shouldDisplayFieldError && TransactionUtils.isAmountMissing(transaction ?? null) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
- errorText={shouldDisplayFieldError && TransactionUtils.isAmountMissing(transaction ?? null) ? translate('common.error.enterAmount') : ''}
+ brickRoadIndicator={shouldDisplayFieldError && TransactionUtils.isAmountMissing(transaction) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+ errorText={shouldDisplayFieldError && TransactionUtils.isAmountMissing(transaction) ? translate('common.error.enterAmount') : ''}
  />
  ),
  shouldShow: shouldShowSmartScanFields,
@@ -1096,7 +1096,7 @@ function MoneyRequestConfirmationList({
  isThumbnail,
  fileExtension,
  isLocalFile,
- } = receiptPath && receiptFilename ? ReceiptUtils.getThumbnailAndImageURIs(transaction ?? null, receiptPath, receiptFilename) : ({} as ReceiptUtils.ThumbnailAndImageURI);
+ } = receiptPath && receiptFilename ? ReceiptUtils.getThumbnailAndImageURIs(transaction, receiptPath, receiptFilename) : ({} as ReceiptUtils.ThumbnailAndImageURI);
 
  const resolvedThumbnail = isLocalFile ? receiptThumbnail : tryResolveUrlFromApiRoot(receiptThumbnail ?? '');
  const resolvedReceiptImage = isLocalFile ? receiptImage : tryResolveUrlFromApiRoot(receiptImage ?? '');

src/components/ShowContextMenuContext.ts

@@ -19,9 +19,9 @@ type ShowContextMenuContextProps = {
 
 const ShowContextMenuContext = createContext<ShowContextMenuContextProps>({
  anchor: null,
- report: null,
- action: null,
- transactionThreadReport: null,
+ report: undefined,
+ action: undefined,
+ transactionThreadReport: undefined,
  checkIfContextMenuActive: () => {},
 });
 

src/languages/types.ts

@@ -1,4 +1,4 @@
-import type {ReportAction} from '@src/types/onyx';
+import type {OnyxInputOrEntry, ReportAction} from '@src/types/onyx';
 import type {Unit} from '@src/types/onyx/Policy';
 import type en from './en';
 
@@ -40,15 +40,15 @@ type LocalTimeParams = {
 };
 
 type EditActionParams = {
- action: ReportAction | null;
+ action: OnyxInputOrEntry<ReportAction>;
 };
 
 type DeleteActionParams = {
- action: ReportAction | null;
+ action: OnyxInputOrEntry<ReportAction>;
 };
 
 type DeleteConfirmationParams = {
- action: ReportAction | null;
+ action: OnyxInputOrEntry<ReportAction>;
 };
 
 type BeginningOfChatHistoryDomainRoomPartOneParams = {
@@ -299,11 +299,10 @@ type DistanceRateOperationsParams = {count: number};
 type ReimbursementRateParams = {unit: Unit};
 
 export type {
- AdminCanceledRequestParams,
- ApprovedAmountParams,
  AddressLineParams,
+ AdminCanceledRequestParams,
  AlreadySignedInParams,
- UserSplitParams,
+ ApprovedAmountParams,
  BeginningOfChatHistoryAdminRoomPartOneParams,
  BeginningOfChatHistoryAnnounceRoomPartOneParams,
  BeginningOfChatHistoryAnnounceRoomPartTwo,
@@ -324,8 +323,10 @@ export type {
  FormattedMaxLengthParams,
  GoBackMessageParams,
  GoToRoomParams,
+ HeldRequestParams,
  InstantSummaryParams,
  LocalTimeParams,
+ LogSizeParams,
  LoggedInAsParams,
  ManagerApprovedAmountParams,
  ManagerApprovedParams,
@@ -339,11 +340,13 @@ export type {
  PaidElsewhereWithAmountParams,
  PaidWithExpensifyWithAmountParams,
  ParentNavigationSummaryParams,
+ PaySomeoneParams,
  PayerOwesAmountParams,
  PayerOwesParams,
  PayerPaidAmountParams,
  PayerPaidParams,
  PayerSettledParams,
+ ReimbursementRateParams,
  RemovedTheRequestParams,
  RenamedRoomActionParams,
  ReportArchiveReasonsClosedParams,
@@ -375,7 +378,9 @@ export type {
  UntilTimeParams,
  UpdatedTheDistanceParams,
  UpdatedTheRequestParams,
+ UsePlusButtonParams,
  UserIsAlreadyMemberParams,
+ UserSplitParams,
  ViolationsAutoReportedRejectedExpenseParams,
  ViolationsCashExpenseWithNoReceiptParams,
  ViolationsConversionSurchargeParams,
@@ -392,14 +397,9 @@ export type {
  ViolationsTaxOutOfPolicyParams,
  WaitingOnBankAccountParams,
  WalletProgramParams,
- UsePlusButtonParams,
  WeSentYouMagicSignInLinkParams,
  WelcomeEnterMagicCodeParams,
  WelcomeNoteParams,
  WelcomeToRoomParams,
  ZipCodeExampleFormatParams,
- LogSizeParams,
- HeldRequestParams,
- PaySomeoneParams,
- ReimbursementRateParams,
 };