Skip to content

fix(android): navigate after edited help request submission #604

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
mehmetcangurbuz08 merged 1 commit into from
May 12, 2026
Merged

fix(android): navigate after edited help request submission #604

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
10 changes: 6 additions & 4 deletions android/app/src/main/java/com/neph/features/requesthelp/presentation/RequestHelpScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,8 +934,10 @@ fun RequestHelpScreen(
loading = true
scope.launch {
try {
val editLocalId = activeDraftLocalId.takeIf { it.isNotBlank() }
val existingDraft = editLocalId?.let { RequestHelpRepository.getLocalHelpRequest(it) }
if (isLoggedIn) {
val hasActiveRequest = activeDraftLocalId.isBlank() && RequestHelpRepository.hasActiveHelpRequest(sessionToken)
val hasActiveRequest = existingDraft == null && RequestHelpRepository.hasActiveHelpRequest(sessionToken)
if (hasActiveRequest) {
errorMessage = "You can only have one active help request at a time."
return@launch
Expand All @@ -948,10 +950,10 @@ fun RequestHelpScreen(
}

val submission = buildSubmission(formState, availableLocationData)
val result = if (activeDraftLocalId.isNotBlank()) {
val result = if (editLocalId != null && existingDraft != null) {
RequestHelpRepository.updateHelpRequest(
token = sessionToken,
localId = activeDraftLocalId,
localId = editLocalId,
submission = submission,
preserveExistingCoordinates = !formState.locationWasManuallyChanged
)
Expand All @@ -961,7 +963,7 @@ fun RequestHelpScreen(
submission = submission
)
}
activeDraftLocalId = result.requestId
activeDraftLocalId = if (existingDraft != null) "" else result.requestId
infoMessage = "Help request saved on this device and queued for sync."
if (isSendOnboardingTarget) {
completeRequestHelpOnboardingStep(MobileOnboardingStepId.REQUEST_HELP_SEND)
Expand Down
10 changes: 7 additions & 3 deletions android/app/src/main/java/com/neph/navigation/AppNavGraph.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,9 +502,13 @@ fun AppNavGraph(
navigateToLogin()
},
onNavigateToMyHelpRequests = {
val popped = navController.popBackStack(Routes.MyHelpRequests.route, inclusive = false)
if (!popped) {
navigateToDrawerRoute(Routes.MyHelpRequests.route)
navController.navigate(Routes.MyHelpRequests.route) {
popUpTo(Routes.Home.route) {
inclusive = false
saveState = false
}
launchSingleTop = true
restoreState = false
}
},
mobileOnboardingStepId = mobileOnboardingStepId,
Expand Down
Loading