Skip to content

Commit

Permalink
Merge pull request #40645 from Krishna2323/krishna2323/issue/40597
Browse files Browse the repository at this point in the history
[CP Staging] fix: IOS - Start Chat - Offline indicator overlaps with navigation bar in Start chat list.

(cherry picked from commit 995f914)
  • Loading branch information
srikarparsi authored and OSBotify committed Apr 22, 2024
1 parent bf9a8b0 commit e6eed95
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions src/pages/NewChatPage.tsx
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -265,6 +265,7 @@ function NewChatPage({isGroupChat}: NewChatPageProps) {
{!!selectedOptions.length && (
<Button
success
large
text={translate('common.next')}
onPress={createGroup}
pressOnEnter
Expand All @@ -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
Expand Down Expand Up @@ -306,7 +311,7 @@ function NewChatPage({isGroupChat}: NewChatPageProps) {
/>
{isSmallScreenWidth && <OfflineIndicator />}
</KeyboardAvoidingView>
</View>
</ScreenWrapper>
);
}

Expand Down

0 comments on commit e6eed95

Please sign in to comment.