Fix displaying 'all' and 'add' buttons on chat with users; fix org na…

…me displaying
apiko-dev · Mar 27, 2016 · d20bad6 · d20bad6
1 parent e9998c4
commit d20bad6
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 19 deletions.
diff --git a/app/components/RoomInfo/RoomInfo.js b/app/components/RoomInfo/RoomInfo.js
@@ -14,16 +14,24 @@ import Divider from '../Divider'
 const RoomInfo = ({name}) => {
   const avatarSrc = createGhAvatarLink(name.split('/')[0], 200)
   const channel = channelNameAndOwner(name)
+
   return (
     <View style={s.container}>
       <View style={s.header}>
         <Avatar
           src={avatarSrc}
           size={50} />
-        <View style={s.headerTextContainer}>
-          <Text style={s.name}>{channel.name}</Text>
-          <Text style={s.owner}>by {channel.owner}</Text>
-        </View>
+        {!channel.name
+          ? (
+          <View style={s.headerTextContainer}>
+            <Text style={s.name}>{channel.owner}</Text>
+          </View>
+        ) : (
+          <View style={s.headerTextContainer}>
+            <Text style={s.name}>{channel.name}</Text>
+            <Text style={s.owner}>by {channel.owner}</Text>
+          </View>
+        )}
       </View>
       <Divider />
     </View>

diff --git a/app/components/RoomInfo/RoomUsers.js b/app/components/RoomInfo/RoomUsers.js
@@ -10,7 +10,8 @@ import Avatar from '../Avatar'
 import Heading from '../Heading'
 import Button from '../Button'
 
-const RoomUsers = ({ids, entities, onPress, userCount, onAllUsersPress}) => {
+const RoomUsers = ({ids, entities, onPress, userCount, onAllUsersPress, oneToOne}) => {
+  const displayUserHeader = oneToOne === true ? 'People' : `People (${userCount})`
   let content = []
 
   if (ids.length >= 30) {
@@ -48,22 +49,24 @@ const RoomUsers = ({ids, entities, onPress, userCount, onAllUsersPress}) => {
   return (
     <View style={s.container}>
       <Heading
-        text={`People (${userCount})`} />
+        text={displayUserHeader} />
       <View style={s.usersContainer}>
         {content}
       </View>
-      <View style={s.buttonsGroup}>
-        <Button
-          onPress={() => {}}
-          styles={[s.button, s.primaryButton]}>
-          <Text>Add</Text>
-        </Button>
-        <Button
-          onPress={() => onAllUsersPress()}
-          styles={s.button}>
-          <Text>See all</Text>
-        </Button>
-      </View>
+      {!oneToOne && (
+        <View style={s.buttonsGroup}>
+          <Button
+            onPress={() => {}}
+            styles={[s.button, s.primaryButton]}>
+            <Text>Add</Text>
+          </Button>
+          <Button
+            onPress={() => onAllUsersPress()}
+            styles={s.button}>
+            <Text>See all</Text>
+          </Button>
+        </View>
+    )}
     </View>
   )
 }
@@ -73,7 +76,8 @@ RoomUsers.propTypes = {
   entities: PropTypes.object,
   onPress: PropTypes.func,
   userCount: PropTypes.number,
-  onAllUsersPress: PropTypes.func
+  onAllUsersPress: PropTypes.func,
+  oneToOne: PropTypes.bool
 }
 
 export default RoomUsers
diff --git a/app/screens/RoomInfoScreen.js b/app/screens/RoomInfoScreen.js
@@ -107,6 +107,7 @@ class RoomInfoScreen extends Component {
     const {users, rooms, route: {roomId}} = this.props
     return (
       <RoomUsers
+        oneToOne={rooms[roomId].githubType === 'ONETOONE' ? true : false}
         userCount={rooms[roomId].userCount}
         ids={users[roomId].ids}
         entities={users[roomId].entities}