ActionSheets: Get rid of makeButtonCallback function

Now that we want to pass different arguments to different types of
action sheet buttons, it doesn't make much sense to have them all
call the same makeButtonCallback function.

I spent a little while trying to write makeButtonCallback with a type
parameter, but I wasn't able to find a way to do that that made flow
happy, and I suspect that even if I did, it'd be harder to understand
than just duplicating a few lines of code. We can definitely come back to
this if we end up with a lot of actionsheets, though.

Author: WesleyAC

src/message/messageActionSheet.js

@@ -330,46 +330,6 @@ export const constructNonHeaderActionButtons = ({
   }
 };
 
-function makeButtonCallback<ButtonType: HeaderButton | MessageButton>({
-  buttonList,
-  auth,
-  subscriptions,
-  ownUser,
-  flags,
-  message,
-  callbacks,
-}: {|
-  buttonList: ButtonType[],
-  auth: Auth,
-  subscriptions: Subscription[],
-  ownUser: User,
-  flags: FlagsState,
-  message: Message | Outbox,
-  callbacks: {|
-    dispatch: Dispatch,
-    startEditMessage: (editMessage: EditMessage) => void,
-    _: GetText,
-  |},
-|}) {
-  return buttonIndex => {
-    (async () => {
-      const pressedButton: ButtonType = buttonList[buttonIndex];
-      try {
-        await pressedButton({
-          subscriptions,
-          auth,
-          ownUser,
-          flags,
-          message,
-          ...callbacks,
-        });
-      } catch (err) {
-        Alert.alert(callbacks._(pressedButton.errorMessage), err.message);
-      }
-    })();
-  };
-}
-
 export const showMessageActionSheet = (
   showActionSheetWithOptions: ShowActionSheetWithOptions,
   callbacks: {|
@@ -392,20 +352,29 @@ export const showMessageActionSheet = (
     message,
     narrow,
   });
+  const callback = buttonIndex => {
+    (async () => {
+      const pressedButton = buttonList[buttonIndex];
+      try {
+        await pressedButton({
+          subscriptions: params.subscriptions,
+          auth: params.auth,
+          ownUser: params.ownUser,
+          flags: params.flags,
+          message,
+          ...callbacks,
+        });
+      } catch (err) {
+        Alert.alert(callbacks._(pressedButton.errorMessage), err.message);
+      }
+    })();
+  };
   showActionSheetWithOptions(
     {
       options: buttonList.map(button => callbacks._(button.title)),
       cancelButtonIndex: buttonList.length - 1,
     },
-    makeButtonCallback({
-      buttonList,
-      auth: params.auth,
-      subscriptions: params.subscriptions,
-      ownUser: params.ownUser,
-      flags: params.flags,
-      message,
-      callbacks,
-    }),
+    callback,
   );
 };
 
@@ -433,20 +402,29 @@ export const showHeaderActionSheet = (
     stream: streamNameOfStreamMessage(message),
     topic: message.subject,
   });
+  const callback = buttonIndex => {
+    (async () => {
+      const pressedButton = buttonList[buttonIndex];
+      try {
+        await pressedButton({
+          subscriptions: params.subscriptions,
+          auth: params.auth,
+          ownUser: params.ownUser,
+          flags: params.flags,
+          message,
+          ...callbacks,
+        });
+      } catch (err) {
+        Alert.alert(callbacks._(pressedButton.errorMessage), err.message);
+      }
+    })();
+  };
   showActionSheetWithOptions(
     {
       title: `#${streamNameOfStreamMessage(message)} > ${message.subject}`,
       options: buttonList.map(button => callbacks._(button.title)),
       cancelButtonIndex: buttonList.length - 1,
     },
-    makeButtonCallback({
-      buttonList,
-      auth: params.auth,
-      subscriptions: params.subscriptions,
-      ownUser: params.ownUser,
-      flags: params.flags,
-      message,
-      callbacks,
-    }),
+    callback,
   );
 };