From 715a9f42363a13bae7160bd7a92b700b7d229813 Mon Sep 17 00:00:00 2001
From: Hans <visaocuoitroi193@gmail.com>
Date: Fri, 22 Sep 2023 13:21:49 +0700
Subject: [PATCH 1/2] fix Save button is not at the bottom of the page

---
 .../PrivateNotes/PrivateNotesEditPage.js      | 77 +++++++++----------
 1 file changed, 37 insertions(+), 40 deletions(-)

diff --git a/src/pages/PrivateNotes/PrivateNotesEditPage.js b/src/pages/PrivateNotes/PrivateNotesEditPage.js
index 5f12d8087a93..124cded37abd 100644
--- a/src/pages/PrivateNotes/PrivateNotesEditPage.js
+++ b/src/pages/PrivateNotes/PrivateNotesEditPage.js
@@ -92,47 +92,44 @@ function PrivateNotesEditPage({route, personalDetailsList, session, report}) {
                     shouldShowBackButton
                     onCloseButtonPress={() => Navigation.dismissModal()}
                 />
-                <View style={[styles.flexGrow1, styles.ph5]}>
-                    <View style={[styles.mb5]}>
-                        <Text>
-                            {translate(
-                                Str.extractEmailDomain(lodashGet(personalDetailsList, [route.params.accountID, 'login'], '')) === CONST.EMAIL.GUIDES_DOMAIN
-                                    ? 'privateNotes.sharedNoteMessage'
-                                    : 'privateNotes.personalNoteMessage',
-                            )}
-                        </Text>
-                    </View>
-                    <Form
-                        formID={ONYXKEYS.FORMS.PRIVATE_NOTES_FORM}
-                        onSubmit={savePrivateNote}
-                        submitButtonText={translate('common.save')}
-                        enabledWhenOffline
+                <Form
+                    formID={ONYXKEYS.FORMS.PRIVATE_NOTES_FORM}
+                    onSubmit={savePrivateNote}
+                    style={[styles.flexGrow1, styles.ph5]}
+                    submitButtonText={translate('common.save')}
+                    enabledWhenOffline
+                >
+                    <Text style={[styles.mb5]}>
+                        {translate(
+                            Str.extractEmailDomain(lodashGet(personalDetailsList, [route.params.accountID, 'login'], '')) === CONST.EMAIL.GUIDES_DOMAIN
+                                ? 'privateNotes.sharedNoteMessage'
+                                : 'privateNotes.personalNoteMessage',
+                        )}
+                    </Text>
+                    <OfflineWithFeedback
+                        errors={{
+                            ...lodashGet(report, ['privateNotes', route.params.accountID, 'errors'], ''),
+                        }}
+                        onClose={() => Report.clearPrivateNotesError(report.reportID, route.params.accountID)}
+                        style={[styles.mb3]}
                     >
-                        <OfflineWithFeedback
-                            errors={{
-                                ...lodashGet(report, ['privateNotes', route.params.accountID, 'errors'], ''),
-                            }}
-                            onClose={() => Report.clearPrivateNotesError(report.reportID, route.params.accountID)}
-                            style={[styles.mb3]}
-                        >
-                            <TextInput
-                                accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                                inputID="privateNotes"
-                                label={translate('privateNotes.composerLabel')}
-                                accessibilityLabel={translate('privateNotes.title')}
-                                autoCompleteType="off"
-                                autoCorrect={false}
-                                autoGrowHeight
-                                textAlignVertical="top"
-                                containerStyles={[styles.autoGrowHeightMultilineInput]}
-                                defaultValue={privateNote}
-                                value={privateNote}
-                                onChangeText={(text) => setPrivateNote(text)}
-                                ref={(el) => (privateNotesInput.current = el)}
-                            />
-                        </OfflineWithFeedback>
-                    </Form>
-                </View>
+                        <TextInput
+                            accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
+                            inputID="privateNotes"
+                            label={translate('privateNotes.composerLabel')}
+                            accessibilityLabel={translate('privateNotes.title')}
+                            autoCompleteType="off"
+                            autoCorrect={false}
+                            autoGrowHeight
+                            textAlignVertical="top"
+                            containerStyles={[styles.autoGrowHeightMultilineInput]}
+                            defaultValue={privateNote}
+                            value={privateNote}
+                            onChangeText={(text) => setPrivateNote(text)}
+                            ref={(el) => (privateNotesInput.current = el)}
+                        />
+                    </OfflineWithFeedback>
+                </Form>
             </FullPageNotFoundView>
         </ScreenWrapper>
     );

From 441d5124fbaf54d62acc9ffc34ff2e441d69a772 Mon Sep 17 00:00:00 2001
From: Hans <visaocuoitroi193@gmail.com>
Date: Fri, 22 Sep 2023 13:37:03 +0700
Subject: [PATCH 2/2] fix keyboard not show on Safari

---
 src/pages/PrivateNotes/PrivateNotesEditPage.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/PrivateNotes/PrivateNotesEditPage.js b/src/pages/PrivateNotes/PrivateNotesEditPage.js
index 124cded37abd..ae155aabbdb4 100644
--- a/src/pages/PrivateNotes/PrivateNotesEditPage.js
+++ b/src/pages/PrivateNotes/PrivateNotesEditPage.js
@@ -1,6 +1,6 @@
 import React, {useState, useRef} from 'react';
 import PropTypes from 'prop-types';
-import {View, Keyboard} from 'react-native';
+import {Keyboard} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import lodashGet from 'lodash/get';
 import Str from 'expensify-common/lib/str';
@@ -78,6 +78,7 @@ function PrivateNotesEditPage({route, personalDetailsList, session, report}) {
 
     return (
         <ScreenWrapper
+            shouldEnableMaxHeight
             includeSafeAreaPaddingBottom={false}
             onEntryTransitionEnd={() => focusAndUpdateMultilineInputRange(privateNotesInput.current)}
             testID={PrivateNotesEditPage.displayName}