diff --git a/src/app/components/message/modals/MessageForward.tsx b/src/app/components/message/modals/MessageForward.tsx index d113cbecf..42eb6af82 100644 --- a/src/app/components/message/modals/MessageForward.tsx +++ b/src/app/components/message/modals/MessageForward.tsx @@ -92,6 +92,7 @@ export function MessageForwardInternal({ room, mEvent, onClose }: MessageForward const [isTargetSelected, setIsTargetSelected] = useState(false); const [isForwardSuccess, setIsForwardSuccess] = useState(false); + const [isForwarding, setIsForwarding] = useState(false); const [isForwardError, setIsForwardError] = useState(false); const [targetRoomId, setTargetRoomId] = useState(null); @@ -143,11 +144,18 @@ export function MessageForwardInternal({ room, mEvent, onClose }: MessageForward // actually forward the message to the selected room const handleForwardClick = () => { - if (!targetRoomId) return; + setIsForwarding(true); + if (!targetRoomId) { + setIsForwarding(false); + return; + } const targetRoom = getRoom(targetRoomId); const eventId = mEvent.getId(); - if (!targetRoom || !eventId) return; + if (!targetRoom || !eventId) { + setIsForwarding(false); + return; + } type SendEventType = Parameters[2]; type SendEventContent = Parameters[3]; @@ -212,10 +220,15 @@ export function MessageForwardInternal({ room, mEvent, onClose }: MessageForward } try { - mx.sendEvent(targetRoom.roomId, null, eventType, content as unknown as SendEventContent).then( - () => setIsForwardSuccess(true) - ); + mx.sendEvent(targetRoom.roomId, null, eventType, content as unknown as SendEventContent) + .then(() => setIsForwardSuccess(true)) + .catch(() => { + setIsForwarding(false); + setIsForwardSuccess(false); + setIsForwardError(true); + }); } catch { + setIsForwarding(false); setIsForwardSuccess(false); setIsForwardError(true); } @@ -264,7 +277,11 @@ export function MessageForwardInternal({ room, mEvent, onClose }: MessageForward {isTargetSelected && targetRoomId && ( - )}