Removed delete message option for message and allowed empty content d…

…uring editing message
zulip · Dec 31, 2022 · c5cd6a7 · c5cd6a7
1 parent 77b7e9c
commit c5cd6a7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/action-sheets/index.js b/src/action-sheets/index.js
@@ -697,7 +697,7 @@ export const constructMessageActionButtons = (args: {|
   if (message.isOutbox === true) {
     buttons.push(copyToClipboard);
     buttons.push(shareMessage);
-    buttons.push(deleteMessage);
+    // buttons.push(deleteMessage);
     buttons.push(cancel);
     return buttons;
   }
@@ -728,6 +728,9 @@ export const constructMessageActionButtons = (args: {|
   }
   if (message.sender_id === ownUser.user_id && messageNotDeleted(message)) {
     // TODO(#2793): Don't show if message isn't deletable.
+    // buttons.push(deleteMessage);
+  }
+  if (ownUser.role === 200 && messageNotDeleted(message)) {
     buttons.push(deleteMessage);
   }
   if (

diff --git a/src/chat/ChatScreen.js b/src/chat/ChatScreen.js
@@ -131,7 +131,9 @@ export default function ChatScreen(props: Props): Node {
 
   const { narrow, editMessage } = route.params;
   const setEditMessage = useCallback(
-    (value: EditMessage | null) => navigation.setParams({ editMessage: value }),
+    (value: EditMessage | null) => {
+      navigation.setParams({ editMessage: value });
+    },
     [navigation],
   );
 
@@ -164,7 +166,7 @@ export default function ChatScreen(props: Props): Node {
           () => undefined,
         );
 
-        if ((content !== undefined && content !== '') || (topic !== undefined && topic !== '')) {
+        if (content !== undefined || (topic !== undefined && topic !== '')) {
           api.updateMessage(auth, editMessage.id, { content, subject: topic }).catch(error => {
             showErrorAlert(_('Failed to edit message'), error.message);
           });

diff --git a/src/compose/ComposeBox.js b/src/compose/ComposeBox.js
@@ -548,7 +548,7 @@ const ComposeBox: React$AbstractComponent<Props, ImperativeHandle> = forwardRef(
       result.push('mandatory-topic-empty');
     }
 
-    if (messageInputValue.trim().length === 0) {
+    if (messageInputValue.trim().length === 0 && !isEditing) {
       result.push('message-empty');
     }
 
@@ -567,6 +567,7 @@ const ComposeBox: React$AbstractComponent<Props, ImperativeHandle> = forwardRef(
     numUploading,
     anyQuoteAndReplyInProgress,
     messageInputState,
+    isEditing,
   ]);
 
   const submitButtonDisabled = validationErrors.length > 0;