diff --git a/native/chat/composed-message.react.js b/native/chat/composed-message.react.js --- a/native/chat/composed-message.react.js +++ b/native/chat/composed-message.react.js @@ -199,7 +199,7 @@ const positioning = isViewer ? 'right' : 'left'; inlineEngagement = ( [styles.repliesText, unreadStyle], [styles.repliesText, unreadStyle], ); - const onPressThread = React.useCallback(() => { - if (threadInfo && !disabled) { - navigateToThread({ threadInfo }); + const onPressSidebar = React.useCallback(() => { + if (sidebarThreadInfo && !disabled) { + navigateToThread({ threadInfo: sidebarThreadInfo }); } - }, [disabled, navigateToThread, threadInfo]); + }, [disabled, navigateToThread, sidebarThreadInfo]); const sidebarItem = React.useMemo(() => { - if (!threadInfo) { + if (!sidebarThreadInfo) { return null; } return ( @@ -73,8 +81,8 @@ ); }, [ - threadInfo, - onPressThread, + sidebarThreadInfo, + onPressSidebar, styles.sidebar, styles.icon, repliesStyles, @@ -172,18 +180,17 @@ } const unboundStyles = { - container: { + inlineEngagement: { flexDirection: 'row', - height: inlineEngagementStyle.height, - borderRadius: 16, - backgroundColor: 'inlineEngagementBackground', - alignSelf: 'baseline', + marginBottom: inlineEngagementStyle.marginBottom, + marginTop: inlineEngagementStyle.marginTop, alignItems: 'center', - padding: 8, + marginLeft: avatarOffset, }, - unread: { - color: 'listForegroundLabel', - fontWeight: 'bold', + leftInlineEngagement: { + justifyContent: 'flex-start', + position: 'relative', + top: inlineEngagementLeftStyle.topOffset, }, rightInlineEngagement: { alignSelf: 'flex-end', @@ -191,21 +198,18 @@ right: inlineEngagementRightStyle.marginRight, top: inlineEngagementRightStyle.topOffset, }, - leftInlineEngagement: { - justifyContent: 'flex-start', - position: 'relative', - top: inlineEngagementLeftStyle.topOffset, - }, - sidebar: { + container: { flexDirection: 'row', + height: inlineEngagementStyle.height, + borderRadius: 16, + backgroundColor: 'inlineEngagementBackground', + alignSelf: 'baseline', alignItems: 'center', + padding: 8, }, - inlineEngagement: { + sidebar: { flexDirection: 'row', - marginBottom: inlineEngagementStyle.marginBottom, - marginTop: inlineEngagementStyle.marginTop, alignItems: 'center', - marginLeft: avatarOffset, }, icon: { color: 'inlineEngagementLabel', @@ -216,6 +220,15 @@ fontSize: 14, lineHeight: 22, }, + unread: { + color: 'listForegroundLabel', + fontWeight: 'bold', + }, + reactionsContainer: { + display: 'flex', + flexDirection: 'row', + alignItems: 'center', + }, reaction: { color: 'inlineEngagementLabel', fontSize: 14, @@ -224,11 +237,6 @@ reactionMarginLeft: { marginLeft: 12, }, - reactionsContainer: { - display: 'flex', - flexDirection: 'row', - alignItems: 'center', - }, messageLabel: { color: 'messageLabel', paddingHorizontal: 3, @@ -330,7 +338,10 @@ return ( - + ); diff --git a/native/chat/robotext-message.react.js b/native/chat/robotext-message.react.js --- a/native/chat/robotext-message.react.js +++ b/native/chat/robotext-message.react.js @@ -66,7 +66,7 @@ inlineEngagement = (