@onekeyfe/react-native-native-list 6.7.0-alpha.397 → 6.7.0-alpha.399

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
@@ -158,13 +176,68 @@ after semantic text styling. Both lines retain their default size, tone, line
 height, right alignment and accessibility text. These fields add no action or
 hit target and travel in existing snapshot JSON without a Nitro ABI change.
 
+### Identity title image
+
+Status: implemented in local source, unreleased. Type checks, JS/Web tests,
+Web runtime checks, package build, iOS XCTest-target compilation, Android
+production/instrumentation-test compilation and JVM tests pass. Focused iOS
+Simulator XCTest and Android emulator instrumentation verify image lifecycle,
+null removal and wallet-sidebar layout. Complete wallet App acceptance remains
+pending.
+An `identity` row may supply `titleImage: { image, accessibilityLabel?,
+hoverActionKey? }`. `image` uses the existing `ImageSource` contract and must
+declare equal finite width and height within 1...40 logical units. The image
+is circular, follows the title and any title icons with a 4-point gap, and
+precedes title suffixes and inline badges. It reserves its declared square
+while loading or after failure, so neither state moves the text. Existing
+rows without this field keep their current layout. The image does not change
+row identity or infer a stock, issuer, or other product meaning.
+
+iOS and Android use the existing OneKeyImage-backed slot, request options and
+retry limits. Slots belong to the mounted row renderer; OneKeyImage owns image
+caches. Text-only rebinds retain an unchanged row/source request. Source or row
+changes, removal, recycling and disposal cancel prior work and prevent stale
+completion from painting the next binding. Failure leaves the reserved square
+empty; the SDK adds no title-image fallback request or separate cache.
+
+On Web, optional `hoverActionKey` uses the title icon's existing help semantics
+and `leadingAction` anchor source: mouse/pen entry opens an anchored help event,
+departure invalidates it, mouse/pen press closes it until departure, and touch
+press toggles it. Pressing this help target does not activate the row. Without
+help, the image participates in the ordinary row press. It adds no tab stop.
+Native renderers ignore this Web-only help field and preserve ordinary row
+presses. The consumer owns the tooltip text and presentation. Omitted
+`accessibilityLabel` makes the image decorative; a supplied label describes it.
+
+Android wallet-sidebar rows with a title image reserve image width and pack the
+wallet name with the image as one centered group. Long names ellipsize within
+the remaining space; removing the image restores the full-width centered name.
+
+Full snapshots without `titleImage` remove the image and old help anchor.
+Explicit patch replacement updates the descriptor; an omitted patch field
+leaves it unchanged. Null patches and empty image URIs remove the image. Development guards
+reject malformed descriptors and invalid display geometry; production sanitizes
+optional decoration as described in the validation contract. A production patch
+that supplies a malformed title-image replacement explicitly clears the old
+image and help target instead of retaining stale decoration. The field travels in existing JSON and does not change the Nitro ABI;
+consumers must use a native SDK that implements the field before enabling it.
+
+Acceptance covers protocol validation, image/source replacement and removal,
+text-only request retention, Web help-action isolation and anchor cleanup,
+native bind/recycle geometry, and native compilation. Device and complete App
+acceptance must be reported separately from source and DOM tests.
+
 ### Identity row risk-management controls
 
 Status: implemented in source for local consumers, unreleased. Focused validation,
 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;
@@ -423,37 +496,61 @@ row positions. An accepted complete snapshot reuses that index only when its
 generation and ordered `(key, type)` sequence match the prior accepted
 snapshot; otherwise it replaces the index. Reorder commits rebuild it and
 disposal clears it. Patch batches reuse the index and never include retiring
-presentation rows in it. They validate the whole batch against the current
-accepted row models before changing config or presentation; invalid batches
-leave both unchanged. iOS updates only changed accepted entries in its
+presentation rows in it. Native hosts validate each received canonical batch before changing config or
+presentation; invalid native batches leave both unchanged. The shared production
+JS boundary first isolates rejected row/group units, so a native batch contains
+only accepted canonical updates. iOS updates only changed accepted entries in its
 presentation lookup after a valid patch, preserving any retiring rows.
 
 ### Validation environments and rejected input
 
