From 4f9460b8b22b826b942fe06eeeb9a1462bf6d595 Mon Sep 17 00:00:00 2001 From: Gerzon Z Date: Mon, 24 Jan 2022 15:18:59 -0400 Subject: [PATCH] Remove style.ts --- app/views/ChangePasscodeView.tsx | 4 ++-- app/views/DiscussionsView/index.tsx | 13 +++++++++---- app/views/DiscussionsView/styles.ts | 7 ------- 3 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 app/views/DiscussionsView/styles.ts diff --git a/app/views/ChangePasscodeView.tsx b/app/views/ChangePasscodeView.tsx index 2768522c1..5ed58a27d 100644 --- a/app/views/ChangePasscodeView.tsx +++ b/app/views/ChangePasscodeView.tsx @@ -80,10 +80,10 @@ const ChangePasscodeView = React.memo(() => { return ( - + {!data?.force ? ( - + ) : null} diff --git a/app/views/DiscussionsView/index.tsx b/app/views/DiscussionsView/index.tsx index 0dc076e97..01282095b 100644 --- a/app/views/DiscussionsView/index.tsx +++ b/app/views/DiscussionsView/index.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useLayoutEffect, useState } from 'react'; -import { FlatList } from 'react-native'; +import { FlatList, StyleSheet } from 'react-native'; import { useSelector } from 'react-redux'; import { useSafeAreaInsets } from 'react-native-safe-area-context'; import { HeaderBackButton, StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack'; @@ -24,10 +24,15 @@ import RocketChat from '../../lib/rocketchat'; import SearchHeader from '../../containers/SearchHeader'; import { TThreadModel } from '../../definitions/IThread'; import Item from './Item'; -import styles from './styles'; const API_FETCH_COUNT = 50; +const styles = StyleSheet.create({ + contentContainer: { + marginBottom: 30 + } +}); + interface IDiscussionsViewProps { navigation: StackNavigationProp; route: RouteProp; @@ -121,7 +126,7 @@ const DiscussionsView = ({ navigation, route }: IDiscussionsViewProps): JSX.Elem options = { headerLeft: () => ( - navigation.pop()} tintColor={themes[theme!].headerTintColor} /> + navigation.pop()} tintColor={themes[theme].headerTintColor} /> ), headerTitleAlign: 'center', headerTitle: I18n.t('Discussions'), @@ -187,7 +192,7 @@ const DiscussionsView = ({ navigation, route }: IDiscussionsViewProps): JSX.Elem data={isSearching ? search : discussions} renderItem={renderItem} keyExtractor={(item: any) => item.msg} - style={{ backgroundColor: themes[theme!].backgroundColor }} + style={{ backgroundColor: themes[theme].backgroundColor }} contentContainerStyle={styles.contentContainer} onEndReachedThreshold={0.5} removeClippedSubviews={isIOS} diff --git a/app/views/DiscussionsView/styles.ts b/app/views/DiscussionsView/styles.ts deleted file mode 100644 index c6478a8b5..000000000 --- a/app/views/DiscussionsView/styles.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { StyleSheet } from 'react-native'; - -export default StyleSheet.create({ - contentContainer: { - marginBottom: 30 - } -});