@onekeyfe/react-native-native-list 6.7.0-alpha.412 → 6.7.0-alpha.413

package/docs/SPEC.md

@@ -1,44 +1,5 @@
 # NativeList contract
 
-## Shared image SVG integration — Implemented
-
-Static icons use the image package's named resources and SVG implementation:
-the main registry, Activity's ten private glyphs, Market stars/recognized badge,
-Media fallback and Android checkbox. The closed per-platform coverage, including
-the main-line asset-list additions, is recorded under Built-in icon metadata
-generation; unknown-name text fallbacks remain. The NativeList-only legacy name
-`BadgeVerifiedSolid` resolves to canonical `BadgeRecognizedSolid`. Circle and
-dynamic charts/spinners/dotted decoration remain local primitives.
-
-Each iOS glyph slot owns a request owner and revision, including overlays and
-UIButton states. Final graphical identity (name, raster geometry/scale and render
-strategy) controls requests. A private synchronous bind transaction preserves
-both an identical pending request and a ready raster across reset/rebind calls;
-changed or empty identities cancel and clear. Only the current attached revision
-may apply a completion. Detach, reuse and raster geometry changes invalidate
-ownership. UIKit template tint changes reuse the immutable mask. UIButton states
-share one decode, retaining template/original and disabled tint/alpha/action
-behavior. Name validity and descriptor geometry control visibility, layout and
-touch bounds; image availability does not control them.
-Detached binds and auto-height measurement use only known intrinsic metadata;
-they MUST NOT submit named requests or read/decode SVG resources. Initial attach
-starts loading without changing the measured glyph or button dimensions.
-
-iOS original brand/opacity modes and the size overload's always-template behavior
-remain. Android preserves Apple 16 × 20 width-based scaling and clipping by
-requesting a proportionate raster and drawing at the old origin. Checkboxes
-retain their 16 dp glyph plus 2 dp border offset in selector geometry, otherwise
-80 percent centered geometry. Shared images are immutable; no cross-view mutable
-Drawable bounds or pixel changes are allowed. Named work uses image's existing
-two-worker and bounded cache service. Web consumers use its pure DOM external-icon
-helper while keeping inherited color, action labels, anchors and exact sizes.
-
-Acceptance must cover actual slots, first bind and repeated row reuse, unknown
-and empty inputs, detach/reattach, resize/tint changes, both UIButton states,
-checkboxes, Apple, original brands, legacy badge, and Web/desktop menus. All
-static path readers must be removed from migrated routes; procedural drawings
-and unrelated URI image loading retain their existing ownership.
-
 This is the entry point for the package's behavioral contract. The linked
 documents are part of this spec; implementation status is separate from target
 architecture and runtime evidence.
@@ -90,55 +51,6 @@ 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.
 
