From 95ecbe664d70cdafc6831970e78ce05cf5a3aa46 Mon Sep 17 00:00:00 2001
From: bemusementpark <bemusementpark>
Date: Thu, 11 Jul 2024 11:26:41 +0930
Subject: [PATCH] SES-2386 Account Creation Modal

---
 .../securesms/onboarding/OnboardingBackPressAlertDialog.kt  | 4 +++-
 .../onboarding/messagenotifications/MessageNotifications.kt | 2 +-
 .../securesms/onboarding/pickname/PickDisplayName.kt        | 6 +++++-
 app/src/main/res/values/strings.xml                         | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/OnboardingBackPressAlertDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/OnboardingBackPressAlertDialog.kt
index 3e6ac4a0c9..c620f32b6a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/OnboardingBackPressAlertDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/OnboardingBackPressAlertDialog.kt
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.onboarding
 
+import androidx.annotation.StringRes
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import network.loki.messenger.R
@@ -11,12 +12,13 @@ import org.thoughtcrime.securesms.ui.color.LocalColors
 @Composable
 fun OnboardingBackPressAlertDialog(
     dismissDialog: () -> Unit,
+    @StringRes textId: Int = R.string.you_cannot_go_back_further_in_order_to_stop_loading_your_account_session_needs_to_quit,
     quit: () -> Unit
 ) {
     AlertDialog(
         onDismissRequest = dismissDialog,
         title = stringResource(R.string.warning),
-        text = stringResource(R.string.you_cannot_go_back_further_in_order_to_stop_loading_your_account_session_needs_to_quit),
+        text = stringResource(textId),
         buttons = listOf(
             DialogButtonModel(
                 GetString(stringResource(R.string.quit)),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt
index dcd3975c45..c8cc30ce79 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt
@@ -58,7 +58,7 @@ internal fun MessageNotificationsScreen(
         return
     }
 
-    if (state.showDialog) OnboardingBackPressAlertDialog(dismissDialog, quit)
+    if (state.showDialog) OnboardingBackPressAlertDialog(dismissDialog, quit = quit)
 
     Column {
         Spacer(Modifier.weight(1f))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayName.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayName.kt
index 0a3a50370a..f5e6e1a9a4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayName.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayName.kt
@@ -40,7 +40,11 @@ internal fun PickDisplayName(
     quit: () -> Unit = {}
 ) {
 
-    if (state.showDialog) OnboardingBackPressAlertDialog(dismissDialog, quit)
+    if (state.showDialog) OnboardingBackPressAlertDialog(
+        dismissDialog,
+        R.string.you_cannot_go_back_further_cancel_account_creation,
+        quit
+    )
 
     Column(
         modifier = Modifier
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cb27192dee..a0d6975547 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1140,5 +1140,6 @@
     <string name="AccessibilityId_qr_code">QR code</string>
     <string name="warning">Warning</string>
     <string name="you_cannot_go_back_further_in_order_to_stop_loading_your_account_session_needs_to_quit">You cannot go back further. In order to stop loading your account, Session needs to quit.</string>
+    <string name="you_cannot_go_back_further_cancel_account_creation">You cannot go back further. In order to cancel your account creation, Session needs to quit.</string>
     <string name="quit">Quit</string>
 </resources>