@momo-kits/native-kits 0.163.1-beta.14-debug → 0.163.1-beta.15-debug

package/.claude/settings.local.json

@@ -0,0 +1,84 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(curl -s -o /dev/null -w \"%{http_code}\" \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/0.144.6/skiko-android-0.144.6.pom\")",
+      "Bash(curl -s \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/maven-metadata.xml\")",
+      "Bash(curl -s \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko/maven-metadata.xml\")",
+      "Bash(curl -s \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko/0.144.6/skiko-0.144.6.module\")",
+      "Bash(curl -s -o /dev/null -w '%{http_code}' https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/0.144.6/skiko-android-0.144.6.__TRACKED_VAR__)",
+      "Bash(curl -s \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/0.144.6/\")",
+      "Bash(curl -s \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/\")",
+      "Bash(curl -s -o /dev/null -w \"%{http_code}\\\\n\" \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/0.148.1/skiko-android-0.148.1.pom\")",
+      "Bash(curl -s -o /dev/null -w \"%{http_code}\\\\n\" \"https://repo.maven.apache.org/maven2/org/jetbrains/skiko/skiko-android/0.144.5/skiko-android-0.144.5.pom\")",
+      "Bash(curl -s -o /dev/null -w \"%{http_code}\\\\n\" \"https://dl.google.com/dl/android/maven2/org/jetbrains/skiko/skiko-android/0.144.6/skiko-android-0.144.6.pom\")",
+      "Bash(curl -s \"https://search.maven.org/solrsearch/select?q=a:skiko-android&rows=5&wt=json\")",
+      "Bash(curl -sL -o /dev/null -w \"%{http_code} %{url_effective}\\\\n\" \"https://repo1.maven.org/maven2/org/jetbrains/skiko/skiko-android/0.144.6/skiko-android-0.144.6.pom\")",
+      "Bash(curl *)",
+      "Bash(./gradlew :sample:androidApp:dependencies --configuration debugRuntimeClasspath)",
+      "Bash(./gradlew :sample:shared:compileDebugKotlinAndroid)",
+      "Bash(./gradlew :sample:androidApp:compileDebugKotlin)",
+      "Bash(ls -d *.xcodeproj)",
+      "Bash(grep -c ChipDemo.swift __TRACKED_VAR__/project.pbxproj)",
+      "Bash(grep -c PBXFileSystemSynchronizedRootGroup __TRACKED_VAR__/project.pbxproj)",
+      "Bash(grep -c InformationDemo.swift __TRACKED_VAR__/project.pbxproj)",
+      "Bash(plutil -lint project.pbxproj)",
+      "Bash(xcode-select -p)",
+      "Bash(/usr/bin/xcrun xcodebuild *)",
+      "Bash(echo \"exit: $?\")",
+      "Bash(/Applications/Xcode26.app/Contents/Developer/usr/bin/xcodebuild -version)",
+      "Bash(./gradlew :compose:tasks --all)",
+      "Bash(grep -n \"vanniktech\\\\|mavenPublishing\\\\|^publishing\\\\|version = gitlabVersion\\\\|namespace =\\\\|compileSdk =\\\\|minSdk =\\\\|GitLabPackages\\\\|name = \\\\\"\\\\${gitlabRepo}Packages\\\\\"\")",
+      "Bash(git checkout *)",
+      "Bash(./gradlew :compose:publishAllPublicationsToGitLabPackagesRepository --dry-run)",
+      "Bash(git fetch *)",
+      "Bash(git pull *)",
+      "Bash(git push *)",
+      "Bash(git branch *)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -list)",
+      "Bash(xcrun simctl *)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14 Pro' -configuration Debug build CODE_SIGNING_ALLOWED=NO)",
+      "Bash(pod install *)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -sdk iphonesimulator -destination 'id=1E6F9A79-5E64-4590-BEA2-828D75D99393' -configuration Debug build CODE_SIGNING_ALLOWED=NO)",
+      "Bash(xcrun swiftc *)",
+      "Bash(echo \"=== exit: $? \\(1=none found\\) ===\")",
+      "Bash(cat Radius.swift)",
+      "Bash(cat Spacing.swift)",
+      "Bash(echo \"exit=$?\")",
+      "Bash(ruby *)",
+      "Bash(xcodebuild -list -workspace iosApp.xcworkspace)",
+      "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(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 *)",
+      "Read(//Users/sophia/Workspace/momo/momo-app/**)",
+      "Bash(git log *)",
+      "Bash(xcodebuild -version)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' -configuration Debug build CODE_SIGNING_ALLOWED=NO)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme MoMoUIKits -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' -configuration Debug build CODE_SIGNING_ALLOWED=NO)",
+      "Bash(xcodebuild -workspace iosApp.xcworkspace -scheme MoMoUIKits -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' -configuration Debug clean build CODE_SIGNING_ALLOWED=NO)",
+      "Bash(git commit *)",
+      "Bash(npm view *)",
+      "Bash(echo \"EXIT=$? -> not resolvable\")",
+      "Bash(yarn install *)",
+      "Bash(RCT_NEW_ARCH_ENABLED=1 pod install)",
+      "Bash(xcodebuild -workspace MoMoPlatform.xcworkspace -list)",
+      "Bash(git --no-pager diff --stat ios/Application/Localize.swift ios/Application/Navigation/NavigationContainer.swift ios/Popup/PopupDisplay.swift ios/Popup/PopupNotify.swift ios/Template/TrustBanner/TrustBanner.swift)",
+      "Bash(git rm *)",
+      "Bash(echo \"EXIT=$?\")"
+    ]
+  }
+}

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.163.1-beta.14-debug"
+        version = "0.163.1-beta.15-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.162.2-test.22'
+    spec.version                  = '0.163.1-beta.15-debug'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.163.1-beta.10
+version=0.163.1-beta.15
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/ios/Application/Components.swift

