[MM-23520] Port mattermost-redux (#4088)

* Remove mattermost-redux

* Move mm-redux files into app/redux

* Add @redux path to tsconfig.json

* Fix imports

* Install missing dependencies

* Fix tsc errors

* Fix i18n_utils test

* Fix more imports

* Remove redux websocket

* Fix tests

* Rename @redux

* Apply changes from mattermost-redux PR 1103

* Remove mattermost-redux mention in template

* Add missing imports

* Rename app/redux/ to app/mm-redux/

* Remove test file

* Fix fetching Sidebar GM profiles

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>

PULL_REQUEST_TEMPLATE.md

@@ -24,7 +24,6 @@ Otherwise, link the JIRA ticket.
 Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.
 -->
 - [ ] Added or updated unit tests (required for all new features)
-- [ ] All new/modified APIs include changes to [mattermost-redux](https://github.com/mattermost/mattermost-redux) (please link)
 - [ ] Has UI changes
 - [ ] Includes text changes and localization file updates
 

app/actions/helpers/channels.ts

@@ -1,22 +1,22 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {ChannelTypes, PreferenceTypes, RoleTypes, UserTypes} from 'mattermost-redux/action_types';
-import {Client4} from 'mattermost-redux/client';
-import {General, Preferences} from 'mattermost-redux/constants';
-import {getCurrentChannelId} from 'mattermost-redux/selectors/entities/channels';
-import {getConfig} from 'mattermost-redux/selectors/entities/general';
-import {getMyPreferences} from 'mattermost-redux/selectors/entities/preferences';
-import {getCurrentUserId, getUsers, getUserIdsInChannels} from 'mattermost-redux/selectors/entities/users';
-import {getUserIdFromChannelName, isAutoClosed} from 'mattermost-redux/utils/channel_utils';
-import {getPreferenceKey} from 'mattermost-redux/utils/preference_utils';
+import {ChannelTypes, PreferenceTypes, RoleTypes, UserTypes} from '@mm-redux/action_types';
+import {Client4} from '@mm-redux/client';
+import {General, Preferences} from '@mm-redux/constants';
+import {getCurrentChannelId} from '@mm-redux/selectors/entities/channels';
+import {getConfig} from '@mm-redux/selectors/entities/general';
+import {getMyPreferences} from '@mm-redux/selectors/entities/preferences';
+import {getCurrentUserId, getUsers, getUserIdsInChannels} from '@mm-redux/selectors/entities/users';
+import {getUserIdFromChannelName, isAutoClosed} from '@mm-redux/utils/channel_utils';
+import {getPreferenceKey} from '@mm-redux/utils/preference_utils';
 
-import {ActionResult, GenericAction} from 'mattermost-redux/types/actions';
-import {Channel, ChannelMembership} from 'mattermost-redux/types/channels';
-import {PreferenceType} from 'mattermost-redux/types/preferences';
-import {GlobalState} from 'mattermost-redux/types/store';
-import {UserProfile} from 'mattermost-redux/types/users';
-import {RelationOneToMany} from 'mattermost-redux/types/utilities';
+import {ActionResult, GenericAction} from '@mm-redux/types/actions';
+import {Channel, ChannelMembership} from '@mm-redux/types/channels';
+import {PreferenceType} from '@mm-redux/types/preferences';
+import {GlobalState} from '@mm-redux/types/store';
+import {UserProfile} from '@mm-redux/types/users';
+import {RelationOneToMany} from '@mm-redux/types/utilities';
 
 import {isDirectChannelVisible, isGroupChannelVisible} from '@utils/channels';
 import {buildPreference} from '@utils/preferences';

app/actions/navigation/index.js

@@ -5,7 +5,7 @@ import {Keyboard, Platform} from 'react-native';
 import {Navigation} from 'react-native-navigation';
 import merge from 'deepmerge';
 
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import store from 'app/store';
 import EphemeralStore from 'app/store/ephemeral_store';

app/actions/navigation/index.test.js

@@ -6,7 +6,7 @@ import {Navigation} from 'react-native-navigation';
 
 import merge from 'deepmerge';
 
-import Preferences from 'mattermost-redux/constants/preferences';
+import Preferences from '@mm-redux/constants/preferences';
 
 import EphemeralStore from 'app/store/ephemeral_store';
 import * as NavigationActions from 'app/actions/navigation';

app/actions/views/channel.js

@@ -5,30 +5,30 @@ import {batchActions} from 'redux-batched-actions';
 
 import {ViewTypes} from 'app/constants';
 
-import {ChannelTypes, RoleTypes} from 'mattermost-redux/action_types';
+import {ChannelTypes, RoleTypes} from '@mm-redux/action_types';
 import {
     fetchMyChannelsAndMembers,
     getChannelByNameAndTeamName,
     leaveChannel as serviceLeaveChannel,
-} from 'mattermost-redux/actions/channels';
-import {getFilesForPost} from 'mattermost-redux/actions/files';
-import {savePreferences} from 'mattermost-redux/actions/preferences';
-import {selectTeam} from 'mattermost-redux/actions/teams';
-import {Client4} from 'mattermost-redux/client';
-import {General, Preferences} from 'mattermost-redux/constants';
-import {getPostIdsInChannel} from 'mattermost-redux/selectors/entities/posts';
+} from '@mm-redux/actions/channels';
+import {getFilesForPost} from '@mm-redux/actions/files';
+import {savePreferences} from '@mm-redux/actions/preferences';
+import {selectTeam} from '@mm-redux/actions/teams';
+import {Client4} from '@mm-redux/client';
+import {General, Preferences} from '@mm-redux/constants';
+import {getPostIdsInChannel} from '@mm-redux/selectors/entities/posts';
 import {
     getCurrentChannelId,
     getRedirectChannelNameForTeam,
     getChannelsNameMapInTeam,
     isManuallyUnread,
-} from 'mattermost-redux/selectors/entities/channels';
-import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
-import {getTeamByName} from 'mattermost-redux/selectors/entities/teams';
+} from '@mm-redux/selectors/entities/channels';
+import {getCurrentUserId} from '@mm-redux/selectors/entities/users';
+import {getTeamByName} from '@mm-redux/selectors/entities/teams';
 
-import {getChannelByName as getChannelByNameSelector} from 'mattermost-redux/utils/channel_utils';
-import EventEmitter from 'mattermost-redux/utils/event_emitter';
-import {getLastCreateAt} from 'mattermost-redux/utils/post_utils';
+import {getChannelByName as getChannelByNameSelector} from '@mm-redux/utils/channel_utils';
+import EventEmitter from '@mm-redux/utils/event_emitter';
+import {getLastCreateAt} from '@mm-redux/utils/post_utils';
 
 import {loadSidebarDirectMessagesProfiles} from '@actions/helpers/channels';
 import {getPosts, getPostsBefore, getPostsSince, getPostThread} from '@actions/views/post';

app/actions/views/channel.test.js

@@ -5,7 +5,7 @@ import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
 import initialState from 'app/initial_state';
-import {ChannelTypes} from 'mattermost-redux/action_types';
+import {ChannelTypes} from '@mm-redux/action_types';
 import testHelper from 'test/test_helper';
 
 import * as ChannelActions from 'app/actions/views/channel';
@@ -15,13 +15,13 @@ const {
     loadPostsIfNecessaryWithRetry,
 } = ChannelActions;
 
-import postReducer from 'mattermost-redux/reducers/entities/posts';
+import postReducer from '@mm-redux/reducers/entities/posts';
 
 const MOCK_CHANNEL_MARK_AS_READ = 'MOCK_CHANNEL_MARK_AS_READ';
 const MOCK_CHANNEL_MARK_AS_VIEWED = 'MOCK_CHANNEL_MARK_AS_VIEWED';
 
