Skip to content

Fix chat message alignment #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TeddyScript101 merged 2 commits into from
May 9, 2026
Merged

Fix chat message alignment #333

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75f9d69
Fix chat message alignment
Apr 30, 2026
79710ac
Fix chat message alignment logic
May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions guard_app/src/screen/MessagesScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ type Message = {
context: 'shift' | 'general';
shiftTitle?: string;
status?: 'sending' | 'sent' | 'delivered' | 'read';
isMe: boolean;
};

type ConversationItem = {
Expand Down Expand Up @@ -105,6 +106,7 @@ export default function MessagesScreen() {
return {
id: dto._id ?? `${dto.timestamp}-${senderId ?? 'unknown'}`,
from: role,
isMe: Boolean(isCurrentUser),
senderName: dto.sender?.name ?? dto.sender?.email ?? 'Unknown',
text: dto.content,
timestamp: dto.timestamp,
Expand Down Expand Up @@ -259,6 +261,7 @@ export default function MessagesScreen() {
const newMsg: Message = {
id: newId,
from: currentUser?.role === 'employer' ? 'employer' : 'guard',
isMe: true,
senderName: currentUser?.name ?? 'You',
text: input.trim(),
timestamp: new Date().toISOString(),
Expand Down Expand Up @@ -296,25 +299,18 @@ export default function MessagesScreen() {
Alert.alert('Error', 'Failed to send message');
}
};

const renderMessage = ({ item }: { item: Message }) => (
<View style={styles.messageRow}>
<View
style={[styles.bubble, item.from === 'guard' ? styles.bubbleGuard : styles.bubbleEmployer]}
>
<View style={[styles.messageRow, item.isMe ? styles.rowRight : styles.rowLeft]}>
<View style={[styles.bubble, item.isMe ? styles.bubbleGuard : styles.bubbleEmployer]}>
<Text style={styles.msgSender}>
{item.senderName} • {item.from === 'guard' ? 'Guard' : 'Employer'}
</Text>
<Text style={item.from === 'guard' ? styles.msgTextLight : styles.msgTextDark}>
{item.text}
</Text>
<Text style={item.isMe ? styles.msgTextLight : styles.msgTextDark}>{item.text}</Text>
<View style={styles.metaRow}>
<Text style={item.from === 'guard' ? styles.msgTimeLight : styles.msgTimeDark}>
<Text style={item.isMe ? styles.msgTimeLight : styles.msgTimeDark}>
{formatTime(item.timestamp)}
</Text>
{item.from === 'guard' && item.status && (
<Text style={styles.msgStatus}>• {item.status}</Text>
)}
{item.isMe && item.status && <Text style={styles.msgStatus}>• {item.status}</Text>}
</View>
</View>
</View>
Expand Down Expand Up @@ -645,7 +641,18 @@ const getStyles = (colors: AppColors) =>
},
newConversationBtnText: { color: colors.white, fontWeight: '700', fontSize: 13 },

messageRow: { marginBottom: 10 },
messageRow: {
marginBottom: 10,
flexDirection: 'row',
},

rowRight: {
justifyContent: 'flex-end',
},

rowLeft: {
justifyContent: 'flex-start',
},
bubble: {
maxWidth: '75%',
padding: 12,
Expand Down
Loading