@@ -100,6 +100,20 @@ public struct HeaderBackground: View {
                         .frame(height: height)
                         .shadow(color: Colors.black20.opacity(0.2), radius: 10, x: 0, y: -2)
                         .background(backgroundColor)
+                        .overlay(
+                            headerTransparent ? AnyView(EmptyView()) :
+                            AnyView(
+                                Rectangle()
+                                    .fill(LinearGradient(
+                                        gradient: Gradient(colors: [
+                                            Color(red: 1, green: 0.8, blue: 0.87),
+                                            Color(red: 1, green: 0.8, blue: 0.87).opacity(0.5)
+                                        ]),
+                                        startPoint: .top,
+                                        endPoint: .bottom))
+                                    .opacity(opacity)
+                                    .frame(height: height))
+                        )
                     if !headerTransparent {
                         Rectangle()
                             .fill(Color.black.opacity(0.1))
@@ -132,17 +146,6 @@ public struct HeaderBackground: View {
     }
 }
 
-// MARK: - Header right width preference
-
-/// Reports the measured width of the header-right area so the animated search
-/// header can compute its trailing inset (mirrors Compose's headerRightWidthPx).
-public struct HeaderRightWidthKey: PreferenceKey {
-    public static var defaultValue: CGFloat = 0
-    public static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
-        value = max(value, nextValue())
-    }
-}
-
 // MARK: - Bottom-tab root preference
 
 /// Set by `BottomTab` on appear so its enclosing `StackScreen` can detect that
@@ -232,9 +235,6 @@ public struct Header: View {
 
                         if let headerRight = headerRight {
                             AnyView(headerRight())
-                                .background(GeometryReader { geo in
-                                    Color.clear.preference(key: HeaderRightWidthKey.self, value: geo.size.width)
-                                })
                         }
                     }
                     .padding(.horizontal, 12)

package/ios/Application/HeaderRight.swift

