@onekeyfe/react-native-native-list 6.7.0-alpha.396 → 6.7.0-alpha.398

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

@@ -54,6 +54,13 @@ internal class NativeListActivityRowView(context: ThemedReactContext, fonts: Nat
     details.onAction = { key, view, source, slot -> emitAction(key, view, source, slot) }
   }
 
+  /** Host clipping for the current bind; see [nativeListActivityHostClips]. */
+  private fun setHostClipping(clips: Boolean) {
+    content.clipChildren = clips
+    clipChildren = clips
+    clipToPadding = clips
+  }
+
   override fun defaultHeight(item: NativeListItem, layout: String) =
     if (item.json.has("amounts")) 0 else if ((item.json.optJSONArray("footerActions")?.length() ?: 0) > 0) 104 else 60
 
@@ -76,6 +83,10 @@ internal class NativeListActivityRowView(context: ThemedReactContext, fonts: Nat
       setPadding(hp, vp, hp, vp)
       visual.recycle()
       details.bind(item, theme, sourceScale)
+      // This view may be reused from a legacy row whose overhanging badge
+      // switched clipping off; a rich row has no badge on the host, so restore
+      // the defaults before returning.
+      setHostClipping(nativeListActivityHostClips(rich = true, leadingOverhangs = false))
       return
     }
     details.recycle()
@@ -157,6 +168,18 @@ internal class NativeListActivityRowView(context: ThemedReactContext, fonts: Nat
       sourceScale,
       data.optJSONObject("secondaryLeading"),
     )
+    // The token network badge hangs 4dp past the 40dp visual and Android clips a
+    // child to its own bounds while its parent clips children, so with the
+    // default clipping the history rows showed the badge cut flat (OK-66071).
+    // Stop clipping the content row and this row's padding exactly when the
+    // bound visual reports such a badge (SPEC "Leading badge overhang"), as the
+    // Identity renderer does.
+    setHostClipping(
+      nativeListActivityHostClips(
+        rich = false,
+        leadingOverhangs = !hideLeading && visual.requestsUnclippedHost,
+      )
+    )
     bind(
       title,
       data.optString("title"),

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

@@ -878,19 +878,16 @@ internal class NativeListIdentityRowView(context: ThemedReactContext, fonts: Nat
       sourceScale,
       checkboxState,
       horizontal =
-        (0 until accessories.length())
-          .map { accessories.getJSONObject(it).optString("kind") }
-          .let { kinds ->
-            kinds.containsAll(listOf("value", "checkbox")) ||
-              kinds == listOf("valuePair", "menu") ||
-              kinds == listOf("valuePair", "chevron") ||
-              (kinds == listOf("icon", "chevron") &&
-                accessories.getJSONObject(0).optString("name") == "RefreshCcwOutline" &&
-                accessories.getJSONObject(0).optString("actionKey").isEmpty()) ||
-              (kinds == listOf("icon", "icon") &&
-                accessories.getJSONObject(0).optString("name") == "PencilOutline" &&
-                accessories.getJSONObject(1).optString("name") == "DragOutline")
-          },
+        nativeListIdentityTrailingIsHorizontal(
+          (0 until accessories.length()).map { index ->
+            val accessory = accessories.getJSONObject(index)
+            NativeListTrailingDescriptor(
+              kind = accessory.optString("kind"),
+              name = accessory.optString("name"),
+              actionKey = accessory.optString("actionKey"),
+            )
+          }
+        ),
     )
     trailingColumn.endInset?.let { setPadding(paddingLeft, paddingTop, it, paddingBottom) }
   }

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

@@ -23,6 +23,8 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
   private val icon = OneKeyIconView(context)
   private val unread = View(context)
   private val networkBackdrop = View(context)
+  // Ring under the secondary token of an Activity pair (SPEC "Activity leading pair").
+  private val pairBackdrop = View(context)
   private val corner = OneKeyIconView(context)
   private val cornerBackdrop = View(context)
   private val slots = mutableListOf<NativeListImageSlot>()
@@ -32,6 +34,10 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
   private var visual = JSONObject()
   private var style = JSONObject()
   private var sources = emptyList<Pair<JSONObject, String>>()
+  // Roles inside [sources]: the token `networkImage` badge and the Activity
+  // `secondaryLeading` token; null when absent.
+  private var networkIndex: Int? = null
+  private var pairIndex: Int? = null
   val fallbackTextView: TextView
     get() = fallback
 
@@ -90,7 +96,9 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
     }
 
   init {
-    listOf(fallback, icon, networkBackdrop, cornerBackdrop, corner, unread).forEach { addView(it) }
+    listOf(fallback, icon, pairBackdrop, networkBackdrop, cornerBackdrop, corner, unread).forEach {
+      addView(it)
+    }
     clipChildren = false
     clipToPadding = false
   }
@@ -119,6 +127,8 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
         "wallet" -> "avatar"
         else -> "generic"
       }
+    networkIndex = null
+    pairIndex = null
     sources =
       if (kind == "stackedImages")
         visual
@@ -132,7 +142,10 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
       else if (kind == "icon") emptyList()
       else visual.optJSONObject("image")?.let { listOf(it to variant) }.orEmpty()
     if (kind == "token" && sources.isNotEmpty())
-      visual.optJSONObject("networkImage")?.let { sources = sources + (it to "network") }
+      visual.optJSONObject("networkImage")?.let {
+        networkIndex = sources.size
+        sources = sources + (it to "network")
+      }
     secondaryVisual?.let { second ->
       val kind = second.optString("kind")
       val source =
@@ -141,7 +154,10 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
           "icon" -> null
           else -> second.optJSONObject("image")
         }
-      if (source != null)
+      if (source != null) {
+        // A second token forms a pair only next to a primary image; without one
+        // it simply takes the primary's place (OK-66071).
+        if (this.visual.optString("kind") == "token" && sources.isNotEmpty()) pairIndex = sources.size
         sources =
           sources +
             (source to
@@ -152,6 +168,7 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
                 "wallet" -> "avatar"
                 else -> "generic"
               })
+      }
     }
     while (slots.size < sources.size) {
       val slot = NativeListImageSlot(reactContext)
@@ -228,6 +245,7 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
         ) { loaded ->
           slot.view.visibility =
             if (!loaded && (index > 0 || sourceFallback)) INVISIBLE else VISIBLE
+          if (index == pairIndex) syncPairBackdrop()
           if (index == 0 && sourceFallback) {
             fallbackKey?.let {
               if (loaded) NativeListSourceFallbackState.forget(it)
@@ -242,9 +260,21 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
         }
       }
     }
-    networkBackdrop.visibility = if (kind == "token" && sources.size > 1) VISIBLE else GONE
+    networkBackdrop.visibility = if (networkIndex != null) VISIBLE else GONE
     networkBackdrop.background =
       fill(color(theme?.optString("rowBackground", "#FFFFFF") ?: "#FFFFFF"), dp(10).toFloat())
+    pairBackdrop.background =
+      fill(color(theme?.optString("rowBackground", "#FFFFFF") ?: "#FFFFFF"), 0f)
+    syncPairBackdrop()
+    // Stacking order by role: primary, pair ring, secondary token, badge
+    // backdrop, badge, corner icon. Slots are reused across binds with
+    // different roles, so the order is restored on every bind.
+    pairBackdrop.bringToFront()
+    pairIndex?.let { slots[it].view.bringToFront() }
+    networkBackdrop.bringToFront()
+    networkIndex?.let { slots[it].view.bringToFront() }
+    cornerBackdrop.bringToFront()
+    corner.bringToFront()
     val badge = visual.optJSONObject("cornerIcon")
     corner.visibility = if (badge == null) GONE else VISIBLE
     cornerBackdrop.visibility = corner.visibility
