master merged

2026-06-03 14:52:27 -03:00
parent 980a106661
commit f51319b486
112 changed files with 1051 additions and 1139 deletions
--- a/pedi-foods/Sources/PediFoods/Components/Buttons.swift
+++ b/pedi-foods/Sources/PediFoods/Components/Buttons.swift
@@ -39,6 +39,7 @@ struct PrimaryButtonLabel: View {
            .frame(height: 56)
            .background(AppColors.primary)
            .clipShape(RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous))
+            .labelStyle(.titleOnly)
    }
 }

@@ -58,7 +59,7 @@ struct SecondaryButton: View {
                    image
                }
            }
-            .foregroundStyle(AppColors.textInverse)
+            .foregroundStyle(AppColors.textPrimary)
            .frame(maxWidth: fullWidth ? .infinity : nil)
            .frame(height: 56)
            .background(AppColors.secondary)
--- a/pedi-foods/Sources/PediFoods/Components/Inputs.swift
+++ b/pedi-foods/Sources/PediFoods/Components/Inputs.swift
@@ -7,7 +7,7 @@ struct SearchField: View {
    var body: some View {
        HStack(spacing: 12) {
            Image(systemName: "magnifyingglass")
-                .foregroundStyle(AppColors.secondary)
+                .foregroundStyle(AppColors.primary)
            TextField(placeholder, text: $text)
                .appNoAutoCap()
        }
@@ -17,7 +17,7 @@ struct SearchField: View {
        .clipShape(RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous))
        .overlay(
            RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous)
-                .stroke(AppColors.secondary.opacity(0.15), lineWidth: 1)
+                .stroke(AppColors.primary.opacity(0.15), lineWidth: 1)
        )
    }
 }
@@ -30,14 +30,14 @@ struct PillButton: View {
        Text(title)
            .font(AppTypography.caption)
            .tracking(AppTypography.captionLetterSpacing)
-            .foregroundStyle(isActive ? AppColors.textInverse : AppColors.secondary)
+            .foregroundStyle(isActive ? AppColors.textInverse : AppColors.primary)
            .padding(.horizontal, 14)
            .padding(.vertical, 8)
            .background(isActive ? AppColors.primary : AppColors.backgroundLight)
            .clipShape(Capsule())
            .overlay(
                Capsule()
-                    .stroke(AppColors.secondary.opacity(0.15), lineWidth: isActive ? 0 : 1)
+                    .stroke(AppColors.primary.opacity(0.15), lineWidth: isActive ? 0 : 1)
            )
    }
 }
