Remove some Flow annotations

react/features/authentication/components/WaitForOwnerDialog.native.js

@@ -1,11 +1,11 @@
 // @flow
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
 import { ConfirmDialog } from '../../base/dialog';
 import { translate } from '../../base/i18n';
+import { connect } from '../../base/redux';
 
 import { cancelWaitForOwner, _openLoginDialog } from '../actions';
 

react/features/base/app/components/BaseApp.js

@@ -55,8 +55,6 @@ export default class BaseApp extends Component<*, State> {
 
         this.state = {
             route: {},
-
-            // $FlowFixMe
             store: undefined
         };
     }

react/features/base/dialog/components/native/BottomSheet.js

@@ -2,10 +2,10 @@
 
 import React, { Component, type Node } from 'react';
 import { TouchableWithoutFeedback, View } from 'react-native';
-import { connect } from 'react-redux';
 
 import { ColorSchemeRegistry } from '../../../color-scheme';
 import { Modal } from '../../../react';
+import { connect } from '../../../redux';
 import { StyleType } from '../../../styles';
 
 import { bottomSheetStyles as styles } from './styles';
@@ -107,5 +107,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(BottomSheet);

react/features/base/dialog/components/native/ConfirmDialog.js

@@ -2,9 +2,9 @@
 
 import React from 'react';
 import { Text, TouchableOpacity } from 'react-native';
-import { connect } from 'react-redux';
 
 import { translate } from '../../../i18n';
+import { connect } from '../../../redux';
 import { StyleType } from '../../../styles';
 
 import { _abstractMapStateToProps } from '../../functions';

react/features/base/dialog/components/native/CustomDialog.js

@@ -1,6 +1,6 @@
 // @flow
 
-import { connect } from 'react-redux';
+import { connect } from '../../../redux';
 
 import { _abstractMapStateToProps } from '../../functions';
 
@@ -21,5 +21,4 @@ class CustomDialog extends BaseDialog<Props, *> {
     }
 }
 
-// $FlowExpectedError
 export default connect(_abstractMapStateToProps)(CustomDialog);

react/features/base/dialog/components/native/CustomSubmitDialog.js

@@ -1,8 +1,7 @@
 // @flow
 
-import { connect } from 'react-redux';
-
 import { translate } from '../../../i18n';
+import { connect } from '../../../redux';
 
 import { _abstractMapStateToProps } from '../../functions';
 

react/features/base/dialog/components/native/DialogContainer.js

@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import { connect } from '../../../redux';
 
 import AbstractDialogContainer, {
     abstractMapStateToProps

react/features/base/dialog/components/native/InputDialog.js

@@ -2,9 +2,9 @@
 
 import React from 'react';
 import { View, Text, TextInput, TouchableOpacity } from 'react-native';
-import { connect } from 'react-redux';
 
 import { translate } from '../../../i18n';
+import { connect } from '../../../redux';
 import { StyleType } from '../../../styles';
 
 import { _abstractMapStateToProps } from '../../functions';

react/features/base/dialog/components/web/Dialog.js

@@ -1,7 +1,8 @@
 // @flow
 
 import React from 'react';
-import { connect } from 'react-redux';
+
+import { connect } from '../../../redux';
 
 import AbstractDialog from '../AbstractDialog';
 import type { Props as AbstractDialogProps, State } from '../AbstractDialog';
@@ -84,5 +85,4 @@ class Dialog extends AbstractDialog<Props, State> {
     _onSubmit: (?string) => void;
 }
 
-// $FlowExpectedError
 export default connect()(Dialog);

react/features/base/dialog/components/web/DialogContainer.js

@@ -1,6 +1,7 @@
 import { ModalTransition } from '@atlaskit/modal-dialog';
 import React from 'react';
-import { connect } from 'react-redux';
+
+import { connect } from '../../../redux';
 
 import AbstractDialogContainer, {
     abstractMapStateToProps

react/features/base/i18n/dateUtil.js

@@ -63,13 +63,10 @@ export function getLocalizedDurationFormatter(duration: number) {
     // showing the hour and we want to include the hour if the conference is
     // more than an hour long
 
-    // $FlowFixMe
     if (moment.duration(duration).format('h') !== '0') {
-        // $FlowFixMe
         return moment.duration(duration).format('h:mm:ss');
     }
 
-    // $FlowFixMe
     return moment.duration(duration).format('mm:ss', { trim: false });
 }
 
@@ -97,8 +94,6 @@ function _getSupportedLocale() {
                 // FIXME The flow-type definition of moment is v2.3 while our
                 // package.json states v2.19 so maybe locales on moment was
                 // introduced in between?
-                //
-                // $FlowFixMe
                 = moment.locales().find(lang => currentLocaleRegexp.exec(lang));
         }
     }

react/features/base/media/components/AbstractAudio.js

@@ -7,7 +7,7 @@ import { Component } from 'react';
  * playback.
  */
 export type AudioElement = {
-    currentTime?: number,
+    currentTime: number,
     pause: () => void,
     play: () => void,
     setSinkId?: string => void,

react/features/base/media/components/native/VideoTrack.js

@@ -2,7 +2,8 @@
 
 import React from 'react';
 import { View } from 'react-native';
-import { connect } from 'react-redux';
+
+import { connect } from '../../../redux';
 
 import AbstractVideoTrack from '../AbstractVideoTrack';
 import type { Props } from '../AbstractVideoTrack';
@@ -29,5 +30,4 @@ class VideoTrack extends AbstractVideoTrack<Props> {
     }
 }
 
-// $FlowExpectedError
 export default connect()(VideoTrack);

react/features/base/media/components/native/VideoTransform.js

@@ -2,9 +2,10 @@
 
 import React, { Component } from 'react';
 import { PanResponder, PixelRatio, View } from 'react-native';
-import { connect } from 'react-redux';
 import { type Dispatch } from 'redux';
 
+import { connect } from '../../../redux';
+
 import type { PanResponderInstance } from 'PanResponder';
 
 import { storeVideoTransform } from '../../actions';
@@ -727,5 +728,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps, _mapDispatchToProps)(VideoTransform);

