From 38923623861ccf3b86753c3f5697e475658e35c6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 29 Jun 2017 18:30:16 +0100
Subject: [PATCH] Make my groups page a bit saner

---
 src/components/structures/MyGroups.js | 8 ++++++--
 src/i18n/strings/en_EN.json           | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index cd0dda33f9..658a17c88f 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -91,11 +91,16 @@ export default WithMatrixClient(React.createClass({
                     </div>
                 );
             });
-            content = <div>{groupNodes}</div>;
+            content = <div>
+                <div>{_t('You are a member of these groups')}:</div>
+                {groupNodes}
+            </div>;
         } else if (this.state.error) {
             content = <div className="mx_MyGroups_error">
                 Error whilst fetching joined groups
             </div>;
+        } else {
+            content = <Loader />;
         }
 
         return <div className="mx_MyGroups">
@@ -105,7 +110,6 @@ export default WithMatrixClient(React.createClass({
                     {_t('Create a new group')}
                 </AccessibleButton>
             </div>
-            You are a member of these groups:
             {content}
         </div>;
     },
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e4a13e0689..a3b81136d6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -936,5 +936,6 @@
   "+example:%(domain)s": "+example:%(domain)s",
   "Group IDs must be of the form +localpart:%(domain)s": "Group IDs must be of the form +localpart:%(domain)s",
   "It is currently only possible to create groups on your own home server: use a group ID ending with %(domain)s": "It is currently only possible to create groups on your own home server: use a group ID ending with %(domain)s",
-  "Room creation failed": "Room creation failed"
+  "Room creation failed": "Room creation failed",
+  "You are a member of these groups": "You are a member of these groups"
 }