chore: remove Chat Bubbles feature flag and related code [WPB-22018] (#4448)

MohamadJaara · MohamadJaara · commit 7ece2ecb18d0 · 2025-11-27T11:45:10.000+01:00
(cherry picked from commit 670d1c5)
diff --git a/app/src/main/kotlin/com/wire/android/datastore/GlobalDataStore.kt b/app/src/main/kotlin/com/wire/android/datastore/GlobalDataStore.kt
@@ -55,7 +55,6 @@ class GlobalDataStore @Inject constructor(@ApplicationContext private val contex
         private val APP_LOCK_PASSCODE = stringPreferencesKey("app_lock_passcode")
         private val APP_LOCK_SOURCE = intPreferencesKey("app_lock_source")
         private val ENTER_TO_SENT = booleanPreferencesKey("enter_to_sent")
-        private val IS_BUBBLE_UI = booleanPreferencesKey("is_bubble_ui")
         private val ANONYMOUS_REGISTRATION_TRACK_ID = stringPreferencesKey("anonymous_registration_track_id")
         private val IS_ANONYMOUS_REGISTRATION_ENABLED = booleanPreferencesKey("is_anonymous_registration_enabled")
 
@@ -213,10 +212,4 @@ class GlobalDataStore @Inject constructor(@ApplicationContext private val contex
     suspend fun setEnterToSend(enabled: Boolean) {
         context.dataStore.edit { it[ENTER_TO_SENT] = enabled }
     }
-
-    fun observeIsBubbleUI() = getBooleanPreference(IS_BUBBLE_UI, false)
-
-    suspend fun setBubbleUiEnabled(enabled: Boolean) {
-        context.dataStore.edit { it[IS_BUBBLE_UI] = enabled }
-    }
 }
diff --git a/app/src/main/kotlin/com/wire/android/di/accountScoped/UserModule.kt b/app/src/main/kotlin/com/wire/android/di/accountScoped/UserModule.kt
@@ -25,7 +25,6 @@ import com.wire.kalium.logic.feature.asset.DeleteAssetUseCase
 import com.wire.kalium.logic.feature.asset.GetAssetSizeLimitUseCase
 import com.wire.kalium.logic.feature.asset.GetAvatarAssetUseCase
 import com.wire.kalium.logic.feature.client.FinalizeMLSClientAfterE2EIEnrollment
-import com.wire.kalium.logic.feature.client.IsChatBubblesEnabledUseCase
 import com.wire.kalium.logic.feature.client.IsProfileQRCodeEnabledUseCase
 import com.wire.kalium.logic.feature.client.IsWireCellsEnabledForConversationUseCase
 import com.wire.kalium.logic.feature.client.IsWireCellsEnabledUseCase
@@ -260,10 +259,6 @@ class UserModule {
     @Provides
     fun provideCellsConfigUseCase(userScope: UserScope): IsWireCellsEnabledUseCase = userScope.isWireCellsEnabled
 
-    @ViewModelScoped
-    @Provides
-    fun provideChatBubblesConfigUseCase(userScope: UserScope): IsChatBubblesEnabledUseCase = userScope.isChatBubblesEnabled
-
     @ViewModelScoped
     @Provides
     fun provideIsWireCellsEnabledForConversationUseCase(userScope: UserScope): IsWireCellsEnabledForConversationUseCase =
diff --git a/app/src/main/kotlin/com/wire/android/ui/debug/featureflags/DebugFeatureFlagsViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/debug/featureflags/DebugFeatureFlagsViewModel.kt
@@ -69,7 +69,6 @@ class DebugFeatureFlagsViewModel @Inject constructor(
                             addFeature("Allowed Global Operations", allowedGlobalOperationsModel?.status, allowedGlobalOperationsModel)
                             addFeature("Wire Cells", cellsModel?.status)
                             addFeature("User Profile QR code", enableUserProfileQRCodeConfigModel?.status)
-                            addFeature("Message bubbles", chatBubblesModel?.status)
                             add(
                                 Feature(
                                     name = "Channels",
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt
@@ -87,6 +87,7 @@ import com.ramcosta.composedestinations.result.NavResult.Value
 import com.ramcosta.composedestinations.result.OpenResultRecipient
 import com.ramcosta.composedestinations.result.ResultBackNavigator
 import com.ramcosta.composedestinations.result.ResultRecipient
+import com.wire.android.BuildConfig.IS_BUBBLE_UI_ENABLED
 import com.wire.android.R
 import com.wire.android.appLogger
 import com.wire.android.feature.analytics.AnonymousAnalyticsManagerImpl
@@ -925,7 +926,7 @@ private fun ConversationScreen(
     Box(modifier = Modifier) {
         // only here we will use normal Scaffold because of specific behaviour of message composer
         Scaffold(
-            contentColor = if (conversationInfoViewState.isBubbleUiEnabled) {
+            contentColor = if (IS_BUBBLE_UI_ENABLED) {
                 colorsScheme().primary
             } else {
                 colorsScheme().background
@@ -1019,7 +1020,7 @@ private fun ConversationScreen(
                         onAttachmentClick = onAttachmentClick,
                         onAttachmentMenuClick = onAttachmentMenuClick,
                         showHistoryLoadingIndicator = conversationInfoViewState.showHistoryLoadingIndicator,
-                        isBubbleUiEnabled = conversationInfoViewState.isBubbleUiEnabled,
+                        isBubbleUiEnabled = IS_BUBBLE_UI_ENABLED,
                         isWireCellsEnabled = isWireCellsEnabled,
                     )
                 }
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/info/ConversationInfoViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/info/ConversationInfoViewModel.kt
@@ -26,7 +26,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.wire.android.R
 import com.wire.android.appLogger
-import com.wire.android.datastore.GlobalDataStore
 import com.wire.android.di.CurrentAccount
 import com.wire.android.model.ImageAsset
 import com.wire.android.ui.home.conversations.ConversationNavArgs
@@ -39,12 +38,10 @@ import com.wire.kalium.logic.data.id.QualifiedID
 import com.wire.kalium.logic.data.id.QualifiedIdMapper
 import com.wire.kalium.logic.data.user.ConnectionState
 import com.wire.kalium.logic.data.user.UserId
-import com.wire.kalium.logic.feature.client.IsChatBubblesEnabledUseCase
 import com.wire.kalium.logic.feature.client.IsWireCellsEnabledUseCase
 import com.wire.kalium.logic.feature.conversation.ObserveConversationDetailsUseCase
 import com.wire.kalium.logic.feature.e2ei.usecase.FetchConversationMLSVerificationStatusUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -54,10 +51,8 @@ class ConversationInfoViewModel @Inject constructor(
     private val qualifiedIdMapper: QualifiedIdMapper,
     val savedStateHandle: SavedStateHandle,
     private val observeConversationDetails: ObserveConversationDetailsUseCase,
-    private val globalDataStore: GlobalDataStore,
     private val fetchConversationMLSVerificationStatus: FetchConversationMLSVerificationStatusUseCase,
     private val isWireCellFeatureEnabled: IsWireCellsEnabledUseCase,
-    private val isChatBubblesEnabledUseCase: IsChatBubblesEnabledUseCase,
     @CurrentAccount private val selfUserId: UserId,
 ) : ViewModel() {
 
@@ -127,13 +122,9 @@ class ConversationInfoViewModel @Inject constructor(
             legalHoldStatus = conversationDetails.conversation.legalHoldStatus,
             accentId = getAccentId(conversationDetails),
             isWireCellEnabled = isWireCellFeatureEnabled() && (conversationDetails as? ConversationDetails.Group)?.wireCell != null,
-            isBubbleUiEnabled = isBubbleUiEnabled()
         )
     }
 
-    private suspend fun isBubbleUiEnabled() = (globalDataStore.observeIsBubbleUI().firstOrNull() ?: false)
-            || isChatBubblesEnabledUseCase()
-
     private fun getAccentId(conversationDetails: ConversationDetails): Int {
         return if (conversationDetails is ConversationDetails.OneOne) {
             conversationDetails.otherUser.accentId
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/info/ConversationInfoViewState.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/info/ConversationInfoViewState.kt
@@ -40,7 +40,6 @@ data class ConversationInfoViewState(
     val accentId: Int = -1,
     val isWireCellEnabled: Boolean = false,
     val notFound: Boolean = false,
-    val isBubbleUiEnabled: Boolean = false
 ) {
     val showHistoryLoadingIndicator: Boolean get() = conversationType == Conversation.Type.Group.Channel
 }
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/account/color/ChangeUserColorScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/account/color/ChangeUserColorScreen.kt
@@ -38,6 +38,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.ramcosta.composedestinations.result.ResultBackNavigator
 import com.ramcosta.composedestinations.spec.DestinationStyle
+import com.wire.android.BuildConfig.IS_BUBBLE_UI_ENABLED
 import com.wire.android.R
 import com.wire.android.navigation.Navigator
 import com.wire.android.navigation.annotation.app.WireDestination
@@ -182,7 +183,7 @@ fun ChangeUserColorContent(
                     }
 
                     VerticalSpace.x24()
-                    if (state.isMessageBubbleEnabled) {
+                    if (IS_BUBBLE_UI_ENABLED) {
                         SectionHeader(stringResource(R.string.settings_myaccount_user_color_example))
                         VerticalSpace.x4()
 
@@ -268,5 +269,5 @@ fun PreviewChangeUserColor() = WireTheme {
 @PreviewMultipleThemes
 @Composable
 fun PreviewChangeUserColorWithExample() = WireTheme {
-    ChangeUserColorContent(AccentActionState(Accent.Green, isMessageBubbleEnabled = true), {}, {}, {})
+    ChangeUserColorContent(AccentActionState(Accent.Green), {}, {}, {})
 }
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/account/color/ChangeUserColorViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/account/color/ChangeUserColorViewModel.kt
@@ -22,24 +22,19 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.viewModelScope
-import com.wire.android.datastore.GlobalDataStore
 import com.wire.android.ui.common.ActionsViewModel
 import com.wire.android.ui.theme.Accent
-import com.wire.kalium.logic.feature.client.IsChatBubblesEnabledUseCase
 import com.wire.kalium.logic.feature.user.GetSelfUserUseCase
 import com.wire.kalium.logic.feature.user.UpdateAccentColorResult
 import com.wire.kalium.logic.feature.user.UpdateAccentColorUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
 class ChangeUserColorViewModel @Inject constructor(
     private val getSelf: GetSelfUserUseCase,
     private val updateAccentColor: UpdateAccentColorUseCase,
-    private val isChatBubblesEnabled: IsChatBubblesEnabledUseCase,
-    private val globalDataStore: GlobalDataStore
 ) : ActionsViewModel<ChangeUserColorAction>() {
 
     var accentState: AccentActionState by mutableStateOf(AccentActionState(null))
@@ -49,18 +44,14 @@ class ChangeUserColorViewModel @Inject constructor(
         viewModelScope.launch {
             getSelf()?.accentId.let { accentId ->
                 accentState = AccentActionState(
-                    accent = Accent.fromAccentId(accentId),
-                    isMessageBubbleEnabled = isBubbleUiEnabled()
+                    accent = Accent.fromAccentId(accentId)
                 )
             }
         }
     }
 
-    private suspend fun isBubbleUiEnabled() = (globalDataStore.observeIsBubbleUI().firstOrNull() ?: false)
-            || isChatBubblesEnabled()
-
     fun changeAccentColor(accent: Accent) {
-        accentState = accentState.copy(accent)
+        accentState = accentState.copy(accent = accent)
     }
 
     fun saveAccentColor() {
@@ -85,7 +76,6 @@ class ChangeUserColorViewModel @Inject constructor(
 data class AccentActionState(
     val accent: Accent?,
     val isPerformingAction: Boolean = false,
-    val isMessageBubbleEnabled: Boolean = false
 )
 
 enum class ChangeUserColorAction {
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/appearance/CustomizationScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/appearance/CustomizationScreen.kt
@@ -41,7 +41,6 @@ import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.wire.android.BuildConfig
 import com.wire.android.R
 import com.wire.android.navigation.Navigator
 import com.wire.android.navigation.annotation.app.WireDestination
@@ -73,7 +72,6 @@ fun CustomizationScreen(
         onThemeOptionChanged = viewModel::selectThemeOption,
         onBackPressed = navigator::navigateBack,
         onEnterToSendClicked = viewModel::selectPressEnterToSendOption,
-        onMessageBubbleClicked = viewModel::selectBubbleUI
     )
 }
 
@@ -83,7 +81,6 @@ fun CustomizationScreenContent(
     onThemeOptionChanged: (ThemeOption) -> Unit,
     onBackPressed: () -> Unit,
     onEnterToSendClicked: (Boolean) -> Unit,
-    onMessageBubbleClicked: (Boolean) -> Unit,
     modifier: Modifier = Modifier,
     lazyListState: LazyListState = rememberLazyListState()
 ) {
@@ -116,9 +113,7 @@ fun CustomizationScreenContent(
             item {
                 CustomizationOptionsContent(
                     enterToSendState = state.pressEnterToSentState,
-                    isBubbleUiEnabled = state.isBubbleUiEnabled,
                     enterToSendClicked = onEnterToSendClicked,
-                    onMessageBubbleClicked = onMessageBubbleClicked
                 )
             }
         }
@@ -128,9 +123,7 @@ fun CustomizationScreenContent(
 @Composable
 fun CustomizationOptionsContent(
     enterToSendState: Boolean,
-    isBubbleUiEnabled: Boolean,
     enterToSendClicked: (Boolean) -> Unit,
-    onMessageBubbleClicked: (Boolean) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Column(
@@ -144,13 +137,6 @@ fun CustomizationOptionsContent(
             arrowType = ArrowType.NONE,
             subtitle = stringResource(id = R.string.press_enter_to_send_text)
         )
-        if (BuildConfig.PRIVATE_BUILD) {
-            GroupConversationOptionsItem(
-                title = "Message bubbles",
-                switchState = SwitchState.Enabled(value = isBubbleUiEnabled, onCheckedChange = onMessageBubbleClicked),
-                arrowType = ArrowType.NONE,
-            )
-        }
     }
 }
 
@@ -217,6 +203,5 @@ fun PreviewSettingsScreen() {
         {},
         {},
         {},
-        {}
     )
 }
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/appearance/CustomizationState.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/appearance/CustomizationState.kt
@@ -22,5 +22,4 @@ import com.wire.android.ui.theme.ThemeOption
 data class CustomizationState(
     val selectedThemeOption: ThemeOption = ThemeOption.SYSTEM,
     val pressEnterToSentState: Boolean = false,
-    val isBubbleUiEnabled: Boolean = false
 )
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/appearance/CustomizationViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/appearance/CustomizationViewModel.kt
@@ -39,7 +39,6 @@ class CustomizationViewModel @Inject constructor(
     init {
         observeThemeState()
         observePressEnterToSendState()
-        observeIsBubbleUiEnabled()
     }
 
     private fun observePressEnterToSendState() {
@@ -54,12 +53,6 @@ class CustomizationViewModel @Inject constructor(
         }
     }
 
-    private fun observeIsBubbleUiEnabled() {
-        viewModelScope.launch {
-            globalDataStore.observeIsBubbleUI().collect { option -> state = state.copy(isBubbleUiEnabled = option) }
-        }
-    }
-
     fun selectPressEnterToSendOption(option: Boolean) {
         viewModelScope.launch {
             globalDataStore.setEnterToSend(option)
@@ -71,10 +64,4 @@ class CustomizationViewModel @Inject constructor(
             globalDataStore.setThemeOption(option)
         }
     }
-
-    fun selectBubbleUI(option: Boolean) {
-        viewModelScope.launch {
-            globalDataStore.setBubbleUiEnabled(option)
-        }
-    }
 }
diff --git a/app/src/test/kotlin/com/wire/android/ui/home/conversations/info/ConversationInfoViewModelArrangement.kt b/app/src/test/kotlin/com/wire/android/ui/home/conversations/info/ConversationInfoViewModelArrangement.kt
@@ -20,7 +20,6 @@ package com.wire.android.ui.home.conversations.info
 
 import androidx.lifecycle.SavedStateHandle
 import com.wire.android.config.mockUri
-import com.wire.android.datastore.GlobalDataStore
 import com.wire.android.framework.TestUser
 import com.wire.android.ui.home.conversations.ConversationNavArgs
 import com.wire.android.ui.navArgs
@@ -30,7 +29,6 @@ import com.wire.kalium.logic.data.id.ConversationId
 import com.wire.kalium.logic.data.id.QualifiedID
 import com.wire.kalium.logic.data.id.QualifiedIdMapper
 import com.wire.kalium.logic.data.user.UserId
-import com.wire.kalium.logic.feature.client.IsChatBubblesEnabledUseCase
 import com.wire.kalium.logic.feature.client.IsWireCellsEnabledUseCase
 import com.wire.kalium.logic.feature.conversation.ObserveConversationDetailsUseCase
 import com.wire.kalium.logic.feature.e2ei.usecase.FetchConversationMLSVerificationStatusUseCase
@@ -64,12 +62,6 @@ class ConversationInfoViewModelArrangement {
     @MockK
     lateinit var isCellsEnabled: IsWireCellsEnabledUseCase
 
-    @MockK
-    lateinit var globalDataStore: GlobalDataStore
-
-    @MockK
-    lateinit var isChatBubblesEnabled: IsChatBubblesEnabledUseCase
-
     private val viewModel: ConversationInfoViewModel by lazy {
         ConversationInfoViewModel(
             qualifiedIdMapper = qualifiedIdMapper,
@@ -78,8 +70,6 @@ class ConversationInfoViewModelArrangement {
             fetchConversationMLSVerificationStatus = fetchConversationMLSVerificationStatus,
             selfUserId = TestUser.SELF_USER_ID,
             isWireCellFeatureEnabled = isCellsEnabled,
-            globalDataStore = globalDataStore,
-            isChatBubblesEnabledUseCase = isChatBubblesEnabled
         )
     }
 
@@ -96,8 +86,6 @@ class ConversationInfoViewModelArrangement {
         }
         coEvery { fetchConversationMLSVerificationStatus.invoke(any()) } returns Unit
         coEvery { isCellsEnabled() } returns false
-        coEvery { globalDataStore.observeIsBubbleUI() } returns flowOf(false)
-        coEvery { isChatBubblesEnabled() } returns false
     }
 
     suspend fun withConversationDetailUpdate(conversationDetails: ConversationDetails) = apply {
diff --git a/app/src/test/kotlin/com/wire/android/ui/home/settings/account/color/ChangeUserColorViewModelTest.kt b/app/src/test/kotlin/com/wire/android/ui/home/settings/account/color/ChangeUserColorViewModelTest.kt
diff --git a/app/src/test/kotlin/com/wire/android/ui/home/settings/appearance/AppearanceViewModelTest.kt b/app/src/test/kotlin/com/wire/android/ui/home/settings/appearance/AppearanceViewModelTest.kt
diff --git a/buildSrc/src/main/kotlin/customization/FeatureConfigs.kt b/buildSrc/src/main/kotlin/customization/FeatureConfigs.kt
diff --git a/core/ui-common/src/main/kotlin/com/wire/android/ui/theme/Accent.kt b/core/ui-common/src/main/kotlin/com/wire/android/ui/theme/Accent.kt
diff --git a/default.json b/default.json
diff --git a/kalium b/kalium

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ data class ConversationInfoViewState(`
`40`	`40`	`val accentId: Int = -1,`
`41`	`41`	`val isWireCellEnabled: Boolean = false,`
`42`	`42`	`val notFound: Boolean = false,`
`43`		`- val isBubbleUiEnabled: Boolean = false`
`44`	`43`	`) {`
`45`	`44`	`val showHistoryLoadingIndicator: Boolean get() = conversationType == Conversation.Type.Group.Channel`
`46`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,4 @@ import com.wire.android.ui.theme.ThemeOption`
`22`	`22`	`data class CustomizationState(`
`23`	`23`	`val selectedThemeOption: ThemeOption = ThemeOption.SYSTEM,`
`24`	`24`	`val pressEnterToSentState: Boolean = false,`
`25`		`- val isBubbleUiEnabled: Boolean = false`
`26`	`25`	`)`