Merge pull request Expensify#40645 from Krishna2323/krishna2323/issue…

…/40597 [CP Staging] fix: IOS - Start Chat - Offline indicator overlaps with navigation bar in Start chat list.
kmbcook · Apr 21, 2024 · 995f914 · 995f914
2 parents 0f30b3d + 7bcbe3b
commit 995f914
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/pages/NewChatPage.tsx b/src/pages/NewChatPage.tsx
@@ -1,14 +1,14 @@
 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';
 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>
     );
 }