[FIX] Inject Redux store to prevent/remove require cycles

app/containers/MessageBox/EmojiKeyboard.tsx

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

app/ee/omnichannel/lib/subscriptions/inquiry.js

@@ -1,5 +1,5 @@
 import log from '../../../../utils/log';
-import store from '../../../../lib/createStore';
+import { store } from '../../../../lib/auxStore';
 import RocketChat from '../../../../lib/rocketchat';
 import { inquiryQueueAdd, inquiryQueueRemove, inquiryQueueUpdate, inquiryRequest } from '../../actions/inquiry';
 

app/index.tsx

@@ -32,8 +32,10 @@ import debounce from './utils/debounce';
 import { isFDroidBuild } from './constants/environment';
 import { IThemePreference } from './definitions/ITheme';
 import { ICommand } from './definitions/ICommand';
+import { initStore } from './lib/auxStore';
 
 RNScreens.enableScreens();
+initStore(store);
 
 interface IDimensions {
 	width: number;

app/lib/auxStore.ts

@@ -0,0 +1,10 @@
+import { Store } from 'redux';
+
+import { IApplicationState } from '../definitions';
+
+// https://redux.js.org/faq/code-structure#how-can-i-use-the-redux-store-in-non-component-files
+export let store: Store<IApplicationState> = null as any;
+
+export const initStore = (_store: Store): void => {
+	store = _store;
+};

app/lib/encryption/encryption.js

@@ -9,7 +9,7 @@ import database from '../database';
 import protectedFunction from '../methods/helpers/protectedFunction';
 import Deferred from '../../utils/deferred';
 import log from '../../utils/log';
-import store from '../createStore';
+import { store } from '../auxStore';
 import {
 	E2E_BANNER_TYPE,
 	E2E_MESSAGE_TYPE,

app/lib/methods/callJitsi.js

@@ -1,4 +1,4 @@
-import reduxStore from '../createStore';
+import { store as reduxStore } from '../auxStore';
 import Navigation from '../Navigation';
 import { events, logEvent } from '../../utils/log';
 

app/lib/methods/canOpenRoom.js

@@ -1,5 +1,5 @@
 import database from '../database';
-import store from '../createStore';
+import { store } from '../auxStore';
 
 const restTypes = {
 	channel: 'channels',

app/lib/methods/enterpriseModules.js

@@ -1,5 +1,5 @@
 import { compareServerVersion, methods } from '../utils';
-import reduxStore from '../createStore';
+import { store as reduxStore } from '../auxStore';
 import database from '../database';
 import log from '../../utils/log';
 import { clearEnterpriseModules, setEnterpriseModules as setEnterpriseModulesAction } from '../../actions/enterpriseModules';

app/lib/methods/getCustomEmojis.js

@@ -2,7 +2,7 @@ import orderBy from 'lodash/orderBy';
 import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord';
 
 import { compareServerVersion, methods } from '../utils';
-import reduxStore from '../createStore';
+import { store as reduxStore } from '../auxStore';
 import database from '../database';
 import log from '../../utils/log';
 import { setCustomEmojis as setCustomEmojisAction } from '../../actions/customEmojis';

app/lib/methods/getPermissions.js

@@ -5,7 +5,7 @@ import orderBy from 'lodash/orderBy';
 import { compareServerVersion, methods } from '../utils';
 import database from '../database';
 import log from '../../utils/log';
-import reduxStore from '../createStore';
+import { store as reduxStore } from '../auxStore';
 import RocketChat from '../rocketchat';
 import { setPermissions as setPermissionsAction } from '../../actions/permissions';
 import protectedFunction from './helpers/protectedFunction';

app/lib/methods/getRoles.js

@@ -2,7 +2,7 @@ import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord';
 
 import database from '../database';
 import log from '../../utils/log';
-import reduxStore from '../createStore';
+import { store as reduxStore } from '../auxStore';
 import { removeRoles, setRoles as setRolesAction, updateRoles } from '../../actions/roles';
 import protectedFunction from './helpers/protectedFunction';
 

app/lib/methods/getSettings.js

@@ -3,7 +3,7 @@ import { Q } from '@nozbe/watermelondb';
 
 import { addSettings, clearSettings } from '../../actions/settings';
 import RocketChat from '../rocketchat';
-import reduxStore from '../createStore';
+import { store as reduxStore } from '../auxStore';
 import settings from '../../constants/settings';
 import log from '../../utils/log';
 import database from '../database';

app/lib/methods/getUsersPresence.js

@@ -2,7 +2,7 @@ import { InteractionManager } from 'react-native';
 import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord';
 
 import { compareServerVersion, methods } from '../utils';
-import reduxStore from '../createStore';
+import { store as reduxStore } from '../auxStore';
 import { setActiveUsers } from '../../actions/activeUsers';
 import { setUser } from '../../actions/login';
 import database from '../database';

app/lib/methods/helpers/mergeSubscriptionsRooms.js

@@ -1,7 +1,7 @@
 import EJSON from 'ejson';
 
 import { Encryption } from '../../encryption';
-import reduxStore from '../../createStore';
+import { store as reduxStore } from '../../auxStore';
 import { compareServerVersion, methods } from '../../utils';
 import findSubscriptionsRooms from './findSubscriptionsRooms';
 import normalizeMessage from './normalizeMessage';

app/lib/methods/subscriptions/rooms.js

@@ -7,7 +7,7 @@ import protectedFunction from '../helpers/protectedFunction';
 import messagesStatus from '../../../constants/messagesStatus';
 import log from '../../../utils/log';
 import random from '../../../utils/random';
-import store from '../../createStore';
+import { store } from '../../auxStore';
 import { handlePayloadUserInteraction } from '../actions';
 import buildMessage from '../helpers/buildMessage';
 import RocketChat from '../../rocketchat';

app/lib/rocketchat.js

@@ -27,7 +27,7 @@ import { updatePermission } from '../actions/permissions';
 import { TEAM_TYPE } from '../definitions/ITeam';
 import { updateSettings } from '../actions/settings';
 import { compareServerVersion, methods } from './utils';
-import reduxStore from './createStore';
+import { store as reduxStore } from './auxStore';
 import database from './database';
 import subscribeRooms from './methods/subscriptions/rooms';
 import getUsersPresence, { getUserPresence, subscribeUsersPresence } from './methods/getUsersPresence';

app/notifications/push/index.ts

@@ -1,6 +1,6 @@
 import EJSON from 'ejson';
 
-import store from '../../lib/createStore';
+import { store } from '../../lib/auxStore';
 import { deepLinkingOpen } from '../../actions/deepLinking';
 import { isFDroidBuild } from '../../constants/environment';
 import PushNotification from './push';

app/notifications/push/push.ios.ts

@@ -2,7 +2,7 @@
 // TODO BUMP LIB VERSION
 import NotificationsIOS, { NotificationAction, NotificationCategory, Notification } from 'react-native-notifications';
 
-import reduxStore from '../../lib/createStore';
+import { store as reduxStore } from '../../lib/auxStore';
 import I18n from '../../i18n';
 import { INotification } from '../../definitions/INotification';
 

app/reducers/share.ts

@@ -16,14 +16,14 @@ export interface IShareUser {
 }
 
 export interface IShare {
-	user: IShareUser | {};
-	server: IShareServer | {};
+	user: IShareUser;
+	server: IShareServer;
 	settings: TShareSettings;
 }
 
 export const initialState: IShare = {
-	user: {},
-	server: {},
+	user: {} as IShareUser,
+	server: {} as IShareServer,
 	settings: {}
 };
 

app/share.tsx

@@ -8,7 +8,7 @@ import { Provider } from 'react-redux';
 import { defaultTheme, newThemeState, subscribeTheme, unsubscribeTheme } from './utils/theme';
 import UserPreferences from './lib/userPreferences';
 import Navigation from './lib/ShareNavigation';
-import store from './lib/createStore';
+import { store } from './lib/auxStore';
 import { supportSystemTheme } from './utils/deviceInfo';
 import { defaultHeader, getActiveRouteName, navigationTheme, themedHeader } from './utils/navigation';
 import RocketChat, { THEME_PREFERENCES_KEY } from './lib/rocketchat';

app/utils/isReadOnly.ts

@@ -1,5 +1,5 @@
 import RocketChat from '../lib/rocketchat';
-import reduxStore from '../lib/createStore';
+import { store as reduxStore } from '../lib/auxStore';
 import { ISubscription } from '../definitions/ISubscription';
 
 const canPostReadOnly = async ({ rid }: { rid: string }) => {

app/utils/localAuthentication.ts

@@ -5,7 +5,7 @@ import AsyncStorage from '@react-native-community/async-storage';
 import { sha256 } from 'js-sha256';
 
 import UserPreferences from '../lib/userPreferences';
-import store from '../lib/createStore';
+import { store } from '../lib/auxStore';
 import database from '../lib/database';
 import {
 	ATTEMPTS_KEY,