@onekeyfe/react-native-native-list 3.0.115 → 3.0.116

package/android/src/main/java/com/onekey/nativelist/NativeListAdapter.kt

@@ -10,6 +10,8 @@ import com.facebook.react.uimanager.ThemedReactContext
 import org.json.JSONObject
 import java.util.Collections
 import java.util.WeakHashMap
+import kotlin.math.ceil
+import kotlin.math.roundToInt
 
 internal class NativeListAdapter(
   private val context: ThemedReactContext,
@@ -39,6 +41,8 @@ internal class NativeListAdapter(
   )
   val currentList: List<NativeListItem>
     get() = differ.currentList
+  private var marketSourceItems: List<NativeListItem>? = null
+  private var marketSourceEdges = DoubleArray(0)
   private val createdRows = Collections.newSetFromMap(
     WeakHashMap<NativeListRowView, Boolean>(),
   )
@@ -122,6 +126,30 @@ internal class NativeListAdapter(
   fun itemAt(position: Int): NativeListItem? =
     reorderItems?.getOrNull(position) ?: differ.currentList.getOrNull(position)
 
+  // OneKey patch: Yoga rounds badge dimensions from unrounded cumulative row edges.
+  fun marketSourceEdgePx(position: Int): Double {
+    val items = reorderItems ?: differ.currentList
+    if (marketSourceItems !== items) {
+      val density = context.resources.displayMetrics.density.toDouble()
+      val edges = DoubleArray(items.size + 1)
+      items.forEachIndexed { index, item ->
+        val style = item.json.optJSONObject("style")
+        val height = item.json.optDouble("height", 0.0)
+        val sourceHeight = if (item.type == "market" && style != null) {
+          val titleHeight = ceil((style.optJSONObject("title")?.optDouble("lineHeight", 24.0) ?: 24.0) * density) / density
+          val subtitleHeight = if (item.json.optString("subtitle").isNotEmpty() || item.json.optJSONObject("subtitlePrefix") != null) {
+            ceil((style.optJSONObject("subtitle")?.optDouble("lineHeight", 20.0) ?: 20.0) * density) / density + style.optDouble("lineGap", 0.0)
+          } else 0.0
+          maxOf(height.roundToInt().toDouble(), titleHeight + subtitleHeight + style.optDouble("verticalPadding", 12.0) * 2).toFloat().toDouble()
+        } else height
+        edges[index + 1] = edges[index] + sourceHeight * density
+      }
+      marketSourceItems = items
+      marketSourceEdges = edges
+    }
+    return marketSourceEdges.getOrElse(position) { 0.0 }
+  }
+
   fun positionOfKey(key: String): Int =
     (reorderItems ?: differ.currentList).indexOfFirst { it.key == key }
 
@@ -169,6 +197,8 @@ internal class NativeListAdapter(
   }
 
   fun dispose() {
+    marketSourceItems = null
+    marketSourceEdges = DoubleArray(0)
     reorderItems = null
     suppressDifferUpdates = false
     createdRows.forEach(NativeListRowView::dispose)

package/android/src/main/java/com/onekey/nativelist/NativeListRowView.kt

@@ -45,6 +45,7 @@ import com.facebook.react.uimanager.style.LogicalEdge
 import com.margelo.nitro.onekeyimage.OneKeyImageReusableView
 import androidx.core.graphics.PathParser
 import androidx.core.widget.TextViewCompat
+import androidx.recyclerview.widget.RecyclerView
 import org.json.JSONArray
 import org.json.JSONObject
 import kotlin.math.roundToInt
@@ -119,6 +120,7 @@ internal data class NativeListActionOrigin(
   val source: String,
   val slot: Int? = null,
   val anchorInsetPixels: Int = 0,
+  val windowPointPixels: android.graphics.PointF? = null,
 )
 
 /** React Native color strings use CSS #RRGGBBAA ordering; Android expects #AARRGGBB. */
@@ -209,6 +211,8 @@ private class DottedUnderlineTextView(context: android.content.Context) : TextVi
 
 private class PackedTitleLineLayout(context: android.content.Context) : LinearLayout(context) {
   var packsChildrenAtStart = false
+  // OneKey patch: optional cap for the Market subtitle's localized name.
+  var leadingTextMaxWidth = Int.MAX_VALUE
 
   override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
     if (!packsChildrenAtStart || childCount < 2) {
@@ -236,7 +240,7 @@ private class PackedTitleLineLayout(context: android.content.Context) : LinearLa
     val titleMargins = title.layoutParams as MarginLayoutParams
     if (widthMode != MeasureSpec.UNSPECIFIED) {
       (title as TextView).maxWidth = (widthSize - paddingLeft - paddingRight - accessoryWidth -
-        titleMargins.leftMargin - titleMargins.rightMargin).coerceAtLeast(0)
+        titleMargins.leftMargin - titleMargins.rightMargin).coerceAtLeast(0).coerceAtMost(leadingTextMaxWidth)
     }
     (title.layoutParams as LayoutParams).apply {
       width = LayoutParams.WRAP_CONTENT
@@ -393,7 +397,16 @@ private class NativeListTableColumnView(context: android.content.Context) : Line
 internal class NativeListRowView(
   private val reactContext: ThemedReactContext,
 ) : LinearLayout(reactContext) {
-  private val leadingFrame = FrameLayout(context)
+  private var marketLeadingUsesSourceClip = false
+  private val leadingFrame = object : FrameLayout(context) {
+    override fun drawChild(canvas: Canvas, child: View, drawingTime: Long): Boolean {
+      if (!marketLeadingUsesSourceClip || child !== leadingImages[0]) return super.drawChild(canvas, child, drawingTime)
+      // OneKey patch: clip only the Market avatar to the source border's padding box.
+      val saved = canvas.save()
+      BackgroundStyleApplicator.clipToPaddingBox(this, canvas)
+      return try { super.drawChild(canvas, child, drawingTime) } finally { canvas.restoreToCount(saved) }
+    }
+  }
   // OneKey patch: reset selector fragments and corner decorations on every bind.
   private val selectorViews = mutableListOf<View>()
   private var selectorUsesSourceScale = false
@@ -405,6 +418,7 @@ internal class NativeListRowView(
   }
   private val selectorOriginalFontFeatures = mutableMapOf<TextView, String?>()
   private val selectorOriginalPaintFlags = mutableMapOf<TextView, Int>()
+  private val marketOriginalPaintFlags = mutableMapOf<TextView, Int>()
   private val selectorLineHeights = mutableMapOf<TextView, Int>()
   private val selectorFontSizes = mutableMapOf<TextView, Float>()
   private val selectorImages = mutableListOf<OneKeyImageReusableView>()
@@ -427,6 +441,8 @@ internal class NativeListRowView(
   private val titleLine = PackedTitleLineLayout(context)
   private val title = DottedUnderlineTextView(context)
   private val subtitle = TextView(context)
+  // OneKey patch: the first text shrinks while the volume retains its width.
+  private val marketSubtitleLine = PackedTitleLineLayout(context)
   private val tertiary = TextView(context)
   private val status = TextView(context)
   private val metricSubtitle = TextView(context)
@@ -479,6 +495,8 @@ internal class NativeListRowView(
   private var marketLongPressRunnable: Runnable? = null
   private var marketTouchStartX = 0f
   private var marketTouchStartY = 0f
+  private var marketTouchX = 0f
+  private var marketTouchY = 0f
   private var marketLongPressFired = false
   private var reorderActive = false
   private var checkboxCheckedColor = Color.rgb(32, 32, 32)
@@ -610,6 +628,8 @@ internal class NativeListRowView(
           if (item?.type == "market") {
             marketTouchStartX = event.x
             marketTouchStartY = event.y
+            marketTouchX = event.x
+            marketTouchY = event.y
             item.json.optString("pressInActionKey").takeIf(String::isNotEmpty)?.let { actionKey ->
               emitAction(item, actionKey, null, this, "row")
             }
@@ -620,7 +640,11 @@ internal class NativeListRowView(
                 if (touchPressed && current?.key == expectedKey && current.type == "market") {
                   marketLongPressRunnable = null
                   marketLongPressFired = true
-                  emitAction(current, actionKey, null, this, "row")
+                  val location = IntArray(2)
+                  getLocationInWindow(location)
+                  onAction?.invoke(current, actionKey, null, actionOrigin(this, "row").copy(
+                    windowPointPixels = android.graphics.PointF(location[0] + marketTouchX, location[1] + marketTouchY),
+                  ))
                 }
               }
               marketLongPressRunnable = runnable
@@ -634,6 +658,8 @@ internal class NativeListRowView(
           }
         }
         MotionEvent.ACTION_MOVE -> {
+          marketTouchX = event.x
+          marketTouchY = event.y
           val outside = event.x < 0 || event.y < 0 || event.x >= width || event.y >= height
           val movedMarket = (tag as? NativeListItem)?.type == "market" &&
             (kotlin.math.abs(event.x - marketTouchStartX) > dp(10) ||
@@ -713,6 +739,22 @@ internal class NativeListRowView(
   }
 
   override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+    val marketItem = (tag as? NativeListItem)?.takeIf { it.type == "market" }
+    val marketStyle = marketItem?.json?.optJSONObject("style")
+    if (marketStyle?.has("horizontalPadding") == true) {
+      // OneKey patch: Yoga rounds the two absolute edges, not both padding values.
+      val sourcePadding = marketStyle.optDouble("horizontalPadding") * resources.displayMetrics.density
+      val width = MeasureSpec.getSize(widthMeasureSpec)
+      val rowHeight = selectorHeight
+      val sourceVerticalPadding = marketStyle.takeIf { it.has("verticalPadding") && rowHeight != null }
+        ?.optDouble("verticalPadding")?.times(resources.displayMetrics.density)
+      setPadding(
+        sourcePadding.roundToInt(),
+        sourceVerticalPadding?.roundToInt() ?: paddingTop,
+        width - (width - sourcePadding).roundToInt(),
+        if (sourceVerticalPadding != null && rowHeight != null) rowHeight - (rowHeight - sourceVerticalPadding).roundToInt() else paddingBottom,
+      )
+    }
     if (isMediaTile) {
       val availableWidth = (MeasureSpec.getSize(widthMeasureSpec) - paddingLeft - paddingRight)
         .coerceAtLeast(0)
@@ -737,6 +779,63 @@ internal class NativeListRowView(
   override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
     super.onLayout(changed, left, top, right, bottom)
     val item = tag as? NativeListItem ?: return
+    if (item.type == "market" && item.json.optJSONObject("style") != null) {
+      // OneKey patch: preserve Yoga's half-pixel centering for Market columns and badges.
+      for (column in listOf(leadingFrame, mainColumn, trailingColumn)) {
+        if (column.parent === this && column.visibility != GONE) {
+          column.offsetTopAndBottom((height - column.height + 1) / 2 - column.top)
+        }
+      }
+      // OneKey patch: token avatars stay centered in the row when text rounding adds a pixel.
+      if (item.json.optString("variant") != "token" && leadingFrame.parent === this && mainColumn.parent === this) {
+        leadingFrame.offsetTopAndBottom(mainColumn.top + (mainColumn.height - leadingFrame.height + 1) / 2 - leadingFrame.top)
+      }
+      // OneKey patch: preserve Yoga's absolute-edge rounding for the Market network badge.
+      if (leadingOverlayBackground.visibility == VISIBLE && item.json.optString("variant") == "token") {
+        val recycler = parent as? RecyclerView
+        val adapter = recycler?.adapter as? NativeListAdapter
+        val position = recycler?.getChildAdapterPosition(this) ?: RecyclerView.NO_POSITION
+        if (recycler != null && adapter != null && position != RecyclerView.NO_POSITION && adapter.itemAt(position)?.key == item.key) {
+          val density = resources.displayMetrics.density.toDouble()
+          val rowTop = adapter.marketSourceEdgePx(position)
+          val rowHeight = adapter.marketSourceEdgePx(position + 1) - rowTop
+          val imageHeight = item.json.optJSONObject("style")?.optJSONObject("image")?.optDouble("height", 32.0) ?: 32.0
+          val contentTop = (recycler.paddingTop / density).roundToInt() * density
+          val badgeTop = contentTop + rowTop + (rowHeight - imageHeight * density) / 2 + (imageHeight - 16) * density
+          val badgeHeight = (badgeTop + 20 * density).roundToInt() - badgeTop.roundToInt()
+          val top = ((imageHeight - 16) * density).roundToInt()
+          leadingOverlayBackground.layout(leadingOverlayBackground.left, top, leadingOverlayBackground.right, top + badgeHeight)
+        }
+      }
+      for (badge in marketBadgeViews) {
+        if (badge.parent === titleLine && badge.visibility != GONE) {
+          badge.offsetTopAndBottom((titleLine.height - badge.height + 1) / 2 - badge.top)
+        }
+      }
+      // OneKey patch: preserve fractional text advances and gaps until the final edge.
+      val style = item.json.optJSONObject("style")
+      for ((line, gap) in listOf(
+        titleLine to style.optDouble("titleBadgeGap", 4.0),
+        marketSubtitleLine to (item.json.optJSONObject("subtitlePrefix")?.optDouble("gap", 4.0) ?: 0.0),
+      )) {
+        var cursor = 0f
+        var hasPrevious = false
+        for (index in 0 until line.childCount) {
+          val child = line.getChildAt(index)
+          if (child.visibility == GONE) continue
+          if (hasPrevious) {
+            cursor += (gap * resources.displayMetrics.density).toFloat()
+            child.offsetLeftAndRight(cursor.roundToInt() - child.left)
+          }
+          val advance = if (index == 0 && child is TextView) {
+            val textWidth = if (line === titleLine) child.paint.measureText(child.text.toString()) else child.layout?.getLineWidth(0)
+            textWidth?.coerceAtMost(child.width.toFloat()) ?: child.width.toFloat()
+          } else child.width.toFloat()
+          cursor = if (hasPrevious) cursor + advance else child.left + advance
+          hasPrevious = true
+        }
+      }
+    }
     val accessory = item.json.optJSONArray("trailing")?.optJSONObject(0)
     if (item.type == "identity" && item.json.has("height") && item.json.optString("presentation") == "accountSelector" && accessory?.optString("kind") == "icon" && accessory.optString("name") == "PlusSmallOutline") {
       // OneKey patch: the borderless Plus retains the source's fixed top18/negative7 slot.
@@ -785,7 +884,7 @@ internal class NativeListRowView(
     touchPressed = shouldRestorePressed
     currentLayout = layout
     tag = item
-    selectorUsesSourceScale = item.type == "market" || item.usesSelectorSourceScale || useSourceScale
+    selectorUsesSourceScale = item.type == "market" || item.type == "system" && item.json.optString("presentation") == "market" && item.json.optString("variant") == "retry" || item.usesSelectorSourceScale || useSourceScale
     reorderActive = false
     leadingImages.forEach(OneKeyImageReusableView::prepareForReuse)
     secondaryImage.prepareForReuse()
@@ -1079,6 +1178,8 @@ internal class NativeListRowView(
     selectorOriginalFontFeatures.clear()
     selectorOriginalPaintFlags.forEach { (view, flags) -> view.paintFlags = flags }
     selectorOriginalPaintFlags.clear()
+    marketOriginalPaintFlags.forEach { (view, flags) -> view.paintFlags = flags }
+    marketOriginalPaintFlags.clear()
     selectorLineHeights.clear()
     selectorFontSizes.clear()
     // OneKey patch: selector-only views cannot survive a recycled binding.
@@ -1095,7 +1196,17 @@ internal class NativeListRowView(
       badge.setOnClickListener(null)
       badge.contentDescription = null
       marketBadgeLabels[index].apply {
+        // OneKey patch: restore every optional Market badge typography property on reuse.
         text = ""
+        layoutParams = wrap()
+        fontFeatureSettings = null
+        textSize = sp(11f)
+        typeface = NativeListFonts.medium(context)
+        setLineSpacing(0f, 1f)
+        includeFontPadding = false
+        maxLines = 1
+        ellipsize = TextUtils.TruncateAt.END
+        gravity = Gravity.START or Gravity.CENTER_VERTICAL
         setTextColor(color(null, "secondaryText", "#0000009B"))
       }
       marketBadgeImages[index].prepareForReuse()
@@ -1140,6 +1251,9 @@ internal class NativeListRowView(
     boundCheckboxData = null
     mainColumn.orientation = VERTICAL
     mainColumn.gravity = Gravity.CENTER_VERTICAL
+    // OneKey patch: remove the Market group before restoring shared labels.
+    marketSubtitleLine.removeAllViews()
+    mainColumn.removeView(marketSubtitleLine)
     mediaMetadataRow.removeView(subtitle)
     mediaMetadataRow.removeView(mediaNetworkImage)
     mainColumn.removeView(mediaMetadataRow)
@@ -1165,6 +1279,10 @@ internal class NativeListRowView(
     badgeLine.text = ""
     title.setLineSpacing(0f, 1f)
     subtitle.setLineSpacing(0f, 1f)
+    tertiary.setLineSpacing(0f, 1f)
+    tertiary.maxWidth = Int.MAX_VALUE
+    tertiary.ellipsize = TextUtils.TruncateAt.END
+    tertiary.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
     title.letterSpacing = 0f
     title.showsDottedUnderline = false
     title.setPadding(0, 0, 0, 0)
@@ -1218,6 +1336,7 @@ internal class NativeListRowView(
     spinner.visibility = GONE
     spinner.layoutParams = LayoutParams(dp(20), dp(20)).apply { gravity = Gravity.END }
     spinner.alpha = 1f
+    marketLeadingUsesSourceClip = false
     leadingFrame.visibility = GONE
     leadingFrame.background = null
     leadingFrame.clipChildren = false
@@ -1932,6 +2051,25 @@ internal class NativeListRowView(
     )
   }
 
+  // OneKey patch: opt-in Market text uses the same pixel rounding and line box as RN.
+  private fun applyMarketTextMetrics(view: TextView, style: JSONObject?) {
+    if (style == null || view.visibility != VISIBLE || view.text.isEmpty()) return
+    marketOriginalPaintFlags.putIfAbsent(view, view.paintFlags)
+    view.paintFlags = view.paintFlags or Paint.SUBPIXEL_TEXT_FLAG or Paint.LINEAR_TEXT_FLAG
+    if (style.has("fontSize")) {
+      val sourceSize = sp(style.optDouble("fontSize").toFloat()) * resources.displayMetrics.density
+      view.setTextSize(TypedValue.COMPLEX_UNIT_PX, kotlin.math.ceil(sourceSize.toDouble()).toFloat())
+    }
+    val text = SpannableStringBuilder(view.text)
+    text.getSpans(0, text.length, SelectorLineHeightSpan::class.java).forEach(text::removeSpan)
+    if (style.has("lineHeight")) {
+      val lineHeight = kotlin.math.ceil(style.optDouble("lineHeight") * (if (selectorUsesSourceScale) 1f else NativeListScale.factor(resources)) * resources.displayMetrics.density).toInt()
+      text.setSpan(SelectorLineHeightSpan(lineHeight), 0, text.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+      view.setLineSpacing(0f, 1f)
+    }
+    view.text = text
+  }
+
   private fun marketText(value: String, segments: JSONArray?, fontSize: Float): CharSequence {
     if (segments == null || segments.length() == 0) return value
     val result = SpannableStringBuilder()
@@ -1989,7 +2127,11 @@ internal class NativeListRowView(
       cornerRadiusDp = cornerRadius,
     )
 
-    addView(mainColumn, weighted())
+    // OneKey patch: retain the source gap without changing other templates.
+    // addView(mainColumn, weighted())
+    addView(mainColumn, weighted().apply {
+      marginEnd = dp(style?.optDouble("contentTrailingGap", 0.0)?.roundToInt() ?: 0)
+    })
     titleLine.packsChildrenAtStart = true
     showText(title, item.json.optString("title"), style?.optJSONObject("title")?.optInt("lines", 1) ?: 1)
     applyMarketTextStyle(
@@ -2008,6 +2150,7 @@ internal class NativeListRowView(
         val badge = badges.getJSONObject(index)
         val badgeView = marketBadgeViews[index]
         val badgeLabel = marketBadgeLabels[index]
+        val badgeStyle = badge.optJSONObject("style")
         val hasGlyph = badge.optString("iconName") == "verified"
         val remoteIcon = badge.optJSONObject("icon")
         val hasIcon = hasGlyph || remoteIcon != null
@@ -2022,15 +2165,28 @@ internal class NativeListRowView(
         val foreground = safeColor(badge.optString("textColor"), toneColor)
         badgeView.visibility = VISIBLE
         val iconOnly = hasIcon && text.isEmpty()
-        badgeView.setPadding(dp(if (iconOnly) 0 else if (hasIcon) 2 else 5), 0, dp(if (iconOnly) 0 else 5), 0)
+        // OneKey patch: Market callers can request the original badge padding.
+        val padding = badgeStyle?.optDouble("horizontalPadding", 5.0)?.roundToInt() ?: 5
+        val leftPadding = if (badgeStyle?.has("horizontalPadding") == true) padding else if (hasIcon) 2 else 5
+        // badgeView.setPadding(dp(if (iconOnly) 0 else if (hasIcon) 2 else 5), 0, dp(if (iconOnly) 0 else 5), 0)
+        badgeView.setPadding(dp(if (iconOnly) 0 else leftPadding), 0, dp(if (iconOnly) 0 else padding), 0)
         badgeView.background = roundedFill(
           safeColor(
             badge.optString("backgroundColor"),
             if (hasIcon && text.isEmpty()) Color.TRANSPARENT else color(theme, "strongBackground", "#0000000F"),
           ),
           4f,
-        )
+        ).apply {
+          if (badgeStyle != null) this.cornerRadius = 4f * resources.displayMetrics.density
+        }
         badgeLabel.text = text
+        // OneKey patch: match SizableText's tabular numerals only for explicit Market metrics.
+        badgeLabel.fontFeatureSettings = if (badgeStyle != null) "tnum" else null
+        badgeLabel.textSize = sp(badgeStyle?.optDouble("fontSize", 11.0)?.toFloat() ?: 11f)
+        badgeLabel.typeface = marketTypeface(badgeStyle?.optString("fontWeight").orEmpty(), "medium")
+        if (badgeStyle?.has("lineHeight") == true) {
+          TextViewCompat.setLineHeight(badgeLabel, dp(badgeStyle.optDouble("lineHeight").roundToInt()))
+        }
         badgeLabel.setTextColor(foreground)
         badgeLabel.visibility = if (text.isEmpty()) GONE else VISIBLE
         if (hasGlyph) {
@@ -2056,7 +2212,9 @@ internal class NativeListRowView(
         badgeView.contentDescription = badge.optString("accessibilityLabel", text)
         titleLine.addView(
           badgeView,
-          LayoutParams(LayoutParams.WRAP_CONTENT, dp(18)).apply { marginStart = dp(titleBadgeGap) },
+          // OneKey patch: preserve 18dp unless the Market row opts into source metrics.
+          // LayoutParams(LayoutParams.WRAP_CONTENT, dp(18)).apply { marginStart = dp(titleBadgeGap) },
+          LayoutParams(LayoutParams.WRAP_CONTENT, dp(badgeStyle?.optDouble("height", 18.0)?.roundToInt() ?: 18)).apply { marginStart = dp(titleBadgeGap) },
         )
       }
     }
@@ -2082,6 +2240,31 @@ internal class NativeListRowView(
         style?.optJSONObject("subtitle")?.optDouble("fontSize", 14.0)?.toFloat() ?: 14f,
       )
     }
+    // OneKey patch: preserve independent name metrics, truncation, and volume.
+    val subtitlePrefix = item.json.optJSONObject("subtitlePrefix")
+    val subtitlePadding = style?.optDouble("subtitleTrailingPadding", 0.0)?.roundToInt() ?: 0
+    if (subtitlePrefix != null || subtitlePadding > 0) {
+      mainColumn.removeView(subtitle)
+      mainColumn.removeView(tertiary)
+      marketSubtitleLine.orientation = HORIZONTAL
+      marketSubtitleLine.gravity = Gravity.CENTER_VERTICAL
+      marketSubtitleLine.packsChildrenAtStart = true
+      marketSubtitleLine.leadingTextMaxWidth = subtitlePrefix?.takeIf { it.has("maxWidth") }
+        ?.optDouble("maxWidth")?.roundToInt()?.let(::dp) ?: Int.MAX_VALUE
+      marketSubtitleLine.setPadding(0, 0, dp(subtitlePadding), 0)
+      showText(tertiary, subtitlePrefix?.optString("text") ?: "", 1)
+      applyMarketTextStyle(tertiary, subtitlePrefix?.optJSONObject("style"), 12f, 16, "regular", color(theme, "secondaryText", "#646464"), "start")
+      marketSubtitleLine.addView(tertiary, wrap())
+      marketSubtitleLine.addView(subtitle, wrap().apply {
+        if (tertiary.visibility == VISIBLE && subtitle.visibility == VISIBLE) {
+          marginStart = dp(subtitlePrefix?.optDouble("gap", 4.0)?.roundToInt() ?: 4)
+        }
+      })
+      mainColumn.addView(marketSubtitleLine, 1, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT).apply {
+        topMargin = dp(style?.optDouble("lineGap", 0.0)?.roundToInt() ?: 0)
+      })
+      marketSubtitleLine.visibility = if (tertiary.visibility == VISIBLE || subtitle.visibility == VISIBLE) VISIBLE else GONE
+    }
     trailingColumn.orientation = HORIZONTAL
     trailingColumn.gravity = Gravity.END or Gravity.CENTER_VERTICAL
     addView(trailingColumn, wrap())
@@ -2150,6 +2333,24 @@ internal class NativeListRowView(
       dp(style?.optDouble("changeWidth", 80.0)?.roundToInt() ?: 80),
       dp(style?.optDouble("changeHeight", 32.0)?.roundToInt() ?: 32),
     )
+    applyMarketTextMetrics(title, style?.optJSONObject("title"))
+    applyMarketTextMetrics(subtitle, style?.optJSONObject("subtitle"))
+    applyMarketTextMetrics(tertiary, item.json.optJSONObject("subtitlePrefix")?.optJSONObject("style"))
+    applyMarketTextMetrics(price, priceStyle)
+    applyMarketTextMetrics(change, changeStyle)
+    val badges = item.json.optJSONArray("badges")
+    marketBadgeLabels.forEachIndexed { index, label ->
+      val badge = badges?.optJSONObject(index)
+      val badgeStyle = badge?.optJSONObject("style")
+      applyMarketTextMetrics(label, badgeStyle)
+      if (badge != null && label.visibility == VISIBLE && badgeStyle?.has("horizontalPadding") == true &&
+          badge.optJSONObject("icon") == null && badge.optString("iconName").isEmpty()) {
+        // OneKey patch: match RN's intrinsic text width and one rounded padding pair.
+        label.layoutParams = wrap().apply { width = label.paint.measureText(label.text.toString()).roundToInt() }
+        val padding = badgeStyle.optDouble("horizontalPadding") * resources.displayMetrics.density
+        marketBadgeViews[index].setPadding(kotlin.math.floor(padding).toInt(), 0, (padding * 2).roundToInt() - kotlin.math.floor(padding).toInt(), 0)
+      }
+    }
     contentDescription = item.json.optString(
       "accessibilityLabel",
       listOf(
@@ -2817,16 +3018,41 @@ internal class NativeListRowView(
       )
       return
     }
+    if (isMarket && variant == "retry") {
+      val message = item.json.optString("message")
+      orientation = VERTICAL
+      gravity = Gravity.CENTER
+      setPadding(dp(32), dp(if (message.isEmpty()) 11 else 32), dp(32), dp(if (message.isEmpty()) 11 else 27))
+      if (message.isNotEmpty()) {
+        showText(title, message, 2)
+        val style = JSONObject().put("fontSize", 16).put("lineHeight", 24)
+        applyMarketTextStyle(title, style, 16f, 24, "regular", color(theme, "secondaryText", "#0000009B"), "center")
+        applyMarketTextMetrics(title, style)
+        addView(mainColumn, wrap().apply { bottomMargin = kotlin.math.ceil(7.0 * resources.displayMetrics.density).toInt() })
+      }
+      showTrailing(0, item.json.optString("actionText", "Retry"), true, item.json.optString("actionKey"))
+      val button = trailingViews[0]
+      val style = JSONObject().put("fontSize", 14).put("lineHeight", 20)
+      applyMarketTextStyle(button, style, 14f, 20, "medium", color(theme, "secondaryText", "#0000009B"), "center")
+      applyMarketTextMetrics(button, style)
+      button.background = null
+      // Match Yoga's text rounding before adding the tertiary Button's border/padding.
+      val density = resources.displayMetrics.density
+      val buttonWidth = (kotlin.math.ceil(button.paint.measureText(button.text.toString()).toDouble()) + 18 * density).roundToInt()
+      val buttonHeight = kotlin.math.ceil(kotlin.math.ceil(20.0 * density) + 10 * density).toInt()
+      button.setPadding(0, 0, 0, 0)
+      button.layoutParams = LayoutParams(buttonWidth, buttonHeight)
+      addView(trailingColumn, wrap())
+      return
+    }
     if (isMarket && variant == "noMatch") {
       gravity = Gravity.CENTER
       setPadding(dp(32), dp(32), dp(32), dp(32))
-      title.textSize = sp(16f)
-      title.typeface = NativeListFonts.regular(context)
-      title.gravity = Gravity.CENTER
-      title.setTextColor(color(theme, "secondaryText", "#0000009B"))
-      TextViewCompat.setLineHeight(title, dp(24))
       showText(title, item.json.optString("message"), 1)
-      addView(mainColumn, weighted())
+      val style = JSONObject().put("fontSize", 16).put("lineHeight", 24)
+      applyMarketTextStyle(title, style, 16f, 24, "regular", color(theme, "secondaryText", "#0000009B"), "center")
+      applyMarketTextMetrics(title, style)
+      addView(mainColumn, wrap())
       return
     }
     // OneKey patch: warning title/description wrap inside the actual scroll content.
@@ -2972,12 +3198,19 @@ internal class NativeListRowView(
     if (tokenPair) {
       leadingOverlayBackground.visibility = VISIBLE
       leadingOverlayBackground.background = roundedFill(visualBackdropColor, 10f)
+      val item = tag as? NativeListItem
+      val marketPadding = if (item?.type == "market") item.json.optJSONObject("style")?.optDouble("horizontalPadding", 20.0) ?: 20.0 else null
+      val density = resources.displayMetrics.density
+      // Yoga rounds the absolute horizontal edges, including the avatar's fractional origin.
+      val badgeRight = marketPadding?.let { ((it + sizeDp + 4) * density).roundToInt() }
+      val badgeLeft = marketPadding?.let { ((it + sizeDp - 16) * density).roundToInt() }
+      val avatarRight = marketPadding?.let { ((it + sizeDp) * density).roundToInt() }
       leadingOverlayBackground.layoutParams = FrameLayout.LayoutParams(
-        dp(20),
+        if (badgeRight != null && badgeLeft != null) badgeRight - badgeLeft else dp(20),
         dp(20),
         Gravity.END or Gravity.BOTTOM,
       ).apply {
-        marginEnd = -dp(4)
+        marginEnd = if (badgeRight != null && avatarRight != null) avatarRight - badgeRight else -dp(4)
         bottomMargin = -dp(4)
       }
     }
@@ -3019,21 +3252,26 @@ internal class NativeListRowView(
       image.clipToOutline = true
       if ((tag as? NativeListItem)?.type == "market" && index == 0 && visual.optString("borderColor").isNotEmpty()) {
         val inset = dp(1)
-        val radius = scaledDp(cornerRadiusDp ?: leadingCornerRadius(shape, minOf(sizeDp, heightDp)))
-        leadingFrame.background = GradientDrawable().apply {
-          setColor(visualBackground)
-          setStroke(inset, safeColor(visual.optString("borderColor"), Color.TRANSPARENT))
-          this.cornerRadius = radius
+        val density = resources.displayMetrics.density
+        val sourceRadius = cornerRadiusDp ?: leadingCornerRadius(shape, minOf(sizeDp, heightDp))
+        // OneKey patch: retain the source's fractional border and background rendering.
+        leadingFrame.background = null
+        BackgroundStyleApplicator.setBackgroundColor(leadingFrame, visualBackground)
+        // Match the source's physical edges: React Native rasterizes ALL as a different stroke path.
+        for (edge in arrayOf(LogicalEdge.LEFT, LogicalEdge.TOP, LogicalEdge.RIGHT, LogicalEdge.BOTTOM)) {
+          BackgroundStyleApplicator.setBorderWidth(leadingFrame, edge, 1f)
+          BackgroundStyleApplicator.setBorderColor(leadingFrame, edge, safeColor(visual.optString("borderColor"), Color.TRANSPARENT))
         }
-        image.layoutParams = FrameLayout.LayoutParams(dp(sizeDp) - inset * 2, dp(heightDp) - inset * 2).apply {
+        BackgroundStyleApplicator.setBorderRadius(leadingFrame, BorderRadiusProp.BORDER_RADIUS, LengthPercentage(sourceRadius, LengthPercentageType.POINT))
+        // OneKey patch: round the source image's absolute edges inside its border.
+        val sourceLeft = ((tag as? NativeListItem)?.json?.optJSONObject("style")?.optDouble("horizontalPadding", 20.0) ?: 20.0) * density
+        val imageWidth = (sourceLeft + (sizeDp - 1) * density).roundToInt() - (sourceLeft + density).roundToInt()
+        image.layoutParams = FrameLayout.LayoutParams(imageWidth, dp(heightDp - 2)).apply {
           leftMargin = inset
           topMargin = inset
         }
-        image.outlineProvider = object : ViewOutlineProvider() {
-          override fun getOutline(view: View, outline: Outline) {
-            outline.setRoundRect(-inset, -inset, view.width + inset, view.height + inset, radius)
-          }
-        }
+        marketLeadingUsesSourceClip = true
+        image.clipToOutline = false
       }
       val fallbackIcon = if (index == 0) visual.optJSONObject("fallbackIcon") else null
       val expectedEpoch = bindingEpoch
@@ -3497,6 +3735,13 @@ internal class NativeListRowView(
   }
 
   private fun applySize(item: NativeListItem) {
+    if (item.type == "system" && item.json.optString("presentation") == "market" &&
+      item.json.optString("variant") in setOf("retry", "noMatch")) {
+      val defaultHeight = if (item.json.optString("variant") == "noMatch") 88.0 else if (item.json.optString("message").isEmpty()) 52.0 else 120.0
+      minimumHeight = (item.json.optDouble("height", defaultHeight).toFloat() * resources.displayMetrics.density).roundToInt()
+      selectorHeight = if (item.json.has("height")) minimumHeight else null
+      return
+    }
     if (item.type == "market") {
       val style = item.json.optJSONObject("style")
       val imageHeight = style?.optJSONObject("image")?.optDouble(
@@ -3505,12 +3750,15 @@ internal class NativeListRowView(
       ) ?: if (item.json.optString("variant") == "stock") 40.0 else 32.0
       val verticalPadding = style?.optDouble("verticalPadding", 12.0) ?: 12.0
       val defaultHeight = if (item.json.optString("variant") == "stock") 72.0 else 68.0
-      minimumHeight = dp(
-        item.json.optDouble(
-          "height",
-          maxOf(defaultHeight, imageHeight + verticalPadding * 2),
-        ).roundToInt(),
+      // OneKey patch: preserve fractional DP until the final physical pixel edge.
+      val rowHeight = item.json.optDouble(
+        "height",
+        maxOf(defaultHeight, imageHeight + verticalPadding * 2),
       )
+      val sourceScale = if (selectorUsesSourceScale) 1f else NativeListScale.factor(resources)
+      minimumHeight = (rowHeight * sourceScale * resources.displayMetrics.density).roundToInt()
+      // OneKey patch: explicit Market row heights must not grow after child pixel rounding.
+      selectorHeight = if (item.json.has("height")) minimumHeight else null
       return
     }
     val isWalletSidebar =

package/android/src/main/java/com/onekey/nativelist/NativeListView.kt

@@ -94,6 +94,8 @@ class NativeListView(
   private var configuredTopPaddingPx = 0
   private var configuredBottomPaddingPx = 0
   private val refreshLayout = SwipeRefreshLayout(context)
+  private val refreshIndicatorTravelPx = refreshLayout.progressViewEndOffset
+  private var refreshIndicatorOffsetPx = 0
   private val contentContainer = FrameLayout(context)
   private val adapter = NativeListAdapter(reactContext)
   private val layoutManager = GridLayoutManager(context, 1)
@@ -251,6 +253,11 @@ class NativeListView(
         JSONObject().put("actionKey", "nativeList.refresh"),
       )
     }
+    recyclerView.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+      // OneKey patch: a collapsible pager owns the extra padding above the rows.
+      // Keep the refresh control below that header without moving ordinary lists.
+      updateRefreshIndicatorOffset((recyclerView.paddingTop - configuredTopPaddingPx).coerceAtLeast(0))
+    }
 
     recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
       override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
@@ -274,6 +281,12 @@ class NativeListView(
 
   override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
     super.onLayout(changed, left, top, right, bottom)
+    val first = config?.items?.firstOrNull()
+    if (recyclerView.isLayoutRequested && (first?.type == "market" || first?.json?.optString("presentation") == "market")) {
+      // A retained Market page can keep cached parent measurements after its diff.
+      // Drain the child's pending layout so its committed rows replace the old cells.
+      relayoutRecyclerViewImmediately()
+    }
     val nextWidth = right - left
     val nextHeight = bottom - top
     if (
@@ -288,6 +301,28 @@ class NativeListView(
     performPendingScrollIfNeeded()
   }
 
+  private fun updateRefreshIndicatorOffset(offset: Int) {
+    if (refreshIndicatorOffsetPx == offset) return
+    refreshIndicatorOffsetPx = offset
+    val refreshing = refreshLayout.isRefreshing
+    val start = offset - refreshLayout.progressCircleDiameter
+    refreshLayout.setProgressViewOffset(false, start, start + refreshIndicatorTravelPx)
+    refreshLayout.isRefreshing = refreshing
+  }
+
+  override fun onAttachedToWindow() {
+    super.onAttachedToWindow()
+    val first = config?.items?.firstOrNull()
+    if (recyclerView.isLayoutRequested && (first?.type == "market" || first?.json?.optString("presentation") == "market")) {
+      relayoutContents()
+    }
+  }
+
+  override fun onDetachedFromWindow() {
+    updateRefreshIndicatorOffset(0)
+    super.onDetachedFromWindow()
+  }
+
   fun applySnapshot(snapshotJson: String) {
     val next = try {
       NativeListConfig.parse(snapshotJson)
@@ -1121,7 +1156,12 @@ class NativeListView(
       .put("source", origin.source)
       .put("generation", generation)
       .put("layoutDirection", if (origin.sourceView.layoutDirection == LAYOUT_DIRECTION_RTL) "rtl" else "ltr")
-      .also { anchor -> origin.slot?.let { anchor.put("slot", it) } }
+      .also { anchor ->
+        origin.slot?.let { anchor.put("slot", it) }
+        origin.windowPointPixels?.let { point ->
+          anchor.put("windowPoint", JSONObject().put("x", point.x / density).put("y", point.y / density))
+        }
+      }
   }
 
   private fun isOriginValid(origin: NativeListActionOrigin): Boolean =

package/ios/NativeListCell.swift

@@ -79,6 +79,7 @@ final class NativeListActionOrigin {
   let slot: Int?
   // OneKey patch: expose the layout slot while preserving the larger hit target.
   let anchorInset: CGFloat
+  var windowPoint: CGPoint?
 
   init(
     sourceView: UIView,
@@ -443,12 +444,17 @@ final class NativeListCell: UICollectionViewCell {
   private let titleRowStack = UIStackView()
   private let titleLabel = NativeListDottedUnderlineLabel()
   private let subtitleLabel = UILabel()
+  // OneKey patch: keep Market name and volume in independent line boxes.
+  private let marketSubtitleStack = UIStackView()
+  private let marketSubtitleSpacer = UIView()
   private let tertiaryLabel = UILabel()
   private let statusLabel = NativeListInsetLabel()
   private let metricSubtitleLabel = UILabel()
   private let metricCompositeStack = UIStackView()
   private let badgeLabel = NativeListInsetLabel()
-  private let marketBadgeButtons = (0..<3).map { _ in UIButton(type: .system) }
+  // OneKey patch: reuse the existing explicit line-box layout for styled Market badges.
+  // private let marketBadgeButtons = (0..<3).map { _ in UIButton(type: .system) }
+  private let marketBadgeButtons = (0..<3).map { _ in NativeListAccessoryButton(type: .system) }
   private let marketBadgeImages = (0..<3).map { _ in OneKeyImageReusableView(frame: .zero) }
   private let actionStack = UIStackView()
   private let actionButtons = (0..<3).map { _ in UIButton(type: .system) }
@@ -797,6 +803,19 @@ final class NativeListCell: UICollectionViewCell {
 
   override func layoutSubviews() {
     super.layoutSubviews()
+    if let item = currentItem, item.type == "system", item.data.string("presentation") == "market",
+       ["noMatch", "retry"].contains(item.data.string("variant")), !titleLabel.isHidden {
+      // The cell content view owns the root constraints and must settle before reading descendants.
+      contentView.layoutIfNeeded()
+      // React Native floors text origins to physical pixels after centering the line box.
+      titleLabel.transform = .identity
+      let scale = max(1, window?.screen.scale ?? traitCollection.displayScale)
+      let origin = titleLabel.convert(titleLabel.bounds, to: contentView).origin
+      let x = floor((contentView.bounds.width - titleLabel.bounds.width) / 2 * scale) / scale
+      let contentHeight: CGFloat = item.data.string("variant") == "retry" ? 56 : 24
+      let y = floor(max(32, (contentView.bounds.height - contentHeight) / 2) * scale) / scale
+      titleLabel.transform = CGAffineTransform(translationX: x - origin.x, y: y - origin.y)
+    }
     // OneKey patch: extend only the background across the section list outer inset.
     if currentItem?.data.bool("backgroundFullWidth") == true {
       selectorFullWidthBackground.frame = CGRect(x: -frame.minX, y: 0, width: superview?.bounds.width ?? bounds.width, height: bounds.height)
@@ -1140,6 +1159,7 @@ final class NativeListCell: UICollectionViewCell {
   }
 
   private func reset() {
+    titleLabel.transform = .identity
     restoreSelectorTypography()
     // OneKey patch: remove selector decorations before rebinding recycled cells.
     selectorViews.forEach { $0.removeFromSuperview() }
@@ -1202,6 +1222,15 @@ final class NativeListCell: UICollectionViewCell {
     headerValueIconImageView.removeFromSuperview()
     headerValueIconImageView.image = nil
     headerValueIconImageView.isHidden = true
+    // OneKey patch: restore the shared labels before any recycled row binds.
+    marketSubtitleStack.arrangedSubviews.forEach {
+      marketSubtitleStack.removeArrangedSubview($0)
+      $0.removeFromSuperview()
+    }
+    mainStack.removeArrangedSubview(marketSubtitleStack)
+    marketSubtitleStack.removeFromSuperview()
+    mainStack.removeArrangedSubview(tertiaryLabel)
+    tertiaryLabel.removeFromSuperview()
     mediaMetadataStack.removeArrangedSubview(subtitleLabel)
     mediaMetadataStack.removeArrangedSubview(mediaNetworkImage)
     mediaMetadataStack.removeFromSuperview()
@@ -1211,6 +1240,7 @@ final class NativeListCell: UICollectionViewCell {
     subtitleLabel.removeFromSuperview()
     mainStack.insertArrangedSubview(titleRowStack, at: 0)
     mainStack.insertArrangedSubview(subtitleLabel, at: 1)
+    mainStack.insertArrangedSubview(tertiaryLabel, at: 2)
     leadingWidth.constant = 40
     leadingHeight.constant = 40
     leadingIconWidth.constant = 18
@@ -1265,6 +1295,13 @@ final class NativeListCell: UICollectionViewCell {
     titleLabel.textAlignment = .natural
     subtitleLabel.text = nil
     subtitleLabel.lineBreakMode = .byTruncatingTail
+    subtitleLabel.attributedText = nil
+    subtitleLabel.setContentHuggingPriority(.defaultLow, for: .horizontal)
+    subtitleLabel.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
+    tertiaryLabel.attributedText = nil
+    tertiaryLabel.lineBreakMode = .byTruncatingTail
+    tertiaryLabel.setContentHuggingPriority(.defaultLow, for: .horizontal)
+    tertiaryLabel.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
     tertiaryLabel.text = nil
     statusLabel.text = nil
     statusLabel.topInset = 0
@@ -1291,6 +1328,15 @@ final class NativeListCell: UICollectionViewCell {
       $0.isHidden = true
       $0.isEnabled = true
       $0.isUserInteractionEnabled = false
+      // OneKey patch: a recycled badge must not retain an attributed title or font.
+      $0.setAttributedTitle(nil, for: .normal)
+      $0.marketLineHeight = nil
+      $0.selectorSummaryLineHeight = nil
+      $0.titleLabel?.font = nativeListFont(ofSize: 11, weight: .medium)
+      $0.titleLabel?.numberOfLines = 1
+      $0.contentHorizontalAlignment = .center
+      $0.accessibilityLabel = nil
+      $0.accessibilityTraits = .staticText
       $0.setTitle(nil, for: .normal)
       $0.setImage(nil, for: .normal)
       $0.setTitleColor(nil, for: .normal)
@@ -2295,15 +2341,29 @@ final class NativeListCell: UICollectionViewCell {
       }
     }
     rootStack.addArrangedSubview(mainStack)
-    rootStack.setCustomSpacing(0, after: mainStack)
+    // OneKey patch: opt in to the source Market row's content gap.
+    // rootStack.setCustomSpacing(0, after: mainStack)
+    rootStack.setCustomSpacing(CGFloat(style?.double("contentTrailingGap", default: 0) ?? 0), after: mainStack)
     mainStack.spacing = CGFloat(style?.double("lineGap", default: 0) ?? 0)
     titleRowStack.spacing = CGFloat(style?.double("titleBadgeGap", default: 4) ?? 4)
+    // OneKey patch: opt in without changing the other row templates' filled layout.
+    if style?.string("titleBadgeLayout") == "inline" {
+      mainStack.alignment = .leading
+      titleRowStack.setContentHuggingPriority(.required, for: .horizontal)
+    }
     show(titleLabel, item.data.string("title"), lines: style?.dictionary("title")?.int("lines", default: 1) ?? 1)
     applyMarketTextStyle(titleLabel, data: style?.dictionary("title"), theme: theme, defaultSize: 16, defaultLineHeight: 24, defaultWeight: .medium, defaultColor: nativeListColor(theme, "primaryText", "#202020"))
     let badges = Array(item.data.dictionaries("badges").prefix(marketBadgeButtons.count))
     marketBadgeActionKeys = badges.map { $0["actionKey"] as? String }
     for (index, badge) in badges.enumerated() {
       let button = marketBadgeButtons[index]
+      let badgeStyle = badge.dictionary("style")
+      let badgeFontSize = CGFloat(badgeStyle?.double("fontSize", default: 11) ?? 11)
+      let badgeFontWeight = marketFontWeight(badgeStyle?.string("fontWeight") ?? "", fallback: .medium)
+      // OneKey patch: SizableText supplies tabular numerals for explicit Market metrics.
+      let badgeFont = badgeStyle == nil
+        ? nativeListFont(ofSize: badgeFontSize, weight: badgeFontWeight)
+        : nativeListTabularFont(ofSize: badgeFontSize, weight: badgeFontWeight)
       let hasBuiltInIcon = badge.string("iconName") == "verified"
       let hasRemoteIcon = badge.dictionary("icon") != nil
       let hasIcon = hasBuiltInIcon || hasRemoteIcon
@@ -2326,6 +2386,12 @@ final class NativeListCell: UICollectionViewCell {
       button.accessibilityTraits = button.isUserInteractionEnabled ? .button : .staticText
       button.setTitle(text, for: .normal)
       button.setTitleColor(foreground, for: .normal)
+      button.titleLabel?.font = badgeFont
+      if let lineHeight = badgeStyle?["lineHeight"] as? Double {
+        setButtonLine(button, text: text, font: badgeFont, color: foreground, lineHeight: CGFloat(lineHeight))
+        // The explicit text-only line box must not cover an adjacent icon.
+        if hasIcon { button.marketLineHeight = nil }
+      }
       button.tintColor = foreground
       button.backgroundColor = UIColor(
         nativeListHex: badge.string("backgroundColor", default: ""),
@@ -2335,7 +2401,12 @@ final class NativeListCell: UICollectionViewCell {
       )
       let iconOnly = hasIcon && text.isEmpty
       let iconSize: CGFloat = hasBuiltInIcon ? 16 : 14
-      button.contentEdgeInsets = UIEdgeInsets(top: 0, left: iconOnly ? 0 : hasRemoteIcon ? 20 : hasIcon ? 3 : 5, bottom: 0, right: iconOnly ? 0 : 5)
+      // OneKey patch: preserve the native defaults unless the caller supplies padding.
+      let padding = CGFloat(badgeStyle?.double("horizontalPadding", default: 5) ?? 5)
+      let hasCustomPadding = badgeStyle?["horizontalPadding"] != nil
+      let leftPadding = hasCustomPadding ? padding + (hasRemoteIcon ? iconSize + 2 : 0) : hasRemoteIcon ? 20 : hasIcon ? 3 : 5
+      // button.contentEdgeInsets = UIEdgeInsets(top: 0, left: iconOnly ? 0 : hasRemoteIcon ? 20 : hasIcon ? 3 : 5, bottom: 0, right: iconOnly ? 0 : 5)
+      button.contentEdgeInsets = UIEdgeInsets(top: 0, left: iconOnly ? 0 : leftPadding, bottom: 0, right: iconOnly ? 0 : padding)
       button.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: text.isEmpty ? 0 : 3)
       button.titleEdgeInsets = .zero
       button.imageView?.contentMode = .scaleAspectFit
@@ -2345,11 +2416,15 @@ final class NativeListCell: UICollectionViewCell {
           for: .normal
         )
       }
-      let height = button.heightAnchor.constraint(equalToConstant: 18)
-      let textWidth = (text as NSString).size(
-        withAttributes: [.font: nativeListFont(ofSize: 11, weight: .medium)]
-      ).width
-      let width = button.widthAnchor.constraint(equalToConstant: iconOnly ? iconSize : ceil(textWidth) + (hasIcon ? iconSize + 11 : 10))
+      // OneKey patch: match source badge metrics at physical-pixel precision.
+      // let height = button.heightAnchor.constraint(equalToConstant: 18)
+      let height = button.heightAnchor.constraint(equalToConstant: CGFloat(badgeStyle?.double("height", default: 18) ?? 18))
+      let textWidth = (text as NSString).size(withAttributes: [.font: badgeFont]).width
+      let scale = max(1, traitCollection.displayScale)
+      let roundedTextWidth = badgeStyle == nil ? ceil(textWidth) : ceil(textWidth * scale) / scale
+      let extraWidth = hasCustomPadding ? padding * 2 + (hasIcon ? iconSize + 2 : 0) : hasIcon ? iconSize + 11 : 10
+      // let width = button.widthAnchor.constraint(equalToConstant: iconOnly ? iconSize : ceil(textWidth) + (hasIcon ? iconSize + 11 : 10))
+      let width = button.widthAnchor.constraint(equalToConstant: iconOnly ? iconSize : roundedTextWidth + extraWidth)
       NSLayoutConstraint.activate([width, height])
       selectorConstraints.append(contentsOf: [width, height])
       if let icon = badge.dictionary("icon") {
@@ -2370,6 +2445,41 @@ final class NativeListCell: UICollectionViewCell {
         subtitleLabel.attributedText = marketAttributedText(item.data.string("subtitle"), segments: item.data.dictionaries("subtitleSegments"), style: style?.dictionary("subtitle"), defaultSize: 14, defaultLineHeight: 20, defaultWeight: .regular, color: nativeListColor(theme, "secondaryText", "#646464"), defaultAlignment: .natural)
       }
     }
+    // OneKey patch: preserve volume width while the localized name truncates.
+    let subtitlePrefix = item.data.dictionary("subtitlePrefix")
+    let subtitlePadding = CGFloat(style?.double("subtitleTrailingPadding", default: 0) ?? 0)
+    if subtitlePrefix != nil || subtitlePadding > 0 {
+      mainStack.removeArrangedSubview(subtitleLabel)
+      subtitleLabel.removeFromSuperview()
+      mainStack.removeArrangedSubview(tertiaryLabel)
+      tertiaryLabel.removeFromSuperview()
+      marketSubtitleStack.axis = .horizontal
+      marketSubtitleStack.alignment = .center
+      marketSubtitleStack.spacing = 0
+      marketSubtitleStack.clipsToBounds = true
+      show(tertiaryLabel, subtitlePrefix?.string("text") ?? "", lines: 1)
+      applyMarketTextStyle(tertiaryLabel, data: subtitlePrefix?.dictionary("style"), theme: theme, defaultSize: 12, defaultLineHeight: 16, defaultWeight: .regular, defaultColor: nativeListColor(theme, "secondaryText", "#646464"))
+      tertiaryLabel.setContentHuggingPriority(.required, for: .horizontal)
+      tertiaryLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+      subtitleLabel.setContentHuggingPriority(.required, for: .horizontal)
+      subtitleLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
+      marketSubtitleStack.addArrangedSubview(tertiaryLabel)
+      marketSubtitleStack.addArrangedSubview(subtitleLabel)
+      marketSubtitleStack.addArrangedSubview(marketSubtitleSpacer)
+      if !tertiaryLabel.isHidden && !subtitleLabel.isHidden {
+        marketSubtitleStack.setCustomSpacing(CGFloat(subtitlePrefix?.double("gap", default: 4) ?? 4), after: tertiaryLabel)
+      }
+      mainStack.insertArrangedSubview(marketSubtitleStack, at: 1)
+      let width = marketSubtitleStack.widthAnchor.constraint(equalTo: mainStack.widthAnchor, constant: -subtitlePadding)
+      width.isActive = true
+      selectorConstraints.append(width)
+      if let maxWidth = subtitlePrefix?["maxWidth"] as? Double {
+        let limit = tertiaryLabel.widthAnchor.constraint(lessThanOrEqualToConstant: CGFloat(maxWidth))
+        limit.isActive = true
+        selectorConstraints.append(limit)
+      }
+      marketSubtitleStack.isHidden = tertiaryLabel.isHidden && subtitleLabel.isHidden
+    }
     rootStack.addArrangedSubview(trailingStack)
     trailingStack.axis = .horizontal
     trailingStack.alignment = .center
@@ -3039,6 +3149,41 @@ final class NativeListCell: UICollectionViewCell {
       rootTopConstraint.constant = 12
       rootBottomConstraint.constant = -12
     }
+    if isMarket && variant == "retry" {
+      let message = item.data.string("message")
+      let text = item.data.string("actionText", default: "Retry")
+      rootStack.axis = .vertical
+      // The source tertiary Button has -5 vertical margins around its 30pt frame.
+      rootStack.spacing = 7
+      rootLeadingConstraint.constant = 32
+      rootTrailingConstraint.constant = -32
+      let height = CGFloat(item.data.double("height", default: message.isEmpty ? 52 : 120))
+      let top = message.isEmpty ? 11 : max(32, (height - 56) / 2)
+      rootTopConstraint.constant = top
+      rootBottomConstraint.constant = -(height - top - (message.isEmpty ? 30 : 61))
+      if !message.isEmpty {
+        show(titleLabel, message, lines: 2)
+        titleLabel.font = nativeListTabularFont(ofSize: 16)
+        titleLabel.textColor = nativeListColor(theme, "secondaryText", "#646464")
+        titleLabel.textAlignment = .center
+        setLineHeight(titleLabel, text: message, lineHeight: 24)
+        rootStack.addArrangedSubview(mainStack)
+      }
+      showAccessory(0, text, action: (item.data.string("actionKey"), nil))
+      let button = accessoryButtons[0]
+      button.backgroundColor = .clear
+      button.layer.cornerRadius = 15
+      setButtonLine(button, text: text, font: nativeListTabularFont(ofSize: 14, weight: .medium),
+                    color: nativeListColor(theme, "secondaryText", "#646464"), lineHeight: 20)
+      let textWidth = button.intrinsicContentSize.width
+      selectorConstraints.append(contentsOf: [
+        button.widthAnchor.constraint(equalToConstant: textWidth + 18),
+        button.heightAnchor.constraint(equalToConstant: 30),
+      ])
+      NSLayoutConstraint.activate(selectorConstraints)
+      rootStack.addArrangedSubview(trailingStack)
+      return
+    }
     if variant == "loading" && item.data.string("loadingStyle") == "skeleton" {
       rootLeadingConstraint.constant = 20
       rootTrailingConstraint.constant = -20
@@ -3065,12 +3210,13 @@ final class NativeListCell: UICollectionViewCell {
       return
     }
     if isMarket && variant == "noMatch" {
-      rootTopConstraint.constant = 32
-      rootBottomConstraint.constant = -32
+      let padding = max(32, (CGFloat(item.data.double("height", default: 88)) - 24) / 2)
+      rootTopConstraint.constant = padding
+      rootBottomConstraint.constant = -padding
       rootStack.addArrangedSubview(mainStack)
       mainStack.alignment = .center
       mainStack.setContentHuggingPriority(.defaultLow, for: .horizontal)
-      titleLabel.font = nativeListFont(ofSize: 16)
+      titleLabel.font = nativeListTabularFont(ofSize: 16)
       titleLabel.textColor = nativeListColor(theme, "secondaryText", "#646464")
       titleLabel.textAlignment = .center
       show(titleLabel, item.data.string("message"), lines: 1)
@@ -3080,6 +3226,8 @@ final class NativeListCell: UICollectionViewCell {
     if isMarket && variant == "end" {
       rootTopConstraint.constant = 16
       rootBottomConstraint.constant = -16
+      // OneKey patch: an empty title stack must not consume the dot's line height.
+      titleRowStack.isHidden = true
       rootStack.addArrangedSubview(mainStack)
       mainStack.alignment = .center
       mainStack.setContentHuggingPriority(.defaultLow, for: .horizontal)
@@ -3558,7 +3706,7 @@ final class NativeListCell: UICollectionViewCell {
       .foregroundColor: label.textColor as Any,
       .paragraphStyle: paragraphStyle,
     ]
-    if currentItem?.type == "market" || (currentItem?.data["height"] != nil && (["accountSelector", "walletSidebar"].contains(currentItem?.data.string("presentation") ?? "") || currentItem?.type == "sectionHeader" && currentItem?.data.string("presentation") == "networkSelector")) || currentItem?.type == "system" && currentItem?.data.string("variant") == "warning" {
+    if currentItem?.type == "market" || currentItem?.type == "system" && currentItem?.data.string("presentation") == "market" && currentItem?.data.string("variant") == "noMatch" || (currentItem?.data["height"] != nil && (["accountSelector", "walletSidebar"].contains(currentItem?.data.string("presentation") ?? "") || currentItem?.type == "sectionHeader" && currentItem?.data.string("presentation") == "networkSelector")) || currentItem?.type == "system" && currentItem?.data.string("variant") == "warning" {
       // OneKey patch: React Native centers font metrics inside explicit line heights.
       let baselineOffset = max(0, (lineHeight - label.font.lineHeight) / 2)
       // OneKey patch: TextKit's 14/20 headings align their baseline to the upper physical pixel.
@@ -3566,7 +3714,7 @@ final class NativeListCell: UICollectionViewCell {
       let scale = window?.screen.scale ?? traitCollection.displayScale
       attributes[.baselineOffset] = isSelectorHeading && scale > 0 ? ceil(baselineOffset * scale) / scale : baselineOffset
     }
-    if letterSpacing != 0 || currentItem?.type == "market" { attributes[.kern] = letterSpacing }
+    if letterSpacing != 0 || currentItem?.type == "market" || currentItem?.data.string("presentation") == "market" { attributes[.kern] = letterSpacing }
     label.attributedText = NSAttributedString(string: text, attributes: attributes)
   }
 
@@ -3581,13 +3729,14 @@ final class NativeListCell: UICollectionViewCell {
     let paragraphStyle = NSMutableParagraphStyle()
     paragraphStyle.minimumLineHeight = lineHeight
     paragraphStyle.maximumLineHeight = lineHeight
+    let isMarketText = currentItem?.type == "market" || currentItem?.type == "system" && currentItem?.data.string("presentation") == "market" && currentItem?.data.string("variant") == "retry"
     let isSelectorValue = currentItem?.data.string("presentation") == "networkSelector" && currentItem?.data["height"] != nil && currentItem?.data.string("variant") != "summary"
     let isSelectorSummary = currentItem?.type == "sectionHeader" && currentItem?.data.string("presentation") == "networkSelector" && currentItem?.data["height"] != nil && currentItem?.data.string("variant") == "summary"
     (button as? NativeListAccessoryButton)?.selectorSummaryLineHeight = isSelectorSummary ? lineHeight : nil
-    (button as? NativeListAccessoryButton)?.marketLineHeight = currentItem?.type == "market" ? lineHeight : nil
+    (button as? NativeListAccessoryButton)?.marketLineHeight = isMarketText ? lineHeight : nil
     // OneKey patch: summary text uses its source line box; currency retains trailing alignment.
     // Market's line box already handles alignment; source text starts at its origin.
-    paragraphStyle.alignment = isSelectorValue ? .right : isSelectorSummary || currentItem?.type == "market" ? .natural : .center
+    paragraphStyle.alignment = isSelectorValue ? .right : isSelectorSummary || isMarketText ? .natural : .center
     if isSelectorSummary {
       button.contentHorizontalAlignment = .leading
       button.titleLabel?.textAlignment = .natural
@@ -3596,14 +3745,14 @@ final class NativeListCell: UICollectionViewCell {
       button.contentHorizontalAlignment = .trailing
       button.titleLabel?.textAlignment = .right
     }
-    let baselineOffset: CGFloat = currentItem?.type == "market" || currentItem?.type == "sectionHeader" && currentItem?.data.string("presentation") == "networkSelector" && currentItem?.data["height"] != nil ? max(0, (lineHeight - font.lineHeight) / 2) : 0
+    let baselineOffset: CGFloat = isMarketText || currentItem?.type == "sectionHeader" && currentItem?.data.string("presentation") == "networkSelector" && currentItem?.data["height"] != nil ? max(0, (lineHeight - font.lineHeight) / 2) : 0
     var attributes: [NSAttributedString.Key: Any] = [
       .font: font,
       .foregroundColor: color,
       .paragraphStyle: paragraphStyle,
-      .baselineOffset: currentItem?.type == "market" && lineHeight == 20 && font.pointSize == 14 ? ceil(baselineOffset * max(1, traitCollection.displayScale)) / max(1, traitCollection.displayScale) : baselineOffset,
+      .baselineOffset: isMarketText && lineHeight == 20 && font.pointSize == 14 ? ceil(baselineOffset * max(1, traitCollection.displayScale)) / max(1, traitCollection.displayScale) : baselineOffset,
     ]
-    if currentItem?.type == "market" { attributes[.kern] = 0 }
+    if isMarketText { attributes[.kern] = 0 }
     button.setAttributedTitle(
       NSAttributedString(string: text, attributes: attributes),
       for: .normal

package/ios/RNCNativeListView.swift

@@ -1052,6 +1052,7 @@ final class NativeListView: UIView {
     let actionKey = item.data.string("longPressActionKey")
     guard !actionKey.isEmpty else { return }
     let origin = (collectionView.cellForItem(at: indexPath) as? NativeListCell)?.rowActionOrigin()
+    origin?.windowPoint = gesture.location(in: window)
     handleAction(item: item, actionKey: actionKey, target: nil, origin: origin)
   }
 
@@ -1478,6 +1479,9 @@ final class NativeListView: UIView {
         ? "rtl"
         : "ltr",
     ]
+    if let point = origin.windowPoint {
+      anchor["windowPoint"] = ["x": point.x, "y": point.y]
+    }
     if let slot = origin.slot { anchor["slot"] = slot }
     return anchor
   }

package/lib/module/validation.js

@@ -84,9 +84,13 @@ function assertMarketTextStyle(style, path) {
 }
 function assertMarketStyle(style, path) {
   if (!style) return;
-  for (const field of ['horizontalPadding', 'verticalPadding', 'leadingGap', 'titleBadgeGap', 'trailingGap']) {
+  for (const field of ['horizontalPadding', 'verticalPadding', 'leadingGap', 'titleBadgeGap', 'trailingGap', 'contentTrailingGap', 'subtitleTrailingPadding']) {
     assertBoundedStyleNumber(style[field], `${path}.${field}`, 0, 64);
   }
+  // OneKey patch: validate the opt-in Market badge layout.
+  if (style.titleBadgeLayout !== undefined && style.titleBadgeLayout !== 'inline') {
+    fail(`${path}.titleBadgeLayout`, 'must be inline when provided');
+  }
   assertBoundedStyleNumber(style.lineGap, `${path}.lineGap`, 0, 16);
   assertBoundedStyleNumber(style.changeWidth, `${path}.changeWidth`, 1, 160);
   assertBoundedStyleNumber(style.changeHeight, `${path}.changeHeight`, 1, 160);
@@ -111,6 +115,13 @@ function assertMarketRow(row, path) {
   }
   assertText(row.title, `${path}.title`);
   assertText(row.subtitle, `${path}.subtitle`);
+  // OneKey patch: validate the independently laid out Market name.
+  if (row.subtitlePrefix) {
+    assertText(row.subtitlePrefix.text, `${path}.subtitlePrefix.text`);
+    assertBoundedStyleNumber(row.subtitlePrefix.gap, `${path}.subtitlePrefix.gap`, 0, 64);
+    assertBoundedStyleNumber(row.subtitlePrefix.maxWidth, `${path}.subtitlePrefix.maxWidth`, 1, 320);
+    assertMarketTextStyle(row.subtitlePrefix.style, `${path}.subtitlePrefix.style`);
+  }
   assertText(row.price, `${path}.price`);
   assertText(row.change.text, `${path}.change.text`);
   assertLeadingVisual(row.leading, `${path}.leading`);
@@ -140,6 +151,10 @@ function assertMarketRow(row, path) {
     }
     badgeKeys.add(badge.key);
     assertText(badge.text, `${badgePath}.text`);
+    // OneKey patch: share typography bounds with Market text styles.
+    assertMarketTextStyle(badge.style, `${badgePath}.style`);
+    assertBoundedStyleNumber(badge.style?.height, `${badgePath}.style.height`, 1, 64);
+    assertBoundedStyleNumber(badge.style?.horizontalPadding, `${badgePath}.style.horizontalPadding`, 0, 32);
     if (badge.iconName !== undefined && badge.iconName !== 'verified') {
       fail(`${badgePath}.iconName`, 'must be verified when provided');
     }
@@ -451,6 +466,7 @@ function assertRow(row, index, path = `rows[${index}]`) {
       }
       if (row.variant === 'retry') {
         assertKey(row.actionKey, `${path}.actionKey`);
+        assertText(row.actionText, `${path}.actionText`);
       }
       break;
   }

package/lib/typescript/src/models.d.ts

@@ -50,7 +50,12 @@ export type MarketRowStyle = Readonly<{
     /** Space between title and subtitle; 0 by default, bounded to 0..16. */
     lineGap?: number;
     titleBadgeGap?: number;
+    /** OneKey patch: keep badges next to the intrinsic title width. */
+    titleBadgeLayout?: 'inline';
     trailingGap?: number;
+    /** OneKey patch: preserve separate Market content and subtitle insets. */
+    contentTrailingGap?: number;
+    subtitleTrailingPadding?: number;
     image?: MarketImageStyle;
     title?: MarketTextStyle;
     subtitle?: MarketTextStyle;
@@ -71,6 +76,14 @@ export type MarketBadgeModel = Readonly<{
     backgroundColor?: string;
     actionKey?: string;
     accessibilityLabel?: string;
+    /** OneKey patch: optional Market badge metrics; legacy native defaults remain unchanged. */
+    style?: Readonly<{
+        fontSize?: number;
+        fontWeight?: MarketTextStyle['fontWeight'];
+        lineHeight?: number;
+        height?: number;
+        horizontalPadding?: number;
+    }>;
 }>;
 export type MarketChangeModel = Readonly<{
     text: string;
@@ -319,6 +332,13 @@ export type MarketRow = RowBase & Readonly<{
     leading: LeadingVisual;
     title: string;
     subtitle?: string;
+    /** OneKey patch: localized name shrinks independently of the volume. */
+    subtitlePrefix?: Readonly<{
+        text: string;
+        gap?: number;
+        maxWidth?: number;
+        style?: MarketTextStyle;
+    }>;
     subtitleSegments?: readonly ValueTextSegment[];
     price: string;
     priceSegments?: readonly ValueTextSegment[];
@@ -415,6 +435,7 @@ export type SystemRow = RowBase & (Readonly<{
     presentation?: 'market';
     message: string;
     actionKey: string;
+    actionText?: string;
 }> | Readonly<{
     type: 'system';
     variant: 'warning';
@@ -562,6 +583,11 @@ export type NativeListActionAnchor = Readonly<{
     token: string;
     /** Window-relative logical units: CSS px on Web, points on iOS, dp on Android. */
     windowRect: NativeListWindowRect;
+    /** Actual long-press point, in the same logical units as windowRect. */
+    windowPoint?: Readonly<{
+        x: number;
+        y: number;
+    }>;
     source: NativeListActionSource;
     slot?: number;
     generation: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-native-list",
-  "version": "3.0.115",
+  "version": "3.0.116",
   "description": "Template-driven native RecyclerView and UICollectionView for React Native",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",
@@ -83,8 +83,8 @@
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
-    "@onekeyfe/react-native-image": "3.0.115",
-    "@onekeyfe/react-native-native-logger": "3.0.115",
+    "@onekeyfe/react-native-image": "3.0.116",
+    "@onekeyfe/react-native-native-logger": "3.0.116",
     "react": "*",
     "react-native": "*",
     "react-native-nitro-modules": "0.37.0"

package/src/models.ts

@@ -57,7 +57,12 @@ export type MarketRowStyle = Readonly<{
   /** Space between title and subtitle; 0 by default, bounded to 0..16. */
   lineGap?: number;
   titleBadgeGap?: number;
+  /** OneKey patch: keep badges next to the intrinsic title width. */
+  titleBadgeLayout?: 'inline';
   trailingGap?: number;
+  /** OneKey patch: preserve separate Market content and subtitle insets. */
+  contentTrailingGap?: number;
+  subtitleTrailingPadding?: number;
   image?: MarketImageStyle;
   title?: MarketTextStyle;
   subtitle?: MarketTextStyle;
@@ -79,6 +84,14 @@ export type MarketBadgeModel = Readonly<{
   backgroundColor?: string;
   actionKey?: string;
   accessibilityLabel?: string;
+  /** OneKey patch: optional Market badge metrics; legacy native defaults remain unchanged. */
+  style?: Readonly<{
+    fontSize?: number;
+    fontWeight?: MarketTextStyle['fontWeight'];
+    lineHeight?: number;
+    height?: number;
+    horizontalPadding?: number;
+  }>;
 }>;
 
 export type MarketChangeModel = Readonly<{
@@ -336,6 +349,13 @@ export type MarketRow = RowBase &
     leading: LeadingVisual;
     title: string;
     subtitle?: string;
+    /** OneKey patch: localized name shrinks independently of the volume. */
+    subtitlePrefix?: Readonly<{
+      text: string;
+      gap?: number;
+      maxWidth?: number;
+      style?: MarketTextStyle;
+    }>;
     subtitleSegments?: readonly ValueTextSegment[];
     price: string;
     priceSegments?: readonly ValueTextSegment[];
@@ -434,6 +454,7 @@ export type SystemRow = RowBase &
         presentation?: 'market';
         message: string;
         actionKey: string;
+        actionText?: string;
       }>
     | Readonly<{
         type: 'system';
@@ -764,6 +785,8 @@ export type NativeListActionAnchor = Readonly<{
   token: string;
   /** Window-relative logical units: CSS px on Web, points on iOS, dp on Android. */
   windowRect: NativeListWindowRect;
+  /** Actual long-press point, in the same logical units as windowRect. */
+  windowPoint?: Readonly<{ x: number; y: number }>;
   source: NativeListActionSource;
   slot?: number;
   generation: number;

package/src/validation.ts

@@ -162,9 +162,18 @@ function assertMarketStyle(
     'leadingGap',
     'titleBadgeGap',
     'trailingGap',
+    'contentTrailingGap',
+    'subtitleTrailingPadding',
   ] as const) {
     assertBoundedStyleNumber(style[field], `${path}.${field}`, 0, 64);
   }
+  // OneKey patch: validate the opt-in Market badge layout.
+  if (
+    style.titleBadgeLayout !== undefined &&
+    style.titleBadgeLayout !== 'inline'
+  ) {
+    fail(`${path}.titleBadgeLayout`, 'must be inline when provided');
+  }
   assertBoundedStyleNumber(style.lineGap, `${path}.lineGap`, 0, 16);
   assertBoundedStyleNumber(style.changeWidth, `${path}.changeWidth`, 1, 160);
   assertBoundedStyleNumber(style.changeHeight, `${path}.changeHeight`, 1, 160);
@@ -211,6 +220,26 @@ function assertMarketRow(row: MarketRow, path: string): void {
   }
   assertText(row.title, `${path}.title`);
   assertText(row.subtitle, `${path}.subtitle`);
+  // OneKey patch: validate the independently laid out Market name.
+  if (row.subtitlePrefix) {
+    assertText(row.subtitlePrefix.text, `${path}.subtitlePrefix.text`);
+    assertBoundedStyleNumber(
+      row.subtitlePrefix.gap,
+      `${path}.subtitlePrefix.gap`,
+      0,
+      64
+    );
+    assertBoundedStyleNumber(
+      row.subtitlePrefix.maxWidth,
+      `${path}.subtitlePrefix.maxWidth`,
+      1,
+      320
+    );
+    assertMarketTextStyle(
+      row.subtitlePrefix.style,
+      `${path}.subtitlePrefix.style`
+    );
+  }
   assertText(row.price, `${path}.price`);
   assertText(row.change.text, `${path}.change.text`);
   assertLeadingVisual(row.leading, `${path}.leading`);
@@ -246,6 +275,20 @@ function assertMarketRow(row: MarketRow, path: string): void {
     }
     badgeKeys.add(badge.key);
     assertText(badge.text, `${badgePath}.text`);
+    // OneKey patch: share typography bounds with Market text styles.
+    assertMarketTextStyle(badge.style, `${badgePath}.style`);
+    assertBoundedStyleNumber(
+      badge.style?.height,
+      `${badgePath}.style.height`,
+      1,
+      64
+    );
+    assertBoundedStyleNumber(
+      badge.style?.horizontalPadding,
+      `${badgePath}.style.horizontalPadding`,
+      0,
+      32
+    );
     if (badge.iconName !== undefined && badge.iconName !== 'verified') {
       fail(`${badgePath}.iconName`, 'must be verified when provided');
     }
@@ -797,6 +840,7 @@ function assertRow(
       }
       if (row.variant === 'retry') {
         assertKey(row.actionKey, `${path}.actionKey`);
+        assertText(row.actionText, `${path}.actionText`);
       }
       break;
   }