From 18e0d8da860cde51df53bb7d09132e5f739e009c Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Fri, 29 Sep 2017 10:27:40 +0100
Subject: [PATCH] Rename Flair feature to Groups

---
 src/UserSettingsStore.js               | 4 ++--
 src/components/views/elements/Flair.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index 1d1924cd23..9b7554bda2 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -35,7 +35,7 @@ export default {
         },
         {
             name: "-",
-            id: 'feature_flair',
+            id: 'feature_groups',
             default: false,
         },
     ],
@@ -43,7 +43,7 @@ export default {
     // horrible but it works. The locality makes this somewhat more palatable.
     doTranslations: function() {
         this.LABS_FEATURES[0].name = _t("Matrix Apps");
-        this.LABS_FEATURES[1].name = _t("Flair");
+        this.LABS_FEATURES[1].name = _t("Groups");
     },
 
     loadProfileInfo: function() {
diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
index 11dbcbc021..61df660fd5 100644
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@@ -191,7 +191,7 @@ export default class Flair extends React.Component {
 
     componentWillMount() {
         this._unmounted = false;
-        if (UserSettingsStore.isFeatureEnabled('feature_flair') && groupSupport) {
+        if (UserSettingsStore.isFeatureEnabled('feature_groups') && groupSupport) {
             this._generateAvatars();
         }
     }