From c59247b6715d073b164a0f0466d2d1659bb58f50 Mon Sep 17 00:00:00 2001
From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 15 Dec 2023 15:10:09 +0000
Subject: [PATCH] Commit with unresolved merge conflicts outside of kalium

---
 app/src/main/kotlin/com/wire/android/ui/WireActivity.kt | 6 ------
 kalium                                                  | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/src/main/kotlin/com/wire/android/ui/WireActivity.kt b/app/src/main/kotlin/com/wire/android/ui/WireActivity.kt
index 4a688ead225..6373fe7346b 100644
--- a/app/src/main/kotlin/com/wire/android/ui/WireActivity.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/WireActivity.kt
@@ -25,7 +25,6 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.view.WindowManager
-import androidx.activity.compose.ReportDrawnWhen
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
@@ -38,10 +37,8 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
-import androidx.compose.runtime.setValue
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
@@ -176,7 +173,6 @@ class WireActivity : AppCompatActivity() {
     ) {
         setContent {
             val snackbarHostState = remember { SnackbarHostState() }
-            var isLoaded by remember { mutableStateOf(false) }
 
             LaunchedEffect(viewModel.globalAppState.themeOption) {
                 when (viewModel.globalAppState.themeOption) {
@@ -195,7 +191,6 @@ class WireActivity : AppCompatActivity() {
             ) {
                 WireTheme {
                     Column(modifier = Modifier.statusBarsPadding()) {
-                        ReportDrawnWhen { isLoaded }
                         val navigator = rememberNavigator(this@WireActivity::finish)
                         CommonTopAppBar(
                             commonTopAppBarState = commonTopAppBarViewModel.state,
@@ -212,7 +207,6 @@ class WireActivity : AppCompatActivity() {
                         // This setup needs to be done after the navigation graph is created, because building the graph takes some time,
                         // and if any NavigationCommand is executed before the graph is fully built, it will cause a NullPointerException.
                         setUpNavigation(navigator.navController, onComplete)
-                        isLoaded = true
                         handleScreenshotCensoring()
                         handleDialogs(
                             navigator::navigate,
diff --git a/kalium b/kalium
index 6d90c8520d7..fecddaa4040 160000
--- a/kalium
+++ b/kalium
@@ -1 +1 @@
-Subproject commit 6d90c8520d797df2e2009c069253639f15c72b5c
+Subproject commit fecddaa4040ea90d7fd1304398f41b14055ab817