Fixed #59 : Consistant channel avatar bg

diff --git a/src/app/molecules/channel-intro/ChannelIntro.jsx b/src/app/molecules/channel-intro/ChannelIntro.jsx
index 84c0c1478d94afffddec99cafd827cfc7be716bd..362dc1475d04bfe144c1017f15fe837c597e0cee 100644 (file)
--- a/src/app/molecules/channel-intro/ChannelIntro.jsx
+++ b/src/app/molecules/channel-intro/ChannelIntro.jsx
@@ -13,11 +13,11 @@ function linkifyContent(content) {
 }
 
 function ChannelIntro({
-  avatarSrc, name, heading, desc, time,
+  roomId, avatarSrc, name, heading, desc, time,
 }) {
   return (
     <div className="channel-intro">
-      <Avatar imageSrc={avatarSrc} text={name.slice(0, 1)} bgColor={colorMXID(name)} size="large" />
+      <Avatar imageSrc={avatarSrc} text={name.slice(0, 1)} bgColor={colorMXID(roomId)} size="large" />
       <div className="channel-intro__content">
         <Text className="channel-intro__name" variant="h1">{heading}</Text>
         <Text className="channel-intro__desc" variant="b1">{linkifyContent(desc)}</Text>
@@ -33,6 +33,7 @@ ChannelIntro.defaultProps = {
 };
 
 ChannelIntro.propTypes = {
+  roomId: PropTypes.string.isRequired,
   avatarSrc: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.bool,

diff --git a/src/app/organisms/channel/ChannelViewContent.jsx b/src/app/organisms/channel/ChannelViewContent.jsx
index b745209514763b71e4041d19a62de8074674a53c..e4eceb6937fb465ecbe3dea142b699730264a799 100644 (file)
--- a/src/app/organisms/channel/ChannelViewContent.jsx
+++ b/src/app/organisms/channel/ChannelViewContent.jsx
@@ -127,6 +127,7 @@ function genChannelIntro(mEvent, roomTimeline) {
   return (
     <ChannelIntro
       key={mEvent ? mEvent.getId() : Math.random().toString(20).substr(2, 6)}
+      roomId={roomTimeline.roomId}
       avatarSrc={avatarSrc}
       name={roomTimeline.room.name}
       heading={`Welcome to ${roomTimeline.room.name}`}

diff --git a/src/app/organisms/channel/ChannelViewHeader.jsx b/src/app/organisms/channel/ChannelViewHeader.jsx
index c16492380bd349d3558e2bd28a9da52d232a7ff2..f89b634367ed407eaddffe038bb451d22b99a484 100644 (file)
--- a/src/app/organisms/channel/ChannelViewHeader.jsx
+++ b/src/app/organisms/channel/ChannelViewHeader.jsx
@@ -27,7 +27,7 @@ function ChannelViewHeader({ roomId }) {
 
   return (
     <Header>
-      <Avatar imageSrc={avatarSrc} text={roomName.slice(0, 1)} bgColor={colorMXID(roomName)} size="small" />
+      <Avatar imageSrc={avatarSrc} text={roomName.slice(0, 1)} bgColor={colorMXID(roomId)} size="small" />
       <TitleWrapper>
         <Text variant="h2">{roomName}</Text>
         { typeof roomTopic !== 'undefined' && <p title={roomTopic} className="text text-b3">{roomTopic}</p>}