diff --git a/native/chat/text-message.react.js b/native/chat/text-message.react.js --- a/native/chat/text-message.react.js +++ b/native/chat/text-message.react.js @@ -33,7 +33,6 @@ import { fixedTooltipHeight } from '../tooltip/tooltip.react.js'; import type { ChatTextMessageInfoItemWithHeight } from '../types/chat-types.js'; import type { VerticalBounds } from '../types/layout-types.js'; -import { useShouldRenderEditButton } from '../utils/edit-messages-utils.js'; type BaseProps = { ...React.ElementConfig, @@ -64,7 +63,6 @@ // MarkdownContext +isLinkModalActive: boolean, +canEditMessage: boolean, - +shouldRenderEditButton: boolean, +canTogglePins: boolean, }; class TextMessage extends React.PureComponent { @@ -92,7 +90,6 @@ isLinkModalActive, canCreateSidebarFromMessage, canEditMessage, - shouldRenderEditButton, canTogglePins, ...viewProps } = this.props; @@ -157,7 +154,7 @@ result.push('reply'); } - if (this.props.canEditMessage && this.props.shouldRenderEditButton) { + if (this.props.canEditMessage) { result.push('edit'); } @@ -267,8 +264,6 @@ props.item.messageInfo, ); - const shouldRenderEditButton = useShouldRenderEditButton(); - const canEditMessage = useCanEditMessage( props.item.threadInfo, props.item.messageInfo, @@ -289,7 +284,6 @@ chatContext={chatContext} isLinkModalActive={isLinkModalActive} canEditMessage={canEditMessage} - shouldRenderEditButton={shouldRenderEditButton} canTogglePins={canTogglePins} /> ); diff --git a/native/utils/edit-messages-utils.js b/native/utils/edit-messages-utils.js --- a/native/utils/edit-messages-utils.js +++ b/native/utils/edit-messages-utils.js @@ -1,17 +1,7 @@ // @flow -import * as React from 'react'; import Alert from 'react-native/Libraries/Alert/Alert.js'; -import { FeatureFlagsContext } from '../components/feature-flags-provider.react.js'; - -function useShouldRenderEditButton(): boolean { - const { configuration: featureFlagConfig } = - React.useContext(FeatureFlagsContext); - - return !!featureFlagConfig['EDIT_BUTTON_DISPLAY']; -} - function exitEditAlert(onDiscard: () => void): void { Alert.alert( 'Discard changes?', @@ -32,4 +22,4 @@ ); } -export { useShouldRenderEditButton, exitEditAlert }; +export { exitEditAlert };