@momo-kits/native-kits 0.113.1-beta.8 → 0.113.1-beta.9

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

@@ -86,13 +86,6 @@ fun Header(
         )
     )
 
-    fun getHeaderRightOpacity(): Float {
-        if (useAnimationSearch) {
-            return 1f - (opacity ?: 1f)
-        }
-        return if (animatedHeader !== null) opacity ?: 1f else 1f
-    }
-
     if (headerType != HeaderType.NONE) {
         BoxWithConstraints(
             Modifier.height(statusBarHeight + 52.dp)
@@ -141,7 +134,7 @@ fun Header(
 
                 if (((useAnimationSearch && inputSearchProps != null) || inputSearchProps == null) && miniAppContext != null) {
                     Box(Modifier.graphicsLayer {
-                        alpha = getHeaderRightOpacity()
+                        alpha = if (useAnimationSearch) 1f - (opacity ?: 1f) else 1f
                     }) {
                         headerRight?.invoke()
                     }

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

@@ -25,7 +25,7 @@ import vn.momo.kits.const.Typography
 fun CheckBox(
     disabled: Boolean = false,
     checked: Boolean = false,
-    onCheckedChange: () -> Unit,
+    onCheckedChange: (Boolean) -> Unit,
     indeterminate: Boolean = false,
     title: String = "",
 ) {
@@ -53,7 +53,7 @@ fun CheckBox(
                 .background(backgroundColor, RoundedCornerShape(Radius.XS))
                 .border(Spacing.XXS, borderColor, RoundedCornerShape(Radius.XS))
                 .clickable(
-                    onClick = onCheckedChange,
+                    onClick = { onCheckedChange(!checked) },
                     enabled = !disabled,
                 ),
         ) {

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

@@ -115,7 +115,7 @@ fun PopupNotify(
             )
 
             Column(modifier = Modifier.padding(Spacing.XL)) {
-                Text(style = Typography.titleXs, maxLines = 1, text = title)
+                Text(style = Typography.titleXs, maxLines = 2, text = title)
                 content(Modifier.padding(top = Spacing.S))
                 if (error.isNotEmpty()) {
                     Text(

package/ios/Application/ApplicationEnvironment.swift

@@ -23,22 +23,12 @@ public class MiniAppContext {
     }
 }
 
-public struct Config: Decodable {
-    public let trustBanner: TrustBanner?
-    
-    enum CodingKeys: String, CodingKey {
-        case trustBanner = "trust_banner"
-    }
-}
-
 public class ApplicationEnvironment: ObservableObject {
     let applicationContext: MiniAppContext?
     let composeApi: KitComposeApi
-    @Published public var config: Config?
     
-    public init(applicationContext: MiniAppContext?, composeApi: KitComposeApi, config: Config? = nil) {
+    public init(applicationContext: MiniAppContext?, composeApi: KitComposeApi) {
         self.applicationContext = applicationContext
         self.composeApi = composeApi
-        self.config = config
     }
 }

package/ios/Button/Button.swift

@@ -98,9 +98,8 @@ private extension View {
         case .secondary:
             return AnyView(self
                 .background(Colors.card)
-                .foregroundColor(Colors.text)
+                .foregroundColor(Colors.primary)
                 .cornerRadius(8)
-                .overlay(RoundedRectangle(cornerRadius: Radius.S).stroke(Colors.black06, lineWidth: 1))
                 .padding(2)
             )
         case .outline:

package/ios/Popup/PopupDisplay.swift

@@ -43,6 +43,7 @@ public struct PopupDisplay: View {
                     Image(systemName: "xmark.circle.fill")
                         .resizable()
                         .frame(width: 16, height: 16)
+                        .overlay(RoundedRectangle(cornerRadius: Radius.S).stroke(Colors.black01, lineWidth: 1))
                 }.foregroundColor(Colors.black20)
                     .background(Colors.black01.cornerRadius(8))
                     .offset(x: 6, y: -6)
@@ -52,15 +53,17 @@ public struct PopupDisplay: View {
                     WebImage(url: URL(string: url), isAnimating: .constant(true))
                         .resizable()
                         .scaledToFill()
-                        .frame(maxWidth: .infinity, maxHeight: 164)
+                        .frame(maxWidth: .infinity)
                         .clipShape(RoundedCorner(radius: 8, corners: [.topLeft, .topRight]))
+                        .aspectRatio(2, contentMode: .fit)
 
                     VStack(alignment: .leading) {
                         Text(title)
                             .foregroundColor(.black)
-                            .font(.headerText1)
-                            .padding(.top, 12)
-                            .padding(.bottom, 24)
+                            .font(.header_default_bold)
+                            .padding(.top, 16)
+                            .padding(.bottom, 8)
+                            .lineLimit(2)
 
                         Text(description)
                             .foregroundColor(.black)
@@ -87,10 +90,8 @@ public struct PopupDisplay: View {
                 }.clipped()
             }
         }
-        .background(Color.white.cornerRadius(8))
-        .shadow(color: .black.opacity(0.08), radius: 2, x: 0, y: 0)
-        .shadow(color: .black.opacity(0.16), radius: 24, x: 0, y: 0)
-        .padding(.horizontal, 40)
+        .background(Color.white.cornerRadius(15))
+        .padding(.horizontal, 24)
     }
 
     // MARK: Internal
@@ -106,7 +107,7 @@ public struct PopupDisplay: View {
     var onClose: () -> Void
     var actionButtonTitle: String
     var closeButtonTitle: String
-
+    
     var RowTextButtons: some View {
         HStack {
             SwiftUI.Button(action: onPressCloseButton) {
@@ -143,8 +144,8 @@ public struct PopupDisplay: View {
 
     var RowButtons: some View {
         HStack {
-            Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary)
-            Button(title: actionButtonTitle, action: onPressAction)
+            Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary, size: .medium)
+            Button(title: actionButtonTitle, action: onPressAction, size: .medium)
         }
         .frame(maxWidth: .infinity, alignment: .center)
         .padding(.horizontal, 24)
@@ -153,8 +154,12 @@ public struct PopupDisplay: View {
 
     var ColumnButtons: some View {
         VStack(alignment: .trailing) {
-            Button(title: actionButtonTitle, action: onPressAction)
-            Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary)
+            Button(
+                title: actionButtonTitle,
+                action: onPressAction,
+                size: .medium
+            )
+            Button(title: closeButtonTitle, action: onPressCloseButton, type: .secondary, size: .medium)
         }
         .frame(maxWidth: .infinity, alignment: .trailing)
         .padding(.horizontal, 24)

package/ios/Template/TrustBanner/TrustBanner.swift

@@ -9,9 +9,14 @@ import Foundation
 import SwiftUI
 import SDWebImageSwiftUI
 
-public struct TrustBanner: Decodable {
+let jsonUrl = "https://static.momocdn.net/app/json/component-kits/design_system.json"
+
+struct TrustBannerData: Decodable {
+    let trustBanner: TrustBanner
+}
+
+struct TrustBanner: Decodable {
     let content: Dictionary<String, String>
-    let subContent: Dictionary<String, String>
     let pciImage: String
     let sslImage: String
     let urlConfig: String
@@ -20,20 +25,18 @@ public struct TrustBanner: Decodable {
     let momoImage: String
 
     enum CodingKeys: String, CodingKey {
-        case content, subContent, pciImage, sslImage, icons, momoImage
+        case content, pciImage, sslImage, icons, momoImage
         case urlConfig = "url_config"
         case featureCode = "feature_code"
     }
 }
 
 let defaultBanner = TrustBanner(
-    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"],
-    pciImage: "https://static.momocdn.net/app/img/kits/trustBanner/pci_dss.png",
+    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",
@@ -41,23 +44,58 @@ let defaultBanner = TrustBanner(
         "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"
 )
 
+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?
-    
-    @EnvironmentObject private var environment: ApplicationEnvironment
+
+    @ObservedObject private var viewModel = TrustBannerViewModel()
 
     public init(serviceName: String?,
                 screenName: String?,
                 onPress: ((_ params: NSDictionary) -> Void)?,
-                trackEvent: ((_ eventName: String,_ params: NSDictionary) -> Void)?, 
-                language: String? = "vi") {
+                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"])
         }
@@ -69,15 +107,9 @@ public struct TrustBannerView: View {
     }
 
     public var body: some View {
-        let trustBanner = environment.config?.trustBanner ?? defaultBanner
-        TrustBannerContentView(
-            trustBanner: trustBanner,
-            onPress: onPress,
-            trackEvent: trackEvent,
-            serviceName: serviceName,
-            screenName: screenName,
-            language: language
-        )
+        if let trustBanner = viewModel.trustBanner {
+            TrustBannerContentView(trustBanner: trustBanner.trustBanner, onPress: onPress, trackEvent: trackEvent, serviceName: serviceName, screenName: screenName, language: language)
+        }
     }
 }
 
@@ -96,47 +128,52 @@ struct TrustBannerContentView: View {
                     .resizable()
                     .scaledToFit()
                     .frame(width: 64, height: 64)
-                VStack(alignment: .leading, spacing: 8) {
+                VStack(alignment: .leading, spacing: 8){
                     Text(trustBanner.content[language ?? "vi"] ?? "")
                         .foregroundColor(Color(hex: 0xFF484848))
                         .lineLimit(2)
-                        .font(.system(size: 12))
-                        .frame(maxWidth: .infinity, alignment: .leading)
-                    
-                    HStack {
-                        HStack(spacing: 2) {
-                            Text(trustBanner.subContent[language ?? "vi"] ?? "")
-                                .foregroundColor(Color(hex: 0xFFEB2F96))
-                                .font(.system(size: 12))
-                            
-                            WebImage(url: URL(string: "https://img.mservice.io/momo_app_v2/new_version/img/appx_icon/16_arrow_chevron_right_small.png"))
+                        .font(.system(size: 12, weight: Font.Weight.regular))
+                        .frame(width: geo.size.width - 24 - 64 - 8, height: 40,alignment: .leading)
+                    HStack{
+                        HStack{
+                            WebImage(url:  URL(string: trustBanner.pciImage))
                                 .resizable()
-                                .renderingMode(.template)
-                                .foregroundColor(Color(hex: 0xFFEB2F96))
-                                .frame(width: 16, height: 16)
+                                .scaledToFit()
+                                .frame(width: 52, height: 20)
+                            WebImage(url:  URL(string: trustBanner.sslImage))
+                                .resizable()
+                                .scaledToFit()
+                                .frame(width: 52, height: 20)
                         }
-                        
                         Spacer()
-                        
-                        HStack(spacing: 4) {
-                            if let pciUrl = URL(string: trustBanner.pciImage) {
-                                WebImage(url: pciUrl)
+                        HStack(spacing: -6){
+                            ForEach(trustBanner.icons, id: \.self) { iconURL in
+                                WebImage(url: URL(string: iconURL))
                                     .resizable()
                                     .scaledToFit()
-                                    .frame(width: 27, height: 20)
+                                    .frame(width:24, height: 24)
+                                    .background(Color.white)
+                                    .cornerRadius(12)
+                                    .overlay(
+                                        Circle().stroke(Color(hex: 0xFFE8E8E8), lineWidth: 1)
+                                    )
                             }
-                            
-                            if let sslUrl = URL(string: trustBanner.sslImage) {
-                                WebImage(url: sslUrl)
-                                    .resizable()
-                                    .scaledToFit()
-                                    .frame(width: 52, height: 20)
-                            }
-                        }
+                            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(12)
+            .frame(width: geo.size.width - 24)
+            .padding(EdgeInsets(top: 12, leading: 12, bottom: 12, trailing: 12))
             .background(Color(hex: 0xFFF2F8FF))
             .cornerRadius(12)
             .onTapGesture {
@@ -144,7 +181,7 @@ struct TrustBannerContentView: View {
                     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 ?? "", "url_config": trustBanner.urlConfig])
+                    onPress(["service_name": self.serviceName ?? "", "screen_name": self.screenName ?? "", "component_name": "logo_trust", "url_config": trustBanner.urlConfig, "feature_code": trustBanner.featureCode])
                 }
             }
         }

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.1-beta.8",
+  "version": "0.113.1-beta.9",
   "private": false,
   "dependencies": {},
   "devDependencies": {},