@momo-kits/native-kits 0.89.30-beta.7 → 0.89.30-nav.11

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

@@ -1,6 +1,7 @@
 package vn.momo.kits.application
 
 import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
@@ -24,6 +25,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
@@ -40,6 +42,8 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 import vn.momo.kits.components.Icon
 import vn.momo.kits.components.Image
+import vn.momo.kits.components.InputSearch
+import vn.momo.kits.components.InputSearchProps
 import vn.momo.kits.components.Options
 import vn.momo.kits.components.Text
 import vn.momo.kits.const.AppStatusBar
@@ -47,6 +51,7 @@ import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.const.Typography
+import vn.momo.kits.modifier.shadow
 import vn.momo.kits.platform.getStatusBarHeight
 import vn.momo.kits.utils.bottomBorder
 
@@ -62,9 +67,15 @@ data class AnimatedHeader(
 
 @Composable
 fun HeaderBackground(
-    headerType: HeaderType = HeaderType.DEFAULT
+    headerType: HeaderType = HeaderType.DEFAULT,
+    useShadow: Boolean? = true,
+    scrollState: Int
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
+    val opacityAni by animateFloatAsState(
+        targetValue = (1 - (scrollState / 200f)).coerceIn(0f, 1f),
+    )
+
     when (headerType) {
         HeaderType.DEFAULT -> {
             val height = statusBarHeight + 52.dp
@@ -106,6 +117,7 @@ fun HeaderBackground(
         HeaderType.EXTENDED -> {
             Box(
                 modifier = Modifier.fillMaxWidth().height(154.dp)
+                    .alpha(opacityAni)
                     .background(
                         Brush.linearGradient(
                             colors = listOf(
@@ -116,10 +128,6 @@ fun HeaderBackground(
                             end = Offset(0f, with(LocalDensity.current) { 154.dp.toPx() })
                         )
                     )
-                    .bottomBorder(
-                        strokeWidth = 1.dp,
-                        color = AppTheme.current.colors.border.default
-                    )
             ) {
                 if (AppTheme.current.assets.headerBackground != null) {
                     Image(
@@ -131,6 +139,17 @@ fun HeaderBackground(
                     )
                 }
             }
+            Box(
+                modifier = Modifier.fillMaxWidth().height(statusBarHeight + 52.dp)
+                    .alpha(1 - opacityAni)
+                    .background(Colors.black_01)
+                    .then(
+                        if (useShadow == true) Modifier.shadow() else Modifier.bottomBorder(
+                            1.dp,
+                            Colors.black_04
+                        )
+                    )
+            )
         }
 
         else -> {
@@ -144,14 +163,18 @@ fun Header(
     headerType: HeaderType = HeaderType.DEFAULT,
     titlePosition: TitlePosition,
     title: String,
+    isBack: Boolean,
     headerRight: @Composable (() -> Unit)? = null,
-    goBack: (() -> Unit)? = null,
+    goBack: (() -> Unit) = { },
     opacity: Float? = null,
     animatedHeader: AnimatedHeader? = null,
-    scrollState: Int = 0
+    useSearchInput: Boolean? = false,
+    scrollState: Int = 0,
+    inputSearchProps: InputSearchProps?
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
     val tintIconColor = AppTheme.current.colors.text.default
+    val backgroundButton = Colors.black_01.copy(alpha = 0.2f)
 
     var colorFraction by remember { mutableStateOf(0f) }
 
@@ -170,7 +193,15 @@ fun Header(
         )
     )
 
-    if (headerType != HeaderType.NONE || animatedHeader !== null) {
+    val backgroundSearch by animateColorAsState(
+        targetValue = animateColor(
+            Colors.black_01,
+            AppTheme.current.colors.background.default,
+            colorFraction
+        )
+    )
+
+    if (headerType != HeaderType.NONE) {
         BoxWithConstraints(
             Modifier.height(statusBarHeight + 52.dp)
                 .fillMaxWidth()
@@ -185,19 +216,19 @@ fun Header(
                 horizontalArrangement = Arrangement.SpaceBetween
             ) {
                 Box {
-                    if (goBack !== null) {
+                    if (isBack) {
                         Box(
                             modifier = Modifier
                                 .size(28.dp)
                                 .then(
                                     Modifier.border(
-                                        0.2.dp,
-                                        Colors.black_20.copy(alpha = 0.2f),
-                                        RoundedCornerShape(14.dp)
+                                        0.5.dp,
+                                        Colors.black_20.copy(alpha = 0.4f),
+                                        RoundedCornerShape(100)
                                     )
                                 )
                                 .background(
-                                    Colors.black_01.copy(alpha = 0.6f),
+                                    backgroundButton,
                                     RoundedCornerShape(100)
                                 )
                                 .clickable(
@@ -205,23 +236,24 @@ fun Header(
                                 )
                                 .padding(Spacing.XS)
                                 .semantics {
-                                    contentDescription = "btn_navigation_back"; testTag =
-                                    "btn_navigation_back"
+                                    testTag = "btn_navigation_back"
                                 },
                             contentAlignment = Alignment.Center
                         ) {
                             Icon(
-                                source = "arrow_back",
+                                source = "ic_back_ios",
                                 color = if (animatedHeader !== null) tintIconColorAnim else tintIconColor,
                                 size = 20.dp,
                             )
                         }
                     }
                 }
-                Box(Modifier.graphicsLayer {
-                    alpha = if (animatedHeader !== null) opacity ?: 1f else 1f
-                }) {
-                    headerRight?.invoke()
+                if (useSearchInput == false) {
+                    Box(Modifier.graphicsLayer {
+                        alpha = if (animatedHeader !== null) opacity ?: 1f else 1f
+                    }) {
+                        headerRight?.invoke()
+                    }
                 }
             }
 
@@ -232,26 +264,28 @@ fun Header(
                     .padding(horizontal = Spacing.M),
                 verticalAlignment = Alignment.CenterVertically,
             ) {
-                if (goBack !== null) {
+                if (isBack) {
                     Spacer(Modifier.width(40.dp))
                 }
-                Box(
-                    Modifier.weight(1f).graphicsLayer {
-                        alpha = if (animatedHeader !== null) opacity ?: 1f else 1f
-                    },
-                    contentAlignment = if (titlePosition == TitlePosition.LEFT) Alignment.TopStart else Alignment.Center
-                ) {
-                    HeaderTitle(
-                        title = title,
-                        color = if (animatedHeader !== null) tintIconColorAnim else tintIconColor,
-                        modifier = Modifier.semantics {
-                            contentDescription = "title_navigation_header"
-                            testTag = "title_navigation_header"
-                        }
-                    )
+                if (useSearchInput == true && inputSearchProps != null) {
+                    InputSearch(inputSearchProps = inputSearchProps.copy(backgroundColor = backgroundSearch))
                 }
-                if (goBack !== null) {
-                    Spacer(Modifier.width(40.dp))
+                else{
+                    Box(
+                        Modifier.weight(1f).graphicsLayer {
+                            alpha = if (animatedHeader !== null) opacity ?: 1f else 1f
+                        },
+                        contentAlignment = if (titlePosition == TitlePosition.LEFT) Alignment.TopStart else Alignment.Center
+                    ) {
+                        HeaderTitle(
+                            title = title,
+                            color = if (animatedHeader !== null) tintIconColorAnim else tintIconColor,
+                            modifier = Modifier.semantics {
+                                contentDescription = title
+                                testTag = "title_navigation_header"
+                            }
+                        )
+                    }
                 }
             }
         }

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

@@ -1,6 +1,7 @@
 package vn.momo.kits.application
 
 import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
@@ -24,15 +25,19 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.LayoutCoordinates
+import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.min
 import androidx.compose.ui.zIndex
+import vn.momo.kits.components.InputSearchProps
 import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Spacing
+import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.shadow
 import vn.momo.kits.platform.getStatusBarHeight
 
@@ -45,19 +50,25 @@ enum class HeaderType {
 @Composable
 fun Screen(
     backgroundColor: Color? = null,
-    isBack: Boolean = true,    headerType: HeaderType = HeaderType.DEFAULT,
+    isBack: Boolean = true,
+    headerType: HeaderType = HeaderType.DEFAULT,
     verticalArrangement: Arrangement.Vertical = Arrangement.Top,
     horizontalAlignment: Alignment.Horizontal = Alignment.Start,
     title: String = "Stack",
     titlePosition: TitlePosition = TitlePosition.LEFT,
-    goBack: (() -> Unit)? = null,
+    goBack: (() -> Unit) = { },
     scrollable: Boolean = true,
+    scrollState: ScrollState = rememberScrollState(),
+    onContentLayout: ((LayoutCoordinates) -> Unit)? = null,
     useAvoidKeyboard: Boolean = true,
     footer: @Composable (() -> Unit)? = null,
     headerRight: @Composable (() -> Unit)? = null,
     fabProps: FabProps? = null,
     animatedHeader: AnimatedHeader? = null,
     layoutOffset: Dp = 56.dp,
+    useShadow: Boolean? = true,
+    useSearchInput: Boolean? = false,
+    inputSearchProps: InputSearchProps? = null,
     content: @Composable () -> Unit,
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
@@ -72,7 +83,6 @@ fun Screen(
 
     val indicator = WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()
     val bottomPadding = min(indicator, 21.dp)
-    val scrollState = rememberScrollState()
 
     val opacity by animateFloatAsState(
         targetValue = ((scrollState.value / 114f)).coerceIn(0f, 1f)
@@ -87,14 +97,18 @@ fun Screen(
     ) {
 
         if (animatedHeader === null) {
-            HeaderBackground(headerType)
+            HeaderBackground(headerType = headerType, scrollState = scrollState.value)
         } else {
             Box(
                 Modifier.zIndex(5f)
                     .background(Color.White.copy(alpha = opacity))
                     .graphicsLayer { alpha = opacity }
             ) {
-                HeaderBackground(HeaderType.DEFAULT)
+                HeaderBackground(
+                    headerType = headerType,
+                    useShadow = useShadow,
+                    scrollState = scrollState.value
+                )
             }
         }
 
@@ -103,9 +117,12 @@ fun Screen(
             title = title,
             titlePosition = titlePosition,
             headerRight = headerRight,
+            isBack = isBack,
             goBack = goBack,
             opacity = opacity,
             animatedHeader = animatedHeader,
+            useSearchInput = useSearchInput,
+            inputSearchProps = inputSearchProps,
             scrollState = scrollState.value
         )
 
@@ -121,7 +138,13 @@ fun Screen(
         ) {
 
             Column(
-                modifier = if (scrollable) Modifier.weight(1f).padding(bottom = keyboardSize).verticalScroll(scrollState) else Modifier.padding(bottom = keyboardSize),
+                modifier = Modifier
+                    .conditional(scrollable) { weight(1f) }
+                    .padding(bottom = keyboardSize)
+                    .conditional(onContentLayout != null) {
+                        onGloballyPositioned(onContentLayout ?: {})
+                    }
+                    .conditional(scrollable) { verticalScroll(scrollState) },
                 verticalArrangement = verticalArrangement,
                 horizontalAlignment = horizontalAlignment
             ) {
@@ -146,7 +169,8 @@ fun Screen(
                 scrollPosition = fabProps.scrollState?.value ?: scrollState.value,
                 onClick = fabProps.onClick,
                 containerColor = AppTheme.current.colors.primary,
-                bottom = fabProps.bottom ?: if (footer != null) bottomPadding + 76.dp else bottomPadding + 12.dp,
+                bottom = fabProps.bottom
+                    ?: if (footer != null) bottomPadding + 76.dp else bottomPadding + 12.dp,
                 icon = fabProps.icon,
                 iconColor = fabProps.iconColor,
                 text = fabProps.label,

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

@@ -260,7 +260,7 @@ fun Button(
                 minWidth = size.value.width
             ).height(size.value.height)
             .semantics {
-                contentDescription = testId; testTag = testId
+                contentDescription = title; testTag = testId
             },
         horizontalArrangement = Arrangement.Center,
         verticalAlignment = Alignment.CenterVertically,

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

@@ -204,7 +204,7 @@ fun Input(
     val testId = if (disabled) "input_${floatingValue}_disabled" else "input_$floatingValue"
 
     Column(modifier = Modifier.semantics {
-        contentDescription = testId; testTag = testId
+        contentDescription = floatingValue; testTag = testId
     }) {
         BasicTextField(
             enabled = !disabled,

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

@@ -17,7 +17,6 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -78,7 +77,7 @@ fun InputDropDown(
     val testId = if (disabled) "input_${floatingValue}_disabled" else "input_$floatingValue"
 
     Column(modifier = Modifier.clickable(enabled = !disabled, onClick = onPress).semantics {
-        contentDescription = testId; testTag = testId
+        contentDescription = floatingValue; testTag = testId
     }) {
         Box {
             if (floatingValue.isNotEmpty() || floatingIcon.isNotEmpty()) {

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

@@ -110,7 +110,7 @@ fun InputMoney(
     val testId = if (disabled) "input_${floatingValue}_disabled" else "input_$floatingValue"
 
     Column(modifier =  Modifier.semantics {
-        contentDescription = testId; testTag = testId
+        contentDescription = floatingValue; testTag = testId
     }) {
         BasicTextField(
             enabled = !disabled,

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

@@ -1,7 +1,6 @@
 package vn.momo.kits.components
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
@@ -33,13 +32,19 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import vn.momo.kits.const.AppTheme
+import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.const.Typography
 import vn.momo.kits.utils.ifTrue
 
 @Composable
-fun RenderRightIconSearch(loading: Boolean, icon: String, color: Color, onClick: () -> Unit) {
+fun RenderRightIconSearch(
+    loading: Boolean,
+    icon: String,
+    color: Color,
+    onClick: () -> Unit,
+) {
     if (loading) {
         Box(Modifier.padding(horizontal = Spacing.S)) {
             CircularProgressIndicator(
@@ -68,34 +73,41 @@ fun RenderRightIconSearch(loading: Boolean, icon: String, color: Color, onClick:
     }
 }
 
+data class InputSearchProps(
+    val text: MutableState<String>,
+    val buttonText: String = "",
+    val showButtonText: Boolean = false,
+    val placeholder: String = "",
+    val onChangeText: (String) -> Unit = {},
+    val onPressButtonText: () -> Unit = {},
+    val disabled: Boolean = false,
+    val icon: String = "",
+    val iconColor: Color = Color(0xff),
+    val onRightIconPressed: () -> Unit = {},
+    val onFocus: () -> Unit = {},
+    val onBlur: () -> Unit = {},
+    val loading: Boolean = false,
+    val fontWeight: InputFontWeight = InputFontWeight.REGULAR,
+    val keyboardType: KeyboardType = KeyboardType.Text,
+    val backgroundColor: Color = Colors.black_01,
+)
+
 @Composable
 fun InputSearch(
-    text: MutableState<String> = remember { mutableStateOf("") },
-    buttonText: String = "",
-    showButtonText: Boolean = false,
-    showBorder: Boolean = true,
-    placeholder: String = "",
-    onChangeText: (String) -> Unit = {},
-    onPressButtonText: () -> Unit = {},
-    error: String = "",
-    disabled: Boolean = false,
-    icon: String = "",
-    iconColor: Color = AppTheme.current.colors.text.default,
-    onRightIconPressed: () -> Unit = {},
-    onFocus: () -> Unit = {},
-    onBlur: () -> Unit = {},
-    loading: Boolean = false,
-    fontWeight: InputFontWeight = InputFontWeight.REGULAR,
-    keyboardType: KeyboardType = KeyboardType.Text,
+    inputSearchProps: InputSearchProps = InputSearchProps(
+        text = remember { mutableStateOf("") },
+        iconColor = AppTheme.current.colors.text.default
+    ),
+
 ) {
     var isFocused by remember { mutableStateOf(false) }
     var isBlurred = false
     val disabledColor = AppTheme.current.colors.text.disable
     var textColor = AppTheme.current.colors.text.default
     var placeholderColor = AppTheme.current.colors.text.hint
-    var iconTintColor = iconColor
+    var iconTintColor = inputSearchProps.iconColor
 
-    if (disabled) {
+    if (inputSearchProps.disabled) {
         textColor = disabledColor
         placeholderColor = disabledColor
         iconTintColor = disabledColor
@@ -103,37 +115,31 @@ fun InputSearch(
 
     Column {
         BasicTextField(
-            enabled = !disabled,
+            enabled = !inputSearchProps.disabled,
             singleLine = true,
-            value = text.value,
+            value = inputSearchProps.text.value,
             textStyle = TextStyle(
                 color = textColor,
-                fontSize = 15.sp,
-                lineHeight = 24.sp,
-                fontWeight = fontWeight.value
+                fontSize = 14.sp,
+                lineHeight = 20.sp,
+                fontWeight = inputSearchProps.fontWeight.value
             ),
-            keyboardOptions = KeyboardOptions.Default.copy(keyboardType = keyboardType),
+            keyboardOptions = KeyboardOptions.Default.copy(keyboardType = inputSearchProps.keyboardType),
             modifier = Modifier.height(36.dp).onFocusChanged {
                 isFocused = it.isFocused
                 if (it.isFocused) {
-                    onFocus()
+                    inputSearchProps.onFocus()
                 }
-                if (!it.isFocused && isBlurred) onBlur()
+                if (!it.isFocused && isBlurred) inputSearchProps.onBlur()
                 if (it.isFocused && !isBlurred) isBlurred = true
             },
-            onValueChange = onChangeText,
+            onValueChange = inputSearchProps.onChangeText,
             decorationBox = { innerTextField ->
-                //input box wrapper
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Row(
-                        modifier = Modifier.weight(showButtonText.ifTrue(8f, 1f))
+                        modifier = Modifier.weight(inputSearchProps.showButtonText.ifTrue(8f, 1f))
                             .background(
-                                AppTheme.current.colors.background.surface,
-                                RoundedCornerShape(Radius.XL)
-                            )
-                            .border(
-                                showBorder.ifTrue(1.dp, 0.dp),
-                                getBorderColor(isFocused, error, disabled),
+                                inputSearchProps.backgroundColor,
                                 RoundedCornerShape(Radius.XL)
                             ),
                         horizontalArrangement = Arrangement.Start,
@@ -154,20 +160,20 @@ fun InputSearch(
                                 color = AppTheme.current.colors.text.hint
                             )
                             Box(Modifier.weight(1f)) {
-                                if (text.value.isEmpty()) {
+                                if (inputSearchProps.text.value.isEmpty()) {
                                     Text(
-                                        text = placeholder,
+                                        text = inputSearchProps.placeholder,
                                         style = TextStyle(
                                             fontSize = 16.sp,
                                             lineHeight = 24.sp,
-                                            fontWeight = fontWeight.value
+                                            fontWeight = inputSearchProps.fontWeight.value
                                         ),
                                         color = placeholderColor
                                     )
                                 }
                                 innerTextField()
                             }
-                            if (isFocused && text.value.isNotEmpty()) {
+                            if (isFocused && inputSearchProps.text.value.isNotEmpty()) {
                                 Row {
                                     Spacer(Modifier.width(Spacing.XS))
                                     Icon(
@@ -175,25 +181,30 @@ fun InputSearch(
                                         size = 16.dp,
                                         color = AppTheme.current.colors.text.hint,
                                         modifier = Modifier.clickable(
-                                            onClick = { text.value = "" },
+                                            onClick = { inputSearchProps.text.value = "" },
                                             interactionSource = remember { MutableInteractionSource() },
                                             indication = null
                                         )
                                     )
                                 }
                             }
-                            RenderRightIconSearch(loading, icon, iconTintColor, onRightIconPressed)
+                            RenderRightIconSearch(
+                                inputSearchProps.loading,
+                                inputSearchProps.icon,
+                                iconTintColor,
+                                inputSearchProps.onRightIconPressed
+                            )
                         }
                     }
-                    if (showButtonText) {
+                    if (inputSearchProps.showButtonText) {
                         Text(
-                            text = buttonText,
+                            text = inputSearchProps.buttonText,
                             style = Typography.actionDefault,
                             color = AppTheme.current.colors.text.default,
                             modifier = Modifier.padding(start = Spacing.L).clickable(
                                 interactionSource = remember { MutableInteractionSource() },
                                 indication = null,
-                                onClick = onPressButtonText
+                                onClick = inputSearchProps.onPressButtonText
                             )
                         )
                     }

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

@@ -97,7 +97,7 @@ fun PopupNotify(
     }
 
     Box(Modifier.semantics {
-        contentDescription = "popup_notify"; testTag = "popup_notify"
+        contentDescription = title; testTag = "popup_notify"
     }, contentAlignment = Alignment.TopEnd) {
         Column(
             modifier = Modifier
@@ -166,7 +166,7 @@ fun PopupNotify(
                 color = AppTheme.current.colors.background.surface,
                 size = 14.dp,
                 modifier = Modifier.semantics {
-                    contentDescription = "ic_popup_close"; testTag = "ic_popup_close"
+                    testTag = "ic_popup_close"
                 }
             )
         }
@@ -235,7 +235,7 @@ fun renderRow(
                     title = it.title,
                     type = ButtonType.TEXT,
                     modifier = Modifier.semantics {
-                        contentDescription = "btn_popup_cancel"; testTag = "btn_popup_cancel"
+                        contentDescription = it.title; testTag = "btn_popup_cancel"
                     }
                 )
             }
@@ -250,7 +250,7 @@ fun renderRow(
                 },
                 title = primary?.title ?: "",
                 modifier = Modifier.semantics {
-                    contentDescription = "btn_popup_allow"; testTag = "btn_popup_allow"
+                    contentDescription = primary?.title ?: ""; testTag = "btn_popup_allow"
                 }
             )
         }
@@ -273,7 +273,7 @@ fun renderColumn(
             },
             title = primary?.title ?: "",
             modifier = Modifier.semantics {
-                contentDescription = "btn_popup_allow"; testTag = "btn_popup_allow"
+                contentDescription = primary?.title ?: ""; testTag = "btn_popup_allow"
             }
         )
         secondary?.let {
@@ -288,7 +288,7 @@ fun renderColumn(
                     title = it.title,
                     type = ButtonType.TEXT,
                     modifier = Modifier.semantics {
-                        contentDescription = "btn_popup_cancel"; testTag = "btn_popup_cancel"
+                        contentDescription = it.title; testTag = "btn_popup_cancel"
                     }
                 )
             }

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

@@ -17,7 +17,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.unit.dp
@@ -30,7 +29,7 @@ fun PromotionPopup(
     source: String = "",
     onClose: (() -> Unit) = {},
 ) {
-    Column(Modifier.semantics { contentDescription = "popup_notify"; testTag = "popup_notify" }) {
+    Column(Modifier.semantics { testTag = "popup_notify" }) {
         if (source.isNotEmpty()) {
             Image(
                 source = source,
@@ -69,7 +68,7 @@ fun PromotionPopup(
                     color = AppTheme.current.colors.background.surface,
                     size = 14.dp,
                     modifier = Modifier.semantics {
-                        contentDescription = "ic_popup_close"; testTag = "ic_popup_close"
+                        testTag = "ic_popup_close"
                     }
                 )
             }

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

@@ -1,7 +1,6 @@
 package vn.momo.kits.components
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -9,9 +8,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
@@ -29,7 +26,11 @@ val defaultBanner = TrustBannerData(
         "vi" to "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" to "Your data security and money safety are MoMo's top priorities."
     ),
-    pciImage = "https://static.momocdn.net/app/img/kits/trustBanner/pci.png",
+    subContent = mapOf(
+        "vi" to "Tìm hiểu thêm",
+        "en" to "Learn more"
+    ),
+    pciImage = "https://static.momocdn.net/app/img/kits/trustBanner/pci_dss.png",
     sslImage = "https://static.momocdn.net/app/img/kits/trustBanner/ssl.png",
     urlConfig = "login_and_security",
     icons = listOf(
@@ -38,40 +39,23 @@ val defaultBanner = TrustBannerData(
         "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_momo_secu.png"
+    momoImage = "https://static.momocdn.net/app/img/kits/trustBanner/ic_secu.png"
 )
 
-const val borderColor = 0xFFE8E8E8
-const val tonalColor = 0xFFFDEAF4
 const val backgroundBlue = 0xFFF2F8FF
 const val contentColor = 0xFF484848
-const val primaryColor = 0xFFEB2F96
-
-data class TrustBannerClass(
-    val trustBanner: TrustBannerData
-)
+const val subContentColor = 0xFFEB2F96
 
 data class TrustBannerData(
     val content: Map<String, String>,
+    val subContent: Map<String, String>,
     val pciImage: String,
+    val momoImage: String,
     val sslImage: String,
     val icons: List<String>,
-    val momoImage: String,
     val urlConfig: String
 )
 
-@Composable
-fun Avatar(iconURL: String) {
-    Image(
-        source = iconURL,
-        modifier = Modifier
-            .size(24.dp)
-            .background(Color.White, CircleShape)
-            .border(width = 1.dp, color = Color(borderColor), CircleShape),
-        options = Options(contentScale = ContentScale.Fit)
-    )
-}
-
 @Composable
 fun TrustBanner(
     trustBanner: TrustBannerData = defaultBanner,
@@ -80,6 +64,7 @@ fun TrustBanner(
     onPress: ((Map<String, String>) -> Unit)? = null,
     trackEvent: ((String, Map<String, String>) -> Unit)? = null,
     language: String = "vi"
+
 ) {
     val trackParams = mapOf(
         "service_name" to serviceName,
@@ -123,12 +108,11 @@ fun TrustBanner(
             modifier = Modifier
                 .width(64.dp)
                 .height(64.dp)
-                .padding(end = 8.dp),
-            options = Options(
-                contentScale = ContentScale.Fit,
-            )
         )
-        Column {
+        Column (
+          modifier = Modifier
+              .padding(start = 10.dp)
+        ) {
             Text(
                 text = trustBanner.content[language] ?: "",
                 modifier = Modifier.padding(bottom = 8.dp),
@@ -138,11 +122,26 @@ fun TrustBanner(
                 maxLines = 2
             )
             Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+                Row (
+                    verticalAlignment = Alignment.CenterVertically,
+                )  {
+                    Text(
+                        text = trustBanner.subContent[language] ?: "",
+                        lineHeight = 16.sp,
+                        fontSize = 12.sp,
+                        color = Color(subContentColor),
+                        maxLines = 2
+                    )
+                    Icon(
+                        source = "https://img.mservice.io/momo_app_v2/new_version/img/appx_icon/16_arrow_chevron_right_small.png",
+                        color = Color(subContentColor),
+                    )
+                }
                 Row {
                     Image(
                         source = trustBanner.pciImage, modifier = Modifier
                             .padding(end = 4.dp)
-                            .width(52.dp)
+                            .width(27.dp)
                             .height(20.dp)
                         ,options = Options(
                             contentScale = ContentScale.Fit,
@@ -157,31 +156,6 @@ fun TrustBanner(
                         )
                     )
                 }
-                Row(
-                    modifier = Modifier
-                        .width(96.dp)
-                        .height(24.dp),
-                    horizontalArrangement = Arrangement.spacedBy((-6).dp)
-                ) {
-                    trustBanner.icons.forEach { iconURL ->
-                        Avatar(iconURL = iconURL)
-                    }
-                    Row(
-                        modifier = Modifier
-                            .size(24.dp)
-                            .background(color = Color(tonalColor), CircleShape)
-                            .border(width = 1.dp, color = Color(borderColor), CircleShape),
-                        verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.Center
-                    ) {
-                        Text(
-                            text = "36+",
-                            color = Color(primaryColor),
-                            lineHeight = 14.sp,
-                            fontSize = 10.sp
-                        )
-                    }
-                }
             }
         }
     }

package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt

@@ -58,6 +58,16 @@ fun getFontFamily(fontFamily: String, fontWeight: FontWeight? = FontWeight.Norma
         "MoMoSignature-700" to "momosignature.otf",
         "MoMoSignature-800" to "momosignature.otf",
         "MoMoSignature-900" to "momosignature.otf",
+
+        "MoMoTrustDisplay-100" to "momotrustdisplay.otf",
+        "MoMoTrustDisplay-200" to "momotrustdisplay.otf",
+        "MoMoTrustDisplay-300" to "momotrustdisplay.otf",
+        "MoMoTrustDisplay-400" to "momotrustdisplay.otf",
+        "MoMoTrustDisplay-500" to "momotrustdisplay.otf",
+        "MoMoTrustDisplay-600" to "momotrustdisplay.otf",
+        "MoMoTrustDisplay-700" to "momotrustdisplay.otf",
+        "MoMoTrustDisplay-800" to "momotrustdisplay.otf",
+        "MoMoTrustDisplay-900" to "momotrustdisplay.otf",
     )
     val font = fontMap[key] ?: "sfprotext_regular.ttf"
     return getFont(font)

package/compose/src/commonMain/kotlin/vn/momo/kits/modifier/Conditional.kt

@@ -0,0 +1,11 @@
+package vn.momo.kits.modifier
+
+import androidx.compose.ui.Modifier
+
+fun Modifier.conditional(condition : Boolean, modifier : Modifier.() -> Modifier) : Modifier {
+    return if (condition) {
+        then(modifier(Modifier))
+    } else {
+        this
+    }
+}

package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Icons.kt

@@ -1317,7 +1317,5 @@ val Icons = mapOf(
     "ic_checked" to "https://img.mservice.com.vn/app/img/kits/checked_ic.png",
     "ic_minus" to "https://img.mservice.com.vn/app/img/kits/minus.png",
     "ic_navigation" to "https://static.momocdn.net/app/img/kits/ic_navigation.png",
-    "ic_money_bag" to "https://static.momocdn.net/app/img/kits/ic_money_bag.png",
-    "help_center" to "https://static.momocdn.net/app/img/kits/ic_money_bag_2.png",
-    "arrow_back" to "https://static.momocdn.net/app/img/kits/arrow-back.png",
+    "ic_money_bag" to "https://static.momocdn.net/app/img/kits/ic_money_bag.png"
 )

package/package.json

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