payment and list

pedi-foods/Sources/PediFoods/Services/OrderRealtimeTracker.swift

@@ -5,6 +5,9 @@ import FoundationNetworking
 
 @MainActor
 final class OrderRealtimeTracker {
+    // Keep realtime tracking on polling to avoid socket.io handshake failures
+    // on environments where websocket upgrade is not available.
+    private let useSocketRealtime = false
     private var pollingTask: Task<Void, Never>? = nil
     private var socketClient: OrderSocketClient? = nil
     private var activeOrderId: String? = nil
@@ -20,7 +23,7 @@ final class OrderRealtimeTracker {
             await self.runPollingLoop(orderId: orderId)
         }
 
-        guard let jwt, jwt.isEmpty == false else { return }
+        guard useSocketRealtime, let jwt, jwt.isEmpty == false else { return }
         let socket = OrderSocketClient()
         socket.onOrderUpdate = { [weak self] update in
             guard let self else { return }
@@ -76,12 +79,42 @@ final class OrderRealtimeTracker {
             let response = try await ApiService().publicOrder(orderId: orderId)
             guard response.error == false, let order = response.result else { return nil }
             SessionStateStore.saveTrackedOrder(order)
+            clearPendingCartIfNeeded(for: order)
             onOrderUpdated?(order)
             return order
         } catch {
             return nil
         }
     }
+
+    private func clearPendingCartIfNeeded(for order: PublicOrderResult) {
+        guard let pendingId = SessionStateStore.loadPendingCartOrderId() else { return }
+        let normalizedPending = pendingId.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+        if normalizedPending.isEmpty { return }
+
+        let ids = [order.id, order.realId]
+            .compactMap { $0?.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() }
+        guard ids.contains(normalizedPending) else { return }
+
+        if shouldClearCart(for: order) == false { return }
+
+        SessionStateStore.clearCart()
+        SessionStateStore.clearPendingCartOrder()
+        NotificationCenter.default.post(name: .cartDidReset, object: nil)
+    }
+
+    private func shouldClearCart(for order: PublicOrderResult) -> Bool {
+        if order.isPaymentConfirmed {
+            return true
+        }
+
+        let status = (order.status ?? "").uppercased()
+        if status.contains("COMPLETED") || status.contains("DELIVERED") || status.contains("RECEIVED") {
+            return true
+        }
+
+        return false
+    }
 }
 
 final class OrderSocketClient: @unchecked Sendable {