diff --git a/src/modules/GroupChannel/context/hooks/useMessageActions.ts b/src/modules/GroupChannel/context/hooks/useMessageActions.ts index 3babb5075..dc8087c2d 100644 --- a/src/modules/GroupChannel/context/hooks/useMessageActions.ts +++ b/src/modules/GroupChannel/context/hooks/useMessageActions.ts @@ -159,7 +159,7 @@ export function useMessageActions(params: Params): MessageActions { }); return message; }, - [buildInternalMessageParams, sendUserMessage, scrollToBottom, processParams], + [buildInternalMessageParams, sendUserMessage, scrollToBottom, processParams, currentChannel?.url], ), sendFileMessage: useCallback( async (params) => { @@ -175,7 +175,7 @@ export function useMessageActions(params: Params): MessageActions { return message; }, - [buildInternalMessageParams, sendFileMessage, scrollToBottom, processParams], + [buildInternalMessageParams, sendFileMessage, scrollToBottom, processParams, currentChannel?.url], ), sendMultipleFilesMessage: useCallback( async (params) => { @@ -189,7 +189,7 @@ export function useMessageActions(params: Params): MessageActions { }); return message; }, - [buildInternalMessageParams, sendMultipleFilesMessage, scrollToBottom, processParams], + [buildInternalMessageParams, sendMultipleFilesMessage, scrollToBottom, processParams, currentChannel?.url], ), sendVoiceMessage: useCallback( async (params: FileMessageCreateParams, duration: number) => { @@ -211,7 +211,7 @@ export function useMessageActions(params: Params): MessageActions { const processedParams = await processParams(onBeforeSendVoiceMessage, internalParams, 'voice'); return sendFileMessage(processedParams, asyncScrollToBottom); }, - [buildInternalMessageParams, sendFileMessage, scrollToBottom, processParams], + [buildInternalMessageParams, sendFileMessage, scrollToBottom, processParams, currentChannel?.url], ), updateUserMessage: useCallback( async (messageId: number, params: UserMessageUpdateParams) => { diff --git a/src/ui/MessageStatus/index.tsx b/src/ui/MessageStatus/index.tsx index 78679f369..8ba01bf19 100644 --- a/src/ui/MessageStatus/index.tsx +++ b/src/ui/MessageStatus/index.tsx @@ -50,7 +50,7 @@ export default function MessageStatus({ const { stringSet, dateLocale } = useLocalization(); const status = getOutgoingMessageState(channel, message); const hideMessageStatusIcon = channel?.isGroupChannel?.() && ( - (channel.isSuper || channel.isPublic || channel.isBroadcast) + (channel.isSuper || channel.isBroadcast) && !(status === OutgoingMessageStates.PENDING || status === OutgoingMessageStates.FAILED) );