Merge remote-tracking branch 'origin/develop' into develop

src/components/structures/MyGroups.js

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import {MatrixClient} from 'matrix-js-sdk';
 import sdk from '../../index';
 import { _t, _tJsx } from '../../languageHandler';
 import withMatrixClient from '../../wrappers/withMatrixClient';
@@ -23,6 +24,8 @@ import dis from '../../dispatcher';
 import PropTypes from 'prop-types';
 import Modal from '../../Modal';
 
+import FlairStore from '../../stores/FlairStore';
+
 const GroupTile = React.createClass({
     displayName: 'GroupTile',
 
@@ -30,6 +33,22 @@ const GroupTile = React.createClass({
         groupId: PropTypes.string.isRequired,
     },
 
+    contextTypes: {
+        matrixClient: React.PropTypes.instanceOf(MatrixClient).isRequired,
+    },
+
+    getInitialState() {
+        return {
+            profile: null,
+        };
+    },
+
+    componentWillMount: function() {
+        FlairStore.getGroupProfileCached(this.context.matrixClient, this.props.groupId).then((profile) => {
+            this.setState({profile});
+        });
+    },
+
     onClick: function(e) {
         e.preventDefault();
         dis.dispatch({
@@ -39,7 +58,21 @@ const GroupTile = React.createClass({
     },
 
     render: function() {
-        return <a onClick={this.onClick} href="#">{ this.props.groupId }</a>;
+        const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
+        const profile = this.state.profile || {};
+        const name = profile.name || this.props.groupId;
+        const desc = profile.shortDescription;
+        const httpUrl = profile.avatarUrl ? this.context.matrixClient.mxcUrlToHttp(profile.avatarUrl, 50, 50) : null;
+        return <AccessibleButton className="mx_GroupTile" onClick={this.onClick}>
+            <div className="mx_GroupTile_avatar">
+                <BaseAvatar name={name} url={httpUrl} width={50} height={50} />
+            </div>
+            <div className="mx_GroupTile_profile">
+                <h3 className="mx_GroupTile_name">{ name }</h3>
+                <div className="mx_GroupTile_desc">{ desc }</div>
+                <div className="mx_GroupTile_groupId">{ this.props.groupId }</div>
+            </div>
+        </AccessibleButton>;
     },
 });
 
@@ -83,14 +116,9 @@ export default withMatrixClient(React.createClass({
         if (this.state.groups) {
             const groupNodes = [];
             this.state.groups.forEach((g) => {
-                groupNodes.push(
+                groupNodes.push(<GroupTile groupId={g} />);
-                    <div key={g}>
-                        <GroupTile groupId={g} />
-                    </div>,
-                );
             });
-            content = <div>
+            content = <div className="mx_MyGroups_joinedGroups">
-                <div>{ _t('You are a member of these communities:') }</div>
                 { groupNodes }
             </div>;
         } else if (this.state.error) {
@@ -134,6 +162,7 @@ export default withMatrixClient(React.createClass({
                 </div>
             </div>
             <div className="mx_MyGroups_content">
+                <h3>{ _t('Your Communities') }</h3>
                 { content }
             </div>
         </div>;

src/i18n/strings/en_EN.json

@@ -700,12 +700,12 @@
     "Signed Out": "Signed Out",
     "For security, this session has been signed out. Please sign in again.": "For security, this session has been signed out. Please sign in again.",
     "Logout": "Logout",
-    "You are a member of these communities:": "You are a member of these communities:",
     "Error whilst fetching joined communities": "Error whilst fetching joined communities",
     "Create a new community": "Create a new community",
     "Create a community to represent your community! Define a set of rooms and your own custom homepage to mark out your space in the Matrix universe.": "Create a community to represent your community! Define a set of rooms and your own custom homepage to mark out your space in the Matrix universe.",
     "Join an existing community": "Join an existing community",
     "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.",
+    "Your Communities": "Your Communities",
     "You have no visible notifications": "You have no visible notifications",
     "Scroll to bottom of page": "Scroll to bottom of page",
     "Connectivity to the server has been lost.": "Connectivity to the server has been lost.",

src/stores/FlairStore.js

@@ -138,6 +138,8 @@ class FlairStore extends EventEmitter {
         this._groupProfiles[groupId] = {
             groupId,
             avatarUrl: profile.avatar_url,
+            name: profile.name,
+            shortDescription: profile.short_description,
         };
         setTimeout(() => {
             delete this._groupProfiles[groupId];