-Development builds (`__DEV__ === true`) run the complete snapshot and patch
-contract assertions. Production builds run only serialization, required data
-shape, supported renderer, finite geometry, identity and patch consistency
-guards. Display budgets and style allowlists are development assertions.
-Typography token resolution runs in both environments. Production treats empty
-optional image URIs as missing images, preserving the existing visual fallback.
-An empty optional image field omitted from a patch is a no-op, matching its
-serialized native payload. Sparkline sample arrays retain their existing
-256-sample resource bound because the Web renderer passes samples as function
-arguments; this protects the runtime's argument limit.
-
-The component and Web engine contain input validation failures in both modes:
-initial invalid input renders an empty list; rejected later snapshots or patch
-batches preserve the last accepted state and are not dispatched to native.
-On iOS and Android, the React wrapper captures caller data before validation
-and owns an immutable accepted snapshot. Later caller mutation cannot rewrite
-that accepted state. Imperative selection keys are captured on entry. Eligible
-value-only `identity` and `dataRow` patches validate their complete changed
-rows; other patches and snapshots without this private ownership use the
-existing complete-snapshot validation path. This does not change exported
-validators or Web behavior.
-An `undefined` value in an eligible field stays on the changed-row path only
-when that field was already `undefined`; clearing a present value uses the
-complete-snapshot path.
+Status: implemented in source; acceptance and remaining runtime gaps are recorded below.
+
+Development runs strict contract assertions after shared null/empty-image
+normalization. Production sanitizes optional decorations without rejecting
+valid business content: invalid colors/styles are omitted, invalid images use
+existing placeholders, and positive title-image dimensions are clamped to a
+square of 1...40 logical units. Image headers are string dictionaries, never
+interpreted as geometry. Unsafe object graphs are rejected before normalization.
+
+A complete snapshot remains atomic after decoration sanitization: invalid
+schema, duplicate/missing identities, required business fields or wallet-group
+parent/children relationships reject the snapshot. No row is silently removed.
+Production normalizes contiguous group positions and filters selection to
+selectable keys, respecting none/single modes.
+
+Patches use omitted/undefined fields as no-ops. Null explicitly removes an
+optional field on JS, Web, iOS and Android; required fields cannot be cleared.
+Empty optional images and empty top-level segment arrays normalize to null in
+patches and absence in snapshots. Empty images remove their outer titleImage
+or media wrapper. This protocol requires native binaries with null-removal
+support; callers must not enable it against older native SDK implementations.
+
+Market price remains required and nonblank. Updating nonempty priceSegments
+requires a price in the same canonical patch; callers own matching formatted
+text (the validator does not reconstruct subscript prices). Updating price
+without segments clears an existing overlay. For identity/market subtitles,
+updating one representation clears the old other representation unless both
+are supplied; clearing segments alone retains the base text. Activity has no
+subtitle pair. Market quote changes with an existing/new webTable must include
+matching table data or explicitly remove webTable.
+
+Development rejects invalid patch batches atomically. Production isolates
+failures to each target key and its coupled groupId: all updates to a key are
+merged in order before validation, and a failure rejects that unit while other
+valid units commit. Financial-value and interactive accessories with missing
+required data fail their row; malformed purely decorative accessories are
+removed. Diagnostics contain locations, never row values or image URLs.
+
+All targets share the canonical accepted patches. The accepted JS rows and
+serialized native changes derive from the same result. Native owned snapshots
+and accepted Web engine snapshots validate only changed rows during patches;
+unchanged rows are not rescanned. Direct helpers receiving an unowned baseline
+validate that baseline once before incremental merging. Native owned snapshots
+are immutable and indexed by key. Initial invalid snapshots render empty;
+rejected later snapshots retain the last accepted snapshot. Rejected patch
+units retain their previous complete rows. Direct validators still throw on
+unrecoverable input. Image loading failures remain the loader's responsibility.
 
 `planNativeListPatches(previous, next)` is an explicit, pure public helper for
 callers that own two valid, immutable snapshots. It returns a readonly empty
@@ -476,14 +573,25 @@ Rejection emits a diagnostic without including row keys, text or image URLs.
 Explicit calls to the exported validation functions still throw on rejected
 input, so development tooling can inspect the full contract failure. Rejection
 does not imply that the requested update succeeded. No row identity is trimmed,
