Remove some Flow annotations

react/features/toolbox/components/AudioMuteButton.js

@@ -1,7 +1,5 @@
 // @flow
 
-import { connect } from 'react-redux';
-
 import {
     ACTION_SHORTCUT_TRIGGERED,
     AUDIO_MUTE,
@@ -11,6 +9,7 @@ import {
 } from '../../analytics';
 import { translate } from '../../base/i18n';
 import { MEDIA_TYPE, setAudioMuted } from '../../base/media';
+import { connect } from '../../base/redux';
 import { AbstractAudioMuteButton } from '../../base/toolbox';
 import type { AbstractButtonProps } from '../../base/toolbox';
 import { isLocalTrackMuted } from '../../base/tracks';

react/features/toolbox/components/HangupButton.js

@@ -1,11 +1,11 @@
 // @flow
 
-import { connect } from 'react-redux';
 
 import { createToolbarEvent, sendAnalytics } from '../../analytics';
 import { appNavigate } from '../../app';
 import { disconnect } from '../../base/connection';
 import { translate } from '../../base/i18n';
+import { connect } from '../../base/redux';
 import { AbstractHangupButton } from '../../base/toolbox';
 import type { AbstractButtonProps } from '../../base/toolbox';
 

react/features/toolbox/components/VideoMuteButton.js

@@ -1,7 +1,5 @@
 // @flow
 
-import { connect } from 'react-redux';
-
 import {
     ACTION_SHORTCUT_TRIGGERED,
     VIDEO_MUTE,
@@ -15,6 +13,7 @@ import {
     VIDEO_MUTISM_AUTHORITY,
     setVideoMuted
 } from '../../base/media';
+import { connect } from '../../base/redux';
 import { AbstractVideoMuteButton } from '../../base/toolbox';
 import type { AbstractButtonProps } from '../../base/toolbox';
 import { isLocalTrackMuted } from '../../base/tracks';

react/features/toolbox/components/native/AudioOnlyButton.js

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

react/features/toolbox/components/native/OverflowMenu.js

@@ -2,13 +2,13 @@
 
 import React, { Component } from 'react';
 import { Platform } from 'react-native';
-import { connect } from 'react-redux';
 
 import { ColorSchemeRegistry } from '../../../base/color-scheme';
 import {
     BottomSheet,
     hideDialog
 } from '../../../base/dialog';
+import { connect } from '../../../base/redux';
 import { StyleType } from '../../../base/styles';
 import { InviteButton } from '../../../invite';
 import { AudioRouteButton } from '../../../mobile/audio-mode';
@@ -128,7 +128,6 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 OverflowMenu_ = connect(_mapStateToProps)(OverflowMenu);
 
 export default OverflowMenu_;

react/features/toolbox/components/native/OverflowMenuButton.js

@@ -1,9 +1,8 @@
 // @flow
 
-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/toolbox/components/native/ToggleCameraButton.js

@@ -1,9 +1,8 @@
 // @flow
 
-import { connect } from 'react-redux';
-
 import { translate } from '../../../base/i18n';
 import { MEDIA_TYPE, toggleCameraFacingMode } from '../../../base/media';
+import { connect } from '../../../base/redux';
 import { AbstractButton } from '../../../base/toolbox';
 import type { AbstractButtonProps } from '../../../base/toolbox';
 import { isLocalTrackMuted } from '../../../base/tracks';

react/features/toolbox/components/native/Toolbox.js

@@ -2,10 +2,10 @@
 
 import React, { Component } from 'react';
 import { View } from 'react-native';
-import { connect } from 'react-redux';
 
 import { Container } from '../../../base/react';
 import { ColorSchemeRegistry } from '../../../base/color-scheme';
+import { connect } from '../../../base/redux';
 import { StyleType } from '../../../base/styles';
 import { ChatButton } from '../../../chat';
 
@@ -279,5 +279,4 @@ function _mapStateToProps(state: Object): Object {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(Toolbox);

react/features/toolbox/components/web/OverflowMenuProfileItem.js

@@ -1,7 +1,8 @@
 // @flow
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
+
+import { connect } from '../../../base/redux';
 
 import {
     Avatar,
@@ -121,5 +122,4 @@ function _mapStateToProps(state) {
     };
 }
 
-// $FlowExpectedError
 export default connect(_mapStateToProps)(OverflowMenuProfileItem);

react/features/toolbox/components/web/Toolbox.js

@@ -1,7 +1,6 @@
 // @flow
 
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 
 import {
     ACTION_SHORTCUT_TRIGGERED,
@@ -16,6 +15,7 @@ import {
     getParticipants,
     participantUpdated
 } from '../../../base/participants';
+import { connect } from '../../../base/redux';
 import { OverflowMenuItem } from '../../../base/toolbox';
 import { getLocalVideoTrack, toggleScreensharing } from '../../../base/tracks';
 import { ChatCounter, toggleChat } from '../../../chat';