refactor: inline sendRoomMessage into useRoomMessaging

app/views/RoomView/hooks/__tests__/useRoomMessaging.test.tsx

@@ -3,7 +3,7 @@ import { Text } from 'react-native';
 
 import { sendMessage as sendMessageRequest } from '../../../../lib/methods/sendMessage';
 import { Review } from '../../../../lib/methods/helpers/review';
-import { events, logEvent } from '../../../../lib/methods/helpers/log';
+import log, { events, logEvent } from '../../../../lib/methods/helpers/log';
 import { MessageActionProvider, useMessageAction } from '../../../../containers/message/stores/MessageActionStore';
 import { useRoomMessaging } from '../useRoomMessaging';
 
@@ -48,6 +48,7 @@ jest.mock('../useRoomInit', () => ({
 const mockSendMessageRequest = sendMessageRequest as jest.Mock;
 const mockReview = Review.pushPositiveEvent as jest.Mock;
 const mockLogEvent = logEvent as jest.Mock;
+const mockLog = log as unknown as jest.Mock;
 
 const createDeferred = () => {
 	let resolve!: () => void;
@@ -143,13 +144,28 @@ describe('useRoomMessaging', () => {
 		const { result } = renderRoomMessaging();
 		const clearLastSeen = require('../useRoomInit').useRoomInit.mock.results[0].value.clearLastSeen as jest.Mock;
 
+		const error = new Error('offline');
+
 		act(() => result.current.sendMessage('hello'));
 		await act(async () => {
-			deferred.reject(new Error('offline'));
+			deferred.reject(error);
 			await Promise.resolve();
 		});
 
 		expect(clearLastSeen).not.toHaveBeenCalled();
 		expect(mockReview).not.toHaveBeenCalled();
+		expect(mockLog).toHaveBeenCalledWith(error);
+	});
+
+	it('does nothing when there is no message to send', () => {
+		const { result } = renderRoomMessaging();
+
+		act(() => result.current.messageActionStore.getState().actions.setQuoteMessageIds(['quoted-message']));
+
+		act(() => result.current.sendMessage(undefined, true));
+
+		expect(mockSendMessageRequest).not.toHaveBeenCalled();
+		expect(mockLogEvent).not.toHaveBeenCalled();
+		expect(result.current.messageActionStore.getState().action).toEqual({ kind: 'quote', messageIds: ['quoted-message'] });
 	});
 });

app/views/RoomView/hooks/useRoomMessaging.ts

@@ -8,9 +8,11 @@ import { createMessageActionStore } from '../../../containers/message/stores/Mes
 import { useAppSelector } from '../../../lib/hooks/useAppSelector';
 import { useLiveRef } from '../../../lib/hooks/useLiveRef';
 import { useMasterDetail } from '../../../lib/hooks/useMasterDetail';
+import log, { events, logEvent } from '../../../lib/methods/helpers/log';
+import { Review } from '../../../lib/methods/helpers/review';
+import { sendMessage as sendMessageRequest } from '../../../lib/methods/sendMessage';
 import { getUserSelector } from '../../../selectors/login';
 import { type IListContainerRef, type IUseRoomMessagingParams, type TListRef } from '../definitions';
-import { sendRoomMessage } from '../services/sendRoomMessage';
 import { useMessageActions } from './useMessageActions';
 import { useRoomInit } from './useRoomInit';
 import { useRoomNavigation } from './useRoomNavigation';
@@ -70,16 +72,19 @@ export function useRoomMessaging({ rid, t, tmid, roomStore, ready, roomUserId, q
 
 	const roomScreen = useRoomInit({ rid, tmid, isAuthenticated, roomStore, onThreadMessagesLoaded, ready });
 
-	const sendMessage = (message?: string, tshow?: boolean) =>
-		sendRoomMessage({
-			rid,
-			message,
-			tmid,
-			user: userRef.current,
-			tshow,
-			onMessageSent: roomScreen.clearLastSeen,
-			resetAction
-		});
+	const sendMessage = (message?: string, tshow?: boolean) => {
+		if (message === undefined) {
+			return;
+		}
+		logEvent(events.ROOM_SEND_MESSAGE);
+		sendMessageRequest(rid as string, message, tmid, userRef.current, tshow)
+			.then(() => {
+				roomScreen.clearLastSeen();
+				Review.pushPositiveEvent();
+			})
+			.catch(log);
+		resetAction();
+	};
 
 	return {
 		messageActionStore,