From 957f473e77db8588859d053294eff4ec8d7c9398 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Wed, 25 Mar 2026 13:20:20 -0300
Subject: [PATCH] Ensure we upgrade properly from v1.

---
 .../app/backups/local/LocalBackupsFragment.kt        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/local/LocalBackupsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/local/LocalBackupsFragment.kt
index 8938838a3b..0c1f08703e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/local/LocalBackupsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/local/LocalBackupsFragment.kt
@@ -137,17 +137,17 @@ class LocalBackupsFragment : ComposeFragment() {
                 backupKey = state.accountEntropyPool.displayValue,
                 onNavigationClick = { requireActivity().onBackPressedDispatcher.onBackPressed() },
                 onNextClick = {
-                  if (!backstack.contains(LocalBackupsNavKey.SETTINGS)) {
-                    backstack.add(0, LocalBackupsNavKey.SETTINGS)
-                  }
-
-                  backstack.removeAll { it != LocalBackupsNavKey.SETTINGS }
-
                   scope.launch {
                     upgradeInProgress = true
                     viewModel.handleUpgrade(requireContext())
                     upgradeInProgress = false
 
+                    if (!backstack.contains(LocalBackupsNavKey.SETTINGS)) {
+                      backstack.add(0, LocalBackupsNavKey.SETTINGS)
+                    }
+
+                    backstack.removeAll { it != LocalBackupsNavKey.SETTINGS }
+
                     snackbarHostState.showSnackbar(
                       message = backupKeyUpdatedMessage
                     )