@momo-kits/native-kits 0.162.2-beta.26-debug → 0.162.2-beta.27-debug

package/ios/Input/InputPhoneNumber.swift

@@ -7,17 +7,15 @@
 
 import SwiftUI
 public struct InputPhoneNumber: View {
-    @Environment(\.appTheme) private var theme
     @Binding public var text: String
     
     public var placeholder: String
     public var size: InputSize
     public var hintText: String
     public var error: String
-    public var errorSpacing: Bool
     public var loading: Bool
     public var rightIcon: String
-    public var rightIconColor: Color?
+    public var rightIconColor: Color
     public var autofocus: Bool
     public var onChangeText: ((String) -> Void)?
     public var onFocus: (() -> Void)?
@@ -33,11 +31,10 @@ public struct InputPhoneNumber: View {
         size: InputSize = .small,
         hintText: String = "",
         error: String = "",
-        errorSpacing: Bool = false,
         loading: Bool = false,
         required: Bool = false,
         rightIcon: String = "",
-        rightIconColor: Color? = nil,
+        rightIconColor: Color = Colors.black12,
         autofocus: Bool = false,
         onChangeText: ((String) -> Void)? = nil,
         onFocus: (() -> Void)? = nil,
@@ -50,7 +47,6 @@ public struct InputPhoneNumber: View {
         self.size = size
         self.hintText = hintText
         self.error = error
-        self.errorSpacing = errorSpacing
         self.loading = loading
         self.rightIcon = rightIcon
         self.rightIconColor = rightIconColor
@@ -80,17 +76,17 @@ public struct InputPhoneNumber: View {
                     .padding(.trailing, Spacing.XS)
                 
                 MomoText("+84", typography: size == .small ? .headerSSemibold : .headerMBold)
-                    .foregroundColor(theme.colors.text.default)
+                    .foregroundColor(Colors.black17)
                 
                 Rectangle()
-                    .fill(theme.colors.border.default)
+                    .fill(Colors.black04)
                     .frame(width: 1, height: size == .small ? 24 : 32)
                     .padding(.horizontal, Spacing.M)
                 
                 // Text input
                 ZStack(alignment: .leading) {
                     if text.isEmpty {
-                        MomoText(placeholder, typography: size == .small ? .headerSSemibold : .headerMBold, color: theme.colors.text.hint)
+                        MomoText(placeholder, typography: size == .small ? .headerSSemibold : .headerMBold, color: Colors.black12)
                     }
                     
                     TextField("", text: textBinding, onEditingChanged: { focused in
@@ -99,8 +95,8 @@ public struct InputPhoneNumber: View {
                     .keyboardType(.numberPad)
                     .font(size == .small ? .header_s_semibold : .header_m_bold)
                     .ignoreBoldTextSetting()
-                    .foregroundColor(theme.colors.text.default)
-                    .applyCursorColor(theme.colors.primary)
+                    .foregroundColor(Colors.black17)
+                    .applyPrimaryCursorColor()
                     .lineLimit(1)
                     .accessibility(identifier: accessibilityLabel ?? "")
                     .accessibilityValue(textBinding.wrappedValue.isEmpty ? placeholder : textBinding.wrappedValue)
@@ -112,7 +108,7 @@ public struct InputPhoneNumber: View {
                         text = ""
                         onChangeText?("")
                     }) {
-                        Icon(source: "24_navigation_close_circle_full", size: 16, color: theme.colors.text.hint)
+                        Icon(source: "24_navigation_close_circle_full", size: 16, color: Colors.black12)
                             .padding(.leading, Spacing.S).accessibility(identifier: "ic_clear")
                     }
                 }
@@ -126,7 +122,7 @@ public struct InputPhoneNumber: View {
                 // ✅ Right icon
                 if !rightIcon.isEmpty {
                     SwiftUI.Button(action: { onRightIconPressed?() }) {
-                        Icon(source: rightIcon, size: 24, color: rightIconColor ?? theme.colors.text.default)
+                        Icon(source: rightIcon, size: 24, color: rightIconColor)
                             .padding(.leading, Spacing.S)
                     }
                 }
@@ -135,7 +131,7 @@ public struct InputPhoneNumber: View {
             .frame(height: scaleSize(size == .small ? 48 : 56, 1.1))
             .background(
                 RoundedRectangle(cornerRadius: Radius.S)
-                    .fill(theme.colors.background.surface)
+                    .fill(Colors.black01)
             )
             .overlay(
                 RoundedRectangle(cornerRadius: Radius.S)
@@ -145,7 +141,7 @@ public struct InputPhoneNumber: View {
             // Error or hint
             ErrorView(
                 errorMessage: error,
-                errorSpacing: errorSpacing,
+                errorSpacing: false,
                 hintText: hintText
             )
         }
@@ -163,18 +159,21 @@ public struct InputPhoneNumber: View {
     }
     
     private func borderColor() -> Color {
-        if !error.isEmpty { return theme.colors.error.primary }
-        if isFocused { return theme.colors.primary }
-        return theme.colors.border.default
+        if !error.isEmpty { return Colors.red03 }
+        if isFocused { return Colors.primary }
+        return Colors.black04
     }
 }
 
 private extension View {
-    func applyCursorColor(_ color: Color) -> some View {
+    func applyPrimaryCursorColor() -> some View {
         if #available(iOS 15.0, *) {
-            return self.tint(color)
+            // Modern SwiftUI: use .tint() for cursor
+            return self.tint(Colors.primary)
         } else {
+            // iOS 13–14: return unchanged (no tint support)
             return self
         }
     }
 }
+

package/ios/Input/InputSearch.swift

@@ -9,12 +9,11 @@ import SwiftUI
 // MARK: - RenderRightIconSearch
 
 struct RenderRightIconSearch: View {
-    @Environment(\.appTheme) private var theme
     let loading: Bool
     let icon: String
     let color: Color
     let onClick: () -> Void
-
+    
     var body: some View {
         HStack(spacing: 0) {
             if loading {
@@ -25,10 +24,12 @@ struct RenderRightIconSearch: View {
             if !icon.isEmpty {
                 Divider()
                     .frame(width: 1)
-                    .background(theme.colors.primary)
+                    .background(Colors.primary)
                     .padding(.leading, Spacing.S)
                 
-                Icon(source: icon, size: 24, color: color)
+                Image(systemName: icon)
+                    .foregroundColor(color)
+                    .frame(width: 24, height: 24)
                     .padding(.leading, Spacing.S)
                     .onTapGesture(perform: onClick)
             }
@@ -47,18 +48,14 @@ public struct InputSearchProps {
     var error: String = ""
     var disabled: Bool = false
     var icon: String = ""
-    var iconColor: Color? = nil
+    var iconColor: Color = Colors.text
     var onRightIconPressed: () -> Void = {}
     var onFocus: () -> Void = {}
     var onBlur: () -> Void = {}
     var loading: Bool = false
     var fontWeight: Font.Weight = .regular
     var keyboardType: UIKeyboardType = .default
-    // Mirrors Compose's InputSearchProps.searchIcon — a custom leading icon view.
-    var searchIcon: (() -> AnyView)? = nil
-    // Mirrors Compose's InputSearchProps.placeholderCustomRender — a custom placeholder view.
-    var placeholderCustomRender: (() -> AnyView)? = nil
-
+    
     public init(text: Binding<String>,
                 buttonText: String = "",
                 showButtonText: Bool = false,
@@ -69,15 +66,13 @@ public struct InputSearchProps {
                 error: String = "",
                 disabled: Bool = false,
                 icon: String = "",
-                iconColor: Color? = nil,
+                iconColor: Color = Colors.text,
                 onRightIconPressed: @escaping () -> Void = {},
                 onFocus: @escaping () -> Void = {},
                 onBlur: @escaping () -> Void = {},
                 loading: Bool = false,
                 fontWeight: Font.Weight = .regular,
-                keyboardType: UIKeyboardType = .default,
-                searchIcon: (() -> AnyView)? = nil,
-                placeholderCustomRender: (() -> AnyView)? = nil) {
+                keyboardType: UIKeyboardType = .default) {
         self._text = text
         self.buttonText = buttonText
         self.showButtonText = showButtonText
@@ -95,15 +90,12 @@ public struct InputSearchProps {
         self.loading = loading
         self.fontWeight = fontWeight
         self.keyboardType = keyboardType
-        self.searchIcon = searchIcon
-        self.placeholderCustomRender = placeholderCustomRender
         }
 }
 
 // MARK: - InputSearch
 
 public struct InputSearch: View {
-    @Environment(\.appTheme) private var theme
     @Binding var text: String
     var buttonText: String = ""
     var showButtonText: Bool = false
@@ -114,19 +106,17 @@ public struct InputSearch: View {
     var error: String = ""
     var disabled: Bool = false
     var icon: String = ""
-    var iconColor: Color? = nil
+    var iconColor: Color = Colors.text
     var onRightIconPressed: () -> Void = {}
     var onFocus: () -> Void = {}
     var onBlur: () -> Void = {}
     var loading: Bool = false
     var fontWeight: Font.Weight = .regular
     var keyboardType: UIKeyboardType = .default
-    var searchIcon: (() -> AnyView)? = nil
-    var placeholderCustomRender: (() -> AnyView)? = nil
-
+    
     @State private var isFocused = false
     @State private var isBlurred = false
-
+    
     public init(text: Binding<String>,
                 buttonText: String = "",
                 showButtonText: Bool = false,
@@ -137,15 +127,13 @@ public struct InputSearch: View {
                 error: String = "",
                 disabled: Bool = false,
                 icon: String = "",
-                iconColor: Color? = nil,
+                iconColor: Color = Colors.text,
                 onRightIconPressed: @escaping () -> Void = {},
                 onFocus: @escaping () -> Void = {},
                 onBlur: @escaping () -> Void = {},
                 loading: Bool = false,
                 fontWeight: Font.Weight = .regular,
-                keyboardType: UIKeyboardType = .default,
-                searchIcon: (() -> AnyView)? = nil,
-                placeholderCustomRender: (() -> AnyView)? = nil) {
+                keyboardType: UIKeyboardType = .default) {
         self._text = text
         self.buttonText = buttonText
         self.showButtonText = showButtonText
@@ -163,60 +151,24 @@ public struct InputSearch: View {
         self.loading = loading
         self.fontWeight = fontWeight
         self.keyboardType = keyboardType
-        self.searchIcon = searchIcon
-        self.placeholderCustomRender = placeholderCustomRender
         }
 
-    /// Convenience initializer mirroring Compose's `InputSearch(inputSearchProps)`.
-    public init(props: InputSearchProps) {
-        self.init(
-            text: props.$text,
-            buttonText: props.buttonText,
-            showButtonText: props.showButtonText,
-            showBorder: props.showBorder,
-            placeholder: props.placeholder,
-            onChangeText: props.onChangeText,
-            onPressButtonText: props.onPressButtonText,
-            error: props.error,
-            disabled: props.disabled,
-            icon: props.icon,
-            iconColor: props.iconColor,
-            onRightIconPressed: props.onRightIconPressed,
-            onFocus: props.onFocus,
-            onBlur: props.onBlur,
-            loading: props.loading,
-            fontWeight: props.fontWeight,
-            keyboardType: props.keyboardType,
-            searchIcon: props.searchIcon,
-            placeholderCustomRender: props.placeholderCustomRender
-        )
-    }
-
-
+    
     public var body: some View {
-        let iconColor: Color = disabled ? theme.colors.text.disable : (self.iconColor ?? theme.colors.text.default)
         VStack(alignment: .leading, spacing: 0) {
             HStack(spacing: 0) {
                 HStack {
-                    if let searchIcon = searchIcon {
-                        searchIcon()
-                    } else {
-                        Image(systemName: "magnifyingglass")
-                            .foregroundColor(theme.colors.text.hint)
-                            .frame(width: 24, height: 24)
-                            .padding(.trailing, Spacing.XS)
-                    }
-
+                    Image(systemName: "magnifyingglass")
+                        .foregroundColor(Colors.black12)
+                        .frame(width: 24, height: 24)
+                        .padding(.trailing, Spacing.XS)
+                    
                     ZStack(alignment: .leading) {
                         if text.isEmpty {
-                            if let placeholderCustomRender = placeholderCustomRender {
-                                placeholderCustomRender()
-                            } else {
-                                Text(placeholder)
-                                    .foregroundColor(disabled ? theme.colors.text.disable : theme.colors.text.hint)
-                                    .font(.system(size: scaleSize(14), weight: fontWeight))
-                                    .ignoreBoldTextSetting()
-                            }
+                            Text(placeholder)
+                                .foregroundColor(disabled ? Colors.black08 : Colors.black12)
+                                .font(.system(size: 16, weight: fontWeight))
+                                .ignoreBoldTextSetting()
                         }
                         TextField("", text: $text, onEditingChanged: { editing in
                             isFocused = editing
@@ -230,27 +182,26 @@ public struct InputSearch: View {
                             }
                         }, onCommit: {})
                         .disabled(disabled)
-                        .foregroundColor(disabled ? theme.colors.text.disable : theme.colors.text.default)
-                        .font(.system(size: scaleSize(14), weight: fontWeight))
+                        .foregroundColor(disabled ? Colors.black08 : Colors.black17)
+                        .font(.system(size: 15, weight: fontWeight))
                         .ignoreBoldTextSetting()
                         .keyboardType(keyboardType)
-                        .applyCursorColor(theme.colors.primary)
                     }
                     
                     if isFocused && !text.isEmpty {
                         SwiftButton(action: { text = "" }) {
                             Image(systemName: "xmark.circle.fill")
-                                .foregroundColor(theme.colors.text.hint)
+                                .foregroundColor(Colors.black12)
                                 .frame(width: 16, height: 16)
                         }
                         .padding(.leading, Spacing.S)
                     }
                     
-                    RenderRightIconSearch(loading: loading, icon: icon, color: iconColor, onClick: onRightIconPressed)
+                    RenderRightIconSearch(loading: loading, icon: icon, color: disabled ? Colors.black08 : iconColor, onClick: onRightIconPressed)
                 }
                 .padding(.horizontal, Spacing.M)
                 .padding(.vertical, Spacing.S)
-                .background(theme.colors.background.surface)
+                .background(Colors.black01)
                 .cornerRadius(Radius.XL)
                 .overlay(
                     RoundedRectangle(cornerRadius: Radius.XL)
@@ -260,35 +211,31 @@ public struct InputSearch: View {
                 
                 if showButtonText {
                     SwiftButton(action: onPressButtonText) {
-                        MomoText(buttonText, typography: .actionDefaultBold, color: theme.colors.text.default)
+                        Text(buttonText)
+                            .foregroundColor(Colors.black17)
+                            .font(.system(size: 14, weight: .medium))
+                            .ignoreBoldTextSetting()
                     }
                     .padding(.leading, Spacing.L)
                 }
             }
         }
     }
-
-    // MARK: - Helper Functions
-
-    func getBorderColor(isFocused: Bool, error: String, disabled: Bool) -> Color {
-        if disabled {
-            return theme.colors.border.disable
-        } else if !error.isEmpty {
-            return theme.colors.error.primary
-        } else if isFocused {
-            return theme.colors.primary
-        } else {
-            return theme.colors.border.default
-        }
-    }
 }
 
-private extension View {
-    func applyCursorColor(_ color: Color) -> some View {
-        if #available(iOS 15.0, *) {
-            return self.tint(color)
-        } else {
-            return self
-        }
+// MARK: - Helper Functions
+
+func getBorderColor(isFocused: Bool, error: String, disabled: Bool) -> Color {
+    if disabled {
+        return Colors.black08
+    } else if !error.isEmpty {
+        return Colors.red03
+    } else if isFocused {
+        return Colors.primary
+    } else {
+        return Colors.black04
     }
 }
+
+
+

package/ios/Input/InputTextArea.swift

@@ -12,12 +12,6 @@ public let DEFAULT_HEIGHT: CGFloat = 104
 
 struct UITextViewWrapper: UIViewRepresentable {
     @Binding var text: String
-    var maxLength: Int
-    var textColor: Color
-    var cursorColor: Color
-    var fontWeight: Font.Weight
-    var disabled: Bool
-    var onChangeText: (String) -> Void
     var onDone: (() -> Void)?
     var onFocus: (() -> Void)?
     var onBlur: (() -> Void)?
@@ -25,20 +19,11 @@ struct UITextViewWrapper: UIViewRepresentable {
     func makeUIView(context: Context) -> UITextView {
         let textView = UITextView()
         textView.delegate = context.coordinator
-        textView.backgroundColor = .clear
-        textView.textContainerInset = .zero
-        textView.textContainer.lineFragmentPadding = 0
         return textView
     }
     
     func updateUIView(_ uiView: UITextView, context: Context) {
-        if uiView.text != text {
-            uiView.text = text
-        }
-        uiView.textColor = UIColor(textColor)
-        uiView.tintColor = UIColor(cursorColor)
-        uiView.font = UIFont.systemFont(ofSize: scaleSize(16), weight: fontWeight == .bold ? .bold : .regular)
-        uiView.isEditable = !disabled
+        uiView.text = text
     }
     
     func makeCoordinator() -> Coordinator {
@@ -53,12 +38,7 @@ struct UITextViewWrapper: UIViewRepresentable {
         }
         
         func textViewDidChange(_ textView: UITextView) {
-            let limited = String(textView.text.prefix(parent.maxLength))
-            if textView.text != limited {
-                textView.text = limited
-            }
-            parent.text = limited
-            parent.onChangeText(limited)
+            parent.text = textView.text
         }
         
         func textViewDidBeginEditing(_ textView: UITextView) {
@@ -74,31 +54,27 @@ struct UITextViewWrapper: UIViewRepresentable {
                 parent.onDone?()
                 return false
             }
-            let current = textView.text ?? ""
-            guard let range = Range(range, in: current) else { return false }
-            let proposed = current.replacingCharacters(in: range, with: text)
-            return proposed.count <= parent.maxLength
+            return true
         }
     }
 }
 
 // Make the struct public
 public struct InputTextArea: View {
-    @Environment(\.appTheme) private var theme
     @Binding var text: String
     var maxLength: Int = MAX_LENGTH
     var height: CGFloat = DEFAULT_HEIGHT
     var floatingValue: String = ""
-    var floatingValueColor: Color?
+    var floatingValueColor: Color = .gray
     var floatingIcon: String = ""
-    var floatingIconColor: Color?
+    var floatingIconColor: Color = .black
     var placeholder: String = ""
     var onChangeText: (String) -> Void = { _ in }
     var error: String = ""
     var errorSpacing: Bool = false
     var disabled: Bool = false
     var icon: String = ""
-    var iconColor: Color?
+    var iconColor: Color = .black
     var onRightIconPressed: () -> Void = {}
     var onFocus: () -> Void = {}
     var onBlur: () -> Void = {}
@@ -116,16 +92,16 @@ public struct InputTextArea: View {
         maxLength: Int = MAX_LENGTH,
         height: CGFloat = DEFAULT_HEIGHT,
         floatingValue: String = "",
-        floatingValueColor: Color? = nil,
+        floatingValueColor: Color = .gray,
         floatingIcon: String = "",
-        floatingIconColor: Color? = nil,
+        floatingIconColor: Color = .black,
         placeholder: String = "",
         onChangeText: @escaping (String) -> Void = { _ in },
         error: String = "",
         errorSpacing: Bool = false,
         disabled: Bool = false,
         icon: String = "",
-        iconColor: Color? = nil,
+        iconColor: Color = Colors.pink03,
         onRightIconPressed: @escaping () -> Void = {},
         onFocus: @escaping () -> Void = {},
         onBlur: @escaping () -> Void = {},
@@ -162,27 +138,24 @@ public struct InputTextArea: View {
                     ZStack(alignment: .topLeading) {
                         if !floatingValue.isEmpty || !floatingIcon.isEmpty {
                             HStack(spacing: 4) {
-                                MomoText(
-                                    floatingValue,
-                                    typography: .labelSMedium,
-                                    color: disabled ? theme.colors.text.disable : (floatingValueColor ?? theme.colors.text.hint)
-                                )
+                                Text(floatingValue)
+                                    .font(.caption)
+                                    .foregroundColor(disabled ? .gray : floatingValueColor)
                                 
                                 if required {
-                                    MomoText("*", typography: .labelSMedium, color: theme.colors.error.primary)
+                                    Text("*")
+                                        .font(.caption)
+                                        .foregroundColor(.red)
                                 }
                                 
                                 if !floatingIcon.isEmpty {
-                                    Icon(
-                                        source: floatingIcon,
-                                        size: 16,
-                                        color: disabled ? theme.colors.text.disable : (floatingIconColor ?? theme.colors.text.default)
-                                    )
-                                    .padding(.leading, Spacing.XS)
+                                    Image(systemName: floatingIcon)
+                                        .font(.caption)
+                                        .foregroundColor(disabled ? .gray : floatingIconColor)
                                 }
                             }
-                            .padding(.horizontal, Spacing.S)
-                            .background(theme.colors.background.surface)
+                            .padding(.horizontal, 8)
+                            .background(Colors.black01)
                             .offset(x: Spacing.S, y: -height / 10)
                             .zIndex(10)
                         }
@@ -191,21 +164,13 @@ public struct InputTextArea: View {
                             ZStack(alignment: .topLeading) {
                                 if text.isEmpty {
                                     Text(placeholder)
-                                        .foregroundColor(disabled ? theme.colors.text.disable : theme.colors.text.hint)
+                                        .foregroundColor(disabled ? .gray : .gray)
                                         .font(.system(size: 16, weight: fontWeight))
                                         .padding(.horizontal, 16)
                                         .padding(.vertical, 12)
                                 }
                                 
-                                UITextViewWrapper(
-                                    text: $text,
-                                    maxLength: maxLength,
-                                    textColor: disabled ? theme.colors.text.disable : theme.colors.text.default,
-                                    cursorColor: theme.colors.primary,
-                                    fontWeight: fontWeight,
-                                    disabled: disabled,
-                                    onChangeText: onChangeText,
-                                    onDone: {
+                                UITextViewWrapper(text: $text, onDone: {
                                     // Handle done action if needed
                                 },
                                 onFocus: {
@@ -223,20 +188,27 @@ public struct InputTextArea: View {
                             
                             HStack {
                                 Spacer()
-                                MomoText("\(text.count)/\(maxLength)", typography: .descriptionXsRegular, color: theme.colors.text.hint)
+                                Text("\(text.count)/\(maxLength)")
+                                    .font(.caption)
+                                    .foregroundColor(.gray)
                             }
                             .padding(.horizontal, 16)
                             .padding(.bottom, 12)
                         }
-                        .background(theme.colors.background.surface)
-                        .cornerRadius(Radius.S)
+                        .background(Color.white)
+                        .cornerRadius(8)
                         .overlay(
-                            RoundedRectangle(cornerRadius: Radius.S)
+                            RoundedRectangle(cornerRadius: 8)
                                 .stroke(borderColor, lineWidth: 1)
                         )
                     }
                     
-                    ErrorView(errorMessage: error, errorSpacing: errorSpacing, hintText: "")
+                    if !error.isEmpty {
+                        Text(error)
+                            .font(.caption)
+                            .foregroundColor(.red)
+                            .padding(.top, errorSpacing ? 8 : 4)
+                    }
                 }
                 .onReceive(NotificationCenter.default.publisher(for: UIResponder.keyboardWillShowNotification)) { _ in
                     if !isBlurred {
@@ -256,14 +228,16 @@ public struct InputTextArea: View {
     
     private var borderColor: Color {
         if disabled {
-            return theme.colors.border.disable
+            return Colors.black03
         } else if !error.isEmpty {
-            return theme.colors.error.primary
+            return .red
         } else if isFocused {
-            return theme.colors.primary
+            return Colors.pink03
         } else {
-            return theme.colors.border.default
+            return Colors.border
         }
 
     }
 }
+
+

package/ios/Popup/PopupDisplay.swift

@@ -221,13 +221,17 @@ public struct PopupDisplay: View {
     var RowTextButtons: some View {
         HStack {
             SwiftUI.Button(action: onPressCloseButton) {
-                MomoText(closeButtonTitle, typography: .actionSBold, color: Colors.black09)
-            }
+                Text(closeButtonTitle)
+                    .font(.action2)
+                    .ignoreBoldTextSetting()
+            }.foregroundColor(Colors.black09)
                 .padding(.trailing, 12)
 
             SwiftUI.Button(action: onPressAction) {
-                MomoText(actionButtonTitle, typography: .actionSBold, color: Colors.primary)
-            }
+                Text(actionButtonTitle)
+                    .font(.action2)
+                    .ignoreBoldTextSetting()
+            }.foregroundColor(Colors.primary)
         }
         .frame(maxWidth: .infinity, alignment: .trailing)
         .padding(EdgeInsets(top: 0, leading: 0, bottom: 24, trailing: 24))
@@ -236,13 +240,17 @@ public struct PopupDisplay: View {
     var ColumnTextButtons: some View {
         VStack(alignment: .trailing) {
             SwiftUI.Button(action: onPressAction) {
-                MomoText(actionButtonTitle, typography: .actionSBold, color: Colors.primary)
-            }
+                Text(actionButtonTitle)
+                    .font(.action2)
+                    .ignoreBoldTextSetting()
+            }.foregroundColor(Colors.primary)
                 .padding(.bottom, 6)
 
             SwiftUI.Button(action: onPressCloseButton) {
-                MomoText(closeButtonTitle, typography: .actionSBold, color: Colors.black09)
-            }
+                Text(closeButtonTitle)
+                    .font(.action2)
+                    .ignoreBoldTextSetting()
+            }.foregroundColor(Colors.black09)
         }
         .frame(maxWidth: .infinity, alignment: .trailing)
         .padding(EdgeInsets(top: 0, leading: 0, bottom: 24, trailing: 24))