From e6eed952962fa282ead8106488e311d6bcc56465 Mon Sep 17 00:00:00 2001
From: Srikar Parsi <48188732+srikarparsi@users.noreply.github.com>
Date: Sun, 21 Apr 2024 18:37:18 -0400
Subject: [PATCH] Merge pull request #40645 from
 Krishna2323/krishna2323/issue/40597

[CP Staging] fix: IOS - Start Chat - Offline indicator overlaps with navigation bar in Start chat list.

(cherry picked from commit 995f914e191f49464054232ce708e42dacd8fe84)
---
 src/pages/NewChatPage.tsx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/pages/NewChatPage.tsx b/src/pages/NewChatPage.tsx
index 5f14f8576cb5..470afc28d76e 100755
--- a/src/pages/NewChatPage.tsx
+++ b/src/pages/NewChatPage.tsx
@@ -1,7 +1,6 @@
 import isEmpty from 'lodash/isEmpty';
 import reject from 'lodash/reject';
 import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
 import KeyboardAvoidingView from '@components/KeyboardAvoidingView';
@@ -9,6 +8,7 @@ import OfflineIndicator from '@components/OfflineIndicator';
 import {useOptionsList} from '@components/OptionListContextProvider';
 import {PressableWithFeedback} from '@components/Pressable';
 import ReferralProgramCTA from '@components/ReferralProgramCTA';
+import ScreenWrapper from '@components/ScreenWrapper';
 import SelectCircle from '@components/SelectCircle';
 import SelectionList from '@components/SelectionList';
 import type {ListItem} from '@components/SelectionList/types';
@@ -265,6 +265,7 @@ function NewChatPage({isGroupChat}: NewChatPageProps) {
                 {!!selectedOptions.length && (
                     <Button
                         success
+                        large
                         text={translate('common.next')}
                         onPress={createGroup}
                         pressOnEnter
@@ -276,8 +277,12 @@ function NewChatPage({isGroupChat}: NewChatPageProps) {
     );
 
     return (
-        <View
-            style={styles.flex1}
+        <ScreenWrapper
+            shouldEnableKeyboardAvoidingView={false}
+            includeSafeAreaPaddingBottom={isOffline}
+            shouldShowOfflineIndicator={false}
+            includePaddingTop={false}
+            shouldEnablePickerAvoiding={false}
             testID={NewChatPage.displayName}
         >
             <KeyboardAvoidingView
@@ -306,7 +311,7 @@ function NewChatPage({isGroupChat}: NewChatPageProps) {
                 />
                 {isSmallScreenWidth && <OfflineIndicator />}
             </KeyboardAvoidingView>
-        </View>
+        </ScreenWrapper>
     );
 }