From a662a5a04573ee0af4f499beff910931d4995274 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 21 Apr 2026 14:32:11 +0200
Subject: [PATCH] Use new `action_delete` and `action_delete_account`

---
 .../android/features/logout/impl/AccountDeactivationView.kt | 2 +-
 .../logout/impl/ui/AccountDeactivationConfirmationDialog.kt | 2 +-
 .../features/logout/impl/AccountDeactivationViewTest.kt     | 2 +-
 .../features/preferences/impl/root/PreferencesRootView.kt   | 2 +-
 .../preferences/impl/root/PreferencesRootViewTest.kt        | 4 ++--
 libraries/ui-strings/src/main/res/values/localazy.xml       | 6 ++++--
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationView.kt b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationView.kt
index c0d625a45e..352efdfb92 100644
--- a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationView.kt
+++ b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationView.kt
@@ -135,7 +135,7 @@ private fun ColumnScope.Buttons(
 ) {
     val logoutAction = state.accountDeactivationAction
     Button(
-        text = stringResource(CommonStrings.action_deactivate),
+        text = stringResource(CommonStrings.action_delete),
         showProgress = logoutAction is AsyncAction.Loading,
         destructive = true,
         enabled = state.submitEnabled,
diff --git a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/AccountDeactivationConfirmationDialog.kt b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/AccountDeactivationConfirmationDialog.kt
index 905112a78d..ab9d87c543 100644
--- a/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/AccountDeactivationConfirmationDialog.kt
+++ b/features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/AccountDeactivationConfirmationDialog.kt
@@ -22,7 +22,7 @@ fun AccountDeactivationConfirmationDialog(
     ConfirmationDialog(
         title = stringResource(id = R.string.screen_deactivate_account_title),
         content = stringResource(R.string.screen_deactivate_account_confirmation_dialog_content),
-        submitText = stringResource(id = CommonStrings.action_deactivate),
+        submitText = stringResource(id = CommonStrings.action_delete),
         onSubmitClick = onSubmitClick,
         onDismiss = onDismiss,
         destructiveSubmit = true,
diff --git a/features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/AccountDeactivationViewTest.kt b/features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/AccountDeactivationViewTest.kt
index eff479d21c..26c942da1f 100644
--- a/features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/AccountDeactivationViewTest.kt
+++ b/features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/AccountDeactivationViewTest.kt
@@ -60,7 +60,7 @@ class AccountDeactivationViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-        rule.clickOn(CommonStrings.action_deactivate)
+        rule.clickOn(CommonStrings.action_delete)
         eventsRecorder.assertSingle(AccountDeactivationEvents.DeactivateAccount(false))
     }
 
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt
index 32ecfc2b13..4afc2d27bf 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt
@@ -278,7 +278,7 @@ private fun ColumnScope.GeneralSection(
     )
     if (state.canDeactivateAccount) {
         ListItem(
-            headlineContent = { Text(stringResource(id = CommonStrings.action_deactivate_account)) },
+            headlineContent = { Text(stringResource(id = CommonStrings.action_delete_account)) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Delete())),
             style = ListItemStyle.Destructive,
             onClick = onDeactivateClick,
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootViewTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootViewTest.kt
index e3c0d6e44d..da91bdbf86 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootViewTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootViewTest.kt
@@ -407,7 +407,7 @@ class PreferencesRootViewTest {
                 ),
                 onDeactivateClick = callback,
             )
-            rule.clickOn(CommonStrings.action_deactivate_account)
+            rule.clickOn(CommonStrings.action_delete_account)
         }
     }
 
@@ -420,7 +420,7 @@ class PreferencesRootViewTest {
                 eventSink = eventsRecorder,
             ),
         )
-        rule.onNodeWithText(rule.activity.getString(CommonStrings.action_deactivate_account)).assertDoesNotExist()
+        rule.onNodeWithText(rule.activity.getString(CommonStrings.action_delete_account)).assertDoesNotExist()
     }
 
     @Test
diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml
index 2982c78ca9..a8a7b90dee 100644
--- a/libraries/ui-strings/src/main/res/values/localazy.xml
+++ b/libraries/ui-strings/src/main/res/values/localazy.xml
@@ -84,10 +84,12 @@
   <string name="action_create">"Create"</string>
   <string name="action_create_room">"Create room"</string>
   <string name="action_create_space">"Create space"</string>
-  <string name="action_deactivate">"Delete"</string>
-  <string name="action_deactivate_account">"Delete account"</string>
+  <string name="action_deactivate">"Deactivate"</string>
+  <string name="action_deactivate_account">"Deactivate account"</string>
   <string name="action_decline">"Decline"</string>
   <string name="action_decline_and_block">"Decline and block"</string>
+  <string name="action_delete">"Delete"</string>
+  <string name="action_delete_account">"Delete account"</string>
   <string name="action_delete_poll">"Delete Poll"</string>
   <string name="action_deselect_all">"Deselect all"</string>
   <string name="action_disable">"Disable"</string>