feat(phase-4a): phase 4a acceptance test fixes

apps/citizen-pwa/package.json

@@ -15,6 +15,7 @@
     "@bantayog/shared-firebase": "workspace:*",
     "@bantayog/shared-types": "workspace:*",
     "@bantayog/shared-ui": "workspace:*",
+    "@bantayog/shared-validators": "workspace:*",
     "firebase": "^12.12.0",
     "react": "^19.2.5",
     "react-dom": "^19.2.5",

apps/citizen-pwa/src/components/SubmitReportForm.tsx

@@ -4,6 +4,7 @@ import { addDoc, collection } from 'firebase/firestore'
 import { httpsCallable } from 'firebase/functions'
 import { db, fns, ensureSignedIn } from '../services/firebase.js'
 import { submitReport, type SubmitReportDeps } from '../services/submit-report.js'
+import { normalizeMsisdn } from '@bantayog/shared-validators'
 import type { ReportType, Severity } from '@bantayog/shared-types'
 
 function randomPublicRef(): string {
@@ -44,6 +45,9 @@ export function SubmitReportForm() {
   const [photo, setPhoto] = useState<File | null>(null)
   const [lat, setLat] = useState<number | null>(null)
   const [lng, setLng] = useState<number | null>(null)
+  const [phone, setPhone] = useState('')
+  const [smsConsent, setSmsConsent] = useState(false)
+  const [phoneError, setPhoneError] = useState<string | null>(null)
   const [busy, setBusy] = useState(false)
   const [error, setError] = useState<string | null>(null)
 
@@ -72,6 +76,14 @@ export function SubmitReportForm() {
       setError('Please capture your location.')
       return
     }
+    if (phone) {
+      try {
+        normalizeMsisdn(phone)
+      } catch {
+        setPhoneError('Enter a valid PH mobile number (e.g. 09171234567 or +639171234567)')
+        return
+      }
+    }
     setBusy(true)
     setError(null)
     try {
@@ -101,6 +113,7 @@ export function SubmitReportForm() {
         description,
         publicLocation: { lat, lng },
         ...(photo ? { photo } : {}),
+        ...(phone && smsConsent ? { contact: { phone, smsConsent: true as const } } : {}),
       })
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
       nav('/receipt', { state: result })
@@ -165,6 +178,30 @@ export function SubmitReportForm() {
           }}
         />
       </label>
+      <label>
+        Mobile number (optional — for SMS alerts)
+        <input
+          type="tel"
+          value={phone}
+          placeholder="09171234567 or +639171234567"
+          onChange={(e) => {
+            setPhone(e.target.value)
+            setPhoneError(null)
+          }}
+        />
+      </label>
+      {phoneError && <p role="alert">{phoneError}</p>}
+      <label>
+        <input
+          type="checkbox"
+          checked={smsConsent}
+          onChange={(e) => {
+            setSmsConsent(e.target.checked)
+          }}
+          disabled={!phone}
+        />
+        Send me SMS updates about this report
+      </label>
       <button
         type="button"
         onClick={() => {

apps/citizen-pwa/src/services/submit-report.test.ts

@@ -1,5 +1,6 @@
 import { describe, it, expect, vi } from 'vitest'
 import { submitReport, type SubmitReportDeps } from './submit-report.js'
+import { normalizeMsisdn } from '@bantayog/shared-validators'
 
 describe('submitReport', () => {
   it('calls requestUploadUrl when a photo is provided, PUTs the photo, and writes inbox', async () => {
@@ -69,4 +70,60 @@ describe('submitReport', () => {
     // eslint-disable-next-line @typescript-eslint/unbound-method
     expect(deps.putBlob).not.toHaveBeenCalled()
   })
+
+  it('normalizes phone and sets smsConsent in contact when provided', async () => {
+    const deps: SubmitReportDeps = {
+      ensureSignedIn: vi.fn().mockResolvedValue('citizen-1'),
+      requestUploadUrl: vi.fn(),
+      putBlob: vi.fn(),
+      writeInbox: vi.fn().mockResolvedValue('ibx-3'),
+      randomUUID: vi.fn().mockReturnValue('uuid-c'),
+      randomPublicRef: vi.fn().mockReturnValue('ref1234'),
+      randomSecret: vi.fn().mockReturnValue('s3'),
+      sha256Hex: vi.fn().mockResolvedValue('i'.repeat(64)),
+      now: () => 1,
+    }
+    await submitReport(deps, {
+      reportType: 'flood',
+      severity: 'low',
+      description: 'z',
+      publicLocation: { lat: 14.1, lng: 122.9 },
+      contact: { phone: '09171234567', smsConsent: true },
+    })
+    // eslint-disable-next-line @typescript-eslint/unbound-method
+    expect(deps.writeInbox).toHaveBeenCalledOnce()
+    const inboxDoc = (deps.writeInbox as unknown as { mock: { calls: unknown[][] } }).mock
+      .calls[0]![0]! as {
+      payload: { contact?: { phone: string; smsConsent: true } }
+    }
+    expect(inboxDoc.payload.contact).toEqual({
+      phone: normalizeMsisdn('09171234567'),
+      smsConsent: true,
+    })
+  })
+
+  it('omits contact when not provided', async () => {
+    const deps: SubmitReportDeps = {
+      ensureSignedIn: vi.fn().mockResolvedValue('citizen-1'),
+      requestUploadUrl: vi.fn(),
+      putBlob: vi.fn(),
+      writeInbox: vi.fn().mockResolvedValue('ibx-4'),
+      randomUUID: vi.fn().mockReturnValue('uuid-d'),
+      randomPublicRef: vi.fn().mockReturnValue('ref5678'),
+      randomSecret: vi.fn().mockReturnValue('s4'),
+      sha256Hex: vi.fn().mockResolvedValue('j'.repeat(64)),
+      now: () => 1,
+    }
+    await submitReport(deps, {
+      reportType: 'flood',
+      severity: 'low',
+      description: 'z',
+      publicLocation: { lat: 14.1, lng: 122.9 },
+    })
+    // eslint-disable-next-line @typescript-eslint/unbound-method
+    expect(deps.writeInbox).toHaveBeenCalledOnce()
+    const inboxDoc = (deps.writeInbox as unknown as { mock: { calls: unknown[][] } }).mock
+      .calls[0]![0]! as { payload: Record<string, unknown> }
+    expect(inboxDoc.payload.contact).toBeUndefined()
+  })
 })

apps/citizen-pwa/src/services/submit-report.ts

@@ -1,9 +1,12 @@
+import { normalizeMsisdn } from '@bantayog/shared-validators'
+
 export interface SubmitReportInput {
   reportType: string
   severity: 'low' | 'medium' | 'high'
   description: string
   publicLocation: { lat: number; lng: number }
   photo?: Blob
+  contact?: { phone: string; smsConsent: true }
 }
 
 export interface SubmitReportDeps {
@@ -65,6 +68,14 @@ export async function submitReport(
       source: 'web',
       publicLocation: input.publicLocation,
       pendingMediaIds,
+      ...(input.contact
+        ? {
+            contact: {
+              phone: normalizeMsisdn(input.contact.phone),
+              smsConsent: true as const,
+            },
+          }
+        : {}),
     },
   })