diff --git a/native/avatars/avatar-hooks.js b/native/avatars/avatar-hooks.js
index 211ef890a..cb240884f 100644
--- a/native/avatars/avatar-hooks.js
+++ b/native/avatars/avatar-hooks.js
@@ -1,589 +1,565 @@
 // @flow
 
 import { useActionSheet } from '@expo/react-native-action-sheet';
 import * as ImagePicker from 'expo-image-picker';
 import * as React from 'react';
 import { Platform } from 'react-native';
 import Alert from 'react-native/Libraries/Alert/Alert.js';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 import {
   changeThreadSettings,
   changeThreadSettingsActionTypes,
 } from 'lib/actions/thread-actions.js';
 import { uploadMultimedia } from 'lib/actions/upload-actions.js';
 import {
   updateUserAvatar,
   updateUserAvatarActionTypes,
 } from 'lib/actions/user-actions.js';
 import {
   extensionFromFilename,
   filenameFromPathOrURI,
 } from 'lib/media/file-utils.js';
 import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors.js';
 import type {
   ImageAvatarDBContent,
   ENSAvatarDBContent,
   UpdateUserAvatarRemoveRequest,
 } from 'lib/types/avatar-types.js';
+import type { SetState } from 'lib/types/hook-types.js';
 import type { LoadingStatus } from 'lib/types/loading-types.js';
 import type {
   NativeMediaSelection,
   MediaLibrarySelection,
   MediaMissionFailure,
   UploadMultimediaResult,
 } from 'lib/types/media-types.js';
 import type { UpdateThreadRequest } from 'lib/types/thread-types.js';
 import {
   useDispatchActionPromise,
   useServerCall,
 } from 'lib/utils/action-utils.js';
 
 import CommIcon from '../components/comm-icon.react.js';
 import SWMansionIcon from '../components/swmansion-icon.react.js';
 import { getCompatibleMediaURI } from '../media/identifier-utils.js';
 import type { MediaResult } from '../media/media-utils.js';
 import { processMedia } from '../media/media-utils.js';
 import { useSelector } from '../redux/redux-utils.js';
 import { useStyles } from '../themes/colors.js';
 import { useStaffCanSee } from '../utils/staff-utils.js';
 
 function useUploadProcessedMedia(): MediaResult => Promise<UploadMultimediaResult> {
   const callUploadMultimedia = useServerCall(uploadMultimedia);
   const uploadProcessedMultimedia: MediaResult => Promise<UploadMultimediaResult> =
     React.useCallback(
       processedMedia => {
         const { uploadURI, filename, mime, dimensions } = processedMedia;
         return callUploadMultimedia(
           {
             uri: uploadURI,
             name: filename,
             type: mime,
           },
           dimensions,
         );
       },
       [callUploadMultimedia],
     );
   return uploadProcessedMultimedia;
 }
 
 function useProcessSelectedMedia(): NativeMediaSelection => Promise<
   MediaMissionFailure | MediaResult,
 > {
   const hasWiFi = useSelector(state => state.connectivity.hasWiFi);
   const staffCanSee = useStaffCanSee();
 
   const processSelectedMedia = React.useCallback(
     async (selection: NativeMediaSelection) => {
       const { resultPromise } = processMedia(selection, {
         hasWiFi,
         finalFileHeaderCheck: staffCanSee,
       });
 
       return await resultPromise;
     },
     [hasWiFi, staffCanSee],
   );
 
   return processSelectedMedia;
 }
 
 function useSelectFromGallery(): () => Promise<?MediaLibrarySelection> {
   const selectFromGallery = React.useCallback(async () => {
     try {
       const { assets, canceled } = await ImagePicker.launchImageLibraryAsync({
         mediaTypes: ImagePicker.MediaTypeOptions.Images,
         allowsEditing: true,
         allowsMultipleSelection: false,
         quality: 1,
       });
 
       if (canceled || assets.length === 0) {
         return;
       }
 
       const asset = assets.pop();
       const { width, height, assetId: mediaNativeID } = asset;
       const assetFilename =
         asset.fileName || filenameFromPathOrURI(asset.uri) || '';
       const uri = getCompatibleMediaURI(
         asset.uri,
         extensionFromFilename(assetFilename),
       );
 
       const currentTime = Date.now();
       const selection: MediaLibrarySelection = {
         step: 'photo_library',
         dimensions: { height, width },
         uri,
         filename: assetFilename,
         mediaNativeID,
         selectTime: currentTime,
         sendTime: currentTime,
         retries: 0,
       };
 
       return selection;
     } catch (e) {
       console.log(e);
       return undefined;
     }
   }, []);
 
   return selectFromGallery;
 }
 
