Replace getTheme selector with one from mattermost-redux (#1013)

app/components/at_mention/index.js

@@ -5,7 +5,7 @@ import {connect} from 'react-redux';
 
 import {getUsersByUsername} from 'mattermost-redux/selectors/entities/users';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import AtMention from './at_mention';
 

app/components/autocomplete/at_mention/index.js

@@ -14,7 +14,7 @@ import {
     filterMembersInCurrentTeam,
     getMatchTermForAtMention
 } from 'app/selectors/autocomplete';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import AtMention from './at_mention';
 

app/components/autocomplete/at_mention_item/index.js

@@ -5,7 +5,7 @@ import {connect} from 'react-redux';
 
 import {getUser} from 'mattermost-redux/selectors/entities/users';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import AtMentionItem from './at_mention_item';
 

app/components/autocomplete/channel_mention/index.js

@@ -15,7 +15,7 @@ import {
     filterPrivateChannels,
     getMatchTermForChannelMention
 } from 'app/selectors/autocomplete';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import ChannelMention from './channel_mention';
 

app/components/autocomplete/channel_mention_item/index.js

@@ -5,7 +5,7 @@ import {connect} from 'react-redux';
 
 import {getChannel} from 'mattermost-redux/selectors/entities/channels';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import ChannelMentionItem from './channel_mention_item';
 

app/components/autocomplete/emoji_suggestion/index.js

@@ -8,7 +8,7 @@ import {bindActionCreators} from 'redux';
 import {getCustomEmojisByName} from 'mattermost-redux/selectors/entities/emojis';
 
 import {addReactionToLatestPost} from 'app/actions/views/emoji';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {EmojiIndicesByAlias} from 'app/utils/emojis';
 
 import EmojiSuggestion from './emoji_suggestion';

app/components/channel_drawer/channels_list/index.js

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import ChannelsList from './channels_list';
 

app/components/channel_drawer/index.js

@@ -12,7 +12,7 @@ import {getCurrentTeamId, getTeamMemberships} from 'mattermost-redux/selectors/e
 import {handleSelectChannel, setChannelDisplayName, setChannelLoading} from 'app/actions/views/channel';
 import {makeDirectChannel} from 'app/actions/views/more_dms';
 import {isLandscape, isTablet} from 'app/selectors/device';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import ChannelDrawer from './channel_drawer.js';
 

app/components/channel_drawer/teams_list/index.js

@@ -8,7 +8,7 @@ import {getCurrentUrl} from 'mattermost-redux/selectors/entities/general';
 import {getCurrentTeamId, getJoinableTeams} from 'mattermost-redux/selectors/entities/teams';
 
 import {handleTeamChange} from 'app/actions/views/select_team';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {getMySortedTeams} from 'app/selectors/teams';
 import {removeProtocol} from 'app/utils/url';
 

app/components/channel_intro/index.js

@@ -6,7 +6,7 @@ import {General, RequestStatus} from 'mattermost-redux/constants';
 import {getCurrentChannel} from 'mattermost-redux/selectors/entities/channels';
 import {getCurrentUser, getProfilesInCurrentChannel} from 'mattermost-redux/selectors/entities/users';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import ChannelIntro from './channel_intro';
 

app/components/channel_loader/index.js

@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 import {connect} from 'react-redux';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import ChannelLoader from './channel_loader';
 

app/components/custom_list/channel_list_row/index.js

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import {makeGetChannel} from 'mattermost-redux/selectors/entities/channels';
 

app/components/custom_list/user_list_row/index.js

@@ -3,9 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {getTheme} from 'app/selectors/preferences';
-
-import {getTeammateNameDisplaySetting} from 'mattermost-redux/selectors/entities/preferences';
+import {getTeammateNameDisplaySetting, getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {getUser} from 'mattermost-redux/selectors/entities/users';
 
 import UserListRow from './user_list_row';

app/components/emoji_picker/index.js

@@ -7,7 +7,7 @@ import {createSelector} from 'reselect';
 import {getCustomEmojisByName} from 'mattermost-redux/selectors/entities/emojis';
 
 import {getDimensions} from 'app/selectors/device';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {CategoryNames, Emojis, EmojiIndicesByCategory} from 'app/utils/emojis';
 
 import EmojiPicker from './emoji_picker';

app/components/error_text.js

@@ -7,7 +7,7 @@ import PropTypes from 'prop-types';
 import {Text} from 'react-native';
 
 import FormattedText from 'app/components/formatted_text';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {GlobalStyles} from 'app/styles';
 import {makeStyleSheetFromTheme} from 'app/utils/theme';
 

app/components/file_attachment_list/index.js

@@ -7,7 +7,7 @@ import {connect} from 'react-redux';
 import {makeGetFilesForPost} from 'mattermost-redux/selectors/entities/files';
 import {loadFilesForPostIfNecessary} from 'app/actions/views/channel';
 import {addFileToFetchCache} from 'app/actions/views/file_preview';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import FileAttachmentList from './file_attachment_list';
 

app/components/file_upload_preview/index.js

@@ -8,7 +8,7 @@ import {createSelector} from 'reselect';
 import {handleRemoveFile, retryFileUpload} from 'app/actions/views/file_upload';
 import {addFileToFetchCache} from 'app/actions/views/file_preview';
 import {getDimensions} from 'app/selectors/device';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import FileUploadPreview from './file_upload_preview';
 

app/components/markdown/markdown_code_block/index.js

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import MarkdownCodeBlock from './markdown_code_block';
 

app/components/post/index.js

@@ -8,7 +8,7 @@ import {addReaction, createPost, deletePost, removePost} from 'mattermost-redux/
 import {getPost} from 'mattermost-redux/selectors/entities/posts';
 import {getCurrentUserId, getCurrentUserRoles} from 'mattermost-redux/selectors/entities/users';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import Post from './post';
 

app/components/post_body/index.js

@@ -7,11 +7,9 @@ import {bindActionCreators} from 'redux';
 import {flagPost, unflagPost} from 'mattermost-redux/actions/posts';
 import {Posts} from 'mattermost-redux/constants';
 import {getPost} from 'mattermost-redux/selectors/entities/posts';
-import {getMyPreferences} from 'mattermost-redux/selectors/entities/preferences';
+import {getMyPreferences, getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {isPostFlagged, isPostEphemeral, isSystemMessage} from 'mattermost-redux/utils/post_utils';
 
-import {getTheme} from 'app/selectors/preferences';
-
 import PostBody from './post_body';
 
 function mapStateToProps(state, ownProps) {

app/components/post_body_additional_content/index.js

@@ -9,11 +9,10 @@ import {connect} from 'react-redux';
 import {Preferences} from 'mattermost-redux/constants';
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
 import {getOpenGraphMetadataForUrl} from 'mattermost-redux/selectors/entities/posts';
-import {getBool} from 'mattermost-redux/selectors/entities/preferences';
+import {getBool, getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import {ViewTypes} from 'app/constants';
 import {getDimensions} from 'app/selectors/device';
-import {getTheme} from 'app/selectors/preferences';
 import {extractFirstLink} from 'app/utils/url';
 
 import PostBodyAdditionalContent from './post_body_additional_content';

app/components/post_header/index.js

@@ -5,13 +5,11 @@ import {connect} from 'react-redux';
 
 import {Preferences} from 'mattermost-redux/constants';
 import {getPost, makeGetCommentCountForPost} from 'mattermost-redux/selectors/entities/posts';
-import {getBool, getTeammateNameDisplaySetting} from 'mattermost-redux/selectors/entities/preferences';
+import {getBool, getTeammateNameDisplaySetting, getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {getUser} from 'mattermost-redux/selectors/entities/users';
 import {isPostPendingOrFailed, isSystemMessage} from 'mattermost-redux/utils/post_utils';
 import {displayUsername} from 'mattermost-redux/utils/user_utils';
 
-import {getTheme} from 'app/selectors/preferences';
-
 import PostHeader from './post_header';
 
 function makeMapStateToProps() {

app/components/post_list/index.js

@@ -5,7 +5,7 @@ import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
 import {refreshChannelWithRetry} from 'app/actions/views/channel';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import PostList from './post_list';
 

app/components/post_profile_picture/index.js

@@ -6,7 +6,7 @@ import {connect} from 'react-redux';
 import {getPost} from 'mattermost-redux/selectors/entities/posts';
 import {isSystemMessage} from 'mattermost-redux/utils/post_utils';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import PostProfilePicture from './post_profile_picture';
 

app/components/post_textbox/components/typing/index.js

@@ -5,7 +5,7 @@ import {connect} from 'react-redux';
 
 import {getUsersTyping} from 'mattermost-redux/selectors/entities/typing';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import Typing from './typing';
 

app/components/post_textbox/index.js

@@ -14,7 +14,7 @@ import {addReactionToLatestPost} from 'app/actions/views/emoji';
 import {handlePostDraftChanged} from 'app/actions/views/channel';
 import {handleClearFiles, handleRemoveLastFile, handleUploadFiles} from 'app/actions/views/file_upload';
 import {handleCommentDraftChanged} from 'app/actions/views/thread';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {getCurrentChannelDraft, getThreadDraft} from 'app/selectors/views';
 
 import PostTextbox from './post_textbox';

app/components/profile_picture/index.js

@@ -4,7 +4,7 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {getStatusesByIdsBatchedDebounced} from 'mattermost-redux/actions/users';
 import {getStatusForUserId, getUser} from 'mattermost-redux/selectors/entities/users';
 

app/components/radio_button/radio_button.js

@@ -7,7 +7,7 @@ import PropTypes from 'prop-types';
 import {Animated, Text, View} from 'react-native';
 import Icon from 'react-native-vector-icons/MaterialIcons';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {makeStyleSheetFromTheme} from 'app/utils/theme';
 
 const DISABLED_OPACITY = 0.26;

app/components/reactions/index.js

@@ -8,7 +8,7 @@ import {addReaction, getReactionsForPost, removeReaction} from 'mattermost-redux
 import {makeGetReactionsForPost} from 'mattermost-redux/selectors/entities/posts';
 import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import Reactions from './reactions';
 

app/components/root/index.js

@@ -8,7 +8,7 @@ import {getCurrentChannelId} from 'mattermost-redux/selectors/entities/channels'
 import {getCurrentUrl} from 'mattermost-redux/selectors/entities/general';
 
 import {getCurrentLocale} from 'app/selectors/i18n';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {removeProtocol} from 'app/utils/url';
 
 import Root from './root';

app/components/status_bar/index.js

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import StatusBar from './status_bar';
 

app/screens/about/index.js

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import About from './about';
 

app/screens/channel/channel_drawer_button.js

@@ -15,7 +15,7 @@ import Icon from 'react-native-vector-icons/Ionicons';
 
 import Badge from 'app/components/badge';
 import PushNotifications from 'app/push_notifications';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {preventDoubleTap} from 'app/utils/tap';
 import {makeStyleSheetFromTheme} from 'app/utils/theme';
 

app/screens/channel/channel_post_list/index.js

@@ -10,7 +10,7 @@ import {makeGetPostsInChannel} from 'mattermost-redux/selectors/entities/posts';
 import {getCurrentChannelId, getMyCurrentChannelMembership, makeGetChannel} from 'mattermost-redux/selectors/entities/channels';
 import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
 import {loadPostsIfNecessaryWithRetry, loadThreadIfNecessary, increasePostVisibility, refreshChannelWithRetry} from 'app/actions/views/channel';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import ChannelPostList from './channel_post_list';
 

app/screens/channel/channel_title/index.js

@@ -5,7 +5,7 @@ import {connect} from 'react-redux';
 
 import {getCurrentChannel} from 'mattermost-redux/selectors/entities/channels';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import ChannelTitle from './channel_title';
 

app/screens/channel/index.js

@@ -18,7 +18,7 @@ import {
 } from 'app/actions/views/channel';
 import {connection} from 'app/actions/device';
 import {selectFirstAvailableTeam} from 'app/actions/views/select_team';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import Channel from './channel';
 

app/screens/channel_add_members/index.js

@@ -5,9 +5,8 @@ import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
 import {handleAddChannelMembers} from 'app/actions/views/channel_add_members';
-import {getTheme} from 'app/selectors/preferences';
 import {getCurrentChannel} from 'mattermost-redux/selectors/entities/channels';
-import {getMyPreferences} from 'mattermost-redux/selectors/entities/preferences';
+import {getMyPreferences, getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {getCurrentTeam} from 'mattermost-redux/selectors/entities/teams';
 import {getProfilesNotInCurrentChannel} from 'mattermost-redux/selectors/entities/users';
 import {getTeamStats} from 'mattermost-redux/actions/teams';

app/screens/channel_info/index.js

@@ -9,7 +9,7 @@ import {
     closeGMChannel,
     leaveChannel
 } from 'app/actions/views/channel';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import {favoriteChannel, getChannelStats, deleteChannel, unfavoriteChannel} from 'mattermost-redux/actions/channels';
 import {General} from 'mattermost-redux/constants';

app/screens/channel_members/index.js

@@ -5,7 +5,7 @@ import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
 import {handleRemoveChannelMembers} from 'app/actions/views/channel_members';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {getCurrentChannel, canManageChannelMembers} from 'mattermost-redux/selectors/entities/channels';
 import {getProfilesInCurrentChannel} from 'mattermost-redux/selectors/entities/users';
 import {getProfilesInChannel, searchProfiles} from 'mattermost-redux/actions/users';

app/screens/code/index.js

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import Code from './code';
 

app/screens/create_channel/index.js

@@ -6,7 +6,7 @@ import {connect} from 'react-redux';
 
 import {handleCreateChannel} from 'app/actions/views/create_channel';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import CreateChannel from './create_channel';
 

app/screens/edit_post/index.js

@@ -4,7 +4,7 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import {editPost} from 'mattermost-redux/actions/posts';
 

app/screens/image_preview/index.js

@@ -7,7 +7,7 @@ import {Platform} from 'react-native';
 
 import {addFileToFetchCache} from 'app/actions/views/file_preview';
 import {getDimensions, getStatusBarHeight} from 'app/selectors/device';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {canDownloadFilesOnMobile} from 'mattermost-redux/selectors/entities/general';
 import {makeGetFilesForPost} from 'mattermost-redux/selectors/entities/files';
 

app/screens/load_team/index.js

@@ -10,7 +10,7 @@ import {getCurrentTeam} from 'mattermost-redux/selectors/entities/teams';
 import {initialize} from 'app/actions/views/load_team';
 import {clearNotification, goToNotification} from 'app/actions/views/root';
 import {handleTeamChange} from 'app/actions/views/select_team';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import LoadTeam from './load_team';
 

app/screens/login/index.js

@@ -5,7 +5,7 @@ import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
 import LoginActions from 'app/actions/views/login';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import {checkMfa, login} from 'mattermost-redux/actions/users';
 

app/screens/login_options/index.js

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import LoginOptions from './login_options';
 

app/screens/more_channels/index.js

@@ -13,7 +13,7 @@ import {showCreateOption} from 'mattermost-redux/utils/channel_utils';
 import {isAdmin, isSystemAdmin} from 'mattermost-redux/utils/user_utils';
 
 import {handleSelectChannel, setChannelDisplayName} from 'app/actions/views/channel';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import MoreChannels from './more_channels';
 

app/screens/more_dms/index.js

@@ -7,12 +7,11 @@ import {createSelector} from 'reselect';
 
 import {setChannelDisplayName} from 'app/actions/views/channel';
 import {makeDirectChannel, makeGroupChannel} from 'app/actions/views/more_dms';
-import {getTheme} from 'app/selectors/preferences';
 
 import {getProfiles, getProfilesInTeam, searchProfiles} from 'mattermost-redux/actions/users';
 import {General} from 'mattermost-redux/constants';
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
-import {getTeammateNameDisplaySetting} from 'mattermost-redux/selectors/entities/preferences';
+import {getTeammateNameDisplaySetting, getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
 import {getCurrentUserId, getProfilesInCurrentTeam, getUsers} from 'mattermost-redux/selectors/entities/users';
 

app/screens/more_dms/selected_users/index.js

@@ -3,9 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {getTheme} from 'app/selectors/preferences';
-
-import {getTeammateNameDisplaySetting} from 'mattermost-redux/selectors/entities/preferences';
+import {getTeammateNameDisplaySetting, getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {getUsers} from 'mattermost-redux/selectors/entities/users';
 
 import SelectedUsers from './selected_users';

app/screens/notification/index.js

@@ -6,10 +6,9 @@ import {connect} from 'react-redux';
 
 import {goToNotification} from 'app/actions/views/root';
 import {getDimensions} from 'app/selectors/device';
-import {getTheme} from 'app/selectors/preferences';
 
 import {getChannel} from 'mattermost-redux/selectors/entities/channels';
-import {getTeammateNameDisplaySetting} from 'mattermost-redux/selectors/entities/preferences';
+import {getTeammateNameDisplaySetting, getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {getUser} from 'mattermost-redux/selectors/entities/users';
 
 import Notification from './notification';

app/screens/root/index.js

@@ -6,7 +6,7 @@ import {connect} from 'react-redux';
 
 import {loadMe} from 'mattermost-redux/actions/users';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import Root from './root';
 

app/screens/select_server/index.js

@@ -8,7 +8,7 @@ import {getPing, resetPing} from 'mattermost-redux/actions/general';
 import {RequestStatus} from 'mattermost-redux/constants';
 
 import {handleServerUrlChanged} from 'app/actions/views/select_server';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import SelectServer from './select_server';
 

app/screens/settings/advanced_settings/index.js

@@ -5,7 +5,7 @@ import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
 import {purgeOfflineStore} from 'app/actions/views/root';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import AdvancedSettings from './advanced_settings';
 

app/screens/settings/general/index.js

@@ -10,7 +10,7 @@ import {getCurrentUrl} from 'mattermost-redux/selectors/entities/general';
 import {getJoinableTeams} from 'mattermost-redux/selectors/entities/teams';
 
 import {purgeOfflineStore} from 'app/actions/views/root';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {removeProtocol} from 'app/utils/url';
 
 import Settings from './settings';

app/screens/settings/notification_settings/index.js

@@ -5,10 +5,9 @@ import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
 import {getCurrentUser} from 'mattermost-redux/selectors/entities/users';
-import {getMyPreferences} from 'mattermost-redux/selectors/entities/preferences';
+import {getMyPreferences, getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import {handleUpdateUserNotifyProps} from 'app/actions/views/account_notifications';
-import {getTheme} from 'app/selectors/preferences';
 
 import NotificationSettings from './notification_settings';
 

app/screens/settings/notification_settings_email/index.js

@@ -4,9 +4,7 @@
 import {connect} from 'react-redux';
 
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
-import {getMyPreferences} from 'mattermost-redux/selectors/entities/preferences';
-
-import {getTheme} from 'app/selectors/preferences';
+import {getMyPreferences, getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import NotificationSettingsEmail from './notification_settings_email';
 

app/screens/settings/notification_settings_mentions/index.js

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import NotificationSettingsMentions from './notification_settings_mentions';
 

app/screens/settings/notification_settings_mentions_keywords/index.js

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import NotificationSettingsMentionsKeywords from './notification_settings_mentions_keywords';
 

app/screens/settings/notification_settings_mobile/index.js

@@ -5,7 +5,7 @@ import {connect} from 'react-redux';
 
 import {getConfig} from 'mattermost-redux/selectors/entities/general';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import NotificationSettingsMobile from './notification_settings_mobile';
 

app/screens/sso/index.js

@@ -5,7 +5,7 @@ import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
 import {getSession, handleSuccessfulLogin} from 'app/actions/views/login';
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import {setStoreFromLocalData} from 'mattermost-redux/actions/general';
 

app/screens/thread/index.js

@@ -4,7 +4,7 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {getTheme} from 'app/selectors/preferences';
+import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
 
 import {selectPost} from 'mattermost-redux/actions/posts';
 import {makeGetPostsForThread} from 'mattermost-redux/selectors/entities/posts';

app/screens/user_profile/index.js

@@ -6,10 +6,9 @@ import {connect} from 'react-redux';
 
 import {setChannelDisplayName} from 'app/actions/views/channel';
 import {makeDirectChannel} from 'app/actions/views/more_dms';
-import {getTheme} from 'app/selectors/preferences';
 
 import {getCurrentChannel} from 'mattermost-redux/selectors/entities/channels';
-import {getTeammateNameDisplaySetting} from 'mattermost-redux/selectors/entities/preferences';
+import {getTeammateNameDisplaySetting, getTheme} from 'mattermost-redux/selectors/entities/preferences';
 import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
 
 import UserProfile from './user_profile';

app/selectors/preferences.js

@@ -1,57 +0,0 @@
-// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-import {createSelector} from 'reselect';
-
-import Config from 'assets/config.json';
-import Themes from 'assets/themes.json';
-
-import {Preferences} from 'mattermost-redux/constants';
-import {getPreferenceKey} from 'mattermost-redux/utils/preference_utils';
-
-import {getMyPreferences} from 'mattermost-redux/selectors/entities/preferences';
-import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
-
-export const getTheme = createSelector(
-    getMyPreferences,
-    getCurrentTeamId,
-    (myPreferences, currentTeamId) => {
-        // Prefer the user's current team-specific theme over the user's current global theme over the default theme
-        let themePreference;
-        if (currentTeamId) {
-            themePreference = myPreferences[getPreferenceKey(Preferences.CATEGORY_THEME, currentTeamId)];
-        }
-
-        if (!themePreference) {
-            themePreference = myPreferences[getPreferenceKey(Preferences.CATEGORY_THEME, '')];
-        }
-
-        let theme;
-        if (themePreference) {
-            theme = themePreference.value;
-        } else {
-            theme = Config.DefaultTheme;
-        }
-
-        if (typeof theme === 'string') {
-            try {
-                // A custom theme will be a JSON-serialized object stored in a preference
-                theme = JSON.parse(theme);
-            } catch (e) {
-                // But if it's not a JSON object, it must be the name of a default theme
-                theme = Themes[theme];
-            }
-        }
-
-        // At this point, the theme should be a plain object
-
-        // Fix a case where upper case theme colours are rendered as black
-        if (currentTeamId) {
-            for (const key of Object.keys(theme)) {
-                theme[key] = theme[key].toLowerCase();
-            }
-        }
-
-        return theme;
-    }
-);

yarn.lock

@@ -3878,7 +3878,7 @@ makeerror@1.0.x:
 
 mattermost-redux@mattermost/mattermost-redux#master:
   version "0.0.1"
-  resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/6932c3fd4064434c5b30cff9898d724cdc687648"
+  resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/3f8bad7d1569949e0c7eeabac91bad06bfe7c1c3"
   dependencies:
     deep-equal "1.0.1"
     harmony-reflect "1.5.1"