@@ -101,98 +101,69 @@ struct ToolkitHeaderRight: View {
     var tintColor: Color?
     @State private var isFavorite: Bool = false
     @State private var isLoading: Bool = false
-    @Environment(\.applicationEnvironment) private var environment
-
-    private func apiValue(_ value: Any?) -> Any {
-        value ?? NSNull()
-    }
-
-    private var contextMap: [String: Any] {
-        let context = environment.applicationContext
-        return [
-            "appId": apiValue(context?.appId),
-            "code": apiValue(context?.appCode),
-            "name": apiValue(context?.appName),
-            "icon": apiValue(context?.appIcon),
-            "description": apiValue(context?.description),
-            "support": apiValue(context?.support),
-            "toolkitConfig": apiValue(context?.toolkitConfig),
-            "providerId": apiValue(context?.providerId),
-            "permissions": apiValue(context?.permissions)
-        ]
-    }
-
-    private var shouldShowShortcut: Bool {
-        headerRight?.useShortcut == true && !(headerRight?.useMore == true && environment.applicationContext == nil)
-    }
-
-    private func parseResponse(_ response: String) -> Any? {
-        guard let jsonData = response.data(using: .utf8),
-              let json = try? JSONSerialization.jsonObject(with: jsonData) as? [String: Any] else {
-            return nil
-        }
-        return json["response"]
-    }
+    @EnvironmentObject private var environment: ApplicationEnvironment
     
     // MARK: - Actions
-    private func loadFavoriteState() {
-        environment.composeApi?.request(
-            funcName: "isFavoriteApp",
-            params: ["code": apiValue(environment.applicationContext?.appCode)]
-        ) { response in
-            if let isFavorite = parseResponse(response) as? Bool {
-                self.isFavorite = isFavorite
-            }
-        }
-    }
-
     private func onPressShortcut() {
         environment.composeApi?.request(
             funcName: "onToolAction",
-            params: [
-                "item": ["key": "onFavorite"],
-                "context": contextMap
-            ]
-        ) { response in
-            if let result = parseResponse(response) as? [String: Any],
-               result["success"] as? Bool == true {
-                isFavorite.toggle()
-            }
+            params: ["item": ["key": "onFavorite"]]
+        ) { _ in
+            isFavorite.toggle()
         }
     }
     
     private func onPressHelpCenter() {
+        let context = environment.applicationContext
+        let paramMap: [String: Any] = [
+            "appId": context?.appId,
+            "code": context?.appCode,
+            "name": context?.appName,
+            "icon": context?.appIcon,
+            "description": context?.description
+        ]
         environment.composeApi?.request(
             funcName: "showHelpCenter",
-            params: [
-                "appId": apiValue(environment.applicationContext?.appId),
-                "code": apiValue(environment.applicationContext?.appCode),
-                "name": apiValue(environment.applicationContext?.appName),
-                "icon": apiValue(environment.applicationContext?.appIcon),
-                "description": apiValue(environment.applicationContext?.description)
-            ]
+            params: paramMap
         ) { _ in }
     }
     
     private func onPressClose() {
         environment.composeApi?.request(
             funcName: "dismissAll",
-            params: nil
+            params: ""
         ) { _ in }
     }
     
     private func onPressMore() {
+        let context = environment.applicationContext
         let params: [String: Any] = [
-            "useSystemTools": headerRight?.useSystemTools ?? true,
+            "useSystemTools": headerRight?.useSystemTools,
             "tools": headerRight?.tools.map { $0.toMap() } ?? [],
-            "context": contextMap
+            "context": [
+                "appId": context?.appId,
+                "code": context?.appCode,
+                "name": context?.appName,
+                "icon": context?.appIcon,
+                "description": context?.description,
+                "support": context?.support,
+                "toolkitConfig": context?.toolkitConfig,
+                "providerId": context?.providerId,
+                "permissions": context?.permissions
+            ]
         ]
         environment.composeApi?.request(
             funcName: "showTools",
             params: params
         ) { response in
-            if let toolResponse = parseResponse(response) as? String {
-                headerRight?.toolCallback?(toolResponse)
+            do {
+                if let jsonData = response.data(using: .utf8),
+                   let json = try JSONSerialization.jsonObject(with: jsonData) as? [String: Any],
+                   let toolResponse = json["response"] as? String {
+                    headerRight?.toolCallback?(toolResponse)
+                }
+            } catch {
+                print("Error parsing response:", error)
             }
         }
     }
@@ -224,7 +195,7 @@ struct ToolkitHeaderRight: View {
         } ?? false
         
         HStack(alignment: .center, spacing: 0) {
-            if shouldShowShortcut {
+            if headerRight?.useShortcut == true {
                 NavigationButton(
                     disabled: isLoading,
                     icon: navButtonConfig.icon,
@@ -235,17 +206,15 @@ struct ToolkitHeaderRight: View {
             }
             
             HStack(alignment: .center, spacing: 0) {
-                if environment.applicationContext != nil {
-                    Icon(source: "help_center", size: 20, color: tintColor ?? Colors.black17)
-                        .padding(4)
-                        .onTapGesture {
-                            onPressHelpCenter()
-                        }
-                    
-                    Rectangle()
-                        .fill(tintColor ?? Colors.black20)
-                        .frame(width: 0.5, height: 12)
-                }
+                Icon(source: "help_center", size: 20, color: tintColor ?? Colors.black17)
+                    .padding(4)
+                    .onTapGesture {
+                        onPressHelpCenter()
+                    }
+                
+                Rectangle()
+                    .fill(tintColor ?? Colors.black20)
+                    .frame(width: 0.5, height: 12)
                 
                 Icon(source: "16_basic_home", size: 20, color: tintColor ?? Colors.black17)
                     .padding(4)
@@ -262,9 +231,6 @@ struct ToolkitHeaderRight: View {
             )
             .padding(.leading, Spacing.S)
         }
-        .onAppear {
-            loadFavoriteState()
-        }
     }
 }
 

package/ios/Application/Localize.swift

@@ -11,6 +11,7 @@
 //
 
 import Foundation
+import SwiftUI
 
 /// Translation dictionary keyed by language; both `vi` and `en` are required.
 public struct LocalizationObject {
@@ -275,3 +276,34 @@ public final class Localize: ObservableObject {
         ]
     )
 }
+
+/// Snapshots `currentLanguage` alongside the instance so SwiftUI sees an environment
+/// *change* on `changeLanguage`: the `Localize` reference alone never changes, and
+/// `@Environment` does not subscribe to `@Published` the way `@EnvironmentObject` does.
+private struct LocalizeBox: Equatable {
+    let localize: Localize
+    let language: String
+
+    init(_ localize: Localize) {
+        self.localize = localize
+        self.language = localize.currentLanguage
+    }
+
+    static func == (lhs: LocalizeBox, rhs: LocalizeBox) -> Bool {
+        lhs.localize === rhs.localize && lhs.language == rhs.language
+    }
+}
+
+private struct LocalizeKey: EnvironmentKey {
+    /// A default-constructed `Localize` already carries the full kit dictionary, so a
+    /// consumer that never injects one renders untranslated-but-correct text instead of
+    /// trapping the way `@EnvironmentObject` does.
+    static let defaultValue = LocalizeBox(Localize())
+}
+
+public extension EnvironmentValues {
+    var localize: Localize {
+        get { self[LocalizeKey.self].localize }
+        set { self[LocalizeKey.self] = LocalizeBox(newValue) }
+    }
+}

package/ios/Application/Navigation/NavigationContainer.swift

@@ -63,12 +63,14 @@ public struct NavigationContainer<Initial: View>: View {
         .environmentObject(applicationEnvironment)
         .environment(\.applicationEnvironment, applicationEnvironment)
         .environmentObject(localize)
+        .environment(\.localize, localize)
         .fullScreenCover(item: $navigator.presented) { route in
             screenView(forDialog: route)
                 .environmentObject(navigator)
                 .environmentObject(applicationEnvironment)
                 .environment(\.applicationEnvironment, applicationEnvironment)
                 .environmentObject(localize)
+                .environment(\.localize, localize)
         }
         .overlay {
             if let item = navigator.overplay {
@@ -77,6 +79,7 @@ public struct NavigationContainer<Initial: View>: View {
                     .environmentObject(applicationEnvironment)
                     .environment(\.applicationEnvironment, applicationEnvironment)
                     .environmentObject(localize)
+                    .environment(\.localize, localize)
             }
         }
         .onAppear {

package/ios/Application/Navigation/component/Header.swift

@@ -22,7 +22,7 @@ public struct NavigationHeader: View {
     /// Optional rich title (mirrors Compose's `HeaderTitle`); `.user` renders an
     /// avatar group, `.default`/nil renders plain `title`.
     var headerTitle: HeaderTitle?
-    var headerRight: (() -> any View)? = { HeaderRight() }
+    var headerRight: (() -> any View)? = { NavigationHeaderRight() }
     var goBack: (() -> Void)?
     var opacity: CGFloat = 1
     var animatedHeader: AnimatedHeader?

package/ios/Application/Navigation/component/HeaderRightWidthKey.swift

@@ -0,0 +1,11 @@
+import SwiftUI
+
+/// Reports the measured width of the header-right area so the animated search
+/// header can compute its trailing inset (mirrors Compose's headerRightWidthPx).
+/// Written by the header views (`NavigationHeader`) and read by `StackScreen`.
+public struct HeaderRightWidthKey: PreferenceKey {
+    public static var defaultValue: CGFloat = 0
+    public static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
+        value = max(value, nextValue())
+    }
+}

package/ios/Application/Navigation/component/NavigationHeaderRight.swift

@@ -0,0 +1,196 @@
+import SwiftUI
+import Foundation
+
+/// Keyed (`@Environment(\.applicationEnvironment)`) variant of `HeaderRight`, for hosts
+/// wired through `NavigationContainer`/`KitContainer` (the injection style introduced by
+/// MR 227 / DS-637). Reuses the shared data types (`HeaderRightData`, `Tool`, `ToolGroup`)
+/// and `NavigationButton` from `HeaderRight.swift`. The legacy `HeaderRight` there stays on
+/// `@EnvironmentObject` for hosts that render `Screen` directly with
+/// `.environmentObject(ApplicationEnvironment(...))`. Opt in per screen with
+/// `headerRight: { NavigationHeaderRight() }`.
+public struct NavigationHeaderRight: View {
+    public init(headerRight: HeaderRightData? = nil, tintColor: Color? = nil) {
+        self.headerRight = headerRight
+        self.tintColor = tintColor
+    }
+    var headerRight: HeaderRightData?
+    var tintColor: Color? = nil
+
+    public var body: some View {
+        HStack(alignment: .center) {
+            ToolkitNavigationHeaderRight(headerRight: headerRight, tintColor: tintColor)
+        }
+    }
+}
+
+struct ToolkitNavigationHeaderRight: View {
+    var headerRight: HeaderRightData?
+    var tintColor: Color?
+    @State private var isFavorite: Bool = false
+    @State private var isLoading: Bool = false
+    @Environment(\.applicationEnvironment) private var environment
+
+    private func apiValue(_ value: Any?) -> Any {
+        value ?? NSNull()
+    }
+
+    private var contextMap: [String: Any] {
+        let context = environment.applicationContext
+        return [
+            "appId": apiValue(context?.appId),
+            "code": apiValue(context?.appCode),
+            "name": apiValue(context?.appName),
+            "icon": apiValue(context?.appIcon),
+            "description": apiValue(context?.description),
+            "support": apiValue(context?.support),
+            "toolkitConfig": apiValue(context?.toolkitConfig),
+            "providerId": apiValue(context?.providerId),
+            "permissions": apiValue(context?.permissions)
+        ]
+    }
+
+    private var shouldShowShortcut: Bool {
+        headerRight?.useShortcut == true && !(headerRight?.useMore == true && environment.applicationContext == nil)
+    }
+
+    private func parseResponse(_ response: String) -> Any? {
+        guard let jsonData = response.data(using: .utf8),
+              let json = try? JSONSerialization.jsonObject(with: jsonData) as? [String: Any] else {
+            return nil
+        }
+        return json["response"]
+    }
+
+    // MARK: - Actions
+    private func loadFavoriteState() {
+        environment.composeApi?.request(
+            funcName: "isFavoriteApp",
+            params: ["code": apiValue(environment.applicationContext?.appCode)]
+        ) { response in
+            if let isFavorite = parseResponse(response) as? Bool {
+                self.isFavorite = isFavorite
+            }
+        }
+    }
+
+    private func onPressShortcut() {
+        environment.composeApi?.request(
+            funcName: "onToolAction",
+            params: [
+                "item": ["key": "onFavorite"],
+                "context": contextMap
+            ]
+        ) { response in
+            if let result = parseResponse(response) as? [String: Any],
+               result["success"] as? Bool == true {
+                isFavorite.toggle()
+            }
+        }
+    }
+
+    private func onPressHelpCenter() {
+        environment.composeApi?.request(
+            funcName: "showHelpCenter",
+            params: [
+                "appId": apiValue(environment.applicationContext?.appId),
+                "code": apiValue(environment.applicationContext?.appCode),
+                "name": apiValue(environment.applicationContext?.appName),
+                "icon": apiValue(environment.applicationContext?.appIcon),
+                "description": apiValue(environment.applicationContext?.description)
+            ]
+        ) { _ in }
+    }
+
+    private func onPressClose() {
+        environment.composeApi?.request(
+            funcName: "dismissAll",
+            params: nil
+        ) { _ in }
+    }
+
+    private func onPressMore() {
+        let params: [String: Any] = [
+            "useSystemTools": headerRight?.useSystemTools ?? true,
+            "tools": headerRight?.tools.map { $0.toMap() } ?? [],
+            "context": contextMap
+        ]
+        environment.composeApi?.request(
+            funcName: "showTools",
+            params: params
+        ) { response in
+            if let toolResponse = parseResponse(response) as? String {
+                headerRight?.toolCallback?(toolResponse)
+            }
+        }
+    }
+
+    private func getNavigationButtonConfig() -> NavigationButtonConfig {
+        let totalTools = headerRight?.tools.reduce(0) { $0 + $1.items.count } ?? 0
+        var icon = isFavorite ? "pin_star_checked" : "pin_star"
+        var onClickHandler: () -> Void = onPressShortcut
+
+        if totalTools > 1 || headerRight?.useMore == true {
+            icon = "navigation_more_icon"
+            onClickHandler = onPressMore
+        } else if totalTools == 1, let singleTool = headerRight?.tools.first?.items.first {
+            icon = singleTool.icon
+            onClickHandler = {
+                headerRight?.toolCallback?(singleTool.key)
+            }
+        }
+
+        return NavigationButtonConfig(icon: icon, onPress: onClickHandler)
+    }
+
+    var body: some View {
+        let backgroundButtonColor: Color = tintColor == Colors.black01 ? Colors.black20.opacity(0.6) : Colors.black01.opacity(0.6)
+        let borderColor: Color = tintColor == Colors.black01 ? Colors.black01.opacity(0.2) : Colors.black20.opacity(0.2)
+        let navButtonConfig = getNavigationButtonConfig()
+        let showBadge = headerRight?.tools.contains { group in
+            group.items.contains { $0.showBadge }
+        } ?? false
+
+        HStack(alignment: .center, spacing: 0) {
+            if shouldShowShortcut {
+                NavigationButton(
+                    disabled: isLoading,
+                    icon: navButtonConfig.icon,
+                    showBadge: showBadge,
+                    onClick: navButtonConfig.onPress,
+                    tintColor: tintColor
+                )
+            }
+
+            HStack(alignment: .center, spacing: 0) {
+                if environment.applicationContext != nil {
+                    Icon(source: "help_center", size: 20, color: tintColor ?? Colors.black17)
+                        .padding(4)
+                        .onTapGesture {
+                            onPressHelpCenter()
+                        }
+
+                    Rectangle()
+                        .fill(tintColor ?? Colors.black20)
+                        .frame(width: 0.5, height: 12)
+                }
+
+                Icon(source: "16_basic_home", size: 20, color: tintColor ?? Colors.black17)
+                    .padding(4)
+                    .onTapGesture {
+                        onPressClose()
+                    }
+            }
+            .frame(width: 65, height: 28)
+            .background(backgroundButtonColor)
+            .cornerRadius(14)
+            .overlay(
+                RoundedRectangle(cornerRadius: 14)
+                    .stroke(borderColor, lineWidth: 0.2)
+            )
+            .padding(.leading, Spacing.S)
+        }
+        .onAppear {
+            loadFavoriteState()
+        }
+    }
+}

package/ios/Popup/PopupDisplay.swift

@@ -54,7 +54,7 @@ extension View {
 // MARK: - PopupDisplay
 
 public struct PopupDisplay: View {
-    @EnvironmentObject private var localize: Localize
+    @Environment(\.localize) private var localize
 
     // MARK: Lifecycle
 

package/ios/Popup/PopupNotify.swift

@@ -38,7 +38,7 @@ public struct PopupNotifyProps {
 }
 
 public struct PopupNotify: View {
-    @EnvironmentObject private var localize: Localize
+    @Environment(\.localize) private var localize
 
     public let props: PopupNotifyProps
 

package/ios/Popup/PopupPromotion.swift

@@ -20,26 +20,21 @@ public struct PopupPromotion: View {
     }
 
     public var body: some View {
-        // Mirrors Kotlin's `Modifier.fillMaxWidth().aspectRatio(0.72f)` box with
-        // `ContentScale.FillBounds` inside it: a fixed-ratio frame the image stretches
-        // to exactly fill (no `.aspectRatio` modifier on the image itself, unlike the
-        // previous `.fit`, which letterboxed instead of stretching).
-        let boxWidth = UIScreen.main.bounds.width - Spacing.XL * 2
-        let boxHeight = boxWidth / 0.72
-
         VStack(spacing: 8) {
             if(imageUrl.isEmpty) {
-                Icon(source: "media_fail", size: boxWidth)
+                Icon(source: "media_fail", size: UIScreen.main.bounds.width - Spacing.XL * 2)
             }
             else {
                 WebImage(url: URL(string: imageUrl)!)
                     .resizable()
                     .placeholder {
                         Color.gray
-                            .frame(width: boxWidth, height: boxHeight)
+                            .aspectRatio(0.72, contentMode: .fit)
+                            .frame(maxWidth: UIScreen.main.bounds.width - Spacing.XL * 2)
                             .clipped()
                     }
-                    .frame(width: boxWidth, height: boxHeight, alignment: .center)
+                    .aspectRatio(0.72, contentMode: .fit)
+                    .frame(maxWidth: UIScreen.main.bounds.width - Spacing.XL * 2, alignment: .center)
                     .clipped()
                     .onTapGesture {
                         onAction?()
@@ -70,7 +65,6 @@ public struct PopupPromotion: View {
                 .padding(8)
                 .zIndex(1)
             }
-            .buttonStyle(.plain)
         }
     }
 

package/ios/Template/TrustBanner/TrustBanner.swift

@@ -51,8 +51,8 @@ let defaultBanner = TrustBannerData(
 )
 
 public struct TrustBanner: View {
-    @EnvironmentObject var applicationEnvironment: ApplicationEnvironment
-    @EnvironmentObject private var localize: Localize
+    @Environment(\.applicationEnvironment) var applicationEnvironment
+    @Environment(\.localize) private var localize
 
     var onPress: ((String)->Void)?
 

package/ios/native-kits.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKits'
-  s.version          = '0.162.2-sp.9'
+  s.version          = '0.163.1-beta.15'
   s.summary          = 'MoMoUIKits for iOS'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/ios-demo/MoMoUIKitsDemo.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKitsDemo'
-  s.version          = '0.162.2-sp.9'
+  s.version          = '0.163.1-beta.15'
   s.summary          = 'Demo browser for MoMoUIKits SwiftUI components'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/PopupNotifyDemo.swift

@@ -89,7 +89,7 @@ private struct PopupNotifyDemoContent: View {
                 )
                 .padding(.top, Spacing.XS)
             }
-            .padding(Spacing.L)
+            .padding(Spacing.M * 2)
         }
     }
 

package/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/PopupPromotionDemo.swift

@@ -29,7 +29,7 @@ struct PopupPromotionDemo: View {
 private struct PopupPromotionDemoContent: View {
     @EnvironmentObject private var navigator: Navigator
 
-    @State private var imageUrl = "https://static.momocdn.net/app/img/popup_permission/img_permission_popup_camera.png"
+    @State private var imageUrl = "https://static.momocdn.net/app/app/appx/ABC.png?size=M"
 
     var body: some View {
         ScrollView {
@@ -48,7 +48,7 @@ private struct PopupPromotionDemoContent: View {
                 )
                 .padding(.top, 8)
             }
-            .padding(16)
+            .padding(Spacing.M * 2)
         }
     }
 

package/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Tue Jun 02 17:05:32 ICT 2026
+sdk.dir=/Users/sophia/Library/Android/sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.163.1-beta.14-debug",
+  "version": "0.163.1-beta.15-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},