diff --git a/native/chat/sidebar-item.react.js b/native/chat/sidebar-item.react.js --- a/native/chat/sidebar-item.react.js +++ b/native/chat/sidebar-item.react.js @@ -5,6 +5,7 @@ import type { SidebarInfo } from 'lib/types/thread-types'; import { shortAbsoluteDate } from 'lib/utils/date-utils'; +import { useResolvedThreadInfo } from 'lib/utils/entity-helpers'; import { SingleLine } from '../components/single-line.react'; import { useStyles } from '../themes/colors'; @@ -17,14 +18,13 @@ const lastActivity = shortAbsoluteDate(lastUpdatedTime); const { threadInfo } = props.sidebarInfo; + const { uiName } = useResolvedThreadInfo(threadInfo); const styles = useStyles(unboundStyles); const unreadStyle = threadInfo.currentUser.unread ? styles.unread : null; return ( - - {threadInfo.uiName} - + {uiName} {lastActivity} ); diff --git a/native/chat/subchannel-item.react.js b/native/chat/subchannel-item.react.js --- a/native/chat/subchannel-item.react.js +++ b/native/chat/subchannel-item.react.js @@ -5,6 +5,7 @@ import type { ChatThreadItem } from 'lib/selectors/chat-selectors'; import { shortAbsoluteDate } from 'lib/utils/date-utils'; +import { useResolvedThreadInfo } from 'lib/utils/entity-helpers'; import { SingleLine } from '../components/single-line.react'; import SWMansionIcon from '../components/swmansion-icon.react'; @@ -20,6 +21,7 @@ threadInfo, mostRecentMessageInfo, } = props.subchannelInfo; + const { uiName } = useResolvedThreadInfo(threadInfo); const lastActivity = shortAbsoluteDate(lastUpdatedTime); @@ -51,9 +53,7 @@ style={[styles.icon, unreadStyle]} /> - - {threadInfo.uiName} - + {uiName} {lastMessage}