From 0c22343bb895f118df613896d63e4cfd61f08ef0 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 15 May 2018 15:38:47 +0100
Subject: [PATCH] Remove cookie bar setting from UserSettings

---
 src/i18n/strings/en_EN.json | 1 -
 src/settings/Settings.js    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 0126661a07..448f5e3a1c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -211,7 +211,6 @@
     "Disable Community Filter Panel": "Disable Community Filter Panel",
     "Disable Peer-to-Peer for 1:1 calls": "Disable Peer-to-Peer for 1:1 calls",
     "Send analytics data": "Send analytics data",
-    "Show cookie bar": "Show cookie bar",
     "Never send encrypted messages to unverified devices from this device": "Never send encrypted messages to unverified devices from this device",
     "Never send encrypted messages to unverified devices in this room from this device": "Never send encrypted messages to unverified devices in this room from this device",
     "Enable inline URL previews by default": "Enable inline URL previews by default",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 8f50885c14..b1bc4161fd 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -220,7 +220,6 @@ export const SETTINGS = {
     },
     "showCookieBar": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,
-        displayName: _td('Show cookie bar'),
         default: true,
     },
     "autocompleteDelay": {