diff --git a/flipchatApp/src/main/AndroidManifest.xml b/flipchatApp/src/main/AndroidManifest.xml
index a5b8cac79..6a4172b25 100644
--- a/flipchatApp/src/main/AndroidManifest.xml
+++ b/flipchatApp/src/main/AndroidManifest.xml
@@ -52,6 +52,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
+            <!-- region rooms -->
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -72,6 +73,48 @@
                 <data android:pathPrefix="/room" />
             </intent-filter>
 
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="app.flipchat.xyz" />
+                <data android:pathPrefix="/id" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="flipchat" />
+                <data android:host="app.flipchat.xyz" />
+                <data android:pathPrefix="/id" />
+            </intent-filter>
+
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" />
+                <data android:host="app.flipchat.xyz" />
+                <data android:pathPrefix="/number" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="flipchat" />
+                <data android:host="app.flipchat.xyz" />
+                <data android:pathPrefix="/number" />
+            </intent-filter>
+            <!-- endregion rooms -->
+
+            <!-- region login -->
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -91,7 +134,9 @@
                 <data android:host="app.flipchat.xyz" />
                 <data android:pathPrefix="/login" />
             </intent-filter>
+            <!-- endregion login -->
 
+            <!-- region user -->
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -111,6 +156,7 @@
                 <data android:host="app.flipchat.xyz" />
                 <data android:pathPrefix="/user" />
             </intent-filter>
+            <!-- endregion user -->
         </activity>
 
         <!--
diff --git a/flipchatApp/src/main/kotlin/xyz/flipchat/app/MainActivity.kt b/flipchatApp/src/main/kotlin/xyz/flipchat/app/MainActivity.kt
index f6808c3ff..06802c0ec 100644
--- a/flipchatApp/src/main/kotlin/xyz/flipchat/app/MainActivity.kt
+++ b/flipchatApp/src/main/kotlin/xyz/flipchat/app/MainActivity.kt
@@ -11,6 +11,8 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.fragment.app.FragmentActivity
 import com.getcode.libs.opengraph.LocalOpenGraphParser
 import com.getcode.libs.opengraph.OpenGraphParser
+import com.getcode.network.BalanceController
+import com.getcode.network.LocalBalanceController
 import com.getcode.network.client.Client
 import com.getcode.network.exchange.ExchangeNull
 import com.getcode.network.exchange.LocalExchange
