diff --git a/native/avatars/avatar-hooks.js b/native/avatars/avatar-hooks.js
new file mode 100644
--- /dev/null
+++ b/native/avatars/avatar-hooks.js
@@ -0,0 +1,31 @@
+// @flow
+
+import * as React from 'react';
+
+import { uploadMultimedia } from 'lib/actions/upload-actions.js';
+import type { UploadMultimediaResult } from 'lib/types/media-types.js';
+import { useServerCall } from 'lib/utils/action-utils.js';
+
+import type { MediaResult } from '../media/media-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;
+}
+
+export { useUploadProcessedMedia };
diff --git a/native/avatars/edit-thread-avatar.react.js b/native/avatars/edit-thread-avatar.react.js
--- a/native/avatars/edit-thread-avatar.react.js
+++ b/native/avatars/edit-thread-avatar.react.js
@@ -6,19 +6,17 @@
 import { View, TouchableOpacity, Platform } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
-import { uploadMultimedia } from 'lib/actions/upload-actions.js';
 import {
   extensionFromFilename,
   filenameFromPathOrURI,
 } from 'lib/media/file-utils.js';
 import type { MediaLibrarySelection } from 'lib/types/media-types.js';
-import { useServerCall } from 'lib/utils/action-utils.js';
 
+import { useUploadProcessedMedia } from './avatar-hooks.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 { processMedia } from '../media/media-utils.js';
-import type { MediaResult } from '../media/media-utils.js';
 import { useSelector } from '../redux/redux-utils.js';
 import { useColors, useStyles } from '../themes/colors.js';
 import { useStaffCanSee } from '../utils/staff-utils.js';
@@ -38,23 +36,7 @@
   const hasWiFi = useSelector(state => state.connectivity.hasWiFi);
   const staffCanSee = useStaffCanSee();
 
-  const callUploadMultimedia = useServerCall(uploadMultimedia);
-
-  const uploadProcessedMedia = React.useCallback(
-    (processedMedia: MediaResult) => {
-      const { uploadURI, filename, mime, dimensions } = processedMedia;
-
-      return callUploadMultimedia(
-        {
-          uri: uploadURI,
-          name: filename,
-          type: mime,
-        },
-        dimensions,
-      );
-    },
-    [callUploadMultimedia],
-  );
+  const uploadProcessedMedia = useUploadProcessedMedia();
 
   const processSelectedMedia = React.useCallback(
     async (selection: MediaLibrarySelection) => {
diff --git a/native/avatars/edit-user-avatar.react.js b/native/avatars/edit-user-avatar.react.js
--- a/native/avatars/edit-user-avatar.react.js
+++ b/native/avatars/edit-user-avatar.react.js
@@ -6,19 +6,17 @@
 import { View, TouchableOpacity, Platform } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
-import { uploadMultimedia } from 'lib/actions/upload-actions.js';
 import {
   extensionFromFilename,
   filenameFromPathOrURI,
 } from 'lib/media/file-utils.js';
 import type { MediaLibrarySelection } from 'lib/types/media-types.js';
-import { useServerCall } from 'lib/utils/action-utils.js';
 
+import { useUploadProcessedMedia } from './avatar-hooks.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 { processMedia } from '../media/media-utils.js';
-import type { MediaResult } from '../media/media-utils.js';
 import { useSelector } from '../redux/redux-utils.js';
 import { useColors, useStyles } from '../themes/colors.js';
 import { useStaffCanSee } from '../utils/staff-utils.js';
@@ -38,23 +36,7 @@
   const hasWiFi = useSelector(state => state.connectivity.hasWiFi);
   const staffCanSee = useStaffCanSee();
 
-  const callUploadMultimedia = useServerCall(uploadMultimedia);
-
-  const uploadProcessedMedia = React.useCallback(
-    (processedMedia: MediaResult) => {
-      const { uploadURI, filename, mime, dimensions } = processedMedia;
-
-      return callUploadMultimedia(
-        {
-          uri: uploadURI,
-          name: filename,
-          type: mime,
-        },
-        dimensions,
-      );
-    },
-    [callUploadMultimedia],
-  );
+  const uploadProcessedMedia = useUploadProcessedMedia();
 
   const processSelectedMedia = React.useCallback(
     async (selection: MediaLibrarySelection) => {