From 620d68b4d9376411f9419a8a3bb59b94a85b1c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Bj=C3=B6rkert?= <jonas@bjorkert.se>
Date: Sun, 1 Nov 2026 19:15:52 +0100
Subject: [PATCH] Remove migration step 2 and add release dates to the
 remaining migration steps

---
 LoopFollow/Storage/Storage+Migrate.swift            | 12 ------------
 LoopFollow/ViewControllers/MainViewController.swift | 11 +++++------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/LoopFollow/Storage/Storage+Migrate.swift b/LoopFollow/Storage/Storage+Migrate.swift
index 34022aff0..93d9bc0f5 100644
--- a/LoopFollow/Storage/Storage+Migrate.swift
+++ b/LoopFollow/Storage/Storage+Migrate.swift
@@ -186,18 +186,6 @@ extension Storage {
         }
     }
 
-    func migrateStep2() {
-        // Migrate from old system to new position-based system
-        if remoteType.value != .none {
-            remotePosition.value = .position2
-            alarmsPosition.value = .menu
-        } else {
-            alarmsPosition.value = .position2
-            remotePosition.value = .menu
-        }
-        nightscoutPosition.value = .position4
-    }
-
     // MARK: - Migration helpers (can be removed when step 5 is removed)
 
     /// Check whether a tab item's position was explicitly stored in UserDefaults
diff --git a/LoopFollow/ViewControllers/MainViewController.swift b/LoopFollow/ViewControllers/MainViewController.swift
index dce0b6611..7da12dc7a 100644
--- a/LoopFollow/ViewControllers/MainViewController.swift
+++ b/LoopFollow/ViewControllers/MainViewController.swift
@@ -639,12 +639,6 @@ class MainViewController: UIViewController, UNUserNotificationCenterDelegate {
         //   2. Update any other StorageValue defaults in Storage.swift that this new step
         //      mutates, so a fresh install ends up in the same state as a migrated user.
 
-        // Step 2: Released in v3.1.0 (2025-07-21). Can be removed after 2026-07-21.
-        if Storage.shared.migrationStep.value < 2 {
-            Storage.shared.migrateStep2()
-            Storage.shared.migrationStep.value = 2
-        }
-
         // Step 3: Released in v4.5.0 (2026-02-01). Can be removed after 2027-02-01.
         if Storage.shared.migrationStep.value < 3 {
             Storage.shared.migrateStep3()
@@ -665,26 +659,31 @@ class MainViewController: UIViewController, UNUserNotificationCenterDelegate {
             Storage.shared.migrationStep.value = 5
         }
 
+        // Step 6: Released in v6.0.0 (2026-04-25). Can be removed after 2027-04-25.
         if Storage.shared.migrationStep.value < 6 {
             Storage.shared.migrateStep6()
             Storage.shared.migrationStep.value = 6
         }
 
+        // Step 7: Released in v6.0.0 (2026-04-25). Can be removed after 2027-04-25.
         if Storage.shared.migrationStep.value < 7 {
             Storage.shared.migrateStep7()
             Storage.shared.migrationStep.value = 7
         }
 
+        // Step 8: Released in v6.1.0 (2026-05-05). Can be removed after 2027-05-05.
         if Storage.shared.migrationStep.value < 8 {
             Storage.shared.migrateStep8()
             Storage.shared.migrationStep.value = 8
         }
 
+        // Step 9: Released in v7.0.0 (2026-07-25). Can be removed after 2027-07-25.
         if Storage.shared.migrationStep.value < 9 {
             Storage.shared.migrateStep9()
             Storage.shared.migrationStep.value = 9
         }
 
+        // Step 10: Released in v7.0.0 (2026-07-25). Can be removed after 2027-07-25.
         if Storage.shared.migrationStep.value < 10 {
             Storage.shared.migrateStep10()
             Storage.shared.migrationStep.value = 10