fix: stay on Spend tab after QAB-submitted expense

Author: jakubkalinski0

src/pages/iou/request/step/confirmation/getSubmitHandler.ts

@@ -61,8 +61,8 @@ function canUseDismissModalFastPath(snapshot: SubmitNavigationSnapshot): boolean
  *   isPreInserted && !isReportPreInserted  -> SEARCH_PRE_INSERT
  *   isReportPreInserted                    -> REPORT_PRE_INSERT
  *   canUseDismissModalFastPath()           -> DISMISS_MODAL
- *   isReportInRHP && destinationReportID   -> REPORT_IN_RHP_DISMISS
- *   isFromGlobalCreate && canDismiss       -> SEARCH_DISMISS
+ *   isFromGlobalCreate && canDismissFromSearch && isSearchTopmostFullScreen -> SEARCH_DISMISS
+ *   isReportInRHP && destinationReportID && !isSplitRequest -> REPORT_IN_RHP_DISMISS
  *   else                                   -> DEFAULT
  */
 function getSubmitHandler(snapshot: SubmitNavigationSnapshot): SubmitHandler {
@@ -75,12 +75,12 @@ function getSubmitHandler(snapshot: SubmitNavigationSnapshot): SubmitHandler {
     if (canUseDismissModalFastPath(snapshot)) {
         return SUBMIT_HANDLER.DISMISS_MODAL;
     }
-    if (snapshot.isReportInRHP && snapshot.destinationReportID && !snapshot.isSplitRequest) {
-        return SUBMIT_HANDLER.REPORT_IN_RHP_DISMISS;
-    }
     if (snapshot.isFromGlobalCreate && snapshot.canDismissFromSearch && snapshot.isSearchTopmostFullScreen) {
         return SUBMIT_HANDLER.SEARCH_DISMISS;
     }
+    if (snapshot.isReportInRHP && snapshot.destinationReportID && !snapshot.isSplitRequest) {
+        return SUBMIT_HANDLER.REPORT_IN_RHP_DISMISS;
+    }
     return SUBMIT_HANDLER.DEFAULT;
 }
 

tests/unit/getSubmitHandlerTest.ts

@@ -116,6 +116,20 @@ describe('getSubmitHandler', () => {
         ).toBe(SUBMIT_HANDLER.DEFAULT);
     });
 
+    it('returns SEARCH_DISMISS (not REPORT_IN_RHP_DISMISS) for global create from Search with report in RHP', () => {
+        expect(
+            getSubmitHandler(
+                snap({
+                    isFromGlobalCreate: true,
+                    canDismissFromSearch: true,
+                    isSearchTopmostFullScreen: true,
+                    isReportInRHP: true,
+                    destinationReportID: '456',
+                }),
+            ),
+        ).toBe(SUBMIT_HANDLER.SEARCH_DISMISS);
+    });
+
     it('returns DEFAULT when destination report is set but not loaded', () => {
         expect(
             getSubmitHandler(