diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 2bc04c4a99ea4..32653c8acdbdf 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -182,7 +182,10 @@ const ROUTES = { SETTINGS_STATUS_CLEAR_AFTER_DATE: 'settings/profile/status/clear-after/date', SETTINGS_STATUS_CLEAR_AFTER_TIME: 'settings/profile/status/clear-after/time', SETTINGS_TROUBLESHOOT: 'settings/troubleshoot', - SETTINGS_CONSOLE: 'settings/troubleshoot/console', + SETTINGS_CONSOLE: { + route: 'settings/troubleshoot/console', + getRoute: (backTo?: string) => getUrlWithBackToParam(`settings/troubleshoot/console`, backTo), + }, SETTINGS_SHARE_LOG: { route: 'settings/troubleshoot/console/share-log', getRoute: (source: string) => `settings/troubleshoot/console/share-log?source=${encodeURI(source)}` as const, diff --git a/src/components/TestToolsModal.tsx b/src/components/TestToolsModal.tsx index 026eafc7a13d8..ad1c65e76a4b5 100644 --- a/src/components/TestToolsModal.tsx +++ b/src/components/TestToolsModal.tsx @@ -7,23 +7,30 @@ import useLocalize from '@hooks/useLocalize'; import useStyleUtils from '@hooks/useStyleUtils'; import useThemeStyles from '@hooks/useThemeStyles'; import useWindowDimensions from '@hooks/useWindowDimensions'; +import Navigation from '@navigation/Navigation'; import toggleTestToolsModal from '@userActions/TestTool'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; +import ROUTES from '@src/ROUTES'; +import Button from './Button'; import ClientSideLoggingToolMenu from './ClientSideLoggingToolMenu'; import Modal from './Modal'; import ProfilingToolMenu from './ProfilingToolMenu'; import TestToolMenu from './TestToolMenu'; +import TestToolRow from './TestToolRow'; import Text from './Text'; type TestToolsModalOnyxProps = { /** Whether the test tools modal is open */ isTestToolsModalOpen: OnyxEntry; + + /** Whether or not logs should be stored */ + shouldStoreLogs: OnyxEntry; }; type TestToolsModalProps = TestToolsModalOnyxProps; -function TestToolsModal({isTestToolsModalOpen = false}: TestToolsModalProps) { +function TestToolsModal({isTestToolsModalOpen = false, shouldStoreLogs = false}: TestToolsModalProps) { const {isDevelopment} = useEnvironment(); const {windowWidth} = useWindowDimensions(); const StyleUtils = useStyleUtils(); @@ -46,6 +53,18 @@ function TestToolsModal({isTestToolsModalOpen = false}: TestToolsModalProps) { + {!!shouldStoreLogs && ( + +