Stabilize beta release with warning cleanup and edge-case fixes

SportsTimeTests/Features/Trip/ItineraryCustomItemTests.swift

@@ -10,6 +10,7 @@ import XCTest
 
 private typealias H = ItineraryTestHelpers
 
+@MainActor
 final class ItineraryCustomItemTests: XCTestCase {
 
     private let testTripId = H.testTripId

SportsTimeTests/Features/Trip/ItineraryEdgeCaseTests.swift

@@ -10,6 +10,7 @@ import XCTest
 
 private typealias H = ItineraryTestHelpers
 
+@MainActor
 final class ItineraryEdgeCaseTests: XCTestCase {
 
     private let testDate = H.testDate

SportsTimeTests/Features/Trip/ItineraryReorderingLogicTests.swift

@@ -12,6 +12,7 @@ import XCTest
 private typealias H = ItineraryTestHelpers
 private typealias Logic = ItineraryReorderingLogic
 
+@MainActor
 final class ItineraryReorderingLogicTests: XCTestCase {
 
     private let testDate = H.testDate
@@ -302,13 +303,8 @@ final class ItineraryReorderingLogicTests: XCTestCase {
 
     func test_calculateSortOrder_emptyDay_returns1() {
         // Day with only header, no items
-        let items = buildFlatItems([
-            .day(1),
-            .day(2)
-        ])
-
-        // Simulating drop right after day 1 header (row 0)
-        // After inserting at row 1, day 1 has no other items
+        // Simulating drop right after day 1 header (row 0). After inserting
+        // at row 1, day 1 has no other items.
         let mockItems = buildFlatItems([
             .day(1),
             .custom("New", sortOrder: 999, day: 1), // Placeholder for dropped item
@@ -810,16 +806,18 @@ final class ItineraryReorderingLogicTests: XCTestCase {
         ])
 
         let customItem = H.makeCustomItem(day: 1, sortOrder: 1.0, title: "A")
-        let zones = Logic.calculateCustomItemDragZones(item: customItem, flatItems: items)
+        let zones = Logic.calculateCustomItemDragZones(
+            item: customItem,
+            sourceRow: 1,
+            flatItems: items,
+            constraints: nil,
+            findTravelSortOrder: { _ in nil }
+        )
 
-        // Headers at rows 0, 2, 4 should be invalid
-        XCTAssertTrue(zones.invalidRowIndices.contains(0))
-        XCTAssertTrue(zones.invalidRowIndices.contains(2))
-        XCTAssertTrue(zones.invalidRowIndices.contains(4))
-
-        // Items at rows 1, 3 should be valid
-        XCTAssertTrue(zones.validDropRows.contains(1))
-        XCTAssertTrue(zones.validDropRows.contains(3))
+        // New API excludes source row from both valid and invalid sets.
+        XCTAssertEqual(zones.invalidRowIndices, Set([0]))
+        XCTAssertEqual(Set(zones.validDropRows), Set([2, 3, 4, 5]))
+        XCTAssertFalse(zones.validDropRows.contains(1))
     }
 
     func test_calculateTravelDragZones_respectsDayRange() {
@@ -834,17 +832,21 @@ final class ItineraryReorderingLogicTests: XCTestCase {
 
         let segment = H.makeTravelSegment(from: "CityA", to: "CityB")
         let travelValidRanges = ["travel:0:citya->cityb": 1...3]
+        let travelItem = H.makeTravelItem(from: "CityA", to: "CityB", day: 2, sortOrder: 1.0)
 
         let zones = Logic.calculateTravelDragZones(
             segment: segment,
+            sourceRow: 3,
             flatItems: items,
             travelValidRanges: travelValidRanges,
             constraints: nil,
-            findTravelItem: { _ in nil }
+            findTravelItem: { _ in travelItem },
+            makeTravelItem: { _ in travelItem },
+            findTravelSortOrder: { _ in travelItem.sortOrder }
         )
 
-        // All days 1-3 should be valid (6 rows total)
-        XCTAssertEqual(zones.validDropRows.count, 6)
-        XCTAssertTrue(zones.invalidRowIndices.isEmpty)
+        XCTAssertEqual(Set(zones.validDropRows), Set([1, 2, 4, 5, 6]))
+        XCTAssertEqual(zones.invalidRowIndices, Set([0]))
+        XCTAssertFalse(zones.validDropRows.contains(3))
     }
 }

SportsTimeTests/Features/Trip/ItineraryReorderingTests.swift

@@ -10,6 +10,7 @@ import XCTest
 
 private typealias H = ItineraryTestHelpers
 
+@MainActor
 final class ItineraryReorderingTests: XCTestCase {
 
     private let testDate = H.testDate

SportsTimeTests/Features/Trip/ItineraryRowFlatteningTests.swift

@@ -10,6 +10,7 @@ import XCTest
 
 private typealias H = ItineraryTestHelpers
 
+@MainActor
 final class ItineraryRowFlatteningTests: XCTestCase {
 
     private let testDate = H.testDate

SportsTimeTests/Features/Trip/ItinerarySortOrderTests.swift

@@ -10,6 +10,7 @@ import XCTest
 
 private typealias H = ItineraryTestHelpers
 
+@MainActor
 final class ItinerarySortOrderTests: XCTestCase {
 
     private let testDate = H.testDate

SportsTimeTests/Features/Trip/ItineraryTravelConstraintTests.swift

@@ -10,6 +10,7 @@ import XCTest
 
 private typealias H = ItineraryTestHelpers
 
+@MainActor
 final class ItineraryTravelConstraintTests: XCTestCase {
 
     private let testTripId = H.testTripId
@@ -176,10 +177,6 @@ final class ItineraryTravelConstraintTests: XCTestCase {
         )
 
         let controller = ItineraryTableViewController(style: .plain)
-        var capturedSortOrder: Double = 0
-        controller.onTravelMoved = { _, _, sortOrder in
-            capturedSortOrder = sortOrder
-        }
         controller.reloadData(
             days: [dayData],
             travelValidRanges: ["travel:0:chicago->detroit": 1...1],

SportsTimeTests/Features/Trip/RegionMapSelectorTests.swift

@@ -13,6 +13,7 @@ import Testing
 @testable import SportsTime
 
 @Suite("RegionMapSelector — regionForCoordinate")
+@MainActor
 struct RegionMapSelectorTests {
 
     // MARK: - West Region (longitude < -102)

SportsTimeTests/Features/Trip/TravelPlacementTests.swift

@@ -10,6 +10,7 @@
 import XCTest
 @testable import SportsTime
 
+@MainActor
 final class TravelPlacementTests: XCTestCase {
 
     // MARK: - Helpers
@@ -417,14 +418,14 @@ final class TravelPlacementTests: XCTestCase {
         // Follow Team pattern: Houston→Cincinnati→Houston→Cincinnati
         // Two segments share the same city pair (Houston→Cincinnati)
         // Each must get a unique travel anchor ID so overrides don't collide.
-        let stops = [
+        _ = [
             makeStop(city: "Houston", arrival: may(1), departure: may(2)),      // Stop 0
             makeStop(city: "Cincinnati", arrival: may(4), departure: may(5)),   // Stop 1
             makeStop(city: "Houston", arrival: may(7), departure: may(8)),      // Stop 2
             makeStop(city: "Cincinnati", arrival: may(10), departure: may(11))  // Stop 3
         ]
 
-        let segments = [
+        _ = [
             makeSegment(from: "Houston", to: "Cincinnati"),   // Seg 0: stops[0] → stops[1]
             makeSegment(from: "Cincinnati", to: "Houston"),   // Seg 1: stops[1] → stops[2]
             makeSegment(from: "Houston", to: "Cincinnati")    // Seg 2: stops[2] → stops[3]