Skip to content

Commit 2ca9068

Browse files
authored
Merge pull request Expensify#68431 from callstack-internal/VickyStash/refactor/67884-follow-up-toggle
2 parents 08ca299 + 7038aaa commit 2ca9068

18 files changed

Lines changed: 45 additions & 6 deletions

File tree

src/components/TestToolMenu.tsx

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ import React from 'react';
22
import useIsAuthenticated from '@hooks/useIsAuthenticated';
33
import useLocalize from '@hooks/useLocalize';
44
import useOnyx from '@hooks/useOnyx';
5+
import usePermissions from '@hooks/usePermissions';
56
import useThemeStyles from '@hooks/useThemeStyles';
67
import {isUsingStagingApi} from '@libs/ApiUtils';
78
import {setShouldFailAllRequests, setShouldForceOffline, setShouldSimulatePoorConnection} from '@userActions/Network';
89
import {expireSessionWithDelay, invalidateAuthToken, invalidateCredentials} from '@userActions/Session';
9-
import {setIsDebugModeEnabled, setShouldUseStagingServer} from '@userActions/User';
10+
import {setIsDebugModeEnabled, setShouldBlockTransactionThreadReportCreation, setShouldUseStagingServer} from '@userActions/User';
1011
import CONFIG from '@src/CONFIG';
12+
import CONST from '@src/CONST';
1113
import ONYXKEYS from '@src/ONYXKEYS';
1214
import type {Account as AccountOnyx} from '@src/types/onyx';
1315
import Button from './Button';
@@ -27,11 +29,14 @@ const ACCOUNT_DEFAULT: AccountOnyx = {
2729
};
2830

2931
function TestToolMenu() {
32+
const {isBetaEnabled} = usePermissions();
3033
const [network] = useOnyx(ONYXKEYS.NETWORK, {canBeMissing: true});
3134
const [account = ACCOUNT_DEFAULT] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});
3235
const [isUsingImportedState] = useOnyx(ONYXKEYS.IS_USING_IMPORTED_STATE, {canBeMissing: true});
3336
const shouldUseStagingServer = account?.shouldUseStagingServer ?? isUsingStagingApi();
3437
const isDebugModeEnabled = !!account?.isDebugModeEnabled;
38+
const shouldBlockTransactionThreadReportCreation = !!account?.shouldBlockTransactionThreadReportCreation;
39+
const shouldShowTransactionThreadReportToggle = isBetaEnabled(CONST.BETAS.NO_OPTIMISTIC_TRANSACTION_THREADS);
3540
const styles = useThemeStyles();
3641
const {translate} = useLocalize();
3742

