From 80d206baf2f3c939eefe048284eba57b31e04b16 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Thu, 9 Aug 2018 08:29:57 -0400
Subject: [PATCH] Do not close permalink view when post is deleted (#1987)

---
 app/screens/permalink/index.js     | 3 +--
 app/screens/permalink/permalink.js | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/screens/permalink/index.js b/app/screens/permalink/index.js
index fd48f4c32..7dc02212c 100644
--- a/app/screens/permalink/index.js
+++ b/app/screens/permalink/index.js
@@ -6,7 +6,6 @@ import {connect} from 'react-redux';
 
 import {getChannel as getChannelAction, joinChannel, markChannelAsRead, markChannelAsViewed} from 'mattermost-redux/actions/channels';
 import {getPostsAfter, getPostsBefore, getPostThread, selectPost} from 'mattermost-redux/actions/posts';
-import {Posts} from 'mattermost-redux/constants';
 import {makeGetChannel, getMyChannelMemberships} from 'mattermost-redux/selectors/entities/channels';
 import {makeGetPostIdsAroundPost, getPost} from 'mattermost-redux/selectors/entities/posts';
 import {getTheme} from 'mattermost-redux/selectors/entities/preferences';
@@ -34,7 +33,7 @@ function makeMapStateToProps() {
         let channel;
         let postIds;
 
-        if (post && post.delete_at === 0 && post.state !== Posts.POST_DELETED) {
+        if (post) {
             channel = getChannel(state, {id: post.channel_id});
             postIds = getPostIdsAroundPost(state, currentFocusedPostId, post.channel_id, {
                 postsBeforeCount: 10,
diff --git a/app/screens/permalink/permalink.js b/app/screens/permalink/permalink.js
index 8b811e5aa..16241e6f2 100644
--- a/app/screens/permalink/permalink.js
+++ b/app/screens/permalink/permalink.js
@@ -114,10 +114,6 @@ export default class Permalink extends PureComponent {
     }
 
     componentWillReceiveProps(nextProps) {
-        if (nextProps.channelId === '' && this.mounted) {
-            this.handleClose();
-        }
-
         if (this.props.channelName !== nextProps.channelName && this.mounted) {
             this.setState({title: nextProps.channelName});
         }