react/features/base/media/components/web/VideoTrack.js

@@ -1,7 +1,8 @@
 /* @flow */
 
 import React from 'react';
-import { connect } from 'react-redux';
+
+import { connect } from '../../../redux';
 
 import AbstractVideoTrack from '../AbstractVideoTrack';
 import type { Props as AbstractVideoTrackProps } from '../AbstractVideoTrack';
@@ -63,5 +64,4 @@ class VideoTrack extends AbstractVideoTrack<Props> {
     _onVideoPlaying: () => void;
 }
 
-// $FlowExpectedError
 export default connect()(VideoTrack);

react/features/base/participants/components/Avatar.native.js

@@ -2,7 +2,10 @@
 
 import React, { Component, Fragment, PureComponent } from 'react';
 import { Dimensions, Image, Platform, View } from 'react-native';
-import FastImage from 'react-native-fast-image';
+import FastImage, {
+    type CacheControls,
+    type Priorities
+} from 'react-native-fast-image';
 
 import { ColorPalette } from '../../styles';
 
@@ -63,7 +66,12 @@ type State = {
     /**
      * Source for the non-local avatar.
      */
-    source: { uri: ?string }
+    source: {
+        uri?: string,
+        headers?: Object,
+        priority?: Priorities,
+        cache?: CacheControls,
+    }
 };
 
 /**
@@ -261,7 +269,7 @@ class AvatarContent extends Component<Props, State> {
             }
         }
 
-        return (// $FlowFixMe
+        return (
             <FastImage
                 onError = { this._onAvatarLoadError }
                 onLoadEnd = { this._onAvatarLoaded }

react/features/base/participants/components/ParticipantView.native.js

@@ -3,7 +3,6 @@
 import React, { Component } from 'react';
 import { Text, View } from 'react-native';
 import FastImage from 'react-native-fast-image';
-import { connect } from 'react-redux';
 
 import { translate } from '../../i18n';
 import { JitsiParticipantConnectionStatus } from '../../lib-jitsi-meet';
@@ -12,6 +11,7 @@ import {
     VideoTrack
 } from '../../media';
 import { Container, TintedView } from '../../react';
+import { connect } from '../../redux';
 import { StyleType } from '../../styles';
 import { TestHint } from '../../testing/components';
 import { getTrackByMediaTypeAndParticipant } from '../../tracks';

react/features/base/react/components/native/BackButton.js

@@ -2,10 +2,10 @@
 
 import React, { Component } from 'react';
 import { TouchableOpacity } from 'react-native';
-import { connect } from 'react-redux';
 
 import { ColorSchemeRegistry } from '../../../color-scheme';
 import { Icon } from '../../../font-icons';
+import { connect } from '../../../redux';
 
 /**
  * The type of the React {@code Component} props of {@link BackButton}
@@ -68,5 +68,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(BackButton);

react/features/base/react/components/native/ForwardButton.js

@@ -2,10 +2,10 @@
 
 import React, { Component } from 'react';
 import { Text, TouchableOpacity } from 'react-native';
-import { connect } from 'react-redux';
 
 import { ColorSchemeRegistry } from '../../../color-scheme';
 import { translate } from '../../../i18n';
+import { connect } from '../../../redux';
 
 /**
  * The type of the React {@code Component} props of {@link ForwardButton}

react/features/base/react/components/native/Header.js

@@ -2,9 +2,9 @@
 
 import React, { Component, type Node } from 'react';
 import { Platform, SafeAreaView, StatusBar, View } from 'react-native';
-import { connect } from 'react-redux';
 
 import { ColorSchemeRegistry } from '../../../color-scheme';
+import { connect } from '../../../redux';
 import { isDarkColor } from '../../../styles';
 
 import { HEADER_PADDING } from './headerstyles';
@@ -165,5 +165,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(Header);

react/features/base/react/components/native/HeaderLabel.js

@@ -2,10 +2,10 @@
 
 import React, { Component } from 'react';
 import { Text, View } from 'react-native';
-import { connect } from 'react-redux';
 
 import { ColorSchemeRegistry } from '../../../color-scheme';
 import { translate } from '../../../i18n';
+import { connect } from '../../../redux';
 
 /**
  * The type of the React {@code Component} props of {@link HeaderLabel}

react/features/base/react/components/native/LoadingIndicator.js

@@ -11,7 +11,7 @@ type Props = {
      * Prop to set the size of the indicator. This is the same as the
      * prop of the native component.
      */
-    size: 'large' | 'medium' | 'small'
+    size: 'large' | 'small'
 };
 
 /**
@@ -40,7 +40,7 @@ export default class LoadingIndicator extends Component<Props> {
             size
         };
 
-        return (// $FlowFixMe
+        return (
             <ActivityIndicator
                 animating = { true }
                 color = { ColorPalette.white }

react/features/base/react/components/native/PagedList.js

@@ -2,9 +2,9 @@
 
 import React, { Component } from 'react';
 import { SafeAreaView, Text, TouchableOpacity, View } from 'react-native';
-import { connect } from 'react-redux';
 
 import { Icon } from '../../../font-icons';
+import { connect } from '../../../redux';
 
 import styles from './styles';
 
@@ -283,5 +283,4 @@ class PagedList extends Component<Props, State> {
     }
 }
 
-// $FlowExpectedError
 export default connect()(PagedList);

react/features/base/react/components/web/Watermarks.js

@@ -1,9 +1,9 @@
 /* @flow */
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 
 import { translate } from '../../../i18n';
+import { connect } from '../../../redux';
 
 declare var interfaceConfig: Object;
 
@@ -242,5 +242,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(translate(Watermarks));

react/features/base/redux/functions.js

@@ -1,6 +1,7 @@
 // @flow
 
 import _ from 'lodash';
