fix 63901

Author: waterim

src/pages/iou/request/step/IOURequestEditReportCommon.tsx

@@ -45,9 +45,10 @@ type Props = {
     selectReport: (item: TransactionGroupListItem) => void;
     removeFromReport?: () => void;
     isEditing?: boolean;
+    isUnreported?: boolean;
 };
 
-function IOURequestEditReportCommon({backTo, transactionsReports, selectReport, removeFromReport, isEditing = false}: Props) {
+function IOURequestEditReportCommon({backTo, transactionsReports, selectReport, removeFromReport, isEditing = false, isUnreported}: Props) {
     const {translate} = useLocalize();
     const {options} = useOptionsList();
     const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {selector: (reports) => mapOnyxCollectionItems(reports, reportSelector), canBeMissing: true});
@@ -60,6 +61,7 @@ function IOURequestEditReportCommon({backTo, transactionsReports, selectReport,
     const onlyReport = transactionsReports.length === 1 ? transactionsReports.at(0) : undefined;
     const isOwner = onlyReport ? onlyReport.ownerAccountID === currentUserPersonalDetails.accountID : false;
     const isReportIOU = onlyReport ? isIOUReport(onlyReport) : false;
+    const shouldShowRemoveFromReport = isEditing && isOwner && !isReportIOU && !isUnreported;
 
     const expenseReports = useMemo(
         () =>
@@ -124,7 +126,7 @@ function IOURequestEditReportCommon({backTo, transactionsReports, selectReport,
                 initiallyFocusedOptionKey={transactionsReports.length === 1 ? transactionsReports.at(0)?.reportID : undefined}
                 ListItem={InviteMemberListItem}
                 listFooterContent={
-                    isEditing && isOwner && !isReportIOU ? (
+                    shouldShowRemoveFromReport ? (
                         <MenuItem
                             onPress={removeFromReport}
                             title={translate('iou.removeFromReport')}

src/pages/iou/request/step/IOURequestStepReport.tsx

@@ -22,7 +22,8 @@ type IOURequestStepReportProps = WithWritableReportOrNotFoundProps<typeof SCREEN
 
 function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) {
     const {backTo, action} = route.params;
-    const reportID = transaction?.reportID === '0' ? transaction?.participants?.at(0)?.reportID : transaction?.reportID;
+    const isUnreported = transaction?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID;
+    const reportID = isUnreported ? transaction?.participants?.at(0)?.reportID : transaction?.reportID;
     const [transactionReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(reportID)}`, {canBeMissing: false});
 
     const isEditing = action === CONST.IOU.ACTION.EDIT;
@@ -59,6 +60,7 @@ function IOURequestStepReport({route, transaction}: IOURequestStepReportProps) {
             selectReport={selectReport}
             removeFromReport={removeFromReport}
             isEditing={isEditing}
+            isUnreported={isUnreported}
         />
     );
 }