From 9a04cd9e3b517485ed64d6c1625671fcbf68cdf1 Mon Sep 17 00:00:00 2001
From: Michelle Tang <mtang@signal.org>
Date: Wed, 11 Feb 2026 14:19:31 -0500
Subject: [PATCH] Move education sheet to safety numbers screen.

---
 .../conversation/v2/ConversationFragment.kt          | 12 ------------
 .../verify/VerifyAutomaticallyEducationSheet.kt      |  7 +------
 .../securesms/verify/VerifyDisplayFragment.kt        |  4 ++++
 app/src/main/res/values/strings.xml                  |  2 +-
 4 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index f204382a36..3af08a4c73 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -369,7 +369,6 @@ import org.thoughtcrime.securesms.util.setIncognitoKeyboardEnabled
 import org.thoughtcrime.securesms.util.toMillis
 import org.thoughtcrime.securesms.util.viewModel
 import org.thoughtcrime.securesms.util.visible
-import org.thoughtcrime.securesms.verify.VerifyAutomaticallyEducationSheet
 import org.thoughtcrime.securesms.verify.VerifyIdentityActivity
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaper
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaperDimLevelUtil
@@ -1473,17 +1472,6 @@ class ConversationFragment :
   private fun presentIdentityRecordsState(identityRecordsState: IdentityRecordsState) {
     binding.conversationTitleView.root.setVerified(identityRecordsState.isVerified)
 
-    if (RemoteConfig.internalUser && SignalStore.settings.automaticVerificationEnabled && !SignalStore.uiHints.hasSeenVerifyAutomaticallySheet() && viewModel.recipientSnapshot?.isIndividual == true && viewModel.recipientSnapshot?.isSelf == false) {
-      VerifyAutomaticallyEducationSheet.show(parentFragmentManager)
-
-      parentFragmentManager.setFragmentResultListener(VerifyAutomaticallyEducationSheet.RESULT_KEY, requireActivity()) { _, bundle ->
-        val shouldVerify = bundle.getBoolean(VerifyAutomaticallyEducationSheet.RESULT_KEY, false)
-        if (shouldVerify) {
-          VerifyIdentityActivity.startOrShowExchangeMessagesDialog(requireContext(), identityRecordsState.identityRecords.identityRecords.first())
-        }
-      }
-    }
-
     if (identityRecordsState.isUnverified) {
       binding.conversationBanner.showUnverifiedBanner(identityRecordsState.identityRecords)
     } else {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyAutomaticallyEducationSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyAutomaticallyEducationSheet.kt
index 62d2cc2987..5019a1bb54 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyAutomaticallyEducationSheet.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyAutomaticallyEducationSheet.kt
@@ -18,9 +18,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import androidx.core.os.bundleOf
 import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.setFragmentResult
 import org.signal.core.ui.BottomSheetUtil
 import org.signal.core.ui.compose.BottomSheets
 import org.signal.core.ui.compose.Buttons
@@ -40,8 +38,6 @@ class VerifyAutomaticallyEducationSheet : ComposeBottomSheetDialogFragment() {
 
   companion object {
 
-    const val RESULT_KEY = "verify_result_key"
-
     @JvmStatic
     fun show(fragmentManager: FragmentManager) {
       VerifyAutomaticallyEducationSheet().show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)
@@ -57,7 +53,6 @@ class VerifyAutomaticallyEducationSheet : ComposeBottomSheetDialogFragment() {
   override fun SheetContent() {
     VerifyEducationSheet(
       onVerify = {
-        setFragmentResult(RESULT_KEY, bundleOf(RESULT_KEY to true))
         dismissAllowingStateLoss()
       },
       onLearnMore = {
@@ -115,7 +110,7 @@ fun VerifyEducationSheet(
       Buttons.LargeTonal(
         onClick = onVerify
       ) {
-        Text(stringResource(id = R.string.VerifyAutomaticallyEducationSheet__verify))
+        Text(stringResource(id = R.string.VerifyAutomaticallyEducationSheet__continue))
       }
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayFragment.kt
index 6cf78dafda..64bd83c6c0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayFragment.kt
@@ -73,6 +73,10 @@ class VerifyDisplayFragment : Fragment() {
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     initializeViewModel()
 
+    if (RemoteConfig.internalUser && SignalStore.settings.automaticVerificationEnabled && !SignalStore.uiHints.hasSeenVerifyAutomaticallySheet()) {
+      VerifyAutomaticallyEducationSheet.show(parentFragmentManager)
+    }
+
     updateVerifyButton(requireArguments().getBoolean(VERIFIED_STATE, false), false)
 
     binding.automaticVerification.visible = RemoteConfig.internalUser && SignalStore.settings.automaticVerificationEnabled
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d6c25224c9..0e6ec47c90 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3870,7 +3870,7 @@
     <!-- Button to learn more about automatic verification -->
     <string name="VerifyAutomaticallyEducationSheet__learn_more">Learn more</string>
     <!-- Button to go to verification page -->
-    <string name="VerifyAutomaticallyEducationSheet__verify">Verify</string>
+    <string name="VerifyAutomaticallyEducationSheet__continue">Continue</string>
 
     <!-- Title for bottom sheet when self verification fails -->
     <string name="SelfVerificationFailureSheet__title">Automatic Key Verification is currently unavailable for your device. Submit debug log?</string>