Skip to content

Commit c0615dd

Browse files
committed
Update
1 parent 782dbd1 commit c0615dd

File tree

6 files changed

+48
-19
lines changed

6 files changed

+48
-19
lines changed

src/components/TestToolMenu.tsx src/components/TestToolMenu/BaseTestToolMenu.tsx

+9-18
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@ import * as User from '@userActions/User';
1111
import CONFIG from '@src/CONFIG';
1212
import ONYXKEYS from '@src/ONYXKEYS';
1313
import type {Network as NetworkOnyx, User as UserOnyx} from '@src/types/onyx';
14-
import testCrash from "@libs/testCrash";
15-
import Button from './Button';
16-
import {withNetwork} from './OnyxProvider';
17-
import Switch from './Switch';
18-
import TestToolRow from './TestToolRow';
19-
import Text from './Text';
14+
import Text from "@components/Text";
15+
import TestToolRow from "@components/TestToolRow";
16+
import Switch from "@components/Switch";
17+
import Button from "@components/Button";
18+
import {withNetwork} from "@components/OnyxProvider";
2019

2120
type TestToolMenuOnyxProps = {
2221
/** User object in Onyx */
@@ -29,7 +28,7 @@ type TestToolMenuProps = TestToolMenuOnyxProps & {
2928
};
3029
const USER_DEFAULT: UserOnyx = {shouldUseStagingServer: undefined, isSubscribedToNewsletter: false, validated: false, isFromPublicDomain: false, isUsingExpensifyCard: false};
3130

32-
function TestToolMenu({user = USER_DEFAULT, network}: TestToolMenuProps) {
31+
function BaseTestToolMenu({user = USER_DEFAULT, network, children}: React.PropsWithChildren<TestToolMenuProps>) {
3332
const shouldUseStagingServer = user?.shouldUseStagingServer ?? ApiUtils.isUsingStagingApi();
3433
const styles = useThemeStyles();
3534
const {translate} = useLocalize();
@@ -91,20 +90,12 @@ function TestToolMenu({user = USER_DEFAULT, network}: TestToolMenuProps) {
9190
/>
9291
</TestToolRow>
9392

94-
<TestToolRow title="Native crash">
95-
<Button
96-
small
97-
text="Native crash"
98-
onPress={() => {
99-
testCrash();
100-
}}
101-
/>
102-
</TestToolRow>
93+
{children}
10394
</>
10495
);
10596
}
10697

107-
TestToolMenu.displayName = 'TestToolMenu';
98+
BaseTestToolMenu.displayName = 'BaseTestToolMenu';
10899

109100
export default compose(
110101
withOnyx<TestToolMenuProps, TestToolMenuOnyxProps>({
@@ -113,4 +104,4 @@ export default compose(
113104
},
114105
}),
115106
withNetwork(),
116-
)(TestToolMenu);
107+
)(BaseTestToolMenu);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import React from 'react';
2+
import BaseTestToolMenu from './BaseTestToolMenu';
3+
import testCrash from '@libs/testCrash';
4+
import Button from "@components/Button";
5+
import TestToolRow from "@components/TestToolRow";
6+
import useLocalize from "@hooks/useLocalize";
7+
8+
function TestToolMenu(props) {
9+
const {translate} = useLocalize();
10+
11+
return (
12+
// eslint-disable-next-line react/jsx-props-no-spreading
13+
<BaseTestToolMenu {...props}>
14+
<TestToolRow title={translate('initialSettingsPage.troubleshoot.nativeCrash')}>
15+
<Button
16+
small
17+
text={translate('initialSettingsPage.troubleshoot.nativeCrash')}
18+
onPress={() => {
19+
testCrash();
20+
}}
21+
/>
22+
</TestToolRow>
23+
</BaseTestToolMenu>
24+
);
25+
}
26+
27+
export default TestToolMenu;

src/components/TestToolMenu/index.tsx

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import React from 'react';
2+
import BaseTestToolMenu from './BaseTestToolMenu';
3+
4+
function Index(props) {
5+
// eslint-disable-next-line react/jsx-props-no-spreading
6+
return <BaseTestToolMenu {...props} />;
7+
}
8+
9+
export default Index;

src/languages/en.ts

+1
Original file line numberDiff line numberDiff line change
@@ -951,6 +951,7 @@ export default {
951951
deviceCredentials: 'Device credentials',
952952
invalidate: 'Invalidate',
953953
destroy: 'Destroy',
954+
nativeCrash: 'Native crash'
954955
},
955956
debugConsole: {
956957
saveLog: 'Save log',

src/languages/es.ts

+1
Original file line numberDiff line numberDiff line change
@@ -947,6 +947,7 @@ export default {
947947
deviceCredentials: 'Credenciales del dispositivo',
948948
invalidate: 'Invalidar',
949949
destroy: 'Destruir',
950+
nativeCrash: 'Fallo nativo',
950951
},
951952
debugConsole: {
952953
saveLog: 'Guardar registro',

src/pages/settings/Troubleshoot/TroubleshootPage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import MenuItemList from '@components/MenuItemList';
1313
import ScreenWrapper from '@components/ScreenWrapper';
1414
import ScrollView from '@components/ScrollView';
1515
import Section from '@components/Section';
16-
import TestToolMenu from '@components/TestToolMenu';
1716
import Text from '@components/Text';
1817
import TextLink from '@components/TextLink';
1918
import useEnvironment from '@hooks/useEnvironment';
@@ -29,6 +28,7 @@ import type {TranslationPaths} from '@src/languages/types';
2928
import ONYXKEYS from '@src/ONYXKEYS';
3029
import ROUTES from '@src/ROUTES';
3130
import SCREENS from '@src/SCREENS';
31+
import TestToolMenu from "@components/TestToolMenu";
3232
import getLightbulbIllustrationStyle from './getLightbulbIllustrationStyle';
3333

3434
type BaseMenuItem = {

0 commit comments

Comments
 (0)