-### Native Swap token menu backport
-
-Status: implemented in local native source, unreleased. Native build and runtime
-acceptance are separate checks. Web and Desktop layout and actions stay unchanged;
-their generated icon artwork is covered in the following section.
-
-iOS and Android render `DotVerSolid` with the app's existing 24-unit solid icon
-geometry. On Android, exactly two identity trailing accessories consisting of
-`valuePair` followed by an `icon` named `DotVerSolid` with `actionKey: 'menu'`
-lay out horizontally, matching iOS. Other icon names or action keys retain the
-existing axis rules. This backport does not change row padding, accessory spacing,
-button dimensions, actions, disabled state, or the public snapshot contract.
-
-`NativeListAccessoryStackTests` checks the iOS image lookup and bound button image.
-`NativeListRiskAccessoryTest` checks Android's actual icon drawing and the target
-horizontal pair, including vertical controls on rebind.
-
-### Built-in icon metadata generation
-
-The closed `scripts/native-list-icons.json` manifest retains platform coverage,
-canonical App source paths and iOS rendering strategy. `Circle` is a local
-primitive. The NativeList-only legacy `BadgeVerifiedSolid` name maps to
-`solid/badge-recognized.svg` / canonical `BadgeRecognizedSolid`, preserving its
-thumbs-up artwork without adding a general alias.
-
-`scripts/generate-icons.mjs --app-root <app-root>` matches each source uniquely
-against image's generated catalog, validates source digests and manifest
-metadata, then emits exactly three small Swift/Kotlin/Web name/geometry tables.
-It writes no SVG, path data or xcassets; image owns the single resource pipeline.
-All validation precedes writes. `--check` is read-only and detects missing or
-ambiguous sources, invalid metadata and stale output. Stable sorting emits no
-machine paths or timestamps. Frozen tests compare exact registry key sets;
-this does not prove that every application-computed name is registered.
-
-The closed manifest contains 43 names with iOS 42, Android 41 and Web 25
-registry entries (including DotVerSolid). Document2Outline, WalletOutline and
-PlusLargeOutline are registered on all three platforms; TicketOutline also
-retains Web and adds native coverage. These main-line names use image-owned
-canonical SVGs, not duplicate NativeList paths or asset catalogs.
-Existing Activity ten-name and Market/Media private call sites resolve canonical
-names through the same DOM helper; their previous coverage does not expand.
-Image preserves raw path order, fill rules, fixed colors, opacity and viewBoxes.
-NativeList retains its layout, button bounds, actions and snapshot interfaces.
-
-Focused SDK fixture acceptance covers native attached lifecycle/rebinding,
-legacy iOS asset comparisons, shared alpha semantics and real Web/Electron
-source/lib consumers. This is not full App, balance, transaction or signed
-release acceptance.
-
 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`,
@@ -149,6 +61,13 @@ platform lays out side by side: `value` + `checkbox`, `valuePair` + `menu`,
 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
@@ -2117,29 +2036,3 @@ A containing Web pager therefore applies insets, collapse/top commands and route
 restoration to the owned host, with slot content as its padding target. The
 ordinary no-slot viewport and explicit external-host paths keep their existing
 ownership; no Pager dependency or new API is required.
-
-### Shared icon recoloring revision — Implemented; scoped runtime acceptance
-
-Android named glyph slots consume image's typed immutable shape-cache results:
-compatible fixed/single/same-alpha multiple colors update per-view tint without a
-request; new alpha or mixed-color raster requests preserve the last successful
-same-source/geometry bitmap until completion. Name/geometry changes, invalid,
-hidden/detach/recycle clear immediately and revisions reject old callbacks.
-Circle remains local; Apple and checkbox rectangles and coverage are unchanged.
-iOS retains its existing black template/original request and synchronous retint.
-Web React and DOM use the image package's demand-loaded external per-icon symbol
-URLs, with existing coverage/aliases/action labels and CSS color inheritance.
-
-## Host-owned named resources — Implemented; SDK fixture runtime verified
-
-Image provides decoding and the static Web `#onekey-icon-assets` provider boundary;
-the application owns complete named SVG resources. NativeList keeps its existing
-43-name platform coverage and three generated metadata tables, including its
-legacy `BadgeVerifiedSolid` to canonical `BadgeRecognizedSolid` mapping. No list
-props, naming coverage, geometry or rendering strategy changes.
-
-The SDK metadata generator validates against the shared 63-sample example/test
-catalog without an App checkout, including raw source digests and viewBox sizes.
-It emits metadata only. Production consumers must supply the complete host icon
-bundle/assets and Web provider; SDK-only fixture tests prove their closed sample
-coverage, while the App's independent generator verifies all 1,909 resources.

package/ios/NativeListAccessoryStack.swift

@@ -1,7 +1,7 @@
 import UIKit
 
 // OneKey patch: explicit summary actions use the source text's physical-pixel line box.
