Inline trivial API-wrapper actions

src/account-info/AwayStatusSwitch.js

@@ -2,10 +2,10 @@
 import React from 'react';
 import type { Node } from 'react';
 
-import { useSelector, useDispatch } from '../react-redux';
+import { useSelector } from '../react-redux';
 import { SwitchRow } from '../common';
-import { getSelfUserAwayStatus } from '../selectors';
-import { updateUserAwayStatus } from '../user-status/userStatusActions';
+import { getAuth, getSelfUserAwayStatus } from '../selectors';
+import * as api from '../api';
 
 type Props = $ReadOnly<{||}>;
 
@@ -15,15 +15,15 @@ type Props = $ReadOnly<{||}>;
  *  * allows by switching it to control the `away` status
  */
 export default function AwayStatusSwitch(props: Props): Node {
+  const auth = useSelector(getAuth);
   const awayStatus = useSelector(getSelfUserAwayStatus);
-  const dispatch = useDispatch();
 
   return (
     <SwitchRow
       label="Set yourself to away"
       value={awayStatus}
       onValueChange={(away: boolean) => {
-        dispatch(updateUserAwayStatus(away));
+        api.updateUserStatus(auth, { away });
       }}
     />
   );

src/actions.js

@@ -10,8 +10,6 @@ export * from './outbox/outboxActions';
 export * from './session/sessionActions';
 export * from './settings/settingsActions';
 export * from './streams/streamsActions';
-export * from './subscriptions/subscriptionsActions';
 export * from './topics/topicActions';
 export * from './typing/typingActions';
 export * from './users/usersActions';
-export * from './user-status/userStatusActions';

src/streams/CreateStreamScreen.js

@@ -5,27 +5,28 @@ import type { Node } from 'react';
 import type { RouteProp } from '../react-navigation';
 import type { AppNavigationProp } from '../nav/AppNavigator';
 import * as NavigationService from '../nav/NavigationService';
-import { useSelector, useDispatch } from '../react-redux';
-import { createNewStream, navigateBack } from '../actions';
-import { getOwnEmail } from '../selectors';
+import { useSelector } from '../react-redux';
+import { navigateBack } from '../actions';
+import { getAuth, getOwnEmail } from '../selectors';
 import { Screen } from '../common';
 import EditStreamCard from './EditStreamCard';
+import * as api from '../api';
 
 type Props = $ReadOnly<{|
   navigation: AppNavigationProp<'create-stream'>,
   route: RouteProp<'create-stream', void>,
 |}>;
 
 export default function CreateStreamScreen(props: Props): Node {
-  const dispatch = useDispatch();
+  const auth = useSelector(getAuth);
   const ownEmail = useSelector(getOwnEmail);
 
   const handleComplete = useCallback(
     (name: string, description: string, isPrivate: boolean) => {
-      dispatch(createNewStream(name, description, [ownEmail], isPrivate));
+      api.createStream(auth, name, description, [ownEmail], isPrivate);
       NavigationService.dispatch(navigateBack());
     },
-    [ownEmail, dispatch],
+    [auth, ownEmail],
   );
 
   return (

src/streams/StreamSettingsScreen.js

@@ -6,18 +6,14 @@ import { View } from 'react-native';
 import type { RouteProp } from '../react-navigation';
 import type { AppNavigationProp } from '../nav/AppNavigator';
 import * as NavigationService from '../nav/NavigationService';
-import { useDispatch, useSelector } from '../react-redux';
+import { useSelector } from '../react-redux';
 import { delay } from '../utils/async';
 import { SwitchRow, Screen, ZulipButton } from '../common';
 import { getSettings } from '../directSelectors';
 import { getAuth, getIsAdmin, getStreamForId } from '../selectors';
 import StreamCard from './StreamCard';
 import { IconPin, IconMute, IconNotifications, IconEdit, IconPlusSquare } from '../common/Icons';
-import {
-  setSubscriptionProperty,
-  navigateToEditStream,
-  navigateToStreamSubscribers,
-} from '../actions';
+import { navigateToEditStream, navigateToStreamSubscribers } from '../actions';
 import styles from '../styles';
 import { getSubscriptionsById } from '../subscriptions/subscriptionSelectors';
 import * as api from '../api';
@@ -29,8 +25,6 @@ type Props = $ReadOnly<{|
 |}>;
 
 export default function StreamSettingsScreen(props: Props): Node {
-  const dispatch = useDispatch();
-
   const auth = useSelector(getAuth);
   const isAdmin = useSelector(getIsAdmin);
   const stream = useSelector(state => getStreamForId(state, props.route.params.streamId));
@@ -41,16 +35,16 @@ export default function StreamSettingsScreen(props: Props): Node {
 
   const handleTogglePinStream = useCallback(
     (newValue: boolean) => {
-      dispatch(setSubscriptionProperty(stream.stream_id, 'pin_to_top', newValue));
+      api.setSubscriptionProperty(auth, stream.stream_id, 'pin_to_top', newValue);
     },
-    [dispatch, stream],
+    [auth, stream],
   );
 
   const handleToggleMuteStream = useCallback(
     (newValue: boolean) => {
-      dispatch(setSubscriptionProperty(stream.stream_id, 'is_muted', newValue));
+      api.setSubscriptionProperty(auth, stream.stream_id, 'is_muted', newValue);
     },
-    [dispatch, stream],
+    [auth, stream],
   );
 
   const handlePressEdit = useCallback(() => {
@@ -71,8 +65,8 @@ export default function StreamSettingsScreen(props: Props): Node {
 
   const handleToggleStreamPushNotification = useCallback(() => {
     const currentValue = getIsNotificationEnabled(subscription, userSettingStreamNotification);
-    dispatch(setSubscriptionProperty(stream.stream_id, 'push_notifications', !currentValue));
-  }, [dispatch, stream, subscription, userSettingStreamNotification]);
+    api.setSubscriptionProperty(auth, stream.stream_id, 'push_notifications', !currentValue);
+  }, [auth, stream, subscription, userSettingStreamNotification]);
 
   return (
     <Screen title="Stream">

src/streams/streamsActions.js

@@ -3,15 +3,6 @@ import type { Stream, ThunkAction } from '../types';
 import * as api from '../api';
 import { getAuth, getZulipFeatureLevel } from '../selectors';
 
-export const createNewStream = (
-  name: string,
-  description: string,
-  principals: string[],
-  isPrivate: boolean,
-): ThunkAction<Promise<void>> => async (dispatch, getState) => {
-  await api.createStream(getAuth(getState()), name, description, principals, isPrivate);
-};
-
 export const updateExistingStream = (
   id: number,
   initialValues: Stream,

src/user-status/UserStatusScreen.js

@@ -8,13 +8,13 @@ import { createStyleSheet } from '../styles';
 import type { RouteProp } from '../react-navigation';
 import type { AppNavigationProp } from '../nav/AppNavigator';
 import * as NavigationService from '../nav/NavigationService';
-import { useSelector, useDispatch } from '../react-redux';
+import { useSelector } from '../react-redux';
 import { Input, SelectableOptionRow, Screen, ZulipButton } from '../common';
-import { getSelfUserStatusText } from '../selectors';
+import { getAuth, getSelfUserStatusText } from '../selectors';
 import { IconCancel, IconDone } from '../common/Icons';
 import statusSuggestions from './userStatusTextSuggestions';
-import { updateUserStatusText } from './userStatusActions';
 import { navigateBack } from '../nav/navActions';
+import * as api from '../api';
 
 const styles = createStyleSheet({
   statusTextInput: {
@@ -35,18 +35,18 @@ type Props = $ReadOnly<{|
 |}>;
 
 export default function UserStatusScreen(props: Props): Node {
-  const dispatch = useDispatch();
+  const auth = useSelector(getAuth);
   const userStatusText = useSelector(getSelfUserStatusText);
 
   const [statusText, setStatusText] = useState<string>(userStatusText);
   const _ = useContext(TranslationContext);
 
   const sendToServer = useCallback(
     (_statusText: string) => {
-      dispatch(updateUserStatusText(_statusText));
+      api.updateUserStatus(auth, { status_text: _statusText });
       NavigationService.dispatch(navigateBack());
     },
-    [dispatch],
+    [auth],
   );
 
   const handlePressUpdate = useCallback(() => {