From 479034c456994d1ddad2006e31004db6bf83529a Mon Sep 17 00:00:00 2001
From: Vitor Hugo Schwaab <vitor@schwaab.dev>
Date: Wed, 5 Jun 2024 14:50:35 +0200
Subject: [PATCH 1/2] chore: upgrade APG to 8.3.2

---
 app/lint-baseline.xml                         | 1113 +++--------------
 .../details/GroupConversationDetailsScreen.kt |    3 +-
 .../options/GroupConversationOptions.kt       |    2 +-
 .../EndToEndIdentityCertificateItem.kt        |    4 +
 .../devices/model/DeviceDetailsState.kt       |    2 +
 .../android/gradle/ComposeConfiguration.kt    |    2 +-
 .../gradle/KotlinAndroidConfiguration.kt      |    7 +-
 core/ui-common/lint-baseline.xml              |   35 +-
 gradle/libs.versions.toml                     |    4 +-
 gradle/wrapper/gradle-wrapper.properties      |    2 +-
 kalium                                        |    2 +-
 11 files changed, 206 insertions(+), 970 deletions(-)

diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index a0bb5184a8a..9d75a396c33 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0)" variant="all" version="8.2.0">
+<issues format="6" by="lint 8.3.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0)" variant="all" version="8.3.0">
 
     <issue
         id="MissingPermission"
@@ -111,28 +111,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="ComposeViewModelForwarding"
-        message="Forwarding a ViewModel through multiple @Composable functions should be avoided. Consider using state hoisting.See https://slackhq.github.io/compose-lints/rules/#hoist-all-the-things for more information."
-        errorLine1="    ConversationScreen("
-        errorLine2="    ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt"
-            line="354"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ComposeViewModelForwarding"
-        message="Forwarding a ViewModel through multiple @Composable functions should be avoided. Consider using state hoisting.See https://slackhq.github.io/compose-lints/rules/#hoist-all-the-things for more information."
-        errorLine1="    GroupConversationDetailsContent("
-        errorLine2="    ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsScreen.kt"
-            line="160"
-            column="5"/>
-    </issue>
-
     <issue
         id="ComposeViewModelForwarding"
         message="Forwarding a ViewModel through multiple @Composable functions should be avoided. Consider using state hoisting.See https://slackhq.github.io/compose-lints/rules/#hoist-all-the-things for more information."
@@ -140,18 +118,7 @@
         errorLine2="    ^">
         <location
             file="src/main/kotlin/com/wire/android/ui/authentication/login/LoginScreen.kt"
-            line="102"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ComposeViewModelForwarding"
-        message="Forwarding a ViewModel through multiple @Composable functions should be avoided. Consider using state hoisting.See https://slackhq.github.io/compose-lints/rules/#hoist-all-the-things for more information."
-        errorLine1="    LoginContent("
-        errorLine2="    ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/authentication/login/LoginScreen.kt"
-            line="102"
+            line="99"
             column="5"/>
     </issue>
 
@@ -177,105 +144,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="ComposeViewModelInjection"
-        message="Implicit dependencies of composables should be made explicit.&#xA;Usages of hiltViewModel to acquire a ViewModel should be done in composable default parameters, so that it is more testable and flexible.&#xA;See https://slackhq.github.io/compose-lints/rules/#viewmodels for more information."
-        errorLine1="    val viewModel: ConversationListViewModel = hiltViewModel()"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/conversationslist/ConversationRouter.kt"
-            line="88"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ComposeViewModelInjection"
-        message="Implicit dependencies of composables should be made explicit.&#xA;Usages of hiltViewModel to acquire a ViewModel should be done in composable default parameters, so that it is more testable and flexible.&#xA;See https://slackhq.github.io/compose-lints/rules/#viewmodels for more information."
-        errorLine1="            val importMediaViewModel: ImportMediaAuthenticatedViewModel = hiltViewModel()"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/sharing/ImportMediaScreen.kt"
-            line="109"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ComposeViewModelInjection"
-        message="Implicit dependencies of composables should be made explicit.&#xA;Usages of hiltViewModel to acquire a ViewModel should be done in composable default parameters, so that it is more testable and flexible.&#xA;See https://slackhq.github.io/compose-lints/rules/#viewmodels for more information."
-        errorLine1="            val importMediaViewModel: ImportMediaAuthenticatedViewModel = hiltViewModel()"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/sharing/ImportMediaScreen.kt"
-            line="118"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ComposeViewModelInjection"
-        message="Implicit dependencies of composables should be made explicit.&#xA;Usages of hiltViewModel to acquire a ViewModel should be done in composable default parameters, so that it is more testable and flexible.&#xA;See https://slackhq.github.io/compose-lints/rules/#viewmodels for more information."
-        errorLine1="    val loginSSOViewModel: LoginSSOViewModel = hiltViewModel()"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/authentication/login/sso/LoginSSOScreen.kt"
-            line="71"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ComposeViewModelInjection"
-        message="Implicit dependencies of composables should be made explicit.&#xA;Usages of hiltViewModel to acquire a ViewModel should be done in composable default parameters, so that it is more testable and flexible.&#xA;See https://slackhq.github.io/compose-lints/rules/#viewmodels for more information."
-        errorLine1="    val loginEmailViewModel: LoginEmailViewModel = hiltViewModel()"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/authentication/login/email/ProxyScreen.kt"
-            line="54"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ComposeViewModelInjection"
-        message="Implicit dependencies of composables should be made explicit.&#xA;Usages of hiltViewModel to acquire a ViewModel should be done in composable default parameters, so that it is more testable and flexible.&#xA;See https://slackhq.github.io/compose-lints/rules/#viewmodels for more information."
-        errorLine1="    val viewModel: RegisterDeviceViewModel = hiltViewModel()"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/authentication/devices/register/RegisterDeviceScreen.kt"
-            line="75"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ComposeViewModelInjection"
-        message="Implicit dependencies of composables should be made explicit.&#xA;Usages of hiltViewModel to acquire a ViewModel should be done in composable default parameters, so that it is more testable and flexible.&#xA;See https://slackhq.github.io/compose-lints/rules/#viewmodels for more information."
-        errorLine1="    val clearSessionViewModel: ClearSessionViewModel = hiltViewModel()"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/authentication/devices/register/RegisterDeviceScreen.kt"
-            line="76"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ComposeViewModelInjection"
-        message="Implicit dependencies of composables should be made explicit.&#xA;Usages of hiltViewModel to acquire a ViewModel should be done in composable default parameters, so that it is more testable and flexible.&#xA;See https://slackhq.github.io/compose-lints/rules/#viewmodels for more information."
-        errorLine1="    val viewModel: RemoveDeviceViewModel = hiltViewModel()"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/authentication/devices/remove/RemoveDeviceScreen.kt"
-            line="72"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ComposeViewModelInjection"
-        message="Implicit dependencies of composables should be made explicit.&#xA;Usages of hiltViewModel to acquire a ViewModel should be done in composable default parameters, so that it is more testable and flexible.&#xA;See https://slackhq.github.io/compose-lints/rules/#viewmodels for more information."
-        errorLine1="    val clearSessionViewModel: ClearSessionViewModel = hiltViewModel()"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/authentication/devices/remove/RemoveDeviceScreen.kt"
-            line="73"
-            column="5"/>
-    </issue>
-
     <issue
         id="RestrictedApi"
         message="ListenableFutureKt.await can only be called from within the same library group (referenced groupId=`androidx.work` from groupId=`AndroidReloaded`)"
@@ -1856,7 +1724,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-si/strings.xml"
-            line="1205"
+            line="1207"
             column="9"/>
     </issue>
 
@@ -1867,7 +1735,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="1207"
+            line="1209"
             column="9"/>
     </issue>
 
@@ -1878,7 +1746,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-si/strings.xml"
-            line="1209"
+            line="1211"
             column="9"/>
     </issue>
 
@@ -1889,7 +1757,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="1211"
+            line="1213"
             column="9"/>
     </issue>
 
@@ -1900,7 +1768,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-si/strings.xml"
-            line="1213"
+            line="1215"
             column="9"/>
     </issue>
 
@@ -1911,7 +1779,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="1215"
+            line="1217"
             column="9"/>
     </issue>
 
@@ -1922,7 +1790,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-si/strings.xml"
-            line="1217"
+            line="1219"
             column="9"/>
     </issue>
 
@@ -1933,7 +1801,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-bn/strings.xml"
-            line="1219"
+            line="1221"
             column="9"/>
     </issue>
 
@@ -1944,7 +1812,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fa/strings.xml"
-            line="1219"
+            line="1221"
             column="9"/>
     </issue>
 
@@ -1955,7 +1823,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="1219"
+            line="1221"
             column="9"/>
     </issue>
 
@@ -1966,7 +1834,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hi/strings.xml"
-            line="1219"
+            line="1221"
             column="9"/>
     </issue>
 
@@ -1977,7 +1845,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pa/strings.xml"
-            line="1219"
+            line="1221"
             column="9"/>
     </issue>
 
@@ -1988,7 +1856,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pt/strings.xml"
-            line="1219"
+            line="1221"
             column="9"/>
     </issue>
 
@@ -1999,7 +1867,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-mk/strings.xml"
-            line="1219"
+            line="1221"
             column="9"/>
     </issue>
 
@@ -2010,7 +1878,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-si/strings.xml"
-            line="1221"
+            line="1223"
             column="9"/>
     </issue>
 
@@ -2021,7 +1889,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-bn/strings.xml"
-            line="1223"
+            line="1225"
             column="9"/>
     </issue>
 
@@ -2032,7 +1900,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fa/strings.xml"
-            line="1223"
+            line="1225"
             column="9"/>
     </issue>
 
@@ -2043,7 +1911,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="1223"
+            line="1225"
             column="9"/>
     </issue>
 
@@ -2054,7 +1922,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hi/strings.xml"
-            line="1223"
+            line="1225"
             column="9"/>
     </issue>
 
@@ -2065,7 +1933,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pa/strings.xml"
-            line="1223"
+            line="1225"
             column="9"/>
     </issue>
 
@@ -2076,7 +1944,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pt/strings.xml"
-            line="1223"
+            line="1225"
             column="9"/>
     </issue>
 
@@ -2087,7 +1955,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-mk/strings.xml"
-            line="1223"
+            line="1225"
             column="9"/>
     </issue>
 
@@ -2098,7 +1966,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-si/strings.xml"
-            line="1225"
+            line="1227"
             column="9"/>
     </issue>
 
@@ -2109,7 +1977,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-bn/strings.xml"
-            line="1227"
+            line="1229"
             column="9"/>
     </issue>
 
@@ -2120,7 +1988,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fa/strings.xml"
-            line="1227"
+            line="1229"
             column="9"/>
     </issue>
 
@@ -2131,7 +1999,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="1227"
+            line="1229"
             column="9"/>
     </issue>
 
