Use AsyncView in EditUserProfileView

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt

@@ -149,12 +149,11 @@ fun ConfigureRoomView(
         onActionSelected = { state.eventSink(ConfigureRoomEvents.HandleAvatarAction(it)) }
     )
 
-    val errorMessage = stringResource(R.string.screen_create_room_error_creating_room)
     AsyncView(
         async = state.createRoomAction,
         progressText = stringResource(CommonStrings.common_creating_room),
         onSuccess = { onRoomCreated(it) },
-        errorTransform = { errorMessage },
+        errorMessage = {  stringResource(R.string.screen_create_room_error_creating_room) },
         onRetry = { state.eventSink(ConfigureRoomEvents.CreateRoom(state.config)) },
         onErrorDismiss = { state.eventSink(ConfigureRoomEvents.CancelCreateRoom) },
     )

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt

@@ -93,12 +93,11 @@ fun CreateRoomRootView(
         }
     }
 
-    val errorMessage = stringResource(R.string.screen_start_chat_error_starting_chat)
     AsyncView(
         async = state.startDmAction,
         progressText = stringResource(CommonStrings.common_starting_chat),
         onSuccess = { onOpenDM(it) },
-        errorTransform = { errorMessage },
+        errorMessage = { stringResource(R.string.screen_start_chat_error_starting_chat) },
         onRetry = {
             state.userListState.selectedUsers.firstOrNull()
                 ?.let { state.eventSink(CreateRoomRootEvents.StartDM(it)) }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt

@@ -63,12 +63,11 @@ fun ReportMessageView(
 ) {
     val focusManager = LocalFocusManager.current
     val isSending = state.result is Async.Loading
-    val errorMessage = stringResource(CommonStrings.error_unknown)
     AsyncView(
         async = state.result,
         showProgressDialog = false,
         onSuccess = { onBackClicked() },
-        errorTransform = { errorMessage },
+        errorMessage = { stringResource(CommonStrings.error_unknown) },
         onErrorDismiss = { state.eventSink(ReportMessageEvents.ClearError) }
     )
 

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt

@@ -78,10 +78,9 @@ fun NotificationSettingsView(
 //                onCallsNotificationsChanged = { state.eventSink(NotificationSettingsEvents.SetCallNotificationsEnabled(it)) },
             )
         }
-        val errorMessage = stringResource(CommonStrings.screen_notification_settings_edit_failed_updating_default_mode)
         AsyncView(
             async = state.changeNotificationSettingAction,
-            errorTransform = { errorMessage },
+            errorMessage = { stringResource(CommonStrings.screen_notification_settings_edit_failed_updating_default_mode) },
             onErrorDismiss = { state.eventSink(NotificationSettingsEvents.ClearNotificationChangeError) },
             onSuccess = {},
         )

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingView.kt

@@ -115,10 +115,9 @@ fun EditDefaultNotificationSettingView(
                 }
             }
         }
-        val errorMessage = stringResource(CommonStrings.screen_notification_settings_edit_failed_updating_default_mode)
         AsyncView(
             async = state.changeNotificationSettingAction,
-            errorTransform = { errorMessage },
+            errorMessage = { stringResource(CommonStrings.screen_notification_settings_edit_failed_updating_default_mode) },
             onErrorDismiss = { state.eventSink(EditDefaultNotificationSettingStateEvents.ClearError) },
             onSuccess = {},
         )

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileView.kt

@@ -31,7 +31,6 @@ import androidx.compose.material.ModalBottomSheetValue
 import androidx.compose.material.rememberModalBottomSheetState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -43,14 +42,12 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.features.preferences.impl.R
-import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.designsystem.components.LabelledOutlinedTextField
-import io.element.android.libraries.designsystem.components.ProgressDialog
+import io.element.android.libraries.designsystem.components.async.AsyncView
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.button.BackButton
-import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
-import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.aliasScreenTitle
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
@@ -150,24 +147,14 @@ fun EditUserProfileView(
             onActionSelected = { state.eventSink(EditUserProfileEvents.HandleAvatarAction(it)) }
         )
 
-        when (state.saveAction) {
+        AsyncView(
-            is Async.Loading -> {
+            async = state.saveAction,
-                ProgressDialog(text = stringResource(R.string.screen_edit_profile_updating_details))
+            progressText = stringResource(R.string.screen_edit_profile_updating_details),
-            }
+            onSuccess = { onProfileEdited() },
-            is Async.Failure -> {
+            errorTitle = { stringResource(R.string.screen_edit_profile_error_title) },
-                ErrorDialog(
+            errorMessage = { stringResource(R.string.screen_edit_profile_error) },
-                    title = stringResource(R.string.screen_edit_profile_error_title),
+            onErrorDismiss = { state.eventSink(EditUserProfileEvents.CancelSaveChanges) },
-                    content = stringResource(R.string.screen_edit_profile_error),
+        )
-                    onDismiss = { state.eventSink(EditUserProfileEvents.CancelSaveChanges) },
-                )
-            }
-            is Async.Success -> {
-                LaunchedEffect(state.saveAction) {
-                    onProfileEdited()
-                }
-            }
-            else -> Unit
-        }
     }
     PermissionsView(
         state = state.cameraPermissionState,

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncView.kt

@@ -23,6 +23,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.designsystem.components.ProgressDialog
 import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
+import io.element.android.libraries.designsystem.components.dialogs.ErrorDialogDefaults
 import io.element.android.libraries.designsystem.components.dialogs.RetryDialog
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@@ -30,7 +31,7 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 /**
  * Render an Async object.
  * - If Success, invoke the callback [onSuccess], only once.
- * - If Failure, display a dialog with the error, which can be transformed, using [errorTransform]. When
+ * - If Failure, display a dialog with the error, which can be transformed, using [errorMessage]. When
  * closed, [onErrorDismiss] will be invoked. If [onRetry] is not null, a retry button will be displayed.
  * - When loading, display a loading dialog, if [showProgressDialog] is true, with on optional [progressText].
  */
@@ -42,9 +43,11 @@ fun <T> AsyncView(
     modifier: Modifier = Modifier,
     showProgressDialog: Boolean = true,
     progressText: String? = null,
-    errorTransform: (Throwable) -> String = { it.message ?: it.toString() },
+    errorTitle: @Composable (Throwable) -> String = { ErrorDialogDefaults.title },
+    errorMessage: @Composable (Throwable) -> String = { it.message ?: it.toString() },
     onRetry: (() -> Unit)? = null,
 ) {
+
     when (async) {
         Async.Uninitialized -> Unit
         is Async.Loading -> {
@@ -59,13 +62,15 @@ fun <T> AsyncView(
             if (onRetry == null) {
                 ErrorDialog(
                     modifier = modifier,
-                    content = errorTransform(async.error),
+                    title = errorTitle(async.error),
+                    content = errorMessage(async.error),
                     onDismiss = onErrorDismiss
                 )
             } else {
                 RetryDialog(
                     modifier = modifier,
-                    content = errorTransform(async.error),
+                    title = errorTitle(async.error),
+                    content = errorMessage(async.error),
                     onDismiss = onErrorDismiss,
                     onRetry = onRetry,
                 )