[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() {

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "Rocket.Chat",
-	"version": "1.1.0-develop",
+	"version": "1.2.0-develop",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -4749,7 +4749,7 @@
 		},
 		"colors": {
 			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+			"resolved": "http://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
 			"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
 			"dev": true
 		},
@@ -7974,7 +7974,7 @@
 		},
 		"get-stream": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+			"resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
 			"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
 		},
 		"get-value": {
@@ -11975,7 +11975,7 @@
 				},
 				"readable-stream": {
 					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+					"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
 					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
 					"requires": {
 						"core-util-is": "~1.0.0",
@@ -11997,7 +11997,7 @@
 				},
 				"string_decoder": {
 					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+					"resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"requires": {
 						"safe-buffer": "~5.1.0"
@@ -12146,7 +12146,7 @@
 		"minimatch": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
 			"requires": {
 				"brace-expansion": "^1.1.7"
 			}
@@ -12922,7 +12922,7 @@
 		"npmlog": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+			"integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
 			"requires": {
 				"are-we-there-yet": "~1.1.2",
 				"console-control-strings": "~1.1.0",
@@ -13589,7 +13589,7 @@
 				},
 				"tough-cookie": {
 					"version": "2.3.4",
-					"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
+					"resolved": "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
 					"integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
 					"dev": true,
 					"requires": {
@@ -14742,7 +14742,7 @@
 				},
 				"pify": {
 					"version": "2.3.0",
-					"resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
 					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
 					"dev": true
 				}