Excluding current user from mention suggestions via ChatComponentFactory and ChatClient.getInstance().getCurrentUser()

[alvindizon]

So we are trying to exclude the current user from being displayed in the mention popup UI, and we have achieved it by overriding MessageComposerMentionsPopupContent in ChatComponentFactory:

class CustomChatComponentFactory() : ChatComponentFactory {

    @Composable
    override fun MessageComposerMentionsPopupContent(
        mentionSuggestions: List<User>,
        onMentionSelected: (User) -> Unit,
    ) {
        // Do not show current user in suggestions list
        MentionSuggestionList(
            users = mentionSuggestions.filterNot { it.id == ChatClient.instance().getCurrentUser()?.id },
            onMentionSelected = onMentionSelected,
        )
    }

// ...

However, after some inactivity, ChatClient.getInstance().getCurrentUser() becomes null, so the current user appears again in the mention suggestion UI. Is there anyway to get hold of a non-null current user?