Merge branch 'develop' into update.enable-multiline-android-tablets

android/app/build.gradle

@@ -277,14 +277,14 @@ android {
 dependencies {
     addUnimodulesDependencies()
     implementation project(':@react-native-community_viewpager')
-    playImplementation project(':reactnativenotifications')
+    playImplementation project(':react-native-notifications')
+    playImplementation 'com.google.firebase:firebase-core:16.0.0'
     playImplementation project(':@react-native-firebase_app')
     playImplementation project(':@react-native-firebase_analytics')
     playImplementation project(':@react-native-firebase_crashlytics')
     implementation fileTree(dir: "libs", include: ["*.jar"])
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
-    playImplementation "com.google.firebase:firebase-messaging:18.0.0"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
       exclude group:'com.facebook.fbjni'

android/app/src/play/java/chat/rocket/reactnative/AdditionalModules.java

@@ -3,7 +3,6 @@ package chat.rocket.reactnative;
 import android.app.Application;
 
 import com.facebook.react.ReactPackage;
-import com.wix.reactnativenotifications.RNNotificationsPackage;
 
 import java.util.Arrays;
 import java.util.List;
@@ -17,8 +16,7 @@ public class AdditionalModules {
         return Arrays.<ReactPackage>asList(
                 new ReactNativeFirebaseAnalyticsPackage(),
                 new ReactNativeFirebaseAppPackage(),
-                new ReactNativeFirebaseCrashlyticsPackage(),
-                new RNNotificationsPackage(application)
+                new ReactNativeFirebaseCrashlyticsPackage()
         );
     }
 }

android/settings.gradle

@@ -2,8 +2,6 @@ apply from: '../node_modules/react-native-unimodules/gradle.groovy'
 includeUnimodulesProjects()
 
 rootProject.name = 'RocketChatRN'
-include ':reactnativenotifications'
-project(':reactnativenotifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/android/app')
 include ':@react-native-community_viewpager'
 project(':@react-native-community_viewpager').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/viewpager/android')
 include ':@react-native-firebase_app'

app/AppContainer.tsx

@@ -4,7 +4,7 @@ import { createStackNavigator } from '@react-navigation/stack';
 import { connect } from 'react-redux';
 
 import { SetUsernameStackParamList, StackParamList } from './definitions/navigationTypes';
-import Navigation from './lib/Navigation';
+import Navigation from './lib/navigation/appNavigation';
 import { defaultHeader, getActiveRouteName, navigationTheme } from './utils/navigation';
 import { RootEnum } from './definitions';
 // Stacks

app/actions/login.ts

@@ -25,6 +25,7 @@ interface ILoginFailure extends Action {
 
 interface ILogout extends Action {
 	forcedByServer: boolean;
+	message: string;
 }
 
 interface ISetUser extends Action {
@@ -79,10 +80,11 @@ export function loginFailure(err: Record<string, any>): ILoginFailure {
 	};
 }
 
-export function logout(forcedByServer = false): ILogout {
+export function logout(forcedByServer = false, message = ''): ILogout {
 	return {
 		type: types.LOGOUT,
-		forcedByServer
+		forcedByServer,
+		message
 	};
 }
 

app/containers/ActionSheet/ActionSheet.tsx

@@ -7,7 +7,7 @@ import Animated, { Easing, Extrapolate, interpolateNode, Value } from 'react-nat
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import ScrollBottomSheet from 'react-native-scroll-bottom-sheet';
 
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { useDimensions, useOrientation } from '../../dimensions';
 import I18n from '../../i18n';
 import { useTheme } from '../../theme';

app/containers/ActionSheet/Handle.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { View } from 'react-native';
 
 import styles from './styles';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { useTheme } from '../../theme';
 
 export const Handle = React.memo(() => {

app/containers/ActionSheet/Item.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Text, View } from 'react-native';
 
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { CustomIcon } from '../../lib/Icons';
 import { useTheme } from '../../theme';
 import { Button } from './Button';

app/containers/ActivityIndicator.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { ActivityIndicator, ActivityIndicatorProps, StyleSheet } from 'react-native';
 
 import { useTheme } from '../theme';
-import { themes } from '../constants/colors';
+import { themes } from '../lib/constants';
 
 interface IActivityIndicator extends ActivityIndicatorProps {
 	absolute?: boolean;

app/containers/AppVersion.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 
-import { themes } from '../constants/colors';
+import { themes } from '../lib/constants';
 import sharedStyles from '../views/Styles';
 import { getReadableVersion } from '../utils/deviceInfo';
 import I18n from '../i18n';

app/containers/BackgroundContainer/index.tsx

@@ -3,7 +3,7 @@ import { ActivityIndicator, ImageBackground, StyleSheet, Text, View } from 'reac
 
 import { useTheme } from '../../theme';
 import sharedStyles from '../../views/Styles';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 
 interface IBackgroundContainer {
 	text?: string;

app/containers/Button/index.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { StyleSheet, Text } from 'react-native';
 import Touchable from 'react-native-platform-touchable';
 
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import sharedStyles from '../../views/Styles';
 import ActivityIndicator from '../ActivityIndicator';
 

app/containers/Check.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { StyleSheet } from 'react-native';
 
 import { CustomIcon } from '../lib/Icons';
-import { themes } from '../constants/colors';
+import { themes } from '../lib/constants';
 import { useTheme } from '../theme';
 
 const styles = StyleSheet.create({

app/containers/EmojiPicker/TabBar.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Text, TouchableOpacity, View } from 'react-native';
 
 import styles from './styles';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 
 interface ITabBarProps {
 	goToPage: Function;

app/containers/EmojiPicker/index.tsx

@@ -15,7 +15,7 @@ import { emojisByCategory } from '../../emojis';
 import protectedFunction from '../../lib/methods/helpers/protectedFunction';
 import shortnameToUnicode from '../../utils/shortnameToUnicode';
 import log from '../../utils/log';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { withTheme } from '../../theme';
 import { IEmoji } from '../../definitions/IEmoji';
 

app/containers/FormContainer.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { ScrollView, ScrollViewProps, StyleSheet, View } from 'react-native';
 
-import { themes } from '../constants/colors';
+import { themes } from '../lib/constants';
 import sharedStyles from '../views/Styles';
 import scrollPersistTaps from '../utils/scrollPersistTaps';
 import KeyboardView from '../presentation/KeyboardView';

app/containers/Header/index.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { StyleSheet, View } from 'react-native';
 
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { themedHeader } from '../../utils/navigation';
 import { isIOS, isTablet } from '../../utils/deviceInfo';
 import { useTheme } from '../../theme';

app/containers/HeaderButton/HeaderButtonItem.tsx

@@ -4,7 +4,7 @@ import Touchable from 'react-native-platform-touchable';
 
 import { CustomIcon } from '../../lib/Icons';
 import { useTheme } from '../../theme';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import sharedStyles from '../../views/Styles';
 
 interface IHeaderButtonItem {

app/containers/InAppNotification/NotifierComponent.tsx

@@ -8,11 +8,11 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import Avatar from '../Avatar';
 import { CustomIcon } from '../../lib/Icons';
 import sharedStyles from '../../views/Styles';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { useTheme } from '../../theme';
 import { ROW_HEIGHT } from '../../presentation/RoomItem';
 import { goRoom } from '../../utils/goRoom';
-import Navigation from '../../lib/Navigation';
+import Navigation from '../../lib/navigation/appNavigation';
 import { useOrientation } from '../../dimensions';
 import { IApplicationState, ISubscription, SubscriptionType } from '../../definitions';
 

app/containers/InAppNotification/index.tsx

@@ -5,7 +5,7 @@ import { dequal } from 'dequal';
 
 import NotifierComponent, { INotifierComponent } from './NotifierComponent';
 import EventEmitter from '../../utils/events';
-import Navigation from '../../lib/Navigation';
+import Navigation from '../../lib/navigation/appNavigation';
 import { getActiveRoute } from '../../utils/navigation';
 import { IApplicationState } from '../../definitions';
 import { IRoom } from '../../reducers/room';

app/containers/List/ListHeader.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 
 import sharedStyles from '../../views/Styles';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import I18n from '../../i18n';
 import { useTheme } from '../../theme';
 import { PADDING_HORIZONTAL } from './constants';

app/containers/List/ListIcon.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
 
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { CustomIcon } from '../../lib/Icons';
 import { useTheme } from '../../theme';
 import { ICON_SIZE } from './constants';

app/containers/List/ListInfo.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 
 import sharedStyles from '../../views/Styles';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { useTheme } from '../../theme';
 import { PADDING_HORIZONTAL } from './constants';
 import I18n from '../../i18n';

app/containers/List/ListItem.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { I18nManager, StyleSheet, Text, View } from 'react-native';
 
 import Touch from '../../utils/touch';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import sharedStyles from '../../views/Styles';
 import { useTheme } from '../../theme';
 import I18n from '../../i18n';

app/containers/List/ListSeparator.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { StyleSheet, View, ViewStyle } from 'react-native';
 
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { useTheme } from '../../theme';
 
 const styles = StyleSheet.create({

app/containers/Loading.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Animated, Modal, StyleSheet, View } from 'react-native';
 
 import { withTheme } from '../theme';
-import { themes } from '../constants/colors';
+import { themes } from '../lib/constants';
 
 const styles = StyleSheet.create({
 	container: {

app/containers/LoginServices.tsx

@@ -7,7 +7,7 @@ import { StackNavigationProp } from '@react-navigation/stack';
 
 import { withTheme } from '../theme';
 import sharedStyles from '../views/Styles';
-import { themes } from '../constants/colors';
+import { themes } from '../lib/constants';
 import Button from './Button';
 import OrSeparator from './OrSeparator';
 import Touch from '../utils/touch';

app/containers/MessageActions/Header.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { FlatList, StyleSheet, Text, View } from 'react-native';
 
 import { useTheme } from '../../theme';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { CustomIcon } from '../../lib/Icons';
 import shortnameToUnicode from '../../utils/shortnameToUnicode';
 import CustomEmoji from '../EmojiPicker/CustomEmoji';

app/containers/MessageActions/index.tsx

@@ -8,7 +8,7 @@ import RocketChat from '../../lib/rocketchat';
 import database from '../../lib/database';
 import I18n from '../../i18n';
 import log, { logEvent } from '../../utils/log';
-import Navigation from '../../lib/Navigation';
+import Navigation from '../../lib/navigation/appNavigation';
 import { getMessageTranslation } from '../message/utils';
 import { LISTENER } from '../Toast';
 import EventEmitter from '../../utils/events';

app/containers/MessageBox/CommandsPreview/Item.tsx

@@ -2,7 +2,7 @@ import FastImage from '@rocket.chat/react-native-fast-image';
 import React, { useContext, useState } from 'react';
 import { TouchableOpacity } from 'react-native';
 
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import { CustomIcon } from '../../../lib/Icons';
 import { useTheme } from '../../../theme';
 import ActivityIndicator from '../../ActivityIndicator';

app/containers/MessageBox/CommandsPreview/index.tsx

@@ -2,7 +2,7 @@ import { dequal } from 'dequal';
 import React from 'react';
 import { FlatList } from 'react-native';
 
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import { IPreviewItem } from '../../../definitions';
 import { useTheme } from '../../../theme';
 import styles from '../styles';

app/containers/MessageBox/EmojiKeyboard.tsx

@@ -2,10 +2,10 @@ import React from 'react';
 import { View } from 'react-native';
 import { KeyboardRegistry } from 'react-native-ui-lib/keyboard';
 
-import { store } from '../../lib/auxStore';
+import { store } from '../../lib/store/auxStore';
 import EmojiPicker from '../EmojiPicker';
 import styles from './styles';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { withTheme } from '../../theme';
 import { IEmoji } from '../../definitions/IEmoji';
 

app/containers/MessageBox/Mentions/FixedMentionItem.tsx

@@ -3,7 +3,7 @@ import { Text, TouchableOpacity } from 'react-native';
 
 import styles from '../styles';
 import I18n from '../../../i18n';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import { useTheme } from '../../../theme';
 
 interface IMessageBoxFixedMentionItem {

app/containers/MessageBox/Mentions/MentionHeaderList.tsx

@@ -1,14 +1,14 @@
 import React, { useContext } from 'react';
 import { ActivityIndicator, Text, TouchableOpacity, View } from 'react-native';
 
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import I18n from '../../../i18n';
 import { CustomIcon } from '../../../lib/Icons';
 import { useTheme } from '../../../theme';
 import sharedStyles from '../../../views/Styles';
-import { MENTIONS_TRACKING_TYPE_CANNED } from '../constants';
 import MessageboxContext from '../Context';
 import styles from '../styles';
+import { MENTIONS_TRACKING_TYPE_CANNED } from '../constants';
 
 interface IMentionHeaderList {
 	trackingType: string;

app/containers/MessageBox/Mentions/MentionItem.tsx

@@ -1,7 +1,7 @@
 import React, { useContext } from 'react';
 import { Text, TouchableOpacity } from 'react-native';
 
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import { IEmoji } from '../../../definitions/IEmoji';
 import { useTheme } from '../../../theme';
 import Avatar from '../../Avatar';

app/containers/MessageBox/Mentions/index.tsx

@@ -5,7 +5,7 @@ import { dequal } from 'dequal';
 import MentionHeaderList from './MentionHeaderList';
 import styles from '../styles';
 import MentionItem from './MentionItem';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import { useTheme } from '../../../theme';
 
 interface IMessageBoxMentions {

app/containers/MessageBox/RecordAudio.tsx

@@ -7,7 +7,7 @@ import { activateKeepAwake, deactivateKeepAwake } from 'expo-keep-awake';
 
 import styles from './styles';
 import I18n from '../../i18n';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { CustomIcon } from '../../lib/Icons';
 import { events, logEvent } from '../../utils/log';
 

app/containers/MessageBox/ReplyPreview.tsx

@@ -6,7 +6,7 @@ import { connect } from 'react-redux';
 import { MarkdownPreview } from '../markdown';
 import { CustomIcon } from '../../lib/Icons';
 import sharedStyles from '../../views/Styles';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { IMessage } from '../../definitions/IMessage';
 import { useTheme } from '../../theme';
 import { IApplicationState } from '../../definitions';

app/containers/MessageBox/buttons/BaseButton.tsx

@@ -5,7 +5,7 @@ import styles from '../styles';
 import i18n from '../../../i18n';
 import { CustomIcon } from '../../../lib/Icons';
 import { useTheme } from '../../../theme';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 
 interface IBaseButton {
 	onPress(): void;

app/containers/MessageBox/buttons/SendButton.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import { useTheme } from '../../../theme';
 import BaseButton from './BaseButton';
 

app/containers/MessageBox/index.tsx

@@ -20,7 +20,7 @@ import RecordAudio from './RecordAudio';
 import I18n from '../../i18n';
 import ReplyPreview from './ReplyPreview';
 import debounce from '../../utils/debounce';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 // @ts-ignore
 // eslint-disable-next-line import/extensions,import/no-unresolved
 import LeftButtons from './LeftButtons';
@@ -44,7 +44,7 @@ import {
 } from './constants';
 import CommandsPreview from './CommandsPreview';
 import { getUserSelector } from '../../selectors/login';
-import Navigation from '../../lib/Navigation';
+import Navigation from '../../lib/navigation/appNavigation';
 import { withActionSheet } from '../ActionSheet';
 import { sanitizeLikeString } from '../../lib/database/utils';
 import { CustomIcon } from '../../lib/Icons';

app/containers/OrSeparator.tsx

@@ -3,7 +3,7 @@ import { StyleSheet, Text, View } from 'react-native';
 
 import I18n from '../i18n';
 import sharedStyles from '../views/Styles';
-import { themes } from '../constants/colors';
+import { themes } from '../lib/constants';
 
 const styles = StyleSheet.create({
 	container: {

app/containers/Passcode/Base/Button.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Text } from 'react-native';
 
 import styles from './styles';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import Touch from '../../../utils/touch';
 import { CustomIcon } from '../../../lib/Icons';
 import { useTheme } from '../../../theme';

app/containers/Passcode/Base/Dots.tsx

@@ -3,7 +3,7 @@ import { View } from 'react-native';
 import range from 'lodash/range';
 
 import styles from './styles';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import { useTheme } from '../../../theme';
 
 const SIZE_EMPTY = 12;

app/containers/Passcode/Base/LockIcon.tsx

@@ -3,7 +3,7 @@ import { View } from 'react-native';
 import { Row } from 'react-native-easy-grid';
 
 import styles from './styles';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import { CustomIcon } from '../../../lib/Icons';
 import { useTheme } from '../../../theme';
 

app/containers/Passcode/Base/Locked.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { Grid } from 'react-native-easy-grid';
 
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import { resetAttempts } from '../../../utils/localAuthentication';
 import { TYPE } from '../constants';
 import { getDiff, getLockedUntil } from '../utils';

app/containers/Passcode/Base/Subtitle.tsx

@@ -3,7 +3,7 @@ import { Text, View } from 'react-native';
 import { Row } from 'react-native-easy-grid';
 
 import styles from './styles';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import { useTheme } from '../../../theme';
 
 interface IPasscodeSubtitle {

app/containers/Passcode/Base/Title.tsx

@@ -3,7 +3,7 @@ import { Text, View } from 'react-native';
 import { Row } from 'react-native-easy-grid';
 
 import styles from './styles';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import { useTheme } from '../../../theme';
 
 interface IPasscodeTitle {

app/containers/Passcode/Base/index.tsx

@@ -9,8 +9,7 @@ import styles from './styles';
 import Button from './Button';
 import Dots from './Dots';
 import { TYPE } from '../constants';
-import { themes } from '../../../constants/colors';
-import { PASSCODE_LENGTH } from '../../../constants/localAuthentication';
+import { PASSCODE_LENGTH, themes } from '../../../lib/constants';
 import { useTheme } from '../../../theme';
 import LockIcon from './LockIcon';
 import Title from './Title';

app/containers/Passcode/PasscodeEnter.tsx

@@ -7,10 +7,10 @@ import { sha256 } from 'js-sha256';
 import Base, { IBase } from './Base';
 import Locked from './Base/Locked';
 import { TYPE } from './constants';
-import { ATTEMPTS_KEY, LOCKED_OUT_TIMER_KEY, MAX_ATTEMPTS, PASSCODE_KEY } from '../../constants/localAuthentication';
+import { ATTEMPTS_KEY, LOCKED_OUT_TIMER_KEY, MAX_ATTEMPTS, PASSCODE_KEY } from '../../lib/constants';
 import { biometryAuth, resetAttempts } from '../../utils/localAuthentication';
 import { getDiff, getLockedUntil } from './utils';
-import { useUserPreferences } from '../../lib/userPreferences';
+import { useUserPreferences } from '../../lib/methods/userPreferences';
 import I18n from '../../i18n';
 
 interface IPasscodePasscodeEnter {

app/containers/Passcode/utils.ts

@@ -1,7 +1,7 @@
 import AsyncStorage from '@react-native-community/async-storage';
 import moment from 'moment';
 
-import { LOCKED_OUT_TIMER_KEY, TIME_TO_LOCK } from '../../constants/localAuthentication';
+import { LOCKED_OUT_TIMER_KEY, TIME_TO_LOCK } from '../../lib/constants';
 
 export const getLockedUntil = async () => {
 	const t = await AsyncStorage.getItem(LOCKED_OUT_TIMER_KEY);

app/containers/ReactionsModal.tsx

@@ -7,7 +7,7 @@ import Emoji from './message/Emoji';
 import I18n from '../i18n';
 import { CustomIcon } from '../lib/Icons';
 import sharedStyles from '../views/Styles';
-import { themes } from '../constants/colors';
+import { themes } from '../lib/constants';
 import { useTheme, withTheme } from '../theme';
 import { TGetCustomEmoji } from '../definitions/IEmoji';
 import { TMessageModel, ILoggedUser } from '../definitions';

app/containers/RoomHeader/RoomHeader.tsx

@@ -3,7 +3,7 @@ import { StyleSheet, Text, TouchableOpacity, View } from 'react-native';
 
 import I18n from '../../i18n';
 import sharedStyles from '../../views/Styles';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { MarkdownPreview } from '../markdown';
 import RoomTypeIcon from '../RoomTypeIcon';
 import { TUserStatus } from '../../definitions';

app/containers/RoomTypeIcon.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { StyleSheet, ViewStyle } from 'react-native';
 
 import { CustomIcon } from '../lib/Icons';
-import { STATUS_COLORS, themes } from '../constants/colors';
+import { STATUS_COLORS, themes } from '../lib/constants';
 import Status from './Status/Status';
 import { withTheme } from '../theme';
 import { TUserStatus } from '../definitions';

app/containers/SafeAreaView.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { StyleSheet, ViewProps } from 'react-native';
 import { SafeAreaView as SafeAreaContext } from 'react-native-safe-area-context';
 
-import { themes } from '../constants/colors';
+import { themes } from '../lib/constants';
 import { useTheme } from '../theme';
 
 const styles = StyleSheet.create({

app/containers/SearchBox.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { StyleSheet, Text, TextInput as RNTextInput, TextInputProps, View } from 'react-native';
 import Touchable from 'react-native-platform-touchable';
 
-import { themes } from '../constants/colors';
+import { themes } from '../lib/constants';
 import I18n from '../i18n';
 import { CustomIcon } from '../lib/Icons';
 import TextInput from '../presentation/TextInput';

app/containers/SearchHeader.tsx

@@ -4,7 +4,7 @@ import { StyleSheet, View } from 'react-native';
 import I18n from '../i18n';
 import { useTheme } from '../theme';
 import sharedStyles from '../views/Styles';
-import { themes } from '../constants/colors';
+import { themes } from '../lib/constants';
 import TextInput from '../presentation/TextInput';
 import { isIOS, isTablet } from '../utils/deviceInfo';
 import { useOrientation } from '../dimensions';

app/containers/ServerItem/index.tsx

@@ -0,0 +1,64 @@
+import React from 'react';
+// @ts-ignore // TODO: Remove on react-native update
+import { Pressable, Text, View } from 'react-native';
+import FastImage from '@rocket.chat/react-native-fast-image';
+
+import { IServerInfo } from '../../definitions';
+import Check from '../Check';
+import styles, { ROW_HEIGHT } from './styles';
+import { themes } from '../../lib/constants';
+import { isIOS } from '../../utils/deviceInfo';
+import { useTheme } from '../../theme';
+
+export { ROW_HEIGHT };
+
+interface IServerItem {
+	item: IServerInfo;
+	onPress(): void;
+	onLongPress?(): void;
+	hasCheck?: boolean;
+}
+
+const defaultLogo = require('../../static/images/logo.png');
+
+const ServerItem = React.memo(({ item, onPress, onLongPress, hasCheck }: IServerItem) => {
+	const { theme } = useTheme();
+	return (
+		<Pressable
+			onPress={onPress}
+			onLongPress={() => onLongPress?.()}
+			testID={`rooms-list-header-server-${item.id}`}
+			android_ripple={{ color: themes[theme].bannerBackground }}
+			style={({ pressed }: { pressed: boolean }) => ({
+				backgroundColor: isIOS && pressed ? themes[theme].bannerBackground : themes[theme].backgroundColor
+			})}>
+			<View style={styles.serverItemContainer}>
+				{item.iconURL ? (
+					<FastImage
+						source={{
+							uri: item.iconURL,
+							priority: FastImage.priority.high
+						}}
+						// @ts-ignore TODO: Remove when updating FastImage
+						defaultSource={defaultLogo}
+						style={styles.serverIcon}
+						onError={() => console.log('err_loading_server_icon')}
+					/>
+				) : (
+					<FastImage source={defaultLogo} style={styles.serverIcon} />
+				)}
+				<View style={styles.serverTextContainer}>
+					<Text numberOfLines={1} style={[styles.serverName, { color: themes[theme].titleText }]}>
+						{item.name || item.id}
+					</Text>
+					<Text numberOfLines={1} style={[styles.serverUrl, { color: themes[theme].auxiliaryText }]}>
+						{item.id}
+					</Text>
+				</View>
+				{hasCheck ? <Check /> : null}
+			</View>
+		</Pressable>
+	);
+});
+
+export default ServerItem;

app/containers/Status/Status.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { StyleProp, TextStyle } from 'react-native';
 
 import { CustomIcon } from '../../lib/Icons';
-import { STATUS_COLORS } from '../../constants/colors';
+import { STATUS_COLORS } from '../../lib/constants';
 import { IStatus } from './definition';
 
 const Status = React.memo(({ style, status = 'offline', size = 32, ...props }: Omit<IStatus, 'id'>) => {

app/containers/StatusBar.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { StatusBar as StatusBarRN } from 'react-native';
 
-import { themes } from '../constants/colors';
+import { themes } from '../lib/constants';
 import { useTheme } from '../theme';
 
 const supportedStyles = {

app/containers/TextInput.tsx

@@ -4,7 +4,7 @@ import Touchable from 'react-native-platform-touchable';
 
 import sharedStyles from '../views/Styles';
 import TextInput from '../presentation/TextInput';
-import { themes } from '../constants/colors';
+import { themes } from '../lib/constants';
 import { CustomIcon } from '../lib/Icons';
 import ActivityIndicator from './ActivityIndicator';
 

app/containers/ThreadDetails.tsx

@@ -3,7 +3,7 @@ import { StyleSheet, Text, View, ViewStyle } from 'react-native';
 import Touchable from 'react-native-platform-touchable';
 
 import { CustomIcon } from '../lib/Icons';
-import { themes } from '../constants/colors';
+import { themes } from '../lib/constants';
 import sharedStyles from '../views/Styles';
 import { useTheme } from '../theme';
 import { TThreadModel } from '../definitions/IThread';

app/containers/Toast.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { StyleSheet } from 'react-native';
 import EasyToast from 'react-native-easy-toast';
 
-import { themes } from '../constants/colors';
+import { themes } from '../lib/constants';
 import sharedStyles from '../views/Styles';
 import EventEmitter from '../utils/events';
 import { withTheme } from '../theme';

app/containers/TwoFactor/index.tsx

@@ -10,7 +10,7 @@ import TextInput from '../TextInput';
 import I18n from '../../i18n';
 import EventEmitter from '../../utils/events';
 import { useTheme } from '../../theme';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import Button from '../Button';
 import sharedStyles from '../../views/Styles';
 import RocketChat from '../../lib/rocketchat';

app/containers/UIKit/DatePicker.tsx

@@ -7,7 +7,7 @@ import moment from 'moment';
 
 import Button from '../Button';
 import { textParser } from './utils';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import sharedStyles from '../../views/Styles';
 import { CustomIcon } from '../../lib/Icons';
 import { isAndroid } from '../../utils/deviceInfo';

app/containers/UIKit/Image.tsx

@@ -4,7 +4,7 @@ import FastImage from '@rocket.chat/react-native-fast-image';
 import { BLOCK_CONTEXT } from '@rocket.chat/ui-kit';
 
 import ImageContainer from '../message/Image';
-import Navigation from '../../lib/Navigation';
+import Navigation from '../../lib/navigation/appNavigation';
 import { IThumb, IImage, IElement } from './interfaces';
 import { IAttachment } from '../../definitions';
 

app/containers/UIKit/Input.tsx

@@ -3,7 +3,7 @@ import { StyleSheet, Text, View } from 'react-native';
 import { BLOCK_CONTEXT } from '@rocket.chat/ui-kit';
 
 import sharedStyles from '../../views/Styles';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { IInput } from './interfaces';
 
 const styles = StyleSheet.create({

app/containers/UIKit/MultiSelect/Chips.tsx

@@ -3,7 +3,7 @@ import { Text, View } from 'react-native';
 import Touchable from 'react-native-platform-touchable';
 import FastImage from '@rocket.chat/react-native-fast-image';
 
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import { textParser } from '../utils';
 import { CustomIcon } from '../../../lib/Icons';
 import styles from './styles';

app/containers/UIKit/MultiSelect/Input.tsx

@@ -3,7 +3,7 @@ import { Text, View } from 'react-native';
 import Touchable from 'react-native-platform-touchable';
 
 import { CustomIcon } from '../../../lib/Icons';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import ActivityIndicator from '../../ActivityIndicator';
 import styles from './styles';
 

app/containers/UIKit/MultiSelect/Items.tsx

@@ -6,7 +6,7 @@ import FastImage from '@rocket.chat/react-native-fast-image';
 import Check from '../../Check';
 import * as List from '../../List';
 import { textParser } from '../utils';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import styles from './styles';
 import { IItemData } from '.';
 

app/containers/UIKit/MultiSelect/index.tsx

@@ -15,7 +15,7 @@ import { BLOCK_CONTEXT } from '@rocket.chat/ui-kit';
 import Button from '../../Button';
 import TextInput from '../../TextInput';
 import { textParser } from '../utils';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import I18n from '../../../i18n';
 import { isIOS } from '../../../utils/deviceInfo';
 import { useTheme } from '../../../theme';

app/containers/UIKit/Overflow.tsx

@@ -5,7 +5,7 @@ import Touchable from 'react-native-platform-touchable';
 
 import { CustomIcon } from '../../lib/Icons';
 import ActivityIndicator from '../ActivityIndicator';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { useTheme } from '../../theme';
 import { BUTTON_HIT_SLOP } from '../message/utils';
 import * as List from '../List';

app/containers/UIKit/Section.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 import { BLOCK_CONTEXT } from '@rocket.chat/ui-kit';
 
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { IAccessoryComponent, IFields, ISection } from './interfaces';
 import { useTheme } from '../../theme';
 

app/containers/UIKit/Select.tsx

@@ -3,7 +3,7 @@ import { StyleSheet } from 'react-native';
 import RNPickerSelect from 'react-native-picker-select';
 
 import sharedStyles from '../../views/Styles';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { CustomIcon } from '../../lib/Icons';
 import { textParser } from './utils';
 import { isAndroid, isIOS } from '../../utils/deviceInfo';

app/containers/UIKit/index.tsx

@@ -7,7 +7,7 @@ import Markdown, { MarkdownPreview } from '../markdown';
 import Button from '../Button';
 import TextInput from '../TextInput';
 import { textParser, useBlockContext } from './utils';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import sharedStyles from '../../views/Styles';
 import { Divider } from './Divider';
 import { Section } from './Section';

app/containers/markdown/AtMention.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { StyleProp, Text, TextStyle } from 'react-native';
 
 import { useTheme } from '../../theme';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import styles from './styles';
 import { events, logEvent } from '../../utils/log';
 import { IUserMention } from './interfaces';

app/containers/markdown/BlockQuote.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { View } from 'react-native';
 
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import styles from './styles';
 
 interface IBlockQuote {

app/containers/markdown/Emoji.tsx

@@ -3,7 +3,7 @@ import { Text } from 'react-native';
 
 import shortnameToUnicode from '../../utils/shortnameToUnicode';
 import CustomEmoji from '../EmojiPicker/CustomEmoji';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import styles from './styles';
 
 interface IEmoji {

app/containers/markdown/Hashtag.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { StyleProp, Text, TextStyle } from 'react-native';
 
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { useTheme } from '../../theme';
 import { IUserChannel } from './interfaces';
 import styles from './styles';

app/containers/markdown/Link.tsx

@@ -3,7 +3,7 @@ import { Text } from 'react-native';
 import Clipboard from '@react-native-clipboard/clipboard';
 
 import styles from './styles';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { LISTENER } from '../Toast';
 import EventEmitter from '../../utils/events';
 import I18n from '../../i18n';

app/containers/markdown/ListItem.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 
 const style = StyleSheet.create({
 	container: {

app/containers/markdown/Preview.tsx

@@ -3,7 +3,7 @@ import { Text, TextStyle } from 'react-native';
 import removeMarkdown from 'remove-markdown';
 
 import shortnameToUnicode from '../../utils/shortnameToUnicode';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import { formatText } from './formatText';
 import { useTheme } from '../../theme';
 import styles from './styles';

app/containers/markdown/Table.tsx

@@ -3,9 +3,9 @@ import { ScrollView, Text, TouchableOpacity, View, ViewStyle } from 'react-nativ
 
 import { CELL_WIDTH } from './TableCell';
 import styles from './styles';
-import Navigation from '../../lib/Navigation';
+import Navigation from '../../lib/navigation/appNavigation';
 import I18n from '../../i18n';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 
 interface ITable {
 	children: React.ReactElement | null;

app/containers/markdown/TableCell.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Text, View, ViewStyle } from 'react-native';
 
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import styles from './styles';
 
 interface ITableCell {

app/containers/markdown/TableRow.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { View, ViewStyle } from 'react-native';
 
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 import styles from './styles';
 
 interface ITableRow {

app/containers/markdown/index.tsx

@@ -5,7 +5,6 @@ import Renderer from 'commonmark-react-renderer';
 import { MarkdownAST } from '@rocket.chat/message-parser';
 
 import I18n from '../../i18n';
-import { themes } from '../../constants/colors';
 import MarkdownLink from './Link';
 import MarkdownList from './List';
 import MarkdownListItem from './ListItem';
@@ -24,6 +23,7 @@ import { formatText } from './formatText';
 import { IUserMention, IUserChannel, TOnLinkPress } from './interfaces';
 import { TGetCustomEmoji } from '../../definitions/IEmoji';
 import { formatHyperlink } from './formatHyperlink';
+import { themes } from '../../lib/constants';
 
 export { default as MarkdownPreview } from './Preview';
 

app/containers/markdown/new/Code.tsx

@@ -3,7 +3,7 @@ import { Text } from 'react-native';
 import { Code as CodeProps } from '@rocket.chat/message-parser';
 
 import styles from '../styles';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import { useTheme } from '../../../theme';
 import CodeLine from './CodeLine';
 

app/containers/markdown/new/Emoji.tsx

@@ -3,7 +3,7 @@ import { Text } from 'react-native';
 import { Emoji as EmojiProps } from '@rocket.chat/message-parser';
 
 import shortnameToUnicode from '../../../utils/shortnameToUnicode';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import { useTheme } from '../../../theme';
 import styles from '../styles';
 import CustomEmoji from '../../EmojiPicker/CustomEmoji';

app/containers/markdown/new/Heading.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Text } from 'react-native';
 import { Heading as HeadingProps } from '@rocket.chat/message-parser';
 
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import styles from '../styles';
 import { useTheme } from '../../../theme';
 

app/containers/markdown/new/Image.tsx

@@ -5,7 +5,7 @@ import * as Progress from 'react-native-progress';
 import FastImage from '@rocket.chat/react-native-fast-image';
 
 import { useTheme } from '../../../theme';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import styles from '../../message/styles';
 
 interface IImageProps {

app/containers/markdown/new/InlineCode.tsx

@@ -3,7 +3,7 @@ import { Text } from 'react-native';
 import { InlineCode as InlineCodeProps } from '@rocket.chat/message-parser';
 
 import styles from '../styles';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import { useTheme } from '../../../theme';
 
 interface IInlineCodeProps {

app/containers/markdown/new/Link.tsx

@@ -9,7 +9,7 @@ import { LISTENER } from '../../Toast';
 import { useTheme } from '../../../theme';
 import openLink from '../../../utils/openLink';
 import EventEmitter from '../../../utils/events';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import Strike from './Strike';
 import Italic from './Italic';
 import Bold from './Bold';

app/containers/markdown/new/OrderedList.tsx

@@ -4,7 +4,7 @@ import { OrderedList as OrderedListProps } from '@rocket.chat/message-parser';
 
 import Inline from './Inline';
 import styles from '../styles';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import { useTheme } from '../../../theme';
 
 interface IOrderedListProps {

app/containers/markdown/new/Paragraph.tsx

@@ -5,7 +5,7 @@ import { Paragraph as ParagraphProps } from '@rocket.chat/message-parser';
 import Inline from './Inline';
 import styles from '../styles';
 import { useTheme } from '../../../theme';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 
 interface IParagraphProps {
 	value: ParagraphProps['value'];

app/containers/markdown/new/Plain.tsx

@@ -4,7 +4,7 @@ import { Plain as PlainProps } from '@rocket.chat/message-parser';
 
 import styles from '../styles';
 import { useTheme } from '../../../theme';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 
 interface IPlainProps {
 	value: PlainProps['value'];

app/containers/markdown/new/Quote.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { View } from 'react-native';
 import { Quote as QuoteProps } from '@rocket.chat/message-parser';
 
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import { useTheme } from '../../../theme';
 import styles from '../styles';
 import Paragraph from './Paragraph';

app/containers/markdown/new/TaskList.tsx

@@ -4,7 +4,7 @@ import { Tasks as TasksProps } from '@rocket.chat/message-parser';
 
 import Inline from './Inline';
 import styles from '../styles';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import { useTheme } from '../../../theme';
 
 interface ITasksProps {

app/containers/markdown/new/UnorderedList.tsx

@@ -4,7 +4,7 @@ import { View, Text } from 'react-native';
 
 import Inline from './Inline';
 import styles from '../styles';
-import { themes } from '../../../constants/colors';
+import { themes } from '../../../lib/constants';
 import { useTheme } from '../../../theme';
 
 interface IUnorderedListProps {

app/containers/message/Attachments.tsx

@@ -14,7 +14,7 @@ import { useTheme } from '../../theme';
 import { IAttachment } from '../../definitions';
 import CollapsibleQuote from './Components/CollapsibleQuote';
 import openLink from '../../utils/openLink';
-import { themes } from '../../constants/colors';
+import { themes } from '../../lib/constants';
 
 export type TElement = {
 	type: string;