@@ -2142,7 +2010,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hi/strings.xml"
-            line="1227"
+            line="1229"
             column="9"/>
     </issue>
 
@@ -2153,7 +2021,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pa/strings.xml"
-            line="1227"
+            line="1229"
             column="9"/>
     </issue>
 
@@ -2164,7 +2032,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pt/strings.xml"
-            line="1227"
+            line="1229"
             column="9"/>
     </issue>
 
@@ -2175,7 +2043,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-mk/strings.xml"
-            line="1227"
+            line="1229"
             column="9"/>
     </issue>
 
@@ -2186,7 +2054,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-si/strings.xml"
-            line="1229"
+            line="1231"
             column="9"/>
     </issue>
 
@@ -2197,7 +2065,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-bn/strings.xml"
-            line="1231"
+            line="1233"
             column="9"/>
     </issue>
 
@@ -2208,7 +2076,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fa/strings.xml"
-            line="1231"
+            line="1233"
             column="9"/>
     </issue>
 
@@ -2219,7 +2087,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="1231"
+            line="1233"
             column="9"/>
     </issue>
 
@@ -2230,7 +2098,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hi/strings.xml"
-            line="1231"
+            line="1233"
             column="9"/>
     </issue>
 
@@ -2241,7 +2109,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pa/strings.xml"
-            line="1231"
+            line="1233"
             column="9"/>
     </issue>
 
@@ -2252,7 +2120,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pt/strings.xml"
-            line="1231"
+            line="1233"
             column="9"/>
     </issue>
 
@@ -2263,7 +2131,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-mk/strings.xml"
-            line="1231"
+            line="1233"
             column="9"/>
     </issue>
 
@@ -2274,7 +2142,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-si/strings.xml"
-            line="1233"
+            line="1235"
             column="9"/>
     </issue>
 
@@ -2285,7 +2153,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hr/strings.xml"
-            line="1233"
+            line="1235"
             column="9"/>
     </issue>
 
@@ -2296,7 +2164,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-bn/strings.xml"
-            line="1235"
+            line="1237"
             column="9"/>
     </issue>
 
@@ -2307,7 +2175,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fa/strings.xml"
-            line="1235"
+            line="1237"
             column="9"/>
     </issue>
 
@@ -2318,7 +2186,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="1235"
+            line="1237"
             column="9"/>
     </issue>
 
@@ -2329,7 +2197,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hi/strings.xml"
-            line="1235"
+            line="1237"
             column="9"/>
     </issue>
 
@@ -2340,7 +2208,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pa/strings.xml"
-            line="1235"
+            line="1237"
             column="9"/>
     </issue>
 
@@ -2351,7 +2219,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pt/strings.xml"
-            line="1235"
+            line="1237"
             column="9"/>
     </issue>
 
@@ -2362,7 +2230,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-mk/strings.xml"
-            line="1235"
+            line="1237"
             column="9"/>
     </issue>
 
@@ -2373,7 +2241,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-si/strings.xml"
-            line="1237"
+            line="1239"
             column="9"/>
     </issue>
 
@@ -2384,7 +2252,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hr/strings.xml"
-            line="1238"
+            line="1240"
             column="9"/>
     </issue>
 
@@ -2395,7 +2263,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-bn/strings.xml"
-            line="1239"
+            line="1241"
             column="9"/>
     </issue>
 
@@ -2406,7 +2274,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fa/strings.xml"
-            line="1239"
+            line="1241"
             column="9"/>
     </issue>
 
@@ -2417,7 +2285,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="1239"
+            line="1241"
             column="9"/>
     </issue>
 
@@ -2428,7 +2296,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hi/strings.xml"
-            line="1239"
+            line="1241"
             column="9"/>
     </issue>
 
@@ -2439,7 +2307,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pa/strings.xml"
-            line="1239"
+            line="1241"
             column="9"/>
     </issue>
 
@@ -2450,7 +2318,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pt/strings.xml"
-            line="1239"
+            line="1241"
             column="9"/>
     </issue>
 
@@ -2461,7 +2329,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-mk/strings.xml"
-            line="1239"
+            line="1241"
             column="9"/>
     </issue>
 
@@ -2472,7 +2340,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sr/strings.xml"
-            line="1239"
+            line="1241"
             column="9"/>
     </issue>
 
@@ -2483,7 +2351,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-si/strings.xml"
-            line="1241"
+            line="1243"
             column="9"/>
     </issue>
 
@@ -2494,7 +2362,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-bn/strings.xml"
-            line="1243"
+            line="1245"
             column="9"/>
     </issue>
 
@@ -2505,7 +2373,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fa/strings.xml"
-            line="1243"
+            line="1245"
             column="9"/>
     </issue>
 
@@ -2516,7 +2384,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="1243"
+            line="1245"
             column="9"/>
     </issue>
 
@@ -2527,7 +2395,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hi/strings.xml"
-            line="1243"
+            line="1245"
             column="9"/>
     </issue>
 
@@ -2538,7 +2406,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pa/strings.xml"
-            line="1243"
+            line="1245"
             column="9"/>
     </issue>
 
@@ -2549,7 +2417,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pt/strings.xml"
-            line="1243"
+            line="1245"
             column="9"/>
     </issue>
 
@@ -2560,7 +2428,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hr/strings.xml"
-            line="1243"
+            line="1245"
             column="9"/>
     </issue>
 
@@ -2571,7 +2439,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-mk/strings.xml"
-            line="1243"
+            line="1245"
             column="9"/>
     </issue>
 
@@ -2582,7 +2450,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sr/strings.xml"
-            line="1244"
+            line="1246"
             column="9"/>
     </issue>
 
@@ -2593,7 +2461,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-bn/strings.xml"
-            line="1247"
+            line="1249"
             column="9"/>
     </issue>
 
@@ -2604,7 +2472,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fa/strings.xml"
-            line="1247"
+            line="1249"
             column="9"/>
     </issue>
 
@@ -2615,7 +2483,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hi/strings.xml"
-            line="1247"
+            line="1249"
             column="9"/>
     </issue>
 
@@ -2626,7 +2494,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pa/strings.xml"
-            line="1247"
+            line="1249"
             column="9"/>
     </issue>
 
@@ -2637,7 +2505,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pt/strings.xml"
-            line="1247"
+            line="1249"
             column="9"/>
     </issue>
 
@@ -2648,7 +2516,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-mk/strings.xml"
-            line="1247"
+            line="1249"
             column="9"/>
     </issue>
 
@@ -2659,7 +2527,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hr/strings.xml"
-            line="1248"
+            line="1250"
             column="9"/>
     </issue>
 
@@ -2670,7 +2538,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sr/strings.xml"
-            line="1249"
+            line="1251"
             column="9"/>
     </issue>
 
@@ -2681,7 +2549,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-bn/strings.xml"
-            line="1251"
+            line="1253"
             column="9"/>
     </issue>
 
@@ -2692,7 +2560,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fa/strings.xml"
-            line="1251"
+            line="1253"
             column="9"/>
     </issue>
 
@@ -2703,7 +2571,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hi/strings.xml"
-            line="1251"
+            line="1253"
             column="9"/>
     </issue>
 
@@ -2714,7 +2582,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pa/strings.xml"
-            line="1251"
+            line="1253"
             column="9"/>
     </issue>
 
@@ -2725,7 +2593,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pt/strings.xml"
-            line="1251"
+            line="1253"
             column="9"/>
     </issue>
 
@@ -2736,7 +2604,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-mk/strings.xml"
-            line="1251"
+            line="1253"
             column="9"/>
     </issue>
 
@@ -2747,7 +2615,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hr/strings.xml"
-            line="1253"
+            line="1255"
             column="9"/>
     </issue>
 
@@ -2758,7 +2626,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sr/strings.xml"
-            line="1254"
+            line="1256"
             column="9"/>
     </issue>
 
@@ -2769,7 +2637,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-bn/strings.xml"
-            line="1255"
+            line="1257"
             column="9"/>
     </issue>
 
@@ -2780,7 +2648,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-fa/strings.xml"
-            line="1255"
+            line="1257"
             column="9"/>
     </issue>
 
@@ -2791,7 +2659,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hi/strings.xml"
-            line="1255"
+            line="1257"
             column="9"/>
     </issue>
 
@@ -2802,7 +2670,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pa/strings.xml"
-            line="1255"
+            line="1257"
             column="9"/>
     </issue>
 
@@ -2813,7 +2681,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-pt/strings.xml"
-            line="1255"
+            line="1257"
             column="9"/>
     </issue>
 
@@ -2824,7 +2692,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-mk/strings.xml"
-            line="1255"
+            line="1257"
             column="9"/>
     </issue>
 
@@ -2835,7 +2703,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hr/strings.xml"
-            line="1258"
+            line="1260"
             column="9"/>
     </issue>
 
@@ -2846,7 +2714,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sl/strings.xml"
-            line="1259"
+            line="1261"
             column="9"/>
     </issue>
 
@@ -2857,7 +2725,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-lt/strings.xml"
-            line="1259"
+            line="1261"
             column="9"/>
     </issue>
 
@@ -2868,7 +2736,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="1259"
+            line="1261"
             column="9"/>
     </issue>
 
@@ -2879,7 +2747,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sr/strings.xml"
-            line="1259"
+            line="1261"
             column="9"/>
     </issue>
 
@@ -2890,7 +2758,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-uk/strings.xml"
-            line="1259"
+            line="1261"
             column="9"/>
     </issue>
 
@@ -2901,7 +2769,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hr/strings.xml"
-            line="1263"
+            line="1265"
             column="9"/>
     </issue>
 
@@ -2912,7 +2780,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sr/strings.xml"
-            line="1264"
+            line="1266"
             column="9"/>
     </issue>
 
@@ -2923,7 +2791,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sl/strings.xml"
-            line="1265"
+            line="1267"
             column="9"/>
     </issue>
 
@@ -2934,7 +2802,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-lt/strings.xml"
-            line="1265"
+            line="1267"
             column="9"/>
     </issue>
 
@@ -2945,7 +2813,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="1265"
+            line="1267"
             column="9"/>
     </issue>
 
@@ -2956,7 +2824,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-uk/strings.xml"
-            line="1265"
+            line="1267"
             column="9"/>
     </issue>
 
@@ -2967,7 +2835,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hr/strings.xml"
-            line="1268"
+            line="1270"
             column="9"/>
     </issue>
 
@@ -2978,7 +2846,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sr/strings.xml"
-            line="1269"
+            line="1271"
             column="9"/>
     </issue>
 
@@ -2989,7 +2857,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sl/strings.xml"
-            line="1271"
+            line="1273"
             column="9"/>
     </issue>
 
@@ -3000,7 +2868,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-lt/strings.xml"
-            line="1271"
+            line="1273"
             column="9"/>
     </issue>
 
@@ -3011,7 +2879,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="1271"
+            line="1273"
             column="9"/>
     </issue>
 
@@ -3022,7 +2890,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-uk/strings.xml"
-            line="1271"
+            line="1273"
             column="9"/>
     </issue>
 
@@ -3033,7 +2901,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hr/strings.xml"
-            line="1273"
+            line="1275"
             column="9"/>
     </issue>
 
@@ -3044,7 +2912,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sr/strings.xml"
-            line="1274"
+            line="1276"
             column="9"/>
     </issue>
 
@@ -3055,7 +2923,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sl/strings.xml"
-            line="1277"
+            line="1279"
             column="9"/>
     </issue>
 
@@ -3066,7 +2934,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-lt/strings.xml"
-            line="1277"
+            line="1279"
             column="9"/>
     </issue>
 
@@ -3077,7 +2945,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="1277"
+            line="1279"
             column="9"/>
     </issue>
 
@@ -3088,7 +2956,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-uk/strings.xml"
-            line="1277"
+            line="1279"
             column="9"/>
     </issue>
 
@@ -3099,7 +2967,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-hr/strings.xml"
-            line="1278"
+            line="1280"
             column="9"/>
     </issue>
 
@@ -3110,7 +2978,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sr/strings.xml"
-            line="1279"
+            line="1281"
             column="9"/>
     </issue>
 
@@ -3121,7 +2989,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sl/strings.xml"
-            line="1283"
+            line="1285"
             column="9"/>
     </issue>
 
@@ -3132,7 +3000,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-lt/strings.xml"
-            line="1283"
+            line="1285"
             column="9"/>
     </issue>
 
@@ -3143,7 +3011,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="1283"
+            line="1285"
             column="9"/>
     </issue>
 
@@ -3154,7 +3022,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-uk/strings.xml"
-            line="1283"
+            line="1285"
             column="9"/>
     </issue>
 
@@ -3165,7 +3033,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sr/strings.xml"
-            line="1284"
+            line="1286"
             column="9"/>
     </issue>
 
@@ -3176,7 +3044,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sl/strings.xml"
-            line="1289"
+            line="1291"
             column="9"/>
     </issue>
 
@@ -3187,7 +3055,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-lt/strings.xml"
-            line="1289"
+            line="1291"
             column="9"/>
     </issue>
 
@@ -3198,7 +3066,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="1289"
+            line="1291"
             column="9"/>
     </issue>
 
@@ -3209,7 +3077,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-uk/strings.xml"
-            line="1289"
+            line="1291"
             column="9"/>
     </issue>
 
@@ -3220,7 +3088,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sl/strings.xml"
-            line="1295"
+            line="1297"
             column="9"/>
     </issue>
 
@@ -3231,7 +3099,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-lt/strings.xml"
-            line="1295"
+            line="1297"
             column="9"/>
     </issue>
 
@@ -3242,7 +3110,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="1295"
+            line="1297"
             column="9"/>
     </issue>
 
@@ -3253,7 +3121,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-uk/strings.xml"
-            line="1295"
+            line="1297"
             column="9"/>
     </issue>
 
@@ -3264,7 +3132,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sl/strings.xml"
-            line="1301"
+            line="1303"
             column="9"/>
     </issue>
 
@@ -3275,7 +3143,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-lt/strings.xml"
-            line="1301"
+            line="1303"
             column="9"/>
     </issue>
 
@@ -3286,7 +3154,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="1301"
+            line="1303"
             column="9"/>
     </issue>
 
@@ -3297,7 +3165,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-uk/strings.xml"
-            line="1301"
+            line="1303"
             column="9"/>
     </issue>
 
@@ -3308,7 +3176,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sl/strings.xml"
-            line="1307"
+            line="1309"
             column="9"/>
     </issue>
 
@@ -3319,7 +3187,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-lt/strings.xml"
-            line="1307"
+            line="1309"
             column="9"/>
     </issue>
 
@@ -3330,7 +3198,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="1307"
+            line="1309"
             column="9"/>
     </issue>
 
@@ -3341,7 +3209,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-uk/strings.xml"
-            line="1307"
+            line="1309"
             column="9"/>
     </issue>
 
@@ -3352,7 +3220,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-sl/strings.xml"
-            line="1313"
+            line="1315"
             column="9"/>
     </issue>
 
@@ -3363,7 +3231,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-lt/strings.xml"
-            line="1313"
+            line="1315"
             column="9"/>
     </issue>
 
@@ -3374,7 +3242,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="1313"
+            line="1315"
             column="9"/>
     </issue>
 
@@ -3385,7 +3253,7 @@
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values-uk/strings.xml"
-            line="1313"
+            line="1315"
             column="9"/>
     </issue>
 
@@ -3396,7 +3264,7 @@
         errorLine2="^">
         <location
             file="src/main/kotlin/com/wire/android/ui/authentication/create/email/CreateAccountEmailScreen.kt"
-            line="261"
+            line="259"
             column="1"/>
     </issue>
 
@@ -3417,37 +3285,15 @@
         errorLine1="@Composable"
         errorLine2="^">
         <location
-            file="src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsScreen.kt"
-            line="371"
+            file="src/main/kotlin/com/wire/android/ui/authentication/devices/DeviceItem.kt"
+            line="158"
             column="1"/>
     </issue>
 
     <issue
         id="ComposeContentEmitterReturningValues"
         message="Composable functions should either emit content into the composition or return a value, but not both.If a composable should offer additional control surfaces to its caller, those control surfaces or callbacks should be provided as parameters to the composable function by the caller.See https://slackhq.github.io/compose-lints/rules/#do-not-emit-content-and-return-a-result for more information."
-        errorLine1="@Composable"
-        errorLine2="^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsScreen.kt"
-            line="397"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="ComposeContentEmitterReturningValues"
-        message="Composable functions should either emit content into the composition or return a value, but not both.If a composable should offer additional control surfaces to its caller, those control surfaces or callbacks should be provided as parameters to the composable function by the caller.See https://slackhq.github.io/compose-lints/rules/#do-not-emit-content-and-return-a-result for more information."
-        errorLine1="@Composable"
-        errorLine2="^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/authentication/devices/DeviceItem.kt"
-            line="158"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="ComposeContentEmitterReturningValues"
-        message="Composable functions should either emit content into the composition or return a value, but not both.If a composable should offer additional control surfaces to its caller, those control surfaces or callbacks should be provided as parameters to the composable function by the caller.See https://slackhq.github.io/compose-lints/rules/#do-not-emit-content-and-return-a-result for more information."
-        errorLine1="// flexible composable to adapt when [MessageComposerTextInput] is expanded or collapsed"
+        errorLine1="// flexible composable to adapt when [MessageComposerTextInput] is expanded or collapsed"
         errorLine2="^">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/messagecomposer/MessageComposerInput.kt"
@@ -3462,7 +3308,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/conversationslist/all/AllConversationScreen.kt"
-            line="125"
+            line="123"
             column="5"/>
     </issue>
 
@@ -3506,7 +3352,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/archive/ArchiveScreen.kt"
-            line="75"
+            line="70"
             column="5"/>
     </issue>
 
@@ -3517,7 +3363,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/conversations/model/messagetypes/asset/AssetMessageTypes.kt"
-            line="168"
+            line="158"
             column="5"/>
     </issue>
 
@@ -3528,7 +3374,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/conversations/model/messagetypes/asset/AssetMessageTypes.kt"
-            line="191"
+            line="181"
             column="5"/>
     </issue>
 
@@ -3539,7 +3385,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/conversations/model/messagetypes/asset/AssetMessageTypes.kt"
-            line="226"
+            line="216"
             column="5"/>
     </issue>
 
@@ -3550,7 +3396,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/messagecomposer/AttachmentOptions.kt"
-            line="62"
+            line="63"
             column="5"/>
     </issue>
 
@@ -3576,17 +3422,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun BackupAndRestoreContent("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/settings/backup/BackupAndRestoreScreen.kt"
-            line="87"
-            column="5"/>
-    </issue>
-
     <issue
         id="ComposeModifierMissing"
         message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
@@ -3653,17 +3488,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun CallLabel(callInfo: ConversationLastEvent.Call) {"
-        errorLine2="    ~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/conversationslist/call/CallLabel.kt"
-            line="39"
-            column="5"/>
-    </issue>
-
     <issue
         id="ComposeModifierMissing"
         message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
@@ -3719,17 +3543,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun CallContent("
-        errorLine2="    ~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/conversationslist/call/CallsScreen.kt"
-            line="79"
-            column="5"/>
-    </issue>
-
     <issue
         id="ComposeModifierMissing"
         message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
@@ -3840,61 +3653,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun MessageList("
-        errorLine2="    ~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt"
-            line="962"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun JumpToLastMessageButton("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt"
-            line="1229"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun SetBackupPasswordDialog("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/settings/backup/dialog/create/CreateBackupDialogs.kt"
-            line="57"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun CreateBackupDialog("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/settings/backup/dialog/create/CreateBackupDialogs.kt"
-            line="97"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun CreatePasswordProtectedGuestLinkScreen("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/conversations/details/editguestaccess/createPasswordProtectedGuestLink/CreatePasswordProtectedGuestLinkScreen.kt"
-            line="65"
-            column="5"/>
-    </issue>
-
     <issue
         id="ComposeModifierMissing"
         message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
@@ -3917,28 +3675,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun DeviceDetailsContent("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsScreen.kt"
-            line="130"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun DeviceMLSSignatureItem("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsScreen.kt"
-            line="372"
-            column="5"/>
-    </issue>
-
     <issue
         id="ComposeModifierMissing"
         message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
@@ -4049,39 +3785,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun EnterLockCodeScreenContent("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/appLock/unlock/EnterLockCodeScreen.kt"
-            line="98"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun ForgotLockCodeResetDeviceDialog("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/appLock/forgot/ForgotLockCodeResetDeviceDialog.kt"
-            line="50"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun ForgotLockCodeScreenContent("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/appLock/forgot/ForgotLockCodeScreen.kt"
-            line="115"
-            column="5"/>
-    </issue>
-
     <issue
         id="ComposeModifierMissing"
         message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
@@ -4115,17 +3818,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun GroupNameScreen("
-        errorLine2="    ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/common/groupname/GroupConversationNameComponent.kt"
-            line="63"
-            column="5"/>
-    </issue>
-
     <issue
         id="ComposeModifierMissing"
         message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
@@ -4210,7 +3902,7 @@
         errorLine2="    ~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/HomeScreen.kt"
-            line="206"
+            line="197"
             column="5"/>
     </issue>
 
@@ -4335,50 +4027,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun ImportMediaRestrictedContent("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/sharing/ImportMediaScreen.kt"
-            line="155"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun ImportMediaRegularContent("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/sharing/ImportMediaScreen.kt"
-            line="189"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun ImportMediaLoggedOutContent("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/sharing/ImportMediaScreen.kt"
-            line="249"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun FileSharingRestrictedContent("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/sharing/ImportMediaScreen.kt"
-            line="274"
-            column="5"/>
-    </issue>
-
     <issue
         id="ComposeModifierMissing"
         message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
@@ -4390,17 +4038,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun JoinConversationViaDeepLinkDialog("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/joinConversation/JoinConversationViaDeepLinkDialog.kt"
-            line="70"
-            column="5"/>
-    </issue>
-
     <issue
         id="ComposeModifierMissing"
         message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
@@ -4423,17 +4060,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun LegalHoldRequestedDialog("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/legalhold/dialog/requested/LegalHoldRequestedDialog.kt"
-            line="55"
-            column="5"/>
-    </issue>
-
     <issue
         id="ComposeModifierMissing"
         message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
@@ -4665,17 +4291,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun MentionLabel(mentionMessage: MentionMessage) {"
-        errorLine2="    ~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/conversationslist/mention/MentionLabel.kt"
-            line="30"
-            column="5"/>
-    </issue>
-
     <issue
         id="ComposeModifierMissing"
         message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
@@ -4749,7 +4364,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/conversations/model/MessageTypes.kt"
-            line="128"
+            line="126"
             column="5"/>
     </issue>
 
@@ -4760,7 +4375,7 @@
         errorLine2="    ~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/conversations/model/MessageTypes.kt"
-            line="171"
+            line="169"
             column="5"/>
     </issue>
 
@@ -4771,7 +4386,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/conversations/model/MessageTypes.kt"
-            line="232"
+            line="225"
             column="5"/>
     </issue>
 
@@ -4947,18 +4562,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/RegularMessageItem.kt"
-            line="405"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun RemoveDeviceDialog("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/authentication/devices/remove/RemoveDeviceDialog.kt"
-            line="45"
+            line="406"
             column="5"/>
     </issue>
 
@@ -4984,17 +4588,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun RestoreProgressDialog("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/settings/backup/dialog/restore/RestoreBackupDialogs.kt"
-            line="124"
-            column="5"/>
-    </issue>
-
     <issue
         id="ComposeModifierMissing"
         message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
@@ -5138,17 +4731,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun SetLockCodeScreenContent("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/appLock/set/SetLockCodeScreen.kt"
-            line="95"
-            column="5"/>
-    </issue>
-
     <issue
         id="ComposeModifierMissing"
         message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
@@ -5299,7 +4881,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/authentication/verificationcode/VerificationCode.kt"
-            line="43"
+            line="44"
             column="5"/>
     </issue>
 
@@ -5556,17 +5138,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="ComposeModifierWithoutDefault"
-        message="This @Composable function has a modifier parameter but it doesn&apos;t have a default value.See https://slackhq.github.io/compose-lints/rules/#modifiers-should-have-default-parameters for more information."
-        errorLine1="private fun backupAndRestoreText(modifier: Modifier, lastBackupTime: Long?) {"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/settings/backup/BackupAndRestoreScreen.kt"
-            line="208"
-            column="34"/>
-    </issue>
-
     <issue
         id="ComposeModifierWithoutDefault"
         message="This @Composable function has a modifier parameter but it doesn&apos;t have a default value.See https://slackhq.github.io/compose-lints/rules/#modifiers-should-have-default-parameters for more information."
@@ -5596,18 +5167,18 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/authentication/login/email/LoginEmailScreen.kt"
-            line="211"
+            line="227"
             column="5"/>
     </issue>
 
     <issue
         id="ComposeModifierWithoutDefault"
         message="This @Composable function has a modifier parameter but it doesn&apos;t have a default value.See https://slackhq.github.io/compose-lints/rules/#modifiers-should-have-default-parameters for more information."
-        errorLine1="private fun PasswordInput(modifier: Modifier, password: TextFieldValue, onPasswordChange: (TextFieldValue) -> Unit) {"
+        errorLine1="private fun PasswordInput(modifier: Modifier, passwordState: TextFieldState) {"
         errorLine2="                          ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/authentication/login/email/LoginEmailScreen.kt"
-            line="235"
+            line="249"
             column="27"/>
     </issue>
 
@@ -5618,7 +5189,7 @@
         errorLine2="                                ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/authentication/login/email/LoginEmailScreen.kt"
-            line="249"
+            line="262"
             column="33"/>
     </issue>
 
@@ -5629,7 +5200,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/authentication/login/email/LoginEmailScreen.kt"
-            line="277"
+            line="290"
             column="25"/>
     </issue>
 
@@ -5640,7 +5211,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/authentication/login/sso/LoginSSOScreen.kt"
-            line="152"
+            line="155"
             column="5"/>
     </issue>
 
@@ -5651,7 +5222,7 @@
         errorLine2="                        ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/authentication/login/sso/LoginSSOScreen.kt"
-            line="168"
+            line="169"
             column="25"/>
     </issue>
 
@@ -5750,19 +5321,19 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/authentication/login/email/ProxyScreen.kt"
-            line="124"
+            line="110"
             column="5"/>
     </issue>
 
     <issue
         id="ComposeModifierWithoutDefault"
         message="This @Composable function has a modifier parameter but it doesn&apos;t have a default value.See https://slackhq.github.io/compose-lints/rules/#modifiers-should-have-default-parameters for more information."
-        errorLine1="private fun ProxyPasswordInput(modifier: Modifier, proxyPassword: TextFieldValue, onProxyPasswordChange: (TextFieldValue) -> Unit) {"
-        errorLine2="                               ~~~~~~~~~~~~~~~~~~">
+        errorLine1="    modifier: Modifier,"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/authentication/login/email/ProxyScreen.kt"
-            line="141"
-            column="32"/>
+            line="126"
+            column="5"/>
     </issue>
 
     <issue
@@ -6003,7 +5574,7 @@
         errorLine2="^">
         <location
             file="src/main/kotlin/com/wire/android/ui/authentication/create/email/CreateAccountEmailScreen.kt"
-            line="261"
+            line="259"
             column="1"/>
     </issue>
 
@@ -6018,28 +5589,6 @@
             column="1"/>
     </issue>
 
-    <issue
-        id="ComposeMultipleContentEmitters"
-        message="Composable functions should only be emitting content into the composition from one source at their top level.&#xA;&#xA;See https://slackhq.github.io/compose-lints/rules/#do-not-emit-multiple-pieces-of-content for more information."
-        errorLine1="@Composable"
-        errorLine2="^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsScreen.kt"
-            line="371"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="ComposeMultipleContentEmitters"
-        message="Composable functions should only be emitting content into the composition from one source at their top level.&#xA;&#xA;See https://slackhq.github.io/compose-lints/rules/#do-not-emit-multiple-pieces-of-content for more information."
-        errorLine1="@Composable"
-        errorLine2="^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsScreen.kt"
-            line="397"
-            column="1"/>
-    </issue>
-
     <issue
         id="ComposeMultipleContentEmitters"
         message="Composable functions should only be emitting content into the composition from one source at their top level.&#xA;&#xA;See https://slackhq.github.io/compose-lints/rules/#do-not-emit-multiple-pieces-of-content for more information."
@@ -6062,39 +5611,6 @@
             column="1"/>
     </issue>
 
-    <issue
-        id="ComposeMutableParameters"
-        message="Using mutable objects as state in Compose will cause your users to see incorrect or stale data in your app.Mutable objects that are not observable, such as ArrayList&lt;T> or a mutable data class, cannot be observed by Compose to trigger recomposition when they change.See https://slackhq.github.io/compose-lints/rules/#do-not-use-inherently-mutable-types-as-parameters for more information."
-        errorLine1="    homeSnackBarState: MutableSharedFlow&lt;HomeSnackbarState>,"
-        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/conversationslist/ConversationRouter.kt"
-            line="342"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="ComposeMutableParameters"
-        message="Using mutable objects as state in Compose will cause your users to see incorrect or stale data in your app.Mutable objects that are not observable, such as ArrayList&lt;T> or a mutable data class, cannot be observed by Compose to trigger recomposition when they change.See https://slackhq.github.io/compose-lints/rules/#do-not-use-inherently-mutable-types-as-parameters for more information."
-        errorLine1="    closeBottomSheetState: MutableSharedFlow&lt;Unit>,"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/conversationslist/ConversationRouter.kt"
-            line="344"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="ComposeMutableParameters"
-        message="Using mutable objects as state in Compose will cause your users to see incorrect or stale data in your app.Mutable objects that are not observable, such as ArrayList&lt;T> or a mutable data class, cannot be observed by Compose to trigger recomposition when they change.See https://slackhq.github.io/compose-lints/rules/#do-not-use-inherently-mutable-types-as-parameters for more information."
-        errorLine1="    messageComposerViewState: MutableState&lt;MessageComposerViewState>,"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt"
-            line="678"
-            column="31"/>
-    </issue>
-
     <issue
         id="ComposeMutableParameters"
         message="Using mutable objects as state in Compose will cause your users to see incorrect or stale data in your app.Mutable objects that are not observable, such as ArrayList&lt;T> or a mutable data class, cannot be observed by Compose to trigger recomposition when they change.See https://slackhq.github.io/compose-lints/rules/#do-not-use-inherently-mutable-types-as-parameters for more information."
@@ -6135,40 +5651,40 @@
         errorLine2="    ~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/messagecomposer/AttachmentOptions.kt"
-            line="158"
+            line="159"
             column="5"/>
     </issue>
 
     <issue
         id="ComposeNamingLowercase"
         message="Composable functions that return a value should start with a lowercase letter.While useful and accepted outside of @Composable functions, this factory function convention has drawbacks that set inappropriate expectations for callers when used with @Composable functions.See https://slackhq.github.io/compose-lints/rules/#naming-composable-functions-properly for more information."
-        errorLine1="private fun GalleryFlow("
-        errorLine2="            ~~~~~~~~~~~">
+        errorLine1="fun MultipleFileBrowserFlow("
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/messagecomposer/AttachmentOptions.kt"
-            line="170"
-            column="13"/>
+            line="174"
+            column="5"/>
     </issue>
 
     <issue
         id="ComposeNamingLowercase"
         message="Composable functions that return a value should start with a lowercase letter.While useful and accepted outside of @Composable functions, this factory function convention has drawbacks that set inappropriate expectations for callers when used with @Composable functions.See https://slackhq.github.io/compose-lints/rules/#naming-composable-functions-properly for more information."
-        errorLine1="private fun TakePictureFlow("
-        errorLine2="            ~~~~~~~~~~~~~~~">
+        errorLine1="private fun MultipleGalleryFlow("
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/messagecomposer/AttachmentOptions.kt"
-            line="182"
+            line="191"
             column="13"/>
     </issue>
 
     <issue
         id="ComposeNamingLowercase"
         message="Composable functions that return a value should start with a lowercase letter.While useful and accepted outside of @Composable functions, this factory function convention has drawbacks that set inappropriate expectations for callers when used with @Composable functions.See https://slackhq.github.io/compose-lints/rules/#naming-composable-functions-properly for more information."
-        errorLine1="private fun CaptureVideoFlow("
-        errorLine2="            ~~~~~~~~~~~~~~~~">
+        errorLine1="private fun TakePictureFlow("
+        errorLine2="            ~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/messagecomposer/AttachmentOptions.kt"
-            line="203"
+            line="208"
             column="13"/>
     </issue>
 
@@ -6216,17 +5732,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="ComposeNamingUppercase"
-        message="Composable functions that return Unit should start with an uppercase letter.They are considered declarative entities that can be either present or absent in a composition and therefore follow the naming rules for classes.See https://slackhq.github.io/compose-lints/rules/#naming-composable-functions-properly for more information."
-        errorLine1="private fun backupAndRestoreText(modifier: Modifier, lastBackupTime: Long?) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/settings/backup/BackupAndRestoreScreen.kt"
-            line="208"
-            column="13"/>
-    </issue>
-
     <issue
         id="ComposeNamingUppercase"
         message="Composable functions that return Unit should start with an uppercase letter.They are considered declarative entities that can be either present or absent in a composition and therefore follow the naming rules for classes.See https://slackhq.github.io/compose-lints/rules/#naming-composable-functions-properly for more information."
@@ -6245,7 +5750,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/conversations/media/ConversationMediaScreen.kt"
-            line="231"
+            line="214"
             column="5"/>
     </issue>
 
@@ -6315,17 +5820,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="ComposeNamingUppercase"
-        message="Composable functions that return Unit should start with an uppercase letter.They are considered declarative entities that can be either present or absent in a composition and therefore follow the naming rules for classes.See https://slackhq.github.io/compose-lints/rules/#naming-composable-functions-properly for more information."
-        errorLine1="private fun handleSnackBarMessage("
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/HomeScreen.kt"
-            line="368"
-            column="13"/>
-    </issue>
-
     <issue
         id="ComposeNamingUppercase"
         message="Composable functions that return Unit should start with an uppercase letter.They are considered declarative entities that can be either present or absent in a composition and therefore follow the naming rules for classes.See https://slackhq.github.io/compose-lints/rules/#naming-composable-functions-properly for more information."
@@ -6590,39 +6084,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="ComposeNamingUppercase"
-        message="Composable functions that return Unit should start with an uppercase letter.They are considered declarative entities that can be either present or absent in a composition and therefore follow the naming rules for classes.See https://slackhq.github.io/compose-lints/rules/#naming-composable-functions-properly for more information."
-        errorLine1="    private fun setUpNavigation("
-        errorLine2="                ~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/WireActivity.kt"
-            line="251"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="ComposeNamingUppercase"
-        message="Composable functions that return Unit should start with an uppercase letter.They are considered declarative entities that can be either present or absent in a composition and therefore follow the naming rules for classes.See https://slackhq.github.io/compose-lints/rules/#naming-composable-functions-properly for more information."
-        errorLine1="    private fun handleScreenshotCensoring() {"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/WireActivity.kt"
-            line="285"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="ComposeNamingUppercase"
-        message="Composable functions that return Unit should start with an uppercase letter.They are considered declarative entities that can be either present or absent in a composition and therefore follow the naming rules for classes.See https://slackhq.github.io/compose-lints/rules/#naming-composable-functions-properly for more information."
-        errorLine1="    private fun handleDialogs(navigate: (NavigationCommand) -> Unit) {"
-        errorLine2="                ~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/WireActivity.kt"
-            line="297"
-            column="17"/>
-    </issue>
-
     <issue
         id="ComposeNamingUppercase"
         message="Composable functions that return Unit should start with an uppercase letter.They are considered declarative entities that can be either present or absent in a composition and therefore follow the naming rules for classes.See https://slackhq.github.io/compose-lints/rules/#naming-composable-functions-properly for more information."
@@ -6821,17 +6282,6 @@
             column="44"/>
     </issue>
 
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [conversations: ImmutableMap&lt;ConversationFolder, List&lt;ConversationItem>>, hasNoConversations: Boolean, isFromArchive: Boolean = false, viewModel: ConversationListViewModel = hiltViewModel(), onEditConversation: (ConversationItem) -> Unit, onOpenConversation: (ConversationId) -> Unit, onOpenUserProfile: (UserId) -> Unit, onJoinedCall: (ConversationId) -> Unit, onPermissionPermanentlyDenied: (type: PermissionDenialType) -> Unit] but should be [conversations: ImmutableMap&lt;ConversationFolder, List&lt;ConversationItem>>, hasNoConversations: Boolean, onEditConversation: (ConversationItem) -> Unit, onOpenConversation: (ConversationId) -> Unit, onOpenUserProfile: (UserId) -> Unit, onJoinedCall: (ConversationId) -> Unit, isFromArchive: Boolean = false, viewModel: ConversationListViewModel = hiltViewModel(), onPermissionPermanentlyDenied: (type: PermissionDenialType) -> Unit].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="fun AllConversationScreenContent("
-        errorLine2="                                ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/conversationslist/all/AllConversationScreen.kt"
-            line="80"
-            column="33"/>
-    </issue>
-
     <issue
         id="ComposeParameterOrder"
         message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [appUnlockWithBiometricsViewModel: AppUnlockWithBiometricsViewModel = hiltViewModel(), navigator: Navigator] but should be [navigator: Navigator, appUnlockWithBiometricsViewModel: AppUnlockWithBiometricsViewModel = hiltViewModel()].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
@@ -6909,17 +6359,6 @@
             column="30"/>
     </issue>
 
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [missedCalls: List&lt;ConversationItem> = emptyList(), callHistory: List&lt;ConversationItem> = emptyList(), onCallItemClick: (ConversationId) -> Unit, onEditConversationItem: (ConversationItem) -> Unit, onOpenUserProfile: (UserId) -> Unit] but should be [onCallItemClick: (ConversationId) -> Unit, onEditConversationItem: (ConversationItem) -> Unit, missedCalls: List&lt;ConversationItem> = emptyList(), callHistory: List&lt;ConversationItem> = emptyList(), onOpenUserProfile: (UserId) -> Unit].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="fun CallsScreenContent("
-        errorLine2="                      ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/conversationslist/call/CallsScreen.kt"
-            line="59"
-            column="23"/>
-    </issue>
-
     <issue
         id="ComposeParameterOrder"
         message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [isCameraOn: Boolean = false, onCameraButtonClicked: () -> Unit, onPermissionPermanentlyDenied: (type: PermissionDenialType) -> Unit, size: Dp = dimensions().defaultCallingControlsSize, modifier: Modifier = Modifier] but should be [onCameraButtonClicked: () -> Unit, onPermissionPermanentlyDenied: (type: PermissionDenialType) -> Unit, modifier: Modifier = Modifier, isCameraOn: Boolean = false, size: Dp = dimensions().defaultCallingControlsSize].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
@@ -6971,18 +6410,7 @@
         errorLine2="                 ^">
         <location
             file="src/main/kotlin/com/wire/android/ui/common/textfield/CodeTextField.kt"
-            line="49"
-            column="18"/>
-    </issue>
-
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [codeLength: Int = integerResource(id = R.integer.code_length), value: TextFieldValue, onValueChange: (CodeFieldValue) -> Unit, shape: Shape = RoundedCornerShape(MaterialTheme.wireDimensions.corner4x), colors: WireTextFieldColors = wireTextFieldColors(), textStyle: TextStyle = MaterialTheme.wireTypography.code01, state: WireTextFieldState = WireTextFieldState.Default, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, maxHorizontalSpacing: Dp = MaterialTheme.wireDimensions.spacing16x, horizontalAlignment: Alignment.Horizontal = Alignment.CenterHorizontally, modifier: Modifier = Modifier] but should be [value: TextFieldValue, onValueChange: (CodeFieldValue) -> Unit, modifier: Modifier = Modifier, codeLength: Int = integerResource(id = R.integer.code_length), shape: Shape = RoundedCornerShape(MaterialTheme.wireDimensions.corner4x), colors: WireTextFieldColors = wireTextFieldColors(), textStyle: TextStyle = MaterialTheme.wireTypography.code01, state: WireTextFieldState = WireTextFieldState.Default, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, maxHorizontalSpacing: Dp = MaterialTheme.wireDimensions.spacing16x, horizontalAlignment: Alignment.Horizontal = Alignment.CenterHorizontally].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="fun CodeTextField("
-        errorLine2="                 ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/common/textfield/CodeTextField.kt"
-            line="96"
+            line="48"
             column="18"/>
     </issue>
 
@@ -7048,7 +6476,7 @@
         errorLine2="                   ^">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/conversations/media/ConversationMediaScreen.kt"
-            line="139"
+            line="136"
             column="20"/>
     </issue>
 
@@ -7063,28 +6491,6 @@
             column="32"/>
     </issue>
 
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [navigator: Navigator, conversationInfoViewModel: ConversationInfoViewModel = hiltViewModel(), conversationBannerViewModel: ConversationBannerViewModel = hiltViewModel(), conversationCallViewModel: ConversationCallViewModel = hiltViewModel(), conversationMessagesViewModel: ConversationMessagesViewModel = hiltViewModel(), messageComposerViewModel: MessageComposerViewModel = hiltViewModel(), sendMessageViewModel: SendMessageViewModel = hiltViewModel(), conversationMigrationViewModel: ConversationMigrationViewModel = hiltViewModel(), messageDraftViewModel: MessageDraftViewModel = hiltViewModel(), groupDetailsScreenResultRecipient: ResultRecipient&lt;GroupConversationDetailsScreenDestination, GroupConversationDetailsNavBackArgs>, mediaGalleryScreenResultRecipient: ResultRecipient&lt;MediaGalleryScreenDestination, MediaGalleryNavBackArgs>, resultNavigator: ResultBackNavigator&lt;GroupConversationDetailsNavBackArgs>] but should be [navigator: Navigator, groupDetailsScreenResultRecipient: ResultRecipient&lt;GroupConversationDetailsScreenDestination, GroupConversationDetailsNavBackArgs>, mediaGalleryScreenResultRecipient: ResultRecipient&lt;MediaGalleryScreenDestination, MediaGalleryNavBackArgs>, resultNavigator: ResultBackNavigator&lt;GroupConversationDetailsNavBackArgs>, conversationInfoViewModel: ConversationInfoViewModel = hiltViewModel(), conversationBannerViewModel: ConversationBannerViewModel = hiltViewModel(), conversationCallViewModel: ConversationCallViewModel = hiltViewModel(), conversationMessagesViewModel: ConversationMessagesViewModel = hiltViewModel(), messageComposerViewModel: MessageComposerViewModel = hiltViewModel(), sendMessageViewModel: SendMessageViewModel = hiltViewModel(), conversationMigrationViewModel: ConversationMigrationViewModel = hiltViewModel(), messageDraftViewModel: MessageDraftViewModel = hiltViewModel()].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="fun ConversationScreen("
-        errorLine2="                      ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt"
-            line="198"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [coroutineScope: CoroutineScope = rememberCoroutineScope(), lazyListState: LazyListState] but should be [lazyListState: LazyListState, coroutineScope: CoroutineScope = rememberCoroutineScope()].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="fun JumpToLastMessageButton("
-        errorLine2="                           ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt"
-            line="1229"
-            column="28"/>
-    </issue>
-
     <issue
         id="ComposeParameterOrder"
         message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [name: String, isLegalHold: Boolean = false, modifier: Modifier = Modifier, badges: @Composable () -> Unit = {}, searchQuery: String] but should be [name: String, searchQuery: String, modifier: Modifier = Modifier, isLegalHold: Boolean = false, badges: @Composable () -> Unit = {}].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
@@ -7173,17 +6579,6 @@
             column="21"/>
     </issue>
 
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [state: DeviceDetailsState, onDeleteDevice: () -> Unit = {}, onNavigateBack: () -> Unit = {}, onNavigateToE2eiCertificateDetailsScreen: (String) -> Unit = {}, onPasswordChange: (TextFieldValue) -> Unit = {}, onRemoveConfirm: () -> Unit = {}, onDialogDismiss: () -> Unit = {}, onErrorDialogDismiss: () -> Unit = {}, enrollE2eiCertificate: () -> Unit = {}, handleE2EIEnrollmentResult: (Either&lt;CoreFailure, E2EIEnrollmentResult>) -> Unit, onUpdateClientVerification: (Boolean) -> Unit = {}, onEnrollE2EIErrorDismiss: () -> Unit = {}, onEnrollE2EISuccessDismiss: () -> Unit = {}] but should be [state: DeviceDetailsState, handleE2EIEnrollmentResult: (Either&lt;CoreFailure, E2EIEnrollmentResult>) -> Unit, onDeleteDevice: () -> Unit = {}, onNavigateBack: () -> Unit = {}, onNavigateToE2eiCertificateDetailsScreen: (String) -> Unit = {}, onPasswordChange: (TextFieldValue) -> Unit = {}, onRemoveConfirm: () -> Unit = {}, onDialogDismiss: () -> Unit = {}, onErrorDialogDismiss: () -> Unit = {}, enrollE2eiCertificate: () -> Unit = {}, onUpdateClientVerification: (Boolean) -> Unit = {}, onEnrollE2EIErrorDismiss: () -> Unit = {}, onEnrollE2EISuccessDismiss: () -> Unit = {}].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="fun DeviceDetailsContent("
-        errorLine2="                        ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsScreen.kt"
-            line="130"
-            column="25"/>
-    </issue>
-
     <issue
         id="ComposeParameterOrder"
         message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [device: Device, placeholder: Boolean, shouldShowVerifyLabel: Boolean, isCurrentClient: Boolean = false, shouldShowE2EIInfo: Boolean = false, background: Color? = null, icon: @Composable (() -> Unit), isWholeItemClickable: Boolean = false, onClickAction: ((Device) -> Unit)? = null] but should be [device: Device, placeholder: Boolean, shouldShowVerifyLabel: Boolean, icon: @Composable (() -> Unit), isCurrentClient: Boolean = false, shouldShowE2EIInfo: Boolean = false, background: Color? = null, isWholeItemClickable: Boolean = false, onClickAction: ((Device) -> Unit)? = null].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
@@ -7217,39 +6612,6 @@
             column="33"/>
     </issue>
 
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [navigator: Navigator, viewModel: EditConversationMetadataViewModel = hiltViewModel(), resultNavigator: ResultBackNavigator&lt;Boolean>] but should be [navigator: Navigator, resultNavigator: ResultBackNavigator&lt;Boolean>, viewModel: EditConversationMetadataViewModel = hiltViewModel()].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="fun EditConversationNameScreen("
-        errorLine2="                              ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/conversations/details/metadata/EditConversationNameScreen.kt"
-            line="34"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [viewModel: EnterLockScreenViewModel = hiltViewModel(), navigator: Navigator] but should be [navigator: Navigator, viewModel: EnterLockScreenViewModel = hiltViewModel()].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="fun EnterLockCodeScreen("
-        errorLine2="                       ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/appLock/unlock/EnterLockCodeScreen.kt"
-            line="75"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [modifier: Modifier = Modifier.fillMaxWidth(), enabled: Boolean, onContinue: () -> Unit] but should be [enabled: Boolean, modifier: Modifier = Modifier.fillMaxWidth(), onContinue: () -> Unit].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="private fun ContinueButton("
-        errorLine2="                          ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/appLock/unlock/EnterLockCodeScreen.kt"
-            line="188"
-            column="27"/>
-    </issue>
-
     <issue
         id="ComposeParameterOrder"
         message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [modifier: Modifier = Modifier, unreadMessageCount: Int] but should be [unreadMessageCount: Int, modifier: Modifier = Modifier].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
@@ -7272,17 +6634,6 @@
             column="22"/>
     </issue>
 
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [modifier: Modifier = Modifier.fillMaxWidth(), enabled: Boolean, onContinue: () -> Unit] but should be [enabled: Boolean, modifier: Modifier = Modifier.fillMaxWidth(), onContinue: () -> Unit].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="private fun ContinueButton("
-        errorLine2="                          ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/appLock/forgot/ForgotLockCodeScreen.kt"
-            line="185"
-            column="27"/>
-    </issue>
-
     <issue
         id="ComposeParameterOrder"
         message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [sharedCallingViewModel: SharedCallingViewModel = hiltViewModel(), selectedParticipant: SelectedParticipant, height: Dp, closeFullScreen: (offset: Offset) -> Unit, onBackButtonClicked: () -> Unit] but should be [selectedParticipant: SelectedParticipant, height: Dp, closeFullScreen: (offset: Offset) -> Unit, sharedCallingViewModel: SharedCallingViewModel = hiltViewModel(), onBackButtonClicked: () -> Unit].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
@@ -7294,17 +6645,6 @@
             column="19"/>
     </issue>
 
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [navigator: Navigator, viewModel: GroupConversationDetailsViewModel = hiltViewModel(), resultNavigator: ResultBackNavigator&lt;GroupConversationDetailsNavBackArgs>, groupConversationDetailResultRecipient: ResultRecipient&lt;EditConversationNameScreenDestination, Boolean>] but should be [navigator: Navigator, resultNavigator: ResultBackNavigator&lt;GroupConversationDetailsNavBackArgs>, groupConversationDetailResultRecipient: ResultRecipient&lt;EditConversationNameScreenDestination, Boolean>, viewModel: GroupConversationDetailsViewModel = hiltViewModel()].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="fun GroupConversationDetailsScreen("
-        errorLine2="                                  ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsScreen.kt"
-            line="129"
-            column="35"/>
-    </issue>
-
     <issue
         id="ComposeParameterOrder"
         message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [viewModel: GroupConversationDetailsViewModel = hiltViewModel(), lazyListState: LazyListState, onEditGuestAccess: () -> Unit, onEditSelfDeletingMessages: () -> Unit, onEditGroupName: () -> Unit] but should be [lazyListState: LazyListState, onEditGuestAccess: () -> Unit, onEditSelfDeletingMessages: () -> Unit, viewModel: GroupConversationDetailsViewModel = hiltViewModel(), onEditGroupName: () -> Unit].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
@@ -7327,17 +6667,6 @@
             column="33"/>
     </issue>
 
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [navigator: Navigator, homeViewModel: HomeViewModel = hiltViewModel(), appSyncViewModel: AppSyncViewModel = hiltViewModel(), homeDrawerViewModel: HomeDrawerViewModel = hiltViewModel(), conversationListViewModel: ConversationListViewModel = hiltViewModel(), groupDetailsScreenResultRecipient: ResultRecipient&lt;ConversationScreenDestination, GroupConversationDetailsNavBackArgs>, otherUserProfileScreenResultRecipient: ResultRecipient&lt;OtherUserProfileScreenDestination, String>] but should be [navigator: Navigator, groupDetailsScreenResultRecipient: ResultRecipient&lt;ConversationScreenDestination, GroupConversationDetailsNavBackArgs>, otherUserProfileScreenResultRecipient: ResultRecipient&lt;OtherUserProfileScreenDestination, String>, homeViewModel: HomeViewModel = hiltViewModel(), appSyncViewModel: AppSyncViewModel = hiltViewModel(), homeDrawerViewModel: HomeDrawerViewModel = hiltViewModel(), conversationListViewModel: ConversationListViewModel = hiltViewModel()].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="fun HomeScreen("
-        errorLine2="              ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/HomeScreen.kt"
-            line="98"
-            column="15"/>
-    </issue>
-
     <issue
         id="ComposeParameterOrder"
         message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [onClick: () -> Unit = {}, modifier: Modifier = Modifier, content: @Composable () -> Unit] but should be [modifier: Modifier = Modifier, onClick: () -> Unit = {}, content: @Composable () -> Unit].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
@@ -7437,17 +6766,6 @@
             column="23"/>
     </issue>
 
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [unreadMentions: List&lt;ConversationItem> = emptyList(), allMentions: List&lt;ConversationItem> = emptyList(), onMentionItemClick: (ConversationId) -> Unit, onEditConversationItem: (ConversationItem) -> Unit, onOpenUserProfile: (UserId) -> Unit, openConversationNotificationsSettings: (ConversationItem) -> Unit] but should be [onMentionItemClick: (ConversationId) -> Unit, onEditConversationItem: (ConversationItem) -> Unit, onOpenUserProfile: (UserId) -> Unit, unreadMentions: List&lt;ConversationItem> = emptyList(), allMentions: List&lt;ConversationItem> = emptyList(), openConversationNotificationsSettings: (ConversationItem) -> Unit].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="fun MentionScreenContent("
-        errorLine2="                        ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/conversationslist/mention/MentionScreen.kt"
-            line="59"
-            column="25"/>
-    </issue>
-
     <issue
         id="ComposeParameterOrder"
         message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [editButtonEnabled: Boolean = false, onEditSaveButtonClicked: () -> Unit = { }, onEditCancelButtonClicked: () -> Unit = { }, modifier: Modifier = Modifier] but should be [modifier: Modifier = Modifier, editButtonEnabled: Boolean = false, onEditSaveButtonClicked: () -> Unit = { }, onEditCancelButtonClicked: () -> Unit = { }].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
@@ -7521,7 +6839,7 @@
         errorLine2="                        ^">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/conversations/model/MessageTypes.kt"
-            line="78"
+            line="76"
             column="25"/>
     </issue>
 
@@ -7532,7 +6850,7 @@
         errorLine2="                   ^">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/conversations/model/MessageTypes.kt"
-            line="232"
+            line="225"
             column="20"/>
     </issue>
 
@@ -7774,7 +7092,7 @@
         errorLine2="                          ^">
         <location
             file="src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/RegularMessageItem.kt"
-            line="580"
+            line="581"
             column="27"/>
     </issue>
 
@@ -7899,39 +7217,6 @@
             column="29"/>
     </issue>
 
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [navigator: Navigator, viewModelSelf: SelfUserProfileViewModel = hiltViewModel(), legalHoldRequestedViewModel: LegalHoldRequestedViewModel = hiltViewModel(), avatarPickerResultRecipient: ResultRecipient&lt;AvatarPickerScreenDestination, String?>] but should be [navigator: Navigator, avatarPickerResultRecipient: ResultRecipient&lt;AvatarPickerScreenDestination, String?>, viewModelSelf: SelfUserProfileViewModel = hiltViewModel(), legalHoldRequestedViewModel: LegalHoldRequestedViewModel = hiltViewModel()].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="fun SelfUserProfileScreen("
-        errorLine2="                         ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/userprofile/self/SelfUserProfileScreen.kt"
-            line="111"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [viewModel: SetLockScreenViewModel = hiltViewModel(), navigator: Navigator] but should be [navigator: Navigator, viewModel: SetLockScreenViewModel = hiltViewModel()].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="fun SetLockCodeScreen("
-        errorLine2="                     ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/appLock/set/SetLockCodeScreen.kt"
-            line="79"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [modifier: Modifier = Modifier.fillMaxWidth(), enabled: Boolean, onContinue: () -> Unit] but should be [enabled: Boolean, modifier: Modifier = Modifier.fillMaxWidth(), onContinue: () -> Unit].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="private fun ContinueButton("
-        errorLine2="                          ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/home/appLock/set/SetLockCodeScreen.kt"
-            line="234"
-            column="27"/>
-    </issue>
-
     <issue
         id="ComposeParameterOrder"
         message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [title: String? = null, text: String, @DrawableRes trailingIcon: Int? = null, switchState: SwitchState = SwitchState.None, onRowPressed: Clickable = Clickable(false), onIconPressed: Clickable? = null] but should be [text: String, title: String? = null, @DrawableRes trailingIcon: Int? = null, switchState: SwitchState = SwitchState.None, onRowPressed: Clickable = Clickable(false), onIconPressed: Clickable? = null].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
@@ -8064,28 +7349,6 @@
             column="25"/>
     </issue>
 
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [textState: TextFieldState, placeholderText: String? = stringResource(R.string.login_password_placeholder), labelText: String? = stringResource(R.string.login_password_label), labelMandatoryIcon: Boolean = false, descriptionText: String? = null, state: WireTextFieldState = WireTextFieldState.Default, autoFill: Boolean = false, inputTransformation: InputTransformation = InputTransformation.maxLength(8000), keyboardOptions: KeyboardOptions = KeyboardOptions.DefaultPassword, onKeyboardAction: KeyboardActionHandler? = null, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, textStyle: TextStyle = MaterialTheme.wireTypography.body01.copy(textAlign = TextAlign.Start), placeholderTextStyle: TextStyle = MaterialTheme.wireTypography.body01.copy(textAlign = TextAlign.Start), placeholderAlignment: Alignment.Horizontal = Alignment.Start, inputMinHeight: Dp = MaterialTheme.wireDimensions.textFieldMinHeight, shape: Shape = RoundedCornerShape(MaterialTheme.wireDimensions.textFieldCornerSize), colors: WireTextFieldColors = wireTextFieldColors(), modifier: Modifier = Modifier, onTap: ((Offset) -> Unit)? = null, testTag: String = String.EMPTY] but should be [textState: TextFieldState, modifier: Modifier = Modifier, placeholderText: String? = stringResource(R.string.login_password_placeholder), labelText: String? = stringResource(R.string.login_password_label), labelMandatoryIcon: Boolean = false, descriptionText: String? = null, state: WireTextFieldState = WireTextFieldState.Default, autoFill: Boolean = false, inputTransformation: InputTransformation = InputTransformation.maxLength(8000), keyboardOptions: KeyboardOptions = KeyboardOptions.DefaultPassword, onKeyboardAction: KeyboardActionHandler? = null, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, textStyle: TextStyle = MaterialTheme.wireTypography.body01.copy(textAlign = TextAlign.Start), placeholderTextStyle: TextStyle = MaterialTheme.wireTypography.body01.copy(textAlign = TextAlign.Start), placeholderAlignment: Alignment.Horizontal = Alignment.Start, inputMinHeight: Dp = MaterialTheme.wireDimensions.textFieldMinHeight, shape: Shape = RoundedCornerShape(MaterialTheme.wireDimensions.textFieldCornerSize), colors: WireTextFieldColors = wireTextFieldColors(), onTap: ((Offset) -> Unit)? = null, testTag: String = String.EMPTY].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="fun WirePasswordTextField("
-        errorLine2="                         ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/common/textfield/WirePasswordTextField.kt"
-            line="71"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [value: TextFieldValue, onValueChange: (TextFieldValue) -> Unit, placeholderText: String? = stringResource(R.string.login_password_placeholder), labelText: String? = stringResource(R.string.login_password_label), labelMandatoryIcon: Boolean = false, descriptionText: String? = null, state: WireTextFieldState = WireTextFieldState.Default, autofill: Boolean, maxTextLength: Int = 8000, imeAction: ImeAction = ImeAction.Default, onImeAction: KeyboardActionHandler? = null, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, textStyle: TextStyle = MaterialTheme.wireTypography.body01.copy(textAlign = TextAlign.Start), placeholderTextStyle: TextStyle = MaterialTheme.wireTypography.body01.copy(textAlign = TextAlign.Start), placeholderAlignment: Alignment.Horizontal = Alignment.Start, inputMinHeight: Dp = MaterialTheme.wireDimensions.textFieldMinHeight, shape: Shape = RoundedCornerShape(MaterialTheme.wireDimensions.textFieldCornerSize), colors: WireTextFieldColors = wireTextFieldColors(), modifier: Modifier = Modifier, onTap: ((Offset) -> Unit)? = null, testTag: String = String.EMPTY] but should be [value: TextFieldValue, onValueChange: (TextFieldValue) -> Unit, autofill: Boolean, modifier: Modifier = Modifier, placeholderText: String? = stringResource(R.string.login_password_placeholder), labelText: String? = stringResource(R.string.login_password_label), labelMandatoryIcon: Boolean = false, descriptionText: String? = null, state: WireTextFieldState = WireTextFieldState.Default, maxTextLength: Int = 8000, imeAction: ImeAction = ImeAction.Default, onImeAction: KeyboardActionHandler? = null, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, textStyle: TextStyle = MaterialTheme.wireTypography.body01.copy(textAlign = TextAlign.Start), placeholderTextStyle: TextStyle = MaterialTheme.wireTypography.body01.copy(textAlign = TextAlign.Start), placeholderAlignment: Alignment.Horizontal = Alignment.Start, inputMinHeight: Dp = MaterialTheme.wireDimensions.textFieldMinHeight, shape: Shape = RoundedCornerShape(MaterialTheme.wireDimensions.textFieldCornerSize), colors: WireTextFieldColors = wireTextFieldColors(), onTap: ((Offset) -> Unit)? = null, testTag: String = String.EMPTY].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="fun WirePasswordTextField("
-        errorLine2="                         ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/common/textfield/WirePasswordTextField.kt"
-            line="137"
-            column="26"/>
-    </issue>
-
     <issue
         id="ComposeParameterOrder"
         message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [tabs: List&lt;TabItem>, selectedTabIndex: Int, onTabChange: (Int) -> Unit, containerColor: Color = MaterialTheme.colorScheme.background, divider: @Composable () -> Unit = @Composable { HorizontalDivider() }, upperCaseTitles: Boolean = true, modifier: Modifier = Modifier] but should be [tabs: List&lt;TabItem>, selectedTabIndex: Int, onTabChange: (Int) -> Unit, modifier: Modifier = Modifier, containerColor: Color = MaterialTheme.colorScheme.background, divider: @Composable () -> Unit = @Composable { HorizontalDivider() }, upperCaseTitles: Boolean = true].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsScreen.kt
index fe2af7e51a5..0ed98208291 100644
--- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsScreen.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsScreen.kt
@@ -121,6 +121,7 @@ import com.wire.kalium.logic.data.conversation.Conversation
 import com.wire.kalium.logic.data.conversation.MutedConversationStatus
 import com.wire.kalium.logic.data.id.ConversationId
 import com.wire.kalium.logic.data.id.GroupID
+import com.wire.kalium.logic.data.mls.CipherSuite
 import kotlinx.coroutines.launch
 import kotlinx.datetime.Instant
 
@@ -587,7 +588,7 @@ fun PreviewGroupConversationDetails() {
                     groupState = Conversation.ProtocolInfo.MLSCapable.GroupState.ESTABLISHED,
                     epoch = ULong.MIN_VALUE,
                     keyingMaterialLastUpdate = Instant.fromEpochMilliseconds(1648654560000),
-                    cipherSuite = Conversation.CipherSuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519
+                    cipherSuite = CipherSuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519
                 ),
                 mlsVerificationStatus = Conversation.VerificationStatus.VERIFIED,
                 isUnderLegalHold = false,
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/options/GroupConversationOptions.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/options/GroupConversationOptions.kt
index 0a32162abd1..771ba3dfa3c 100644
--- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/options/GroupConversationOptions.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/details/options/GroupConversationOptions.kt
@@ -186,7 +186,7 @@ fun ConversationProtocolDetails(
             if (protocolInfo is Conversation.ProtocolInfo.MLS) {
                 ProtocolDetails(
                     label = UIText.StringResource(R.string.cipher_suite),
-                    text = UIText.DynamicString(protocolInfo.cipherSuite.name)
+                    text = UIText.DynamicString(protocolInfo.cipherSuite.toString())
                 )
 
                 if (BuildConfig.PRIVATE_BUILD) {
diff --git a/app/src/main/kotlin/com/wire/android/ui/settings/devices/EndToEndIdentityCertificateItem.kt b/app/src/main/kotlin/com/wire/android/ui/settings/devices/EndToEndIdentityCertificateItem.kt
index 76e472b72c7..f1d8baa5486 100644
--- a/app/src/main/kotlin/com/wire/android/ui/settings/devices/EndToEndIdentityCertificateItem.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/settings/devices/EndToEndIdentityCertificateItem.kt
@@ -199,9 +199,11 @@ fun PreviewEndToEndIdentityCertificateItem() {
         isE2eiCertificateActivated = true,
         isCurrentDevice = false,
         certificate = E2eiCertificate(
+            userHandle = "user_handle",
             status = CertificateStatus.VALID,
             serialNumber = "e5:d5:e6:75:7e:04:86:07:14:3c:a0:ed:9a:8d:e4:fd",
             certificateDetail = "",
+            thumbprint = "thumbPrint",
             endAt = Instant.DISTANT_FUTURE
         ),
         isLoadingCertificate = false,
@@ -217,9 +219,11 @@ fun PreviewEndToEndIdentityCertificateSelfItem() {
         isE2eiCertificateActivated = true,
         isCurrentDevice = true,
         certificate = E2eiCertificate(
+            userHandle = "user_handle",
             status = CertificateStatus.VALID,
             serialNumber = "e5:d5:e6:75:7e:04:86:07:14:3c:a0:ed:9a:8d:e4:fd",
             certificateDetail = "",
+            thumbprint = "thumbPrint",
             endAt = Instant.DISTANT_FUTURE
         ),
         isLoadingCertificate = false,
diff --git a/app/src/main/kotlin/com/wire/android/ui/settings/devices/model/DeviceDetailsState.kt b/app/src/main/kotlin/com/wire/android/ui/settings/devices/model/DeviceDetailsState.kt
index 784f0d38fb1..f19965a0e85 100644
--- a/app/src/main/kotlin/com/wire/android/ui/settings/devices/model/DeviceDetailsState.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/settings/devices/model/DeviceDetailsState.kt
@@ -34,9 +34,11 @@ data class DeviceDetailsState(
     val userName: String? = null,
     val isE2eiCertificateActivated: Boolean = false,
     val e2eiCertificate: E2eiCertificate = E2eiCertificate(
+        userHandle = "",
         status = CertificateStatus.EXPIRED,
         serialNumber = "",
         certificateDetail = "",
+        thumbprint = "",
         endAt = Instant.DISTANT_FUTURE
     ),
     val canBeRemoved: Boolean = false,
diff --git a/build-logic/plugins/src/main/kotlin/com/wire/android/gradle/ComposeConfiguration.kt b/build-logic/plugins/src/main/kotlin/com/wire/android/gradle/ComposeConfiguration.kt
index 1391d51386a..ad2d219df5d 100644
--- a/build-logic/plugins/src/main/kotlin/com/wire/android/gradle/ComposeConfiguration.kt
+++ b/build-logic/plugins/src/main/kotlin/com/wire/android/gradle/ComposeConfiguration.kt
@@ -22,7 +22,7 @@ import findVersion
 import org.gradle.api.Project
 
 internal fun Project.configureCompose(
-    commonExtension: CommonExtension<*, *, *, *, *>, // Add another `*` when upgrading AGP to 8.3
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ): Unit = with(commonExtension) {
     buildFeatures {
         compose = true
diff --git a/build-logic/plugins/src/main/kotlin/com/wire/android/gradle/KotlinAndroidConfiguration.kt b/build-logic/plugins/src/main/kotlin/com/wire/android/gradle/KotlinAndroidConfiguration.kt
index 708462915b1..7062102e62a 100644
--- a/build-logic/plugins/src/main/kotlin/com/wire/android/gradle/KotlinAndroidConfiguration.kt
+++ b/build-logic/plugins/src/main/kotlin/com/wire/android/gradle/KotlinAndroidConfiguration.kt
@@ -31,7 +31,7 @@ import versionCatalog
 import findLibrary
 
 internal fun Project.configureKotlinAndroid(
-    commonExtension: CommonExtension<*, *, *, *, *>, // Add another `*` when upgrading AGP to 8.3
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ): Unit = with(commonExtension) {
     compileSdk = AndroidSdk.compile
 
@@ -76,7 +76,7 @@ private fun Project.configureKotlin() {
     }
 }
 
-private fun CommonExtension<*, *, *, *, *>.configureLint(project: Project) {
+private fun CommonExtension<*, *, *, *, *, *>.configureLint(project: Project) {
     lint {
         showAll = true
         explainIssues = true
@@ -99,8 +99,7 @@ private fun CommonExtension<*, *, *, *, *>.configureLint(project: Project) {
     }
 }
 
-// Add another `*` when upgrading AGP to 8.3
-internal fun CommonExtension<*, *, *, *, *>.configureAndroidKotlinTests() {
+internal fun CommonExtension<*, *, *, *, *, *>.configureAndroidKotlinTests() {
     defaultConfig {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments.putAll(
diff --git a/core/ui-common/lint-baseline.xml b/core/ui-common/lint-baseline.xml
index 1b8bad39529..8531a75f935 100644
--- a/core/ui-common/lint-baseline.xml
+++ b/core/ui-common/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.2.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.0)" variant="all" version="8.2.0">
+<issues format="6" by="lint 8.3.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0)" variant="all" version="8.3.0">
 
     <issue
         id="ComposeComposableModifier"
@@ -67,17 +67,6 @@
             column="9"/>
     </issue>
 
-    <issue
-        id="ComposeModifierMissing"
-        message="This @Composable function emits content but doesn&apos;t have a modifier parameter.See https://slackhq.github.io/compose-lints/rules/#when-should-i-expose-modifier-parameters for more information."
-        errorLine1="fun MenuModalSheetContent("
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/common/bottomsheet/WireModalSheetLayout.kt"
-            line="87"
-            column="5"/>
-    </issue>
-
     <issue
         id="ComposeModifierReused"
         message="Modifiers should only be used once and by the root level layout of a Composable. This is true even if appended to or with other modifiers e.g. modifier.fillMaxWidth().Use Modifier (with a capital &apos;M&apos;) to construct a new Modifier that you can pass to other composables.See https://slackhq.github.io/compose-lints/rules/#dont-re-use-modifiers for more information."
@@ -254,28 +243,6 @@
             column="32"/>
     </issue>
 
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [sheetState: WireModalSheetState, coroutineScope: CoroutineScope, header: MenuModalSheetHeader = MenuModalSheetHeader.Gone, menuItems: List&lt;@Composable () -> Unit>] but should be [sheetState: WireModalSheetState, coroutineScope: CoroutineScope, menuItems: List&lt;@Composable () -> Unit>, header: MenuModalSheetHeader = MenuModalSheetHeader.Gone].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="fun MenuModalSheetLayout("
-        errorLine2="                        ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/common/bottomsheet/WireModalSheetLayout.kt"
-            line="73"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [header: MenuModalSheetHeader = MenuModalSheetHeader.Gone, menuItems: List&lt;@Composable () -> Unit>] but should be [menuItems: List&lt;@Composable () -> Unit>, header: MenuModalSheetHeader = MenuModalSheetHeader.Gone].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="fun MenuModalSheetContent("
-        errorLine2="                         ^">
-        <location
-            file="src/main/kotlin/com/wire/android/ui/common/bottomsheet/WireModalSheetLayout.kt"
-            line="87"
-            column="26"/>
-    </issue>
-
     <issue
         id="ComposeParameterOrder"
         message="    Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;    Current params are: [onClick: () -> Unit, loading: Boolean = false, leadingIcon: @Composable (() -> Unit)? = null, leadingIconAlignment: IconAlignment = IconAlignment.Center, trailingIcon: @Composable (() -> Unit)? = null, trailingIconAlignment: IconAlignment = IconAlignment.Border, text: String? = null, fillMaxWidth: Boolean = true, textStyle: TextStyle = if (fillMaxWidth) MaterialTheme.wireTypography.button02 else MaterialTheme.wireTypography.button03, state: WireButtonState = WireButtonState.Default, clickBlockParams: ClickBlockParams = ClickBlockParams(), minSize: DpSize = MaterialTheme.wireDimensions.buttonMinSize, minClickableSize: DpSize = MaterialTheme.wireDimensions.buttonMinClickableSize, shape: Shape = RoundedCornerShape(MaterialTheme.wireDimensions.buttonCornerSize), colors: WireButtonColors = wirePrimaryButtonColors(), elevation: ButtonElevation? = ButtonDefaults.buttonElevation(), borderWidth: Dp = 0.dp, contentPadding: PaddingValues = PaddingValues(&#xA;    horizontal = MaterialTheme.wireDimensions.buttonHorizontalContentPadding,&#xA;    vertical = MaterialTheme.wireDimensions.buttonVerticalContentPadding&#xA;), interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, modifier: Modifier = Modifier] but should be [onClick: () -> Unit, modifier: Modifier = Modifier, loading: Boolean = false, leadingIcon: @Composable (() -> Unit)? = null, leadingIconAlignment: IconAlignment = IconAlignment.Center, trailingIcon: @Composable (() -> Unit)? = null, trailingIconAlignment: IconAlignment = IconAlignment.Border, text: String? = null, fillMaxWidth: Boolean = true, textStyle: TextStyle = if (fillMaxWidth) MaterialTheme.wireTypography.button02 else MaterialTheme.wireTypography.button03, state: WireButtonState = WireButtonState.Default, clickBlockParams: ClickBlockParams = ClickBlockParams(), minSize: DpSize = MaterialTheme.wireDimensions.buttonMinSize, minClickableSize: DpSize = MaterialTheme.wireDimensions.buttonMinClickableSize, shape: Shape = RoundedCornerShape(MaterialTheme.wireDimensions.buttonCornerSize), colors: WireButtonColors = wirePrimaryButtonColors(), elevation: ButtonElevation? = ButtonDefaults.buttonElevation(), borderWidth: Dp = 0.dp, contentPadding: PaddingValues = PaddingValues(&#xA;    horizontal = MaterialTheme.wireDimensions.buttonHorizontalContentPadding,&#xA;    vertical = MaterialTheme.wireDimensions.buttonVerticalContentPadding&#xA;), interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }].&#xA;    See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4800612d202..a3293be3d05 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 # Gradle - Remind to change in `gradle-wrapper.properties` file as well!
 androidJunit5 = "1.10.0.0"
-gradle = "8.5"
+gradle = "8.8"
 
 # Kotlin
 grgitCore = "5.2.2"
@@ -17,7 +17,7 @@ ktx-serialization = "1.6.3"
 detekt = "1.23.6"
 google-gms = "4.4.1"
 gms-location = "21.2.0"
-android-gradlePlugin = "8.2.0"
+android-gradlePlugin = "8.3.2"
 desugaring = "2.0.4"
 firebaseBOM = "32.8.1"
 fragment = "1.5.6"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d7b7df5d442..74c71905115 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -18,6 +18,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kalium b/kalium
index 323fad3c7ba..1a6e1f197a9 160000
--- a/kalium
+++ b/kalium
@@ -1 +1 @@
-Subproject commit 323fad3c7ba910ccafaa3a279007d5ace1607e8c
+Subproject commit 1a6e1f197a9f3004d1d2ba0c99652e7c5f6f7de7

From 202c1937091963c8358db1f64cc6238cc4cc98e7 Mon Sep 17 00:00:00 2001
From: Vitor Hugo Schwaab <vitor@schwaab.dev>
Date: Thu, 6 Jun 2024 10:50:09 +0200
Subject: [PATCH 2/2] chore: update kalium reference

---
 kalium | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kalium b/kalium
index 1a6e1f197a9..749b0ed5983 160000
--- a/kalium
+++ b/kalium
@@ -1 +1 @@
-Subproject commit 1a6e1f197a9f3004d1d2ba0c99652e7c5f6f7de7
+Subproject commit 749b0ed598338f334cec39de485319f48faf7005