@momo-kits/native-kits 0.162.2-sp.7 → 0.162.2-sp.8

package/.claude/settings.local.json

@@ -49,7 +49,21 @@
       "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme MoMoUIKits -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14 Pro' build)",
       "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme MoMoUIKits -sdk iphonesimulator -destination 'platform=iOS Simulator,id=E6A899C0-098E-473A-95B8-A2BBD2D42A92' build)",
       "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -sdk iphonesimulator -destination 'platform=iOS Simulator,id=E6A899C0-098E-473A-95B8-A2BBD2D42A92' build)",
-      "Bash(xcodebuild build *)"
+      "Bash(xcodebuild build *)",
+      "Bash(git stash *)",
+      "Bash(plutil -lint sample/iosApp/iosApp.xcodeproj/project.pbxproj)",
+      "Bash(git add *)",
+      "Bash(git commit -m 'feat: DS-646 [ci build] *)",
+      "Bash(git commit -q -m 'fix:  DS-656 [ci build] *)",
+      "Bash(xargs git log --oneline -1)",
+      "Bash(git rev-list *)",
+      "Bash(git status *)",
+      "Bash(git rebase *)",
+      "Bash(git merge *)",
+      "Bash(git reset *)",
+      "Bash(awk '/^ *)",
+      "Bash(git ls-tree *)",
+      "Bash(awk *)"
     ]
   }
 }

package/CLAUDE.md

