From 6f5bc03b96fc4ee5b0fca21eeb6bafda118aba98 Mon Sep 17 00:00:00 2001 From: sashaweiss-signal Date: Tue, 2 Jun 2026 08:24:39 -0700 Subject: [PATCH] Finalize new AEP after popping to BackupSettingsVC In the "disabling Backups to rotate my AEP" case, we may end up presenting action sheets. To that end, make sure we're at Backup Settings before we get there. --- Signal/Backups/BackupSettingsViewController.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/Backups/BackupSettingsViewController.swift b/Signal/Backups/BackupSettingsViewController.swift index c513c8a2a3..60fe6ae9e3 100644 --- a/Signal/Backups/BackupSettingsViewController.swift +++ b/Signal/Backups/BackupSettingsViewController.swift @@ -1435,10 +1435,10 @@ class BackupSettingsViewController: onConfirmed: { [weak self] _ in guard let self else { return } - self.finalizeNewRecoveryKey(newCandidateAEP: newCandidateAEP) - // Pop all the way back to Backup Settings. navigationController?.popToViewController(self, animated: true) { + self.finalizeNewRecoveryKey(newCandidateAEP: newCandidateAEP) + self.presentToast(text: OWSLocalizedString( "BACKUP_SETTINGS_CREATE_NEW_KEY_SUCCESS_TOAST", comment: "Toast shown when a new Recovery Key has been created successfully.",