apply review suggestions

Author: samranahm

src/pages/iou/request/step/IOURequestStepScan/hooks/useReceiptScan.ts

@@ -71,10 +71,10 @@ function useReceiptScan({
     const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
     const draftTransactionIDs = Object.keys(allTransactionDrafts ?? {});
     const [isMultiScanEnabled, setIsMultiScanEnabled] = useState(false);
+    const isStartingScan = routeName === SCREENS.MONEY_REQUEST.CREATE;
 
     const isEditing = action === CONST.IOU.ACTION.EDIT;
     const isReplacingReceipt = (isEditing && hasReceipt(initialTransaction)) || (!!initialTransaction?.receipt && !!backTo);
-    const isStartingScan = routeName === SCREENS.MONEY_REQUEST.CREATE;
     const shouldAcceptMultipleFiles = !isEditing && !backTo;
     const shouldGenerateTransactionThreadReport = !isBetaEnabled(CONST.BETAS.NO_OPTIMISTIC_TRANSACTION_THREADS);
     const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);

src/pages/iou/request/step/IOURequestStepScan/types.ts

@@ -39,7 +39,7 @@ type UseReceiptScanParams = {
     backToReport: string | undefined;
 
     /** The route name to determine if scan is starting */
-    routeName: string;
+    routeName: IOURequestStepScanProps['route']['name'];
 
     /** Callback to replace receipt and navigate back when editing */
     updateScanAndNavigate: (file: FileObject, source: string) => void;
@@ -56,7 +56,7 @@ type UseMobileReceiptScanParams = {
     iouType: IOUType;
 
     /** Whether multi-scan is enabled */
-    isMultiScanEnabled?: boolean;
+    isMultiScanEnabled: boolean;
 
     /** Whether the user is starting a scan request */
     isStartingScan: boolean;

tests/ui/IOURequestStepScanTest.tsx

@@ -172,11 +172,6 @@ describe('IOURequestStepScan', () => {
         const POLICY_ID = 'policy-1';
         const TRANSACTION_ID_1 = '101';
 
-        await act(async () => {
-            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, createMinimalReport(REPORT_ID, POLICY_ID));
-        });
-        await waitForBatchedUpdates();
-
         render(
             <OnyxListItemProvider>
                 <LocaleContextProvider>
@@ -193,7 +188,7 @@ describe('IOURequestStepScan', () => {
                                         transactionID: TRANSACTION_ID_1,
                                         pageIndex: 0,
                                     },
-                                } as unknown as PlatformStackScreenProps<MoneyRequestNavigatorParamList, typeof SCREENS.MONEY_REQUEST.STEP_SCAN>['route']
+                                } as unknown as PlatformStackScreenProps<MoneyRequestNavigatorParamList, typeof SCREENS.MONEY_REQUEST.CREATE>['route']
                             }
                             navigation={{} as never}
                         />
@@ -204,13 +199,14 @@ describe('IOURequestStepScan', () => {
 
         await waitForBatchedUpdatesWithAct();
         fireEvent.press(screen.getByLabelText('multi-scan'));
-        await waitForBatchedUpdatesWithAct();
+        await waitForBatchedUpdates();
         const transaction1 = createRandomTransaction(1);
         transaction1.reportID = REPORT_ID;
         transaction1.transactionID = TRANSACTION_ID_1;
         transaction1.receipt = {source: 'file://first-receipt.png', state: CONST.IOU.RECEIPT_STATE.OPEN};
 
         await act(async () => {
+            await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, createMinimalReport(REPORT_ID, POLICY_ID));
             await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${TRANSACTION_ID_1}`, transaction1);
         });
         await waitForBatchedUpdates();

tests/unit/hooks/useReceiptScan.test.ts

@@ -296,29 +296,6 @@ describe('useReceiptScan', () => {
             expect(result.current.receiptFiles).toHaveLength(1);
             expect(result.current.receiptFiles.at(0)).toEqual(receiptFile);
         });
-
-        it('should clear receiptFiles when isMultiScanEnabled changes from true to false', async () => {
-            const {result} = renderHook(() => useReceiptScan(params));
-            await waitForBatchedUpdatesWithAct();
-
-            await act(async () => {
-                result.current.setIsMultiScanEnabled(true);
-            });
-            await waitForBatchedUpdatesWithAct();
-
-            const receiptFile = {file: {uri: 'picture.jpg'}, source: 'file://picture.jpg', transactionID: INITIAL_TRANSACTION_ID};
-            await act(async () => {
-                result.current.setReceiptFiles([receiptFile]);
-            });
-            await waitForBatchedUpdatesWithAct();
-            expect(result.current.receiptFiles).toHaveLength(1);
-
-            await act(async () => {
-                result.current.setIsMultiScanEnabled(false);
-            });
-            await waitForBatchedUpdatesWithAct();
-            expect(result.current.isMultiScanEnabled).toBe(false);
-        });
     });
 
     describe('processReceipts', () => {