+function useUploadSelectedMedia(
+  setProcessingOrUploadInProgress: SetState<boolean>,
+): (selection: ?NativeMediaSelection) => Promise<?string> {
+  const processSelectedMedia = useProcessSelectedMedia();
+  const uploadProcessedMedia = useUploadProcessedMedia();
+
+  return React.useCallback(
+    async (selection: ?NativeMediaSelection) => {
+      if (!selection) {
+        Alert.alert(
+          'Media selection failed',
+          'Unable to select media from Media Library.',
+        );
+        return;
+      }
+
+      setProcessingOrUploadInProgress(true);
+
+      let processedMedia;
+      try {
+        processedMedia = await processSelectedMedia(selection);
+      } catch (e) {
+        Alert.alert(
+          'Media processing failed',
+          'Unable to process selected media.',
+        );
+        setProcessingOrUploadInProgress(false);
+        return;
+      }
+
+      if (!processedMedia.success) {
+        Alert.alert(
+          'Media processing failed',
+          'Unable to process selected media.',
+        );
+        setProcessingOrUploadInProgress(false);
+        return;
+      }
+
+      let uploadedMedia: UploadMultimediaResult;
+      try {
+        uploadedMedia = await uploadProcessedMedia(processedMedia);
+      } catch {
+        Alert.alert(
+          'Media upload failed',
+          'Unable to upload selected media. Please try again.',
+        );
+        setProcessingOrUploadInProgress(false);
+        return;
+      }
+
+      return uploadedMedia.id;
+    },
+    [
+      processSelectedMedia,
+      setProcessingOrUploadInProgress,
+      uploadProcessedMedia,
+    ],
+  );
+}
+
 const updateUserAvatarLoadingStatusSelector = createLoadingStatusSelector(
   updateUserAvatarActionTypes,
 );
 function useSelectFromGalleryAndUpdateUserAvatar(): [
   () => Promise<void>,
   boolean,
 ] {
   const dispatchActionPromise = useDispatchActionPromise();
   const updateUserAvatarCall = useServerCall(updateUserAvatar);
 
   const selectFromGallery = useSelectFromGallery();
-  const processSelectedMedia = useProcessSelectedMedia();
-  const uploadProcessedMedia = useUploadProcessedMedia();
 
   const [processingOrUploadInProgress, setProcessingOrUploadInProgress] =
     React.useState(false);
 
   const updateUserAvatarLoadingStatus: LoadingStatus = useSelector(
     updateUserAvatarLoadingStatusSelector,
   );
 
   const inProgress = React.useMemo(
     () =>
       processingOrUploadInProgress ||
       updateUserAvatarLoadingStatus === 'loading',
     [processingOrUploadInProgress, updateUserAvatarLoadingStatus],
   );
 
+  const uploadSelectedMedia = useUploadSelectedMedia(
+    setProcessingOrUploadInProgress,
+  );
+
   const selectFromGalleryAndUpdateUserAvatar = React.useCallback(async () => {
     const selection: ?MediaLibrarySelection = await selectFromGallery();
-    if (!selection) {
-      Alert.alert(
-        'Media selection failed',
-        'Unable to select media from Media Library.',
-      );
-      return;
-    }
 
-    setProcessingOrUploadInProgress(true);
-    let processedMedia;
-    try {
-      processedMedia = await processSelectedMedia(selection);
-    } catch (e) {
-      Alert.alert(
-        'Media processing failed',
-        'Unable to process selected media.',
-      );
-      setProcessingOrUploadInProgress(false);
-      return;
-    }
-
-    if (!processedMedia || !processedMedia.success) {
-      Alert.alert(
-        'Media processing failed',
-        'Unable to process selected media.',
-      );
-      setProcessingOrUploadInProgress(false);
-      return;
-    }
-
-    let uploadedMedia: ?UploadMultimediaResult;
-    try {
-      uploadedMedia = await uploadProcessedMedia(processedMedia);
-    } catch {
-      Alert.alert(
-        'Media upload failed',
-        'Unable to upload selected media. Please try again.',
-      );
-      setProcessingOrUploadInProgress(false);
-      return;
-    }
+    const uploadedMediaID = await uploadSelectedMedia(selection);
 
-    if (!uploadedMedia) {
-      Alert.alert(
-        'Media upload failed',
-        'Unable to upload selected media. Please try again.',
-      );
-      setProcessingOrUploadInProgress(false);
+    if (!uploadedMediaID) {
       return;
     }
 
     const imageAvatarUpdateRequest: ImageAvatarDBContent = {
       type: 'image',
-      uploadID: uploadedMedia.id,
+      uploadID: uploadedMediaID,
     };
 
     dispatchActionPromise(
       updateUserAvatarActionTypes,
       (async () => {
         setProcessingOrUploadInProgress(false);
         try {
           return await updateUserAvatarCall(imageAvatarUpdateRequest);
         } catch {
           Alert.alert('Avatar update failed', 'Unable to update avatar.');
         }
       })(),
     );
   }, [
     dispatchActionPromise,
-    processSelectedMedia,
     selectFromGallery,
     updateUserAvatarCall,
-    uploadProcessedMedia,
+    uploadSelectedMedia,
   ]);
 
   return React.useMemo(
     () => [selectFromGalleryAndUpdateUserAvatar, inProgress],
     [selectFromGalleryAndUpdateUserAvatar, inProgress],
   );
 }
 
 const threadAvatarLoadingStatusSelector = createLoadingStatusSelector(
   changeThreadSettingsActionTypes,
   `${changeThreadSettingsActionTypes.started}:avatar`,
 );
 function useSelectFromGalleryAndUpdateThreadAvatar(
   threadID: string,
 ): [() => Promise<void>, boolean] {
   const dispatchActionPromise = useDispatchActionPromise();
   const changeThreadSettingsCall = useServerCall(changeThreadSettings);
 
   const selectFromGallery = useSelectFromGallery();
-  const processSelectedMedia = useProcessSelectedMedia();
-  const uploadProcessedMedia = useUploadProcessedMedia();
 
   const [processingOrUploadInProgress, setProcessingOrUploadInProgress] =
     React.useState(false);
 
   const updateThreadAvatarLoadingStatus: LoadingStatus = useSelector(
     threadAvatarLoadingStatusSelector,
   );
 
   const inProgress = React.useMemo(
     () =>
       processingOrUploadInProgress ||
       updateThreadAvatarLoadingStatus === 'loading',
     [processingOrUploadInProgress, updateThreadAvatarLoadingStatus],
   );
 
+  const uploadSelectedMedia = useUploadSelectedMedia(
+    setProcessingOrUploadInProgress,
+  );
+
   const selectFromGalleryAndUpdateThreadAvatar = React.useCallback(async () => {
     const selection: ?MediaLibrarySelection = await selectFromGallery();
-    if (!selection) {
-      Alert.alert(
-        'Media selection failed',
-        'Unable to select media from Media Library.',
-      );
-      return;
-    }
 
-    setProcessingOrUploadInProgress(true);
-    let processedMedia;
-    try {
-      processedMedia = await processSelectedMedia(selection);
-    } catch (e) {
-      Alert.alert(
-        'Media processing failed',
-        'Unable to process selected media.',
-      );
-      setProcessingOrUploadInProgress(false);
-      return;
-    }
+    const uploadedMediaID = await uploadSelectedMedia(selection);
 
-    if (!processedMedia || !processedMedia.success) {
-      Alert.alert(
-        'Media processing failed',
-        'Unable to process selected media.',
-      );
-      setProcessingOrUploadInProgress(false);
-      return;
-    }
-
-    let uploadedMedia: ?UploadMultimediaResult;
-    try {
-      uploadedMedia = await uploadProcessedMedia(processedMedia);
-    } catch {
-      Alert.alert(
-        'Media upload failed',
-        'Unable to upload selected media. Please try again.',
-      );
-      setProcessingOrUploadInProgress(false);
-      return;
-    }
-
-    if (!uploadedMedia) {
-      Alert.alert(
-        'Media upload failed',
-        'Unable to upload selected media. Please try again.',
-      );
-      setProcessingOrUploadInProgress(false);
+    if (!uploadedMediaID) {
       return;
     }
 
     const imageAvatarUpdateRequest: ImageAvatarDBContent = {
       type: 'image',
-      uploadID: uploadedMedia.id,
+      uploadID: uploadedMediaID,
     };
 
     const updateThreadRequest: UpdateThreadRequest = {
       threadID,
       changes: {
         avatar: imageAvatarUpdateRequest,
       },
     };
 
     dispatchActionPromise(
       changeThreadSettingsActionTypes,
       (async () => {
         setProcessingOrUploadInProgress(false);
         try {
           return await changeThreadSettingsCall(updateThreadRequest);
         } catch {
           Alert.alert('Avatar update failed', 'Unable to update avatar.');
         }
       })(),
       { customKeyName: `${changeThreadSettingsActionTypes.started}:avatar` },
     );
   }, [
     changeThreadSettingsCall,
     dispatchActionPromise,
-    processSelectedMedia,
     selectFromGallery,
     threadID,
-    uploadProcessedMedia,
+    uploadSelectedMedia,
   ]);
 
   return React.useMemo(
     () => [selectFromGalleryAndUpdateThreadAvatar, inProgress],
     [inProgress, selectFromGalleryAndUpdateThreadAvatar],
   );
 }
 
 function useRemoveUserAvatar(): [() => void, boolean] {
   const dispatchActionPromise = useDispatchActionPromise();
   const updateUserAvatarCall = useServerCall(updateUserAvatar);
   const updateUserAvatarLoadingStatus: LoadingStatus = useSelector(
     updateUserAvatarLoadingStatusSelector,
   );
 
   const removeUserAvatar = React.useCallback(() => {
     const removeAvatarRequest: UpdateUserAvatarRemoveRequest = {
       type: 'remove',
     };
 
     dispatchActionPromise(
       updateUserAvatarActionTypes,
       (async () => {
         try {
           return await updateUserAvatarCall(removeAvatarRequest);
         } catch {
           Alert.alert('Avatar update failed', 'Unable to update avatar.');
         }
       })(),
     );
   }, [dispatchActionPromise, updateUserAvatarCall]);
 
   return React.useMemo(
     () => [removeUserAvatar, updateUserAvatarLoadingStatus === 'loading'],
     [removeUserAvatar, updateUserAvatarLoadingStatus],
   );
 }
 
 function useRemoveThreadAvatar(threadID: string): [() => void, boolean] {
   const dispatchActionPromise = useDispatchActionPromise();
   const changeThreadSettingsCall = useServerCall(changeThreadSettings);
   const updateThreadAvatarLoadingStatus: LoadingStatus = useSelector(
     threadAvatarLoadingStatusSelector,
   );
 
   const removeThreadAvatar = React.useCallback(() => {
     const removeAvatarRequest: UpdateUserAvatarRemoveRequest = {
       type: 'remove',
     };
 
     const updateThreadRequest: UpdateThreadRequest = {
       threadID,
       changes: {
         avatar: removeAvatarRequest,
       },
     };
 
     dispatchActionPromise(
       changeThreadSettingsActionTypes,
       (async () => {
         try {
           return await changeThreadSettingsCall(updateThreadRequest);
         } catch {
           Alert.alert('Avatar update failed', 'Unable to update avatar.');
         }
       })(),
       { customKeyName: `${changeThreadSettingsActionTypes.started}:avatar` },
     );
   }, [changeThreadSettingsCall, dispatchActionPromise, threadID]);
 
   return React.useMemo(
     () => [removeThreadAvatar, updateThreadAvatarLoadingStatus === 'loading'],
     [removeThreadAvatar, updateThreadAvatarLoadingStatus],
   );
 }
 
 function useENSUserAvatar(): [() => Promise<void>, boolean] {
   const dispatchActionPromise = useDispatchActionPromise();
   const updateUserAvatarCall = useServerCall(updateUserAvatar);
 
   const updateUserAvatarLoadingStatus: LoadingStatus = useSelector(
     updateUserAvatarLoadingStatusSelector,
   );
 
   const saveENSUserAvatar = React.useCallback(async () => {
     const ensAvatarRequest: ENSAvatarDBContent = {
       type: 'ens',
     };
 
     dispatchActionPromise(
       updateUserAvatarActionTypes,
       (async () => {
         try {
           return await updateUserAvatarCall(ensAvatarRequest);
         } catch {
           Alert.alert('Avatar update failed', 'Unable to update avatar.');
         }
       })(),
     );
   }, [dispatchActionPromise, updateUserAvatarCall]);
 
   return React.useMemo(
     () => [saveENSUserAvatar, updateUserAvatarLoadingStatus === 'loading'],
     [saveENSUserAvatar, updateUserAvatarLoadingStatus],
   );
 }
 
 type ShowAvatarActionSheetOptions = {
   +id: 'emoji' | 'image' | 'ens' | 'cancel' | 'remove',
   +onPress?: () => mixed,
 };
 function useShowAvatarActionSheet(
   options: $ReadOnlyArray<ShowAvatarActionSheetOptions>,
 ): () => void {
   options = Platform.OS === 'ios' ? [...options, { id: 'cancel' }] : options;
 
   const insets = useSafeAreaInsets();
   const { showActionSheetWithOptions } = useActionSheet();
   const styles = useStyles(unboundStyles);
 
   const showAvatarActionSheet = React.useCallback(() => {
     const texts = options.map((option: ShowAvatarActionSheetOptions) => {
       if (option.id === 'emoji') {
         return 'Use Emoji';
       } else if (option.id === 'image') {
         return 'Select image';
       } else if (option.id === 'ens') {
         return 'Use ENS Avatar';
       } else if (option.id === 'remove') {
         return 'Remove avatar';
       } else {
         return 'Cancel';
       }
     });
 
     const cancelButtonIndex = options.findIndex(
       option => option.id === 'cancel',
     );
 
     const containerStyle = {
       paddingBotton: insets.bottom,
     };
 
     const icons = options.map(option => {
       if (option.id === 'emoji') {
         return (
           <SWMansionIcon
             name="emote-smile"
             size={22}
             style={styles.bottomSheetIcon}
           />
         );
       } else if (option.id === 'image') {
         return (
           <SWMansionIcon
             name="image-1"
             size={22}
             style={styles.bottomSheetIcon}
           />
         );
       } else if (option.id === 'ens') {
         return (
           <CommIcon
             name="ethereum-outline"
             size={18}
             style={styles.bottomSheetIcon}
           />
         );
       } else if (option.id === 'remove') {
         return (
           <SWMansionIcon
             name="trash-2"
             size={22}
             style={styles.bottomSheetIcon}
           />
         );
       } else {
         return undefined;
       }
     });
 
     const onPressAction = (selectedIndex: ?number) => {
       if (
         selectedIndex === null ||
         selectedIndex === undefined ||
         selectedIndex < 0
       ) {
         return;
       }
       const option = options[selectedIndex];
       if (option.onPress) {
         option.onPress();
       }
     };
 
     showActionSheetWithOptions(
       {
         options: texts,
         cancelButtonIndex,
         containerStyle,
         icons,
       },
       onPressAction,
     );
   }, [
     insets.bottom,
     options,
     showActionSheetWithOptions,
     styles.bottomSheetIcon,
   ]);
 
   return showAvatarActionSheet;
 }
 
 const unboundStyles = {
   bottomSheetIcon: {
     color: '#000000',
   },
 };
 
 export {
   useUploadProcessedMedia,
   useProcessSelectedMedia,
   useShowAvatarActionSheet,
   useSelectFromGalleryAndUpdateUserAvatar,
   useSelectFromGalleryAndUpdateThreadAvatar,
   useRemoveUserAvatar,
   useRemoveThreadAvatar,
   useENSUserAvatar,
 };