-truncated or regenerated, and no invalid row is silently dropped from a batch.
-
-Status: implemented. Development/production JS regressions pass, including
-native wrappers for iOS/Android and the Web DOM engine. Real Swift XCTest on an
-iOS 27 simulator and Android instrumentation on API 35 verify production
-serialization, normalized typography, opaque identities and duplicate-key
-protection against the shipping native parsers. Full app/device rendering and
-gesture acceptance remain separate from these input-boundary checks.
+truncated or regenerated, and no row is silently dropped from a snapshot.
+
+Acceptance for this revision: 429 JS/Web tests pass, including native React
+wrapper containment, canonical null/undefined semantics, price/segment pairing,
+production row/group isolation and unchanged-row access checks. Package type
+checks, lint (zero errors; existing warnings) and test-integrity checks pass.
+iOS production/XCTest targets and Android production/instrumentation targets
+compile; 29 Android JVM tests pass. Four focused iOS 26.5 XCTest cases verify
+title-icon packing, title-image reuse and null removal. Android 15/API 35
+instrumentation verifies wallet-sidebar image bounds, long-title ellipsis,
+and full-width title restoration after removal. Shared JS/Web regressions also
+verify that malformed production title-image replacements clear the previous
+image and help anchor. Full App acceptance remains pending.
+
+Wallet groups use the actual embedded parent/children model, not memberKeys
+references. groupId/groupPosition remain snapshot-owned fields; production
+patch failures also reject other patched rows in the same existing groupId.
+Unknown extension fields (including unsupported sparkline/changeHighlight
+models) are ignored in production rather than introducing a new renderer API.
 
 ## Platform contract
 
@@ -571,7 +679,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 +699,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 +716,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