--- a/pedi-foods/Sources/PediFoods/Components/SnackbarOverlay.swift
+++ b/pedi-foods/Sources/PediFoods/Components/SnackbarOverlay.swift
@@ -1,16 +1,9 @@
 import SwiftUI

 struct SnackbarOverlay: View {
-#if os(Android)
-    let center: SnackbarCenter
-#else
    @ObservedObject var center: SnackbarCenter
-#endif

    var body: some View {
-#if os(Android)
-        EmptyView()
-#else
        VStack {
            if let message = center.current {
                HStack(spacing: 10) {
@@ -41,6 +34,5 @@ struct SnackbarOverlay: View {
        }
        .animation(.spring(response: 0.3, dampingFraction: 0.9), value: center.current?.id)
        .allowsHitTesting(center.current != nil)
-#endif
    }
 }
--- a/pedi-foods/Sources/PediFoods/Components/StoreCard.swift
+++ b/pedi-foods/Sources/PediFoods/Components/StoreCard.swift
@@ -120,6 +120,7 @@ struct FeaturedStoreCardModel: Identifiable {
    let rating: Double
    let reviews: String
    let distance: String
+    let deliveryFee: Double?
    let category: String
    let promoText: String?
    let isFavorite: Bool
--- a/pedi-foods/Sources/PediFoods/ContentView.swift
+++ b/pedi-foods/Sources/PediFoods/ContentView.swift
@@ -12,16 +12,10 @@ struct ContentView: View {
    @State var shouldPulseLaunchSplash = true
    @State var shouldPrepareAuthEntryAnimation = DefaultTokenStore().jwt == nil
    @State var authEntryAnimationToken = 0
-    #if os(iOS)
    @State private var sessionExpiredObserver: NSObjectProtocol?
-    #endif
    @State var cartResetObserver: Any?
    @State var appResumeObserver: Any?
-#if os(Android)
-    @State var snackbarCenter = SnackbarCenter.shared
-#else
    @StateObject var snackbarCenter = SnackbarCenter.shared
-#endif

    var body: some View {
        ZStack(alignment: .top) {
@@ -95,16 +89,12 @@ struct ContentView: View {
        .onAppear {
            attachCartResetObserverIfNeeded()
            attachAppResumeObserverIfNeeded()
-            #if os(iOS)
            attachSessionExpiredObserverIfNeeded()
-            #endif
        }
        .onDisappear {
            detachCartResetObserver()
            detachAppResumeObserver()
-            #if os(iOS)
            detachSessionExpiredObserver()
-            #endif
        }
    }

@@ -402,7 +392,6 @@ struct ContentView: View {
        }
    }

-    #if os(iOS)
    private func attachSessionExpiredObserverIfNeeded() {
        guard sessionExpiredObserver == nil else { return }
        sessionExpiredObserver = NotificationCenter.default.addObserver(
@@ -421,7 +410,6 @@ struct ContentView: View {
        NotificationCenter.default.removeObserver(observer)
        sessionExpiredObserver = nil
    }
-    #endif
 }

 struct AddressPickerModalView: View {
--- a/pedi-foods/Sources/PediFoods/DesignSystem/DesignSystem.swift
+++ b/pedi-foods/Sources/PediFoods/DesignSystem/DesignSystem.swift
@@ -1,28 +1,38 @@
 import SwiftUI
+#if canImport(UIKit)
+import UIKit
+#elseif canImport(AppKit)
+import AppKit
+#endif

 // MARK: - Colors

-enum AppColors {
-    static let primary = Color(hex: "#1E6B43")
-    static let secondary = Color(hex: "#2F7C4B")
-    static let tertiary = Color(hex: "#8CFF2E")
+struct AppColors {
+    private init() {}
+    // Brandbook 2026 (Pedi Foods)
+    // Primary now follows the "FOODS" dark green tone from the logo.
+    static let primary = Color(.sRGB, red: 52/255.0, green: 93/255.0, blue: 84/255.0, opacity: 1.0)
+    // Secondary keeps the vivid lime from the symbol/logo body.
+    static let secondary = Color(.sRGB, red: 213/255.0, green: 216/255.0, blue: 65/255.0, opacity: 1.0)
+    static let tertiary = Color(.sRGB, red: 167/255.0, green: 191/255.0, blue: 66/255.0, opacity: 1.0)

-    static let brandDark = Color(hex: "#1B5C3A")
-    static let brandSoft = Color(hex: "#E8F2EC")
+    static let brandDark = Color(.sRGB, red: 31/255.0, green: 45/255.0, blue: 64/255.0, opacity: 1.0)
+    static let brandSoft = Color(.sRGB, red: 242/255.0, green: 245/255.0, blue: 227/255.0, opacity: 1.0)

-    static let backgroundLight = Color(hex: "#F3F5F7")
-    static let backgroundDark = Color(hex: "#18230F")
-    static let surface = Color(hex: "#FFFFFF")
-    static let textPrimary = Color(hex: "#1C1F23")
-    static let textInverse = Color(hex: "#FFFFFF")
-    static let textMuted = Color(hex: "#7B8794")
+    static let backgroundLight = Color(.sRGB, red: 243/255.0, green: 245/255.0, blue: 247/255.0, opacity: 1.0)
+    static let backgroundDark = Color(.sRGB, red: 31/255.0, green: 45/255.0, blue: 64/255.0, opacity: 1.0)
+    static let surface = Color.white
+    static let textPrimary = Color.black
+    static let textInverse = Color.white
+    static let textMuted = Color(.sRGB, red: 102/255.0, green: 112/255.0, blue: 133/255.0, opacity: 1.0)
 }

-enum AppDarkColors {
-    static let background = Color(hex: "#18230F")
-    static let surface = Color(hex: "#FFFFFF", alpha: 0.05)
-    static let textPrimary = Color(hex: "#FFFFFF")
-    static let textSecondary = Color(hex: "#A3A3A3")
+struct AppDarkColors {
+    private init() {}
+    static let background = Color(.sRGB, red: 31/255.0, green: 45/255.0, blue: 64/255.0, opacity: 1.0)
+    static let surface = Color.white.opacity(0.08)
+    static let textPrimary = Color.white
+    static let textSecondary = Color(.sRGB, red: 208/255.0, green: 213/255.0, blue: 221/255.0, opacity: 1.0)
    static let primary = AppColors.primary
    static let secondary = AppColors.secondary
    static let tertiary = AppColors.tertiary
@@ -30,28 +40,46 @@ enum AppDarkColors {

 // MARK: - Typography

-enum AppTypography {
-    static let fontFamily = "Plus Jakarta Sans"
+struct AppTypography {
+    private init() {}
+    // Brandbook typography: Nexa (fallback: system font)
+    static let fontFamily = "Nexa-Regular"

-    // Avoid applying dynamic weight on custom font descriptors to prevent
-    // SwiftUI runtime warnings on some platforms/toolchains.
-    static let heading1 = Font.custom(fontFamily, size: 28)
-    static let heading25 = Font.custom(fontFamily, size: 25)
-    static let heading2 = Font.custom(fontFamily, size: 20)
-    static let heading3 = Font.custom(fontFamily, size: 16)
-    static let body = Font.custom(fontFamily, size: 16)
-    static let button = Font.custom(fontFamily, size: 14)
-    static let caption = Font.custom(fontFamily, size: 10)
-    static let overline = Font.custom(fontFamily, size: 11)
+    static let heading1 = resolvedFont(size: 28, fallbackWeight: .bold)
+    static let heading25 = resolvedFont(size: 25, fallbackWeight: .bold)
+    static let heading2 = resolvedFont(size: 20, fallbackWeight: .semibold)
+    static let heading3 = resolvedFont(size: 16, fallbackWeight: .semibold)
+    static let body = resolvedFont(size: 16, fallbackWeight: .regular)
+    static let button = resolvedFont(size: 14, fallbackWeight: .semibold)
+    static let caption = resolvedFont(size: 10, fallbackWeight: .regular)
+    static let overline = resolvedFont(size: 11, fallbackWeight: .regular)

    static let bodyLineHeight: CGFloat = 1.6
    static let buttonLetterSpacing: CGFloat = 0.08
    static let captionLetterSpacing: CGFloat = 0.12
+
+    private static func resolvedFont(size: CGFloat, fallbackWeight: Font.Weight) -> Font {
+        if isBrandFontAvailable {
+            return Font.custom(fontFamily, size: size)
+        }
+        return .system(size: size, weight: fallbackWeight, design: .default)
+    }
+
+    private static var isBrandFontAvailable: Bool {
+        #if canImport(UIKit)
+        return UIFont(name: fontFamily, size: 16) != nil
+        #elseif canImport(AppKit)
+        return NSFont(name: fontFamily, size: 16) != nil
+        #else
+        return false
+        #endif
+    }
 }

 // MARK: - Layout

-enum AppLayout {
+struct AppLayout {
+    private init() {}
    static let radiusMD: CGFloat = 12
    static let radiusLG: CGFloat = 16
    static let radiusXL: CGFloat = 24
@@ -68,7 +96,8 @@ struct ShadowSpec {
    let y: CGFloat
 }

-enum AppShadow {
+struct AppShadow {
+    private init() {}
    static let soft = ShadowSpec(color: Color.black.opacity(0.08), radius: 20, y: 6)
    static let glow = ShadowSpec(color: AppColors.tertiary.opacity(0.2), radius: 24, y: 8)
 }
@@ -79,7 +108,9 @@ extension Color {
    init(hex: String, alpha: Double = 1.0) {
        let cleaned = hex.trimmingCharacters(in: CharacterSet.alphanumerics.inverted)
        var int: UInt64 = 0
-        Scanner(string: cleaned).scanHexInt64(&int)
+        if let val = UInt64(cleaned, radix: 16) {
+            int = val
+        }

        let r, g, b: UInt64
        switch cleaned.count {
--- a/pedi-foods/Sources/PediFoods/PediFoodsApp.swift
+++ b/pedi-foods/Sources/PediFoods/PediFoodsApp.swift
@@ -2,59 +2,29 @@ import Foundation
 import OSLog
 import SwiftUI

-/// A logger for the PediFoods module.
 let logger: Logger = Logger(subsystem: "com.br.pedifoods.app", category: "PediFoods")

-/// The shared top-level view for the app, loaded from the platform-specific App delegates below.
-///
-/// The default implementation merely loads the `ContentView` for the app and logs a message.
-/* SKIP @bridge */public struct PediFoodsRootView : View {
-    /* SKIP @bridge */public init() {
-    }
+public struct PediFoodsRootView: View {
+    public init() {}

    public var body: some View {
        ContentView()
-            .task {
-                logger.info("Skip app logs are viewable in the Xcode console for iOS; Android logs can be viewed in Studio or using adb logcat")
-            }
    }
 }

-/// Global application delegate functions.
-///
-/// These functions can update a shared observable object to communicate app state changes to interested views.
-/* SKIP @bridge */public final class PediFoodsAppDelegate : Sendable {
-    /* SKIP @bridge */public static let shared = PediFoodsAppDelegate()
+public final class PediFoodsAppDelegate: Sendable {
+    public static let shared = PediFoodsAppDelegate()

-    private init() {
-    }
+    private init() {}

-    /* SKIP @bridge */public func onInit() {
-        logger.debug("onInit")
-    }
-
-    /* SKIP @bridge */public func onLaunch() {
-        logger.debug("onLaunch")
-    }
-
-    /* SKIP @bridge */public func onResume() {
+    public func onInit() { logger.debug("onInit") }
+    public func onLaunch() { logger.debug("onLaunch") }
+    public func onResume() {
        logger.debug("onResume")
        NotificationCenter.default.post(name: .appDidResume, object: nil)
    }
-
-    /* SKIP @bridge */public func onPause() {
-        logger.debug("onPause")
-    }
-
-    /* SKIP @bridge */public func onStop() {
-        logger.debug("onStop")
-    }
-
-    /* SKIP @bridge */public func onDestroy() {
-        logger.debug("onDestroy")
-    }
-
-    /* SKIP @bridge */public func onLowMemory() {
-        logger.debug("onLowMemory")
-    }
+    public func onPause() { logger.debug("onPause") }
+    public func onStop() { logger.debug("onStop") }
+    public func onDestroy() { logger.debug("onDestroy") }
+    public func onLowMemory() { logger.debug("onLowMemory") }
 }
--- a/pedi-foods/Sources/PediFoods/Resources/Localizable.xcstrings
+++ b/pedi-foods/Sources/PediFoods/Resources/Localizable.xcstrings
@@ -297,6 +297,9 @@
    "Cardápio indisponível no momento." : {
      "comment" : "A message displayed when a store's menu is unavailable.",
      "isCommentAutoGenerated" : true
+    },
+    "Carregando cardápio..." : {
+
    },
    "Carregando pedido..." : {

--- a/pedi-foods/Sources/PediFoods/Resources/pedifoods.icon/Assets/Screenshot
+++ b/pedi-foods/Sources/PediFoods/Resources/pedifoods.icon/Assets/Screenshot
--- a/pedi-foods/Sources/PediFoods/Resources/pedifoods.icon/Assets/Screenshot
+++ b/pedi-foods/Sources/PediFoods/Resources/pedifoods.icon/Assets/Screenshot
--- a/pedi-foods/Sources/PediFoods/Resources/pedifoods.icon/Assets/pedifoods_big.png
+++ b/pedi-foods/Sources/PediFoods/Resources/pedifoods.icon/Assets/pedifoods_big.png
--- a/pedi-foods/Sources/PediFoods/Resources/pedifoods.icon/icon.json
+++ b/pedi-foods/Sources/PediFoods/Resources/pedifoods.icon/icon.json
@@ -14,8 +14,83 @@
  ],
  "groups" : [
    {
+      "hidden" : false,
      "layers" : [
-
+        {
+          "glass-specializations" : [
+            {
+              "appearance" : "dark",
+              "value" : true
+            }
+          ],
+          "hidden" : false,
+          "image-name" : "Screenshot 2026-04-25 at 16.22.36.png",
+          "name" : "Screenshot 2026-04-25 at 16.22.36",
+          "opacity-specializations" : [
+            {
+              "value" : 0
+            },
+            {
+              "appearance" : "dark",
+              "value" : 1
+            }
+          ],
+          "position-specializations" : [
+            {
+              "idiom" : "iOS",
+              "value" : {
+                "scale" : 1.24,
+                "translation-in-points" : [
+                  0,
+                  0
+                ]
+              }
+            },
+            {
+              "idiom" : "watchOS",
+              "value" : {
+                "scale" : 1.54,
+                "translation-in-points" : [
+                  0,
+                  0
+                ]
+              }
+            }
+          ]
+        },
+        {
+          "hidden" : false,
+          "image-name" : "Screenshot 2026-04-25 at 16.22.59.png",
+          "name" : "Screenshot 2026-04-25 at 16.22.59",
+          "position-specializations" : [
+            {
+              "idiom" : "iOS",
+              "value" : {
+                "scale" : 1.24,
+                "translation-in-points" : [
+                  0,
+                  0
+                ]
+              }
+            },
+            {
+              "idiom" : "watchOS",
+              "value" : {
+                "scale" : 1.54,
+                "translation-in-points" : [
+                  0,
+                  0
+                ]
+              }
+            }
+          ]
+        }
+      ],
+      "opacity-specializations" : [
+        {
+          "appearance" : "dark",
+          "value" : 1
+        }
      ],
      "shadow" : {
        "kind" : "neutral",
@@ -27,54 +102,18 @@
      }
    },
    {
-      "layers" : [
+      "blend-mode" : "normal",
+      "hidden-specializations" : [
        {
-          "blend-mode-specializations" : [
-            {
-              "value" : "normal"
-            },
-            {
-              "appearance" : "dark",
-              "value" : "normal"
-            }
-          ],
-          "fill-specializations" : [
-            {
-              "value" : "none"
-            },
-            {
-              "appearance" : "dark",
-              "value" : {
-                "solid" : "srgb:0.00000,0.50000,0.04260,1.00000"
-              }
-            }
-          ],
-          "glass" : false,
-          "hidden" : false,
-          "image-name" : "pedifoods_big.png",
-          "name" : "pedifoods_big",
-          "position-specializations" : [
-            {
-              "value" : {
-                "scale" : 1,
-                "translation-in-points" : [
-                  137.390625,
-                  11.984375
-                ]
-              }
-            },
-            {
-              "idiom" : "square",
-              "value" : {
-                "scale" : 0.35,
-                "translation-in-points" : [
-                  8,
-                  0
-                ]
-              }
-            }
-          ]
+          "value" : false
+        },
+        {
+          "idiom" : "iOS",
+          "value" : false
        }
+      ],
+      "layers" : [
+
      ],
      "shadow" : {
        "kind" : "neutral",
@@ -87,6 +126,9 @@
    }
  ],
  "supported-platforms" : {
+    "circles" : [
+      "watchOS"
+    ],
    "squares" : [
      "iOS"
    ]
--- a/pedi-foods/Sources/PediFoods/Resources/pedifoods.png
+++ b/pedi-foods/Sources/PediFoods/Resources/pedifoods.png
--- a/pedi-foods/Sources/PediFoods/Resources/pedifoods_dark.png
+++ b/pedi-foods/Sources/PediFoods/Resources/pedifoods_dark.png
--- a/pedi-foods/Sources/PediFoods/Services/ApiOrderModels.swift
+++ b/pedi-foods/Sources/PediFoods/Services/ApiOrderModels.swift
@@ -152,4 +152,38 @@ struct ValidateDeliveryAddressResult: Decodable {
    let deliveryFee: Double?
    let deliveryTime: String?
    let sameCity: Bool?
+
+    enum CodingKeys: String, CodingKey {
+        case deliveryAllowed
+        case delivery_allowed
+        case reasonCode
+        case reason_code
+        case reasonMessage
+        case reason_message
+        case deliveryMode
+        case delivery_mode
+        case distance
+        case deliveryFee
+        case delivery_fee
+        case fee
+        case taxa
+        case deliveryTime
+        case delivery_time
+        case sameCity
+        case same_city
+    }
+
+    init(from decoder: Decoder) throws {
+        let c = try decoder.container(keyedBy: CodingKeys.self)
+        deliveryAllowed = (try? c.decode(Bool.self, forKey: .deliveryAllowed))
+            ?? (try? c.decode(Bool.self, forKey: .delivery_allowed))
+        reasonCode = ApiService.decodeFlexibleString(from: c, keys: [.reasonCode, .reason_code])
+        reasonMessage = ApiService.decodeFlexibleString(from: c, keys: [.reasonMessage, .reason_message])
+        deliveryMode = ApiService.decodeFlexibleString(from: c, keys: [.deliveryMode, .delivery_mode])
+        distance = ApiService.decodeFlexibleDouble(from: c, keys: [.distance])
+        deliveryFee = ApiService.decodeFlexibleDouble(from: c, keys: [.deliveryFee, .delivery_fee, .fee, .taxa])
+        deliveryTime = ApiService.decodeFlexibleString(from: c, keys: [.deliveryTime, .delivery_time])
+        sameCity = (try? c.decode(Bool.self, forKey: .sameCity))
+            ?? (try? c.decode(Bool.self, forKey: .same_city))
+    }
 }
--- a/pedi-foods/Sources/PediFoods/Services/ApiReviewModels.swift
+++ b/pedi-foods/Sources/PediFoods/Services/ApiReviewModels.swift
@@ -8,8 +8,6 @@ enum ReviewPlatform: String, Encodable {
    static var current: ReviewPlatform {
        #if os(iOS)
        return .ios
-        #elseif os(Android)
-        return .android
        #else
        return .web
        #endif
--- a/pedi-foods/Sources/PediFoods/Services/FeatureControlService.swift
+++ b/pedi-foods/Sources/PediFoods/Services/FeatureControlService.swift
@@ -258,20 +258,16 @@ final class FeatureControlService {
    }

    private func featureKeys() -> [String] {
-        let raw = ProcessInfo.processInfo.environment["FEATURE_CONTROL_KEYS"] ?? "fc.checkout_v2,fc.search_ranking_v3"
+        let raw = ProcessInfo.processInfo.environment["FEATURE_CONTROL_KEYS"] ?? "at.city.aguai,at.promo,at.ios.only,at.android.only"
        let items = raw
            .split(separator: ",")
            .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
            .filter { $0.isEmpty == false }
-        return items.isEmpty ? ["fc.checkout_v2"] : items
+        return items.isEmpty ? ["at.ios.only"] : items
    }

    private func platformName() -> String {
-        #if os(Android)
-        return "android"
-        #else
        return "ios"
-        #endif
    }

    private func appVersion() -> String {
--- a/pedi-foods/Sources/PediFoods/Skip/skip.yml
+++ b/pedi-foods/Sources/PediFoods/Skip/skip.yml
@@ -1,12 +0,0 @@
-# Configuration file for https://skip.tools project
-#
-# Kotlin dependencies and Gradle build options for this module can be configured here
-#build:
-#  contents:
-#    - block: 'dependencies'
-#      contents:
-#        - 'implementation("androidx.compose.runtime:runtime")'
-
-# this is a natively-compiled Skip Fuse module
-skip:
-  mode: 'native'
--- a/pedi-foods/Sources/PediFoods/State/AppState.swift
+++ b/pedi-foods/Sources/PediFoods/State/AppState.swift
@@ -62,6 +62,16 @@ struct FeatureFlagsState: Codable, Equatable {
    var source: String = "default"
    var values: [String: FeatureFlagValue] = [:]
    var raw: [String: FeatureControlRawFlag] = [:]
+
+    func isEnabled(_ key: String, default defaultValue: Bool = false) -> Bool {
+        if let rawValue = raw[key] {
+            return rawValue.enabled || rawValue.variant.lowercased() == "on"
+        }
+        if let mapped = values[key] {
+            return mapped.boolValue
+        }
+        return defaultValue
+    }
 }

 enum AppModal: String, Identifiable {
--- a/pedi-foods/Sources/PediFoods/State/SnackbarCenter.swift
+++ b/pedi-foods/Sources/PediFoods/State/SnackbarCenter.swift
@@ -1,26 +1,10 @@
 import Foundation
 import SwiftUI

-#if os(Android)
-@MainActor
-final class SnackbarCenter {
-    static let shared = SnackbarCenter()
-    var current: SnackbarMessage?
-
-    func show(
-        title: String,
-        style: SnackbarStyle = .info,
-        icon: String? = nil,
-        duration: TimeInterval = 3.5,
-        action: (() -> Void)? = nil
-    ) {
-        action?()
-    }
-
-    func handleTap() {}
-    func dismiss(animated: Bool) {}
+extension Notification.Name {
+    static let snackbarDidChange = Notification.Name("snackbarDidChange")
 }
-#else
+
@MainActor
 final class SnackbarCenter: ObservableObject {
    static let shared = SnackbarCenter()
@@ -71,7 +55,6 @@ final class SnackbarCenter: ObservableObject {
        }
    }
 }
-#endif

 enum SnackbarStyle: Sendable {
    case info
--- a/pedi-foods/Sources/PediFoods/Support/PlatformCompat.swift
+++ b/pedi-foods/Sources/PediFoods/Support/PlatformCompat.swift
@@ -11,26 +11,76 @@ import CoreGraphics
 import UIKit
 #endif

-#if !canImport(UIKit)
-struct UIDevice {
-    static let topNotch = 0.0
-    static let bottomNotch = 0.0
+#if canImport(AppKit)
+import AppKit
+#endif

-    var modelName: String {
-        "android"
+#if canImport(UIKit)
+extension UIDevice {
+    static var appSafeAreaTop: CGFloat {
+        let scenes = UIApplication.shared.connectedScenes
+            .compactMap { $0 as? UIWindowScene }
+        let windows = scenes.flatMap { $0.windows }
+        if let maxTop = windows.map({ $0.safeAreaInsets.top }).max(), maxTop > 0 {
+            return maxTop
+        }
+        if let fallbackMaxTop = UIApplication.shared.windows.map({ $0.safeAreaInsets.top }).max(), fallbackMaxTop > 0 {
+            return fallbackMaxTop
+        }
+        return 0
+    }
+}
+#else
+struct UIDevice {
+    static let topNotch: CGFloat = 0.0
+    static let bottomNotch: CGFloat = 0.0
+    static let appSafeAreaTop: CGFloat = 0.0
+    var modelName: String { "mac" }
+}
+
+enum UIKeyboardType: Int {
+    case `default` = 0
+    case asciiCapable = 1
+    case numbersAndPunctuation = 2
+    case URL = 3
+    case numberPad = 4
+    case phonePad = 10
+    case namePhonePad = 9
+    case emailAddress = 7
+    case decimalPad = 8
+    case twitter = 12
+    case webSearch = 13
+    case asciiCapableNumberPad = 14
+}
+
+extension View {
+    @ViewBuilder
+    func keyboardType(_ type: UIKeyboardType) -> some View {
+        self
    }
 }
 #endif

-#if !(canImport(LCEssentials) && os(iOS))
-func printLog(title: String, msg: String) {
-    print("[\(title)] \(msg)")
+func appReadClipboardText() -> String? {
+#if canImport(UIKit)
+    return UIPasteboard.general.string
+#elseif canImport(AppKit)
+    return NSPasteboard.general.string(forType: .string)
+#else
+    return nil
+#endif
 }

-func printError(title: String, msg: String) {
-    print("[\(title)] \(msg)")
-}
+func appWriteClipboardText(_ value: String) {
+#if canImport(UIKit)
+    UIPasteboard.general.string = value
+#elseif canImport(AppKit)
+    NSPasteboard.general.clearContents()
+    NSPasteboard.general.setString(value, forType: .string)
+#else
+    _ = value
 #endif
+}

 extension View {
    @ViewBuilder
@@ -38,7 +88,9 @@ extension View {
 #if os(macOS)
        self
 #else
-        self.navigationBarTitleDisplayMode(.inline)
+        self
+            .navigationBarTitleDisplayMode(.inline)
+            .modifier(AppRoundedBackButtonModifier())
 #endif
    }

@@ -72,32 +124,48 @@ extension View {

    @ViewBuilder
    func appContentShape<S: Shape>(_ shape: S) -> some View {
-#if os(Android)
-        self
-#else
        self.contentShape(shape)
-#endif
    }

    @ViewBuilder
    func appBottomSafeAreaInset<Content: View>(@ViewBuilder content: () -> Content) -> some View {
-#if os(Android)
-        self.overlay(alignment: .bottom) {
-            content()
-        }
-#else
        self.safeAreaInset(edge: .bottom) {
            content()
        }
-#endif
    }

    @ViewBuilder
    func appLayoutPriority(_ value: Double) -> some View {
-#if os(Android)
-        self
-#else
        self.layoutPriority(value)
-#endif
+    }
+
+    @ViewBuilder
+    func appNamedCoordinateSpace(_ name: String) -> some View {
+        self.coordinateSpace(name: name)
    }
 }
+
+#if !os(macOS)
+private struct AppRoundedBackButtonModifier: ViewModifier {
+    @Environment(\.dismiss) private var dismiss
+
+    func body(content: Content) -> some View {
+        content
+            .navigationBarBackButtonHidden(true)
+            .toolbar {
+                ToolbarItem(placement: .topBarLeading) {
+                    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)
+                }
+            }
+    }
+}
+#endif
--- a/pedi-foods/Sources/PediFoods/Views/Auth/LegalViews.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Auth/LegalViews.swift
@@ -17,9 +17,7 @@ struct TermsOfUseView: View {
        }
        .background((colorScheme == .dark ? Color.black : AppColors.backgroundLight).ignoresSafeArea())
        .navigationTitle("Termos de Uso")
-#if os(iOS)
        .appInlineNavigationTitle()
-#endif
    }
 }

@@ -40,8 +38,6 @@ struct PrivacyPolicyView: View {
        }
        .background((colorScheme == .dark ? Color.black : AppColors.backgroundLight).ignoresSafeArea())
        .navigationTitle("Privacidade")
-#if os(iOS)
        .appInlineNavigationTitle()
-#endif
    }
 }
--- a/pedi-foods/Sources/PediFoods/Views/Auth/LoginEmailView.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Auth/LoginEmailView.swift
@@ -14,13 +14,8 @@ struct LoginEmailView: View {
    @Environment(\.colorScheme) var colorScheme

    @ViewBuilder private var logoImage: some View {
-#if os(Android)
        SwiftUI.Image("pedifoods")
            .resizable()
-#else
-        SwiftUI.Image("pedifoods")
-            .resizable()
-#endif
    }

    var body: some View {
@@ -40,9 +35,9 @@ struct LoginEmailView: View {

                VStack(spacing: 16) {
                    VStack(alignment: .leading, spacing: 16) {
-                        LoginField(icon: "envelope", placeholder: "seu@email.com", text: $email)
+                        LoginField(icon: "envelope", placeholder: "seu@email.com", keyboardType: .emailAddress, text: $email)

-                        LoginField(icon: "phone", placeholder: "(00) 00000-0000", text: $phone)
+                        LoginField(icon: "phone", placeholder: "(00) 00000-0000", keyboardType: .numberPad, text: $phone)
                            .onChange(of: phone) { _, newValue in
                                let masked = formatPhoneBR(newValue)
                                if masked != newValue {
@@ -78,6 +73,7 @@ struct LoginEmailView: View {
                            dismiss()
                        }
                }
+                .buttonStyle(.plain)
                .font(AppTypography.body)
                .padding(.top, 8)

@@ -125,6 +121,7 @@ struct LoginEmailView: View {
 struct LoginField: View {
    let icon: String
    let placeholder: String
+    let keyboardType: UIKeyboardType
    @Binding var text: String

    var body: some View {
@@ -135,6 +132,7 @@ struct LoginField: View {
            TextField(text: $text, prompt: Text(placeholder).foregroundColor(Color.gray)) { }
                .appNoAutoCap()
                .foregroundColor(.black)
+                .keyboardType(keyboardType)
        }
        .padding(.horizontal, 16)
        .frame(height: 52)
--- a/pedi-foods/Sources/PediFoods/Views/Auth/LoginView.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Auth/LoginView.swift
@@ -15,23 +15,13 @@ struct LoginView: View {
    @State var lastAnimatedToken = 0

    @ViewBuilder private var logoImage: some View {
-#if os(Android)
        SwiftUI.Image("pedifoods")
            .resizable()
-#else
-        SwiftUI.Image("pedifoods")
-            .resizable()
-#endif
    }

    @ViewBuilder private var pinHeroImage: some View {
-#if os(Android)
-        SwiftUI.Image(colorScheme == .dark ? "pin_image_app_dark" : "pin_image_app")
-            .resizable()
-#else
        SwiftUI.Image("pin_image_app")
            .resizable()
-#endif
    }

    var body: some View {
@@ -82,6 +72,7 @@ struct LoginView: View {
                    .tint(AppColors.tertiary)
                    .offset(y: buttonVisible ? 0 : 140)
                    .opacity(buttonVisible ? 1.0 : 0.0)
+                    .buttonStyle(.plain)

                    HStack(spacing: 6) {
                        Text("Não tem conta ainda?")
@@ -89,6 +80,7 @@ struct LoginView: View {
                        Button("Criar conta") {
                            navigate(.registration)
                        }
+                        .buttonStyle(.plain)
                        .foregroundStyle(AppColors.primary)
                    }
                    .font(AppTypography.body)
--- a/pedi-foods/Sources/PediFoods/Views/Auth/OtpView.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Auth/OtpView.swift
@@ -64,6 +64,10 @@ struct OtpView: View {
                            if trimmed != newValue {
                                otp = trimmed
                            }
+                            if trimmed.count == 8 && !isLoading {
+                                isOtpFocused = false
+                                validateOtp()
+                            }
                        }
                }
                .frame(height: 204)
@@ -84,6 +88,7 @@ struct OtpView: View {
                    Button(resendButtonTitle) {
                        resendOtp()
                    }
+                    .buttonStyle(.plain)
                    .font(AppTypography.heading3)
                    .foregroundStyle(AppColors.primary)
                    .disabled(isResending || !canResend)
@@ -93,6 +98,7 @@ struct OtpView: View {
                Button("Colar código") {
                    pasteOtpFromClipboard()
                }
+                .buttonStyle(.plain)
                .font(AppTypography.heading3)
                .foregroundStyle(AppColors.primary)
                .padding(.top, 22)
@@ -116,6 +122,7 @@ struct OtpView: View {
                .padding(.bottom, 18)
            }
        }
+        .scrollDismissesKeyboard(.interactively)
        .background(AppColors.backgroundLight)
        .ignoresSafeArea()
        .onAppear {
@@ -181,31 +188,20 @@ struct OtpView: View {
    }

    private func pasteOtpFromClipboard() {
-#if canImport(UIKit)
-        let raw = UIPasteboard.general.string ?? ""
+        let raw = appReadClipboardText() ?? ""
        let digits = raw.filter(\.isNumber)
        let trimmed = String(digits.prefix(8))
        if trimmed.isEmpty == false {
            otp = trimmed
        }
-#elseif canImport(AppKit)
-        let raw = NSPasteboard.general.string(forType: .string) ?? ""
-        let digits = raw.filter(\.isNumber)
-        let trimmed = String(digits.prefix(8))
-        if trimmed.isEmpty == false {
-            otp = trimmed
-        }
-#endif
    }

    private func autoFillOtpFromClipboardIfAvailable() {
-#if canImport(UIKit)
        guard otp.isEmpty else { return }
-        let raw = UIPasteboard.general.string ?? ""
+        let raw = appReadClipboardText() ?? ""
        let digits = raw.filter(\.isNumber)
        guard digits.count >= 8 else { return }
        otp = String(digits.prefix(8))
-#endif
    }

    private var otpDeliveryMessage: String {
--- a/pedi-foods/Sources/PediFoods/Views/Auth/RegistrationView.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Auth/RegistrationView.swift
@@ -18,13 +18,8 @@ struct RegistrationView: View {
    private var isFormValid: Bool { !name.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty && !email.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty && !phone.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty && acceptedTerms }

    @ViewBuilder private var logoImage: some View {
-#if os(Android)
        SwiftUI.Image("pedifoods")
            .resizable()
-#else
-        SwiftUI.Image("pedifoods")
-            .resizable()
-#endif
    }

    var body: some View {
@@ -49,9 +44,9 @@ struct RegistrationView: View {

                    VStack(spacing: 16) {
                        VStack(alignment: .leading, spacing: 16) {
-                            LoginField(icon: "person", placeholder: "Ex: Maria Silva", text: $name)
-                            LoginField(icon: "envelope", placeholder: "seu@email.com", text: $email)
-                            LoginField(icon: "phone", placeholder: "(00) 00000-0000", text: $phone)
+                            LoginField(icon: "person", placeholder: "Ex: Maria Silva", keyboardType: .default, text: $name)
+                            LoginField(icon: "envelope", placeholder: "seu@email.com", keyboardType: .emailAddress, text: $email)
+                            LoginField(icon: "phone", placeholder: "(00) 00000-0000", keyboardType: .namePhonePad, text: $phone)
                                .onChange(of: phone) { _, newValue in
                                    let masked = formatPhoneBR(newValue)
                                    if masked != newValue {
--- a/pedi-foods/Sources/PediFoods/Views/Launch/LaunchSplashView.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Launch/LaunchSplashView.swift
@@ -36,12 +36,7 @@ struct LaunchSplashView: View {
    }

    @ViewBuilder var splashLogo: some View {
-#if os(Android)
        SwiftUI.Image("pedifoods")
            .resizable()
-#else
-        SwiftUI.Image("pedifoods")
-            .resizable()
-#endif
    }
 }
--- a/pedi-foods/Sources/PediFoods/Views/Main/AddAddressFormView.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Main/AddAddressFormView.swift
@@ -32,13 +32,8 @@ struct AddAddressFormView: View {
    }

    @ViewBuilder private var logoImage: some View {
-#if os(Android)
        SwiftUI.Image("pedifoods")
            .resizable()
-#else
-        SwiftUI.Image("pedifoods")
-            .resizable()
-#endif
    }

    var body: some View {
@@ -47,6 +42,13 @@ struct AddAddressFormView: View {

            ScrollView {
                VStack(spacing: 0) {
+                    screenHeader(
+                        title: existingAddress == nil ? "Novo endereço" : "Editar endereço",
+                        onBack: { dismiss() }
+                    )
+                    .padding(.horizontal, 24)
+                    .padding(.bottom, 12)
+
                    logoImage
                        .scaledToFit()
                        .frame(width: 120, height: 120)
@@ -63,8 +65,8 @@ struct AddAddressFormView: View {
                        .padding(.bottom, 20)

                    VStack(alignment: .leading, spacing: 16) {
-                        LoginField(icon: "tag", placeholder: "Ex: Casa, Trabalho", text: $label)
-                        LoginField(icon: "mail", placeholder: "CEP", text: $zipCode)
+                        LoginField(icon: "tag", placeholder: "Ex: Casa, Trabalho", keyboardType: .default, text: $label)
+                        LoginField(icon: "mail", placeholder: "CEP", keyboardType: .numberPad, text: $zipCode)
                            .onChange(of: zipCode) { _, newValue in
                                let masked = formatZipCodeBR(newValue)
                                if masked != newValue {
@@ -92,12 +94,12 @@ struct AddAddressFormView: View {
                                .foregroundStyle(AppColors.textMuted)
                                .padding(.horizontal, 6)
                        }
-                        LoginField(icon: "mappin.and.ellipse", placeholder: "Rua / Avenida", text: $address)
-                        LoginField(icon: "number", placeholder: "Número", text: $number)
-                        LoginField(icon: "plus.app", placeholder: "Complemento (opcional)", text: $complement)
-                        LoginField(icon: "square.grid.2x2", placeholder: "Bairro", text: $neighborhood)
-                        LoginField(icon: "building.2", placeholder: "Cidade", text: $city)
-                        LoginField(icon: "map", placeholder: "Estado (UF)", text: $state)
+                        LoginField(icon: "mappin.and.ellipse", placeholder: "Rua / Avenida", keyboardType: .default, text: $address)
+                        LoginField(icon: "number", placeholder: "Número", keyboardType: .default, text: $number)
+                        LoginField(icon: "plus.app", placeholder: "Complemento (opcional)", keyboardType: .default, text: $complement)
+                        LoginField(icon: "square.grid.2x2", placeholder: "Bairro", keyboardType: .default, text: $neighborhood)
+                        LoginField(icon: "building.2", placeholder: "Cidade", keyboardType: .default, text: $city)
+                        LoginField(icon: "map", placeholder: "Estado (UF)", keyboardType: .default, text: $state)
                            .onChange(of: state) { _, newValue in
                                let normalized = String(newValue.uppercased().prefix(2))
                                if normalized != newValue {
@@ -134,6 +136,28 @@ struct AddAddressFormView: View {
        }
    }

+    private func screenHeader(title: String, onBack: @escaping () -> Void) -> some View {
+        ZStack {
+            Text(title)
+                .font(AppTypography.heading2)
+                .foregroundStyle(colorScheme == .dark ? Color.white : AppColors.textPrimary)
+
+            HStack {
+                Button(action: onBack) {
+                    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 saveAddress() {
        guard !isLoading else { return }
        let latLong: [Double]? = {
--- a/pedi-foods/Sources/PediFoods/Views/Main/AddressesView.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Main/AddressesView.swift
@@ -22,7 +22,7 @@ struct AddressesView: View {

            ScrollView(showsIndicators: false) {
                VStack(spacing: 20) {
-                    header
+                    screenHeader(title: "Meus Endereços", onBack: { dismiss() })

                    if let message {
                        Text(message)
@@ -131,28 +131,6 @@ struct AddressesView: View {
        }
    }

-    var header: some View {
-        ZStack {
-            Text("Meus Endereços")
-                .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)
-                }
-
-                Spacer()
-            }
-        }
-    }
-
    var bottomOverlay: some View {
        ZStack(alignment: .bottom) {
            Rectangle()
@@ -181,6 +159,28 @@ struct AddressesView: View {
        }
    }

+    private func screenHeader(title: String, onBack: @escaping () -> Void) -> some View {
+        ZStack {
+            Text(title)
+                .font(AppTypography.heading2)
+                .foregroundStyle(AppColors.textPrimary)
+
+            HStack {
+                Button(action: onBack) {
+                    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 selectAddress(_ address: CustomerAddress) {
        appState.address.selectedId = address.id
        let label = (address.label ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
--- a/pedi-foods/Sources/PediFoods/Views/Main/CheckoutView.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Main/CheckoutView.swift
@@ -692,12 +692,7 @@ struct PaymentPixView: View {
    }

    private func copyToClipboard(_ value: String) {
-#if canImport(UIKit)
-        UIPasteboard.general.string = value
-#elseif canImport(AppKit)
-        NSPasteboard.general.clearContents()
-        NSPasteboard.general.setString(value, forType: .string)
-#endif
+        appWriteClipboardText(value)
    }

    private var parsedExpirationDate: Date? {
--- a/pedi-foods/Sources/PediFoods/Views/Main/HomeScrollOffsetObserver.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Main/HomeScrollOffsetObserver.swift
@@ -4,7 +4,6 @@ enum HomeScrollCoordinateSpace {
    static let name = "home-scroll"
 }

-#if os(iOS)
 struct HomeScrollOffsetPreferenceKey: PreferenceKey {
    static let defaultValue: CGFloat = 0

@@ -32,4 +31,3 @@ struct ScrollOffsetObserver: View {
            }
    }
 }
-#endif
--- a/pedi-foods/Sources/PediFoods/Views/Main/HomeView+Filtering.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Main/HomeView+Filtering.swift
@@ -61,6 +61,7 @@ extension HomeView {
            rating: store.rating ?? 0,
            reviews: String(store.positiveReviews ?? store.reviewsCount ?? 0),
            distance: formatDistance(store.distance),
+            deliveryFee: store.deliveryFee,
            category: store.category ?? "Loja",
            promoText: nil,
            isFavorite: appState.favorites.storeIds.contains(store.id),
--- a/pedi-foods/Sources/PediFoods/Views/Main/HomeView.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Main/HomeView.swift
@@ -48,7 +48,7 @@ struct HomeView: View {
                    refreshCategories: true
                )
            }
-            .coordinateSpace(name: HomeScrollCoordinateSpace.name)
+            .appNamedCoordinateSpace(HomeScrollCoordinateSpace.name)

            header(collapseProgress: collapseProgress, height: headerHeight)
                .frame(maxWidth: .infinity, alignment: .top)
@@ -101,6 +101,7 @@ struct HomeView: View {
                                    storeCategory: store.category,
                                    storeRating: store.rating,
                                    storeDistance: store.distance,
+                                    storeDeliveryFee: store.deliveryFee,
                                    appState: $appState
                                )
                            } label: {
@@ -121,15 +122,17 @@ struct HomeView: View {
                }
            }

-            section(title: "#PediPromo") {
-                ScrollView(.horizontal, showsIndicators: false) {
-                    HStack(spacing: 16) {
-                        ForEach(specials) { item in
-                            SpecialOfferCard(model: item)
-                                .frame(width: 260, height: 120)
+            if appState.featureFlags.isEnabled("at.promo") {
+                section(title: "#PediPromo") {
+                    ScrollView(.horizontal, showsIndicators: false) {
+                        HStack(spacing: 16) {
+                            ForEach(specials) { item in
+                                SpecialOfferCard(model: item)
+                                    .frame(width: 260, height: 120)
+                            }
                        }
+                        .padding(.horizontal, 20)
                    }
-                    .padding(.horizontal, 20)
                }
            }

@@ -156,6 +159,7 @@ struct HomeView: View {
                                )
                            }
                        }
+                        .buttonStyle(.plain)
                        .font(AppTypography.heading3)
                        .foregroundStyle(AppColors.primary)
                    }
@@ -177,6 +181,7 @@ struct HomeView: View {
                                    storeCategory: store.category,
                                    storeRating: store.rating,
                                    storeDistance: store.distance,
+                                    storeDeliveryFee: store.deliveryFee,
                                    appState: $appState
                                )
                            } label: {
@@ -204,7 +209,7 @@ struct HomeView: View {

        return ZStack(alignment: .top) {
            RoundedRectangle(cornerRadius: 32, style: .continuous)
-                .fill(AppColors.brandDark)
+                .fill(AppColors.primary)
                .frame(height: height)
                .overlay(headerRings.opacity(1 - collapseProgress), alignment: .topTrailing)

@@ -449,16 +454,12 @@ struct HomeView: View {

    @ViewBuilder
    private var scrollOffsetObserver: some View {
-#if os(iOS)
        ScrollOffsetObserver { y in
            // Use only upward displacement for collapse and ignore top bounce.
            let normalized = max(0, y)
            scrollOffset = normalized
        }
        .frame(width: 0, height: 0)
-#else
-        EmptyView()
-#endif
    }

    private var addressCacheScope: String {
--- a/pedi-foods/Sources/PediFoods/Views/Main/HomeViewComponents.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Main/HomeViewComponents.swift
@@ -28,7 +28,7 @@ struct CategoryChip: View {
        .foregroundStyle(isActive ? AppColors.textInverse : AppColors.textPrimary)
        .padding(.horizontal, 16)
        .padding(.vertical, 10)
-        .background(isActive ? AppColors.brandDark : AppColors.surface)
+        .background(isActive ? AppColors.primary : AppColors.surface)
        .clipShape(Capsule())
    }
 }
@@ -49,6 +49,7 @@ struct SearchBar: View {
                Image(systemName: "slider.horizontal.3")
                    .foregroundStyle(AppColors.textMuted)
            }
+            .buttonStyle(.plain)
        }
        .padding(.horizontal, 16)
        .frame(height: 52)
--- a/pedi-foods/Sources/PediFoods/Views/Main/MainTabView.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Main/MainTabView.swift
@@ -72,12 +72,12 @@ struct MainTabView: View {
                        .font(AppTypography.heading3)
                }
            }
-            .foregroundStyle(isActive ? AppColors.primary : AppColors.textPrimary)
+            .foregroundStyle(isActive ? AppColors.textInverse : AppColors.textPrimary)
            .padding(.horizontal, 18)
            .padding(.vertical, 10)
            .background(
                Capsule()
-                    .fill(isActive ? AppColors.brandSoft : Color.clear)
+                    .fill(isActive ? AppColors.primary : Color.clear)
            )
        }
        .buttonStyle(.plain)
--- a/pedi-foods/Sources/PediFoods/Views/Main/OrdersView.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Main/OrdersView.swift
@@ -1,6 +1,7 @@
 import SwiftUI

 struct OrdersView: View {
+    @Environment(\.dismiss) var dismiss
    @State var isLoading = false
    @State var errorMessage: String? = nil
    @State var orders: [AppOrderSummary] = []
@@ -12,6 +13,8 @@ struct OrdersView: View {
    var body: some View {
        ScrollView(showsIndicators: false) {
            VStack(alignment: .leading, spacing: 14) {
+                screenHeader(title: "Meus Pedidos", onBack: { dismiss() })
+
                if isLoading {
                    ProgressView()
                        .frame(maxWidth: .infinity)
@@ -35,11 +38,12 @@ struct OrdersView: View {
                }
            }
            .padding(.horizontal, 20)
+            .padding(.top, 18)
            .padding(.bottom, UIDevice.bottomNotch + 18)
        }
        .background(AppColors.backgroundLight)
-        .navigationTitle("Meus Pedidos")
-        .appInlineNavigationTitle()
+        .navigationBarBackButtonHidden(true)
+        .appHiddenNavigationBar()
        .task {
            await loadOrdersIfNeeded()
            await refreshStoreRatings()
@@ -59,6 +63,28 @@ struct OrdersView: View {
        }
    }

+    private func screenHeader(title: String, onBack: @escaping () -> Void) -> some View {
+        ZStack {
+            Text(title)
+                .font(AppTypography.heading2)
+                .foregroundStyle(AppColors.textPrimary)
+
+            HStack {
+                Button(action: onBack) {
+                    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 orderCard(_ order: AppOrderSummary) -> some View {
        let status = orderVisualStatus(for: order)
        let detailsRoute = OrderRouteContext(
@@ -81,7 +107,6 @@ struct OrdersView: View {
                AsyncStoreImage(imageURL: resolvedMediaURL(order.storeLogoURL))
                    .frame(width: 80, height: 80)
                    .clipShape(RoundedRectangle(cornerRadius: 20, style: .continuous))
-                    .background(AppColors.brandSoft, in: RoundedRectangle(cornerRadius: 20, style: .continuous))

                VStack(alignment: .leading, spacing: 5) {
                    
@@ -663,58 +688,57 @@ struct OrderEntryDestinationView: View {
    func resolveRoute() async {
        defer { isResolvingRoute = false }

-        if routeIntent == .tracking {
-            return
-        }
-
        let order = await fetchOrderForRouting()
        guard let order else { return }
+
        if routeIntent == .details {
            orderDetails = order
            return
        }
-        if shouldOpenOrderDetails(for: order) {
+
+        // For both .tracking and .auto: show payment screen if payment is still pending.
+        // Timeline only shows once payment is confirmed or method is off-app.
+        if shouldOpenPaymentScreen(for: order) {
+            let normalizedMethod = normalizePaymentMethod(order)
+            if normalizedMethod.contains("PIX") {
+                let pixFromPayment = order.payment?.pix
+                let pixFromPayload = order.paymentPayload
+                let copyPaste = (pixFromPayment?.copyPaste?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false)
+                    ? pixFromPayment?.copyPaste
+                    : pixFromPayload?.copyPaste
+                let qrCodeImage = (pixFromPayment?.qrCodeImage?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false)
+                    ? pixFromPayment?.qrCodeImage
+                    : pixFromPayload?.qrCodeImage
+                let expirationDate = (pixFromPayment?.expirationDate?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false)
+                    ? pixFromPayment?.expirationDate
+                    : pixFromPayload?.expirationDate
+                pixContext = PixPaymentContext(
+                    id: order.id,
+                    orderId: order.id,
+                    shortId: order.shortId ?? initialShortId,
+                    copyPaste: copyPaste?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false
+                        ? (copyPaste ?? "")
+                        : "Código PIX indisponível no momento. Aguarde e tente novamente.",
+                    qrCodeImageBase64: qrCodeImage,
+                    expirationDate: expirationDate
+                )
+                return
+            }
+            if normalizedMethod == "CREDIT_CARD" || normalizedMethod == "DEBIT_CARD" {
+                cardContext = CardPaymentContext(
+                    orderId: order.id,
+                    shortId: order.shortId ?? initialShortId,
+                    total: order.total ?? fallbackTotal ?? 0
+                )
+                return
+            }
+        }
+
+        // For .auto only: route terminal/canceled orders to details instead of timeline.
+        if routeIntent == .auto && shouldOpenOrderDetails(for: order) {
            orderDetails = order
-            return
-        }
-        guard shouldOpenPaymentScreen(for: order) else { return }
-
-        let normalizedMethod = normalizePaymentMethod(order)
-        if normalizedMethod.contains("PIX") {
-            let pixFromPayment = order.payment?.pix
-            let pixFromPayload = order.paymentPayload
-            let copyPaste = (pixFromPayment?.copyPaste?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false)
-                ? pixFromPayment?.copyPaste
-                : pixFromPayload?.copyPaste
-
-            let qrCodeImage = (pixFromPayment?.qrCodeImage?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false)
-                ? pixFromPayment?.qrCodeImage
-                : pixFromPayload?.qrCodeImage
-            let expirationDate = (pixFromPayment?.expirationDate?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false)
-                ? pixFromPayment?.expirationDate
-                : pixFromPayload?.expirationDate
-
-            pixContext = PixPaymentContext(
-                id: order.id,
-                orderId: order.id,
-                shortId: order.shortId ?? initialShortId,
-                copyPaste: copyPaste?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false
-                    ? (copyPaste ?? "")
-                    : "Código PIX indisponível no momento. Aguarde e tente novamente.",
-                qrCodeImageBase64: qrCodeImage,
-                expirationDate: expirationDate
-            )
-            return
-        }
-
-        if normalizedMethod == "CREDIT_CARD" || normalizedMethod == "DEBIT_CARD" {
-            cardContext = CardPaymentContext(
-                orderId: order.id,
-                shortId: order.shortId ?? initialShortId,
-                total: order.total ?? fallbackTotal ?? 0
-            )
-            return
        }
+        // .tracking (and .auto fallthrough) → nil states → body renders OrderTrackingView
    }

    @MainActor
--- a/pedi-foods/Sources/PediFoods/Views/Main/PizzaFlavorAddonsSheet.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Main/PizzaFlavorAddonsSheet.swift
@@ -81,6 +81,7 @@ struct PizzaFlavorAddonsSheet: View {
        .appInlineNavigationTitle()
        .appTopBarTrailingToolbar {
            Button("Concluir") { dismiss() }
+                .buttonStyle(.plain)
                .foregroundStyle(AppColors.primary)
        }
    }
--- a/pedi-foods/Sources/PediFoods/Views/Main/StoreDetailSupport.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Main/StoreDetailSupport.swift
@@ -22,6 +22,7 @@ struct ScrollOffsetPreferenceKey: PreferenceKey {

 struct ScrollOffsetReader: View {
    @Binding var offsetY: CGFloat
+    @State private var baseline: CGFloat? = nil

    var body: some View {
        Color.clear
@@ -35,9 +36,10 @@ struct ScrollOffsetReader: View {
                }
            )
            .onPreferenceChange(ScrollOffsetPreferenceKey.self) { minY in
-                let normalizedOffset = max(0, -minY)
-                if abs(offsetY - normalizedOffset) > 0.5 {
-                    offsetY = normalizedOffset
+                if baseline == nil { baseline = minY }
+                let offset = max(0, (baseline ?? 0) - minY)
+                if abs(offsetY - offset) > 0.5 {
+                    offsetY = offset
                }
            }
    }
@@ -61,3 +63,6 @@ struct AsyncStoreImage: View {
            .scaledToFill()
    }
 }
+
+
+
--- a/pedi-foods/Sources/PediFoods/Views/Main/StoreDetailView+Components.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Main/StoreDetailView+Components.swift
@@ -0,0 +1,348 @@
+import SwiftUI
+
+extension StoreDetailView {
+
+    var topSection: some View {
+        ZStack(alignment: .top) {
+            heroSection
+                .frame(height: topSectionHeight)
+
+            // Hard cut: cover cannot appear below this line.
+            Rectangle()
+                .fill(AppColors.backgroundLight)
+                .frame(height: max(0, topSectionHeight - coverVisibleUntilY))
+                .offset(y: coverVisibleUntilY)
+
+            summaryCard
+                .padding(.horizontal, 16)
+                .padding(.top, cardTopInset)
+
+            storeLogoBadge
+                .padding(.top, cardTopInset - (storeLogoSize / 2))
+        }
+        .frame(height: topSectionHeight)
+    }
+
+    var heroSection: some View {
+        ZStack(alignment: .top) {
+            AsyncStoreImage(imageURL: resolvedURL(storeCoverURL))
+                .frame(height: topSectionHeight)
+                .overlay(
+                    LinearGradient(
+                        colors: [Color.black.opacity(0.32), Color.black.opacity(0.05)],
+                        startPoint: .top,
+                        endPoint: .bottom
+                    )
+                )
+                .ignoresSafeArea(.container, edges: .top)
+
+            VStack(spacing: 0) {
+                HStack {
+                    heroIconButton(icon: "chevron.left") {
+                        dismiss()
+                    }
+                    Spacer()
+                    heroIconButton(icon: "magnifyingglass") {}
+                    heroIconButton(
+                        icon: isFavoriteStore ? "heart.fill" : "heart",
+                        foregroundStyle: isFavoriteStore ? Color.red : Color.white
+                    ) {
+                        Task {
+                            await toggleFavoriteStore()
+                        }
+                    }
+                }
+                .padding(.horizontal, 14)
+                .padding(.top, UIDevice.topNotch)
+
+                Spacer()
+
+                Text("RESTAURANT")
+                    .font(AppTypography.overline)
+                    .tracking(1.8)
+                    .foregroundStyle(Color.white.opacity(0.92))
+                    .padding(.bottom, 14)
+            }
+        }
+    }
+
+    var storeLogoBadge: some View {
+        ZStack {
+            Circle()
+                .fill(AppColors.surface)
+                .frame(width: storeLogoSize, height: storeLogoSize)
+                .overlay(
+                    Circle()
+                        .stroke(Color.white, lineWidth: 0.1)
+                )
+
+            AsyncStoreImage(imageURL: resolvedURL(storeLogoURL))
+                .frame(width: storeLogoSize - 10, height: storeLogoSize - 10)
+                .clipShape(Circle())
+        }
+        .shadow(color: Color.black.opacity(0.10), radius: 8, y: 3)
+    }
+
+    var summaryCard: some View {
+        VStack(spacing: 0) {
+            VStack(alignment: .leading, spacing: 14) {
+                HStack(alignment: .top) {
+                    VStack(alignment: .leading, spacing: 6) {
+                        Text(storeName)
+                            .font(AppTypography.heading2)
+                            .foregroundStyle(AppColors.textPrimary)
+                            .lineLimit(2)
+                            .padding(.top, 30)
+
+                        Text(storeSubtitle)
+                            .font(.caption)
+                            .foregroundStyle(AppColors.textMuted)
+                            .lineLimit(1)
+                    }
+
+                    Spacer()
+
+                    ratingChip
+                }
+
+                HStack(spacing: 0) {
+                    statItem(title: "DISTÂNCIA", value: distanceValueLabel)
+                    Divider().frame(height: 34)
+                    if let deliveryTime = info?.deliveryTime {
+                        statItem(title: "TEMPO MIN.", value: deliveryTime+" min.")
+                    } else {
+                        statItem(title: "TEMPO", value: "--")
+                    }
+                    Divider().frame(height: 34)
+                    statItem(title: "PED. MIN.", value: deliveryValueLabel)
+                }
+                .padding(.vertical, 4)
+            }
+            .padding(16)
+
+            if isStoreOpen == false {
+                Text(closedStoreBannerText)
+                    .font(AppTypography.heading3)
+                    .foregroundStyle(Color.white)
+                    .frame(maxWidth: .infinity, minHeight: closedBannerHeight)
+                    .background(AppColors.brandDark)
+            }
+        }
+        .frame(height: summaryCardHeight)
+        .background(AppColors.surface)
+        .clipShape(RoundedRectangle(cornerRadius: AppLayout.radiusXL, style: .continuous))
+        .shadow(color: AppShadow.soft.color, radius: AppShadow.soft.radius, y: AppShadow.soft.y)
+    }
+
+    @ViewBuilder
+    var sectionedProducts: some View {
+        if isLoading {
+            VStack(spacing: 10) {
+                ProgressView()
+                Text("Carregando cardápio...")
+                    .font(AppTypography.body)
+                    .foregroundStyle(AppColors.textMuted)
+            }
+            .frame(maxWidth: .infinity, minHeight: 280, alignment: .center)
+        } else if let errorMessage {
+            VStack(alignment: .leading, spacing: 10) {
+                Text(errorMessage)
+                    .font(AppTypography.body)
+                    .foregroundStyle(AppColors.textMuted)
+                Button("Tentar novamente") {
+                    Task { await loadStoreData() }
+                }
+                .font(AppTypography.heading3)
+                .foregroundStyle(AppColors.primary)
+            }
+            .padding(.top, 16)
+        } else if categories.isEmpty {
+            Text("Cardápio indisponível no momento.")
+                .font(AppTypography.body)
+                .foregroundStyle(AppColors.textMuted)
+                .padding(.top, 16)
+                .padding(.horizontal, 16)
+                .padding(.bottom, 120)
+        } else {
+            ForEach(categories, id: \.id) { category in
+                Text(category.name)
+                    .font(AppTypography.heading2)
+                    .foregroundStyle(AppColors.textPrimary)
+                    .id(sectionAnchorId(for: category.id))
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .padding(.horizontal, 16)
+                    .padding(.top, 8)
+                    .padding(.bottom, 8)
+                    .background(AppColors.backgroundLight)
+                    .background(
+                        GeometryReader { geometry in
+                            Color.clear.preference(
+                                key: CategoryHeaderOffsetPreferenceKey.self,
+                                value: [category.id: geometry.frame(in: .global).minY]
+                            )
+                        }
+                    )
+
+                VStack(spacing: 12) {
+                    ForEach(listItems(for: category)) { item in
+                        productCard(item, in: category)
+                    }
+                }
+                .padding(.horizontal, 16)
+                .padding(.bottom, 8)
+            }
+            Color.clear.frame(height: 140)
+        }
+    }
+
+    func categoryTabs(proxy: ScrollViewProxy, isPinned: Bool = false) -> some View {
+        let safeTop: CGFloat = {
+            guard isPinned else { return 0 }
+            #if canImport(UIKit)
+            return UIDevice.appSafeAreaTop
+            #else
+            return 0
+            #endif
+        }()
+
+        return ScrollView(.horizontal, showsIndicators: false) {
+            HStack(spacing: 10) {
+                ForEach(categories, id: \.id) { category in
+                    let active = selectedCategoryId == category.id
+                    Button {
+                        selectedCategoryId = category.id
+                        isProgrammaticCategoryScroll = true
+                        withAnimation(.easeInOut(duration: 0.25)) {
+                            proxy.scrollTo(sectionAnchorId(for: category.id), anchor: .top)
+                        }
+                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
+                            isProgrammaticCategoryScroll = false
+                        }
+                    } label: {
+                        Text(category.name)
+                            .font(AppTypography.heading3)
+                            .foregroundStyle(active ? AppColors.textInverse : AppColors.textMuted)
+                            .padding(.horizontal, 16)
+                            .padding(.vertical, 9)
+                            .background(active ? AppColors.primary : AppColors.surface)
+                            .clipShape(Capsule())
+                    }
+                    .buttonStyle(.plain)
+                }
+            }
+            .padding(.horizontal, 16)
+            .padding(.vertical, 10)
+        }
+        .padding(.top, safeTop)
+        .background(AppColors.backgroundLight)
+        .animation(.easeInOut(duration: 0.15), value: isPinned)
+    }
+
+    func productCard(_ item: StoreCatalogListItem, in category: StoreCatalogCategory) -> some View {
+        let product = item.product
+        let hasSelectableAddons = product.addonGroups.contains { $0.items.isEmpty == false }
+
+        return HStack(spacing: 12) {
+            VStack(alignment: .leading, spacing: 8) {
+                Text(item.title)
+                    .font(AppTypography.heading3)
+                    .foregroundStyle(AppColors.textPrimary)
+                    .lineLimit(2)
+                    .multilineTextAlignment(.leading)
+
+                if let description = item.description, description.isEmpty == false {
+                    Text(description)
+                        .font(.caption)
+                        .foregroundStyle(AppColors.textMuted)
+                        .lineLimit(2)
+                        .multilineTextAlignment(.leading)
+                }
+
+                Text(listPriceLabel(for: product, in: category))
+                    .font(AppTypography.heading3)
+                    .foregroundStyle(AppColors.textPrimary)
+            }
+
+            Spacer()
+
+            ZStack(alignment: .bottomTrailing) {
+                AsyncStoreImage(imageURL: resolvedURL(item.imageURL))
+                    .frame(width: 92, height: 92)
+                    .clipShape(RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous))
+
+                Button {
+                    guard isStoreOpen else {
+                        SnackbarCenter.shared.show(title: "Loja fechada no momento.", style: .warning, icon: "moon.zzz.fill", duration: 2.0)
+                        return
+                    }
+                    if item.isPizzaSummary, let pizzaCategoryId = item.pizzaCategoryId {
+                        requestOpenPizzaSheet(categoryId: pizzaCategoryId)
+                        return
+                    }
+                    if hasSelectableAddons == false {
+                        let basePrice = product.price ?? 0
+                        let item = CartItemState(
+                            id: "\(storeId)::\(product.id)::base",
+                            productId: product.id,
+                            storeId: storeId,
+                            name: product.name,
+                            imageURL: resolvedURL(product.image),
+                            quantity: 1,
+                            unitPrice: basePrice
+                        )
+                        requestAddToCart(item)
+                    } else {
+                        requestOpenProductSheet(product)
+                    }
+                } label: {
+                    ZStack(alignment: .leading) {
+                        Image(systemName: "plus")
+                            .font(.system(size: 16, weight: .bold))
+                            .foregroundStyle(AppColors.textPrimary)
+                            .frame(width: 30, height: 30)
+                            .background(AppColors.tertiary)
+                            .clipShape(Circle())
+
+                        let qty = quantityInCart(for: item)
+                        if qty > 0 {
+                            Text("\(qty)")
+                                .font(.system(size: 10, weight: .bold))
+                                .foregroundStyle(Color.white)
+                                .padding(.horizontal, 5)
+                                .padding(.vertical, 2)
+                                .background(Color.red)
+                                .clipShape(Capsule())
+                                .offset(x: -6, y: -10)
+                                .zIndex(1)
+                        }
+                    }
+                    .offset(x: 3, y: -3)
+                    .frame(width: 30, height: 30)
+                    .appContentShape(Circle())
+                }
+                .buttonStyle(.plain)
+                .frame(width: 30, height: 30)
+                .disabled(isStoreOpen == false)
+                .opacity(isStoreOpen ? 1 : 0.65)
+                .offset(x: 7, y: 7)
+            }
+        }
+        .padding(12)
+        .background(AppColors.surface)
+        .clipShape(RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous))
+        .appContentShape(RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous))
+        .onTapGesture {
+            guard isStoreOpen else {
+                SnackbarCenter.shared.show(title: "Loja fechada no momento.", style: .warning, icon: "moon.zzz.fill", duration: 2.0)
+                return
+            }
+            if item.isPizzaSummary, let pizzaCategoryId = item.pizzaCategoryId {
+                requestOpenPizzaSheet(categoryId: pizzaCategoryId)
+                return
+            }
+            guard hasSelectableAddons else { return }
+            requestOpenProductSheet(product)
+        }
+    }
+
+}
--- a/pedi-foods/Sources/PediFoods/Views/Main/StoreDetailView+Logic.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Main/StoreDetailView+Logic.swift
@@ -51,8 +51,8 @@ extension StoreDetailView {
    }

    var deliveryValueLabel: String {
-        if let minOrder = info?.minOrder {
-            return formatCurrency(minOrder)
+        if let fee = storeDeliveryFee {
+            return formatCurrency(fee)
        }
        return "R$ --"
    }
--- a/pedi-foods/Sources/PediFoods/Views/Main/StoreDetailView.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Main/StoreDetailView.swift
@@ -14,6 +14,7 @@ struct StoreDetailView: View {
    let storeCategory: String?
    let storeRating: Double?
    let storeDistance: String?
+    let storeDeliveryFee: Double?
    @Binding var appState: AppState

    @Environment(\.dismiss) var dismiss
@@ -33,60 +34,37 @@ struct StoreDetailView: View {
    @State var didLoad = false
    @State var categoryHeaderOffsets: [String: CGFloat] = [:]
    @State var isProgrammaticCategoryScroll = false
-    @State var scrollOffsetY: CGFloat = 0
    @State var isFavoriteRequestInFlight = false
+    @State var scrollOffset: CGFloat = 0

-    let cardTopInset: CGFloat = 168
-    let summaryCardBaseHeight: CGFloat = 170
+    var isCategoryTabsPinned: Bool { scrollOffset >= topSectionHeight }
+
+    let cardTopInset: CGFloat = 180
+    let summaryCardBaseHeight: CGFloat = 212
    let closedBannerHeight: CGFloat = 44
    let coverVisibleUntilY: CGFloat = 253
    let storeLogoSize: CGFloat = 84

    var body: some View {
-        GeometryReader { geometry in
-            let safeTop = geometry.safeAreaInsets.top
-            ScrollViewReader { proxy in
-                
-                ZStack(alignment: .top) {
-                    AppColors.backgroundLight.ignoresSafeArea()
-
-                    ScrollView(showsIndicators: false) {
-#if os(Android)
-                        LazyVStack(spacing: 0) {
-                            ScrollOffsetReader(offsetY: $scrollOffsetY)
-                            topSection
-
-                            categoryTabs(proxy: proxy, safeTop: safeTop, isSticky: false)
-
-                            sectionedProducts
-                        }
-#else
-                        LazyVStack(spacing: 0, pinnedViews: [.sectionHeaders]) {
-                            ScrollOffsetReader(offsetY: $scrollOffsetY)
-                            topSection
-
-                            categoryTabs(proxy: proxy, safeTop: safeTop, isSticky: false)
-
-                            sectionedProducts
-                        }
-#endif
-                    }
-                    .refreshable {
-                        await loadStoreData(forceRefresh: true)
-                    }
-                    .coordinateSpace(name: StoreDetailScrollCoordinateSpace.name)
-                    .ignoresSafeArea(edges: .top)
-                }
-                .ignoresSafeArea(edges: .top)
-                .overlay(alignment: .top) {
-                    if isCategoryTabsPinned(safeTop: safeTop) {
-                        categoryTabs(proxy: proxy, safeTop: safeTop, isSticky: true)
-                        .transition(.opacity)
-                        .zIndex(20)
+        ScrollViewReader { proxy in
+            ScrollView(showsIndicators: false) {
+                ScrollOffsetReader(offsetY: $scrollOffset)
+                LazyVStack(spacing: 0, pinnedViews: [.sectionHeaders]) {
+                    topSection
+                    Section {
+                        sectionedProducts
+                    } header: {
+                        categoryTabs(proxy: proxy, isPinned: isCategoryTabsPinned)
                    }
                }
-                .saturation(isStoreOpen ? 1 : 0)
            }
+            .coordinateSpace(name: StoreDetailScrollCoordinateSpace.name)
+            .refreshable {
+                await loadStoreData(forceRefresh: true)
+            }
+            .ignoresSafeArea(edges: .top)
+            .background(AppColors.backgroundLight)
+            .saturation(isStoreOpen ? 1 : 0)
        }
        .navigationBarBackButtonHidden(true)
        .appHiddenNavigationBar()
@@ -180,343 +158,4 @@ struct StoreDetailView: View {
            syncCategoryWithScroll()
        }
    }
-
-    private var topSection: some View {
-        ZStack(alignment: .top) {
-            heroSection
-                .frame(height: topSectionHeight)
-
-            // Hard cut: cover cannot appear below this line.
-            Rectangle()
-                .fill(AppColors.backgroundLight)
-                .frame(height: max(0, topSectionHeight - coverVisibleUntilY))
-                .offset(y: coverVisibleUntilY)
-
-            summaryCard
-                .padding(.horizontal, 16)
-                .padding(.top, cardTopInset)
-
-            storeLogoBadge
-                .padding(.top, cardTopInset - (storeLogoSize / 2))
-        }
-        .frame(height: topSectionHeight)
-    }
-
-    private var heroSection: some View {
-        ZStack(alignment: .top) {
-            AsyncStoreImage(imageURL: resolvedURL(storeCoverURL))
-                .frame(height: topSectionHeight)
-                .overlay(
-                    LinearGradient(
-                        colors: [Color.black.opacity(0.32), Color.black.opacity(0.05)],
-                        startPoint: .top,
-                        endPoint: .bottom
-                    )
-                )
-
-            VStack(spacing: 0) {
-                HStack {
-                    heroIconButton(icon: "chevron.left") {
-                        dismiss()
-                    }
-                    Spacer()
-                    heroIconButton(icon: "magnifyingglass") {}
-                    heroIconButton(
-                        icon: isFavoriteStore ? "heart.fill" : "heart",
-                        foregroundStyle: isFavoriteStore ? Color.red : Color.white
-                    ) {
-                        Task {
-                            await toggleFavoriteStore()
-                        }
-                    }
-                }
-                .padding(.horizontal, 14)
-                .padding(.top, UIDevice.topNotch)
-
-                Spacer()
-
-                Text("RESTAURANT")
-                    .font(AppTypography.overline)
-                    .tracking(1.8)
-                    .foregroundStyle(Color.white.opacity(0.92))
-                    .padding(.bottom, 14)
-            }
-        }
-    }
-
-    private var storeLogoBadge: some View {
-        ZStack {
-            Circle()
-                .fill(AppColors.surface)
-                .frame(width: storeLogoSize, height: storeLogoSize)
-                .overlay(
-                    Circle()
-                        .stroke(Color.white, lineWidth: 0.1)
-                )
-
-            AsyncStoreImage(imageURL: resolvedURL(storeLogoURL))
-                .frame(width: storeLogoSize - 10, height: storeLogoSize - 10)
-                .clipShape(Circle())
-        }
-        .shadow(color: Color.black.opacity(0.10), radius: 8, y: 3)
-    }
-
-    private var summaryCard: some View {
-        VStack(spacing: 0) {
-            VStack(alignment: .leading, spacing: 14) {
-                HStack(alignment: .top) {
-                    VStack(alignment: .leading, spacing: 6) {
-                        Text(storeName)
-                            .font(AppTypography.heading2)
-                            .foregroundStyle(AppColors.textPrimary)
-                            .lineLimit(2)
-                            .padding(.top, 30)
-
-                        Text(storeSubtitle)
-                            .font(.caption)
-                            .foregroundStyle(AppColors.textMuted)
-                            .lineLimit(1)
-                    }
-
-                    Spacer()
-
-                    ratingChip
-                }
-
-                HStack(spacing: 0) {
-                    statItem(title: "DISTÂNCIA", value: distanceValueLabel)
-                    Divider().frame(height: 34)
-                    statItem(title: "TEMPO", value: info?.deliveryTime ?? "25-35 min")
-                    Divider().frame(height: 34)
-                    statItem(title: "ENTREGA", value: deliveryValueLabel)
-                }
-                .padding(.vertical, 4)
-            }
-            .padding(16)
-
-            if isStoreOpen == false {
-                Text(closedStoreBannerText)
-                    .font(AppTypography.heading3)
-                    .foregroundStyle(Color.white)
-                    .frame(maxWidth: .infinity, minHeight: closedBannerHeight)
-                    .background(AppColors.brandDark)
-            }
-        }
-        .frame(height: summaryCardHeight)
-        .background(AppColors.surface)
-        .clipShape(RoundedRectangle(cornerRadius: AppLayout.radiusXL, style: .continuous))
-        .shadow(color: AppShadow.soft.color, radius: AppShadow.soft.radius, y: AppShadow.soft.y)
-    }
-
-    @ViewBuilder
-    private var sectionedProducts: some View {
-        if isLoading {
-            ProgressView()
-                .frame(maxWidth: .infinity, alignment: .center)
-                .padding(.top, 26)
-        } else if let errorMessage {
-            VStack(alignment: .leading, spacing: 10) {
-                Text(errorMessage)
-                    .font(AppTypography.body)
-                    .foregroundStyle(AppColors.textMuted)
-                Button("Tentar novamente") {
-                    Task { await loadStoreData() }
-                }
-                .font(AppTypography.heading3)
-                .foregroundStyle(AppColors.primary)
-            }
-            .padding(.top, 16)
-        } else if categories.isEmpty {
-            Text("Cardápio indisponível no momento.")
-                .font(AppTypography.body)
-                .foregroundStyle(AppColors.textMuted)
-                .padding(.top, 16)
-                .padding(.horizontal, 16)
-                .padding(.bottom, 120)
-        } else {
-            ForEach(categories, id: \.id) { category in
-                Section {
-                    VStack(spacing: 12) {
-                        ForEach(listItems(for: category)) { item in
-                            productCard(item, in: category)
-                        }
-                    }
-                    .padding(.horizontal, 16)
-                    .padding(.bottom, 8)
-                } header: {
-                    Text(category.name)
-                        .font(AppTypography.heading2)
-                        .foregroundStyle(AppColors.textPrimary)
-                        .id(sectionAnchorId(for: category.id))
-                        .frame(maxWidth: .infinity, alignment: .leading)
-                        .padding(.horizontal, 16)
-                        .padding(.top, 8)
-                        .padding(.bottom, 8)
-                        .background(AppColors.backgroundLight)
-                        .background(
-                            GeometryReader { geometry in
-                                Color.clear.preference(
-                                    key: CategoryHeaderOffsetPreferenceKey.self,
-                                    value: [category.id: geometry.frame(in: .global).minY]
-                                )
-                            }
-                        )
-                }
-            }
-            Color.clear.frame(height: 120)
-        }
-    }
-
-    private func categoryTabs(proxy: ScrollViewProxy, safeTop: CGFloat, isSticky: Bool) -> some View {
-        ScrollView(.horizontal, showsIndicators: false) {
-            HStack(spacing: 10) {
-                ForEach(categories, id: \.id) { category in
-                    let active = selectedCategoryId == category.id
-                    Button {
-                        selectedCategoryId = category.id
-                        isProgrammaticCategoryScroll = true
-                        withAnimation(.easeInOut(duration: 0.25)) {
-                            proxy.scrollTo(sectionAnchorId(for: category.id), anchor: .top)
-                        }
-                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
-                            isProgrammaticCategoryScroll = false
-                        }
-                    } label: {
-                        Text(category.name)
-                            .font(AppTypography.heading3)
-                            .foregroundStyle(active ? AppColors.textInverse : AppColors.textMuted)
-                            .padding(.horizontal, 16)
-                            .padding(.vertical, 9)
-                            .background(active ? AppColors.primary : AppColors.surface)
-                            .clipShape(Capsule())
-                    }
-                    .buttonStyle(.plain)
-                }
-            }
-            .padding(.horizontal, 16)
-            .padding(.bottom, 10)
-            .padding(.top, isSticky ? categoryTabsPinnedInset(safeTop: safeTop) : 10)
-        }
-        .background(AppColors.backgroundLight)
-    }
-
-    private func isCategoryTabsPinned(safeTop: CGFloat) -> Bool {
-        scrollOffsetY >= categoryTabsPinThreshold(safeTop: safeTop)
-    }
-
-    private func categoryTabsPinThreshold(safeTop: CGFloat) -> CGFloat {
-        max(0, topSectionHeight + 10 - safeTop)
-    }
-
-    private func categoryTabsPinnedInset(safeTop: CGFloat) -> CGFloat {
-        max(8, safeTop - 44)
-    }
-
-    private func productCard(_ item: StoreCatalogListItem, in category: StoreCatalogCategory) -> some View {
-        let product = item.product
-        let hasSelectableAddons = product.addonGroups.contains { $0.items.isEmpty == false }
-
-        return HStack(spacing: 12) {
-            VStack(alignment: .leading, spacing: 8) {
-                Text(item.title)
-                    .font(AppTypography.heading3)
-                    .foregroundStyle(AppColors.textPrimary)
-                    .lineLimit(2)
-                    .multilineTextAlignment(.leading)
-
-                if let description = item.description, description.isEmpty == false {
-                    Text(description)
-                        .font(.caption)
-                        .foregroundStyle(AppColors.textMuted)
-                        .lineLimit(2)
-                        .multilineTextAlignment(.leading)
-                }
-
-                Text(listPriceLabel(for: product, in: category))
-                    .font(AppTypography.heading3)
-                    .foregroundStyle(AppColors.textPrimary)
-            }
-
-            Spacer()
-
-            ZStack(alignment: .bottomTrailing) {
-                AsyncStoreImage(imageURL: resolvedURL(item.imageURL))
-                    .frame(width: 92, height: 92)
-                    .clipShape(RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous))
-
-                Button {
-                    guard isStoreOpen else {
-                        SnackbarCenter.shared.show(title: "Loja fechada no momento.", style: .warning, icon: "moon.zzz.fill", duration: 2.0)
-                        return
-                    }
-                    if item.isPizzaSummary, let pizzaCategoryId = item.pizzaCategoryId {
-                        requestOpenPizzaSheet(categoryId: pizzaCategoryId)
-                        return
-                    }
-                    if hasSelectableAddons == false {
-                        let basePrice = product.price ?? 0
-                        let item = CartItemState(
-                            id: "\(storeId)::\(product.id)::base",
-                            productId: product.id,
-                            storeId: storeId,
-                            name: product.name,
-                            imageURL: resolvedURL(product.image),
-                            quantity: 1,
-                            unitPrice: basePrice
-                        )
-                        requestAddToCart(item)
-                    } else {
-                        requestOpenProductSheet(product)
-                    }
-                } label: {
-                    ZStack(alignment: .leading) {
-                        Image(systemName: "plus")
-                            .font(.system(size: 16, weight: .bold))
-                            .foregroundStyle(AppColors.textPrimary)
-                            .frame(width: 30, height: 30)
-                            .background(AppColors.tertiary)
-                            .clipShape(Circle())
-
-                        let qty = quantityInCart(for: item)
-                        if qty > 0 {
-                            Text("\(qty)")
-                                .font(.system(size: 10, weight: .bold))
-                                .foregroundStyle(Color.white)
-                                .padding(.horizontal, 5)
-                                .padding(.vertical, 2)
-                                .background(Color.red)
-                                .clipShape(Capsule())
-                                .offset(x: -6, y: -10)
-                                .zIndex(1)
-                        }                        
-                    }
-                    .offset(x: 3, y: -3)
-                    .frame(width: 30, height: 30)
-                    .appContentShape(Circle())
-                }
-                .buttonStyle(.plain)
-                .frame(width: 30, height: 30)
-                .disabled(isStoreOpen == false)
-                .opacity(isStoreOpen ? 1 : 0.65)
-                .offset(x: 7, y: 7)
-            }
-        }
-        .padding(12)
-        .background(AppColors.surface)
-        .clipShape(RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous))
-        .appContentShape(RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous))
-        .onTapGesture {
-            guard isStoreOpen else {
-                SnackbarCenter.shared.show(title: "Loja fechada no momento.", style: .warning, icon: "moon.zzz.fill", duration: 2.0)
-                return
-            }
-            if item.isPizzaSummary, let pizzaCategoryId = item.pizzaCategoryId {
-                requestOpenPizzaSheet(categoryId: pizzaCategoryId)
-                return
-            }
-            guard hasSelectableAddons else { return }
-            requestOpenProductSheet(product)
-        }
-    }
-
 }
--- a/pedi-foods/Sources/PediFoods/Views/Main/UserProfileView+Android.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Main/UserProfileView+Android.swift
@@ -1,205 +0,0 @@
-#if os(Android)
-import SwiftUI
-
-struct UserProfileView: View {
-    @Binding var appState: AppState
-
-    @State var name: String = ""
-    @State var email: String = ""
-    @State var phone: String = ""
-    @State var profilePicture: String = ""
-    @State var isSaving = false
-
-    var body: some View {
-        ScrollView(showsIndicators: false) {
-            VStack(spacing: 22) {
-                avatarSection
-                formSection
-                saveButton
-            }
-            .padding(.horizontal, 20)
-            .padding(.top, 18)
-            .padding(.bottom, UIDevice.bottomNotch + 24)
-        }
-        .background(AppColors.backgroundLight)
-        .navigationTitle("Meu Perfil")
-        .appInlineNavigationTitle()
-        .onAppear {
-            hydrateFromAppState()
-        }
-    }
-
-    private var avatarSection: some View {
-        VStack(spacing: 12) {
-            Circle()
-                .fill(AppColors.brandSoft)
-                .frame(width: 110, height: 110)
-                .overlay {
-                    Text(initials)
-                        .font(.system(size: 32, weight: .bold))
-                        .foregroundStyle(AppColors.primary)
-                }
-
-            Button("Remover") {
-                profilePicture = ""
-            }
-            .font(AppTypography.caption)
-            .foregroundStyle(AppColors.textMuted)
-            .buttonStyle(.plain)
-            .disabled(profilePicture.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
-        }
-        .frame(maxWidth: .infinity)
-    }
-
-    private var formSection: some View {
-        VStack(alignment: .leading, spacing: 14) {
-            textFieldSection(title: "Nome", placeholder: "Seu nome completo", text: $name)
-
-            textFieldSection(title: "E-mail", placeholder: "seu@email.com", text: $email)
-                .appNoAutoCap()
-
-            textFieldSection(title: "Telefone", placeholder: "(00) 00000-0000", text: $phone)
-                .onChange(of: phone) { _, newValue in
-                    let masked = formatPhoneBR(displayPhoneDigits(newValue))
-                    if masked != newValue {
-                        phone = masked
-                    }
-                }
-                .appNoAutoCap()
-        }
-        .padding(16)
-        .background(AppColors.surface)
-        .clipShape(RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous))
-    }
-
-    private var saveButton: some View {
-        Button(isSaving ? "Salvando..." : "Salvar Alterações") {
-            Task { await saveProfile() }
-        }
-        .font(AppTypography.button)
-        .foregroundStyle(AppColors.textInverse)
-        .frame(maxWidth: .infinity, minHeight: 56)
-        .background(AppColors.primary)
-        .clipShape(RoundedRectangle(cornerRadius: AppLayout.radiusLG, style: .continuous))
-        .buttonStyle(.plain)
-        .disabled(isSaving || canSave == false)
-        .opacity((isSaving || canSave == false) ? 0.6 : 1.0)
-    }
-
-    private var initials: String {
-        let parts = name
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-            .split(separator: " ")
-            .prefix(2)
-        let letters = parts.compactMap { $0.first }.map(String.init).joined()
-        return letters.isEmpty ? "PF" : letters.uppercased()
-    }
-
-    private var canSave: Bool {
-        let cleanName = name.trimmingCharacters(in: .whitespacesAndNewlines)
-        let cleanEmail = email.trimmingCharacters(in: .whitespacesAndNewlines)
-        let normalizedPhone = normalizePhoneNumberForAPI(phone)
-        return cleanName.isEmpty == false
-            && cleanEmail.isEmpty == false
-            && cleanEmail.contains("@")
-            && normalizedPhone.isEmpty == false
-    }
-
-    private func hydrateFromAppState() {
-        name = appState.profile.name
-        email = appState.profile.email
-        phone = formatPhoneForDisplay(appState.profile.phone)
-        profilePicture = appState.profile.profilePicture
-    }
-
-    @MainActor
-    private func saveProfile() async {
-        guard canSave else { return }
-
-        let cleanName = name.trimmingCharacters(in: .whitespacesAndNewlines)
-        let cleanEmail = email.trimmingCharacters(in: .whitespacesAndNewlines)
-        let normalizedPhone = normalizePhoneNumberForAPI(phone)
-        let cleanPhoto = profilePicture.trimmingCharacters(in: .whitespacesAndNewlines)
-
-        isSaving = true
-        defer { isSaving = false }
-
-        do {
-            let response = try await ApiService().updateCustomerProfile(
-                name: cleanName,
-                email: cleanEmail,
-                phoneNumber: normalizedPhone,
-                profilePicture: cleanPhoto.isEmpty ? nil : cleanPhoto
-            )
-
-            if response.error {
-                SnackbarCenter.shared.show(
-                    title: response.message ?? "Não foi possível atualizar seu perfil.",
-                    style: .error,
-                    icon: "xmark.octagon.fill",
-                    duration: 3.0
-                )
-                return
-            }
-
-            let customer = response.result
-            appState.profile.id = customer?.id ?? appState.profile.id
-            appState.profile.name = customer?.name ?? cleanName
-            appState.profile.email = customer?.email ?? cleanEmail
-            appState.profile.phone = customer?.phoneNumber ?? normalizedPhone
-            appState.profile.profilePicture = customer?.profilePicture ?? cleanPhoto
-            SessionStateStore.setActiveUserKey(
-                SessionStateStore.makeUserKey(profileId: appState.profile.id, email: appState.profile.email)
-            )
-
-            SnackbarCenter.shared.show(
-                title: "Perfil atualizado com sucesso.",
-                style: .success,
-                icon: "checkmark.circle.fill",
-                duration: 2.0
-            )
-        } catch {
-            SnackbarCenter.shared.show(
-                title: "Não foi possível atualizar seu perfil.",
-                style: .error,
-                icon: "xmark.octagon.fill",
-                duration: 3.0
-            )
-        }
-    }
-
-    private func formatPhoneForDisplay(_ raw: String) -> String {
-        let digits = displayPhoneDigits(raw)
-        if digits.isEmpty { return "" }
-        return formatPhoneBR(digits)
-    }
-
-    private func displayPhoneDigits(_ raw: String) -> String {
-        var digits = raw.filter(\.isNumber)
-        if digits.hasPrefix("55"), digits.count > 11 {
-            digits = String(digits.dropFirst(2))
-        }
-        return String(digits.prefix(11))
-    }
-
-    private func textFieldSection(title: String, placeholder: String, text: Binding<String>) -> some View {
-        VStack(alignment: .leading, spacing: 8) {
-            Text(title)
-                .font(AppTypography.caption)
-                .foregroundStyle(AppColors.textMuted)
-
-            TextField(placeholder, text: text)
-                .font(AppTypography.body)
-                .foregroundStyle(AppColors.textPrimary)
-                .padding(.horizontal, 12)
-                .frame(height: 50)
-                .background(AppColors.backgroundLight)
-                .clipShape(RoundedRectangle(cornerRadius: 14, style: .continuous))
-                .overlay(
-                    RoundedRectangle(cornerRadius: 14, style: .continuous)
-                        .stroke(AppColors.secondary.opacity(0.2), lineWidth: 1)
-                )
-        }
-    }
-}
-#endif
--- a/pedi-foods/Sources/PediFoods/Views/Main/UserProfileView.swift
+++ b/pedi-foods/Sources/PediFoods/Views/Main/UserProfileView.swift
@@ -1,9 +1,6 @@
-#if !os(Android)
 import SwiftUI
-#if canImport(PhotosUI) && os(iOS)
+#if os(iOS)
 import PhotosUI
-#endif
-#if canImport(UIKit)
 import UIKit
 #endif

@@ -17,8 +14,8 @@ struct UserProfileView: View {
    @State var profilePicture: String = ""
    @State var isSaving = false

-#if canImport(PhotosUI) && os(iOS)
-    @State var selectedPhotoItem: PhotosPickerItem?
+#if os(iOS)
+    @State private var selectedPhotoItem: PhotosPickerItem?
 #endif

    var body: some View {
@@ -38,7 +35,7 @@ struct UserProfileView: View {
        .onAppear {
            hydrateFromAppState()
        }
-#if canImport(PhotosUI) && os(iOS)
+#if os(iOS)
        .onChange(of: selectedPhotoItem) { _, newItem in
            Task { await applySelectedPhoto(newItem) }
        }
@@ -63,7 +60,7 @@ struct UserProfileView: View {
                }

            HStack(spacing: 10) {
-#if canImport(PhotosUI) && os(iOS)
+#if os(iOS)
                PhotosPicker(selection: $selectedPhotoItem, matching: .images, photoLibrary: .shared()) {
                    Text("Trocar Foto")
                        .font(AppTypography.caption)
@@ -244,19 +241,15 @@ struct UserProfileView: View {
        }
    }

-#if canImport(PhotosUI) && os(iOS)
+#if os(iOS)
    @MainActor
    private func applySelectedPhoto(_ item: PhotosPickerItem?) async {
        guard let item else { return }
        do {
            guard let data = try await item.loadTransferable(type: Data.self) else { return }
-            #if canImport(UIKit)
            guard let image = UIImage(data: data),
                  let jpegData = image.jpegData(compressionQuality: 0.82) else { return }
            profilePicture = "data:image/jpeg;base64,\(jpegData.base64EncodedString())"
-            #else
-            profilePicture = "data:image/jpeg;base64,\(data.base64EncodedString())"
-            #endif
        } catch {
            SnackbarCenter.shared.show(
                title: "Não foi possível carregar a foto selecionada.",
@@ -268,4 +261,3 @@ struct UserProfileView: View {
    }
 #endif
 }
-#endif