From 3807fb0efd395cf8ad5f670512f3fe25bec6e4ec Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Tue, 22 Mar 2022 14:30:44 -0300
Subject: [PATCH] constants

---
 app/constants/screens.ts | 23 ++++++++++++++++-------
 app/utils/theme/index.ts | 17 +----------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/app/constants/screens.ts b/app/constants/screens.ts
index db43ef32d..22dd7d37a 100644
--- a/app/constants/screens.ts
+++ b/app/constants/screens.ts
@@ -3,7 +3,7 @@
 
 export const ABOUT = 'About';
 export const ACCOUNT = 'Account';
-export const EMOJI_PICKER = 'AddReaction';
+export const EMOJI_PICKER = 'EmojiPicker';
 export const APP_FORM = 'AppForm';
 export const BOTTOM_SHEET = 'BottomSheet';
 export const BROWSE_CHANNELS = 'BrowseChannels';
@@ -11,6 +11,7 @@ export const CHANNEL = 'Channel';
 export const CHANNEL_ADD_PEOPLE = 'ChannelAddPeople';
 export const CHANNEL_DETAILS = 'ChannelDetails';
 export const CHANNEL_EDIT = 'ChannelEdit';
+export const CREATE_DIRECT_MESSAGE = 'CreateDirectMessage';
 export const CUSTOM_STATUS_CLEAR_AFTER = 'CustomStatusClearAfter';
 export const CUSTOM_STATUS = 'CustomStatus';
 export const EDIT_POST = 'EditPost';
@@ -24,16 +25,16 @@ export const IN_APP_NOTIFICATION = 'InAppNotification';
 export const LOGIN = 'Login';
 export const MENTIONS = 'Mentions';
 export const MFA = 'MFA';
-export const CREATE_DIRECT_MESSAGE = 'CreateDirectMessage';
 export const PERMALINK = 'Permalink';
+export const POST_OPTIONS = 'PostOptions';
+export const REACTIONS = 'Reactions';
+export const SAVED_POSTS = 'SavedPosts';
 export const SEARCH = 'Search';
 export const SERVER = 'Server';
 export const SETTINGS_SIDEBAR = 'SettingsSidebar';
 export const SSO = 'SSO';
 export const THREAD = 'Thread';
 export const USER_PROFILE = 'UserProfile';
-export const POST_OPTIONS = 'PostOptions';
-export const SAVED_POSTS = 'SavedPosts';
 
 export default {
     ABOUT,
@@ -46,6 +47,7 @@ export default {
     CHANNEL_ADD_PEOPLE,
     CHANNEL_EDIT,
     CHANNEL_DETAILS,
+    CREATE_DIRECT_MESSAGE,
     CUSTOM_STATUS_CLEAR_AFTER,
     CUSTOM_STATUS,
     EDIT_POST,
@@ -59,14 +61,21 @@ export default {
     LOGIN,
     MENTIONS,
     MFA,
-    CREATE_DIRECT_MESSAGE,
     PERMALINK,
+    POST_OPTIONS,
+    REACTIONS,
+    SAVED_POSTS,
     SEARCH,
     SERVER,
     SETTINGS_SIDEBAR,
     SSO,
     THREAD,
     USER_PROFILE,
-    POST_OPTIONS,
-    SAVED_POSTS,
 };
+
+export const MODAL_SCREENS_WITHOUT_BACK = [
+    CREATE_DIRECT_MESSAGE,
+    EMOJI_PICKER,
+    EDIT_POST,
+    PERMALINK,
+];
diff --git a/app/utils/theme/index.ts b/app/utils/theme/index.ts
index 4bdfdadc5..1af040555 100644
--- a/app/utils/theme/index.ts
+++ b/app/utils/theme/index.ts
@@ -6,27 +6,12 @@ import {StatusBar, StyleSheet} from 'react-native';
 import tinyColor from 'tinycolor2';
 
 import {Preferences} from '@constants';
+import {MODAL_SCREENS_WITHOUT_BACK} from '@constants/screens';
 import {appearanceControlledScreens, mergeNavigationOptions} from '@screens/navigation';
 import EphemeralStore from '@store/ephemeral_store';
 
 import type {Options} from 'react-native-navigation';
 
-const MODAL_SCREENS_WITHOUT_BACK = [
-    'AddReaction',
-    'ChannelInfo',
-    'ClientUpgrade',
-    'CreateChannel',
-    'EditPost',
-    'ErrorTeamsList',
-    'MoreChannels',
-    'MoreDirectMessages',
-    'Permalink',
-    'SelectTeam',
-    'Settings',
-    'TermsOfService',
-    'UserProfile',
-];
-
 const rgbPattern = /^rgba?\((\d+),(\d+),(\d+)(?:,([\d.]+))?\)$/;
 
 export function getComponents(inColor: string): {red: number; green: number; blue: number; alpha: number} {