From c7fdb6aed94544dcbef278d26702f8d093bdd91c Mon Sep 17 00:00:00 2001
From: alansley <aclansley@gmail.com>
Date: Fri, 2 Aug 2024 14:21:11 +1000
Subject: [PATCH] Replaced string
 'dialog_disappearing_messages_follow_setting_confirm' with 'confirm'

---
 .../disappearingmessages/DisappearingMessages.kt            | 2 +-
 libsession/src/main/res/values/strings.xml                  | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessages.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessages.kt
index 236977457a..f2f6f6bb82 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessages.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/DisappearingMessages.kt
@@ -57,7 +57,7 @@ class DisappearingMessages @Inject constructor(
         })
 
         dangerButton(
-                text = if (message.expiresIn == 0L) R.string.dialog_disappearing_messages_follow_setting_confirm else R.string.set,
+                text = if (message.expiresIn == 0L) R.string.confirm else R.string.set,
                 contentDescription = if (message.expiresIn == 0L) R.string.AccessibilityId_confirm else R.string.AccessibilityId_set_button
         ) {
             set(message.threadId, message.recipient.address, message.expiryMode, message.recipient.isClosedGroupRecipient)
diff --git a/libsession/src/main/res/values/strings.xml b/libsession/src/main/res/values/strings.xml
index edcc3bb8b5..5a57f46d01 100644
--- a/libsession/src/main/res/values/strings.xml
+++ b/libsession/src/main/res/values/strings.xml
@@ -60,11 +60,6 @@
     -->
     <string name="activity_settings_upload">Upload</string>
 
-    <!-- REQUIRED: Used when a users follows the disappearing messages of another user to turn them off.
-         Figma: https://www.figma.com/design/tEgZ8ujg76DdtPwEJv8zFp/Disappearing-Messages?node-id=0-1&t=RmpaOwy9gz7ohKSE-0
-    -->
-    <string name="dialog_disappearing_messages_follow_setting_confirm">Confirm</string>
-
     <!-- USED as text for the Legacy ExpiryType enum defined in State.kt - however, I don' think
          there's any way to set "Legacy" disappearing messages any more, that's gone. Although we
          may still need to cater to _seeing_ Legacy disappearing messages from clients which haven't
@@ -256,6 +251,7 @@
     <string name="communityUnknown">Unknown Community</string>
     <string name="communityUrl">Community URL</string>
     <string name="communityUrlCopy">Copy Community URL</string>
+    <string name="confirm">Confirm</string>
     <string name="contactContacts">Contacts</string>
     <string name="contactDelete">Delete Contact</string>
     <string name="contactDeleteDescription">Are you sure you want to delete <b>{name}</b> from your contacts? New messages from <b>{name}</b> will arrive as a message request.</string>