cards

pedi-foods/Sources/PediFoods/Views/Main/CheckoutView.swift

@@ -7,6 +7,8 @@ import AppKit
 
 struct CheckoutView: View {
     @Binding var appState: AppState
+    @Binding var selectedTab: MainTab
+    @Environment(\.dismiss) var dismiss
 
     @State var storeInfo: StoreInfoResult? = nil
     @State var errorMessage: String? = nil
@@ -98,6 +100,7 @@ struct CheckoutView: View {
     var body: some View {
         ScrollView(showsIndicators: false) {
             VStack(alignment: .leading, spacing: 18) {
+                screenHeader
                 deliveryTypeSection
                 addressSection
                 orderSummarySection
@@ -120,8 +123,8 @@ struct CheckoutView: View {
             .padding(.bottom, 10)
         }
         .background(AppColors.backgroundLight)
-        .navigationTitle("Finalizar Pedido")
-        .appInlineNavigationTitle()
+        .appHiddenNavigationBar()
+        .navigationBarBackButtonHidden(true)
         .appBottomSafeAreaInset {
             bottomBar
         }
@@ -212,7 +215,31 @@ struct CheckoutView: View {
             }
         }
         .navigationDestination(item: $orderTrackingContext) { context in
-            OrderTrackingView(orderId: context.orderId, initialShortId: context.shortId)
+            OrderTrackingView(orderId: context.orderId, initialShortId: context.shortId, postOrderBack: {
+                appState.shouldNavigateToOrders = true
+                selectedTab = .profile
+            })
+        }
+    }
+
+    private var screenHeader: some View {
+        ZStack {
+            Text("Finalizar Pedido")
+                .font(AppTypography.heading2)
+                .foregroundStyle(AppColors.textPrimary)
+            HStack {
+                Button(action: { dismiss() }) {
+                    Image(systemName: "chevron.left")
+                        .font(.system(size: 24, weight: .semibold))
+                        .foregroundStyle(AppColors.textPrimary)
+                        .frame(width: 52, height: 52)
+                        .background(AppColors.surface)
+                        .clipShape(Circle())
+                        .shadow(color: .black.opacity(0.06), radius: 8, y: 2)
+                }
+                .buttonStyle(.plain)
+                Spacer()
+            }
         }
     }
 
@@ -676,6 +703,7 @@ struct PaymentPixView: View {
     var body: some View {
         ScrollView(showsIndicators: false) {
             VStack(spacing: 14) {
+                screenHeader
                 RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous)
                     .fill(AppColors.surface)
                     .overlay(
@@ -767,8 +795,8 @@ struct PaymentPixView: View {
             .padding(20)
         }
         .background(AppColors.backgroundLight)
-        .navigationTitle("Pagamento via PIX")
-        .appInlineNavigationTitle()
+        .appHiddenNavigationBar()
+        .navigationBarBackButtonHidden(true)
         .sheet(isPresented: $showChangePaymentSheet) {
             ChangePaymentSheet(
                 pixContext: currentContext,
@@ -814,6 +842,27 @@ struct PaymentPixView: View {
         }
     }
 
+    private var screenHeader: some View {
+        ZStack {
+            Text("Pagamento via PIX")
+                .font(AppTypography.heading2)
+                .foregroundStyle(AppColors.textPrimary)
+            HStack {
+                Button(action: { dismiss() }) {
+                    Image(systemName: "chevron.left")
+                        .font(.system(size: 24, weight: .semibold))
+                        .foregroundStyle(AppColors.textPrimary)
+                        .frame(width: 52, height: 52)
+                        .background(AppColors.surface)
+                        .clipShape(Circle())
+                        .shadow(color: .black.opacity(0.06), radius: 8, y: 2)
+                }
+                .buttonStyle(.plain)
+                Spacer()
+            }
+        }
+    }
+
     private func openTrackingOnce() {
         guard hasOpenedTracking == false else { return }
         hasOpenedTracking = true