diff --git a/lib/shared/dm-ops/dm-op-utils.js b/lib/shared/dm-ops/dm-op-utils.js
index 2d5add6a9..233bccd23 100644
--- a/lib/shared/dm-ops/dm-op-utils.js
+++ b/lib/shared/dm-ops/dm-op-utils.js
@@ -1,426 +1,433 @@
 // @flow
 
 import invariant from 'invariant';
 import _groupBy from 'lodash/fp/groupBy.js';
 import * as React from 'react';
 import uuid from 'uuid';
 
 import {
   type ProcessDMOperationUtilities,
   type ProcessingPossibilityCheckResult,
 } from './dm-op-spec.js';
 import { dmOpSpecs } from './dm-op-specs.js';
 import { useProcessAndSendDMOperation } from './process-dm-ops.js';
 import { useFindUserIdentities } from '../../actions/user-actions.js';
 import { useLoggedInUserInfo } from '../../hooks/account-hooks.js';
 import { useGetLatestMessageEdit } from '../../hooks/latest-message-edit.js';
 import { mergeUpdatesWithMessageInfos } from '../../reducers/message-reducer.js';
+import { getAllPeerUserIDAndDeviceIDs } from '../../selectors/user-selectors.js';
 import type {
   CreateThickRawThreadInfoInput,
   DMAddMembersOperation,
   DMAddViewerToThreadMembersOperation,
   DMOperation,
   ComposableDMOperation,
 } from '../../types/dm-ops.js';
 import type { RawMessageInfo } from '../../types/message-types.js';
 import type {
   RawThreadInfo,
   ThickRawThreadInfo,
   ThreadInfo,
 } from '../../types/minimally-encoded-thread-permissions-types.js';
 import type { InboundActionMetadata } from '../../types/redux-types.js';
 import {
   outboundP2PMessageStatuses,
   type OutboundP2PMessage,
 } from '../../types/sqlite-types.js';
 import {
   assertThickThreadType,
   thickThreadTypes,
 } from '../../types/thread-types-enum.js';
 import type { LegacyRawThreadInfo } from '../../types/thread-types.js';
 import {
   type DMOperationP2PMessage,
   userActionsP2PMessageTypes,
 } from '../../types/tunnelbroker/user-actions-peer-to-peer-message-types.js';
 import { updateTypes } from '../../types/update-types-enum.js';
 import type { ClientUpdateInfo } from '../../types/update-types.js';
 import { getContentSigningKey } from '../../utils/crypto-utils.js';
 import { useSelector } from '../../utils/redux-utils.js';
 import { messageSpecs } from '../messages/message-specs.js';
 import { updateSpecs } from '../updates/update-specs.js';
 
 function generateMessagesToPeers(
   message: DMOperation,
   peers: $ReadOnlyArray<{
     +userID: string,
     +deviceID: string,
   }>,
 ): $ReadOnlyArray<OutboundP2PMessage> {
   const opMessage: DMOperationP2PMessage = {
     type: userActionsP2PMessageTypes.DM_OPERATION,
     op: message,
   };
   const plaintext = JSON.stringify(opMessage);
   const outboundP2PMessages = [];
   for (const peer of peers) {
     const messageToPeer: OutboundP2PMessage = {
       messageID: uuid.v4(),
       deviceID: peer.deviceID,
       userID: peer.userID,
       timestamp: new Date().getTime().toString(),
       plaintext,
       ciphertext: '',
       status: outboundP2PMessageStatuses.persisted,
       supportsAutoRetry: dmOpSpecs[message.type].supportsAutoRetry,
     };
     outboundP2PMessages.push(messageToPeer);
   }
   return outboundP2PMessages;
 }
 
 export const dmOperationSpecificationTypes = Object.freeze({
   OUTBOUND: 'OutboundDMOperationSpecification',
   INBOUND: 'InboundDMOperationSpecification',
 });
 
 type OutboundDMOperationSpecificationRecipients =
   | { +type: 'all_peer_devices' | 'self_devices' }
   | { +type: 'some_users', +userIDs: $ReadOnlyArray<string> }
   | { +type: 'all_thread_members', +threadID: string }
   | { +type: 'some_devices', +deviceIDs: $ReadOnlyArray<string> };
 
 // The operation generated on the sending client, causes changes to
 // the state and broadcasting information to peers.
 export type OutboundDMOperationSpecification = {
   +type: 'OutboundDMOperationSpecification',
   +op: DMOperation,
   +recipients: OutboundDMOperationSpecificationRecipients,
   +sendOnly?: boolean,
 };
 
 export type OutboundComposableDMOperationSpecification = {
   +type: 'OutboundDMOperationSpecification',
   +op: ComposableDMOperation,
   +recipients: OutboundDMOperationSpecificationRecipients,
   // Composable DM Ops are created only to be sent, locally we use
   // dedicated mechanism for updating the store.
   +sendOnly: true,
   +composableMessageID: string,
 };
 
 // The operation received from other peers, causes changes to
 // the state and after processing, sends confirmation to the sender.
 export type InboundDMOperationSpecification = {
   +type: 'InboundDMOperationSpecification',
   +op: DMOperation,
   +metadata: ?InboundActionMetadata,
 };
 
 export type DMOperationSpecification =
   | OutboundDMOperationSpecification
   | InboundDMOperationSpecification;
 