-final class NativeListAccessoryButton: NativeListIconButton {
+final class NativeListAccessoryButton: UIButton {
   var pressedBackgroundColor: UIColor?
   var normalBackgroundColor: UIColor = .clear
   var fixedTextLineHeight: CGFloat?
@@ -197,7 +197,7 @@ final class NativeListAccessoryButton: NativeListIconButton {
 final class NativeListAccessoryStack: UIStackView {
   var fonts = NativeListFontFamilies()
   private let accessoryButtons = (0..<2).map { _ in NativeListAccessoryButton(type: .system) }
-  private let checkboxButton = NativeListIconButton(type: .system)
+  private let checkboxButton = UIButton(type: .system)
   private let spinner = UIActivityIndicatorView(style: .medium)
   private var accessoryActions: [(String, NativeSelectionTarget?)] = []
   private var checkboxAction: (String, NativeSelectionTarget?)?
@@ -250,8 +250,6 @@ final class NativeListAccessoryStack: UIStackView {
     checkboxState: (NativeListItem, NativeSelectionTarget?, String) -> String,
     fonts: NativeListFontFamilies
   ) {
-    let iconUpdate = NativeListIconUpdate(self)
-    defer { iconUpdate.finish() }
     self.fonts = fonts
     reset()
     currentItem = item
@@ -503,7 +501,10 @@ final class NativeListAccessoryStack: UIStackView {
       state == "indeterminate"
       ? "CheckboxIndeterminateCustom"
       : "CheckboxCheckedCustom"
-    checkboxButton.bindIcon(state == "unchecked" ? nil : glyphName)
+    checkboxButton.setImage(
+      state == "unchecked" ? nil : nativeListIcon(named: glyphName),
+      for: .normal
+    )
     checkboxButton.tintColor = checkboxIconColor
     // A disabled ListItem already applies 0.5 to its complete content. Avoid
     // multiplying that opacity on the nested control a second time.
@@ -665,7 +666,16 @@ final class NativeListAccessoryStack: UIStackView {
     button.tintColor = tintColor
     let isDecorativeRefresh =
       data.string("name") == "RefreshCcwOutline" && data.string("actionKey").isEmpty
-    button.bindIcon(data.string("name"), size: isDecorativeRefresh ? CGSize(width: 16, height: 16) : nil)
+    let image = isDecorativeRefresh
+      ? nativeListIcon(named: data.string("name"), size: CGSize(width: 16, height: 16))
+      : nativeListIcon(named: data.string("name"))
+    if let image {
+      button.setImage(image, for: .normal)
+      button.setImage(
+        image.withTintColor(tintColor, renderingMode: .alwaysOriginal),
+        for: .disabled
+      )
+    }
     let isDrillIn = data.string("kind") == "chevron"
     let isTertiary = data.string("buttonStyle") == "tertiary"
     if data.string("kind") == "icon" && isTertiary {

package/ios/NativeListDataRowRenderer.swift

@@ -12,7 +12,7 @@ final class NativeListDataRowCell: NativeListRendererCell {
   }
 
   private let visual = NativeListLeadingVisual()
-  private let favorite = NativeListIconImageView()
+  private let favorite = UIImageView()
   private let accessories = NativeListAccessoryStack()
   private let trailingAccessories = NativeListAccessoryStack()
   private let columns = UIStackView()
@@ -51,9 +51,6 @@ final class NativeListDataRowCell: NativeListRendererCell {
     _ item: NativeListItem, theme: [String: Any]?, layout: String,
     checkboxState: (NativeListItem, NativeSelectionTarget?, String) -> String
   ) {
-    let iconUpdate = NativeListIconUpdate(self)
-    defer { iconUpdate.finish() }
-
     let data = item.data
     let style = data.dictionary("style") ?? [:]
     let image = style.dictionary("image") ?? [:]
@@ -67,7 +64,8 @@ final class NativeListDataRowCell: NativeListRendererCell {
     let vp = CGFloat(style.double("verticalPadding", default: layout == "table" ? 10 : 8))
     contentInsets = UIEdgeInsets(top: vp, left: hp, bottom: vp, right: hp)
     favorite.isHidden = !data.bool("favorite") && !data.bool("favoriteActive")
-    favorite.bindIcon(data.bool("favoriteActive") ? "StarSolid" : "StarOutline")
+    favorite.image = nativeListIcon(
+      named: data.bool("favoriteActive") ? "StarSolid" : "StarOutline")
     favorite.tintColor = nativeListColor(
       theme, data.bool("favoriteActive") ? "icon" : "iconSubdued",
       data.bool("favoriteActive") ? "#646464" : "#8D8D8D")
@@ -168,18 +166,13 @@ final class NativeListDataRowCell: NativeListRendererCell {
       NSLayoutConstraint.activate(columnWidthConstraints)
       columnWeights = normalizedWeights
     }
-
   }
   override func bindSelectionContent(
     _ item: NativeListItem,
     checkboxState: (NativeListItem, NativeSelectionTarget?, String) -> String
   ) {
-    let iconUpdate = NativeListIconUpdate(self)
-    defer { iconUpdate.finish() }
-
     accessories.updateSelection(item, checkboxState: checkboxState)
     trailingAccessories.updateSelection(item, checkboxState: checkboxState)
-
   }
   override func recycleContent() {
     visual.recycle()
@@ -192,8 +185,8 @@ final class NativeListDataRowCell: NativeListRendererCell {
 private final class NativeListTableColumnView: UIStackView {
   private let primaryLine = UIStackView()
   private let primaryLabel = NativeListTextLabel()
-  private let titleIconView = NativeListIconImageView()
-  private let secondaryTitleIconView = NativeListIconImageView()
+  private let titleIconView = UIImageView()
+  private let secondaryTitleIconView = UIImageView()
   private let badgesStack = UIStackView()
   private let secondaryLine = UIStackView()
   private let secondaryLeadingLabel = NativeListTextLabel()
@@ -287,7 +280,7 @@ private final class NativeListTableColumnView: UIStackView {
     for (index, descriptor) in descriptors.enumerated() {
       guard let descriptor else { continue }
       let icon = index == 0 ? titleIconView : secondaryTitleIconView
-      icon.bindIcon(descriptor.string("name"))
+      icon.image = nativeListIcon(named: descriptor.string("name"))
       icon.tintColor = UIColor(
         nativeListHex: descriptor.string("tintColor",
           default: theme?["iconSubdued"] as? String ?? "#8D8D8D"),
@@ -310,8 +303,6 @@ private final class NativeListTableColumnView: UIStackView {
     theme: [String: Any]?,
     fonts: NativeListFontFamilies
   ) {
-    let iconUpdate = NativeListIconUpdate(self)
-    defer { iconUpdate.finish() }
     reset()
     let textAlignment: NSTextAlignment
     switch column.string("alignment") {

package/ios/NativeListDesignAssets.swift

@@ -1,7 +1,8 @@
 import CoreText
-import OneKeyImage
 import UIKit
 
+private final class NativeListResourceToken {}
+
 enum NativeListFontWeight {
   case regular
   case medium
@@ -18,6 +19,19 @@ enum NativeListFontWeight {
   }
 }
 
+private enum NativeListResources {
+  static let bundle: Bundle = {
+    let owners = [Bundle(for: NativeListResourceToken.self), .main]
+    for owner in owners {
+      if let url = owner.url(forResource: "NativeListResources", withExtension: "bundle"),
+         let bundle = Bundle(url: url) {
+        return bundle
+      }
+    }
+    return Bundle(for: NativeListResourceToken.self)
+  }()
+}
+
 struct NativeListFontFamilies: Equatable {
   let names: [String: String]
   init(names: [String: String] = [:]) { self.names = names }
@@ -70,19 +84,76 @@ func nativeListTabularFont(
     descriptor: font.fontDescriptor.addingAttributes([.featureSettings: settings]), size: size)
 }
 
-func nativeListIconMetadata(named name: String) -> NativeListIconMetadata? {
+func nativeListIcon(named name: String) -> UIImage? {
+  // OneKey patch: the connection indicator is a solid circle at its requested size.
   if name == "Circle" {
-    return NativeListIconMetadata(name: "Circle", size: CGSize(width: 24, height: 24), original: false)
+    return UIGraphicsImageRenderer(size: CGSize(width: 24, height: 24)).image { _ in
+      UIColor.black.setFill()
+      UIBezierPath(ovalIn: CGRect(x: 0, y: 0, width: 24, height: 24)).fill()
+    }.withRenderingMode(.alwaysTemplate)
   }
-  if let generated = NativeListGeneratedIcons.icons[name] {
-    return generated
+  let assetName: String
+  switch name {
+  // OneKey patch: official selector icon geometry.
+  case "AccountErrorCustom": assetName = "onekey_selector_account_error_custom"
+  // OneKey patch: official selector icon geometry.
+  case "CrossedSmallSolid": assetName = "onekey_selector_crossed_small_solid"
+  // OneKey patch: official selector icon geometry.
+  case "AllNetworksSolid": assetName = "onekey_selector_all_networks_solid"
+  // OneKey patch: official selector icon geometry.
+  case "BotIllus": assetName = "onekey_selector_bot_illus"
+  // OneKey patch: official selector icon geometry.
+  case "AppleBrand": assetName = "onekey_selector_apple_brand"
+  // OneKey patch: official selector icon geometry.
+  case "GoogleIllus": assetName = "onekey_selector_google_illus"
+  // OneKey patch: official selector icon geometry.
+  case "LockSolid": assetName = "onekey_selector_lock_solid"
+  // OneKey patch: official selector icon geometry.
+  case "GlobusOutline": assetName = "onekey_selector_globus_outline"
+  case "GasSolid": assetName = "onekey_gas_solid"
+  case "RefreshCcwOutline": assetName = "onekey_refresh_ccw_outline"
+  case "CryptoCoinOutline": assetName = "onekey_crypto_coin_outline"
+  case "ArrowBottomOutline": assetName = "onekey_arrow_bottom"
+  case "ArrowTopOutline": assetName = "onekey_arrow_top"
+  case "ChartTrendingUpOutline": assetName = "onekey_chart_trending_up"
+  case "SwapHorOutline": assetName = "onekey_swap_hor"
+  case "ShieldExclamationOutline": assetName = "onekey_shield_exclamation"
+  case "InfoCircleOutline": assetName = "onekey_info_circle"
+  case "SpeakerPromoteOutline": assetName = "onekey_speaker_promote"
+  case "PlusCircleOutline": assetName = "onekey_plus_circle"
+  case "PlusSmallOutline": assetName = "onekey_plus_small"
+  case "DotHorOutline": assetName = "onekey_dot_hor"
+  case "PencilOutline": assetName = "onekey_pencil"
+  case "MinusCircleSolid": assetName = "onekey_minus_circle_solid"
+  case "MinusCircleOutline": assetName = "onekey_minus_circle"
+  case "ChevronRightSmallOutline": assetName = "onekey_chevron_right_small"
+  case "DragOutline": assetName = "onekey_drag"
+  case "StarOutline": assetName = "onekey_star"
+  case "StarSolid": assetName = "onekey_star_solid"
+  case "BadgeVerifiedSolid": assetName = "onekey_badge_verified_solid"
+  case "ChevronGrabberVerOutline": assetName = "onekey_chevron_grabber_ver"
+  case "ChevronBottomOutline": assetName = "onekey_chevron_bottom"
+  case "ChevronTopOutline": assetName = "onekey_chevron_top"
+  case "CheckboxCheckedCustom": assetName = "onekey_checkbox_checked"
+  case "CheckboxIndeterminateCustom": assetName = "onekey_checkbox_indeterminate"
+  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
   }
-  guard let meta = OneKeyNamedSVG.shared.iconMetadata(forName: name) else {
-    return nil
-  }
-  return NativeListIconMetadata(
-    name: name,
-    size: CGSize(width: meta.width, height: meta.height),
-    original: meta.recolorMode == .fixed || meta.recolorMode == .raster
-  )
+  return UIImage(named: assetName, in: NativeListResources.bundle, compatibleWith: nil)?
+    .withRenderingMode(["GoogleIllus", "BotIllus", "AccountErrorCustom"].contains(name) ? .alwaysOriginal : .alwaysTemplate)
+}
+
+func nativeListIcon(named name: String, size: CGSize) -> UIImage? {
+  guard let image = nativeListIcon(named: name) else { return nil }
+  return UIGraphicsImageRenderer(size: size).image { _ in
+    image.draw(in: CGRect(origin: .zero, size: size))
+  }.withRenderingMode(.alwaysTemplate)
 }

package/ios/NativeListIdentityRenderer.swift

@@ -109,7 +109,7 @@ final class NativeListIdentityCell: NativeListRendererCell {
   private let mainStack = UIStackView()
   private let titleRowStack = UIStackView()
   private let titleLabel = NativeListTextLabel()
-  private let titleIconView = NativeListIconImageView()
+  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
@@ -120,7 +120,7 @@ final class NativeListIdentityCell: NativeListRendererCell {
   private let tertiaryLabel = NativeListTextLabel()
   private let badgeLabel = NativeListInsetLabel()
   private let trailingStack = NativeListAccessoryStack(frame: .zero)
-  private let leadingActionButton = NativeListIconButton(type: .system)
+  private let leadingActionButton = UIButton(type: .system)
   private var leadingWidth: NSLayoutConstraint!
   private var leadingHeight: NSLayoutConstraint!
   private var leftInset: CGFloat = 12
@@ -208,9 +208,6 @@ final class NativeListIdentityCell: NativeListRendererCell {
     _ item: NativeListItem, theme: [String: Any]?, layout: String,
     checkboxState: (NativeListItem, NativeSelectionTarget?, String) -> String
   ) {
-    let iconUpdate = NativeListIconUpdate(self)
-    defer { iconUpdate.finish() }
-
     selectorTypographyRestorers.reversed().forEach { $0() }
     selectorTypographyRestorers = []
     currentItem = item
@@ -301,7 +298,7 @@ final class NativeListIdentityCell: NativeListRendererCell {
     bindIdentity(item, theme: theme, selected: item.data.bool("selected"), checkboxState)
     let style = item.data.dictionary("style") ?? [:]
     if let titleIcon = item.data.dictionary("titleIcon") {
-      titleIconView.bindIcon(titleIcon.string("name"))
+      titleIconView.image = nativeListIcon(named: titleIcon.string("name"))
       titleIconView.tintColor = UIColor(
         nativeListHex: titleIcon.string("tintColor",
           default: theme?["iconSubdued"] as? String ?? "#8D8D8D"),
@@ -410,7 +407,6 @@ final class NativeListIdentityCell: NativeListRendererCell {
     }
     settleTitleRowFillerSpacing()
     applySelectorTypography(item)
-
   }
 
   /// The filler is the title row's last arranged view; the stack's default
@@ -426,9 +422,6 @@ final class NativeListIdentityCell: NativeListRendererCell {
     _ item: NativeListItem,
     checkboxState: (NativeListItem, NativeSelectionTarget?, String) -> String
   ) {
-    let iconUpdate = NativeListIconUpdate(self)
-    defer { iconUpdate.finish() }
-
     currentItem = item
     trailingStack.updateSelection(item, checkboxState: checkboxState)
     if item.data.string("presentation") == "walletSidebar" {
@@ -446,7 +439,6 @@ final class NativeListIdentityCell: NativeListRendererCell {
         NativeListTextStyles.applyStyledText(titleLabel, style, fonts: fonts)
       }
     }
-
   }
   override func layoutSubviews() {
     super.layoutSubviews()
@@ -618,7 +610,13 @@ final class NativeListIdentityCell: NativeListRendererCell {
         fallback: .darkGray
       )
       leadingActionButton.tintColor = tintColor
-      leadingActionButton.bindIcon(leadingAction.string("name"))
+      if let image = nativeListIcon(named: leadingAction.string("name")) {
+        leadingActionButton.setImage(image, for: .normal)
+        leadingActionButton.setImage(
+          image.withTintColor(tintColor, renderingMode: .alwaysOriginal),
+          for: .disabled
+        )
+      }
       leadingActionButton.isEnabled = !leadingAction.bool("disabled")
       leadingActionButton.alpha = leadingActionButton.isEnabled ? 1 : 0.4
       leadingActionKey = leadingAction.string("actionKey")

package/ios/NativeListLeadingVisual.swift

@@ -14,16 +14,16 @@ final class NativeListLeadingVisual: UIView {
   var overlayTextFontSize: CGFloat = 10
   var overlayTextLineHeight: CGFloat?
   var overlayTextHorizontalInset: CGFloat?
-  private let icon = NativeListIconImageView()
+  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 = NativeListIconImageView()
+  private let corner = UIImageView()
   private let cornerBackdrop = UIView()
   private var slots: [NativeListImageSlot] = []
   private var overlaySlots: [NativeListImageSlot] = []
-  private var overlayFallbackIcons: [NativeListIconImageView] = []
+  private var overlayFallbackIcons: [UIImageView] = []
   private var overlays: [(UIView, [String: Any])] = []
   private let dashedBorder = CAShapeLayer()
   private var visual: [String: Any] = [:]
@@ -54,8 +54,6 @@ final class NativeListLeadingVisual: UIView {
     isUnread: Bool, secondaryVisual: [String: Any]? = nil,
     fonts: NativeListFontFamilies
   ) {
-    let iconUpdate = NativeListIconUpdate(self)
-    defer { iconUpdate.finish() }
     self.fonts = fonts
     fallback.font = nativeListFont(ofSize: 13, weight: .bold, fonts: fonts)
     self.visual = visual
@@ -113,7 +111,7 @@ final class NativeListLeadingVisual: UIView {
     fallback.text = String(visual.string("fallbackText").prefix(2))
     fallback.textColor = UIColor(
       nativeListHex: visual.string("fallbackTextColor", default: "#8D8D8D"), fallback: .gray)
-    icon.bindIcon(fallbackData?.string("name"))
+    icon.image = fallbackData.map { nativeListIcon(named: $0.string("name")) } ?? nil
     icon.tintColor = UIColor(
       nativeListHex: fallbackData?.string("tintColor", default: "#646464") ?? "#646464",
       fallback: .darkGray)
@@ -177,7 +175,7 @@ final class NativeListLeadingVisual: UIView {
     let badge = visual.dictionary("cornerIcon")
     corner.isHidden = badge == nil
     cornerBackdrop.isHidden = badge == nil
-    corner.bindIcon(badge?.string("name"))
+    corner.image = badge.flatMap { nativeListIcon(named: $0.string("name")) }
     corner.tintColor = UIColor(
       nativeListHex: badge?.string("tintColor", default: "#646464") ?? "#646464",
       fallback: .darkGray)
@@ -189,12 +187,12 @@ final class NativeListLeadingVisual: UIView {
     overlays.removeAll(keepingCapacity: true)
     let descriptors = Array(visual.dictionaries("overlays").prefix(2))
     while overlaySlots.count < descriptors.count { overlaySlots.append(NativeListImageSlot()) }
-    while overlayFallbackIcons.count < descriptors.count { overlayFallbackIcons.append(NativeListIconImageView()) }
+    while overlayFallbackIcons.count < descriptors.count { overlayFallbackIcons.append(UIImageView()) }
     for (index, data) in descriptors.enumerated() {
       let frame = index < previousOverlays.count ? previousOverlays[index].0 : UIView()
       let fallbackData = data.dictionary("fallbackIcon")
       let fallbackGlyph = overlayFallbackIcons[index]
-      fallbackGlyph.bindIcon(fallbackData?.string("name"))
+      fallbackGlyph.image = fallbackData.flatMap { nativeListIcon(named: $0.string("name")) }
       fallbackGlyph.tintColor = UIColor(
         nativeListHex: fallbackData?.string("tintColor", default: "#646464") ?? "#646464",
         fallback: .darkGray)
@@ -245,8 +243,8 @@ final class NativeListLeadingVisual: UIView {
         child = label
       } else {
         overlaySlots[index].recycle()
-        let glyph = frame.subviews.first as? NativeListIconImageView ?? NativeListIconImageView()
-        glyph.bindIcon(data.string("name"))
+        let glyph = frame.subviews.first as? UIImageView ?? UIImageView()
+        glyph.image = nativeListIcon(named: data.string("name"))
         glyph.contentMode = .scaleAspectFit
         glyph.tintColor = UIColor(
           nativeListHex: data.string("tintColor", default: "#646464"), fallback: .darkGray)

package/ios/NativeListMarketRenderer.swift

@@ -35,7 +35,7 @@ final class NativeListMarketCell: NativeListRendererCell {
   private let marketBadgeButtons = (0..<3).map { _ in NativeListAccessoryButton(type: .system) }
   private let badgeSlots = (0..<3).map { _ in NativeListImageSlot() }
   private var marketBadgeImages: [UIView] { badgeSlots.map { $0.view } }
-  private let leadingActionButton = NativeListIconButton(type: .system)
+  private let leadingActionButton = UIButton(type: .system)
   private var leadingWidth: NSLayoutConstraint!
   private var leadingHeight: NSLayoutConstraint!
   private var selectorConstraints: [NSLayoutConstraint] = []
@@ -99,9 +99,6 @@ final class NativeListMarketCell: NativeListRendererCell {
     _ item: NativeListItem, theme: [String: Any]?, layout: String,
     checkboxState: (NativeListItem, NativeSelectionTarget?, String) -> String
   ) {
-    let iconUpdate = NativeListIconUpdate(self)
-    defer { iconUpdate.finish() }
-
     NSLayoutConstraint.deactivate(selectorConstraints + accessorySizeConstraints)
     selectorConstraints = []
     accessorySizeConstraints = []
@@ -169,7 +166,6 @@ final class NativeListMarketCell: NativeListRendererCell {
       ? .top
       : style?.dictionary("container")?.string("contentVerticalAlignment") == "bottom"
         ? .bottom : .center
-
   }
   private func resetButton(_ button: NativeListAccessoryButton) {
     button.setTitle(nil, for: .normal)
@@ -502,7 +498,13 @@ final class NativeListMarketCell: NativeListRendererCell {
         fallback: .darkGray
       )
       leadingActionButton.tintColor = tintColor
-      leadingActionButton.bindIcon(leadingAction.string("name"))
+      if let image = nativeListIcon(named: leadingAction.string("name")) {
+        leadingActionButton.setImage(image, for: .normal)
+        leadingActionButton.setImage(
+          image.withTintColor(tintColor, renderingMode: .alwaysOriginal),
+          for: .disabled
+        )
+      }
       leadingActionButton.isEnabled = !leadingAction.bool("disabled")
       leadingActionButton.alpha = leadingActionButton.isEnabled ? 1 : 0.4
       leadingActionButton.accessibilityIdentifier = leadingAction["testID"] as? String
@@ -625,7 +627,11 @@ final class NativeListMarketCell: NativeListRendererCell {
       button.titleEdgeInsets = .zero
       button.imageView?.contentMode = .scaleAspectFit
       if hasBuiltInIcon {
-        button.bindIcon("BadgeVerifiedSolid", size: CGSize(width: iconSize, height: iconSize))
+        button.setImage(
+          nativeListIcon(
+            named: "BadgeVerifiedSolid", size: CGSize(width: iconSize, height: iconSize)),
+          for: .normal
+        )
       }
       // OneKey patch: match source badge metrics at physical-pixel precision.
       // let height = button.heightAnchor.constraint(equalToConstant: 18)

package/ios/NativeListMediaTileRenderer.swift

@@ -11,7 +11,7 @@ final class NativeListMediaTileCell: NativeListRendererCell {
   private let picture = UIView()
   private let image = NativeListMediaPreviewSlot()
   private let network = NativeListImageSlot()
-  private let errorIcon = NativeListIconImageView()
+  private let errorIcon = UIImageView()
   private let title = NativeListTextLabel()
   private let subtitle = NativeListTextLabel()
   private let badge = NativeListTextLabel()
@@ -87,9 +87,6 @@ final class NativeListMediaTileCell: NativeListRendererCell {
     _ item: NativeListItem, theme: [String: Any]?, layout: String,
     checkboxState: (NativeListItem, NativeSelectionTarget?, String) -> String
   ) {
-    let iconUpdate = NativeListIconUpdate(self)
-    defer { iconUpdate.finish() }
-
     let style = item.data.dictionary("style") ?? [:]
     imageStyle = style.dictionary("image") ?? [:]
     let hp = CGFloat(style.double("horizontalPadding", default: 10))
@@ -125,7 +122,7 @@ final class NativeListMediaTileCell: NativeListRendererCell {
     let state = item.data.string("imageState")
     let placeholder = theme?.string("strongBackground", default: "#0000000F") ?? "#0000000F"
     errorIcon.isHidden = state != "error"
-    errorIcon.bindIcon("ImageSquareWavesOutline")
+    errorIcon.image = nativeListIcon(named: "ImageSquareWavesOutline")
     errorIcon.tintColor = UIColor(nativeListHex: "#00000044", fallback: .lightGray)
     let media = item.data.dictionary("media")
     if state != "empty", state != "error", let source = media?.dictionary("source") ?? item.data.dictionary("image") {
@@ -167,7 +164,6 @@ final class NativeListMediaTileCell: NativeListRendererCell {
     close.setTitle("×", for: .normal)
     close.titleLabel?.font = nativeListFont(ofSize: 16, weight: .medium, fonts: fonts)
     close.setTitleColor(nativeListColor(theme, "primaryText", "#202020"), for: .normal)
-
   }
   override func layoutSubviews() {
     let width = CGFloat(