@@ -48,6 +53,17 @@ function TestToolMenu() {
4853
</Text>
4954
{isAuthenticated && (
5055
<>
56+
{/* When toggled, the app won't create the transaction thread report. It should be removed together with CONST.BETAS.NO_OPTIMISTIC_TRANSACTION_THREADS beta */}
57+
{shouldShowTransactionThreadReportToggle && (
58+
<TestToolRow title={translate('initialSettingsPage.troubleshoot.shouldBlockTransactionThreadReportCreation')}>
59+
<Switch
60+
accessibilityLabel={translate('initialSettingsPage.troubleshoot.shouldBlockTransactionThreadReportCreation')}
61+
isOn={shouldBlockTransactionThreadReportCreation}
62+
onToggle={() => setShouldBlockTransactionThreadReportCreation(!shouldBlockTransactionThreadReportCreation)}
63+
/>
64+
</TestToolRow>
65+
)}
66+
5167
{/* When toggled the app will be put into debug mode. */}
5268
<TestToolRow title={translate('initialSettingsPage.troubleshoot.debugMode')}>
5369
<Switch

src/languages/de.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1587,6 +1587,7 @@ const translations = {
15871587
testCrash: 'Testabsturz',
15881588
resetToOriginalState: 'Auf den ursprünglichen Zustand zurücksetzen',
15891589
usingImportedState: 'Sie verwenden importierten Status. Drücken Sie hier, um ihn zu löschen.',
1590+
shouldBlockTransactionThreadReportCreation: 'Erstellung von Transaktions-Thread-Berichten blockieren',
15901591
debugMode: 'Debug-Modus',
15911592
invalidFile: 'Ungültige Datei',
15921593
invalidFileDescription: 'Die Datei, die Sie importieren möchten, ist ungültig. Bitte versuchen Sie es erneut.',

src/languages/en.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1571,6 +1571,7 @@ const translations = {
15711571
testCrash: 'Test crash',
15721572
resetToOriginalState: 'Reset to original state',
15731573
usingImportedState: 'You are using imported state. Press here to clear it.',
1574+
shouldBlockTransactionThreadReportCreation: 'Block transaction thread report creation',
15741575
debugMode: 'Debug mode',
15751576
invalidFile: 'Invalid file',
15761577
invalidFileDescription: 'The file you are trying to import is not valid. Please try again.',

src/languages/es.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1564,6 +1564,7 @@ const translations = {
15641564
testCrash: 'Prueba de fallo',
15651565
resetToOriginalState: 'Restablecer al estado original',
15661566
usingImportedState: 'Estás utilizando el estado importado. Pulsa aquí para borrarlo.',
1567+
shouldBlockTransactionThreadReportCreation: 'Bloquear la creación de informes de hilos de transacciones',
15671568
debugMode: 'Modo depuración',
15681569
invalidFile: 'Archivo inválido',
15691570
invalidFileDescription: 'El archivo que ests intentando importar no es válido. Por favor, inténtalo de nuevo.',

src/languages/fr.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1588,6 +1588,7 @@ const translations = {
15881588
testCrash: 'Test crash',
15891589
resetToOriginalState: "Réinitialiser à l'état d'origine",
15901590
usingImportedState: 'Vous utilisez un état importé. Appuyez ici pour le réinitialiser.',
1591+
shouldBlockTransactionThreadReportCreation: 'Bloquer la création de rapports de fil de transaction',
15911592
debugMode: 'Mode débogage',
15921593
invalidFile: 'Fichier invalide',
15931594
invalidFileDescription: "Le fichier que vous essayez d'importer n'est pas valide. Veuillez réessayer.",

src/languages/it.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1581,6 +1581,7 @@ const translations = {
15811581
testCrash: 'Test crash',
15821582
resetToOriginalState: 'Ripristina allo stato originale',
15831583
usingImportedState: 'Stai utilizzando uno stato importato. Premi qui per cancellarlo.',
1584+
shouldBlockTransactionThreadReportCreation: 'Blocca la creazione di report del thread di transazione',
15841585
debugMode: 'Modalità debug',
15851586
invalidFile: 'File non valido',
15861587
invalidFileDescription: 'Il file che stai cercando di importare non è valido. Per favore riprova.',

src/languages/ja.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1581,6 +1581,7 @@ const translations = {
15811581
testCrash: 'クラッシュのテスト',
15821582
resetToOriginalState: '元の状態にリセット',
15831583
usingImportedState: 'インポートされた状態を使用しています。ここを押してクリアしてください。',
1584+
shouldBlockTransactionThreadReportCreation: 'トランザクションスレッドレポートの作成をブロック',
15841585
debugMode: 'デバッグモード',
15851586
invalidFile: '無効なファイル',
15861587
invalidFileDescription: 'インポートしようとしているファイルは無効です。もう一度お試しください。',

src/languages/nl.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1583,6 +1583,7 @@ const translations = {
15831583
testCrash: 'Test crash',
15841584
resetToOriginalState: 'Reset naar oorspronkelijke staat',
15851585
usingImportedState: 'U gebruikt geïmporteerde status. Druk hier om het te wissen.',
1586+
shouldBlockTransactionThreadReportCreation: 'Creatie van transactie thread rapporten blokkeren',
15861587
debugMode: 'Debug-modus',
15871588
invalidFile: 'Ongeldig bestand',
15881589
invalidFileDescription: 'Het bestand dat je probeert te importeren is niet geldig. Probeer het opnieuw.',

src/languages/pl.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1579,6 +1579,7 @@ const translations = {
15791579
testCrash: 'Test awarii',
15801580
resetToOriginalState: 'Przywróć do stanu początkowego',
15811581
usingImportedState: 'Używasz zaimportowanego stanu. Naciśnij tutaj, aby go wyczyścić.',
1582+
shouldBlockTransactionThreadReportCreation: 'Blokuj tworzenie raportów wątku transakcji',
15821583
debugMode: 'Tryb debugowania',
15831584
invalidFile: 'Nieprawidłowy plik',
15841585
invalidFileDescription: 'Plik, który próbujesz zaimportować, jest nieprawidłowy. Spróbuj ponownie.',

src/languages/pt-BR.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1580,6 +1580,7 @@ const translations = {
15801580
testCrash: 'Teste de falha',
15811581
resetToOriginalState: 'Redefinir para o estado original',
15821582
usingImportedState: 'Você está usando um estado importado. Clique aqui para limpá-lo.',
1583+
shouldBlockTransactionThreadReportCreation: 'Bloquear a criação de relatórios de thread de transação',
15831584
debugMode: 'Modo de depuração',
15841585
invalidFile: 'Arquivo inválido',
15851586
invalidFileDescription: 'O arquivo que você está tentando importar não é válido. Por favor, tente novamente.',

0 commit comments

Comments
 (0)