diff --git a/native/chat/text-message.react.js b/native/chat/text-message.react.js
index 093a2d2aa..8ec2052f4 100644
--- a/native/chat/text-message.react.js
+++ b/native/chat/text-message.react.js
@@ -1,298 +1,292 @@
 // @flow
 
 import invariant from 'invariant';
 import * as React from 'react';
 import { View } from 'react-native';
 
 import { useCanEditMessage } from 'lib/shared/edit-messages-utils.js';
 import { messageKey } from 'lib/shared/message-utils.js';
 import {
   threadHasPermission,
   useCanCreateSidebarFromMessage,
 } from 'lib/shared/thread-utils.js';
 import { threadPermissions } from 'lib/types/thread-permission-types.js';
 
 import type { ChatNavigationProp } from './chat.react.js';
 import ComposedMessage from './composed-message.react.js';
 import { InnerTextMessage } from './inner-text-message.react.js';
 import {
   MessagePressResponderContext,
   type MessagePressResponderContextType,
 } from './message-press-responder-context.js';
 import textMessageSendFailed from './text-message-send-failed.js';
 import { getMessageTooltipKey } from './utils.js';
 import { ChatContext, type ChatContextType } from '../chat/chat-context.js';
 import { MarkdownContext } from '../markdown/markdown-context.js';
 import type { AppNavigationProp } from '../navigation/app-navigator.react';
 import {
   OverlayContext,
   type OverlayContextType,
 } from '../navigation/overlay-context.js';
 import type { NavigationRoute } from '../navigation/route-names.js';
 import { TextMessageTooltipModalRouteName } from '../navigation/route-names.js';
 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<typeof View>,
   +item: ChatTextMessageInfoItemWithHeight,
   +navigation:
     | ChatNavigationProp<'MessageList'>
     | AppNavigationProp<'TogglePinModal'>
     | ChatNavigationProp<'MessageResultsScreen'>
     | ChatNavigationProp<'MessageSearch'>,
   +route:
     | NavigationRoute<'MessageList'>
     | NavigationRoute<'TogglePinModal'>
     | NavigationRoute<'MessageResultsScreen'>
     | NavigationRoute<'MessageSearch'>,
   +focused: boolean,
   +toggleFocus: (messageKey: string) => void,
   +verticalBounds: ?VerticalBounds,
   +shouldDisplayPinIndicator: boolean,
 };
 type Props = {
   ...BaseProps,
   // Redux state
   +canCreateSidebarFromMessage: boolean,
   // withOverlayContext
   +overlayContext: ?OverlayContextType,
   // ChatContext
   +chatContext: ?ChatContextType,
   // MarkdownContext
   +isLinkModalActive: boolean,
   +canEditMessage: boolean,
-  +shouldRenderEditButton: boolean,
   +canTogglePins: boolean,
 };
 class TextMessage extends React.PureComponent<Props> {
   message: ?React.ElementRef<typeof View>;
   messagePressResponderContext: MessagePressResponderContextType;
 
   constructor(props: Props) {
     super(props);
     this.messagePressResponderContext = {
       onPressMessage: this.onPress,
     };
   }
 
   render() {
     const {
       item,
       navigation,
       route,
       focused,
       toggleFocus,
       verticalBounds,
       shouldDisplayPinIndicator,
       overlayContext,
       chatContext,
       isLinkModalActive,
       canCreateSidebarFromMessage,
       canEditMessage,
-      shouldRenderEditButton,
       canTogglePins,
       ...viewProps
     } = this.props;
 
     let swipeOptions = 'none';
     const canReply = this.canReply();
     const canNavigateToSidebar = this.canNavigateToSidebar();
     if (isLinkModalActive) {
       swipeOptions = 'none';
     } else if (canReply && canNavigateToSidebar) {
       swipeOptions = 'both';
     } else if (canReply) {
       swipeOptions = 'reply';
     } else if (canNavigateToSidebar) {
       swipeOptions = 'sidebar';
     }
 
     return (
       <MessagePressResponderContext.Provider
         value={this.messagePressResponderContext}
       >
         <ComposedMessage
           item={item}
           sendFailed={textMessageSendFailed(item)}
           focused={focused}
           swipeOptions={swipeOptions}
           shouldDisplayPinIndicator={shouldDisplayPinIndicator}
           {...viewProps}
         >
           <InnerTextMessage
             item={item}
             onPress={this.onPress}
             messageRef={this.messageRef}
           />
         </ComposedMessage>
       </MessagePressResponderContext.Provider>
     );
   }
 
   messageRef = (message: ?React.ElementRef<typeof View>) => {
     this.message = message;
   };
 
   canReply() {
     return threadHasPermission(
       this.props.item.threadInfo,
       threadPermissions.VOICED,
     );
   }
 
   canNavigateToSidebar() {
     return (
       this.props.item.threadCreatedFromMessage ||
       this.props.canCreateSidebarFromMessage
     );
   }
 
   visibleEntryIDs() {
     const result = ['copy'];
 
     if (this.canReply()) {
       result.push('reply');
     }
 
-    if (this.props.canEditMessage && this.props.shouldRenderEditButton) {
+    if (this.props.canEditMessage) {
       result.push('edit');
     }
 
     if (this.props.canTogglePins) {
       this.props.item.isPinned ? result.push('unpin') : result.push('pin');
     }
 
     if (
       this.props.item.threadCreatedFromMessage ||
       this.props.canCreateSidebarFromMessage
     ) {
       result.push('sidebar');
     }
 
     if (!this.props.item.messageInfo.creator.isViewer) {
       result.push('report');
     }
 
     return result;
   }
 
   onPress = () => {
     const visibleEntryIDs = this.visibleEntryIDs();
     if (visibleEntryIDs.length === 0) {
       return;
     }
 
     const {
       message,
       props: { verticalBounds, isLinkModalActive },
     } = this;
     if (!message || !verticalBounds || isLinkModalActive) {
       return;
     }
 
     const { focused, toggleFocus, item } = this.props;
     if (!focused) {
       toggleFocus(messageKey(item.messageInfo));
     }
 
     const { overlayContext } = this.props;
     invariant(overlayContext, 'TextMessage should have OverlayContext');
     overlayContext.setScrollBlockingModalStatus('open');
 
     message.measure((x, y, width, height, pageX, pageY) => {
       const coordinates = { x: pageX, y: pageY, width, height };
 
       const messageTop = pageY;
       const messageBottom = pageY + height;
       const boundsTop = verticalBounds.y;
       const boundsBottom = verticalBounds.y + verticalBounds.height;
 
       const belowMargin = 20;
       const belowSpace = fixedTooltipHeight + belowMargin;
       const { isViewer } = item.messageInfo.creator;
       const aboveMargin = isViewer ? 30 : 50;
       const aboveSpace = fixedTooltipHeight + aboveMargin;
 
       let margin = belowMargin;
       if (
         messageBottom + belowSpace > boundsBottom &&
         messageTop - aboveSpace > boundsTop
       ) {
         margin = aboveMargin;
       }
 
       const currentInputBarHeight =
         this.props.chatContext?.chatInputBarHeights.get(item.threadInfo.id) ??
         0;
 
       this.props.navigation.navigate<'TextMessageTooltipModal'>({
         name: TextMessageTooltipModalRouteName,
         params: {
           presentedFrom: this.props.route.key,
           initialCoordinates: coordinates,
           verticalBounds,
           visibleEntryIDs,
           tooltipLocation: 'fixed',
           margin,
           item,
           chatInputBarHeight: currentInputBarHeight,
         },
         key: getMessageTooltipKey(item),
       });
     });
   };
 }
 
 const ConnectedTextMessage: React.ComponentType<BaseProps> =
   React.memo<BaseProps>(function ConnectedTextMessage(props: BaseProps) {
     const overlayContext = React.useContext(OverlayContext);
     const chatContext = React.useContext(ChatContext);
     const markdownContext = React.useContext(MarkdownContext);
     invariant(markdownContext, 'markdownContext should be set');
 
     const { linkModalActive, clearMarkdownContextData } = markdownContext;
 
     const key = messageKey(props.item.messageInfo);
 
     // We check if there is an key in the object - if not, we
     // default to false. The likely situation where the former statement
     // evaluates to null is when the thread is opened for the first time.
     const isLinkModalActive = linkModalActive[key] ?? false;
 
     const canCreateSidebarFromMessage = useCanCreateSidebarFromMessage(
       props.item.threadInfo,
       props.item.messageInfo,
     );
 
-    const shouldRenderEditButton = useShouldRenderEditButton();
-
     const canEditMessage = useCanEditMessage(
       props.item.threadInfo,
       props.item.messageInfo,
     );
 
     const canTogglePins = threadHasPermission(
       props.item.threadInfo,
       threadPermissions.MANAGE_PINS,
     );
 
     React.useEffect(() => clearMarkdownContextData, [clearMarkdownContextData]);
 
     return (
       <TextMessage
         {...props}
         canCreateSidebarFromMessage={canCreateSidebarFromMessage}
         overlayContext={overlayContext}
         chatContext={chatContext}
         isLinkModalActive={isLinkModalActive}
         canEditMessage={canEditMessage}
-        shouldRenderEditButton={shouldRenderEditButton}
         canTogglePins={canTogglePins}
       />
     );
   });
 
 export { ConnectedTextMessage as TextMessage };
diff --git a/native/utils/edit-messages-utils.js b/native/utils/edit-messages-utils.js
index d8d0ea005..c85f888bb 100644
--- a/native/utils/edit-messages-utils.js
+++ b/native/utils/edit-messages-utils.js
@@ -1,35 +1,25 @@
 // @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?',
     'You have unsaved changes which will be discarded if you navigate away.',
     [
       {
         text: 'Continue editing',
         style: 'cancel',
       },
       {
         text: 'Discard edit',
         style: 'destructive',
         onPress: () => {
           onDiscard();
         },
       },
     ],
   );
 }
 
-export { useShouldRenderEditButton, exitEditAlert };
+export { exitEditAlert };