@@ -73,6 +75,9 @@ class MainActivity : FragmentActivity() {
     @Inject
     lateinit var openGraphParser: OpenGraphParser
 
+    @Inject
+    lateinit var balanceController: BalanceController
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         handleUncaughtException()
@@ -90,6 +95,7 @@ class MainActivity : FragmentActivity() {
                 LocalLabs provides betaFeatures,
                 LocalBillingClient provides iapController,
                 LocalOpenGraphParser provides openGraphParser,
+                LocalBalanceController provides balanceController,
             ) {
                 Rinku {
                     App(tipsEngine = tipsEngine)
diff --git a/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/conversation/ConversationChatInput.kt b/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/conversation/ConversationChatInput.kt
index 44f542163..49bceb393 100644
--- a/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/conversation/ConversationChatInput.kt
+++ b/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/conversation/ConversationChatInput.kt
@@ -42,6 +42,7 @@ import com.getcode.util.resources.LocalResources
 import com.getcode.utils.Kin
 import com.getcode.utils.formatAmountString
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.withTimeoutOrNull
 import xyz.flipchat.app.R
 
 @Composable
@@ -121,14 +122,18 @@ fun ConversationChatInput(
                         }
                     }
 
+                    var wasKeyboardVisible by remember { mutableStateOf(false) }
+
                     LaunchedEffect(keyboardVisible) {
-                        delay(300)
-                        if (!keyboardVisible) {
-                            if (chattableState is ChattableState.TemporarilyEnabled) {
+                        if (wasKeyboardVisible && !keyboardVisible) {
+                            delay(150) // Short delay to prevent accidental blips
+                            if (!keyboardVisible && chattableState is ChattableState.TemporarilyEnabled) {
                                 dispatchEvent(ConversationViewModel.Event.ResetToSpectator)
                             }
                         }
+                        wasKeyboardVisible = keyboardVisible
                     }
+
                 }
             }
 
diff --git a/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/conversation/ConversationViewModel.kt b/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/conversation/ConversationViewModel.kt
index d161fedf5..ab350ea66 100644
--- a/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/conversation/ConversationViewModel.kt
+++ b/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/conversation/ConversationViewModel.kt
@@ -77,7 +77,7 @@ import xyz.flipchat.services.data.metadata.SendMessageAsListenerPaymentMetadata
 import xyz.flipchat.services.data.metadata.SendTipMessagePaymentMetadata
 import xyz.flipchat.services.data.metadata.erased
 import xyz.flipchat.services.data.metadata.typeUrl
-import xyz.flipchat.services.domain.model.chat.ConversationMember
+import xyz.flipchat.services.domain.model.chat.ConversationMemberWithPersonalInfo
 import xyz.flipchat.services.domain.model.chat.ConversationMessage
 import xyz.flipchat.services.domain.model.chat.ConversationWithMembersAndLastPointers
 import xyz.flipchat.services.extensions.titleOrFallback
@@ -1004,13 +1004,13 @@ class ConversationViewModel @Inject constructor(
                         },
                         sender = Sender(
                             id = reply.message.senderId,
-                            profileImage = reply.member?.imageUri.takeIf {
+                            profileImage = reply.personalInfo?.imageUri.takeIf {
                                 it.orEmpty().isNotEmpty()
                             },
                             isFullMember = reply.member?.isFullMember == true,
-                            displayName = reply.member?.memberName ?: "Deleted",
+                            displayName = reply.personalInfo?.memberName.orEmpty().ifEmpty { "Member" },
                             isSelf = reply.contentEntity.isFromSelf,
-                            isBlocked = reply.member?.isBlocked == true,
+                            isBlocked = reply.personalInfo?.isBlocked == true,
                             isHost = reply.message.senderId == currentState.hostId && !contents.isFromSelf,
                         )
                     )
@@ -1022,16 +1022,16 @@ class ConversationViewModel @Inject constructor(
                     currentState.isTippingEnabled && !userManager.isSelf(message.senderId)
 
                 val tips = if (currentState.isTippingEnabled && tipInfo.isNotEmpty()) {
-                    tipInfo.map { (tip, member) ->
+                    tipInfo.map { (tip, member, user) ->
                         MessageTip(
                             amount = tip.kin,
                             tipper = Sender(
                                 id = member?.id,
-                                profileImage = member?.imageUri.nullIfEmpty(),
-                                displayName = member?.memberName,
+                                profileImage = user?.imageUri.nullIfEmpty(),
+                                displayName = user?.memberName,
                                 isHost = member?.isHost ?: false,
                                 isSelf = userManager.isSelf(member?.id),
-                                isBlocked = member?.isBlocked ?: false,
+                                isBlocked = user?.isBlocked ?: false,
                             )
                         )
                     }
@@ -1063,7 +1063,7 @@ class ConversationViewModel @Inject constructor(
                     sender = Sender(
                         id = message.senderId,
                         profileImage = member?.imageUri.takeIf { it.orEmpty().isNotEmpty() },
-                        displayName = member?.memberName ?: "Deleted",
+                        displayName = member?.displayName.orEmpty().ifEmpty { "Member" },
                         isSelf = contents.isFromSelf,
                         isFullMember = member?.isFullMember == true,
                         isHost = message.senderId == currentState.hostId,
@@ -1119,20 +1119,20 @@ class ConversationViewModel @Inject constructor(
 
     private fun buildMessageActions(
         message: ConversationMessage,
-        member: ConversationMember?,
+        member: ConversationMemberWithPersonalInfo?,
         contents: MessageContent,
         enableReply: Boolean,
         enableTip: Boolean,
     ): List<MessageControlAction> {
         return mutableListOf<MessageControlAction>().apply {
             if (stateFlow.value.isHost) {
-                if (member?.memberName?.isNotEmpty() == true && !contents.isFromSelf) {
+                if (member?.displayName?.isNotEmpty() == true && !contents.isFromSelf) {
                     if (member.isFullMember) {
                         add(
                             MessageControlAction.DemoteUser {
                                 confirmUserDemote(
                                     conversationId = message.conversationId,
-                                    user = member.memberName,
+                                    user = member.displayName,
                                     userId = message.senderId
                                 )
                             }
@@ -1142,7 +1142,7 @@ class ConversationViewModel @Inject constructor(
                             MessageControlAction.PromoteUser {
                                 confirmUserPromote(
                                     conversationId = message.conversationId,
-                                    user = member.memberName,
+                                    user = member.displayName,
                                     userId = message.senderId
                                 )
                             }
@@ -1157,7 +1157,7 @@ class ConversationViewModel @Inject constructor(
                         val sender = Sender(
                             id = message.senderId,
                             profileImage = member?.imageUri.takeIf { it.orEmpty().isNotEmpty() },
-                            displayName = member?.memberName ?: "Deleted",
+                            displayName = member?.displayName ?: "Deleted",
                             isSelf = contents.isFromSelf,
                             isHost = message.senderId == stateFlow.value.hostId && !contents.isFromSelf,
                             isBlocked = member?.isBlocked == true
@@ -1193,7 +1193,7 @@ class ConversationViewModel @Inject constructor(
 
     private fun buildSelfDefenseControls(
         message: ConversationMessage,
-        member: ConversationMember?,
+        member: ConversationMemberWithPersonalInfo?,
         contents: MessageContent
     ): List<MessageControlAction> {
         return mutableListOf<MessageControlAction>().apply {
@@ -1211,7 +1211,7 @@ class ConversationViewModel @Inject constructor(
 
 
             if (stateFlow.value.isHost) {
-                if (member?.memberName?.isNotEmpty() == true && !contents.isFromSelf) {
+                if (member?.displayName?.isNotEmpty() == true && !contents.isFromSelf) {
 //                    add(
 //                        MessageControlAction.RemoveUser(member.memberName.orEmpty()) {
 //                            confirmUserRemoval(
@@ -1225,7 +1225,7 @@ class ConversationViewModel @Inject constructor(
                         MessageControlAction.MuteUser {
                             confirmUserMute(
                                 conversationId = message.conversationId,
-                                user = member.memberName,
+                                user = member.displayName,
                                 userId = message.senderId,
                             )
                         }
@@ -1238,14 +1238,14 @@ class ConversationViewModel @Inject constructor(
                     if (member.isBlocked) {
                         add(
                             MessageControlAction.UnblockUser {
-                                dispatchEvent(Event.UnblockUser(member.id))
+                                dispatchEvent(Event.UnblockUser(message.senderId))
                             }
                         )
                     } else {
                         add(
                             MessageControlAction.BlockUser {
                                 confirmUserBlock(
-                                    user = member.memberName,
+                                    user = member.displayName,
                                     userId = message.senderId,
                                 )
                             }
@@ -1254,9 +1254,9 @@ class ConversationViewModel @Inject constructor(
                 }
 
                 add(
-                    MessageControlAction.ReportUserForMessage(member?.memberName.orEmpty()) {
+                    MessageControlAction.ReportUserForMessage(member?.displayName.orEmpty()) {
                         confirmUserReport(
-                            user = member?.memberName,
+                            user = member?.displayName,
                             userId = message.senderId,
                             messageId = message.id
                         )
@@ -1487,7 +1487,7 @@ class ConversationViewModel @Inject constructor(
                             roomId = conversation.id,
                             roomNumber = conversation.roomNumber,
                             ownerId = conversation.ownerId,
-                            hostName = host?.memberName,
+                            hostName = host?.displayName,
                             memberCount = members.count(),
                             messagingFeeQuarks = conversation.coverCharge.quarks
                         )
diff --git a/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/info/ChatInfoViewModel.kt b/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/info/ChatInfoViewModel.kt
index aeebc41f5..8372b6f01 100644
--- a/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/info/ChatInfoViewModel.kt
+++ b/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/info/ChatInfoViewModel.kt
@@ -151,7 +151,7 @@ class ChatInfoViewModel @Inject constructor(
                                     members.map { m ->
                                         MinimalMember(
                                             id = m.id,
-                                            displayName = m.memberName.nullIfEmpty(),
+                                            displayName = m.displayName.nullIfEmpty(),
                                             profileImageUrl = m.imageUri,
                                             isHost = m.isHost,
                                             canSpeak = m.isFullMember,
diff --git a/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/info/RoomInfoScreen.kt b/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/info/RoomInfoScreen.kt
index a322b09ab..7a2c8cd3c 100644
--- a/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/info/RoomInfoScreen.kt
+++ b/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/info/RoomInfoScreen.kt
@@ -197,8 +197,7 @@ class RoomInfoScreen(
                                     buildActions(
                                         state,
                                         viewModel::dispatchEvent
-                                    ),
-                                    ContextMenuStyle.Themed
+                                    )
                                 )
                             )
                         }
diff --git a/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/payments/MessageTipPaymentConfirmation.kt b/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/payments/MessageTipPaymentConfirmation.kt
index 0263e91b2..c59bd261c 100644
--- a/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/payments/MessageTipPaymentConfirmation.kt
+++ b/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/payments/MessageTipPaymentConfirmation.kt
@@ -1,21 +1,25 @@
 package xyz.flipchat.app.features.payments
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.res.stringResource
+import cafe.adriel.voyager.navigator.currentOrThrow
 import com.getcode.model.Currency
 import com.getcode.model.KinAmount
 import com.getcode.model.Rate
 import com.getcode.model.kin
 import com.getcode.models.ConfirmationState
 import com.getcode.models.MessageTipPaymentConfirmation
+import com.getcode.network.LocalBalanceController
 import com.getcode.theme.CodeTheme
 import com.getcode.ui.components.Modal
 import com.getcode.ui.components.SlideToConfirm
@@ -58,11 +62,18 @@ internal fun MessageTipPaymentConfirmation(
         )
     }
 
+    val balanceController = LocalBalanceController.currentOrThrow
+    val currentBalance by balanceController.formattedBalance.collectAsState()
+
+    BackHandler {
+        onCancel()
+    }
+
     Modal(modifier) {
         if (state != null) {
             MessageTipConfirmationContent(
                 pickerState = pickerState,
-                balance = confirmation?.balance,
+                balance = currentBalance?.formattedValue,
                 isSending = isSending,
                 state = state,
                 onApproved = {
diff --git a/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/payments/PaymentScaffold.kt b/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/payments/PaymentScaffold.kt
index f8017f9f2..2dd752e89 100644
--- a/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/payments/PaymentScaffold.kt
+++ b/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/payments/PaymentScaffold.kt
@@ -17,7 +17,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import com.getcode.models.BillState
 import com.getcode.theme.Black40
-import com.getcode.ui.modals.TipConfirmation
 import com.getcode.ui.utils.AnimationUtils
 import com.getcode.ui.utils.ModalAnimationSpeed
 import com.getcode.ui.utils.rememberedClickable
@@ -45,7 +44,7 @@ fun PaymentScaffold(content: @Composable () -> Unit) {
                         interactionSource = remember { MutableInteractionSource() }
                     ) {
                         if (scrimDetails.cancellable) {
-                            payments.cancelPayment()
+                            payments.cancelPayment(fromUser = true)
                         }
                     }
             )
@@ -73,7 +72,7 @@ fun PaymentScaffold(content: @Composable () -> Unit) {
 
         AnimatedContent(
             modifier = Modifier.align(BottomCenter),
-            targetState = state.billState.messageTipPaymentConfirmation?.balance,
+            targetState = state.billState.messageTipPaymentConfirmation?.metadata,
             transitionSpec = AnimationUtils.modalAnimationSpec(speed = ModalAnimationSpeed.Fast),
             label = "message tip payments",
         ) {
diff --git a/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/payments/PublicPaymentConfirmation.kt b/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/payments/PublicPaymentConfirmation.kt
index 0e80e9335..3f372151c 100644
--- a/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/payments/PublicPaymentConfirmation.kt
+++ b/flipchatApp/src/main/kotlin/xyz/flipchat/app/features/payments/PublicPaymentConfirmation.kt
@@ -1,5 +1,6 @@
 package xyz.flipchat.app.features.payments
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.Text
@@ -42,6 +43,11 @@ internal fun PublicPaymentConfirmation(
         derivedStateOf { confirmation?.amount }
     }
 
+    BackHandler {
+        onCancel()
+    }
+
+
     Modal(modifier) {
         val amount = requestedAmount
         if (state != null && amount != null) {
diff --git a/flipchatApp/src/main/kotlin/xyz/flipchat/app/util/Router.kt b/flipchatApp/src/main/kotlin/xyz/flipchat/app/util/Router.kt
index 9e10015a2..5f2040f4e 100644
--- a/flipchatApp/src/main/kotlin/xyz/flipchat/app/util/Router.kt
+++ b/flipchatApp/src/main/kotlin/xyz/flipchat/app/util/Router.kt
@@ -40,6 +40,7 @@ enum class FcTab {
 sealed interface DeeplinkType {
     data class Login(val entropy: String) : DeeplinkType
     data class OpenRoomByNumber(val number: Long, val messageId: ID? = null) : DeeplinkType
+    data class OpenRoomById(val id: ID, val messageId: ID? = null) : DeeplinkType
 }
 
 class RouterImpl(
@@ -55,7 +56,7 @@ class RouterImpl(
         val settings = listOf("settings")
 
         val login = listOf("login")
-        val room = listOf("room")
+        val room = listOf("room", "id", "number")
     }
 
     private val db: FcAppDatabase
@@ -133,6 +134,38 @@ class RouterImpl(
 
                     screens
                 }
+
+                is DeeplinkType.OpenRoomById -> {
+                    val conversation = db.conversationDao().findConversationRaw(type.id)
+                    val screens = mutableListOf(ScreenRegistry.get(NavScreenProvider.AppHomeScreen()))
+                    if (conversation != null) {
+                        screens.add(ScreenRegistry.get(NavScreenProvider.Room.Messages(conversation.id)))
+                    } else {
+                        val lookup = chatsController.lookupRoom(type.id).getOrNull()
+                        if (lookup != null) {
+                            val (room, members) = lookup
+                            val moderator = members.firstOrNull { it.isModerator }
+
+                            val args = RoomInfoArgs(
+                                roomId = room.id,
+                                roomNumber = room.roomNumber,
+                                roomTitle = room.titleOrFallback(resources,),
+                                memberCount = members.count(),
+                                ownerId = room.ownerId,
+                                hostName = moderator?.identity?.displayName,
+                                messagingFeeQuarks = room.messagingFee.quarks,
+                            )
+
+                            screens.add(
+                                ScreenRegistry.get(
+                                    NavScreenProvider.Room.Preview(args = args, returnToSender = true)
+                                )
+                            )
+                        }
+                    }
+
+                    screens
+                }
             }
         } ?: emptyList()
     }
@@ -164,15 +197,32 @@ class RouterImpl(
                 2 -> {
                     when {
                         room.contains(deeplink.pathSegments[0]) -> {
-                            val number = runCatching {
-                                deeplink.pathSegments[1].toLongOrNull()
-                            }.getOrNull() ?: return null
-
-                            val messageId = runCatching {
-                                deeplink.data.toUri().getQueryParameter("m")?.let { Base58.decode(it).toList() }
-                            }.getOrNull()
-
-                            DeeplinkType.OpenRoomByNumber(number = number, messageId = messageId)
+                            when (val specifier = deeplink.pathSegments[0]) {
+                                "room",
+                                "number" -> {
+                                    val number = runCatching {
+                                        deeplink.pathSegments[1].toLongOrNull()
+                                    }.getOrNull() ?: return null
+
+                                    val messageId = runCatching {
+                                        deeplink.data.toUri().getQueryParameter("m")?.let { Base58.decode(it).toList() }
+                                    }.getOrNull()
+
+                                    DeeplinkType.OpenRoomByNumber(number = number, messageId = messageId)
+                                }
+                                "id" -> {
+                                    val id = runCatching {
+                                        deeplink.pathSegments[1]
+                                    }.getOrNull()?.let { Base58.decode(it).toList() } ?: return null
+
+                                    val messageId = runCatching {
+                                        deeplink.data.toUri().getQueryParameter("m")?.let { Base58.decode(it).toList() }
+                                    }.getOrNull()
+
+                                    DeeplinkType.OpenRoomById(id = id, messageId = messageId)
+                                }
+                                else -> return null
+                            }
                         }
 
                         else -> null
diff --git a/flipchatApp/src/main/res/values/strings.xml b/flipchatApp/src/main/res/values/strings.xml
index 377a58fbb..4926dd741 100644
--- a/flipchatApp/src/main/res/values/strings.xml
+++ b/flipchatApp/src/main/res/values/strings.xml
@@ -114,7 +114,7 @@
     <string name="action_joinRoomByName">Join %1$s</string>
     <string name="action_joinRoomWithCost">Join Room: ⬢ %1$s</string>
     <string name="action_payToChatInRoom">Pay to Chat: ⬢ %1$s</string>
-    <string name="action_sendMessageInRoom">Audience Messages: ⬢ %1$s</string>
+    <string name="action_sendMessageInRoom">Listener Message: ⬢ %1$s</string>
 
     <string name="title_leaveRoom">Leave Flipchat?</string>
     <string name="subtitle_leaveRoom">You will need to pay to get back in, but we won\’t tell people you left</string>
diff --git a/libs/requests/src/main/kotlin/com/getcode/models/BillState.kt b/libs/requests/src/main/kotlin/com/getcode/models/BillState.kt
index 7555a2e1d..ce002e531 100644
--- a/libs/requests/src/main/kotlin/com/getcode/models/BillState.kt
+++ b/libs/requests/src/main/kotlin/com/getcode/models/BillState.kt
@@ -233,7 +233,6 @@ data class MessageTipPaymentConfirmation(
     override val state: ConfirmationState,
     val destination: PublicKey,
     val metadata: ExtendedMetadata,
-    val balance: String?,
     override val showScrim: Boolean = true,
     override val cancellable: Boolean = true,
 ): Confirmation(showScrim, state)
diff --git a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/chat/Conversation.kt b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/chat/Conversation.kt
index 3999d3845..7e57094e4 100644
--- a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/chat/Conversation.kt
+++ b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/chat/Conversation.kt
@@ -48,14 +48,14 @@ data class Conversation(
     val coverCharge: Kin = messagingFee?.let { Kin.fromQuarks(messagingFee) } ?: Kin.fromQuarks(0)
 }
 
-@Serializable
 data class ConversationWithMembersAndLastPointers(
     @Embedded val conversation: Conversation,
     @Relation(
         parentColumn = "idBase58",
-        entityColumn = "conversationIdBase58"
+        entityColumn = "conversationIdBase58",
+        entity = ConversationMember::class
     )
-    val members: List<ConversationMember>,
+    val members: List<ConversationMemberWithPersonalInfo>,
     @Relation(
         parentColumn = "idBase58",
         entityColumn = "conversationIdBase58",
diff --git a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/chat/ConversationMember.kt b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/chat/ConversationMember.kt
index edf6ae098..f5bb53e38 100644
--- a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/chat/ConversationMember.kt
+++ b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/chat/ConversationMember.kt
@@ -1,12 +1,17 @@
 package xyz.flipchat.services.domain.model.chat
 
 import androidx.room.ColumnInfo
+import androidx.room.DatabaseView
+import androidx.room.Embedded
 import androidx.room.Entity
 import androidx.room.Ignore
 import androidx.room.Index
+import androidx.room.Relation
 import com.getcode.model.ID
 import com.getcode.vendor.Base58
 import kotlinx.serialization.Serializable
+import xyz.flipchat.services.domain.model.people.FlipchatUser
+import xyz.flipchat.services.domain.model.people.MemberPersonalInfo
 
 @Serializable
 @Entity(
@@ -20,20 +25,41 @@ import kotlinx.serialization.Serializable
 data class ConversationMember(
     val memberIdBase58: String,
     val conversationIdBase58: String,
-    val memberName: String?,
-    val imageUri: String?,
     @ColumnInfo(defaultValue = "false")
     val isHost: Boolean, // isModerator
     @ColumnInfo(defaultValue = "false")
     val isMuted: Boolean,
     @ColumnInfo(defaultValue = "false")
     val isFullMember: Boolean,
-    @ColumnInfo(defaultValue = "false")
-    val isBlocked: Boolean
 ) {
     @Ignore
     val id: ID = Base58.decode(memberIdBase58).toList()
 
     @Ignore
     val conversationId: ID = Base58.decode(conversationIdBase58).toList()
+}
+
+data class ConversationMemberWithPersonalInfo(
+    @Embedded val member: ConversationMember?,
+    @Relation(
+        parentColumn = "memberIdBase58",
+        entityColumn = "userIdBase58",
+        projection = ["memberName", "imageUri", "isBlocked"],
+        entity = FlipchatUser::class
+    )
+    private val personalInfo: MemberPersonalInfo?,
+) {
+    val id: ID? get() = member?.memberIdBase58?.let { Base58.decode(it).toList() }
+
+    val isHost: Boolean get() = member?.isHost == true
+
+    val isMuted: Boolean get() = member?.isMuted == true
+
+    val isFullMember: Boolean get() = member?.isFullMember == true
+
+    val displayName: String? get() = personalInfo?.memberName
+
+    val imageUri: String? get() = personalInfo?.imageUri
+
+    val isBlocked: Boolean get() = personalInfo?.isBlocked == true
 }
\ No newline at end of file
diff --git a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/chat/ConversationMessage.kt b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/chat/ConversationMessage.kt
index 11951afea..ff411b626 100644
--- a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/chat/ConversationMessage.kt
+++ b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/chat/ConversationMessage.kt
@@ -7,12 +7,15 @@ import androidx.room.Ignore
 import androidx.room.Index
 import androidx.room.Junction
 import androidx.room.PrimaryKey
+import androidx.room.Query
 import androidx.room.Relation
 import com.getcode.model.ID
 import com.getcode.model.KinAmount
 import com.getcode.model.chat.MessageContent
 import com.getcode.vendor.Base58
 import kotlinx.serialization.Serializable
+import xyz.flipchat.services.domain.model.people.FlipchatUser
+import xyz.flipchat.services.domain.model.people.MemberPersonalInfo
 
 @Serializable
 @Entity(
@@ -72,28 +75,27 @@ data class ConversationMessageWithMemberAndReply(
         entity = ConversationMember::class,
     )
     val member: ConversationMember?,
-    @Relation(
-        parentColumn = "inReplyToBase58",
-        entityColumn = "idBase58",
-        entity = ConversationMessage::class,
-    )
-    val inReplyTo: ConversationMessageWithMemberAndContent? = null,
-    @Relation(
-        parentColumn = "idBase58",
-        entityColumn = "messageIdBase58",
-        entity = ConversationMessageTip::class,
-    )
-    val tips: List<MessageTipInfo>
 )
 
+
 data class ConversationMessageWithMemberAndContent(
     @Embedded val message: ConversationMessage,
+
+    // Member information from members table
     @Relation(
         parentColumn = "senderIdBase58",
         entityColumn = "memberIdBase58",
-        entity = ConversationMember::class,
+        entity = ConversationMember::class
     )
     val member: ConversationMember?,
+
+    @Relation(
+        parentColumn = "senderIdBase58",
+        entityColumn = "userIdBase58",
+        projection = ["memberName", "imageUri", "isBlocked"],
+        entity = FlipchatUser::class,
+    )
+    val personalInfo: MemberPersonalInfo?
 ) {
     @Ignore
     var contentEntity: MessageContent = MessageContent.Unknown(false)
@@ -102,7 +104,7 @@ data class ConversationMessageWithMemberAndContent(
 data class InflatedConversationMessage(
     val pageIndex: Int = 0, // tracking for [PagingSource] refresh eky
     val message: ConversationMessage,
-    val member: ConversationMember?,
+    val member: ConversationMemberWithPersonalInfo?,
     val content: MessageContent,
     val reply: ConversationMessageWithMemberAndContent?,
     val tips: List<MessageTipInfo>
@@ -115,5 +117,12 @@ data class MessageTipInfo(
         entityColumn = "memberIdBase58",
         entity = ConversationMember::class,
     )
-    val tipper: ConversationMember?
+    val tipper: ConversationMember?,
+    @Relation(
+        parentColumn = "tipperIdBase58",
+        entityColumn = "userIdBase58",
+        projection = ["memberName", "imageUri", "isBlocked"],
+        entity = FlipchatUser::class
+    )
+    val personalInfo: MemberPersonalInfo?,
 )
\ No newline at end of file
diff --git a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/chat/db/ChatUpdate.kt b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/chat/db/ChatUpdate.kt
index be945bc3a..a5c72c017 100644
--- a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/chat/db/ChatUpdate.kt
+++ b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/chat/db/ChatUpdate.kt
@@ -1,6 +1,7 @@
 package xyz.flipchat.services.domain.model.chat.db
 
 import com.getcode.model.ID
+import xyz.flipchat.services.data.Member
 import xyz.flipchat.services.domain.model.chat.Conversation
 import xyz.flipchat.services.domain.model.chat.ConversationMember
 import xyz.flipchat.services.domain.model.chat.ConversationMessage
@@ -12,9 +13,9 @@ data class ChatUpdate(
 )
 
 sealed interface ConversationMemberUpdate {
-    data class FullRefresh(val members: List<ConversationMember>): ConversationMemberUpdate
-    data class IndividualRefresh(val member: ConversationMember): ConversationMemberUpdate
-    data class Joined(val member: ConversationMember): ConversationMemberUpdate
+    data class FullRefresh(val roomId: ID, val members: List<Member>): ConversationMemberUpdate
+    data class IndividualRefresh(val roomId: ID, val member: Member): ConversationMemberUpdate
+    data class Joined(val roomId: ID, val member: Member): ConversationMemberUpdate
     data class Left(val roomId: ID, val memberId: ID): ConversationMemberUpdate
     data class Removed(val roomId: ID, val memberId: ID, val removedBy: ID): ConversationMemberUpdate
     data class Muted(val roomId: ID, val memberId: ID, val mutedBy: ID): ConversationMemberUpdate
diff --git a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/people/FlipchatUser.kt b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/people/FlipchatUser.kt
new file mode 100644
index 000000000..c4d41469f
--- /dev/null
+++ b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/domain/model/people/FlipchatUser.kt
@@ -0,0 +1,27 @@
+package xyz.flipchat.services.domain.model.people
+
+import androidx.room.Entity
+import androidx.room.Ignore
+import androidx.room.PrimaryKey
+import com.getcode.model.ID
+import com.getcode.vendor.Base58
+import kotlinx.serialization.Serializable
+
+@Serializable
+@Entity(tableName = "users",)
+data class FlipchatUser(
+    @PrimaryKey
+    val userIdBase58: String,
+    val memberName: String?,
+    val imageUri: String?,
+    val isBlocked: Boolean? = null
+) {
+    @Ignore
+    val id: ID = Base58.decode(userIdBase58).toList()
+}
+
+data class MemberPersonalInfo(
+    val memberName: String?,
+    val imageUri: String?,
+    val isBlocked: Boolean
+)
diff --git a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/data/mapper/ConversationMemberMapper.kt b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/data/mapper/ConversationMemberMapper.kt
index 16034e0b7..f74e5c1f8 100644
--- a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/data/mapper/ConversationMemberMapper.kt
+++ b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/data/mapper/ConversationMemberMapper.kt
@@ -13,12 +13,9 @@ class ConversationMemberMapper @Inject constructor(): Mapper<Pair<ID, Member>, C
         return ConversationMember(
             memberIdBase58 = member.id.base58,
             conversationIdBase58 = conversationId.base58,
-            memberName = member.identity?.displayName,
-            imageUri = member.identity?.imageUrl,
             isHost = member.isModerator,
             isMuted = member.isMuted,
             isFullMember = !member.isSpectator,
-            isBlocked = false // local set only right now
         )
     }
 }
\ No newline at end of file
diff --git a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/data/mapper/UserMapper.kt b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/data/mapper/UserMapper.kt
new file mode 100644
index 000000000..8ba3d381c
--- /dev/null
+++ b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/data/mapper/UserMapper.kt
@@ -0,0 +1,17 @@
+package xyz.flipchat.services.internal.data.mapper
+
+import com.getcode.services.mapper.Mapper
+import com.getcode.utils.base58
+import xyz.flipchat.services.data.Member
+import xyz.flipchat.services.domain.model.people.FlipchatUser
+import javax.inject.Inject
+
+class UserMapper @Inject constructor(): Mapper<Member, FlipchatUser> {
+    override fun map(from: Member): FlipchatUser {
+        return FlipchatUser(
+            userIdBase58 = from.id.base58,
+            memberName = from.identity?.displayName,
+            imageUri = from.identity?.imageUrl,
+        )
+    }
+}
\ No newline at end of file
diff --git a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/ConversationDao.kt b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/ConversationDao.kt
index abae9b15a..a43ef2805 100644
--- a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/ConversationDao.kt
+++ b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/ConversationDao.kt
@@ -81,6 +81,7 @@ interface ConversationDao {
         SELECT * FROM conversations AS c
         LEFT JOIN members AS m ON c.idBase58 = m.conversationIdBase58
         LEFT JOIN conversation_pointers AS p ON c.idBase58 = p.conversationIdBase58
+        LEFT JOIN users AS u ON m.memberIdBase58 = u.userIdBase58
         WHERE c.idBase58 = :id
     """
     )
diff --git a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/ConversationMemberDao.kt b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/ConversationMemberDao.kt
index 2983fbf3f..64e472d57 100644
--- a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/ConversationMemberDao.kt
+++ b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/ConversationMemberDao.kt
@@ -57,11 +57,6 @@ interface ConversationMemberDao {
         purgeMembersNotIn(conversationId.base58, memberIds)
     }
 
-    suspend fun refreshMembers(conversationId: ID, members: List<ConversationMember>) {
-        removeMembersFrom(conversationId)
-        upsertMembers(*members.toTypedArray())
-    }
-
     @Query("UPDATE members SET isMuted = 1 WHERE conversationIdBase58 = :conversationId AND memberIdBase58 = :memberId")
     suspend fun muteMember(conversationId: String, memberId: String)
     suspend fun muteMember(conversationId: ID, memberId: ID) {
@@ -86,18 +81,6 @@ interface ConversationMemberDao {
         demoteMember(conversationId.base58, memberId.base58)
     }
 
-    @Query("UPDATE members SET isBlocked = 1 WHERE memberIdBase58 = :memberId")
-    suspend fun blockMember(memberId: String)
-    suspend fun blockMember(memberId: ID) {
-        blockMember(memberId.base58)
-    }
-
-    @Query("UPDATE members SET isBlocked = 0 WHERE memberIdBase58 = :memberId")
-    suspend fun unblockMember(memberId: String)
-    suspend fun unblockMember(memberId: ID) {
-        unblockMember(memberId.base58)
-    }
-
     @Query("DELETE FROM members")
     fun clearMembers()
 }
\ No newline at end of file
diff --git a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/ConversationMessageDao.kt b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/ConversationMessageDao.kt
index fa1f60726..c53f1bb08 100644
--- a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/ConversationMessageDao.kt
+++ b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/ConversationMessageDao.kt
@@ -11,12 +11,17 @@ import com.getcode.model.ID
 import com.getcode.model.chat.MessageContent
 import com.getcode.model.uuid
 import com.getcode.utils.base58
+import com.getcode.vendor.Base58
 import xyz.flipchat.services.domain.model.chat.ConversationMember
+import xyz.flipchat.services.domain.model.chat.ConversationMemberWithPersonalInfo
 import xyz.flipchat.services.domain.model.chat.ConversationMessage
 import xyz.flipchat.services.domain.model.chat.ConversationMessageTip
 import xyz.flipchat.services.domain.model.chat.ConversationMessageWithMemberAndContent
 import xyz.flipchat.services.domain.model.chat.ConversationMessageWithMemberAndReply
 import xyz.flipchat.services.domain.model.chat.InflatedConversationMessage
+import xyz.flipchat.services.domain.model.chat.MessageTipInfo
+import xyz.flipchat.services.domain.model.people.FlipchatUser
+import xyz.flipchat.services.domain.model.people.MemberPersonalInfo
 
 @Dao
 interface ConversationMessageDao {
@@ -111,17 +116,18 @@ interface ConversationMessageDao {
         messages.sentOffStage AS sentOffStage,
         messages.content AS content,
         members.memberIdBase58 AS memberIdBase58,
-        members.memberName AS memberName,
         members.isHost AS isHost,
-        members.imageUri AS imageUri,
-        members.isBlocked AS isBlocked,
         members.isFullMember AS isFullMember,
-        members.isMuted AS isMuted
+        members.isMuted AS isMuted,
+        users.memberName AS memberName,
+        users.imageUri AS imageUri,
+        users.isBlocked AS isBlocked
     FROM messages
 
     LEFT JOIN members ON messages.senderIdBase58 = members.memberIdBase58 
                        AND messages.conversationIdBase58 = members.conversationIdBase58
                        AND members.conversationIdBase58 = :id
+    LEFT JOIN users ON messages.senderIdBase58 = users.userIdBase58
     LEFT JOIN tips ON messages.idBase58 = tips.messageIdBase58
     -- RawText, Announcements, Replies, and Actionable Announcements --
     WHERE messages.conversationIdBase58 = :id AND type IN (1, 4, 8, 12)
@@ -141,21 +147,46 @@ interface ConversationMessageDao {
         return getMemberInternal(conversationId.base58, memberId.base58)
     }
 
+    @Query("SELECT * FROM users WHERE userIdBase58 = :memberId")
+    suspend fun getMemberPersonalInfo(memberId: String): FlipchatUser?
+    suspend fun getMemberPersonalInfo(memberId: ID): FlipchatUser? {
+        return getMemberPersonalInfo(memberId.base58)
+    }
+
+    @Query("SELECT * FROM tips WHERE messageIdBase58 = :id")
+    suspend fun getTipsForMessage(id: String): List<MessageTipInfo>
+    suspend fun getTipsForMessage(id: ID): List<MessageTipInfo> {
+        return getTipsForMessage(id.base58)
+    }
+
     suspend fun getPagedMessagesWithDetails(id: ID, limit: Int, offset: Int, selfId: ID?): List<InflatedConversationMessage> {
         val messages = getPagedMessages(id.base58, limit, offset)
 
         return messages.map {
             val content = MessageContent.fromData(it.message.type, it.message.content, isFromSelf = selfId == it.message.senderId)
             val member = getMemberInternal(id, it.message.senderId)
-            val replyContent = it.inReplyTo?.let { rp ->
+            val pii = getMemberPersonalInfo(it.message.senderId)
+            val replyMessage = it.message.inReplyTo?.let { id -> getMessageById(id.base58) }
+            val replyContent = replyMessage?.let { rp ->
                 MessageContent.fromData(rp.message.type, rp.message.content, isFromSelf = rp.message.senderId == selfId)
             } ?: MessageContent.Unknown(false)
+
+            val tips = getTipsForMessage(it.message.id)
             InflatedConversationMessage(
                 message = it.message,
-                member = member,
+                member = ConversationMemberWithPersonalInfo(
+                    member = member,
+                    personalInfo = pii?.let {
+                        MemberPersonalInfo(
+                            memberName = pii.memberName,
+                            imageUri = pii.imageUri,
+                            isBlocked = pii.isBlocked ?: false
+                        )
+                    }
+                ),
                 content = content,
-                reply = it.inReplyTo?.apply { contentEntity = replyContent },
-                tips = it.tips,
+                reply = replyMessage?.apply { contentEntity = replyContent },
+                tips = tips,
             )
         }
     }
@@ -189,25 +220,7 @@ interface ConversationMessageDao {
             WHERE messages.idBase58 = :messageId
             LIMIT 1
         """)
-    suspend fun getMessageById(messageId: String): ConversationMessageWithMemberAndReply?
-
-
-    suspend fun getMessageWithContentById(messageId: String, selfId: String?): ConversationMessageWithMemberAndContent? {
-        val row = getMessageById(messageId) ?: return null
-        val content = MessageContent.fromData(row.message.type, row.message.content, isFromSelf = row.message.senderIdBase58 == selfId) ?: return null
-        val member = getMemberInternal(row.message.conversationId, row.message.senderId)
-        return ConversationMessageWithMemberAndContent(
-            message = row.message,
-            member = member,
-        ).apply {
-            contentEntity = content
-        }
-    }
-
-    suspend fun getMessageWithContentById(messageId: ID, selfID: ID?): ConversationMessageWithMemberAndContent? {
-        return getMessageWithContentById(messageId.base58, selfID?.base58)
-    }
-
+    suspend fun getMessageById(messageId: String): ConversationMessageWithMemberAndContent?
 
     @Query("""
         SELECT * FROM messages 
diff --git a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/UserDao.kt b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/UserDao.kt
new file mode 100644
index 000000000..e6c5678c3
--- /dev/null
+++ b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/UserDao.kt
@@ -0,0 +1,27 @@
+package xyz.flipchat.services.internal.db
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import com.getcode.model.ID
+import com.getcode.utils.base58
+import xyz.flipchat.services.domain.model.people.FlipchatUser
+
+@Dao
+interface UserDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun upsert(vararg users: FlipchatUser)
+
+    @Query("UPDATE users SET isBlocked = 1 WHERE userIdBase58 = :userId")
+    suspend fun blockUser(userId: String)
+    suspend fun blockUser(userId: ID) {
+        blockUser(userId.base58)
+    }
+
+    @Query("UPDATE users SET isBlocked = 0 WHERE userIdBase58 = :userId")
+    suspend fun unblockUser(userId: String)
+    suspend fun unblockUser(userId: ID) {
+        unblockUser(userId.base58)
+    }
+}
\ No newline at end of file
diff --git a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/inject/RepositoryModule.kt b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/inject/RepositoryModule.kt
index b63cbf4ae..e40e11237 100644
--- a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/inject/RepositoryModule.kt
+++ b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/inject/RepositoryModule.kt
@@ -65,9 +65,7 @@ internal object RepositoryModule {
         service = service,
         roomMapper = roomMapper,
         roomWithMembersMapper = roomWithMembersMapper,
-        conversationMapper = conversationMapper,
         memberUpdateMapper = memberUpdateMapper,
-        conversationMemberMapper = conversationMemberMapper,
         lastMessageMapper = messageMapper,
         messageMapper = messageWithContentMapper,
         metadataUpdateMapper = metadataUpdateMapper,
diff --git a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/network/repository/chat/RealChatRepository.kt b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/network/repository/chat/RealChatRepository.kt
index 5a69a70bd..815b588d9 100644
--- a/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/network/repository/chat/RealChatRepository.kt
+++ b/services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/network/repository/chat/RealChatRepository.kt
@@ -43,11 +43,9 @@ internal class RealChatRepository @Inject constructor(
     private val service: ChatService,
     private val roomMapper: MetadataRoomMapper,
     private val roomWithMembersMapper: RoomWithMembersMapper,
-    private val conversationMapper: RoomConversationMapper,
     private val metadataUpdateMapper: MetadataUpdateMapper,
     private val streamMetadataUpdateMapper: StreamMetadataUpdateMapper,
     private val memberUpdateMapper: MemberUpdateMapper,
-    private val conversationMemberMapper: ConversationMemberMapper,
     private val lastMessageMapper: LastMessageMapper,
     private val messageMapper: ConversationMessageMapper,
 ) : ChatRepository {
@@ -279,31 +277,15 @@ internal class RealChatRepository @Inject constructor(
                         val convoMemberUpdates = memberUpdates.mapNotNull { memberUpdate ->
                             when (memberUpdate) {
                                 is StreamMemberUpdate.Refresh -> {
-                                    val members = memberUpdate.members.map {
-                                        conversationMemberMapper.map(
-                                            Pair(
-                                                update.id,
-                                                it
-                                            )
-                                        )
-                                    }
-                                    ConversationMemberUpdate.FullRefresh(members)
+                                    ConversationMemberUpdate.FullRefresh(update.id, memberUpdate.members)
                                 }
 
                                 is StreamMemberUpdate.IndividualRefresh -> {
-                                    ConversationMemberUpdate.IndividualRefresh(
-                                        conversationMemberMapper.map(
-                                            Pair(update.id, memberUpdate.member)
-                                        )
-                                    )
+                                    ConversationMemberUpdate.IndividualRefresh(update.id, memberUpdate.member)
                                 }
 
                                 is StreamMemberUpdate.Joined -> {
-                                    ConversationMemberUpdate.Joined(
-                                        conversationMemberMapper.map(
-                                            Pair(update.id, memberUpdate.member)
-                                        )
-                                    )
+                                    ConversationMemberUpdate.Joined(update.id, memberUpdate.member)
                                 }
 
                                 is StreamMemberUpdate.Left -> {
diff --git a/services/flipchat/payments/src/main/kotlin/com/getcode/network/BalanceController.kt b/services/flipchat/payments/src/main/kotlin/com/getcode/network/BalanceController.kt
index 1012bfe4a..1efc181de 100644
--- a/services/flipchat/payments/src/main/kotlin/com/getcode/network/BalanceController.kt
+++ b/services/flipchat/payments/src/main/kotlin/com/getcode/network/BalanceController.kt
@@ -1,6 +1,6 @@
 package com.getcode.network
 
-import com.codeinc.gen.user.v1.user
+import androidx.compose.runtime.staticCompositionLocalOf
 import com.getcode.model.Currency
 import com.getcode.model.CurrencyCode
 import com.getcode.model.Rate
@@ -32,6 +32,7 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import timber.log.Timber
+import xyz.flipchat.services.PaymentController
 import xyz.flipchat.services.user.AuthState
 import xyz.flipchat.services.user.UserManager
 import java.util.Locale
@@ -243,3 +244,5 @@ open class BalanceController @Inject constructor(
         }
     }
 }
+
+val LocalBalanceController = staticCompositionLocalOf<BalanceController?> { null }
diff --git a/services/flipchat/payments/src/main/kotlin/xyz/flipchat/services/PaymentController.kt b/services/flipchat/payments/src/main/kotlin/xyz/flipchat/services/PaymentController.kt
index d5320d258..76d1c1849 100644
--- a/services/flipchat/payments/src/main/kotlin/xyz/flipchat/services/PaymentController.kt
+++ b/services/flipchat/payments/src/main/kotlin/xyz/flipchat/services/PaymentController.kt
@@ -3,23 +3,17 @@ package xyz.flipchat.services
 import androidx.compose.runtime.staticCompositionLocalOf
 import com.getcode.domain.BillController
 import com.getcode.manager.TopBarManager
-import com.getcode.model.Currency
 import com.getcode.model.ID
 import com.getcode.model.KinAmount
 import com.getcode.models.BillState
 import com.getcode.models.ConfirmationState
 import com.getcode.models.MessageTipPaymentConfirmation
 import com.getcode.models.PublicPaymentConfirmation
-import com.getcode.network.BalanceController
 import com.getcode.network.repository.PaymentError
 import com.getcode.network.repository.PaymentRepository
 import com.getcode.services.model.ExtendedMetadata
 import com.getcode.solana.keys.PublicKey
 import com.getcode.util.resources.ResourceHelper
-import com.getcode.utils.CurrencyUtils
-import com.getcode.utils.Kin
-import com.getcode.utils.flagResId
-import com.getcode.utils.formatAmountString
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -58,16 +52,14 @@ open class PaymentController @Inject constructor(
     private val paymentRepository: PaymentRepository,
     private val resources: ResourceHelper,
     private val billController: BillController,
-    private val balanceController: BalanceController,
-    private val currencyUtils: CurrencyUtils,
 ) {
-    protected val scope = CoroutineScope(Dispatchers.IO)
+    private val scope = CoroutineScope(Dispatchers.IO)
 
     val state = billController.state.map {
         PaymentState(it)
     }.stateIn(scope, started = SharingStarted.Eagerly, initialValue = PaymentState())
 
-    protected val _eventFlow: MutableSharedFlow<PaymentEvent> = MutableSharedFlow()
+    private val _eventFlow: MutableSharedFlow<PaymentEvent> = MutableSharedFlow()
     val eventFlow: SharedFlow<PaymentEvent> = _eventFlow.asSharedFlow()
 
     fun presentPublicPaymentConfirmation(
@@ -156,21 +148,12 @@ open class PaymentController @Inject constructor(
     }
 
     fun presentMessageTipConfirmation(metadata: ExtendedMetadata, destination: PublicKey) {
-        val rawBalance = balanceController.rawBalance
-        val balance = formatAmountString(
-            resources,
-            Currency.Kin,
-            rawBalance,
-            suffix = resources.getKinSuffix()
-        )
-
         billController.update {
             it.copy(
                 messageTipPaymentConfirmation = MessageTipPaymentConfirmation(
                     state = ConfirmationState.AwaitingConfirmation,
                     metadata = metadata,
                     destination = destination,
-                    balance = balance,
                 )
             )
         }
diff --git a/services/flipchat/sdk/schemas/xyz.flipchat.internal.db.FcAppDatabase/23.json b/services/flipchat/sdk/schemas/xyz.flipchat.internal.db.FcAppDatabase/23.json
new file mode 100644
index 000000000..992c7cf39
--- /dev/null
+++ b/services/flipchat/sdk/schemas/xyz.flipchat.internal.db.FcAppDatabase/23.json
@@ -0,0 +1,513 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 23,
+    "identityHash": "2833cbe331cac7c0adf5fbea7479bbb0",
+    "entities": [
+      {
+        "tableName": "PrefInt",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PrefString",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` TEXT NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PrefBool",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "PrefDouble",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` REAL NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "users",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userIdBase58` TEXT NOT NULL, `memberName` TEXT, `imageUri` TEXT, `isBlocked` INTEGER, PRIMARY KEY(`userIdBase58`))",
+        "fields": [
+          {
+            "fieldPath": "userIdBase58",
+            "columnName": "userIdBase58",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "memberName",
+            "columnName": "memberName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "imageUri",
+            "columnName": "imageUri",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isBlocked",
+            "columnName": "isBlocked",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "userIdBase58"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "conversations",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`idBase58` TEXT NOT NULL, `ownerIdBase58` TEXT, `title` TEXT NOT NULL, `roomNumber` INTEGER NOT NULL DEFAULT 0, `imageUri` TEXT, `lastActivity` INTEGER, `isMuted` INTEGER NOT NULL, `canMute` INTEGER NOT NULL DEFAULT true, `unreadCount` INTEGER NOT NULL, `coverChargeQuarks` INTEGER, `hasMoreUnread` INTEGER NOT NULL DEFAULT false, `isOpen` INTEGER NOT NULL DEFAULT true, PRIMARY KEY(`idBase58`))",
+        "fields": [
+          {
+            "fieldPath": "idBase58",
+            "columnName": "idBase58",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "ownerIdBase58",
+            "columnName": "ownerIdBase58",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomNumber",
+            "columnName": "roomNumber",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "imageUri",
+            "columnName": "imageUri",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastActivity",
+            "columnName": "lastActivity",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isMuted",
+            "columnName": "isMuted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canMute",
+            "columnName": "canMute",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          },
+          {
+            "fieldPath": "unreadCount",
+            "columnName": "unreadCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messagingFee",
+            "columnName": "coverChargeQuarks",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "hasMoreUnread",
+            "columnName": "hasMoreUnread",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isOpen",
+            "columnName": "isOpen",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "idBase58"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "members",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`memberIdBase58` TEXT NOT NULL, `conversationIdBase58` TEXT NOT NULL, `isHost` INTEGER NOT NULL DEFAULT false, `isMuted` INTEGER NOT NULL DEFAULT false, `isFullMember` INTEGER NOT NULL DEFAULT false, PRIMARY KEY(`memberIdBase58`, `conversationIdBase58`))",
+        "fields": [
+          {
+            "fieldPath": "memberIdBase58",
+            "columnName": "memberIdBase58",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "conversationIdBase58",
+            "columnName": "conversationIdBase58",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isHost",
+            "columnName": "isHost",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isMuted",
+            "columnName": "isMuted",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isFullMember",
+            "columnName": "isFullMember",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "memberIdBase58",
+            "conversationIdBase58"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_members_memberIdBase58",
+            "unique": false,
+            "columnNames": [
+              "memberIdBase58"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_members_memberIdBase58` ON `${TABLE_NAME}` (`memberIdBase58`)"
+          },
+          {
+            "name": "index_members_conversationIdBase58",
+            "unique": false,
+            "columnNames": [
+              "conversationIdBase58"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_members_conversationIdBase58` ON `${TABLE_NAME}` (`conversationIdBase58`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "conversation_pointers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`conversationIdBase58` TEXT NOT NULL, `messageIdString` TEXT NOT NULL, `status` TEXT NOT NULL, PRIMARY KEY(`conversationIdBase58`, `status`))",
+        "fields": [
+          {
+            "fieldPath": "conversationIdBase58",
+            "columnName": "conversationIdBase58",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageIdString",
+            "columnName": "messageIdString",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "conversationIdBase58",
+            "status"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`idBase58` TEXT NOT NULL, `conversationIdBase58` TEXT NOT NULL, `senderIdBase58` TEXT NOT NULL DEFAULT '', `dateMillis` INTEGER NOT NULL, `deleted` INTEGER, `deletedByBase58` TEXT, `inReplyToBase58` TEXT, `sentOffStage` INTEGER NOT NULL DEFAULT false, `isApproved` INTEGER, `tipCount` INTEGER NOT NULL DEFAULT 0, `type` INTEGER NOT NULL DEFAULT 1, `content` TEXT NOT NULL DEFAULT '', PRIMARY KEY(`idBase58`))",
+        "fields": [
+          {
+            "fieldPath": "idBase58",
+            "columnName": "idBase58",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "conversationIdBase58",
+            "columnName": "conversationIdBase58",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderIdBase58",
+            "columnName": "senderIdBase58",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "dateMillis",
+            "columnName": "dateMillis",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deleted",
+            "columnName": "deleted",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "deletedByBase58",
+            "columnName": "deletedByBase58",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "inReplyToBase58",
+            "columnName": "inReplyToBase58",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "sentOffStage",
+            "columnName": "sentOffStage",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isApproved",
+            "columnName": "isApproved",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "tipCount",
+            "columnName": "tipCount",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "idBase58"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_messages_conversationIdBase58",
+            "unique": false,
+            "columnNames": [
+              "conversationIdBase58"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_messages_conversationIdBase58` ON `${TABLE_NAME}` (`conversationIdBase58`)"
+          },
+          {
+            "name": "index_messages_senderIdBase58",
+            "unique": false,
+            "columnNames": [
+              "senderIdBase58"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_messages_senderIdBase58` ON `${TABLE_NAME}` (`senderIdBase58`)"
+          },
+          {
+            "name": "index_messages_dateMillis",
+            "unique": false,
+            "columnNames": [
+              "dateMillis"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_messages_dateMillis` ON `${TABLE_NAME}` (`dateMillis`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "tips",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`idBase58` TEXT NOT NULL, `messageIdBase58` TEXT NOT NULL, `amount` INTEGER NOT NULL, `tipperIdBase58` TEXT NOT NULL, PRIMARY KEY(`idBase58`))",
+        "fields": [
+          {
+            "fieldPath": "idBase58",
+            "columnName": "idBase58",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageIdBase58",
+            "columnName": "messageIdBase58",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tipperIdBase58",
+            "columnName": "tipperIdBase58",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "idBase58"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_tips_messageIdBase58",
+            "unique": false,
+            "columnNames": [
+              "messageIdBase58"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_tips_messageIdBase58` ON `${TABLE_NAME}` (`messageIdBase58`)"
+          }
+        ],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '2833cbe331cac7c0adf5fbea7479bbb0')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/chat/RoomController.kt b/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/chat/RoomController.kt
index d206fc489..6c873180d 100644
--- a/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/chat/RoomController.kt
+++ b/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/chat/RoomController.kt
@@ -28,6 +28,7 @@ import xyz.flipchat.services.domain.model.chat.ConversationMessageWithMemberAndC
 import xyz.flipchat.services.domain.model.chat.ConversationWithMembersAndLastPointers
 import xyz.flipchat.services.domain.model.chat.InflatedConversationMessage
 import xyz.flipchat.services.internal.data.mapper.ConversationMemberMapper
+import xyz.flipchat.services.internal.data.mapper.UserMapper
 import xyz.flipchat.services.internal.network.repository.chat.ChatRepository
 import xyz.flipchat.services.internal.network.repository.messaging.MessagingRepository
 import xyz.flipchat.services.user.UserManager
@@ -37,6 +38,7 @@ class RoomController @Inject constructor(
     private val chatRepository: ChatRepository,
     private val messagingRepository: MessagingRepository,
     private val conversationMemberMapper: ConversationMemberMapper,
+    private val userMapper: UserMapper,
     private val conversationMessageMapper: ConversationMessageMapper,
     private val notificationManager: NotificationManagerCompat,
     private val userManager: UserManager,
@@ -48,18 +50,10 @@ class RoomController @Inject constructor(
         return db.conversationDao().observeConversation(id)
     }
 
-    fun observeMembersIn(id: ID): Flow<List<ConversationMember>> {
-        return db.conversationMembersDao().observeMembersIn(id)
-    }
-
     suspend fun getConversation(identifier: ID): ConversationWithMembersAndLastPointers? {
         return db.conversationDao().findConversation(identifier)
     }
 
-    suspend fun getMessage(id: ID): ConversationMessageWithMemberAndContent? {
-        return db.conversationMessageDao().getMessageWithContentById(id, userManager.userId)
-    }
-
     suspend fun getUnreadCount(identifier: ID): Int {
         return db.conversationDao().getUnreadCount(identifier) ?: 0
     }
@@ -69,10 +63,12 @@ class RoomController @Inject constructor(
             .onSuccess {
                 val dbMembers = it.map { m -> conversationMemberMapper.map(identifier to m) }
                 val memberIds = dbMembers.map { member -> member.id.base58 }
+                val users = it.map { m -> userMapper.map(m) }
                 db.withTransaction {
                     withContext(Dispatchers.IO) {
                         db.conversationMembersDao().purgeMembersNotIn(identifier, memberIds)
                         db.conversationMembersDao().upsertMembers(*dbMembers.toTypedArray())
+                        db.userDao().upsert(*users.toTypedArray())
                     }
                 }
             }
@@ -281,7 +277,7 @@ class RoomController @Inject constructor(
         userId: ID,
     ): Result<Unit> {
         withContext(Dispatchers.IO) {
-            db.conversationMembersDao().blockMember(userId)
+            db.userDao().blockUser(userId)
         }
 
         return Result.success(Unit)
@@ -291,7 +287,7 @@ class RoomController @Inject constructor(
         userId: ID,
     ): Result<Unit> {
         withContext(Dispatchers.IO) {
-            db.conversationMembersDao().unblockMember(userId)
+            db.userDao().unblockUser(userId)
         }
 
         return Result.success(Unit)
diff --git a/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/controllers/ChatsController.kt b/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/controllers/ChatsController.kt
index 84b35374c..c5e35b076 100644
--- a/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/controllers/ChatsController.kt
+++ b/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.UserMapper
 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
@@ -47,6 +48,7 @@ import javax.inject.Singleton
 class ChatsController @Inject constructor(
     private val conversationMapper: RoomConversationMapper,
     private val conversationMemberMapper: ConversationMemberMapper,
+    private val userMapper: UserMapper,
     private val conversationMessageMapper: ConversationMessageMapper,
     private val chatRepository: ChatRepository,
     private val messagingRepository: MessagingRepository,
@@ -86,8 +88,11 @@ class ChatsController @Inject constructor(
                 db.withTransaction {
                     withContext(Dispatchers.IO) {
                         db.conversationDao().upsertConversations(conversationMapper.map(room))
-                        members.map { conversationMemberMapper.map(room.id to it) }.onEach {
-                            db.conversationMembersDao().upsertMembers(it)
+                        members.map { conversationMemberMapper.map(room.id to it) }.let {
+                            db.conversationMembersDao().upsertMembers(*it.toTypedArray())
+                        }
+                        members.map { userMapper.map(it) }.let {
+                            db.userDao().upsert(*it.toTypedArray())
                         }
                     }
                 }
@@ -149,16 +154,42 @@ class ChatsController @Inject constructor(
                             event.members.onEach { update ->
                                 when (update) {
                                     is ConversationMemberUpdate.FullRefresh -> {
+                                        val members = update.members.map {
+                                            conversationMemberMapper.map(
+                                                Pair(
+                                                    update.roomId,
+                                                    it
+                                                )
+                                            )
+                                        }
+                                        val users = update.members.map {
+                                            userMapper.map(it)
+                                        }
+
                                         db.conversationMembersDao()
-                                            .upsertMembers(*update.members.toTypedArray())
+                                            .upsertMembers(*members.toTypedArray())
+                                        db.userDao()
+                                            .upsert(*users.toTypedArray())
                                     }
 
                                     is ConversationMemberUpdate.IndividualRefresh -> {
-                                        db.conversationMembersDao().upsertMembers(update.member)
+                                        val member = conversationMemberMapper.map(
+                                            Pair(update.roomId, update.member)
+                                        )
+
+                                        val user = userMapper.map(update.member)
+                                        db.conversationMembersDao().upsertMembers(member)
+                                        db.userDao().upsert(user)
                                     }
 
                                     is ConversationMemberUpdate.Joined -> {
-                                        db.conversationMembersDao().upsertMembers(update.member)
+                                        val member = conversationMemberMapper.map(
+                                            Pair(update.roomId, update.member)
+                                        )
+
+                                        val user = userMapper.map(update.member)
+                                        db.conversationMembersDao().upsertMembers(member)
+                                        db.userDao().upsert(user)
                                     }
 
                                     is ConversationMemberUpdate.Left -> {
@@ -288,17 +319,23 @@ class ChatsController @Inject constructor(
         return chatRepository.getChat(identifier = ChatIdentifier.RoomNumber(roomNumber))
     }
 
+    suspend fun lookupRoom(id: ID): Result<RoomWithMembers> {
+        return chatRepository.getChat(identifier = ChatIdentifier.Id(id))
+    }
+
 
     suspend fun createDirectMessage(recipient: ID): Result<RoomWithMembers> {
         return chatRepository.startChat(StartChatRequestType.TwoWay(recipient))
             .onSuccess { result ->
                 val members =
                     result.members.map { conversationMemberMapper.map(result.room.id to it) }
+                val users = result.members.map { userMapper.map(it) }
                 db.withTransaction {
                     withContext(Dispatchers.IO) {
                         db.conversationDao()
                             .upsertConversations(conversationMapper.map(result.room))
                         db.conversationMembersDao().upsertMembers(*members.toTypedArray())
+                        db.userDao().upsert(*users.toTypedArray())
                     }
                 }
             }
@@ -313,11 +350,13 @@ class ChatsController @Inject constructor(
             .onSuccess { result ->
                 val members =
                     result.members.map { conversationMemberMapper.map(result.room.id to it) }
+                val users = result.members.map { userMapper.map(it) }
                 db.withTransaction {
                     withContext(Dispatchers.IO) {
                         db.conversationDao()
                             .upsertConversations(conversationMapper.map(result.room))
                         db.conversationMembersDao().upsertMembers(*members.toTypedArray())
+                        db.userDao().upsert(*users.toTypedArray())
                     }
                 }
             }
@@ -328,11 +367,13 @@ class ChatsController @Inject constructor(
             .onSuccess { result ->
                 val members =
                     result.members.map { conversationMemberMapper.map(result.room.id to it) }
+                val users = result.members.map { userMapper.map(it) }
                 db.withTransaction {
                     withContext(Dispatchers.IO) {
                         db.conversationDao()
                             .upsertConversations(conversationMapper.map(result.room))
                         db.conversationMembersDao().upsertMembers(*members.toTypedArray())
+                        db.userDao().upsert(*users.toTypedArray())
                     }
                 }
             }
@@ -343,11 +384,13 @@ class ChatsController @Inject constructor(
             .onSuccess { result ->
                 val members =
                     result.members.map { conversationMemberMapper.map(result.room.id to it) }
+                val users = result.members.map { userMapper.map(it) }
                 db.withTransaction {
                     withContext(Dispatchers.IO) {
                         db.conversationDao()
                             .upsertConversations(conversationMapper.map(result.room))
                         db.conversationMembersDao().upsertMembers(*members.toTypedArray())
+                        db.userDao().upsert(*users.toTypedArray())
                     }
                 }
             }
diff --git a/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/internal/db/FcAppDatabase.kt b/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/internal/db/FcAppDatabase.kt
index 93ce96d41..5722685bc 100644
--- a/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/internal/db/FcAppDatabase.kt
+++ b/services/flipchat/sdk/src/main/kotlin/xyz/flipchat/internal/db/FcAppDatabase.kt
@@ -25,10 +25,12 @@ import xyz.flipchat.services.domain.model.chat.ConversationMember
 import xyz.flipchat.services.domain.model.chat.ConversationMessage
 import xyz.flipchat.services.domain.model.chat.ConversationMessageTip
 import xyz.flipchat.services.domain.model.chat.ConversationPointerCrossRef
+import xyz.flipchat.services.domain.model.people.FlipchatUser
 import xyz.flipchat.services.internal.db.ConversationDao
 import xyz.flipchat.services.internal.db.ConversationMemberDao
 import xyz.flipchat.services.internal.db.ConversationMessageDao
 import xyz.flipchat.services.internal.db.ConversationPointerDao
+import xyz.flipchat.services.internal.db.UserDao
 import java.io.File
 
 @Database(
@@ -37,6 +39,7 @@ import java.io.File
         PrefString::class,
         PrefBool::class,
         PrefDouble::class,
+        FlipchatUser::class,
         Conversation::class,
         ConversationMember::class,
         ConversationPointerCrossRef::class,
@@ -65,8 +68,9 @@ import java.io.File
         AutoMigration(from = 19, to = 20),
         AutoMigration(from = 20, to = 21, spec = FcAppDatabase.Migration20To21::class),
         AutoMigration(from = 21, to = 22, spec = FcAppDatabase.Migration21To22::class),
+        // explicit no migration to fallback to reset (from = 22, to = 23)
     ],
-    version = 22,
+    version = 23,
 )
 @TypeConverters(SharedConverters::class, Converters::class)
 abstract class FcAppDatabase : RoomDatabase(), ClosableDatabase {
@@ -79,6 +83,7 @@ abstract class FcAppDatabase : RoomDatabase(), ClosableDatabase {
     abstract fun conversationPointersDao(): ConversationPointerDao
     abstract fun conversationMessageDao(): ConversationMessageDao
     abstract fun conversationMembersDao(): ConversationMemberDao
+    abstract fun userDao(): UserDao
 
     class Migration6To7 : Migration(6, 7), AutoMigrationSpec {
         override fun migrate(db: SupportSQLiteDatabase) {
diff --git a/ui/components/src/main/kotlin/com/getcode/ui/components/chat/HostableAvatar.kt b/ui/components/src/main/kotlin/com/getcode/ui/components/chat/HostableAvatar.kt
index 7d3a4155f..be681746c 100644
--- a/ui/components/src/main/kotlin/com/getcode/ui/components/chat/HostableAvatar.kt
+++ b/ui/components/src/main/kotlin/com/getcode/ui/components/chat/HostableAvatar.kt
@@ -13,6 +13,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.CompositingStrategy
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.Layout
 import androidx.compose.ui.layout.MeasureScope
@@ -59,7 +61,7 @@ fun HostableAvatar(
     }
 ) {
     Layout(
-        modifier = modifier,
+        modifier = modifier.graphicsLayer { clip = false },
         content = {
             UserAvatar(
                 modifier = Modifier
@@ -73,6 +75,7 @@ fun HostableAvatar(
             if (isHost) {
                 Image(
                     modifier = imageModifier
+                        .graphicsLayer { compositingStrategy = CompositingStrategy.Offscreen }
                         .layoutId("crown")
                         .size(getBadgeSize(size))
                         .background(color = Color(0xFFE9C432), shape = CircleShape)
@@ -88,6 +91,7 @@ fun HostableAvatar(
                     is AvatarEndAction.Icon -> {
                         Image(
                             modifier = imageModifier
+                                .graphicsLayer { compositingStrategy = CompositingStrategy.Offscreen }
                                 .layoutId("badge")
                                 .size(getBadgeSize(size))
                                 .background(color = endAction.backgroundColor, shape = CircleShape)
@@ -160,13 +164,13 @@ private fun MeasureScope.placeBadgeOnAvatarPerimeter(
 
     val badgeRadius = widthOrZero(placeable) / 2f
 
-    val distanceBetweenCenters = avatarRadius + badgeRadius - 16.dp.toPx()
+    val distanceBetweenCenters = avatarRadius + badgeRadius - (avatarRadius * 0.30f)
 
     val badgeCenterX = centerX + distanceBetweenCenters * cos(angle)
     val badgeCenterY = centerY + distanceBetweenCenters * sin(angle)
 
     val offsetX = badgeCenterX - badgeRadius
-    val offsetY = badgeCenterY - badgeRadius
+    val offsetY = badgeCenterY - badgeRadius + 2.dp.toPx()
 
     return IntOffset(offsetX.roundToInt(), offsetY.roundToInt())
 }
\ No newline at end of file
diff --git a/ui/components/src/main/kotlin/com/getcode/ui/components/chat/MessageList.kt b/ui/components/src/main/kotlin/com/getcode/ui/components/chat/MessageList.kt
index 464190ef8..b09273787 100644
--- a/ui/components/src/main/kotlin/com/getcode/ui/components/chat/MessageList.kt
+++ b/ui/components/src/main/kotlin/com/getcode/ui/components/chat/MessageList.kt
@@ -28,16 +28,20 @@ import androidx.paging.compose.itemKey
 import com.getcode.model.ID
 import com.getcode.model.chat.MessageContent
 import com.getcode.model.chat.MessageStatus
+import com.getcode.model.uuid
 import com.getcode.theme.CodeTheme
 import com.getcode.ui.components.chat.messagecontents.MessageControlAction
 import com.getcode.ui.components.chat.utils.ChatItem
 import com.getcode.ui.components.chat.utils.MessageTip
 import com.getcode.ui.components.text.markup.Markup
 import com.getcode.util.formatDateRelatively
+import com.getcode.utils.timestamp
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterNot
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 
 sealed interface MessageListEvent {
     data class AdvancePointer(val messageId: ID) : MessageListEvent
@@ -45,9 +49,9 @@ sealed interface MessageListEvent {
     data class OnMarkupEvent(val markup: Markup.Interactive) : MessageListEvent
     data class ReplyToMessage(val message: ChatItem.Message) : MessageListEvent
     data class ViewOriginalMessage(val messageId: ID, val originalMessageId: ID) : MessageListEvent
-    data object UnreadStateHandled: MessageListEvent
-    data class TipMessage(val message: ChatItem.Message): MessageListEvent
-    data class ShowTipsForMessage(val tips: List<MessageTip>): MessageListEvent
+    data object UnreadStateHandled : MessageListEvent
+    data class TipMessage(val message: ChatItem.Message) : MessageListEvent
+    data class ShowTipsForMessage(val tips: List<MessageTip>) : MessageListEvent
 }
 
 data class MessageListPointer(
@@ -90,7 +94,8 @@ fun MessageList(
         state = listState,
         reverseLayout = true,
         contentPadding = PaddingValues(
-            vertical = CodeTheme.dimens.inset,
+            top = CodeTheme.dimens.inset,
+            bottom = CodeTheme.dimens.grid.x2,
         ),
         verticalArrangement = Arrangement.Top,
     ) {
@@ -128,16 +133,18 @@ fun MessageList(
                     }
                     val spacingAfter = when {
                         index > messages.itemCount -> 0.dp
-                        item.message is MessageContent.Announcement -> CodeTheme.dimens.inset
+                        item.message is MessageContent.Announcement -> CodeTheme.dimens.grid.x2
                         isNextGrouped -> 3.dp
-                        else -> CodeTheme.dimens.grid.x3
+                        else -> CodeTheme.dimens.grid.x2
                     }
 
                     val showTimestamp =
                         remember(isPreviousGrouped, isNextGrouped, item.date, next?.date) {
                             !isPreviousGrouped
                                     || !isNextGrouped
-                                    || next?.date?.epochSeconds?.div(60) != item.date.epochSeconds.div(60)
+                                    || next?.date?.epochSeconds?.div(60) != item.date.epochSeconds.div(
+                                60
+                            )
                         }
 
                     val updatedSender by rememberUpdatedState(item.sender)
@@ -275,12 +282,18 @@ private fun HandleMessageReads(
             }.distinctUntilChanged(),
             snapshotFlow { listState.isScrollInProgress },
             snapshotFlow { listState.firstVisibleItemIndex },
-        ) { loadState, isScrolling, firstVisibleIndex ->
-            Triple(loadState, isScrolling, firstVisibleIndex)
-        }.filter { (loadStateIsNotLoading, isScrolling, _) ->
-            // Wait until scrolling stops, messages are not loading, and we are at the bottom
-            loadStateIsNotLoading && !isScrolling && messages.itemCount > 0 && hasSetAtUnread
-        }.collect { (_, _, firstVisibleIndex) ->
+            snapshotFlow { messages.itemCount },
+        ) { loadState, isScrolling, firstVisibleIndex, itemCount ->
+            Triple(loadState, isScrolling, firstVisibleIndex) to itemCount
+        }.filter { (state, itemCount) ->
+            val (loadStateIsNotLoading, isScrolling, firstVisibleIndex) = state
+            // Ensure we react to new messages while at the bottom
+            loadStateIsNotLoading && !isScrolling && hasSetAtUnread &&
+                    (firstVisibleIndex == 0 || firstVisibleIndex == itemCount - 1) && itemCount > 0
+        }.onEach { (state, _) ->
+
+            val (_, _, firstVisibleIndex) = state
+
             val closestChatMessage =
                 messages[firstVisibleIndex]?.let { it as? ChatItem.Message }
 
@@ -298,7 +311,7 @@ private fun HandleMessageReads(
                     }
                 }
             }
-        }
+        }.launchIn(this)
     }
 }
 
diff --git a/ui/components/src/main/kotlin/com/getcode/ui/components/chat/utils/HandleMessageChanges.kt b/ui/components/src/main/kotlin/com/getcode/ui/components/chat/utils/HandleMessageChanges.kt
index 8c4fa919b..1108ffbdf 100644
--- a/ui/components/src/main/kotlin/com/getcode/ui/components/chat/utils/HandleMessageChanges.kt
+++ b/ui/components/src/main/kotlin/com/getcode/ui/components/chat/utils/HandleMessageChanges.kt
@@ -38,7 +38,7 @@ fun HandleMessageChanges(
             .filter { it.refresh is LoadState.NotLoading }
             .mapNotNull { items.itemSnapshotList.firstOrNull() }
             .filterIsInstance<ChatItem.Message>()
-            .distinctUntilChangedBy { it.date }
+            .distinctUntilChangedBy { it.chatMessageId }
             .collect { newMessage ->
                 if (newMessage.status.isOutgoing()) {
                     if (newMessage.date.toEpochMilliseconds() > lastMessageSent) {
diff --git a/ui/navigation/src/main/kotlin/com/getcode/navigation/screens/ContextSheet.kt b/ui/navigation/src/main/kotlin/com/getcode/navigation/screens/ContextSheet.kt
index 2eed89eb1..5b636894e 100644
--- a/ui/navigation/src/main/kotlin/com/getcode/navigation/screens/ContextSheet.kt
+++ b/ui/navigation/src/main/kotlin/com/getcode/navigation/screens/ContextSheet.kt
@@ -44,7 +44,7 @@ sealed interface ContextMenuStyle {
 
 class ContextSheet(
     private val actions: List<ContextMenuAction>,
-    private val style: ContextMenuStyle = ContextMenuStyle.Default
+    private val style: ContextMenuStyle = ContextMenuStyle.Themed
 ) : Screen {
 
     @Composable