Skip to content

Commit 8621b61

Browse files
jainkuniyark-for-zulip
authored andcommitted
chatScreen [nfc]: Get rid of reverse styles.
This styles were added in zulip#3226, to fix a issue on Android where navbar was not rendered. This was basically a workaround of RN bug, which now seems to be fixed. So removing this styles to simplify code.
1 parent a111cfc commit 8621b61

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

src/chat/ChatScreen.js

+5-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* @flow strict-local */
22
import React, { PureComponent } from 'react';
3-
import { View, StyleSheet } from 'react-native';
3+
import { View } from 'react-native';
44
import type { NavigationScreenProp } from 'react-navigation';
55
import { ActionSheetProvider } from '@expo/react-native-action-sheet';
66

@@ -32,14 +32,6 @@ type Props = $ReadOnly<{|
3232
...SelectorProps,
3333
|}>;
3434

35-
const componentStyles = StyleSheet.create({
36-
/** A workaround for #3089, by letting us put MessageList first. */
37-
reverse: {
38-
flex: 1,
39-
flexDirection: 'column-reverse',
40-
},
41-
});
42-
4335
class ChatScreen extends PureComponent<Props> {
4436
context: Context;
4537

@@ -59,8 +51,11 @@ class ChatScreen extends PureComponent<Props> {
5951

6052
return (
6153
<ActionSheetProvider>
62-
<View style={[contextStyles.screen, componentStyles.reverse]}>
54+
<View style={contextStyles.screen}>
6355
<KeyboardAvoider style={styles.flexed} behavior="padding">
56+
<ZulipStatusBar narrow={narrow} />
57+
<ChatNavBar narrow={narrow} />
58+
<OfflineNotice />
6459
<UnreadNotice narrow={narrow} />
6560
{sayNoMessages ? (
6661
<NoMessages narrow={narrow} />
@@ -69,9 +64,6 @@ class ChatScreen extends PureComponent<Props> {
6964
)}
7065
{showComposeBox && <ComposeBox narrow={narrow} />}
7166
</KeyboardAvoider>
72-
<OfflineNotice />
73-
<ChatNavBar narrow={narrow} />
74-
<ZulipStatusBar narrow={narrow} />
7567
</View>
7668
</ActionSheetProvider>
7769
);

0 commit comments

Comments
 (0)