feat: align swap k-line and same-chain token selection (OK-57650, OK-57751)#12436
Merged
Conversation
zhaono1
marked this pull request as ready for review
July 13, 2026 10:18
zhaono1
requested review from
ezailWang,
huhuanming,
originalix,
revan-zhang and
sidmorizon
as code owners
July 13, 2026 10:18
zhaono1
enabled auto-merge (squash)
July 13, 2026 10:19
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: efd6f1d4fa
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
6 tasks
originalix
reviewed
Jul 14, 2026
originalix
approved these changes
Jul 14, 2026
originalix
disabled auto-merge
July 14, 2026 09:41
originalix
reviewed
Jul 14, 2026
| "trade.privacy_mode": "Privatsphärenmodus", | ||
| "trade.privacy_mode_tooltips": "Der Privatsphärenmodus kann die direkte On-Chain-Verbindung zwischen Absender- und Empfängeradressen während Swaps oder Bridges verbergen.", | ||
| "trade.taking_longer_than_usual": "Dauert länger als gewöhnlich, überprüfen Sie den On-Chain-Status zur Bestätigung", | ||
| "trade.token_same_chain": "Same chain", |
Collaborator
There was a problem hiding this comment.
当德语或法语用户打开普通 Swap 选币器并出现同链推荐时,这个 Badge 会分别显示英文 Same chain 和中英混合的 Même chain,因为对应 locale 尚未完成本地化。
这会让新功能的核心标签直接出现语言回退。请在 Lokalise 中补全 trade::token_same_chain 的 de 和 fr_FR 翻译,再通过 i18n pull 流程重新生成 locale 文件。
This was referenced Jul 16, 2026
Merged
originalix
added a commit
that referenced
this pull request
Jul 16, 2026
* fix: consolidate pending issue fixes (OK-57753, OK-57836, OK-57752, OK-57547, OK-57451, OK-54672, OK-57787, OK-56469, OK-56028) (#12461) * fix: stabilize Swap Pro account warning (OK-57753) * fix: center editable DeFi percentage value (OK-57836) * fix: keep Market network labels unshrunk (OK-57547) * fix: keep Limit history available when disconnected (OK-57451) * fix: use decimal keyboards for trading inputs (OK-54672) * fix: prepare Swap Pro before navigation (OK-57752) * fix: clear stale Stock balance on Swap exit (OK-57787) * fix: align Earn provider header breakpoint (OK-56469) * fix: expand Private Send quote toggle target (OK-56028) * fix: handle Stock market data failures * fix: preserve stock balance and swap pro account scope * feat: align swap k-line and same-chain token selection (OK-57650, OK-57751) (#12436) * feat: align swap k-line chart controls (OK-57650) * fix: hide duplicate swap chart interval selector OK-57650 * chore: update translations * feat: support same-chain token selection (OK-57751) * chore: update translations * fix: resolve Jira UI issues(OK-57565, OK-52118, OK-56004, OK-55516, OK-56209, OK-57648, OK-57924) (#12468) * fix: honor Pendle tooltip text styles OK-57565 * fix: make borrow detail tabs scrollable OK-52118 * fix: deduplicate same-symbol K-line tokens OK-56004 * fix: hide estimated swap savings OK-55516 * fix: hide swap keyboard accessory on iPad OK-56470 * fix: keep extension side panel on Trade OK-57350 * fix: guard swap derive selector by network OK-56209 * fix: align swap slippage boundaries OK-54577 * fix: preserve WebDapp route through modals OK-57648 * fix: use OneKey token metadata for limits OK-57550 * revert: restore iPad swap keyboard accessories OK-56470 * revert: restore extension Perps home navigation OK-57350 * revert: restore previous swap slippage rules OK-54577 * fix: align limit order metadata with Market detail OK-57550 * fix: avoid blocking limit order status refresh * fix: keep borrow detail tab visible OK-52118 * revert: remove OK-57550 from PR scope * fix: stabilize Earn protocol balances OK-57924 * fix: preserve supported K-line side OK-56004 * fix: tighten WebDapp route fallback OK-57648 * fix: address route and K-line edge cases OK-57648 OK-56004 * fix: ignore network filter for market stocks(OK-57973) (#12490) * fix: adjust market chart height(OK-56353, OK-57794) (#12180) * fix: adjust market chart height(OK-56353, OK-57794) * fix: limit market sub indicators on mobile only * fix: remove perps mobile chart touch bridge * fix: tune mobile chart scroll sensitivity * fix: translate Perps fallback strings (#12499) * feat: add attempt-level firmware update tracking(OK-57543) (#12481) * feat: add attempt-level firmware update tracking(OK-57543) - add firmwareUpdateFailedAttempt event: report each real update-task failure (before user retry) with deviceType/transportType/updateFlow/ firmwareVersions/attempt/errorCode, so attempt-level failure rate is measurable even when a later retry succeeds - add retryCount & durationMs to firmwareUpdateResult (v1 UI flow and v2 service flow), enabling retry-recovery-rate and USB-vs-BLE duration analysis - user exit (FirmwareUpdateExit/FirmwareUpdateTasksClear) is not counted as a failed attempt * fix: make tracking-info reading in UI never reject to avoid flipping a successful update into failed state * fix: exclude retry wait from firmware duration * fix: track every firmware update attempt * fix: isolate firmware update tracking workflows --------- Co-authored-by: Leon <lixiao.dev@gmail.com> * fix: correct Swap and Market display states (OK-57526, OK-57987, OK-57998) (#12494) * fix: align Swap K-line toolbar spacing (OK-57526) * fix: hide unavailable token audit UI (OK-57987) * fix: enrich Swap history network metadata (OK-57998) * chore: simplify Swap and DeFi readiness checks * fix: align swap k-line skeleton layout OK-57526 * fix: show unavailable mobile audit state (OK-57987) * fix: prevent incorrect swap recipient fallback * fix: refine Japanese Perps translations (#12505) * fix: prevent mobile isolated label clipping * fix: widen mobile margin mode selector * fix: refine Japanese Perps translations --------- Co-authored-by: Zhao <Charon.Dian@gmail.com> Co-authored-by: limichange <limichange@hotmail.com> Co-authored-by: Kahn <0xkahnchan@gmail.com> Co-authored-by: LeoShang <biubiu520520@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
OK-57650 OK-57751
Summary
Same chainnetwork shortcut to the Swap token selector based on the opposite token's network.N+, and align the new UI with the Figma dimensions.Intent & Context
OK-57650 aligns the Swap K-line controls with the Market native control layer without changing chart data or trading behavior.
OK-57751 makes same-chain selection immediately visible in the combined Swap & Bridge token selector. When selecting the From token, the To token network is featured; when selecting the To token, the From token network is featured. This behavior is limited to the regular Swap selector.
Root Cause
TradingViewV2adapter did not opt in toenableNativeChartControls, so the hosted chart rendered its legacy control UI.N+from the rendered list.Design Decisions
sameChainNetworkas selector presentation data instead of mutating the underlying network order.Changes Detail
SwapKLineContent.tsx: enable native chart controls on the existingTradingViewV2instance and hide the duplicate selector.N+behavior.Issues
Risk Assessment
Test plan
yarn agent:check --profile commityarn jest packages/kit/src/views/Swap/pages/modal/SwapTokenSelectModal.utils.test.ts --runInBand(13 tests)28+label, featured full-list row, and divider in the iOS simulator.N+navigation at runtime.