ComposeMenu [nfc]: Use our own new type definition for attachments

Soon, we'd like to also use the `insertAttachments` prop not just
for react-native-document-picker payloads, but also for
react-native-image-picker payloads. Better to define our own type
that's meant to accommodate both kinds, rather than, e.g., using
react-native-document-picker's type and fudging image-picker
payloads to flow through that type.

While we're at it, trim down the type to just what
`insertAttachments` currently uses: the url [1] and a nullable name
for the file. The `type` property in particular smells like
something that might not be easy to make uniform across
document-picker and image-picker payloads; there's no comment
linking to a spec that says what the possible values of `type` mean,
for example.

[1] renamed from "uri"; see style guide

Author: chrisbobbe

src/compose/ComposeBox.js

@@ -10,7 +10,6 @@ import React, {
   forwardRef,
 } from 'react';
 import { Platform, View } from 'react-native';
-import type { DocumentPickerResponse } from 'react-native-document-picker';
 import type { LayoutEvent } from 'react-native/Libraries/Types/CoreEventTypes';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import invariant from 'invariant';
@@ -73,6 +72,7 @@ import useUncontrolledInput from '../useUncontrolledInput';
 import { tryFetch } from '../message/fetchActions';
 import { getMessageUrl } from '../utils/internalLinks';
 import * as logging from '../utils/logging';
+import type { Attachment } from './ComposeMenu';
 
 /* eslint-disable no-shadow */
 
@@ -320,7 +320,7 @@ const ComposeBox: React$AbstractComponent<Props, ImperativeHandle> = forwardRef(
 
   const [numUploading, setNumUploading] = useState<number>(0);
   const insertAttachments = useCallback(
-    async (attachments: $ReadOnlyArray<DocumentPickerResponse>) => {
+    async (attachments: $ReadOnlyArray<Attachment>) => {
       setNumUploading(n => n + 1);
       try {
         const fileNames: string[] = [];
@@ -338,7 +338,7 @@ const ComposeBox: React$AbstractComponent<Props, ImperativeHandle> = forwardRef(
           const placeholder = placeholders[i];
           let response = null;
           try {
-            response = await api.uploadFile(auth, attachments[i].uri, fileName);
+            response = await api.uploadFile(auth, attachments[i].url, fileName);
           } catch {
             showToast(_('Failed to upload file: {fileName}', { fileName }));
             setMessageInputValue(state =>

src/compose/ComposeMenu.js

@@ -20,9 +20,14 @@ import { androidEnsureStoragePermission } from '../lightbox/download';
 import { ThemeContext } from '../styles/theme';
 import type { SpecificIconType } from '../common/Icons';
 
+export type Attachment = {|
+  +name: string | null,
+  +url: string,
+|};
+
 type Props = $ReadOnly<{|
   destinationNarrow: Narrow,
-  insertAttachments: ($ReadOnlyArray<DocumentPickerResponse>) => Promise<void>,
+  insertAttachments: ($ReadOnlyArray<Attachment>) => Promise<void>,
   insertVideoCallLink: (() => void) | null,
 |}>;
 
@@ -221,7 +226,7 @@ export default function ComposeMenu(props: Props): Node {
       return;
     }
 
-    insertAttachments(response);
+    insertAttachments(response.map(a => ({ name: a.name, url: a.uri })));
   }, [_, insertAttachments]);
 
   const styles = useMemo(