Skip to content

fix/mark-as-unread-qa #248

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
merged 26 commits into from
Jul 18, 2025
Merged

fix/mark-as-unread-qa #248

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c240f1d
chore: refine unread message visibility logic and remove unnecessary …
OnestarLee Jul 8, 2025
7b7cb8f
chore: enhance unread message handling and visibility logic in GroupC…
OnestarLee Jul 9, 2025
a227237
refactor: show 99+ when new message count reaches 100 or higher
OnestarLee Jul 9, 2025
10d6390
Update packages/uikit-react-native/src/localization/createBaseStringS…
OnestarLee Jul 10, 2025
5fc7c18
chore: streamline unread message detection logic in GroupChannelMessa…
OnestarLee Jul 10, 2025
e3707e6
Merge remote-tracking branch 'origin/fix/mark-as-unread-qa' into fix/…
OnestarLee Jul 10, 2025
0108698
chore: rename UnreadMessage.ts to UnreadMessage.tsx and update string…
OnestarLee Jul 14, 2025
b89c18d
chore: replace ref with state for new line existence in GroupChannelM…
OnestarLee Jul 17, 2025
b258e09
chore: adjust scrolling behavior and update reply type options in Gro…
OnestarLee Jul 17, 2025
5338bc8
chore: correct variable reference for previous message in GroupChanne…
OnestarLee Jul 17, 2025
0428ef7
chore: enable debug mode for Firebase App Distribution in deploy lane
OnestarLee Jul 17, 2025
b14fe0b
chore: update CA certificates in config.yml
OnestarLee Jul 17, 2025
6e2a7d6
chore: update gem dependencies in Gemfile.lock
OnestarLee Jul 17, 2025
8d4f2d6
chore: update Ruby version to 3.2.2 in config.yml
OnestarLee Jul 17, 2025
55b1e8c
chore: update Ruby version to 3.0.6 in config.yml
OnestarLee Jul 17, 2025
1ef2159
chore: update Ruby version to 3.1.0 in config.yml
OnestarLee Jul 17, 2025
ba6b884
Revert "chore: update Ruby version to 3.1.0 in config.yml"
OnestarLee Jul 17, 2025
ec62d01
Revert "chore: update Ruby version to 3.0.6 in config.yml"
OnestarLee Jul 17, 2025
c39c8b8
Revert "chore: update Ruby version to 3.2.2 in config.yml"
OnestarLee Jul 17, 2025
13214ed
Revert "chore: update gem dependencies in Gemfile.lock"
OnestarLee Jul 17, 2025
fc8ed41
Revert "chore: update CA certificates in config.yml"
OnestarLee Jul 17, 2025
e59a8ef
chore: update Android Docker image version to 2025.04.1-node
OnestarLee Jul 17, 2025
ae0e2dc
chore: update android fastlane plugin
bang9 Jul 17, 2025
1686a71
chore: add setup for trusted certificates in config.yml
OnestarLee Jul 17, 2025
eeef021
chore: add setup for trusted certificates in config.yml
OnestarLee Jul 17, 2025
18f61d6
chore: update confirmAndMarkAsRead to optionally skip unread count check
OnestarLee Jul 17, 2025
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
1 change: 0 additions & 1 deletion ...it-react-native/src/components/GroupChannelMessageRenderer/GroupChannelMessageNewLine.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ const GroupChannelMessageNewLine = ({ shouldRenderNewLine }: Props) => {
const styles = StyleSheet.create({
container: {
width: '100%',
height: 12,
flexDirection: 'row',
alignItems: 'center',
marginBottom: 16,
Expand Down
37 changes: 29 additions & 8 deletions packages/uikit-react-native/src/domain/groupChannel/component/GroupChannelMessageList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,12 @@ const GroupChannelMessageList = (props: GroupChannelProps['MessageList']) => {

const hasSeenNewLineRef = useRef(false);
const isNewLineInViewportRef = useRef(false);
const isNewLineExistInChannelRef = useRef(false);
const scrolledAwayFromBottomRef = useRef(false);
const [isVisibleUnreadMessageFloating, setIsVisibleUnreadMessageFloating] = useState(false);
const viewableMessages = useRef<SendbirdMessage[]>();
const hasUserMarkedAsUnreadRef = useRef(false);
const [unreadFirstMessage, setUnreadFirstMessage] = useState<SendbirdMessage | undefined>(undefined);

const updateHasSeenNewLine = useCallback(
(hasSeenNewLine: boolean) => {
Expand All @@ -46,10 +51,6 @@ const GroupChannelMessageList = (props: GroupChannelProps['MessageList']) => {
[props.onNewLineSeenChange],
);

const viewableMessages = useRef<SendbirdMessage[]>();
const hasUserMarkedAsUnreadRef = useRef(false);
const [unreadFirstMessage, setUnreadFirstMessage] = useState<SendbirdMessage | undefined>(undefined);

const updateHasUserMarkedAsUnread = useCallback(
(hasUserMarkedAsUnread: boolean) => {
if (hasUserMarkedAsUnreadRef.current !== hasUserMarkedAsUnread) {
Expand Down Expand Up @@ -84,13 +85,18 @@ const GroupChannelMessageList = (props: GroupChannelProps['MessageList']) => {
},
);

const onScrolledAwayFromBottom = useFreshCallback((value: boolean) => {
scrolledAwayFromBottomRef.current = value;
props.onScrolledAwayFromBottom(value);
});

const scrollToBottom = useFreshCallback(async (animated = false) => {
if (props.hasNext()) {
props.onUpdateSearchItem(undefined);
props.onScrolledAwayFromBottom(false);
onScrolledAwayFromBottom(false);

await props.onResetMessageList().catch((_) => {});
props.onScrolledAwayFromBottom(false);
onScrolledAwayFromBottom(false);
lazyScrollToBottom({ animated });
} else {
lazyScrollToBottom({ animated });
Expand Down Expand Up @@ -205,10 +211,16 @@ const GroupChannelMessageList = (props: GroupChannelProps['MessageList']) => {

const unreadMessagesFloatingPropsRef = useRef<UnreadMessagesFloatingProps>();
const updateUnreadMessagesFloatingProps = useFreshCallback(() => {
const canAutoMarkAsRead =
!scrolledAwayFromBottomRef.current &&
!hasUserMarkedAsUnreadRef.current &&
(hasSeenNewLineRef.current || !isNewLineExistInChannelRef.current);

unreadMessagesFloatingPropsRef.current = {
visible:
sbOptions.uikit.groupChannel.channel.enableMarkAsUnread &&
!!props.isNewLineExistInChannel &&
!canAutoMarkAsRead &&
isNewLineExistInChannelRef.current &&
0 < props.channel.unreadMessageCount &&
!isNewLineInViewportRef.current,
onPressClose: onPressUnreadMessagesFloatingCloseButton,
Expand All @@ -219,9 +231,17 @@ const GroupChannelMessageList = (props: GroupChannelProps['MessageList']) => {
}
});

useEffect(() => {
isNewLineExistInChannelRef.current = !!props.isNewLineExistInChannel && !!viewableMessages.current;
}, [props.isNewLineExistInChannel, viewableMessages.current]);

useEffect(() => {
updateUnreadMessagesFloatingProps();
}, [props.isNewLineExistInChannel, sbOptions.uikit.groupChannel.channel.enableMarkAsUnread]);
}, [
isNewLineExistInChannelRef.current,
props.channel.unreadMessageCount,
sbOptions.uikit.groupChannel.channel.enableMarkAsUnread,
]);

useGroupChannelHandler(sdk, {
onReactionUpdated(channel, event) {
Expand Down Expand Up @@ -326,6 +346,7 @@ const GroupChannelMessageList = (props: GroupChannelProps['MessageList']) => {
<ChannelMessageList
{...props}
ref={flatListRef}
onScrolledAwayFromBottom={onScrolledAwayFromBottom}
onReplyMessage={setMessageToReply}
onReplyInThreadMessage={setMessageToReply}
onEditMessage={setMessageToEdit}
Expand Down
20 changes: 14 additions & 6 deletions packages/uikit-react-native/src/localization/createBaseStringSet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,15 @@ export const createBaseStringSet = ({ dateLocale, overrides }: StringSetCreateOp
GROUP_CHANNEL: {
HEADER_TITLE: (uid, channel) => getGroupChannelTitle(uid, channel, USER_NO_NAME, CHANNEL_NO_MEMBERS),
LIST_DATE_SEPARATOR: (date, locale) => getDateSeparatorFormat(date, locale ?? dateLocale),
LIST_BUTTON_NEW_MSG: (newMessages) =>
newMessages.length === 1 ? `${newMessages.length} new message` : `${newMessages.length} new messages`,
LIST_FLOATING_UNREAD_MSG: (unreadMessageCount) =>
unreadMessageCount === 1 ? `${unreadMessageCount} unread message` : `${unreadMessageCount} unread messages`,
LIST_BUTTON_NEW_MSG: (newMessages) => {
const count = newMessages.length;
const displayCount = count >= 100 ? '99+' : count;
return count === 1 ? `${displayCount} new message` : `${displayCount} new messages`;
},
LIST_FLOATING_UNREAD_MSG: (unreadMessageCount) => {
const displayCount = unreadMessageCount >= 100 ? '99+' : unreadMessageCount;
return unreadMessageCount === 1 ? `${displayCount} unread message` : `${displayCount} unread messages`;
},
LIST_NEW_LINE: 'New messages',
MESSAGE_BUBBLE_TIME: (message, locale) => getMessageTimeFormat(new Date(message.createdAt), locale ?? dateLocale),
MESSAGE_BUBBLE_FILE_TITLE: (message) => message.name,
Expand All @@ -135,8 +140,11 @@ export const createBaseStringSet = ({ dateLocale, overrides }: StringSetCreateOp
HEADER_TITLE: 'Thread',
HEADER_SUBTITLE: (uid, channel) => getGroupChannelTitle(uid, channel, USER_NO_NAME, CHANNEL_NO_MEMBERS),
LIST_DATE_SEPARATOR: (date, locale) => getDateSeparatorFormat(date, locale ?? dateLocale),
LIST_BUTTON_NEW_MSG: (newMessages) => `${newMessages.length} new messages`,

LIST_BUTTON_NEW_MSG: (newMessages) => {
const count = newMessages.length;
const displayCount = count >= 100 ? '99+' : count;
return `${displayCount} new messages`;
},
MESSAGE_BUBBLE_TIME: (message, locale) => getMessageTimeFormat(new Date(message.createdAt), locale ?? dateLocale),
MESSAGE_BUBBLE_FILE_TITLE: (message) => message.name,
MESSAGE_BUBBLE_EDITED_POSTFIX: ' (edited)',
Expand Down