@@ -353,7 +383,7 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
         (fallbackGlyph.parent as? android.view.ViewGroup)?.removeView(fallbackGlyph)
         frame.addView(fallbackGlyph, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
       }
-      if (frame.parent == null) addView(frame)
+      if (frame.parent == null) addView(frame) else frame.bringToFront()
       overlays.add(frame to data)
     }
     previousOverlays.drop(descriptors.size).forEach { (frame, _) ->
@@ -426,28 +456,46 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
       iconSize,
       iconSize,
     )
-    val tokenPair = kind == "token" && sources.size > 1
+    val ring = dp(2)
     slots.take(sources.size).forEachIndexed { index, slot ->
-      val size =
-        if (tokenPair && index == 1) dp(16)
-        else if (sources.size == 1 || tokenPair) h else (h * 0.72f).roundToInt()
-      val x =
-        if (tokenPair && index == 1) w - size + dp(2)
-        else if (sources.size == 1 || tokenPair) 0
-        else (index * (w - size).toFloat() / maxOf(1, sources.size - 1)).roundToInt()
-      val y = if (tokenPair && index == 1) h - size + dp(2) else (h - size) / 2
-      val imageWidth = if (sources.size == 1 || tokenPair && index == 0) w else size
+      val frame =
+        nativeListLeadingSlotFrame(
+          index = index,
+          sourceCount = sources.size,
+          networkIndex = networkIndex,
+          pairIndex = pairIndex,
+          width = w,
+          height = h,
+          badgeSize = dp(16),
+          badgeOverhang = dp(2),
+          pairRing = ring,
+        )
       slot.view.measure(
-        MeasureSpec.makeMeasureSpec(imageWidth, MeasureSpec.EXACTLY),
-        MeasureSpec.makeMeasureSpec(size, MeasureSpec.EXACTLY),
+        MeasureSpec.makeMeasureSpec(frame.width, MeasureSpec.EXACTLY),
+        MeasureSpec.makeMeasureSpec(frame.height, MeasureSpec.EXACTLY),
       )
       val inset = if (index == 0) bitmapBorderWidth else 0
-      place(slot.view, x + inset, y + inset, imageWidth - 2 * inset, size - 2 * inset)
+      place(
+        slot.view,
+        frame.x + inset,
+        frame.y + inset,
+        frame.width - 2 * inset,
+        frame.height - 2 * inset,
+      )
       val imageRadius =
         if (shape == "rounded" && !style.has("shape") && !style.has("cornerRadius"))
           dp(roundedImageRadius).toFloat()
         else radius
-      val r = if (index == 0 && (sources.size == 1 || tokenPair)) imageRadius else size / 2f
+      val fillsFrame = index == 0 && pairIndex == null && (sources.size == 1 || networkIndex != null)
+      val r =
+        when {
+          fillsFrame -> imageRadius
+          // Pair members keep the token shape at their own size (rounded NFTs
+          // use the box's 10dp rule scaled to the member).
+          pairIndex != null && index != networkIndex && shape == "rounded" ->
+            minOf(dp(roundedImageRadius).toFloat(), frame.height / 4f)
+          else -> frame.height / 2f
+        }
       slot.view.outlineProvider =
         object : ViewOutlineProvider() {
           override fun getOutline(view: View, outline: Outline) {
@@ -458,6 +506,14 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
         }
       slot.view.clipToOutline = true
     }
+    if (pairIndex != null) {
+      val member = nativeListLeadingPairMemberSize(h)
+      val box = member + 2 * ring
+      (pairBackdrop.background as? GradientDrawable)?.cornerRadius =
+        if (shape == "rounded") minOf(dp(roundedImageRadius).toFloat(), member / 4f) + ring
+        else box / 2f
+      place(pairBackdrop, w - box, h - box, box, box)
+    }
     place(networkBackdrop, w - dp(16), h - dp(16), dp(20), dp(20))
     place(cornerBackdrop, w - dp(16), h - dp(16), dp(20), dp(20))
     place(corner, w - dp(15), h - dp(15), dp(18), dp(18))
@@ -487,9 +543,22 @@ internal class NativeListLeadingVisual(private val reactContext: ThemedReactCont
     }
   }
 
