Merge pull request #51425 from callstack-internal/pac-guerreiro/fix/5…

…1271-debug-mode-for-inbox-tab-gbr-doesnt-handle-multi-policy Debug mode for Inbox tab GBR doesn't handle multi-policy
Expensify · Nov 5, 2024 · 5a63cc5 · 5a63cc5
2 parents 4833a6c + d6da63d
commit 5a63cc5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 3 deletions.
diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -5147,6 +5147,7 @@ const translations = {
         RBR: 'RBR',
         true: 'true',
         false: 'false',
+        viewReport: 'View Report',
         reasonVisibleInLHN: {
             hasDraftComment: 'Has draft comment',
             hasGBR: 'Has GBR',

diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -5662,6 +5662,7 @@ const translations = {
         RBR: 'RBR',
         true: 'verdadero',
         false: 'falso',
+        viewReport: 'Ver Informe',
         reasonVisibleInLHN: {
             hasDraftComment: 'Tiene comentario en borrador',
             hasGBR: 'Tiene GBR',

diff --git a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/DebugTabView.tsx b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/DebugTabView.tsx
@@ -134,7 +134,7 @@ function DebugTabView({selectedTab = '', chatTabBrickRoad, activeWorkspaceID}: D
             const report = getChatTabBrickRoadReport(activeWorkspaceID);
 
             if (report) {
-                Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report.reportID));
+                Navigation.navigate(ROUTES.DEBUG_REPORT.getRoute(report.reportID));
             }
         }
         if (selectedTab === SCREENS.SETTINGS.ROOT) {

diff --git a/src/pages/Debug/DebugDetails.tsx b/src/pages/Debug/DebugDetails.tsx
@@ -14,7 +14,6 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import type {ObjectType, OnyxDataType} from '@libs/DebugUtils';
 import DebugUtils from '@libs/DebugUtils';
-import Navigation from '@libs/Navigation/Navigation';
 import Debug from '@userActions/Debug';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -236,7 +235,6 @@ function DebugDetails({data, children, onSave, onDelete, validate}: DebugDetails
                         text={translate('common.delete')}
                         onPress={() => {
                             onDelete();
-                            Navigation.goBack();
                         }}
                     />
                 </View>

diff --git a/src/pages/Debug/Report/DebugReportPage.tsx b/src/pages/Debug/Report/DebugReportPage.tsx
@@ -4,13 +4,15 @@ import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Expensicons from '@components/Icon/Expensicons';
 import ScreenWrapper from '@components/ScreenWrapper';
 import TabSelector from '@components/TabSelector/TabSelector';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {navigateToConciergeChatAndDeleteReport} from '@libs/actions/Report';
 import DebugUtils from '@libs/DebugUtils';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import Navigation from '@libs/Navigation/Navigation';
@@ -19,6 +21,7 @@ import type {DebugParamList} from '@libs/Navigation/types';
 import * as ReportUtils from '@libs/ReportUtils';
 import DebugDetails from '@pages/Debug/DebugDetails';
 import DebugJSON from '@pages/Debug/DebugJSON';
+import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
 import Debug from '@userActions/Debug';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -112,6 +115,10 @@ function DebugReportPage({
         ];
     }, [parentReportAction, report, reportActions, reportID, transactionViolations, translate]);
 
+    if (!report) {
+        return <NotFoundPage />;
+    }
+
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
@@ -138,6 +145,7 @@ function DebugReportPage({
                                     }}
                                     onDelete={() => {
                                         Debug.mergeDebugData(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, null);
+                                        navigateToConciergeChatAndDeleteReport(reportID, true, true);
                                     }}
                                     validate={DebugUtils.validateReportDraftProperty}
                                 >
@@ -157,6 +165,13 @@ function DebugReportPage({
                                                 )}
                                             </View>
                                         ))}
+                                        <Button
+                                            text={translate('debug.viewReport')}
+                                            onPress={() => {
+                                                Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
+                                            }}
+                                            icon={Expensicons.Eye}
+                                        />
                                     </View>
                                 </DebugDetails>
                             )}

diff --git a/src/pages/Debug/ReportAction/DebugReportActionPage.tsx b/src/pages/Debug/ReportAction/DebugReportActionPage.tsx
@@ -60,6 +60,7 @@ function DebugReportActionPage({
                                     }}
                                     onDelete={() => {
                                         Debug.mergeDebugData(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {[reportActionID]: null});
+                                        Navigation.goBack();
                                     }}
                                     validate={DebugUtils.validateReportActionDraftProperty}
                                 />