Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Apr 21, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading