From 0b18ff52c528b343a248b595cd00f5e21c883417 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 14 May 2019 15:41:55 +0100
Subject: [PATCH] pass feature flag to js-sdk

---
 src/MatrixClientPeg.js      | 2 ++
 src/i18n/strings/en_EN.json | 2 +-
 src/settings/Settings.js    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index cd40c7874e..8796d7fe30 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -176,6 +176,7 @@ class MatrixClientPeg {
 
     _createClient(creds: MatrixClientCreds) {
         const aggregateRelations = SettingsStore.isFeatureEnabled("feature_reactions");
+        const enableEdits = SettingsStore.isFeatureEnabled("feature_message_editing");
 
         const opts = {
             baseUrl: creds.homeserverUrl,
@@ -187,6 +188,7 @@ class MatrixClientPeg {
             forceTURN: !SettingsStore.getValue('webRtcAllowPeerToPeer', false),
             verificationMethods: [verificationMethods.SAS],
             unstableClientRelationAggregation: aggregateRelations,
+            unstableClientRelationReplacements: enableEdits,
         };
 
         this.matrixClient = createMatrixClient(opts);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 1d524cbcbc..393184a6c4 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -300,7 +300,7 @@
     "Show recent room avatars above the room list": "Show recent room avatars above the room list",
     "Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",
     "Render simple counters in room header": "Render simple counters in room header",
-    "Edit messages after they have been sent": "Edit messages after they have been sent",
+    "Edit messages after they have been sent (refresh to apply changes)": "Edit messages after they have been sent (refresh to apply changes)",
     "React to messages with emoji (refresh to apply changes)": "React to messages with emoji (refresh to apply changes)",
     "Enable Emoji suggestions while typing": "Enable Emoji suggestions while typing",
     "Use compact timeline layout": "Use compact timeline layout",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 76d220cf56..429030d862 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -120,7 +120,7 @@ export const SETTINGS = {
     },
     "feature_message_editing": {
         isFeature: true,
-        displayName: _td("Edit messages after they have been sent"),
+        displayName: _td("Edit messages after they have been sent (refresh to apply changes)"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },