From faba4682ed73dfcecf0a6582fd359ea15b3013fe Mon Sep 17 00:00:00 2001
From: jeffrey-signal <jeffrey@signal.org>
Date: Fri, 26 Sep 2025 13:01:38 -0400
Subject: [PATCH] Fix indeterminate progress dialog animation.

---
 .../org/signal/core/ui/compose/Dialogs.kt     | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Dialogs.kt b/core-ui/src/main/java/org/signal/core/ui/compose/Dialogs.kt
index 3625c0ae48..72bcb8e230 100644
--- a/core-ui/src/main/java/org/signal/core/ui/compose/Dialogs.kt
+++ b/core-ui/src/main/java/org/signal/core/ui/compose/Dialogs.kt
@@ -202,21 +202,24 @@ object Dialogs {
   fun IndeterminateProgressDialog(
     onDismissRequest: () -> Unit = {}
   ) {
-    BaseAlertDialog(
-      onDismissRequest = onDismissRequest,
-      confirmButton = {},
-      dismissButton = {},
-      text = {
+    Dialog(
+      onDismissRequest = onDismissRequest
+    ) {
+      Surface(
+        modifier = Modifier.size(100.dp),
+        shape = Defaults.shape,
+        color = Defaults.containerColor,
+        tonalElevation = Defaults.TonalElevation
+      ) {
         CircularProgressIndicator(
           modifier = Modifier
             .fillMaxWidth()
             .fillMaxHeight()
+            .padding(24.dp)
             .testTag("dialog-circular-progress-indicator")
         )
-      },
-      modifier = Modifier
-        .size(100.dp)
-    )
+      }
+    }
   }
 
   /**
@@ -513,7 +516,9 @@ object Dialogs {
 
           FlowRow(
             horizontalArrangement = Arrangement.End,
-            modifier = Modifier.fillMaxWidth().padding(bottom = 16.dp)
+            modifier = Modifier
+              .fillMaxWidth()
+              .padding(bottom = 16.dp)
           ) {
             TextButton(onClick = onDismissRequest) {
               Text(text = stringResource(R.string.cancel))