+import { connect as reduxConnect } from 'react-redux';
 
 /**
  * Sets specific properties of a specific state to specific values and prevents
@@ -25,6 +26,19 @@ export function assign(target: Object, source: Object) {
     return t;
 }
 
+/**
+ * Wrapper function for the react-redux connect function to avoid having to
+ * declare function types for flow, but still let flow warn for other errors.
+ *
+ * @param {Function?} mapStateToProps - Redux mapStateToProps function.
+ * @param {Function?} mapDispatchToProps - Redux mapDispatchToProps function.
+ * @returns {Connector}
+ */
+export function connect(
+        mapStateToProps?: Function, mapDispatchToProps?: Function) {
+    return reduxConnect<*, *, *, *, *, *>(mapStateToProps, mapDispatchToProps);
+}
+
 /**
  * Determines whether {@code a} equals {@code b} according to deep comparison
  * (which makes sense for Redux and its state definition).

react/features/base/responsive-ui/components/AspectRatioAware.js

@@ -1,7 +1,8 @@
 // @flow
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
+
+import { connect } from '../../redux';
 
 import { ASPECT_RATIO_NARROW, ASPECT_RATIO_WIDE } from '../constants';
 
@@ -51,7 +52,6 @@ export function makeAspectRatioAware(
         }
     }
 
-    // $FlowFixMe
     return connect(_mapStateToProps)(AspectRatioAware);
 }
 

react/features/base/responsive-ui/components/AspectRatioDetector.js

@@ -1,9 +1,10 @@
 // @flow
 
 import React, { Component, type Node } from 'react';
-import { connect } from 'react-redux';
 import { type Dispatch } from 'redux';
 
+import { connect } from '../../redux';
+
 import { setAspectRatio } from '../actions';
 import DimensionsDetector from './DimensionsDetector';
 
@@ -69,5 +70,4 @@ function _mapDispatchToProps(dispatch: Dispatch<any>) {
     };
 }
 
-// $FlowExpectedError
 export default connect(undefined, _mapDispatchToProps)(AspectRatioDetector);

react/features/base/responsive-ui/components/ReducedUIDetector.js

@@ -1,9 +1,10 @@
 // @flow
 
 import React, { Component, type Node } from 'react';
-import { connect } from 'react-redux';
 import { type Dispatch } from 'redux';
 
+import { connect } from '../../redux';
+
 import { setReducedUI } from '../actions';
 import DimensionsDetector from './DimensionsDetector';
 
@@ -70,5 +71,4 @@ function _mapDispatchToProps(dispatch: Dispatch<any>) {
     };
 }
 
-// $FlowExpectedError
 export default connect(undefined, _mapDispatchToProps)(ReducedUIDetector);

react/features/base/sounds/components/SoundCollection.js

@@ -1,10 +1,10 @@
 // @flow
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 
 import { Audio } from '../../media';
 import type { AudioElement } from '../../media';
+import { connect } from '../../redux';
 
 import { _addAudioElement, _removeAudioElement } from '../actions';
 import type { Sound } from '../reducer';
@@ -153,5 +153,4 @@ export function _mapDispatchToProps(dispatch: Function) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps, _mapDispatchToProps)(SoundCollection);

react/features/base/testing/components/TestConnectionInfo.js

@@ -1,9 +1,9 @@
 // @flow
 
 import React, { Component, Fragment } from 'react';
-import { connect } from 'react-redux';
 
 import { getLocalParticipant } from '../../participants';
+import { connect } from '../../redux';
 
 // FIXME this imports feature to 'base'
 import { statsEmitter } from '../../../connection-indicator';
@@ -215,5 +215,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(TestConnectionInfo);

react/features/base/testing/components/TestHint.android.js

@@ -1,9 +1,10 @@
 /* @flow */
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 import { Text } from 'react-native';
 
+import { connect } from '../../redux';
+
 import type { TestHintProps } from './AbstractTestHint';
 import { _mapStateToProps } from './AbstractTestHint';
 

react/features/base/testing/components/TestHint.ios.js

@@ -1,9 +1,10 @@
 /* @flow */
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 import { Text } from 'react-native';
 
+import { connect } from '../../redux';
+
 import type { TestHintProps } from './AbstractTestHint';
 import { _mapStateToProps } from './AbstractTestHint';
 
@@ -34,5 +35,4 @@ class TestHint extends Component<TestHintProps> {
     }
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(TestHint);

react/features/calendar-sync/components/AddMeetingUrlButton.web.js

