Skip to content

fix: ios master builds again after the usdt and receive fixes landed together - #947

Merged
ovitrif merged 1 commit into
masterfrom
fix/receive-qr-error-build
Oct 15, 2026
Merged

ovitrif merged 1 commit into
masterfrom
fix/receive-qr-error-build

Conversation

@ovitrif

@ovitrif ovitrif commented Oct 15, 2026

Copy link
Copy Markdown
Collaborator

Fixes the master build. #933 added a QrArea call for the receive error state with the navigationPath: / editRoute: arguments, while #884 (merged just before it) replaced those with an onEdit closure. Each PR built on its own; together ReceiveQr.swift:432 fails with "extra arguments at positions #4, #5", so Run Tests, Run Integration Tests and build-local fail on master and on every open PR.

Description

  • Pass onEdit to the error-state QrArea the same way the other two QrArea calls in this file do.

QA Notes

Automated Checks

  • CI on this PR builds the app and runs the unit and integration tests.

@piotr-iohk @ben-kaufman FYI, this unblocks iOS master for RC2.

@ovitrif ovitrif added this to the 3.0.0 milestone Oct 15, 2026
@ovitrif ovitrif self-assigned this Oct 15, 2026
@ovitrif ovitrif changed the title fix: build the receive error state against the new qr area fix: ios master builds again after the usdt and receive fixes landed together Oct 15, 2026
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 15, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-15T13:41:26.514563Z db851cf PR opened
ℹ️ 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@ovitrif
ovitrif requested review from a team, ben-kaufman and coreyphillips and removed request for a team October 15, 2026 13:40
@greptile-apps

greptile-apps Bot commented Oct 15, 2026 •

Copy link
Copy Markdown

RetriggerView in GreptileConfidence Score: 5/5

[Low impact] This change appears safe to merge.

Summary

Updates the receive error state's QrArea call to use onEdit instead of the removed navigation arguments.

  • The receive error screen sends edits to the selected tab.

Reviews (1) · Last reviewed commit: "fix: build the receive error state again..." · Reviewed by Greptile

@ovitrif
ovitrif requested review from piotr-iohk and removed request for coreyphillips October 15, 2026 13:43
@ovitrif
ovitrif enabled auto-merge October 15, 2026 13:54

@talosmachina talosmachina left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No findings. Fixes the master compile break where #933's error-state QrArea still passed navigationPath: / editRoute: after #884 had replaced them with onEdit. The call now uses the same editRoute(for:).map { route in { navigationPath.append(route) } } form as the populated QR at line 404. Reviewed db851cf, light tier, reasoned from the code and from CI (the iOS app is not built here).

What I checked, and 2 candidates I ruled out

Read in full: Bitkit/Views/Wallets/Receive/QrArea.swift, the three QrArea calls and editRoute(for:) in ReceiveQr.swift.
Master failure confirmed: Run Tests on 3a3ebd4e failed with ReceiveQr.swift:432 extra arguments at positions #4, #5 in call. afb57933 (#884) was green, and the merge with #933 broke it.
Call sites: no other QrArea( in the tree still passes navigationPath: or editRoute: (ReceiveQr.swift:376, :400, :432 and UsdtReceiveView.swift:187 all use onEdit). The editRoute: at ReceiveQr.swift:583 goes to CopyAddressCard, which still declares it.
CI: build-local green on this head. Run Tests and Run Integration Tests were still running at review time.

Ruled out

  • Edit button behaviour changed in the error state: the old QrArea showed the edit button only for if let editRoute and appended it to navigationPath. The new one shows it only for a non-nil onEdit, and .map yields nil exactly when editRoute(for:) would. editRoute(for:) always returns a route, so the button stays and pushes the same .edit(...) route, including replacesCurrentQr.
  • Edit enabled with an empty URI: same as before the merge. #933 disabled only Copy and Share for an empty uri, never Edit.

Merge confidence: 5/5, a compile fix that build-local now compiles, with no behaviour change.

@ovitrif
ovitrif merged commit 1aafebe into master Oct 15, 2026
18 checks passed
@ovitrif
ovitrif deleted the fix/receive-qr-error-build branch October 15, 2026 14:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants