fix: create conversation button crash [WPB-3538] (#2034)

wireapp · Aug 1, 2023 · ddf7845 · ddf7845
1 parent 143eca0
commit ddf7845
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/common/button/WireButton.kt b/app/src/main/kotlin/com/wire/android/ui/common/button/WireButton.kt
@@ -145,23 +145,25 @@ private fun InnerButtonBox(
     val contentColor = colors.contentColor(state, interactionSource).value
     val leadingItem: (@Composable () -> Unit) = { leadingIcon?.let { Tint(contentColor = contentColor, content = it) } }
     val trailingItem: (@Composable () -> Unit) = {
-        Crossfade(targetState = (trailingIcon != null) to loading) { (hasTrailingIcon, loading) ->
+        Crossfade(targetState = trailingIcon to loading) { (trailingIcon, loading) ->
             when {
-                hasTrailingIcon -> Tint(contentColor = contentColor, content = trailingIcon!!)
                 loading -> WireCircularProgressIndicator(progressColor = contentColor)
+                trailingIcon != null -> Tint(contentColor = contentColor, content = trailingIcon)
             }
         }
     }
-    Box(contentAlignment = Alignment.Center,
+    Box(
+        contentAlignment = Alignment.Center,
         modifier = if (fillMaxWidth) Modifier.fillMaxWidth() else Modifier.wrapContentWidth(),
     ) {
         var startItemWidth by remember { mutableStateOf(0) }
         var endItemWidth by remember { mutableStateOf(0) }
         val borderItemsMaxWidth = with(LocalDensity.current) { max(startItemWidth, endItemWidth).toDp() }
 
-        Box(modifier = Modifier
-            .align(Alignment.CenterStart)
-            .onGloballyPositioned { startItemWidth = it.size.width },
+        Box(
+            modifier = Modifier
+                .align(Alignment.CenterStart)
+                .onGloballyPositioned { startItemWidth = it.size.width },
         ) { if (leadingIconAlignment == IconAlignment.Border) leadingItem() }
 
         Row(