diff --git a/src/components/ScreenWrapper.tsx b/src/components/ScreenWrapper.tsx
index 4a7aab4ad299..3645b832ed43 100644
--- a/src/components/ScreenWrapper.tsx
+++ b/src/components/ScreenWrapper.tsx
@@ -172,7 +172,7 @@ function ScreenWrapper(
         }),
     ).current;
 
-    const keyboardDissmissPanResponder = useRef(
+    const keyboardDismissPanResponder = useRef(
         PanResponder.create({
             onMoveShouldSetPanResponderCapture: (_e, gestureState) => {
                 const isHorizontalSwipe = Math.abs(gestureState.dx) > Math.abs(gestureState.dy);
@@ -265,7 +265,7 @@ function ScreenWrapper(
                                 fsClass="fs-unmask"
                                 style={[styles.flex1, paddingStyle, style]}
                                 // eslint-disable-next-line react/jsx-props-no-spreading
-                                {...keyboardDissmissPanResponder.panHandlers}
+                                {...keyboardDismissPanResponder.panHandlers}
                             >
                                 <KeyboardAvoidingView
                                     style={[styles.w100, styles.h100, {maxHeight}, isAvoidingViewportScroll ? [styles.overflowAuto, styles.overscrollBehaviorContain] : {}]}
diff --git a/src/components/TestToolsModal.tsx b/src/components/TestToolsModal.tsx
index 5c330bd700e0..7c2e161b2d11 100644
--- a/src/components/TestToolsModal.tsx
+++ b/src/components/TestToolsModal.tsx
@@ -1,8 +1,6 @@
 import React from 'react';
 import {View} from 'react-native';
-import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
-import useEnvironment from '@hooks/useEnvironment';
+import {useOnyx} from 'react-native-onyx';
 import useLocalize from '@hooks/useLocalize';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -20,18 +18,9 @@ import TestToolMenu from './TestToolMenu';
 import TestToolRow from './TestToolRow';
 import Text from './Text';
 
-type TestToolsModalOnyxProps = {
-    /** Whether the test tools modal is open */
-    isTestToolsModalOpen: OnyxEntry<boolean>;
-
-    /** Whether or not logs should be stored */
-    shouldStoreLogs: OnyxEntry<boolean>;
-};
-
-type TestToolsModalProps = TestToolsModalOnyxProps;
-
-function TestToolsModal({isTestToolsModalOpen = false, shouldStoreLogs = false}: TestToolsModalProps) {
-    const {isProduction} = useEnvironment();
+function TestToolsModal() {
+    const [isTestToolsModalOpen = false] = useOnyx(ONYXKEYS.IS_TEST_TOOLS_MODAL_OPEN);
+    const [shouldStoreLogs = false] = useOnyx(ONYXKEYS.SHOULD_STORE_LOGS);
     const {windowWidth} = useWindowDimensions();
     const StyleUtils = useStyleUtils();
     const styles = useThemeStyles();
@@ -64,7 +53,7 @@ function TestToolsModal({isTestToolsModalOpen = false, shouldStoreLogs = false}:
                         />
                     </TestToolRow>
                 )}
-                {!isProduction && <TestToolMenu />}
+                <TestToolMenu />
             </View>
         </Modal>
     );
@@ -72,11 +61,4 @@ function TestToolsModal({isTestToolsModalOpen = false, shouldStoreLogs = false}:
 
 TestToolsModal.displayName = 'TestToolsModal';
 
-export default withOnyx<TestToolsModalProps, TestToolsModalOnyxProps>({
-    isTestToolsModalOpen: {
-        key: ONYXKEYS.IS_TEST_TOOLS_MODAL_OPEN,
-    },
-    shouldStoreLogs: {
-        key: ONYXKEYS.SHOULD_STORE_LOGS,
-    },
-})(TestToolsModal);
+export default TestToolsModal;