From e31726c74d1f0bc61a787eb054bf76a77f2efe50 Mon Sep 17 00:00:00 2001
From: Martin Kraft <martinkraft@gmail.com>
Date: Mon, 11 Jun 2018 14:11:47 -0400
Subject: [PATCH] MM-10819: Adds 'Delete' long-press action for system
 messages.

---
 app/components/post_body/post_body.js | 28 +++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/components/post_body/post_body.js b/app/components/post_body/post_body.js
index 2624b0399..4f9024f0a 100644
--- a/app/components/post_body/post_body.js
+++ b/app/components/post_body/post_body.js
@@ -173,16 +173,16 @@ export default class PostBody extends PureComponent {
                 actions.push({text: formatMessage({id: 'post_info.edit', defaultMessage: 'Edit'}), onPress: onPostEdit});
             }
 
-            if (canDelete && !hasBeenDeleted) {
-                actions.push({text: formatMessage({id: 'post_info.del', defaultMessage: 'Delete'}), onPress: onPostDelete});
-            }
-
             actions.push({
                 text: formatMessage({id: 'get_post_link_modal.title', defaultMessage: 'Copy Permalink'}),
                 onPress: this.props.onCopyPermalink,
             });
         }
 
+        if (!isPendingOrFailedPost && !isPostEphemeral && canDelete && !hasBeenDeleted) {
+            actions.push({text: formatMessage({id: 'post_info.del', defaultMessage: 'Delete'}), onPress: onPostDelete});
+        }
+
         return actions;
     };
 
@@ -507,16 +507,16 @@ export default class PostBody extends PureComponent {
                         {body}
                     </View>
                     {isFailed &&
-                    <TouchableOpacity
-                        onPress={onFailedPostPress}
-                        style={style.retry}
-                    >
-                        <Icon
-                            name='ios-information-circle-outline'
-                            size={26}
-                            color={theme.errorTextColor}
-                        />
-                    </TouchableOpacity>
+                        <TouchableOpacity
+                            onPress={onFailedPostPress}
+                            style={style.retry}
+                        >
+                            <Icon
+                                name='ios-information-circle-outline'
+                                size={26}
+                                color={theme.errorTextColor}
+                            />
+                        </TouchableOpacity>
                     }
                 </View>
             </View>