-jest.mock('mattermost-redux/actions/channels', () => {
-    const channelActions = require.requireActual('mattermost-redux/actions/channels');
+jest.mock('@mm-redux/actions/channels', () => {
+    const channelActions = require.requireActual('@mm-redux/actions/channels');
     return {
         ...channelActions,
         markChannelAsRead: jest.fn().mockReturnValue({type: 'MOCK_CHANNEL_MARK_AS_READ'}),
@@ -29,8 +29,8 @@ jest.mock('mattermost-redux/actions/channels', () => {
     };
 });
 
-jest.mock('mattermost-redux/selectors/entities/teams', () => {
-    const teamSelectors = require.requireActual('mattermost-redux/selectors/entities/teams');
+jest.mock('@mm-redux/selectors/entities/teams', () => {
+    const teamSelectors = require.requireActual('@mm-redux/selectors/entities/teams');
     return {
         ...teamSelectors,
         getTeamByName: jest.fn(() => ({name: 'current-team-name'})),
@@ -48,7 +48,7 @@ describe('Actions.Views.Channel', () => {
     const MOCK_RECEIVED_POSTS_IN_CHANNEL = 'RECEIVED_POSTS_IN_CHANNEL';
     const MOCK_RECEIVED_POSTS_SINCE = 'MOCK_RECEIVED_POSTS_SINCE';
 
-    const actions = require('mattermost-redux/actions/channels');
+    const actions = require('@mm-redux/actions/channels');
     actions.getChannelByNameAndTeamName = jest.fn((teamName) => {
         if (teamName) {
             return {
@@ -96,7 +96,7 @@ describe('Actions.Views.Channel', () => {
         };
     });
 
-    const postUtils = require('mattermost-redux/utils/post_utils');
+    const postUtils = require('@mm-redux/utils/post_utils');
     postUtils.getLastCreateAt = jest.fn((array) => {
         return array[0].create_at;
     });
@@ -138,7 +138,7 @@ describe('Actions.Views.Channel', () => {
         },
     };
 
-    const channelSelectors = require('mattermost-redux/selectors/entities/channels');
+    const channelSelectors = require('@mm-redux/selectors/entities/channels');
     channelSelectors.getChannel = jest.fn((state, channelId) => ({data: channelId}));
     channelSelectors.getCurrentChannelId = jest.fn(() => currentChannelId);
     channelSelectors.getMyChannelMember = jest.fn(() => ({data: {member: {}}}));

app/actions/views/channel_add_members.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {addChannelMember} from 'mattermost-redux/actions/channels';
+import {addChannelMember} from '@mm-redux/actions/channels';
 
 export function handleAddChannelMembers(channelId, members) {
     return async (dispatch) => {

app/actions/views/channel_members.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {removeChannelMember} from 'mattermost-redux/actions/channels';
+import {removeChannelMember} from '@mm-redux/actions/channels';
 
 export function handleRemoveChannelMembers(channelId, members) {
     return async (dispatch, getState) => {

app/actions/views/command.js

@@ -1,9 +1,9 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {IntegrationTypes} from 'mattermost-redux/action_types';
-import {executeCommand as executeCommandService} from 'mattermost-redux/actions/integrations';
-import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
+import {IntegrationTypes} from '@mm-redux/action_types';
+import {executeCommand as executeCommandService} from '@mm-redux/actions/integrations';
+import {getCurrentTeamId} from '@mm-redux/selectors/entities/teams';
 
 export function executeCommand(message, channelId, rootId) {
     return async (dispatch, getState) => {

app/actions/views/create_channel.js

@@ -2,11 +2,11 @@
 // See LICENSE.txt for license information.
 
 import {handleSelectChannel, setChannelDisplayName} from './channel';
-import {createChannel} from 'mattermost-redux/actions/channels';
-import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
-import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
-import {cleanUpUrlable} from 'mattermost-redux/utils/channel_utils';
-import {generateId} from 'mattermost-redux/utils/helpers';
+import {createChannel} from '@mm-redux/actions/channels';
+import {getCurrentTeamId} from '@mm-redux/selectors/entities/teams';
+import {getCurrentUserId} from '@mm-redux/selectors/entities/users';
+import {cleanUpUrlable} from '@mm-redux/utils/channel_utils';
+import {generateId} from '@mm-redux/utils/helpers';
 
 export function generateChannelNameFromDisplayName(displayName) {
     let name = cleanUpUrlable(displayName);

app/actions/views/edit_profile.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {updateMe, setDefaultProfileImage} from 'mattermost-redux/actions/users';
+import {updateMe, setDefaultProfileImage} from '@mm-redux/actions/users';
 
 import {ViewTypes} from 'app/constants';
 

app/actions/views/emoji.js

@@ -3,10 +3,10 @@
 
 import {batchActions} from 'redux-batched-actions';
 
-import {EmojiTypes} from 'mattermost-redux/action_types';
-import {addReaction as serviceAddReaction, getNeededCustomEmojis} from 'mattermost-redux/actions/posts';
-import {Client4} from 'mattermost-redux/client';
-import {getPostIdsInCurrentChannel, makeGetPostIdsForThread} from 'mattermost-redux/selectors/entities/posts';
+import {EmojiTypes} from '@mm-redux/action_types';
+import {addReaction as serviceAddReaction, getNeededCustomEmojis} from '@mm-redux/actions/posts';
+import {Client4} from '@mm-redux/client';
+import {getPostIdsInCurrentChannel, makeGetPostIdsForThread} from '@mm-redux/selectors/entities/posts';
 
 import {ViewTypes} from 'app/constants';
 

app/actions/views/file_upload.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {FileTypes} from 'mattermost-redux/action_types';
+import {FileTypes} from '@mm-redux/action_types';
 
 import {ViewTypes} from 'app/constants';
 import {buildFileUploadData, generateId} from 'app/utils/file';

app/actions/views/login.js

@@ -3,14 +3,14 @@
 
 import moment from 'moment-timezone';
 
-import {getDataRetentionPolicy} from 'mattermost-redux/actions/general';
-import {GeneralTypes} from 'mattermost-redux/action_types';
-import {getSessions} from 'mattermost-redux/actions/users';
-import {autoUpdateTimezone} from 'mattermost-redux/actions/timezone';
-import {Client4} from 'mattermost-redux/client';
-import {getConfig, getLicense} from 'mattermost-redux/selectors/entities/general';
-import {isTimezoneEnabled} from 'mattermost-redux/selectors/entities/timezone';
-import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
+import {getDataRetentionPolicy} from '@mm-redux/actions/general';
+import {GeneralTypes} from '@mm-redux/action_types';
+import {getSessions} from '@mm-redux/actions/users';
+import {autoUpdateTimezone} from '@mm-redux/actions/timezone';
+import {Client4} from '@mm-redux/client';
+import {getConfig, getLicense} from '@mm-redux/selectors/entities/general';
+import {isTimezoneEnabled} from '@mm-redux/selectors/entities/timezone';
+import {getCurrentUserId} from '@mm-redux/selectors/entities/users';
 
 import {setAppCredentials} from 'app/init/credentials';
 import PushNotifications from 'app/push_notifications';

app/actions/views/login.test.js

@@ -4,7 +4,7 @@
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
-import * as GeneralActions from 'mattermost-redux/actions/general';
+import * as GeneralActions from '@mm-redux/actions/general';
 
 import {handleSuccessfulLogin} from 'app/actions/views/login';
 

app/actions/views/more_dms.js

@@ -1,9 +1,9 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {getDirectChannelName} from 'mattermost-redux/utils/channel_utils';
-import {createDirectChannel, createGroupChannel} from 'mattermost-redux/actions/channels';
-import {getProfilesByIds, getStatusesByIds} from 'mattermost-redux/actions/users';
+import {getDirectChannelName} from '@mm-redux/utils/channel_utils';
+import {createDirectChannel, createGroupChannel} from '@mm-redux/actions/channels';
+import {getProfilesByIds, getStatusesByIds} from '@mm-redux/actions/users';
 import {handleSelectChannel, toggleDMChannel, toggleGMChannel} from 'app/actions/views/channel';
 
 export function makeDirectChannel(otherUserId, switchToChannel = true) {

app/actions/views/post.js

@@ -3,7 +3,7 @@
 
 import {batchActions} from 'redux-batched-actions';
 
-import {UserTypes} from 'mattermost-redux/action_types';
+import {UserTypes} from '@mm-redux/action_types';
 import {
     doPostAction,
     getNeededAtMentionedUsernames,
@@ -14,11 +14,11 @@ import {
     receivedPostsInChannel,
     receivedPostsSince,
     receivedPostsInThread,
-} from 'mattermost-redux/actions/posts';
-import {Client4} from 'mattermost-redux/client';
-import {Posts} from 'mattermost-redux/constants';
-import {getPost as selectPost} from 'mattermost-redux/selectors/entities/posts';
-import {removeUserFromList} from 'mattermost-redux/utils/user_utils';
+} from '@mm-redux/actions/posts';
+import {Client4} from '@mm-redux/client';
+import {Posts} from '@mm-redux/constants';
+import {getPost as selectPost} from '@mm-redux/selectors/entities/posts';
+import {removeUserFromList} from '@mm-redux/utils/user_utils';
 
 import {ViewTypes} from 'app/constants';
 import {generateId} from 'app/utils/file';

app/actions/views/root.js

@@ -3,13 +3,13 @@
 
 import {batchActions} from 'redux-batched-actions';
 
-import {ChannelTypes, GeneralTypes, TeamTypes} from 'mattermost-redux/action_types';
-import {Client4} from 'mattermost-redux/client';
-import {General} from 'mattermost-redux/constants';
-import {fetchMyChannelsAndMembers} from 'mattermost-redux/actions/channels';
-import {getClientConfig, getDataRetentionPolicy, getLicenseConfig} from 'mattermost-redux/actions/general';
-import {receivedNewPost} from 'mattermost-redux/actions/posts';
-import {getMyTeams, getMyTeamMembers} from 'mattermost-redux/actions/teams';
+import {ChannelTypes, GeneralTypes, TeamTypes} from '@mm-redux/action_types';
+import {Client4} from '@mm-redux/client';
+import {General} from '@mm-redux/constants';
+import {fetchMyChannelsAndMembers} from '@mm-redux/actions/channels';
+import {getClientConfig, getDataRetentionPolicy, getLicenseConfig} from '@mm-redux/actions/general';
+import {receivedNewPost} from '@mm-redux/actions/posts';
+import {getMyTeams, getMyTeamMembers} from '@mm-redux/actions/teams';
 
 import {ViewTypes} from 'app/constants';
 import EphemeralStore from 'app/store/ephemeral_store';

app/actions/views/select_server.js

@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 import {batchActions} from 'redux-batched-actions';
-import {GeneralTypes} from 'mattermost-redux/action_types';
+import {GeneralTypes} from '@mm-redux/action_types';
 
 import {ViewTypes} from 'app/constants';
 

app/actions/views/select_server.test.js

@@ -5,7 +5,7 @@ import {batchActions} from 'redux-batched-actions';
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
-import {GeneralTypes} from 'mattermost-redux/action_types';
+import {GeneralTypes} from '@mm-redux/action_types';
 
 import {ViewTypes} from 'app/constants';
 

app/actions/views/select_team.js

@@ -3,11 +3,11 @@
 
 import {batchActions} from 'redux-batched-actions';
 
-import {ChannelTypes, TeamTypes} from 'mattermost-redux/action_types';
-import {getMyTeams} from 'mattermost-redux/actions/teams';
-import {RequestStatus} from 'mattermost-redux/constants';
-import {getConfig} from 'mattermost-redux/selectors/entities/general';
-import EventEmitter from 'mattermost-redux/utils/event_emitter';
+import {ChannelTypes, TeamTypes} from '@mm-redux/action_types';
+import {getMyTeams} from '@mm-redux/actions/teams';
+import {RequestStatus} from '@mm-redux/constants';
+import {getConfig} from '@mm-redux/selectors/entities/general';
+import EventEmitter from '@mm-redux/utils/event_emitter';
 
 import {NavigationTypes} from 'app/constants';
 import {selectFirstAvailableTeam} from 'app/utils/teams';

app/actions/views/user.js

@@ -3,15 +3,15 @@
 
 import {batchActions} from 'redux-batched-actions';
 
-import {GeneralTypes, RoleTypes, UserTypes} from 'mattermost-redux/action_types';
-import {getDataRetentionPolicy} from 'mattermost-redux/actions/general';
-import * as HelperActions from 'mattermost-redux/actions/helpers';
-import {autoUpdateTimezone} from 'mattermost-redux/actions/timezone';
-import {Client4} from 'mattermost-redux/client';
-import {General} from 'mattermost-redux/constants';
-import {getConfig, getLicense} from 'mattermost-redux/selectors/entities/general';
-import {isTimezoneEnabled} from 'mattermost-redux/selectors/entities/timezone';
-import {getCurrentUserId, getStatusForUserId} from 'mattermost-redux/selectors/entities/users';
+import {GeneralTypes, RoleTypes, UserTypes} from '@mm-redux/action_types';
+import {getDataRetentionPolicy} from '@mm-redux/actions/general';
+import * as HelperActions from '@mm-redux/actions/helpers';
+import {autoUpdateTimezone} from '@mm-redux/actions/timezone';
+import {Client4} from '@mm-redux/client';
+import {General} from '@mm-redux/constants';
+import {getConfig, getLicense} from '@mm-redux/selectors/entities/general';
+import {isTimezoneEnabled} from '@mm-redux/selectors/entities/timezone';
+import {getCurrentUserId, getStatusForUserId} from '@mm-redux/selectors/entities/users';
 
 import {setAppCredentials} from 'app/init/credentials';
 import {setCSRFFromCookie} from '@utils/security';

app/actions/views/user.test.js

@@ -4,14 +4,14 @@
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
-import {UserTypes} from 'mattermost-redux/action_types';
-import {General} from 'mattermost-redux/constants';
+import {UserTypes} from '@mm-redux/action_types';
+import {General} from '@mm-redux/constants';
 
 import {setCurrentUserStatusOffline} from 'app/actions/views/user';
 
 const mockStore = configureStore([thunk]);
 
-jest.mock('mattermost-redux/actions/users', () => ({
+jest.mock('@mm-redux/actions/users', () => ({
     getStatus: (...args) => ({type: 'MOCK_GET_STATUS', args}),
     getStatusesByIds: (...args) => ({type: 'MOCK_GET_STATUS_BY_IDS', args}),
     startPeriodicStatusUpdates: () => ({type: 'MOCK_PERIODIC_STATUS_UPDATES'}),

app/actions/websocket.test.js

@@ -8,16 +8,16 @@ import {batchActions} from 'redux-batched-actions';
 import thunk from 'redux-thunk';
 import configureMockStore from 'redux-mock-store';
 
-import {ChannelTypes, GeneralTypes, RoleTypes, TeamTypes, UserTypes} from 'mattermost-redux/action_types';
-import * as ChannelActions from 'mattermost-redux/actions/channels';
-import * as PostActions from 'mattermost-redux/actions/posts';
-import * as PreferenceActions from 'mattermost-redux/actions/preferences';
-import * as TeamActions from 'mattermost-redux/actions/teams';
-import * as UserActions from 'mattermost-redux/actions/users';
-import {Client4} from 'mattermost-redux/client';
-import {General, Posts, RequestStatus} from 'mattermost-redux/constants';
-import * as PostSelectors from 'mattermost-redux/selectors/entities/posts';
-import EventEmitter from 'mattermost-redux/utils/event_emitter';
+import {ChannelTypes, GeneralTypes, RoleTypes, TeamTypes, UserTypes} from '@mm-redux/action_types';
+import * as ChannelActions from '@mm-redux/actions/channels';
+import * as PostActions from '@mm-redux/actions/posts';
+import * as PreferenceActions from '@mm-redux/actions/preferences';
+import * as TeamActions from '@mm-redux/actions/teams';
+import * as UserActions from '@mm-redux/actions/users';
+import {Client4} from '@mm-redux/client';
+import {General, Posts, RequestStatus} from '@mm-redux/constants';
+import * as PostSelectors from '@mm-redux/selectors/entities/posts';
+import EventEmitter from '@mm-redux/utils/event_emitter';
 
 import * as Actions from '@actions/websocket';
 import {WebsocketEvents} from '@constants';
@@ -26,8 +26,6 @@ import TestHelper from 'test/test_helper';
 import configureStore from 'test/test_store';
 import initial_state from 'app/initial_state';
 
-require('isomorphic-fetch');
-
 global.WebSocket = MockWebSocket;
 
 const mockConfigRequest = (config = {}) => {

app/actions/websocket.ts

@@ -1,11 +1,11 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import {Client4} from 'mattermost-redux/client';
+import {Client4} from '@mm-redux/client';
 import websocketClient from '@websocket';
 
-import {ChannelTypes, GeneralTypes, EmojiTypes, PostTypes, PreferenceTypes, TeamTypes, UserTypes, RoleTypes, IntegrationTypes} from 'mattermost-redux/action_types';
-import {General, Preferences} from 'mattermost-redux/constants';
+import {ChannelTypes, GeneralTypes, EmojiTypes, PostTypes, PreferenceTypes, TeamTypes, UserTypes, RoleTypes, IntegrationTypes} from '@mm-redux/action_types';
+import {General, Preferences} from '@mm-redux/constants';
 import {
     getAllChannels,
     getChannel,
@@ -17,26 +17,26 @@ import {
     getChannelMembersInChannels,
     isManuallyUnread,
     getKnownUsers,
-} from 'mattermost-redux/selectors/entities/channels';
-import {getConfig} from 'mattermost-redux/selectors/entities/general';
-import {getAllPosts, getPost as selectPost} from 'mattermost-redux/selectors/entities/posts';
-import {getCurrentTeamId, getTeams as getTeamsSelector} from 'mattermost-redux/selectors/entities/teams';
-import {getCurrentUser, getCurrentUserId, getUsers, getUserStatuses} from 'mattermost-redux/selectors/entities/users';
-import {getChannelByName, getUserIdFromChannelName} from 'mattermost-redux/utils/channel_utils';
-import EventEmitter from 'mattermost-redux/utils/event_emitter';
-import {isMinimumServerVersion} from 'mattermost-redux/utils/helpers';
-import {isGuest, removeUserFromList} from 'mattermost-redux/utils/user_utils';
-import {isFromWebhook, isSystemMessage, shouldIgnorePost} from 'mattermost-redux/utils/post_utils';
+} from '@mm-redux/selectors/entities/channels';
+import {getConfig} from '@mm-redux/selectors/entities/general';
+import {getAllPosts, getPost as selectPost} from '@mm-redux/selectors/entities/posts';
+import {getCurrentTeamId, getTeams as getTeamsSelector} from '@mm-redux/selectors/entities/teams';
+import {getCurrentUser, getCurrentUserId, getUsers, getUserStatuses} from '@mm-redux/selectors/entities/users';
+import {getChannelByName, getUserIdFromChannelName} from '@mm-redux/utils/channel_utils';
+import EventEmitter from '@mm-redux/utils/event_emitter';
+import {isMinimumServerVersion} from '@mm-redux/utils/helpers';
+import {isGuest, removeUserFromList} from '@mm-redux/utils/user_utils';
+import {isFromWebhook, isSystemMessage, shouldIgnorePost} from '@mm-redux/utils/post_utils';
 
-import {DispatchFunc, GenericAction, GetStateFunc, batchActions} from 'mattermost-redux/types/actions';
+import {DispatchFunc, GenericAction, GetStateFunc, batchActions} from '@mm-redux/types/actions';
 
-import {getCustomEmojiForReaction, getUnreadPostData, postDeleted, receivedNewPost, receivedPost} from 'mattermost-redux/actions/posts';
-import {markChannelAsRead} from 'mattermost-redux/actions/channels';
-import {getProfilesByIds, getStatusesByIds} from 'mattermost-redux/actions/users';
-import {Channel, ChannelMembership} from 'mattermost-redux/types/channels';
-import {PreferenceType} from 'mattermost-redux/types/preferences';
-import {TeamMembership} from 'mattermost-redux/types/teams';
-import {Dictionary} from 'mattermost-redux/types/utilities';
+import {getCustomEmojiForReaction, getUnreadPostData, postDeleted, receivedNewPost, receivedPost} from '@mm-redux/actions/posts';
+import {markChannelAsRead} from '@mm-redux/actions/channels';
+import {getProfilesByIds, getStatusesByIds} from '@mm-redux/actions/users';
+import {Channel, ChannelMembership} from '@mm-redux/types/channels';
+import {PreferenceType} from '@mm-redux/types/preferences';
+import {TeamMembership} from '@mm-redux/types/teams';
+import {Dictionary} from '@mm-redux/types/utilities';
 
 import {WebsocketEvents} from '@constants';
 import {
@@ -51,7 +51,7 @@ import {
 import {loadChannelsForTeam, markAsViewedAndReadBatch} from '@actions/views/channel';
 import {getPost, getPosts, getPostsAdditionalDataBatch, getPostThread} from '@actions/views/post';
 import {getMe, loadMe} from '@actions/views/user';
-import {GlobalState} from 'mattermost-redux/types/store';
+import {GlobalState} from '@mm-redux/types/store';
 
 export type WebsocketBroadcast = {
     omit_users: Dictionary<boolean>;

app/components/announcement_banner/announcement_banner.test.js

@@ -4,7 +4,7 @@
 import React from 'react';
 import {shallow} from 'enzyme';
 
-import Preferences from 'mattermost-redux/constants/preferences';
+import Preferences from '@mm-redux/constants/preferences';
 
 import AnnouncementBanner from './announcement_banner.js';
 

app/components/announcement_banner/index.js

@@ -3,8 +3,8 @@
 
 import {connect} from 'react-redux';
 
-import {getConfig, getLicense} from 'mattermost-redux/selectors/entities/general';
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getConfig, getLicense} from '@mm-redux/selectors/entities/general';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import {isLandscape} from 'app/selectors/device';
 

app/components/at_mention/at_mention.js

@@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
 import {Clipboard, Text} from 'react-native';
 import {intlShape} from 'react-intl';
 
-import {displayUsername} from 'mattermost-redux/utils/user_utils';
+import {displayUsername} from '@mm-redux/utils/user_utils';
 
 import CustomPropTypes from 'app/constants/custom_prop_types';
 import mattermostManaged from 'app/mattermost_managed';

app/components/at_mention/index.js

@@ -3,9 +3,9 @@
 
 import {connect} from 'react-redux';
 
-import {getUsersByUsername, getCurrentUserMentionKeys} from 'mattermost-redux/selectors/entities/users';
+import {getUsersByUsername, getCurrentUserMentionKeys} from '@mm-redux/selectors/entities/users';
 
-import {getTeammateNameDisplaySetting, getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getTeammateNameDisplaySetting, getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import AtMention from './at_mention';
 

app/components/attachment_button/index.js

@@ -19,7 +19,7 @@ import DocumentPicker from 'react-native-document-picker';
 import ImagePicker from 'react-native-image-picker';
 import Permissions from 'react-native-permissions';
 
-import {lookupMimeType} from 'mattermost-redux/utils/file_utils';
+import {lookupMimeType} from '@mm-redux/utils/file_utils';
 
 import TouchableWithFeedback from 'app/components/touchable_with_feedback';
 import emmProvider from 'app/init/emm_provider';

app/components/attachment_button/index.test.js

@@ -7,7 +7,7 @@ import {shallow} from 'enzyme';
 import Permissions from 'react-native-permissions';
 import {Alert, StatusBar} from 'react-native';
 
-import Preferences from 'mattermost-redux/constants/preferences';
+import Preferences from '@mm-redux/constants/preferences';
 
 import {VALID_MIME_TYPES} from 'app/screens/edit_profile/edit_profile';
 

app/components/autocomplete/at_mention/at_mention.js

@@ -5,7 +5,7 @@ import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
 import {SectionList} from 'react-native';
 
-import {RequestStatus} from 'mattermost-redux/constants';
+import {RequestStatus} from '@mm-redux/constants';
 
 import {AT_MENTION_REGEX, AT_MENTION_SEARCH_REGEX} from 'app/constants/autocomplete';
 import AtMentionItem from 'app/components/autocomplete/at_mention_item';

app/components/autocomplete/at_mention/index.js

@@ -4,10 +4,10 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {isMinimumServerVersion} from 'mattermost-redux/utils/helpers';
-import {autocompleteUsers} from 'mattermost-redux/actions/users';
-import {getCurrentChannelId, getDefaultChannel} from 'mattermost-redux/selectors/entities/channels';
-import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
+import {isMinimumServerVersion} from '@mm-redux/utils/helpers';
+import {autocompleteUsers} from '@mm-redux/actions/users';
+import {getCurrentChannelId, getDefaultChannel} from '@mm-redux/selectors/entities/channels';
+import {getCurrentTeamId} from '@mm-redux/selectors/entities/teams';
 import {isLandscape} from 'app/selectors/device';
 
 import {
@@ -16,10 +16,10 @@ import {
     filterMembersInCurrentTeam,
     getMatchTermForAtMention,
 } from 'app/selectors/autocomplete';
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
-import {haveIChannelPermission} from 'mattermost-redux/selectors/entities/roles';
-import {Permissions} from 'mattermost-redux/constants';
+import {haveIChannelPermission} from '@mm-redux/selectors/entities/roles';
+import {Permissions} from '@mm-redux/constants';
 
 import AtMention from './at_mention';
 

app/components/autocomplete/at_mention_item/index.js

@@ -3,9 +3,9 @@
 
 import {connect} from 'react-redux';
 
-import {getCurrentUserId, getUser} from 'mattermost-redux/selectors/entities/users';
+import {getCurrentUserId, getUser} from '@mm-redux/selectors/entities/users';
 
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import AtMentionItem from './at_mention_item';
 

app/components/autocomplete/autocomplete.js

@@ -9,7 +9,7 @@ import {
     View,
 } from 'react-native';
 
-import EventEmitter from 'mattermost-redux/utils/event_emitter';
+import EventEmitter from '@mm-redux/utils/event_emitter';
 
 import {DeviceTypes} from 'app/constants';
 import {changeOpacity, makeStyleSheetFromTheme} from 'app/utils/theme';

app/components/autocomplete/autocomplete_divider/index.js

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import AutocompleteDivider from './autocomplete_divider';
 

app/components/autocomplete/channel_mention/channel_mention.js

@@ -5,9 +5,9 @@ import React, {PureComponent} from 'react';
 import PropTypes from 'prop-types';
 import {Platform, SectionList} from 'react-native';
 
-import {RequestStatus} from 'mattermost-redux/constants';
-import {isMinimumServerVersion} from 'mattermost-redux/utils/helpers';
-import {debounce} from 'mattermost-redux/actions/helpers';
+import {RequestStatus} from '@mm-redux/constants';
+import {isMinimumServerVersion} from '@mm-redux/utils/helpers';
+import {debounce} from '@mm-redux/actions/helpers';
 
 import {CHANNEL_MENTION_REGEX, CHANNEL_MENTION_SEARCH_REGEX} from 'app/constants/autocomplete';
 import AutocompleteSectionHeader from 'app/components/autocomplete/autocomplete_section_header';

app/components/autocomplete/channel_mention/index.js

@@ -4,9 +4,9 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {searchChannels, autocompleteChannelsForSearch} from 'mattermost-redux/actions/channels';
-import {getMyChannelMemberships} from 'mattermost-redux/selectors/entities/channels';
-import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
+import {searchChannels, autocompleteChannelsForSearch} from '@mm-redux/actions/channels';
+import {getMyChannelMemberships} from '@mm-redux/selectors/entities/channels';
+import {getCurrentTeamId} from '@mm-redux/selectors/entities/teams';
 import {isLandscape} from 'app/selectors/device';
 
 import {
@@ -17,7 +17,7 @@ import {
     filterDirectAndGroupMessages,
     getMatchTermForChannelMention,
 } from 'app/selectors/autocomplete';
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import ChannelMention from './channel_mention';
 

app/components/autocomplete/channel_mention_item/channel_mention_item.js

@@ -7,7 +7,7 @@ import {
     Text,
 } from 'react-native';
 
-import {General} from 'mattermost-redux/constants';
+import {General} from '@mm-redux/constants';
 import AutocompleteDivider from 'app/components/autocomplete/autocomplete_divider';
 import {BotTag, GuestTag} from 'app/components/tag';
 import {paddingHorizontal as padding} from 'app/components/safe_area_view/iphone_x_spacing';

app/components/autocomplete/channel_mention_item/index.js

@@ -3,10 +3,10 @@
 
 import {connect} from 'react-redux';
 
-import {General} from 'mattermost-redux/constants';
-import {getChannel} from 'mattermost-redux/selectors/entities/channels';
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
-import {getUser} from 'mattermost-redux/selectors/entities/users';
+import {General} from '@mm-redux/constants';
+import {getChannel} from '@mm-redux/selectors/entities/channels';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
+import {getUser} from '@mm-redux/selectors/entities/users';
 
 import {getChannelNameForSearchAutocomplete} from 'app/selectors/channel';
 import {isLandscape} from 'app/selectors/device';

app/components/autocomplete/date_suggestion/date_suggestion.js

@@ -7,7 +7,7 @@ import PropTypes from 'prop-types';
 import {CalendarList, LocaleConfig} from 'react-native-calendars';
 import {intlShape} from 'react-intl';
 
-import {memoizeResult} from 'mattermost-redux/utils/helpers';
+import {memoizeResult} from '@mm-redux/utils/helpers';
 
 import {DATE_MENTION_SEARCH_REGEX, ALL_SEARCH_FLAGS_REGEX} from 'app/constants/autocomplete';
 import {changeOpacity} from 'app/utils/theme';

app/components/autocomplete/date_suggestion/index.js

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import {makeGetMatchTermForDateMention} from 'app/selectors/autocomplete';
 import {getCurrentLocale} from 'app/selectors/i18n';

app/components/autocomplete/emoji_suggestion/index.js

@@ -5,11 +5,11 @@ import {connect} from 'react-redux';
 import {createSelector} from 'reselect';
 import {bindActionCreators} from 'redux';
 
-import {getCustomEmojisByName} from 'mattermost-redux/selectors/entities/emojis';
-import {autocompleteCustomEmojis} from 'mattermost-redux/actions/emojis';
+import {getCustomEmojisByName} from '@mm-redux/selectors/entities/emojis';
+import {autocompleteCustomEmojis} from '@mm-redux/actions/emojis';
 
 import {addReactionToLatestPost} from 'app/actions/views/emoji';
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 import {EmojiIndicesByAlias} from 'app/utils/emojis';
 
 import EmojiSuggestion from './emoji_suggestion';

app/components/autocomplete/index.js

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

app/components/autocomplete/slash_suggestion/index.js

@@ -5,10 +5,10 @@ import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 import {createSelector} from 'reselect';
 
-import {getAutocompleteCommands} from 'mattermost-redux/actions/integrations';
-import {getAutocompleteCommandsList} from 'mattermost-redux/selectors/entities/integrations';
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
-import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
+import {getAutocompleteCommands} from '@mm-redux/actions/integrations';
+import {getAutocompleteCommandsList} from '@mm-redux/selectors/entities/integrations';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
+import {getCurrentTeamId} from '@mm-redux/selectors/entities/teams';
 import {isLandscape} from 'app/selectors/device';
 
 import SlashSuggestion from './slash_suggestion';

app/components/autocomplete_selector/autocomplete_selector.js

@@ -7,7 +7,7 @@ import PropTypes from 'prop-types';
 import {intlShape} from 'react-intl';
 import Icon from 'react-native-vector-icons/FontAwesome';
 
-import {displayUsername} from 'mattermost-redux/utils/user_utils';
+import {displayUsername} from '@mm-redux/utils/user_utils';
 
 import FormattedText from 'app/components/formatted_text';
 import {paddingHorizontal as padding} from 'app/components/safe_area_view/iphone_x_spacing';

app/components/autocomplete_selector/index.js

@@ -4,7 +4,7 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {getTeammateNameDisplaySetting, getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getTeammateNameDisplaySetting, getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import {setAutocompleteSelector} from 'app/actions/views/post';
 

app/components/channel_icon.js

@@ -8,7 +8,7 @@ import {
     View,
 } from 'react-native';
 
-import {General} from 'mattermost-redux/constants';
+import {General} from '@mm-redux/constants';
 
 import Icon from 'app/components/vector_icon';
 

app/components/channel_intro/channel_intro.js

@@ -9,8 +9,8 @@ import {
 } from 'react-native';
 import {injectIntl, intlShape} from 'react-intl';
 
-import {displayUsername} from 'mattermost-redux/utils/user_utils';
-import {General} from 'mattermost-redux/constants';
+import {displayUsername} from '@mm-redux/utils/user_utils';
+import {General} from '@mm-redux/constants';
 
 import {goToScreen} from 'app/actions/navigation';
 import ProfilePicture from 'app/components/profile_picture';

app/components/channel_intro/index.js

@@ -4,11 +4,11 @@
 import {connect} from 'react-redux';
 import {createSelector} from 'reselect';
 
-import {General} from 'mattermost-redux/constants';
-import {makeGetChannel} from 'mattermost-redux/selectors/entities/channels';
-import {getCurrentUserId, getUser, makeGetProfilesInChannel} from 'mattermost-redux/selectors/entities/users';
+import {General} from '@mm-redux/constants';
+import {makeGetChannel} from '@mm-redux/selectors/entities/channels';
+import {getCurrentUserId, getUser, makeGetProfilesInChannel} from '@mm-redux/selectors/entities/users';
 
-import {getTeammateNameDisplaySetting, getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getTeammateNameDisplaySetting, getTheme} from '@mm-redux/selectors/entities/preferences';
 import {isLandscape} from 'app/selectors/device';
 import {getChannelMembersForDm} from 'app/selectors/channel';
 

app/components/channel_link/index.js

@@ -5,10 +5,10 @@ import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import {createSelector} from 'reselect';
 
-import {joinChannel} from 'mattermost-redux/actions/channels';
-import {getChannelsNameMapInCurrentTeam} from 'mattermost-redux/selectors/entities/channels';
-import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
-import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
+import {joinChannel} from '@mm-redux/actions/channels';
+import {getChannelsNameMapInCurrentTeam} from '@mm-redux/selectors/entities/channels';
+import {getCurrentTeamId} from '@mm-redux/selectors/entities/teams';
+import {getCurrentUserId} from '@mm-redux/selectors/entities/users';
 
 import {handleSelectChannel} from 'app/actions/views/channel';
 

app/components/channel_loader/channel_loader.js

@@ -11,7 +11,7 @@ import {
 } from 'react-native';
 import {ImageContent} from 'rn-placeholder';
 
-import EventEmitter from 'mattermost-redux/utils/event_emitter';
+import EventEmitter from '@mm-redux/utils/event_emitter';
 
 import CustomPropTypes from 'app/constants/custom_prop_types';
 import {changeOpacity, makeStyleSheetFromTheme} from 'app/utils/theme';

app/components/channel_loader/channel_loader.test.js

@@ -4,7 +4,7 @@
 import React from 'react';
 import {shallow} from 'enzyme';
 
-import Preferences from 'mattermost-redux/constants/preferences';
+import Preferences from '@mm-redux/constants/preferences';
 
 import ChannelLoader from './channel_loader';
 

app/components/channel_loader/index.js

@@ -4,7 +4,7 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import {handleSelectChannel, setChannelLoading} from 'app/actions/views/channel';
 

app/components/client_upgrade_listener/index.js

@@ -3,8 +3,8 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {logError} from 'mattermost-redux/actions/errors';
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {logError} from '@mm-redux/actions/errors';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import {setLastUpgradeCheck} from 'app/actions/views/client_upgrade';
 import getClientUpgrade from 'app/selectors/client_upgrade';

app/components/combined_system_message/combined_system_message.js

@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import {intlShape} from 'react-intl';
 
-import {Posts} from 'mattermost-redux/constants';
+import {Posts} from '@mm-redux/constants';
 
 import {makeStyleSheetFromTheme} from 'app/utils/theme';
 import {t} from 'app/utils/i18n';

app/components/combined_system_message/index.js

@@ -4,10 +4,10 @@
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 
-import {getMissingProfilesByIds, getMissingProfilesByUsernames} from 'mattermost-redux/actions/users';
-import {Preferences} from 'mattermost-redux/constants';
-import {getBool} from 'mattermost-redux/selectors/entities/preferences';
-import {getCurrentUser, makeGetProfilesByIdsAndUsernames} from 'mattermost-redux/selectors/entities/users';
+import {getMissingProfilesByIds, getMissingProfilesByUsernames} from '@mm-redux/actions/users';
+import {Preferences} from '@mm-redux/constants';
+import {getBool} from '@mm-redux/selectors/entities/preferences';
+import {getCurrentUser, makeGetProfilesByIdsAndUsernames} from '@mm-redux/selectors/entities/users';
 
 import CombinedSystemMessage from './combined_system_message';
 

app/components/combined_system_message/last_users.js

@@ -6,7 +6,7 @@ import React from 'react';
 import {Text} from 'react-native';
 import {intlShape} from 'react-intl';
 
-import {Posts} from 'mattermost-redux/constants';
+import {Posts} from '@mm-redux/constants';
 
 import FormattedMarkdownText from 'app/components/formatted_markdown_text';
 import FormattedText from 'app/components/formatted_text';

app/components/combined_user_activity_post/index.js

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {makeGenerateCombinedPost} from 'mattermost-redux/utils/post_list';
+import {makeGenerateCombinedPost} from '@mm-redux/utils/post_list';
 
 import Post from 'app/components/post';
 

app/components/custom_list/channel_list_row/index.js

@@ -3,9 +3,9 @@
 
 import {connect} from 'react-redux';
 
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
-import {makeGetChannel} from 'mattermost-redux/selectors/entities/channels';
+import {makeGetChannel} from '@mm-redux/selectors/entities/channels';
 import {isLandscape} from 'app/selectors/device';
 import ChannelListRow from './channel_list_row';
 

app/components/custom_list/index.test.js

@@ -5,7 +5,7 @@ import React from 'react';
 import {View} from 'react-native';
 import {shallow} from 'enzyme';
 
-import Preferences from 'mattermost-redux/constants/preferences';
+import Preferences from '@mm-redux/constants/preferences';
 
 import CustomList, {FLATLIST, SECTIONLIST} from './index';
 

app/components/custom_list/option_list_row/index.js

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 import {isLandscape} from 'app/selectors/device';
 import OptionListRow from './option_list_row';
 

app/components/custom_list/user_list_row/index.js

@@ -3,8 +3,8 @@
 
 import {connect} from 'react-redux';
 
-import {getTeammateNameDisplaySetting, getTheme} from 'mattermost-redux/selectors/entities/preferences';
-import {getCurrentUserId, getUser} from 'mattermost-redux/selectors/entities/users';
+import {getTeammateNameDisplaySetting, getTheme} from '@mm-redux/selectors/entities/preferences';
+import {getCurrentUserId, getUser} from '@mm-redux/selectors/entities/users';
 import {isLandscape} from 'app/selectors/device';
 import UserListRow from './user_list_row';
 

app/components/custom_list/user_list_row/user_list_row.js

@@ -9,7 +9,7 @@ import {
     View,
 } from 'react-native';
 
-import {displayUsername} from 'mattermost-redux/utils/user_utils';
+import {displayUsername} from '@mm-redux/utils/user_utils';
 
 import CustomListRow from 'app/components/custom_list/custom_list_row';
 import ProfilePicture from 'app/components/profile_picture';

app/components/custom_list/user_list_row/user_list_test.test.js

@@ -4,7 +4,7 @@
 import React from 'react';
 import {shallow} from 'enzyme';
 
-import Preferences from 'mattermost-redux/constants/preferences';
+import Preferences from '@mm-redux/constants/preferences';
 
 import UserListRow from './user_list_row';
 

app/components/edit_channel_info/edit_channel_info.js

@@ -10,7 +10,7 @@ import {
 } from 'react-native';
 import {KeyboardAwareScrollView} from 'react-native-keyboard-aware-scroll-view';
 
-import {General} from 'mattermost-redux/constants';
+import {General} from '@mm-redux/constants';
 
 import Autocomplete from 'app/components/autocomplete';
 import ErrorText from 'app/components/error_text';

app/components/edit_channel_info/edit_channel_info.test.js

@@ -4,7 +4,7 @@
 import React from 'react';
 import {shallow} from 'enzyme';
 
-import Preferences from 'mattermost-redux/constants/preferences';
+import Preferences from '@mm-redux/constants/preferences';
 
 import Autocomplete from 'app/components/autocomplete';
 import EditChannelInfo from './edit_channel_info';

app/components/emoji/index.js

@@ -3,11 +3,11 @@
 
 import {connect} from 'react-redux';
 
-import {getCustomEmojisByName} from 'mattermost-redux/selectors/entities/emojis';
-import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
-import {getConfig} from 'mattermost-redux/selectors/entities/general';
-import {Client4} from 'mattermost-redux/client';
-import {isMinimumServerVersion} from 'mattermost-redux/utils/helpers';
+import {getCustomEmojisByName} from '@mm-redux/selectors/entities/emojis';
+import {getCurrentUserId} from '@mm-redux/selectors/entities/users';
+import {getConfig} from '@mm-redux/selectors/entities/general';
+import {Client4} from '@mm-redux/client';
+import {isMinimumServerVersion} from '@mm-redux/utils/helpers';
 
 import {BuiltInEmojis, EmojiIndicesByAlias, Emojis} from 'app/utils/emojis';
 

app/components/emoji_picker/emoji_picker.test.js

@@ -3,7 +3,7 @@
 
 import React from 'react';
 
-import Preferences from 'mattermost-redux/constants/preferences';
+import Preferences from '@mm-redux/constants/preferences';
 
 import {shallowWithIntl} from 'test/intl-test-helper';
 import {filterEmojiSearchInput} from './emoji_picker_base';

app/components/emoji_picker/index.js

@@ -5,10 +5,10 @@ import {connect} from 'react-redux';
 import {createSelector} from 'reselect';
 import {bindActionCreators} from 'redux';
 
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
-import {getCustomEmojisByName} from 'mattermost-redux/selectors/entities/emojis';
-import {getConfig} from 'mattermost-redux/selectors/entities/general';
-import {getCustomEmojis, searchCustomEmojis} from 'mattermost-redux/actions/emojis';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
+import {getCustomEmojisByName} from '@mm-redux/selectors/entities/emojis';
+import {getConfig} from '@mm-redux/selectors/entities/general';
+import {getCustomEmojis, searchCustomEmojis} from '@mm-redux/actions/emojis';
 
 import {incrementEmojiPickerPage} from 'app/actions/views/emoji';
 import {getDimensions, isLandscape} from 'app/selectors/device';

app/components/error_list/index.js

@@ -4,8 +4,8 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {getDisplayableErrors} from 'mattermost-redux/selectors/errors';
-import {dismissError, clearErrors} from 'mattermost-redux/actions/errors';
+import {getDisplayableErrors} from '@mm-redux/selectors/errors';
+import {dismissError, clearErrors} from '@mm-redux/actions/errors';
 
 import ErrorList from './error_list';
 

app/components/error_text/error_text.test.js

@@ -3,7 +3,7 @@
 
 import React from 'react';
 import {shallow} from 'enzyme';
-import Preferences from 'mattermost-redux/constants/preferences';
+import Preferences from '@mm-redux/constants/preferences';
 
 import ErrorText from './error_text.js';
 

app/components/error_text/index.js

@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 import {connect} from 'react-redux';
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import ErrorText from './error_text.js';
 

app/components/file_attachment_list/file_attachment.js

@@ -11,7 +11,7 @@ import {
     StyleSheet,
 } from 'react-native';
 
-import * as Utils from 'mattermost-redux/utils/file_utils.js';
+import * as Utils from '@mm-redux/utils/file_utils';
 
 import TouchableWithFeedback from 'app/components/touchable_with_feedback';
 import {isDocument, isGif} from 'app/utils/file';

app/components/file_attachment_list/file_attachment.test.js

@@ -4,7 +4,7 @@ import React from 'react';
 import {shallow} from 'enzyme';
 
 import FileAttachment from './file_attachment.js';
-import Preferences from 'mattermost-redux/constants/preferences';
+import Preferences from '@mm-redux/constants/preferences';
 
 jest.mock('react-native-doc-viewer', () => ({
     openDoc: jest.fn(),

app/components/file_attachment_list/file_attachment_document/file_attachment_document.js

@@ -19,7 +19,7 @@ import {CircularProgress} from 'react-native-circular-progress';
 import {intlShape} from 'react-intl';
 import tinyColor from 'tinycolor2';
 
-import {getFileUrl} from 'mattermost-redux/utils/file_utils.js';
+import {getFileUrl} from '@mm-redux/utils/file_utils';
 
 import FileAttachmentIcon from 'app/components/file_attachment_list/file_attachment_icon';
 import TouchableWithFeedback from 'app/components/touchable_with_feedback';

app/components/file_attachment_list/file_attachment_icon.js

@@ -9,7 +9,7 @@ import {
     StyleSheet,
 } from 'react-native';
 
-import * as Utils from 'mattermost-redux/utils/file_utils';
+import * as Utils from '@mm-redux/utils/file_utils';
 
 import audioIcon from 'assets/images/icons/audio.png';
 import codeIcon from 'assets/images/icons/code.png';

app/components/file_attachment_list/file_attachment_image.js

@@ -10,7 +10,7 @@ import {
 } from 'react-native';
 import FastImage from 'react-native-fast-image';
 
-import {Client4} from 'mattermost-redux/client';
+import {Client4} from '@mm-redux/client';
 
 import ProgressiveImage from 'app/components/progressive_image';
 import {changeOpacity} from 'app/utils/theme';

app/components/file_attachment_list/file_attachment_list.js

@@ -6,8 +6,8 @@ import PropTypes from 'prop-types';
 import {Dimensions, StyleSheet, View} from 'react-native';
 import AsyncStorage from '@react-native-community/async-storage';
 
-import {Client4} from 'mattermost-redux/client';
-import EventEmitter from 'mattermost-redux/utils/event_emitter';
+import {Client4} from '@mm-redux/client';
+import EventEmitter from '@mm-redux/utils/event_emitter';
 
 import {TABLET_WIDTH} from 'app/components/sidebars/drawer_layout';
 import {DeviceTypes} from 'app/constants';

app/components/file_attachment_list/file_attachment_list.test.js

@@ -4,7 +4,7 @@ import React from 'react';
 import {shallow} from 'enzyme';
 
 import FileAttachment from './file_attachment_list.js';
-import Preferences from 'mattermost-redux/constants/preferences';
+import Preferences from '@mm-redux/constants/preferences';
 
 jest.mock('react-native-doc-viewer', () => ({
     openDoc: jest.fn(),

app/components/file_attachment_list/index.js

@@ -4,9 +4,9 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {canDownloadFilesOnMobile} from 'mattermost-redux/selectors/entities/general';
-import {makeGetFilesForPost} from 'mattermost-redux/selectors/entities/files';
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {canDownloadFilesOnMobile} from '@mm-redux/selectors/entities/general';
+import {makeGetFilesForPost} from '@mm-redux/selectors/entities/files';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import {loadFilesForPostIfNecessary} from 'app/actions/views/channel';
 

app/components/file_upload_preview/file_upload_item/file_upload_item.js

@@ -7,7 +7,7 @@ import {Text, View} from 'react-native';
 import RNFetchBlob from 'rn-fetch-blob';
 import {AnimatedCircularProgress} from 'react-native-circular-progress';
 
-import {Client4} from 'mattermost-redux/client';
+import {Client4} from '@mm-redux/client';
 
 import FileAttachmentImage from 'app/components/file_attachment_list/file_attachment_image';
 import FileAttachmentIcon from 'app/components/file_attachment_list/file_attachment_icon';

app/components/file_upload_preview/file_upload_item/file_upload_item.test.js

@@ -3,7 +3,7 @@
 import React from 'react';
 import {shallow} from 'enzyme';
 
-import {Preferences} from 'mattermost-redux/constants';
+import {Preferences} from '@mm-redux/constants';
 import ImageCacheManager from 'app/utils/image_cache_manager';
 import FileUploadItem from './file_upload_item';
 

app/components/file_upload_preview/file_upload_item/index.js

@@ -4,7 +4,7 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import {handleRemoveFile, retryFileUpload, uploadComplete, uploadFailed} from 'app/actions/views/file_upload';
 

app/components/file_upload_preview/file_upload_preview.js

@@ -12,7 +12,7 @@ import {
 } from 'react-native';
 import * as Animatable from 'react-native-animatable';
 
-import EventEmitter from 'mattermost-redux/utils/event_emitter';
+import EventEmitter from '@mm-redux/utils/event_emitter';
 
 import FormattedText from 'app/components/formatted_text';
 import {makeStyleSheetFromTheme} from 'app/utils/theme';

app/components/file_upload_preview/index.js

@@ -2,8 +2,8 @@
 // See LICENSE.txt for license information.
 
 import {connect} from 'react-redux';
-import {getCurrentChannelId} from 'mattermost-redux/selectors/entities/channels';
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getCurrentChannelId} from '@mm-redux/selectors/entities/channels';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import {getDimensions} from 'app/selectors/device';
 import {checkForFileUploadingInChannel} from 'app/selectors/file';

app/components/interactive_dialog_controller/index.js

@@ -4,7 +4,7 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {submitInteractiveDialog} from 'mattermost-redux/actions/integrations';
+import {submitInteractiveDialog} from '@mm-redux/actions/integrations';
 
 import InteractiveDialogController from './interactive_dialog_controller';
 

app/components/markdown/index.js

@@ -3,9 +3,9 @@
 
 import {connect} from 'react-redux';
 
-import {getAutolinkedUrlSchemes, getConfig} from 'mattermost-redux/selectors/entities/general';
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
-import {getCurrentUserMentionKeys} from 'mattermost-redux/selectors/entities/users';
+import {getAutolinkedUrlSchemes, getConfig} from '@mm-redux/selectors/entities/general';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
+import {getCurrentUserMentionKeys} from '@mm-redux/selectors/entities/users';
 
 import Markdown from './markdown';
 

app/components/markdown/markdown_code_block/index.js

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

app/components/markdown/markdown_emoji/index.js

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import MarkdownEmoji from './markdown_emoji';
 

app/components/markdown/markdown_emoji/markdown_emoji.test.js

@@ -4,7 +4,7 @@
 import React from 'react';
 import {shallow} from 'enzyme';
 
-import Preferences from 'mattermost-redux/constants/preferences';
+import Preferences from '@mm-redux/constants/preferences';
 
 import MarkdownEmoji from './markdown_emoji';
 

app/components/markdown/markdown_image/index.js

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {getCurrentUrl} from 'mattermost-redux/selectors/entities/general';
+import {getCurrentUrl} from '@mm-redux/selectors/entities/general';
 
 import {getDimensions} from 'app/selectors/device';
 

app/components/markdown/markdown_link/index.js

@@ -4,7 +4,7 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {getConfig, getCurrentUrl} from 'mattermost-redux/selectors/entities/general';
+import {getConfig, getCurrentUrl} from '@mm-redux/selectors/entities/general';
 import {handleSelectChannelByName} from 'app/actions/views/channel';
 
 import MarkdownLink from './markdown_link';

app/components/markdown/markdown_table/index.js

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import MarkdownTable from './markdown_table';
 

app/components/markdown/markdown_table/markdown_table.test.js

@@ -4,7 +4,7 @@
 import React from 'react';
 import {shallowWithIntl} from 'test/intl-test-helper';
 
-import Preferences from 'mattermost-redux/constants/preferences';
+import Preferences from '@mm-redux/constants/preferences';
 
 import MarkdownTable from './markdown_table';
 

app/components/markdown/markdown_table_cell/index.js

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import MarkdownTableCell from './markdown_table_cell';
 

app/components/markdown/markdown_table_image/index.js

@@ -3,8 +3,8 @@
 
 import {connect} from 'react-redux';
 
-import {getCurrentUrl} from 'mattermost-redux/selectors/entities/general';
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getCurrentUrl} from '@mm-redux/selectors/entities/general';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import MarkdownTableImage from './markdown_table_image';
 

app/components/markdown/markdown_table_row/index.js

@@ -3,7 +3,7 @@
 
 import {connect} from 'react-redux';
 
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import MarkdownTableRow from './markdown_table_row';
 

app/components/message_attachments/action_button/action_button.test.js

@@ -7,7 +7,7 @@ import ActionButton from './action_button';
 import {changeOpacity} from 'app/utils/theme';
 import {getStatusColors} from 'app/utils/message_attachment_colors';
 
-import Preferences from 'mattermost-redux/constants/preferences';
+import Preferences from '@mm-redux/constants/preferences';
 
 describe('ActionButton', () => {
     test('correct styles when from global theme', () => {

app/components/message_attachments/action_button/index.js

@@ -4,8 +4,8 @@
 import {bindActionCreators} from 'redux';
 import {connect} from 'react-redux';
 
-import {doPostActionWithCookie} from 'mattermost-redux/actions/posts';
-import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
+import {doPostActionWithCookie} from '@mm-redux/actions/posts';
+import {getTheme} from '@mm-redux/selectors/entities/preferences';
 
 import ActionButton from './action_button';