[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

src/settings/Settings.js

@@ -128,6 +128,12 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
+    "feature_ftue_dms": {
+        isFeature: true,
+        displayName: _td("New DM invite dialog (under development)"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "mjolnirRooms": {
         supportedLevels: ['account'],
         default: [],
@@ -136,13 +142,6 @@ export const SETTINGS = {
         supportedLevels: ['account'],
         default: null,
     },
-    "feature_dm_verification": {
-        isFeature: true,
-        displayName: _td("Send verification requests in direct message," +
-            " including a new verification UX in the member panel."),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-    },
     "feature_cross_signing": {
         isFeature: true,
         displayName: _td("Enable cross-signing to verify per-user instead of per-device (in development)"),
@@ -156,10 +155,11 @@ export const SETTINGS = {
         displayName: _td("Enable local event indexing and E2EE search (requires restart)"),
         default: false,
     },
-    "useCiderComposer": {
-        displayName: _td("Use the new, faster, composer for writing messages"),
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        default: true,
+    "feature_bridge_state": {
+        isFeature: true,
+        supportedLevels: LEVELS_FEATURE,
+        displayName: _td("Show info about bridges in room settings"),
+        default: false,
     },
     "MessageComposerInput.suggestEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,