Merge pull request #49400 from bernhardoj/fix/48468-empty-space-below…

…-button Fix the "Next" button is not positioned above the keyboard
Expensify · Sep 20, 2024 · 9160fa5 · 9160fa5
2 parents eaa7969 + 920e74f
commit 9160fa5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 35 deletions.
diff --git a/src/pages/settings/AboutPage/ConsolePage.tsx b/src/pages/settings/AboutPage/ConsolePage.tsx
@@ -4,7 +4,7 @@ import {format} from 'date-fns';
 import React, {useCallback, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 import type {ListRenderItem, ListRenderItemInfo} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import Button from '@components/Button';
 import ConfirmModal from '@components/ConfirmModal';
@@ -33,23 +33,15 @@ import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {CapturedLogs} from '@src/types/onyx';
 
-type ConsolePageOnyxProps = {
-    /** Logs captured on the current device */
-    capturedLogs: OnyxEntry<CapturedLogs>;
-
-    /** Whether or not logs should be stored */
-    shouldStoreLogs: OnyxEntry<boolean>;
-};
-
-type ConsolePageProps = ConsolePageOnyxProps;
-
 const filterBy = {
     all: '',
     network: '[Network]',
 } as const;
 type FilterBy = (typeof filterBy)[keyof typeof filterBy];
 
-function ConsolePage({capturedLogs, shouldStoreLogs}: ConsolePageProps) {
+function ConsolePage() {
+    const [capturedLogs] = useOnyx(ONYXKEYS.LOGS);
+    const [shouldStoreLogs] = useOnyx(ONYXKEYS.SHOULD_STORE_LOGS);
     const [input, setInput] = useState('');
     const [isGeneratingLogsFile, setIsGeneratingLogsFile] = useState(false);
     const [isLimitModalVisible, setIsLimitModalVisible] = useState(false);
@@ -159,7 +151,10 @@ function ConsolePage({capturedLogs, shouldStoreLogs}: ConsolePageProps) {
     );
 
     return (
-        <ScreenWrapper testID={ConsolePage.displayName}>
+        <ScreenWrapper
+            testID={ConsolePage.displayName}
+            shouldEnableMaxHeight
+        >
             <HeaderWithBackButton
                 title={translate('initialSettingsPage.troubleshoot.debugConsole')}
                 onBackButtonPress={() => Navigation.goBack(route.params?.backTo)}
@@ -228,11 +223,4 @@ function ConsolePage({capturedLogs, shouldStoreLogs}: ConsolePageProps) {
 
 ConsolePage.displayName = 'ConsolePage';
 
-export default withOnyx<ConsolePageProps, ConsolePageOnyxProps>({
-    capturedLogs: {
-        key: ONYXKEYS.LOGS,
-    },
-    shouldStoreLogs: {
-        key: ONYXKEYS.SHOULD_STORE_LOGS,
-    },
-})(ConsolePage);
+export default ConsolePage;
diff --git a/src/pages/settings/ExitSurvey/ExitSurveyResponsePage.tsx b/src/pages/settings/ExitSurvey/ExitSurveyResponsePage.tsx
@@ -1,6 +1,6 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback, useEffect, useState} from 'react';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
@@ -34,13 +34,10 @@ import INPUT_IDS from '@src/types/form/ExitSurveyResponseForm';
 import type {Errors} from '@src/types/onyx/OnyxCommon';
 import ExitSurveyOffline from './ExitSurveyOffline';
 
-type ExitSurveyResponsePageOnyxProps = {
-    draftResponse: string;
-};
+type ExitSurveyResponsePageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.EXIT_SURVEY.RESPONSE>;
 
-type ExitSurveyResponsePageProps = ExitSurveyResponsePageOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.EXIT_SURVEY.RESPONSE>;
-
-function ExitSurveyResponsePage({draftResponse, route, navigation}: ExitSurveyResponsePageProps) {
+function ExitSurveyResponsePage({route, navigation}: ExitSurveyResponsePageProps) {
+    const [draftResponse = ''] = useOnyx(ONYXKEYS.FORMS.EXIT_SURVEY_RESPONSE_FORM_DRAFT, {selector: (value) => value?.[INPUT_IDS.RESPONSE]});
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
@@ -119,7 +116,10 @@ function ExitSurveyResponsePage({draftResponse, route, navigation}: ExitSurveyRe
     );
 
     return (
-        <ScreenWrapper testID={ExitSurveyResponsePage.displayName}>
+        <ScreenWrapper
+            testID={ExitSurveyResponsePage.displayName}
+            shouldEnableMaxHeight
+        >
             <HeaderWithBackButton
                 title={translate('exitSurvey.header')}
                 onBackButtonPress={() => Navigation.goBack()}
@@ -179,9 +179,4 @@ function ExitSurveyResponsePage({draftResponse, route, navigation}: ExitSurveyRe
 
 ExitSurveyResponsePage.displayName = 'ExitSurveyResponsePage';
 
-export default withOnyx<ExitSurveyResponsePageProps, ExitSurveyResponsePageOnyxProps>({
-    draftResponse: {
-        key: ONYXKEYS.FORMS.EXIT_SURVEY_RESPONSE_FORM_DRAFT,
-        selector: (value) => value?.[INPUT_IDS.RESPONSE] ?? '',
-    },
-})(ExitSurveyResponsePage);
+export default ExitSurveyResponsePage;