fix(fc): remove post processing of room names on event

Signed-off-by: Brandon McAnsh <[email protected]>

Author: bmc08gt

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/info/ChatInfoViewModel.kt

@@ -21,7 +21,6 @@ import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.onEach
 import xyz.flipchat.app.R
 import xyz.flipchat.app.data.RoomInfo
-import xyz.flipchat.app.features.chat.conversation.ConversationViewModel.Event
 import xyz.flipchat.app.features.login.register.onResult
 import xyz.flipchat.app.util.IntentUtils
 import xyz.flipchat.chat.RoomController

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/name/RoomNameScreen.kt

@@ -65,15 +65,20 @@ data class RoomNameScreen(val roomId: ID, val customTitle: String) : Screen, Par
         val navigator = LocalCodeNavigator.current
         val keyboardIsVisible by keyboardAsState()
         val keyboard = LocalSoftwareKeyboardController.current
+        val scope = rememberCoroutineScope()
 
-
-        BackHandler {
-            if (keyboardIsVisible) {
-                keyboard?.hide()
-            } else {
+        val goBack = {
+            scope.launch {
+                if (keyboardIsVisible) {
+                    keyboard?.hide()
+                    delay(500)
+                }
                 navigator.pop()
             }
         }
+        BackHandler {
+            goBack()
+        }
 
         Column(
             modifier = Modifier
@@ -82,7 +87,7 @@ data class RoomNameScreen(val roomId: ID, val customTitle: String) : Screen, Par
             AppBarWithTitle(
                 backButton = true,
                 title = stringResource(R.string.action_changeRoomName),
-                onBackIconClicked = { navigator.pop() },
+                onBackIconClicked = { goBack() },
             )
 
             val viewModel = getViewModel<RoomNameScreenViewModel>()

services/flipchat/sdk/src/main/kotlin/xyz/flipchat/controllers/ChatsController.kt

@@ -36,6 +36,7 @@ import xyz.flipchat.services.domain.model.chat.db.ConversationUpdate
 import xyz.flipchat.services.domain.model.query.QueryOptions
 import xyz.flipchat.services.extensions.titleOrFallback
 import xyz.flipchat.services.internal.data.mapper.ConversationMemberMapper
+import xyz.flipchat.services.internal.data.mapper.nullIfEmpty
 import xyz.flipchat.services.internal.network.repository.chat.ChatRepository
 import xyz.flipchat.services.internal.network.repository.messaging.MessagingRepository
 import xyz.flipchat.services.user.UserManager
@@ -108,11 +109,10 @@ class ChatsController @Inject constructor(
                                         db.conversationDao().updateMessagingFee(update.roomId, update.amount)
                                     }
                                     is ConversationUpdate.DisplayName -> {
-                                        val conversation = db.conversationDao().findConversationRaw(update.roomId)?.copy(title = update.name)
+                                        val conversation = db.conversationDao().findConversationRaw(update.roomId)
                                         if (conversation != null) {
-                                            val newTitle = conversation.titleOrFallback(resources = resources)
                                             db.conversationDao()
-                                                .setDisplayName(update.roomId, newTitle)
+                                                .setDisplayName(update.roomId, update.name)
                                         }
                                     }
                                     is ConversationUpdate.LastActivity -> {