@@ -0,0 +1,78 @@
+# CLAUDE.md
+
+Guidance for working in this repo. Keep it accurate — update it when structure or commands change.
+
+## What this is
+
+`momo-native-kits` — MoMo's design-system / UI-kit as a **Kotlin Multiplatform + Compose Multiplatform** library, published for Android (AAR/Maven) and iOS (static framework + CocoaPods). It is the Compose port of the React Native `momo-kits`. Consumed by mini-apps embedded in the host MoMo app.
+
+- Artifact: `vn.momo.kits:kits` (version in `gradle.properties`). NPM mirror: `@momo-kits/native-kits`.
+- Targets: `androidTarget` (JVM 17, compile/min/target SDK 36/24/36), `iosArm64`, `iosSimulatorArm64` (framework `baseName = "kits"`, `isStatic = true`).
+- Kotlin 2.3.10, Compose MP 1.10.3.
+
+## Modules
+
+- `:compose` — the published library. All real code lives here.
+- `:sample:shared` + `:sample:androidApp` — demo app (`UIKitHome` lists all components). iOS demo in `sample/iosApp` (Xcode).
+
+## Source layout (`compose/src/commonMain/kotlin/vn/momo/kits/`)
+
+- `components/` — ~50 UI components, **one file per component** (`Button.kt`, `Input*.kt`, `PopupNotify.kt`, …).
+- `application/` — app-level context & config: `Context.kt` (CompositionLocals, `MiniAppContext`, `DesignSystemConfig`), `Localize.kt` (i18n: `LocalizationObject`, `Localize`, default dictionary), `Screen.kt`, header pieces. Also holds the **deprecated** `ApplicationContainer`.
+- `navigation/` — `NavigationContainer.kt` (**canonical entry point**), `Navigator.kt`, `Navigation.kt`, `StackScreen.kt`, `bottomtab/`, `component/`, `tracking/`.
+- `const/` — design tokens: `Theme.kt`, `Colors.kt`, `Typography.kt`, `Spacing.kt`, `Radius.kt`.
+- `layout/`, `modifier/`, `utils/`.
+- `platform/` — `Platform.kt` `expect` declarations, actualized in `androidMain` / `iosMain` (`Platform.android.kt`, `Platform.ios.kt`).
+
+## Build & verify
+
+No unit-test suite is configured. Validate changes by compiling the relevant target(s); use the sample app for visual checks.
+
+```bash
+./gradlew :compose:compileCommonMainKotlinMetadata        # validate commonMain (fast, do this first)
+./gradlew :compose:compileDebugKotlinAndroid              # Android target
+./gradlew :compose:linkDebugFrameworkIosSimulatorArm64    # iOS framework (slow)
+./gradlew :sample:androidApp:installDebug                 # run demo on device/emulator
+```
+
+Publishing is automated (`publish.sh` + GitLab CI on `[ci build]` / `main`). Do not publish manually unless asked: `sh publish.sh beta` / `sh publish.sh release` (Maven→GitLab + NPM).
+
+## Architecture essentials
+
+- **Entry point:** wrap content in `NavigationContainer(...)` from `navigation/`. It builds the `Navigator`, takes a host-supplied `Localize` (falls back to an empty one), and provides the CompositionLocals below. **Do not use** `ApplicationContainer` (`application/NavigationContainer.kt`) — deprecated and does **not** wire `LocalLocalize` / `LocalNavigator` / `LocalMaxApi`.
+- **Configuration flows via CompositionLocals**, not params. Public ones: `AppTheme`, `AppStatusBar`, `AppNavigationBar` (`const/Theme.kt`); `ApplicationContext`, `AppConfig`, `AppLanguage`, `LocalLocalize` (`application/`); `LocalNavigator`, `LocalMaxApi` (`navigation/`). Read with `X.current`.
+- **Platform code** goes through `expect`/`actual` in `platform/` — never reference Android/iOS APIs from `commonMain` directly.
+- **Native bridge:** `IMaxApi` (`vn.momo.maxapi`, exposed as `LocalMaxApi`) is the host-app bridge (dismiss, tracking, device info, language).
+- Navigation uses a runtime `DynamicScreenRegistry`; overlays (modal/bottom-sheet/snackbar) go through `Navigator` + `OverplayComponentRegistry`.
+
+## i18n / Localize (port of RN `Localize`)
+
+- `application/Localize.kt`: everything i18n. `LocalizationObject` is a data class with required `vi` / `en` maps (`LocalizationObject(vi = mapOf(…), en = mapOf(…))`). `Localize` constructors take a `LocalizationObject` or a `(vi, en)` map pair; the constructor **merges** the kit defaults with the host data (host wins on key clash). Methods: `translate(key)` (missing/empty → returns the key), `translateData(map)` / `translateData(vi, en)`, `addTranslations` (existing keys win), `changeLanguage(lang)`. Default language `"vi"`, `"en"` only on exact match; language is snapshot state so a switch recomposes consumers.
+- The default dictionary lives **inside `Localize`** (companion `defaultLanguage`), **generated 1:1 from `momo-kits` RN `Assets/language.json`** — do not hand-edit that block; edit the RN source and regenerate.
+- The host creates one `Localize` and passes it in: `NavigationContainer(localize = myLocalize, …)`. There is **no** `language` param and `DesignSystemConfig` carries no translations — overrides go through the `Localize` constructor / `addTranslations`. Switch language at runtime with `myLocalize.changeLanguage("en")`.
+- Access in a `@Composable`: `LocalLocalize.current.translate("errorCode")`. Language is host-controlled, never read from the OS locale. `AppLanguage` is still provided (derived from `Localize.currentLanguage`) for older components that read it.
+- Some older components still do ad-hoc `AppLanguage.current` + `Map` lookups; new/changed code should use `LocalLocalize`.
+
+## Code conventions
+
+- **Tokens, not literals:** use `Colors`, `Typography`, `Spacing`, `Radius` objects and `AppTheme.current` for colors/styles. Per-component sizing is bundled in enums (e.g. `Button.Size(val value: ButtonSpecs)`).
+- **Composable signatures:** required params first, slot lambdas next, `modifier: Modifier = Modifier` **last**; give optional params sensible defaults.
+- **Stability:** annotate token/config data classes `@Stable`/`@Immutable`; memoize derived colors/styles/handlers with `remember(keys) { … }`.
+- **Custom modifiers** are preferred: `conditional(...)`, `setAutomationId(...)`, the `clickable` variants in `modifier/`.
+- Match the surrounding file's style when adding code.
+
+## Writing docs in code (follow this)
+
+Comments are **sparse and in English**. Document only what is **not obvious from the code** — non-obvious behavior, platform quirks, RN-parity semantics, memoization intent, or important gotchas worth flagging. Do **not**:
+
+- write KDoc walls or restate what the signature/code already says;
+- narrate obvious steps or add section-banner noise;
+- use a language other than English in code comments.
+
+Prefer one tight line at the surprising spot over a paragraph. Match the (low) comment density already in the codebase.
+
+## Gotchas
+
+- **Resource qualifier drift:** the generated Compose `Res` namespace is `vn.momo.uikits.resources`, but `utils/Resources.kt` and `platform/Platform.ios.kt` reference `vn.momo.compose.resources`. Keep bundled strings/dictionaries as plain Kotlin (the `defaultLanguage` map in `Localize.kt`), not `composeResources/values`, to avoid iOS framework resource-loading issues.
+- Prefer `NavigationContainer` over the deprecated `ApplicationContainer`; prefer `IMaxApi`/`LocalMaxApi` over the deprecated `PlatformApi`.
+- iOS strings/maps must survive Kotlin/Native framework packaging — keep them compiled-in, not loaded from resource bundles.

