fix: dont disable text area for outgoing message requests

we only want to disable some of the buttons
pull/3083/head
William Grant 11 months ago
parent 8ae6dabfd1
commit 20c0453b9f

@ -63,11 +63,8 @@ export const StartRecordingButton = (props: { onClick: () => void }) => {
// eslint-disable-next-line react/display-name // eslint-disable-next-line react/display-name
export const ToggleEmojiButton = forwardRef<HTMLButtonElement, { onClick: () => void }>( export const ToggleEmojiButton = forwardRef<HTMLButtonElement, { onClick: () => void }>(
(props, ref) => { (props, ref) => {
const selectedConvoKey = useSelectedConversationKey();
const isOutgoingRequest = useIsOutgoingRequest(selectedConvoKey);
return ( return (
<StyledChatButtonContainer disabled={isOutgoingRequest}> <StyledChatButtonContainer>
<SessionIconButton <SessionIconButton
iconType="emoji" iconType="emoji"
ref={ref} ref={ref}
@ -77,7 +74,6 @@ export const ToggleEmojiButton = forwardRef<HTMLButtonElement, { onClick: () =>
borderRadius="300px" borderRadius="300px"
iconPadding="6px" iconPadding="6px"
onClick={props.onClick} onClick={props.onClick}
disabled={isOutgoingRequest}
dataTestId="emoji-button" dataTestId="emoji-button"
/> />
</StyledChatButtonContainer> </StyledChatButtonContainer>
@ -86,11 +82,8 @@ export const ToggleEmojiButton = forwardRef<HTMLButtonElement, { onClick: () =>
); );
export const SendMessageButton = (props: { onClick: () => void }) => { export const SendMessageButton = (props: { onClick: () => void }) => {
const selectedConvoKey = useSelectedConversationKey();
const isOutgoingRequest = useIsOutgoingRequest(selectedConvoKey);
return ( return (
<StyledChatButtonContainer disabled={isOutgoingRequest}> <StyledChatButtonContainer>
<SessionIconButton <SessionIconButton
iconType="send" iconType="send"
backgroundColor={'var(--chat-buttons-background-color)'} backgroundColor={'var(--chat-buttons-background-color)'}
@ -100,7 +93,6 @@ export const SendMessageButton = (props: { onClick: () => void }) => {
borderRadius="300px" borderRadius="300px"
iconPadding="6px" iconPadding="6px"
onClick={props.onClick} onClick={props.onClick}
disabled={isOutgoingRequest}
dataTestId="send-message-button" dataTestId="send-message-button"
/> />
</StyledChatButtonContainer> </StyledChatButtonContainer>

@ -1,6 +1,5 @@
import { RefObject, useState } from 'react'; import { RefObject, useState } from 'react';
import { Mention, MentionsInput } from 'react-mentions'; import { Mention, MentionsInput } from 'react-mentions';
import { useIsOutgoingRequest } from '../../../hooks/useParamSelector';
import { getConversationController } from '../../../session/conversations'; import { getConversationController } from '../../../session/conversations';
import { import {
useSelectedConversationKey, useSelectedConversationKey,
@ -55,7 +54,6 @@ export const CompositionTextArea = (props: Props) => {
const selectedConversationKey = useSelectedConversationKey(); const selectedConversationKey = useSelectedConversationKey();
const htmlDirection = useHTMLDirection(); const htmlDirection = useHTMLDirection();
const isOutgoingRequest = useIsOutgoingRequest(selectedConversationKey);
const isKickedFromGroup = useSelectedIsKickedFromGroup(); const isKickedFromGroup = useSelectedIsKickedFromGroup();
const left = useSelectedIsLeft(); const left = useSelectedIsLeft();
const isBlocked = useSelectedIsBlocked(); const isBlocked = useSelectedIsBlocked();
@ -121,7 +119,7 @@ export const CompositionTextArea = (props: Props) => {
spellCheck={true} spellCheck={true}
dir={htmlDirection} dir={htmlDirection}
inputRef={textAreaRef} inputRef={textAreaRef}
disabled={!typingEnabled || isOutgoingRequest} disabled={!typingEnabled}
rows={1} rows={1}
data-testid="message-input-text-area" data-testid="message-input-text-area"
style={style} style={style}

Loading…
Cancel
Save