Migrate from iOS 17 Observation to iOS 16-compatible Combine architecture.

Lower deployment target to iOS 16, replace @Observable with ObservableObject, add navigation and UI compatibility shims, and include login smoke UI tests. Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-26 10:16:35 +08:00
parent c32a610ee0
commit 26f4d0e671
127 changed files with 2320 additions and 1465 deletions
--- a/suixinkan/Features/Orders/API/OrdersAPI.swift
+++ b/suixinkan/Features/Orders/API/OrdersAPI.swift
@ -6,7 +6,7 @@
 //

 import Foundation
-import Observation
+import Combine

@MainActor
 /// 订单服务协议，抽象订单列表、核销列表和核销操作以便测试替换。
@ -59,10 +59,9 @@ protocol OrderServing {
 }

@MainActor
-@Observable
 /// 订单 API，封装订单管理、核销订单和订单核销接口。
 final class OrdersAPI: OrderServing {
-    @ObservationIgnored private let client: APIClient
+    private let client: APIClient

    /// 初始化订单 API，并注入共享网络客户端。
    init(client: APIClient) {
--- a/suixinkan/Features/Orders/ViewModels/OrderDetailViewModel.swift
+++ b/suixinkan/Features/Orders/ViewModels/OrderDetailViewModel.swift
@ -6,16 +6,15 @@
 //

 import Foundation
-import Observation
+import Combine

@MainActor
-@Observable
 /// 订单详情 ViewModel，负责加载门店订单详情并保留列表摘要兜底展示。
-final class OrderDetailViewModel {
-    private(set) var detail: StoreOrderDetailResponse?
-    private(set) var loading = false
-    private(set) var errorMessage: String?
-    private(set) var contextMessage: String?
+final class OrderDetailViewModel: ObservableObject {
+    @Published private(set) var detail: StoreOrderDetailResponse?
+    @Published private(set) var loading = false
+    @Published private(set) var errorMessage: String?
+    @Published private(set) var contextMessage: String?

    /// 当前页面用于展示的订单信息，详情接口成功时优先使用详情数据。
    var display: StoreOrderDetailDisplay {
--- a/suixinkan/Features/Orders/ViewModels/OrderLongTailViewModels.swift
+++ b/suixinkan/Features/Orders/ViewModels/OrderLongTailViewModels.swift
@ -6,20 +6,19 @@
 //

 import Foundation
-import Observation
+import Combine

@MainActor
-@Observable
 /// 押金订单列表 ViewModel，负责分页、核销、退款和操作后刷新。
-final class DepositOrderListViewModel {
-    private(set) var orders: [DepositOrderListItem] = []
-    private(set) var total = 0
-    private(set) var page = 1
-    private(set) var hasMore = false
-    private(set) var loading = false
-    private(set) var loadingMore = false
-    private(set) var operatingOrderNumber: String?
-    var errorMessage: String?
+final class DepositOrderListViewModel: ObservableObject {
+    @Published private(set) var orders: [DepositOrderListItem] = []
+    @Published private(set) var total = 0
+    @Published private(set) var page = 1
+    @Published private(set) var hasMore = false
+    @Published private(set) var loading = false
+    @Published private(set) var loadingMore = false
+    @Published private(set) var operatingOrderNumber: String?
+    @Published var errorMessage: String?

    private let pageSize = 10

@ -134,12 +133,11 @@ final class DepositOrderListViewModel {
 }

@MainActor
-@Observable
 /// 押金订单详情 ViewModel，负责按门店和订单号加载详情。
-final class DepositOrderDetailViewModel {
-    private(set) var detail: StoreOrderDetailResponse?
-    private(set) var loading = false
-    var errorMessage: String?
+final class DepositOrderDetailViewModel: ObservableObject {
+    @Published private(set) var detail: StoreOrderDetailResponse?
+    @Published private(set) var loading = false
+    @Published var errorMessage: String?

    /// 加载押金订单详情，缺少门店或订单号时不请求接口。
    func load(api: OrderServing, storeId: Int?, orderNumber: String) async {
@ -179,12 +177,11 @@ final class DepositOrderDetailViewModel {
 }

@MainActor
-@Observable
 /// 押金拍摄信息 ViewModel，负责加载单个打卡点的媒体和评分。
-final class DepositOrderShootingInfoViewModel {
-    private(set) var detail: StoreOrderShootingDetailResponse?
-    private(set) var loading = false
-    var errorMessage: String?
+final class DepositOrderShootingInfoViewModel: ObservableObject {
+    @Published private(set) var detail: StoreOrderShootingDetailResponse?
+    @Published private(set) var loading = false
+    @Published var errorMessage: String?

    /// 加载押金订单拍摄信息，缺少门店或订单号时不请求接口。
    func load(api: OrderServing, storeId: Int?, orderNumber: String, scenicSpotId: Int, photogUid: Int) async {
@ -229,14 +226,13 @@ final class DepositOrderShootingInfoViewModel {
 }

@MainActor
-@Observable
 /// 普通订单退款 ViewModel，负责退款入口判断、金额校验和提交保护。
-final class OrderRefundViewModel {
-    var mode: OrderRefundMode = .full
-    var amount = ""
-    var reason = ""
-    private(set) var submitting = false
-    var errorMessage: String?
+final class OrderRefundViewModel: ObservableObject {
+    @Published var mode: OrderRefundMode = .full
+    @Published var amount = ""
+    @Published var reason = ""
+    @Published private(set) var submitting = false
+    @Published var errorMessage: String?

    /// 判断订单是否允许展示普通退款入口。
    func canRefund(_ item: OrderEntity) -> Bool {
@ -344,14 +340,13 @@ final class OrderRefundViewModel {
 }

@MainActor
-@Observable
 /// 历史拍摄 ViewModel，负责按订单号加载多点位历史拍摄媒体。
-final class HistoricalShootingInfoViewModel {
-    private(set) var projectName = ""
-    private(set) var projectTypeName = ""
-    private(set) var spots: [PhotogSpotItem] = []
-    private(set) var loading = false
-    var errorMessage: String?
+final class HistoricalShootingInfoViewModel: ObservableObject {
+    @Published private(set) var projectName = ""
+    @Published private(set) var projectTypeName = ""
+    @Published private(set) var spots: [PhotogSpotItem] = []
+    @Published private(set) var loading = false
+    @Published var errorMessage: String?

    /// 加载历史拍摄信息，订单号为空时清空旧数据且不请求接口。
    func load(api: OrderServing, orderNumber: String) async {
@ -390,20 +385,19 @@ final class HistoricalShootingInfoViewModel {
 }

@MainActor
-@Observable
 /// 多点旅拍任务上传 ViewModel，负责订单号、打卡点、云盘附件、本地附件和素材提交。
-final class MultiTravelTaskUploadViewModel {
-    var orderNumber = ""
-    var selectedSpotId: Int?
-    private(set) var spots: [MultiTravelVerifiedScenicSpotItem] = []
-    var selectedCloudFiles: [TaskCloudSelectionItem] = []
-    var selectedLocalFiles: [TaskLocalUploadItem] = []
-    private(set) var isLoadingSpots = false
-    private(set) var isSubmitting = false
-    private(set) var didSubmitSuccessfully = false
-    var errorMessage: String?
+final class MultiTravelTaskUploadViewModel: ObservableObject {
+    @Published var orderNumber = ""
+    @Published var selectedSpotId: Int?
+    @Published private(set) var spots: [MultiTravelVerifiedScenicSpotItem] = []
+    @Published var selectedCloudFiles: [TaskCloudSelectionItem] = []
+    @Published var selectedLocalFiles: [TaskLocalUploadItem] = []
+    @Published private(set) var isLoadingSpots = false
+    @Published private(set) var isSubmitting = false
+    @Published private(set) var didSubmitSuccessfully = false
+    @Published var errorMessage: String?

-    private var loadedSpotOrderNumber = ""
+    @Published private var loadedSpotOrderNumber = ""

    /// 当前选中打卡点展示名。
    var selectedSpotName: String {
--- a/suixinkan/Features/Orders/ViewModels/OrdersViewModel.swift
+++ b/suixinkan/Features/Orders/ViewModels/OrdersViewModel.swift
@ -6,31 +6,30 @@
 //

 import Foundation
-import Observation
+import Combine

@MainActor
-@Observable
 /// 订单页面 ViewModel，管理订单列表、核销列表、筛选条件和手动核销流程。
-final class OrdersViewModel {
-    var selectedEntry: OrdersEntry = .storeOrders
-    var selectedStatus = 0
-    var searchPhone = ""
-    var filterStartDate: Date?
-    var filterEndDate: Date?
-    private(set) var loading = false
-    private(set) var loadingMore = false
-    private(set) var isVerifying = false
-    private(set) var currentVerifyingOrderNumber: String?
+final class OrdersViewModel: ObservableObject {
+    @Published var selectedEntry: OrdersEntry = .storeOrders
+    @Published var selectedStatus = 0
+    @Published var searchPhone = ""
+    @Published var filterStartDate: Date?
+    @Published var filterEndDate: Date?
+    @Published private(set) var loading = false
+    @Published private(set) var loadingMore = false
+    @Published private(set) var isVerifying = false
+    @Published private(set) var currentVerifyingOrderNumber: String?

-    private(set) var storeOrders: [OrderEntity] = []
-    private(set) var storeTotal = 0
-    private(set) var storePage = 1
-    private(set) var storeHasMore = false
+    @Published private(set) var storeOrders: [OrderEntity] = []
+    @Published private(set) var storeTotal = 0
+    @Published private(set) var storePage = 1
+    @Published private(set) var storeHasMore = false

-    private(set) var writeOffOrders: [WriteOffOrderItem] = []
-    private(set) var writeOffTotal = 0
-    private(set) var writeOffPage = 1
-    private(set) var writeOffHasMore = false
+    @Published private(set) var writeOffOrders: [WriteOffOrderItem] = []
+    @Published private(set) var writeOffTotal = 0
+    @Published private(set) var writeOffPage = 1
+    @Published private(set) var writeOffHasMore = false

    /// 返回去除首尾空白后的手机号搜索值。
    var normalizedPhone: String? {
--- a/suixinkan/Features/Orders/Views/DepositOrderViews.swift
+++ b/suixinkan/Features/Orders/Views/DepositOrderViews.swift
@ -9,13 +9,13 @@ import SwiftUI

 /// 押金订单入口页，支持订单号查询、列表分页、核销和退款。
 struct DepositOrderEntryView: View {
-    @Environment(AccountContext.self) private var accountContext
-    @Environment(OrdersAPI.self) private var ordersAPI
-    @Environment(RouterPath.self) private var router
-    @Environment(ToastCenter.self) private var toastCenter
+    @EnvironmentObject private var accountContext: AccountContext
+    @Environment(\.ordersAPI) private var ordersAPI
+    @EnvironmentObject private var router: RouterPath
+    @EnvironmentObject private var toastCenter: ToastCenter
    @Environment(\.globalLoading) private var globalLoading

-    @State private var viewModel = DepositOrderListViewModel()
+    @StateObject private var viewModel = DepositOrderListViewModel()
    @State private var orderNumber = ""
    @State private var pendingWriteOff: DepositOrderListItem?
    @State private var pendingRefund: DepositOrderListItem?
@ -36,7 +36,7 @@ struct DepositOrderEntryView: View {

            Section {
                if viewModel.orders.isEmpty {
-                    ContentUnavailableView("暂无押金订单", systemImage: "doc.text.magnifyingglass")
+                    AppContentUnavailableView("暂无押金订单", systemImage: "doc.text.magnifyingglass")
                        .frame(maxWidth: .infinity, minHeight: 180)
                } else {
                    ForEach(viewModel.orders) { item in
@ -239,13 +239,13 @@ private struct DepositOrderRow: View {

 /// 押金订单详情页，展示订单基础信息和拍摄点列表。
 struct DepositOrderDetailView: View {
-    @Environment(AccountContext.self) private var accountContext
-    @Environment(OrdersAPI.self) private var ordersAPI
-    @Environment(RouterPath.self) private var router
+    @EnvironmentObject private var accountContext: AccountContext
+    @Environment(\.ordersAPI) private var ordersAPI
+    @EnvironmentObject private var router: RouterPath
    @Environment(\.globalLoading) private var globalLoading

    let orderNumber: String
-    @State private var viewModel = DepositOrderDetailViewModel()
+    @StateObject private var viewModel = DepositOrderDetailViewModel()

    var body: some View {
        List {
@ -275,7 +275,7 @@ struct DepositOrderDetailView: View {
                Section("拍摄详情") {
                    let shootingList = detail.multiTravel?.shootingList ?? []
                    if shootingList.isEmpty {
-                        ContentUnavailableView("暂无拍摄记录", systemImage: "photo.stack")
+                        AppContentUnavailableView("暂无拍摄记录", systemImage: "photo.stack")
                    } else {
                        ForEach(shootingList) { item in
                            Button {
@ -296,7 +296,7 @@ struct DepositOrderDetailView: View {
                }
            } else {
                Section {
-                    ContentUnavailableView("暂无订单详情", systemImage: "doc.text.magnifyingglass")
+                    AppContentUnavailableView("暂无订单详情", systemImage: "doc.text.magnifyingglass")
                        .frame(maxWidth: .infinity, minHeight: 220)
                }
            }
@ -363,15 +363,15 @@ private struct DepositShootingPointRow: View {

 /// 押金拍摄信息页，展示评价、底片和成片。
 struct DepositOrderShootingInfoView: View {
-    @Environment(AccountContext.self) private var accountContext
-    @Environment(OrdersAPI.self) private var ordersAPI
+    @EnvironmentObject private var accountContext: AccountContext
+    @Environment(\.ordersAPI) private var ordersAPI
    @Environment(\.globalLoading) private var globalLoading

    let orderNumber: String
    let scenicSpotId: Int
    let photogUid: Int

-    @State private var viewModel = DepositOrderShootingInfoViewModel()
+    @StateObject private var viewModel = DepositOrderShootingInfoViewModel()
    @State private var selectedTab: DepositShootingMediaTab = .negative

    var body: some View {
@ -393,7 +393,7 @@ struct DepositOrderShootingInfoView: View {
                            .font(.system(size: AppMetrics.FontSize.subheadline))
                            .foregroundStyle(AppDesign.textSecondary)
                    } else {
-                        ContentUnavailableView("暂无评价信息", systemImage: "star")
+                        AppContentUnavailableView("暂无评价信息", systemImage: "star")
                    }
                }

@ -410,7 +410,7 @@ struct DepositOrderShootingInfoView: View {
                }
            } else {
                Section {
-                    ContentUnavailableView("暂无拍摄信息", systemImage: "photo.stack")
+                    AppContentUnavailableView("暂无拍摄信息", systemImage: "photo.stack")
                        .frame(maxWidth: .infinity, minHeight: 220)
                }
            }
@ -448,11 +448,11 @@ struct DepositOrderShootingInfoView: View {

 /// 历史拍摄信息页，展示多点位拍摄媒体。
 struct HistoricalShootingInfoView: View {
-    @Environment(OrdersAPI.self) private var ordersAPI
+    @Environment(\.ordersAPI) private var ordersAPI
    @Environment(\.globalLoading) private var globalLoading

    let orderNumber: String
-    @State private var viewModel = HistoricalShootingInfoViewModel()
+    @StateObject private var viewModel = HistoricalShootingInfoViewModel()

    var body: some View {
        List {
@ -464,7 +464,7 @@ struct HistoricalShootingInfoView: View {

            Section("历史拍摄") {
                if viewModel.spots.isEmpty {
-                    ContentUnavailableView("暂无历史拍摄信息", systemImage: "photo.on.rectangle")
+                    AppContentUnavailableView("暂无历史拍摄信息", systemImage: "photo.on.rectangle")
                        .frame(maxWidth: .infinity, minHeight: 220)
                } else {
                    ForEach(viewModel.spots) { spot in
@ -565,7 +565,7 @@ private struct OrderMediaGrid: View {

    var body: some View {
        if files.isEmpty {
-            ContentUnavailableView("暂无媒体文件", systemImage: "photo")
+            AppContentUnavailableView("暂无媒体文件", systemImage: "photo")
                .frame(maxWidth: .infinity, minHeight: 140)
        } else {
            LazyVGrid(columns: columns, spacing: AppMetrics.Spacing.small) {
--- a/suixinkan/Features/Orders/Views/OrderDetailViews.swift
+++ b/suixinkan/Features/Orders/Views/OrderDetailViews.swift
@ -9,21 +9,21 @@ import SwiftUI

 /// 门店订单详情页，展示订单接口补全后的支付、客户、项目和拍摄点信息。
 struct StoreOrderDetailView: View {
-    @Environment(AccountContext.self) private var accountContext
-    @Environment(OrdersAPI.self) private var ordersAPI
-    @Environment(RouterPath.self) private var router
-    @Environment(ToastCenter.self) private var toastCenter
+    @EnvironmentObject private var accountContext: AccountContext
+    @Environment(\.ordersAPI) private var ordersAPI
+    @EnvironmentObject private var router: RouterPath
+    @EnvironmentObject private var toastCenter: ToastCenter
    @Environment(\.globalLoading) private var globalLoading

    let item: OrderEntity
-    @State private var viewModel: OrderDetailViewModel
-    @State private var refundViewModel = OrderRefundViewModel()
+    @StateObject private var viewModel: OrderDetailViewModel
+    @StateObject private var refundViewModel = OrderRefundViewModel()
    @State private var showRefundSheet = false

    /// 使用列表订单初始化详情页，并创建详情 ViewModel。
    init(item: OrderEntity) {
        self.item = item
-        _viewModel = State(initialValue: OrderDetailViewModel(item: item))
+        _viewModel = StateObject(wrappedValue: OrderDetailViewModel(item: item))
    }

    var body: some View {
@ -204,7 +204,7 @@ struct StoreOrderDetailView: View {
 /// 普通订单退款表单，负责收集退款模式、金额和原因。
 private struct OrderRefundSheet: View {
    let item: OrderEntity
-    @Bindable var viewModel: OrderRefundViewModel
+    @ObservedObject var viewModel: OrderRefundViewModel
    let onCancel: () -> Void
    let onSubmit: () -> Void
    @FocusState private var focusedField: RefundInputField?
@ -276,9 +276,9 @@ private enum RefundInputField: Hashable {

 /// 核销订单详情页，展示核销列表项信息并支持再次发起核销。
 struct WriteOffOrderDetailView: View {
-    @Environment(AccountContext.self) private var accountContext
-    @Environment(OrdersAPI.self) private var ordersAPI
-    @Environment(ToastCenter.self) private var toastCenter
+    @EnvironmentObject private var accountContext: AccountContext
+    @Environment(\.ordersAPI) private var ordersAPI
+    @EnvironmentObject private var toastCenter: ToastCenter

    let item: WriteOffOrderItem
    @State private var verifying = false
--- a/suixinkan/Features/Orders/Views/OrderTailUploadViews.swift
+++ b/suixinkan/Features/Orders/Views/OrderTailUploadViews.swift
@ -11,21 +11,21 @@ import UniformTypeIdentifiers

 /// 多点旅拍任务上传页面，负责选择打卡点和素材后提交到订单接口。
 struct MultiTravelTaskUploadView: View {
-    @Environment(AccountContext.self) private var accountContext
-    @Environment(OrdersAPI.self) private var ordersAPI
-    @Environment(OSSUploadService.self) private var uploadService
-    @Environment(ToastCenter.self) private var toastCenter
+    @EnvironmentObject private var accountContext: AccountContext
+    @Environment(\.ordersAPI) private var ordersAPI
+    @Environment(\.ossUploadService) private var uploadService
+    @EnvironmentObject private var toastCenter: ToastCenter
    @Environment(\.dismiss) private var dismiss
    @Environment(\.globalLoading) private var globalLoading

-    @State private var viewModel: MultiTravelTaskUploadViewModel
+    @StateObject private var viewModel: MultiTravelTaskUploadViewModel
    @State private var showSpotPicker = false
    @State private var showCloudSelection = false
    @State private var pickerItems: [PhotosPickerItem] = []

    /// 使用订单号初始化任务上传页面。
    init(initialOrderNumber: String) {
-        _viewModel = State(initialValue: MultiTravelTaskUploadViewModel(initialOrderNumber: initialOrderNumber))
+        _viewModel = StateObject(wrappedValue: MultiTravelTaskUploadViewModel(initialOrderNumber: initialOrderNumber))
    }

    var body: some View {
@ -61,7 +61,7 @@ struct MultiTravelTaskUploadView: View {
            }
            Button("取消", role: .cancel) {}
        }
-        .onChange(of: pickerItems) { _, items in
+        .onChange(of: pickerItems) { items in
            Task { await importPickerItems(items) }
        }
        .alert("提示", isPresented: errorBinding) {
--- a/suixinkan/Features/Orders/Views/OrdersView.swift
+++ b/suixinkan/Features/Orders/Views/OrdersView.swift
@ -9,16 +9,16 @@ import SwiftUI

 /// 订单 Tab 根视图，展示订单管理和核销订单两个业务入口。
 struct OrdersView: View {
-    @Environment(AccountContext.self) private var accountContext
-    @Environment(PermissionContext.self) private var permissionContext
-    @Environment(AppRouter.self) private var appRouter
-    @Environment(RouterPath.self) private var router
-    @Environment(OrdersAPI.self) private var ordersAPI
-    @Environment(ToastCenter.self) private var toastCenter
+    @EnvironmentObject private var accountContext: AccountContext
+    @EnvironmentObject private var permissionContext: PermissionContext
+    @EnvironmentObject private var appRouter: AppRouter
+    @EnvironmentObject private var router: RouterPath
+    @Environment(\.ordersAPI) private var ordersAPI
+    @EnvironmentObject private var toastCenter: ToastCenter
    @Environment(\.globalLoading) private var globalLoading
    @Environment(\.horizontalSizeClass) private var horizontalSizeClass

-    @State private var viewModel = OrdersViewModel()
+    @StateObject private var viewModel = OrdersViewModel()
    @State private var manualOrderNumber = ""
    @State private var showDateFilterSheet = false
    @State private var showScanner = false
@ -62,7 +62,7 @@ struct OrdersView: View {
                    entrySection

                    if currentScenicId == nil {
-                        ContentUnavailableView(
+                        AppContentUnavailableView(
                            "缺少经营上下文",
                            systemImage: "mountain.2",
                            description: Text("请先在首页选择景区后查看订单。")
@ -80,7 +80,7 @@ struct OrdersView: View {
                .padding(.bottom, AppMetrics.Spacing.pageVertical)
                .frame(maxWidth: .infinity)
            }
-            .onChange(of: matchedScannedOrderNumber) { _, orderNumber in
+            .onChange(of: matchedScannedOrderNumber) { orderNumber in
                guard let orderNumber else { return }
                withAnimation(.easeInOut(duration: 0.25)) {
                    scrollProxy.scrollTo(orderNumber, anchor: .center)
@ -96,15 +96,15 @@ struct OrdersView: View {
            await reload()
            await consumePendingScanCodeIfNeeded()
        }
-        .onChange(of: appRouter.selectedOrdersEntry) { _, entry in
+        .onChange(of: appRouter.selectedOrdersEntry) { entry in
            guard viewModel.selectedEntry != entry else { return }
            viewModel.selectedEntry = entry
            Task { await reload() }
        }
-        .onChange(of: appRouter.pendingOrderScanCode) { _, _ in
+        .onChange(of: appRouter.pendingOrderScanCode) { _ in
            Task { await consumePendingScanCodeIfNeeded() }
        }
-        .onChange(of: accountContext.currentScenic?.id) { _, _ in
+        .onChange(of: accountContext.currentScenic?.id) { _ in
            Task { await reload() }
        }
        .confirmationDialog("确认核销该订单？", isPresented: $showVerifyConfirmation, titleVisibility: .visible) {
@ -233,7 +233,7 @@ struct OrdersView: View {
                    .frame(maxWidth: .infinity)
                    .frame(minHeight: 260)
            } else if viewModel.storeOrders.isEmpty {
-                ContentUnavailableView("暂无订单", systemImage: "tray", description: Text("可切换筛选条件或下拉刷新。"))
+                AppContentUnavailableView("暂无订单", systemImage: "tray", description: Text("可切换筛选条件或下拉刷新。"))
                    .frame(minHeight: 260)
            } else {
                ForEach(viewModel.storeOrders) { item in
@ -306,7 +306,7 @@ struct OrdersView: View {
                    .frame(maxWidth: .infinity)
                    .frame(minHeight: 260)
            } else if viewModel.writeOffOrders.isEmpty {
-                ContentUnavailableView("暂无核销订单", systemImage: "tray", description: Text("可下拉刷新或切换景区查看。"))
+                AppContentUnavailableView("暂无核销订单", systemImage: "tray", description: Text("可下拉刷新或切换景区查看。"))
                    .frame(minHeight: 260)
            } else {
                ForEach(viewModel.writeOffOrders) { item in
@ -735,11 +735,11 @@ private struct OrdersDateFilterSheet: View {
 #Preview {
    NavigationStack {
        OrdersView()
-            .environment(AccountContext())
-            .environment(PermissionContext())
-            .environment(AppRouter())
-            .environment(RouterPath())
-            .environment(OrdersAPI(client: APIClient()))
-            .environment(ToastCenter())
+            .environmentObject(AccountContext())
+            .environmentObject(PermissionContext())
+            .environmentObject(AppRouter())
+            .environmentObject(RouterPath())
+            .environment(\.ordersAPI, OrdersAPI(client: APIClient()))
+            .environmentObject(ToastCenter())
    }
 }