-async function createMessagesToPeersFromDMOp(
+function useCreateMessagesToPeersFromDMOp(): (
   operation: DMOperation,
   recipients: OutboundDMOperationSpecificationRecipients,
-  allPeerUserIDAndDeviceIDs: $ReadOnlyArray<{
-    +userID: string,
-    +deviceID: string,
-  }>,
-  utilities: ProcessDMOperationUtilities,
-): Promise<$ReadOnlyArray<OutboundP2PMessage>> {
-  const { viewerID, threadInfos } = utilities;
-  if (!viewerID) {
-    return [];
-  }
+) => Promise<$ReadOnlyArray<OutboundP2PMessage>> {
+  const allPeerUserIDAndDeviceIDs = useSelector(getAllPeerUserIDAndDeviceIDs);
+  const utilities = useSendDMOperationUtils();
 
-  let peerUserIDAndDeviceIDs = allPeerUserIDAndDeviceIDs;
-  if (recipients.type === 'self_devices') {
-    peerUserIDAndDeviceIDs = allPeerUserIDAndDeviceIDs.filter(
-      peer => peer.userID === viewerID,
-    );
-  } else if (recipients.type === 'some_users') {
-    const userIDs = new Set(recipients.userIDs);
-    peerUserIDAndDeviceIDs = allPeerUserIDAndDeviceIDs.filter(peer =>
-      userIDs.has(peer.userID),
-    );
-  } else if (recipients.type === 'all_thread_members') {
-    const { threadID } = recipients;
-    if (!threadInfos[threadID]) {
-      console.log(
-        `all_thread_members called for threadID ${threadID}, which is ` +
-          'missing from the ThreadStore. if sending a message soon after ' +
-          'thread creation, consider some_users instead',
+  return React.useCallback(
+    async (
+      operation: DMOperation,
+      recipients: OutboundDMOperationSpecificationRecipients,
+    ): Promise<$ReadOnlyArray<OutboundP2PMessage>> => {
+      const { viewerID, threadInfos } = utilities;
+      if (!viewerID) {
+        return [];
+      }
+
+      let peerUserIDAndDeviceIDs = allPeerUserIDAndDeviceIDs;
+      if (recipients.type === 'self_devices') {
+        peerUserIDAndDeviceIDs = allPeerUserIDAndDeviceIDs.filter(
+          peer => peer.userID === viewerID,
+        );
+      } else if (recipients.type === 'some_users') {
+        const userIDs = new Set(recipients.userIDs);
+        peerUserIDAndDeviceIDs = allPeerUserIDAndDeviceIDs.filter(peer =>
+          userIDs.has(peer.userID),
+        );
+      } else if (recipients.type === 'all_thread_members') {
+        const { threadID } = recipients;
+        if (!threadInfos[threadID]) {
+          console.log(
+            `all_thread_members called for threadID ${threadID}, which is ` +
+              'missing from the ThreadStore. if sending a message soon after ' +
+              'thread creation, consider some_users instead',
+          );
+        }
+        const members = threadInfos[recipients.threadID]?.members ?? [];
+        const memberIDs = members.map(member => member.id);
+
+        const userIDs = new Set(memberIDs);
+        peerUserIDAndDeviceIDs = allPeerUserIDAndDeviceIDs.filter(peer =>
+          userIDs.has(peer.userID),
+        );
+      } else if (recipients.type === 'some_devices') {
+        const deviceIDs = new Set(recipients.deviceIDs);
+        peerUserIDAndDeviceIDs = allPeerUserIDAndDeviceIDs.filter(peer =>
+          deviceIDs.has(peer.deviceID),
+        );
+      }
+
+      const thisDeviceID = await getContentSigningKey();
+      const targetPeers = peerUserIDAndDeviceIDs.filter(
+        peer => peer.deviceID !== thisDeviceID,
       );
-    }
-    const members = threadInfos[recipients.threadID]?.members ?? [];
-    const memberIDs = members.map(member => member.id);
-
-    const userIDs = new Set(memberIDs);
-    peerUserIDAndDeviceIDs = allPeerUserIDAndDeviceIDs.filter(peer =>
-      userIDs.has(peer.userID),
-    );
-  } else if (recipients.type === 'some_devices') {
-    const deviceIDs = new Set(recipients.deviceIDs);
-    peerUserIDAndDeviceIDs = allPeerUserIDAndDeviceIDs.filter(peer =>
-      deviceIDs.has(peer.deviceID),
-    );
-  }
-
-  const thisDeviceID = await getContentSigningKey();
-  const targetPeers = peerUserIDAndDeviceIDs.filter(
-    peer => peer.deviceID !== thisDeviceID,
+      return generateMessagesToPeers(operation, targetPeers);
+    },
+    [allPeerUserIDAndDeviceIDs, utilities],
   );
-  return generateMessagesToPeers(operation, targetPeers);
 }
 
 function getCreateThickRawThreadInfoInputFromThreadInfo(
   threadInfo: ThickRawThreadInfo,
 ): CreateThickRawThreadInfoInput {
   const roleID = Object.keys(threadInfo.roles).pop();
   const thickThreadType = assertThickThreadType(threadInfo.type);
   return {
     threadID: threadInfo.id,
     threadType: thickThreadType,
     creationTime: threadInfo.creationTime,
     parentThreadID: threadInfo.parentThreadID,
     allMemberIDsWithSubscriptions: threadInfo.members.map(
       ({ id, subscription }) => ({
         id,
         subscription,
       }),
     ),
     roleID,
     unread: !!threadInfo.currentUser.unread,
     name: threadInfo.name,
     avatar: threadInfo.avatar,
     description: threadInfo.description,
     color: threadInfo.color,
     containingThreadID: threadInfo.containingThreadID,
     sourceMessageID: threadInfo.sourceMessageID,
     repliesCount: threadInfo.repliesCount,
     pinnedCount: threadInfo.pinnedCount,
     timestamps: threadInfo.timestamps,
   };
 }
 
 function useAddDMThreadMembers(): (
   newMemberIDs: $ReadOnlyArray<string>,
   threadInfo: ThreadInfo,
 ) => Promise<void> {
   const viewerID = useSelector(
     state => state.currentUserInfo && state.currentUserInfo.id,
   );
   const processAndSendDMOperation = useProcessAndSendDMOperation();
   const threadInfos = useSelector(state => state.threadStore.threadInfos);
 
   return React.useCallback(
     async (newMemberIDs: $ReadOnlyArray<string>, threadInfo: ThreadInfo) => {
       const rawThreadInfo = threadInfos[threadInfo.id];
       invariant(rawThreadInfo.thick, 'thread should be thick');
       const existingThreadDetails =
         getCreateThickRawThreadInfoInputFromThreadInfo(rawThreadInfo);
 
       invariant(viewerID, 'viewerID should be set');
       const addViewerToThreadMembersOperation: DMAddViewerToThreadMembersOperation =
         {
           type: 'add_viewer_to_thread_members',
           existingThreadDetails,
           editorID: viewerID,
           time: Date.now(),
           messageID: uuid.v4(),
           addedUserIDs: newMemberIDs,
         };
       const viewerOperationSpecification: OutboundDMOperationSpecification = {
         type: dmOperationSpecificationTypes.OUTBOUND,
         op: addViewerToThreadMembersOperation,
         recipients: {
           type: 'some_users',
           userIDs: newMemberIDs,
         },
         sendOnly: true,
       };
 
       invariant(viewerID, 'viewerID should be set');
       const addMembersOperation: DMAddMembersOperation = {
         type: 'add_members',
         threadID: threadInfo.id,
         editorID: viewerID,
         time: Date.now(),
         messageID: uuid.v4(),
         addedUserIDs: newMemberIDs,
       };
       const newMemberIDsSet = new Set<string>(newMemberIDs);
       const recipientsThreadID =
         threadInfo.type === thickThreadTypes.THICK_SIDEBAR &&
         threadInfo.parentThreadID
           ? threadInfo.parentThreadID
           : threadInfo.id;
 
       const existingMembers =
         threadInfos[recipientsThreadID]?.members
           ?.map(member => member.id)
           ?.filter(memberID => !newMemberIDsSet.has(memberID)) ?? [];
 
       const addMembersOperationSpecification: OutboundDMOperationSpecification =
         {
           type: dmOperationSpecificationTypes.OUTBOUND,
           op: addMembersOperation,
           recipients: {
             type: 'some_users',
             userIDs: existingMembers,
           },
         };
 
       await Promise.all([
         processAndSendDMOperation(viewerOperationSpecification),
         processAndSendDMOperation(addMembersOperationSpecification),
       ]);
     },
     [processAndSendDMOperation, threadInfos, viewerID],
   );
 }
 
 function getThreadUpdatesForNewMessages(
   rawMessageInfos: $ReadOnlyArray<RawMessageInfo>,
   updateInfos: $ReadOnlyArray<ClientUpdateInfo>,
   utilities: ProcessDMOperationUtilities,
 ): Array<ClientUpdateInfo> {
   const { threadInfos, viewerID } = utilities;
 
   const { rawMessageInfos: allNewMessageInfos } = mergeUpdatesWithMessageInfos(
     rawMessageInfos,
     updateInfos,
   );
   const messagesByThreadID = _groupBy(message => message.threadID)(
     allNewMessageInfos,
   );
 
   const updatedThreadInfosByThreadID: {
     [string]: RawThreadInfo | LegacyRawThreadInfo,
   } = {};
   for (const threadID in messagesByThreadID) {
     updatedThreadInfosByThreadID[threadID] = threadInfos[threadID];
   }
   for (const update of updateInfos) {
     const updatedThreadInfo = updateSpecs[update.type].getUpdatedThreadInfo?.(
       update,
       updatedThreadInfosByThreadID,
     );
     if (updatedThreadInfo) {
       updatedThreadInfosByThreadID[updatedThreadInfo.id] = updatedThreadInfo;
     }
   }
 
   const newUpdateInfos: Array<ClientUpdateInfo> = [];
   for (const threadID in messagesByThreadID) {
     const repliesCountIncreasingMessages = messagesByThreadID[threadID].filter(
       message => messageSpecs[message.type].includedInRepliesCount,
     );
 
     let threadInfo = updatedThreadInfosByThreadID[threadID];
 
     if (repliesCountIncreasingMessages.length > 0) {
       const repliesCountIncreaseTime = Math.max(
         repliesCountIncreasingMessages.map(message => message.time),
       );
       const newThreadInfo = {
         ...threadInfo,
         repliesCount:
           threadInfo.repliesCount + repliesCountIncreasingMessages.length,
       };
       newUpdateInfos.push({
         type: updateTypes.UPDATE_THREAD,
         id: uuid.v4(),
         time: repliesCountIncreaseTime,
         threadInfo: newThreadInfo,
       });
       threadInfo = newThreadInfo;
     }
 
     const messagesFromOtherPeers = messagesByThreadID[threadID].filter(
       message => message.creatorID !== viewerID,
     );
     if (messagesFromOtherPeers.length === 0) {
       continue;
     }
     // We take the most recent timestamp to make sure that
     // change_thread_read_status operation older
     // than it won't flip the status to read.
     const time = Math.max(messagesFromOtherPeers.map(message => message.time));
     invariant(threadInfo.thick, 'Thread should be thick');
 
     // We aren't checking if the unread timestamp is lower than the time.
     // We're doing this because we want to flip the thread to unread after
     // any new message from a non-viewer.
     newUpdateInfos.push({
       type: updateTypes.UPDATE_THREAD_READ_STATUS,
       id: uuid.v4(),
       time,
       threadID: threadInfo.id,
       unread: true,
     });
   }
 
   return newUpdateInfos;
 }
 
 async function checkMessageIDConflict(
   dmOperation: DMOperation,
   utilities: ProcessDMOperationUtilities,
 ): Promise<ProcessingPossibilityCheckResult> {
   if (!dmOperation.messageID) {
     return {
       isProcessingPossible: true,
     };
   }
   const messageID = dmOperation.messageID;
   const message = await utilities.fetchMessage(messageID);
   if (message) {
     console.log(
       `Discarded a ${dmOperation.type} operation because ` +
         `message with the same ID ${messageID} already exists ` +
         'in the store',
     );
     return {
       isProcessingPossible: false,
       reason: {
         type: 'invalid',
       },
     };
   }
   return {
     isProcessingPossible: true,
   };
 }
 
 function useSendDMOperationUtils(): $ReadOnly<{
   ...ProcessDMOperationUtilities,
   viewerID: ?string,
 }> {
   const fetchMessage = useGetLatestMessageEdit();
   const threadInfos = useSelector(state => state.threadStore.threadInfos);
   const entryInfos = useSelector(state => state.entryStore.entryInfos);
   const findUserIdentities = useFindUserIdentities();
   const loggedInUserInfo = useLoggedInUserInfo();
   const viewerID = loggedInUserInfo?.id;
   return React.useMemo(
     () => ({
       viewerID,
       fetchMessage,
       threadInfos,
       entryInfos,
       findUserIdentities,
     }),
     [viewerID, fetchMessage, threadInfos, entryInfos, findUserIdentities],
   );
 }
 
 export {
-  createMessagesToPeersFromDMOp,
+  useCreateMessagesToPeersFromDMOp,
   useAddDMThreadMembers,
   getCreateThickRawThreadInfoInputFromThreadInfo,
   getThreadUpdatesForNewMessages,
   checkMessageIDConflict,
   useSendDMOperationUtils,
 };
diff --git a/lib/shared/dm-ops/process-dm-ops.js b/lib/shared/dm-ops/process-dm-ops.js
index 6cb6f9757..864abf431 100644
--- a/lib/shared/dm-ops/process-dm-ops.js
+++ b/lib/shared/dm-ops/process-dm-ops.js
@@ -1,401 +1,396 @@
 // @flow
 
 import invariant from 'invariant';
 import * as React from 'react';
 
 import type { ProcessDMOperationUtilities } from './dm-op-spec.js';
 import { dmOpSpecs } from './dm-op-specs.js';
 import {
   type OutboundDMOperationSpecification,
   type DMOperationSpecification,
-  createMessagesToPeersFromDMOp,
+  useCreateMessagesToPeersFromDMOp,
   dmOperationSpecificationTypes,
   type OutboundComposableDMOperationSpecification,
   getThreadUpdatesForNewMessages,
   checkMessageIDConflict,
   useSendDMOperationUtils,
 } from './dm-op-utils.js';
 import { useProcessBlobHolders } from '../../actions/holder-actions.js';
 import { processNewUserIDsActionType } from '../../actions/user-actions.js';
 import { useDispatchWithMetadata } from '../../hooks/ops-hooks.js';
-import { getAllPeerUserIDAndDeviceIDs } from '../../selectors/user-selectors.js';
 import {
   usePeerToPeerCommunication,
   type ProcessOutboundP2PMessagesResult,
 } from '../../tunnelbroker/peer-to-peer-context.js';
 import {
   processDMOpsActionType,
   queueDMOpsActionType,
   dmOperationValidator,
 } from '../../types/dm-ops.js';
 import type { NotificationsCreationData } from '../../types/notif-types.js';
 import type { DispatchMetadata } from '../../types/redux-types.js';
 import type { OutboundP2PMessage } from '../../types/sqlite-types.js';
 import { extractUserIDsFromPayload } from '../../utils/conversion-utils.js';
 import { useSelector, useDispatch } from '../../utils/redux-utils.js';
 
 function useProcessDMOperation(): (
   dmOperationSpecification: DMOperationSpecification,
   dmOpID: ?string,
 ) => Promise<void> {
   const baseUtilities = useSendDMOperationUtils();
   const dispatchWithMetadata = useDispatchWithMetadata();
-  const allPeerUserIDAndDeviceIDs = useSelector(getAllPeerUserIDAndDeviceIDs);
   const processBlobHolders = useProcessBlobHolders();
+  const createMessagesToPeersFromDMOp = useCreateMessagesToPeersFromDMOp();
 
   const dispatch = useDispatch();
 
   return React.useCallback(
     async (
       dmOperationSpecification: DMOperationSpecification,
       dmOpID: ?string,
     ) => {
       const { viewerID, ...restUtilities } = baseUtilities;
       if (!viewerID) {
         console.log('ignored DMOperation because logged out');
         return;
       }
       const utilities: ProcessDMOperationUtilities = {
         ...restUtilities,
         viewerID,
       };
 
       const { op: dmOp } = dmOperationSpecification;
 
       let outboundP2PMessages: ?$ReadOnlyArray<OutboundP2PMessage> = null;
       if (
         dmOperationSpecification.type === dmOperationSpecificationTypes.OUTBOUND
       ) {
         outboundP2PMessages = await createMessagesToPeersFromDMOp(
           dmOp,
           dmOperationSpecification.recipients,
-          allPeerUserIDAndDeviceIDs,
-          utilities,
         );
       }
 
       let dispatchMetadata: ?DispatchMetadata = null;
       if (
         dmOperationSpecification.type ===
           dmOperationSpecificationTypes.OUTBOUND &&
         dmOpID
       ) {
         dispatchMetadata = {
           dmOpID,
         };
       } else if (
         dmOperationSpecification.type === dmOperationSpecificationTypes.INBOUND
       ) {
         dispatchMetadata = dmOperationSpecification.metadata;
       }
 
       let composableMessageID: ?string = null;
       if (
         dmOperationSpecification.type ===
           dmOperationSpecificationTypes.OUTBOUND &&
         !dmOpSpecs[dmOp.type].supportsAutoRetry
       ) {
         composableMessageID = dmOp.messageID;
       }
 
       if (
         dmOperationSpecification.type ===
           dmOperationSpecificationTypes.OUTBOUND &&
         dmOperationSpecification.sendOnly
       ) {
         const notificationsCreationData = await dmOpSpecs[
           dmOp.type
         ].notificationsCreationData?.(dmOp, utilities);
 
         dispatchWithMetadata(
           {
             type: processDMOpsActionType,
             payload: {
               rawMessageInfos: [],
               updateInfos: [],
               outboundP2PMessages,
               composableMessageID,
               notificationsCreationData,
             },
           },
           dispatchMetadata,
         );
 
         return;
       }
 
       if (!dmOpSpecs[dmOp.type].operationValidator.is(dmOp)) {
         console.log(`Ignoring ${dmOp.type} operation because it is invalid`);
         return;
       }
 
       const [messageIDConflictCheckResult, processingCheckResult] =
         await Promise.all([
           checkMessageIDConflict(dmOp, utilities),
           dmOpSpecs[dmOp.type].canBeProcessed(dmOp, utilities),
         ]);
 
       if (!messageIDConflictCheckResult.isProcessingPossible) {
         return;
       }
 
       if (!processingCheckResult.isProcessingPossible) {
         if (processingCheckResult.reason.type === 'invalid') {
           return;
         }
         let condition;
         if (processingCheckResult.reason.type === 'missing_thread') {
           condition = {
             type: 'thread',
             threadID: processingCheckResult.reason.threadID,
           };
         } else if (processingCheckResult.reason.type === 'missing_entry') {
           condition = {
             type: 'entry',
             entryID: processingCheckResult.reason.entryID,
           };
         } else if (processingCheckResult.reason.type === 'missing_message') {
           condition = {
             type: 'message',
             messageID: processingCheckResult.reason.messageID,
           };
         } else if (processingCheckResult.reason.type === 'missing_membership') {
           condition = {
             type: 'membership',
             threadID: processingCheckResult.reason.threadID,
             userID: processingCheckResult.reason.userID,
           };
         }
         dispatchWithMetadata(
           {
             type: queueDMOpsActionType,
             payload: {
               operation: dmOp,
               timestamp: Date.now(),
               condition,
             },
           },
           dispatchMetadata,
         );
         return;
       }
 
       const newUserIDs = extractUserIDsFromPayload(dmOperationValidator, dmOp);
       if (newUserIDs.length > 0) {
         dispatch({
           type: processNewUserIDsActionType,
           payload: { userIDs: newUserIDs },
         });
       }
 
       const dmOpSpec = dmOpSpecs[dmOp.type];
       const notificationsCreationDataPromise: Promise<?NotificationsCreationData> =
         (async () => {
           if (
             dmOperationSpecification.type ===
               dmOperationSpecificationTypes.INBOUND ||
             !dmOpSpec.notificationsCreationData
           ) {
             return null;
           }
           return await dmOpSpec.notificationsCreationData(dmOp, utilities);
         })();
 
       const [
         { rawMessageInfos, updateInfos, blobOps },
         notificationsCreationData,
       ] = await Promise.all([
         dmOpSpec.processDMOperation(dmOp, utilities),
         notificationsCreationDataPromise,
       ]);
 
       const holderOps = blobOps
         .map(({ dmOpType, ...holderOp }) => {
           if (
             (dmOpType === 'inbound_only' &&
               dmOperationSpecification.type ===
                 dmOperationSpecificationTypes.OUTBOUND) ||
             (dmOpType === 'outbound_only' &&
               dmOperationSpecification.type ===
                 dmOperationSpecificationTypes.INBOUND)
           ) {
             return null;
           }
           return holderOp;
         })
         .filter(Boolean);
       void processBlobHolders(holderOps);
 
       const newUpdateInfos = getThreadUpdatesForNewMessages(
         rawMessageInfos,
         updateInfos,
         utilities,
       );
 
       updateInfos.push(...newUpdateInfos);
 
       dispatchWithMetadata(
         {
           type: processDMOpsActionType,
           payload: {
             rawMessageInfos,
             updateInfos,
             outboundP2PMessages,
             composableMessageID,
             notificationsCreationData,
           },
         },
         dispatchMetadata,
       );
     },
     [
       baseUtilities,
+      processBlobHolders,
       dispatchWithMetadata,
-      allPeerUserIDAndDeviceIDs,
+      createMessagesToPeersFromDMOp,
       dispatch,
-      processBlobHolders,
     ],
   );
 }
 
 function useProcessAndSendDMOperation(): (
   dmOperationSpecification: OutboundDMOperationSpecification,
 ) => Promise<void> {
   const processDMOps = useProcessDMOperation();
   const { getDMOpsSendingPromise } = usePeerToPeerCommunication();
 
   return React.useCallback(
     async (dmOperationSpecification: OutboundDMOperationSpecification) => {
       const { promise, dmOpID } = getDMOpsSendingPromise();
       await processDMOps(dmOperationSpecification, dmOpID);
       await promise;
     },
     [getDMOpsSendingPromise, processDMOps],
   );
 }
 
 function useSendComposableDMOperation(): (
   dmOperationSpecification: OutboundComposableDMOperationSpecification,
 ) => Promise<ProcessOutboundP2PMessagesResult> {
   const { getDMOpsSendingPromise } = usePeerToPeerCommunication();
   const dispatchWithMetadata = useDispatchWithMetadata();
-  const allPeerUserIDAndDeviceIDs = useSelector(getAllPeerUserIDAndDeviceIDs);
   const baseUtilities = useSendDMOperationUtils();
   const { processOutboundMessages } = usePeerToPeerCommunication();
   const localMessageInfos = useSelector(state => state.messageStore.local);
+  const createMessagesToPeersFromDMOp = useCreateMessagesToPeersFromDMOp();
 
   return React.useCallback(
     async (
       dmOperationSpecification: OutboundComposableDMOperationSpecification,
     ): Promise<ProcessOutboundP2PMessagesResult> => {
       const { viewerID, ...restUtilities } = baseUtilities;
       if (!viewerID) {
         console.log('ignored DMOperation because logged out');
         return {
           result: 'failure',
           failedMessageIDs: [],
         };
       }
       const utilities: ProcessDMOperationUtilities = {
         ...restUtilities,
         viewerID,
       };
 
       const { promise, dmOpID } = getDMOpsSendingPromise();
 
       const { op, composableMessageID, recipients } = dmOperationSpecification;
 
       const localMessageInfo = localMessageInfos[composableMessageID];
       if (
         localMessageInfo?.outboundP2PMessageIDs &&
         localMessageInfo.outboundP2PMessageIDs.length > 0
       ) {
         processOutboundMessages(localMessageInfo.outboundP2PMessageIDs, dmOpID);
         try {
           // This code should never throw.
           return await promise;
         } catch (e) {
           invariant(
             localMessageInfo.outboundP2PMessageIDs,
             'outboundP2PMessageIDs should be defined',
           );
           return {
             result: 'failure',
             failedMessageIDs: localMessageInfo.outboundP2PMessageIDs,
           };
         }
       }
 
       const outboundP2PMessages = await createMessagesToPeersFromDMOp(
         op,
         recipients,
-        allPeerUserIDAndDeviceIDs,
-        utilities,
       );
 
       const spec = dmOpSpecs[op.type];
 
       const notificationsCreationDataPromise: Promise<?NotificationsCreationData> =
         (async () => {
           if (!spec?.notificationsCreationData) {
             return null;
           }
           return await spec.notificationsCreationData(op, utilities);
         })();
 
       const [{ rawMessageInfos, updateInfos }, notificationsCreationData] =
         await Promise.all([
           dmOpSpecs[op.type].processDMOperation(op, utilities),
           notificationsCreationDataPromise,
         ]);
 
       const newUpdateInfos = getThreadUpdatesForNewMessages(
         rawMessageInfos,
         updateInfos,
         utilities,
       );
 
       dispatchWithMetadata(
         {
           type: processDMOpsActionType,
           payload: {
             rawMessageInfos: [],
             updateInfos: newUpdateInfos,
             outboundP2PMessages,
             composableMessageID,
             notificationsCreationData,
           },
         },
         {
           dmOpID,
         },
       );
 
       try {
         // This code should never throw.
         return await promise;
       } catch (e) {
         return {
           result: 'failure',
           failedMessageIDs: outboundP2PMessages.map(
             message => message.messageID,
           ),
         };
       }
     },
     [
-      allPeerUserIDAndDeviceIDs,
-      dispatchWithMetadata,
+      baseUtilities,
       getDMOpsSendingPromise,
       localMessageInfos,
+      createMessagesToPeersFromDMOp,
+      dispatchWithMetadata,
       processOutboundMessages,
-      baseUtilities,
     ],
   );
 }
 
 export {
   useProcessDMOperation,
   useProcessAndSendDMOperation,
   useSendComposableDMOperation,
 };