+  /**
+   * The pair ring sits above the primary token, so it is shown only while the
+   * secondary token image is actually displayed: hidden while that image loads,
+   * after a failed load and once the slot is recycled, or it would cover the
+   * primary's lower-right corner with a blank row-background disc.
+   */
+  private fun syncPairBackdrop() {
+    val secondary = pairIndex?.let { slots.getOrNull(it) }
+    pairBackdrop.visibility =
+      if (secondary != null && secondary.view.visibility == VISIBLE) VISIBLE else GONE
+  }
+
   fun recycle() {
     slots.forEach { it.recycle() }
     overlaySlots.forEach { it.recycle() }
+    pairBackdrop.visibility = GONE
   }
 
   fun dispose() {

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

@@ -4,6 +4,7 @@ import org.json.JSONArray
 import org.json.JSONObject
 import java.nio.ByteBuffer
 import java.security.MessageDigest
+import kotlin.math.roundToInt
 import java.util.Locale
 
 internal data class NativeSelectionTarget(val scope: String, val key: String?)
@@ -48,6 +49,96 @@ internal fun nativeListLeadingVisualOverhangsFrame(
   overlayCount: Int,
 ): Boolean = kind == "token" && sourceCount > 1 || hasCornerIcon || overlayCount > 0
 
+/**
+ * Whether an Activity row host clips its children and padding for this bind.
+ * One row view serves both the legacy row and the rich (`amounts`) row and is
+ * reused across binds, so clipping is derived from the bound item alone and
+ * applied on every bind: only a legacy row whose leading visual lays a badge
+ * past its frame ([nativeListLeadingVisualOverhangsFrame], OK-66071) opts out;
+ * a rich row keeps Android's default clipping even when the view it reuses
+ * last showed such a badge.
+ */
+internal fun nativeListActivityHostClips(rich: Boolean, leadingOverhangs: Boolean): Boolean =
+  rich || !leadingOverhangs
+
+internal data class NativeListSlotFrame(val x: Int, val y: Int, val width: Int, val height: Int)
+
+/** Side of one member of an Activity token pair inside a [frame]-unit box (24 in 40). */
+internal fun nativeListLeadingPairMemberSize(frame: Int): Int = (frame * 0.6f).roundToInt()
+
+/**
+ * Frame of image source [index] of a leading visual inside its [width]×[height]
+ * box (SPEC "Activity leading pair", OK-66071). [networkIndex] is the token
+ * `networkImage` badge and [pairIndex] the Activity `secondaryLeading` token;
+ * either is null when absent. A pair draws the primary at the top-left and the
+ * secondary at the bottom-right, both [nativeListLeadingPairMemberSize] wide and
+ * the secondary inset by its [pairRing]; the badge keeps its corner geometry
+ * above them. A lone token, or a token with only a badge, fills the box. Any
+ * other multi-source visual (stackedImages) steps 0.72-sized images diagonally.
+ */
+internal fun nativeListLeadingSlotFrame(
+  index: Int,
+  sourceCount: Int,
+  networkIndex: Int?,
+  pairIndex: Int?,
+  width: Int,
+  height: Int,
+  badgeSize: Int,
+  badgeOverhang: Int,
+  pairRing: Int,
+): NativeListSlotFrame {
+  if (index == networkIndex)
+    return NativeListSlotFrame(
+      width - badgeSize + badgeOverhang,
+      height - badgeSize + badgeOverhang,
+      badgeSize,
+      badgeSize,
+    )
+  if (pairIndex != null) {
+    val member = nativeListLeadingPairMemberSize(height)
+    return if (index == pairIndex)
+      NativeListSlotFrame(width - member - pairRing, height - member - pairRing, member, member)
+    else NativeListSlotFrame(0, 0, member, member)
+  }
+  if (sourceCount == 1 || networkIndex != null) return NativeListSlotFrame(0, 0, width, height)
+  val side = (height * 0.72f).roundToInt()
+  val x = (index * (width - side).toFloat() / maxOf(1, sourceCount - 1)).roundToInt()
+  return NativeListSlotFrame(x, (height - side) / 2, side, side)
+}
+
+internal data class NativeListTrailingDescriptor(
+  val kind: String,
+  val name: String = "",
+  val actionKey: String = "",
+)
+
+/**
+ * Identity trailing accessories stack vertically unless they form one of the
+ * pairs every platform lays out side by side. The `valuePair` + `DotVerSolid`
+ * menu icon pair (the Swap token selector's balance and row menu) matches
+ * iOS `configureTrailingStack`; stacking it put the menu under the balance and
+ * clipped both inside the fixed row height on Android only.
+ */
+internal fun nativeListIdentityTrailingIsHorizontal(
+  accessories: List<NativeListTrailingDescriptor>,
+): Boolean {
+  val kinds = accessories.map { it.kind }
+  if (kinds.containsAll(listOf("value", "checkbox"))) return true
+  if (accessories.size != 2) return false
+  val (first, second) = accessories
+  return kinds == listOf("valuePair", "menu") ||
+    kinds == listOf("valuePair", "chevron") ||
+    (kinds == listOf("valuePair", "icon") &&
+      second.name == "DotVerSolid" &&
+      second.actionKey == "menu") ||
+    (kinds == listOf("icon", "chevron") &&
+      first.name == "RefreshCcwOutline" &&
+      first.actionKey.isEmpty()) ||
+    (kinds == listOf("icon", "icon") &&
+      first.name == "PencilOutline" &&
+      second.name == "DragOutline")
+}
+
 internal fun resolveNativeListSelectorBackgroundColor(
   rowType: String,
   styleBackgroundColor: String?,

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

@@ -287,6 +287,12 @@ internal class OneKeyIconView(context: android.content.Context) : View(context)
     // use EVEN_ODD. Other existing icons retain their prior rendering behavior.
     private val actionIconFillTypes =
       mapOf(
+        // Asset-list icons the app passes by name (OK-66072 audit): absent entries drew nothing.
+        "DotVerSolid" to listOf(Path.FillType.WINDING),
+        "Document2Outline" to listOf(Path.FillType.WINDING, Path.FillType.EVEN_ODD),
+        "WalletOutline" to listOf(Path.FillType.WINDING, Path.FillType.EVEN_ODD),
+        "PlusLargeOutline" to listOf(Path.FillType.WINDING),
+        "TicketOutline" to listOf(Path.FillType.WINDING, Path.FillType.EVEN_ODD),
         "GlobusOutline" to listOf(Path.FillType.EVEN_ODD),
         "GasSolid" to listOf(Path.FillType.EVEN_ODD),
         "RefreshCcwOutline" to listOf(Path.FillType.WINDING),
@@ -333,6 +339,29 @@ internal class OneKeyIconView(context: android.content.Context) : View(context)
     // Exact 24x24 paths from app-monorepo packages/components Icon sources.
     private val iconPaths =
       mapOf(
+        "DotVerSolid" to
+          listOf(
+            "M14 18v4h-4v-4zm0-4h-4v-4h4zm0-8h-4V2h4z"
+          ),
+        "Document2Outline" to
+          listOf(
+            "M12 16H8v-2h4zm4-4H8v-2h8zm0-4H8V6h8z",
+            "M20 22H4V2h16zM6 20h12V4H6z"
+          ),
+        "WalletOutline" to
+          listOf(
+            "M15.5 13.25a1.25 1.25 0 1 1 0 2.5 1.25 1.25 0 0 1 0-2.5",
+            "M17 8h4v13H7a4 4 0 0 1-4-4V6.5A3.5 3.5 0 0 1 6.5 3H17zM5 17a2 2 0 0 0 2 2h12v-9H6.5c-.537 0-1.045-.12-1.5-.337zM6.5 5a1.5 1.5 0 1 0 0 3H15V5z"
+          ),
+        "PlusLargeOutline" to
+          listOf(
+            "M13 11h8v2h-8v8h-2v-8H3v-2h8V3h2z"
+          ),
+        "TicketOutline" to
+          listOf(
+            "M16 17.01h-2V15h2zm0-4h-2V11h2zm0-4h-2V7h2z",
+            "m22 9.927-.629.252c-1.661.665-1.661 2.977 0 3.642l.629.252V20H2v-5.927l.629-.252c1.661-.665 1.661-2.977 0-3.642L2 9.927V4h20zM4 8.636c2.5 1.52 2.499 5.207 0 6.727V18h16v-2.637c-2.499-1.52-2.5-5.208 0-6.727V6H4z"
+          ),
         "RefreshCcwOutline" to
           listOf(
             "M5 12a7 7 0 0 0 7 7 7.15 7.15 0 0 0 4.955-2h-2.943v-2h6v6h-2v-2.257A9.148 9.148 0 0 1 12 21a9 9 0 0 1-9-9v-1h2v1Zm1-6.754A9.148 9.148 0 0 1 12 3a9 9 0 0 1 9 9v1h-2v-1a7 7 0 0 0-7-7 7.15 7.15 0 0 0-4.955 2H10v2H4V3h2v2.246Z"

package/android/src/test/java/com/margelo/nitro/nativelist/NativeListActivityHostClipPolicyTest.kt

@@ -0,0 +1,29 @@
+package com.margelo.nitro.nativelist
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class NativeListActivityHostClipPolicyTest {
+  // One Activity row view serves legacy and rich rows and is reused across
+  // binds. A legacy row with an overhanging network badge switches the host's
+  // clipping off (OK-66071); the next bind must derive clipping afresh, so a
+  // rich row reusing that view clips again instead of drawing its details over
+  // a neighbouring row (PR #185 review).
+  @Test
+  fun rebindSequenceDerivesClippingFromEachBoundItem() {
+    data class Bind(val name: String, val rich: Boolean, val leadingOverhangs: Boolean, val clips: Boolean)
+
+    val binds = listOf(
+      Bind("legacy row, plain token", rich = false, leadingOverhangs = false, clips = true),
+      Bind("legacy row, network badge", rich = false, leadingOverhangs = true, clips = false),
+      Bind("rich row reusing the badge row's view", rich = true, leadingOverhangs = false, clips = true),
+      Bind("legacy row, badge again", rich = false, leadingOverhangs = true, clips = false),
+      Bind("legacy row, hidden leading", rich = false, leadingOverhangs = false, clips = true),
+    )
+
+    assertEquals(
+      binds.map(Bind::clips),
+      binds.map { nativeListActivityHostClips(rich = it.rich, leadingOverhangs = it.leadingOverhangs) },
+    )
+  }
+}

package/android/src/test/java/com/margelo/nitro/nativelist/NativeListIdentityTrailingAxisTest.kt

@@ -0,0 +1,36 @@
+package com.margelo.nitro.nativelist
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class NativeListIdentityTrailingAxisTest {
+  // Identity trailing accessories stack vertically except for the pairs iOS
+  // lays out side by side. The Swap token selector's `valuePair` + DotVerSolid
+  // menu icon was missing from the Android list, so the balance was pushed
+  // above the menu and clipped inside the 60dp row.
+  @Test
+  fun matchesTheSideBySidePairsOfIos() {
+    fun d(kind: String, name: String = "", actionKey: String = "") =
+      NativeListTrailingDescriptor(kind, name, actionKey)
+
+    val cases: List<Pair<List<NativeListTrailingDescriptor>, Boolean>> = listOf(
+      listOf(d("valuePair")) to false,
+      listOf(d("valuePair"), d("menu", actionKey = "menu")) to true,
+      listOf(d("valuePair"), d("icon", "DotVerSolid", "menu")) to true,
+      listOf(d("valuePair"), d("icon", "DotVerSolid")) to false,
+      listOf(d("valuePair"), d("icon", "InfoCircleOutline", "menu")) to false,
+      listOf(d("icon", "DotVerSolid", "menu"), d("valuePair")) to false,
+      listOf(d("valuePair"), d("chevron")) to true,
+      listOf(d("icon", "RefreshCcwOutline"), d("chevron")) to true,
+      listOf(d("icon", "RefreshCcwOutline", "refresh"), d("chevron")) to false,
+      listOf(d("icon", "PencilOutline", "edit"), d("icon", "DragOutline")) to true,
+      listOf(d("value"), d("checkbox")) to true,
+      listOf(d("valuePair"), d("icon", "DotVerSolid", "menu"), d("chevron")) to false,
+    )
+
+    assertEquals(
+      cases.map { it.second },
+      cases.map { nativeListIdentityTrailingIsHorizontal(it.first) },
+    )
+  }
+}

package/android/src/test/java/com/margelo/nitro/nativelist/NativeListLeadingSlotFrameTest.kt

@@ -0,0 +1,68 @@
+package com.margelo.nitro.nativelist
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class NativeListLeadingSlotFrameTest {
+  // 40dp box, 16dp badge hanging 2dp past the frame, 2dp pair ring.
+  private fun frame(index: Int, count: Int, network: Int? = null, pair: Int? = null) =
+    nativeListLeadingSlotFrame(
+      index = index,
+      sourceCount = count,
+      networkIndex = network,
+      pairIndex = pair,
+      width = 40,
+      height = 40,
+      badgeSize = 16,
+      badgeOverhang = 2,
+      pairRing = 2,
+    )
+
+  private val full = NativeListSlotFrame(0, 0, 40, 40)
+  private val badge = NativeListSlotFrame(26, 26, 16, 16)
+  private val primary = NativeListSlotFrame(0, 0, 24, 24)
+  private val secondary = NativeListSlotFrame(14, 14, 24, 24)
+
+  @Test
+  fun loneTokenFillsTheBox() {
+    assertEquals(full, frame(0, 1))
+  }
+
+  @Test
+  fun tokenWithNetworkBadgeKeepsTheCornerBadge() {
+    assertEquals(listOf(full, badge), listOf(frame(0, 2, network = 1), frame(1, 2, network = 1)))
+  }
+
+  // OK-66071: the history swap rows bind [send, network, receive]. Android laid
+  // the receive token over the whole box, hiding the send token and the network
+  // badge; iOS drew it in the badge's corner slot over the badge.
+  @Test
+  fun activityPairStepsTheSecondaryToTheBottomRightUnderTheBadge() {
+    assertEquals(
+      listOf(primary, badge, secondary),
+      (0 until 3).map { frame(it, 3, network = 1, pair = 2) },
+    )
+  }
+
+  @Test
+  fun activityPairWithoutNetworkBadge() {
+    assertEquals(listOf(primary, secondary), listOf(frame(0, 2, pair = 1), frame(1, 2, pair = 1)))
+  }
+
+  @Test
+  fun pairMemberIsSixTenthsOfTheBox() {
+    assertEquals(listOf(24, 19, 29), listOf(40, 32, 48).map(::nativeListLeadingPairMemberSize))
+  }
+
+  @Test
+  fun stackedImagesStepDiagonally() {
+    assertEquals(
+      listOf(
+        NativeListSlotFrame(0, 5, 29, 29),
+        NativeListSlotFrame(6, 5, 29, 29),
+        NativeListSlotFrame(11, 5, 29, 29),
+      ),
+      (0 until 3).map { frame(it, 3) },
+    )
+  }
+}

package/docs/SPEC.md

@@ -51,6 +51,24 @@ ordinary press for that gesture. Motion cancellation, row rebind/recycle,
 disabled state and disposal cancel pending recognition. Trailing accessory
 actions remain independent. Omission preserves existing tap behavior.
 
+Identity trailing accessories stack vertically, except for the pairs every
+platform lays out side by side: `value` + `checkbox`, `valuePair` + `menu`,
+`valuePair` + an `icon` named `DotVerSolid` whose `actionKey` is `menu`,
+`valuePair` + `chevron`, a `RefreshCcwOutline` icon without an action key +
+`chevron`, and `PencilOutline` + `DragOutline` icons. iOS decides this in
+`configureTrailingStack`; Android in `nativeListIdentityTrailingIsHorizontal`
+(JVM test `NativeListIdentityTrailingAxisTest`). The `valuePair` + menu-icon
+pair is the Swap token selector's balance column and row menu; stacking it
+clipped both inside the fixed 60dp row on Android.
+
+Icon names are a closed set drawn from the app's 24-unit Icon sources on every
+platform (`iconPaths` on Android, `NativeListIcons.xcassets` on iOS,
+`selectorIcons` on Web); an unmapped name renders an empty slot rather than a
+placeholder. The set includes every name the app's NativeList builders pass,
+including `DotVerSolid`, `Document2Outline`, `WalletOutline`, `PlusLargeOutline`
+and `TicketOutline` (added 2026-10-30 after the OK-66072 audit found them missing
+on native).
+
 A `message` row may opt into `bodyLines: 0`; its complete body wraps within its
 existing text area and determines natural height unless an explicit row or
 container height overrides it. Existing omitted and one-to-three-line behavior
@@ -164,7 +182,11 @@ Status: implemented in source for local consumers, unreleased. Focused validatio
 Web DOM tests, native builds and device acceptance are tracked separately below.
 The optional `identity.titleIcon` is a static, non-actionable icon after the
 title: a 20-point glyph with a 4-point gap, optional tint and accessibility
-label. Its optional Web-only `hoverActionKey` emits an anchored help action
+label. "After the title" means directly after the title text: the title row
+packs at its start on every platform (Android `PackedTitleLineLayout`, Web flex
+`0 1 auto`, iOS a slack-absorbing filler at the end of the title row), so the
+glyph and any badge follow the text and never drift toward the trailing column
+(OK-66041). Its optional Web-only `hoverActionKey` emits an anchored help action
 from the icon alone on mouse/pen hover or touch press; the consumer owns the
 tooltip. Mouse/pen press closes the anchor until pointer leave. Touch press
 toggles the icon anchor. The icon adds no tab stop or separate click action;
@@ -571,7 +593,8 @@ an action-less accessory as a `span`, so its click reaches the row.
 ### Leading badge overhang (OK-65694)
 
 Status: implemented on Android, the only platform that clipped. Android JVM
-policy test (`NativeListLeadingVisualClipPolicyTest`); Android emulator
+policy tests (`NativeListLeadingVisualClipPolicyTest`,
+`NativeListActivityHostClipPolicyTest`); Android emulator
 acceptance on the example account selector (API 36, 2026-10-27) is recorded in
 the changelog entry. iOS and Web are unchanged.
 
@@ -590,6 +613,12 @@ overhanging badge (`requestsUnclippedHost`, decided by
 already do for their network badges; a visual without such a badge keeps the
 row's default clipping.
 
+Host clipping is per-bind state. A row view that serves several row shapes
+(the Android Activity view serves the legacy row and the rich `amounts` row) is
+reused across binds, so each bind MUST derive clipping from the item it binds
+(`nativeListActivityHostClips`): a view that last showed an overhanging badge
+clips again when it is rebound to a row without one.
+
 The row's own shape still clips on every platform: iOS masks the cell to its
 corner radius (`masksToBounds`), Web keeps the row `overflow: hidden`, and
 Android keeps `clipToOutline` for a `style.container.cornerRadius` row (its
@@ -601,6 +630,34 @@ padding. The example `NativeListRowStylePage` row `identity-badge-rounded`
 combines both badges with `container.cornerRadius` as the rendering check for
 that combination.
 
+### Activity leading pair (OK-66071)
+
+Status: implemented on iOS and Android; Web already drew the pair. Android JVM
+geometry test (`NativeListLeadingSlotFrameTest`); Android emulator acceptance on
+the example row-style page is recorded in the changelog entry.
+
+An Activity row whose `leading` and `secondaryLeading` are both tokens with an
+image (the app's swap and multi-asset history rows) draws them as a pair inside
+the 40-unit visual box, as the legacy avatar and the Web renderer do: the
+primary token at the top-left at 0.6 of the box (24 units), the secondary at the
+same size at the bottom-right inside a 2-unit ring in the row background, above
+the primary. The ring is shown only while the secondary image is displayed:
+while that image loads, after a failed load and after recycling it stays hidden,
+so it never covers the primary's corner with a blank disc. The token `networkImage` badge, when present, keeps its single-token
+geometry at the box's bottom-right corner above the secondary; a pair shows one
+badge, never one per member. A secondary token without an image leaves the
+primary alone at full size, and a primary without an image lets the secondary
+take its place. Before this rule Android laid the secondary over the whole box
+(hiding the primary and the badge) and iOS drew it in the badge's corner slot
+over the badge. The per-source geometry is one pure function on Android
+(`nativeListLeadingSlotFrame`) and the same arithmetic in
+`NativeListLeadingVisual.layoutSubviews` on iOS; both restore the stacking
+order by role on every bind because slots are reused across roles.
+
+The Android Activity renderer also applies the badge-overhang rule above
+(`requestsUnclippedHost` stops the content row and the row padding clipping),
+so the history rows' network badges render whole instead of cut flat.
+
 ## Failures, fallback and limits
 
 Snapshot validation rejects malformed/duplicate-key input without partial

package/ios/NativeListDesignAssets.swift

@@ -139,6 +139,12 @@ func nativeListIcon(named name: String) -> UIImage? {
   case "ErrorSolid": assetName = "onekey_error_solid"
   case "QuestionmarkSolid": assetName = "onekey_questionmark_solid"
   case "ImageSquareWavesOutline": assetName = "onekey_image_square_waves"
+  // Asset-list icons the app passes by name (OK-66072 audit): unmapped names rendered nothing.
+  case "DotVerSolid": assetName = "onekey_dot_ver_solid"
+  case "Document2Outline": assetName = "onekey_document2"
+  case "WalletOutline": assetName = "onekey_wallet"
+  case "PlusLargeOutline": assetName = "onekey_plus_large"
+  case "TicketOutline": assetName = "onekey_ticket"
   default: return nil
   }
   return UIImage(named: assetName, in: NativeListResources.bundle, compatibleWith: nil)?

package/ios/NativeListIdentityRenderer.swift

@@ -107,6 +107,10 @@ final class NativeListIdentityCell: NativeListRendererCell {
   private let titleRowStack = UIStackView()
   private let titleLabel = NativeListTextLabel()
   private let titleIconView = UIImageView()
+  // Absorbs the title row's slack so the title keeps its intrinsic width and the
+  // title icon / badge follow the text (OK-66041); Android's PackedTitleLineLayout
+  // and the Web flex row already pack the title row at its start.
+  private let titleRowFiller = UIView()
   private let subtitleLabel = NativeListTextLabel()
   private let tertiaryLabel = NativeListTextLabel()
   private let badgeLabel = NativeListInsetLabel()
@@ -164,6 +168,9 @@ final class NativeListIdentityCell: NativeListRendererCell {
     titleRowStack.addArrangedSubview(titleLabel)
     titleRowStack.addArrangedSubview(titleIconView)
     titleRowStack.addArrangedSubview(badgeLabel)
+    titleRowStack.addArrangedSubview(titleRowFiller)
+    titleRowFiller.setContentHuggingPriority(UILayoutPriority(1), for: .horizontal)
+    titleRowFiller.setContentCompressionResistancePriority(UILayoutPriority(1), for: .horizontal)
     titleIconView.translatesAutoresizingMaskIntoConstraints = false
     let titleIconWidth = titleIconView.widthAnchor.constraint(equalToConstant: 20)
     titleIconWidth.priority = UILayoutPriority(999)
@@ -291,6 +298,10 @@ final class NativeListIdentityCell: NativeListRendererCell {
       titleIconView.accessibilityLabel = label.isEmpty ? nil : label
       titleIconView.isAccessibilityElement = !label.isEmpty
       titleRowStack.setCustomSpacing(4, after: titleLabel)
+      // A long title truncates ahead of the 20pt glyph (Android caps the title
+      // at row width minus accessories, Web shrinks the title first); with the
+      // title at `.required` the icon's 999 width constraint collapsed to 0.
+      titleLabel.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
     }
     if let ratio = style["leadingContentMaxWidthRatio"] as? NSNumber,
       root.arrangedSubviews.contains(visual)
@@ -351,8 +362,19 @@ final class NativeListIdentityCell: NativeListRendererCell {
         : style.dictionary("container")?.string("contentVerticalAlignment") == "bottom"
           ? .bottom : .center
     }
+    settleTitleRowFillerSpacing()
     applySelectorTypography(item)
   }
+
+  /// The filler is the title row's last arranged view; the stack's default
+  /// spacing before it would shave 8pt off the title's available width (visible
+  /// under `leadingContentMaxWidthRatio`), so the gap before the filler is zero.
+  private func settleTitleRowFillerSpacing() {
+    let visible = titleRowStack.arrangedSubviews.filter { $0 !== titleRowFiller && !$0.isHidden }
+    if let last = visible.last {
+      titleRowStack.setCustomSpacing(0, after: last)
+    }
+  }
   override func bindSelectionContent(
     _ item: NativeListItem,
     checkboxState: (NativeListItem, NativeSelectionTarget?, String) -> String
@@ -593,7 +615,10 @@ final class NativeListIdentityCell: NativeListRendererCell {
           limit.isActive = true
           selectorConstraints.append(limit)
         }
-        titleRowStack.insertArrangedSubview(label, at: titleRowStack.arrangedSubviews.count - 1)
+        titleRowStack.insertArrangedSubview(
+          label,
+          at: titleRowStack.arrangedSubviews.firstIndex(of: badgeLabel)
+            ?? titleRowStack.arrangedSubviews.count)
         selectorViews.append(label)
       }
     }

package/ios/NativeListLeadingVisual.swift

@@ -17,6 +17,8 @@ final class NativeListLeadingVisual: UIView {
   private let icon = UIImageView()
   private let unread = UIView()
   private let networkBackdrop = UIView()
+  // Ring under the secondary token of an Activity pair (SPEC "Activity leading pair").
+  private let pairBackdrop = UIView()
   private let corner = UIImageView()
   private let cornerBackdrop = UIView()
   private var slots: [NativeListImageSlot] = []
@@ -27,10 +29,14 @@ final class NativeListLeadingVisual: UIView {
   private var visual: [String: Any] = [:]
   private var imageStyle: [String: Any] = [:]
   private var sources: [([String: Any], String)] = []
+  // Roles inside `sources`: the token `networkImage` badge and the Activity
+  // `secondaryLeading` token; nil when absent.
+  private var networkIndex: Int?
+  private var pairIndex: Int?
 
   override init(frame: CGRect) {
     super.init(frame: frame)
-    [fallback, icon, networkBackdrop, cornerBackdrop, corner, unread].forEach(addSubview)
+    [fallback, icon, pairBackdrop, networkBackdrop, cornerBackdrop, corner, unread].forEach(addSubview)
     fallback.textAlignment = .center
     fallback.font = nativeListFont(ofSize: 13, weight: .bold, fonts: fonts)
     icon.contentMode = .scaleAspectFit
@@ -57,11 +63,14 @@ final class NativeListLeadingVisual: UIView {
       kind == "token"
       ? "token"
       : kind == "network" ? "network" : ["account", "wallet"].contains(kind) ? "avatar" : "generic"
+    networkIndex = nil
+    pairIndex = nil
     sources =
       kind == "stackedImages"
       ? visual.dictionaries("images").prefix(3).map { ($0, "generic") }
       : kind == "icon" ? [] : visual.dictionary("image").map { [($0, variant)] } ?? []
     if kind == "token", !sources.isEmpty, let network = visual.dictionary("networkImage") {
+      networkIndex = sources.count
       sources.append((network, "network"))
     }
     if let secondaryVisual {
@@ -71,6 +80,9 @@ final class NativeListLeadingVisual: UIView {
         ? secondaryVisual.dictionaries("images").first
         : secondaryKind == "icon" ? nil : secondaryVisual.dictionary("image")
       if let source {
+        // A second token forms a pair only next to a primary image; without one
+        // it simply takes the primary's place (OK-66071).
+        if kind == "token", !sources.isEmpty { pairIndex = sources.count }
         sources.append(
           (
             source,
@@ -132,6 +144,7 @@ final class NativeListLeadingVisual: UIView {
         fit: index == 0 ? style["contentFit"] as? String : nil, placeholder: placeholder
       ) { [weak self, weak slot] loaded in
         slot?.view.isHidden = !loaded && (index > 0 || sourceFallback)
+        if let self, index == self.pairIndex { self.syncPairBackdrop() }
         guard let self, index == 0, sourceFallback else { return }
         if let fallbackKey {
           if loaded {
@@ -146,8 +159,19 @@ final class NativeListLeadingVisual: UIView {
         self.icon.isHidden = loaded || fallbackIcon == nil
       }
     }
-    networkBackdrop.isHidden = !(kind == "token" && sources.count > 1)
+    networkBackdrop.isHidden = networkIndex == nil
     networkBackdrop.backgroundColor = nativeListColor(theme, "rowBackground", "#FFFFFF")
+    pairBackdrop.backgroundColor = nativeListColor(theme, "rowBackground", "#FFFFFF")
+    syncPairBackdrop()
+    // Stacking order by role: primary, pair ring, secondary token, badge
+    // backdrop, badge, corner icon. Slots are reused across binds with
+    // different roles, so the order is restored on every bind.
+    bringSubviewToFront(pairBackdrop)
+    if let pairIndex { bringSubviewToFront(slots[pairIndex].view) }
+    bringSubviewToFront(networkBackdrop)
+    if let networkIndex { bringSubviewToFront(slots[networkIndex].view) }
+    bringSubviewToFront(cornerBackdrop)
+    bringSubviewToFront(corner)
     let badge = visual.dictionary("cornerIcon")
     corner.isHidden = badge == nil
     cornerBackdrop.isHidden = badge == nil
@@ -229,7 +253,7 @@ final class NativeListLeadingVisual: UIView {
       frame.subviews.forEach { $0.removeFromSuperview() }
       frame.addSubview(child)
       if data.dictionary("image") != nil && fallbackData != nil { frame.addSubview(fallbackGlyph) }
-      if frame.superview == nil { addSubview(frame) }
+      if frame.superview == nil { addSubview(frame) } else { bringSubviewToFront(frame) }
       overlays.append((frame, data))
     }
     previousOverlays.dropFirst(descriptors.count).forEach { $0.0.removeFromSuperview() }
@@ -284,13 +308,22 @@ final class NativeListLeadingVisual: UIView {
     icon.frame = CGRect(
       x: (bounds.width - iconSize) / 2, y: (bounds.height - iconSize) / 2, width: iconSize,
       height: iconSize)
-    let tokenPair = kind == "token" && sources.count > 1
+    // Same geometry as Android's `nativeListLeadingSlotFrame` (SPEC "Activity leading pair").
+    let pairMember = (bounds.height * 0.6).rounded()
+    let pairRing: CGFloat = 2
     for (index, slot) in slots.prefix(sources.count).enumerated() {
       let frame: CGRect
-      if sources.count == 1 || tokenPair && index == 0 {
-        frame = bounds
-      } else if tokenPair {
+      if index == networkIndex {
         frame = CGRect(x: bounds.width - 14, y: bounds.height - 14, width: 16, height: 16)
+      } else if pairIndex != nil {
+        frame =
+          index == pairIndex
+          ? CGRect(
+            x: bounds.width - pairMember - pairRing, y: bounds.height - pairMember - pairRing,
+            width: pairMember, height: pairMember)
+          : CGRect(x: 0, y: 0, width: pairMember, height: pairMember)
+      } else if sources.count == 1 || networkIndex != nil {
+        frame = bounds
       } else {
         let side = bounds.height * 0.72
         frame = CGRect(
@@ -302,10 +335,23 @@ final class NativeListLeadingVisual: UIView {
       slot.view.clipsToBounds =
         !(singleOuterMask && sources.count == 1 && overlays.isEmpty
         && visual.dictionary("cornerIcon") == nil)
+      let fillsFrame = index == 0 && pairIndex == nil && (sources.count == 1 || networkIndex != nil)
+      // Pair members keep the token shape at their own size (rounded NFTs use
+      // the box's 10pt rule scaled to the member).
+      let pairRadius: CGFloat = shape == "rounded" ? min(10, frame.height / 4) : frame.height / 2
       slot.view.layer.cornerRadius =
         index == 0 && singleOuterMask && sources.count == 1 && overlays.isEmpty
           && visual.dictionary("cornerIcon") == nil
-        ? 0 : index == 0 && (sources.count == 1 || tokenPair) ? radius : frame.height / 2
+        ? 0
+        : fillsFrame
+          ? radius : pairIndex != nil && index != networkIndex ? pairRadius : frame.height / 2
+    }
+    if pairIndex != nil {
+      let box = pairMember + 2 * pairRing
+      pairBackdrop.frame = logical(
+        CGRect(x: bounds.width - box, y: bounds.height - box, width: box, height: box))
+      pairBackdrop.layer.cornerRadius =
+        shape == "rounded" ? min(10, pairMember / 4) + pairRing : box / 2
     }
     for (index, slot) in slots.enumerated() {
       if index == 0 && bitmapBorderWidth > 0 {
@@ -381,9 +427,22 @@ final class NativeListLeadingVisual: UIView {
       UIBezierPath(ovalIn: bounds.insetBy(dx: dashedBorderWidth / 2, dy: dashedBorderWidth / 2))
       .cgPath
   }
+  /// The pair ring sits above the primary token, so it is shown only while the
+  /// secondary token image is actually displayed: hidden while that image loads,
+  /// after a failed load and once the slot is recycled, or it would cover the
+  /// primary's lower-right corner with a blank row-background disc.
+  private func syncPairBackdrop() {
+    guard let pairIndex, slots.indices.contains(pairIndex) else {
+      pairBackdrop.isHidden = true
+      return
+    }
+    pairBackdrop.isHidden = slots[pairIndex].view.isHidden
+  }
+
   func recycle() {
     slots.forEach { $0.recycle() }
     overlaySlots.forEach { $0.recycle() }
+    pairBackdrop.isHidden = true
   }
   /// Empty slot (legacy leading container without a visual): no image, fallback, fill,
   /// border or overlays from a previous binding.
@@ -399,6 +458,9 @@ final class NativeListLeadingVisual: UIView {
     icon.image = nil
     icon.isHidden = true
     networkBackdrop.isHidden = true
+    pairBackdrop.isHidden = true
+    networkIndex = nil
+    pairIndex = nil
     corner.isHidden = true
     cornerBackdrop.isHidden = true
     unread.isHidden = true

package/ios/Resources/NativeListIcons.xcassets/onekey_document2.imageset/Contents.json

@@ -0,0 +1 @@
+{"images":[{"filename":"icon.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true,"template-rendering-intent":"template"}}

package/ios/Resources/NativeListIcons.xcassets/onekey_document2.imageset/icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000"><path d="M12 16H8v-2h4zm4-4H8v-2h8zm0-4H8V6h8z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M20 22H4V2h16zM6 20h12V4H6z"/></svg>

package/ios/Resources/NativeListIcons.xcassets/onekey_dot_ver_solid.imageset/Contents.json

@@ -0,0 +1 @@
+{"images":[{"filename":"icon.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true,"template-rendering-intent":"template"}}

package/ios/Resources/NativeListIcons.xcassets/onekey_dot_ver_solid.imageset/icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000"><path d="M14 18v4h-4v-4zm0-4h-4v-4h4zm0-8h-4V2h4z"/></svg>

package/ios/Resources/NativeListIcons.xcassets/onekey_plus_large.imageset/Contents.json

@@ -0,0 +1 @@
+{"images":[{"filename":"icon.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true,"template-rendering-intent":"template"}}

package/ios/Resources/NativeListIcons.xcassets/onekey_plus_large.imageset/icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000"><path d="M13 11h8v2h-8v8h-2v-8H3v-2h8V3h2z"/></svg>

package/ios/Resources/NativeListIcons.xcassets/onekey_ticket.imageset/Contents.json

@@ -0,0 +1 @@
+{"images":[{"filename":"icon.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true,"template-rendering-intent":"template"}}

package/ios/Resources/NativeListIcons.xcassets/onekey_ticket.imageset/icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000"><path d="M16 17.01h-2V15h2zm0-4h-2V11h2zm0-4h-2V7h2z"/><path fill-rule="evenodd" clip-rule="evenodd" d="m22 9.927-.629.252c-1.661.665-1.661 2.977 0 3.642l.629.252V20H2v-5.927l.629-.252c1.661-.665 1.661-2.977 0-3.642L2 9.927V4h20zM4 8.636c2.5 1.52 2.499 5.207 0 6.727V18h16v-2.637c-2.499-1.52-2.5-5.208 0-6.727V6H4z"/></svg>

package/ios/Resources/NativeListIcons.xcassets/onekey_wallet.imageset/Contents.json

@@ -0,0 +1 @@
+{"images":[{"filename":"icon.svg","idiom":"universal"}],"info":{"author":"xcode","version":1},"properties":{"preserves-vector-representation":true,"template-rendering-intent":"template"}}

package/ios/Resources/NativeListIcons.xcassets/onekey_wallet.imageset/icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#000"><path d="M15.5 13.25a1.25 1.25 0 1 1 0 2.5 1.25 1.25 0 0 1 0-2.5"/><path fill-rule="evenodd" clip-rule="evenodd" d="M17 8h4v13H7a4 4 0 0 1-4-4V6.5A3.5 3.5 0 0 1 6.5 3H17zM5 17a2 2 0 0 0 2 2h12v-9H6.5c-.537 0-1.045-.12-1.5-.337zM6.5 5a1.5 1.5 0 1 0 0 3H15V5z"/></svg>

package/ios/tests/NativeListIdentityTitleIconLayoutTests.swift

@@ -0,0 +1,81 @@
+import UIKit
+import XCTest
+@testable import NativeListModule
+
+@MainActor
+final class NativeListIdentityTitleIconLayoutTests: XCTestCase {
+  private func child<T>(_ cell: NativeListIdentityCell, _ label: String, as type: T.Type) throws -> T {
+    try XCTUnwrap(Mirror(reflecting: cell).children.first { $0.label == label }?.value as? T)
+  }
+
+  // OK-66041: the Home native-token row carries a GasSolid `titleIcon`. The
+  // glyph must sit right after the title text (4pt gap), as Android's
+  // PackedTitleLineLayout and the Web flex row already do. iOS let the title
+  // label stretch across the whole title row, so the icon landed next to the
+  // trailing value column instead of beside "ETH".
+  func testTitleIconFollowsTheTitleTextInsteadOfTheRowEnd() throws {
+    let cell = NativeListIdentityCell(frame: CGRect(x: 0, y: 0, width: 390, height: 60))
+    let window = UIWindow(frame: CGRect(x: 0, y: 0, width: 390, height: 200))
+    window.addSubview(cell)
+    let titleIcon = try child(cell, "titleIconView", as: UIImageView.self)
+    let titleLabel = try child(cell, "titleLabel", as: UILabel.self)
+    let titleStack = try child(cell, "titleRowStack", as: UIStackView.self)
+    let item = try NativeListItem(data: [
+      "key": "eth", "type": "identity", "title": "ETH", "height": 60,
+      "leading": ["kind": "token", "fallbackIcon": ["name": "CryptoCoinOutline"]],
+      "titleIcon": ["name": "GasSolid"],
+      "subtitleSegments": [
+        ["text": "$2,330.23", "tone": "secondary"],
+        ["text": "+0.23%", "tone": "positive", "separatorBefore": true],
+      ],
+      "trailing": [["kind": "valuePair", "primary": "0.00001417", "secondary": "$0.03"]],
+    ])
+    cell.bind(item: item, theme: nil, layout: "linear", selected: false,
+      checkboxState: { _, _, fallback in fallback }, fonts: NativeListFontFamilies())
+    cell.layoutIfNeeded()
+
+    XCTAssertFalse(titleIcon.isHidden)
+    // The title keeps its intrinsic width; the slack goes to the end of the row.
+    XCTAssertEqual(
+      titleLabel.bounds.width, titleLabel.intrinsicContentSize.width, accuracy: 1,
+      "title label must not stretch across the title row")
+    let labelFrame = titleLabel.convert(titleLabel.bounds, to: cell)
+    let iconFrame = titleIcon.convert(titleIcon.bounds, to: cell)
+    XCTAssertEqual(iconFrame.minX, labelFrame.maxX + 4, accuracy: 1,
+      "gas icon must follow the title text with the 4pt gap")
+    let iconInRow = titleIcon.convert(titleIcon.bounds, to: titleStack)
+    XCTAssertLessThan(iconInRow.maxX, titleStack.bounds.width / 2,
+      "gas icon must stay in the leading half of the title row, not at the value column")
+  }
+
+  // A long title still truncates in front of the icon instead of pushing it
+  // out of the row, and the badge keeps following the icon.
+  func testLongTitleTruncatesAndKeepsIconAndBadgeAdjacent() throws {
+    let cell = NativeListIdentityCell(frame: CGRect(x: 0, y: 0, width: 320, height: 60))
+    let window = UIWindow(frame: CGRect(x: 0, y: 0, width: 320, height: 200))
+    window.addSubview(cell)
+    let titleIcon = try child(cell, "titleIconView", as: UIImageView.self)
+    let titleLabel = try child(cell, "titleLabel", as: UILabel.self)
+    let badge = try child(cell, "badgeLabel", as: UILabel.self)
+    let item = try NativeListItem(data: [
+      "key": "long", "type": "identity",
+      "title": "A very long token name that cannot possibly fit on one line", "height": 60,
+      "leading": ["kind": "token", "fallbackIcon": ["name": "CryptoCoinOutline"]],
+      "titleIcon": ["name": "GasSolid"],
+      "badges": [["key": "native", "text": "Native"]],
+      "trailing": [["kind": "valuePair", "primary": "1.00", "secondary": "$1.00"]],
+    ])
+    cell.bind(item: item, theme: nil, layout: "linear", selected: false,
+      checkboxState: { _, _, fallback in fallback }, fonts: NativeListFontFamilies())
+    cell.layoutIfNeeded()
+
+    let labelFrame = titleLabel.convert(titleLabel.bounds, to: cell)
+    let iconFrame = titleIcon.convert(titleIcon.bounds, to: cell)
+    let badgeFrame = badge.convert(badge.bounds, to: cell)
+    XCTAssertEqual(titleIcon.bounds.width, 20, accuracy: 0.5)
+    XCTAssertEqual(iconFrame.minX, labelFrame.maxX + 4, accuracy: 1)
+    XCTAssertFalse(badge.isHidden)
+    XCTAssertGreaterThan(badgeFrame.minX, iconFrame.maxX)
+    XCTAssertLessThanOrEqual(badgeFrame.maxX, cell.bounds.width)
+  }
+}

package/ios/tests/NativeListLeadingVisualPairBackdropTests.swift

@@ -0,0 +1,50 @@
+import UIKit
+import XCTest
+@testable import NativeListModule
+
+@MainActor
+final class NativeListLeadingVisualPairBackdropTests: XCTestCase {
+  private func child<T>(_ visual: NativeListLeadingVisual, _ label: String, as type: T.Type) throws -> T {
+    try XCTUnwrap(Mirror(reflecting: visual).children.first { $0.label == label }?.value as? T)
+  }
+
+  private func token(_ uri: String) -> [String: Any] {
+    [
+      "kind": "token", "shape": "circle",
+      "image": ["uri": uri, "width": 40, "height": 40],
+      "fallbackIcon": ["name": "CryptoCoinOutline"],
+    ]
+  }
+
+  // PR #185 review: the pair ring sits above the primary token. While the
+  // secondary image has not loaded (or failed), its slot is hidden, so the ring
+  // must be hidden too; otherwise a blank row-background disc covers the
+  // primary's lower-right corner.
+  func testPairRingStaysHiddenWhileTheSecondaryImageIsNotDisplayed() throws {
+    let visual = NativeListLeadingVisual(frame: CGRect(x: 0, y: 0, width: 40, height: 40))
+    let ring = try child(visual, "pairBackdrop", as: UIView.self)
+    visual.bind(
+      token("https://example.invalid/primary.png"), style: [:], key: "pair", theme: nil,
+      isUnread: false, secondaryVisual: token("https://example.invalid/secondary.png"),
+      fonts: NativeListFontFamilies())
+    visual.layoutIfNeeded()
+    // `slots` is a value-type array: read it after bind has created the slots.
+    let slots = try child(visual, "slots", as: [NativeListImageSlot].self)
+    XCTAssertEqual(slots.count, 2)
+    XCTAssertTrue(slots[1].view.isHidden, "secondary slot is hidden until its image loads")
+    XCTAssertTrue(ring.isHidden, "ring must follow the hidden secondary slot")
+
+    visual.recycle()
+    XCTAssertTrue(ring.isHidden)
+  }
+
+  func testNoPairMeansNoRing() throws {
+    let visual = NativeListLeadingVisual(frame: CGRect(x: 0, y: 0, width: 40, height: 40))
+    let ring = try child(visual, "pairBackdrop", as: UIView.self)
+    visual.bind(
+      token("https://example.invalid/primary.png"), style: [:], key: "single", theme: nil,
+      isUnread: false, fonts: NativeListFontFamilies())
+    visual.layoutIfNeeded()
+    XCTAssertTrue(ring.isHidden)
+  }
+}

package/lib/module/web/NativeListWebEngine.js

@@ -735,6 +735,52 @@ const selectorIcons = {
       opacity: 1
     }]
   },
+  DotVerSolid: {
+    viewBox: '0 0 24 24',
+    paths: [{
+      d: 'M14 18v4h-4v-4zm0-4h-4v-4h4zm0-8h-4V2h4z',
+      fill: 'currentColor',
+      fillRule: 'nonzero',
+      opacity: 1
+    }]
+  },
+  Document2Outline: {
+    viewBox: '0 0 24 24',
+    paths: [{
+      d: 'M12 16H8v-2h4zm4-4H8v-2h8zm0-4H8V6h8z',
+      fill: 'currentColor',
+      fillRule: 'nonzero',
+      opacity: 1
+    }, {
+      d: 'M20 22H4V2h16zM6 20h12V4H6z',
+      fill: 'currentColor',
+      fillRule: 'evenodd',
+      opacity: 1
+    }]
+  },
+  WalletOutline: {
+    viewBox: '0 0 24 24',
+    paths: [{
+      d: 'M15.5 13.25a1.25 1.25 0 1 1 0 2.5 1.25 1.25 0 0 1 0-2.5',
+      fill: 'currentColor',
+      fillRule: 'nonzero',
+      opacity: 1
+    }, {
+      d: 'M17 8h4v13H7a4 4 0 0 1-4-4V6.5A3.5 3.5 0 0 1 6.5 3H17zM5 17a2 2 0 0 0 2 2h12v-9H6.5c-.537 0-1.045-.12-1.5-.337zM6.5 5a1.5 1.5 0 1 0 0 3H15V5z',
+      fill: 'currentColor',
+      fillRule: 'evenodd',
+      opacity: 1
+    }]
+  },
+  PlusLargeOutline: {
+    viewBox: '0 0 24 24',
+    paths: [{
+      d: 'M13 11h8v2h-8v8h-2v-8H3v-2h8V3h2z',
+      fill: 'currentColor',
+      fillRule: 'nonzero',
+      opacity: 1
+    }]
+  },
   TicketOutline: {
     viewBox: '0 0 24 24',
     paths: [{

package/package.json

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

package/src/web/NativeListWebEngine.ts

@@ -1206,6 +1206,62 @@ const selectorIcons: Readonly<
       },
     ],
   },
+  DotVerSolid: {
+    viewBox: '0 0 24 24',
+    paths: [
+      {
+        d: 'M14 18v4h-4v-4zm0-4h-4v-4h4zm0-8h-4V2h4z',
+        fill: 'currentColor',
+        fillRule: 'nonzero',
+        opacity: 1,
+      },
+    ],
+  },
+  Document2Outline: {
+    viewBox: '0 0 24 24',
+    paths: [
+      {
+        d: 'M12 16H8v-2h4zm4-4H8v-2h8zm0-4H8V6h8z',
+        fill: 'currentColor',
+        fillRule: 'nonzero',
+        opacity: 1,
+      },
+      {
+        d: 'M20 22H4V2h16zM6 20h12V4H6z',
+        fill: 'currentColor',
+        fillRule: 'evenodd',
+        opacity: 1,
+      },
+    ],
+  },
+  WalletOutline: {
+    viewBox: '0 0 24 24',
+    paths: [
+      {
+        d: 'M15.5 13.25a1.25 1.25 0 1 1 0 2.5 1.25 1.25 0 0 1 0-2.5',
+        fill: 'currentColor',
+        fillRule: 'nonzero',
+        opacity: 1,
+      },
+      {
+        d: 'M17 8h4v13H7a4 4 0 0 1-4-4V6.5A3.5 3.5 0 0 1 6.5 3H17zM5 17a2 2 0 0 0 2 2h12v-9H6.5c-.537 0-1.045-.12-1.5-.337zM6.5 5a1.5 1.5 0 1 0 0 3H15V5z',
+        fill: 'currentColor',
+        fillRule: 'evenodd',
+        opacity: 1,
+      },
+    ],
+  },
+  PlusLargeOutline: {
+    viewBox: '0 0 24 24',
+    paths: [
+      {
+        d: 'M13 11h8v2h-8v8h-2v-8H3v-2h8V3h2z',
+        fill: 'currentColor',
+        fillRule: 'nonzero',
+        opacity: 1,
+      },
+    ],
+  },
   TicketOutline: {
     viewBox: '0 0 24 24',
     paths: [