Simplify connect and boundActions (#1289)

src/account-info/AccountDetailsScreen.js

@@ -1,9 +1,8 @@
 /* @flow */
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 
 import type { Auth, Actions, Orientation, UserType } from '../types';
-import boundActions from '../boundActions';
+import connectWithActions from '../connectWithActions';
 import { getAuth, getAccountDetailsUser } from '../selectors';
 import { Screen } from '../common';
 import AccountDetails from './AccountDetails';
@@ -47,11 +46,8 @@ class AccountDetailsScreen extends Component<Props> {
   }
 }
 
-export default connect(
-  state => ({
-    auth: getAuth(state),
-    user: getAccountDetailsUser(state),
-    orientation: state.app.orientation,
-  }),
-  boundActions,
-)(AccountDetailsScreen);
+export default connectWithActions(state => ({
+  auth: getAuth(state),
+  user: getAccountDetailsUser(state),
+  orientation: state.app.orientation,
+}))(AccountDetailsScreen);

src/account-info/LogoutButton.js

@@ -1,10 +1,9 @@
 /* @flow */
 import React, { PureComponent } from 'react';
 import { StyleSheet } from 'react-native';
-import { connect } from 'react-redux';
 
 import type { Actions, Auth } from '../types';
-import boundActions from '../boundActions';
+import connectWithActions from '../connectWithActions';
 import { ZulipButton } from '../common';
 import unregisterPush from '../api/unregisterPush';
 import { getAuth } from '../selectors';
@@ -52,11 +51,8 @@ class LogoutButton extends PureComponent<Props> {
   }
 }
 
-export default connect(
-  state => ({
-    auth: getAuth(state),
-    accounts: state.accounts,
-    pushToken: state.realm.pushToken,
-  }),
-  boundActions,
-)(LogoutButton);
+export default connectWithActions(state => ({
+  auth: getAuth(state),
+  accounts: state.accounts,
+  pushToken: state.realm.pushToken,
+}))(LogoutButton);

src/account-info/SwitchAccountButton.js

@@ -1,10 +1,9 @@
 /* @flow */
 import React, { PureComponent } from 'react';
 import { StyleSheet } from 'react-native';
-import { connect } from 'react-redux';
 
 import type { Auth, Actions } from '../types';
-import boundActions from '../boundActions';
+import connectWithActions from '../connectWithActions';
 import { ZulipButton } from '../common';
 import { getAuth } from '../selectors';
 import unregisterPush from '../api/unregisterPush';
@@ -50,11 +49,8 @@ class SwitchAccountButton extends PureComponent<Props> {
   }
 }
 
-export default connect(
-  state => ({
-    auth: getAuth(state),
-    accounts: state.accounts,
-    pushToken: state.realm.pushToken,
-  }),
-  boundActions,
-)(SwitchAccountButton);
+export default connectWithActions(state => ({
+  auth: getAuth(state),
+  accounts: state.accounts,
+  pushToken: state.realm.pushToken,
+}))(SwitchAccountButton);

src/account/AccountPickScreen.js

@@ -1,10 +1,9 @@
 /* @flow */
 import React, { PureComponent } from 'react';
 import { StyleSheet } from 'react-native';
-import { connect } from 'react-redux';
 
 import type { Auth, Actions } from '../types';
-import boundActions from '../boundActions';
+import connectWithActions from '../connectWithActions';
 import { getAuth } from '../selectors';
 import { Centerer, ZulipButton, Logo, Screen } from '../common';
 import AccountList from './AccountList';
@@ -60,10 +59,7 @@ class AccountPickScreen extends PureComponent<Props> {
   }
 }
 
-export default connect(
-  state => ({
-    auth: getAuth(state),
-    accounts: state.accounts,
-  }),
-  boundActions,
-)(AccountPickScreen);
+export default connectWithActions(state => ({
+  auth: getAuth(state),
+  accounts: state.accounts,
+}))(AccountPickScreen);

src/autocomplete/PeopleAutocomplete.js

@@ -1,9 +1,9 @@
 /* @flow */
 import React, { PureComponent } from 'react';
 import { FlatList } from 'react-native';
-import { connect } from 'react-redux';
 
 import type { User, GlobalState } from '../types';
+import connectWithActions from '../connectWithActions';
 import {
   getOwnEmail,
   sortAlphabetically,
@@ -51,7 +51,7 @@ class PeopleAutocomplete extends PureComponent<Props> {
   }
 }
 
