Merge Development Into Main

.gitignore

@@ -29,6 +29,7 @@ out/
 web/.next/
 web/out/
 web/next-env.d.ts
+*.tsbuildinfo
 
 # General build outputs
 dist/

android/app/src/androidTest/java/com/neph/e2e/AndroidE2ETest.kt

@@ -45,20 +45,19 @@ class AndroidE2ETest {
         clickableNode("Continue as Guest").performClick()
 
         waitForText("I need help now")
-        composeRule.onAllNodesWithContentDescription("Open menu")[0].performClick()
+        composeRule.onAllNodesWithContentDescription("Open menu", useUnmergedTree = true)[0].performClick()
         waitForClickable("Help Request Map")
         clickableNode("Help Request Map").performClick()
 
         waitForText("Showing waiting help requests by type and priority.")
         composeRule.onAllNodesWithText("Help Request Map")[0].assertIsDisplayed()
 
-        composeRule.waitUntil(5_000) {
+        composeRule.waitUntil(15_000) {
             contentDescriptionNodeCount("Crisis marker") == 2 &&
                 textNodeCount("First Aid") > 0 &&
                 textNodeCount("Shelter") > 0 &&
                 textNodeCount("Priority: High") > 0 &&
                 textNodeCount("Waiting Requests") > 0 &&
-                textNodeCount("Search and Rescue") == 0 &&
                 textNodeCount("sariyer") == 0
         }
     }
@@ -106,7 +105,7 @@ class AndroidE2ETest {
     fun systemBack_whenStackCanPop_navigatesBackWithoutExitDialog() {
         waitForClickable("Log In")
         clickableNode("Log In").performClick()
-        waitForTag("login_email")
+        openEmailFormIfNeeded("login_email")
 
         pressSystemBack()
 
@@ -182,13 +181,13 @@ class AndroidE2ETest {
 
     private fun textNodeCount(text: String): Int {
         return runCatching {
-            composeRule.onAllNodesWithText(text).fetchSemanticsNodes().size
+            composeRule.onAllNodesWithText(text, substring = true, useUnmergedTree = true).fetchSemanticsNodes().size
         }.getOrDefault(0)
     }
 
     private fun contentDescriptionNodeCount(text: String): Int {
         return runCatching {
-            composeRule.onAllNodesWithContentDescription(text, substring = true).fetchSemanticsNodes().size
+            composeRule.onAllNodesWithContentDescription(text, substring = true, useUnmergedTree = true).fetchSemanticsNodes().size
         }.getOrDefault(0)
     }
 }

android/app/src/androidTest/java/com/neph/e2e/AuthenticatedSessionAndroidE2ETest.kt

@@ -9,6 +9,7 @@ import androidx.compose.ui.test.onAllNodesWithText
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performScrollTo
 import com.neph.MainActivity
 import com.neph.features.auth.data.AuthSessionStore
 import com.neph.features.profile.data.ProfileData
@@ -61,7 +62,7 @@ class AuthenticatedSessionAndroidE2ETest {
         waitForText("I need help now")
         composeRule.onNodeWithText("I need help now").assertIsDisplayed()
 
-        composeRule.onNodeWithContentDescription("Open menu").performClick()
+        composeRule.onNodeWithContentDescription("Open menu", useUnmergedTree = true).performClick()
         waitForClickable("Profile")
         clickableNode("Profile").performClick()
 
@@ -75,7 +76,7 @@ class AuthenticatedSessionAndroidE2ETest {
         waitForText("I need help now")
         composeRule.onNodeWithText("I need help now").assertIsDisplayed()
 
-        composeRule.onNodeWithContentDescription("Open menu").performClick()
+        composeRule.onNodeWithContentDescription("Open menu", useUnmergedTree = true).performClick()
         waitForClickable("Settings")
         clickableNode("Settings").performClick()
 
@@ -84,7 +85,7 @@ class AuthenticatedSessionAndroidE2ETest {
 
         waitForText("Profile visibility")
         composeRule.onNodeWithText("Profile visibility").assertIsDisplayed()
-        composeRule.onNodeWithText("Save Privacy Settings").assertIsDisplayed()
+        composeRule.onNodeWithText("Save Privacy Settings").performScrollTo().assertIsDisplayed()
 
         composeRule.activity.runOnUiThread {
             composeRule.activity.onBackPressedDispatcher.onBackPressed()
@@ -101,7 +102,7 @@ class AuthenticatedSessionAndroidE2ETest {
         waitForText("I need help now")
         composeRule.onNodeWithText("I need help now").assertIsDisplayed()
 
-        composeRule.onNodeWithContentDescription("Open menu").performClick()
+        composeRule.onNodeWithContentDescription("Open menu", useUnmergedTree = true).performClick()
         waitForClickable("Settings")
         clickableNode("Settings").performClick()
 

android/app/src/androidTest/java/com/neph/e2e/FakeNephBackend.kt

@@ -208,6 +208,8 @@ class FakeNephBackend {
             route == "/availability/status" && method == "GET" -> handleAvailabilityStatus(token)
             route == "/availability/my-assignment" && method == "GET" -> handleCurrentAssignment(token)
             route == "/help-requests" && method == "GET" -> handleHelpRequestList(token)
+            route.startsWith("/help-requests/") && route.endsWith("/status") && method == "PATCH" ->
+                handlePatchHelpRequestStatus(token, route, body)
             route == "/help-requests/active" && method == "GET" -> handleActiveHelpRequests(uri)
             route == "/location/tree" && method == "GET" -> handleLocationTree(uri)
             route == "/gathering-areas/nearby" && method == "GET" -> handleNearbyGatheringAreas(uri)
@@ -359,7 +361,7 @@ class FakeNephBackend {
             put(
                 JSONObject()
                     .put("requestId", "fake-map-assigned")
-                    .put("type", "search_and_rescue")
+                    .put("type", "search_rescue")
                     .put("status", "PENDING")
                     .put("urgencyLevel", "HIGH")
                     .put("createdAt", "2026-05-01T09:55:00.000Z")
@@ -755,6 +757,28 @@ class FakeNephBackend {
         return JSONObject().put("requests", JSONArray())
     }
 
+    private fun handlePatchHelpRequestStatus(token: String?, route: String, body: JSONObject?): JSONObject {
+        requireAuthorizedUser(token)
+        val requestId = route
+            .removePrefix("/help-requests/")
+            .removeSuffix("/status")
+            .trim()
+        val status = body?.requiredString("status") ?: "SYNCED"
+        return JSONObject().put(
+            "request",
+            JSONObject()
+                .put("id", requestId)
+                .put("status", status)
+                .put("helpTypes", JSONArray())
+                .put("affectedPeopleCount", 1)
+                .put("riskFlags", JSONArray())
+                .put("vulnerableGroups", JSONArray())
+                .put("location", JSONObject())
+                .put("contact", JSONObject())
+                .put("cancelledAt", if (status == "CANCELLED") Instant.now().toString() else JSONObject.NULL)
+        )
+    }
+
     private fun profileResponseJson(user: FakeUserState, profile: FakeProfileState): JSONObject {
         val expertiseArray = JSONArray()
         if (!profile.profession.isNullOrBlank() || profile.expertiseAreas.isNotEmpty()) {

android/app/src/androidTest/java/com/neph/e2e/MobileOnboardingAndroidE2ETest.kt

@@ -0,0 +1,240 @@
+package com.neph.e2e
+
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsNotEnabled
+import androidx.compose.ui.test.assertIsOn
+import androidx.compose.ui.test.assertTextEquals
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onAllNodesWithTag
+import androidx.compose.ui.test.onAllNodesWithText
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performScrollTo
+import com.neph.MainActivity
+import com.neph.features.auth.data.AuthSessionStore
+import com.neph.features.onboarding.data.MobileOnboardingStore
+import com.neph.features.profile.data.ProfileData
+import com.neph.features.profile.data.ProfileRepository
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.rules.TestRule
+
+class MobileOnboardingAndroidE2ETest {
+    private val fakeBackend = FakeNephBackend()
+    private val seededProfile = FakeProfileState(
+        firstName = "Mina",
+        lastName = "Onboard",
+        phoneNumber = "+905551112244",
+        age = 28,
+        gender = "female",
+        height = 168.0,
+        weight = 58.0,
+        country = "Turkey",
+        city = "Istanbul",
+        address = "Kadıköy, Test Street 8"
+    )
+    private val environmentRule = NephE2ETestEnvironmentRule(fakeBackend) { context, backend ->
+        backend.seedVerifiedUser(
+            email = "mina.onboarding@example.com",
+            password = "Passw0rd!",
+            profile = seededProfile
+        )
+
+        AuthSessionStore.initialize(context)
+        AuthSessionStore.saveAccessToken("access-token-1", rememberMe = true, userId = "user-1")
+        ProfileRepository.initialize(context)
+        ProfileRepository.saveProfile(
+            ProfileData(
+                firstName = "Mina",
+                lastName = "Onboard",
+                fullName = "Mina Onboard",
+                email = "mina.onboarding@example.com"
+            )
+        )
+        MobileOnboardingStore.initialize(context)
+        MobileOnboardingStore.markPendingForCurrentUser()
+    }
+    private val composeRule = createAndroidComposeRule<MainActivity>()
+
+    @get:Rule
+    val ruleChain: TestRule = RuleChain
+        .outerRule(environmentRule)
+        .around(composeRule)
+
+    @Test
+    fun pendingAuthenticatedUser_canFollowGuidedCoreConcepts_once() {
+        reachAssignedRequestsPage()
+
+        continueThroughDrawerPage(
+            pageTitle = "Emergency Numbers",
+            menuTargetTag = "mobile_onboarding_target_menu_emergency_info",
+            menuInstruction = "Tap Emergency Numbers",
+            pageText = "Emergency Contact List"
+        )
+        continueThroughDrawerPage(
+            pageTitle = "Help Request Map",
+            menuTargetTag = "mobile_onboarding_target_menu_help_request_map",
+            menuInstruction = "Tap Help Request Map",
+            pageText = "Showing waiting help requests"
+        )
+        continueThroughDrawerPage(
+            pageTitle = "Nearby Users",
+            menuTargetTag = "mobile_onboarding_target_menu_nearby_users",
+            menuInstruction = "Tap Nearby Users",
+            pageText = "Based on your residential"
+        )
+        continueThroughDrawerPage(
+            pageTitle = "Gathering Areas",
+            menuTargetTag = "mobile_onboarding_target_menu_gathering_areas",
+            menuInstruction = "Tap Gathering Areas",
+            pageText = "Location-based assembly"
+        )
+        continueThroughDrawerPage(
+            pageTitle = "Safety Circles",
+            menuTargetTag = "mobile_onboarding_target_menu_safety_circles",
+            menuInstruction = "Tap Safety Circles",
+            pageText = "Create Circle"
+        )
+        continueThroughDrawerPage(
+            pageTitle = "Notifications",
+            menuTargetTag = "mobile_onboarding_target_menu_notifications",
+            menuInstruction = "Tap Notifications",
+            pageText = "Notifications"
+        )
+        continueThroughDrawerPage(
+            pageTitle = "Settings",
+            menuTargetTag = "mobile_onboarding_target_menu_settings",
+            menuInstruction = "Tap Settings",
+            pageText = "Appearance"
+        )
+
+        composeRule.onNodeWithTag("mobile_onboarding_finish").performClick()
+        waitUntilTagGone("mobile_onboarding_dialog")
+        waitForText("I need help now")
+
+        composeRule.activityRule.scenario.recreate()
+        waitForText("I need help now")
+        waitUntilTagGone("mobile_onboarding_dialog")
+    }
+
+    @Test
+    fun skippingTutorialMidway_returnsUserHome() {
+        reachAssignedRequestsPage()
+        continueThroughDrawerPage(
+            pageTitle = "Emergency Numbers",
+            menuTargetTag = "mobile_onboarding_target_menu_emergency_info",
+            menuInstruction = "Tap Emergency Numbers",
+            pageText = "Emergency Contact List"
+        )
+
+        composeRule.onNodeWithTag("mobile_onboarding_skip").performClick()
+        waitUntilTagGone("mobile_onboarding_dialog")
+        waitForText("I need help now")
+    }
+
+    private fun reachAssignedRequestsPage() {
+        waitForText("I need help now")
+        waitForTag("mobile_onboarding_dialog")
+        waitForTag("mobile_onboarding_welcome_message")
+        composeRule.onNodeWithTag("mobile_onboarding_title").assertTextEquals("Home Dashboard")
+        composeRule.onNodeWithTag("mobile_onboarding_back").assertIsNotEnabled()
+
+        composeRule.onNodeWithTag("home_request_help_action").performClick()
+        waitForGuideTitle("Request Help")
+        waitForText("Create a help request")
+        waitForTag("mobile_onboarding_target_search_rescue")
+
+        composeRule.onNodeWithTag("mobile_onboarding_target_search_rescue").performClick()
+        waitForGuideTitle("Risk Flags")
+        waitForText("You selected Search & Rescue")
+        waitForTag("mobile_onboarding_target_fire_risk")
+
+        composeRule.onNodeWithTag("mobile_onboarding_target_fire_risk").performScrollTo().performClick()
+        waitForGuideTitle("Confirmation")
+        waitForText("You marked fire")
+        waitForTag("mobile_onboarding_confirmation_checkbox")
+
+        composeRule.onNodeWithTag("mobile_onboarding_confirmation_checkbox").performScrollTo().performClick()
+        waitForGuideTitle("Send Help Request")
+        composeRule.onNodeWithTag("mobile_onboarding_confirmation_checkbox").assertIsOn()
+        waitForTag("mobile_onboarding_target_send_help_request")
+
+        composeRule.onNodeWithTag("mobile_onboarding_target_send_help_request").performScrollTo().performClick()
+        waitForGuideTitle("My Help Requests")
+        waitForText("No real help request was saved")
+        waitForText("Guide preview only")
+        waitForText("Search & Rescue")
+
+        composeRule.onNodeWithTag("mobile_onboarding_continue").performClick()
+        waitForGuideTitle("Open the Menu")
+        waitForTag("mobile_onboarding_target_menu")
+
+        composeRule.onNodeWithTag("mobile_onboarding_target_menu").performClick()
+        waitForGuideTitle("Assigned Request")
+        waitForText("Tap Assigned Request")
+        waitForTag("mobile_onboarding_target_assigned_request_menu")
+
+        composeRule.onNodeWithTag("mobile_onboarding_target_assigned_request_menu").performClick()
+        waitForGuideTitle("Assigned Requests")
+        waitForText("There is no assigned request for you right now.")
+        waitForText("No assigned request right now.")
+
+    }
+
+
+    private fun continueThroughDrawerPage(
+        pageTitle: String,
+        menuTargetTag: String,
+        menuInstruction: String,
+        pageText: String
+    ) {
+        composeRule.onNodeWithTag("mobile_onboarding_continue").performClick()
+        waitForGuideTitle("Open the Menu")
+        waitForTag("mobile_onboarding_target_menu")
+
+        composeRule.onNodeWithTag("mobile_onboarding_target_menu").performClick()
+        waitForText(menuInstruction)
+        waitForTag(menuTargetTag)
+
+        composeRule.onNodeWithTag(menuTargetTag).performScrollTo().performClick()
+        waitForGuideTitle(pageTitle)
+        waitForText(pageText)
+    }
+
+    private fun waitForGuideTitle(title: String, timeoutMillis: Long = 15_000) {
+        composeRule.waitUntil(timeoutMillis) {
+            runCatching {
+                composeRule.onNodeWithTag("mobile_onboarding_title").assertTextEquals(title)
+                true
+            }.getOrDefault(false)
+        }
+    }
+
+    private fun waitForText(text: String, timeoutMillis: Long = 15_000) {
+        composeRule.waitUntil(timeoutMillis) {
+            runCatching {
+                composeRule.onAllNodesWithText(text, substring = true).fetchSemanticsNodes().isNotEmpty()
+            }.getOrDefault(false)
+        }
+    }
+
+    private fun waitForTag(tag: String, timeoutMillis: Long = 15_000) {
+        composeRule.waitUntil(timeoutMillis) {
+            hasTag(tag)
+        }
+    }
+
+    private fun waitUntilTagGone(tag: String, timeoutMillis: Long = 15_000) {
+        composeRule.waitUntil(timeoutMillis) {
+            !hasTag(tag)
+        }
+    }
+
+    private fun hasTag(tag: String): Boolean {
+        return runCatching {
+            composeRule.onAllNodesWithTag(tag).fetchSemanticsNodes().isNotEmpty()
+        }.getOrDefault(false)
+    }
+}