Repository navigation
chore: restore master SwiftFormat compliance - #1040
Conversation
|
@ben-kaufman I closed #1035 in favour of this PR, since it covers all three files; it's ready to undraft and merge once approved. |
There was a problem hiding this comment.
Verdict: ✅ Approve
Findings: None.
QA for 035b8e6:
Test 1: SwiftFormat compliance ✅ Repository lint passes with SwiftFormat 0.64.0.
Checked with swiftformat --lint .. The three changed files fail lint at the base; applying SwiftFormat 0.64.0 to those base files produces the PR's contents byte for byte.
Test 2: Simulator build ✅ Bitkit Debug builds successfully for the iOS simulator.
Built the reviewed head with Xcode 27.0 for the arm64 iOS simulator. This was a compile-only check; the app was not launched.
Device journeys and manual tests were not run: the PR lists none, and the change has no user-visible behavior. No runtime behavior was exercised.
Full review of bcaa461b..035b8e6, covering all three changed files and the connection lifecycle code they call. The guard conditions retain their order and generation checks around await; the Activity spacer condition is unchanged.
Android twin: none linked; this is an iOS SwiftFormat correction with no cross-platform behavior change.
Reviewed by gpt-6.1-sol-high via gh-pr-review-loop skill
Commands: @ovi-reviewer review · test · retest
[Low impact] This formatting-only PR appears safe to merge. SummaryApplies formatting changes to three Swift files.
No actionable issues found. Build and formatting checks were not run. Reviews (1) · Last reviewed commit: "chore: restore master SwiftFormat compli..." · Reviewed by Greptile |
|
Triage: milestone 3.1.0, with the lint work in #1028. It turns master's SwiftFormat check green, after which SwiftFormat becomes a required check. It closes no issue, so this PR carries the milestone itself. Not a release blocker. |
talosmachina
left a comment
There was a problem hiding this comment.
No findings. Folds the split Electrum/RGS connection guards into one guard and braces the ActivityRow spacer so master passes SwiftFormat 0.64.0. Reviewed 035b8e6, full tier, reasoned from the code and CI (iOS does not build on this reviewer's host).
What I checked, and 2 candidates I ruled out
Read in full: ElectrumSettingsScreen.swift, RgsSettingsScreen.swift, the changed ActivityRowContent body
CI: SwiftFormat, validate, Greptile green; Run Tests, Run Integration Tests and build-local still pending at review time
Ruled out
- Guard order changed: Swift evaluates a
guardcondition list left to right and stops at the first false one, soisCurrentServerConnection(generation)still short-circuits before theawait, and the post-await generation check still runs after it. Same behaviour as the two separate guards. - Layout change in
ActivityRow:if !stacked { Spacer(minLength: 0) }and the braced form build the same view tree.
Merge confidence: 4/5, the unit and integration test jobs had not finished when I reviewed.
jvsena42
left a comment
There was a problem hiding this comment.
Approving. The change is formatting only:
ElectrumSettingsScreen/RgsSettingsScreen: each pair ofguards becomes one guard with the conditions in the same order, so the generation checks before and after theawaitbehave as before.ActivityRow: the spacer'sifbody moves onto its own lines and builds the same views.
SwiftFormat, Run Tests and validate are green at 035b8e6. Merging this clears the SwiftFormat failure on the other open PRs.
Device gate: no device check needed (formatting only); perf: not relevant; l10n: no UI text changed.
|
Admin-merged this PR before its integration and e2e runs finished, and cancelled those runs. Why: master's SwiftFormat check was red after #1028 began enforcing it, which turned the lint check red on every open iOS PR. This PR only reformats three Swift files and touches no logic. It was approved, its SwiftFormat, unit tests and build were green, and the e2e queue on the self-hosted runner was several hours long. Cancelling its runs freed that runner for other PRs. Follow-ups:
|
|
SwiftFormat is now a required check on master (ruleset |
Description
The settings findings reproduce on
bcaa461b, from #871. The Activity formatting finding also reproduces on that base. These failures affect merge-checkout CI for unrelated PRs, including #1025.Design
N/A — no UI changes.
Preview
N/A
QA Notes
Journeys
N/A — no user-visible behaviour change.
Manual Tests
N/A
Automated Checks
N/A — formatting-only correction; no test coverage changes.