@@ -2,7 +2,6 @@
 
 import Tooltip from '@atlaskit/tooltip';
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
 import {
@@ -10,6 +9,7 @@ import {
     sendAnalytics
 } from '../../analytics';
 import { translate } from '../../base/i18n';
+import { connect } from '../../base/redux';
 
 import { updateCalendarEvent } from '../actions';
 

react/features/calendar-sync/components/CalendarList.native.js

@@ -2,11 +2,11 @@
 
 import React from 'react';
 import { Text, TouchableOpacity, View } from 'react-native';
-import { connect } from 'react-redux';
 
 import { openSettings } from '../../mobile/permissions';
 import { translate } from '../../base/i18n';
 import { AbstractPage } from '../../base/react';
+import { connect } from '../../base/redux';
 
 import { refreshCalendar } from '../actions';
 import { isCalendarEnabled } from '../functions';

react/features/calendar-sync/components/CalendarList.web.js

@@ -2,10 +2,10 @@
 
 import Spinner from '@atlaskit/spinner';
 import React from 'react';
-import { connect } from 'react-redux';
 
 import { translate } from '../../base/i18n';
 import { AbstractPage } from '../../base/react';
+import { connect } from '../../base/redux';
 import { openSettingsDialog, SETTINGS_TABS } from '../../settings';
 import {
     createCalendarClickedEvent,

react/features/calendar-sync/components/CalendarListContent.native.js

@@ -1,7 +1,6 @@
 // @flow
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 
 import { appNavigate } from '../../app';
 import {
@@ -11,6 +10,7 @@ import {
 } from '../../analytics';
 import { getLocalizedDateFormatter, translate } from '../../base/i18n';
 import { NavigateSectionList } from '../../base/react';
+import { connect } from '../../base/redux';
 
 import { refreshCalendar, openUpdateCalendarEventDialog } from '../actions';
 import { isCalendarEnabled } from '../functions';

react/features/calendar-sync/components/CalendarListContent.web.js

@@ -1,7 +1,6 @@
 // @flow
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 
 import { appNavigate } from '../../app';
 import {
@@ -10,6 +9,7 @@ import {
     sendAnalytics
 } from '../../analytics';
 import { MeetingsList } from '../../base/react';
+import { connect } from '../../base/redux';
 
 import { isCalendarEnabled } from '../functions';
 
@@ -173,7 +173,5 @@ function _mapStateToProps(state: Object) {
 }
 
 export default isCalendarEnabled()
-
-    // $FlowExpectedError
     ? connect(_mapStateToProps)(CalendarListContent)
     : undefined;

react/features/calendar-sync/components/ConferenceNotification.native.js

@@ -2,12 +2,12 @@
 
 import React, { Component } from 'react';
 import { Text, TouchableOpacity, View } from 'react-native';
-import { connect } from 'react-redux';
 
 import { appNavigate } from '../../app';
 import { getURLWithoutParamsNormalized } from '../../base/connection';
 import { Icon } from '../../base/font-icons';
 import { getLocalizedDateFormatter, translate } from '../../base/i18n';
+import { connect } from '../../base/redux';
 import { ASPECT_RATIO_NARROW } from '../../base/responsive-ui';
 
 import { isCalendarEnabled } from '../functions';

react/features/calendar-sync/components/UpdateCalendarEventDialog.native.js

@@ -1,10 +1,10 @@
 // @flow
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 
 import { ConfirmDialog } from '../../base/dialog';
 import { translate } from '../../base/i18n';
+import { connect } from '../../base/redux';
 
 import { updateCalendarEvent } from '../actions';
 

react/features/calendar-sync/functions.any.js

@@ -107,15 +107,16 @@ export function _updateCalendarEntries(events: Array<Object>) {
  */
 function _checkPattern(str, positivePattern, negativePattern) {
     const positiveRegExp = new RegExp(positivePattern, 'gi');
-    let positiveMatch;
+    let positiveMatch = positiveRegExp.exec(str);
 
-    while ((positiveMatch = positiveRegExp.exec(str)) !== null) {
-        // $FlowFixMe
+    while (positiveMatch !== null) {
         const url = positiveMatch[0];
 
         if (!new RegExp(negativePattern, 'gi').exec(url)) {
             return url;
         }
+
+        positiveMatch = positiveRegExp.exec(str);
     }
 }
 

react/features/calendar-sync/reducer.js

@@ -63,7 +63,6 @@ isCalendarEnabled()
             // knownDomains. At this point, it should have already been
             // translated into the new state format (namely, base/known-domains)
             // and the app no longer needs it.
-            // $FlowFixMe
             if (typeof state.knownDomains !== 'undefined') {
                 return set(state, 'knownDomains', undefined);
             }

react/features/chat/components/native/Chat.js

@@ -3,10 +3,10 @@
 import React from 'react';
 import { SafeAreaView } from 'react-native';
 import { GiftedChat } from 'react-native-gifted-chat';
-import { connect } from 'react-redux';
 
 import { translate } from '../../../base/i18n';
 import { BackButton, Header, HeaderLabel, Modal } from '../../../base/react';
+import { connect } from '../../../base/redux';
 
 import AbstractChat, {
     _mapDispatchToProps,

react/features/chat/components/native/ChatButton.js

@@ -1,8 +1,7 @@
 // @flow
 
-import { connect } from 'react-redux';
-
 import { getLocalParticipant } from '../../../base/participants';
+import { connect } from '../../../base/redux';
 import {
     AbstractButton,
     type AbstractButtonProps
@@ -126,5 +125,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps, _mapDispatchToProps)(ChatButton);

react/features/chat/components/native/ChatMessage.js

@@ -2,10 +2,10 @@
 
 import React from 'react';
 import { Text, View } from 'react-native';
-import { connect } from 'react-redux';
 
 import { getLocalizedDateFormatter, translate } from '../../../base/i18n';
 import { Avatar } from '../../../base/participants';
+import { connect } from '../../../base/redux';
 
 import AbstractChatMessage, {
     _mapStateToProps as _abstractMapStateToProps,

react/features/chat/components/web/Chat.js

@@ -1,10 +1,10 @@
 // @flow
 
 import React from 'react';
-import { connect } from 'react-redux';
 import Transition from 'react-transition-group/Transition';
 
 import { translate } from '../../../base/i18n';
+import { connect } from '../../../base/redux';
 
 import AbstractChat, {
     _mapDispatchToProps,

react/features/chat/components/web/ChatCounter.js

@@ -1,7 +1,8 @@
 // @flow
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
+
+import { connect } from '../../../base/redux';
 
 import { getUnreadCount } from '../../functions';
 
@@ -57,5 +58,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(ChatCounter);

react/features/chat/components/web/ChatInput.js

@@ -1,10 +1,11 @@
 // @flow
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 import Emoji from 'react-emoji-render';
 import type { Dispatch } from 'redux';
 
+import { connect } from '../../../base/redux';
+
 import { sendMessage } from '../../actions';
 
 import SmileysPanel from './SmileysPanel';
@@ -232,5 +233,4 @@ class ChatInput extends Component<Props, State> {
     }
 }
 
-// $FlowExpectedError
 export default connect()(ChatInput);

react/features/chat/components/web/DisplayNameForm.js

@@ -2,10 +2,10 @@
 
 import { FieldTextStateless } from '@atlaskit/field-text';
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
 import { translate } from '../../../base/i18n';
+import { connect } from '../../../base/redux';
 import { updateSettings } from '../../../base/settings';
 
 /**

react/features/conference/components/native/Conference.js

@@ -3,12 +3,12 @@
 import React from 'react';
 
 import { BackHandler, SafeAreaView, StatusBar, View } from 'react-native';
-import { connect as reactReduxConnect } from 'react-redux';
 
 import { appNavigate } from '../../../app';
 import { connect, disconnect } from '../../../base/connection';
 import { getParticipantCount } from '../../../base/participants';
 import { Container, LoadingIndicator, TintedView } from '../../../base/react';
+import { connect as reactReduxConnect } from '../../../base/redux';
 import {
     isNarrowAspectRatio,
     makeAspectRatioAware
@@ -540,6 +540,5 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowFixMe
 export default reactReduxConnect(_mapStateToProps, _mapDispatchToProps)(
     makeAspectRatioAware(Conference));

react/features/conference/components/native/DisplayNameLabel.js

@@ -2,13 +2,13 @@
 
 import React, { Component } from 'react';
 import { Text, View } from 'react-native';
-import { connect } from 'react-redux';
 
 import {
     getLocalParticipant,
     getParticipantDisplayName,
     shouldRenderParticipantVideo
 } from '../../../base/participants';
+import { connect } from '../../../base/redux';
 
 import { shouldDisplayTileView } from '../../../video-layout';
 
@@ -76,5 +76,4 @@ function _mapStateToProps(state: Object) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(DisplayNameLabel);

react/features/conference/components/native/Labels.js

@@ -2,9 +2,9 @@
 
 import React from 'react';
 import { TouchableOpacity, View } from 'react-native';
-import { connect } from 'react-redux';
 
 import { JitsiRecordingConstants } from '../../../base/lib-jitsi-meet';
+import { connect } from '../../../base/redux';
 import {
     isNarrowAspectRatio,
     makeAspectRatioAware
@@ -370,5 +370,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(makeAspectRatioAware(Labels));

react/features/conference/components/native/NavigationBar.js

@@ -4,9 +4,9 @@ import _ from 'lodash';
 import React, { Component } from 'react';
 import { SafeAreaView, Text, View } from 'react-native';
 import LinearGradient from 'react-native-linear-gradient';
-import { connect } from 'react-redux';
 
 import { getConferenceName } from '../../../base/conference';
+import { connect } from '../../../base/redux';
 import { PictureInPictureButton } from '../../../mobile/picture-in-picture';
 import { isToolboxVisible } from '../../../toolbox';
 
@@ -87,5 +87,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(NavigationBar);

react/features/conference/components/web/Conference.js

@@ -2,13 +2,13 @@
 
 import _ from 'lodash';
 import React from 'react';
-import { connect as reactReduxConnect } from 'react-redux';
 
 import VideoLayout from '../../../../../modules/UI/videolayout/VideoLayout';
 
 import { obtainConfig } from '../../../base/config';
 import { connect, disconnect } from '../../../base/connection';
 import { translate } from '../../../base/i18n';
+import { connect as reactReduxConnect } from '../../../base/redux';
 import { Chat } from '../../../chat';
 import { Filmstrip } from '../../../filmstrip';
 import { CalleeInfoContainer } from '../../../invite';
@@ -293,5 +293,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default reactReduxConnect(_mapStateToProps)(translate(Conference));

react/features/conference/components/web/Labels.js

@@ -1,9 +1,9 @@
 // @flow
 
 import React from 'react';
-import { connect } from 'react-redux';
 
 import { JitsiRecordingConstants } from '../../../base/lib-jitsi-meet';
+import { connect } from '../../../base/redux';
 
 import AbstractLabels, {
     _abstractMapStateToProps as _mapStateToProps,
@@ -105,5 +105,4 @@ class Labels extends AbstractLabels<Props, State> {
     _renderVideoQualityLabel: () => React$Element<*>;
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(Labels);

react/features/conference/components/web/Notice.js

@@ -1,9 +1,9 @@
 /* @flow */
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 
 import { translate } from '../../../base/i18n';
+import { connect } from '../../../base/redux';
 
 declare var config: Object;
 

react/features/conference/components/web/Subject.js

@@ -1,8 +1,8 @@
 /* @flow */
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 
+import { connect } from '../../../base/redux';
 import { isToolboxVisible } from '../../../toolbox';
 
 /**
@@ -65,5 +65,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(Subject);

react/features/deep-linking/components/DeepLinkingDesktopPage.web.js

@@ -3,7 +3,7 @@
 import Button, { ButtonGroup } from '@atlaskit/button';
 import { AtlasKitThemeProvider } from '@atlaskit/theme';
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
+import { connect } from '../../base/redux';
 import type { Dispatch } from 'redux';
 
 import { createDeepLinkingPageEvent, sendAnalytics } from '../../analytics';

react/features/deep-linking/components/DeepLinkingMobilePage.web.js

@@ -1,7 +1,7 @@
 // @flow
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
+import { connect } from '../../base/redux';
 
 import { createDeepLinkingPageEvent, sendAnalytics } from '../../analytics';
 import { translate, translateToHTML } from '../../base/i18n';

react/features/desktop-picker/components/DesktopPicker.js

@@ -2,7 +2,7 @@
 
 import Tabs from '@atlaskit/tabs';
 import React, { PureComponent } from 'react';
-import { connect } from 'react-redux';
+import { connect } from '../../base/redux';
 import type { Dispatch } from 'redux';
 
 import { Dialog, hideDialog } from '../../base/dialog';

react/features/display-name/components/DisplayName.web.js

@@ -1,7 +1,7 @@
 /* @flow */
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
+import { connect } from '../../base/redux';
 import type { Dispatch } from 'redux';
 
 import { appendSuffix } from '../functions';

react/features/display-name/components/DisplayNamePrompt.native.js

@@ -1,7 +1,7 @@
 // @flow
 
 import React from 'react';
-import { connect } from 'react-redux';
+import { connect } from '../../base/redux';
 
 import { InputDialog } from '../../base/dialog';
 
@@ -27,5 +27,4 @@ class DisplayNamePrompt extends AbstractDisplayNamePrompt<*> {
     _onSetDisplayName: string => boolean;
 }
 
-// $FlowExpectedError
 export default connect()(DisplayNamePrompt);

react/features/display-name/components/DisplayNamePrompt.web.js

@@ -1,7 +1,7 @@
 /* @flow */
 
 import React from 'react';
-import { connect } from 'react-redux';
+import { connect } from '../../base/redux';
 import { FieldTextStateless as TextField } from '@atlaskit/field-text';
 
 import { Dialog } from '../../base/dialog';

react/features/feedback/components/FeedbackDialog.web.js

@@ -4,7 +4,7 @@ import { FieldTextAreaStateless } from '@atlaskit/field-text-area';
 import StarIcon from '@atlaskit/icon/glyph/star';
 import StarFilledIcon from '@atlaskit/icon/glyph/star-filled';
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
+import { connect } from '../../base/redux';
 import type { Dispatch } from 'redux';
 
 import {

react/features/filmstrip/components/native/Filmstrip.js

@@ -2,9 +2,9 @@
 
 import React, { Component } from 'react';
 import { ScrollView } from 'react-native';
-import { connect } from 'react-redux';
 
 import { Container, Platform } from '../../../base/react';
+import { connect } from '../../../base/redux';
 import {
     isNarrowAspectRatio,
     makeAspectRatioAware
@@ -219,5 +219,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(makeAspectRatioAware(Filmstrip));

react/features/filmstrip/components/native/LocalThumbnail.js

@@ -2,9 +2,9 @@
 
 import React, { Component } from 'react';
 import { View } from 'react-native';
-import { connect } from 'react-redux';
 
 import { getLocalParticipant } from '../../../base/participants';
+import { connect } from '../../../base/redux';
 
 import styles from '../styles';
 import Thumbnail from './Thumbnail';
@@ -60,5 +60,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(LocalThumbnail);

react/features/filmstrip/components/native/Thumbnail.js

@@ -1,7 +1,6 @@
 // @flow
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
 import { ColorSchemeRegistry } from '../../../base/color-scheme';
@@ -14,6 +13,7 @@ import {
     pinParticipant
 } from '../../../base/participants';
 import { Container } from '../../../base/react';
+import { connect } from '../../../base/redux';
 import { StyleType } from '../../../base/styles';
 import { getTrackByMediaTypeAndParticipant } from '../../../base/tracks';
 
@@ -255,5 +255,4 @@ function _mapStateToProps(state, ownProps) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps, _mapDispatchToProps)(Thumbnail);

react/features/filmstrip/components/native/TileView.js

@@ -6,13 +6,13 @@ import {
     TouchableWithoutFeedback,
     View
 } from 'react-native';
-import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
 import {
     getNearestReceiverVideoQualityLevel,
     setMaxReceiverVideoQuality
 } from '../../../base/conference';
+import { connect } from '../../../base/redux';
 import {
     DimensionsDetector,
     isNarrowAspectRatio,
@@ -335,5 +335,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(makeAspectRatioAware(TileView));

react/features/filmstrip/components/web/Filmstrip.js

@@ -2,7 +2,6 @@
 
 import _ from 'lodash';
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
 import {
@@ -10,6 +9,7 @@ import {
     createToolbarEvent,
     sendAnalytics
 } from '../../../analytics';
+import { connect } from '../../../base/redux';
 import { dockToolbox } from '../../../toolbox';
 
 import { setFilmstripHovered, setFilmstripVisible } from '../../actions';
@@ -319,5 +319,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(Filmstrip);

react/features/filmstrip/components/web/Toolbar.js

@@ -1,8 +1,8 @@
 // @flow
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 
+import { connect } from '../../../base/redux';
 import { SettingsButton } from '../../../settings';
 import {
     AudioMuteButton,
@@ -90,5 +90,4 @@ function _mapStateToProps(state): Object { // eslint-disable-line no-unused-vars
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(Toolbar);

react/features/invite/components/InfoDialogButton.web.js

@@ -2,7 +2,6 @@
 
 import InlineDialog from '@atlaskit/inline-dialog';
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
 import { createToolbarEvent, sendAnalytics } from '../../analytics';
@@ -11,6 +10,7 @@ import { translate } from '../../base/i18n';
 import { JitsiRecordingConstants } from '../../base/lib-jitsi-meet';
 import { getParticipantCount } from '../../base/participants';
 import { OverflowMenuItem } from '../../base/toolbox';
+import { connect } from '../../base/redux';
 import { getActiveSession } from '../../recording';
 import { ToolbarButton } from '../../toolbox';
 import { updateDialInNumbers } from '../actions';

react/features/invite/components/InviteButton.native.js

@@ -1,9 +1,9 @@
 // @flow
 
-import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
 import { translate } from '../../base/i18n';
+import { connect } from '../../base/redux';
 import { AbstractButton } from '../../base/toolbox';
 import type { AbstractButtonProps } from '../../base/toolbox';
 import { beginShareRoom } from '../../share-room';

react/features/invite/components/add-people-dialog/native/AddPeopleDialog.js

@@ -11,7 +11,6 @@ import {
     TouchableOpacity,
     View
 } from 'react-native';
-import { connect } from 'react-redux';
 
 import { Icon } from '../../../../base/font-icons';
 import { translate } from '../../../../base/i18n';
@@ -24,6 +23,7 @@ import {
     Modal,
     type Item
 } from '../../../../base/react';
+import { connect } from '../../../../base/redux';
 
 import { setAddPeopleDialogVisible } from '../../../actions';
 

react/features/invite/components/add-people-dialog/web/AddPeopleDialog.js

@@ -3,7 +3,6 @@
 import Avatar from '@atlaskit/avatar';
 import InlineMessage from '@atlaskit/inline-message';
 import React from 'react';
-import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
 import { createInviteDialogEvent, sendAnalytics } from '../../../../analytics';
@@ -11,6 +10,7 @@ import { Dialog, hideDialog } from '../../../../base/dialog';
 import { translate, translateToHTML } from '../../../../base/i18n';
 import { getLocalParticipant } from '../../../../base/participants';
 import { MultiSelectAutocomplete } from '../../../../base/react';
+import { connect } from '../../../../base/redux';
 
 import AbstractAddPeopleDialog, {
     type Props as AbstractProps,

react/features/invite/components/callee-info/CalleeInfo.js

@@ -1,7 +1,6 @@
 // @flow
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 
 import { MEDIA_TYPE } from '../../../base/media';
 import {
@@ -12,6 +11,7 @@ import {
     getParticipantPresenceStatus
 } from '../../../base/participants';
 import { Container, Text } from '../../../base/react';
+import { connect } from '../../../base/redux';
 import { isLocalTrackMuted } from '../../../base/tracks';
 import { CALLING, PresenceLabel } from '../../../presence-status';
 
@@ -158,5 +158,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(CalleeInfo);

react/features/invite/components/callee-info/CalleeInfoContainer.js

@@ -1,7 +1,8 @@
 // @flow
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
+
+import { connect } from '../../../base/redux';
 
 import CalleeInfo from './CalleeInfo';
 
@@ -61,5 +62,4 @@ function _mapStateToProps(state: Object): Object {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(CalleeInfoContainer);

react/features/invite/components/info-dialog/InfoDialog.web.js

@@ -1,13 +1,13 @@
 /* @flow */
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
 import { setPassword } from '../../../base/conference';
 import { getInviteURL } from '../../../base/connection';
 import { Dialog } from '../../../base/dialog';
 import { translate } from '../../../base/i18n';
+import { connect } from '../../../base/redux';
 import { isLocalParticipantModerator } from '../../../base/participants';
 
 import { _getDefaultPhoneNumber, getDialInfoPageURL } from '../../functions';

react/features/large-video/components/LargeVideo.native.js

@@ -1,10 +1,10 @@
 // @flow
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 
 import { ColorSchemeRegistry } from '../../base/color-scheme';
 import { ParticipantView } from '../../base/participants';
+import { connect } from '../../base/redux';
 import { DimensionsDetector } from '../../base/responsive-ui';
 import { StyleType } from '../../base/styles';
 
@@ -159,5 +159,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(LargeVideo);

react/features/local-recording/components/LocalRecordingInfoDialog.js

@@ -2,7 +2,6 @@
 
 import moment from 'moment';
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
 import { Dialog } from '../../base/dialog';
@@ -11,6 +10,7 @@ import {
     PARTICIPANT_ROLE,
     getLocalParticipant
 } from '../../base/participants';
+import { connect } from '../../base/redux';
 
 import { statsUpdate } from '../actions';
 import { recordingController } from '../controller';

react/features/local-recording/components/LocalRecordingLabel.web.js

@@ -2,10 +2,10 @@
 
 import Tooltip from '@atlaskit/tooltip';
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 
 import { translate } from '../../base/i18n/index';
 import { CircularLabel } from '../../base/label/index';
+import { connect } from '../../base/redux';
 
 
 /**

react/features/mobile/audio-mode/components/AudioRouteButton.js

@@ -7,10 +7,10 @@ import {
     requireNativeComponent,
     View
 } from 'react-native';
-import { connect } from 'react-redux';
 
 import { openDialog } from '../../../base/dialog';
 import { translate } from '../../../base/i18n';
+import { connect } from '../../../base/redux';
 import { AbstractButton } from '../../../base/toolbox';
 import type { AbstractButtonProps } from '../../../base/toolbox';
 

react/features/mobile/audio-mode/components/AudioRoutePickerDialog.js

@@ -3,11 +3,11 @@
 import _ from 'lodash';
 import React, { Component } from 'react';
 import { NativeModules, Text, TouchableHighlight, View } from 'react-native';
-import { connect } from 'react-redux';
 
 import { hideDialog, BottomSheet } from '../../../base/dialog';
 import { translate } from '../../../base/i18n';
 import { Icon } from '../../../base/font-icons';
+import { connect } from '../../../base/redux';
 import { ColorPalette } from '../../../base/styles';
 
 import styles from './styles';

react/features/mobile/incoming-call/components/AnswerButton.js

@@ -1,8 +1,7 @@
 // @flow
 
-import { connect } from 'react-redux';
-
 import { translate } from '../../../base/i18n';
+import { connect } from '../../../base/redux';
 import { AbstractButton } from '../../../base/toolbox';
 import type { AbstractButtonProps } from '../../../base/toolbox';
 

react/features/mobile/incoming-call/components/DeclineButton.js

@@ -1,8 +1,7 @@
 // @flow
 
-import { connect } from 'react-redux';
-
 import { translate } from '../../../base/i18n';
+import { connect } from '../../../base/redux';
 import { AbstractButton } from '../../../base/toolbox';
 import type { AbstractButtonProps } from '../../../base/toolbox';
 

react/features/mobile/incoming-call/components/IncomingCallPage.js

@@ -3,10 +3,10 @@
 import React, { Component } from 'react';
 import { Image, Text, View } from 'react-native';
 import LinearGradient from 'react-native-linear-gradient';
-import { connect } from 'react-redux';
 
 import { translate } from '../../../base/i18n';
 import { Avatar } from '../../../base/participants';
+import { connect } from '../../../base/redux';
 
 import AnswerButton from './AnswerButton';
 import DeclineButton from './DeclineButton';

react/features/mobile/network-activity/components/NetworkActivityIndicator.js

@@ -1,9 +1,9 @@
 // @flow
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 
 import { LoadingIndicator } from '../../../base/react';
+import { connect } from '../../../base/redux';
 
 /**
  * The type of the React {@code Component} props of
@@ -52,5 +52,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(NetworkActivityIndicator);

react/features/mobile/picture-in-picture/components/PictureInPictureButton.js

@@ -1,9 +1,8 @@
 // @flow
 
-import { connect } from 'react-redux';
-
 import { getAppProp } from '../../../base/app';
 import { translate } from '../../../base/i18n';
+import { connect } from '../../../base/redux';
 import { AbstractButton } from '../../../base/toolbox';
 import type { AbstractButtonProps } from '../../../base/toolbox';
 

react/features/notifications/components/NotificationsContainer.native.js

@@ -2,7 +2,8 @@
 
 import React from 'react';
 import { View } from 'react-native';
-import { connect } from 'react-redux';
+
+import { connect } from '../../base/redux';
 
 import AbstractNotificationsContainer, {
     _abstractMapStateToProps,
@@ -63,5 +64,4 @@ class NotificationsContainer
     _onDismissed: number => void;
 }
 
-// $FlowExpectedError
 export default connect(_abstractMapStateToProps)(NotificationsContainer);

react/features/notifications/components/NotificationsContainer.web.js

@@ -2,7 +2,8 @@
 
 import { FlagGroup } from '@atlaskit/flag';
 import React from 'react';
-import { connect } from 'react-redux';
+
+import { connect } from '../../base/redux';
 
 import AbstractNotificationsContainer, {
     _abstractMapStateToProps as _mapStateToProps,
@@ -63,5 +64,4 @@ class NotificationsContainer extends AbstractNotificationsContainer<Props> {
     }
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(NotificationsContainer);

react/features/overlay/components/FilmstripOnlyOverlayFrame.js

@@ -1,13 +1,13 @@
 // @flow
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 
 import {
     Avatar,
     getAvatarURL,
     getLocalParticipant
 } from '../../base/participants';
+import { connect } from '../../base/redux';
 
 import OverlayFrame from './OverlayFrame';
 
@@ -112,5 +112,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(FilmstripOnlyOverlayFrame);

react/features/overlay/components/OverlayContainer.js

@@ -1,7 +1,8 @@
 // @flow
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
+
+import { connect } from '../../base/redux';
 
 import { getOverlayToRender } from '../functions';
 
@@ -58,5 +59,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(OverlayContainer);

react/features/overlay/components/PageReloadFilmstripOnlyOverlay.js

@@ -1,7 +1,7 @@
 import React from 'react';
-import { connect } from 'react-redux';
 
 import { translate } from '../../base/i18n';
+import { connect } from '../../base/redux';
 
 import AbstractPageReloadOverlay, { abstractMapStateToProps }
     from './AbstractPageReloadOverlay';

react/features/overlay/components/PageReloadOverlay.native.js

@@ -2,12 +2,12 @@
 
 import React from 'react';
 import { Text } from 'react-native';
-import { connect } from 'react-redux';
 
 import { appNavigate, reloadNow } from '../../app';
 import { ColorSchemeRegistry } from '../../base/color-scheme';
 import { ConfirmDialog } from '../../base/dialog';
 import { translate } from '../../base/i18n';
+import { connect } from '../../base/redux';
 import { StyleType } from '../../base/styles';
 
 import AbstractPageReloadOverlay, {

react/features/overlay/components/PageReloadOverlay.web.js

@@ -1,9 +1,9 @@
 // @flow
 
 import React from 'react';
-import { connect } from 'react-redux';
 
 import { translate } from '../../base/i18n';
+import { connect } from '../../base/redux';
 
 import AbstractPageReloadOverlay, {
     abstractMapStateToProps,

react/features/overlay/components/ReloadButton.js

@@ -1,10 +1,10 @@
 /* @flow */
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 
 import { reloadNow } from '../../app';
 import { translate } from '../../base/i18n';
+import { connect } from '../../base/redux';
 
 /**
  * The type of the React {@code Component} props of {@link ReloadButton}.

react/features/overlay/components/UserMediaPermissionsFilmstripOnlyOverlay.js

@@ -1,7 +1,7 @@
 import React from 'react';
-import { connect } from 'react-redux';
 
 import { translate, translateToHTML } from '../../base/i18n';
+import { connect } from '../../base/redux';
 
 import AbstractUserMediaPermissionsOverlay, { abstractMapStateToProps }
     from './AbstractUserMediaPermissionsOverlay';

react/features/overlay/components/UserMediaPermissionsOverlay.js

@@ -1,9 +1,9 @@
 /* global interfaceConfig */
 
 import React from 'react';
-import { connect } from 'react-redux';
 
 import { translate, translateToHTML } from '../../base/i18n';
+import { connect } from '../../base/redux';
 
 import AbstractUserMediaPermissionsOverlay, { abstractMapStateToProps }
     from './AbstractUserMediaPermissionsOverlay';

react/features/presence-status/components/PresenceLabel.js

@@ -1,11 +1,11 @@
 /* @flow */
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 
 import { translate } from '../../base/i18n';
 import { getParticipantById } from '../../base/participants';
 import { Text } from '../../base/react';
+import { connect } from '../../base/redux';
 
 import { STATUS_TO_I18N_KEY } from '../constants';
 

react/features/recent-list/components/RecentList.native.js

@@ -1,13 +1,12 @@
 // @flow
 
 import React from 'react';
-import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
 import { getDefaultURL } from '../../app';
 import { translate } from '../../base/i18n';
-import { NavigateSectionList } from '../../base/react';
-import type { Section } from '../../base/react';
+import { NavigateSectionList, type Section } from '../../base/react';
+import { connect } from '../../base/redux';
 
 import { deleteRecentListEntry } from '../actions';
 import { isRecentListEnabled, toDisplayableList } from '../functions';

react/features/recent-list/components/RecentList.web.js

@@ -1,11 +1,11 @@
 // @flow
 
 import React from 'react';
-import { connect } from 'react-redux';
 import type { Dispatch } from 'redux';
 
 import { translate } from '../../base/i18n';
 import { MeetingsList } from '../../base/react';
+import { connect } from '../../base/redux';
 
 import AbstractRecentList from './AbstractRecentList';
 import { isRecentListEnabled, toDisplayableList } from '../functions';

react/features/recording/components/LiveStream/native/GoogleSigninForm.js

@@ -2,10 +2,10 @@
 
 import React, { Component } from 'react';
 import { Text, View } from 'react-native';
-import { connect } from 'react-redux';
 
 import { _abstractMapStateToProps } from '../../../../base/dialog';
 import { translate } from '../../../../base/i18n';
+import { connect } from '../../../../base/redux';
 import { StyleType } from '../../../../base/styles';
 
 import {