@momo-kits/native-kits 0.113.3-beta.7 → 0.113.3-pu.1

package/compose/src/commonMain/kotlin/vn/momo/kits/application/HeaderRight.kt

@@ -128,7 +128,11 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
                     "code" to context?.appCode,
                     "name" to context?.appName,
                     "icon" to context?.appIcon,
-                    "description" to context?.description
+                    "description" to context?.description,
+                    "support" to context?.support,
+                    "toolkitConfig" to context?.toolkitConfig,
+                    "providerId" to context?.providerId,
+                    "permissions" to context?.permissions
                 )
             )
         ) { response ->

package/compose/src/commonMain/kotlin/vn/momo/kits/application/NavigationContainer.kt

@@ -10,7 +10,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.unit.Dp
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.internal.FormatLanguage
 import vn.momo.kits.components.TrustBannerData
 import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
@@ -58,8 +57,8 @@ data class MiniAppContext(
 
 val PlatformApi = staticCompositionLocalOf<Any?> { null }
 
-val AppNavigator = staticCompositionLocalOf<Navigator> {
-    error("no navigator provided!")
+val AppNavigator = staticCompositionLocalOf<Navigator?> {
+    null
 }
 
 val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {
@@ -70,10 +69,6 @@ val AppConfig = staticCompositionLocalOf<KitConfig?> {
     null
 }
 
-val AppLanguage = staticCompositionLocalOf<String?> {
-    null
-}
-
 data class KitConfig(
     val trustBanner: TrustBannerData? = null,
     val headerBar: String? = null,
@@ -87,7 +82,6 @@ fun ApplicationContainer(
     statusBarHeight: Dp? = AppStatusBar.current,
     applicationContext: MiniAppContext? = null,
     config: KitConfig? = null,
-    language: String? = null,
     content: @Composable () -> Unit,
 ) {
     var appTheme by remember { mutableStateOf(theme) }
@@ -116,8 +110,7 @@ fun ApplicationContainer(
         AppNavigator provides Navigator(),
         AppStatusBar provides appStatusBarHeight,
         ApplicationContext provides applicationContext,
-        AppConfig provides config,
-        AppLanguage provides language
+        AppConfig provides config
     ) {
         content()
     }

package/compose/src/commonMain/kotlin/vn/momo/kits/components/Input.kt

@@ -21,6 +21,7 @@ import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -36,6 +37,7 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
@@ -154,7 +156,7 @@ fun ErrorView(errorMessage: String, errorSpacing: Boolean, hintText: String) {
 
 @Composable
 fun Input(
-    text: MutableState<String> = remember { mutableStateOf("") },
+    text: String = "",
     floatingValue: String = "",
     floatingValueColor: Color = AppTheme.current.colors.text.hint,
     floatingIcon: String = "",
@@ -181,6 +183,11 @@ fun Input(
     keyboardType: KeyboardType = KeyboardType.Text,
     modifier: Modifier = Modifier,
 ) {
+    // Handling state based on the `BasicTextField` concept
+    var textFieldValueState by remember { mutableStateOf(TextFieldValue(text = text)) }
+    val textFieldValue = textFieldValueState.copy(text = text)
+    var lastTextValue by remember(text) { mutableStateOf(text) }
+
     var isFocused by remember { mutableStateOf(false) }
     var passHidden by remember { mutableStateOf(false) }
     var isBlurred = false
@@ -209,10 +216,10 @@ fun Input(
     setAutomationId(testId)
     ) {
         BasicTextField(
+            value = text,
             enabled = !disabled,
             readOnly = readOnly,
             singleLine = true,
-            value = text.value,
             textStyle = TextStyle(
                 color = textColor,
                 fontSize = 16.sp,
@@ -229,7 +236,15 @@ fun Input(
                 if (!it.isFocused && isBlurred) onBlur()
                 if (it.isFocused && !isBlurred) isBlurred = true
             },
-            onValueChange = onChangeText,
+            onValueChange = { newValue ->
+                textFieldValueState.copy(text = newValue)
+                val stringChangedSinceLastInvocation = lastTextValue != newValue
+                lastTextValue = newValue
+
+                if (stringChangedSinceLastInvocation) {
+                    onChangeText(newValue)
+                }
+            },
             decorationBox = { innerTextField ->
                 // Floating Icon
                 if (floatingValue.isNotEmpty() || floatingIcon.isNotEmpty()) {
@@ -291,7 +306,7 @@ fun Input(
                             )
                         }
                         Box(Modifier.weight(1f)) {
-                            if (text.value.isEmpty()) {
+                            if (textFieldValue.text.isEmpty()) {
                                 Text(
                                     text = placeholder,
                                     style = TextStyle(
@@ -304,7 +319,7 @@ fun Input(
                             }
                             innerTextField()
                         }
-                        if (isFocused && text.value.isNotEmpty()) {
+                        if (isFocused && textFieldValue.text.isNotEmpty()) {
                             Row {
                                 Spacer(Modifier.width(Spacing.XS))
                                 Icon(
@@ -312,7 +327,10 @@ fun Input(
                                     size = 16.dp,
                                     color = AppTheme.current.colors.text.hint,
                                     modifier = Modifier.clickable(
-                                        onClick = { text.value = "" },
+                                        onClick = {
+                                            onChangeText("")
+                                            textFieldValueState = TextFieldValue(text = "")
+                                        },
                                         interactionSource = remember { MutableInteractionSource() },
                                         indication = null
                                     )

package/compose/src/commonMain/kotlin/vn/momo/kits/components/PopupNotify.kt

@@ -143,7 +143,7 @@ fun PopupNotify(
             Modifier
                 .width(22.dp)
                 .height(22.dp)
-                .offset(x = Spacing.M / 2, y = -Spacing.M)
+                .offset(x = -(1).dp, y = (-11).dp)
                 .background(
                     color = AppTheme.current.colors.text.default,
                     shape = RoundedCornerShape(Radius.M)

package/compose/src/commonMain/kotlin/vn/momo/kits/components/TrustBanner.kt

@@ -20,7 +20,6 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import vn.momo.kits.application.AppConfig
-import vn.momo.kits.application.AppLanguage
 import vn.momo.kits.modifier.noFeedbackClickable
 
 val defaultBanner = TrustBannerData(
@@ -63,10 +62,10 @@ fun TrustBanner(
     serviceName: String = "",
     screenName: String = "",
     onPress: ((Map<String, String>) -> Unit)? = null,
-    trackEvent: ((String, Map<String, String>) -> Unit)? = null
+    trackEvent: ((String, Map<String, String>) -> Unit)? = null,
+    language: String = "vi"
 ) {
     val appConfig = AppConfig.current
-    val language = AppLanguage.current ?: "vi"
     val trustBanner = appConfig?.trustBanner ?: defaultBanner
     val trackParams = mapOf(
         "service_name" to serviceName,

package/ios/Application/ApplicationEnvironment.swift

@@ -13,30 +13,30 @@ public class MiniAppContext {
     public var appName: Any? = nil
     public var appIcon: String = ""
     public var description: Any? = nil
-    
-    public init(appId: String, appCode: String, appName: Any? = nil, appIcon: String, description: Any? = nil) {
+    public var support: Any? = nil
+    public var toolkitConfig: Any? = nil
+    public var providerId: String = ""
+    public var permissions: Any? = nil
+
+    public init(appId: String, appCode: String, appName: Any? = nil, appIcon: String, description: Any? = nil, support: Any? = nil, toolkitConfig: Any? = nil, providerId: String, permissions: Any? = nil) {
         self.appId = appId
         self.appCode = appCode
         self.appName = appName
         self.appIcon = appIcon
         self.description = description
+        self.support = support
+        self.toolkitConfig = toolkitConfig
+        self.providerId = providerId
+        self.permissions = permissions
     }
 }
 
-public class KitConfig {
-    public var trustBanner: TrustBannerData? = nil
-    public var headerBar: String? = nil
-    public var headerGradient: String? = nil
-}
-
 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 composeApi: KitComposeApi
+
+    public init(applicationContext: MiniAppContext?, composeApi: KitComposeApi) {
         self.applicationContext = applicationContext
         self.composeApi = composeApi
-        self.config = config
     }
 }

package/ios/Application/HeaderRight.swift

@@ -6,7 +6,7 @@ public struct HeaderRightData {
     var useMore: Bool
     var tools: [ToolGroup]
     var toolCallback: ((String) -> Void)?
-    
+
     public init(
         useShortcut: Bool = false,
         useMore: Bool = false,
@@ -25,7 +25,7 @@ public struct Tool {
     var icon: String
     var showBadge: Bool
     var name: [String: String]
-    
+
     public init(
         key: String,
         icon: String,
@@ -37,7 +37,7 @@ public struct Tool {
         self.showBadge = showBadge
         self.name = name
     }
-    
+
     func toMap() -> [String: Any] {
         return [
             "key": key,
@@ -51,7 +51,7 @@ public struct Tool {
 public struct ToolGroup {
     var title: [String: String]
     var items: [Tool]
-    
+
     public init(
         title: [String: String] = [:],
         items: [Tool]
@@ -59,7 +59,7 @@ public struct ToolGroup {
         self.title = title
         self.items = items
     }
-    
+
     func toMap() -> [String: Any] {
         return [
             "title": title,
@@ -79,7 +79,7 @@ public struct HeaderRight: View {
         self.headerRight = headerRight
     }
     var headerRight: HeaderRightData?
-    
+
     public var body: some View {
         HStack(alignment: .center) {
             ToolkitHeaderRight(headerRight: headerRight)
@@ -92,17 +92,17 @@ struct ToolkitHeaderRight: View {
     @State private var isFavorite: Bool = false
     @State private var isLoading: Bool = false
     @EnvironmentObject private var environment: ApplicationEnvironment
-    
+
     // MARK: - Actions
     private func onPressShortcut() {
-        environment.composeApi?.request(
+        environment.composeApi.request(
             funcName: "onToolAction",
             params: ["item": ["key": "onFavorite"]]
         ) { _ in
             isFavorite.toggle()
         }
     }
-    
+
     private func onPressHelpCenter() {
         let context = environment.applicationContext
         let paramMap: [String: Any] = [
@@ -112,19 +112,20 @@ struct ToolkitHeaderRight: View {
             "icon": context?.appIcon,
             "description": context?.description
         ]
-        environment.composeApi?.request(
+        environment.composeApi.request(
             funcName: "showHelpCenter",
             params: paramMap
         ) { _ in }
     }
-    
+
     private func onPressClose() {
-        environment.composeApi?.request(
+        environment.composeApi.request(
             funcName: "dismiss",
             params: ""
         ) { _ in }
     }
-    
+
+
     private func onPressMore() {
         let context = environment.applicationContext
         let params: [String: Any] = [
@@ -134,10 +135,14 @@ struct ToolkitHeaderRight: View {
                 "code": context?.appCode,
                 "name": context?.appName,
                 "icon": context?.appIcon,
-                "description": context?.description
+                "description": context?.description,
+                 "support": context?.support,
+                 "toolkitConfig": context?.toolkitConfig,
+                 "providerId": context?.providerId,
+                 "permissions": context?.permissions
             ]
         ]
-        environment.composeApi?.request(
+        environment.composeApi.request(
             funcName: "showTools",
             params: params
         ) { response in
@@ -152,12 +157,12 @@ struct ToolkitHeaderRight: View {
             }
         }
     }
-    
+
     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
@@ -167,16 +172,16 @@ struct ToolkitHeaderRight: View {
                 headerRight?.toolCallback?(singleTool.key)
             }
         }
-        
+
         return NavigationButtonConfig(icon: icon, onPress: onClickHandler)
     }
-    
+
     var body: some View {
         let navButtonConfig = getNavigationButtonConfig()
         let showBadge = headerRight?.tools.contains { group in
             group.items.contains { $0.showBadge }
         } ?? false
-        
+
         HStack(alignment: .center) {
             if headerRight?.useShortcut == true {
                 NavigationButton(
@@ -186,18 +191,18 @@ struct ToolkitHeaderRight: View {
                     onClick: navButtonConfig.onPress
                 )
             }
-            
+
             HStack(alignment: .center, spacing: 0) {
                 Icon(source: "help_center", size: 20)
                     .padding(4)
                     .onTapGesture {
                         onPressHelpCenter()
                     }
-                
+
                 Rectangle()
                     .fill(Colors.black20)
                     .frame(width: 0.5, height: 12)
-                
+
                 Icon(source: "16_navigation_close_circle", size: 20, color: Colors.black17)
                     .padding(4)
                     .onTapGesture {
@@ -221,7 +226,7 @@ struct NavigationButton: View {
     var icon: String
     var showBadge: Bool
     var onClick: () -> Void
-    
+
     var body: some View {
         ZStack {
             Circle()
@@ -230,9 +235,9 @@ struct NavigationButton: View {
                     Circle()
                         .stroke(Color.black.opacity(0.2), lineWidth: 0.2)
                 )
-            
+
             Icon(source: icon, size: 16)
-            
+
             if showBadge {
                 BadgeDot(size: .small)
                     .offset(x: -2, y: -2)

package/ios/Popup/PopupDisplay.swift

@@ -46,8 +46,8 @@ public struct PopupDisplay: View {
                         .overlay(RoundedRectangle(cornerRadius: Radius.L).stroke(Colors.black01, lineWidth: 1))
                 }.foregroundColor(Colors.black20)
                     .background(Colors.black01.cornerRadius(15))
-                    .padding(.trailing, -Spacing.M )
-                    .padding(.top, -Spacing.M)
+                    .padding(.trailing, -11)
+                    .padding(.top, -11)
                     .zIndex(1)
                     .accessibility(identifier: "ic_popup_close")
 

package/ios/Swipeable/SwipeCell.swift

@@ -10,9 +10,9 @@ public struct SwipeCellModifier: ViewModifier {
     var trailingSideGroup: [SwipeCellActionItem] = []
     @Binding var currentUserInteractionCellID: String?
     var settings: SwipeCellSettings = .init()
-    
+
     @State private var offsetX: CGFloat = 0
-    
+
     let generator = UINotificationFeedbackGenerator()
     @State private var hapticFeedbackOccurred: Bool = false
     @State private var openSideLock: SwipeGroupSide?
@@ -22,15 +22,23 @@ public struct SwipeCellModifier: ViewModifier {
             if self.leadingSideGroup.isEmpty == false && self.offsetX != 0 {
                 self.swipeToRevealArea(swipeItemGroup: self.leadingSideGroup, side: .leading)
             }
-                
+
             if self.trailingSideGroup.isEmpty == false && self.offsetX != 0 {
                 self.swipeToRevealArea(swipeItemGroup: self.trailingSideGroup, side: .trailing)
             }
-                
+
             content
                 .offset(x: self.offsetX)
-                .gesture(DragGesture(minimumDistance: 30, coordinateSpace: .local).onChanged(self.dragOnChanged(value:)).onEnded(dragOnEnded(value:)))
-                    
+                .simultaneousGesture(
+                    DragGesture(minimumDistance: 30, coordinateSpace: .local)
+                        .onChanged { value in
+                            self.dragOnChanged(value: value)
+                        }
+                        .onEnded { value in
+                            self.dragOnEnded(value: value)
+                        }
+                )
+
         }.frame(width: cellWidth)
             .edgesIgnoringSafeArea(.horizontal)
             .clipped()
@@ -43,7 +51,7 @@ public struct SwipeCellModifier: ViewModifier {
                 }
             }
     }
-    
+
     internal func swipeToRevealArea(swipeItemGroup: [SwipeCellActionItem], side: SwipeGroupSide)->some View {
         HStack {
             if side == .trailing {
@@ -63,17 +71,17 @@ public struct SwipeCellModifier: ViewModifier {
                     }
                 }
             }.opacity(self.swipeRevealAreaOpacity(side: side))
-    
+
             if side == .leading {
                 Spacer()
             }
         }
     }
-    
+
     internal func buttonContentView(item: SwipeCellActionItem, group: [SwipeCellActionItem], side: SwipeGroupSide)->some View {
         ZStack {
             item.backgroundColor
-                
+
             HStack {
                 if self.warnSwipeOutCondition(side: side, hasSwipeOut: item.swipeOutAction) && item.swipeOutButtonView != nil {
                     item.swipeOutButtonView!()
@@ -81,28 +89,28 @@ public struct SwipeCellModifier: ViewModifier {
                     item.buttonView()
                 }
             }
-        
+
         }.frame(width: self.itemButtonWidth(item: item, itemGroup: group, side: side))
     }
-    
+
     internal func menuWidth(side: SwipeGroupSide)->CGFloat {
         switch side {
         case .leading:
             return self.leadingSideGroup.map { $0.buttonWidth }.reduce(0, +)
-          
+
         case .trailing:
             return self.trailingSideGroup.map { $0.buttonWidth }.reduce(0, +)
         }
     }
-    
+
     // MARK: drag gesture
-    
+
     internal func dragOnChanged(value: DragGesture.Value) {
         let horizontalTranslation = value.translation.width
         if self.nonDraggableCondition(horizontalTranslation: horizontalTranslation) {
             return
         }
-        
+
         if self.openSideLock != nil {
             // if one side is open, we need to add the menu width!
             let menuWidth = self.openSideLock == .leading ? self.menuWidth(side: .leading) : self.menuWidth(side: .trailing)
@@ -110,9 +118,9 @@ public struct SwipeCellModifier: ViewModifier {
             self.triggerHapticFeedbackIfNeeded(horizontalTranslation: horizontalTranslation)
             return
         }
-        
+
         self.triggerHapticFeedbackIfNeeded(horizontalTranslation: horizontalTranslation)
-        
+
         if horizontalTranslation > 8 || horizontalTranslation < -8 { // makes sure the swipe cell doesn't open too easily
             self.currentUserInteractionCellID = self.id
             self.offsetX = horizontalTranslation
@@ -120,11 +128,11 @@ public struct SwipeCellModifier: ViewModifier {
             self.offsetX = 0
         }
     }
-    
+
     internal func nonDraggableCondition(horizontalTranslation: CGFloat)->Bool {
         return self.offsetX == 0 && (self.leadingSideGroup.isEmpty && horizontalTranslation > 0 || self.trailingSideGroup.isEmpty && horizontalTranslation < 0)
     }
-    
+
     internal func dragOnEnded(value: DragGesture.Value) {
         let swipeOutTriggerValue = self.cellWidth * self.settings.swipeOutTriggerRatio
 
@@ -139,7 +147,7 @@ public struct SwipeCellModifier: ViewModifier {
                 } else {
                     self.lockSideMenu(side: .leading)
                 }
-                
+
             } else {
                 // leading group emtpy
                 self.setOffsetX(value: 0)
@@ -160,7 +168,7 @@ public struct SwipeCellModifier: ViewModifier {
             }
         }
     }
-    
+
     internal func triggerHapticFeedbackIfNeeded(horizontalTranslation: CGFloat) {
         let side: SwipeGroupSide = horizontalTranslation > 0 ? .leading : .trailing
         let group = side == .leading ? self.leadingSideGroup : self.trailingSideGroup
@@ -170,7 +178,7 @@ public struct SwipeCellModifier: ViewModifier {
             self.hapticFeedbackOccurred = true
         }
     }
-    
+
     internal func swipeOutItemWithHapticFeedback(group: [SwipeCellActionItem])->SwipeCellActionItem? {
         if let item = group.filter({ $0.swipeOutAction == true }).first {
             if item.swipeOutHapticFeedbackType != nil {
@@ -179,7 +187,7 @@ public struct SwipeCellModifier: ViewModifier {
         }
         return nil
     }
-    
+
     internal func swipeOutAction(item: SwipeCellActionItem, sideFactor: CGFloat) {
         if item.swipeOutIsDestructive {
             let swipeOutWidth = cellWidth + 10
@@ -188,12 +196,12 @@ public struct SwipeCellModifier: ViewModifier {
         } else {
             self.setOffsetX(value: 0) // open side lock set in function!
         }
-      
+
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
             item.actionCallback()
         }
     }
-    
+
     internal func lockSideMenu(side: SwipeGroupSide) {
         self.setOffsetX(value: side.sideFactor * self.menuWidth(side: side))
         self.openSideLock = side
@@ -214,7 +222,7 @@ public struct SwipeCellModifier: ViewModifier {
         let dynamicButtonWidth = self.dynamicButtonWidth(item: item, itemCount: itemGroup.count, side: side)
         let triggerValue = self.cellWidth * settings.swipeOutTriggerRatio
         let swipeOutActionCondition = side == .leading ? self.offsetX > triggerValue : self.offsetX < -triggerValue
-        
+
         if item.swipeOutAction && swipeOutActionCondition {
             return self.offsetX.magnitude + settings.addWidthMargin
         } else if swipeOutActionCondition && item.swipeOutAction == false && itemGroup.contains(where: { $0.swipeOutAction == true }) {
@@ -223,12 +231,12 @@ public struct SwipeCellModifier: ViewModifier {
             return dynamicButtonWidth
         }
     }
-    
+
     internal func dynamicButtonWidth(item: SwipeCellActionItem, itemCount: Int, side: SwipeGroupSide)->CGFloat {
         let menuWidth = self.menuWidth(side: side)
         return (self.offsetX.magnitude + settings.addWidthMargin) * (item.buttonWidth / menuWidth)
     }
-    
+
     internal func warnSwipeOutCondition(side: SwipeGroupSide, hasSwipeOut: Bool)->Bool {
         if hasSwipeOut == false {
             return false
@@ -236,11 +244,11 @@ public struct SwipeCellModifier: ViewModifier {
         let triggerValue = self.cellWidth * settings.swipeOutTriggerRatio
         return (side == .trailing && self.offsetX < -triggerValue) || (side == .leading && self.offsetX > triggerValue)
     }
-    
+
     internal func swipeRevealAreaOpacity(side: SwipeGroupSide)->Double {
         switch side {
         case .leading:
-        
+
             return self.offsetX > 5 ? 1 : 0
         case .trailing:
             return self.offsetX < -5 ? 1 : 0

package/ios/Template/TrustBanner/TrustBanner.swift

@@ -11,110 +11,179 @@ import SDWebImageSwiftUI
 
 let jsonUrl = "https://static.momocdn.net/app/json/component-kits/design_system.json"
 
-public struct TrustBannerData: Decodable {
-    let content: [String: String]
-    let subContent: [String: String]
+struct TrustBannerData: Decodable {
+    let trustBanner: TrustBanner
+}
+
+struct TrustBanner: Decodable {
+    let content: Dictionary<String, String>
     let pciImage: String
     let sslImage: String
     let urlConfig: String
+    let featureCode: String
     let icons: [String]
     let momoImage: String
-    
+
     enum CodingKeys: String, CodingKey {
-        case content
-        case subContent
-        case pciImage
-        case sslImage
-        case icons
-        case momoImage
+        case content, pciImage, sslImage, icons, momoImage
         case urlConfig = "url_config"
+        case featureCode = "feature_code"
     }
 }
 
-let defaultBanner = TrustBannerData(
-    content: ["vi": "An toàn tài sản & Bảo mật thông tin của bạn là ưu tiên hàng đầu của MoMo.",
-              "en": "Ensuring financial security and data privacy is MoMo's highest priority."],
-    subContent: [
-        "vi": "Tìm hiểu thêm",
-        "en": "Learn more"
-    ],
+let defaultBanner = TrustBanner(
+    content: ["vi": "Bảo mật thông tin & An toàn tài sản của bạn là ưu tiên hàng đầu của MoMo.",
+              "en": "Your data security and money safety are MoMo's top priorities."],
     pciImage: "https://static.momocdn.net/app/img/kits/trustBanner/pci.png",
     sslImage: "https://static.momocdn.net/app/img/kits/trustBanner/ssl.png",
-    urlConfig: "login_and_security",
+    urlConfig: "https://momo.vn/an-toan-bao-mat",
+    featureCode: "login_and_security",
     icons: [
         "https://static.momocdn.net/app/img/kits/trustBanner/ic_viettinbank.png",
         "https://static.momocdn.net/app/img/kits/trustBanner/ic_agribank.png",
         "https://static.momocdn.net/app/img/kits/trustBanner/ic_vietcombank.png",
         "https://static.momocdn.net/app/img/kits/trustBanner/ic_bidv.png"
     ],
-    momoImage: "https://static.momocdn.net/app/img/kits/trustBanner/ic_secu.png"
+    momoImage: "https://static.momocdn.net/app/img/kits/trustBanner/ic_momo_secu.png"
 )
 
-public struct TrustBanner: View {
-    @EnvironmentObject var applicationEnvironment: ApplicationEnvironment
-    
-    var onPress: ((String)->Void)?
-     
-    public init(onPress: ((String)->Void)?) {
+let defaultData = TrustBannerData(trustBanner: defaultBanner)
+
+class TrustBannerViewModel: ObservableObject {
+    @Published var trustBanner: TrustBannerData?
+
+    init() {
+        fetchData(from: jsonUrl)
+    }
+
+    func fetchData(from urlString: String) {
+        guard let url = URL(string: urlString) else { return }
+
+        URLSession.shared.dataTask(with: url) { [weak self] data, response, error in
+            guard let self = self else { return }
+
+            if let error = error {
+                print("Data fetching error: \(error)")
+                return
+            }
+
+            guard let data = data else {
+                print("No data received")
+                return
+            }
+            do {
+                let decodedData = try JSONDecoder().decode(TrustBannerData.self, from: data)
+                DispatchQueue.main.async {
+                    self.trustBanner = decodedData
+                }
+            } catch {
+                print("Decoding error: \(error)")
+            }
+        }.resume()
+    }
+}
+
+public struct TrustBannerView: View {
+    var serviceName: String? = ""
+    var screenName: String? = ""
+    var onPress: ((_ params: NSDictionary) -> Void)?
+    var trackEvent: ((_ eventName: String, _ params: NSDictionary) -> Void)?
+    var language: String?
+
+    @ObservedObject private var viewModel = TrustBannerViewModel()
+
+    public init(serviceName: String?,
+                screenName: String?,
+                onPress: ((_ params: NSDictionary) -> Void)?,
+                trackEvent: ((_ eventName: String,_ params: NSDictionary) -> Void)?, language: String? = "vi") {
+        if let trackEvent = trackEvent {
+            trackEvent("service_component_displayed", ["service_name": serviceName ?? "", "screen_name": screenName ?? "", "component_name": "logo_trust"])
+        }
         self.onPress = onPress
+        self.trackEvent = trackEvent
+        self.screenName = screenName
+        self.serviceName = serviceName
+        self.language = language
     }
-    
-    var language: String? = "vi"
-    
-    func onPressSecurity() {
-        if (onPress != nil) {
-            onPress!(applicationEnvironment.config?.trustBanner?.urlConfig ?? defaultBanner.urlConfig)
+
+    public var body: some View {
+        if let trustBanner = viewModel.trustBanner {
+            TrustBannerContentView(trustBanner: trustBanner.trustBanner, onPress: onPress, trackEvent: trackEvent, serviceName: serviceName, screenName: screenName, language: language)
         }
     }
+}
+
+struct TrustBannerContentView: View {
+    var trustBanner: TrustBanner
+    var onPress: ((_ params: NSDictionary) -> Void)?
+    var trackEvent: ((_ eventName: String, _ params: NSDictionary) -> Void)?
+    var serviceName: String?
+    var screenName: String?
+    var language: String?
     
-    
-    public var body: some View {
-        HStack(alignment: .center, spacing: 8) {
-            WebImage(url: URL(string: applicationEnvironment.config?.trustBanner?.momoImage ?? defaultBanner.momoImage))
-                .resizable()
-                .scaledToFit()
-                .frame(width: 64, height: 64)
-            VStack(alignment: .leading){
-                Text(applicationEnvironment.config?.trustBanner?.content[language ?? "vi"] as? String ?? defaultBanner.content[language ?? "vi"])
-                    .foregroundColor(Color(hex: "484848"))
-                    .lineLimit(2)
-                    .font(.system(size: 13, weight: Font.Weight.regular))
-                    .lineSpacing(3)
-                    .padding(.bottom, 8)
-                HStack {
-                    HStack(spacing: 0) {
-                        Text(applicationEnvironment.config?.trustBanner?.subContent[language ?? "vi"] as? String ?? defaultBanner.subContent[language ?? "vi"])
-                            .foregroundColor(Colors.pink03)
-                            .font(.system(size: 13, weight: .bold))
-                            .padding(.trailing, 4)
-                        
-                        Icon(source: "arrow_chevron_right_small", color: Colors.pink03)
-                    }.onTapGesture {
-                        onPressSecurity()
-                    }
-                    
-                    Spacer()
+    var body: some View {
+        GeometryReader { geo in
+            HStack(alignment: .center, spacing: 8) {
+                WebImage(url: URL(string: trustBanner.momoImage))
+                    .resizable()
+                    .scaledToFit()
+                    .frame(width: 64, height: 64)
+                VStack(alignment: .leading, spacing: 8){
+                    Text(trustBanner.content[language ?? "vi"] ?? "")
+                        .foregroundColor(Color(hex: 0xFF484848))
+                        .lineLimit(2)
+                        .font(.system(size: 12, weight: Font.Weight.regular))
+                        .frame(width: geo.size.width - 24 - 64 - 8, height: 40,alignment: .leading)
                     HStack{
-                        WebImage(url:  URL(string: applicationEnvironment.config?.trustBanner?.pciImage ?? defaultBanner.pciImage))
-                            .resizable()
-                            .scaledToFit()
-                            .frame(width: 24, height: 20)
-                        WebImage(url:  URL(string: applicationEnvironment.config?.trustBanner?.sslImage ?? defaultBanner.sslImage))
-                            .resizable()
-                            .scaledToFit()
-                            .frame(width: 52, height: 20)
+                        HStack{
+                            WebImage(url:  URL(string: trustBanner.pciImage))
+                                .resizable()
+                                .scaledToFit()
+                                .frame(width: 52, height: 20)
+                            WebImage(url:  URL(string: trustBanner.sslImage))
+                                .resizable()
+                                .scaledToFit()
+                                .frame(width: 52, height: 20)
+                        }
+                        Spacer()
+                        HStack(spacing: -6){
+                            ForEach(trustBanner.icons, id: \.self) { iconURL in
+                                WebImage(url: URL(string: iconURL))
+                                    .resizable()
+                                    .scaledToFit()
+                                    .frame(width:24, height: 24)
+                                    .background(Color.white)
+                                    .cornerRadius(12)
+                                    .overlay(
+                                        Circle().stroke(Color(hex: 0xFFE8E8E8), lineWidth: 1)
+                                    )
+                            }
+                            Text("36+")
+                                .font(.system(size: 10, weight: Font.Weight.regular))
+                                .frame(width: 24, height: 24, alignment: .center)
+                                .foregroundColor(Color(hex: 0xFFEB2F96))
+                                .background(Color(hex: 0xFFFDEAF4))
+                                .cornerRadius(12)
+                                .overlay(
+                                    Circle()
+                                        .stroke(Color(hex: 0xFFE8E8E8), lineWidth: 1)
+                                )
+                        }.frame(width: 96, height: 24)
                     }
                 }
-                
             }
-            
-        }
-        .padding(.all, 12)
-        .background(Color(hex: "F2F8FF"))
-        .cornerRadius(12)
-        .onTapGesture {
-            onPressSecurity()
+            .frame(width: geo.size.width - 24)
+            .padding(EdgeInsets(top: 12, leading: 12, bottom: 12, trailing: 12))
+            .background(Color(hex: 0xFFF2F8FF))
+            .cornerRadius(12)
+            .onTapGesture {
+                if let trackEvent = trackEvent {
+                    trackEvent("service_component_clicked", ["service_name": self.serviceName ?? "", "screen_name": self.screenName ?? "", "component_name": "logo_trust", "url_config": trustBanner.urlConfig])
+                }
+                if let onPress = onPress {
+                    onPress(["service_name": self.serviceName ?? "", "screen_name": self.screenName ?? "", "component_name": "logo_trust", "url_config": trustBanner.urlConfig, "feature_code": trustBanner.featureCode])
+                }
+            }
         }
-        .frame(maxWidth: UIScreen.main.bounds.size.width)
     }
 }

package/local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Apr 23 16:40:15 ICT 2024
-sdk.dir=/Users/hung.dao1/Library/Android/sdk
+#Thu Jan 09 10:43:10 ICT 2025
+sdk.dir=/Users/sophia/Library/Android/sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.113.3-beta.7",
+  "version": "0.113.3-pu.1",
   "private": false,
   "dependencies": {},
   "devDependencies": {},