diff --git a/lib/shared/farcaster/farcaster-hooks.js b/lib/shared/farcaster/farcaster-hooks.js --- a/lib/shared/farcaster/farcaster-hooks.js +++ b/lib/shared/farcaster/farcaster-hooks.js @@ -1256,15 +1256,8 @@ function useAddNewFarcasterMessage(): FarcasterMessage => Promise { const dispatch = useDispatch(); - const fetchUsersByFIDs = useGetCommFCUsersForFIDs(); - const viewerID = useSelector( - state => state.currentUserInfo && state.currentUserInfo.id, - ); - const fetchMessage = useGetLatestMessageEdit(); - const threadInfos = useSelector(state => state.threadStore.threadInfos); const fetchConversationWithMessages = useFetchConversationWithMessages(); const currentlyFetchedConversations = React.useRef>(new Set()); - const { addLog } = useDebugLogs(); const fetchConversation = React.useCallback( async (farcasterMessage: FarcasterMessage, withMessages: boolean) => { @@ -1288,8 +1281,21 @@ [dispatch, fetchConversationWithMessages], ); + const fetchUsersByFIDs = useGetCommFCUsersForFIDs(); + const viewerID = useSelector( + state => state.currentUserInfo && state.currentUserInfo.id, + ); + const fetchMessage = useGetLatestMessageEdit(); + const threadInfos = useSelector(state => state.threadStore.threadInfos); + const { addLog } = useDebugLogs(); + const currentUserSupportsDCs = useCurrentUserSupportsDCs(); + return React.useCallback( async (farcasterMessage: FarcasterMessage) => { + if (!currentUserSupportsDCs) { + return; + } + const threadID = farcasterThreadIDFromConversationID( farcasterMessage.conversationId, ); @@ -1369,6 +1375,7 @@ fetchUsersByFIDs, threadInfos, viewerID, + currentUserSupportsDCs, ], ); } @@ -1540,12 +1547,16 @@ const threadInfos = useSelector(state => state.threadStore.threadInfos); const fetchConversationWithBatching = useFetchConversationWithBatching(); const { addLog } = useDebugLogs(); + const currentUserSupportsDCs = useCurrentUserSupportsDCs(); return React.useCallback( async ( unreadConversationIds: $ReadOnlyArray, readConversationIds: $ReadOnlyArray, ) => { + if (!currentUserSupportsDCs) { + return; + } try { const allConversationIds = [ ...unreadConversationIds, @@ -1614,15 +1625,17 @@ throw e; } }, - [addLog, dispatch, fetchConversationWithBatching, threadInfos], + [ + currentUserSupportsDCs, + addLog, + dispatch, + fetchConversationWithBatching, + threadInfos, + ], ); } export { - useFarcasterConversationsSync, - useLightweightFarcasterConversationsSync, - useFetchConversationWithBatching, - useFetchConversationWithMessages, useFetchConversation, useFetchMessagesForConversation, useRefreshFarcasterConversation,