diff --git a/app/containers/MessageBox/RightButtons.android.js b/app/containers/MessageBox/RightButtons.android.js
index 6384fabf3..6ce281653 100644
--- a/app/containers/MessageBox/RightButtons.android.js
+++ b/app/containers/MessageBox/RightButtons.android.js
@@ -10,10 +10,10 @@ const RightButtons = React.memo(({
 		return <SendButton onPress={submit} />;
 	}
 	return (
-		<React.Fragment>
+		<>
 			<AudioButton onPress={recordAudioMessage} />
 			<FileButton onPress={showFileActions} />
-		</React.Fragment>
+		</>
 	);
 });
 
diff --git a/app/containers/message/Audio.js b/app/containers/message/Audio.js
index 4d411df9d..e1302aea1 100644
--- a/app/containers/message/Audio.js
+++ b/app/containers/message/Audio.js
@@ -168,7 +168,7 @@ export default class Audio extends React.Component {
 		}
 
 		return (
-			<React.Fragment>
+			<>
 				<View style={styles.audioContainer}>
 					<Video
 						ref={this.setRef}
@@ -196,7 +196,7 @@ export default class Audio extends React.Component {
 					<Text style={styles.duration}>{this.duration}</Text>
 				</View>
 				<Markdown msg={description} baseUrl={baseUrl} username={user.username} getCustomEmoji={getCustomEmoji} useMarkdown={useMarkdown} />
-			</React.Fragment>
+			</>
 		);
 	}
 }
