From 46efa88bb46c0f815e3287d4de7d8d7f220df0b9 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Sat, 30 Nov 2019 14:12:08 -0300
Subject: [PATCH] MM-19990 Prevent glimpse of the app if TOS not accepted
 (#3617)

---
 app/screens/terms_of_service/terms_of_service.js      | 3 +--
 app/screens/terms_of_service/terms_of_service.test.js | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/screens/terms_of_service/terms_of_service.js b/app/screens/terms_of_service/terms_of_service.js
index beed535bb..8a7fd7634 100644
--- a/app/screens/terms_of_service/terms_of_service.js
+++ b/app/screens/terms_of_service/terms_of_service.js
@@ -19,7 +19,7 @@ import StatusBar from 'app/components/status_bar';
 import {getMarkdownTextStyles, getMarkdownBlockStyles} from 'app/utils/markdown';
 import {makeStyleSheetFromTheme, setNavigatorStyles} from 'app/utils/theme';
 
-import {dismissModal, dismissAllModals, setButtons} from 'app/actions/navigation';
+import {dismissModal, setButtons} from 'app/actions/navigation';
 
 export default class TermsOfService extends PureComponent {
     static propTypes = {
@@ -118,7 +118,6 @@ export default class TermsOfService extends PureComponent {
     closeTermsAndLogout = async () => {
         const {actions} = this.props;
 
-        await dismissAllModals();
         actions.logout();
     };
 
diff --git a/app/screens/terms_of_service/terms_of_service.test.js b/app/screens/terms_of_service/terms_of_service.test.js
index 85a21ae01..4e95528e8 100644
--- a/app/screens/terms_of_service/terms_of_service.test.js
+++ b/app/screens/terms_of_service/terms_of_service.test.js
@@ -121,8 +121,6 @@ describe('TermsOfService', () => {
     });
 
     test('should call dismissAllModals on closeTermsAndLogout', () => {
-        const dismissAllModals = jest.spyOn(NavigationActions, 'dismissAllModals');
-
         const wrapper = shallow(
             <TermsOfService {...baseProps}/>,
             {context: {intl: {formatMessage: jest.fn()}}},
@@ -130,6 +128,6 @@ describe('TermsOfService', () => {
 
         wrapper.setState({loading: false, termsId: 1, termsText: 'Terms Text'});
         wrapper.instance().closeTermsAndLogout();
-        expect(dismissAllModals).toHaveBeenCalledTimes(1);
+        expect(baseProps.actions.logout).toHaveBeenCalledTimes(1);
     });
 });