From 521435748e6cef8bcf88066f396a124b2e68118a Mon Sep 17 00:00:00 2001
From: Mattermost Build <build@mattermost.com>
Date: Thu, 12 Sep 2019 16:30:58 +0200
Subject: [PATCH] Automated cherry pick of #3240 (#3253)

* Fix edit profile screen being dismissed when removing profile picture

* Fix test
---
 app/screens/edit_profile/edit_profile.js      | 1 -
 app/screens/edit_profile/edit_profile.test.js | 2 --
 2 files changed, 3 deletions(-)

diff --git a/app/screens/edit_profile/edit_profile.js b/app/screens/edit_profile/edit_profile.js
index 24c047246..8533c331c 100644
--- a/app/screens/edit_profile/edit_profile.js
+++ b/app/screens/edit_profile/edit_profile.js
@@ -258,7 +258,6 @@ export default class EditProfile extends PureComponent {
     handleRemoveProfileImage = () => {
         this.setState({profileImageRemove: true});
         this.emitCanUpdateAccount(true);
-        this.props.actions.dismissModal();
     }
 
     uploadProfileImage = async () => {
diff --git a/app/screens/edit_profile/edit_profile.test.js b/app/screens/edit_profile/edit_profile.test.js
index 71bd67850..3d2d7fcf1 100644
--- a/app/screens/edit_profile/edit_profile.test.js
+++ b/app/screens/edit_profile/edit_profile.test.js
@@ -69,7 +69,5 @@ describe('edit_profile', () => {
         expect(wrapper.state('profileImageRemove')).toEqual(true);
         expect(instance.emitCanUpdateAccount).toHaveBeenCalledTimes(1);
         expect(instance.emitCanUpdateAccount).toBeCalledWith(true);
-
-        expect(baseProps.actions.dismissModal).toHaveBeenCalledTimes(1);
     });
 });