From 213cbcd9ad0de6311f58f4305eb05e04e66cf965 Mon Sep 17 00:00:00 2001
From: Pete Walters <pete@signal.org>
Date: Tue, 9 Jun 2026 16:53:12 -0500
Subject: [PATCH] Remove option to enter recovery key from PIN entry screen.

---
 .../RegistrationNavigationController.swift    | 11 ---------
 .../RegistrationPinViewController.swift       | 23 -------------------
 .../translations/en.lproj/Localizable.strings |  6 -----
 3 files changed, 40 deletions(-)

diff --git a/Signal/Registration/UserInterface/RegistrationNavigationController.swift b/Signal/Registration/UserInterface/RegistrationNavigationController.swift
index 29a03988cc..fde527b7ac 100644
--- a/Signal/Registration/UserInterface/RegistrationNavigationController.swift
+++ b/Signal/Registration/UserInterface/RegistrationNavigationController.swift
@@ -624,17 +624,6 @@ extension RegistrationNavigationController: RegistrationPinPresenter {
     func submitWithCreateNewPinInstead() {
         pushNextController(coordinator.skipAndCreateNewPINCode())
     }
-
-    func enterRecoveryKey() {
-        pushNextController(
-            .value(.enterRecoveryKey(
-                RegistrationEnterAccountEntropyPoolState(
-                    canShowBackButton: true,
-                    canShowNoKeyHelpButton: false,
-                ),
-            )),
-        )
-    }
 }
 
 extension RegistrationNavigationController: RegistrationPinAttemptsExhaustedAndMustCreateNewPinPresenter {
diff --git a/Signal/Registration/UserInterface/RegistrationPinViewController.swift b/Signal/Registration/UserInterface/RegistrationPinViewController.swift
index 44d59cd47b..5b813553fb 100644
--- a/Signal/Registration/UserInterface/RegistrationPinViewController.swift
+++ b/Signal/Registration/UserInterface/RegistrationPinViewController.swift
@@ -89,8 +89,6 @@ protocol RegistrationPinPresenter: AnyObject {
     func submitWithCreateNewPinInstead()
 
     func exitRegistration()
-
-    func enterRecoveryKey()
 }
 
 // MARK: - RegistrationPinViewController
@@ -454,18 +452,6 @@ class RegistrationPinViewController: OWSViewController {
             ))
         }
 
-        actions.append(
-            UIAction(
-                title: OWSLocalizedString(
-                    "PIN_ENTER_EXISTING_USE_RECOVERY_KEY",
-                    comment: "If the user is re-registering, they need to enter their PIN to restore all their data. If they don't remember their PIN, they may remember their Recovery Key which can be used instead of a PIN.",
-                ),
-                handler: { [weak self] _ in
-                    self?.presenter?.enterRecoveryKey()
-                },
-            ),
-        )
-
         if let exitAction = exitAction() {
             actions.append(exitAction)
         }
@@ -682,15 +668,6 @@ class RegistrationPinViewController: OWSViewController {
             }
         }
 
-        actionSheet.addAction(.init(
-            title: OWSLocalizedString(
-                "ONBOARDING_2FA_SKIP_AND_USE_RECOVERY_KEY",
-                comment: "Label for action to use Recovery Key instead of PIN for registration.",
-            ),
-        ) { [weak self] _ in
-            self?.presenter?.enterRecoveryKey()
-        })
-
         actionSheet.addAction(.init(title: CommonStrings.contactSupport) { [weak self] _ in
             guard let self else { return }
             ContactSupportActionSheet.present(
diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings
index 12431280c5..b3beddb7fa 100644
--- a/Signal/translations/en.lproj/Localizable.strings
+++ b/Signal/translations/en.lproj/Localizable.strings
@@ -6073,9 +6073,6 @@
 /* Label for the 'skip and create new pin' button when reglock is disabled during onboarding. */
 "ONBOARDING_2FA_SKIP_AND_CREATE_NEW_PIN" = "Skip and Create New PIN";
 
-/* Label for action to use Recovery Key instead of PIN for registration. */
-"ONBOARDING_2FA_SKIP_AND_USE_RECOVERY_KEY" = "Use Recovery Key";
-
 /* Explanation for the skip pin entry action sheet during onboarding. */
 "ONBOARDING_2FA_SKIP_PIN_ENTRY_MESSAGE" = "If you can’t remember your PIN, you can create a new one. You can register and use your account but you’ll lose some saved settings like your profile information.";
 
@@ -6940,9 +6937,6 @@
 /* If the user is re-registering, they need to enter their PIN to restore all their data. In some cases, they can skip this entry and lose some data. This text is shown on a button that lets them begin to do this. */
 "PIN_ENTER_EXISTING_SKIP" = "Skip PIN";
 
-/* If the user is re-registering, they need to enter their PIN to restore all their data. If they don't remember their PIN, they may remember their Recovery Key which can be used instead of a PIN. */
-"PIN_ENTER_EXISTING_USE_RECOVERY_KEY" = "Use Recovery Key";
-
 /* The explanation for the 'pin reminder' dialog. */
 "PIN_REMINDER_EXPLANATION" = "To help you memorize your PIN, we’ll ask you to enter it periodically. We’ll ask less over time.";