@@ -91,7 +91,10 @@ final class NativeListIdentityCell: NativeListRendererCell {
       let tertiary = NativeListResolvedText(
         item.data.string("tertiary"), style: style.dictionary("tertiary"), size: 14,
         color: .black, lineHeight: 20, lines: 1, fonts: fonts)
-      let textHeight = title.measure(width: textWidth)
+      let titleImageSize = CGFloat(item.data.dictionary("titleImage")?.dictionary("image")?.double("width") ?? 0)
+      let titleImageWidth = titleImageSize > 0
+        ? titleImageSize + 4 + (item.data.dictionary("titleIcon") == nil ? 0 : 24) : 0
+      let textHeight = max(titleImageSize, title.measure(width: max(1, textWidth - titleImageWidth)))
         + subtitle.measure(width: textWidth)
         + tertiary.measure(width: textWidth)
         + (item.data.string("subtitle").isEmpty ? 0 : CGFloat(style.double("lineGap", default: 0)))
@@ -107,6 +110,12 @@ final class NativeListIdentityCell: NativeListRendererCell {
   private let titleRowStack = UIStackView()
   private let titleLabel = NativeListTextLabel()
   private let titleIconView = UIImageView()
+  private var titleImageSlot: NativeListImageSlot?
+  private var titleImageConstraints: [NSLayoutConstraint] = []
+  // 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()
@@ -127,7 +136,7 @@ final class NativeListIdentityCell: NativeListRendererCell {
   private var currentItem: NativeListItem?
   private var currentTheme: [String: Any]?
   private var leadingActionKey: String?
-  override var assetFields: [String] { ["leading"] }
+  override var assetFields: [String] { ["leading", "titleImage"] }
   override var defaultSeparatorInset: CGFloat { 60 }
   override var defaultCornerRadius: CGFloat {
     guard let item = currentItem else { return 0 }
@@ -164,6 +173,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)
@@ -234,6 +246,11 @@ final class NativeListIdentityCell: NativeListRendererCell {
     titleIconView.isHidden = true
     titleIconView.accessibilityLabel = nil
     titleIconView.isAccessibilityElement = false
+    titleImageSlot?.view.isHidden = true
+    titleImageSlot?.view.accessibilityLabel = nil
+    titleImageSlot?.view.isAccessibilityElement = false
+    NSLayoutConstraint.deactivate(titleImageConstraints)
+    titleImageConstraints = []
     titleRowStack.setContentHuggingPriority(.defaultLow, for: .horizontal)
     titleRowStack.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
     for label in [titleLabel, subtitleLabel, tertiaryLabel, badgeLabel] {
@@ -291,6 +308,42 @@ 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 descriptor = item.data.dictionary("titleImage"),
+      let image = descriptor.dictionary("image"), !image.string("uri").isEmpty
+    {
+      let size = CGFloat(image.double("width"))
+      let slot = titleImageSlot ?? NativeListImageSlot()
+      titleImageSlot = slot
+      let view = slot.view
+      if view.superview == nil {
+        let index = titleRowStack.arrangedSubviews.firstIndex(of: titleIconView)! + 1
+        titleRowStack.insertArrangedSubview(view, at: index)
+      }
+      view.clipsToBounds = true
+      view.setContentHuggingPriority(.required, for: .horizontal)
+      view.setContentCompressionResistancePriority(.required, for: .horizontal)
+      view.translatesAutoresizingMaskIntoConstraints = false
+      view.layer.cornerRadius = size / 2
+      view.isHidden = false
+      let label = descriptor.string("accessibilityLabel")
+      view.accessibilityLabel = label.isEmpty ? nil : label
+      view.isAccessibilityElement = !label.isEmpty
+      titleImageConstraints = [
+        view.widthAnchor.constraint(equalToConstant: size),
+        view.heightAnchor.constraint(equalToConstant: size),
+      ]
+      titleImageConstraints.forEach { $0.priority = UILayoutPriority(999) }
+      NSLayoutConstraint.activate(titleImageConstraints)
+      titleRowStack.setCustomSpacing(4, after: titleIconView.isHidden ? titleLabel : titleIconView)
+      titleLabel.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
+      slot.bind(image, key: "\(item.key):titleImage", placeholder: "#00000000")
+    } else {
+      titleImageSlot?.recycle()
     }
     if let ratio = style["leadingContentMaxWidthRatio"] as? NSNumber,
       root.arrangedSubviews.contains(visual)
@@ -328,7 +381,8 @@ final class NativeListIdentityCell: NativeListRendererCell {
       } else {
         titleRowStack.setCustomSpacing(
           CGFloat(style.double("titleBadgeGap")),
-          after: titleIconView.isHidden ? titleLabel : titleIconView)
+          after: titleImageSlot?.view.isHidden == false ? titleImageSlot!.view
+            : titleIconView.isHidden ? titleLabel : titleIconView)
       }
     }
     if style["trailingGap"] != nil { trailingStack.spacing = CGFloat(style.double("trailingGap")) }
@@ -351,8 +405,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
@@ -391,6 +456,10 @@ final class NativeListIdentityCell: NativeListRendererCell {
   }
   override func recycleContent() {
     visual.recycle()
+    titleImageSlot?.recycle()
+    titleImageSlot?.view.isHidden = true
+    titleImageSlot?.view.accessibilityLabel = nil
+    titleImageSlot?.view.isAccessibilityElement = false
     trailingStack.reset()
     currentItem = nil
   }
@@ -593,7 +662,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/RNCNativeListView.swift

@@ -1530,7 +1530,10 @@ final class NativeListView: UIView {
       let previous = current.items[index]
       var merged = current.items[index].data
       changes.forEach { key, value in
-        if key != "key" && key != "type" { merged[key] = value }
+        if key != "key" && key != "type" {
+          if value is NSNull { merged.removeValue(forKey: key) }
+          else { merged[key] = value }
+        }
       }
       guard let item = try? NativeListItem(data: merged) else { return }
       if rowHeight(previous, usingCompactReorderHeight: false) != rowHeight(item, usingCompactReorderHeight: false) ||
@@ -1554,6 +1557,8 @@ final class NativeListView: UIView {
       }
       if let selected = changes["selected"] as? Bool {
         if selected { current.selectedKeys.insert(item.key) } else { current.selectedKeys.remove(item.key) }
+      } else if changes["selected"] is NSNull {
+        current.selectedKeys.remove(item.key)
       }
     }
     if !changedKeys.isEmpty { invalidateActionAnchor(reason: "snapshot") }

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>