[FIX] Removes E2E action button, icon and banner when E2E is disabled. (

#14810)

app/e2e/client/rocketchat.e2e.js

@@ -500,6 +500,7 @@ Meteor.startup(function() {
 				e2e.enabled.set(true);
 			} else {
 				e2e.enabled.set(false);
+				e2e.closeAlert();
 			}
 		}
 	});

app/e2e/client/tabbar.js

@@ -1,22 +1,30 @@
 import { Meteor } from 'meteor/meteor';
 import { Session } from 'meteor/session';
+import { Tracker } from 'meteor/tracker';
 
 import { hasAllPermission } from '../../authorization';
 import { call, TabBar } from '../../ui-utils';
 import { ChatRoom } from '../../models';
+import { settings } from '../../settings';
 
 Meteor.startup(() => {
-	TabBar.addButton({
-		groups: ['direct', 'group'],
-		id: 'e2e',
-		i18nTitle: 'E2E',
-		icon: 'key',
-		class: () => (ChatRoom.findOne(Session.get('openedRoom')) || {}).encrypted && 'enabled',
-		action: () => {
-			const room = ChatRoom.findOne(Session.get('openedRoom'));
-			call('saveRoomSettings', room._id, 'encrypted', !room.encrypted);
-		},
-		order: 10,
-		condition: () => hasAllPermission('edit-room', Session.get('openedRoom')),
+	Tracker.autorun(() => {
+		if (settings.get('E2E_Enable')) {
+			TabBar.addButton({
+				groups: ['direct', 'group'],
+				id: 'e2e',
+				i18nTitle: 'E2E',
+				icon: 'key',
+				class: () => (ChatRoom.findOne(Session.get('openedRoom')) || {}).encrypted && 'enabled',
+				action: () => {
+					const room = ChatRoom.findOne(Session.get('openedRoom'));
+					call('saveRoomSettings', room._id, 'encrypted', !room.encrypted);
+				},
+				order: 10,
+				condition: () => hasAllPermission('edit-room', Session.get('openedRoom')),
+			});
+		} else {
+			TabBar.removeButton('e2e');
+		}
 	});
 });

app/ui/client/components/header/headerRoom.js

@@ -102,7 +102,7 @@ Template.headerRoom.helpers({
 	},
 	encryptionState() {
 		const room = ChatRoom.findOne(this._id);
-		return (room && room.encrypted) && 'encrypted';
+		return settings.get('E2E_Enable') && room && room.encrypted && 'encrypted';
 	},
 
 	userStatus() {