Skip to content

fix(ios): preserve PR drafts across related-file navigation #446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BunsDev merged 1 commit into from
Sep 12, 2026
Merged

fix(ios): preserve PR drafts across related-file navigation #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions native/ios/PsycheApp/Sources/PsycheApp/Views/ActionSheetView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ struct ActionSheetView: View {
.navigationBarTitleDisplayMode(.inline)
.accessibilityIdentifier("remote-action-sheet")
.interactiveDismissDisabled(preventsInteractiveDismissal)
.onChange(of: store.presentation?.requestID, initial: true) {
resetDraft()
}
}
.onChange(of: store.presentation?.requestID, initial: true) {
resetDraft()
}
}

Expand Down
34 changes: 31 additions & 3 deletions native/ios/PsycheApp/Tests/PsycheAppUITests/PsycheAppUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,19 +700,31 @@ final class PsycheAppUITests: XCTestCase {

let sheet = element("remote-action-sheet", in: app)
XCTAssertTrue(sheet.waitForExistence(timeout: 10))
let titleField = textInput("remote-action-pr-title", in: app)
let bodyField = textInput("remote-action-pr-body", in: app)
reveal(titleField, in: sheet)
XCTAssertTrue(titleField.waitForExistence(timeout: 10))
XCTAssertTrue(bodyField.waitForExistence(timeout: 10))
let originalTitle = try XCTUnwrap(titleField.value as? String)
let originalBody = try XCTUnwrap(bodyField.value as? String)
let changedFile = element("remote-action-pr-file-Sources/App.swift", in: app)
reveal(changedFile, in: sheet)
XCTAssertTrue(changedFile.waitForExistence(timeout: 10))
changedFile.tap()

XCTAssertTrue(element("action-sheet-related-file", in: app).waitForExistence(timeout: 10))
app.navigationBars.buttons.element(boundBy: 0).tap()
// Regular-width layouts also expose the underlying workspace navigation bar.
let relatedFileNavigationBar = app.navigationBars["App.swift"]
XCTAssertTrue(relatedFileNavigationBar.waitForExistence(timeout: 10))
let backToReview = relatedFileNavigationBar.buttons.firstMatch
XCTAssertTrue(backToReview.waitForExistence(timeout: 10))
backToReview.tap()

let titleField = textInput("remote-action-pr-title", in: app)
let bodyField = textInput("remote-action-pr-body", in: app)
reveal(titleField, in: sheet)
XCTAssertTrue(titleField.waitForExistence(timeout: 10))
XCTAssertTrue(bodyField.waitForExistence(timeout: 10))
XCTAssertEqual(titleField.value as? String, originalTitle)
XCTAssertEqual(bodyField.value as? String, originalBody)

titleField.tap()
titleField.typeText(" safely")
Expand All @@ -726,6 +738,22 @@ final class PsycheAppUITests: XCTestCase {
(bodyField.value as? String ?? "").contains("Confirmed from iOS"),
"Edited PR summary should remain in the review form"
)

let editedTitle = try XCTUnwrap(titleField.value as? String)
let editedBody = try XCTUnwrap(bodyField.value as? String)
reveal(changedFile, in: sheet)
XCTAssertTrue(changedFile.isHittable)
changedFile.tap()
XCTAssertTrue(element("action-sheet-related-file", in: app).waitForExistence(timeout: 10))
XCTAssertTrue(relatedFileNavigationBar.waitForExistence(timeout: 10))
XCTAssertTrue(backToReview.waitForExistence(timeout: 10))
backToReview.tap()

reveal(titleField, in: sheet)
XCTAssertTrue(titleField.waitForExistence(timeout: 10))
XCTAssertTrue(bodyField.waitForExistence(timeout: 10))
XCTAssertEqual(titleField.value as? String, editedTitle)
XCTAssertEqual(bodyField.value as? String, editedBody)
}

func testPullRequestCanBeCancelledFromConfirmationAndReview() throws {
Expand Down
Loading