Merge pull request #10 from ishpaul777/revert-36934-nikki-one-transac…

…tion-report-view

Revert "Add One Transaction Report View"

src/components/ReportActionItem/MoneyRequestView.tsx

@@ -70,9 +70,6 @@ type MoneyRequestViewPropsWithoutTransaction = MoneyRequestViewOnyxPropsWithoutT
 
  /** Whether we should display the horizontal rule below the component */
  shouldShowHorizontalRule: boolean;
-
- /** Whether we should display the animated banner above the component */
- shouldShowAnimatedBackground: boolean;
 };
 
 type MoneyRequestViewProps = MoneyRequestViewTransactionOnyxProps & MoneyRequestViewPropsWithoutTransaction;
@@ -87,7 +84,6 @@ function MoneyRequestView({
  policyTagList,
  policy,
  transactionViolations,
- shouldShowAnimatedBackground,
 }: MoneyRequestViewProps) {
  const theme = useTheme();
  const styles = useThemeStyles();
@@ -241,9 +237,9 @@ function MoneyRequestView({
  );
 
  return (
- <View style={[StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth, true, shouldShowAnimatedBackground)]}>
- {shouldShowAnimatedBackground && <AnimatedEmptyStateBackground />}
- <View style={shouldShowAnimatedBackground && [StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth, true)]}>
+ <View style={[StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth)]}>
+ <AnimatedEmptyStateBackground />
+ <View style={[StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth)]}>
  {/* eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing */}
  {(showMapAsImage || hasReceipt) && (
  <OfflineWithFeedback

src/libs/ReportActionsUtils.ts

@@ -213,35 +213,6 @@ function isTransactionThread(parentReportAction: OnyxEntry<ReportAction> | Empty
  );
 }
 
-/**
- * Returns the reportID for the transaction thread associated with a report by iterating over the reportActions and identifying the IOU report actions with a childReportID. Returns a reportID if there is exactly one transaction thread for the report, and null otherwise.
- */
-function getOneTransactionThreadReportID(reportActions: OnyxEntry<ReportActions> | ReportAction[]): string | null {
- const reportActionsArray = Object.values(reportActions ?? {});
-
- if (!reportActionsArray.length) {
- return null;
- }
-
- // Get all IOU report actions for the report.
- const iouRequestTypes: Array<ValueOf<typeof CONST.IOU.REPORT_ACTION_TYPE>> = [CONST.IOU.REPORT_ACTION_TYPE.CREATE, CONST.IOU.REPORT_ACTION_TYPE.SPLIT, CONST.IOU.REPORT_ACTION_TYPE.PAY];
- const iouRequestActions = reportActionsArray.filter(
- (action) =>
- action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU &&
- (iouRequestTypes.includes(action.originalMessage.type) ?? []) &&
- action.childReportID &&
- action.originalMessage.IOUTransactionID,
- );
-
- // If we don't have any IOU request actions, or we have more than one IOU request actions, this isn't a oneTransaction report
- if (!iouRequestActions.length || iouRequestActions.length > 1) {
- return null;
- }
-
- // Ensure we have a childReportID associated with the IOU report action
- return iouRequestActions[0].childReportID ?? null;
-}
-
 /**
  * Sort an array of reportActions by their created timestamp first, and reportActionID second
  * This gives us a stable order even in the case of multiple reportActions created on the same millisecond
@@ -1063,7 +1034,6 @@ function getReportActionMessageText(reportAction: OnyxEntry<ReportAction> | Empt
 
 export {
  extractLinksFromMessageHtml,
- getOneTransactionThreadReportID,
  getAllReportActions,
  getIOUReportIDFromReportActionPreview,
  getLastClosedReportAction,

src/libs/ReportUtils.ts

@@ -1265,23 +1265,6 @@ function isMoneyRequestReport(reportOrID: OnyxEntry<Report> | EmptyObject | stri
  return isIOUReport(report) || isExpenseReport(report);
 }
 
-/**
- * Checks if a report has only one transaction associated with it
- */
-function isOneTransactionReport(reportID: string): boolean {
- const reportActions = reportActionsByReport?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? ([] as ReportAction[]);
- return ReportActionsUtils.getOneTransactionThreadReportID(reportActions) !== null;
-}
-
-/**
- * Checks if a report is a transaction thread associated with a report that has only one transaction
- */
-function isOneTransactionThread(reportID: string, parentReportID: string): boolean {
- const parentReportActions = reportActionsByReport?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`] ?? ([] as ReportAction[]);
- const transactionThreadReportID = ReportActionsUtils.getOneTransactionThreadReportID(parentReportActions);
- return reportID === transactionThreadReportID;
-}
-
 /**
  * Should return true only for personal 1:1 report
  *
@@ -1812,11 +1795,6 @@ function getIcons(
  };
  const isManager = currentUserAccountID === report?.managerID;
 
- // For one transaction IOUs, display a simplified report icon
- if (isOneTransactionReport(report?.reportID ?? '0')) {
- return [ownerIcon];
- }
-
  return isManager ? [managerIcon, ownerIcon] : [ownerIcon, managerIcon];
  }
 
@@ -4420,11 +4398,6 @@ function shouldReportBeInOptionList({
  return false;
  }
 
- // If this is a transaction thread associated with a report that only has one transaction, omit it
- if (isOneTransactionThread(report.reportID, report.parentReportID ?? '0')) {
- return false;
- }
-
  // Include the currently viewed report. If we excluded the currently viewed report, then there
  // would be no way to highlight it in the options list and it would be confusing to users because they lose
  // a sense of context.
@@ -4895,10 +4868,6 @@ function shouldReportShowSubscript(report: OnyxEntry<Report>): boolean {
  return true;
  }
 
- if (isExpenseReport(report) && isOneTransactionReport(report?.reportID ?? '')) {
- return true;
- }
-
  if (isWorkspaceTaskReport(report)) {
  return true;
  }
@@ -5829,7 +5798,6 @@ export {
  hasSingleParticipant,
  getReportRecipientAccountIDs,
  isOneOnOneChat,
- isOneTransactionThread,
  isPayer,
  goBackToDetailsPage,
  getTransactionReportName,

src/pages/home/ReportScreen.tsx

@@ -635,7 +635,6 @@ function ReportScreen({
  isLoadingNewerReportActions={reportMetadata?.isLoadingNewerReportActions}
  isLoadingOlderReportActions={reportMetadata?.isLoadingOlderReportActions}
  isReadyForCommentLinking={!shouldShowSkeleton}
- transactionThreadReportID={ReportActionsUtils.getOneTransactionThreadReportID(reportActions ?? [])}
  />
  )}
 

src/pages/home/report/ReportActionItem.tsx

@@ -49,7 +49,6 @@ import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import SelectionScraper from '@libs/SelectionScraper';
-import * as TransactionUtils from '@libs/TransactionUtils';
 import {ReactionListContext} from '@pages/home/ReportScreenContext';
 import * as BankAccounts from '@userActions/BankAccounts';
 import * as EmojiPickerAction from '@userActions/EmojiPickerAction';
@@ -101,22 +100,12 @@ type ReportActionItemOnyxProps = {
 
  /** The policy which the user has access to and which the report is tied to */
  policy: OnyxEntry<OnyxTypes.Policy>;
-
- /** Transaction associated with this report, if any */
- transaction: OnyxEntry<OnyxTypes.Transaction>;
 };
 
 type ReportActionItemProps = {
  /** Report for this action */
  report: OnyxTypes.Report;
 
- /** The transaction thread report associated with the report for this action, if any */
- transactionThreadReport: OnyxEntry<OnyxTypes.Report>;
-
- /** Array of report actions for the report for this action */
- // eslint-disable-next-line react/no-unused-prop-types
- reportActions: OnyxTypes.ReportAction[];
-
  /** Report action belonging to the report's parent */
  parentReportAction: OnyxEntry<OnyxTypes.ReportAction>;
 
@@ -153,7 +142,6 @@ const isIOUReport = (actionObj: OnyxEntry<OnyxTypes.ReportAction>): actionObj is
 function ReportActionItem({
  action,
  report,
- transactionThreadReport,
  linkedReportActionID,
  displayAsGroup,
  emojiReactions,
@@ -167,7 +155,6 @@ function ReportActionItem({
  shouldHideThreadDividerLine = false,
  shouldShowSubscriptAvatar = false,
  policy,
- transaction,
  onPress = undefined,
 }: ReportActionItemProps) {
  const {translate} = useLocalize();
@@ -193,7 +180,7 @@ function ReportActionItem({
  const originalReportID = ReportUtils.getOriginalReportID(report.reportID, action);
  const originalReport = report.reportID === originalReportID ? report : ReportUtils.getReport(originalReportID);
  const isReportActionLinked = linkedReportActionID && action.reportActionID && linkedReportActionID === action.reportActionID;
- const transactionCurrency = TransactionUtils.getCurrency(transaction);
+
  const reportScrollManager = useReportScrollManager();
 
  const highlightedBackgroundColorIfNeeded = useMemo(
@@ -756,7 +743,6 @@ function ReportActionItem({
  <MoneyRequestView
  report={report}
  shouldShowHorizontalRule={!shouldHideThreadDividerLine}
- shouldShowAnimatedBackground
  />
  </ShowContextMenuContext.Provider>
  );
@@ -796,30 +782,11 @@ function ReportActionItem({
  if (ReportUtils.isExpenseReport(report) || ReportUtils.isIOUReport(report)) {
  return (
  <OfflineWithFeedback pendingAction={action.pendingAction}>
- {transactionThreadReport && !isEmptyObject(transactionThreadReport) ? (
- <>
- {transactionCurrency !== report.currency && (
- <MoneyReportView
- report={report}
- policy={policy}
- shouldShowHorizontalRule={!shouldHideThreadDividerLine}
- />
- )}
- <ShowContextMenuContext.Provider value={contextValue}>
- <MoneyRequestView
- report={transactionThreadReport}
- shouldShowHorizontalRule={!shouldHideThreadDividerLine}
- shouldShowAnimatedBackground={transactionCurrency === report.currency}
- />
- </ShowContextMenuContext.Provider>
- </>
- ) : (
- <MoneyReportView
- report={report}
- policy={policy}
- shouldShowHorizontalRule={!shouldHideThreadDividerLine}
- />
- )}
+ <MoneyReportView
+ report={report}
+ policy={policy}
+ shouldShowHorizontalRule={!shouldHideThreadDividerLine}
+ />
  </OfflineWithFeedback>
  );
  }
@@ -980,14 +947,6 @@ export default withOnyx<ReportActionItemProps, ReportActionItemOnyxProps>({
  userWallet: {
  key: ONYXKEYS.USER_WALLET,
  },
- transaction: {
- key: ({transactionThreadReport, reportActions}) => {
- const parentReportActionID = isEmptyObject(transactionThreadReport) ? '0' : transactionThreadReport.parentReportActionID;
- const action = reportActions?.find((reportAction) => reportAction.reportActionID === parentReportActionID);
- const transactionID = (action as OnyxTypes.OriginalMessageIOU)?.originalMessage.IOUTransactionID ? (action as OnyxTypes.OriginalMessageIOU).originalMessage.IOUTransactionID : 0;
- return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
- },
- },
 })(
  memo(ReportActionItem, (prevProps, nextProps) => {
  const prevParentReportAction = prevProps.parentReportAction;
@@ -1019,9 +978,6 @@ export default withOnyx<ReportActionItemProps, ReportActionItemOnyxProps>({
  prevProps.linkedReportActionID === nextProps.linkedReportActionID &&
  lodashIsEqual(prevProps.report.fieldList, nextProps.report.fieldList) &&
  lodashIsEqual(prevProps.policy, nextProps.policy) &&
- lodashIsEqual(prevProps.transactionThreadReport, nextProps.transactionThreadReport) &&
- lodashIsEqual(prevProps.reportActions, nextProps.reportActions) &&
- lodashIsEqual(prevProps.transaction, nextProps.transaction) &&
  lodashIsEqual(prevParentReportAction, nextParentReportAction)
  );
  }),

src/pages/home/report/ReportActionItemParentAction.tsx

@@ -31,28 +31,14 @@ type ReportActionItemParentActionProps = {
  /** The current report is displayed */
  report: OnyxEntry<OnyxTypes.Report>;
 
- /** The transaction thread report associated with the current report, if any */
- transactionThreadReport: OnyxEntry<OnyxTypes.Report>;
-
- /** Array of report actions for this report */
- reportActions: OnyxTypes.ReportAction[];
-
  /** Report actions belonging to the report's parent */
  parentReportAction: OnyxEntry<OnyxTypes.ReportAction>;
 
  /** Whether we should display "Replies" divider */
  shouldDisplayReplyDivider: boolean;
 };
 
-function ReportActionItemParentAction({
- report,
- transactionThreadReport,
- reportActions,
- parentReportAction,
- index = 0,
- shouldHideThreadDividerLine = false,
- shouldDisplayReplyDivider,
-}: ReportActionItemParentActionProps) {
+function ReportActionItemParentAction({report, parentReportAction, index = 0, shouldHideThreadDividerLine = false, shouldDisplayReplyDivider}: ReportActionItemParentActionProps) {
  const styles = useThemeStyles();
  const StyleUtils = useStyleUtils();
  const {isSmallScreenWidth} = useWindowDimensions();
@@ -106,8 +92,6 @@ function ReportActionItemParentAction({
  onPress={() => Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? ''))}
  parentReportAction={parentReportAction}
  report={ancestor.report}
- reportActions={reportActions}
- transactionThreadReport={transactionThreadReport}
  action={ancestor.reportAction}
  displayAsGroup={false}
  isMostRecentIOUReportAction={false}

src/pages/home/report/ReportActionsList.tsx

@@ -41,12 +41,6 @@ type ReportActionsListProps = WithCurrentUserPersonalDetailsProps & {
  /** The report currently being looked at */
  report: OnyxTypes.Report;
 
- /** The transaction thread report associated with the current report, if any */
- transactionThreadReport: OnyxEntry<OnyxTypes.Report>;
-
- /** Array of report actions for the current report */
- reportActions: OnyxTypes.ReportAction[];
-
  /** The report's parentReportAction */
  parentReportAction: OnyxEntry<OnyxTypes.ReportAction>;
 
@@ -131,8 +125,6 @@ const onScrollToIndexFailed = () => {};
 
 function ReportActionsList({
  report,
- transactionThreadReport,
- reportActions = [],
  parentReportAction,
  isLoadingInitialReportActions = false,
  isLoadingOlderReportActions = false,
@@ -522,11 +514,9 @@ function ReportActionsList({
  ({item: reportAction, index}: ListRenderItemInfo<OnyxTypes.ReportAction>) => (
  <ReportActionsListItemRenderer
  reportAction={reportAction}
- reportActions={reportActions}
  parentReportAction={parentReportAction}
  index={index}
  report={report}
- transactionThreadReport={transactionThreadReport}
  linkedReportActionID={linkedReportActionID}
  displayAsGroup={ReportActionsUtils.isConsecutiveActionMadeByPreviousActor(sortedVisibleReportActions, index)}
  mostRecentIOUReportActionID={mostRecentIOUReportActionID}
@@ -544,8 +534,6 @@ function ReportActionsList({
  shouldHideThreadDividerLine,
  shouldDisplayNewMarker,
  parentReportAction,
- reportActions,
- transactionThreadReport,
  ],
  );