package/ios/Application/ApplicationEnvironment.swift

@@ -41,11 +41,13 @@ public class ApplicationEnvironment: ObservableObject {
     let applicationContext: MiniAppContext?
     let composeApi: KitComposeApi?
     let config: KitConfig?
-    
-    public init(applicationContext: MiniAppContext? = nil, composeApi: KitComposeApi? = nil, config: KitConfig? = nil) {
+    let maxApi: MaxApi?
+
+    public init(applicationContext: MiniAppContext? = nil, composeApi: KitComposeApi? = nil, config: KitConfig? = nil, maxApi: MaxApi? = nil) {
         self.applicationContext = applicationContext
         self.composeApi = composeApi
         self.config = config
+        self.maxApi = maxApi
     }
 }
 

package/ios/Application/Components.swift

@@ -143,6 +143,22 @@ public struct HeaderRightWidthKey: PreferenceKey {
     }
 }
 
+// MARK: - Bottom-tab root preference
+
+/// Set by `BottomTab` on appear so its enclosing `StackScreen` can detect that
+/// it's hosting a self-contained bottom-tab surface and skip its own bottom
+/// safe-area reservation — mirrors Compose's `Navigation.markAsBottomTabRoot()`
+/// (`navigation.isBottomTabRoot`, read by `StackScreen.kt`'s `MainContent`).
+/// Without this, `BottomTab`'s own internal safe-area handling gets an extra,
+/// unwanted inset stacked on top of it by the outer `StackScreen`, pushing the
+/// tab bar up higher than the true bottom inset.
+public struct IsBottomTabRootKey: PreferenceKey {
+    public static var defaultValue: Bool = false
+    public static func reduce(value: inout Bool, nextValue: () -> Bool) {
+        value = value || nextValue()
+    }
+}
+
 // MARK: - Header View
 
 public struct Header: View {

package/ios/Application/Localize.swift

@@ -0,0 +1,277 @@
+//
+//  Localize.swift
+//  MoMoUIKits
+//
+//  SwiftUI mirror of Compose's `application/Localize.kt`, itself a port of
+//  momo-kits React Native's `Application/Localize.ts`. Holds the merged
+//  dictionary (kit defaults + host overrides) and the active language,
+//  switched at runtime via `changeLanguage`. `Localize` is an `ObservableObject`
+//  so a language switch republishes to consumers of `translate`/`translateData`,
+//  mirroring Compose's snapshot-state-backed `language`.
+//
+
+import Foundation
+
+/// Translation dictionary keyed by language; both `vi` and `en` are required.
+public struct LocalizationObject {
+    public var vi: [String: String]
+    public var en: [String: String]
+
+    public init(vi: [String: String] = [:], en: [String: String] = [:]) {
+        self.vi = vi
+        self.en = en
+    }
+}
+
+public final class Localize: ObservableObject {
+    public static let VI = "vi"
+    public static let EN = "en"
+
+    private var assets: LocalizationObject
+    @Published public private(set) var currentLanguage: String = Localize.VI
+
+    public init(_ translations: LocalizationObject = LocalizationObject()) {
+        self.assets = Localize.merge(base: Localize.defaultLanguage, override: translations)
+    }
+
+    public func changeLanguage(_ language: String?) {
+        currentLanguage = (language == Localize.EN) ? Localize.EN : Localize.VI
+    }
+
+    public func translate(_ key: String) -> String {
+        let dictionary = currentLanguage == Localize.EN ? assets.en : assets.vi
+        if let value = dictionary[key], !value.isEmpty { return value }
+        return key
+    }
+
+    public func translateData(_ data: [String: String]) -> String {
+        if let value = data[currentLanguage] { return value }
+        let body = data.map { "\"\($0.key)\":\"\($0.value)\"" }.joined(separator: ",")
+        return "{\(body)}"
+    }
+
+    public func translateData(vi: String, en: String) -> String {
+        currentLanguage == Localize.EN ? en : vi
+    }
+
+    /// Existing keys win (mirrors Compose: `merge(translations, assets)`).
+    public func addTranslations(_ translations: LocalizationObject) {
+        assets = Localize.merge(base: translations, override: assets)
+    }
+
+    private static func merge(base: LocalizationObject, override: LocalizationObject) -> LocalizationObject {
+        LocalizationObject(
+            vi: base.vi.merging(override.vi) { _, new in new },
+            en: base.en.merging(override.en) { _, new in new }
+        )
+    }
+
+    private static let defaultLanguage = LocalizationObject(
+        vi: [
+            "errorCode": "Mã lỗi: ",
+            "seeMore": "Xem thêm",
+            "cancel": "Huỷ",
+            "done": "Xong",
+            "confirm": "Xác nhận",
+            "month": "tháng",
+            "day": "ngày",
+            "choose": "Chọn",
+            "sent": "Đã gửi",
+            "received": "Đã tiếp nhận",
+            "processing": "Đang xử lý",
+            "processed": "Đã xử lý",
+            "addImg": "Thêm hình",
+            "chooseBtn": "Chọn button",
+            "imgEg": "Hình ảnh tham khảo",
+            "filter": "Sắp xếp",
+            "shipping": "Đang giao hàng",
+            "men": "Nam",
+            "women": "Nữ",
+            "more": "Khác",
+            "expDate": "Ngày hết hạn",
+            "exp": "HSD",
+            "inActive": "Chưa kích hoạt",
+            "voucherRemindHour": "Hết hạn sau {hours} giờ",
+            "voucherRemindMinute": "Hết hạn sau {minutes} phút",
+            "voucherRemindSecond": "Hết hạn sau {seconds} giây",
+            "voucherRemindDay": "Hết hạn sau {days} ngày",
+            "chooseRoundtrip": "Chọn vé khứ hồi",
+            "depart": "Ngày đi",
+            "return": "Ngày về",
+            "departing": "Đi",
+            "returning": "Về",
+            "jan": "Tháng 1",
+            "feb": "Tháng 2",
+            "mar": "Tháng 3",
+            "apr": "Tháng 4",
+            "may": "Tháng 5",
+            "jun": "Tháng 6",
+            "jul": "Tháng 7",
+            "aug": "Tháng 8",
+            "sep": "Tháng 9",
+            "oct": "Tháng 10",
+            "nov": "Tháng 11",
+            "dec": "Tháng 12",
+            "mon": "T2",
+            "tue": "T3",
+            "wed": "T4",
+            "thu": "T5",
+            "fri": "T6",
+            "sat": "T7",
+            "sun": "CN",
+            "showLunar": "Hiển thị lịch âm",
+            "newYear": "Tết Dương lịch",
+            "valentine": "Ngày Lễ Tình nhân",
+            "womenDay": "Ngày Quốc tế Phụ nữ",
+            "liberationDay": "Ngày giải phóng Miền Nam thống nhất đất nước",
+            "laborDay": "Ngày Quốc tế Lao động",
+            "childrenDay": "Ngày Quốc tế Thiếu nhi",
+            "nationalDay": "Quốc khánh nước CHXHCN Việt Nam",
+            "womenDayVN": "Ngày Phụ nữ Việt Nam",
+            "teacherDay": "Ngày Nhà giáo Việt Nam",
+            "christmasEve": "Ngày Lễ Giáng Sinh",
+            "christmas": "Ngày Lễ Giáng Sinh",
+            "lunarNewYear": "Tết Nguyên Đán",
+            "hungKingDay": "Giỗ Tổ Hùng Vương",
+            "balance": "Số dư trong ví",
+            "chooseDate": "Chọn ngày tháng năm",
+            "year": "năm",
+            "hour": "giờ",
+            "minute": "phút",
+            "from": "Từ",
+            "to": "Đến",
+            "connected": "Đã kết nối",
+            "disconnected": "Mất kết nối",
+            "hide": "Ẩn",
+            "viewAllTitle": "Xem tất cả",
+            "headerTitle": "Lịch sử thanh toán",
+            "SHORTEN": "THU GỌN",
+            "viewMoreBank": "XEM THÊM (${otherItemCount} ngân hàng)",
+            "transaction_success": "Thành công",
+            "transaction_fail": "Thất bại",
+            "transaction_processing": "Đang xử lý",
+            "viewMore": "Xem thêm",
+            "shorten": "Thu gọn",
+            "Payment": "Thanh toán ${serviceName}",
+            "currencyUnit": "đ",
+            "Month": "Tháng",
+            "save": "Lưu",
+            "favoriteIn": "Thêm dịch vụ yêu thích",
+            "favoriteOut": "Xóa dịch vụ yêu thích",
+            "deviceIn": "Thêm vào thiết bị",
+            "setting": "Cài đặt",
+            "transaction": "Lịch sử giao dịch",
+            "share": "Chia sẽ dịch vụ",
+            "information": "Thông tin chung",
+            "tutorial": "Hướng dẫn sử dụng",
+            "question": "Câu hỏi thường gặp",
+            "support": "Trung tâm hỗ trợ",
+            "skip": "Bỏ qua",
+            "enterPhoneNumber": "Vui lòng nhập số điện thoại",
+            "invalidPhoneNumber": "Số điện thoại không đúng",
+        ],
+        en: [
+            "seeMore": "See more",
+            "cancel": "Cancel",
+            "done": "Done",
+            "confirm": "Confirm",
+            "month": "month",
+            "day": "day",
+            "choose": "Choose",
+            "sent": "Sent",
+            "received": "Received",
+            "processing": "Processing",
+            "processed": "Done",
+            "addImg": "Add image",
+            "chooseBtn": "Choose button",
+            "imgEg": "Example images",
+            "filter": "Filter",
+            "shipping": "Shipping",
+            "men": "Men",
+            "women": "Women",
+            "more": "More",
+            "expDate": "Expiration date",
+            "exp": "EXP",
+            "inActive": "Not Activated",
+            "voucherRemindHour": "Revoke after {hours} hours",
+            "voucherRemindMinute": "Revoke after {minutes} minutes",
+            "voucherRemindSecond": "Revoke after {seconds} seconds",
+            "voucherRemindDay": "Revoke after {days} days",
+            "chooseRoundtrip": "Choose roundtrip ticket",
+            "depart": "Departing",
+            "return": "Returning",
+            "departing": "De",
+            "returning": "Re",
+            "jan": "January",
+            "feb": "February",
+            "mar": "March",
+            "apr": "April",
+            "may": "May",
+            "jun": "June",
+            "jul": "July",
+            "aug": "August",
+            "sep": "September",
+            "oct": "October",
+            "nov": "November",
+            "dec": "December",
+            "mon": "Mon",
+            "tue": "Tue",
+            "wed": "Wed",
+            "thu": "Thu",
+            "fri": "Fri",
+            "sat": "Sat",
+            "sun": "Sun",
+            "showLunar": "Show Lunar Calendar",
+            "newYear": "New Year's Day",
+            "valentine": "Valentine's Day",
+            "womenDay": "International Women's Day",
+            "liberationDay": "Liberation Day",
+            "laborDay": "Internation Labor's Day",
+            "childrenDay": "International Labor's Day",
+            "nationalDay": "National Day",
+            "womenDayVN": "Vietnamese Women's Day",
+            "teacherDay": "Teacher's Day",
+            "christmasEve": "Christmas Eve",
+            "christmas": "Christmas Day",
+            "lunarNewYear": "Lunar New Year",
+            "hungKingDay": "Hung Kings' Festival",
+            "balance": "Wallet Balance",
+            "chooseDate": "Choose date",
+            "year": "year",
+            "hour": "hour",
+            "minute": "minute",
+            "from": "From",
+            "to": "To",
+            "connected": "Connected",
+            "disconnected": "Disconnected",
+            "hide": "Hide",
+            "viewAllTitle": "View all",
+            "headerTitle": "Transaction history",
+            "SHORTEN": "SHORTEN",
+            "viewMoreBank": "VIEW MORE (${otherItemCount} banks)",
+            "transaction_success": "Success",
+            "transaction_fail": "Fail",
+            "transaction_processing": "Processing",
+            "viewMore": "View more",
+            "shorten": "Shorten",
+            "Payment": "${serviceName} payment",
+            "currencyUnit": "VND",
+            "Month": "Month",
+            "save": "Save",
+            "favoriteIn": "Add to favorite services",
+            "favoriteOut": "Remove to favorite services",
+            "deviceIn": "Add to device",
+            "setting": "Settings",
+            "transaction": "Transaction History",
+            "share": "Share",
+            "information": "Information",
+            "tutorial": "Instruction",
+            "question": "FAQ",
+            "support": "Support center",
+            "errorCode": "Error code: ",
+            "skip": "Skip",
+            "enterPhoneNumber": "Please enter your phone number",
+            "invalidPhoneNumber": "Invalid phone number",
+        ]
+    )
+}

package/ios/Application/MaxApi.swift

@@ -0,0 +1,18 @@
+//
+//  MaxApi.swift
+//  MoMoUIKits
+//
+//  Swift mirror of the host-app bridge exposed on Kotlin as `vn.momo.maxapi.IMaxApi`
+//  (`LocalMaxApi`). `IMaxApi` itself is an external compiled dependency with no
+//  source in this repo, so this protocol intentionally exposes only the methods
+//  this kit's Kotlin source actually calls (`track`, `dismiss`, `getLanguage`) —
+//  not a full guess at IMaxApi's real surface.
+//
+
+import Foundation
+
+public protocol MaxApi {
+    func track(eventName: String, params: [String: Any?])
+    func dismiss(completion: (() -> Void)?)
+    func getLanguage(callback: @escaping ([String: Any?]?) -> Void)
+}

package/ios/Application/Navigation/BottomTab/BottomTab.swift

@@ -56,6 +56,7 @@ public struct BottomTab: View {
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
         .ignoresSafeArea(edges: .bottom)
+        .preference(key: IsBottomTabRootKey.self, value: true)
     }
 
     @ViewBuilder

package/ios/Application/Navigation/NavigationContainer.swift

@@ -14,9 +14,11 @@ import SwiftUI
 public struct NavigationContainer<Initial: View>: View {
     @StateObject private var navigator: Navigator
     @StateObject private var applicationEnvironment: ApplicationEnvironment
+    @StateObject private var localize: Localize
 
     private let setNavigator: ((Navigator) -> Void)?
     private let composeApi: KitComposeApi?
+    private let maxApi: MaxApi?
 
     public init(
         initialScreenName: String = "",
@@ -25,6 +27,8 @@ public struct NavigationContainer<Initial: View>: View {
         applicationContext: MiniAppContext? = nil,
         composeApi: KitComposeApi? = nil,
         config: KitConfig? = nil,
+        maxApi: MaxApi? = nil,
+        localize: Localize? = nil,
         setNavigator: ((Navigator) -> Void)? = nil
     ) {
         let nav = Navigator(
@@ -38,10 +42,13 @@ public struct NavigationContainer<Initial: View>: View {
             wrappedValue: ApplicationEnvironment(
                 applicationContext: applicationContext,
                 composeApi: composeApi,
-                config: config
+                config: config,
+                maxApi: maxApi
             )
         )
+        _localize = StateObject(wrappedValue: localize ?? Localize())
         self.composeApi = composeApi
+        self.maxApi = maxApi
         self.setNavigator = setNavigator
     }
 
@@ -55,11 +62,13 @@ public struct NavigationContainer<Initial: View>: View {
         .environmentObject(navigator)
         .environmentObject(applicationEnvironment)
         .environment(\.applicationEnvironment, applicationEnvironment)
+        .environmentObject(localize)
         .fullScreenCover(item: $navigator.presented) { route in
             screenView(forDialog: route)
                 .environmentObject(navigator)
                 .environmentObject(applicationEnvironment)
                 .environment(\.applicationEnvironment, applicationEnvironment)
+                .environmentObject(localize)
         }
         .overlay {
             if let item = navigator.overplay {
@@ -67,6 +76,7 @@ public struct NavigationContainer<Initial: View>: View {
                     .environmentObject(navigator)
                     .environmentObject(applicationEnvironment)
                     .environment(\.applicationEnvironment, applicationEnvironment)
+                    .environmentObject(localize)
             }
         }
         .onAppear {
@@ -74,12 +84,19 @@ public struct NavigationContainer<Initial: View>: View {
                 navigator.composeApi = composeApi
             }
             setNavigator?(navigator)
+            // Mirrors Compose's LaunchedEffect(maxApi, resolvedLocalize): host-reported
+            // language wins over the default "vi" only when it resolves to English.
+            maxApi?.getLanguage { data in
+                if parseLanguage(data) == Localize.EN {
+                    localize.changeLanguage(Localize.EN)
+                }
+            }
         }
     }
 
     @ViewBuilder
     private func screenView(for route: DynamicScreenRoute) -> some View {
-        if let screen = DynamicScreenRegistry.shared.getScreen(id: route.id) {
+        if let screen = navigator.registry.getScreen(id: route.id) {
             ScreenHost(screen: screen, navigator: navigator)
                 .navigationBarBackButtonHidden(true)
         } else {
@@ -89,7 +106,7 @@ public struct NavigationContainer<Initial: View>: View {
 
     @ViewBuilder
     private func screenView(forDialog route: DynamicDialogRoute) -> some View {
-        if let screen = DynamicScreenRegistry.shared.getScreen(id: route.id) {
+        if let screen = navigator.registry.getScreen(id: route.id) {
             ScreenHost(screen: screen, navigator: navigator)
         } else {
             EmptyView()
@@ -128,6 +145,7 @@ private struct ScreenHost: View {
             layoutOffset: options.layoutOffset,
             inputSearchProps: options.inputSearchProps,
             fabProps: options.fabProps,
+            screenName: screen.name,
             content: { screen.content() }
         )
     }
@@ -174,3 +192,9 @@ private func safeAreaBottomInset() -> CGFloat {
         .compactMap { ($0 as? UIWindowScene)?.keyWindow?.safeAreaInsets.bottom }
         .first ?? 0
 }
+
+private func parseLanguage(_ raw: [String: Any?]?) -> String? {
+    guard let response = (raw?["response"] as? String)?.trimmingCharacters(in: .whitespaces).lowercased(),
+          !response.isEmpty else { return nil }
+    return response.hasPrefix(Localize.EN) ? Localize.EN : Localize.VI
+}