diff --git a/app/containers/message/Broadcast.js b/app/containers/message/Broadcast.js
index f1eaac95f..1aab228ff 100644
--- a/app/containers/message/Broadcast.js
+++ b/app/containers/message/Broadcast.js
@@ -21,10 +21,10 @@ const Broadcast = React.memo(({
 					style={styles.button}
 					hitSlop={BUTTON_HIT_SLOP}
 				>
-					<React.Fragment>
+					<>
 						<CustomIcon name='back' size={20} style={styles.buttonIcon} />
 						<Text style={styles.buttonText}>{I18n.t('Reply')}</Text>
-					</React.Fragment>
+					</>
 				</Touchable>
 			</View>
 		);
diff --git a/app/containers/message/Discussion.js b/app/containers/message/Discussion.js
index 47ea1693a..5c666e275 100644
--- a/app/containers/message/Discussion.js
+++ b/app/containers/message/Discussion.js
@@ -15,7 +15,7 @@ const Discussion = React.memo(({
 	const time = formatLastMessage(dlm);
 	const buttonText = formatMessageCount(dcount, DISCUSSION);
 	return (
-		<React.Fragment>
+		<>
 			<Text style={styles.startedDiscussion}>{I18n.t('Started_discussion')}</Text>
 			<Text style={styles.text}>{msg}</Text>
 			<View style={styles.buttonContainer}>
@@ -25,14 +25,14 @@ const Discussion = React.memo(({
 					style={[styles.button, styles.smallButton]}
 					hitSlop={BUTTON_HIT_SLOP}
 				>
-					<React.Fragment>
+					<>
 						<CustomIcon name='chat' size={20} style={styles.buttonIcon} />
 						<Text style={styles.buttonText}>{buttonText}</Text>
-					</React.Fragment>
+					</>
 				</Touchable>
 				<Text style={styles.time}>{time}</Text>
 			</View>
-		</React.Fragment>
+		</>
 	);
 }, (prevProps, nextProps) => {
 	if (prevProps.msg !== nextProps.msg) {
diff --git a/app/containers/message/Message.js b/app/containers/message/Message.js
index 9bb0f702d..e26040d5a 100644
--- a/app/containers/message/Message.js
+++ b/app/containers/message/Message.js
@@ -21,23 +21,23 @@ import CallButton from './CallButton';
 const MessageInner = React.memo((props) => {
 	if (props.type === 'discussion-created') {
 		return (
-			<React.Fragment>
+			<>
 				<User {...props} />
 				<Discussion {...props} />
-			</React.Fragment>
+			</>
 		);
 	}
 	if (props.type === 'jitsi_call_started') {
 		return (
-			<React.Fragment>
+			<>
 				<User {...props} />
 				<Content {...props} isInfo />
 				<CallButton {...props} />
-			</React.Fragment>
+			</>
 		);
 	}
 	return (
-		<React.Fragment>
+		<>
 			<User {...props} />
 			<Content {...props} />
 			<Attachments {...props} />
@@ -45,7 +45,7 @@ const MessageInner = React.memo((props) => {
 			<Thread {...props} />
 			<Reactions {...props} />
 			<Broadcast {...props} />
-		</React.Fragment>
+		</>
 	);
 });
 MessageInner.displayName = 'MessageInner';
diff --git a/app/containers/message/Urls.js b/app/containers/message/Urls.js
index ddb5db835..0275996a9 100644
--- a/app/containers/message/Urls.js
+++ b/app/containers/message/Urls.js
@@ -89,10 +89,10 @@ const Url = React.memo(({
 			style={[styles.button, index > 0 && styles.marginTop, styles.container]}
 			background={Touchable.Ripple('#fff')}
 		>
-			<React.Fragment>
+			<>
 				<UrlImage image={url.image} user={user} baseUrl={baseUrl} />
 				<UrlContent title={url.title} description={url.description} />
-			</React.Fragment>
+			</>
 		</Touchable>
 	);
 }, (oldProps, newProps) => isEqual(oldProps.url, newProps.url));
diff --git a/app/containers/message/Video.js b/app/containers/message/Video.js
index 95d164ea2..74cedca68 100644
--- a/app/containers/message/Video.js
+++ b/app/containers/message/Video.js
@@ -48,7 +48,7 @@ const Video = React.memo(({
 	};
 
 	return (
-		<React.Fragment>
+		<>
 			<Touchable
 				onPress={onPress}
 				style={styles.button}
@@ -61,7 +61,7 @@ const Video = React.memo(({
 				/>
 			</Touchable>
 			<Markdown msg={file.description} baseUrl={baseUrl} username={user.username} getCustomEmoji={getCustomEmoji} useMarkdown={useMarkdown} />
-		</React.Fragment>
+		</>
 	);
 }, (prevProps, nextProps) => isEqual(prevProps.file, nextProps.file));
 
diff --git a/app/index.js b/app/index.js
index 016be1163..4c0b48803 100644
--- a/app/index.js
+++ b/app/index.js
@@ -239,11 +239,11 @@ class CustomInsideStack extends React.Component {
 	render() {
 		const { navigation } = this.props;
 		return (
-			<React.Fragment>
+			<>
 				<InsideStackModal navigation={navigation} />
 				<NotificationBadge navigation={navigation} />
 				<Toast />
-			</React.Fragment>
+			</>
 		);
 	}
 }
diff --git a/app/notifications/inApp/index.js b/app/notifications/inApp/index.js
index 0e2d029b5..7e99903af 100644
--- a/app/notifications/inApp/index.js
+++ b/app/notifications/inApp/index.js
@@ -200,13 +200,13 @@ class NotificationBadge extends React.Component {
 					hitSlop={BUTTON_HIT_SLOP}
 					background={Touchable.SelectableBackgroundBorderless()}
 				>
-					<React.Fragment>
+					<>
 						<Avatar text={name} size={AVATAR_SIZE} type={type} baseUrl={baseUrl} style={styles.avatar} userId={userId} token={token} />
 						<View>
 							<Text style={styles.roomName}>{name}</Text>
 							<Text style={[styles.message, { maxWidth: maxWidthMessage }]} numberOfLines={1}>{message}</Text>
 						</View>
-					</React.Fragment>
+					</>
 				</Touchable>
 				<TouchableOpacity onPress={this.hide}>
 					<CustomIcon name='circle-cross' style={styles.close} size={20} />
diff --git a/app/presentation/RoomItem/Actions.js b/app/presentation/RoomItem/Actions.js
index 8793dc791..7bdebcb1b 100644
--- a/app/presentation/RoomItem/Actions.js
+++ b/app/presentation/RoomItem/Actions.js
@@ -44,10 +44,10 @@ export const LeftActions = React.memo(({
 					]}
 				>
 					<RectButton style={styles.actionButton} onPress={onToggleReadPress}>
-						<React.Fragment>
+						<>
 							<CustomIcon size={20} name={isRead ? 'flag' : 'check'} color='white' />
 							<Text style={styles.actionText}>{I18n.t(isRead ? 'Unread' : 'Read')}</Text>
-						</React.Fragment>
+						</>
 					</RectButton>
 				</Animated.View>
 			</Animated.View>
@@ -87,10 +87,10 @@ export const RightActions = React.memo(({
 				]}
 			>
 				<RectButton style={[styles.actionButton, { backgroundColor: '#ffbb00' }]} onPress={toggleFav}>
-					<React.Fragment>
+					<>
 						<CustomIcon size={20} name={favorite ? 'Star-filled' : 'star'} color='white' />
 						<Text style={styles.actionText}>{I18n.t(favorite ? 'Unfavorite' : 'Favorite')}</Text>
-					</React.Fragment>
+					</>
 				</RectButton>
 			</Animated.View>
 			<Animated.View
@@ -103,10 +103,10 @@ export const RightActions = React.memo(({
 				]}
 			>
 				<RectButton style={[styles.actionButton, { backgroundColor: '#54585e' }]} onPress={onHidePress}>
-					<React.Fragment>
+					<>
 						<CustomIcon size={20} name='eye-off' color='white' />
 						<Text style={styles.actionText}>{I18n.t('Hide')}</Text>
-					</React.Fragment>
+					</>
 				</RectButton>
 			</Animated.View>
 		</View>
diff --git a/app/views/AuthLoadingView.js b/app/views/AuthLoadingView.js
index a2ef3e509..b0195d634 100644
--- a/app/views/AuthLoadingView.js
+++ b/app/views/AuthLoadingView.js
@@ -12,8 +12,8 @@ const styles = StyleSheet.create({
 });
 
 export default React.memo(() => (
-	<React.Fragment>
+	<>
 		<StatusBar />
 		{isAndroid ? <Image source={{ uri: 'launch_screen' }} style={styles.image} /> : null}
-	</React.Fragment>
+	</>
 ));
diff --git a/app/views/AuthenticationWebView.js b/app/views/AuthenticationWebView.js
index a1c2757db..cbf7549b4 100644
--- a/app/views/AuthenticationWebView.js
+++ b/app/views/AuthenticationWebView.js
@@ -105,7 +105,7 @@ class AuthenticationWebView extends React.PureComponent {
 		const { loading } = this.state;
 		const uri = navigation.getParam('url');
 		return (
-			<React.Fragment>
+			<>
 				<StatusBar />
 				<WebView
 					useWebKit
@@ -120,7 +120,7 @@ class AuthenticationWebView extends React.PureComponent {
 					}}
 				/>
 				{ loading ? <ActivityIndicator size='large' style={styles.loading} /> : null }
-			</React.Fragment>
+			</>
 		);
 	}
 }
diff --git a/app/views/DirectoryView/Options.js b/app/views/DirectoryView/Options.js
index 31725c118..8a9425db3 100644
--- a/app/views/DirectoryView/Options.js
+++ b/app/views/DirectoryView/Options.js
@@ -85,7 +85,7 @@ export default class DirectoryOptions extends PureComponent {
 		});
 		const { globalUsers, toggleWorkspace, isFederationEnabled } = this.props;
 		return (
-			<React.Fragment>
+			<>
 				<TouchableWithoutFeedback onPress={this.close}>
 					<Animated.View style={[styles.backdrop, { opacity: backdropOpacity }]} />
 				</TouchableWithoutFeedback>
@@ -103,7 +103,7 @@ export default class DirectoryOptions extends PureComponent {
 					{this.renderItem('users')}
 					{isFederationEnabled
 						? (
-							<React.Fragment>
+							<>
 								<View style={styles.dropdownSeparator} />
 								<View style={[styles.dropdownItemContainer, styles.globalUsersContainer]}>
 									<View style={styles.globalUsersTextContainer}>
@@ -112,11 +112,11 @@ export default class DirectoryOptions extends PureComponent {
 									</View>
 									<Switch value={globalUsers} onValueChange={toggleWorkspace} trackColor={SWITCH_TRACK_COLOR} />
 								</View>
-							</React.Fragment>
+							</>
 						)
 						: null}
 				</Animated.View>
-			</React.Fragment>
+			</>
 		);
 	}
 }
diff --git a/app/views/DirectoryView/index.js b/app/views/DirectoryView/index.js
index 4dc5310fd..9f5018c86 100644
--- a/app/views/DirectoryView/index.js
+++ b/app/views/DirectoryView/index.js
@@ -142,7 +142,7 @@ class DirectoryView extends React.Component {
 	renderHeader = () => {
 		const { type } = this.state;
 		return (
-			<React.Fragment>
+			<>
 				<SearchBox
 					onChangeText={this.onSearchChangeText}
 					onSubmitEditing={this.search}
@@ -155,7 +155,7 @@ class DirectoryView extends React.Component {
 						<CustomIcon name='arrow-down' size={20} style={styles.toggleDropdownArrow} />
 					</View>
 				</Touch>
-			</React.Fragment>
+			</>
 		);
 	}
 
diff --git a/app/views/RoomInfoView/index.js b/app/views/RoomInfoView/index.js
index 458ddcc2b..e7dcd7ea0 100644
--- a/app/views/RoomInfoView/index.js
+++ b/app/views/RoomInfoView/index.js
@@ -253,23 +253,23 @@ class RoomInfoView extends React.Component {
 	renderChannel = () => {
 		const { room } = this.state;
 		return (
-			<React.Fragment>
+			<>
 				{this.renderItem('description', room)}
 				{this.renderItem('topic', room)}
 				{this.renderItem('announcement', room)}
 				{room.broadcast ? this.renderBroadcast() : null}
-			</React.Fragment>
+			</>
 		);
 	}
 
 	renderDirect = () => {
 		const { roomUser } = this.state;
 		return (
-			<React.Fragment>
+			<>
 				{this.renderRoles()}
 				{this.renderTimezone()}
 				{this.renderCustomFields(roomUser._id)}
-			</React.Fragment>
+			</>
 		);
 	}
 
diff --git a/app/views/RoomView/index.js b/app/views/RoomView/index.js
index 05dc9677a..bbe07cc42 100644
--- a/app/views/RoomView/index.js
+++ b/app/views/RoomView/index.js
@@ -669,13 +669,13 @@ class RoomView extends React.Component {
 
 		if (showUnreadSeparator || dateSeparator) {
 			return (
-				<React.Fragment>
+				<>
 					{message}
 					<Separator
 						ts={dateSeparator}
 						unread={showUnreadSeparator}
 					/>
-				</React.Fragment>
+				</>
 			);
 		}
 
diff --git a/app/views/RoomsListView/ListHeader/index.js b/app/views/RoomsListView/ListHeader/index.js
index fd35f0b57..bdef7d1cc 100644
--- a/app/views/RoomsListView/ListHeader/index.js
+++ b/app/views/RoomsListView/ListHeader/index.js
@@ -8,11 +8,11 @@ import Sort from './Sort';
 const ListHeader = React.memo(({
 	searchLength, sortBy, onChangeSearchText, toggleSort, goDirectory
 }) => (
-	<React.Fragment>
+	<>
 		<SearchBar onChangeSearchText={onChangeSearchText} />
 		<Directory goDirectory={goDirectory} />
 		<Sort searchLength={searchLength} sortBy={sortBy} toggleSort={toggleSort} />
-	</React.Fragment>
+	</>
 ));
 
 ListHeader.propTypes = {
diff --git a/app/views/RoomsListView/SortDropdown.js b/app/views/RoomsListView/SortDropdown.js
index 44aa31d94..bd87ea670 100644
--- a/app/views/RoomsListView/SortDropdown.js
+++ b/app/views/RoomsListView/SortDropdown.js
@@ -112,7 +112,7 @@ class Sort extends PureComponent {
 		} = this.props;
 
 		return (
-			<React.Fragment>
+			<>
 				<TouchableWithoutFeedback key='sort-backdrop' onPress={this.close}>
 					<Animated.View style={[styles.backdrop, { opacity: backdropOpacity }]} />
 				</TouchableWithoutFeedback>
@@ -167,7 +167,7 @@ class Sort extends PureComponent {
 						</View>
 					</Touch>
 				</Animated.View>
-			</React.Fragment>
+			</>
 		);
 	}
 }
diff --git a/app/views/ShareListView/index.js b/app/views/ShareListView/index.js
index ac6deed65..f419ffc60 100644
--- a/app/views/ShareListView/index.js
+++ b/app/views/ShareListView/index.js
@@ -312,7 +312,7 @@ class ShareListView extends React.Component {
 		const { server } = this.props;
 		const currentServer = servers.find(serverFiltered => serverFiltered.id === server);
 		return currentServer ? (
-			<React.Fragment>
+			<>
 				{this.renderSectionHeader('Select_Server')}
 				<View style={styles.bordered}>
 					<ServerItem
@@ -321,7 +321,7 @@ class ShareListView extends React.Component {
 						item={currentServer}
 					/>
 				</View>
-			</React.Fragment>
+			</>
 		) : null;
 	}
 
@@ -334,17 +334,17 @@ class ShareListView extends React.Component {
 	renderHeader = () => {
 		const { searching } = this.state;
 		return (
-			<React.Fragment>
+			<>
 				{ !searching
 					? (
-						<React.Fragment>
+						<>
 							{this.renderSelectServer()}
 							{this.renderSectionHeader('Chats')}
-						</React.Fragment>
+						</>
 					)
 					: null
 				}
-			</React.Fragment>
+			</>
 		);
 	}
 
@@ -391,9 +391,9 @@ class ShareListView extends React.Component {
 			<View style={styles.container}>
 				{ !searching
 					? (
-						<React.Fragment>
+						<>
 							{this.renderSelectServer()}
-						</React.Fragment>
+						</>
 					)
 					: null
 				}
diff --git a/app/views/SidebarView/index.js b/app/views/SidebarView/index.js
index 9e008071c..fa077befb 100644
--- a/app/views/SidebarView/index.js
+++ b/app/views/SidebarView/index.js
@@ -184,7 +184,7 @@ class Sidebar extends Component {
 		const { isAdmin } = this.state;
 		const { activeItemKey } = this.props;
 		return (
-			<React.Fragment>
+			<>
 				<SidebarItem
 					text={I18n.t('Chats')}
 					left={<CustomIcon name='message' size={20} color={COLOR_TEXT} />}
@@ -222,7 +222,7 @@ class Sidebar extends Component {
 					onPress={this.logout}
 					testID='sidebar-logout'
 				/>
-			</React.Fragment>
+			</>
 		);
 	}