-export default connect((state: GlobalState) => ({
+export default connectWithActions((state: GlobalState) => ({
   ownEmail: getOwnEmail(state),
   users: sortAlphabetically(getAllActiveUsers(state)),
 }))(PeopleAutocomplete);

src/autocomplete/StreamAutocomplete.js

@@ -1,9 +1,9 @@
 /* @flow */
 import React, { PureComponent } from 'react';
 import { FlatList } from 'react-native';
-import { connect } from 'react-redux';
 
 import type { GlobalState, SubscriptionsState } from '../types';
+import connectWithActions from '../connectWithActions';
 import { Popup } from '../common';
 import { getSubscribedStreams } from '../subscriptions/subscriptionSelectors';
 import StreamItem from '../streams/StreamItem';
@@ -48,6 +48,6 @@ class StreamAutocomplete extends PureComponent<Props> {
   }
 }
 
-export default connect((state: GlobalState) => ({
+export default connectWithActions((state: GlobalState) => ({
   subscriptions: getSubscribedStreams(state),
 }))(StreamAutocomplete);

src/boot/AppDataFetcher.js

@@ -1,9 +1,8 @@
 /* @flow */
 import { PureComponent } from 'react';
-import { connect } from 'react-redux';
 
 import { Actions } from '../types';
-import boundActions from '../boundActions';
+import connectWithActions from '../connectWithActions';
 
 type Props = {
   needsInitialFetch: boolean,
@@ -31,9 +30,6 @@ class AppDataFetcher extends PureComponent<Props> {
   }
 }
 
-export default connect(
-  state => ({
-    needsInitialFetch: state.app.needsInitialFetch,
-  }),
-  boundActions,
-)(AppDataFetcher);
+export default connectWithActions(state => ({
+  needsInitialFetch: state.app.needsInitialFetch,
+}))(AppDataFetcher);

src/boot/AppEventHandlers.js

@@ -1,11 +1,10 @@
 /* @flow */
 import React, { PureComponent } from 'react';
 import { AppState, BackHandler, NetInfo, View, Platform } from 'react-native';
-import { connect } from 'react-redux';
 import SafeArea from 'react-native-safe-area';
 
 import { Auth, Actions } from '../types';
-import boundActions from '../boundActions';
+import connectWithActions from '../connectWithActions';
 import { getAuth, getNavigationIndex } from '../selectors';
 import { registerAppActivity } from '../utils/activity';
 import { handlePendingNotifications } from '../utils/notifications';
@@ -93,11 +92,8 @@ class AppEventHandlers extends PureComponent<Props> {
   }
 }
 
-export default connect(
-  state => ({
-    auth: getAuth(state),
-    needsInitialFetch: state.app.needsInitialFetch,
-    navIndex: getNavigationIndex(state),
-  }),
-  boundActions,
-)(AppEventHandlers);
+export default connectWithActions(state => ({
+  auth: getAuth(state),
+  needsInitialFetch: state.app.needsInitialFetch,
+  navIndex: getNavigationIndex(state),
+}))(AppEventHandlers);

src/boot/StylesProvider.js

@@ -1,8 +1,8 @@
 /* @flow */
 import React, { PureComponent } from 'react';
 import { StyleSheet } from 'react-native';
-import { connect } from 'react-redux';
 
+import connectWithActions from '../connectWithActions';
 import themeCreator from '../styles/theme';
 import themeDark from '../styles/themeDark';
 import themeLight from '../styles/themeLight';
@@ -45,6 +45,6 @@ class StyleProvider extends PureComponent<Props> {
   }
 }
 
-export default connect(state => ({
+export default connectWithActions(state => ({
   theme: state.settings.theme,
 }))(StyleProvider);

src/boot/TranslationProvider.js

@@ -1,9 +1,9 @@
 /* @flow */
 import React, { PureComponent } from 'react';
 import { Text } from 'react-native';
-import { connect } from 'react-redux';
 import { IntlProvider } from 'react-intl';
 
+import connectWithActions from '../connectWithActions';
 import '../../vendor/intl/intl';
 import messages from '../i18n/messages';
 
@@ -26,6 +26,6 @@ class TranslationProvider extends PureComponent<Props> {
   }
 }
 
-export default connect(state => ({
+export default connectWithActions(state => ({
   locale: state.settings.locale,
 }))(TranslationProvider);

src/chat/ChatContainer.js

@@ -1,16 +1,11 @@
 /* @flow */
-import { connect } from 'react-redux';
-
-import boundActions from '../boundActions';
+import connectWithActions from '../connectWithActions';
 import { getActiveNarrow, getIsFetching, getIfNoMessages } from '../selectors';
 import Chat from './Chat';
 
-export default connect(
-  state => ({
-    isOnline: state.app.isOnline,
-    isFetching: getIsFetching(state),
-    narrow: getActiveNarrow(state),
-    noMessages: getIfNoMessages(state),
-  }),
-  boundActions,
-)(Chat);
+export default connectWithActions(state => ({
+  isOnline: state.app.isOnline,
+  isFetching: getIsFetching(state),
+  narrow: getActiveNarrow(state),
+  noMessages: getIfNoMessages(state),
+}))(Chat);

src/chat/GroupDetailsScreen.js

@@ -1,10 +1,9 @@
 /* @flow */
 import React, { PureComponent } from 'react';
-import { connect } from 'react-redux';
 import { View, FlatList, StyleSheet } from 'react-native';
 
 import type { Actions } from '../types';
-import boundActions from '../boundActions';
+import connectWithActions from '../connectWithActions';
 import { Screen, Label } from '../common';
 import UserItem from '../users/UserItem';
 import { BRAND_COLOR } from '../styles';
@@ -69,4 +68,4 @@ class GroupDetailsScreen extends PureComponent<Props> {
   }
 }
 
-export default connect(null, boundActions)(GroupDetailsScreen);
+export default connectWithActions(null)(GroupDetailsScreen);

src/chat/MarkUnreadButton.js

@@ -1,9 +1,9 @@
 /* @flow */
 import React, { PureComponent } from 'react';
 import { StyleSheet } from 'react-native';
-import { connect } from 'react-redux';
 
 import type { Auth, Narrow, Stream } from '../types';
+import connectWithActions from '../connectWithActions';
 import { ZulipButton } from '../common';
 import { markAllAsRead, markStreamAsRead, markTopicAsRead } from '../api';
 import { getActiveNarrow, getAuth, getStreams } from '../selectors';
@@ -85,7 +85,7 @@ class MarkUnreadButton extends PureComponent<Props> {
   }
 }
 
-export default connect(state => ({
+export default connectWithActions(state => ({
   auth: getAuth(state),
   narrow: getActiveNarrow(state),
   streams: getStreams(state),

src/chat/UnreadNoticeContainer.js

@@ -1,13 +1,8 @@
 /* @flow */
-import { connect } from 'react-redux';
-
-import boundActions from '../boundActions';
+import connectWithActions from '../connectWithActions';
 import { getUnreadCountInActiveNarrow } from '../selectors';
 import UnreadNotice from './UnreadNotice';
 
-export default connect(
-  state => ({
-    unreadCount: getUnreadCountInActiveNarrow(state),
-  }),
-  boundActions,
-)(UnreadNotice);
+export default connectWithActions(state => ({
+  unreadCount: getUnreadCountInActiveNarrow(state),
+}))(UnreadNotice);

src/common/Avatar.js

@@ -1,9 +1,9 @@
 /* @flow */
 import React, { PureComponent } from 'react';
 import { StyleSheet } from 'react-native';
-import { connect } from 'react-redux';
 
 import type { Presence } from '../types';
+import connectWithActions from '../connectWithActions';
 import { nullFunction, NULL_PRESENCE } from '../nullObjects';
 import { getCurrentRealm } from '../selectors';
 import ImageAvatar from './ImageAvatar';
@@ -59,6 +59,6 @@ class Avatar extends PureComponent<Props> {
   }
 }
 
-export default connect(state => ({
+export default connectWithActions(state => ({
   realm: getCurrentRealm(state),
 }))(Avatar);

src/common/Screen.js

@@ -1,9 +1,9 @@
 /* @flow */
 import React, { PureComponent } from 'react';
 import { ScrollView, StyleSheet, View } from 'react-native';
-import { connect } from 'react-redux';
 
 import type { Dimensions, LocalizableText } from '../types';
+import connectWithActions from '../connectWithActions';
 import { KeyboardAvoider, ZulipStatusBar } from '../common';
 import ModalNavBar from '../nav/ModalNavBar';
 import ModalSearchNavBar from '../nav/ModalSearchNavBar';
@@ -64,6 +64,6 @@ class Screen extends PureComponent<Props> {
   }
 }
 
-export default connect((state, props) => ({
+export default connectWithActions((state, props) => ({
   safeAreaInsets: state.app.safeAreaInsets,
 }))(Screen);

src/common/WebLink.js

@@ -1,7 +1,7 @@
 /* @flow */
 import React, { PureComponent } from 'react';
-import { connect } from 'react-redux';
 
+import connectWithActions from '../connectWithActions';
 import { Touchable, Label } from '../common';
 import { getFullUrl } from '../utils/url';
 import openLink from '../utils/openLink';
@@ -37,6 +37,6 @@ class WebLink extends PureComponent<Props> {
   }
 }
 
-export default connect(state => ({
+export default connectWithActions(state => ({
   realm: getCurrentRealm(state),
 }))(WebLink);