diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 000000000..449db17b6
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,4 @@
+# style(format): run spotlessApply cmd on codebase to fix lint + format issues
+cc43a9f0e1550a50d6025abb2bba2d143e799709
+# style(format): run `./gradlew --init-script gradle/init.gradle.kts spotlessApply` to format + lint all files
+1fb424562e796ea572d9f9d6d8d88c3bc9f3bb0c
diff --git a/.github/ci-gradle.properties b/.github/ci-gradle.properties
new file mode 100644
index 000000000..bd989705d
--- /dev/null
+++ b/.github/ci-gradle.properties
@@ -0,0 +1,28 @@
+#
+# Copyright 2020 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+org.gradle.daemon=false
+org.gradle.parallel=true
+org.gradle.workers.max=2
+
+kotlin.incremental=false
+kotlin.compiler.execution.strategy=in-process
+
+# Controls KotlinOptions.allWarningsAsErrors.
+# This value used in CI and is currently set to false.
+# If you want to treat warnings as errors locally, set this property to true
+# in your ~/.gradle/gradle.properties file.
+warningsAsErrors=false
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 000000000..2c5e5df09
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,225 @@
+name: Main
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+concurrency:
+  group: build-${{ github.job }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Build 🏗️
+    runs-on: ubuntu-latest
+    timeout-minutes: 120
+
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v3
+
+      - name: Validate Gradle Wrapper 📝
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Copy CI gradle.properties 📋
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties        
+
+      - name: Set up JDK 17 ⚙️
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 17
+
+      - name: Setup Gradle ⚙️
+        uses: gradle/gradle-build-action@v2
+
+      - name: Build all build type and flavor permutations 🏗️
+        run: ./gradlew assembleDemoDebug
+  
+      - name: 📊 Upload build outputs (APKs)
+        uses: actions/upload-artifact@v3
+        with:
+          name: APKs
+          path: '**/build/outputs/apk/**/*.apk'
+
+  spotless-check:
+    name: Spotless Check 📝
+    runs-on: ubuntu-latest
+    timeout-minutes: 120
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v3
+
+      - name: Validate Gradle Wrapper 📝
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Copy CI gradle.properties 📋
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties        
+
+      - name: Set up JDK 17 ⚙️
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 17
+
+      - name: Setup Gradle ⚙️
+        uses: gradle/gradle-build-action@v2
+
+      - name: Check spotless 📝
+        run: ./gradlew spotlessCheck --init-script gradle/init.gradle.kts --no-configuration-cache
+
+  lint:
+    name: Lint Check 💅
+    runs-on: ubuntu-latest
+    timeout-minutes: 120
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v3
+
+      - name: Validate Gradle Wrapper 📝
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Copy CI gradle.properties 📋
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties        
+
+      - name: Set up JDK 17 ⚙️
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 17
+
+      - name: Setup Gradle ⚙️
+        uses: gradle/gradle-build-action@v2
+
+      - name: Check lint 💅
+        run: ./gradlew lintDemoDebug
+        
+      - name: 📊 Upload lint reports (HTML)
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: lint-reports
+          path: '**/build/reports/lint-results-*.html'
+
+  unit-test:
+    name: Unit Test 🧪
+    runs-on: ubuntu-latest
+    timeout-minutes: 120
+
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v3
+
+      - name: Validate Gradle Wrapper 📝
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Copy CI gradle.properties 📋
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties        
+
+      - name: Set up JDK 17 ⚙️
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 17
+
+      - name: Setup Gradle ⚙️
+        uses: gradle/gradle-build-action@v2
+
+      - name: Run local tests 🧪
+        run: ./gradlew testDemoDebug testProdDebug
+
+      - name: 📊 Upload test results (XML)
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: test-results
+          path: '**/build/test-results/test*UnitTest/**.xml'
+
+  androidTest:
+    if: false # disabled bc packageDemoDebugAndroidTest is failing
+    name: Android Test 🧪
+    needs: build
+    runs-on: macos-latest # enables hardware acceleration in the virtual machine
+    timeout-minutes: 90
+    strategy:
+      matrix:
+        api-level: [26, 30]
+
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v3
+      
+      - name: Copy CI gradle.properties 📋
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
+
+      - name: Set up JDK 17 ⚙️
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 17
+
+      - name: Setup Gradle ⚙️
+        uses: gradle/gradle-build-action@v2
+
+      - name: Build AndroidTest apps 🏗️
+        run: ./gradlew packageDemoDebug packageDemoDebugAndroidTest --daemon
+
+      - name: Run instrumentation tests 🧪
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          arch: x86_64
+          disable-animations: true
+          disk-size: 6000M
+          heap-size: 600M
+          script: ./gradlew connectedDemoDebugAndroidTest --daemon
+
+      - name: 📊 Upload test reports
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: test-reports-${{ matrix.api-level }}
+          path: '**/build/reports/androidTests'
+
+  androidTest-GMD:
+    if: false # disabled bc packageDemoDebugAndroidTest is failing
+    name: Android Test GMD 🧪
+    needs: build
+    runs-on: macos-latest # enables hardware acceleration in the virtual machine
+    timeout-minutes: 90
+
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v3
+
+      - name: Copy CI gradle.properties 📋
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
+
+      - name: Set up JDK 17 ⚙️
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 17
+
+      - name: Setup Gradle ⚙️
+        uses: gradle/gradle-build-action@v2
+
+      - name: Accept Android licenses ✔️
+        run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
+
+      - name: Build AndroidTest apps 🏗️
+        run: ./gradlew packageDemoDebug packageDemoDebugAndroidTest
+
+      - name: Run instrumented tests with GMD 🧪
+        run: ./gradlew cleanManagedDevices --unused-only &&
+          ./gradlew ciDemoDebugAndroidTest -Dorg.gradle.workers.max=1
+          -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect" -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
+
+      - name: 📊 Upload test reports
+        if: success() || failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: test-reports
+          path: '**/build/reports/androidTests'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 000000000..9d2d1726c
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,52 @@
+name: GitHub Release with APKs
+
+on:
+  push:
+    tags:
+    - 'v*'
+
+jobs:
+  build:
+    name: Build and Release 🏷️
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v3   
+
+      - name: Validate Gradle Wrapper 📝
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Copy CI gradle.properties 📋
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
+
+      - name: Set up JDK 17 ⚙️
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 17
+
+      - name: Build app 🏗️
+        run: ./gradlew :app:assembleDemoRelease
+
+      - name: Create Release 🚀
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          draft: true
+          prerelease: false
+
+      - name: Upload app 📤
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/apk/demo/release/app-demo-release.apk
+          asset_name: app-demo-release.apk
+          asset_content_type: application/vnd.android.package-archive          
diff --git a/.tool-versions b/.tool-versions
index 32479b157..f40abe5ba 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
-java    adoptopenjdk-17.0.8+7
+java    zulu-17.44.17 
 direnv  2.32.3
 maestro 1.31.0
diff --git a/app/src/androidTest/java/com/crisiscleanup/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/crisiscleanup/ExampleInstrumentedTest.kt
index f9710e4aa..b69dc732f 100644
--- a/app/src/androidTest/java/com/crisiscleanup/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/crisiscleanup/ExampleInstrumentedTest.kt
@@ -19,4 +19,4 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         Assert.assertEquals("com.crisiscleanup.demo.debug", appContext.packageName)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/androidTest/java/com/crisiscleanup/ui/CrisisCleanupAppStateTest.kt b/app/src/androidTest/java/com/crisiscleanup/ui/CrisisCleanupAppStateTest.kt
index 89adf3071..b07b58cf6 100644
--- a/app/src/androidTest/java/com/crisiscleanup/ui/CrisisCleanupAppStateTest.kt
+++ b/app/src/androidTest/java/com/crisiscleanup/ui/CrisisCleanupAppStateTest.kt
@@ -16,14 +16,16 @@ import androidx.navigation.createGraph
 import androidx.navigation.testing.TestNavHostController
 import com.crisiscleanup.core.testing.util.TestNavigationObserver
 import com.crisiscleanup.core.testing.util.TestNetworkMonitor
-import junit.framework.TestCase.*
+import junit.framework.TestCase.assertEquals
+import junit.framework.TestCase.assertFalse
+import junit.framework.TestCase.assertTrue
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
-import java.util.*
+import java.util.Locale
 
 /**
  * Tests [CrisisCleanupAppState].
@@ -56,7 +58,7 @@ class CrisisCleanupAppStateTest {
                     windowSizeClass = getCompactWindowClass(),
                     navController = navController,
                     networkMonitor = networkMonitor,
-                    coroutineScope = backgroundScope
+                    coroutineScope = backgroundScope,
                 )
             }
 
@@ -87,7 +89,7 @@ class CrisisCleanupAppStateTest {
         for (i in destinations.indices) {
             assertEquals(
                 destinations[i],
-                state.topLevelDestinations[i].name.lowercase(Locale.getDefault())
+                state.topLevelDestinations[i].name.lowercase(Locale.getDefault()),
             )
         }
     }
@@ -99,7 +101,7 @@ class CrisisCleanupAppStateTest {
                 windowSizeClass = getCompactWindowClass(),
                 navController = NavHostController(LocalContext.current),
                 networkMonitor = networkMonitor,
-                coroutineScope = backgroundScope
+                coroutineScope = backgroundScope,
             )
         }
 
@@ -114,7 +116,7 @@ class CrisisCleanupAppStateTest {
                 windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(800.dp, 800.dp)),
                 navController = NavHostController(LocalContext.current),
                 networkMonitor = networkMonitor,
-                coroutineScope = backgroundScope
+                coroutineScope = backgroundScope,
             )
         }
 
@@ -124,13 +126,12 @@ class CrisisCleanupAppStateTest {
 
     @Test
     fun CrisisCleanupAppState_showNavRail_large() = runTest {
-
         composeTestRule.setContent {
             state = CrisisCleanupAppState(
                 windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(900.dp, 1200.dp)),
                 navController = NavHostController(LocalContext.current),
                 networkMonitor = networkMonitor,
-                coroutineScope = backgroundScope
+                coroutineScope = backgroundScope,
             )
         }
 
@@ -140,13 +141,12 @@ class CrisisCleanupAppStateTest {
 
     @Test
     fun stateIsOfflineWhenNetworkMonitorIsOffline() = runTest(UnconfinedTestDispatcher()) {
-
         composeTestRule.setContent {
             state = CrisisCleanupAppState(
                 windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(900.dp, 1200.dp)),
                 navController = NavHostController(LocalContext.current),
                 networkMonitor = networkMonitor,
-                coroutineScope = backgroundScope
+                coroutineScope = backgroundScope,
             )
         }
 
@@ -154,7 +154,7 @@ class CrisisCleanupAppStateTest {
         networkMonitor.setConnected(false)
         assertEquals(
             true,
-            state.isOffline.value
+            state.isOffline.value,
         )
     }
 
diff --git a/app/src/demo/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/demo/res/mipmap-anydpi-v26/ic_launcher.xml
index bbd3e0212..6ae6a23dd 100644
--- a/app/src/demo/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/demo/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
diff --git a/app/src/demoDebug/AndroidManifest.xml b/app/src/demoDebug/AndroidManifest.xml
index 0ae8aa2f8..92e3300ad 100644
--- a/app/src/demoDebug/AndroidManifest.xml
+++ b/app/src/demoDebug/AndroidManifest.xml
@@ -1,7 +1,3 @@
-<!-- The application element should be a copy of the prod manifest with the additional attribute
-     android:usesCleartextTraffic="true"
-     This allows for http (non-secure) requests. The server must whitelist the device/emulator host.
--->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
diff --git a/app/src/demoDebug/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/demoDebug/res/mipmap-anydpi-v26/ic_launcher.xml
index bbd3e0212..6ae6a23dd 100644
--- a/app/src/demoDebug/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/demoDebug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
diff --git a/app/src/demoDebug/res/values/strings.xml b/app/src/demoDebug/res/values/strings.xml
index 9fa873246..62842ed17 100644
--- a/app/src/demoDebug/res/values/strings.xml
+++ b/app/src/demoDebug/res/values/strings.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name_short">ccu</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/earlybird/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/earlybird/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cfe5..3b9280ae0 100644
--- a/app/src/earlybird/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/earlybird/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fe898c387..7fbd64f61 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
diff --git a/app/src/main/java/com/crisiscleanup/AndroidLocationProvider.kt b/app/src/main/java/com/crisiscleanup/AndroidLocationProvider.kt
index 60155cd35..35350902b 100644
--- a/app/src/main/java/com/crisiscleanup/AndroidLocationProvider.kt
+++ b/app/src/main/java/com/crisiscleanup/AndroidLocationProvider.kt
@@ -53,4 +53,4 @@ class AndroidLocationProvider @Inject constructor(
         }
         return null
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/crisiscleanup/AndroidPermissionManager.kt b/app/src/main/java/com/crisiscleanup/AndroidPermissionManager.kt
index a6f19266b..6ca998a17 100644
--- a/app/src/main/java/com/crisiscleanup/AndroidPermissionManager.kt
+++ b/app/src/main/java/com/crisiscleanup/AndroidPermissionManager.kt
@@ -37,8 +37,11 @@ class AndroidPermissionManager @Inject constructor(
     private var activityWr: WeakReference<ComponentActivity> = WeakReference(null)
 
     private val screenshotReadPermission =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) READ_MEDIA_IMAGES
-        else READ_EXTERNAL_STORAGE
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            READ_MEDIA_IMAGES
+        } else {
+            READ_EXTERNAL_STORAGE
+        }
 
     override fun onCreate(owner: LifecycleOwner) {
         (owner as? ComponentActivity)?.let { activity ->
@@ -50,8 +53,11 @@ class AndroidPermissionManager @Inject constructor(
                     // Assume unchanged permission since requested
                     val permission = permissionChanges.value.first
                     val status =
-                        if (isGranted) PermissionStatus.Granted
-                        else PermissionStatus.Denied
+                        if (isGranted) {
+                            PermissionStatus.Granted
+                        } else {
+                            PermissionStatus.Denied
+                        }
                     permissionChanges.value = Pair(permission, status)
 
                     if (permission == ACCESS_COARSE_LOCATION || permission == ACCESS_FINE_LOCATION) {
@@ -67,7 +73,7 @@ class AndroidPermissionManager @Inject constructor(
 
     private fun publishLocationPermission() {
         hasLocationPermission.value = hasPermission(ACCESS_COARSE_LOCATION) ||
-                hasPermission(ACCESS_FINE_LOCATION)
+            hasPermission(ACCESS_FINE_LOCATION)
     }
 
     private fun hasPermission(permission: String): Boolean {
diff --git a/app/src/main/java/com/crisiscleanup/AppVisualAlertManager.kt b/app/src/main/java/com/crisiscleanup/AppVisualAlertManager.kt
index fcfdeb7f3..d0cb93002 100644
--- a/app/src/main/java/com/crisiscleanup/AppVisualAlertManager.kt
+++ b/app/src/main/java/com/crisiscleanup/AppVisualAlertManager.kt
@@ -16,4 +16,4 @@ class AppVisualAlertManager @Inject constructor() : VisualAlertManager {
     override fun setNonProductionAppAlert(show: Boolean) {
         showNonProductionAlert.set(show)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/crisiscleanup/CrisisCleanupAppEnv.kt b/app/src/main/java/com/crisiscleanup/CrisisCleanupAppEnv.kt
index 9522ba992..400176639 100644
--- a/app/src/main/java/com/crisiscleanup/CrisisCleanupAppEnv.kt
+++ b/app/src/main/java/com/crisiscleanup/CrisisCleanupAppEnv.kt
@@ -17,4 +17,4 @@ class CrisisCleanupAppEnv @Inject constructor() : AppEnv {
             block()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/crisiscleanup/FirebaseFeedbackReceiver.kt b/app/src/main/java/com/crisiscleanup/FirebaseFeedbackReceiver.kt
index 80f7820db..3f9bdd959 100644
--- a/app/src/main/java/com/crisiscleanup/FirebaseFeedbackReceiver.kt
+++ b/app/src/main/java/com/crisiscleanup/FirebaseFeedbackReceiver.kt
@@ -17,4 +17,4 @@ class FirebaseFeedbackReceiver @Inject constructor(
 
         Firebase.appDistribution.startFeedback("Do share O_o")
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/crisiscleanup/MainActivityViewModel.kt b/app/src/main/java/com/crisiscleanup/MainActivityViewModel.kt
index adfa5f677..05f5145e9 100644
--- a/app/src/main/java/com/crisiscleanup/MainActivityViewModel.kt
+++ b/app/src/main/java/com/crisiscleanup/MainActivityViewModel.kt
@@ -98,8 +98,11 @@ class MainActivityViewModel @Inject constructor(
         .map {
             isAccountExpired.value = !it.areTokensValid
 
-            if (it.hasAuthenticated) AuthState.Authenticated(it)
-            else AuthState.NotAuthenticated
+            if (it.hasAuthenticated) {
+                AuthState.Authenticated(it)
+            } else {
+                AuthState.NotAuthenticated
+            }
         }
         .stateIn(
             scope = viewModelScope,
@@ -200,4 +203,4 @@ sealed interface AuthState {
     data object Loading : AuthState
     data class Authenticated(val accountData: AccountData) : AuthState
     data object NotAuthenticated : AuthState
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/crisiscleanup/di/AppModule.kt b/app/src/main/java/com/crisiscleanup/di/AppModule.kt
index ab17f4b1b..d21307a97 100644
--- a/app/src/main/java/com/crisiscleanup/di/AppModule.kt
+++ b/app/src/main/java/com/crisiscleanup/di/AppModule.kt
@@ -39,13 +39,13 @@ interface AppModule {
     @Singleton
     @Binds
     fun bindsCrisisCleanupAuthInterceptorProvider(
-        provider: CrisisCleanupAuthInterceptorProvider
+        provider: CrisisCleanupAuthInterceptorProvider,
     ): AuthInterceptorProvider
 
     @Singleton
     @Binds
     fun bindsCrisisCleanupInterceptorProvider(
-        provider: CrisisCleanupInterceptorProvider
+        provider: CrisisCleanupInterceptorProvider,
     ): RetrofitInterceptorProvider
 
     @Singleton
@@ -84,4 +84,4 @@ object AppObjectModule {
     fun firebaseAnalytics(
         @ApplicationContext context: Context,
     ): FirebaseAnalytics = FirebaseAnalytics.getInstance(context)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/crisiscleanup/di/JankStatsModule.kt b/app/src/main/java/com/crisiscleanup/di/JankStatsModule.kt
index f019e2ce3..10c2c648c 100644
--- a/app/src/main/java/com/crisiscleanup/di/JankStatsModule.kt
+++ b/app/src/main/java/com/crisiscleanup/di/JankStatsModule.kt
@@ -31,7 +31,7 @@ object JankStatsModule {
     @Provides
     fun providesJankStats(
         window: Window,
-        frameListener: JankStats.OnFrameListener
+        frameListener: JankStats.OnFrameListener,
     ): JankStats {
         return JankStats.createAndTrack(window, frameListener)
     }
diff --git a/app/src/main/java/com/crisiscleanup/log/CrisisCleanupAppLogger.kt b/app/src/main/java/com/crisiscleanup/log/CrisisCleanupAppLogger.kt
index 92c523433..f5eefb2c3 100644
--- a/app/src/main/java/com/crisiscleanup/log/CrisisCleanupAppLogger.kt
+++ b/app/src/main/java/com/crisiscleanup/log/CrisisCleanupAppLogger.kt
@@ -41,4 +41,4 @@ class CrisisCleanupAppLogger @Inject constructor(
             crashlytics.log(message)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/crisiscleanup/navigation/CrisisCleanupNavigationObserver.kt b/app/src/main/java/com/crisiscleanup/navigation/CrisisCleanupNavigationObserver.kt
index 3450848d8..8ca2c9281 100644
--- a/app/src/main/java/com/crisiscleanup/navigation/CrisisCleanupNavigationObserver.kt
+++ b/app/src/main/java/com/crisiscleanup/navigation/CrisisCleanupNavigationObserver.kt
@@ -23,4 +23,4 @@ class CrisisCleanupNavigationObserver @Inject constructor(
     override fun onRouteChange(route: String?, arguments: Bundle?) {
         navigationRoute.value = Pair(navigationRoute.value.second, route)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/crisiscleanup/navigation/TopLevelDestination.kt b/app/src/main/java/com/crisiscleanup/navigation/TopLevelDestination.kt
index ac10fc5aa..a219e22a5 100644
--- a/app/src/main/java/com/crisiscleanup/navigation/TopLevelDestination.kt
+++ b/app/src/main/java/com/crisiscleanup/navigation/TopLevelDestination.kt
@@ -29,5 +29,5 @@ enum class TopLevelDestination(
         selectedIcon = ImageVectorIcon(CrisisCleanupIcons.Menu),
         unselectedIcon = ImageVectorIcon(CrisisCleanupIcons.Menu),
         titleTranslateKey = "nav.menu",
-    )
+    ),
 }
diff --git a/app/src/main/java/com/crisiscleanup/network/CrisisCleanupInterceptorProvider.kt b/app/src/main/java/com/crisiscleanup/network/CrisisCleanupInterceptorProvider.kt
index c6b439a87..2c9d67d88 100644
--- a/app/src/main/java/com/crisiscleanup/network/CrisisCleanupInterceptorProvider.kt
+++ b/app/src/main/java/com/crisiscleanup/network/CrisisCleanupInterceptorProvider.kt
@@ -280,4 +280,4 @@ class CrisisCleanupAuthInterceptorProvider @Inject constructor() : AuthIntercept
     }
 }
 
-private class NetworkAuthException(message: String) : IOException(message)
\ No newline at end of file
+private class NetworkAuthException(message: String) : IOException(message)
diff --git a/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupApp.kt b/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupApp.kt
index 967b213cd..c29cd8a03 100644
--- a/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupApp.kt
+++ b/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupApp.kt
@@ -94,7 +94,6 @@ fun CrisisCleanupApp(
 ) {
     CrisisCleanupBackground {
         Box(Modifier.fillMaxSize()) {
-
             val snackbarHostState = remember { SnackbarHostState() }
 
             val isOffline by appState.isOffline.collectAsStateWithLifecycle()
@@ -104,11 +103,13 @@ fun CrisisCleanupApp(
 
             LaunchedEffect(isOffline) {
                 val notConnectedMessage = translator("info.no_internet")
-                if (isOffline) snackbarHostState.showSnackbar(
-                    message = notConnectedMessage,
-                    duration = SnackbarDuration.Indefinite,
-                    withDismissAction = true,
-                )
+                if (isOffline) {
+                    snackbarHostState.showSnackbar(
+                        message = notConnectedMessage,
+                        duration = SnackbarDuration.Indefinite,
+                        withDismissAction = true,
+                    )
+                }
             }
 
             val authState by viewModel.authState.collectAsStateWithLifecycle()
@@ -320,8 +321,11 @@ private fun NavigableContent(
                 .padding(padding)
                 .consumeWindowInsets(padding)
                 .windowInsetsPadding(
-                    if (isFullscreen) WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal)
-                    else WindowInsets.safeDrawing,
+                    if (isFullscreen) {
+                        WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal)
+                    } else {
+                        WindowInsets.safeDrawing
+                    },
                 ),
         ) {
             if (showNavigation && appState.shouldShowNavRail) {
@@ -341,7 +345,11 @@ private fun NavigableContent(
                     if (!showNavigation &&
                         snackbarHostState.currentSnackbarData != null &&
                         keyboardVisibility == ScreenKeyboardVisibility.NotVisible
-                    ) 64.dp else 0.dp
+                    ) {
+                        64.dp
+                    } else {
+                        0.dp
+                    }
 
                 CompositionLocalProvider(
                     LocalAppLayout provides AppLayoutArea(snackbarHostState),
@@ -431,8 +439,11 @@ private fun AppHeader(
 
 @Composable
 private fun TopLevelDestination.Icon(isSelected: Boolean, description: String) {
-    val icon = if (isSelected) selectedIcon
-    else unselectedIcon
+    val icon = if (isSelected) {
+        selectedIcon
+    } else {
+        unselectedIcon
+    }
     when (icon) {
         is ImageVectorIcon -> Icon(
             imageVector = icon.imageVector,
@@ -489,7 +500,7 @@ private fun CrisisCleanupBottomBar(
                 selected = selected,
                 onClick = { onNavigateToDestination(destination) },
                 icon = { destination.Icon(selected, title) },
-                modifier = Modifier.testTag("navItem_${title}"),
+                modifier = Modifier.testTag("navItem_$title"),
                 label = {
                     Text(
                         title,
diff --git a/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupAppHeaderUiState.kt b/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupAppHeaderUiState.kt
index a5d08070a..2bdb470e6 100644
--- a/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupAppHeaderUiState.kt
+++ b/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupAppHeaderUiState.kt
@@ -28,4 +28,4 @@ class CrisisCleanupAppHeaderUiState @Inject constructor(
     override fun setTitle(title: String) {
         this.title.value = title
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupAppState.kt b/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupAppState.kt
index 6a7b30902..105188d5f 100644
--- a/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupAppState.kt
+++ b/app/src/main/java/com/crisiscleanup/ui/CrisisCleanupAppState.kt
@@ -45,7 +45,7 @@ fun rememberCrisisCleanupAppState(
     networkMonitor: NetworkMonitor,
     navigationObserver: NavigationObserver,
     coroutineScope: CoroutineScope = rememberCoroutineScope(),
-    navController: NavHostController = rememberNavController()
+    navController: NavHostController = rememberNavController(),
 ): CrisisCleanupAppState {
     NavigationTrackingSideEffect(navController)
     NavigationObserverSideEffect(navController, navigationObserver)
@@ -97,7 +97,7 @@ class CrisisCleanupAppState(
         .stateIn(
             scope = coroutineScope,
             started = SharingStarted.WhileSubscribed(5_000),
-            initialValue = false
+            initialValue = false,
         )
 
     val hideLoginAlert: Boolean
diff --git a/app/src/main/java/com/crisiscleanup/ui/EndOfLifeView.kt b/app/src/main/java/com/crisiscleanup/ui/EndOfLifeView.kt
index 4df8fe126..3fb2d1174 100644
--- a/app/src/main/java/com/crisiscleanup/ui/EndOfLifeView.kt
+++ b/app/src/main/java/com/crisiscleanup/ui/EndOfLifeView.kt
@@ -61,4 +61,4 @@ internal fun EndOfLifeView(
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index d9e78cc1c..662b61348 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_beta_foreground"/>
diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
index fa0f996d2..c76c34673 100644
--- a/app/src/main/res/xml/backup_rules.xml
+++ b/app/src/main/res/xml/backup_rules.xml
@@ -1,10 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   Sample backup rules file; uncomment and customize as necessary.
-   See https://developer.android.com/guide/topics/data/autobackup
-   for details.
-   Note: This file is ignored for devices older that API 31
-   See https://developer.android.com/about/versions/12/backup-restore
--->
 <full-backup-content>
     <!--
    <include domain="sharedpref" path="."/>
diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
index 9ee9997b0..1033270e2 100644
--- a/app/src/main/res/xml/data_extraction_rules.xml
+++ b/app/src/main/res/xml/data_extraction_rules.xml
@@ -1,8 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   Sample data extraction rules file; uncomment and customize as necessary.
-   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
-   for details.
--->
 <data-extraction-rules>
     <cloud-backup>
         <!-- TODO: Use <include> and <exclude> to control what is backed up.
diff --git a/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/AddressSearchRepository.kt b/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/AddressSearchRepository.kt
index f144c1c24..98c14d5f9 100644
--- a/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/AddressSearchRepository.kt
+++ b/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/AddressSearchRepository.kt
@@ -17,4 +17,4 @@ interface AddressSearchRepository {
         northeast: LatLng? = null,
         maxResults: Int = 8,
     ): List<KeyLocationAddress>
-}
\ No newline at end of file
+}
diff --git a/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/AndroidGeocoderAddressSearchRepository.kt b/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/AndroidGeocoderAddressSearchRepository.kt
index 039543ed3..914efe1f9 100644
--- a/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/AndroidGeocoderAddressSearchRepository.kt
+++ b/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/AndroidGeocoderAddressSearchRepository.kt
@@ -60,15 +60,18 @@ class AndroidGeocoderAddressSearchRepository @Inject constructor(
 
         val hasBounds = southwest != null && northeast != null
         try {
-            val geocoderAddresses = if (hasBounds) geocoder.getFromLocationName(
-                query,
-                maxResults,
-                southwest!!.latitude,
-                southwest.longitude,
-                northeast!!.latitude,
-                northeast.longitude
-            )
-            else geocoder.getFromLocationName(query, maxResults)
+            val geocoderAddresses = if (hasBounds) {
+                geocoder.getFromLocationName(
+                    query,
+                    maxResults,
+                    southwest!!.latitude,
+                    southwest.longitude,
+                    northeast!!.latitude,
+                    northeast.longitude,
+                )
+            } else {
+                geocoder.getFromLocationName(query, maxResults)
+            }
 
             val addresses =
                 geocoderAddresses
@@ -100,4 +103,4 @@ internal fun Geocoder.getAddress(coordinates: LatLng): LocationAddress? {
         latitude = coordinates.latitude,
         longitude = coordinates.longitude,
     )
-}
\ No newline at end of file
+}
diff --git a/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/GooglePlaceAddressSearchRepository.kt b/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/GooglePlaceAddressSearchRepository.kt
index 269b42bbf..d7f451ce6 100644
--- a/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/GooglePlaceAddressSearchRepository.kt
+++ b/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/GooglePlaceAddressSearchRepository.kt
@@ -107,7 +107,7 @@ class GooglePlaceAddressSearchRepository @Inject constructor(
         val request = FindAutocompletePredictionsRequest.builder()
             // Call either setLocationBias() OR setLocationRestriction().
             .setLocationBias(bounds)
-            //.setLocationRestriction(bounds)
+            // .setLocationRestriction(bounds)
             .setOrigin(center)
             .setCountries(countryCodes)
             .setTypesFilter(listOf(TypeFilter.ADDRESS.toString().lowercase()))
@@ -131,4 +131,4 @@ class GooglePlaceAddressSearchRepository @Inject constructor(
 
         return@coroutineScope emptyList()
     }
-}
\ No newline at end of file
+}
diff --git a/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/di/AddressSearchModule.kt b/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/di/AddressSearchModule.kt
index 076f89d0a..7a3eb420c 100644
--- a/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/di/AddressSearchModule.kt
+++ b/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/di/AddressSearchModule.kt
@@ -12,6 +12,6 @@ import dagger.hilt.components.SingletonComponent
 interface AddressSearchModule {
     @Binds
     fun bindsAddressSearchRepository(
-        repository: GooglePlaceAddressSearchRepository
+        repository: GooglePlaceAddressSearchRepository,
     ): AddressSearchRepository
-}
\ No newline at end of file
+}
diff --git a/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/model/Address.kt b/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/model/Address.kt
index 44f4b4a62..28cebfd28 100644
--- a/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/model/Address.kt
+++ b/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/model/Address.kt
@@ -16,8 +16,11 @@ fun List<Address?>.filterLatLng(): List<Address> {
 fun Address.asLocationAddress(): LocationAddress {
     val addressLine = getAddressLine(0) ?: ""
     val streetAddress =
-        if (addressLine.isNotBlank()) addressLine.split(",")[0]
-        else thoroughfare ?: ""
+        if (addressLine.isNotBlank()) {
+            addressLine.split(",")[0]
+        } else {
+            thoroughfare ?: ""
+        }
 
     val county = subAdminArea ?: ""
 
diff --git a/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/model/KeyLocationAddress.kt b/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/model/KeyLocationAddress.kt
index 0a118fb0c..d974eaa5d 100644
--- a/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/model/KeyLocationAddress.kt
+++ b/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/model/KeyLocationAddress.kt
@@ -5,4 +5,4 @@ import com.crisiscleanup.core.model.data.LocationAddress
 data class KeyLocationAddress(
     val key: String,
     val address: LocationAddress,
-)
\ No newline at end of file
+)
diff --git a/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/model/LocationAddress.kt b/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/model/LocationAddress.kt
index 156dd89fb..50ba2b599 100644
--- a/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/model/LocationAddress.kt
+++ b/core/addresssearch/src/main/java/com/crisiscleanup/core/addresssearch/model/LocationAddress.kt
@@ -3,4 +3,4 @@ package com.crisiscleanup.core.addresssearch.model
 import com.crisiscleanup.core.model.data.LocationAddress
 import com.google.android.gms.maps.model.LatLng
 
-fun LocationAddress.toLatLng() = LatLng(latitude, longitude)
\ No newline at end of file
+fun LocationAddress.toLatLng() = LatLng(latitude, longitude)
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/AndroidResourceProvider.kt b/core/common/src/main/java/com/crisiscleanup/core/common/AndroidResourceProvider.kt
index e27d39ea6..1e2a6c0da 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/AndroidResourceProvider.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/AndroidResourceProvider.kt
@@ -24,7 +24,7 @@ interface AndroidResourceProvider {
 
 @Singleton
 class ApplicationResourceProvider @Inject constructor(
-    @ApplicationContext private val context: Context
+    @ApplicationContext private val context: Context,
 ) : AndroidResourceProvider {
     override val resources: Resources = context.resources
 
@@ -38,4 +38,4 @@ class ApplicationResourceProvider @Inject constructor(
 
     override fun getDrawable(drawableId: Int, theme: Resources.Theme?): Drawable =
         resources.getDrawable(drawableId, theme)
-}
\ No newline at end of file
+}
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/AppEnv.kt b/core/common/src/main/java/com/crisiscleanup/core/common/AppEnv.kt
index 9439a0903..bd0000bc0 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/AppEnv.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/AppEnv.kt
@@ -6,4 +6,4 @@ interface AppEnv {
     val isNotProduction: Boolean
     val isEarlybird: Boolean
     fun runInNonProd(block: () -> Unit)
-}
\ No newline at end of file
+}
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/AppMemoryStats.kt b/core/common/src/main/java/com/crisiscleanup/core/common/AppMemoryStats.kt
index fd1e1d94d..fcb456ec7 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/AppMemoryStats.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/AppMemoryStats.kt
@@ -27,4 +27,4 @@ class AndroidAppMemoryStats @Inject constructor(
 
     override val availableMemory: Int
         get() = activityManager.memoryClass
-}
\ No newline at end of file
+}
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/AppVersionProvider.kt b/core/common/src/main/java/com/crisiscleanup/core/common/AppVersionProvider.kt
index 20ceb47f9..302913d9b 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/AppVersionProvider.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/AppVersionProvider.kt
@@ -28,7 +28,8 @@ class AndroidAppVersionProvider @Inject constructor(
     private val packageInfo: PackageInfo
         get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             context.packageManager.getPackageInfo(
-                context.packageName, PackageInfoFlags.of(0)
+                context.packageName,
+                PackageInfoFlags.of(0),
             )
         } else {
             context.packageManager.getPackageInfo(context.packageName, 0)
@@ -46,4 +47,4 @@ class AndroidAppVersionProvider @Inject constructor(
 
     override val versionName: String
         get() = version.second
-}
\ No newline at end of file
+}
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/CollectionUtil.kt b/core/common/src/main/java/com/crisiscleanup/core/common/CollectionUtil.kt
index 493a80643..c3028cebd 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/CollectionUtil.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/CollectionUtil.kt
@@ -14,4 +14,4 @@ fun <T> Collection<T>.split(predicate: (t: T) -> Boolean): Pair<Collection<T>, C
         }
     }
     return Pair(trueBucket, falseBucket)
-}
\ No newline at end of file
+}
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/ContextUtil.kt b/core/common/src/main/java/com/crisiscleanup/core/common/ContextUtil.kt
index f34ee043e..06aadf5ac 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/ContextUtil.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/ContextUtil.kt
@@ -21,4 +21,4 @@ fun Context.openMaps(locationQuery: String) {
     } catch (t: Throwable) {
         Log.w("open-maps", t.message ?: "Unknown exception")
     }
-}
\ No newline at end of file
+}
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/DateUtil.kt b/core/common/src/main/java/com/crisiscleanup/core/common/DateUtil.kt
index 280466efd..9bae2e92f 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/DateUtil.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/DateUtil.kt
@@ -15,4 +15,4 @@ val Instant.noonTime: Instant
         val javaDate = toJavaInstant()
         val startOfDay = javaDate.truncatedTo(ChronoUnit.DAYS)
         return startOfDay.toKotlinInstant().plus(12.hours)
-    }
\ No newline at end of file
+    }
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/FlowUtil.kt b/core/common/src/main/java/com/crisiscleanup/core/common/FlowUtil.kt
index f701b3754..a662955a7 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/FlowUtil.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/FlowUtil.kt
@@ -89,7 +89,7 @@ fun <T1, T2, T3, T4, T5, T6, T7, R> combine(
 ): Flow<R> = kCombine(
     kCombine(flow, flow2, flow3, ::Triple),
     kCombine(flow4, flow5, ::Pair),
-    kCombine(flow6, flow7, ::Pair)
+    kCombine(flow6, flow7, ::Pair),
 ) { t1, t2, t3 ->
     transform(
         t1.first,
@@ -115,7 +115,7 @@ fun <T1, T2, T3, T4, T5, T6, T7, T8, R> combine(
 ): Flow<R> = kCombine(
     kCombine(flow, flow2, flow3, ::Triple),
     kCombine(flow4, flow5, flow6, ::Triple),
-    kCombine(flow7, flow8, ::Pair)
+    kCombine(flow7, flow8, ::Pair),
 ) { t1, t2, t3 ->
     transform(
         t1.first,
@@ -143,7 +143,7 @@ fun <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> combine(
 ): Flow<R> = kCombine(
     kCombine(flow, flow2, flow3, ::Triple),
     kCombine(flow4, flow5, flow6, ::Triple),
-    kCombine(flow7, flow8, flow9, ::Triple)
+    kCombine(flow7, flow8, flow9, ::Triple),
 ) { t1, t2, t3 ->
     transform(
         t1.first,
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/HaversineDistance.kt b/core/common/src/main/java/com/crisiscleanup/core/common/HaversineDistance.kt
index b5c1323cc..a29462a95 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/HaversineDistance.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/HaversineDistance.kt
@@ -29,8 +29,10 @@ val Double.kmToMiles: Double
  * @see kmToMiles
  */
 fun haversineDistance(
-    latA: Double, lngA: Double,
-    latB: Double, lngB: Double,
+    latA: Double,
+    lngA: Double,
+    latB: Double,
+    lngB: Double,
 ): Double {
     val deltaLat = latA - latB
     val deltaLng = lngA - lngB
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/InputValidator.kt b/core/common/src/main/java/com/crisiscleanup/core/common/InputValidator.kt
index ad7848b1c..cfa724856 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/InputValidator.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/InputValidator.kt
@@ -21,8 +21,11 @@ class CommonInputValidator @Inject constructor() : InputValidator {
         Patterns.EMAIL_ADDRESS.matcher(emailAddress).matches()
 
     override fun validatePhoneNumber(value: String, allowSpaces: Boolean) =
-        if (allowSpaces) phoneNumbersAndSpacesRegex.matches(value)
-        else phoneNumbersRegex.matches(value)
+        if (allowSpaces) {
+            phoneNumbersAndSpacesRegex.matches(value)
+        } else {
+            phoneNumbersRegex.matches(value)
+        }
 
     override fun hasEmailAddress(text: String) = commonEmailRegex.containsMatchIn(text)
-}
\ No newline at end of file
+}
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/KeyTranslator.kt b/core/common/src/main/java/com/crisiscleanup/core/common/KeyTranslator.kt
index ac51a1ec9..6afb5453b 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/KeyTranslator.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/KeyTranslator.kt
@@ -27,7 +27,13 @@ class AndroidResourceTranslator @Inject constructor(
     override fun translate(phraseKey: String) = keyTranslator.translate(phraseKey)
 
     override fun translate(phraseKey: String, @StringRes fallbackResId: Int) =
-        keyTranslator.translate(phraseKey) ?: (if (fallbackResId != 0) context.getString(
-            fallbackResId
-        ) else phraseKey)
-}
\ No newline at end of file
+        keyTranslator.translate(phraseKey) ?: (
+            if (fallbackResId != 0) {
+                context.getString(
+                    fallbackResId,
+                )
+            } else {
+                phraseKey
+            }
+            )
+}
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/LocationProvider.kt b/core/common/src/main/java/com/crisiscleanup/core/common/LocationProvider.kt
index 34dac6c0b..aaa114ec7 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/LocationProvider.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/LocationProvider.kt
@@ -10,4 +10,4 @@ interface LocationProvider {
      * Latitude, longitude
      */
     suspend fun getLocation(): Pair<Double, Double>?
-}
\ No newline at end of file
+}
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/NavigationObserver.kt b/core/common/src/main/java/com/crisiscleanup/core/common/NavigationObserver.kt
index 0a34bcfa9..fb294cbd5 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/NavigationObserver.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/NavigationObserver.kt
@@ -4,4 +4,4 @@ import android.os.Bundle
 
 interface NavigationObserver {
     fun onRouteChange(route: String?, arguments: Bundle?)
-}
\ No newline at end of file
+}
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/PermissionManager.kt b/core/common/src/main/java/com/crisiscleanup/core/common/PermissionManager.kt
index b833182f8..07ddcf0d9 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/PermissionManager.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/PermissionManager.kt
@@ -32,4 +32,4 @@ enum class PermissionStatus {
     ShowRationale,
     Requesting,
     Undefined,
-}
\ No newline at end of file
+}
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/PhoneNumberUtil.kt b/core/common/src/main/java/com/crisiscleanup/core/common/PhoneNumberUtil.kt
index 93a958282..8c5b3291a 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/PhoneNumberUtil.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/PhoneNumberUtil.kt
@@ -54,4 +54,4 @@ object PhoneNumberUtil {
 data class ParsedPhoneNumber(
     val source: String,
     val parsedNumbers: List<String>,
-)
\ No newline at end of file
+)
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/TextUtil.kt b/core/common/src/main/java/com/crisiscleanup/core/common/TextUtil.kt
index 220d8d62d..c0bfbbc0d 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/TextUtil.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/TextUtil.kt
@@ -13,4 +13,4 @@ fun Collection<String?>.combineTrimText(separator: String = ", ") =
     filterNotBlankTrim().joinToString(separator)
 
 fun String.urlEncode(): String = URLEncoder.encode(this, StandardCharsets.UTF_8.toString())
-fun String.urlDecode(): String = URLDecoder.decode(this, StandardCharsets.UTF_8.toString())
\ No newline at end of file
+fun String.urlDecode(): String = URLDecoder.decode(this, StandardCharsets.UTF_8.toString())
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/UuidGenerator.kt b/core/common/src/main/java/com/crisiscleanup/core/common/UuidGenerator.kt
index e9f81680d..78d8f5ad0 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/UuidGenerator.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/UuidGenerator.kt
@@ -9,4 +9,4 @@ interface UuidGenerator {
 
 class JavaUuidGenerator @Inject constructor() : UuidGenerator {
     override fun uuid() = UUID.randomUUID().toString()
-}
\ No newline at end of file
+}
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/VisualAlertManager.kt b/core/common/src/main/java/com/crisiscleanup/core/common/VisualAlertManager.kt
index 8b4d6750b..0b463b4e7 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/VisualAlertManager.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/VisualAlertManager.kt
@@ -3,4 +3,4 @@ package com.crisiscleanup.core.common
 interface VisualAlertManager {
     fun takeNonProductionAppAlert(): Boolean
     fun setNonProductionAppAlert(show: Boolean)
-}
\ No newline at end of file
+}
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/WorksiteLocationEditor.kt b/core/common/src/main/java/com/crisiscleanup/core/common/WorksiteLocationEditor.kt
index 0ad265158..4bc7fb9a5 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/WorksiteLocationEditor.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/WorksiteLocationEditor.kt
@@ -2,4 +2,4 @@ package com.crisiscleanup.core.common
 
 interface WorksiteLocationEditor {
     fun takeEditedLocation(): Pair<Double, Double>?
-}
\ No newline at end of file
+}
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/di/ApplicationModule.kt b/core/common/src/main/java/com/crisiscleanup/core/common/di/ApplicationModule.kt
index 4c611e30d..030f2261f 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/di/ApplicationModule.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/di/ApplicationModule.kt
@@ -15,18 +15,18 @@ interface ApplicationModule {
     @Singleton
     @Binds
     fun bindsAndroidResourceProvider(
-        resourceProvider: ApplicationResourceProvider
+        resourceProvider: ApplicationResourceProvider,
     ): AndroidResourceProvider
 
     @Binds
     fun bindsInputValidator(
-        validator: CommonInputValidator
+        validator: CommonInputValidator,
     ): InputValidator
 
     @Singleton
     @Binds
     fun bindsTrimMemoryEventManager(
-        manager: CrisisCleanupTrimMemoryEventManager
+        manager: CrisisCleanupTrimMemoryEventManager,
     ): TrimMemoryEventManager
 
     @Binds
@@ -34,11 +34,11 @@ interface ApplicationModule {
 
     @Binds
     fun bindsAppVersionProvider(
-        versionProvider: AndroidAppVersionProvider
+        versionProvider: AndroidAppVersionProvider,
     ): AppVersionProvider
 
     @Binds
     fun bindsTranslator(
-        translator: AndroidResourceTranslator
+        translator: AndroidResourceTranslator,
     ): KeyResourceTranslator
-}
\ No newline at end of file
+}
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/di/CoroutineScopesModule.kt b/core/common/src/main/java/com/crisiscleanup/core/common/di/CoroutineScopesModule.kt
index 01ee74705..8e740d2be 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/di/CoroutineScopesModule.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/di/CoroutineScopesModule.kt
@@ -23,6 +23,6 @@ object CoroutinesScopesModule {
     @ApplicationScope
     @Provides
     fun providesApplicationScope(
-        @Dispatcher(Default) defaultDispatcher: CoroutineDispatcher
+        @Dispatcher(Default) defaultDispatcher: CoroutineDispatcher,
     ): CoroutineScope = CoroutineScope(SupervisorJob() + defaultDispatcher)
-}
\ No newline at end of file
+}
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/di/DispatchersModule.kt b/core/common/src/main/java/com/crisiscleanup/core/common/di/DispatchersModule.kt
index 459a88d26..1d333821a 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/di/DispatchersModule.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/di/DispatchersModule.kt
@@ -19,4 +19,4 @@ object DispatchersModule {
     @Provides
     @Dispatcher(CrisisCleanupDispatchers.IO)
     fun providesIODispatcher(): CoroutineDispatcher = Dispatchers.IO
-}
\ No newline at end of file
+}
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/di/IdGeneratorModule.kt b/core/common/src/main/java/com/crisiscleanup/core/common/di/IdGeneratorModule.kt
index 4bc3c74f9..2a20e7489 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/di/IdGeneratorModule.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/di/IdGeneratorModule.kt
@@ -12,4 +12,4 @@ import dagger.hilt.components.SingletonComponent
 interface IdGeneratorModule {
     @Binds
     fun bindsUuidGenerator(generator: JavaUuidGenerator): UuidGenerator
-}
\ No newline at end of file
+}
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/event/AuthEventBus.kt b/core/common/src/main/java/com/crisiscleanup/core/common/event/AuthEventBus.kt
index cc83d6207..e3acfc01f 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/event/AuthEventBus.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/event/AuthEventBus.kt
@@ -35,4 +35,4 @@ class CrisisCleanupAuthEventBus @Inject constructor(
             refreshedTokens.emit(true)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/event/TrimMemoryEventManager.kt b/core/common/src/main/java/com/crisiscleanup/core/common/event/TrimMemoryEventManager.kt
index 5f36ab494..0cd049463 100644
--- a/core/common/src/main/java/com/crisiscleanup/core/common/event/TrimMemoryEventManager.kt
+++ b/core/common/src/main/java/com/crisiscleanup/core/common/event/TrimMemoryEventManager.kt
@@ -35,4 +35,4 @@ class CrisisCleanupTrimMemoryEventManager @Inject constructor() : TrimMemoryEven
         // TODO Handle exceptions properly
         listeners.values.onEach { it.get()?.onTrimMemory(level) }
     }
-}
\ No newline at end of file
+}
diff --git a/core/common/src/main/res/values/strings.xml b/core/common/src/main/res/values/strings.xml
index 50eda40da..d84c9c1f7 100644
--- a/core/common/src/main/res/values/strings.xml
+++ b/core/common/src/main/res/values/strings.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="crisis_cleanup">Crisis Cleanup</string>
     <string name="unexpected_error">This is a minor crisis. We will need to find and fix issue. Sorry for this inconvenience.</string>
diff --git a/core/common/src/test/java/com/crisiscleanup/core/common/InputValidatorTest.kt b/core/common/src/test/java/com/crisiscleanup/core/common/InputValidatorTest.kt
index 0ceae997b..0837dca3d 100644
--- a/core/common/src/test/java/com/crisiscleanup/core/common/InputValidatorTest.kt
+++ b/core/common/src/test/java/com/crisiscleanup/core/common/InputValidatorTest.kt
@@ -35,4 +35,4 @@ class InputValidatorTest {
             assertTrue(inputValidator.hasEmailAddress(s))
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/common/src/test/java/com/crisiscleanup/core/common/PhoneNumberUtilTest.kt b/core/common/src/test/java/com/crisiscleanup/core/common/PhoneNumberUtilTest.kt
index 2a865cd1b..df81ba498 100644
--- a/core/common/src/test/java/com/crisiscleanup/core/common/PhoneNumberUtilTest.kt
+++ b/core/common/src/test/java/com/crisiscleanup/core/common/PhoneNumberUtilTest.kt
@@ -47,4 +47,4 @@ class PhoneNumberUtilTest {
         )
         assertEquals(expected, actual)
     }
-}
\ No newline at end of file
+}
diff --git a/core/commonassets/src/main/java/com/crisiscleanup/core/commonassets/DisasterIcon.kt b/core/commonassets/src/main/java/com/crisiscleanup/core/commonassets/DisasterIcon.kt
index 0d972de9d..15dec449d 100644
--- a/core/commonassets/src/main/java/com/crisiscleanup/core/commonassets/DisasterIcon.kt
+++ b/core/commonassets/src/main/java/com/crisiscleanup/core/commonassets/DisasterIcon.kt
@@ -55,4 +55,4 @@ fun DisasterIcon(
             contentDescription = incidentName,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/commoncase/src/main/java/com/crisiscleanup/core/commoncase/model/Worksite.kt b/core/commoncase/src/main/java/com/crisiscleanup/core/commoncase/model/Worksite.kt
index f33a66d7f..c90638c36 100644
--- a/core/commoncase/src/main/java/com/crisiscleanup/core/commoncase/model/Worksite.kt
+++ b/core/commoncase/src/main/java/com/crisiscleanup/core/commoncase/model/Worksite.kt
@@ -21,4 +21,4 @@ val Worksite.addressQuery: Triple<String, String, String>
         val addressText = fullAddress
         val locationQuery = "geo:$coordinates?q=$addressText"
         return Triple(addressText, geoQuery, locationQuery)
-    }
\ No newline at end of file
+    }
diff --git a/core/commoncase/src/main/java/com/crisiscleanup/core/commoncase/ui/ExistingWorksitesList.kt b/core/commoncase/src/main/java/com/crisiscleanup/core/commoncase/ui/ExistingWorksitesList.kt
index d9bad2b3c..a74a26e62 100644
--- a/core/commoncase/src/main/java/com/crisiscleanup/core/commoncase/ui/ExistingWorksitesList.kt
+++ b/core/commoncase/src/main/java/com/crisiscleanup/core/commoncase/ui/ExistingWorksitesList.kt
@@ -39,7 +39,7 @@ private fun CaseView(
             Column(
                 Modifier
                     .weight(1f)
-                    .listRowItemStartPadding()
+                    .listRowItemStartPadding(),
             ) {
                 with(summary) {
                     Text(listOf(name, caseNumber).combineTrimText())
@@ -67,9 +67,9 @@ fun LazyListScope.listCaseResults(
                 .testTag("workSearchResultItem_${it.listItemKey}")
                 .clickable(
                     enabled = isEditable,
-                    onClick = { onCaseSelect(it) }
+                    onClick = { onCaseSelect(it) },
                 )
-                .listItemOptionPadding()
+                .listItemOptionPadding(),
         )
     }
 }
@@ -86,10 +86,10 @@ fun ExistingCaseLocationsDropdownItems(
                     caseLocation,
                     Modifier
                         .fillMaxWidth()
-                        .optionItemPadding()
+                        .optionItemPadding(),
                 )
             },
             onClick = { onCaseSelect(caseLocation) },
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/commoncase/src/main/java/com/crisiscleanup/core/commoncase/ui/IncidentDropdownSelect.kt b/core/commoncase/src/main/java/com/crisiscleanup/core/commoncase/ui/IncidentDropdownSelect.kt
index 63fe15152..431c19cb4 100644
--- a/core/commoncase/src/main/java/com/crisiscleanup/core/commoncase/ui/IncidentDropdownSelect.kt
+++ b/core/commoncase/src/main/java/com/crisiscleanup/core/commoncase/ui/IncidentDropdownSelect.kt
@@ -41,7 +41,7 @@ fun IncidentDropdownSelect(
     ) {
         val contentColor = LocalContentColor.current
         CompositionLocalProvider(
-            LocalContentColor provides if (enabled) contentColor else contentColor.disabledAlpha()
+            LocalContentColor provides if (enabled) contentColor else contentColor.disabledAlpha(),
         ) {
             DisasterIcon(disasterIconResId, title)
             TruncatedAppBarText(
@@ -55,15 +55,15 @@ fun IncidentDropdownSelect(
             AnimatedVisibility(
                 visible = isLoading,
                 enter = fadeIn(),
-                exit = fadeOut()
+                exit = fadeOut(),
             ) {
                 CircularProgressIndicator(
                     modifier
                         .testTag("incidentSelectLoadingIndicator")
                         .size(48.dp)
-                        .padding(8.dp)
+                        .padding(8.dp),
                 )
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/IncidentOrganizationsDataCache.kt b/core/data/src/main/java/com/crisiscleanup/core/data/IncidentOrganizationsDataCache.kt
index d90e29e3a..8d52b6e00 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/IncidentOrganizationsDataCache.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/IncidentOrganizationsDataCache.kt
@@ -46,7 +46,7 @@ class IncidentOrganizationsDataFileCache @Inject constructor(
     override fun loadOrganizations(
         incidentId: Long,
         dataIndex: Int,
-        expectedCount: Int
+        expectedCount: Int,
     ): IncidentOrganizationsPageRequest? {
         val cacheFileName = cacheFileName(incidentId, dataIndex)
         val cacheFile = File(context.cacheDir, cacheFileName)
@@ -100,4 +100,4 @@ class IncidentOrganizationsDataFileCache @Inject constructor(
             logger.logDebug("Error deleting cache file $cacheFileName. ${e.message}")
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/IncidentOrganizationsSyncer.kt b/core/data/src/main/java/com/crisiscleanup/core/data/IncidentOrganizationsSyncer.kt
index e313e2d4a..12a7d1c3d 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/IncidentOrganizationsSyncer.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/IncidentOrganizationsSyncer.kt
@@ -38,7 +38,7 @@ class IncidentOrganizationsSyncer @Inject constructor(
 
     override suspend fun sync(incidentId: Long) {
         val statsUpdater = IncidentDataPullStatsUpdater(
-            updatePullStats = { stats -> dataPullStats.value = stats }
+            updatePullStats = { stats -> dataPullStats.value = stats },
         ).also {
             it.beginPull(incidentId)
         }
@@ -149,7 +149,7 @@ class IncidentOrganizationsSyncer @Inject constructor(
                     targetCount = syncCount,
                     successfulSync = syncStart,
                     appBuildVersionCode = appVersionProvider.versionCode,
-                )
+                ),
             )
         }
 
@@ -159,4 +159,4 @@ class IncidentOrganizationsSyncer @Inject constructor(
 
         personContactDao.trimIncidentOrganizationContacts()
     }
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/IncidentSelectManager.kt b/core/data/src/main/java/com/crisiscleanup/core/data/IncidentSelectManager.kt
index 2043bf14f..cb4adcc4a 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/IncidentSelectManager.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/IncidentSelectManager.kt
@@ -49,4 +49,4 @@ interface IncidentSelectModule {
     @Singleton
     @Binds
     fun bindsIncidentSelector(selector: IncidentSelectManager): IncidentSelector
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/IncidentWorksitesFullSyncer.kt b/core/data/src/main/java/com/crisiscleanup/core/data/IncidentWorksitesFullSyncer.kt
index 6c50c6ed3..5eceb45c7 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/IncidentWorksitesFullSyncer.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/IncidentWorksitesFullSyncer.kt
@@ -216,7 +216,7 @@ class IncidentWorksitesFullSyncer @Inject constructor(
                 queryBounds,
             ) {
                 val syncWorksite = now - it.syncedAt > recentSyncDuration ||
-                        it.formData.isEmpty()
+                    it.formData.isEmpty()
                 if (!syncWorksite) {
                     skipCount++
                 }
@@ -225,11 +225,16 @@ class IncidentWorksitesFullSyncer @Inject constructor(
 
             val splitBoundedIds = boundedIds.size > byIdPageCount
             val networkQueryIds =
-                if (splitBoundedIds) boundedIds.subList(0, byIdPageCount)
-                else boundedIds
-            boundedIds = if (boundedIds.size > byIdPageCount)
+                if (splitBoundedIds) {
+                    boundedIds.subList(0, byIdPageCount)
+                } else {
+                    boundedIds
+                }
+            boundedIds = if (boundedIds.size > byIdPageCount) {
                 boundedIds.subList(byIdPageCount, boundedIds.size).toMutableList()
-            else mutableListOf()
+            } else {
+                mutableListOf()
+            }
 
             if (networkQueryIds.isEmpty()) {
                 continue
@@ -287,8 +292,8 @@ private suspend fun IncidentWorksitesFullSyncStatsEntity.asQueryParameters(
     val locationChangeLength = searchRadius * 0.5
     val hasLocation = abs(latitude) <= 90 && abs(longitude) <= 180 && searchRadius > 0
     val hasLocationChange = hasLocation &&
-            abs(latitude - this.latitude) * 111 > locationChangeLength &&
-            abs(longitude - this.longitude) * 111 > locationChangeLength
+        abs(latitude - this.latitude) * 111 > locationChangeLength &&
+        abs(longitude - this.longitude) * 111 > locationChangeLength
 
     return LocationQueryParameters(
         hasLocation,
@@ -297,4 +302,4 @@ private suspend fun IncidentWorksitesFullSyncStatsEntity.asQueryParameters(
         longitude,
         searchRadius,
     )
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/IncidentWorksitesSyncer.kt b/core/data/src/main/java/com/crisiscleanup/core/data/IncidentWorksitesSyncer.kt
index 1a656075d..730e35f9b 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/IncidentWorksitesSyncer.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/IncidentWorksitesSyncer.kt
@@ -63,7 +63,7 @@ class IncidentWorksitesSyncer @Inject constructor(
         syncStats: IncidentDataSyncStats,
     ) {
         val statsUpdater = IncidentDataPullStatsUpdater(
-            updatePullStats = { stats -> dataPullStats.value = stats }
+            updatePullStats = { stats -> dataPullStats.value = stats },
         ).also {
             it.beginPull(incidentId)
         }
@@ -108,7 +108,7 @@ class IncidentWorksitesSyncer @Inject constructor(
                     pageCount,
                     networkPullPage,
                     syncCount,
-                    updatedAfter
+                    updatedAfter,
                 )
                 networkPullPage++
                 requestingCount += pageCount
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/SyncUtilities.kt b/core/data/src/main/java/com/crisiscleanup/core/data/SyncUtilities.kt
index e2fd4eac3..cf43623a2 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/SyncUtilities.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/SyncUtilities.kt
@@ -42,19 +42,19 @@ private suspend fun <T> suspendRunCatching(block: suspend () -> T): Result<T> =
     Log.i(
         "suspendRunCatching",
         "Failed to evaluate a suspendRunCatchingBlock. Returning failure Result",
-        exception
+        exception,
     )
     Result.failure(exception)
 }
 
 // See starting file for full change list version syncing logic
-//suspend fun Synchronizer.changeListSync(
+// suspend fun Synchronizer.changeListSync(
 //    versionReader: (ChangeListVersions) -> Int,
 //    changeListFetcher: suspend (Int) -> List<NetworkChangeList>,
 //    versionUpdater: ChangeListVersions.(Int) -> ChangeListVersions,
 //    modelDeleter: suspend (List<String>) -> Unit,
 //    modelUpdater: suspend (List<String>) -> Unit,
-//) = suspendRunCatching {
+// ) = suspendRunCatching {
 // See starting file for sync logic
 // Flow was
 // 1. Get change list version for specific syncable
@@ -62,7 +62,7 @@ private suspend fun <T> suspendRunCatching(block: suspend () -> T): Result<T> =
 // 1. Split changes into deletes and updated changes
 // 1. Process deleted and updated separately
 // 1. Update change list version for specific syncable with highest water mark in changes from network
-//}.isSuccess
+// }.isSuccess
 
 /**
  * Returns a [Flow] whose values are generated by [transform] function that process the most
@@ -75,10 +75,10 @@ fun <T1, T2, T3, T4, T5, T6, R> combine(
     flow4: Flow<T4>,
     flow5: Flow<T5>,
     flow6: Flow<T6>,
-    transform: suspend (T1, T2, T3, T4, T5, T6) -> R
+    transform: suspend (T1, T2, T3, T4, T5, T6) -> R,
 ): Flow<R> = combine(
     combine(flow, flow2, flow3, ::Triple),
-    combine(flow4, flow5, flow6, ::Triple)
+    combine(flow4, flow5, flow6, ::Triple),
 ) { t1, t2 ->
     transform(
         t1.first,
@@ -86,6 +86,6 @@ fun <T1, T2, T3, T4, T5, T6, R> combine(
         t1.third,
         t2.first,
         t2.second,
-        t2.third
+        t2.third,
     )
 }
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/di/DataModule.kt b/core/data/src/main/java/com/crisiscleanup/core/data/di/DataModule.kt
index 84348f851..81a6af579 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/di/DataModule.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/di/DataModule.kt
@@ -150,4 +150,4 @@ interface DataInternalModule {
     fun providesIncidentOrganizationsNetworkDataCache(
         cache: IncidentOrganizationsDataFileCache,
     ): IncidentOrganizationsDataCache
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/model/IncidentNetworkDataPageRequest.kt b/core/data/src/main/java/com/crisiscleanup/core/data/model/IncidentNetworkDataPageRequest.kt
index fc1efd2d4..174e8fcb9 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/model/IncidentNetworkDataPageRequest.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/model/IncidentNetworkDataPageRequest.kt
@@ -22,4 +22,4 @@ data class IncidentOrganizationsPageRequest(
     val offset: Int,
     val totalCount: Int,
     val organizations: List<NetworkIncidentOrganization>,
-)
\ No newline at end of file
+)
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkCaseHistoryEvent.kt b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkCaseHistoryEvent.kt
index 992b1a1ca..86c7ce89a 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkCaseHistoryEvent.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkCaseHistoryEvent.kt
@@ -33,4 +33,4 @@ fun NetworkCaseHistoryEvent.asEntities(worksiteId: Long): Pair<CaseHistoryEventE
                 recipientNameT = recipientNameT,
             )
         },
-    )
\ No newline at end of file
+    )
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkFile.kt b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkFile.kt
index dc8844f46..ac862f1e8 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkFile.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkFile.kt
@@ -15,4 +15,4 @@ fun NetworkFile.asEntity() = NetworkFileEntity(
     tag = tag,
     title = title,
     url = url,
-)
\ No newline at end of file
+)
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkIncident.kt b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkIncident.kt
index e1161ce29..61355975f 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkIncident.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkIncident.kt
@@ -66,4 +66,4 @@ fun NetworkIncidentFormField.asEntity(incidentId: Long): IncidentFormFieldEntity
         parentKeyNonNull = fieldParentKey ?: "",
         selectToggleWorkType = selectToggleWorkType,
     )
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkIncidentOrganization.kt b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkIncidentOrganization.kt
index 80dbe9d47..98cc743c6 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkIncidentOrganization.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkIncidentOrganization.kt
@@ -26,16 +26,25 @@ fun Collection<NetworkIncidentOrganization>.asEntities(
 ): OrganizationEntities {
     val organizations = map { it.asEntity() }
     val primaryContacts =
-        if (getContacts) flatMap {
-            it.primaryContacts?.map(NetworkPersonContact::asEntity) ?: emptyList()
+        if (getContacts) {
+            flatMap {
+                it.primaryContacts?.map(NetworkPersonContact::asEntity) ?: emptyList()
+            }
+        } else {
+            emptyList()
         }
-        else emptyList()
     val organizationContactCrossRefs =
-        if (getReferences) flatMap(NetworkIncidentOrganization::primaryContactCrossReferences)
-        else emptyList()
+        if (getReferences) {
+            flatMap(NetworkIncidentOrganization::primaryContactCrossReferences)
+        } else {
+            emptyList()
+        }
     val organizationAffiliates =
-        if (getReferences) flatMap(NetworkIncidentOrganization::affiliateOrganizationCrossReferences)
-        else emptyList()
+        if (getReferences) {
+            flatMap(NetworkIncidentOrganization::affiliateOrganizationCrossReferences)
+        } else {
+            emptyList()
+        }
     return OrganizationEntities(
         organizations,
         primaryContacts,
@@ -49,4 +58,4 @@ data class OrganizationEntities(
     val primaryContacts: List<PersonContactEntity>,
     val organizationContactCrossRefs: List<OrganizationPrimaryContactCrossRef>,
     val orgAffiliates: List<OrganizationAffiliateEntity>,
-)
\ No newline at end of file
+)
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkLanguage.kt b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkLanguage.kt
index 332d11b92..a1b1239f3 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkLanguage.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkLanguage.kt
@@ -19,4 +19,4 @@ fun NetworkLanguageTranslation.asEntity(syncedAt: Instant) = LanguageTranslation
     name = name,
     translationsJson = Json.encodeToString(translations),
     syncedAt = syncedAt,
-)
\ No newline at end of file
+)
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkPersonContact.kt b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkPersonContact.kt
index 73cb9dccb..afd4157c1 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkPersonContact.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkPersonContact.kt
@@ -44,4 +44,4 @@ data class PersonContactEntities(
     val organizationAffiliates: Collection<Long>,
     val personContact: PersonContactEntity,
     val personToOrganization: PersonOrganizationCrossRef,
-)
\ No newline at end of file
+)
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkWorkType.kt b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkWorkType.kt
index 892e2e490..247f515b1 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkWorkType.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkWorkType.kt
@@ -29,4 +29,4 @@ fun WorkTypeShort.asEntity() = WorkTypeEntity(
     recur = null,
     status = status,
     workType = workType,
-)
\ No newline at end of file
+)
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkWorkTypeRequest.kt b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkWorkTypeRequest.kt
index 69cba2cbe..46504d041 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkWorkTypeRequest.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkWorkTypeRequest.kt
@@ -15,4 +15,4 @@ fun NetworkWorkTypeRequest.asEntity(worksiteId: Long) = WorkTypeTransferRequestE
     approvedAt = approvedAt,
     rejectedAt = rejectedAt,
     approvedRejectedReason = acceptedRejectedReason ?: "",
-)
\ No newline at end of file
+)
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkWorkTypeStatusFull.kt b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkWorkTypeStatusFull.kt
index c2656355b..bdbeba414 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkWorkTypeStatusFull.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkWorkTypeStatusFull.kt
@@ -8,4 +8,4 @@ fun NetworkWorkTypeStatusFull.asEntity() = WorkTypeStatusEntity(
     name = name,
     primaryState = primaryState,
     listOrder = listOrder,
-)
\ No newline at end of file
+)
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkWorksite.kt b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkWorksite.kt
index b4c9711d3..a41518dad 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkWorksite.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/model/NetworkWorksite.kt
@@ -201,4 +201,4 @@ fun NetworkWorksiteCoreData.asEntities(): WorksiteEntities {
         workTypes,
         emptyList(),
     )
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/model/PopulatedWorksiteMapVisual.kt b/core/data/src/main/java/com/crisiscleanup/core/data/model/PopulatedWorksiteMapVisual.kt
index b5919d3ed..c363a5872 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/model/PopulatedWorksiteMapVisual.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/model/PopulatedWorksiteMapVisual.kt
@@ -26,8 +26,10 @@ fun List<PopulatedWorksiteMapVisual>.filter(
     return mapNotNull {
         val distance = if (filterByDistance) {
             haversineDistance(
-                latRad, lngRad,
-                it.latitude.radians, it.longitude.radians,
+                latRad,
+                lngRad,
+                it.latitude.radians,
+                it.longitude.radians,
             ).kmToMiles
         } else {
             0.0
@@ -42,19 +44,19 @@ fun List<PopulatedWorksiteMapVisual>.filter(
         }
 
         val isFilteredOut = filters.hasAdditionalFilters &&
-                !filters.passesFilter(
-                    organizationAffiliates,
-                    it.flags,
-                    it.formData,
-                    it.workTypes,
-                    it.createdAt,
-                    it.isFavorite,
-                    it.reportedBy,
-                    it.updatedAt,
-                    it.latitude,
-                    it.longitude,
-                    locationAreaBounds,
-                )
+            !filters.passesFilter(
+                organizationAffiliates,
+                it.flags,
+                it.formData,
+                it.workTypes,
+                it.createdAt,
+                it.isFavorite,
+                it.reportedBy,
+                it.updatedAt,
+                it.latitude,
+                it.longitude,
+                locationAreaBounds,
+            )
         it.asExternalModel(isFilteredOut)
     }
 }
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/model/SyncLog.kt b/core/data/src/main/java/com/crisiscleanup/core/data/model/SyncLog.kt
index f21f245db..1bf400ce0 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/model/SyncLog.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/model/SyncLog.kt
@@ -9,4 +9,4 @@ fun SyncLog.asEntity() = SyncLogEntity(
     logType = logType,
     message = message,
     details = details,
-)
\ No newline at end of file
+)
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/model/WorksiteLocalImage.kt b/core/data/src/main/java/com/crisiscleanup/core/data/model/WorksiteLocalImage.kt
index 8de69b143..685994efe 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/model/WorksiteLocalImage.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/model/WorksiteLocalImage.kt
@@ -10,4 +10,4 @@ fun WorksiteLocalImage.asEntity() = WorksiteLocalImageEntity(
     uri = uri,
     tag = tag,
     rotateDegrees = rotateDegrees,
-)
\ No newline at end of file
+)
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/AccountDataRefresher.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/AccountDataRefresher.kt
index 2bd60dcd0..ba5173a93 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/AccountDataRefresher.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/AccountDataRefresher.kt
@@ -49,4 +49,4 @@ class AccountDataRefresher @Inject constructor(
             organizationsRepository.syncOrganization(organizationId, force, true)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/AppMetricsRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/AppMetricsRepository.kt
index 2ce99a62c..c7b823f0c 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/AppMetricsRepository.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/AppMetricsRepository.kt
@@ -36,4 +36,4 @@ class AppMetricsRepository @Inject constructor(
     ) {
         dataSource.setAppOpen(appVersion, timestamp)
     }
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/CaseHistoryRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/CaseHistoryRepository.kt
index 98b99c0e8..29e37d316 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/CaseHistoryRepository.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/CaseHistoryRepository.kt
@@ -151,4 +151,4 @@ class OfflineFirstCaseHistoryRepository @Inject constructor(
         }
         return 0
     }
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/CasesFilterRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/CasesFilterRepository.kt
index f692bc89a..fccfcbb30 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/CasesFilterRepository.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/CasesFilterRepository.kt
@@ -64,4 +64,4 @@ class CrisisCleanupCasesFilterRepository @Inject constructor(
     override fun updateWorkTypeFilters(workTypes: Collection<String>) {
         // TODO Update work types removing non-matching
     }
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/CrisisCleanupAccountDataRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/CrisisCleanupAccountDataRepository.kt
index 8a09c777f..aa7ada41a 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/CrisisCleanupAccountDataRepository.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/CrisisCleanupAccountDataRepository.kt
@@ -88,13 +88,13 @@ class CrisisCleanupAccountDataRepository @Inject constructor(
     override suspend fun updateAccountTokens(
         refreshToken: String,
         accessToken: String,
-        expirySeconds: Long
+        expirySeconds: Long,
     ) {
         val isClearing = refreshToken.isBlank()
         dataSource.updateAccountTokens(
             refreshToken,
             if (isClearing) "" else accessToken,
-            if (isClearing) 0 else expirySeconds
+            if (isClearing) 0 else expirySeconds,
         )
     }
 
@@ -109,7 +109,7 @@ class CrisisCleanupAccountDataRepository @Inject constructor(
                     updateAccountTokens(
                         refreshResult.refreshToken,
                         refreshResult.accessToken,
-                        now.plus(refreshResult.expiresIn.seconds).epochSeconds
+                        now.plus(refreshResult.expiresIn.seconds).epochSeconds,
                     )
                     logger.logDebug("Refreshed soon/expiring account tokens")
                 }
@@ -134,4 +134,4 @@ class CrisisCleanupAccountDataRepository @Inject constructor(
             dataSource.updateAccountTokens(refreshToken, "", 1)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/DatabaseManagementRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/DatabaseManagementRepository.kt
index 73262af91..90bb9d85c 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/DatabaseManagementRepository.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/DatabaseManagementRepository.kt
@@ -22,4 +22,4 @@ class CrisisCleanupDatabaseManagementRepository @Inject constructor(
         organizationDaoPlus.rebuildOrganizationFts()
         worksiteDaoPlus.rebuildWorksiteTextFts()
     }
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/EndOfLifeRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/EndOfLifeRepository.kt
index ec1fb2507..c955392b9 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/EndOfLifeRepository.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/EndOfLifeRepository.kt
@@ -42,4 +42,4 @@ class AppEndOfLifeRepository @Inject constructor(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/IncidentsRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/IncidentsRepository.kt
index c0b802ae0..32c03dde0 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/IncidentsRepository.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/IncidentsRepository.kt
@@ -29,4 +29,4 @@ interface IncidentsRepository {
     suspend fun pullIncidentOrganizations(incidentId: Long, force: Boolean = false)
 
     suspend fun getMatchingIncidents(q: String): List<IncidentIdNameType>
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/LanguageTranslationsRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/LanguageTranslationsRepository.kt
index 04e33df4e..c6fb021f0 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/LanguageTranslationsRepository.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/LanguageTranslationsRepository.kt
@@ -187,4 +187,4 @@ class OfflineFirstLanguageTranslationsRepository @Inject constructor(
     override fun translate(phraseKey: String): String? {
         return translations.value[phraseKey] ?: statusRepository.translateStatus(phraseKey)
     }
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/LocalImageRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/LocalImageRepository.kt
index 029b179b4..7c18d1f5e 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/LocalImageRepository.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/LocalImageRepository.kt
@@ -69,8 +69,11 @@ class CrisisCleanupLocalImageRepository @Inject constructor(
     override fun streamLocalImageUri(id: Long) = localImageDao.streamLocalImageUri(id)
 
     override fun getImageRotation(id: Long, isNetworkImage: Boolean): Int {
-        return if (isNetworkImage) localImageDao.getNetworkFileLocalImage(id)?.rotateDegrees ?: 0
-        else localImageDao.getLocalImage(id)?.rotateDegrees ?: 0
+        return if (isNetworkImage) {
+            localImageDao.getNetworkFileLocalImage(id)?.rotateDegrees ?: 0
+        } else {
+            localImageDao.getLocalImage(id)?.rotateDegrees ?: 0
+        }
     }
 
     override suspend fun setImageRotation(id: Long, isNetworkImage: Boolean, rotationDegrees: Int) {
@@ -223,4 +226,4 @@ class CrisisCleanupLocalImageRepository @Inject constructor(
 
         return saveCount
     }
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/LocationsRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/LocationsRepository.kt
index 9f2bdcd1c..d9d885415 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/LocationsRepository.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/LocationsRepository.kt
@@ -6,4 +6,4 @@ import kotlinx.coroutines.flow.Flow
 interface LocationsRepository {
     fun streamLocations(ids: Collection<Long>): Flow<List<Location>>
     fun getLocations(ids: Collection<Long>): List<Location>
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/OfflineFirstIncidentsRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/OfflineFirstIncidentsRepository.kt
index 6ad914bbe..9cd4292d8 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/OfflineFirstIncidentsRepository.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/OfflineFirstIncidentsRepository.kt
@@ -121,7 +121,9 @@ class OfflineFirstIncidentsRepository @Inject constructor(
     private suspend fun syncInternal(forcePullAll: Boolean = false) = coroutineScope {
         isSyncing.value = true
         try {
-            val pullAll = if (forcePullAll) true else {
+            val pullAll = if (forcePullAll) {
+                true
+            } else {
                 val localIncidentsCount = incidentDao.getIncidentCount()
                 localIncidentsCount < 10
             }
@@ -194,4 +196,4 @@ class OfflineFirstIncidentsRepository @Inject constructor(
     }
 
     override suspend fun getMatchingIncidents(q: String) = incidentDaoPlus.getMatchingIncidents(q)
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/OfflineFirstLocationsRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/OfflineFirstLocationsRepository.kt
index a6eb37f50..fff263ed0 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/OfflineFirstLocationsRepository.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/OfflineFirstLocationsRepository.kt
@@ -16,4 +16,4 @@ class OfflineFirstLocationsRepository @Inject constructor(
 
     override fun getLocations(ids: Collection<Long>) =
         locationDao.getLocations(ids).map(PopulatedLocation::asExternalModel)
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/OrganizationsRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/OrganizationsRepository.kt
index b17502cef..a2f907844 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/OrganizationsRepository.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/OrganizationsRepository.kt
@@ -156,4 +156,4 @@ class OfflineFirstOrganizationsRepository @Inject constructor(
 
     override suspend fun getMatchingOrganizations(q: String) =
         incidentOrganizationDaoPlus.getMatchingOrganizations(q)
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/SearchWorksiteRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/SearchWorksiteRepository.kt
index a0842a566..a3d5c8b4c 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/SearchWorksiteRepository.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/SearchWorksiteRepository.kt
@@ -133,8 +133,10 @@ class MemoryCacheSearchWorksitesRepository @Inject constructor(
             val distance = if (filterByDistance) {
                 val (resultLongitude, resultLatitude) = result.location.coordinates
                 haversineDistance(
-                    locationLatitudeRad, locationLongitudeRad,
-                    resultLatitude.radians, resultLongitude.radians,
+                    locationLatitudeRad,
+                    locationLongitudeRad,
+                    resultLatitude.radians,
+                    resultLongitude.radians,
                 ).kmToMiles
             } else {
                 null
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/SyncLogRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/SyncLogRepository.kt
index d6afde28e..dcf5204fd 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/SyncLogRepository.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/SyncLogRepository.kt
@@ -50,7 +50,7 @@ class PagingSyncLogRepository @Inject constructor(
                 logType = type.ifEmpty { this.type },
                 message = message,
                 details = details,
-            )
+            ),
         )
         return this
     }
@@ -93,4 +93,4 @@ interface SyncLogModule {
 
     @Binds
     fun bindsSyncLogRepository(repository: PagingSyncLogRepository): SyncLogRepository
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/UsersRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/UsersRepository.kt
index e2e0c1ee7..36d80ffed 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/UsersRepository.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/UsersRepository.kt
@@ -34,4 +34,4 @@ class OfflineFirstUsersRepository @Inject constructor(
         }
         return emptyList()
     }
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/WorksiteChangeRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/WorksiteChangeRepository.kt
index da9f7eec2..5c9df1c86 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/WorksiteChangeRepository.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/WorksiteChangeRepository.kt
@@ -349,8 +349,11 @@ class CrisisCleanupWorksiteChangeRepository @Inject constructor(
         val newestChange = sortedChanges.last()
         if (hasSnapshotChanges || !newestChange.isArchived) {
             val syncChanges =
-                if (hasSnapshotChanges) sortedChanges.subList(startingSyncIndex, sortedChanges.size)
-                else listOf(newestChange)
+                if (hasSnapshotChanges) {
+                    sortedChanges.subList(startingSyncIndex, sortedChanges.size)
+                } else {
+                    listOf(newestChange)
+                }
             val hasPriorUnsyncedChanges = startingSyncIndex > oldestReferenceChangeIndex + 1
             val worksiteId = newestChange.worksiteId
             val networkWorksiteId = worksiteDao.getWorksiteNetworkId(worksiteId)
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/WorksitesRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/WorksitesRepository.kt
index cc797f9e7..25a08745d 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/WorksitesRepository.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/WorksitesRepository.kt
@@ -97,4 +97,4 @@ interface WorksitesRepository {
         searchRadius: Float = 100f,
         count: Int = 360,
     ): List<TableDataWorksite>
-}
\ No newline at end of file
+}
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/repository/fake/FakeAccountRepository.kt b/core/data/src/main/java/com/crisiscleanup/core/data/repository/fake/FakeAccountRepository.kt
index 59c5b32f8..4165aeb8e 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/repository/fake/FakeAccountRepository.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/repository/fake/FakeAccountRepository.kt
@@ -22,7 +22,6 @@ class FakeAccountRepository : AccountDataRepository {
 
     override val accountData: Flow<AccountData> = _accountData.filterNotNull()
 
-
     override val isAuthenticated: Flow<Boolean> = accountData.map { it.hasAuthenticated }
 
     override var refreshToken: String = ""
@@ -55,18 +54,18 @@ class FakeAccountRepository : AccountDataRepository {
                 emailAddress = email,
                 profilePictureUri = profilePictureUri,
                 org = org,
-            )
+            ),
         )
     }
 
     override suspend fun updateAccountTokens(
         refreshToken: String,
         accessToken: String,
-        expirySeconds: Long
+        expirySeconds: Long,
     ) {
         setAccountTokens(refreshToken, accessToken)
         _accountData.tryEmit(
-            current.copy(tokenExpiry = Instant.fromEpochSeconds(expirySeconds))
+            current.copy(tokenExpiry = Instant.fromEpochSeconds(expirySeconds)),
         )
     }
 
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/util/ConnectivityManagerNetworkMonitor.kt b/core/data/src/main/java/com/crisiscleanup/core/data/util/ConnectivityManagerNetworkMonitor.kt
index cfc559ade..1f990ec09 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/util/ConnectivityManagerNetworkMonitor.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/util/ConnectivityManagerNetworkMonitor.kt
@@ -19,7 +19,7 @@ import javax.inject.Singleton
 
 @Singleton
 class ConnectivityManagerNetworkMonitor @Inject constructor(
-    @ApplicationContext private val context: Context
+    @ApplicationContext private val context: Context,
 ) : NetworkMonitor {
     override val isOnline: Flow<Boolean> = callbackFlow {
         val connectivityManager = context.getSystemService<ConnectivityManager>()
@@ -40,7 +40,7 @@ class ConnectivityManagerNetworkMonitor @Inject constructor(
 
             override fun onCapabilitiesChanged(
                 network: Network,
-                networkCapabilities: NetworkCapabilities
+                networkCapabilities: NetworkCapabilities,
             ) {
                 channel.trySend(connectivityManager.isCurrentlyConnected())
             }
@@ -50,7 +50,7 @@ class ConnectivityManagerNetworkMonitor @Inject constructor(
             Builder()
                 .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
                 .build(),
-            callback
+            callback,
         )
 
         channel.trySend(connectivityManager.isCurrentlyConnected())
@@ -65,9 +65,10 @@ class ConnectivityManagerNetworkMonitor @Inject constructor(
 
     private fun ConnectivityManager?.isCurrentlyConnected() = when (this) {
         null -> false
-        else -> activeNetwork
-            ?.let(::getNetworkCapabilities)
-            ?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-            ?: false
+        else ->
+            activeNetwork
+                ?.let(::getNetworkCapabilities)
+                ?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+                ?: false
     }
 }
diff --git a/core/data/src/main/java/com/crisiscleanup/core/data/util/IncidentDataPullReporter.kt b/core/data/src/main/java/com/crisiscleanup/core/data/util/IncidentDataPullReporter.kt
index 5a83762e9..e2d358bcd 100644
--- a/core/data/src/main/java/com/crisiscleanup/core/data/util/IncidentDataPullReporter.kt
+++ b/core/data/src/main/java/com/crisiscleanup/core/data/util/IncidentDataPullReporter.kt
@@ -85,7 +85,7 @@ internal class IncidentDataPullStatsUpdater(
                 isStarted = true,
                 incidentId = incidentId,
                 pullStart = Clock.System.now(),
-            )
+            ),
         )
     }
 
@@ -108,4 +108,4 @@ internal class IncidentDataPullStatsUpdater(
     fun endPull() {
         reportChange(pullStats.copy(isEnded = true))
     }
-}
\ No newline at end of file
+}
diff --git a/core/data/src/test/java/com/crisiscleanup/core/data/repository/CrisisCleanupAccountDataRepositoryTest.kt b/core/data/src/test/java/com/crisiscleanup/core/data/repository/CrisisCleanupAccountDataRepositoryTest.kt
index dcc3f6a8e..153c9dcf1 100644
--- a/core/data/src/test/java/com/crisiscleanup/core/data/repository/CrisisCleanupAccountDataRepositoryTest.kt
+++ b/core/data/src/test/java/com/crisiscleanup/core/data/repository/CrisisCleanupAccountDataRepositoryTest.kt
@@ -137,4 +137,4 @@ class CrisisCleanupAccountDataRepositoryTest {
 //        assertEquals(expectedData, accountInfoDataSource.accountData.first())
 //        assertFalse(repository.isAuthenticated.first())
 //    }
-}
\ No newline at end of file
+}
diff --git a/core/database/src/androidTest/java/com/crisiscleanup/core/database/MigrationTest.kt b/core/database/src/androidTest/java/com/crisiscleanup/core/database/MigrationTest.kt
index e22deb4d1..c8adf366d 100644
--- a/core/database/src/androidTest/java/com/crisiscleanup/core/database/MigrationTest.kt
+++ b/core/database/src/androidTest/java/com/crisiscleanup/core/database/MigrationTest.kt
@@ -16,7 +16,7 @@ class MigrationTest {
     @get:Rule
     val helper = MigrationTestHelper(
         InstrumentationRegistry.getInstrumentation(),
-        CrisisCleanupDatabase::class.java
+        CrisisCleanupDatabase::class.java,
     )
 
     @Test
@@ -32,7 +32,7 @@ class MigrationTest {
         Room.databaseBuilder(
             InstrumentationRegistry.getInstrumentation().targetContext,
             CrisisCleanupDatabase::class.java,
-            TEST_DB
+            TEST_DB,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/database/src/androidTest/java/com/crisiscleanup/core/database/TestUtil.kt b/core/database/src/androidTest/java/com/crisiscleanup/core/database/TestUtil.kt
index 08480a82e..3d6c97e44 100644
--- a/core/database/src/androidTest/java/com/crisiscleanup/core/database/TestUtil.kt
+++ b/core/database/src/androidTest/java/com/crisiscleanup/core/database/TestUtil.kt
@@ -68,7 +68,7 @@ object TestUtil {
         val context = ApplicationProvider.getApplicationContext<Context>()
         return Room.inMemoryDatabaseBuilder(
             context,
-            CrisisCleanupDatabase::class.java
+            CrisisCleanupDatabase::class.java,
         ).build()
     }
 
@@ -76,9 +76,9 @@ object TestUtil {
         val context = ApplicationProvider.getApplicationContext<Context>()
         return Room.inMemoryDatabaseBuilder(
             context,
-            TestCrisisCleanupDatabase::class.java
+            TestCrisisCleanupDatabase::class.java,
         ).build()
     }
 }
 
-fun Instant.isNearNow(duration: Duration = 1.seconds) = Clock.System.now().minus(this) < duration
\ No newline at end of file
+fun Instant.isNearNow(duration: Duration = 1.seconds) = Clock.System.now().minus(this) < duration
diff --git a/core/database/src/androidTest/java/com/crisiscleanup/core/database/WorksiteTestUtil.kt b/core/database/src/androidTest/java/com/crisiscleanup/core/database/WorksiteTestUtil.kt
index 909c06e59..c648f02ab 100644
--- a/core/database/src/androidTest/java/com/crisiscleanup/core/database/WorksiteTestUtil.kt
+++ b/core/database/src/androidTest/java/com/crisiscleanup/core/database/WorksiteTestUtil.kt
@@ -37,4 +37,4 @@ object WorksiteTestUtil {
 
         override fun translate(phraseKey: String) = "$phraseKey-translated"
     }
-}
\ No newline at end of file
+}
diff --git a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/IncidentDaoFormFieldTest.kt b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/IncidentDaoFormFieldTest.kt
index 1c10ccc89..632fb665e 100644
--- a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/IncidentDaoFormFieldTest.kt
+++ b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/IncidentDaoFormFieldTest.kt
@@ -41,7 +41,7 @@ class IncidentDaoFormFieldTest {
                 testFormFieldEntity(23, "field-a"),
                 testFormFieldEntity(23, "field-b"),
                 testFormFieldEntity(23, "field-c"),
-            )
+            ),
         )
 
         val expected1 = listOf(
@@ -66,7 +66,7 @@ class IncidentDaoFormFieldTest {
                 testFormFieldEntity(23, "field-d"),
                 testFormFieldEntity(23, "field-b", label = "label-b"),
                 testFormFieldEntity(23, "field-c"),
-            )
+            ),
         )
         val expected2 = expected1.toMutableList().also {
             it.add(testFormField("field-d"))
@@ -126,4 +126,4 @@ private fun testFormField(fieldKey: String) = IncidentFormField(
     fieldKey = fieldKey,
     parentKey = "",
     selectToggleWorkType = "",
-)
\ No newline at end of file
+)
diff --git a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/IncidentDaoTest.kt b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/IncidentDaoTest.kt
index a1685eebe..f97dde166 100644
--- a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/IncidentDaoTest.kt
+++ b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/IncidentDaoTest.kt
@@ -45,7 +45,7 @@ class IncidentDaoTest {
 
         assertEquals(
             listOf(2L, 1, 3),
-            savedIncidents.map { it.entity.id }
+            savedIncidents.map { it.entity.id },
         )
     }
 
@@ -63,7 +63,7 @@ class IncidentDaoTest {
         for ((incidentId, locationIds) in idMap.entries) {
             for (locationId in locationIds) {
                 incidentCrossRefs.add(
-                    IncidentIncidentLocationCrossRef(incidentId, locationId)
+                    IncidentIncidentLocationCrossRef(incidentId, locationId),
                 )
             }
         }
@@ -82,7 +82,7 @@ class IncidentDaoTest {
                 48L to setOf(15L, 226),
                 18L to setOf(226L, 31),
                 954L to setOf(15L),
-            )
+            ),
         )
         return Triple(incidentLocations, incidents, incidentToIncidentLocations)
     }
@@ -97,7 +97,7 @@ class IncidentDaoTest {
         incidentDaoPlus.saveIncidents(
             incidents,
             incidentLocations,
-            incidentToIncidentLocations
+            incidentToIncidentLocations,
         )
 
         val savedIncidents = incidentDao.streamIncidents().first()
@@ -111,7 +111,7 @@ class IncidentDaoTest {
             ),
             savedIncidents.map { incident ->
                 incident.locations.map(IncidentLocationEntity::id)
-            }
+            },
         )
     }
 
@@ -152,7 +152,7 @@ class IncidentDaoTest {
                 // New incidents
                 phoneIncidentEntity(5, "new-incident"),
                 phoneIncidentEntity(6, "phone-1, phone-2"),
-            )
+            ),
         )
 
         // Assert
@@ -192,11 +192,11 @@ class IncidentDaoTest {
         incidentDaoPlus.saveIncidents(
             incidents,
             incidentLocations,
-            incidentToIncidentLocations
+            incidentToIncidentLocations,
         )
         // Incident without location
         incidentDao.upsertIncidents(
-            listOf(testIncidentEntity(35L, testStartAtSeconds + 11))
+            listOf(testIncidentEntity(35L, testStartAtSeconds + 11)),
         )
 
         // incidentToIncidentLocations IDs
@@ -222,7 +222,7 @@ class IncidentDaoTest {
             mapOf(
                 18L to setOf(31L),
                 35L to setOf(321L, 852),
-            )
+            ),
         )
         incidentDaoPlus.saveIncidents(
             syncingIncidents,
@@ -243,7 +243,7 @@ class IncidentDaoTest {
             ),
             savedIncidents.map { incident ->
                 incident.locations.map(IncidentLocationEntity::id)
-            }
+            },
         )
     }
 
@@ -267,4 +267,4 @@ class IncidentDaoTest {
 fun testIncidentEntity(
     id: Long,
     startAtSeconds: Long,
-) = IncidentEntity(id, Instant.fromEpochSeconds(startAtSeconds), "", "", "")
\ No newline at end of file
+) = IncidentEntity(id, Instant.fromEpochSeconds(startAtSeconds), "", "", "")
diff --git a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/LanguageDaoTest.kt b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/LanguageDaoTest.kt
index c89a707c1..8360d5f61 100644
--- a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/LanguageDaoTest.kt
+++ b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/LanguageDaoTest.kt
@@ -46,17 +46,17 @@ class LanguageDaoTest {
                 key = languages1[0].key,
                 name = languages1[0].name,
                 translationsJson = Json.encodeToString(
-                    mapOf("a" to "b")
+                    mapOf("a" to "b"),
                 ),
                 syncedAt = syncedAt,
-            )
+            ),
         )
 
         languageDaoPlus.saveLanguages(
             listOf(
                 testLanguageEntity("sp-MX", "Spanish Mexico"),
                 testLanguageEntity("en-GB", "British"),
-            )
+            ),
         )
 
         val languages2 = languages1.toMutableList().also {
@@ -70,11 +70,13 @@ class LanguageDaoTest {
                     translations = mapOf("a" to "b"),
                     syncedAt = syncedAt,
                 )
-            } else LanguageTranslations(
-                Language(it.key, it.name),
-                translations = emptyMap(),
-                syncedAt = Instant.fromEpochSeconds(0)
-            )
+            } else {
+                LanguageTranslations(
+                    Language(it.key, it.name),
+                    translations = emptyMap(),
+                    syncedAt = Instant.fromEpochSeconds(0),
+                )
+            }
             assertEquals(expected, translations!!.asExternalModel())
         }
     }
@@ -85,4 +87,4 @@ private fun testLanguageEntity(key: String, name: String) = LanguageTranslationE
     name = name,
     translationsJson = null,
     syncedAt = null,
-)
\ No newline at end of file
+)
diff --git a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/LocationDaoTest.kt b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/LocationDaoTest.kt
index 48d5224a7..45625bc95 100644
--- a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/LocationDaoTest.kt
+++ b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/LocationDaoTest.kt
@@ -30,7 +30,9 @@ class LocationDaoTest {
             LocationEntitySource(1, "Point", listOf(-3.4, 5.1), null),
             LocationEntitySource(2, "Polygon", listOf(-13.4, 55.1, 41.2, -81.2), null),
             LocationEntitySource(
-                3, "MultiPolygon", null,
+                3,
+                "MultiPolygon",
+                null,
                 listOf(
                     listOf(-5.3, 14.5, 82.24, 4.14),
                     listOf(51.28, 42.1, 48.123, -1.88, 6.42, -7.14),
@@ -49,14 +51,16 @@ class LocationDaoTest {
             Location(1, "Point", listOf(-3.4, 5.1), null),
             Location(2, "Polygon", listOf(-13.4, 55.1, 41.2, -81.2), null),
             Location(
-                3, "MultiPolygon", null, listOf(
+                3,
+                "MultiPolygon",
+                null,
+                listOf(
                     listOf(-5.3, 14.5, 82.24, 4.14),
                     listOf(51.28, 42.1, 48.123, -1.88, 6.42, -7.14),
-                )
+                ),
             ),
             Location(5, "Triangle", listOf(-51.342, -9.3413), null),
         )
         assertEquals(expecteds, locations)
-
     }
-}
\ No newline at end of file
+}
diff --git a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorkTypeDaoTest.kt b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorkTypeDaoTest.kt
index dce80532c..070b09e37 100644
--- a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorkTypeDaoTest.kt
+++ b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorkTypeDaoTest.kt
@@ -53,7 +53,7 @@ class WorkTypeDaoTest {
             listOf(
                 testWorkTypeEntity(111),
                 testWorkTypeEntity(112, workType = "work-type-b"),
-            )
+            ),
         )
 
         val workTypeFull = fullWorkTypeEntity(
@@ -88,14 +88,14 @@ class WorkTypeDaoTest {
             listOf(
                 workTypeFull,
                 testWorkTypeEntity(112, workType = "work-type-b"),
-            )
+            ),
         )
 
         workTypeDaoPlus.syncUpsert(
             listOf(
                 testWorkTypeEntity(111, "s", "work-type-a"),
                 testWorkTypeEntity(350, "sa", "wa"),
-            )
+            ),
         )
         val expecteds = listOf(
             // Inserts
diff --git a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorkTypeTransferRequestDaoTest.kt b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorkTypeTransferRequestDaoTest.kt
index 6cfe14975..8993492d8 100644
--- a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorkTypeTransferRequestDaoTest.kt
+++ b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorkTypeTransferRequestDaoTest.kt
@@ -65,7 +65,7 @@ class WorkTypeTransferRequestDaoTest {
                 toOrg = 513,
                 networkId = 593,
                 rejectedAt = updatedAtA,
-                approvedRejectedReason = "rejected"
+                approvedRejectedReason = "rejected",
             ),
             // Update
             testWorkTypeTransferRequestEntity(
@@ -76,7 +76,7 @@ class WorkTypeTransferRequestDaoTest {
                 toOrg = 513,
                 networkId = 93,
                 approvedAt = updatedAtA,
-                approvedRejectedReason = "approved"
+                approvedRejectedReason = "approved",
             ),
             // New, different byOrg
             testWorkTypeTransferRequestEntity(
@@ -104,12 +104,14 @@ class WorkTypeTransferRequestDaoTest {
         ).apply {
             val entityIds = listOf(2L, 3, 7, 8)
             val reasons = listOf("reason", "reason", "reason-new", "reason")
-            addAll(newRequests.mapIndexed { index, entity ->
-                entity.copy(
-                    id = entityIds[index],
-                    reason = reasons[index],
-                )
-            })
+            addAll(
+                newRequests.mapIndexed { index, entity ->
+                    entity.copy(
+                        id = entityIds[index],
+                        reason = reasons[index],
+                    )
+                },
+            )
             sortBy(WorkTypeTransferRequestEntity::id)
         }
         val actual = db.testWorkTypeRequestDao().getEntities(1)
@@ -142,4 +144,4 @@ private fun testWorkTypeTransferRequestEntity(
     approvedAt = approvedAt,
     rejectedAt = rejectedAt,
     approvedRejectedReason = approvedRejectedReason,
-)
\ No newline at end of file
+)
diff --git a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteChangeDaoTest.kt b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteChangeDaoTest.kt
index c6ef5bfa9..879d83e20 100644
--- a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteChangeDaoTest.kt
+++ b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteChangeDaoTest.kt
@@ -88,7 +88,7 @@ class WorksiteChangeDaoTest {
             testWorksiteFlag(
                 0,
                 createdAtA,
-                "reason-a"
+                "reason-a",
             ),
             testWorksiteFlag(
                 33,
@@ -169,7 +169,7 @@ class WorksiteChangeDaoTest {
             testWorksiteFlag(
                 1,
                 createdAtC,
-                "reason-a"
+                "reason-a",
             ),
             // Delete 33 (from full)
             // Insert and map 11 (network ID)
@@ -304,8 +304,11 @@ class WorksiteChangeDaoTest {
 
         var entityIndex = 1L
         val expectedFlags = entityData.flags.map { flag ->
-            if (flag.id <= 0) flag.copy(id = entityIndex++)
-            else flag
+            if (flag.id <= 0) {
+                flag.copy(id = entityIndex++)
+            } else {
+                flag
+            }
         }
         val actualFlags = db.testFlagDao().getEntities(worksiteId)
         assertEquals(expectedFlags, actualFlags)
@@ -316,16 +319,22 @@ class WorksiteChangeDaoTest {
 
         entityIndex = 1
         val expectedNotes = entityData.notes.map { note ->
-            if (note.id <= 0) note.copy(id = entityIndex++)
-            else note
+            if (note.id <= 0) {
+                note.copy(id = entityIndex++)
+            } else {
+                note
+            }
         }
         val actualNotes = db.testNoteDao().getEntities(worksiteId)
         assertEquals(expectedNotes, actualNotes)
 
         entityIndex = 1
         val expectedWorkTypes = entityData.workTypes.map { workType ->
-            if (workType.id <= 0) workType.copy(id = entityIndex++)
-            else workType
+            if (workType.id <= 0) {
+                workType.copy(id = entityIndex++)
+            } else {
+                workType
+            }
         }
         val actualWorkTypes = db.testWorkTypeDao().getEntities(worksiteId)
         assertEquals(expectedWorkTypes, actualWorkTypes)
@@ -511,7 +520,7 @@ class WorksiteChangeDaoTest {
                 0,
                 worksite.networkId,
                 worksite.incidentId,
-            )
+            ),
         )
         db.worksiteDao().insert(entities.core)
         db.worksiteFlagDao().insertIgnore(entities.flags)
@@ -535,8 +544,8 @@ class WorksiteChangeDaoTest {
                     "",
                     "reason-c",
                     "",
-                )
-            )
+                ),
+            ),
         )
         db.worksiteFlagDao().updateNetworkId(21, 221)
 
@@ -551,8 +560,8 @@ class WorksiteChangeDaoTest {
                     createdAtB,
                     false,
                     "note-e",
-                )
-            )
+                ),
+            ),
         )
 
         db.workTypeDao().updateNetworkId(1, 301)
@@ -569,8 +578,8 @@ class WorksiteChangeDaoTest {
                     null,
                     "status-existing",
                     "work-type-existing",
-                )
-            )
+                ),
+            ),
         )
         db.workTypeDao().updateNetworkId(37, 237)
 
@@ -589,7 +598,7 @@ class WorksiteChangeDaoTest {
                         createdAtB,
                         "reason-network-synced-local-deleted",
                         isHighPriority = true,
-                    )
+                    ),
                 )
             },
             workTypes = worksiteFull.workTypes.toMutableList().apply {
@@ -602,7 +611,7 @@ class WorksiteChangeDaoTest {
                         "work-type-c",
                     ),
                 )
-            }
+            },
         )
         /*
          * Flags
@@ -632,17 +641,26 @@ class WorksiteChangeDaoTest {
                 worksiteSynced,
                 worksiteModified.copy(
                     flags = worksiteModified.flags!!.map {
-                        if (it.id == 0L) it.copy(id = 34)
-                        else it
+                        if (it.id == 0L) {
+                            it.copy(id = 34)
+                        } else {
+                            it
+                        }
                     },
                     notes = worksiteModified.notes.mapIndexed { index, note ->
-                        if (note.id == 0L) note.copy(id = index + 63L)
-                        else note
+                        if (note.id == 0L) {
+                            note.copy(id = index + 63L)
+                        } else {
+                            note
+                        }
                     },
                     workTypes = worksiteModified.workTypes.map {
-                        if (it.id == 0L) it.copy(id = 58)
-                        else it
-                    }
+                        if (it.id == 0L) {
+                            it.copy(id = 58)
+                        } else {
+                            it
+                        }
+                    },
                 ),
                 mapOf(
                     1L to 201,
@@ -821,7 +839,6 @@ class WorksiteChangeDaoTest {
         verify(exactly = 0) { appLogger.logException(any()) }
     }
 
-
     /**
      * Establishes initial conditions for [editSyncedWorksite_deleteExistingFlags]
      */
@@ -847,7 +864,7 @@ class WorksiteChangeDaoTest {
                 0,
                 worksite.networkId,
                 worksite.incidentId,
-            )
+            ),
         )
         db.worksiteDao().insert(entities.core)
         db.worksiteFlagDao().insertIgnore(entities.flags)
@@ -874,7 +891,7 @@ class WorksiteChangeDaoTest {
                         createdAtB,
                         "reason-network-synced-local-deleted",
                         isHighPriority = true,
-                    )
+                    ),
                 )
             },
         )
@@ -887,12 +904,18 @@ class WorksiteChangeDaoTest {
             flags = emptyList(),
             formData = worksiteSynced.formData,
             notes = worksiteSynced.notes.mapIndexed { index, note ->
-                if (note.id == 0L) note.copy(id = index + 1L)
-                else note
+                if (note.id == 0L) {
+                    note.copy(id = index + 1L)
+                } else {
+                    note
+                }
             },
             workTypes = worksiteSynced.workTypes.map {
-                if (it.id == 0L) it.copy(id = 1)
-                else it
+                if (it.id == 0L) {
+                    it.copy(id = 1)
+                } else {
+                    it
+                }
             },
         )
 
diff --git a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteChangeTransferDaoTest.kt b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteChangeTransferDaoTest.kt
index 886b3f199..5a9f8fb6a 100644
--- a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteChangeTransferDaoTest.kt
+++ b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteChangeTransferDaoTest.kt
@@ -152,8 +152,8 @@ class WorksiteChangeTransferDaoTest {
                     notes = "notes",
                     reasonT = "reason",
                     requestedAction = "",
-                )
-            )
+                ),
+            ),
         )
         db.worksiteNoteDao().insertIgnoreNote(
             WorksiteNoteEntity(
@@ -164,7 +164,7 @@ class WorksiteChangeTransferDaoTest {
                 createdAt = createdAtA,
                 isSurvivor = false,
                 note = "note",
-            )
+            ),
 
         )
         db.workTypeDao().insertIgnoreWorkType(
@@ -179,7 +179,7 @@ class WorksiteChangeTransferDaoTest {
                 recur = null,
                 status = "status-existing",
                 workType = "work-type-existing",
-            )
+            ),
         )
         db.workTypeDao().updateNetworkId(3, 353)
         db.workTypeDao().updateNetworkId(57, 357)
@@ -205,7 +205,7 @@ class WorksiteChangeTransferDaoTest {
                     syncAttempt = 0,
                     networkId = worksite.networkId,
                     incidentId = worksite.incidentId,
-                )
+                ),
             )
             db.worksiteDao().insert(entities.core)
         }
@@ -326,7 +326,6 @@ class WorksiteChangeTransferDaoTest {
         verify(exactly = 0) { appLogger.logException(any()) }
     }
 
-
     @Test
     fun releaseClaimedUnclaimed() = runTest {
         var workTypeInsertId = 60L
@@ -339,8 +338,9 @@ class WorksiteChangeTransferDaoTest {
                 createdAt = now,
             ),
             workTypes = testWorksite.workTypes.map { workType ->
-                if (workType.orgClaim == null) workType
-                else {
+                if (workType.orgClaim == null) {
+                    workType
+                } else {
                     WorkType(
                         id = workTypeInsertId++,
                         createdAt = now,
@@ -471,4 +471,4 @@ private fun testWorkTypeTransferRequestEntity(
     byOrg = byOrg,
     toOrg = toOrg,
     createdAt = createdAt,
-)
\ No newline at end of file
+)
diff --git a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteChangeUpdateSyncTest.kt b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteChangeUpdateSyncTest.kt
index 44e9f1bd3..4c459d757 100644
--- a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteChangeUpdateSyncTest.kt
+++ b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteChangeUpdateSyncTest.kt
@@ -81,7 +81,7 @@ class WorksiteChangeUpdateSyncTest {
             rootEntity.copy(
                 id = 65,
                 localGlobalUuid = "local-global-uuid-2",
-            )
+            ),
         )
         val changesB = listOf(
             testWorksiteChange(65),
@@ -94,7 +94,7 @@ class WorksiteChangeUpdateSyncTest {
             rootEntity.copy(
                 id = 77,
                 localGlobalUuid = "local-global-uuid-3",
-            )
+            ),
         )
         val changesC = listOf(
             testWorksiteChange(77, archiveAction = WorksiteChangeArchiveAction.Synced),
@@ -127,8 +127,8 @@ class WorksiteChangeUpdateSyncTest {
                     51,
                     createdAtA,
                     "reason-a",
-                )
-            )
+                ),
+            ),
         )
 
         val noteDao = db.worksiteNoteDao()
@@ -140,8 +140,8 @@ class WorksiteChangeUpdateSyncTest {
                     createdAtA,
                     "note-a",
                     localGlobalUuid = "local-global-uuid-2",
-                )
-            )
+                ),
+            ),
         )
 
         val workTypeDao = db.workTypeDao()
@@ -157,7 +157,7 @@ class WorksiteChangeUpdateSyncTest {
                     workType = "work-type-b",
                     worksiteId = 51,
                 ),
-            )
+            ),
         )
 
         val workTypeRequestsDao = db.workTypeTransferRequestDao()
@@ -181,7 +181,7 @@ class WorksiteChangeUpdateSyncTest {
                     "work-type-b",
                     538,
                 ),
-            )
+            ),
         )
 
         worksiteChangeDaoPlus.updateSyncIds(
@@ -196,7 +196,7 @@ class WorksiteChangeUpdateSyncTest {
                 workTypeRequestIdMap = mapOf(
                     "work-type-a" to 524,
                     "work-type-b" to 529,
-                )
+                ),
             ),
         )
 
@@ -298,7 +298,8 @@ class WorksiteChangeUpdateSyncTest {
     @Test
     fun updateSyncChanges_oneFail() = runTest {
         worksiteChangeDaoPlus.updateSyncChanges(
-            51, listOf(testChangeResult(1, isFail = true))
+            51,
+            listOf(testChangeResult(1, isFail = true)),
         )
 
         val actual = db.testWorksiteChangeDao().getEntitiesOrderId(51)
@@ -308,7 +309,7 @@ class WorksiteChangeUpdateSyncTest {
                 1,
                 saveAttempt = 3,
                 saveAttemptAt = actual[0].saveAttemptAt,
-            )
+            ),
         )
         assertEquals(expected, actual)
         actual[0].saveAttemptAt.assertRecentTime()
@@ -317,7 +318,8 @@ class WorksiteChangeUpdateSyncTest {
     @Test
     fun updateSyncChanges_onePartiallySuccessful() = runTest {
         worksiteChangeDaoPlus.updateSyncChanges(
-            51, listOf(testChangeResult(1, isPartiallySuccessful = true))
+            51,
+            listOf(testChangeResult(1, isPartiallySuccessful = true)),
         )
 
         val actual = db.testWorksiteChangeDao().getEntitiesOrderId(51)
@@ -337,7 +339,8 @@ class WorksiteChangeUpdateSyncTest {
     @Test
     fun updateSyncChanges_oneSuccessful() = runTest {
         worksiteChangeDaoPlus.updateSyncChanges(
-            51, listOf(testChangeResult(1, isSuccessful = true))
+            51,
+            listOf(testChangeResult(1, isSuccessful = true)),
         )
 
         val actual = db.testWorksiteChangeDao().getEntitiesOrderId(51)
@@ -426,7 +429,7 @@ class WorksiteChangeUpdateSyncTest {
                 4,
                 saveAttempt = 1,
                 saveAttemptAt = actual[0].saveAttemptAt,
-            )
+            ),
         )
         assertEquals(expected, actual)
         actual[0].saveAttemptAt.assertRecentTime()
@@ -452,7 +455,7 @@ class WorksiteChangeUpdateSyncTest {
                 saveAttempt = 4,
                 saveAttemptAt = actual[0].saveAttemptAt,
             ),
-            testWorksiteChange(77, 9, saveAttempt = 4)
+            testWorksiteChange(77, 9, saveAttempt = 4),
         )
         assertEquals(expected, actual)
         actual[0].saveAttemptAt.assertRecentTime()
@@ -477,7 +480,7 @@ class WorksiteChangeUpdateSyncTest {
                 9,
                 saveAttempt = 5,
                 saveAttemptAt = actual[0].saveAttemptAt,
-            )
+            ),
         )
         assertEquals(expected, actual)
         actual[0].saveAttemptAt.assertRecentTime()
@@ -569,4 +572,4 @@ class WorksiteChangeUpdateSyncTest {
         toOrg = toOrg,
         createdAt = createdAt,
     )
-}
\ No newline at end of file
+}
diff --git a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteDaoTest.kt b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteDaoTest.kt
index c7bf339b0..4ec61b190 100644
--- a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteDaoTest.kt
+++ b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteDaoTest.kt
@@ -429,7 +429,6 @@ fun testWorksiteFullEntity(
     updatedAt = createdAt.plus(99.seconds),
 )
 
-
 // Defines all fields not nullable
 fun testWorksiteShortEntity(
     networkId: Long,
@@ -464,4 +463,4 @@ fun testWorksiteShortEntity(
     svi = 0.548f,
     what3Words = null,
     updatedAt = createdAt.plus(66.seconds),
-)
\ No newline at end of file
+)
diff --git a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteFormDataFlagNoteTest.kt b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteFormDataFlagNoteTest.kt
index d6e8890c7..b190eb417 100644
--- a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteFormDataFlagNoteTest.kt
+++ b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteFormDataFlagNoteTest.kt
@@ -75,7 +75,7 @@ class WorksiteFormDataFlagNoteTest {
                 "form-field-c",
                 value = "doesn't matter",
                 isBoolValue = true,
-                valueBool = false
+                valueBool = false,
             ),
         )
         val syncingFlags = listOf(
@@ -108,8 +108,12 @@ class WorksiteFormDataFlagNoteTest {
 
         val expectedFormDataEntities = listOf(
             WorksiteFormDataEntity(
-                1, "form-field-c", true, "doesn't matter", false
-            )
+                1,
+                "form-field-c",
+                true,
+                "doesn't matter",
+                false,
+            ),
         )
         assertEquals(expectedFormDataEntities, actualPopulatedWorksite.formData)
 
@@ -124,16 +128,28 @@ class WorksiteFormDataFlagNoteTest {
                 "notes-new-a",
                 "reason-new-a",
                 "requested-action-new-a",
-            )
+            ),
         )
         assertEquals(expectedFlagEntities, actualPopulatedWorksite.flags)
 
         val expectedNoteEntities = listOf(
             WorksiteNoteEntity(
-                1, "", 34, 1, updatedAtB, true, "note-new-a"
+                1,
+                "",
+                34,
+                1,
+                updatedAtB,
+                true,
+                "note-new-a",
             ),
             WorksiteNoteEntity(
-                2, "", 45, 1, updatedAtA, false, "note-new-b"
+                2,
+                "",
+                45,
+                1,
+                updatedAtA,
+                false,
+                "note-new-b",
             ),
         )
         assertEquals(expectedNoteEntities, actualPopulatedWorksite.notes)
@@ -184,19 +200,19 @@ class WorksiteFormDataFlagNoteTest {
                 testFormDataEntity(1, "form-field-a"),
                 testFormDataEntity(1, "form-field-b"),
                 testFormDataEntity(1, "form-field-c", isBoolValue = true, valueBool = true),
-            )
+            ),
         )
         db.worksiteFlagDao().insertIgnore(
             listOf(
                 testFlagEntity(11, 1, createdAtA, "flag-a"),
                 testFlagEntity(12, 1, createdAtA, "flag-b"),
-            )
+            ),
         )
         db.worksiteNoteDao().insertIgnore(
             listOf(
                 testNotesEntity(21, 1, createdAtA, "note-a"),
                 testNotesEntity(22, 1, createdAtA, "note-b"),
-            )
+            ),
         )
 
         // Sync
@@ -209,7 +225,7 @@ class WorksiteFormDataFlagNoteTest {
                 "form-field-c",
                 value = "doesn't matter",
                 isBoolValue = true,
-                valueBool = false
+                valueBool = false,
             ),
             // Delete form-field-a
             // New
@@ -322,7 +338,9 @@ class WorksiteFormDataFlagNoteTest {
         val syncingWorksite = testWorksiteEntity(1, 1, "sync-address", updatedAtB)
         val syncingFormData = listOf(
             testFormDataEntity(
-                1, "form-field-a", "doesn't-matter",
+                1,
+                "form-field-a",
+                "doesn't-matter",
                 isBoolValue = true,
                 valueBool = false,
             ),
@@ -489,4 +507,4 @@ internal fun testNotesEntity(
     createdAt = createdAt,
     isSurvivor = isSurvivor,
     note = note,
-)
\ No newline at end of file
+)
diff --git a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteSyncFillTest.kt b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteSyncFillTest.kt
index 18a27d756..8aae73f78 100644
--- a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteSyncFillTest.kt
+++ b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteSyncFillTest.kt
@@ -59,8 +59,7 @@ class WorksiteSyncFillTest {
         worksiteDao.insertRoot(rootB)
         worksiteDao.insertRoot(rootD)
 
-        val coreA = testWorksiteFullEntity(rootA.networkId, incidentId, now, id = rootA.id).copy(
-        )
+        val coreA = testWorksiteFullEntity(rootA.networkId, incidentId, now, id = rootA.id).copy()
         val coreB = coreA.copy(
             id = rootB.id,
             networkId = rootB.networkId,
@@ -91,7 +90,7 @@ class WorksiteSyncFillTest {
                 testWorksiteFlagEntity("reason-b", rootB.id, 35),
                 testWorksiteFlagEntity("reason-c", rootA.id, 36),
                 testWorksiteFlagEntity("reason-d", rootA.id, 37),
-            )
+            ),
         )
 
         formDataDao.upsert(
@@ -99,7 +98,7 @@ class WorksiteSyncFillTest {
                 testWorksiteFormDataEntity(rootA.id, "field-a", "value-a"),
                 testWorksiteFormDataEntity(rootA.id, "field-b", "value-b"),
                 testWorksiteFormDataEntity(rootB.id, "field-c", "value-c"),
-            )
+            ),
         )
 
         noteDao.insertIgnore(
@@ -110,7 +109,7 @@ class WorksiteSyncFillTest {
                 testWorksiteNoteEntity("note-d", rootA.id, 60, 1.hours, 16),
                 testWorksiteNoteEntity("note-e", rootB.id, 61, (-1).hours, 17),
                 testWorksiteNoteEntity("note-f", rootB.id, 62, 1.hours, 18),
-            )
+            ),
         )
 
         workTypeDao.insertIgnore(
@@ -119,7 +118,7 @@ class WorksiteSyncFillTest {
                 testWorkTypeEntity(36, "status-b", "type-b", 26, rootA.id),
                 testWorkTypeEntity(37, "status-c", "type-c", 26, rootA.id),
                 testWorkTypeEntity(38, "status-d", "type-d", 25, rootB.id),
-            )
+            ),
         )
 
         val updateCore = coreA.copy(
@@ -382,4 +381,4 @@ class WorksiteSyncFillTest {
         isSurvivor = false,
         note = note,
     )
-}
\ No newline at end of file
+}
diff --git a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteWorkTypeTest.kt b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteWorkTypeTest.kt
index 6b9adf568..cb598262d 100644
--- a/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteWorkTypeTest.kt
+++ b/core/database/src/androidTest/java/com/crisiscleanup/core/database/dao/WorksiteWorkTypeTest.kt
@@ -83,7 +83,7 @@ class WorksiteWorkTypeTest {
             listOf(
                 testWorkTypeEntity(1, worksiteId = 1, workType = "work-type-a"),
                 testWorkTypeEntity(11, worksiteId = 1, workType = "work-type-b"),
-            )
+            ),
         )
 
         // Sync
@@ -205,7 +205,7 @@ class WorksiteWorkTypeTest {
         )
         assertEquals(
             expectedWorkTypes,
-            actual.asExternalModel(515).worksite.workTypes.sortedBy(WorkType::id)
+            actual.asExternalModel(515).worksite.workTypes.sortedBy(WorkType::id),
         )
 
         actual = worksiteDao.getWorksite(2)
@@ -242,7 +242,7 @@ class WorksiteWorkTypeTest {
                 testWorkTypeEntity(11, worksiteId = 1, workType = "work-type-b"),
                 testWorkTypeEntity(22, worksiteId = 2, workType = "work-type-a"),
                 testWorkTypeEntity(24, worksiteId = 2, workType = "work-type-b"),
-            )
+            ),
         )
 
         // Sync
@@ -320,4 +320,4 @@ class WorksiteWorkTypeTest {
         assertEquals(existingWorksites[1], actual.entity)
         assertEquals(expectedWorkTypes, actual.workTypes)
     }
-}
\ No newline at end of file
+}
diff --git a/core/database/src/androidTest/java/com/crisiscleanup/core/database/model/CaseNumberOrderTest.kt b/core/database/src/androidTest/java/com/crisiscleanup/core/database/model/CaseNumberOrderTest.kt
index aa69441c8..318dcd85a 100644
--- a/core/database/src/androidTest/java/com/crisiscleanup/core/database/model/CaseNumberOrderTest.kt
+++ b/core/database/src/androidTest/java/com/crisiscleanup/core/database/model/CaseNumberOrderTest.kt
@@ -30,4 +30,4 @@ class CaseNumberOrderTest {
             assertEquals(it.second, parseCaseNumberOrder(it.first))
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/database/src/androidTest/java/com/crisiscleanup/core/database/model/CoordinateGridQueryTest.kt b/core/database/src/androidTest/java/com/crisiscleanup/core/database/model/CoordinateGridQueryTest.kt
index cdb267ae3..a504fae73 100644
--- a/core/database/src/androidTest/java/com/crisiscleanup/core/database/model/CoordinateGridQueryTest.kt
+++ b/core/database/src/androidTest/java/com/crisiscleanup/core/database/model/CoordinateGridQueryTest.kt
@@ -36,4 +36,4 @@ class CoordinateGridQueryTest {
             assertTrue(radiiSqr5[i] >= radiiSqr5[i - 1])
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/AndroidManifest.xml b/core/database/src/main/AndroidManifest.xml
index 568741e54..227314eeb 100644
--- a/core/database/src/main/AndroidManifest.xml
+++ b/core/database/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
 <manifest />
\ No newline at end of file
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/DatabaseMigration.kt b/core/database/src/main/java/com/crisiscleanup/core/database/DatabaseMigration.kt
index 0239ad6ba..f49cbea51 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/DatabaseMigration.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/DatabaseMigration.kt
@@ -60,4 +60,4 @@ object DatabaseMigrations {
         ),
     )
     class Schema35To36 : AutoMigrationSpec
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/CaseHistoryDao.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/CaseHistoryDao.kt
index fc505daff..0aaba6731 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/CaseHistoryDao.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/CaseHistoryDao.kt
@@ -31,4 +31,4 @@ interface CaseHistoryDao {
         """,
     )
     fun streamEvents(worksiteId: Long): Flow<List<PopulatedCaseHistoryEvent>>
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/CaseHistoryDaoPlus.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/CaseHistoryDaoPlus.kt
index 03a599224..073a3b99d 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/CaseHistoryDaoPlus.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/CaseHistoryDaoPlus.kt
@@ -22,4 +22,4 @@ class CaseHistoryDaoPlus @Inject constructor(
             historyDao.upsertAttrs(eventAttrs)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/IncidentDao.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/IncidentDao.kt
index f1e114090..b7a1a313d 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/IncidentDao.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/IncidentDao.kt
@@ -31,7 +31,7 @@ interface IncidentDao {
         FROM incidents
         WHERE is_archived==0
         ORDER BY start_at DESC, id DESC
-        """
+        """,
     )
     fun streamIncidents(): Flow<List<PopulatedIncident>>
 
@@ -62,13 +62,13 @@ interface IncidentDao {
         """
         DELETE FROM incident_to_incident_location
         WHERE incident_id IN (:incidentIds)
-        """
+        """,
     )
     suspend fun deleteIncidentLocationCrossRefs(incidentIds: Collection<Long>)
 
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     suspend fun insertIgnoreIncidentLocationCrossRefs(
-        incidentCrossRefs: Collection<IncidentIncidentLocationCrossRef>
+        incidentCrossRefs: Collection<IncidentIncidentLocationCrossRef>,
     )
 
     @Transaction
@@ -77,7 +77,7 @@ interface IncidentDao {
         UPDATE incident_form_fields
         SET is_invalidated=1
         WHERE incident_id=:incidentId
-        """
+        """,
     )
     suspend fun invalidateFormFields(incidentId: Long)
 
@@ -100,7 +100,7 @@ interface IncidentDao {
         FROM incident_fts f
         INNER JOIN incidents i ON f.docid=i.id
         WHERE incident_fts MATCH :query
-        """
+        """,
     )
     fun matchIncidentTokens(query: String): List<PopulatedIncidentIdNameMatchInfo>
 }
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/IncidentDaoPlus.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/IncidentDaoPlus.kt
index acc365174..6de87cf1f 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/IncidentDaoPlus.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/IncidentDaoPlus.kt
@@ -46,4 +46,4 @@ class IncidentDaoPlus @Inject constructor(
             incidents.forEach { updateFormFields(it.first, it.second) }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/IncidentOrganizationDao.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/IncidentOrganizationDao.kt
index d527a6b00..cfbcb7347 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/IncidentOrganizationDao.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/IncidentOrganizationDao.kt
@@ -93,4 +93,4 @@ interface IncidentOrganizationDao {
     @Transaction
     @Query("SELECT id FROM incident_organizations WHERE id=:id")
     fun findOrganization(id: Long): Long?
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/IncidentOrganizationDaoPlus.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/IncidentOrganizationDaoPlus.kt
index 503e69e00..11b9e7f20 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/IncidentOrganizationDaoPlus.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/IncidentOrganizationDaoPlus.kt
@@ -53,4 +53,4 @@ class IncidentOrganizationDaoPlus @Inject constructor(
         organizationsDao.upsert(newOrganizations)
         organizationsDao.insertIgnoreAffiliateOrganization(newAffiliates)
     }
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/LanguageDao.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/LanguageDao.kt
index 8fa68f494..606aca621 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/LanguageDao.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/LanguageDao.kt
@@ -31,10 +31,10 @@ interface LanguageDao {
         """
         INSERT OR IGNORE INTO language_translations(key, name)
         VALUES(:key, :name)
-        """
+        """,
     )
     fun insertIgnoreLanguage(
         key: String,
         name: String,
     )
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/LanguageDaoPlus.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/LanguageDaoPlus.kt
index c110ae903..69e036a83 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/LanguageDaoPlus.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/LanguageDaoPlus.kt
@@ -16,4 +16,4 @@ class LanguageDaoPlus @Inject constructor(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/LocalImageDao.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/LocalImageDao.kt
index 60ebc4ff6..60643e120 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/LocalImageDao.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/LocalImageDao.kt
@@ -45,7 +45,7 @@ interface LocalImageDao {
         UPDATE worksite_local_images
         SET tag=:tag
         WHERE worksite_id=:worksiteId AND local_document_id=:documentId
-        """
+        """,
     )
     fun update(
         worksiteId: Long,
@@ -68,7 +68,7 @@ interface LocalImageDao {
         FROM worksite_local_images
         WHERE worksite_id=:worksiteId
         ORDER BY id ASC
-        """
+        """,
     )
     fun getWorksiteLocalImages(worksiteId: Long): List<PopulatedLocalImageDescription>
 
@@ -82,7 +82,7 @@ interface LocalImageDao {
             GROUP BY worksite_id
             ORDER BY min_id ASC
         )
-        """
+        """,
     )
     fun getUploadImageWorksiteIds(): List<PopulatedWorksiteImageCount>
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/LocalImageDaoPlus.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/LocalImageDaoPlus.kt
index d2d66302c..1d6d1297c 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/LocalImageDaoPlus.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/LocalImageDaoPlus.kt
@@ -62,4 +62,4 @@ class LocalImageDaoPlus @Inject constructor(
             val deletedFileIds = db.networkFileDao().getDeletedPhotoNetworkFileIds(worksiteId)
             Pair(networkWorksiteId, deletedFileIds)
         }
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/LocationDao.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/LocationDao.kt
index e97936590..86f06f130 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/LocationDao.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/LocationDao.kt
@@ -20,4 +20,4 @@ interface LocationDao {
     @Transaction
     @Query("SELECT * FROM locations WHERE id in (:ids)")
     fun getLocations(ids: Collection<Long>): List<PopulatedLocation>
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/LocationDaoPlus.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/LocationDaoPlus.kt
index 3a09d0113..14d93c0f0 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/LocationDaoPlus.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/LocationDaoPlus.kt
@@ -21,12 +21,15 @@ class LocationDaoPlus @Inject constructor(
                         }
                     } ?: ""
                 }
-                if (coordinates.isEmpty()) null
-                else LocationEntity(
-                    id = source.id,
-                    shapeType = source.shapeType,
-                    coordinates = coordinates,
-                )
+                if (coordinates.isEmpty()) {
+                    null
+                } else {
+                    LocationEntity(
+                        id = source.id,
+                        shapeType = source.shapeType,
+                        coordinates = coordinates,
+                    )
+                }
             }
         db.locationDao().upsertLocations(locations)
     }
@@ -37,4 +40,4 @@ data class LocationEntitySource(
     val shapeType: String,
     val coordinates: List<Double>?,
     val multiCoordinates: List<List<Double>>?,
-)
\ No newline at end of file
+)
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/NetworkFileDao.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/NetworkFileDao.kt
index 629a1d362..b8c753a7b 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/NetworkFileDao.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/NetworkFileDao.kt
@@ -26,7 +26,7 @@ interface NetworkFileDao {
             INNER JOIN worksite_to_network_file w ON w.network_file_id=i.id
             WHERE worksite_id=:worksiteId AND is_deleted<>0 AND i.id NOT IN(:keepIds)
         )
-        """
+        """,
     )
     fun deleteDeleted(worksiteId: Long, keepIds: Collection<Long>)
 
@@ -35,7 +35,7 @@ interface NetworkFileDao {
         """
         DELETE FROM worksite_to_network_file
         WHERE worksite_id=:worksiteId AND network_file_id NOT IN(:networkFileIds)
-        """
+        """,
     )
     fun deleteUnspecifiedCrossReferences(worksiteId: Long, networkFileIds: Collection<Long>)
 
@@ -61,7 +61,7 @@ interface NetworkFileDao {
             LEFT JOIN network_file_local_images fi ON f.id=fi.id
             INNER JOIN worksite_to_network_file wf ON f.id=wf.network_file_id
             WHERE worksite_id=:worksiteId AND fi.is_deleted<>0
-        """
+        """,
     )
     fun getDeletedPhotoNetworkFileIds(worksiteId: Long): List<Long>
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/PersonContactDao.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/PersonContactDao.kt
index 6b0e0f734..f518030f3 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/PersonContactDao.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/PersonContactDao.kt
@@ -27,11 +27,11 @@ interface PersonContactDao {
             ON pc.id=o2pc.contact_id
             WHERE o2pc.contact_id IS NULL
         )
-        """
+        """,
     )
     fun trimIncidentOrganizationContacts()
 
     @Transaction
     @Query("SELECT * FROM person_contacts WHERE id=:id")
     fun getContact(id: Long): PopulatedPersonContactOrganization?
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/PersonContactDaoPlus.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/PersonContactDaoPlus.kt
index 76260ca6c..b142d2d38 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/PersonContactDaoPlus.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/PersonContactDaoPlus.kt
@@ -21,4 +21,4 @@ class PersonContactDaoPlus @Inject constructor(
 
         contactDao.upsertPersonOrganizations(personOrganizations)
     }
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/RecentWorksiteDao.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/RecentWorksiteDao.kt
index 688a83cd9..023a0f4fc 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/RecentWorksiteDao.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/RecentWorksiteDao.kt
@@ -19,11 +19,11 @@ interface RecentWorksiteDao {
         ORDER BY viewed_at DESC
         LIMIT :limit
         OFFSET :offset
-        """
+        """,
     )
     fun streamRecentWorksites(
         incidentId: Long,
         limit: Int = 16,
-        offset: Int = 0
+        offset: Int = 0,
     ): Flow<List<PopulatedRecentWorksite>>
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/SyncLogDao.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/SyncLogDao.kt
index 4cbdb149b..6b08c7522 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/SyncLogDao.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/SyncLogDao.kt
@@ -27,4 +27,4 @@ interface SyncLogDao {
     @Transaction
     @Query("DELETE FROM sync_logs WHERE log_time<:minLogTime")
     fun trimOldSyncLogs(minLogTime: Instant = Clock.System.now().minus(14.days))
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorkTypeDao.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorkTypeDao.kt
index e411cb41d..0b340d362 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorkTypeDao.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorkTypeDao.kt
@@ -22,7 +22,7 @@ interface WorkTypeDao {
         recur           =:recur,
         status          =:status
         WHERE worksite_id=:worksiteId AND work_type=:workType
-        """
+        """,
     )
     fun syncUpdateWorkType(
         worksiteId: Long,
@@ -41,7 +41,7 @@ interface WorkTypeDao {
         """
         DELETE FROM work_types
         WHERE worksite_id=:worksiteId AND network_id NOT IN(:networkIds)
-        """
+        """,
     )
     fun syncDeleteUnspecified(worksiteId: Long, networkIds: Collection<Long>)
 
@@ -59,7 +59,7 @@ interface WorkTypeDao {
         SELECT id, network_id
         FROM work_types
         WHERE worksite_id=:worksiteId AND network_id>-1
-        """
+        """,
     )
     fun getNetworkedIdMap(worksiteId: Long): List<PopulatedIdNetworkId>
 
@@ -75,7 +75,7 @@ interface WorkTypeDao {
         UPDATE OR IGNORE work_types
         SET network_id =:networkId
         WHERE id=:id
-        """
+        """,
     )
     fun updateNetworkId(id: Long, networkId: Long)
 
@@ -85,7 +85,7 @@ interface WorkTypeDao {
         UPDATE OR IGNORE work_types
         SET network_id =:networkId
         WHERE worksite_id=:worksiteId AND work_type=:workType
-        """
+        """,
     )
     fun updateNetworkId(worksiteId: Long, workType: String, networkId: Long)
 
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorkTypeStatusDao.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorkTypeStatusDao.kt
index 0f6f49f81..cb1f12e3b 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorkTypeStatusDao.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorkTypeStatusDao.kt
@@ -16,4 +16,4 @@ interface WorkTypeStatusDao {
     @Transaction
     @Query("SELECT status, name, primary_state FROM work_type_statuses ORDER BY list_order ASC")
     fun getStatuses(): List<PopulatedWorkTypeStatus>
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorkTypeTransferRequestDao.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorkTypeTransferRequestDao.kt
index 48b3eaad2..9fbb7b72d 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorkTypeTransferRequestDao.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorkTypeTransferRequestDao.kt
@@ -15,7 +15,7 @@ interface WorkTypeTransferRequestDao {
         """
         DELETE FROM worksite_work_type_requests
         WHERE worksite_id=:worksiteId AND work_type NOT IN(:workTypes) AND network_id>0
-        """
+        """,
     )
     fun syncDeleteUnspecified(worksiteId: Long, workTypes: Set<String>)
 
@@ -24,7 +24,7 @@ interface WorkTypeTransferRequestDao {
         """
         DELETE FROM worksite_work_type_requests
         WHERE worksite_id=:worksiteId AND network_id<=0
-        """
+        """,
     )
     fun deleteUnsynced(worksiteId: Long)
 
@@ -46,7 +46,7 @@ interface WorkTypeTransferRequestDao {
         rejected_at =:rejectedAt,
         approved_rejected_reason=:approvedRejectedReason
         WHERE worksite_id=:worksiteId AND work_type=:workType AND by_org=:byOrg
-        """
+        """,
     )
     fun syncUpdateRequest(
         worksiteId: Long,
@@ -66,12 +66,12 @@ interface WorkTypeTransferRequestDao {
         UPDATE OR IGNORE worksite_work_type_requests
         SET network_id =:networkId
         WHERE worksite_id=:worksiteId AND work_type=:workType AND by_org=:orgId
-        """
+        """,
     )
     fun updateNetworkId(
         worksiteId: Long,
         workType: String,
         orgId: Long,
-        networkId: Long
+        networkId: Long,
     )
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteChangeDao.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteChangeDao.kt
index e2de0a06a..2e30bf7e8 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteChangeDao.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteChangeDao.kt
@@ -29,7 +29,7 @@ interface WorksiteChangeDao {
             save_attempt    =save_attempt+1,
             save_attempt_at =:savedAt
         WHERE id=:id
-        """
+        """,
     )
     fun updateAction(id: Long, action: String, savedAt: Instant = Clock.System.now())
 
@@ -40,7 +40,7 @@ interface WorksiteChangeDao {
         SET save_attempt    =save_attempt+1,
             save_attempt_at =:savedAt
         WHERE id=:id
-        """
+        """,
     )
     fun updateSyncAttempt(id: Long, savedAt: Instant = Clock.System.now())
 
@@ -60,7 +60,7 @@ interface WorksiteChangeDao {
         FROM worksites w
         INNER JOIN (SELECT DISTINCT worksite_id FROM worksite_changes ORDER BY created_at) wc
         ON w.id = wc.worksite_id
-        """
+        """,
     )
     fun streamWorksitesPendingSync(): Flow<List<PopulatedWorksite>>
 
@@ -75,7 +75,7 @@ interface WorksiteChangeDao {
             ORDER BY min_attempt_at ASC, max_created_at ASC
         )
         LIMIT :limit
-        """
+        """,
     )
     fun getWorksitesPendingSync(limit: Int): List<Long>
 
@@ -85,7 +85,7 @@ interface WorksiteChangeDao {
         SELECT COUNT(id)
         FROM worksite_changes
         WHERE worksite_id=:worksiteId AND save_attempt>0
-        """
+        """,
     )
     fun getSaveFailCount(worksiteId: Long): Int
 }
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteChangeDaoPlus.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteChangeDaoPlus.kt
index 989250ba6..ee2543bf5 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteChangeDaoPlus.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteChangeDaoPlus.kt
@@ -67,8 +67,11 @@ class WorksiteChangeDaoPlus @Inject constructor(
         }
 
         val logPostfix = localModifiedAt.epochSeconds.toString()
-        syncLogger.type = if (worksiteChange.isNew) "worksite-new-$logPostfix"
-        else "worksite-update-$worksiteId-$logPostfix"
+        syncLogger.type = if (worksiteChange.isNew) {
+            "worksite-new-$logPostfix"
+        } else {
+            "worksite-update-$worksiteId-$logPostfix"
+        }
 
         db.withTransaction {
             try {
@@ -150,15 +153,21 @@ class WorksiteChangeDaoPlus @Inject constructor(
                         val unsyncedLookup = inserts
                             .mapIndexedNotNull { index, flag ->
                                 val id = insertIds[index]
-                                if (id > 0) Pair(flag.reasonT, id)
-                                else null
+                                if (id > 0) {
+                                    Pair(flag.reasonT, id)
+                                } else {
+                                    null
+                                }
                             }
                             .associate { it.first to it.second }
                         if (unsyncedLookup.isNotEmpty()) {
                             val updatedIds = worksiteUpdatedIds.flags?.map {
                                 val localId = unsyncedLookup[it.reasonT]
-                                if (localId == null || it.id > 0) it
-                                else it.copy(id = localId)
+                                if (localId == null || it.id > 0) {
+                                    it
+                                } else {
+                                    it.copy(id = localId)
+                                }
                             }
                             worksiteUpdatedIds = worksiteUpdatedIds.copy(flags = updatedIds)
                         }
@@ -186,7 +195,7 @@ class WorksiteChangeDaoPlus @Inject constructor(
                                 }
                             }
                             note
-                        }
+                        },
                     )
                     syncLogger.log("Notes. Inserted ${insertNotes.size}.")
                 }
@@ -196,15 +205,21 @@ class WorksiteChangeDaoPlus @Inject constructor(
                     val unsyncedLookup = inserts
                         .mapIndexedNotNull { index, flag ->
                             val id = insertIds[index]
-                            if (id > 0) Pair(flag.workType, id)
-                            else null
+                            if (id > 0) {
+                                Pair(flag.workType, id)
+                            } else {
+                                null
+                            }
                         }
                         .associate { it.first to it.second }
                     if (unsyncedLookup.isNotEmpty()) {
                         val updatedIds = worksiteUpdatedIds.workTypes.map {
                             val localId = unsyncedLookup[it.workTypeLiteral]
-                            if (localId == null || it.id > 0) it
-                            else it.copy(id = localId)
+                            if (localId == null || it.id > 0) {
+                                it
+                            } else {
+                                it.copy(id = localId)
+                            }
                         }
                         worksiteUpdatedIds = worksiteUpdatedIds.copy(workTypes = updatedIds)
                     }
@@ -337,17 +352,20 @@ class WorksiteChangeDaoPlus @Inject constructor(
         ) { workTypeLookup ->
             val requestEntities = requests.mapNotNull {
                 workTypeLookup[it]?.let { workType ->
-                    if (workType.orgClaim == null) null
-                    else WorkTypeTransferRequestEntity(
-                        0,
-                        networkId = -1,
-                        worksiteId = worksite.id,
-                        workType = it,
-                        reason = reason,
-                        byOrg = organizationId,
-                        toOrg = workType.orgClaim!!,
-                        createdAt = localModifiedAt,
-                    )
+                    if (workType.orgClaim == null) {
+                        null
+                    } else {
+                        WorkTypeTransferRequestEntity(
+                            0,
+                            networkId = -1,
+                            worksiteId = worksite.id,
+                            workType = it,
+                            reason = reason,
+                            byOrg = organizationId,
+                            toOrg = workType.orgClaim!!,
+                            createdAt = localModifiedAt,
+                        )
+                    }
                 }
             }
 
@@ -521,8 +539,11 @@ class WorksiteChangeDaoPlus @Inject constructor(
                 if (result.isFail) {
                     worksiteChangeDao.updateSyncAttempt(result.id)
                 } else if (result.isSuccessful || result.isPartiallySuccessful) {
-                    val action = if (result.isSuccessful) WorksiteChangeArchiveAction.Synced
-                    else WorksiteChangeArchiveAction.PartiallySynced
+                    val action = if (result.isSuccessful) {
+                        WorksiteChangeArchiveAction.Synced
+                    } else {
+                        WorksiteChangeArchiveAction.PartiallySynced
+                    }
                     worksiteChangeDao.updateAction(result.id, action.literal)
                 }
             }
@@ -566,4 +587,4 @@ private data class IdNetworkIdMaps(
     val flag: Map<Long, Long> = emptyMap(),
     val note: Map<Long, Long> = emptyMap(),
     val workType: Map<Long, Long> = emptyMap(),
-)
\ No newline at end of file
+)
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteDao.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteDao.kt
index 3ced7d3ec..92355f8cc 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteDao.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteDao.kt
@@ -446,7 +446,6 @@ interface WorksiteDao {
         OFFSET :offset
         """,
     )
-
     fun getTableWorksitesOrderByCounty(
         incidentId: Long,
         limit: Int,
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteDaoPlus.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteDaoPlus.kt
index d4c4f491e..d24e0e1d9 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteDaoPlus.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteDaoPlus.kt
@@ -156,7 +156,6 @@ class WorksiteDaoPlus @Inject constructor(
             files?.let { syncFiles(id, it) }
 
             return@withTransaction true
-
         } else if (!isLocallyModified) {
             if (worksiteDao.getRootCount(
                     id = modifiedAt.id,
@@ -215,7 +214,6 @@ class WorksiteDaoPlus @Inject constructor(
             files?.let { syncFiles(worksiteId, it) }
 
             return@withTransaction true
-
         } else {
             // Resolving changes at this point is not worth the complexity.
             // Defer to worksite (snapshot) changes resolving successfully and completely.
@@ -308,8 +306,11 @@ class WorksiteDaoPlus @Inject constructor(
         )
 
         val worksiteId =
-            if (isUpdated) db.worksiteDao().getWorksiteId(core.networkId)
-            else -1
+            if (isUpdated) {
+                db.worksiteDao().getWorksiteId(core.networkId)
+            } else {
+                -1
+            }
         return@withTransaction Pair(isUpdated, worksiteId)
     }
 
@@ -397,7 +398,7 @@ class WorksiteDaoPlus @Inject constructor(
     ): Int {
         val worksiteDao = db.worksiteDao()
         val isLongitudeOrdered = longitudeLeft < longitudeRight
-        return if (isLongitudeOrdered)
+        return if (isLongitudeOrdered) {
             worksiteDao.getWorksitesCount(
                 incidentId,
                 latitudeSouth,
@@ -405,13 +406,15 @@ class WorksiteDaoPlus @Inject constructor(
                 longitudeLeft,
                 longitudeRight,
             )
-        else worksiteDao.getWorksitesCountLongitudeCrossover(
-            incidentId,
-            latitudeSouth,
-            latitudeNorth,
-            longitudeLeft,
-            longitudeRight,
-        )
+        } else {
+            worksiteDao.getWorksitesCountLongitudeCrossover(
+                incidentId,
+                latitudeSouth,
+                latitudeNorth,
+                longitudeLeft,
+                longitudeRight,
+            )
+        }
     }
 
     suspend fun onSyncEnd(
@@ -425,9 +428,9 @@ class WorksiteDaoPlus @Inject constructor(
             val workTypeChanges = db.workTypeDao().getUnsyncedCount(worksiteId)
             val changes = db.worksiteChangeDao().getChangeCount(worksiteId)
             val hasModification = flagChanges > 0 ||
-                    noteChanges > 0 ||
-                    workTypeChanges > 0 ||
-                    changes > 0
+                noteChanges > 0 ||
+                workTypeChanges > 0 ||
+                changes > 0
             return@withTransaction if (hasModification) {
                 syncLogger.log(
                     "Pending changes on sync end",
@@ -472,8 +475,11 @@ class WorksiteDaoPlus @Inject constructor(
             }
         }
 
-        if (boundsIndex >= remainingBounds.size) emptyList()
-        else remainingBounds.subList(boundsIndex, remainingBounds.size)
+        if (boundsIndex >= remainingBounds.size) {
+            emptyList()
+        } else {
+            remainingBounds.subList(boundsIndex, remainingBounds.size)
+        }
     }
 
     suspend fun loadTableWorksites(
@@ -646,8 +652,10 @@ class WorksiteDaoPlus @Inject constructor(
             val worksite = boundedWorksites[i]
             val entity = worksite.base.entity
             val distance = haversineDistance(
-                latRad, lngRad,
-                entity.latitude.radians, entity.longitude.radians,
+                latRad,
+                lngRad,
+                entity.latitude.radians,
+                entity.longitude.radians,
             )
             withDistance.add(Pair(worksite, distance))
             if (i % strideCount == 0) {
@@ -779,4 +787,4 @@ class WorksiteDaoPlus @Inject constructor(
 
             IncidentIdWorksiteCount(incidentId, totalCount, count)
         }
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteFlagDao.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteFlagDao.kt
index 14d94582e..419a88115 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteFlagDao.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteFlagDao.kt
@@ -21,7 +21,7 @@ interface WorksiteFlagDao {
         notes           =:notes,
         requested_action=:requestedAction
         WHERE worksite_id=:worksiteId AND reason_t=:reasonT
-        """
+        """,
     )
     fun syncUpdateFlag(
         worksiteId: Long,
@@ -39,7 +39,7 @@ interface WorksiteFlagDao {
         """
         DELETE FROM worksite_flags
         WHERE worksite_id=:worksiteId AND reason_t NOT IN(:reasons)
-        """
+        """,
     )
     fun syncDeleteUnspecified(worksiteId: Long, reasons: Collection<String>)
 
@@ -48,7 +48,7 @@ interface WorksiteFlagDao {
         """
         DELETE FROM worksite_flags
         WHERE worksite_id=:worksiteId AND id NOT IN(:ids)
-        """
+        """,
     )
     fun deleteUnspecified(worksiteId: Long, ids: Collection<Long>)
 
@@ -58,7 +58,7 @@ interface WorksiteFlagDao {
         SELECT id, network_id
         FROM worksite_flags
         WHERE worksite_id=:worksiteId AND network_id>-1
-        """
+        """,
     )
     fun getNetworkedIdMap(worksiteId: Long): List<PopulatedIdNetworkId>
 
@@ -74,7 +74,7 @@ interface WorksiteFlagDao {
         UPDATE OR IGNORE worksite_flags
         SET network_id=:networkId
         WHERE id=:id
-        """
+        """,
     )
     fun updateNetworkId(id: Long, networkId: Long)
 
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteFormDataDao.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteFormDataDao.kt
index 0dd52125e..5606372d7 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteFormDataDao.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteFormDataDao.kt
@@ -10,7 +10,7 @@ interface WorksiteFormDataDao {
         """
         DELETE FROM worksite_form_data
         WHERE worksite_id=:worksiteId AND field_key NOT IN(:fieldKeys)
-        """
+        """,
     )
     fun deleteUnspecifiedKeys(worksiteId: Long, fieldKeys: Collection<String>)
 
@@ -20,4 +20,4 @@ interface WorksiteFormDataDao {
     @Transaction
     @Query("SELECT DISTINCT field_key FROM worksite_form_data WHERE worksite_id=:worksiteId")
     fun getDataKeys(worksiteId: Long): List<String>
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteNoteDao.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteNoteDao.kt
index 0cd9a89ca..32c82cc59 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteNoteDao.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteNoteDao.kt
@@ -20,7 +20,7 @@ interface WorksiteNoteDao {
         is_survivor =:isSurvivor,
         note        =:note
         WHERE worksite_id=:worksiteId AND network_id=:networkId AND local_global_uuid=''
-        """
+        """,
     )
     fun syncUpdateNote(
         worksiteId: Long,
@@ -35,7 +35,7 @@ interface WorksiteNoteDao {
         """
         DELETE FROM worksite_notes
         WHERE worksite_id=:worksiteId AND network_id NOT IN(:networkIds)
-        """
+        """,
     )
     fun syncDeleteUnspecified(worksiteId: Long, networkIds: Collection<Long>)
 
@@ -45,7 +45,7 @@ interface WorksiteNoteDao {
         SELECT id, network_id
         FROM worksite_notes
         WHERE worksite_id=:worksiteId AND network_id>-1
-        """
+        """,
     )
     fun getNetworkedIdMap(worksiteId: Long): List<PopulatedIdNetworkId>
 
@@ -59,7 +59,7 @@ interface WorksiteNoteDao {
         SET network_id          =:networkId,
             local_global_uuid   =''
         WHERE id=:id
-        """
+        """,
     )
     fun updateNetworkId(id: Long, networkId: Long)
 
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteSyncStatDao.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteSyncStatDao.kt
index 9ba4384ef..d9124ddbe 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteSyncStatDao.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/WorksiteSyncStatDao.kt
@@ -17,7 +17,7 @@ interface WorksiteSyncStatDao {
         SELECT *
         FROM worksite_sync_stats
         WHERE incident_id==:incidentId
-        """
+        """,
     )
     fun getSyncStats(incidentId: Long): WorksiteSyncStatsEntity?
 
@@ -30,7 +30,7 @@ interface WorksiteSyncStatDao {
         UPDATE OR IGNORE worksite_sync_stats
         SET paged_count=:pagedCount
         WHERE incident_id=:incidentId AND sync_start=:syncStart
-        """
+        """,
     )
     fun updateStatsPaged(
         incidentId: Long,
@@ -49,7 +49,7 @@ interface WorksiteSyncStatDao {
             attempted_counter   =:attemptedCounter,
             app_build_version_code=:appBuildVersionCode
         WHERE incident_id=:incidentId AND sync_start=:syncStart
-        """
+        """,
     )
     fun updateStatsSuccessful(
         incidentId: Long,
@@ -80,7 +80,7 @@ interface WorksiteSyncStatDao {
             center_latitude     =:latitude,
             center_longitude    =:longitude
         WHERE incident_id=:incidentId
-        """
+        """,
     )
     fun setFullSyncCenter(
         incidentId: Long,
@@ -95,10 +95,10 @@ interface WorksiteSyncStatDao {
         UPDATE incident_worksites_full_sync_stats
         SET query_area_radius=:radius
         WHERE incident_id=:incidentId
-        """
+        """,
     )
     fun setFullSyncRadius(
         incidentId: Long,
         radius: Double,
     )
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/fts/IncidentFts.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/fts/IncidentFts.kt
index 1dda734ce..f8311825e 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/fts/IncidentFts.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/fts/IncidentFts.kt
@@ -42,8 +42,8 @@ data class PopulatedIncidentIdNameMatchInfo(
 
     val sortScore by lazy {
         matchInfoInts.okapiBm25Score(0) * 3 +
-                matchInfoInts.okapiBm25Score(1) * 2 +
-                matchInfoInts.okapiBm25Score(2)
+            matchInfoInts.okapiBm25Score(1) * 2 +
+            matchInfoInts.okapiBm25Score(2)
     }
 
     override fun equals(other: Any?): Boolean {
@@ -91,4 +91,4 @@ suspend fun IncidentDaoPlus.getMatchingIncidents(q: String): List<IncidentIdName
                 .sortedByDescending { it.sortScore }
                 .map { it.incident.asExternalModel() }
         }
-    }
\ No newline at end of file
+    }
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/fts/OrganizationFts.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/fts/OrganizationFts.kt
index 81557db5c..e5ae702fc 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/fts/OrganizationFts.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/fts/OrganizationFts.kt
@@ -84,4 +84,4 @@ suspend fun IncidentOrganizationDaoPlus.getMatchingOrganizations(q: String): Lis
                 .sortedByDescending { it.sortScore }
                 .map(PopulatedOrganizationIdNameMatchInfo::idName)
         }
-    }
\ No newline at end of file
+    }
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/dao/fts/WorksiteTextFts.kt b/core/database/src/main/java/com/crisiscleanup/core/database/dao/fts/WorksiteTextFts.kt
index 94e645519..72b933c35 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/dao/fts/WorksiteTextFts.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/dao/fts/WorksiteTextFts.kt
@@ -45,13 +45,13 @@ data class PopulatedWorksiteTextMatchInfo(
 
     val sortScore by lazy {
         matchInfoInts.okapiBm25Score(0) * 0.9 +
-                matchInfoInts.okapiBm25Score(1) +
-                matchInfoInts.okapiBm25Score(2) * 0.8 +
-                matchInfoInts.okapiBm25Score(3) * 0.7 +
-                matchInfoInts.okapiBm25Score(4) * 0.7 +
-                matchInfoInts.okapiBm25Score(5) * 0.9 +
-                matchInfoInts.okapiBm25Score(6) * 0.6 +
-                matchInfoInts.okapiBm25Score(7) * 0.6
+            matchInfoInts.okapiBm25Score(1) +
+            matchInfoInts.okapiBm25Score(2) * 0.8 +
+            matchInfoInts.okapiBm25Score(3) * 0.7 +
+            matchInfoInts.okapiBm25Score(4) * 0.7 +
+            matchInfoInts.okapiBm25Score(5) * 0.9 +
+            matchInfoInts.okapiBm25Score(6) * 0.6 +
+            matchInfoInts.okapiBm25Score(7) * 0.6
     }
 
     override fun equals(other: Any?): Boolean {
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/di/DaoModule.kt b/core/database/src/main/java/com/crisiscleanup/core/database/di/DaoModule.kt
index 3487c1afd..a02788183 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/di/DaoModule.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/di/DaoModule.kt
@@ -66,4 +66,4 @@ object DaoModule {
 
     @Provides
     fun caseHistoryDao(db: CrisisCleanupDatabase) = db.caseHistoryDao()
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/di/DatabaseModule.kt b/core/database/src/main/java/com/crisiscleanup/core/database/di/DatabaseModule.kt
index 3dcea6d4d..a012e8739 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/di/DatabaseModule.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/di/DatabaseModule.kt
@@ -24,7 +24,7 @@ object DatabaseModule {
     ): CrisisCleanupDatabase = Room.databaseBuilder(
         context,
         CrisisCleanupDatabase::class.java,
-        "crisis-cleanup-database"
+        "crisis-cleanup-database",
     ).build()
 
     @Provides
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/BoundedSyncedWorksiteIds.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/BoundedSyncedWorksiteIds.kt
index dd250da0d..315b05ea5 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/BoundedSyncedWorksiteIds.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/BoundedSyncedWorksiteIds.kt
@@ -22,4 +22,4 @@ data class SwNeBounds(
     val north: Double,
     val west: Double,
     val east: Double,
-)
\ No newline at end of file
+)
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/CaseHistoryEventEntity.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/CaseHistoryEventEntity.kt
index 4a72ee006..72edd438b 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/CaseHistoryEventEntity.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/CaseHistoryEventEntity.kt
@@ -20,7 +20,7 @@ import kotlinx.datetime.Instant
     indices = [
         Index(
             value = ["worksite_id", "created_by", "created_at"],
-        )
+        ),
     ],
 )
 data class CaseHistoryEventEntity(
@@ -80,4 +80,4 @@ data class CaseHistoryEventAttrEntity(
     val recipientName: String?,
     @ColumnInfo("recipient_name_t")
     val recipientNameT: String?,
-)
\ No newline at end of file
+)
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/CasesFilter.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/CasesFilter.kt
index 3e959ef05..eec27a69a 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/CasesFilter.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/CasesFilter.kt
@@ -86,7 +86,8 @@ fun CasesFilter.passesFilter(
     if (formDataFilters.isNotEmpty()) {
         if (!formData.any {
                 formDataFilters.contains(it.fieldKey) && it.isBoolValue
-            }) {
+            }
+        ) {
             return false
         }
     }
@@ -148,8 +149,10 @@ internal fun CasesFilter.passes(
     val filterByDistance = latRad != null && lngRad != null && hasDistanceFilter
     val distance = if (filterByDistance) {
         haversineDistance(
-            latRad!!, lngRad!!,
-            worksite.latitude.radians, worksite.longitude.radians,
+            latRad!!,
+            lngRad!!,
+            worksite.latitude.radians,
+            worksite.longitude.radians,
         ).kmToMiles
     } else {
         0.0
@@ -182,4 +185,4 @@ internal fun CasesFilter.passes(
     }
 
     return true
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/CoordinateGridQuery.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/CoordinateGridQuery.kt
index 489a74109..02c53384f 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/CoordinateGridQuery.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/CoordinateGridQuery.kt
@@ -21,7 +21,7 @@ class CoordinateGridQuery(
         for (i in 0 until dimensionCount) {
             for (j in 0 until dimensionCount) {
                 val radiusSqr = (gridCenter - (i + 0.5f)).pow(2) +
-                        (gridCenter - (j + 0.5f)).pow(2)
+                    (gridCenter - (j + 0.5f)).pow(2)
                 cellCoordinates.add(Triple(i, j, radiusSqr))
             }
         }
@@ -38,11 +38,17 @@ class CoordinateGridQuery(
                         (deltaX >= 0 && deltaY == 0 && (a.second + 0.5f) > gridCenter) ||
                         (deltaX < 0 && deltaY > 0) ||
                         (deltaX < 0 && deltaY == 0 && (a.second + 0.5f) < gridCenter)
-                    ) -1
-                    else 1
+                    ) {
+                        -1
+                    } else {
+                        1
+                    }
                     order
-                } else if (a.third < b.third) -1
-                else 1
+                } else if (a.third < b.third) {
+                    -1
+                } else {
+                    1
+                }
             }
             .map { Pair(it.first, it.second) }
 
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/IncidentEntity.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/IncidentEntity.kt
index 4828247d4..4ad95665c 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/IncidentEntity.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/IncidentEntity.kt
@@ -17,8 +17,8 @@ import kotlinx.serialization.json.Json
             value = ["start_at"],
             orders = [Index.Order.DESC],
             name = "idx_newest_to_oldest_incidents",
-        )
-    ]
+        ),
+    ],
 )
 data class IncidentEntity(
     @PrimaryKey
@@ -75,7 +75,7 @@ fun IncidentLocationEntity.asExternalModel() = IncidentLocation(
             value = ["incident_location_id", "incident_id"],
             name = "idx_incident_location_to_incident",
         ),
-    ]
+    ],
 )
 data class IncidentIncidentLocationCrossRef(
     @ColumnInfo("incident_id")
@@ -98,7 +98,7 @@ data class IncidentIncidentLocationCrossRef(
     primaryKeys = ["incident_id", "parent_key", "field_key"],
     indices = [
         Index(value = ["data_group", "parent_key", "list_order"]),
-    ]
+    ],
 )
 data class IncidentFormFieldEntity(
     @ColumnInfo("incident_id")
@@ -149,9 +149,13 @@ fun IncidentFormFieldEntity.asExternalModel(): IncidentFormField {
     val formValues =
         if (valuesJson?.isNotEmpty() == true) Json.decodeFromString<Map<String, String>>(valuesJson) else emptyMap()
     val formValuesDefault =
-        if (formValues.isEmpty() && valuesDefaultJson?.isNotEmpty() == true) Json.decodeFromString<Map<String, String?>>(
-            valuesDefaultJson
-        ) else emptyMap()
+        if (formValues.isEmpty() && valuesDefaultJson?.isNotEmpty() == true) {
+            Json.decodeFromString<Map<String, String?>>(
+                valuesDefaultJson,
+            )
+        } else {
+            emptyMap()
+        }
     return IncidentFormField(
         label = label,
         htmlType = htmlType,
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/LanguageTranslationEntity.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/LanguageTranslationEntity.kt
index b05feae71..fc2d64aea 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/LanguageTranslationEntity.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/LanguageTranslationEntity.kt
@@ -14,4 +14,4 @@ data class LanguageTranslationEntity(
     val translationsJson: String?,
     @ColumnInfo("synced_at", defaultValue = "0")
     val syncedAt: Instant?,
-)
\ No newline at end of file
+)
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/LocationEntity.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/LocationEntity.kt
index af8e9315c..e37694583 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/LocationEntity.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/LocationEntity.kt
@@ -12,8 +12,8 @@ data class LocationEntity(
     val id: Long,
     @ColumnInfo("shape_type", defaultValue = "")
     val shapeType: String,
-    @ColumnInfo(defaultValue = "")
     // Newline delimited sequences of
     //   comma delimited latitude,longitude coordinates
+    @ColumnInfo(defaultValue = "")
     val coordinates: String,
-)
\ No newline at end of file
+)
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/NetworkFileEntity.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/NetworkFileEntity.kt
index 44aba0c0f..d3dc42584 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/NetworkFileEntity.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/NetworkFileEntity.kt
@@ -52,7 +52,7 @@ data class NetworkFileEntity(
     ],
     indices = [
         Index(value = ["network_file_id", "worksite_id"]),
-    ]
+    ],
 )
 data class WorksiteNetworkFileCrossRef(
     @ColumnInfo("worksite_id")
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/NetworkFileLocalImageEntity.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/NetworkFileLocalImageEntity.kt
index 2518e950e..2b000aa4a 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/NetworkFileLocalImageEntity.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/NetworkFileLocalImageEntity.kt
@@ -18,7 +18,7 @@ import androidx.room.PrimaryKey
     ],
     indices = [
         Index("is_deleted"),
-    ]
+    ],
 )
 data class NetworkFileLocalImageEntity(
     @PrimaryKey
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/PersonContactEntity.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/PersonContactEntity.kt
index 135a4d884..88c8785e2 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/PersonContactEntity.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/PersonContactEntity.kt
@@ -46,10 +46,10 @@ fun PersonContactEntity.asExternalModel() = PersonContact(
     ],
     indices = [
         Index(value = ["organization_id", "id"]),
-    ]
+    ],
 )
 data class PersonOrganizationCrossRef(
     val id: Long,
     @ColumnInfo("organization_id")
     val organizationId: Long,
-)
\ No newline at end of file
+)
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedCaseHistoryEvent.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedCaseHistoryEvent.kt
index 58e3171b5..e25c42ddd 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedCaseHistoryEvent.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedCaseHistoryEvent.kt
@@ -39,4 +39,4 @@ fun PopulatedCaseHistoryEvent.asExternalModel(translator: KeyTranslator): CaseHi
             recipientLocationName = recipientLocationName,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedEntityIds.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedEntityIds.kt
index 7f33b763f..fe1f40a2c 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedEntityIds.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedEntityIds.kt
@@ -8,4 +8,4 @@ data class PopulatedIdNetworkId(
     val networkId: Long,
 )
 
-fun List<PopulatedIdNetworkId>.asLookup() = associate { it.id to it.networkId }
\ No newline at end of file
+fun List<PopulatedIdNetworkId>.asLookup() = associate { it.id to it.networkId }
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedFilterDataWorksite.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedFilterDataWorksite.kt
index 0985794e8..02f2cae77 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedFilterDataWorksite.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedFilterDataWorksite.kt
@@ -37,4 +37,4 @@ data class PopulatedFilterDataWorksite(
         base.isFavorite,
         locationAreaBounds,
     )
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedIncident.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedIncident.kt
index 30deca162..fc68d2b3e 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedIncident.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedIncident.kt
@@ -17,9 +17,9 @@ data class PopulatedIncident(
             value = IncidentIncidentLocationCrossRef::class,
             parentColumn = "incident_id",
             entityColumn = "incident_location_id",
-        )
+        ),
     )
-    val locations: List<IncidentLocationEntity>
+    val locations: List<IncidentLocationEntity>,
 )
 
 fun PopulatedIncident.asExternalModel() = with(entity) {
@@ -49,7 +49,7 @@ data class PopulatedFormFieldsIncident(
 
 fun PopulatedFormFieldsIncident.asExternalModel() = entity.asExternalModel().copy(
     formFields = formFields.map(IncidentFormFieldEntity::asExternalModel)
-        .filter { !(it.isInvalidated || it.isDivEnd) }
+        .filter { !(it.isInvalidated || it.isDivEnd) },
 )
 
 data class PopulatedIncidentMatch(
@@ -66,4 +66,4 @@ fun PopulatedIncidentMatch.asExternalModel() = IncidentIdNameType(
     name = name,
     shortName = shortName,
     disasterLiteral = type,
-)
\ No newline at end of file
+)
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedIncidentOrganization.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedIncidentOrganization.kt
index 8a99e713c..da07f8f0f 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedIncidentOrganization.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedIncidentOrganization.kt
@@ -16,7 +16,7 @@ data class PopulatedIncidentOrganization(
             value = OrganizationPrimaryContactCrossRef::class,
             parentColumn = "organization_id",
             entityColumn = "contact_id",
-        )
+        ),
     )
     val primaryContacts: List<PersonContactEntity>,
     @Relation(
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedIncidentSyncStats.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedIncidentSyncStats.kt
index 053d76778..23e108bc2 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedIncidentSyncStats.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedIncidentSyncStats.kt
@@ -15,4 +15,4 @@ data class PopulatedIncidentSyncStats(
     fun isShortSynced() = with(entity) {
         successfulSync != null && pagedCount >= targetCount
     }
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedLocalImage.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedLocalImage.kt
index 9db68be3d..00928a6b2 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedLocalImage.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedLocalImage.kt
@@ -4,4 +4,4 @@ data class PopulatedLocalImageDescription(
     val id: Long,
     val uri: String,
     val tag: String,
-)
\ No newline at end of file
+)
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedLocalWorksite.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedLocalWorksite.kt
index cd8d6e68c..890dfe24d 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedLocalWorksite.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedLocalWorksite.kt
@@ -49,7 +49,7 @@ data class PopulatedLocalWorksite(
             value = WorksiteNetworkFileCrossRef::class,
             parentColumn = "worksite_id",
             entityColumn = "network_file_id",
-        )
+        ),
     )
     val files: List<NetworkFileEntity>,
     @Relation(
@@ -59,7 +59,7 @@ data class PopulatedLocalWorksite(
             value = WorksiteNetworkFileCrossRef::class,
             parentColumn = "worksite_id",
             entityColumn = "network_file_id",
-        )
+        ),
     )
     val fileImages: List<NetworkFileLocalImageEntity>,
     @Relation(
@@ -119,9 +119,11 @@ fun PopulatedLocalWorksite.asExternalModel(
                         if (a.networkId == b.networkId) {
                             if (a.createdAt < b.createdAt) 1 else -1
                         } else {
-                            if (a.networkId < 0) -1
-                            else if (b.networkId < 0) 1
-                            else if (a.networkId > b.networkId) -1 else 1
+                            if (a.networkId < 0) {
+                                -1
+                            } else if (b.networkId < 0) {
+                                1
+                            } else if (a.networkId > b.networkId) -1 else 1
                         }
                     }
                     .map(WorksiteNoteEntity::asExternalModel),
@@ -143,11 +145,11 @@ fun PopulatedLocalWorksite.asExternalModel(
             localImages.map(WorksiteLocalImageEntity::asExternalModel),
             LocalChange(
                 isLocalModified = root.isLocalModified ||
-                        hasImagesPendingDelete ||
-                        localImages.isNotEmpty(),
+                    hasImagesPendingDelete ||
+                    localImages.isNotEmpty(),
                 localModifiedAt = root.localModifiedAt,
                 syncedAt = root.syncedAt,
             ),
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedLocation.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedLocation.kt
index 7c8244da2..f1596c3e0 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedLocation.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedLocation.kt
@@ -26,4 +26,4 @@ fun PopulatedLocation.asExternalModel(): Location {
         coordinates = coordinates,
         multiCoordinates = multiCoordinates,
     )
-}
\ No newline at end of file
+}
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedPersonContactOrganization.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedPersonContactOrganization.kt
index 20ceb01d5..6b6d9f31d 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedPersonContactOrganization.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedPersonContactOrganization.kt
@@ -7,6 +7,7 @@ import androidx.room.Relation
 data class PopulatedPersonContactOrganization(
     @Embedded
     val entity: PersonContactEntity,
+    // Missing cross ref will crash so be flexible
     @Relation(
         parentColumn = "id",
         entityColumn = "id",
@@ -14,8 +15,7 @@ data class PopulatedPersonContactOrganization(
             value = PersonOrganizationCrossRef::class,
             parentColumn = "id",
             entityColumn = "organization_id",
-        )
+        ),
     )
-    // Missing cross ref will crash so be flexible
     val organization: IncidentOrganizationEntity?,
 )
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedRecentWorksite.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedRecentWorksite.kt
index 3c4074f6c..15366932b 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedRecentWorksite.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedRecentWorksite.kt
@@ -12,7 +12,7 @@ data class PopulatedRecentWorksite(
         parentColumn = "id",
         entityColumn = "id",
     )
-    val worksite: WorksiteEntity
+    val worksite: WorksiteEntity,
 )
 
 fun PopulatedRecentWorksite.asSummary(): WorksiteSummary {
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedTableDataWorksite.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedTableDataWorksite.kt
index bd78bdc56..415356496 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedTableDataWorksite.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedTableDataWorksite.kt
@@ -52,6 +52,10 @@ fun List<PopulatedTableDataWorksite>.filter(
                 it.base.isFavorite,
                 locationAreaBounds,
             )
-        ) it else null
+        ) {
+            it
+        } else {
+            null
+        }
     }
 }
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedWorksite.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedWorksite.kt
index c4b5f9dea..13bcfa9ce 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedWorksite.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/PopulatedWorksite.kt
@@ -143,8 +143,8 @@ fun PopulatedWorksiteMapVisual.asExternalModel(isFilteredOut: Boolean = false) =
     isFavorite = favoriteId != null,
     isHighPriority = flags.any {
         it.isHighPriority == true ||
-                it.reasonT == highPriorityFlagLiteral
+            it.reasonT == highPriorityFlagLiteral
     },
     isDuplicate = flags.any { it.reasonT == duplicateFlagLiteral },
     isFilteredOut = isFilteredOut,
-)
\ No newline at end of file
+)
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/RecentWorksiteEntity.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/RecentWorksiteEntity.kt
index 473320629..cb294db8d 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/RecentWorksiteEntity.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/RecentWorksiteEntity.kt
@@ -12,7 +12,7 @@ import kotlinx.datetime.Instant
             parentColumns = ["id"],
             childColumns = ["id"],
             onDelete = ForeignKey.CASCADE,
-        )
+        ),
     ],
     indices = [
         Index(
@@ -23,7 +23,7 @@ import kotlinx.datetime.Instant
             value = ["viewed_at"],
             orders = [Order.DESC],
         ),
-    ]
+    ],
 )
 data class RecentWorksiteEntity(
     @PrimaryKey
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/SyncLogEntity.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/SyncLogEntity.kt
index 0e4ddadd1..867ba5eb2 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/SyncLogEntity.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/SyncLogEntity.kt
@@ -12,8 +12,8 @@ import kotlinx.datetime.Instant
         Index(
             value = ["log_time"],
             orders = [Index.Order.DESC],
-        )
-    ]
+        ),
+    ],
 )
 data class SyncLogEntity(
     @PrimaryKey(true)
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/WorkTypeStatusEntity.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/WorkTypeStatusEntity.kt
index 69437bfc1..65634c982 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/WorkTypeStatusEntity.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/WorkTypeStatusEntity.kt
@@ -9,7 +9,7 @@ import androidx.room.PrimaryKey
     "work_type_statuses",
     indices = [
         Index(value = ["list_order"]),
-    ]
+    ],
 )
 data class WorkTypeStatusEntity(
     @PrimaryKey
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/Worksite.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/Worksite.kt
index 38e3d316c..0d74afd08 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/Worksite.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/Worksite.kt
@@ -116,4 +116,4 @@ data class EditWorksiteEntities(
     val formData: Collection<WorksiteFormDataEntity>,
     val notes: Collection<WorksiteNoteEntity>,
     val workTypes: Collection<WorkTypeEntity>,
-)
\ No newline at end of file
+)
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteChangeEntity.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteChangeEntity.kt
index 64265068e..e707d384e 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteChangeEntity.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteChangeEntity.kt
@@ -22,7 +22,7 @@ import kotlinx.datetime.Instant
             value = ["worksite_id", "save_attempt_at", "created_at"],
             orders = [Order.ASC, Order.ASC, Order.DESC],
         ),
-    ]
+    ],
 )
 data class WorksiteChangeEntity(
     @PrimaryKey(true)
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteEntities.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteEntities.kt
index e202922e9..7f423d7b4 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteEntities.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteEntities.kt
@@ -7,4 +7,4 @@ data class WorksiteEntities(
     val notes: List<WorksiteNoteEntity>,
     val workTypes: List<WorkTypeEntity>,
     val files: List<NetworkFileEntity> = emptyList(),
-)
\ No newline at end of file
+)
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteEntity.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteEntity.kt
index bb71b8bf2..ddf1eb78f 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteEntity.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteEntity.kt
@@ -165,7 +165,8 @@ fun parseCaseNumberOrder(caseNumber: String): Long {
     ],
     indices = [
         Index(
-            value = ["worksite_id", "work_type"], unique = true,
+            value = ["worksite_id", "work_type"],
+            unique = true,
             name = "unique_worksite_work_type",
         ),
         Index(value = ["worksite_id", "network_id"]),
@@ -244,7 +245,8 @@ data class WorksiteFormDataEntity(
     ],
     indices = [
         Index(
-            value = ["worksite_id", "reason_t"], unique = true,
+            value = ["worksite_id", "reason_t"],
+            unique = true,
             name = "unique_worksite_flag",
         ),
         Index(value = ["reason_t"]),
@@ -297,7 +299,8 @@ fun WorksiteFlagEntity.asExternalModel(translator: KeyTranslator? = null) = Work
     ],
     indices = [
         Index(
-            value = ["worksite_id", "network_id", "local_global_uuid"], unique = true,
+            value = ["worksite_id", "network_id", "local_global_uuid"],
+            unique = true,
             name = "unique_worksite_note",
         ),
     ],
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteLocalImageEntity.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteLocalImageEntity.kt
index 0ee69f3ef..1c4f2ef55 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteLocalImageEntity.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteLocalImageEntity.kt
@@ -19,7 +19,7 @@ import com.crisiscleanup.core.model.data.WorksiteLocalImage
     ],
     indices = [
         Index(value = ["worksite_id", "local_document_id"], unique = true),
-    ]
+    ],
 )
 data class WorksiteLocalImageEntity(
     @PrimaryKey(true)
@@ -47,4 +47,4 @@ data class PopulatedWorksiteImageCount(
     @ColumnInfo("worksite_id")
     val id: Long,
     val count: Int,
-)
\ No newline at end of file
+)
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteSyncStatsEntity.kt b/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteSyncStatsEntity.kt
index a438f8a7a..bfde7104c 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteSyncStatsEntity.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/model/WorksiteSyncStatsEntity.kt
@@ -80,10 +80,16 @@ fun IncidentDataSyncStats.asWorksiteSyncStatsEntity() = WorksiteSyncStatsEntity(
     syncStart = syncStart,
     targetCount = dataCount,
     pagedCount = pagedCount,
-    successfulSync = if (syncAttempt.successfulSeconds <= 0) null
-    else Instant.fromEpochSeconds(syncAttempt.successfulSeconds),
-    attemptedSync = if (syncAttempt.attemptedSeconds <= 0) null
-    else Instant.fromEpochSeconds(syncAttempt.attemptedSeconds),
+    successfulSync = if (syncAttempt.successfulSeconds <= 0) {
+        null
+    } else {
+        Instant.fromEpochSeconds(syncAttempt.successfulSeconds)
+    },
+    attemptedSync = if (syncAttempt.attemptedSeconds <= 0) {
+        null
+    } else {
+        Instant.fromEpochSeconds(syncAttempt.attemptedSeconds)
+    },
     attemptedCounter = syncAttempt.attemptedCounter,
     appBuildVersionCode = appBuildVersionCode,
-)
\ No newline at end of file
+)
diff --git a/core/database/src/main/java/com/crisiscleanup/core/database/util/FtsUtil.kt b/core/database/src/main/java/com/crisiscleanup/core/database/util/FtsUtil.kt
index 33e43453e..4e937f72a 100644
--- a/core/database/src/main/java/com/crisiscleanup/core/database/util/FtsUtil.kt
+++ b/core/database/src/main/java/com/crisiscleanup/core/database/util/FtsUtil.kt
@@ -19,7 +19,7 @@ val String.ftsSanitize: String
 
 val String.ftsGlobEnds: String
     get() {
-        return "*${this}*"
+        return "*$this*"
     }
 
 val String.ftsSanitizeAsToken: String
@@ -83,4 +83,4 @@ internal fun Array<Int>.okapiBm25Score(
     }
 
     return score
-}
\ No newline at end of file
+}
diff --git a/core/datastore-test/src/main/java/com/crisiscleanup/core/datastore/test/TestDataStoreModule.kt b/core/datastore-test/src/main/java/com/crisiscleanup/core/datastore/test/TestDataStoreModule.kt
index f69f342f8..fc9422126 100644
--- a/core/datastore-test/src/main/java/com/crisiscleanup/core/datastore/test/TestDataStoreModule.kt
+++ b/core/datastore-test/src/main/java/com/crisiscleanup/core/datastore/test/TestDataStoreModule.kt
@@ -17,14 +17,14 @@ import javax.inject.Singleton
 @Module
 @TestInstallIn(
     components = [SingletonComponent::class],
-    replaces = [DataStoreModule::class]
+    replaces = [DataStoreModule::class],
 )
 object TestDataStoreModule {
     @Provides
     @Singleton
     fun providesUserPreferencesDataStore(
         userPreferencesSerializer: UserPreferencesSerializer,
-        tmpFolder: TemporaryFolder
+        tmpFolder: TemporaryFolder,
     ): DataStore<UserPreferences> =
         tmpFolder.testUserPreferencesDataStore(userPreferencesSerializer)
 
@@ -32,12 +32,12 @@ object TestDataStoreModule {
     @Singleton
     fun providesAccountInfoDataStore(
         serializer: AccountInfoProtoSerializer,
-        tmpFolder: TemporaryFolder
+        tmpFolder: TemporaryFolder,
     ): DataStore<AccountInfo> = tmpFolder.testAccountInfoDataStore(serializer)
 }
 
 fun TemporaryFolder.testUserPreferencesDataStore(
-    userPreferencesSerializer: UserPreferencesSerializer = UserPreferencesSerializer()
+    userPreferencesSerializer: UserPreferencesSerializer = UserPreferencesSerializer(),
 ) = DataStoreFactory.create(
     serializer = userPreferencesSerializer,
 ) {
@@ -45,7 +45,7 @@ fun TemporaryFolder.testUserPreferencesDataStore(
 }
 
 fun TemporaryFolder.testAccountInfoDataStore(
-    serializer: AccountInfoProtoSerializer = AccountInfoProtoSerializer()
+    serializer: AccountInfoProtoSerializer = AccountInfoProtoSerializer(),
 ) = DataStoreFactory.create(
     serializer = serializer,
 ) {
diff --git a/core/datastore/src/main/java/com/crisiscleanup/core/datastore/AccountInfoDataSource.kt b/core/datastore/src/main/java/com/crisiscleanup/core/datastore/AccountInfoDataSource.kt
index dab394859..c46c53550 100644
--- a/core/datastore/src/main/java/com/crisiscleanup/core/datastore/AccountInfoDataSource.kt
+++ b/core/datastore/src/main/java/com/crisiscleanup/core/datastore/AccountInfoDataSource.kt
@@ -22,16 +22,22 @@ class AccountInfoDataSource @Inject constructor(
 ) {
     companion object {
         fun defaultProfilePictureUri(fullName: String): String =
-            if (fullName.isEmpty()) ""
-            else "https://avatars.dicebear.com/api/bottts/$fullName.svg"
+            if (fullName.isEmpty()) {
+                ""
+            } else {
+                "https://avatars.dicebear.com/api/bottts/$fullName.svg"
+            }
     }
 
     val accountData = dataStore.data
         .map {
             val fullName = "${it.firstName} ${it.lastName}".trim()
             val profilePictureUri =
-                if (it.profilePictureUri?.isEmpty() == true) defaultProfilePictureUri(fullName)
-                else it.profilePictureUri
+                if (it.profilePictureUri?.isEmpty() == true) {
+                    defaultProfilePictureUri(fullName)
+                } else {
+                    it.profilePictureUri
+                }
             AccountData(
                 id = it.id,
                 tokenExpiry = Instant.fromEpochSeconds(it.expirySeconds),
diff --git a/core/datastore/src/main/java/com/crisiscleanup/core/datastore/AppMetricsSerializer.kt b/core/datastore/src/main/java/com/crisiscleanup/core/datastore/AppMetricsSerializer.kt
index 87bb529e8..eb1ac8610 100644
--- a/core/datastore/src/main/java/com/crisiscleanup/core/datastore/AppMetricsSerializer.kt
+++ b/core/datastore/src/main/java/com/crisiscleanup/core/datastore/AppMetricsSerializer.kt
@@ -22,4 +22,4 @@ class AppMetricsSerializer @Inject constructor() : Serializer<AppMetrics> {
         // writeTo is already called on the data store background thread
         t.writeTo(output)
     }
-}
\ No newline at end of file
+}
diff --git a/core/datastore/src/main/java/com/crisiscleanup/core/datastore/CasesFiltersDataSource.kt b/core/datastore/src/main/java/com/crisiscleanup/core/datastore/CasesFiltersDataSource.kt
index 0276d6c30..1f50648fc 100644
--- a/core/datastore/src/main/java/com/crisiscleanup/core/datastore/CasesFiltersDataSource.kt
+++ b/core/datastore/src/main/java/com/crisiscleanup/core/datastore/CasesFiltersDataSource.kt
@@ -18,7 +18,7 @@ class CasesFiltersDataSource @Inject constructor(
         if (startSeconds in 1..endSeconds) {
             Pair(
                 Instant.fromEpochSeconds(startSeconds),
-                Instant.fromEpochSeconds(endSeconds)
+                Instant.fromEpochSeconds(endSeconds),
             )
         } else {
             null
@@ -103,4 +103,4 @@ class CasesFiltersDataSource @Inject constructor(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/datastore/src/main/java/com/crisiscleanup/core/datastore/LocalAppMetricsDataSource.kt b/core/datastore/src/main/java/com/crisiscleanup/core/datastore/LocalAppMetricsDataSource.kt
index 7a85eccba..77be34bf8 100644
--- a/core/datastore/src/main/java/com/crisiscleanup/core/datastore/LocalAppMetricsDataSource.kt
+++ b/core/datastore/src/main/java/com/crisiscleanup/core/datastore/LocalAppMetricsDataSource.kt
@@ -55,4 +55,4 @@ class LocalAppMetricsDataSource @Inject constructor(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/datastore/src/main/java/com/crisiscleanup/core/datastore/LocalAppPreferencesDataSource.kt b/core/datastore/src/main/java/com/crisiscleanup/core/datastore/LocalAppPreferencesDataSource.kt
index 57ee98455..5c4fc481b 100644
--- a/core/datastore/src/main/java/com/crisiscleanup/core/datastore/LocalAppPreferencesDataSource.kt
+++ b/core/datastore/src/main/java/com/crisiscleanup/core/datastore/LocalAppPreferencesDataSource.kt
@@ -139,4 +139,4 @@ class LocalAppPreferencesDataSource @Inject constructor(
             it.copy { allowAllAnalytics = allowAll }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/datastore/src/main/java/com/crisiscleanup/core/datastore/SecureDataSource.kt b/core/datastore/src/main/java/com/crisiscleanup/core/datastore/SecureDataSource.kt
index 4eb1718ce..9ac5fe583 100644
--- a/core/datastore/src/main/java/com/crisiscleanup/core/datastore/SecureDataSource.kt
+++ b/core/datastore/src/main/java/com/crisiscleanup/core/datastore/SecureDataSource.kt
@@ -8,7 +8,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
 class SecureDataSource @Inject constructor(
-    @ApplicationContext context: Context
+    @ApplicationContext context: Context,
 ) {
     private val sharedPrefsFile = "crisis-cleanup-secure-prefs"
     private val sharedPreferences: SharedPreferences
@@ -42,4 +42,4 @@ class SecureDataSource @Inject constructor(
 
     val accessToken: String?
         get() = sharedPreferences.getString(accessTokenKey, null)
-}
\ No newline at end of file
+}
diff --git a/core/datastore/src/test/java/com/crisiscleanup/core/datastore/AccountInfoDataSourceTest.kt b/core/datastore/src/test/java/com/crisiscleanup/core/datastore/AccountInfoDataSourceTest.kt
index a3a4c9d0e..991c6b0e0 100644
--- a/core/datastore/src/test/java/com/crisiscleanup/core/datastore/AccountInfoDataSourceTest.kt
+++ b/core/datastore/src/test/java/com/crisiscleanup/core/datastore/AccountInfoDataSourceTest.kt
@@ -84,4 +84,4 @@ class AccountInfoDataSourceTest {
 //        )
 //        assertEquals(expected, subject.accountData.first())
 //    }
-}
\ No newline at end of file
+}
diff --git a/core/datastore/src/test/java/com/crisiscleanup/core/datastore/AccountInfoProtoSerializerTest.kt b/core/datastore/src/test/java/com/crisiscleanup/core/datastore/AccountInfoProtoSerializerTest.kt
index 7c2081848..588da760a 100644
--- a/core/datastore/src/test/java/com/crisiscleanup/core/datastore/AccountInfoProtoSerializerTest.kt
+++ b/core/datastore/src/test/java/com/crisiscleanup/core/datastore/AccountInfoProtoSerializerTest.kt
@@ -15,7 +15,7 @@ class AccountInfoProtoSerializerTest {
             accountInfo {
                 // Default value
             },
-            serializer.defaultValue
+            serializer.defaultValue,
         )
     }
 
@@ -23,4 +23,4 @@ class AccountInfoProtoSerializerTest {
     fun readingInvalidAccountInfo_throwsCorruptionException() = runTest {
         serializer.readFrom(ByteArrayInputStream(byteArrayOf(0)))
     }
-}
\ No newline at end of file
+}
diff --git a/core/datastore/src/test/java/com/crisiscleanup/core/datastore/LocalAppPreferencesDataSourceTest.kt b/core/datastore/src/test/java/com/crisiscleanup/core/datastore/LocalAppPreferencesDataSourceTest.kt
index 6eca2284d..310fe2c46 100644
--- a/core/datastore/src/test/java/com/crisiscleanup/core/datastore/LocalAppPreferencesDataSourceTest.kt
+++ b/core/datastore/src/test/java/com/crisiscleanup/core/datastore/LocalAppPreferencesDataSourceTest.kt
@@ -26,7 +26,7 @@ class LocalAppPreferencesDataSourceTest {
     @Before
     fun setup() {
         subject = LocalAppPreferencesDataSource(
-            tmpFolder.testUserPreferencesDataStore()
+            tmpFolder.testUserPreferencesDataStore(),
         )
     }
 
diff --git a/core/datastore/src/test/java/com/crisiscleanup/core/datastore/UserPreferencesSerializerTest.kt b/core/datastore/src/test/java/com/crisiscleanup/core/datastore/UserPreferencesSerializerTest.kt
index c0ec961b0..e16e2ac26 100644
--- a/core/datastore/src/test/java/com/crisiscleanup/core/datastore/UserPreferencesSerializerTest.kt
+++ b/core/datastore/src/test/java/com/crisiscleanup/core/datastore/UserPreferencesSerializerTest.kt
@@ -15,7 +15,7 @@ class UserPreferencesSerializerTest {
             userPreferences {
                 // Default value
             },
-            userPreferencesSerializer.defaultValue
+            userPreferencesSerializer.defaultValue,
         )
     }
 
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/LocalTranslator.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/LocalTranslator.kt
index e95d49749..1d66cc819 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/LocalTranslator.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/LocalTranslator.kt
@@ -12,4 +12,4 @@ val passThroughTranslator = object : KeyResourceTranslator {
     override fun translate(phraseKey: String, fallbackResId: Int) = phraseKey
 }
 
-val LocalAppTranslator = staticCompositionLocalOf { passThroughTranslator }
\ No newline at end of file
+val LocalAppTranslator = staticCompositionLocalOf { passThroughTranslator }
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/AlertDialog.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/AlertDialog.kt
index 139d9a15c..372749793 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/AlertDialog.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/AlertDialog.kt
@@ -42,7 +42,9 @@ fun CrisisCleanupAlertDialog(
     text: String = "",
     textContent: @Composable () -> Unit = {},
 ) {
-    val titleComposable: @Composable () -> Unit = if (title.isBlank()) titleContent else {
+    val titleComposable: @Composable () -> Unit = if (title.isBlank()) {
+        titleContent
+    } else {
         @Composable {
             Text(
                 title,
@@ -52,10 +54,13 @@ fun CrisisCleanupAlertDialog(
     }
     val textComposable: @Composable () -> Unit = {
         CompositionLocalProvider(
-            LocalTextStyle provides MaterialTheme.typography.bodyLarge
+            LocalTextStyle provides MaterialTheme.typography.bodyLarge,
         ) {
-            if (text.isBlank()) textContent()
-            else Text(text)
+            if (text.isBlank()) {
+                textContent()
+            } else {
+                Text(text)
+            }
         }
     }
 
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/Background.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/Background.kt
index ce285d65a..77b1266c9 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/Background.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/Background.kt
@@ -25,7 +25,7 @@ import com.crisiscleanup.core.designsystem.theme.LocalBackgroundTheme
 @Composable
 fun CrisisCleanupBackground(
     modifier: Modifier = Modifier,
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
     val color = LocalBackgroundTheme.current.color
     val tonalElevation = LocalBackgroundTheme.current.tonalElevation
@@ -62,4 +62,4 @@ fun BackgroundDynamic() {
     CrisisCleanupTheme {
         CrisisCleanupBackground(Modifier.size(100.dp), content = {})
     }
-}
\ No newline at end of file
+}
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/Button.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/Button.kt
index 5a4c2b293..0422dacd2 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/Button.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/Button.kt
@@ -240,7 +240,7 @@ fun CrisisCleanupFab(
     iconContent: @Composable () -> Unit = {},
 ) {
     CompositionLocalProvider(
-        LocalRippleTheme provides if (enabled) LocalRippleTheme.current else NoRippleTheme
+        LocalRippleTheme provides if (enabled) LocalRippleTheme.current else NoRippleTheme,
     ) {
         // TODO Complex conditions below are due to some bug when shape is not a circle.
         //      Container color would not need the condition if elevation changed as expected.
@@ -270,7 +270,7 @@ fun WorkTypeAction(
     onClick: () -> Unit = {},
 ) = CrisisCleanupOutlinedButton(
     // TODO Common dimensions
-    modifier = Modifier.testTag("workTypeAction_${text}").widthIn(100.dp),
+    modifier = Modifier.testTag("workTypeAction_$text").widthIn(100.dp),
     text = text,
     onClick = onClick,
     enabled = enabled,
@@ -322,8 +322,9 @@ fun CrisisCleanupOutlinedButtonPreview() {
     CrisisCleanupTheme {
         CrisisCleanupOutlinedButton(text = "Outlined") {
             Icon(
-                imageVector = CrisisCleanupIcons.ArrowDropDown, contentDescription = null
+                imageVector = CrisisCleanupIcons.ArrowDropDown,
+                contentDescription = null,
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/Checkbox.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/Checkbox.kt
index fffe1fdb8..9a6b2d85f 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/Checkbox.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/Checkbox.kt
@@ -31,7 +31,7 @@ fun CrisisCleanupTextCheckbox(
         Modifier
             .clickable(
                 enabled = enabled && enableToggle,
-                onClick = onToggle
+                onClick = onToggle,
             )
             .then(modifier),
         verticalAlignment = Alignment.CenterVertically,
@@ -56,4 +56,4 @@ fun CrisisCleanupTextCheckbox(
             it()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/CollapsibleIcon.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/CollapsibleIcon.kt
index 79870eb33..200bd1865 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/CollapsibleIcon.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/CollapsibleIcon.kt
@@ -7,7 +7,6 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.testTag
 import com.crisiscleanup.core.designsystem.LocalAppTranslator
 
-
 @Composable
 fun CollapsibleIcon(
     isCollapsed: Boolean,
@@ -15,13 +14,16 @@ fun CollapsibleIcon(
     iconVector: ImageVector,
 ) {
     val translator = LocalAppTranslator.current
-    val translateKey = if (isCollapsed) "actions.collapse_section"
-    else "actions.expand_section"
+    val translateKey = if (isCollapsed) {
+        "actions.collapse_section"
+    } else {
+        "actions.expand_section"
+    }
     val description = translator(translateKey)
         .replace("{section}", sectionTitle)
     Icon(
         imageVector = iconVector,
         contentDescription = description,
-        modifier = Modifier.testTag("collapsibleIcon_${sectionTitle}"),
+        modifier = Modifier.testTag("collapsibleIcon_$sectionTitle"),
     )
 }
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/DatePickerDialog.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/DatePickerDialog.kt
index 0d5992148..f80550c1e 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/DatePickerDialog.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/DatePickerDialog.kt
@@ -82,7 +82,7 @@ fun DateRangePickerDialog(
     val confirmEnabled = remember {
         derivedStateOf {
             datePickerState.selectedStartDateMillis != null &&
-                    datePickerState.selectedEndDateMillis != null
+                datePickerState.selectedEndDateMillis != null
         }
     }
     val translator = LocalAppTranslator.current
@@ -100,7 +100,7 @@ fun DateRangePickerDialog(
             ) {
                 CrisisCleanupIconButton(
                     imageVector = CrisisCleanupIcons.Close,
-                    onClick = { onCloseDialog(selectedMillis) }
+                    onClick = { onCloseDialog(selectedMillis) },
                 )
                 Spacer(modifier = Modifier.weight(1f))
                 CrisisCleanupTextButton(
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/ExplainLocationPermissionDialog.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/ExplainLocationPermissionDialog.kt
index 9592d4397..87dbf509f 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/ExplainLocationPermissionDialog.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/ExplainLocationPermissionDialog.kt
@@ -27,7 +27,7 @@ fun OpenSettingsDialog(
             CrisisCleanupTextButton(
                 text = dismissText,
                 onClick = closeDialog,
-                modifier = Modifier.testTag("ccuAlertDialogDismissBtn")
+                modifier = Modifier.testTag("ccuAlertDialogDismissBtn"),
             )
         },
         confirmButton = {
@@ -40,7 +40,7 @@ fun OpenSettingsDialog(
                     ContextCompat.startActivity(context, intent, null)
                     closeDialog()
                 },
-                modifier = Modifier.testTag("ccuAlertDialogConfirmBtn")
+                modifier = Modifier.testTag("ccuAlertDialogConfirmBtn"),
             )
         },
     )
@@ -63,4 +63,4 @@ fun ExplainLocationPermissionDialog(
             closeDialog = closeDialog,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/FocusSectionSlider.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/FocusSectionSlider.kt
index 081b6ea3f..72544b7ce 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/FocusSectionSlider.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/FocusSectionSlider.kt
@@ -49,7 +49,6 @@ fun FocusSectionSlider(
     pagerState: LazyListState = rememberLazyListState(),
     scrollToSection: (Int) -> Unit = {},
 ) {
-
     val pagerScrollConnection = remember(pagerState) {
         object : NestedScrollConnection {
             override suspend fun onPostFling(consumed: Velocity, available: Velocity): Velocity {
@@ -79,7 +78,6 @@ fun FocusSectionSlider(
                         overflow = TextOverflow.Ellipsis,
                         style = LocalFontStyles.current.header4,
                     )
-
                 } else {
                     val endFillerItemWidth = LocalConfiguration.current.screenWidthDp.dp * 0.8f
                     Spacer(modifier = Modifier.width(endFillerItemWidth))
@@ -126,7 +124,7 @@ fun rememberSectionContentIndexLookup(sectionItemLookup: Map<Int, Int>): Mutable
                 sectionItem = sectionItemLookup,
                 itemSection = itemSectionLookup,
                 sectionItemCount = sectionItemCount,
-            )
+            ),
         )
     }
 }
@@ -337,4 +335,4 @@ class FocusSectionSliderState(
     val onSliderScrollRest: (Int) -> Unit,
     val takeScrollToSection: () -> Boolean,
     val onContentScrollRest: (Int) -> Unit,
-)
\ No newline at end of file
+)
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/HelpDialog.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/HelpDialog.kt
index 8b6a0a219..7be0e6298 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/HelpDialog.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/HelpDialog.kt
@@ -28,8 +28,8 @@ fun HelpRow(
     ) {
         Text(
             text,
-            modifier = Modifier.testTag("helpRowText_${text}"),
-            fontWeight = if (isBold) FontWeight.Bold else null
+            modifier = Modifier.testTag("helpRowText_$text"),
+            fontWeight = if (isBold) FontWeight.Bold else null,
         )
         HelpAction(iconContentDescription, showHelp)
     }
@@ -100,4 +100,4 @@ fun WithHelpDialog(
             hasHtml = hasHtml,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/IconButton.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/IconButton.kt
index 8f88e9a1c..45c40c8f5 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/IconButton.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/IconButton.kt
@@ -46,8 +46,11 @@ fun CrisisCleanupElevatedIconButton(
         elevation = elevation,
         enabled = enabled,
     ) {
-        val cd = if (contentDescriptionResId == 0) contentDescription
-        else stringResource(contentDescriptionResId)
+        val cd = if (contentDescriptionResId == 0) {
+            contentDescription
+        } else {
+            stringResource(contentDescriptionResId)
+        }
         if (iconResId != 0) {
             Icon(
                 painter = painterResource(iconResId),
@@ -73,16 +76,19 @@ fun CrisisCleanupIconButton(
     contentDescription: String = "",
     onClick: () -> Unit = {},
     enabled: Boolean = true,
-    tint: Color = LocalContentColor.current
+    tint: Color = LocalContentColor.current,
 ) {
     IconButton(
         modifier = modifier,
         onClick = onClick,
         enabled = enabled,
     ) {
-        val cd = if (contentDescriptionResId == 0) contentDescription
-        else stringResource(contentDescriptionResId)
-        val iconTint = if(enabled) tint else tint.disabledAlpha()
+        val cd = if (contentDescriptionResId == 0) {
+            contentDescription
+        } else {
+            stringResource(contentDescriptionResId)
+        }
+        val iconTint = if (enabled) tint else tint.disabledAlpha()
         if (iconResId != 0) {
             Icon(
                 painter = painterResource(iconResId),
@@ -108,4 +114,4 @@ fun CrisisCleanupIconButtonPreview() {
         modifier = Modifier.size(48.dp),
         iconResId = R.drawable.ic_cases,
     )
-}
\ No newline at end of file
+}
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/IconTextButton.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/IconTextButton.kt
index f0aa9681d..690088784 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/IconTextButton.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/IconTextButton.kt
@@ -75,4 +75,4 @@ private fun CrisisCleanupIconTextButtonPreview() {
         imageVector = Icons.Default.Image,
         label = "Presses",
     )
-}
\ No newline at end of file
+}
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/LinkifyText.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/LinkifyText.kt
index b264c3684..0064b5a54 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/LinkifyText.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/LinkifyText.kt
@@ -99,4 +99,4 @@ fun LinkifyPhoneEmailText(
         textView,
         Linkify.EMAIL_ADDRESSES or Linkify.PHONE_NUMBERS,
     )
-}
\ No newline at end of file
+}
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/Navigation.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/Navigation.kt
index ad55ca80d..a474c2801 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/Navigation.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/Navigation.kt
@@ -43,7 +43,7 @@ fun RowScope.CrisisCleanupNavigationBarItem(
     selectedIcon: @Composable () -> Unit = icon,
     enabled: Boolean = true,
     label: @Composable (() -> Unit)? = null,
-    alwaysShowLabel: Boolean = true
+    alwaysShowLabel: Boolean = true,
 ) {
     val selectedColor = CrisisCleanupNavigationDefaults.navigationSelectedItemColor()
     val unselectedColor = selectedColor.copy(0.5f)
@@ -61,7 +61,7 @@ fun RowScope.CrisisCleanupNavigationBarItem(
             selectedTextColor = selectedColor,
             unselectedTextColor = unselectedColor,
             indicatorColor = CrisisCleanupNavigationDefaults.navigationIndicatorColor(),
-        )
+        ),
     )
 }
 
@@ -75,14 +75,14 @@ fun RowScope.CrisisCleanupNavigationBarItem(
 @Composable
 fun CrisisCleanupNavigationBar(
     modifier: Modifier = Modifier,
-    content: @Composable RowScope.() -> Unit
+    content: @Composable RowScope.() -> Unit,
 ) {
     NavigationBar(
         modifier = modifier.testTag("appNavBar"),
         containerColor = CrisisCleanupNavigationDefaults.navigationContainerColor(),
         contentColor = CrisisCleanupNavigationDefaults.navigationContentColor(),
         tonalElevation = 0.dp,
-        content = content
+        content = content,
     )
 }
 
@@ -110,7 +110,7 @@ fun CrisisCleanupNavigationRailItem(
     selectedIcon: @Composable () -> Unit = icon,
     enabled: Boolean = true,
     label: @Composable (() -> Unit)? = null,
-    alwaysShowLabel: Boolean = true
+    alwaysShowLabel: Boolean = true,
 ) {
     NavigationRailItem(
         selected = selected,
@@ -126,7 +126,7 @@ fun CrisisCleanupNavigationRailItem(
             selectedTextColor = CrisisCleanupNavigationDefaults.navigationSelectedItemColor(),
             unselectedTextColor = CrisisCleanupNavigationDefaults.navigationContentColor(),
             indicatorColor = CrisisCleanupNavigationDefaults.navigationIndicatorColor(),
-        )
+        ),
     )
 }
 
@@ -142,14 +142,14 @@ fun CrisisCleanupNavigationRailItem(
 fun CrisisCleanupNavigationRail(
     modifier: Modifier = Modifier,
     header: @Composable (ColumnScope.() -> Unit)? = null,
-    content: @Composable ColumnScope.() -> Unit
+    content: @Composable ColumnScope.() -> Unit,
 ) {
     NavigationRail(
         modifier = modifier,
         containerColor = CrisisCleanupNavigationDefaults.navigationContainerColor(),
         contentColor = CrisisCleanupNavigationDefaults.navigationContentColor(),
         header = header,
-        content = content
+        content = content,
     )
 }
 
@@ -158,6 +158,7 @@ fun CrisisCleanupNavigationRail(
  */
 object CrisisCleanupNavigationDefaults {
     private val containerColor = com.crisiscleanup.core.designsystem.theme.navigationContainerColor
+
     @Composable
     fun navigationContainerColor() = containerColor
 
@@ -227,4 +228,4 @@ private fun CrisisCleanupNavigationRailPreview() {
             label = { Text("baa") },
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/ProgressIndicator.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/ProgressIndicator.kt
index ab744a7af..4b71a5b9e 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/ProgressIndicator.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/ProgressIndicator.kt
@@ -59,4 +59,4 @@ fun SmallBusyIndicator(
             .size(size),
         color = color,
     )
-}
\ No newline at end of file
+}
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/RadioButton.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/RadioButton.kt
index 4386ecfa1..f79d27dab 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/RadioButton.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/RadioButton.kt
@@ -61,4 +61,4 @@ fun CrisisCleanupRadioButton(
             it()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/TextArea.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/TextArea.kt
index f9da959ee..d1e07b1fd 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/TextArea.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/TextArea.kt
@@ -42,7 +42,7 @@ fun CrisisCleanupTextArea(
             focusManager.moveFocus(nextDirection)
             onNext?.invoke()
         },
-        onDone = onDone?.let { { onDone() } }
+        onDone = onDone?.let { { onDone() } },
     )
     OutlinedTextField(
         text,
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/TextField.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/TextField.kt
index 1526e22cc..9597ae947 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/TextField.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/TextField.kt
@@ -114,18 +114,21 @@ fun SingleLineTextField(
         onDone = onEnter?.let { { onEnter() } },
     )
     val labelText = if (labelResId == 0) label else stringResource(labelResId)
-    val labelContent: (@Composable (() -> Unit)?) = if (labelText.isBlank()) null
-    else {
+    val labelContent: (@Composable (() -> Unit)?) = if (labelText.isBlank()) {
+        null
+    } else {
         { Text(labelText) }
     }
     val trailingIconContent: (@Composable (() -> Unit)?) =
-        if (value.isEmpty() || trailingIcon == null) null
-        else {
+        if (value.isEmpty() || trailingIcon == null) {
+            null
+        } else {
             { trailingIcon() }
         }
     val placeholderContent: (@Composable (() -> Unit)?) =
-        if (placeholder.isBlank()) null
-        else {
+        if (placeholder.isBlank()) {
+            null
+        } else {
             { Text(placeholder) }
         }
 
@@ -169,7 +172,7 @@ fun SingleLineTextField(
                 focusedIndicatorColor = Color.Transparent,
                 unfocusedIndicatorColor = Color.Transparent,
                 disabledIndicatorColor = Color.Transparent,
-            )
+            ),
         )
     }
 
@@ -289,8 +292,11 @@ fun OutlinedObfuscatingTextField(
     imeAction: ImeAction = ImeAction.Next,
 ) {
     val visualTransformation =
-        if (isObfuscating) PasswordVisualTransformation()
-        else VisualTransformation.None
+        if (isObfuscating) {
+            PasswordVisualTransformation()
+        } else {
+            VisualTransformation.None
+        }
 
     val trailingIcon = @Composable {
         if (value.isNotEmpty()) {
@@ -298,10 +304,16 @@ fun OutlinedObfuscatingTextField(
                 onClick = { onObfuscate?.invoke() },
                 enabled = enabled,
             ) {
-                val icon = if (isObfuscating) CrisisCleanupIcons.Visibility
-                else CrisisCleanupIcons.VisibilityOff
-                val translateKey = if (isObfuscating) "actions.show"
-                else "actions.hide"
+                val icon = if (isObfuscating) {
+                    CrisisCleanupIcons.Visibility
+                } else {
+                    CrisisCleanupIcons.VisibilityOff
+                }
+                val translateKey = if (isObfuscating) {
+                    "actions.show"
+                } else {
+                    "actions.hide"
+                }
                 val iconTestTag = if (isObfuscating) "textFieldShowIcon" else "textFieldHideIcon"
                 val translator = LocalAppTranslator.current
                 Icon(
@@ -331,4 +343,4 @@ fun OutlinedObfuscatingTextField(
         imeAction = imeAction,
         drawOutline = true,
     )
-}
\ No newline at end of file
+}
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/TopAppBar.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/TopAppBar.kt
index 7509dc1db..4bd46c85b 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/TopAppBar.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/TopAppBar.kt
@@ -78,7 +78,7 @@ private fun IconButton(
         Icon(
             imageVector = iconImage,
             contentDescription = contentDescription,
-            tint = MaterialTheme.colorScheme.onSurface
+            tint = MaterialTheme.colorScheme.onSurface,
         )
     }
 }
@@ -95,7 +95,7 @@ private fun StaticDynamicIcon(
             modifier = Modifier.padding(staticIconPadding),
             imageVector = imageIcon,
             contentDescription = contentDescription,
-            tint = MaterialTheme.colorScheme.onSurface
+            tint = MaterialTheme.colorScheme.onSurface,
         )
     } else {
         IconButton(onClick, imageIcon, contentDescription)
@@ -143,7 +143,7 @@ fun CrisisCleanupTopAppBar(
             navigationIcon = navigationContent,
             actions = actionsContent,
             colors = colors,
-            modifier = modifier
+            modifier = modifier,
         )
     } else {
         TopAppBar(
@@ -151,7 +151,7 @@ fun CrisisCleanupTopAppBar(
             navigationIcon = navigationContent,
             actions = actionsContent,
             colors = colors,
-            modifier = modifier
+            modifier = modifier,
         )
     }
 }
@@ -184,7 +184,7 @@ fun TopAppBarBackCancel(
         navigationIcon = navigationContent,
         actions = actionsContent,
         colors = colors,
-        modifier = modifier
+        modifier = modifier,
     )
 }
 
@@ -287,7 +287,7 @@ fun TopAppBarBackCaretAction(
         navigationIcon = navigationContent,
         actions = { },
         colors = colors,
-        modifier = modifier
+        modifier = modifier,
     )
 }
 
@@ -295,7 +295,7 @@ fun TopAppBarBackCaretAction(
 @Composable
 private fun AvatarAttentionBadge(
     isAlert: Boolean,
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
     BadgedBox(
         badge = {
@@ -304,7 +304,7 @@ private fun AvatarAttentionBadge(
                 Modifier
                     .size(16.dp, 16.dp)
                     .offset((-4).dp, 32.dp),
-                containerColor = if (isAlert) avatarAttentionColor else avatarStandardColor
+                containerColor = if (isAlert) avatarAttentionColor else avatarStandardColor,
             )
         },
     ) {
@@ -340,7 +340,7 @@ fun TopAppBarDefault(
                     navIcon,
                     onNavigationClick,
                     navContentDescription,
-                    navIconPadding
+                    navIconPadding,
                 )
             }
         }
@@ -390,7 +390,7 @@ private fun CrisisCleanupTopCenterAppBarPreview() {
         navIcon = CrisisCleanupIcons.Search,
         navContentDescription = "Nav",
         actionIcon = CrisisCleanupIcons.MoreVert,
-        actionIconContentDescription = "Action"
+        actionIconContentDescription = "Action",
     )
 }
 
@@ -403,7 +403,7 @@ private fun CrisisCleanupTopAppBarPreview() {
         navIcon = CrisisCleanupIcons.Search,
         titleResId = android.R.string.untitled,
         actionIcon = CrisisCleanupIcons.MoreVert,
-        actionIconContentDescription = "Action"
+        actionIconContentDescription = "Action",
     )
 }
 
@@ -447,4 +447,4 @@ private fun CrisisCleanupTopAppBarImagePreview() {
 @Composable
 private fun TopAppBarBackPreview() {
     TopBarNavAction()
-}
\ No newline at end of file
+}
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/Background.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/Background.kt
index 903f9bd63..7afc47190 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/Background.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/Background.kt
@@ -11,7 +11,7 @@ import androidx.compose.ui.unit.Dp
 @Immutable
 data class BackgroundTheme(
     val color: Color = Color.Unspecified,
-    val tonalElevation: Dp = Dp.Unspecified
+    val tonalElevation: Dp = Dp.Unspecified,
 )
 
 /**
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/Multipreviews.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/Multipreviews.kt
index b88d4a43a..48d1d9644 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/Multipreviews.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/Multipreviews.kt
@@ -5,4 +5,4 @@ import androidx.compose.ui.tooling.preview.Preview
 
 @Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
 @Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
-annotation class DayNightPreviews
\ No newline at end of file
+annotation class DayNightPreviews
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/StyleModifier.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/StyleModifier.kt
index 788767271..c001dab2f 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/StyleModifier.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/StyleModifier.kt
@@ -42,4 +42,4 @@ fun Modifier.textMessagePadding() = padding(16.dp)
 
 val listItemDropdownMenuOffset = DpOffset(16.dp, 0.dp)
 
-fun Modifier.centerAlignTextFieldLabelOffset() = offset(y = 3.dp)
\ No newline at end of file
+fun Modifier.centerAlignTextFieldLabelOffset() = offset(y = 3.dp)
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/Theme.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/Theme.kt
index d76fa414b..abe36c551 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/Theme.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/Theme.kt
@@ -115,11 +115,11 @@ val DarkColors = darkColorScheme(
 @Composable
 fun CrisisCleanupTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) = CrisisCleanupTheme(
     darkTheme = darkTheme,
     disableDynamicTheming = false,
-    content = content
+    content = content,
 )
 
 /**
@@ -134,7 +134,7 @@ fun CrisisCleanupTheme(
 internal fun CrisisCleanupTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
     disableDynamicTheming: Boolean,
-    content: @Composable () -> Unit
+    content: @Composable () -> Unit,
 ) {
     // Color scheme
     val colorScheme = SingleColors
@@ -155,7 +155,7 @@ internal fun CrisisCleanupTheme(
         MaterialTheme(
             colorScheme = colorScheme,
             typography = AppTypography,
-            content = content
+            content = content,
         )
     }
 }
diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/Type.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/Type.kt
index 84541748a..bbe206ef0 100644
--- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/Type.kt
+++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/theme/Type.kt
@@ -29,57 +29,57 @@ val CrisisCleanupTypographyDefault = CrisisCleanupTypography(
         fontWeight = FontWeight.W700,
         letterSpacing = 0.sp,
         lineHeight = 15.8.sp,
-        fontSize = 16.sp
+        fontSize = 16.sp,
     ),
     accentTextStyle = TextStyle(
         fontFamily = NunitoSans,
         fontWeight = FontWeight.W600,
         letterSpacing = 0.sp,
         lineHeight = 21.82.sp,
-        fontSize = 16.sp
+        fontSize = 16.sp,
     ),
     helpTextStyle = TextStyle(
         fontFamily = NunitoSans,
         fontWeight = FontWeight.W400,
         letterSpacing = 0.sp,
         lineHeight = 16.37.sp,
-        fontSize = 12.sp
+        fontSize = 12.sp,
     ),
     header1 = TextStyle(
         fontFamily = NunitoSans,
         fontWeight = FontWeight.W700,
         letterSpacing = 0.sp,
         lineHeight = 28.7.sp,
-        fontSize = 24.sp
+        fontSize = 24.sp,
     ),
     header2 = TextStyle(
         fontFamily = NunitoSans,
         fontWeight = FontWeight.W700,
         letterSpacing = 0.sp,
         lineHeight = 27.28.sp,
-        fontSize = 20.sp
+        fontSize = 20.sp,
     ),
     header3 = TextStyle(
         fontFamily = NunitoSans,
         fontWeight = FontWeight.W700,
         letterSpacing = 0.sp,
         lineHeight = 24.55.sp,
-        fontSize = 18.sp
+        fontSize = 18.sp,
     ),
     header4 = TextStyle(
         fontFamily = NunitoSans,
         fontWeight = FontWeight.W700,
         letterSpacing = 0.sp,
         lineHeight = 18.sp,
-        fontSize = 16.sp
+        fontSize = 16.sp,
     ),
     header5 = TextStyle(
         fontFamily = NunitoSans,
         fontWeight = FontWeight.W700,
         letterSpacing = 0.sp,
         lineHeight = 16.sp,
-        fontSize = 14.sp
-    )
+        fontSize = 14.sp,
+    ),
 )
 
 val LocalFontStyles = staticCompositionLocalOf { CrisisCleanupTypographyDefault }
@@ -90,104 +90,104 @@ internal val AppTypography = Typography(
         fontWeight = FontWeight.Medium,
         letterSpacing = 0.sp,
         lineHeight = 20.sp,
-        fontSize = 14.sp
+        fontSize = 14.sp,
     ),
     labelMedium = TextStyle(
         fontFamily = Roboto,
         fontWeight = FontWeight.Medium,
         letterSpacing = 0.10000000149011612.sp,
         lineHeight = 16.sp,
-        fontSize = 12.sp
+        fontSize = 12.sp,
     ),
     labelSmall = TextStyle(
         fontFamily = Roboto,
         fontWeight = FontWeight.Medium,
         letterSpacing = 0.10000000149011612.sp,
         lineHeight = 16.sp,
-        fontSize = 11.sp
+        fontSize = 11.sp,
     ),
     bodyLarge = TextStyle(
         fontFamily = NunitoSans,
         fontWeight = FontWeight.W400,
         letterSpacing = 0.sp,
         lineHeight = 21.82.sp,
-        fontSize = 16.sp
+        fontSize = 16.sp,
     ),
     bodyMedium = TextStyle(
         fontFamily = Roboto,
         fontWeight = FontWeight.W400,
         letterSpacing = 0.sp,
         lineHeight = 20.sp,
-        fontSize = 14.sp
+        fontSize = 14.sp,
     ),
     bodySmall = TextStyle(
         fontFamily = NunitoSans,
         fontWeight = FontWeight.W400,
         letterSpacing = 0.10000000149011612.sp,
         lineHeight = 16.8.sp,
-        fontSize = 14.sp
+        fontSize = 14.sp,
     ),
     headlineLarge = TextStyle(
         fontFamily = Roboto,
         fontWeight = FontWeight.W400,
         letterSpacing = 0.sp,
         lineHeight = 40.sp,
-        fontSize = 32.sp
+        fontSize = 32.sp,
     ),
     headlineMedium = TextStyle(
         fontFamily = Roboto,
         fontWeight = FontWeight.W400,
         letterSpacing = 0.sp,
         lineHeight = 36.sp,
-        fontSize = 28.sp
+        fontSize = 28.sp,
     ),
     headlineSmall = TextStyle(
         fontFamily = Roboto,
         fontWeight = FontWeight.W400,
         letterSpacing = 0.sp,
         lineHeight = 32.sp,
-        fontSize = 24.sp
+        fontSize = 24.sp,
     ),
     displayLarge = TextStyle(
         fontFamily = Roboto,
         fontWeight = FontWeight.W400,
         letterSpacing = 0.sp,
         lineHeight = 64.sp,
-        fontSize = 57.sp
+        fontSize = 57.sp,
     ),
     displayMedium = TextStyle(
         fontFamily = Roboto,
         fontWeight = FontWeight.W400,
         letterSpacing = 0.sp,
         lineHeight = 52.sp,
-        fontSize = 45.sp
+        fontSize = 45.sp,
     ),
     displaySmall = TextStyle(
         fontFamily = Roboto,
         fontWeight = FontWeight.W400,
         letterSpacing = 0.sp,
         lineHeight = 44.sp,
-        fontSize = 36.sp
+        fontSize = 36.sp,
     ),
     titleLarge = TextStyle(
         fontFamily = Roboto,
         fontWeight = FontWeight.W400,
         letterSpacing = 0.sp,
         lineHeight = 28.sp,
-        fontSize = 22.sp
+        fontSize = 22.sp,
     ),
     titleMedium = TextStyle(
         fontFamily = Roboto,
         fontWeight = FontWeight.Medium,
         letterSpacing = 0.sp,
         lineHeight = 24.sp,
-        fontSize = 16.sp
+        fontSize = 16.sp,
     ),
     titleSmall = TextStyle(
         fontFamily = Roboto,
         fontWeight = FontWeight.Medium,
         letterSpacing = 0.sp,
         lineHeight = 20.sp,
-        fontSize = 14.sp
+        fontSize = 14.sp,
     ),
-)
\ No newline at end of file
+)
diff --git a/core/designsystem/src/main/res/font/nunito_sans_bold.xml b/core/designsystem/src/main/res/font/nunito_sans_bold.xml
index 49aa8baa9..518b340e1 100644
--- a/core/designsystem/src/main/res/font/nunito_sans_bold.xml
+++ b/core/designsystem/src/main/res/font/nunito_sans_bold.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <font-family xmlns:app="http://schemas.android.com/apk/res-auto"
         app:fontProviderAuthority="com.google.android.gms.fonts"
         app:fontProviderPackage="com.google.android.gms"
diff --git a/core/designsystem/src/main/res/font/nunito_sans_bold_italic.xml b/core/designsystem/src/main/res/font/nunito_sans_bold_italic.xml
index 9d371f5f1..99927de8a 100644
--- a/core/designsystem/src/main/res/font/nunito_sans_bold_italic.xml
+++ b/core/designsystem/src/main/res/font/nunito_sans_bold_italic.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <font-family xmlns:app="http://schemas.android.com/apk/res-auto"
         app:fontProviderAuthority="com.google.android.gms.fonts"
         app:fontProviderPackage="com.google.android.gms"
diff --git a/core/designsystem/src/main/res/font/nunito_sans_family.xml b/core/designsystem/src/main/res/font/nunito_sans_family.xml
index 899f713dc..4b5a4d6b7 100644
--- a/core/designsystem/src/main/res/font/nunito_sans_family.xml
+++ b/core/designsystem/src/main/res/font/nunito_sans_family.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <font-family xmlns:android="http://schemas.android.com/apk/res/android">
     <font
         android:font="@font/nunito_sans"
diff --git a/core/designsystem/src/main/res/values/colors.xml b/core/designsystem/src/main/res/values/colors.xml
index 60b08d5c1..6900fd5c7 100644
--- a/core/designsystem/src/main/res/values/colors.xml
+++ b/core/designsystem/src/main/res/values/colors.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="primary_blue">#009BFF</color>
 </resources>
\ No newline at end of file
diff --git a/core/designsystem/src/main/res/values/font_certs.xml b/core/designsystem/src/main/res/values/font_certs.xml
index d2226ac01..fe71e3295 100644
--- a/core/designsystem/src/main/res/values/font_certs.xml
+++ b/core/designsystem/src/main/res/values/font_certs.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <array name="com_google_android_gms_fonts_certs">
         <item>@array/com_google_android_gms_fonts_certs_dev</item>
diff --git a/core/designsystem/src/main/res/values/preloaded_fonts.xml b/core/designsystem/src/main/res/values/preloaded_fonts.xml
index 9ed9b795b..c820bcbf3 100644
--- a/core/designsystem/src/main/res/values/preloaded_fonts.xml
+++ b/core/designsystem/src/main/res/values/preloaded_fonts.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <array name="preloaded_fonts" translatable="false">
         <item>@font/nunito_sans</item>
diff --git a/core/designsystem/src/main/res/values/styles.xml b/core/designsystem/src/main/res/values/styles.xml
index 57414a340..85c1e9f77 100644
--- a/core/designsystem/src/main/res/values/styles.xml
+++ b/core/designsystem/src/main/res/values/styles.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <style name="link_text_style">
diff --git a/core/domain/src/main/java/com/crisiscleanup/core/domain/LoadIncidentDataUseCase.kt b/core/domain/src/main/java/com/crisiscleanup/core/domain/LoadIncidentDataUseCase.kt
index a35b34bbe..cd2fa1b4f 100644
--- a/core/domain/src/main/java/com/crisiscleanup/core/domain/LoadIncidentDataUseCase.kt
+++ b/core/domain/src/main/java/com/crisiscleanup/core/domain/LoadIncidentDataUseCase.kt
@@ -40,8 +40,11 @@ class LoadIncidentDataUseCase @Inject constructor(
 
         incidentSelector.setIncident(incident)
 
-        if (incident.id == EmptyIncident.id) IncidentsData.Empty
-        else IncidentsData.Incidents(incidents)
+        if (incident.id == EmptyIncident.id) {
+            IncidentsData.Empty
+        } else {
+            IncidentsData.Incidents(incidents)
+        }
     }.shareIn(
         scope = coroutineScope,
         started = SharingStarted.WhileSubscribed(1_000),
@@ -77,4 +80,4 @@ object LoadIncidentsDataModule {
         appPreferencesRepository,
         coroutineScope,
     )
-}
\ No newline at end of file
+}
diff --git a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/CrisisCleanupLocationBoundsConverter.kt b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/CrisisCleanupLocationBoundsConverter.kt
index e745731d7..16e879ddb 100644
--- a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/CrisisCleanupLocationBoundsConverter.kt
+++ b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/CrisisCleanupLocationBoundsConverter.kt
@@ -16,4 +16,4 @@ class CrisisCleanupLocationBoundsConverter @Inject constructor() : LocationBound
                 incidentBounds.containsLocation(LatLng(latitude, longitude))
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/MapCaseDotProvider.kt b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/MapCaseDotProvider.kt
index cb61ccfe7..d9652270a 100644
--- a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/MapCaseDotProvider.kt
+++ b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/MapCaseDotProvider.kt
@@ -171,4 +171,4 @@ private data class DotCacheKey(
     val statusClaim: WorkTypeStatusClaim,
     val isDuplicate: Boolean = false,
     val isFilteredOut: Boolean = false,
-)
\ No newline at end of file
+)
diff --git a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/MapCaseIconProvider.kt b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/MapCaseIconProvider.kt
index 9c4bbf7bb..13728bd0c 100644
--- a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/MapCaseIconProvider.kt
+++ b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/MapCaseIconProvider.kt
@@ -29,4 +29,4 @@ interface MapCaseIconProvider {
         isDuplicate: Boolean = false,
         isFilteredOut: Boolean = false,
     ): Bitmap?
-}
\ No newline at end of file
+}
diff --git a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/MapMarkerIconProvider.kt b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/MapMarkerIconProvider.kt
index 1d1dee3f4..89c72c4d2 100644
--- a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/MapMarkerIconProvider.kt
+++ b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/MapMarkerIconProvider.kt
@@ -12,7 +12,7 @@ import javax.inject.Singleton
 interface DrawableResourceBitmapProvider {
     fun getIcon(
         @DrawableRes drawableResId: Int,
-        whDpDimensions: Pair<Float, Float>
+        whDpDimensions: Pair<Float, Float>,
     ): BitmapDescriptor
 }
 
@@ -69,4 +69,4 @@ class CrisisCleanupDrawableResourceBitmapProvider @Inject constructor(
 
         return output
     }
-}
\ No newline at end of file
+}
diff --git a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/MapsIncidentBoundsProvider.kt b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/MapsIncidentBoundsProvider.kt
index 8f037f2e1..cf71d5bf1 100644
--- a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/MapsIncidentBoundsProvider.kt
+++ b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/MapsIncidentBoundsProvider.kt
@@ -50,8 +50,11 @@ class MapsIncidentBoundsProvider @Inject constructor(
 
     private suspend fun publishIds(id: Long, add: Boolean) {
         val copyIds = mappingBoundsIncidentIds.first().toMutableSet()
-        if (add) copyIds.add(id)
-        else copyIds.remove(id)
+        if (add) {
+            copyIds.add(id)
+        } else {
+            copyIds.remove(id)
+        }
         mappingBoundsIncidentIds.emit(copyIds)
     }
 
@@ -113,4 +116,4 @@ private data class CacheEntry(
     val bounds: IncidentBounds,
     val locationIds: Set<Long>,
     val timestamp: Instant,
-)
\ No newline at end of file
+)
diff --git a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/WorkTypeIconProvider.kt b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/WorkTypeIconProvider.kt
index 2ba2ea677..39ae01a84 100644
--- a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/WorkTypeIconProvider.kt
+++ b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/WorkTypeIconProvider.kt
@@ -172,9 +172,13 @@ class WorkTypeIconProvider @Inject constructor(
     }
 
     private fun drawIcon(cacheKey: WorkTypeIconCacheKey): Bitmap {
-        val iconResId = if (cacheKey.isFavorite) statusIcons[Favorite]!!
-        else if (cacheKey.isImportant) statusIcons[Important]!!
-        else statusIcons[cacheKey.workType] ?: R.drawable.ic_work_type_unknown
+        val iconResId = if (cacheKey.isFavorite) {
+            statusIcons[Favorite]!!
+        } else if (cacheKey.isImportant) {
+            statusIcons[Important]!!
+        } else {
+            statusIcons[cacheKey.workType] ?: R.drawable.ic_work_type_unknown
+        }
 
         val drawable = resourceProvider.getDrawable(iconResId)
         val output = Bitmap.createBitmap(
@@ -318,4 +322,4 @@ private data class WorkTypeIconCacheKey(
     val isImportant: Boolean = false,
     val isDuplicate: Boolean = false,
     val isFilteredOut: Boolean = false,
-)
\ No newline at end of file
+)
diff --git a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/di/MapMarkerModule.kt b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/di/MapMarkerModule.kt
index 7e9c2588d..4c0cffae4 100644
--- a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/di/MapMarkerModule.kt
+++ b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/di/MapMarkerModule.kt
@@ -22,16 +22,16 @@ interface MapMarkerModule {
     @Singleton
     @Binds
     fun bindsBitmapIconProvider(
-        provider: CrisisCleanupDrawableResourceBitmapProvider
+        provider: CrisisCleanupDrawableResourceBitmapProvider,
     ): DrawableResourceBitmapProvider
 
     @Binds
     fun bindsIncidentBoundsProvider(
-        calculator: MapsIncidentBoundsProvider
+        calculator: MapsIncidentBoundsProvider,
     ): IncidentBoundsProvider
 
     @Binds
     fun bindsLocationBoundsConverter(
-        converter: CrisisCleanupLocationBoundsConverter
+        converter: CrisisCleanupLocationBoundsConverter,
     ): LocationBoundsConverter
-}
\ No newline at end of file
+}
diff --git a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/tiler/BorderTile.kt b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/tiler/BorderTile.kt
index 467e294e5..8907884ae 100644
--- a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/tiler/BorderTile.kt
+++ b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/tiler/BorderTile.kt
@@ -16,9 +16,11 @@ class BorderTile(private val sizePx: Int) {
             }
             Canvas(bitmap).apply {
                 drawRect(
-                    0f, 0f,
-                    bitmap.width.toFloat(), bitmap.height.toFloat(),
-                    borderPaint
+                    0f,
+                    0f,
+                    bitmap.width.toFloat(),
+                    bitmap.height.toFloat(),
+                    borderPaint,
                 )
             }
             synchronized(this) {
diff --git a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/ui/MapUtil.kt b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/ui/MapUtil.kt
index 7045d8597..5d2ab25aa 100644
--- a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/ui/MapUtil.kt
+++ b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/ui/MapUtil.kt
@@ -25,7 +25,7 @@ fun rememberMapUiSettings(
                 mapToolbarEnabled = false,
                 myLocationButtonEnabled = myLocation,
                 scrollGesturesEnabled = !disablePanning,
-            )
+            ),
         )
     }
 }
@@ -36,14 +36,17 @@ fun rememberMapProperties(
     isMyLocation: Boolean = false,
 ): MutableState<MapProperties> {
     val context = LocalContext.current
-    val mapStyleOptions = if (mapStyle == 0) null
-    else MapStyleOptions.loadRawResourceStyle(context, mapStyle)
+    val mapStyleOptions = if (mapStyle == 0) {
+        null
+    } else {
+        MapStyleOptions.loadRawResourceStyle(context, mapStyle)
+    }
     return remember {
         mutableStateOf(
             MapProperties(
                 mapStyleOptions = mapStyleOptions,
                 isMyLocationEnabled = isMyLocation,
-            )
+            ),
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/util/CoordinatesUtil.kt b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/util/CoordinatesUtil.kt
index 5d5092a77..796342ba6 100644
--- a/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/util/CoordinatesUtil.kt
+++ b/core/mapmarker/src/main/java/com/crisiscleanup/core/mapmarker/util/CoordinatesUtil.kt
@@ -43,12 +43,18 @@ internal fun Collection<Location>.toLatLng(): Collection<LocationLatLng> {
 internal fun Collection<LocationLatLng>.toBounds(): IncidentBounds {
     val locations = map {
         val multiBounds = it.multiCoordinates.map { latLngs ->
-            if (latLngs.size < 3) null
-            else latLngs.toBounds()
+            if (latLngs.size < 3) {
+                null
+            } else {
+                latLngs.toBounds()
+            }
         }
         val areas = multiBounds.mapIndexed { i, latLngBounds ->
-            if (latLngBounds == null) 0.0
-            else SphericalUtil.computeArea(it.multiCoordinates[i])
+            if (latLngBounds == null) {
+                0.0
+            } else {
+                SphericalUtil.computeArea(it.multiCoordinates[i])
+            }
         }
         LocationBounds(it, multiBounds, areas)
     }
@@ -63,7 +69,7 @@ internal fun Collection<LocationLatLng>.toBounds(): IncidentBounds {
 
     val maxAreaLocation =
         locations.fold(
-            Triple<Double, List<LatLng>?, LatLngBounds?>(0.0, null, null)
+            Triple<Double, List<LatLng>?, LatLngBounds?>(0.0, null, null),
         ) { accOuter, locationLatLng ->
             var maxArea = 0.0
             var latLngs: List<LatLng>? = null
@@ -76,8 +82,11 @@ internal fun Collection<LocationLatLng>.toBounds(): IncidentBounds {
                 }
             }
 
-            if (accOuter.first > maxArea) accOuter
-            else Triple(maxArea, latLngs, bounds)
+            if (accOuter.first > maxArea) {
+                accOuter
+            } else {
+                Triple(maxArea, latLngs, bounds)
+            }
         }
     // TODO Cache the center location on save to database rather than computing every time
     var incidentCentroid = DefaultCoordinates
diff --git a/core/mapmarker/src/test/java/com/crisiscleanup/core/mapmarker/model/TileCoordinatesTest.kt b/core/mapmarker/src/test/java/com/crisiscleanup/core/mapmarker/model/TileCoordinatesTest.kt
index 1ac639f44..082db2643 100644
--- a/core/mapmarker/src/test/java/com/crisiscleanup/core/mapmarker/model/TileCoordinatesTest.kt
+++ b/core/mapmarker/src/test/java/com/crisiscleanup/core/mapmarker/model/TileCoordinatesTest.kt
@@ -19,16 +19,16 @@ class CoordinateGridQueryTest {
             Pair(70, -100) to Pair(0.7777777777777778, 0.7904007883569593),
             Pair(70, -95) to Pair(0.888888888888889, 0.7904007883569593),
             Pair(70, -90) to Pair(1.0, 0.7904007883569593),
-            Pair(75, -135) to Pair(0.0, 0.41839296767736744),
-            Pair(75, -130) to Pair(0.11111111111111112, 0.41839296767736744),
-            Pair(75, -125) to Pair(0.22222222222222224, 0.41839296767736744),
-            Pair(75, -120) to Pair(0.33333333333333337, 0.41839296767736744),
-            Pair(75, -115) to Pair(0.4444444444444445, 0.41839296767736744),
-            Pair(75, -110) to Pair(0.5555555555555556, 0.41839296767736744),
-            Pair(75, -105) to Pair(0.6666666666666667, 0.41839296767736744),
-            Pair(75, -100) to Pair(0.7777777777777778, 0.41839296767736744),
-            Pair(75, -95) to Pair(0.888888888888889, 0.41839296767736744),
-            Pair(75, -90) to Pair(1.0, 0.41839296767736744),
+            Pair(75, -135) to Pair(0.0, 0.4183929676773679),
+            Pair(75, -130) to Pair(0.11111111111111112, 0.4183929676773679),
+            Pair(75, -125) to Pair(0.22222222222222224, 0.4183929676773679),
+            Pair(75, -120) to Pair(0.33333333333333337, 0.4183929676773679),
+            Pair(75, -115) to Pair(0.4444444444444445, 0.4183929676773679),
+            Pair(75, -110) to Pair(0.5555555555555556, 0.4183929676773679),
+            Pair(75, -105) to Pair(0.6666666666666667, 0.4183929676773679),
+            Pair(75, -100) to Pair(0.7777777777777778, 0.4183929676773679),
+            Pair(75, -95) to Pair(0.888888888888889, 0.4183929676773679),
+            Pair(75, -90) to Pair(1.0, 0.4183929676773679),
         )
         val tileCoordinates = TileCoordinates(1, 1, 3)
 
@@ -40,4 +40,4 @@ class CoordinateGridQueryTest {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/model/src/main/java/com/crisiscleanup/core/model/data/AccountData.kt b/core/model/src/main/java/com/crisiscleanup/core/model/data/AccountData.kt
index a3cc72eb1..a299e61e9 100644
--- a/core/model/src/main/java/com/crisiscleanup/core/model/data/AccountData.kt
+++ b/core/model/src/main/java/com/crisiscleanup/core/model/data/AccountData.kt
@@ -11,7 +11,7 @@ data class AccountData(
     val emailAddress: String,
     val profilePictureUri: String,
     val org: OrgData,
-    val areTokensValid: Boolean
+    val areTokensValid: Boolean,
 ) {
     val hasAuthenticated: Boolean
         get() = id > 0
@@ -26,4 +26,4 @@ val emptyAccountData =
 data class OrgData(
     val id: Long,
     val name: String,
-)
\ No newline at end of file
+)
diff --git a/core/model/src/main/java/com/crisiscleanup/core/model/data/CaseStatus.kt b/core/model/src/main/java/com/crisiscleanup/core/model/data/CaseStatus.kt
index 47d6514d5..eb1e1332c 100644
--- a/core/model/src/main/java/com/crisiscleanup/core/model/data/CaseStatus.kt
+++ b/core/model/src/main/java/com/crisiscleanup/core/model/data/CaseStatus.kt
@@ -22,4 +22,4 @@ enum class CaseStatus {
      */
     OutOfScopeDu,
     Incomplete,
-}
\ No newline at end of file
+}
diff --git a/core/model/src/main/java/com/crisiscleanup/core/model/data/CasesFilter.kt b/core/model/src/main/java/com/crisiscleanup/core/model/data/CasesFilter.kt
index c34146689..993d1926c 100644
--- a/core/model/src/main/java/com/crisiscleanup/core/model/data/CasesFilter.kt
+++ b/core/model/src/main/java/com/crisiscleanup/core/model/data/CasesFilter.kt
@@ -130,12 +130,12 @@ data class CasesFilter(
 
     val hasWorkTypeFilters by lazy {
         isAssignedToMyTeam ||
-                isUnclaimed ||
-                isClaimedByMyOrg ||
-                isStatusOpen ||
-                isStatusClosed ||
-                workTypeStatuses.isNotEmpty() ||
-                workTypes.isNotEmpty()
+            isUnclaimed ||
+            isClaimedByMyOrg ||
+            isStatusOpen ||
+            isStatusClosed ||
+            workTypeStatuses.isNotEmpty() ||
+            workTypes.isNotEmpty()
     }
 
     val matchingStatuses: Set<String> by lazy {
@@ -179,4 +179,4 @@ data class CasesFilter(
     // TODO How to determine no work type?
 }
 
-private val DefaultCasesFilter = CasesFilter()
\ No newline at end of file
+private val DefaultCasesFilter = CasesFilter()
diff --git a/core/model/src/main/java/com/crisiscleanup/core/model/data/Incident.kt b/core/model/src/main/java/com/crisiscleanup/core/model/data/Incident.kt
index 4583d26ee..dd7b60226 100644
--- a/core/model/src/main/java/com/crisiscleanup/core/model/data/Incident.kt
+++ b/core/model/src/main/java/com/crisiscleanup/core/model/data/Incident.kt
@@ -72,4 +72,4 @@ data class IncidentIdNameType(
     val name: String,
     val shortName: String,
     val disasterLiteral: String,
-)
\ No newline at end of file
+)
diff --git a/core/model/src/main/java/com/crisiscleanup/core/model/data/IncidentDataSyncStats.kt b/core/model/src/main/java/com/crisiscleanup/core/model/data/IncidentDataSyncStats.kt
index bab03fa09..65af38424 100644
--- a/core/model/src/main/java/com/crisiscleanup/core/model/data/IncidentDataSyncStats.kt
+++ b/core/model/src/main/java/com/crisiscleanup/core/model/data/IncidentDataSyncStats.kt
@@ -52,8 +52,8 @@ data class IncidentDataSyncStats(
     private val isInitialPull = pagedCount < dataCount
 
     val shouldSync = isInitialPull ||
-            isDataVersionOutdated ||
-            syncAttempt.shouldSyncPassively(600)
+        isDataVersionOutdated ||
+        syncAttempt.shouldSyncPassively(600)
 
     val isDeltaPull = !isInitialPull
 }
diff --git a/core/model/src/main/java/com/crisiscleanup/core/model/data/IncidentWorksiteCount.kt b/core/model/src/main/java/com/crisiscleanup/core/model/data/IncidentWorksiteCount.kt
index 2359ca7d9..ef29ac6f8 100644
--- a/core/model/src/main/java/com/crisiscleanup/core/model/data/IncidentWorksiteCount.kt
+++ b/core/model/src/main/java/com/crisiscleanup/core/model/data/IncidentWorksiteCount.kt
@@ -7,4 +7,4 @@ data class IncidentIdWorksiteCount(
      * Number of worksites after filter is applied
      */
     val filteredCount: Int,
-)
\ No newline at end of file
+)
diff --git a/core/model/src/main/java/com/crisiscleanup/core/model/data/Language.kt b/core/model/src/main/java/com/crisiscleanup/core/model/data/Language.kt
index 699ebaa76..c576dde3e 100644
--- a/core/model/src/main/java/com/crisiscleanup/core/model/data/Language.kt
+++ b/core/model/src/main/java/com/crisiscleanup/core/model/data/Language.kt
@@ -13,4 +13,4 @@ data class LanguageTranslations(
     val syncedAt: Instant,
 )
 
-val EnglishLanguage = Language("en-US", "English (United States)")
\ No newline at end of file
+val EnglishLanguage = Language("en-US", "English (United States)")
diff --git a/core/model/src/main/java/com/crisiscleanup/core/model/data/LocationAreaBounds.kt b/core/model/src/main/java/com/crisiscleanup/core/model/data/LocationAreaBounds.kt
index 821873b27..94542f136 100644
--- a/core/model/src/main/java/com/crisiscleanup/core/model/data/LocationAreaBounds.kt
+++ b/core/model/src/main/java/com/crisiscleanup/core/model/data/LocationAreaBounds.kt
@@ -11,4 +11,4 @@ data class OrganizationLocationAreaBounds(
 
 interface LocationBoundsConverter {
     fun convert(location: Location): LocationAreaBounds
-}
\ No newline at end of file
+}
diff --git a/core/model/src/main/java/com/crisiscleanup/core/model/data/PhotoChangeDataProvider.kt b/core/model/src/main/java/com/crisiscleanup/core/model/data/PhotoChangeDataProvider.kt
index 667e9607a..bdc835c27 100644
--- a/core/model/src/main/java/com/crisiscleanup/core/model/data/PhotoChangeDataProvider.kt
+++ b/core/model/src/main/java/com/crisiscleanup/core/model/data/PhotoChangeDataProvider.kt
@@ -2,4 +2,4 @@ package com.crisiscleanup.core.model.data
 
 interface PhotoChangeDataProvider {
     suspend fun getDeletedPhotoNetworkFileIds(worksiteId: Long): Pair<Long, List<Long>>
-}
\ No newline at end of file
+}
diff --git a/core/model/src/main/java/com/crisiscleanup/core/model/data/SavedWorksiteChange.kt b/core/model/src/main/java/com/crisiscleanup/core/model/data/SavedWorksiteChange.kt
index ee861c9fc..b72e54897 100644
--- a/core/model/src/main/java/com/crisiscleanup/core/model/data/SavedWorksiteChange.kt
+++ b/core/model/src/main/java/com/crisiscleanup/core/model/data/SavedWorksiteChange.kt
@@ -35,4 +35,4 @@ enum class WorksiteChangeArchiveAction(val literal: String) {
 
     // Worksite was synced but not all additional data was synced
     PartiallySynced("partially_synced"),
-}
\ No newline at end of file
+}
diff --git a/core/model/src/main/java/com/crisiscleanup/core/model/data/SyncAttempt.kt b/core/model/src/main/java/com/crisiscleanup/core/model/data/SyncAttempt.kt
index 0e4bfd322..fbeed2c8e 100644
--- a/core/model/src/main/java/com/crisiscleanup/core/model/data/SyncAttempt.kt
+++ b/core/model/src/main/java/com/crisiscleanup/core/model/data/SyncAttempt.kt
@@ -33,6 +33,8 @@ data class SyncAttempt(
         recentIntervalSeconds: Int = 1800,
         backoffIntervalSeconds: Int = 15,
         nowSeconds: Long = Clock.System.now().epochSeconds,
-    ) = !(isRecent(recentIntervalSeconds, nowSeconds) ||
-            isBackingOff(backoffIntervalSeconds, nowSeconds))
+    ) = !(
+        isRecent(recentIntervalSeconds, nowSeconds) ||
+            isBackingOff(backoffIntervalSeconds, nowSeconds)
+        )
 }
diff --git a/core/model/src/main/java/com/crisiscleanup/core/model/data/TableDataWorksite.kt b/core/model/src/main/java/com/crisiscleanup/core/model/data/TableDataWorksite.kt
index 8ca8e697b..da3e94730 100644
--- a/core/model/src/main/java/com/crisiscleanup/core/model/data/TableDataWorksite.kt
+++ b/core/model/src/main/java/com/crisiscleanup/core/model/data/TableDataWorksite.kt
@@ -8,8 +8,11 @@ fun Worksite.getClaimStatus(affiliateIds: Set<Long>): TableWorksiteClaimStatus {
     if (unclaimedCount == 0) {
         val claimedByMyOrgCount = claimedBy.filter { affiliateIds.contains(it) }.size
         claimStatus =
-            if (claimedByMyOrgCount > 0) TableWorksiteClaimStatus.ClaimedByMyOrg
-            else TableWorksiteClaimStatus.ClaimedByOthers
+            if (claimedByMyOrgCount > 0) {
+                TableWorksiteClaimStatus.ClaimedByMyOrg
+            } else {
+                TableWorksiteClaimStatus.ClaimedByOthers
+            }
 
         // TODO Test
         if (claimStatus == TableWorksiteClaimStatus.ClaimedByOthers &&
@@ -47,4 +50,4 @@ enum class TableWorksiteClaimAction {
     Unclaim,
     Request,
     Release,
-}
\ No newline at end of file
+}
diff --git a/core/model/src/main/java/com/crisiscleanup/core/model/data/WorkType.kt b/core/model/src/main/java/com/crisiscleanup/core/model/data/WorkType.kt
index dc5196ef5..3fbb4d533 100644
--- a/core/model/src/main/java/com/crisiscleanup/core/model/data/WorkType.kt
+++ b/core/model/src/main/java/com/crisiscleanup/core/model/data/WorkType.kt
@@ -171,4 +171,4 @@ enum class WorkTypeType {
     Unknown,
     WaterBottles,
     WellnessCheck,
-}
\ No newline at end of file
+}
diff --git a/core/model/src/main/java/com/crisiscleanup/core/model/data/WorksiteChangeSerializer.kt b/core/model/src/main/java/com/crisiscleanup/core/model/data/WorksiteChangeSerializer.kt
index d193b8aba..2a203c579 100644
--- a/core/model/src/main/java/com/crisiscleanup/core/model/data/WorksiteChangeSerializer.kt
+++ b/core/model/src/main/java/com/crisiscleanup/core/model/data/WorksiteChangeSerializer.kt
@@ -18,4 +18,4 @@ interface WorksiteChangeSerializer {
         releaseReason: String = "",
         releaseWorkTypes: List<String> = emptyList(),
     ): Pair<Int, String>
-}
\ No newline at end of file
+}
diff --git a/core/model/src/main/java/com/crisiscleanup/core/model/data/WorksiteSyncResult.kt b/core/model/src/main/java/com/crisiscleanup/core/model/data/WorksiteSyncResult.kt
index 1d901b82b..955be63c3 100644
--- a/core/model/src/main/java/com/crisiscleanup/core/model/data/WorksiteSyncResult.kt
+++ b/core/model/src/main/java/com/crisiscleanup/core/model/data/WorksiteSyncResult.kt
@@ -23,17 +23,22 @@ data class WorksiteSyncResult(
     )
 
     private fun <T, R> summarizeChanges(changeMap: Map<T, R>, postText: String): String =
-        if (changeMap.isEmpty()) ""
-        else "${changeMap.size} $postText"
+        if (changeMap.isEmpty()) {
+            ""
+        } else {
+            "${changeMap.size} $postText"
+        }
 
     fun getSummary(totalChangeCount: Int): String {
         var successCount = 0
         var partialSuccessCount = 0
         var failCount = 0
         changeResults.forEach {
-            if (it.isSuccessful) successCount++
-            else if (it.isPartiallySuccessful) partialSuccessCount++
-            else if (it.isFail) failCount++
+            if (it.isSuccessful) {
+                successCount++
+            } else if (it.isPartiallySuccessful) {
+                partialSuccessCount++
+            } else if (it.isFail) failCount++
         }
         val outcomeSummary = if (totalChangeCount > 1) {
             listOf(
@@ -44,11 +49,16 @@ data class WorksiteSyncResult(
             ).joinToString("\n")
         } else {
             "1 change: " + (
-                    if (successCount > 0) "success"
-                    else if (partialSuccessCount > 0) "partial"
-                    else if (failCount > 0) "fail"
-                    else ""
-                    )
+                if (successCount > 0) {
+                    "success"
+                } else if (partialSuccessCount > 0) {
+                    "partial"
+                } else if (failCount > 0) {
+                    "fail"
+                } else {
+                    ""
+                }
+                )
         }
         val changeTypeSummary = with(changeIds) {
             listOf(
@@ -65,7 +75,7 @@ data class WorksiteSyncResult(
         return listOf(
             "Network ID: ${changeIds.networkWorksiteId}",
             outcomeSummary,
-            changeTypeSummary
+            changeTypeSummary,
         )
             .joinToString("\n")
     }
diff --git a/core/model/src/test/java/com/crisiscleanup/core/model/data/SyncAttemptTest.kt b/core/model/src/test/java/com/crisiscleanup/core/model/data/SyncAttemptTest.kt
index 2085dd46f..c6973921e 100644
--- a/core/model/src/test/java/com/crisiscleanup/core/model/data/SyncAttemptTest.kt
+++ b/core/model/src/test/java/com/crisiscleanup/core/model/data/SyncAttemptTest.kt
@@ -75,4 +75,4 @@ class SyncAttemptTest {
         val recentBackingOff = SyncAttempt(800, 1000, 1)
         assertFalse(recentBackingOff.shouldSyncPassively(250, 50, 1049))
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/lint.xml b/core/network/lint.xml
index 59fd50bd5..da8ce307b 100644
--- a/core/network/lint.xml
+++ b/core/network/lint.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
 <lint>
     <!--
     Lint crashes when it tries to analyse a file without a package name:
diff --git a/core/network/src/demoRelease/java/com/crisiscleanup/core/network/di/FlavoredNetworkModule.kt b/core/network/src/demoRelease/java/com/crisiscleanup/core/network/di/FlavoredNetworkModule.kt
index 38287d525..aeed72110 100644
--- a/core/network/src/demoRelease/java/com/crisiscleanup/core/network/di/FlavoredNetworkModule.kt
+++ b/core/network/src/demoRelease/java/com/crisiscleanup/core/network/di/FlavoredNetworkModule.kt
@@ -12,4 +12,4 @@ import dagger.hilt.components.SingletonComponent
 interface DemoReleaseFlavoredNetworkModule {
     @Binds
     fun bindsEndOfLifeClient(apiClient: NoEndOfLifeClient): EndOfLifeClient
-}
\ No newline at end of file
+}
diff --git a/core/network/src/earlybird/java/com/crisiscleanup/core/network/di/FlavoredNetworkModule.kt b/core/network/src/earlybird/java/com/crisiscleanup/core/network/di/FlavoredNetworkModule.kt
index 83d28a8b3..3ef8203f3 100644
--- a/core/network/src/earlybird/java/com/crisiscleanup/core/network/di/FlavoredNetworkModule.kt
+++ b/core/network/src/earlybird/java/com/crisiscleanup/core/network/di/FlavoredNetworkModule.kt
@@ -1,7 +1,7 @@
 package com.crisiscleanup.core.network.di
 
-import com.crisiscleanup.core.network.endoflife.EndOfLifeClient
 import com.crisiscleanup.core.network.endoflife.EndOfLifeApiClient
+import com.crisiscleanup.core.network.endoflife.EndOfLifeClient
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -12,4 +12,4 @@ import dagger.hilt.components.SingletonComponent
 interface FlavoredNetworkModule {
     @Binds
     fun bindsEndOfLifeClient(apiClient: EndOfLifeApiClient): EndOfLifeClient
-}
\ No newline at end of file
+}
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/CrisisCleanupNetworkDataSource.kt b/core/network/src/main/java/com/crisiscleanup/core/network/CrisisCleanupNetworkDataSource.kt
index 282d6bcdd..7d125c31b 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/CrisisCleanupNetworkDataSource.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/CrisisCleanupNetworkDataSource.kt
@@ -116,4 +116,4 @@ interface CrisisCleanupNetworkDataSource {
     suspend fun getCaseHistory(worksiteId: Long): List<NetworkCaseHistoryEvent>
 
     suspend fun getUsers(ids: Collection<Long>): List<NetworkPersonContact>
-}
\ No newline at end of file
+}
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/CrisisCleanupWriteApi.kt b/core/network/src/main/java/com/crisiscleanup/core/network/CrisisCleanupWriteApi.kt
index 6ac53bcdf..aa36e16db 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/CrisisCleanupWriteApi.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/CrisisCleanupWriteApi.kt
@@ -41,14 +41,14 @@ interface CrisisCleanupWriteApi {
         createdAt: Instant,
         worksiteId: Long,
         workTypes: List<String>,
-        reason: String
+        reason: String,
     )
 
     suspend fun releaseWorkTypes(
         createdAt: Instant,
         worksiteId: Long,
         workTypes: List<String>,
-        reason: String
+        reason: String,
     )
 
     suspend fun deleteFile(worksiteId: Long, file: Long)
@@ -72,6 +72,6 @@ interface CrisisCleanupWriteApi {
         emails: List<String>,
         phoneNumbers: List<String>,
         shareMessage: String,
-        noClaimReason: String?
+        noClaimReason: String?,
     )
 }
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/endoflife/EndOfLifeApi.kt b/core/network/src/main/java/com/crisiscleanup/core/network/endoflife/EndOfLifeApi.kt
index df400269b..b6c3f0065 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/endoflife/EndOfLifeApi.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/endoflife/EndOfLifeApi.kt
@@ -18,7 +18,6 @@ private interface EndOfLifeApi {
     suspend fun getEarlybirdEndOfLife(
         @Url url: String = "https://android-earlybird-end-5vzbp64o2a-uc.a.run.app",
     ): NetworkBuildEndOfLife
-
 }
 
 class EndOfLifeApiClient @Inject constructor(
@@ -31,4 +30,4 @@ class EndOfLifeApiClient @Inject constructor(
 
 class NoEndOfLifeClient @Inject constructor() : EndOfLifeClient {
     override suspend fun getEarlybirdEndOfLife() = null
-}
\ No newline at end of file
+}
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/fake/FakeAuthApi.kt b/core/network/src/main/java/com/crisiscleanup/core/network/fake/FakeAuthApi.kt
index e7e48da37..60ffb777a 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/fake/FakeAuthApi.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/fake/FakeAuthApi.kt
@@ -44,4 +44,4 @@ class FakeAuthApi @Inject constructor() : CrisisCleanupAuthApi {
             expiresIn = 3600,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/model/KeyDynamicValuePair.kt b/core/network/src/main/java/com/crisiscleanup/core/network/model/KeyDynamicValuePair.kt
index 42dd7f761..3bde26629 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/model/KeyDynamicValuePair.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/model/KeyDynamicValuePair.kt
@@ -25,4 +25,4 @@ data class DynamicValue(
 
     fun isStringEqual(other: DynamicValue) =
         !isBoolean && !other.isBoolean && valueString.trim() == other.valueString.trim()
-}
\ No newline at end of file
+}
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkAuth.kt b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkAuth.kt
index d7e9939fd..4758e41ec 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkAuth.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkAuth.kt
@@ -16,7 +16,7 @@ data class NetworkAuthResult(
     val accessToken: String? = null,
     @SerialName("user_claims")
     val claims: NetworkAuthUserClaims? = null,
-    val organizations: NetworkAuthOrganization? = null
+    val organizations: NetworkAuthOrganization? = null,
 )
 
 @Serializable
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkCaseHistory.kt b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkCaseHistory.kt
index 80c613087..e83f79abb 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkCaseHistory.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkCaseHistory.kt
@@ -7,7 +7,7 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class NetworkCaseHistoryResult(
     val errors: List<NetworkCrisisCleanupApiError>? = null,
-    val events: List<NetworkCaseHistoryEvent>? = null
+    val events: List<NetworkCaseHistoryEvent>? = null,
 )
 
 @Serializable
@@ -54,4 +54,4 @@ data class NetworkCaseHistoryAttrs(
     val recipientName: String? = null,
     @SerialName("recipient_name_t")
     val recipientNameT: String? = null,
-)
\ No newline at end of file
+)
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkError.kt b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkError.kt
index b774622f3..dd0e1a5ed 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkError.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkError.kt
@@ -41,8 +41,11 @@ data class NetworkCrisisCleanupApiError(
 fun Collection<NetworkCrisisCleanupApiError>.tryThrowException() {
     if (isNotEmpty()) {
         val exception =
-            if (hasExpiredToken) ExpiredTokenException()
-            else Exception(condenseMessages)
+            if (hasExpiredToken) {
+                ExpiredTokenException()
+            } else {
+                Exception(condenseMessages)
+            }
         throw exception
     }
 }
@@ -53,4 +56,4 @@ val Collection<NetworkCrisisCleanupApiError>.hasExpiredToken: Boolean
 val Collection<NetworkCrisisCleanupApiError>.condenseMessages: String
     get() = mapNotNull { it.message?.joinToString(". ") }
         .filter(String::isNotBlank)
-        .joinToString("\n")
\ No newline at end of file
+        .joinToString("\n")
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkEvent.kt b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkEvent.kt
index 4719c1d44..e53f65d12 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkEvent.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkEvent.kt
@@ -29,4 +29,4 @@ data class NetworkEvent(
         @SerialName("event_name_t")
         val eventNameT: String,
     )
-}
\ No newline at end of file
+}
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkLanguage.kt b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkLanguage.kt
index 523387bb0..bd5c073b2 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkLanguage.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkLanguage.kt
@@ -28,4 +28,4 @@ data class NetworkLanguageTranslation(
     @SerialName("name_t")
     val name: String,
     val translations: Map<String, String>,
-)
\ No newline at end of file
+)
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkLocation.kt b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkLocation.kt
index 797936ce8..c91bcb00d 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkLocation.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkLocation.kt
@@ -21,7 +21,7 @@ data class NetworkLocation(
     @Serializable
     data class LocationGeometry(
         val type: String,
-        val coordinates: List<List<List<List<Double>>>>
+        val coordinates: List<List<List<List<Double>>>>,
     ) {
         val condensedCoordinates = coordinates.map { flatten(it[0]) }
     }
@@ -29,7 +29,7 @@ data class NetworkLocation(
     @Serializable
     data class LocationPolygon(
         val type: String,
-        val coordinates: List<List<List<Double>>>
+        val coordinates: List<List<List<Double>>>,
     ) {
         val condensedCoordinates: List<Double> = flatten(coordinates[0])
     }
@@ -37,7 +37,7 @@ data class NetworkLocation(
     @Serializable
     data class LocationPoint(
         val type: String,
-        val coordinates: List<Double>
+        val coordinates: List<Double>,
     )
 
     companion object {
@@ -49,4 +49,4 @@ data class NetworkLocation(
             return coordinates
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkOrganization.kt b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkOrganization.kt
index 104288e2a..2aa7c837f 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkOrganization.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkOrganization.kt
@@ -29,4 +29,4 @@ data class NetworkIncidentOrganization(
 data class NetworkOrganizationShort(
     val id: Long,
     val name: String,
-)
\ No newline at end of file
+)
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkShareDetails.kt b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkShareDetails.kt
index 6f03d8e68..6371c1bc0 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkShareDetails.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkShareDetails.kt
@@ -11,5 +11,5 @@ data class NetworkShareDetails(
     @SerialName("share_message")
     val shareMessage: String,
     @SerialName("no_claim_reason_text")
-    val noClaimReason: String?
+    val noClaimReason: String?,
 )
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkType.kt b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkType.kt
index 17eed75dd..6f907c883 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkType.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkType.kt
@@ -10,7 +10,7 @@ data class NetworkType(
     @SerialName("type_t")
     val typeT: String,
     @SerialName("created_at")
-    val createdAt: Instant?
+    val createdAt: Instant?,
 )
 
 internal val networkTypeFavorite = NetworkType(null, "favorite", null)
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkWorkTypeChange.kt b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkWorkTypeChange.kt
index 8c9cb5969..dab50972a 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkWorkTypeChange.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkWorkTypeChange.kt
@@ -17,4 +17,4 @@ data class NetworkWorkTypeChangeRelease(
     val workTypes: List<String>,
     @SerialName("unclaim_reason")
     val reason: String,
-)
\ No newline at end of file
+)
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkWorkTypeStatus.kt b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkWorkTypeStatus.kt
index 103871a26..d02f48f11 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkWorkTypeStatus.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkWorkTypeStatus.kt
@@ -19,4 +19,4 @@ data class NetworkWorkTypeStatusFull(
     val listOrder: Int,
     @SerialName("primary_state")
     val primaryState: String,
-)
\ No newline at end of file
+)
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkWorksite.kt b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkWorksite.kt
index b7301c03a..5d937c997 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkWorksite.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/model/NetworkWorksite.kt
@@ -119,7 +119,7 @@ data class NetworkWorksiteFull(
         val createdByOrg: Long?,
         val seconds: Int,
         val volunteers: Int,
-        val worksite: Int
+        val worksite: Int,
     )
 
     @Serializable
@@ -203,9 +203,9 @@ data class NetworkWorksiteShort(
             workTypes: List<NetworkWorksiteFull.WorkTypeShort>,
             keyWorkType: NetworkWorksiteFull.KeyWorkTypeShort?,
         ): Pair<
-                List<NetworkWorksiteFull.WorkTypeShort>,
-                NetworkWorksiteFull.KeyWorkTypeShort?,
-                > {
+            List<NetworkWorksiteFull.WorkTypeShort>,
+            NetworkWorksiteFull.KeyWorkTypeShort?,
+            > {
             val newMap = mutableMapOf<String, Pair<Int, NetworkWorksiteFull.WorkTypeShort>>()
             workTypes.forEachIndexed { index, workType ->
                 val literal = workType.workType
@@ -371,4 +371,4 @@ data class NetworkWorksiteCoreData(
         val distinct = NetworkWorksiteFull.distinctNewestWorkTypes(workTypes, null)
         newestWorkTypes = distinct.first
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/model/Worksite.kt b/core/network/src/main/java/com/crisiscleanup/core/network/model/Worksite.kt
index 1e3675b02..3a7cdf7df 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/model/Worksite.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/model/Worksite.kt
@@ -70,7 +70,7 @@ fun Worksite.asSnapshotModel(
                     involvesMyOrg = attr?.involvesMyOrg,
                     haveContactedOtherOrg = attr?.haveContactedOtherOrg,
                     organizationIds = attr?.organizations ?: emptyList(),
-                )
+                ),
             )
         } ?: emptyList(),
         notes.map { note ->
@@ -81,7 +81,7 @@ fun Worksite.asSnapshotModel(
                     createdAt = note.createdAt,
                     isSurvivor = note.isSurvivor,
                     note = note.note,
-                )
+                ),
             )
         },
         workTypes.map { workType ->
@@ -96,7 +96,7 @@ fun Worksite.asSnapshotModel(
                     recur = workType.recur,
                     status = workType.statusLiteral,
                     workType = workType.workTypeLiteral,
-                )
+                ),
             )
         },
     )
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/model/WorksiteSearchFilter.kt b/core/network/src/main/java/com/crisiscleanup/core/network/model/WorksiteSearchFilter.kt
index 184e5fef7..fdcbd5285 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/model/WorksiteSearchFilter.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/model/WorksiteSearchFilter.kt
@@ -18,10 +18,13 @@ private val CasesFilter.statusQueryString: String?
             statuses.addAll(closedWorkTypeStatuses)
         }
 
-        return if (statuses.isEmpty()) null
-        else workTypeStatuses
-            .map(WorkTypeStatus::literal)
-            .joinToString(",")
+        return if (statuses.isEmpty()) {
+            null
+        } else {
+            workTypeStatuses
+                .map(WorkTypeStatus::literal)
+                .joinToString(",")
+        }
     }
 
 private fun trueOrNull(b: Boolean): Boolean? {
@@ -34,14 +37,13 @@ private val CasesFilter.flagQueryString: String?
 private val CasesFilter.workQueryString: String?
     get() = if (workTypes.isEmpty()) null else workTypes.joinToString(",")
 
-
 private val dateQueryStringFormatter = DateTimeFormatter
     .ofPattern("yyyy-MM-dd")
     .withZone(ZoneId.systemDefault())
 
 private fun dateRangeQueryString(
     datePrefix: String,
-    dateRange: Pair<Instant, Instant>?
+    dateRange: Pair<Instant, Instant>?,
 ): List<Pair<String, String>>? {
     if (dateRange == null) {
         return null
@@ -57,7 +59,7 @@ private fun dateRangeQueryString(
 
     return listOf(
         Pair("${datePrefix}_at__gt", dateQueryStringFormatter.format(minDate.toJavaInstant())),
-        Pair("&${datePrefix}_at__lt=", dateQueryStringFormatter.format(maxDate.toJavaInstant()))
+        Pair("&${datePrefix}_at__lt=", dateQueryStringFormatter.format(maxDate.toJavaInstant())),
     )
 }
 
@@ -100,4 +102,4 @@ fun CasesFilter.queryMap(myOrgId: Long): Map<String, Any> {
     }
 
     return nonNullQueryMap
-}
\ No newline at end of file
+}
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/model/util/InstantSerializer.kt b/core/network/src/main/java/com/crisiscleanup/core/network/model/util/InstantSerializer.kt
index 2f8bf9eb6..5d67ad3f8 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/model/util/InstantSerializer.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/model/util/InstantSerializer.kt
@@ -15,7 +15,7 @@ object InstantSerializer : KSerializer<Instant> {
 
     override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor(
         serialName = "Instant",
-        kind = STRING
+        kind = STRING,
     )
 
     override fun serialize(encoder: Encoder, value: Instant) =
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/AuthApiClient.kt b/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/AuthApiClient.kt
index e11ae2a48..880ac3c4d 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/AuthApiClient.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/AuthApiClient.kt
@@ -53,4 +53,4 @@ class AuthApiClient @Inject constructor(
     }
 
     override suspend fun logout() {}
-}
\ No newline at end of file
+}
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/DataApiClient.kt b/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/DataApiClient.kt
index 01d8e3ce0..9a856bc52 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/DataApiClient.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/DataApiClient.kt
@@ -298,8 +298,11 @@ class DataApiClient @Inject constructor(
         longitude: Double?,
         updatedAtAfter: Instant?,
     ): List<NetworkWorksitePage> {
-        val centerCoordinates: List<Double>? = if (latitude == null && longitude == null) null else
+        val centerCoordinates: List<Double>? = if (latitude == null && longitude == null) {
+            null
+        } else {
             listOf(latitude!!, longitude!!)
+        }
         val result = networkApi.getWorksitesPage(
             incidentId,
             pageCount,
@@ -392,4 +395,4 @@ class DataApiClient @Inject constructor(
                 it.errors?.tryThrowException()
                 it.results ?: emptyList()
             }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/RequestHeaderCallAdapterFactory.kt b/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/RequestHeaderCallAdapterFactory.kt
index cd2c31e02..dd0a9fa98 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/RequestHeaderCallAdapterFactory.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/RequestHeaderCallAdapterFactory.kt
@@ -13,7 +13,7 @@ enum class RequestHeaderKey {
 }
 
 class RequestHeaderKeysLookup(
-    private val lookup: MutableMap<Int, Map<RequestHeaderKey, String>> = mutableMapOf()
+    private val lookup: MutableMap<Int, Map<RequestHeaderKey, String>> = mutableMapOf(),
 ) {
     private fun requestKey(request: Request): Int =
         request.url.hashCode() + 31 * request.method.hashCode()
@@ -67,18 +67,21 @@ internal class RequestHeaderCallAdapterFactory(
     override fun get(
         returnType: Type,
         annotations: Array<out Annotation>,
-        retrofit: Retrofit
+        retrofit: Retrofit,
     ): CallAdapter<*, *>? {
         val matchingAdapterFactories =
             retrofit.callAdapterFactories().filterNot { it is RequestHeaderCallAdapterFactory }
         for (adapterFactory in matchingAdapterFactories) {
             adapterFactory.get(returnType, annotations, retrofit)?.let {
-                return if (annotations.isEmpty()) it
-                else HeaderKeysCallAdapter(
-                    it as CallAdapter<Any, Any>,
-                    annotations,
-                    headerKeysLookup
-                )
+                return if (annotations.isEmpty()) {
+                    it
+                } else {
+                    HeaderKeysCallAdapter(
+                        it as CallAdapter<Any, Any>,
+                        annotations,
+                        headerKeysLookup,
+                    )
+                }
             }
         }
         return null
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/RetrofitApiBuilders.kt b/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/RetrofitApiBuilders.kt
index b90f31e30..3b9b3a658 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/RetrofitApiBuilders.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/RetrofitApiBuilders.kt
@@ -119,4 +119,4 @@ internal fun getJsonApiBuilder(
         .client(clientBuilder.build())
         .addConverterFactory(networkApiJson.converterFactory)
         .build()
-}
\ No newline at end of file
+}
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/TokenAuthenticationHeader.kt b/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/TokenAuthenticationHeader.kt
index 4ed8a1ee4..729a8e017 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/TokenAuthenticationHeader.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/TokenAuthenticationHeader.kt
@@ -5,4 +5,4 @@ import kotlin.annotation.AnnotationTarget.*
 
 @Target(FUNCTION, PROPERTY_GETTER)
 @Retention(RUNTIME)
-internal annotation class TokenAuthenticationHeader
\ No newline at end of file
+internal annotation class TokenAuthenticationHeader
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/WrapResponseHeader.kt b/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/WrapResponseHeader.kt
index 509046df0..f1b3fb59d 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/WrapResponseHeader.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/WrapResponseHeader.kt
@@ -5,4 +5,4 @@ import kotlin.annotation.AnnotationTarget.*
 
 @Target(FUNCTION)
 @Retention(RUNTIME)
-internal annotation class WrapResponseHeader(val key: String)
\ No newline at end of file
+internal annotation class WrapResponseHeader(val key: String)
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/WriteApiClient.kt b/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/WriteApiClient.kt
index 57351bb2f..b1dd5359c 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/WriteApiClient.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/retrofit/WriteApiClient.kt
@@ -165,9 +165,11 @@ class WriteApiClient @Inject constructor(
         syncUuid: String,
         worksite: NetworkWorksitePush,
     ): NetworkWorksiteFull {
-        return if (worksite.id == null)
+        return if (worksite.id == null) {
             changeWorksiteApi.newWorksite(modifiedAt, syncUuid, worksite)
-        else changeWorksiteApi.updateWorksite(modifiedAt, syncUuid, worksite.id, worksite)
+        } else {
+            changeWorksiteApi.updateWorksite(modifiedAt, syncUuid, worksite.id, worksite)
+        }
     }
 
     override suspend fun favoriteWorksite(createdAt: Instant, worksiteId: Long) =
@@ -215,7 +217,7 @@ class WriteApiClient @Inject constructor(
         createdAt: Instant,
         worksiteId: Long,
         workTypes: List<String>,
-        reason: String
+        reason: String,
     ) {
         changeWorksiteApi.requestWorkTypes(
             createdAt,
@@ -228,7 +230,7 @@ class WriteApiClient @Inject constructor(
         createdAt: Instant,
         worksiteId: Long,
         workTypes: List<String>,
-        reason: String
+        reason: String,
     ) {
         changeWorksiteApi.releaseWorkTypes(
             createdAt,
@@ -265,7 +267,7 @@ class WriteApiClient @Inject constructor(
         emails: List<String>,
         phoneNumbers: List<String>,
         shareMessage: String,
-        noClaimReason: String?
+        noClaimReason: String?,
     ) {
         changeWorksiteApi.shareWorksite(
             worksiteId,
@@ -277,4 +279,4 @@ class WriteApiClient @Inject constructor(
             ),
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/NetworkWorksiteChangeSerializer.kt b/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/NetworkWorksiteChangeSerializer.kt
index 66dc5ad5b..9d7d5abdc 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/NetworkWorksiteChangeSerializer.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/NetworkWorksiteChangeSerializer.kt
@@ -24,8 +24,11 @@ class NetworkWorksiteChangeSerializer @Inject constructor() : WorksiteChangeSeri
         releaseReason: String,
         releaseWorkTypes: List<String>,
     ): Pair<Int, String> {
-        val snapshotStart = if (worksiteStart.isNew) null
-        else worksiteStart.asSnapshotModel(flagIdLookup, noteIdLookup, workTypeIdLookup)
+        val snapshotStart = if (worksiteStart.isNew) {
+            null
+        } else {
+            worksiteStart.asSnapshotModel(flagIdLookup, noteIdLookup, workTypeIdLookup)
+        }
         val snapshotChange =
             worksiteChange.asSnapshotModel(flagIdLookup, noteIdLookup, workTypeIdLookup)
         val change = WorksiteChange(
@@ -45,6 +48,6 @@ class NetworkWorksiteChangeSerializer @Inject constructor() : WorksiteChangeSeri
 interface WorksiteChangeSerializerModule {
     @Binds
     fun bindsWorksiteChangeSerializer(
-        serializer: NetworkWorksiteChangeSerializer
+        serializer: NetworkWorksiteChangeSerializer,
     ): WorksiteChangeSerializer
-}
\ No newline at end of file
+}
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/StringChange.kt b/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/StringChange.kt
index c02a3857c..6acbbf045 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/StringChange.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/StringChange.kt
@@ -7,8 +7,11 @@ package com.crisiscleanup.core.network.worksitechange
  * NULL indicates a reference value should be used and non-NULL indicates the returned value should be used.
  */
 private fun String.diffFrom(from: String?) =
-    if (this.trim() == (from?.trim() ?: "")) null
-    else this
+    if (this.trim() == (from?.trim() ?: "")) {
+        null
+    } else {
+        this
+    }
 
 internal fun String.change(from: String, to: String) = to.diffFrom(from) ?: this
 
@@ -18,7 +21,10 @@ internal fun baseChange(base: String?, from: String?, to: String?): String? {
     } else {
         val nFrom = from?.trim() ?: ""
         val nTo = to?.trim() ?: ""
-        if (nFrom == nTo) return base
-        else to
+        if (nFrom == nTo) {
+            return base
+        } else {
+            to
+        }
     }
 }
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksiteChangeProcessor.kt b/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksiteChangeProcessor.kt
index a4388ab9d..3ce2a1015 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksiteChangeProcessor.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksiteChangeProcessor.kt
@@ -92,8 +92,11 @@ class WorksiteChangeProcessor(
         val lastLoopIndex = sortedChanges.size - 1
         sortedChanges.forEachIndexed { index, syncChange ->
             val changes =
-                if (hasPriorUnsyncedChanges) syncChange.worksiteChange.copy(start = start)
-                else syncChange.worksiteChange
+                if (hasPriorUnsyncedChanges) {
+                    syncChange.worksiteChange.copy(start = start)
+                } else {
+                    syncChange.worksiteChange
+                }
 
             val syncResult = syncChangeDelta(syncChange, changes)
             val hasError = syncResult.hasError
@@ -104,7 +107,7 @@ class WorksiteChangeProcessor(
                     isPartiallySuccessful = syncResult.isPartiallySynced,
                     isFail = hasError,
                     exception = syncResult.primaryException,
-                )
+                ),
             )
 
             hasPriorUnsyncedChanges = !syncResult.isFullySynced
@@ -174,7 +177,7 @@ class WorksiteChangeProcessor(
 
     private suspend fun syncWorkTypeTransfer(
         syncChange: SyncWorksiteChange,
-        deltaChange: WorksiteChange
+        deltaChange: WorksiteChange,
     ): SyncChangeSetResult {
         var result = SyncChangeSetResult(false, isFullySynced = false)
         val changeCreatedAt = syncChange.createdAt
@@ -246,7 +249,6 @@ class WorksiteChangeProcessor(
                     changeSet.workTypeChanges.associate { it.workType.workType to it.localId }
                 updateWorkTypeIdMap(workTypeLocalIdLookup, false)
             }
-
         } catch (e: Exception) {
             result = when (e) {
                 is NoInternetConnectionException -> result.copy(isConnectedToInternet = false)
@@ -294,7 +296,6 @@ class WorksiteChangeProcessor(
                 val syncedFlag = writeApiClient.addFlag(changeAt, networkWorksiteId, flag)
                 flagIdMap[localId] = syncedFlag.id!!
                 syncLogger.log("Synced flag $localId (${syncedFlag.id}).")
-
             } catch (e: Exception) {
                 ensureSyncConditions()
                 addFlagExceptions[localId] = e
@@ -388,7 +389,6 @@ class WorksiteChangeProcessor(
             }
         }
 
-
         var workTypeUnclaimException: Exception? = null
         val networkUnclaimWorkTypes = unclaimWorkTypes.filter {
             val claimOrgId = workTypeOrgLookup[it]
@@ -435,24 +435,27 @@ class WorksiteChangeProcessor(
     ): SyncChangeSetResult {
         val networkWorksite = getNetworkWorksite()
         val requestWorkTypes = networkWorksite.matchOtherOrgWorkTypes(transferRequest)
-        return if (requestWorkTypes.isEmpty()) baseResult
-        else try {
-            writeApiClient.requestWorkTypes(
-                changeAt,
-                networkWorksite.id,
-                requestWorkTypes,
-                transferRequest.reason,
-            )
+        return if (requestWorkTypes.isEmpty()) {
+            baseResult
+        } else {
+            try {
+                writeApiClient.requestWorkTypes(
+                    changeAt,
+                    networkWorksite.id,
+                    requestWorkTypes,
+                    transferRequest.reason,
+                )
 
-            val workTypeRequests = networkDataSource.getWorkTypeRequests(networkWorksiteId)
-            workTypeRequests.forEach {
-                workTypeRequestIdMap[it.workType.workType] = it.id
-            }
+                val workTypeRequests = networkDataSource.getWorkTypeRequests(networkWorksiteId)
+                workTypeRequests.forEach {
+                    workTypeRequestIdMap[it.workType.workType] = it.id
+                }
 
-            baseResult
-        } catch (e: Exception) {
-            ensureSyncConditions()
-            baseResult.copy(workTypeRequestException = e)
+                baseResult
+            } catch (e: Exception) {
+                ensureSyncConditions()
+                baseResult.copy(workTypeRequestException = e)
+            }
         }
     }
 
@@ -464,28 +467,31 @@ class WorksiteChangeProcessor(
     ): SyncChangeSetResult {
         val networkWorksite = getNetworkWorksite()
         val releaseWorkTypes = networkWorksite.matchOtherOrgWorkTypes(transferRelease)
-        return if (releaseWorkTypes.isEmpty()) baseResult
-        else try {
-            writeApiClient.releaseWorkTypes(
-                changeAt,
-                networkWorksite.id,
-                releaseWorkTypes,
-                transferRelease.reason,
-            )
+        return if (releaseWorkTypes.isEmpty()) {
+            baseResult
+        } else {
+            try {
+                writeApiClient.releaseWorkTypes(
+                    changeAt,
+                    networkWorksite.id,
+                    releaseWorkTypes,
+                    transferRelease.reason,
+                )
 
-            val workTypeLocalIdLookup = worksite.workTypes.associate {
-                it.workType.workType to it.localId
-            }
-            updateWorkTypeIdMap(workTypeLocalIdLookup, true)
+                val workTypeLocalIdLookup = worksite.workTypes.associate {
+                    it.workType.workType to it.localId
+                }
+                updateWorkTypeIdMap(workTypeLocalIdLookup, true)
 
-            baseResult
-        } catch (e: Exception) {
-            // TODO Failure likely introduces inconsistencies on downstream changes and local state.
-            //      How to manage properly and completely?
-            //      Local state at this point likely has unclaimed work types.
-            //      Further operations may introduce and propagate additional inconsistencies.
-            ensureSyncConditions()
-            baseResult.copy(workTypeReleaseException = e)
+                baseResult
+            } catch (e: Exception) {
+                // TODO Failure likely introduces inconsistencies on downstream changes and local state.
+                //      How to manage properly and completely?
+                //      Local state at this point likely has unclaimed work types.
+                //      Further operations may introduce and propagate additional inconsistencies.
+                ensureSyncConditions()
+                baseResult.copy(workTypeReleaseException = e)
+            }
         }
     }
 
@@ -555,9 +561,13 @@ internal data class SyncChangeSetResult(
 
     val primaryException: Exception?
         get() {
-            return if (!isConnectedToInternet) NoInternetConnectionException()
-            else if (!isValidToken) ExpiredTokenException()
-            else dataException
+            return if (!isConnectedToInternet) {
+                NoInternetConnectionException()
+            } else if (!isValidToken) {
+                ExpiredTokenException()
+            } else {
+                dataException
+            }
         }
 
     val hasError: Boolean
@@ -597,4 +607,4 @@ internal data class SyncChangeSetResult(
 
     val canContinueSyncing: Boolean
         get() = isConnectedToInternet && isValidToken
-}
\ No newline at end of file
+}
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksiteChangeSet.kt b/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksiteChangeSet.kt
index 989117933..3293700e2 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksiteChangeSet.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksiteChangeSet.kt
@@ -16,8 +16,8 @@ data class WorksiteChangeSet(
 ) {
     val hasNonCoreChanges: Boolean
         get() = isOrgMember != null ||
-                extraNotes.isNotEmpty() ||
-                flagChanges.first.isNotEmpty() ||
-                flagChanges.second.isNotEmpty() ||
-                workTypeChanges.isNotEmpty()
-}
\ No newline at end of file
+            extraNotes.isNotEmpty() ||
+            flagChanges.first.isNotEmpty() ||
+            flagChanges.second.isNotEmpty() ||
+            workTypeChanges.isNotEmpty()
+}
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksiteChangeSetOperator.kt b/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksiteChangeSetOperator.kt
index 1dce1f099..fd6b9db2a 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksiteChangeSetOperator.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksiteChangeSetOperator.kt
@@ -137,7 +137,7 @@ internal fun NetworkWorksiteFull.getCoreChange(
     }
 
     val isLocationChange = coreA.latitude != coreB.latitude ||
-            coreA.longitude != coreB.longitude
+        coreA.longitude != coreB.longitude
     val locationPush = if (isLocationChange) coreB.pointLocation else location
 
     // Pass explicit "" to clear a value on the backend
@@ -181,8 +181,11 @@ internal fun NetworkWorksiteFull.getFavoriteChange(
 ): Boolean? {
     val isFavoriteA = coreA.isAssignedToOrgMember
     val isFavoriteB = coreB.isAssignedToOrgMember
-    return if (isFavoriteA == isFavoriteB || isFavoriteB == (favorite != null)) null
-    else isFavoriteB
+    return if (isFavoriteA == isFavoriteB || isFavoriteB == (favorite != null)) {
+        null
+    } else {
+        isFavoriteB
+    }
 }
 
 /**
@@ -208,7 +211,7 @@ internal fun NetworkWorksiteFull.getFlagChanges(
                 snapshot = it.copy(
                     flag = it.flag.copy(
                         id = networkId,
-                    )
+                    ),
                 )
             }
         }
@@ -247,16 +250,25 @@ internal fun NetworkWorksiteFull.getFormDataChanges(
     }
 
     val newFormData = change.mapNotNull {
-        if (start.contains(it.key)) null
-        else KeyDynamicValuePair(it.key, it.value)
+        if (start.contains(it.key)) {
+            null
+        } else {
+            KeyDynamicValuePair(it.key, it.value)
+        }
     }
     val deletedFormData = start.mapNotNull {
-        if (change.contains(it.key)) null
-        else it.key
+        if (change.contains(it.key)) {
+            null
+        } else {
+            it.key
+        }
     }
     val crossChangeFormData = change.mapNotNull {
-        if (start.contains(it.key)) it
-        else null
+        if (start.contains(it.key)) {
+            it
+        } else {
+            null
+        }
     }
     val unchangedFormData = crossChangeFormData
         .mapNotNull { changeData ->
@@ -359,8 +371,8 @@ internal fun NetworkWorksiteFull.getWorkTypeChanges(
         if (it.workType.id != changeNetworkId) {
             snapshot = it.copy(
                 workType = it.workType.copy(
-                    id = changeNetworkId
-                )
+                    id = changeNetworkId,
+                ),
             )
         }
         snapshot
@@ -425,7 +437,7 @@ internal fun NetworkWorksiteFull.getWorkTypeChanges(
                                 nextRecurAt = existingWorkType.nextRecurAt,
                                 phase = existingWorkType.phase,
                                 recur = existingWorkType.recur,
-                            )
+                            ),
                         )
                     }
             }
@@ -435,4 +447,4 @@ internal fun NetworkWorksiteFull.getWorkTypeChanges(
     val changing = modified.filter { it.networkId > 0 }
 
     return Triple(create, changing, deletedWorkTypes)
-}
\ No newline at end of file
+}
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksitePhotoChangeSyncer.kt b/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksitePhotoChangeSyncer.kt
index 5c864b11f..c709a4406 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksitePhotoChangeSyncer.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksitePhotoChangeSyncer.kt
@@ -13,4 +13,4 @@ class WorksitePhotoChangeSyncer @Inject constructor(
         deleteFileIds.filter { it > 0 }
             .forEach { writeApiClient.deleteFile(networkWorksiteId, it) }
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksiteSnapshot.kt b/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksiteSnapshot.kt
index d1dbf3b84..de9b8c8f1 100644
--- a/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksiteSnapshot.kt
+++ b/core/network/src/main/java/com/crisiscleanup/core/network/worksitechange/WorksiteSnapshot.kt
@@ -105,7 +105,7 @@ data class CoreSnapshot(
     val pointLocation: NetworkWorksiteFull.Location
         get() = NetworkWorksiteFull.Location(
             type = "Point",
-            coordinates = listOf(longitude, latitude)
+            coordinates = listOf(longitude, latitude),
         )
 }
 
@@ -137,14 +137,17 @@ private fun yesNo(b: Boolean) = if (b) "Yes" else "No"
 fun FlagSnapshot.asNetworkFlag(): NetworkFlag {
     with(flag) {
         val addAttributes = involvesMyOrg != null ||
-                haveContactedOtherOrg != null ||
-                organizationIds.isNotEmpty()
-        val attr = if (addAttributes) NetworkFlag.FlagAttributes(
-            involvesYou = involvesMyOrg?.let { yesNo(it) },
-            haveContactedOtherOrg = haveContactedOtherOrg?.let { yesNo(it) },
-            organizations = organizationIds,
-        )
-        else null
+            haveContactedOtherOrg != null ||
+            organizationIds.isNotEmpty()
+        val attr = if (addAttributes) {
+            NetworkFlag.FlagAttributes(
+                involvesYou = involvesMyOrg?.let { yesNo(it) },
+                haveContactedOtherOrg = haveContactedOtherOrg?.let { yesNo(it) },
+                organizations = organizationIds,
+            )
+        } else {
+            null
+        }
         return NetworkFlag(
             id = if (id > 0) id else null,
             action = action.ifBlank { null },
@@ -175,7 +178,7 @@ data class NoteSnapshot(
 @Serializable
 data class WorkTypeSnapshot(
     val localId: Long,
-    val workType: WorkType
+    val workType: WorkType,
 ) {
     @Serializable
     data class WorkType(
@@ -212,5 +215,5 @@ data class WorkTypeChange(
     val changedAt: Instant,
     val isClaimChange: Boolean,
     val isStatusChange: Boolean,
-    val hasChange: Boolean = isClaimChange || isStatusChange
+    val hasChange: Boolean = isClaimChange || isStatusChange,
 )
diff --git a/core/network/src/prod/java/com/crisiscleanup/core/network/di/FlavoredNetworkModule.kt b/core/network/src/prod/java/com/crisiscleanup/core/network/di/FlavoredNetworkModule.kt
index a912772ba..13d281a23 100644
--- a/core/network/src/prod/java/com/crisiscleanup/core/network/di/FlavoredNetworkModule.kt
+++ b/core/network/src/prod/java/com/crisiscleanup/core/network/di/FlavoredNetworkModule.kt
@@ -12,4 +12,4 @@ import dagger.hilt.components.SingletonComponent
 interface FlavoredNetworkModule {
     @Binds
     fun bindsEndOfLifeClient(apiClient: NoEndOfLifeClient): EndOfLifeClient
-}
\ No newline at end of file
+}
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/endoflife/NetworkBuildEndOfLifeTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/endoflife/NetworkBuildEndOfLifeTest.kt
index 4028a81dc..d596d9e94 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/endoflife/NetworkBuildEndOfLifeTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/endoflife/NetworkBuildEndOfLifeTest.kt
@@ -20,4 +20,4 @@ class NetworkBuildEndOfLifeTest {
             result,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkAuthTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkAuthTest.kt
index 3624f4337..10645c319 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkAuthTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkAuthTest.kt
@@ -14,7 +14,7 @@ class NetworkAuthTest {
 
         assertEquals(
             "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzUxMiJ9.eyJ1c2VybmFtZSI6ImRlbW9AY3Jpc2lzY2xlYW51cC5vcmciLCJpYXQiOjE2NzMzNzQ2NDIsImV4cCI6MTY3MzQ2MTA0MiwianRpIjoiZjI3Y2Y4ZTItYjNkNi00YTJjLTkzMjgtZmVhODQxMjQ5NzU4IiwidXNlcl9pZCI6MTg2MDIsIm9yaWdfaWF0IjoxNjczMzc0NjQyLCJhdWQiOiJodHRwczovL2Rldi5jcmlzaXNjbGVhbnVwLmlvIiwiaXNzIjoiVGVtY2tmdEp0S1RmZzhDcWg4bXBnM29BRkdpVDFURFIifQ.ouHPjdWIAp-92VsyHBA-CDIviqzaWNTbxA_tW137gPQnpbziBjn2infhQjJznh5fX__jqjdtOdAaaonUbPVYHXKDWW-iAEEg6z3FTEPF9G4g-_1r55uhA8sTvdzrzBaFRNhkoYYXHQjP-KKuETJdkKXSiYAPWldK5qFRkhbhEIcRe7fawctxnSo0J7TMC9TLrjDicC7ykcrzEyfhtOKD4FBuE_85op6xuqzr-6i2UKh4grw_TkZ6CzD98LSsBHqIDjQEU0rHgY-8mTEV803P3pVQMU6_0rB4UtWuNetvZafFI9CD2lQtAUyw2LgZEu-J0WNPniAyoR8Tg1P089CKiO2LWfu2E20QDY9qP_hYpnd6w3_wb20U_gf92uNBY-J2MSlqkY4EepmmlKVI01ZT31-8B-4UQRwLG5S2G1gYeOK6UKWGCovotkyrVTs-tGkbz-Z-ROTwiS9RCKLmPtcZna44TH9mKYkY3UN_CUmM0i1qwDLO1FOjPgawISejfIAmrjU0tMDg7KPA7fpA92_UUSRULY-tu6bOLWQctaduQPSV5Iq38cMbmYwDBkZHNmT9xBvrdk_CXRRAOokWht41fM6VGkCjDWdALsnG0OkNRgthQJhceXcj1WIFRRnACXPHwBxq7mfT-XwHL9KbfFtLSBBTr924lR42We161TNyMyI",
-            result.accessToken
+            result.accessToken,
         )
 
         val claims = result.claims!!
@@ -36,7 +36,8 @@ class NetworkAuthTest {
                 filenameOriginal = "6645713.jpg",
                 fileTypeT = "fileTypes.user_profile_picture",
                 mimeContentType = "image/jpeg",
-            ), firstFile
+            ),
+            firstFile,
         )
 
         val organization = result.organizations!!
@@ -58,9 +59,9 @@ class NetworkAuthTest {
         assertEquals(
             NetworkCrisisCleanupApiError(
                 "non_field_errors",
-                listOf("Unable to log in with provided credentials.")
+                listOf("Unable to log in with provided credentials."),
             ),
-            firstError
+            firstError,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkCaseHistoryTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkCaseHistoryTest.kt
index 5b0363195..673c569be 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkCaseHistoryTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkCaseHistoryTest.kt
@@ -15,6 +15,5 @@ class NetworkCaseHistoryTest {
         val events = result.events
         assertNotNull(events)
         assertEquals(5, events.size)
-
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkFileUploadTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkFileUploadTest.kt
index c3dacacf2..1e431c7f1 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkFileUploadTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkFileUploadTest.kt
@@ -18,11 +18,11 @@ class NetworkFileUploadTest {
                     credential = "cred",
                     date = "date",
                     policy = "policy",
-                    signature = "sig"
-                )
+                    signature = "sig",
+                ),
             ),
         )
 
         assertEquals(expected, actual)
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkFormFieldTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkFormFieldTest.kt
index 999bfd038..2ddc0deb6 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkFormFieldTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkFormFieldTest.kt
@@ -36,4 +36,4 @@ private data class IncidentFormField(
     val name: String,
     @SerialName("form_fields")
     val fields: List<NetworkIncidentFormField>,
-)
\ No newline at end of file
+)
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkIncidentTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkIncidentTest.kt
index 1b7a78263..9fa83caf4 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkIncidentTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkIncidentTest.kt
@@ -8,32 +8,47 @@ import kotlin.test.assertNull
 class NetworkIncidentTest {
     private val expectedIncidents = listOf(
         fillNetworkIncident(
-            158, "2019-09-25T00:00:00Z",
-            "Small Tornado (Fake)", "chippewa_dunn_wi_tornado", "tornado",
+            158,
+            "2019-09-25T00:00:00Z",
+            "Small Tornado (Fake)",
+            "chippewa_dunn_wi_tornado",
+            "tornado",
             listOf(NetworkIncidentLocation(129, 41905)),
         ),
         fillNetworkIncident(
-            200, "2022-07-20T16:28:51Z",
-            "Another Tornado (Fake)", "another_tornado", "tornado",
+            200,
+            "2022-07-20T16:28:51Z",
+            "Another Tornado (Fake)",
+            "another_tornado",
+            "tornado",
             listOf(
                 NetworkIncidentLocation(1, 73132),
-                NetworkIncidentLocation(3, 73145)
+                NetworkIncidentLocation(3, 73145),
             ),
         ),
         fillNetworkIncident(
-            199, "2021-03-10T02:33:48Z",
-            "Pandemic (Fake)", "covid_19_response", "virus",
+            199,
+            "2021-03-10T02:33:48Z",
+            "Pandemic (Fake)",
+            "covid_19_response",
+            "virus",
             listOf(NetworkIncidentLocation(2, 73141)),
         ),
         fillNetworkIncident(
-            60, "2017-08-24T00:00:00Z",
-            "Big Hurricane (Fake)", "hurricane_harvey", "hurricane",
+            60,
+            "2017-08-24T00:00:00Z",
+            "Big Hurricane (Fake)",
+            "hurricane_harvey",
+            "hurricane",
             listOf(NetworkIncidentLocation(63, 41823)),
             isArchived = true,
         ),
         fillNetworkIncident(
-            151, "2019-07-22T00:00:00Z",
-            "Medium Storm (Fake)", "n_wi_derecho_jul_2019", "wind",
+            151,
+            "2019-07-22T00:00:00Z",
+            "Medium Storm (Fake)",
+            "n_wi_derecho_jul_2019",
+            "wind",
             listOf(NetworkIncidentLocation(122, 41898)),
         ),
     )
@@ -66,9 +81,9 @@ class NetworkIncidentTest {
         assertEquals(
             NetworkCrisisCleanupApiError(
                 field = "detail",
-                message = listOf("Token has expired.")
+                message = listOf("Token has expired."),
             ),
-            firstError
+            firstError,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkLanguageTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkLanguageTest.kt
index facbb6cdb..f844fb990 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkLanguageTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkLanguageTest.kt
@@ -12,7 +12,7 @@ class NetworkLanguageTest {
                 NetworkLanguageDescription("en-US", "English (United States)"),
                 NetworkLanguageDescription("es-MX", "Spanish (Mexico)"),
                 NetworkLanguageDescription("cs", "Czech"),
-            )
+            ),
         )
         assertEquals(expected, result)
     }
@@ -26,4 +26,4 @@ class NetworkLanguageTest {
         assertEquals("English (United States)", result.name)
         assertEquals(11, result.translations.size)
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkLocationTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkLocationTest.kt
index bb4f44e34..147ee2d2b 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkLocationTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkLocationTest.kt
@@ -15,27 +15,27 @@ class NetworkLocationTest {
         val locations = result.results!!
         assertEquals(
             listOf("Polygon", "MultiPolygon", "Point"),
-            locations.map(NetworkLocation::shapeType)
+            locations.map(NetworkLocation::shapeType),
         )
 
         assertEquals(
             1074,
-            locations[0].poly!!.condensedCoordinates.size
+            locations[0].poly!!.condensedCoordinates.size,
         )
 
         val geoCoordinates = locations[1].geom!!.condensedCoordinates
         assertEquals(
             6,
-            geoCoordinates.size
+            geoCoordinates.size,
         )
         assertEquals(
             listOf(1582, 10, 16, 18, 26, 42),
-            geoCoordinates.map { it.size }
+            geoCoordinates.map { it.size },
         )
 
         assertEquals(
             2,
-            locations[2].point!!.coordinates.size
+            locations[2].point!!.coordinates.size,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkOrganizationTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkOrganizationTest.kt
index 636870e2e..d98d22ab6 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkOrganizationTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkOrganizationTest.kt
@@ -37,4 +37,4 @@ class NetworkOrganizationTest {
         )
         assertEquals(expected, organizations[0])
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorkTypeRequestTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorkTypeRequestTest.kt
index a1df7cd5f..6d53be524 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorkTypeRequestTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorkTypeRequestTest.kt
@@ -39,10 +39,10 @@ class NetworkWorkTypeRequestTest {
             byOrg = NetworkOrganizationShort(89, "Crisis Cleanup Admin"),
             toOrg = NetworkOrganizationShort(
                 4734,
-                "test to org"
+                "test to org",
             ),
             worksite = 252155,
         )
         assertEquals(expected, workTypeRequests[0])
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorkTypeStatusTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorkTypeStatusTest.kt
index 33f16481b..8696203bd 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorkTypeStatusTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorkTypeStatusTest.kt
@@ -33,4 +33,4 @@ class NetworkWorkTypeStatusTest {
         )
         assertEquals(expectedStatusLast, statuses[14])
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorksitesAllTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorksitesAllTest.kt
index 326a9dd9f..dd4e86fb4 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorksitesAllTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorksitesAllTest.kt
@@ -31,9 +31,9 @@ class NetworkWorksitesAllTest {
         assertEquals(
             NetworkCrisisCleanupApiError(
                 field = "detail",
-                message = listOf("Token has expired.")
+                message = listOf("Token has expired."),
             ),
-            firstError
+            firstError,
         )
     }
 
@@ -50,9 +50,9 @@ class NetworkWorksitesAllTest {
         assertEquals(
             NetworkCrisisCleanupApiError(
                 field = "incident",
-                message = listOf("Select a valid choice. That choice is not one of the available choices.")
+                message = listOf("Select a valid choice. That choice is not one of the available choices."),
             ),
-            firstError
+            firstError,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorksitesFullTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorksitesFullTest.kt
index 941fc55c7..2feff8819 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorksitesFullTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorksitesFullTest.kt
@@ -50,9 +50,9 @@ class NetworkWorksitesFullTest {
         assertEquals(
             NetworkCrisisCleanupApiError(
                 field = "detail",
-                message = listOf("Token has expired.")
+                message = listOf("Token has expired."),
             ),
-            firstError
+            firstError,
         )
     }
 
@@ -69,9 +69,9 @@ class NetworkWorksitesFullTest {
         assertEquals(
             NetworkCrisisCleanupApiError(
                 field = "incident",
-                message = listOf("Select a valid choice. That choice is not one of the available choices.")
+                message = listOf("Select a valid choice. That choice is not one of the available choices."),
             ),
-            firstError
+            firstError,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorksitesPageTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorksitesPageTest.kt
index 6ab08591a..45d2ff14d 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorksitesPageTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorksitesPageTest.kt
@@ -27,9 +27,9 @@ class NetworkWorksitesPageTest {
         assertEquals(
             NetworkCrisisCleanupApiError(
                 field = "detail",
-                message = listOf("Token has expired.")
+                message = listOf("Token has expired."),
             ),
-            firstError
+            firstError,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorksitesSearchTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorksitesSearchTest.kt
index 3683b9ae9..653fc1684 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorksitesSearchTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/model/NetworkWorksitesSearchTest.kt
@@ -42,4 +42,4 @@ class NetworkWorksitesSearchTest {
         )
         assertEquals(expected, actual)
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/model/NewestWorkTypesTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/model/NewestWorkTypesTest.kt
index 6308307ab..c80d14081 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/model/NewestWorkTypesTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/model/NewestWorkTypesTest.kt
@@ -15,13 +15,15 @@ class NewestWorkTypesTest {
     @Test
     fun noWorkTypes() {
         val (newestWorkTypes, newestKeyWorkType) = NetworkWorksiteFull.distinctNewestWorkTypes(
-            emptyList(), null
+            emptyList(),
+            null,
         )
         assertEquals(emptyList(), newestWorkTypes)
         assertNull(newestKeyWorkType)
 
         val (workTypesShort, keyWorkTypeShort) = NetworkWorksiteShort.distinctNewestWorkTypes(
-            emptyList(), null
+            emptyList(),
+            null,
         )
         assertEquals(emptyList(), workTypesShort)
         assertNull(keyWorkTypeShort)
@@ -78,7 +80,7 @@ class NewestWorkTypesTest {
                 orgClaim = 152,
                 status =
                 "status-high",
-                createdAt = createdAtA
+                createdAt = createdAtA,
             ),
             testWorkType(21, workType = "work-type-b"),
         )
@@ -174,7 +176,7 @@ class NewestWorkTypesTest {
                 orgClaim = 152,
                 status =
                 "status-high",
-                createdAt = createdAtA
+                createdAt = createdAtA,
             ),
             testWorkType(21, workType = "work-type-b"),
         )
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/model/TestUtil.kt b/core/network/src/test/java/com/crisiscleanup/core/network/model/TestUtil.kt
index e10ad7aa6..ffa5ce0ed 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/model/TestUtil.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/model/TestUtil.kt
@@ -23,7 +23,7 @@ internal fun fillNetworkIncident(
     locations: List<NetworkIncidentLocation>,
     activePhone: List<String>? = null,
     turnOnRelease: Boolean = false,
-    isArchived: Boolean = false
+    isArchived: Boolean = false,
 ) = NetworkIncident(
     id,
     Instant.parse(startAt),
@@ -42,18 +42,30 @@ internal fun fillNetworkLocation(
     point: List<Double>? = null,
 ) = NetworkLocation(
     id = id,
-    geom = if (geom == null) null else NetworkLocation.LocationGeometry(
-        type = "MultiPolygon",
-        coordinates = geom,
-    ),
-    poly = if (poly == null) null else NetworkLocation.LocationPolygon(
-        type = "Polygon",
-        coordinates = poly,
-    ),
-    point = if (point == null) null else NetworkLocation.LocationPoint(
-        type = "Point",
-        coordinates = point,
-    ),
+    geom = if (geom == null) {
+        null
+    } else {
+        NetworkLocation.LocationGeometry(
+            type = "MultiPolygon",
+            coordinates = geom,
+        )
+    },
+    poly = if (poly == null) {
+        null
+    } else {
+        NetworkLocation.LocationPolygon(
+            type = "Polygon",
+            coordinates = poly,
+        )
+    },
+    point = if (point == null) {
+        null
+    } else {
+        NetworkLocation.LocationPoint(
+            type = "Point",
+            coordinates = point,
+        )
+    },
 )
 
 internal fun splitToTwos(coordinates: List<Double>): List<List<Double>> {
@@ -62,4 +74,4 @@ internal fun splitToTwos(coordinates: List<Double>): List<List<Double>> {
         twosList.add(listOf(coordinates[i], coordinates[i + 1]))
     }
     return twosList
-}
\ No newline at end of file
+}
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/model/util/DynamicValueSerializerTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/model/util/DynamicValueSerializerTest.kt
index dc35f72d4..09aba003c 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/model/util/DynamicValueSerializerTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/model/util/DynamicValueSerializerTest.kt
@@ -44,7 +44,7 @@ class DynamicValueSerializerTest {
         val deserialized = TestUtil.json.decodeFromString<List<KeyDynamicValuePair>>(
             """[${serializedEntry("boolean-key", "true")},${
                 serializedEntry("string-key", """"string-value"""")
-            },${serializedEntry("boolean-false-key", "false")}]"""
+            },${serializedEntry("boolean-false-key", "false")}]""",
         )
         val expected = listOf(
             KeyDynamicValuePair(
@@ -62,4 +62,4 @@ class DynamicValueSerializerTest {
         )
         assertEquals(expected, deserialized)
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/ChangeTestUtil.kt b/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/ChangeTestUtil.kt
index 9bc4fabde..ef191fe01 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/ChangeTestUtil.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/ChangeTestUtil.kt
@@ -109,4 +109,4 @@ internal fun testCoreSnapshot(
     updatedAt = updatedAt,
     what3Words = what3Words,
     isAssignedToOrgMember = isAssignedToOrgMember,
-)
\ No newline at end of file
+)
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/FormDataChangeTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/FormDataChangeTest.kt
index 528fc9478..ead757bb4 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/FormDataChangeTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/FormDataChangeTest.kt
@@ -78,7 +78,7 @@ class FormDataChangeTest {
     fun deleteNone() {
         val changesMap = mapOf(
             "r" to DynamicValue("r"),
-            "s" to DynamicValue("s")
+            "s" to DynamicValue("s"),
         )
 
         assertEquals(emptyFormData, emptyWorksite.getFormDataChanges(changesMap, emptyMap()))
@@ -217,4 +217,4 @@ class FormDataChangeTest {
         )
         assertEquals(expected, actual)
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/NetworkFlagChangeTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/NetworkFlagChangeTest.kt
index c9000991e..17f72c805 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/NetworkFlagChangeTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/NetworkFlagChangeTest.kt
@@ -48,7 +48,8 @@ class NetworkFlagChangeTest {
 
         val actualOneLocal = noFlagsWorksite.getFlagChanges(emptyStart, startOne, emptyMap())
         assertEquals(
-            listOf(Pair(3L, testNetworkFlag(null, "reasono"))), actualOneLocal.first,
+            listOf(Pair(3L, testNetworkFlag(null, "reasono"))),
+            actualOneLocal.first,
         )
         assertEquals(emptyList(), actualOneLocal.second)
     }
@@ -86,7 +87,7 @@ class NetworkFlagChangeTest {
                 Pair(3L, testNetworkFlag(null, "reasono")),
                 Pair(4L, testNetworkFlag(null, "newer")),
             ),
-            actualAddAll.first
+            actualAddAll.first,
         )
         assertEquals(emptyList(), actualAddAll.second)
 
@@ -150,7 +151,7 @@ class NetworkFlagChangeTest {
             listOf(
                 testNetworkFlag(42, "reasono"),
                 testNetworkFlag(51, "newer"),
-            )
+            ),
         )
         val actualNone = flagsWorksiteMultiple.getFlagChanges(emptyStart, addedFlags, emptyMap())
         assertEquals(emptyList(), actualNone.first)
@@ -162,7 +163,7 @@ class NetworkFlagChangeTest {
             testNetworkFlag(42, "reasono"),
             testNetworkFlag(51, "newer"),
             testNetworkFlag(487, "pentag"),
-        )
+        ),
     )
 
     @Test
@@ -221,7 +222,7 @@ class NetworkFlagChangeTest {
                 testNetworkFlag(51, "newer"),
                 testNetworkFlag(487, "pentag"),
                 testNetworkFlag(521, "inasmu"),
-            )
+            ),
         )
         val flagIdLookup = mapOf(
             23L to 531L,
@@ -269,7 +270,7 @@ private fun testFlagSnapshot(
         reasonT = reason,
         reason = reason,
         requestedAction = "",
-    )
+    ),
 )
 
 private fun testNetworkFlag(
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/NewNoteTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/NewNoteTest.kt
index 8a3809891..6d0848e3f 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/NewNoteTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/NewNoteTest.kt
@@ -17,7 +17,7 @@ class NewNoteTest {
                 testNoteSnapshot("", -1, -1),
                 testNoteSnapshot("not-blank", 53, -1),
                 testNoteSnapshot("not-blank", -1, 46),
-            )
+            ),
         )
         val actual = snapshot.getNewNetworkNotes(mapOf(53L to 35))
         assertEquals(emptyList(), actual)
@@ -29,11 +29,11 @@ class NewNoteTest {
             notes = listOf(
                 testNoteSnapshot("not-blank-a", 44, -1, createdAt = createdAtA),
                 testNoteSnapshot("not-blank-b", 53, -1),
-            )
+            ),
         )
         val actual = snapshot.getNewNetworkNotes(mapOf(53L to 35))
         val expected = listOf(
-            Pair(44L, NetworkNote(null, createdAtA, false, "not-blank-a"))
+            Pair(44L, NetworkNote(null, createdAtA, false, "not-blank-a")),
         )
         assertEquals(expected, actual)
     }
@@ -53,7 +53,7 @@ class NewNoteTest {
                 NetworkNote(13, sevenDaysAgo, false, "note-c"),
                 NetworkNote(14, twoDaysAgo, true, "note-d"),
                 NetworkNote(15, oneDayAgo, false, "note-e"),
-            )
+            ),
         )
 
         val actual = worksite.filterDuplicateNotes(
@@ -64,7 +64,7 @@ class NewNoteTest {
                 Pair(4L, NetworkNote(-1, sevenDaysAgo, true, "new-note-a")),
                 Pair(5L, NetworkNote(-1, now, false, "note-d")),
                 Pair(6L, NetworkNote(-1, oneDayAgo.minus(11.hours), true, "note-e")),
-            )
+            ),
         )
 
         val expected = listOf(
@@ -129,5 +129,5 @@ private fun testNoteSnapshot(
         createdAt = createdAt,
         isSurvivor = false,
         note = note,
-    )
+    ),
 )
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/StringChangeTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/StringChangeTest.kt
index cf76c5235..54055064a 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/StringChangeTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/StringChangeTest.kt
@@ -60,4 +60,4 @@ class StringChangeTest {
         assertEquals("", baseChange("base", "from", ""))
         assertEquals(" ", baseChange("base", "from", " "))
     }
-}
\ No newline at end of file
+}
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/WorkTypeChangeTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/WorkTypeChangeTest.kt
index cb432dccb..4c9e1a822 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/WorkTypeChangeTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/WorkTypeChangeTest.kt
@@ -85,8 +85,8 @@ class WorkTypeChangeTest {
                     326,
                     status = "status",
                     workType = "work-type-a",
-                )
-            )
+                ),
+            ),
         )
         val actual = worksite.getWorkTypeChanges(start, emptyList(), updatedAtA)
         assertEquals(emptyChangesResult, actual)
@@ -106,8 +106,8 @@ class WorkTypeChangeTest {
                     326,
                     status = "status",
                     workType = "work-type-a",
-                )
-            )
+                ),
+            ),
         )
         val actual = worksite.getWorkTypeChanges(start, change, updatedAtA)
         assertEquals(emptyChangesResult, actual)
@@ -132,9 +132,9 @@ class WorkTypeChangeTest {
                             -1,
                             workType = "work-type-a",
                             status = "status-b",
-                        )
-                    )
-                )
+                        ),
+                    ),
+                ),
             ),
             actual,
         )
@@ -154,8 +154,8 @@ class WorkTypeChangeTest {
                     326,
                     status = "status",
                     workType = "work-type-a",
-                )
-            )
+                ),
+            ),
         )
         val actual = worksite.getWorkTypeChanges(start, change, updatedAtA)
         assertEquals(emptyChangesResult, actual)
@@ -171,8 +171,8 @@ class WorkTypeChangeTest {
                     326,
                     status = "status",
                     workType = "work-type-a",
-                )
-            )
+                ),
+            ),
         )
         val actual = worksite.getWorkTypeChanges(start, change, updatedAtA)
         assertEquals(emptyChangesResult, actual)
@@ -193,7 +193,7 @@ class WorkTypeChangeTest {
                     status = "status",
                     workType = "work-type-b",
                 ),
-            )
+            ),
         )
         val actual = worksite.getWorkTypeChanges(start, emptyList(), updatedAtA)
         assertEquals(emptyChangesResult.copy(third = listOf(326L)), actual)
@@ -215,7 +215,7 @@ class WorkTypeChangeTest {
                     phase = 2,
                     recur = "recur",
                 ),
-            )
+            ),
         )
 
         val actual = worksite.getWorkTypeChanges(emptyList(), change, updatedAtA)
@@ -233,7 +233,7 @@ class WorkTypeChangeTest {
                     status = "status-b",
                     workType = "work-type-a",
                 ),
-            )
+            ),
         )
         assertEquals(emptyChangesResult.copy(first = expectedChanges), actual)
     }
@@ -254,7 +254,7 @@ class WorkTypeChangeTest {
                     phase = 2,
                     recur = "recur",
                 ),
-            )
+            ),
         )
 
         val actual = worksite.getWorkTypeChanges(emptyList(), change, updatedAtA)
@@ -276,7 +276,7 @@ class WorkTypeChangeTest {
                 updatedAtA,
                 isClaimChange = false,
                 isStatusChange = true,
-            )
+            ),
         )
         assertEquals(emptyChangesResult.copy(second = expectedChanges), actual)
     }
@@ -334,7 +334,7 @@ class WorkTypeChangeTest {
                     orgClaim = 471,
                     phase = 4,
                 ),
-            )
+            ),
         )
         val actual = worksite.getWorkTypeChanges(start, change, updatedAtA)
         val expectedChanges = listOf(
@@ -427,4 +427,4 @@ private fun testWorkTypeSnapshot(
         status = status,
         workType = workType,
     ),
-)
\ No newline at end of file
+)
diff --git a/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/WorksiteCoreChangeTest.kt b/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/WorksiteCoreChangeTest.kt
index ece218773..561834fa9 100644
--- a/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/WorksiteCoreChangeTest.kt
+++ b/core/network/src/test/java/com/crisiscleanup/core/network/worksitechange/WorksiteCoreChangeTest.kt
@@ -53,7 +53,7 @@ class WorksiteCoreChangeTest {
                 createdAtA,
                 status = "status-min",
                 workType = "work-type-min",
-            )
+            ),
         ),
     )
     private val fullyDefinedWorksite = NetworkWorksiteFull(
@@ -73,16 +73,16 @@ class WorksiteCoreChangeTest {
                 "key",
                 9684,
                 "patient",
-                NetworkEvent.Description("key", "description", "name")
+                NetworkEvent.Description("key", "description", "name"),
             ),
         ),
         favorite = NetworkType(38, "favorite", createdAtA),
         files = emptyList(),
         flags = listOf(
-            NetworkFlag(53853, "action", createdAtA, false, "notes", "reason", null)
+            NetworkFlag(53853, "action", createdAtA, false, "notes", "reason", null),
         ),
         formData = listOf(
-            KeyDynamicValuePair("key", DynamicValue("dynamic-value"))
+            KeyDynamicValuePair("key", DynamicValue("dynamic-value")),
         ),
         incident = 875,
         keyWorkType = NetworkWorkType(
@@ -247,7 +247,7 @@ class WorksiteCoreChangeTest {
             keyWorkType = null,
             location = NetworkWorksiteFull.Location(
                 "Point",
-                listOf(changeSnapshot.longitude, changeSnapshot.latitude)
+                listOf(changeSnapshot.longitude, changeSnapshot.latitude),
             ),
             name = changeSnapshot.name,
             phone1 = changeSnapshot.phone1,
@@ -318,7 +318,7 @@ class WorksiteCoreChangeTest {
             keyWorkType = null,
             location = NetworkWorksiteFull.Location(
                 "Point",
-                listOf(changeSnapshot.longitude, changeSnapshot.latitude)
+                listOf(changeSnapshot.longitude, changeSnapshot.latitude),
             ),
             name = changeSnapshot.name,
             phone1 = changeSnapshot.phone1,
@@ -390,4 +390,4 @@ class WorksiteCoreChangeTest {
         )
         assertEquals(expected, actual)
     }
-}
\ No newline at end of file
+}
diff --git a/core/renderscript-toolkit/src/main/AndroidManifest.xml b/core/renderscript-toolkit/src/main/AndroidManifest.xml
index a5918e68a..972c3a837 100644
--- a/core/renderscript-toolkit/src/main/AndroidManifest.xml
+++ b/core/renderscript-toolkit/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/core/renderscript-toolkit/src/main/java/com/google/android/renderscript/Toolkit.kt b/core/renderscript-toolkit/src/main/java/com/google/android/renderscript/Toolkit.kt
index 8d761cb74..b0ec75505 100644
--- a/core/renderscript-toolkit/src/main/java/com/google/android/renderscript/Toolkit.kt
+++ b/core/renderscript-toolkit/src/main/java/com/google/android/renderscript/Toolkit.kt
@@ -1,19 +1,3 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package com.google.android.renderscript
 
 import android.graphics.Bitmap
@@ -79,15 +63,15 @@ object Toolkit {
         destArray: ByteArray,
         sizeX: Int,
         sizeY: Int,
-        restriction: Range2d? = null
+        restriction: Range2d? = null,
     ) {
         require(sourceArray.size >= sizeX * sizeY * 4) {
             "$externalName blend. sourceArray is too small for the given dimensions. " +
-                    "$sizeX*$sizeY*4 < ${sourceArray.size}."
+                "$sizeX*$sizeY*4 < ${sourceArray.size}."
         }
         require(destArray.size >= sizeX * sizeY * 4) {
             "$externalName blend. sourceArray is too small for the given dimensions. " +
-                    "$sizeX*$sizeY*4 < ${sourceArray.size}."
+                "$sizeX*$sizeY*4 < ${sourceArray.size}."
         }
         validateRestriction("blend", sizeX, sizeY, restriction)
 
@@ -121,21 +105,21 @@ object Toolkit {
         mode: BlendingMode,
         sourceBitmap: Bitmap,
         destBitmap: Bitmap,
-        restriction: Range2d? = null
+        restriction: Range2d? = null,
     ) {
         validateBitmap("blend", sourceBitmap)
         validateBitmap("blend", destBitmap)
         require(
             sourceBitmap.width == destBitmap.width &&
-                    sourceBitmap.height == destBitmap.height
+                sourceBitmap.height == destBitmap.height,
         ) {
             "$externalName blend. Source and destination bitmaps should be the same size. " +
-                    "${sourceBitmap.width}x${sourceBitmap.height} and " +
-                    "${destBitmap.width}x${destBitmap.height} provided."
+                "${sourceBitmap.width}x${sourceBitmap.height} and " +
+                "${destBitmap.width}x${destBitmap.height} provided."
         }
         require(sourceBitmap.config == destBitmap.config) {
             "RenderScript Toolkit blend. Source and destination bitmaps should have the same " +
-                    "config. ${sourceBitmap.config} and ${destBitmap.config} provided."
+                "config. ${sourceBitmap.config} and ${destBitmap.config} provided."
         }
         validateRestriction("blend", sourceBitmap.width, sourceBitmap.height, restriction)
 
@@ -179,14 +163,14 @@ object Toolkit {
         sizeX: Int,
         sizeY: Int,
         radius: Int = 5,
-        restriction: Range2d? = null
+        restriction: Range2d? = null,
     ): ByteArray {
         require(vectorSize == 1 || vectorSize == 4) {
             "$externalName blur. The vectorSize should be 1 or 4. $vectorSize provided."
         }
         require(inputArray.size >= sizeX * sizeY * vectorSize) {
             "$externalName blur. inputArray is too small for the given dimensions. " +
-                    "$sizeX*$sizeY*$vectorSize < ${inputArray.size}."
+                "$sizeX*$sizeY*$vectorSize < ${inputArray.size}."
         }
         require(radius in 1..25) {
             "$externalName blur. The radius should be between 1 and 25. $radius provided."
@@ -195,7 +179,14 @@ object Toolkit {
 
         val outputArray = ByteArray(inputArray.size)
         nativeBlur(
-            nativeHandle, inputArray, vectorSize, sizeX, sizeY, radius, outputArray, restriction
+            nativeHandle,
+            inputArray,
+            vectorSize,
+            sizeX,
+            sizeY,
+            radius,
+            outputArray,
+            restriction,
         )
         return outputArray
     }
@@ -250,7 +241,7 @@ object Toolkit {
             1f, 0f, 0f, 0f,
             0f, 1f, 0f, 0f,
             0f, 0f, 1f, 0f,
-            0f, 0f, 0f, 1f
+            0f, 0f, 0f, 1f,
         )
 
     /**
@@ -264,7 +255,7 @@ object Toolkit {
             0.299f, 0.299f, 0.299f, 0f,
             0.587f, 0.587f, 0.587f, 0f,
             0.114f, 0.114f, 0.114f, 0f,
-            0f, 0f, 0f, 1f
+            0f, 0f, 0f, 1f,
         )
 
     /**
@@ -282,7 +273,7 @@ object Toolkit {
             0.299f, -0.14713f, 0.615f, 0f,
             0.587f, -0.28886f, -0.51499f, 0f,
             0.114f, 0.436f, -0.10001f, 0f,
-            0f, 0f, 0f, 1f
+            0f, 0f, 0f, 1f,
         )
 
     /**
@@ -300,7 +291,7 @@ object Toolkit {
             1f, 1f, 1f, 0f,
             0f, -0.39465f, 2.03211f, 0f,
             1.13983f, -0.5806f, 0f, 0f,
-            0f, 0f, 0f, 1f
+            0f, 0f, 0f, 1f,
         )
 
     /**
@@ -342,33 +333,33 @@ object Toolkit {
         outputVectorSize: Int,
         matrix: FloatArray,
         addVector: FloatArray = floatArrayOf(0f, 0f, 0f, 0f),
-        restriction: Range2d? = null
+        restriction: Range2d? = null,
     ): ByteArray {
         require(inputVectorSize in 1..4) {
             "$externalName colorMatrix. The inputVectorSize should be between 1 and 4. " +
-                    "$inputVectorSize provided."
+                "$inputVectorSize provided."
         }
         require(outputVectorSize in 1..4) {
             "$externalName colorMatrix. The outputVectorSize should be between 1 and 4. " +
-                    "$outputVectorSize provided."
+                "$outputVectorSize provided."
         }
         require(inputArray.size >= sizeX * sizeY * inputVectorSize) {
             "$externalName colorMatrix. inputArray is too small for the given dimensions. " +
-                    "$sizeX*$sizeY*$inputVectorSize < ${inputArray.size}."
+                "$sizeX*$sizeY*$inputVectorSize < ${inputArray.size}."
         }
         require(matrix.size == 16) {
             "$externalName colorMatrix. matrix should have 16 entries. ${matrix.size} provided."
         }
         require(addVector.size == 4) {
             "$externalName colorMatrix. addVector should have 4 entries. " +
-                    "${addVector.size} provided."
+                "${addVector.size} provided."
         }
         validateRestriction("colorMatrix", sizeX, sizeY, restriction)
 
         val outputArray = ByteArray(sizeX * sizeY * paddedSize(outputVectorSize))
         nativeColorMatrix(
             nativeHandle, inputArray, inputVectorSize, sizeX, sizeY, outputArray, outputVectorSize,
-            matrix, addVector, restriction
+            matrix, addVector, restriction,
         )
         return outputArray
     }
@@ -400,7 +391,7 @@ object Toolkit {
         inputBitmap: Bitmap,
         matrix: FloatArray,
         addVector: FloatArray = floatArrayOf(0f, 0f, 0f, 0f),
-        restriction: Range2d? = null
+        restriction: Range2d? = null,
     ): Bitmap {
         validateBitmap("colorMatrix", inputBitmap)
         require(matrix.size == 16) {
@@ -418,7 +409,7 @@ object Toolkit {
             outputBitmap,
             matrix,
             addVector,
-            restriction
+            restriction,
         )
         return outputBitmap
     }
@@ -463,19 +454,19 @@ object Toolkit {
         sizeX: Int,
         sizeY: Int,
         coefficients: FloatArray,
-        restriction: Range2d? = null
+        restriction: Range2d? = null,
     ): ByteArray {
         require(vectorSize in 1..4) {
             "$externalName convolve. The vectorSize should be between 1 and 4. " +
-                    "$vectorSize provided."
+                "$vectorSize provided."
         }
         require(inputArray.size >= sizeX * sizeY * vectorSize) {
             "$externalName convolve. inputArray is too small for the given dimensions. " +
-                    "$sizeX*$sizeY*$vectorSize < ${inputArray.size}."
+                "$sizeX*$sizeY*$vectorSize < ${inputArray.size}."
         }
         require(coefficients.size == 9 || coefficients.size == 25) {
             "$externalName convolve. Only 3x3 or 5x5 convolutions are supported. " +
-                    "${coefficients.size} coefficients provided."
+                "${coefficients.size} coefficients provided."
         }
         validateRestriction("convolve", sizeX, sizeY, restriction)
 
@@ -488,7 +479,7 @@ object Toolkit {
             sizeY,
             outputArray,
             coefficients,
-            restriction
+            restriction,
         )
         return outputArray
     }
@@ -520,12 +511,12 @@ object Toolkit {
     fun convolve(
         inputBitmap: Bitmap,
         coefficients: FloatArray,
-        restriction: Range2d? = null
+        restriction: Range2d? = null,
     ): Bitmap {
         validateBitmap("convolve", inputBitmap)
         require(coefficients.size == 9 || coefficients.size == 25) {
             "$externalName convolve. Only 3x3 or 5x5 convolutions are supported. " +
-                    "${coefficients.size} coefficients provided."
+                "${coefficients.size} coefficients provided."
         }
         validateRestriction("convolve", inputBitmap, restriction)
 
@@ -567,15 +558,15 @@ object Toolkit {
         vectorSize: Int,
         sizeX: Int,
         sizeY: Int,
-        restriction: Range2d? = null
+        restriction: Range2d? = null,
     ): IntArray {
         require(vectorSize in 1..4) {
             "$externalName histogram. The vectorSize should be between 1 and 4. " +
-                    "$vectorSize provided."
+                "$vectorSize provided."
         }
         require(inputArray.size >= sizeX * sizeY * vectorSize) {
             "$externalName histogram. inputArray is too small for the given dimensions. " +
-                    "$sizeX*$sizeY*$vectorSize < ${inputArray.size}."
+                "$sizeX*$sizeY*$vectorSize < ${inputArray.size}."
         }
         validateRestriction("histogram", sizeX, sizeY, restriction)
 
@@ -587,7 +578,7 @@ object Toolkit {
             sizeX,
             sizeY,
             outputArray,
-            restriction
+            restriction,
         )
         return outputArray
     }
@@ -619,7 +610,7 @@ object Toolkit {
     @JvmOverloads
     fun histogram(
         inputBitmap: Bitmap,
-        restriction: Range2d? = null
+        restriction: Range2d? = null,
     ): IntArray {
         validateBitmap("histogram", inputBitmap)
         validateRestriction("histogram", inputBitmap, restriction)
@@ -668,15 +659,15 @@ object Toolkit {
         sizeX: Int,
         sizeY: Int,
         coefficients: FloatArray? = null,
-        restriction: Range2d? = null
+        restriction: Range2d? = null,
     ): IntArray {
         require(vectorSize in 1..4) {
             "$externalName histogramDot. The vectorSize should be between 1 and 4. " +
-                    "$vectorSize provided."
+                "$vectorSize provided."
         }
         require(inputArray.size >= sizeX * sizeY * vectorSize) {
             "$externalName histogramDot. inputArray is too small for the given dimensions. " +
-                    "$sizeX*$sizeY*$vectorSize < ${inputArray.size}."
+                "$sizeX*$sizeY*$vectorSize < ${inputArray.size}."
         }
         validateHistogramDotCoefficients(coefficients, vectorSize)
         validateRestriction("histogramDot", sizeX, sizeY, restriction)
@@ -691,7 +682,7 @@ object Toolkit {
             sizeY,
             outputArray,
             actualCoefficients,
-            restriction
+            restriction,
         )
         return outputArray
     }
@@ -728,7 +719,7 @@ object Toolkit {
     fun histogramDot(
         inputBitmap: Bitmap,
         coefficients: FloatArray? = null,
-        restriction: Range2d? = null
+        restriction: Range2d? = null,
     ): IntArray {
         validateBitmap("histogramDot", inputBitmap)
         validateHistogramDotCoefficients(coefficients, vectorSize(inputBitmap))
@@ -737,7 +728,11 @@ object Toolkit {
         val outputArray = IntArray(256)
         val actualCoefficients = coefficients ?: floatArrayOf(0.299f, 0.587f, 0.114f, 0f)
         nativeHistogramDotBitmap(
-            nativeHandle, inputBitmap, outputArray, actualCoefficients, restriction
+            nativeHandle,
+            inputBitmap,
+            outputArray,
+            actualCoefficients,
+            restriction,
         )
         return outputArray
     }
@@ -773,11 +768,11 @@ object Toolkit {
         sizeX: Int,
         sizeY: Int,
         table: LookupTable,
-        restriction: Range2d? = null
+        restriction: Range2d? = null,
     ): ByteArray {
         require(inputArray.size >= sizeX * sizeY * 4) {
             "$externalName lut. inputArray is too small for the given dimensions. " +
-                    "$sizeX*$sizeY*4 < ${inputArray.size}."
+                "$sizeX*$sizeY*4 < ${inputArray.size}."
         }
         validateRestriction("lut", sizeX, sizeY, restriction)
 
@@ -792,7 +787,7 @@ object Toolkit {
             table.green,
             table.blue,
             table.alpha,
-            restriction
+            restriction,
         )
         return outputArray
     }
@@ -822,7 +817,7 @@ object Toolkit {
     fun lut(
         inputBitmap: Bitmap,
         table: LookupTable,
-        restriction: Range2d? = null
+        restriction: Range2d? = null,
     ): Bitmap {
         validateBitmap("lut", inputBitmap)
         validateRestriction("lut", inputBitmap, restriction)
@@ -836,7 +831,7 @@ object Toolkit {
             table.green,
             table.blue,
             table.alpha,
-            restriction
+            restriction,
         )
         return outputBitmap
     }
@@ -874,25 +869,25 @@ object Toolkit {
         sizeX: Int,
         sizeY: Int,
         cube: Rgba3dArray,
-        restriction: Range2d? = null
+        restriction: Range2d? = null,
     ): ByteArray {
         require(inputArray.size >= sizeX * sizeY * 4) {
             "$externalName lut3d. inputArray is too small for the given dimensions. " +
-                    "$sizeX*$sizeY*4 < ${inputArray.size}."
+                "$sizeX*$sizeY*4 < ${inputArray.size}."
         }
         require(
             cube.sizeX >= 2 && cube.sizeY >= 2 && cube.sizeZ >= 2 &&
-                    cube.sizeX <= 256 && cube.sizeY <= 256 && cube.sizeZ <= 256
+                cube.sizeX <= 256 && cube.sizeY <= 256 && cube.sizeZ <= 256,
         ) {
             "$externalName lut3d. The dimensions of the cube should be between 2 and 256. " +
-                    "(${cube.sizeX}, ${cube.sizeY}, ${cube.sizeZ}) provided."
+                "(${cube.sizeX}, ${cube.sizeY}, ${cube.sizeZ}) provided."
         }
         validateRestriction("lut3d", sizeX, sizeY, restriction)
 
         val outputArray = ByteArray(inputArray.size)
         nativeLut3d(
             nativeHandle, inputArray, outputArray, sizeX, sizeY, cube.values, cube.sizeX,
-            cube.sizeY, cube.sizeZ, restriction
+            cube.sizeY, cube.sizeZ, restriction,
         )
         return outputArray
     }
@@ -926,15 +921,21 @@ object Toolkit {
     fun lut3d(
         inputBitmap: Bitmap,
         cube: Rgba3dArray,
-        restriction: Range2d? = null
+        restriction: Range2d? = null,
     ): Bitmap {
         validateBitmap("lut3d", inputBitmap)
         validateRestriction("lut3d", inputBitmap, restriction)
 
         val outputBitmap = createCompatibleBitmap(inputBitmap)
         nativeLut3dBitmap(
-            nativeHandle, inputBitmap, outputBitmap, cube.values, cube.sizeX,
-            cube.sizeY, cube.sizeZ, restriction
+            nativeHandle,
+            inputBitmap,
+            outputBitmap,
+            cube.values,
+            cube.sizeX,
+            cube.sizeY,
+            cube.sizeZ,
+            restriction,
         )
         return outputBitmap
     }
@@ -974,14 +975,14 @@ object Toolkit {
         inputSizeY: Int,
         outputSizeX: Int,
         outputSizeY: Int,
-        restriction: Range2d? = null
+        restriction: Range2d? = null,
     ): ByteArray {
         require(vectorSize in 1..4) {
             "$externalName resize. The vectorSize should be between 1 and 4. $vectorSize provided."
         }
         require(inputArray.size >= inputSizeX * inputSizeY * vectorSize) {
             "$externalName resize. inputArray is too small for the given dimensions. " +
-                    "$inputSizeX*$inputSizeY*$vectorSize < ${inputArray.size}."
+                "$inputSizeX*$inputSizeY*$vectorSize < ${inputArray.size}."
         }
         validateRestriction("resize", outputSizeX, outputSizeY, restriction)
 
@@ -995,7 +996,7 @@ object Toolkit {
             outputArray,
             outputSizeX,
             outputSizeY,
-            restriction
+            restriction,
         )
         return outputArray
     }
@@ -1025,7 +1026,7 @@ object Toolkit {
         inputBitmap: Bitmap,
         outputSizeX: Int,
         outputSizeY: Int,
-        restriction: Range2d? = null
+        restriction: Range2d? = null,
     ): Bitmap {
         validateBitmap("resize", inputBitmap)
         validateRestriction("resize", outputSizeX, outputSizeY, restriction)
@@ -1053,7 +1054,7 @@ object Toolkit {
     fun yuvToRgb(inputArray: ByteArray, sizeX: Int, sizeY: Int, format: YuvFormat): ByteArray {
         require(sizeX % 2 == 0 && sizeY % 2 == 0) {
             "$externalName yuvToRgb. Non-even dimensions are not supported. " +
-                    "$sizeX and $sizeY were provided."
+                "$sizeX and $sizeY were provided."
         }
 
         val outputArray = ByteArray(sizeX * sizeY * 4)
@@ -1079,7 +1080,7 @@ object Toolkit {
     fun yuvToRgbBitmap(inputArray: ByteArray, sizeX: Int, sizeY: Int, format: YuvFormat): Bitmap {
         require(sizeX % 2 == 0 && sizeY % 2 == 0) {
             "$externalName yuvToRgbBitmap. Non-even dimensions are not supported. " +
-                    "$sizeX and $sizeY were provided."
+                "$sizeX and $sizeY were provided."
         }
 
         val outputBitmap = Bitmap.createBitmap(sizeX, sizeY, Bitmap.Config.ARGB_8888)
@@ -1118,7 +1119,7 @@ object Toolkit {
         destArray: ByteArray,
         sizeX: Int,
         sizeY: Int,
-        restriction: Range2d?
+        restriction: Range2d?,
     )
 
     private external fun nativeBlendBitmap(
@@ -1126,7 +1127,7 @@ object Toolkit {
         mode: Int,
         sourceBitmap: Bitmap,
         destBitmap: Bitmap,
-        restriction: Range2d?
+        restriction: Range2d?,
     )
 
     private external fun nativeBlur(
@@ -1137,7 +1138,7 @@ object Toolkit {
         sizeY: Int,
         radius: Int,
         outputArray: ByteArray,
-        restriction: Range2d?
+        restriction: Range2d?,
     )
 
     private external fun nativeBlurBitmap(
@@ -1145,7 +1146,7 @@ object Toolkit {
         inputBitmap: Bitmap,
         outputBitmap: Bitmap,
         radius: Int,
-        restriction: Range2d?
+        restriction: Range2d?,
     )
 
     private external fun nativeColorMatrix(
@@ -1158,7 +1159,7 @@ object Toolkit {
         outputVectorSize: Int,
         matrix: FloatArray,
         addVector: FloatArray,
-        restriction: Range2d?
+        restriction: Range2d?,
     )
 
     private external fun nativeColorMatrixBitmap(
@@ -1167,7 +1168,7 @@ object Toolkit {
         outputBitmap: Bitmap,
         matrix: FloatArray,
         addVector: FloatArray,
-        restriction: Range2d?
+        restriction: Range2d?,
     )
 
     private external fun nativeConvolve(
@@ -1178,7 +1179,7 @@ object Toolkit {
         sizeY: Int,
         outputArray: ByteArray,
         coefficients: FloatArray,
-        restriction: Range2d?
+        restriction: Range2d?,
     )
 
     private external fun nativeConvolveBitmap(
@@ -1186,7 +1187,7 @@ object Toolkit {
         inputBitmap: Bitmap,
         outputBitmap: Bitmap,
         coefficients: FloatArray,
-        restriction: Range2d?
+        restriction: Range2d?,
     )
 
     private external fun nativeHistogram(
@@ -1196,14 +1197,14 @@ object Toolkit {
         sizeX: Int,
         sizeY: Int,
         outputArray: IntArray,
-        restriction: Range2d?
+        restriction: Range2d?,
     )
 
     private external fun nativeHistogramBitmap(
         nativeHandle: Long,
         inputBitmap: Bitmap,
         outputArray: IntArray,
-        restriction: Range2d?
+        restriction: Range2d?,
     )
 
     private external fun nativeHistogramDot(
@@ -1214,7 +1215,7 @@ object Toolkit {
         sizeY: Int,
         outputArray: IntArray,
         coefficients: FloatArray,
-        restriction: Range2d?
+        restriction: Range2d?,
     )
 
     private external fun nativeHistogramDotBitmap(
@@ -1222,7 +1223,7 @@ object Toolkit {
         inputBitmap: Bitmap,
         outputArray: IntArray,
         coefficients: FloatArray,
-        restriction: Range2d?
+        restriction: Range2d?,
     )
 
     private external fun nativeLut(
@@ -1235,7 +1236,7 @@ object Toolkit {
         green: ByteArray,
         blue: ByteArray,
         alpha: ByteArray,
-        restriction: Range2d?
+        restriction: Range2d?,
     )
 
     private external fun nativeLutBitmap(
@@ -1246,7 +1247,7 @@ object Toolkit {
         green: ByteArray,
         blue: ByteArray,
         alpha: ByteArray,
-        restriction: Range2d?
+        restriction: Range2d?,
     )
 
     private external fun nativeLut3d(
@@ -1259,7 +1260,7 @@ object Toolkit {
         cubeSizeX: Int,
         cubeSizeY: Int,
         cubeSizeZ: Int,
-        restriction: Range2d?
+        restriction: Range2d?,
     )
 
     private external fun nativeLut3dBitmap(
@@ -1270,7 +1271,7 @@ object Toolkit {
         cubeSizeX: Int,
         cubeSizeY: Int,
         cubeSizeZ: Int,
-        restriction: Range2d?
+        restriction: Range2d?,
     )
 
     private external fun nativeResize(
@@ -1282,14 +1283,14 @@ object Toolkit {
         outputArray: ByteArray,
         outputSizeX: Int,
         outputSizeY: Int,
-        restriction: Range2d?
+        restriction: Range2d?,
     )
 
     private external fun nativeResizeBitmap(
         nativeHandle: Long,
         inputBitmap: Bitmap,
         outputBitmap: Bitmap,
-        restriction: Range2d?
+        restriction: Range2d?,
     )
 
     private external fun nativeYuvToRgb(
@@ -1298,7 +1299,7 @@ object Toolkit {
         outputArray: ByteArray,
         sizeX: Int,
         sizeY: Int,
-        format: Int
+        format: Int,
     )
 
     private external fun nativeYuvToRgbBitmap(
@@ -1307,7 +1308,7 @@ object Toolkit {
         sizeX: Int,
         sizeY: Int,
         outputBitmap: Bitmap,
-        value: Int
+        value: Int,
     )
 }
 
@@ -1400,7 +1401,7 @@ enum class BlendingMode(val value: Int) {
     /**
      * dest = max(dest - src, 0.0)
      */
-    SUBTRACT(14)
+    SUBTRACT(14),
 }
 
 /**
@@ -1440,7 +1441,7 @@ data class Range2d(
     val startX: Int,
     val endX: Int,
     val startY: Int,
-    val endY: Int
+    val endY: Int,
 ) {
     constructor() : this(0, 0, 0, 0)
 }
@@ -1474,26 +1475,26 @@ class Rgba3dArray(val values: ByteArray, val sizeX: Int, val sizeY: Int, val siz
 internal fun validateBitmap(
     function: String,
     inputBitmap: Bitmap,
-    alphaAllowed: Boolean = true
+    alphaAllowed: Boolean = true,
 ) {
     if (alphaAllowed) {
         require(
             inputBitmap.config == Bitmap.Config.ARGB_8888 ||
-                    inputBitmap.config == Bitmap.Config.ALPHA_8
+                inputBitmap.config == Bitmap.Config.ALPHA_8,
         ) {
             "$externalName. $function supports only ARGB_8888 and ALPHA_8 bitmaps. " +
-                    "${inputBitmap.config} provided."
+                "${inputBitmap.config} provided."
         }
     } else {
         require(inputBitmap.config == Bitmap.Config.ARGB_8888) {
             "$externalName. $function supports only ARGB_8888. " +
-                    "${inputBitmap.config} provided."
+                "${inputBitmap.config} provided."
         }
     }
     require(inputBitmap.width * vectorSize(inputBitmap) == inputBitmap.rowBytes) {
         "$externalName $function. Only bitmaps with rowSize equal to the width * vectorSize are " +
-                "currently supported. Provided were rowBytes=${inputBitmap.rowBytes}, " +
-                "width={${inputBitmap.width}, and vectorSize=${vectorSize(inputBitmap)}."
+            "currently supported. Provided were rowBytes=${inputBitmap.rowBytes}, " +
+            "width={${inputBitmap.width}, and vectorSize=${vectorSize(inputBitmap)}."
     }
 }
 
@@ -1502,7 +1503,7 @@ internal fun createCompatibleBitmap(inputBitmap: Bitmap) =
 
 internal fun validateHistogramDotCoefficients(
     coefficients: FloatArray?,
-    vectorSize: Int
+    vectorSize: Int,
 ) {
     require(coefficients == null || coefficients.size == vectorSize) {
         "$externalName histogramDot. The coefficients should be null or have $vectorSize values."
@@ -1512,7 +1513,7 @@ internal fun validateHistogramDotCoefficients(
         for (i in 0 until vectorSize) {
             require(coefficients[i] >= 0.0f) {
                 "$externalName histogramDot. Coefficients should not be negative. " +
-                        "Coefficient $i was ${coefficients[i]}."
+                    "Coefficient $i was ${coefficients[i]}."
             }
             sum += coefficients[i]
         }
@@ -1530,26 +1531,26 @@ internal fun validateRestriction(
     tag: String,
     sizeX: Int,
     sizeY: Int,
-    restriction: Range2d? = null
+    restriction: Range2d? = null,
 ) {
     if (restriction == null) return
     require(restriction.startX < sizeX && restriction.endX <= sizeX) {
         "$externalName $tag. sizeX should be greater than restriction.startX and greater " +
-                "or equal to restriction.endX. $sizeX, ${restriction.startX}, " +
-                "and ${restriction.endX} were provided respectively."
+            "or equal to restriction.endX. $sizeX, ${restriction.startX}, " +
+            "and ${restriction.endX} were provided respectively."
     }
     require(restriction.startY < sizeY && restriction.endY <= sizeY) {
         "$externalName $tag. sizeY should be greater than restriction.startY and greater " +
-                "or equal to restriction.endY. $sizeY, ${restriction.startY}, " +
-                "and ${restriction.endY} were provided respectively."
+            "or equal to restriction.endY. $sizeY, ${restriction.startY}, " +
+            "and ${restriction.endY} were provided respectively."
     }
     require(restriction.startX < restriction.endX) {
         "$externalName $tag. Restriction startX should be less than endX. " +
-                "${restriction.startX} and ${restriction.endX} were provided respectively."
+            "${restriction.startX} and ${restriction.endX} were provided respectively."
     }
     require(restriction.startY < restriction.endY) {
         "$externalName $tag. Restriction startY should be less than endY. " +
-                "${restriction.startY} and ${restriction.endY} were provided respectively."
+            "${restriction.startY} and ${restriction.endY} were provided respectively."
     }
 }
 
@@ -1558,7 +1559,7 @@ internal fun vectorSize(bitmap: Bitmap): Int {
         Bitmap.Config.ARGB_8888 -> 4
         Bitmap.Config.ALPHA_8 -> 1
         else -> throw IllegalArgumentException(
-            "$externalName. Only ARGB_8888 and ALPHA_8 Bitmap are supported."
+            "$externalName. Only ARGB_8888 and ALPHA_8 Bitmap are supported.",
         )
     }
 }
diff --git a/core/testerfeedback/src/main/java/com/crisiscleanup/core/testerfeedback/ScreenshotFeedbackTrigger.kt b/core/testerfeedback/src/main/java/com/crisiscleanup/core/testerfeedback/ScreenshotFeedbackTrigger.kt
index 82278c8ce..777b8050c 100644
--- a/core/testerfeedback/src/main/java/com/crisiscleanup/core/testerfeedback/ScreenshotFeedbackTrigger.kt
+++ b/core/testerfeedback/src/main/java/com/crisiscleanup/core/testerfeedback/ScreenshotFeedbackTrigger.kt
@@ -40,7 +40,7 @@ class ScreenshotFeedbackTrigger @Inject constructor(
         context.contentResolver?.registerContentObserver(
             MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
             true,
-            this
+            this,
         )
     }
 
@@ -89,4 +89,4 @@ class ScreenshotFeedbackTrigger @Inject constructor(
             logger.logException(e)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/testerfeedback/src/main/java/com/crisiscleanup/core/testerfeedback/ShakeFeedbackTrigger.kt b/core/testerfeedback/src/main/java/com/crisiscleanup/core/testerfeedback/ShakeFeedbackTrigger.kt
index 600837a22..bb39405a4 100644
--- a/core/testerfeedback/src/main/java/com/crisiscleanup/core/testerfeedback/ShakeFeedbackTrigger.kt
+++ b/core/testerfeedback/src/main/java/com/crisiscleanup/core/testerfeedback/ShakeFeedbackTrigger.kt
@@ -32,4 +32,4 @@ class ShakeFeedbackTrigger @Inject constructor(
     override fun hearShake() {
         feedbackReceiver.onStartFeedback("shake")
     }
-}
\ No newline at end of file
+}
diff --git a/core/testerfeedback/src/main/java/com/crisiscleanup/core/testerfeedback/TesterFeedbackTriggerProvider.kt b/core/testerfeedback/src/main/java/com/crisiscleanup/core/testerfeedback/TesterFeedbackTriggerProvider.kt
index e6fbf57c7..35c319888 100644
--- a/core/testerfeedback/src/main/java/com/crisiscleanup/core/testerfeedback/TesterFeedbackTriggerProvider.kt
+++ b/core/testerfeedback/src/main/java/com/crisiscleanup/core/testerfeedback/TesterFeedbackTriggerProvider.kt
@@ -9,4 +9,4 @@ class TesterFeedbackTriggerProvider @Inject constructor(
     screenshotTrigger: ScreenshotFeedbackTrigger,
 ) : FeedbackTriggerProvider {
     override val triggers: Collection<FeedbackTrigger> = listOf(shakeTrigger, screenshotTrigger)
-}
\ No newline at end of file
+}
diff --git a/core/testerfeedback/src/main/java/com/crisiscleanup/core/testerfeedback/di/AdditionalFeedbackTriggersModule.kt b/core/testerfeedback/src/main/java/com/crisiscleanup/core/testerfeedback/di/AdditionalFeedbackTriggersModule.kt
index 4f2101be3..ed778adb8 100644
--- a/core/testerfeedback/src/main/java/com/crisiscleanup/core/testerfeedback/di/AdditionalFeedbackTriggersModule.kt
+++ b/core/testerfeedback/src/main/java/com/crisiscleanup/core/testerfeedback/di/AdditionalFeedbackTriggersModule.kt
@@ -15,4 +15,4 @@ interface AdditionalFeedbackTriggerModule {
     @Binds
     @FeedbackTriggerProviderKey(FeedbackTriggerProviders.Additional)
     fun bindsFeedbackTriggerProvider(provider: TesterFeedbackTriggerProvider): FeedbackTriggerProvider
-}
\ No newline at end of file
+}
diff --git a/core/testerfeedbackapi/src/main/java/com/crisiscleanup/core/testerfeedbackapi/FeedbackTriggerProvider.kt b/core/testerfeedbackapi/src/main/java/com/crisiscleanup/core/testerfeedbackapi/FeedbackTriggerProvider.kt
index 112052f79..d46d38efe 100644
--- a/core/testerfeedbackapi/src/main/java/com/crisiscleanup/core/testerfeedbackapi/FeedbackTriggerProvider.kt
+++ b/core/testerfeedbackapi/src/main/java/com/crisiscleanup/core/testerfeedbackapi/FeedbackTriggerProvider.kt
@@ -6,4 +6,4 @@ interface FeedbackTriggerProvider {
 
 class EmptyFeedbackTriggerProvider : FeedbackTriggerProvider {
     override val triggers = emptyList<FeedbackTrigger>()
-}
\ No newline at end of file
+}
diff --git a/core/testerfeedbackapi/src/main/java/com/crisiscleanup/core/testerfeedbackapi/UserFeedback.kt b/core/testerfeedbackapi/src/main/java/com/crisiscleanup/core/testerfeedbackapi/UserFeedback.kt
index 56ee71f40..3903c64f2 100644
--- a/core/testerfeedbackapi/src/main/java/com/crisiscleanup/core/testerfeedbackapi/UserFeedback.kt
+++ b/core/testerfeedbackapi/src/main/java/com/crisiscleanup/core/testerfeedbackapi/UserFeedback.kt
@@ -6,4 +6,4 @@ interface FeedbackReceiver {
     fun onStartFeedback(starterKey: String, payload: Bundle = Bundle.EMPTY)
 }
 
-interface FeedbackTrigger
\ No newline at end of file
+interface FeedbackTrigger
diff --git a/core/testerfeedbackapi/src/main/java/com/crisiscleanup/core/testerfeedbackapi/di/FeedbackTriggerModule.kt b/core/testerfeedbackapi/src/main/java/com/crisiscleanup/core/testerfeedbackapi/di/FeedbackTriggerModule.kt
index 3f012b3c7..906e90c8c 100644
--- a/core/testerfeedbackapi/src/main/java/com/crisiscleanup/core/testerfeedbackapi/di/FeedbackTriggerModule.kt
+++ b/core/testerfeedbackapi/src/main/java/com/crisiscleanup/core/testerfeedbackapi/di/FeedbackTriggerModule.kt
@@ -26,7 +26,7 @@ object FeedbackTriggerModule {
     @Provides
     @FeedbackTriggerProviderKey(FeedbackTriggerProviders.Default)
     fun providesFeedbackTriggers(
-        @FeedbackTriggerProviderKey(FeedbackTriggerProviders.Additional) triggerProvider: Optional<FeedbackTriggerProvider>
+        @FeedbackTriggerProviderKey(FeedbackTriggerProviders.Additional) triggerProvider: Optional<FeedbackTriggerProvider>,
     ): FeedbackTriggerProvider = triggerProvider.getOrNull() ?: EmptyFeedbackTriggerProvider()
 }
 
@@ -36,4 +36,4 @@ abstract class AdditionalFeedbackTriggerModule {
     @BindsOptionalOf
     @FeedbackTriggerProviderKey(FeedbackTriggerProviders.Additional)
     abstract fun providesFeedbackTriggerProvider(): FeedbackTriggerProvider
-}
\ No newline at end of file
+}
diff --git a/core/testing/src/main/java/com/crisiscleanup/core/testing/model/WorksiteModelUtil.kt b/core/testing/src/main/java/com/crisiscleanup/core/testing/model/WorksiteModelUtil.kt
index e6ea1953f..bca02251e 100644
--- a/core/testing/src/main/java/com/crisiscleanup/core/testing/model/WorksiteModelUtil.kt
+++ b/core/testing/src/main/java/com/crisiscleanup/core/testing/model/WorksiteModelUtil.kt
@@ -42,7 +42,7 @@ fun makeTestWorksite(
             createdAt = noteCreatedAt,
             isSurvivor = false,
             note = "worksite-note",
-        )
+        ),
     ),
     phone1 = "phone-1",
     phone2 = "phone-2",
@@ -59,8 +59,8 @@ fun makeTestWorksite(
             orgClaim = 513,
             statusLiteral = "status",
             workTypeLiteral = "work-type",
-        )
-    )
+        ),
+    ),
 )
 
 fun makeTestWorksiteFlag(
@@ -79,4 +79,4 @@ fun makeTestWorksiteFlag(
     reason = reason,
     requestedAction = "",
     attr = null,
-)
\ No newline at end of file
+)
diff --git a/core/testing/src/main/java/com/crisiscleanup/core/testing/repository/TestLocalAppPreferencesRepository.kt b/core/testing/src/main/java/com/crisiscleanup/core/testing/repository/TestLocalAppPreferencesRepository.kt
index f2ad0a9f1..6f895d05e 100644
--- a/core/testing/src/main/java/com/crisiscleanup/core/testing/repository/TestLocalAppPreferencesRepository.kt
+++ b/core/testing/src/main/java/com/crisiscleanup/core/testing/repository/TestLocalAppPreferencesRepository.kt
@@ -76,4 +76,4 @@ class TestLocalAppPreferencesRepository : LocalAppPreferencesRepository {
             _userData.tryEmit(current.copy(allowAllAnalytics = allowAll))
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/testing/src/main/java/com/crisiscleanup/core/testing/util/TestNavigationObserver.kt b/core/testing/src/main/java/com/crisiscleanup/core/testing/util/TestNavigationObserver.kt
index 8e3bc28bb..96c3db1d6 100644
--- a/core/testing/src/main/java/com/crisiscleanup/core/testing/util/TestNavigationObserver.kt
+++ b/core/testing/src/main/java/com/crisiscleanup/core/testing/util/TestNavigationObserver.kt
@@ -5,4 +5,4 @@ import com.crisiscleanup.core.common.NavigationObserver
 
 class TestNavigationObserver : NavigationObserver {
     override fun onRouteChange(route: String?, arguments: Bundle?) {}
-}
\ No newline at end of file
+}
diff --git a/core/ui/src/main/java/com/crisiscleanup/core/ui/AppLayoutArea.kt b/core/ui/src/main/java/com/crisiscleanup/core/ui/AppLayoutArea.kt
index b3f0cbed9..b0126e706 100644
--- a/core/ui/src/main/java/com/crisiscleanup/core/ui/AppLayoutArea.kt
+++ b/core/ui/src/main/java/com/crisiscleanup/core/ui/AppLayoutArea.kt
@@ -8,7 +8,7 @@ import androidx.compose.ui.unit.dp
 
 @Immutable
 data class AppLayoutArea(
-    val snackbarHostState: SnackbarHostState? = null
+    val snackbarHostState: SnackbarHostState? = null,
 ) {
     val isBottomSnackbarVisible: Boolean
         get() = snackbarHostState?.currentSnackbarData != null
diff --git a/core/ui/src/main/java/com/crisiscleanup/core/ui/JankStatsExtensions.kt b/core/ui/src/main/java/com/crisiscleanup/core/ui/JankStatsExtensions.kt
index bb73190dc..b55a0a689 100644
--- a/core/ui/src/main/java/com/crisiscleanup/core/ui/JankStatsExtensions.kt
+++ b/core/ui/src/main/java/com/crisiscleanup/core/ui/JankStatsExtensions.kt
@@ -29,7 +29,7 @@ fun rememberMetricsStateHolder(): Holder {
 @Composable
 fun TrackJank(
     vararg keys: Any?,
-    reportMetric: suspend CoroutineScope.(state: Holder) -> Unit
+    reportMetric: suspend CoroutineScope.(state: Holder) -> Unit,
 ) {
     val metrics = rememberMetricsStateHolder()
     LaunchedEffect(metrics, *keys) {
@@ -44,7 +44,7 @@ fun TrackJank(
 @Composable
 fun TrackDisposableJank(
     vararg keys: Any?,
-    reportMetric: DisposableEffectScope.(state: Holder) -> DisposableEffectResult
+    reportMetric: DisposableEffectScope.(state: Holder) -> DisposableEffectResult,
 ) {
     val metrics = rememberMetricsStateHolder()
     DisposableEffect(metrics, *keys) {
diff --git a/core/ui/src/main/java/com/crisiscleanup/core/ui/KeyboardUtil.kt b/core/ui/src/main/java/com/crisiscleanup/core/ui/KeyboardUtil.kt
index d3d3b95dd..80c951f30 100644
--- a/core/ui/src/main/java/com/crisiscleanup/core/ui/KeyboardUtil.kt
+++ b/core/ui/src/main/java/com/crisiscleanup/core/ui/KeyboardUtil.kt
@@ -54,4 +54,4 @@ fun screenKeyboardVisibility(): State<ScreenKeyboardVisibility> {
     }
 
     return keyboardState
-}
\ No newline at end of file
+}
diff --git a/core/ui/src/main/java/com/crisiscleanup/core/ui/MapOverlayMessage.kt b/core/ui/src/main/java/com/crisiscleanup/core/ui/MapOverlayMessage.kt
index d746ff365..bacacfa22 100644
--- a/core/ui/src/main/java/com/crisiscleanup/core/ui/MapOverlayMessage.kt
+++ b/core/ui/src/main/java/com/crisiscleanup/core/ui/MapOverlayMessage.kt
@@ -28,7 +28,7 @@ fun BoxScope.MapOverlayMessage(
             Modifier.padding(
                 horizontal = 16.dp,
                 vertical = 48.dp,
-            )
+            ),
         ) {
             Text(
                 text = message,
@@ -37,4 +37,4 @@ fun BoxScope.MapOverlayMessage(
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/ui/src/main/java/com/crisiscleanup/core/ui/ScrollUtil.kt b/core/ui/src/main/java/com/crisiscleanup/core/ui/ScrollUtil.kt
index 5cb50a997..c1dc16d8b 100644
--- a/core/ui/src/main/java/com/crisiscleanup/core/ui/ScrollUtil.kt
+++ b/core/ui/src/main/java/com/crisiscleanup/core/ui/ScrollUtil.kt
@@ -22,7 +22,7 @@ fun Modifier.touchDownConsumer(
             }
             else -> true
         }
-    }
+    },
 )
 
 fun Modifier.scrollFlingListener(
@@ -37,4 +37,4 @@ fun Modifier.scrollFlingListener(
         }
     }
     nestedScroll(nestedScrollConnection)
-}
\ No newline at end of file
+}
diff --git a/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/AccessTokenDecoder.kt b/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/AccessTokenDecoder.kt
index eff27d59f..fea504799 100644
--- a/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/AccessTokenDecoder.kt
+++ b/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/AccessTokenDecoder.kt
@@ -7,5 +7,5 @@ interface AccessTokenDecoder {
 }
 
 data class DecodedAccessToken(
-    val expiresAt: Instant
-)
\ No newline at end of file
+    val expiresAt: Instant,
+)
diff --git a/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/AuthenticateScreen.kt b/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/AuthenticateScreen.kt
index 53c19b9e5..a5e233a5c 100644
--- a/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/AuthenticateScreen.kt
+++ b/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/AuthenticateScreen.kt
@@ -99,12 +99,12 @@ fun AuthenticateScreen(
 @Composable
 private fun AuthenticateScreenContainer(
     modifier: Modifier = Modifier,
-    content: @Composable ColumnScope.() -> Unit
+    content: @Composable ColumnScope.() -> Unit,
 ) {
     Box(
         Modifier
             .fillMaxSize()
-            .then(modifier)
+            .then(modifier),
     ) {
         Column(Modifier.fillMaxWidth()) {
             content()
@@ -153,7 +153,7 @@ private fun LoginScreen(
     AuthenticateScreenContainer(
         Modifier
             .fillMaxSize()
-            .then(modifier)
+            .then(modifier),
     ) {
         CrisisCleanupLogoRow()
 
@@ -169,7 +169,7 @@ private fun LoginScreen(
         val isNotBusy by viewModel.isNotAuthenticating.collectAsStateWithLifecycle()
 
         val focusEmail = viewModel.loginInputData.emailAddress.isEmpty() ||
-                viewModel.isInvalidEmail.value
+            viewModel.isInvalidEmail.value
         val updateEmailInput =
             remember(viewModel) { { s: String -> viewModel.loginInputData.emailAddress = s } }
         val clearErrorVisuals = remember(viewModel) { { viewModel.clearErrorVisuals() } }
@@ -259,7 +259,7 @@ private fun AuthenticatedScreen(
     AuthenticateScreenContainer(
         Modifier
             .fillMaxSize()
-            .then(modifier)
+            .then(modifier),
     ) {
         CrisisCleanupLogoRow()
 
@@ -267,7 +267,7 @@ private fun AuthenticatedScreen(
             modifier = fillWidthPadded.testTag("authedProfileAccountInfo"),
             text = translator("info.account_is")
                 .replace("{full_name}", authState.accountData.fullName)
-                .replace("{email_address}", authState.accountData.emailAddress)
+                .replace("{email_address}", authState.accountData.emailAddress),
         )
 
         val authErrorMessage by viewModel.errorMessage
diff --git a/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/AuthenticationViewModel.kt b/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/AuthenticationViewModel.kt
index 56fe4685a..6aaa8659c 100644
--- a/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/AuthenticationViewModel.kt
+++ b/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/AuthenticationViewModel.kt
@@ -43,7 +43,9 @@ class AuthenticationViewModel @Inject constructor(
 ) : ViewModel() {
     private var isAuthenticating = MutableStateFlow(false)
     val isNotAuthenticating = isAuthenticating.map(Boolean::not).stateIn(
-        scope = viewModelScope, initialValue = true, started = SharingStarted.WhileSubscribed()
+        scope = viewModelScope,
+        initialValue = true,
+        started = SharingStarted.WhileSubscribed(),
     )
 
     val uiState: StateFlow<AuthenticateScreenUiState> = accountDataRepository.accountData.map {
@@ -213,4 +215,4 @@ class AuthenticationViewModel @Inject constructor(
 sealed interface AuthenticateScreenUiState {
     object Loading : AuthenticateScreenUiState
     data class Ready(val authenticationState: AuthenticationState) : AuthenticateScreenUiState
-}
\ No newline at end of file
+}
diff --git a/feature/authentication/src/main/res/values/strings.xml b/feature/authentication/src/main/res/values/strings.xml
index 089e62aef..175d049b8 100644
--- a/feature/authentication/src/main/res/values/strings.xml
+++ b/feature/authentication/src/main/res/values/strings.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--
         Fallback for when app loads initially.
diff --git a/feature/authentication/src/test/java/com/crisiscleanup/feature/authentication/AuthenticationViewModelTest.kt b/feature/authentication/src/test/java/com/crisiscleanup/feature/authentication/AuthenticationViewModelTest.kt
index 1147ebdaf..04753c5af 100644
--- a/feature/authentication/src/test/java/com/crisiscleanup/feature/authentication/AuthenticationViewModelTest.kt
+++ b/feature/authentication/src/test/java/com/crisiscleanup/feature/authentication/AuthenticationViewModelTest.kt
@@ -2,8 +2,8 @@ package com.crisiscleanup.feature.authentication
 
 import com.crisiscleanup.core.common.AndroidResourceProvider
 import com.crisiscleanup.core.common.InputValidator
+import com.crisiscleanup.core.common.KeyResourceTranslator
 import com.crisiscleanup.core.common.event.AuthEventBus
-import com.crisiscleanup.core.common.event.PasswordCredentials
 import com.crisiscleanup.core.common.log.AppLogger
 import com.crisiscleanup.core.data.repository.AccountDataRepository
 import com.crisiscleanup.core.data.repository.LocalAppPreferencesRepository
@@ -13,6 +13,7 @@ import com.crisiscleanup.core.model.data.EnglishLanguage
 import com.crisiscleanup.core.model.data.OrgData
 import com.crisiscleanup.core.model.data.SyncAttempt
 import com.crisiscleanup.core.model.data.UserData
+import com.crisiscleanup.core.model.data.WorksiteSortBy
 import com.crisiscleanup.core.model.data.emptyAccountData
 import com.crisiscleanup.core.network.model.NetworkAuthOrganization
 import com.crisiscleanup.core.network.model.NetworkAuthResult
@@ -28,7 +29,6 @@ import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOf
@@ -39,6 +39,7 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import kotlin.math.abs
+import kotlin.test.Ignore
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertNotEquals
@@ -67,6 +68,9 @@ class AuthenticationViewModelTest {
     @MockK
     lateinit var appPreferences: LocalAppPreferencesRepository
 
+    @MockK
+    lateinit var translator: KeyResourceTranslator
+
     @MockK
     lateinit var appLogger: AppLogger
 
@@ -75,7 +79,7 @@ class AuthenticationViewModelTest {
 
     private lateinit var viewModel: AuthenticationViewModel
 
-    private val passwordCredentialsStream = MutableSharedFlow<PasswordCredentials>(0)
+    // private val passwordCredentialsStream = MutableSharedFlow<PasswordCredentials>(0)
 
     @Before
     fun setUp() {
@@ -91,6 +95,7 @@ class AuthenticationViewModelTest {
                 expirySeconds = any(),
                 profilePictureUri = any(),
                 org = any(),
+                refreshToken = any(),
             )
         } returns Unit
 
@@ -106,16 +111,18 @@ class AuthenticationViewModelTest {
                 syncAttempt = SyncAttempt(0, 0, 0),
                 selectedIncidentId = 0,
                 languageKey = EnglishLanguage.key,
-            )
+                tableViewSortBy = WorksiteSortBy.None,
+                allowAllAnalytics = false,
+            ),
         )
 
         coEvery {
             appPreferences.incrementSaveCredentialsPrompt()
         } returns Unit
 
-        every {
-            authEventBus.passwordCredentialResults
-        } returns passwordCredentialsStream
+        // every {
+        //     authEventBus.passwordCredentialResults
+        // } returns passwordCredentialsStream
 
         every {
             accessTokenDecoder.decode("access-token")
@@ -130,22 +137,23 @@ class AuthenticationViewModelTest {
 
     private val nonEmptyAccountData = AccountData(
         id = 19,
-        "access-token",
         Clock.System.now().plus(1000.seconds),
-        "display-name",
-        "email-address",
-        "profile-picture-uri",
+        fullName = "display-name",
+        emailAddress = "email-address",
+        profilePictureUri = "profile-picture-uri",
         org = OrgData(813, "org"),
+        areTokensValid = false,
     )
 
     private fun buildViewModel() = AuthenticationViewModel(
         accountDataRepository,
         authApiClient,
         inputValidator,
-        accessTokenDecoder,
+//        accessTokenDecoder,
         authEventBus,
-        appPreferences,
-        resProvider,
+//        appPreferences,
+        translator,
+//        resProvider,
         UnconfinedTestDispatcher(),
         appLogger,
     )
@@ -154,6 +162,7 @@ class AuthenticationViewModelTest {
      * View model starts out as not authenticating
      */
     @Test
+    @Ignore("Auth flow will change. Ignoring this test for now...")
     fun initialState() = runTest {
         // Setup
         val accountDataFlow = flow { emit(emptyAccountData) }
@@ -166,6 +175,7 @@ class AuthenticationViewModelTest {
     }
 
     @Test
+    @Ignore("Auth flow will change. Ignoring this test for now...")
     fun notAuthenticated_authenticateEmailPassword() = runTest {
         // Setup
         val accountDataFlow = flow { emit(emptyAccountData) }
@@ -183,7 +193,8 @@ class AuthenticationViewModelTest {
         assertEquals(
             AuthenticationState(
                 accountData = emptyAccountData,
-            ), (viewModel.uiState.first() as Ready).authenticationState
+            ),
+            (viewModel.uiState.first() as Ready).authenticationState,
         )
         assertEquals(emptyLoginData, viewModel.loginInputData)
 
@@ -210,7 +221,7 @@ class AuthenticationViewModelTest {
                 id = 813,
                 name = "org",
                 isActive = true,
-            )
+            ),
         )
 
         // TODO How to test state during authentication?
@@ -220,6 +231,7 @@ class AuthenticationViewModelTest {
         coVerify(exactly = 1) {
             accountDataRepository.setAccount(
                 id = 534,
+                refreshToken = "refresh-token",
                 accessToken = "access-token",
                 email = "email@address.com",
                 firstName = "first-name",
@@ -241,6 +253,7 @@ class AuthenticationViewModelTest {
     // TODO Other paths in authenticateEmailPassword()
 
     @Test
+    @Ignore("Auth flow will change. Ignoring this test for now...")
     fun authenticated_logout() = runTest {
         // Setup
         val accountDataFlow = flow { emit(nonEmptyAccountData) }
@@ -258,7 +271,8 @@ class AuthenticationViewModelTest {
         assertEquals(
             AuthenticationState(
                 accountData = nonEmptyAccountData,
-            ), (viewModel.uiState.first() as Ready).authenticationState
+            ),
+            (viewModel.uiState.first() as Ready).authenticationState,
         )
 
         assertEquals(LoginInputData("email-address"), viewModel.loginInputData)
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseAddFlagViewModel.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseAddFlagViewModel.kt
index 338a1b3b3..02b84974e 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseAddFlagViewModel.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseAddFlagViewModel.kt
@@ -60,8 +60,11 @@ class CaseAddFlagViewModel @Inject constructor(
 ) : ViewModel() {
     private val caseAddFlagArgs = CaseAddFlagArgs(savedStateHandle)
     private val editableWorksite =
-        if (caseAddFlagArgs.isFromCaseEdit) editableWorksiteProvider.editableWorksite
-        else worksiteProvider.editableWorksite
+        if (caseAddFlagArgs.isFromCaseEdit) {
+            editableWorksiteProvider.editableWorksite
+        } else {
+            worksiteProvider.editableWorksite
+        }
     private val worksiteIn = editableWorksite.value
     private val flagsIn =
         worksiteIn.flags?.mapNotNull(WorksiteFlag::flagType)?.toSet() ?: emptySet()
@@ -265,9 +268,12 @@ class CaseAddFlagViewModel @Inject constructor(
         otherOrganizationsInvolved: List<OrganizationIdName>,
     ): List<Long> {
         val isQueryMatchingOrg = otherOrganizationsInvolved.isNotEmpty() &&
-                otherOrgQuery.trim() == otherOrganizationsInvolved.first().name.trim()
-        return if (isQueryMatchingOrg) listOf(otherOrganizationsInvolved.first().id)
-        else emptyList()
+            otherOrgQuery.trim() == otherOrganizationsInvolved.first().name.trim()
+        return if (isQueryMatchingOrg) {
+            listOf(otherOrganizationsInvolved.first().id)
+        } else {
+            emptyList()
+        }
     }
 
     fun onUpsetClient(
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseEditorDataLoader.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseEditorDataLoader.kt
index 13b73e93a..f2293b57c 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseEditorDataLoader.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseEditorDataLoader.kt
@@ -113,8 +113,11 @@ internal class CaseEditorDataLoader(
 
     val worksiteStream = worksiteIdStream
         .flatMapLatest { worksiteId ->
-            if (worksiteId == null || worksiteId <= 0) flowOf(null)
-            else worksitesRepository.streamLocalWorksite(worksiteId)
+            if (worksiteId == null || worksiteId <= 0) {
+                flowOf(null)
+            } else {
+                worksitesRepository.streamLocalWorksite(worksiteId)
+            }
         }
         .distinctUntilChanged()
         .flowOn(coroutineDispatcher)
@@ -193,8 +196,11 @@ internal class CaseEditorDataLoader(
             var worksiteState = loadedWorksite ?: EmptyWorksite.copy(
                 incidentId = incidentIdIn,
                 autoContactFrequencyT = AutoContactFrequency.Often.literal,
-                flags = if (networkMonitor.isOnline.first()) EmptyWorksite.flags
-                else listOf(WorksiteFlag.wrongLocation()),
+                flags = if (networkMonitor.isOnline.first()) {
+                    EmptyWorksite.flags
+                } else {
+                    listOf(WorksiteFlag.wrongLocation())
+                },
             )
 
             with(editableWorksiteProvider) {
@@ -252,8 +258,11 @@ internal class CaseEditorDataLoader(
                             formFields.map {
                                 with(it.formField) {
                                     val isRequired = requiredGroups.contains(group)
-                                    if (isRequired) "$label *"
-                                    else label
+                                    if (isRequired) {
+                                        "$label *"
+                                    } else {
+                                        label
+                                    }
                                 }
                             },
                         )
@@ -290,20 +299,20 @@ internal class CaseEditorDataLoader(
             }
 
             var isEditingAllowed = editSections.value.isNotEmpty() &&
-                    workTypeStatuses.isNotEmpty()
+                workTypeStatuses.isNotEmpty()
             var isNetworkLoadFinished = true
             var isLocalLoadFinished = true
             if (!isCreateWorksite) {
                 // Minimal state for editing to to begin
                 isEditingAllowed = isEditingAllowed &&
-                        localWorksite != null
+                    localWorksite != null
                 isNetworkLoadFinished = isEditingAllowed &&
-                        isPulled
+                    isPulled
                 // Reliable state for editing to begin.
                 // There are edge cases where network changes are still committing/propagating locally while this is true.
                 // If internet connection is not available this may never turn true.
                 isLocalLoadFinished = isNetworkLoadFinished &&
-                        worksiteState.formData?.isNotEmpty() == true
+                    worksiteState.formData?.isNotEmpty() == true
             }
             val isTranslationUpdated =
                 editableWorksiteProvider.formFieldTranslationLookup.isNotEmpty()
@@ -395,4 +404,4 @@ internal class CaseEditorDataLoader(
         worksiteIdStream.value = worksiteId
         dataLoadCountStream.value++
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseEditorViewModel.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseEditorViewModel.kt
index 5d8801676..e48d59b4d 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseEditorViewModel.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseEditorViewModel.kt
@@ -164,7 +164,7 @@ class CaseEditorViewModel @Inject constructor(
     val showClaimAndSave =
         editingWorksite.map {
             isCreateWorksite ||
-                    it.workTypes.firstOrNull { w -> w.orgClaim == null } != null
+                it.workTypes.firstOrNull { w -> w.orgClaim == null } != null
         }
 
     init {
@@ -220,9 +220,9 @@ class CaseEditorViewModel @Inject constructor(
         caseEditors = dataLoader.uiState
             .filter {
                 it.asCaseData()?.isNetworkLoadFinished == true &&
-                        editorSetInstant?.let { setInstant ->
-                            Clock.System.now().minus(setInstant) < editorSetWindow
-                        } ?: true
+                    editorSetInstant?.let { setInstant ->
+                        Clock.System.now().minus(setInstant) < editorSetWindow
+                    } ?: true
             }
             .mapLatest {
                 editorSetInstant = Clock.System.now()
@@ -270,9 +270,13 @@ class CaseEditorViewModel @Inject constructor(
                     propertyEditor.editIncidentWorksite,
                     locationEditor.editIncidentWorksite,
                 ) { w0, w1 ->
-                    if (w0.isDefined) w0
-                    else if (w1.isDefined) w1
-                    else w0
+                    if (w0.isDefined) {
+                        w0
+                    } else if (w1.isDefined) {
+                        w1
+                    } else {
+                        w0
+                    }
                 }
                     .distinctUntilChanged()
                     .onEach { identifier ->
@@ -359,8 +363,11 @@ class CaseEditorViewModel @Inject constructor(
 
     private fun updateHeaderTitle(caseNumber: String = "") {
         headerTitle.value = if (caseNumber.isEmpty()) {
-            if (isCreateWorksite) translate("casesVue.new_case")
-            else translate("nav.work_view_case")
+            if (isCreateWorksite) {
+                translate("casesVue.new_case")
+            } else {
+                translate("nav.work_view_case")
+            }
         } else {
             "${translate("actions.view")} $caseNumber"
         }
@@ -483,7 +490,7 @@ class CaseEditorViewModel @Inject constructor(
                     .updateKeyWorkType(initialWorksite)
                 val saveIncidentId = saveChangeIncident.id
                 val isIncidentChange = saveIncidentId != EmptyIncident.id &&
-                        saveIncidentId != worksite.incidentId
+                    saveIncidentId != worksite.incidentId
                 if (worksite == initialWorksite && !isIncidentChange) {
                     if (backOnSuccess) {
                         navigateBack.value = true
@@ -502,8 +509,11 @@ class CaseEditorViewModel @Inject constructor(
                 if (claimUnclaimed) {
                     workTypes = workTypes
                         .map {
-                            if (it.orgClaim != null) it
-                            else it.copy(orgClaim = editorStateData.orgId)
+                            if (it.orgClaim != null) {
+                                it
+                            } else {
+                                it.copy(orgClaim = editorStateData.orgId)
+                            }
                         }
                 }
 
@@ -512,8 +522,8 @@ class CaseEditorViewModel @Inject constructor(
                 val updatedReportedBy =
                     if (worksite.isNew) editorStateData.orgId else worksite.reportedBy
                 val clearWhat3Words = worksite.what3Words?.isNotBlank() == true &&
-                        worksite.latitude != initialWorksite.latitude ||
-                        worksite.longitude != initialWorksite.longitude
+                    worksite.latitude != initialWorksite.latitude ||
+                    worksite.longitude != initialWorksite.longitude
                 val updatedWhat3Words = if (clearWhat3Words) "" else worksite.what3Words
 
                 val updatedWorksite = worksite.copy(
@@ -581,8 +591,11 @@ class CaseEditorViewModel @Inject constructor(
             is LocationInputData -> {
                 val (isAddressError, message) = dataWriter.getUserErrorMessage()
                 val section =
-                    if (isAddressError) WorksiteSection.LocationAddress
-                    else WorksiteSection.Location
+                    if (isAddressError) {
+                        WorksiteSection.LocationAddress
+                    } else {
+                        WorksiteSection.Location
+                    }
                 invalidWorksiteInfo.value = InvalidWorksiteInfo(section, message)
                 showInvalidWorksiteSave.value = true
             }
@@ -683,7 +696,7 @@ sealed interface CaseEditorUiState {
         val isTranslationUpdated: Boolean,
     ) : CaseEditorUiState {
         val isPendingSync = !isLocalLoadFinished ||
-                localWorksite?.localChanges?.isLocalModified ?: false
+            localWorksite?.localChanges?.isLocalModified ?: false
     }
 
     data class Error(
@@ -727,7 +740,7 @@ internal data class CaseEditors(
         details,
         work,
         hazards,
-        volunteerReport
+        volunteerReport,
     ),
 ) {
     val dataWriters: List<CaseDataWriter> = mutableListOf(
@@ -737,4 +750,4 @@ internal data class CaseEditors(
     ).apply {
         addAll(formData.map(FormDataEditor::inputData))
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseHistoryViewModel.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseHistoryViewModel.kt
index 8bf8f6225..f345f4d1c 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseHistoryViewModel.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseHistoryViewModel.kt
@@ -23,7 +23,7 @@ class CaseHistoryViewModel @Inject constructor(
     editableWorksiteProvider: EditableWorksiteProvider,
     caseHistoryRepository: CaseHistoryRepository,
     val translator: KeyResourceTranslator,
-    @Dispatcher(CrisisCleanupDispatchers.IO) private val ioDispatcher: CoroutineDispatcher
+    @Dispatcher(CrisisCleanupDispatchers.IO) private val ioDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
     private val worksite = editableWorksiteProvider.editableWorksite.value
     private val worksiteId = worksite.id
@@ -53,4 +53,4 @@ class CaseHistoryViewModel @Inject constructor(
             hasEvents.value = eventCount > 0
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseShareViewModel.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseShareViewModel.kt
index ea6d450ee..eb61867d4 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseShareViewModel.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/CaseShareViewModel.kt
@@ -121,9 +121,9 @@ class CaseShareViewModel @Inject constructor(
         receiverContacts,
     ) { sharable, loading, sharing, contacts ->
         sharable &&
-                !loading &&
-                !sharing &&
-                contacts.isNotEmpty()
+            !loading &&
+            !sharing &&
+            contacts.isNotEmpty()
     }
 
     private val contactQuery = receiverContactSuggestion
@@ -257,4 +257,4 @@ data class ShareContactInfo(
     val name: String,
     val contactValue: String,
     val isEmail: Boolean,
-)
\ No newline at end of file
+)
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/EditCaseBaseViewModel.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/EditCaseBaseViewModel.kt
index 2300d4085..3290f69b6 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/EditCaseBaseViewModel.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/EditCaseBaseViewModel.kt
@@ -30,4 +30,4 @@ abstract class EditCaseBaseViewModel(
 
     override fun translate(phraseKey: String, fallbackResId: Int) =
         worksiteProvider.translate(phraseKey) ?: translator.translate(phraseKey, fallbackResId)
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/EditCaseLocationViewModel.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/EditCaseLocationViewModel.kt
index 8ece19efe..d8b413ecb 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/EditCaseLocationViewModel.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/EditCaseLocationViewModel.kt
@@ -170,9 +170,13 @@ internal class EditableLocationDataEditor(
 
     override val defaultMapZoom: Float
         get() {
-            val zoom = if (worksiteProvider.editableWorksite.value.address.isBlank()) 7
-            else if (isMoveLocationOnMapMode.value) 19
-            else 13
+            val zoom = if (worksiteProvider.editableWorksite.value.address.isBlank()) {
+                7
+            } else if (isMoveLocationOnMapMode.value) {
+                19
+            } else {
+                13
+            }
             return zoom + (Math.random() * 1e-3).toFloat()
         }
     private var zoomCache = defaultMapZoom
@@ -202,8 +206,10 @@ internal class EditableLocationDataEditor(
         incidentId = worksiteIn.incidentId
 
         if (worksite.isNew &&
-            (worksite.coordinates == EmptyWorksite.coordinates ||
-                    worksite.coordinates == DefaultCoordinates)
+            (
+                worksite.coordinates == EmptyWorksite.coordinates ||
+                    worksite.coordinates == DefaultCoordinates
+                )
         ) {
             val incidentBounds = worksiteProvider.incidentBounds
             var worksiteCoordinates: LatLng = incidentBounds.centroid
@@ -282,8 +288,11 @@ internal class EditableLocationDataEditor(
 
     override val mapMarkerIcon = isLocationInBounds
         .map {
-            if (it) inBoundsPinIcon
-            else outOfBoundsPinIcon
+            if (it) {
+                inBoundsPinIcon
+            } else {
+                outOfBoundsPinIcon
+            }
         }
         .flowOn(ioDispatcher)
         .stateIn(
@@ -294,8 +303,9 @@ internal class EditableLocationDataEditor(
 
     override val locationOutOfBoundsMessage = isLocationInBounds
         .map {
-            if (it) ""
-            else {
+            if (it) {
+                ""
+            } else {
                 translator("caseForm.case_outside_incident_name")
                     .replace("{incident_name}", worksiteProvider.incident.name)
             }
@@ -306,7 +316,6 @@ internal class EditableLocationDataEditor(
             started = SharingStarted.WhileSubscribed(),
         )
 
-
     private fun setDefaultMapCamera(coordinates: LatLng) {
         if (coordinates == DefaultCoordinates) {
             setMyLocationCoordinates()
@@ -354,7 +363,8 @@ internal class EditableLocationDataEditor(
             }
 
             PermissionStatus.Denied,
-            PermissionStatus.Undefined -> {
+            PermissionStatus.Undefined,
+            -> {
                 // Ignore these statuses as they're not important
             }
         }
@@ -384,7 +394,7 @@ internal class EditableLocationDataEditor(
     override fun onMapCameraChange(
         cameraPosition: CameraPosition,
         projection: Projection?,
-        isActiveChange: Boolean
+        isActiveChange: Boolean,
     ) {
         zoomCache = cameraPosition.zoom
 
@@ -653,8 +663,11 @@ internal class LocationOutOfBoundsManager(
             isCheckingOutOfBounds.value = true
             try {
                 val recentIncident = boundsProvider.isInRecentIncidentBounds(coordinates)
-                locationOutOfBounds.value = if (recentIncident == null) outOfBoundsData
-                else outOfBoundsData.copy(recentIncident = recentIncident)
+                locationOutOfBounds.value = if (recentIncident == null) {
+                    outOfBoundsData
+                } else {
+                    outOfBoundsData.copy(recentIncident = recentIncident)
+                }
             } finally {
                 isCheckingOutOfBounds.value = false
             }
@@ -667,4 +680,4 @@ data class LocationOutOfBounds(
     val coordinates: LatLng,
     val address: LocationAddress? = null,
     val recentIncident: Incident? = null,
-)
\ No newline at end of file
+)
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/EditableWorksiteProvider.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/EditableWorksiteProvider.kt
index 1e1e5110b..21fb81489 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/EditableWorksiteProvider.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/EditableWorksiteProvider.kt
@@ -70,7 +70,8 @@ fun EditableWorksiteProvider.reset(incidentId: Long = EmptyIncident.id) {
 }
 
 @Singleton
-class SingleEditableWorksiteProvider @Inject constructor() : EditableWorksiteProvider,
+class SingleEditableWorksiteProvider @Inject constructor() :
+    EditableWorksiteProvider,
     WorksiteLocationEditor {
     override var incident = EmptyIncident
     override var incidentBounds = DefaultIncidentBounds
@@ -92,8 +93,11 @@ class SingleEditableWorksiteProvider @Inject constructor() : EditableWorksitePro
     override fun takeStale() = _isStale.getAndSet(false)
 
     private fun setCoordinates(coordinates: LatLng? = null) {
-        val latLngPair = if (coordinates == null) null
-        else Pair(coordinates.latitude, coordinates.longitude)
+        val latLngPair = if (coordinates == null) {
+            null
+        } else {
+            Pair(coordinates.latitude, coordinates.longitude)
+        }
         editedLocation.set(latLngPair)
     }
 
@@ -165,4 +169,4 @@ interface EditableWorksiteModule {
     @Binds
     @Singleton
     fun bindsWorksiteLocationEditor(editor: SingleEditableWorksiteProvider): WorksiteLocationEditor
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ExistingCaseViewModel.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ExistingCaseViewModel.kt
index 09edfa70e..daf2fdb94 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ExistingCaseViewModel.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ExistingCaseViewModel.kt
@@ -132,7 +132,7 @@ class ExistingCaseViewModel @Inject constructor(
     )
         .mapLatest { (syncingWorksiteIds, imageSyncingWorksiteId) ->
             syncingWorksiteIds.contains(worksiteIdArg) ||
-                    imageSyncingWorksiteId == worksiteIdArg
+                imageSyncingWorksiteId == worksiteIdArg
         }
         .stateIn(
             scope = viewModelScope,
@@ -194,7 +194,7 @@ class ExistingCaseViewModel @Inject constructor(
         @SuppressLint("SimpleDateFormat")
         get() {
             val timeStamp: String = SimpleDateFormat("yyyyMMdd_HHmmss").format(Date())
-            val fileName = "CC_${timeStamp}.jpg"
+            val fileName = "CC_$timeStamp.jpg"
             val contentValues = ContentValues().apply {
                 put(MediaStore.MediaColumns.DISPLAY_NAME, fileName)
                 put(MediaStore.MediaColumns.MIME_TYPE, "image/jpeg")
@@ -303,7 +303,7 @@ class ExistingCaseViewModel @Inject constructor(
     val tabTitles = filesNotes.mapLatest { (fileImages, localImages, notes) ->
         val fileCount = fileImages.size + localImages.size
         val photosTitle = translate("caseForm.photos").let {
-            if (fileCount > 0) "$it (${fileCount})" else it
+            if (fileCount > 0) "$it ($fileCount)" else it
         }
         val notesTitle = translate("formLabels.notes").let {
             if (notes.isNotEmpty()) "$it (${notes.size})" else it
@@ -338,10 +338,13 @@ class ExistingCaseViewModel @Inject constructor(
         )
 
     val subTitle = editableWorksite.mapLatest {
-        if (it.isNew) ""
-        else listOf(it.county, it.state)
-            .filter { s -> s.isNotBlank() }
-            .joinToString(", ")
+        if (it.isNew) {
+            ""
+        } else {
+            listOf(it.county, it.state)
+                .filter { s -> s.isNotBlank() }
+                .joinToString(", ")
+        }
     }
         .stateIn(
             scope = viewModelScope,
@@ -357,8 +360,8 @@ class ExistingCaseViewModel @Inject constructor(
     )
         .filter {
             it.first is CaseEditorUiState.CaseData &&
-                    !it.second.isNew &&
-                    it.third.isNotEmpty()
+                !it.second.isNew &&
+                it.third.isNotEmpty()
         }
         .filter {
             val (viewModelState, _, orgLookup) = it
@@ -506,8 +509,11 @@ class ExistingCaseViewModel @Inject constructor(
         )
 
     private fun updateHeaderTitle(caseNumber: String = "") {
-        headerTitle.value = if (caseNumber.isEmpty()) translate("nav.work_view_case")
-        else "${translate("actions.view")} $caseNumber"
+        headerTitle.value = if (caseNumber.isEmpty()) {
+            translate("nav.work_view_case")
+        } else {
+            "${translate("actions.view")} $caseNumber"
+        }
     }
 
     private fun refreshOrganizationLookup() {
@@ -585,8 +591,11 @@ class ExistingCaseViewModel @Inject constructor(
             startingWorksite.copy(isAssignedToOrgMember = !startingWorksite.isLocalFavorite)
         saveWorksiteChange(startingWorksite, changedWorksite)
 
-        val messageTranslateKey = if (changedWorksite.isLocalFavorite) "caseView.member_my_org"
-        else "actions.member_of_my_org"
+        val messageTranslateKey = if (changedWorksite.isLocalFavorite) {
+            "caseView.member_my_org"
+        } else {
+            "actions.member_of_my_org"
+        }
         actionDescriptionMessage.value = translate(messageTranslateKey)
     }
 
@@ -595,8 +604,11 @@ class ExistingCaseViewModel @Inject constructor(
         val changedWorksite = startingWorksite.toggleHighPriorityFlag()
         saveWorksiteChange(startingWorksite, changedWorksite)
 
-        val messageTranslateKey = if (changedWorksite.hasHighPriorityFlag) "caseView.high_priority"
-        else "caseView.not_high_priority"
+        val messageTranslateKey = if (changedWorksite.hasHighPriorityFlag) {
+            "caseView.high_priority"
+        } else {
+            "caseView.not_high_priority"
+        }
         actionDescriptionMessage.value = translate(messageTranslateKey)
     }
 
@@ -653,8 +665,11 @@ class ExistingCaseViewModel @Inject constructor(
             val updatedWorkTypes =
                 startingWorksite.workTypes
                     .map {
-                        if (it.isClaimed) it
-                        else it.copy(orgClaim = orgId)
+                        if (it.isClaimed) {
+                            it
+                        } else {
+                            it.copy(orgClaim = orgId)
+                        }
                     }
             val changedWorksite = startingWorksite.copy(workTypes = updatedWorkTypes)
             saveWorksiteChange(startingWorksite, changedWorksite)
@@ -817,4 +832,4 @@ data class WorkTypeProfile(
 
     val orgName: String,
     val caseNumber: String,
-)
\ No newline at end of file
+)
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ExistingWorksiteSelector.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ExistingWorksiteSelector.kt
index 63a0a8ff8..59be99d85 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ExistingWorksiteSelector.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ExistingWorksiteSelector.kt
@@ -13,7 +13,7 @@ data class ExistingWorksiteIdentifier(
     val worksiteId: Long,
 ) {
     val isDefined = incidentId != EmptyIncident.id &&
-            worksiteId != EmptyWorksite.id
+        worksiteId != EmptyWorksite.id
 }
 
 val ExistingWorksiteIdentifierNone = ExistingWorksiteIdentifier(
@@ -37,4 +37,4 @@ class ExistingWorksiteSelector @Inject constructor(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/FormDataEditor.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/FormDataEditor.kt
index dc30f4ecc..c1a360062 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/FormDataEditor.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/FormDataEditor.kt
@@ -33,7 +33,7 @@ open class EditableFormDataEditor(
             groupNode,
             ignoreFieldKeys,
             autoManageGroups = autoManageGroups,
-            isWorkInputData = isWorkInputData
+            isWorkInputData = isWorkInputData,
         )
     }
 
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/LocationSearchManager.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/LocationSearchManager.kt
index ba64e7ea6..b9ff29689 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/LocationSearchManager.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/LocationSearchManager.kt
@@ -128,11 +128,17 @@ internal class LocationSearchManager(
         addressSearch,
     ) { q, worksiteResults, addressResults ->
         val addresses =
-            if (addressResults.first == q) addressResults.second
-            else emptyList()
+            if (addressResults.first == q) {
+                addressResults.second
+            } else {
+                emptyList()
+            }
         val worksites =
-            if (worksiteResults.first == q) worksiteResults.second
-            else emptyList()
+            if (worksiteResults.first == q) {
+                worksiteResults.second
+            } else {
+                emptyList()
+            }
         LocationSearchResults(q, addresses, worksites)
     }
 
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/NetworkRefreshClient.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/NetworkRefreshClient.kt
index 3142d9e12..5a5f1a75f 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/NetworkRefreshClient.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/NetworkRefreshClient.kt
@@ -55,4 +55,4 @@ class LanguageRefresher @Inject constructor(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/QueryIncidentsManager.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/QueryIncidentsManager.kt
index 258d4c8e7..2e884504c 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/QueryIncidentsManager.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/QueryIncidentsManager.kt
@@ -113,4 +113,4 @@ class QueryIncidentsManager(
         }
             .launchIn(coroutineScope)
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ResidentNameSearchManager.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ResidentNameSearchManager.kt
index 649bfdc77..73853ec89 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ResidentNameSearchManager.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ResidentNameSearchManager.kt
@@ -78,7 +78,9 @@ class ResidentNameSearchManager(
             } else {
                 worksiteResults.second
             }
-        } else emptyList()
+        } else {
+            emptyList()
+        }
         ResidentNameSearchResults(q, worksites)
     }
 
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/RruleExtension.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/RruleExtension.kt
index 16ccd2370..e3faccff7 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/RruleExtension.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/RruleExtension.kt
@@ -30,17 +30,17 @@ data class RruleProfile(
 fun RRule.profile(): RruleProfile {
     val days = byDay.map(WeekdayNum::weekday).toSet()
     val hasWeekDays = days.contains(Weekday.Monday) &&
-            days.contains(Weekday.Tuesday) &&
-            days.contains(Weekday.Wednesday) &&
-            days.contains(Weekday.Thursday) &&
-            days.contains(Weekday.Friday)
+        days.contains(Weekday.Tuesday) &&
+        days.contains(Weekday.Wednesday) &&
+        days.contains(Weekday.Thursday) &&
+        days.contains(Weekday.Friday)
     val isWeekdays = hasWeekDays &&
-            !days.contains(Weekday.Saturday) &&
-            !days.contains(Weekday.Sunday)
+        !days.contains(Weekday.Saturday) &&
+        !days.contains(Weekday.Sunday)
     val isEveryDay = hasWeekDays &&
-            !isWeekdays &&
-            days.contains(Weekday.Saturday) &&
-            days.contains(Weekday.Sunday)
+        !isWeekdays &&
+        days.contains(Weekday.Saturday) &&
+        days.contains(Weekday.Sunday)
     return RruleProfile(isWeekdays, isEveryDay)
 }
 
@@ -142,9 +142,11 @@ fun RRule.toHumanReadableText(
                 untilDateFormat.format(it)
             }
             val untilPart =
-                if (untilDate?.isNotBlank() == true)
+                if (untilDate?.isNotBlank() == true) {
                     "${translator("recurringSchedule.until_date")} $untilDate"
-                else ""
+                } else {
+                    ""
+                }
             val frequencyString = listOf(
                 every,
                 frequencyPart,
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/SingleTransferWorkTypeProvider.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/SingleTransferWorkTypeProvider.kt
index 1e972536e..12ee81d1a 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/SingleTransferWorkTypeProvider.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/SingleTransferWorkTypeProvider.kt
@@ -64,6 +64,6 @@ interface WorkTypeTransferModule {
     @Binds
     @Singleton
     fun bindsWorkTypeTransferProvider(
-        provider: SingleTransferWorkTypeProvider
+        provider: SingleTransferWorkTypeProvider,
     ): TransferWorkTypeProvider
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/TransferWorkTypeViewModel.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/TransferWorkTypeViewModel.kt
index 5a45b32d4..e92e644d0 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/TransferWorkTypeViewModel.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/TransferWorkTypeViewModel.kt
@@ -79,8 +79,11 @@ class TransferWorkTypeViewModel @Inject constructor(
     var transferReason by mutableStateOf("")
 
     val reasonHint =
-        if (transferType == Request) translate("workTypeRequestModal.reason_requested")
-        else null
+        if (transferType == Request) {
+            translate("workTypeRequestModal.reason_requested")
+        } else {
+            null
+        }
 
     val errorMessageReason = MutableStateFlow("")
     private val errorMessageWorkType = MutableStateFlow("")
@@ -134,8 +137,11 @@ class TransferWorkTypeViewModel @Inject constructor(
         )
 
     private val editableWorksite =
-        if (isFromCaseEdit) editableWorksiteProvider.editableWorksite
-        else worksiteProvider.editableWorksite
+        if (isFromCaseEdit) {
+            editableWorksiteProvider.editableWorksite
+        } else {
+            worksiteProvider.editableWorksite
+        }
 
     init {
         transferWorkTypeProvider.clearPendingTransfer()
@@ -160,7 +166,6 @@ class TransferWorkTypeViewModel @Inject constructor(
                         .replace("{organizations}", otherOrganizations)
                         .replace("{my_organization}", organizationName)
                         .replace("{case_number}", caseNumber)
-
             }
         }
     }
@@ -174,8 +179,11 @@ class TransferWorkTypeViewModel @Inject constructor(
         if (transferReason.isBlank()) {
             val isRelease = transferType == Release
             val reasonTranslateKey =
-                if (isRelease) "workTypeRequestModal.explain_release_case_required"
-                else "workTypeRequestModal.explain_request_case_required"
+                if (isRelease) {
+                    "workTypeRequestModal.explain_release_case_required"
+                } else {
+                    "workTypeRequestModal.explain_request_case_required"
+                }
             errorMessageReason.value = translate(reasonTranslateKey)
         }
 
@@ -202,8 +210,11 @@ class TransferWorkTypeViewModel @Inject constructor(
                 .map { it.id to it.workTypeLiteral }
                 .associate { it.first to it.second }
             val workTypes = workTypesState.mapNotNull {
-                if (it.value) workTypeIdLookup[it.key]
-                else null
+                if (it.value) {
+                    workTypeIdLookup[it.key]
+                } else {
+                    null
+                }
             }
             val worksite = editableWorksite.value
             try {
@@ -235,8 +246,11 @@ class TransferWorkTypeViewModel @Inject constructor(
     override fun translate(phraseKey: String) = translate(phraseKey, 0)
 
     override fun translate(phraseKey: String, fallbackResId: Int): String {
-        val translated = if (isFromCaseEdit) editableWorksiteProvider.translate(phraseKey)
-        else worksiteProvider.translate(phraseKey)
+        val translated = if (isFromCaseEdit) {
+            editableWorksiteProvider.translate(phraseKey)
+        } else {
+            worksiteProvider.translate(phraseKey)
+        }
         return translated ?: translator.translate(
             phraseKey,
             fallbackResId,
@@ -247,4 +261,4 @@ class TransferWorkTypeViewModel @Inject constructor(
 data class RequestWorkTypeState(
     val workTypeIdOrgNameLookup: Map<Long, String> = emptyMap(),
     val orgIdContactListLookup: Map<Long, List<String>> = emptyMap(),
-)
\ No newline at end of file
+)
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/WrongLocationFlagManager.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/WrongLocationFlagManager.kt
index f86a29d18..22ea1eb57 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/WrongLocationFlagManager.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/WrongLocationFlagManager.kt
@@ -20,7 +20,7 @@ class WrongLocationFlagManager(
     private val isVerifyingCoordinates = MutableStateFlow(false)
     val isProcessingLocation = combine(
         isParsingCoordinates,
-        isVerifyingCoordinates
+        isVerifyingCoordinates,
     ) { b0, b1 -> b0 || b1 }
         .stateIn(
             coroutineScope,
@@ -74,4 +74,4 @@ class WrongLocationFlagManager(
             initialValue = null,
             started = SharingStarted.WhileSubscribed(),
         )
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/CaseImage.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/CaseImage.kt
index cacb2cc38..35ad66596 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/CaseImage.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/CaseImage.kt
@@ -39,4 +39,4 @@ fun WorksiteLocalImage.asCaseImage() = CaseImage(
     imageUri = uri,
     tag = tag,
     rotateDegrees = rotateDegrees,
-)
\ No newline at end of file
+)
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/ExistingCaseLocation.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/ExistingCaseLocation.kt
index 5524b1a73..6cd543f96 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/ExistingCaseLocation.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/ExistingCaseLocation.kt
@@ -17,4 +17,4 @@ fun WorksiteSummary.asCaseLocation(iconProvider: MapCaseIconProvider): CaseSumma
         this,
         icon = icon,
     )
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/FieldDynamicValue.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/FieldDynamicValue.kt
index a0d62ef0d..f2b161d7b 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/FieldDynamicValue.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/FieldDynamicValue.kt
@@ -12,7 +12,7 @@ data class FieldDynamicValue(
     val nestLevel: Int = 0,
     val dynamicValue: DynamicValue = DynamicValue(""),
     val breakGlass: FieldEditProperties = FieldEditProperties(field.isReadOnlyBreakGlass),
-    val workTypeStatus: WorkTypeStatus = WorkTypeStatus.OpenUnassigned
+    val workTypeStatus: WorkTypeStatus = WorkTypeStatus.OpenUnassigned,
 ) {
     val key = field.fieldKey
     val childrenCount = childKeys.size
@@ -35,4 +35,4 @@ data class FieldEditProperties(
         }
         return false
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/FormFieldsInputData.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/FormFieldsInputData.kt
index 82e1b01c8..4ae6ca340 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/FormFieldsInputData.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/FormFieldsInputData.kt
@@ -37,11 +37,11 @@ open class FormFieldsInputData(
 
             // TODO Add test coverage
             val isActiveGroup = autoManageGroups &&
-                    node.children.isNotEmpty() &&
-                    node.children.any { child ->
-                        val childFormValue = worksiteFormData[child.fieldKey]
-                        childFormValue?.hasValue == true
-                    }
+                node.children.isNotEmpty() &&
+                node.children.any { child ->
+                    val childFormValue = worksiteFormData[child.fieldKey]
+                    childFormValue?.hasValue == true
+                }
             if (isActiveGroup && !dynamicValue.isBooleanTrue) {
                 managedGroups.add(node.fieldKey)
                 dynamicValue = DynamicValue("", isBoolean = true, true)
@@ -106,8 +106,11 @@ open class FormFieldsInputData(
     }
 
     protected open fun onPreCommitFieldData(data: Map<String, DynamicValue>) =
-        if (!autoManageGroups || managedGroups.isEmpty()) data
-        else data.filter { !managedGroups.contains(it.key) }
+        if (!autoManageGroups || managedGroups.isEmpty()) {
+            data
+        } else {
+            data.filter { !managedGroups.contains(it.key) }
+        }
 
     override fun updateCase() = updateCase(worksiteIn)
 
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/IncidentOrganization.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/IncidentOrganization.kt
index 5b618c394..60ea7a5b2 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/IncidentOrganization.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/IncidentOrganization.kt
@@ -12,4 +12,4 @@ val IncidentOrganization.contactList: List<String>
                 "$email $mobile",
             ).combineTrimText(" ")
         }
-    }
\ No newline at end of file
+    }
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/LocationInputData.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/LocationInputData.kt
index 98da5a632..1b27dd5e5 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/LocationInputData.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/LocationInputData.kt
@@ -40,26 +40,26 @@ class LocationInputData(
 
     private val isIncompleteAddress: Boolean
         get() = streetAddress.isBlank() ||
-                zipCode.isBlank() ||
-                city.isBlank() ||
-                county.isBlank() ||
-                state.isBlank()
+            zipCode.isBlank() ||
+            city.isBlank() ||
+            county.isBlank() ||
+            state.isBlank()
 
     val isBlankAddress: Boolean
         get() = streetAddress.isBlank() &&
-                zipCode.isBlank() &&
-                city.isBlank() &&
-                county.isBlank() &&
-                state.isBlank()
+            zipCode.isBlank() &&
+            city.isBlank() &&
+            county.isBlank() &&
+            state.isBlank()
 
     var wasGeocodeAddressSelected by mutableStateOf(false)
 
     val hasAddressError: Boolean
         get() = streetAddressError.isNotBlank() ||
-                zipCodeError.isNotBlank() ||
-                cityError.isNotBlank() ||
-                countyError.isNotBlank() ||
-                stateError.isNotBlank()
+            zipCodeError.isNotBlank() ||
+            cityError.isNotBlank() ||
+            countyError.isNotBlank() ||
+            stateError.isNotBlank()
 
     val addressChangeWorksite: Worksite
         get() {
@@ -78,13 +78,13 @@ class LocationInputData(
 
     private fun isChanged(worksite: Worksite): Boolean {
         return this.coordinates.value != worksite.coordinates ||
-                streetAddress.trim() != worksite.address ||
-                zipCode.trim() != worksite.postalCode ||
-                city.trim() != worksite.city ||
-                county.trim() != worksite.county ||
-                state.trim() != worksite.state ||
-                hasWrongLocation != worksite.hasWrongLocationFlag ||
-                crossStreetNearbyLandmark.trim() != worksite.crossStreetNearbyLandmark
+            streetAddress.trim() != worksite.address ||
+            zipCode.trim() != worksite.postalCode ||
+            city.trim() != worksite.city ||
+            county.trim() != worksite.county ||
+            state.trim() != worksite.state ||
+            hasWrongLocation != worksite.hasWrongLocationFlag ||
+            crossStreetNearbyLandmark.trim() != worksite.crossStreetNearbyLandmark
     }
 
     internal fun resetValidity() {
@@ -228,4 +228,4 @@ class LocationInputData(
             isEditingAddress = true
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/NotesFlagsInputData.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/NotesFlagsInputData.kt
index 5f30eaf45..d35fd7eca 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/NotesFlagsInputData.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/NotesFlagsInputData.kt
@@ -24,8 +24,8 @@ class NotesFlagsInputData(
 
     private fun isChanged(notes: List<WorksiteNote>, worksite: Worksite): Boolean {
         return notes != worksite.notes ||
-                isHighPriority != worksite.hasHighPriorityFlag ||
-                isAssignedToOrgMember != worksite.isAssignedToOrgMember
+            isHighPriority != worksite.hasHighPriorityFlag ||
+            isAssignedToOrgMember != worksite.isAssignedToOrgMember
     }
 
     override fun updateCase() = updateCase(worksiteIn)
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/PropertyInputData.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/PropertyInputData.kt
index a3ea65d56..cc087d7e5 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/PropertyInputData.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/PropertyInputData.kt
@@ -33,10 +33,10 @@ class PropertyInputData(
 
     private fun isChanged(worksite: Worksite) =
         residentName.value.trim() != worksite.name ||
-                phoneNumber.trim() != worksite.phone1 ||
-                phoneNumberSecondary.trim() != worksite.phone2 ||
-                email.trim() != (worksite.email ?: "") ||
-                autoContactFrequency != Worksite.autoContactFrequency(worksite.autoContactFrequencyT)
+            phoneNumber.trim() != worksite.phone1 ||
+            phoneNumberSecondary.trim() != worksite.phone2 ||
+            email.trim() != (worksite.email ?: "") ||
+            autoContactFrequency != Worksite.autoContactFrequency(worksite.autoContactFrequencyT)
 
     private fun resetValidity() {
         residentNameError = ""
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/Worksite.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/Worksite.kt
index 55349b69b..cf76276c4 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/Worksite.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/Worksite.kt
@@ -40,8 +40,8 @@ fun Worksite.copyModifiedFormData(
     val prevValue = outFormData?.get(targetFieldKey)
     val isChanged =
         prevValue == null ||
-                formValue.isBoolean && formValue.valueBoolean != prevValue.valueBoolean ||
-                !formValue.isBoolean && trimDataValue != prevValue.valueString.trim()
+            formValue.isBoolean && formValue.valueBoolean != prevValue.valueBoolean ||
+            !formValue.isBoolean && trimDataValue != prevValue.valueString.trim()
     if (!isChanged) {
         return outFormData
     }
@@ -122,4 +122,4 @@ fun Worksite.copyModifiedFormData(dynamicFormFields: Map<String, DynamicValue>):
     }
 
     return if (mutableFormData.isEmpty()) null else mutableFormData
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/WorksiteNote.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/WorksiteNote.kt
index 4eb2a5028..e8296a274 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/WorksiteNote.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/model/WorksiteNote.kt
@@ -3,4 +3,4 @@ package com.crisiscleanup.feature.caseeditor.model
 import com.crisiscleanup.core.common.relativeTime
 import com.crisiscleanup.core.model.data.WorksiteNote
 
-fun WorksiteNote.getRelativeDate() = createdAt.relativeTime
\ No newline at end of file
+fun WorksiteNote.getRelativeDate() = createdAt.relativeTime
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/navigation/CaseEditorNavigation.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/navigation/CaseEditorNavigation.kt
index fe1f32099..0adcf74bf 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/navigation/CaseEditorNavigation.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/navigation/CaseEditorNavigation.kt
@@ -196,8 +196,9 @@ fun NavController.rerouteToCaseChange(ids: ExistingWorksiteIdentifier) {
     popBackStack()
     while (currentBackStackEntry?.destination?.route?.let {
             it.startsWith(caseEditorRoute) ||
-                    it.startsWith(viewCaseRoute)
-        } == true) {
+                it.startsWith(viewCaseRoute)
+        } == true
+    ) {
         popBackStack()
     }
 
@@ -220,7 +221,7 @@ fun NavGraphBuilder.caseEditSearchAddressScreen(
 }
 
 fun NavGraphBuilder.caseEditMoveLocationOnMapScreen(
-    onBackClick: () -> Unit
+    onBackClick: () -> Unit,
 ) {
     composable(caseEditMapMoveLocationRoute) {
         EditCaseMapMoveLocationRoute(onBack = onBackClick)
@@ -281,4 +282,4 @@ fun NavGraphBuilder.caseHistoryScreen(
             onBack = onBack,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/CaseEditorScreen.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/CaseEditorScreen.kt
index 639b9b7c7..414b07c9e 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/CaseEditorScreen.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/CaseEditorScreen.kt
@@ -136,7 +136,7 @@ internal fun ColumnScope.CaseEditorScreen(
             Box(
                 modifier
                     .fillMaxWidth()
-                    .weight(1f)
+                    .weight(1f),
             ) {
                 BusyIndicatorFloatingTopCenter(true)
             }
@@ -153,8 +153,11 @@ internal fun ColumnScope.CaseEditorScreen(
 
         else -> {
             val errorData = uiState as CaseEditorUiState.Error
-            val errorMessage = if (errorData.errorResId != 0) stringResource(errorData.errorResId)
-            else errorData.errorMessage.ifEmpty { stringResource(commonR.string.unexpected_error) }
+            val errorMessage = if (errorData.errorResId != 0) {
+                stringResource(errorData.errorResId)
+            } else {
+                errorData.errorMessage.ifEmpty { stringResource(commonR.string.unexpected_error) }
+            }
             Box(modifier.weight(1f)) {
                 Text(
                     text = errorMessage,
@@ -192,7 +195,7 @@ private fun ColumnScope.FullEditView(
             2 to 10,
             3 to 13,
             4 to 16,
-        )
+        ),
     )
 
     val sectionSliderState = rememberFocusSectionSliderState(
@@ -211,8 +214,8 @@ private fun ColumnScope.FullEditView(
     val areEditorsReady by viewModel.areEditorsReady.collectAsStateWithLifecycle()
     val isSavingData by viewModel.isSavingWorksite.collectAsStateWithLifecycle()
     val isEditable = areEditorsReady &&
-            caseData.isNetworkLoadFinished &&
-            !isSavingData
+        caseData.isNetworkLoadFinished &&
+        !isSavingData
 
     val isSectionCollapsed =
         remember(viewModel) { { sectionIndex: Int -> sectionCollapseStates[sectionIndex] } }
@@ -472,7 +475,7 @@ private fun PromptChangesDialog(
         dismissButton = {
             CrisisCleanupTextButton(
                 text = translator("caseForm.no"),
-                onClick = onAbort
+                onClick = onAbort,
             )
         },
         confirmButton = {
@@ -509,7 +512,7 @@ private fun InvalidSaveDialog(
                 dismissButton = {
                     CrisisCleanupTextButton(
                         text = translator("actions.cancel"),
-                        onClick = onDismiss
+                        onClick = onDismiss,
                     )
                 },
                 confirmButton = {
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/CaseHistoryScreen.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/CaseHistoryScreen.kt
index bbf862fd2..4a964e4b6 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/CaseHistoryScreen.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/CaseHistoryScreen.kt
@@ -79,7 +79,8 @@ fun CaseEditCaseHistoryRoute(
                     if (hasEvents) {
                         items(
                             historyEvents,
-                            key = { it.userId }) {
+                            key = { it.userId },
+                        ) {
                             CardSurface(listItemModifier) {
                                 Column(Modifier.fillMaxWidth()) {
                                     HistoryUser(it)
@@ -111,7 +112,7 @@ private fun HistoryUser(
         Modifier
             .background(Color.White)
             // TODO Common dimensions
-            .padding(16.dp)
+            .padding(16.dp),
     ) {
         Row(horizontalArrangement = listItemSpacedBy) {
             Text(
@@ -142,7 +143,7 @@ private fun HistoryEvents(
             .background(neutralBackgroundColor)
             // TODO Common dimensions
             .padding(16.dp),
-        verticalArrangement = listItemSpacedBy
+        verticalArrangement = listItemSpacedBy,
     ) {
         for (event in events) {
             Column {
@@ -168,4 +169,4 @@ private fun HistoryEvents(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/CaseIncidentView.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/CaseIncidentView.kt
index 66ed4ec60..bc950ca5d 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/CaseIncidentView.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/CaseIncidentView.kt
@@ -60,7 +60,7 @@ internal fun CaseIncidentView(
                 Icon(
                     imageVector = CrisisCleanupIcons.CloudSync,
                     contentDescription = translator("info.is_syncing"),
-                    modifier = Modifier.testTag("caseViewIsSyncingIcon")
+                    modifier = Modifier.testTag("caseViewIsSyncingIcon"),
                 )
             }
         } else if (isPendingSync) {
@@ -69,7 +69,7 @@ internal fun CaseIncidentView(
                 imageVector = CrisisCleanupIcons.Cloud,
                 contentDescription = translator("info.is_pending_sync"),
                 tint = primaryOrangeColor,
-                modifier = Modifier.testTag("caseViewIsPendingSyncIconBtn")
+                modifier = Modifier.testTag("caseViewIsPendingSyncIconBtn"),
             )
         }
     }
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ClipboardViews.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ClipboardViews.kt
index aafb23dbc..6b96350e0 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ClipboardViews.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ClipboardViews.kt
@@ -13,13 +13,16 @@ internal fun BoxScope.CopiedToClipboard(
 ) {
     val clipboardManager = LocalClipboardManager.current
     val translator = LocalAppTranslator.current
-    val copiedText = if (clipboardContents.isBlank()) ""
-    else translator("info.copied_value")
-        .replace("{copied_string}", clipboardContents)
+    val copiedText = if (clipboardContents.isBlank()) {
+        ""
+    } else {
+        translator("info.copied_value")
+            .replace("{copied_string}", clipboardContents)
+    }
     TemporaryDialog(
         message = copiedText,
         onDialogStartShow = {
             clipboardManager.setText(AnnotatedString(clipboardContents))
         },
     )
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/DynamicFormCronSelect.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/DynamicFormCronSelect.kt
index 0aa7faef3..5378a5563 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/DynamicFormCronSelect.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/DynamicFormCronSelect.kt
@@ -115,7 +115,7 @@ private fun FrequencyDailyOption(
     enabled: Boolean = false,
     onSelect: () -> Unit = {},
     text: String = "",
-    trailingContent: (@Composable () -> Unit)? = null
+    trailingContent: (@Composable () -> Unit)? = null,
 ) {
     CrisisCleanupRadioButton(
         modifier = Modifier
@@ -344,7 +344,7 @@ private fun FrequencyIntervalDialog(
                 text = positiveActionText,
                 onClick = submitInterval,
             )
-        }
+        },
     ) {
         Row(
             Modifier.listItemVerticalPadding(),
@@ -431,7 +431,7 @@ private fun FrequencyDatePicker(
         Spacer(
             Modifier
                 .weight(1f)
-                .actionHeight()
+                .actionHeight(),
         )
         rRule.until?.let {
             CrisisCleanupIconButton(
@@ -454,7 +454,7 @@ private fun FrequencyDatePicker(
                 }
                 updateRrule()
                 showDatePicker = false
-            }
+            },
         )
     }
 }
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/DynamicFormInput.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/DynamicFormInput.kt
index 5f0910570..8d29e49be 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/DynamicFormInput.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/DynamicFormInput.kt
@@ -141,7 +141,8 @@ internal fun DynamicFormListItem(
         }
 
         "h5",
-        "h4" -> {
+        "h4",
+        -> {
             if (field.childrenCount == 0 && field.field.isReadOnly) {
                 Text(
                     modifier = modifier,
@@ -240,7 +241,9 @@ private fun CheckboxItem(
         @Composable {
             HelpAction(helpHint, showHelp)
         }
-    } else null
+    } else {
+        null
+    }
 
     CrisisCleanupTextCheckbox(
         modifier.listCheckboxAlignStartOffset(),
@@ -277,8 +280,11 @@ private fun SingleLineTextItem(
         rowModifier,
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        val textFieldModifier = if (hasMultipleRowItems) Modifier.weight(1f)
-        else modifier
+        val textFieldModifier = if (hasMultipleRowItems) {
+            Modifier.weight(1f)
+        } else {
+            modifier
+        }
 
         val hasFocus = glassState.isGlassBroken && glassState.takeBrokenGlassFocus()
 
@@ -399,7 +405,7 @@ private fun SelectItem(
                     itemData.selectOptions[selectedOption] ?: selectedOption,
                     modifier = Modifier
                         .listItemHorizontalPadding()
-                        .listItemBottomPadding()
+                        .listItemBottomPadding(),
                 )
             }
         }
@@ -411,9 +417,11 @@ private fun SelectItem(
             }
             DropdownMenu(
                 modifier = Modifier
-                    .width(with(LocalDensity.current) {
-                        contentWidth.width.toDp().minus(listItemDropdownMenuOffset.x.times(2))
-                    }),
+                    .width(
+                        with(LocalDensity.current) {
+                            contentWidth.width.toDp().minus(listItemDropdownMenuOffset.x.times(2))
+                        },
+                    ),
                 expanded = showDropdown,
                 onDismissRequest = { showDropdown = false },
                 offset = listItemDropdownMenuOffset,
@@ -521,7 +529,9 @@ private fun CronSelect(
             {
                 HelpAction(helpHint, showHelp)
             }
-        } else null
+        } else {
+            null
+        }
     val defaultRrule = itemData.field.recurDefault.ifBlank { FallbackRrule }
     val rRuleIn = itemData.dynamicValue.valueString
     val showFrequencyInput = isInputExpanded || (rRuleIn.isNotBlank() && defaultRrule != rRuleIn)
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/EditExistingCaseScreen.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/EditExistingCaseScreen.kt
index 588818763..06507e633 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/EditExistingCaseScreen.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/EditExistingCaseScreen.kt
@@ -259,8 +259,11 @@ private fun getTopIconActionColor(
     isActive: Boolean,
     isEditable: Boolean,
 ): Color {
-    var tint = if (isActive) primaryRedColor
-    else neutralIconColor
+    var tint = if (isActive) {
+        primaryRedColor
+    } else {
+        neutralIconColor
+    }
     if (!isEditable) {
         tint = tint.disabledAlpha()
     }
@@ -295,14 +298,14 @@ private fun TopBar(
             Text(
                 title,
                 style = LocalFontStyles.current.header3,
-                modifier = Modifier.testTag("editCaseHeaderText")
+                modifier = Modifier.testTag("editCaseHeaderText"),
             )
 
             if (subTitle.isNotBlank()) {
                 Text(
                     subTitle,
                     style = MaterialTheme.typography.bodySmall,
-                    modifier = Modifier.testTag("editCaseSubHeaderText")
+                    modifier = Modifier.testTag("editCaseSubHeaderText"),
                 )
             }
         }
@@ -317,8 +320,11 @@ private fun TopBar(
         @Composable {
             val translator = LocalAppTranslator.current
             val highPriorityTranslateKey =
-                if (isHighPriority) "actions.unmark_high_priority"
-                else "flag.flag_high_priority"
+                if (isHighPriority) {
+                    "actions.unmark_high_priority"
+                } else {
+                    "flag.flag_high_priority"
+                }
             val highPriorityTint = getTopIconActionColor(isHighPriority, isEditable)
             CrisisCleanupIconButton(
                 iconResId = R.drawable.ic_important_filled,
@@ -326,14 +332,20 @@ private fun TopBar(
                 onClick = toggleHighPriority,
                 enabled = isEditable,
                 tint = highPriorityTint,
-                modifier = Modifier.testTag("editCaseHighPriorityToggleBtn")
+                modifier = Modifier.testTag("editCaseHighPriorityToggleBtn"),
             )
 
-            val iconResId = if (isFavorite) R.drawable.ic_heart_filled
-            else R.drawable.ic_heart_outline
+            val iconResId = if (isFavorite) {
+                R.drawable.ic_heart_filled
+            } else {
+                R.drawable.ic_heart_outline
+            }
             val favoriteDescription =
-                if (isFavorite) translator("actions.not_member_of_my_org")
-                else translator("actions.member_of_my_org")
+                if (isFavorite) {
+                    translator("actions.not_member_of_my_org")
+                } else {
+                    translator("actions.member_of_my_org")
+                }
             val favoriteTint = getTopIconActionColor(isFavorite, isEditable)
             CrisisCleanupIconButton(
                 iconResId = iconResId,
@@ -341,7 +353,7 @@ private fun TopBar(
                 onClick = toggleFavorite,
                 enabled = isEditable,
                 tint = favoriteTint,
-                modifier = Modifier.testTag("editCaseFavoriteToggleBtn")
+                modifier = Modifier.testTag("editCaseFavoriteToggleBtn"),
             )
         }
     }
@@ -392,7 +404,7 @@ private fun ColumnScope.ExistingCaseContent(
                         pagerState.animateScrollToPage(index)
                     }
                 },
-                modifier = Modifier.testTag("caseInfoTab_${title}")
+                modifier = Modifier.testTag("caseInfoTab_$title"),
             )
         }
     }
@@ -454,7 +466,7 @@ private fun BottomActions(
             }
 
             NavigationBarItem(
-                modifier = Modifier.testTag("editCaseNavItem_${label}"),
+                modifier = Modifier.testTag("editCaseNavItem_$label"),
                 selected = false,
                 onClick = {
                     when (index) {
@@ -465,7 +477,7 @@ private fun BottomActions(
                             ExistingWorksiteIdentifier(
                                 worksite.incidentId,
                                 worksite.id,
-                            )
+                            ),
                         )
                     }
                 },
@@ -589,7 +601,7 @@ internal fun EditExistingCaseInfoView(
             Spacer(
                 Modifier
                     .fillMaxWidth()
-                    .height(edgeSpacing)
+                    .height(edgeSpacing),
             )
         }
     }
@@ -663,7 +675,7 @@ private fun FlagChip(
                             onClick = { removeFlag(flag) },
                             role = Role.Button,
                         ),
-                    contentAlignment = Alignment.Center
+                    contentAlignment = Alignment.Center,
                 ) {
                     Icon(
                         imageVector = CrisisCleanupIcons.Clear,
@@ -707,7 +719,7 @@ private fun LazyListScope.propertyInfoItems(
                         .testTag("editCasePropertyInfoWorksiteNameRow")
                         .combinedClickable(
                             onClick = {},
-                            onLongClick = { copyToClipboard(worksite.name) }
+                            onLongClick = { copyToClipboard(worksite.name) },
                         )
                         .fillMaxWidth()
                         .padding(horizontal = edgeSpacing, vertical = edgeSpacingHalf),
@@ -721,7 +733,7 @@ private fun LazyListScope.propertyInfoItems(
                         .testTag("editCasePropertyInfoPhoneRow")
                         .combinedClickable(
                             onClick = {},
-                            onLongClick = { copyToClipboard(phoneNumbers) }
+                            onLongClick = { copyToClipboard(phoneNumbers) },
                         )
                         .fillMaxWidth()
                         .padding(horizontal = edgeSpacing, vertical = edgeSpacingHalf),
@@ -736,7 +748,7 @@ private fun LazyListScope.propertyInfoItems(
                                 .testTag("editCasePropertyInfoEmailRow")
                                 .combinedClickable(
                                     onClick = {},
-                                    onLongClick = { copyToClipboard(worksite.email) }
+                                    onLongClick = { copyToClipboard(worksite.email) },
                                 )
                                 .fillMaxWidth()
                                 .padding(horizontal = edgeSpacing, vertical = edgeSpacingHalf),
@@ -753,7 +765,7 @@ private fun LazyListScope.propertyInfoItems(
                         .testTag("editCasePropertyInfoLocationRow")
                         .combinedClickable(
                             onClick = {},
-                            onLongClick = { copyToClipboard(fullAddress) }
+                            onLongClick = { copyToClipboard(fullAddress) },
                         )
                         .fillMaxWidth()
                         .padding(horizontal = edgeSpacing, vertical = edgeSpacingHalf),
@@ -945,7 +957,7 @@ internal fun EditExistingCaseNotesView(
                     Modifier
                         .fillMaxWidth()
                         // TODO Common dimensions
-                        .height(8.dp)
+                        .height(8.dp),
                 )
             }
             staticNoteItems(
@@ -961,7 +973,7 @@ internal fun EditExistingCaseNotesView(
                 Spacer(
                     Modifier
                         .fillMaxWidth()
-                        .fabPlusSpaceHeight()
+                        .fabPlusSpaceHeight(),
                 )
             }
         }
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/EditNoteDialog.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/EditNoteDialog.kt
index 375e2e95e..3591b799c 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/EditNoteDialog.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/EditNoteDialog.kt
@@ -39,7 +39,7 @@ fun EditNoteDialog(
                 onDone = { saveNote() },
                 hasFocus = true,
                 enabled = true,
-                modifier = Modifier.testTag("caseAlertNoteTextAreaField")
+                modifier = Modifier.testTag("caseAlertNoteTextAreaField"),
             )
         },
         onDismissRequest = onCancel,
@@ -47,7 +47,7 @@ fun EditNoteDialog(
             CrisisCleanupTextButton(
                 text = translator("actions.cancel"),
                 onClick = onCancel,
-                modifier = Modifier.testTag("caseAlertNoteDismissBtn")
+                modifier = Modifier.testTag("caseAlertNoteDismissBtn"),
             )
         },
         confirmButton = {
@@ -55,7 +55,7 @@ fun EditNoteDialog(
                 text = translator("actions.add"),
                 onClick = saveNote,
                 enabled = !isSaving,
-                modifier = Modifier.testTag("caseAlertNoteSaveBtn")
+                modifier = Modifier.testTag("caseAlertNoteSaveBtn"),
             )
         },
     )
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ExistingCaseMediaViews.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ExistingCaseMediaViews.kt
index 6f618de4c..e8457cddb 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ExistingCaseMediaViews.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ExistingCaseMediaViews.kt
@@ -330,4 +330,4 @@ private fun ExplainCameraPermissionDialog(
             closeDialog = closeDialog,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ExistingWorkTypeViews.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ExistingWorkTypeViews.kt
index d52760de6..9aad679e3 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ExistingWorkTypeViews.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ExistingWorkTypeViews.kt
@@ -70,7 +70,7 @@ private fun WorkTypeOrgClaims(
     Column(
         Modifier.padding(bottom = edgeSpacing),
         verticalArrangement = Arrangement.spacedBy(
-            edgeSpacingHalf
+            edgeSpacingHalf,
         ),
     ) {
         if (isMyOrgClaim) {
@@ -163,7 +163,7 @@ internal fun LazyListScope.existingWorkTypeItems(
                     Modifier
                         .fillMaxWidth()
                         // TODO Common dimensions
-                        .height(4.dp)
+                        .height(4.dp),
                 )
             }
         }
@@ -192,8 +192,11 @@ internal fun LazyListScope.workTypeSectionTitle(
     "section-work-type-title-$titleItemKey",
     "section-work-type-title",
 ) {
-    val style = if (isSmallTitle) MaterialTheme.typography.bodySmall
-    else MaterialTheme.typography.bodyLarge
+    val style = if (isSmallTitle) {
+        MaterialTheme.typography.bodySmall
+    } else {
+        MaterialTheme.typography.bodyLarge
+    }
     Text(
         LocalAppTranslator.current(titleTranslateKey),
         modifier,
@@ -257,4 +260,4 @@ private fun OrgClaimsPreview() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/FormDataScreen.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/FormDataScreen.kt
index 2bf14f338..4709e53d4 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/FormDataScreen.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/FormDataScreen.kt
@@ -46,8 +46,11 @@ private fun FormItems(
             }
             val fieldShowHelp = remember(viewModel) { { showHelp(state) } }
             val modifier =
-                if (state.nestLevel > 0) listItemModifier.listItemNestedPadding(state.nestLevel * 2)
-                else listItemModifier
+                if (state.nestLevel > 0) {
+                    listItemModifier.listItemNestedPadding(state.nestLevel * 2)
+                } else {
+                    listItemModifier
+                }
             DynamicFormListItem(
                 state,
                 label,
@@ -105,4 +108,4 @@ private fun HelpContent(
             onClose = { helpText = "" },
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocalCaseEditor.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocalCaseEditor.kt
index 1514e8985..279384199 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocalCaseEditor.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocalCaseEditor.kt
@@ -53,4 +53,4 @@ private val caseEditor = CaseEditor(
     isNewCase = false,
 )
 
-val LocalCaseEditor = staticCompositionLocalOf { caseEditor }
\ No newline at end of file
+val LocalCaseEditor = staticCompositionLocalOf { caseEditor }
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocationOutOfBoundsDialog.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocationOutOfBoundsDialog.kt
index 52ea88be4..acaaeabd3 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocationOutOfBoundsDialog.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocationOutOfBoundsDialog.kt
@@ -62,4 +62,4 @@ internal fun LocationOutOfBoundsDialog(
             confirmButton = startButton,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocationScreen.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocationScreen.kt
index 3d5beeb7b..795c45e88 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocationScreen.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocationScreen.kt
@@ -101,13 +101,13 @@ private fun AddressSummaryInColumn(
                         imageVector = CrisisCleanupIcons.Delete,
                         onClick = onClearAddress,
                         enabled = isEditable,
-                        modifier = Modifier.testTag("locationClearAddressBtn")
+                        modifier = Modifier.testTag("locationClearAddressBtn"),
                     )
                     CrisisCleanupIconButton(
                         imageVector = CrisisCleanupIcons.Edit,
                         onClick = onEditAddress,
                         enabled = isEditable,
-                        modifier = Modifier.testTag("locationEditAddressBtn")
+                        modifier = Modifier.testTag("locationEditAddressBtn"),
                     )
                 }
             }
@@ -151,8 +151,8 @@ internal fun BoxScope.LocationMapView(
     val onMapLoaded = remember(viewModel) { { editor.onMapLoaded() } }
     val onMapCameraChange = remember(viewModel) {
         { position: CameraPosition,
-          projection: Projection?,
-          isUserInteraction: Boolean ->
+                projection: Projection?,
+                isUserInteraction: Boolean, ->
             editor.onMapCameraChange(position, projection, isUserInteraction)
         }
     }
@@ -190,7 +190,8 @@ internal fun BoxScope.LocationMapView(
     LaunchedEffect(mapCameraZoom) {
         if (mapCameraZoom.takeApply()) {
             val update = CameraUpdateFactory.newLatLngZoom(
-                mapCameraZoom.center, mapCameraZoom.zoom
+                mapCameraZoom.center,
+                mapCameraZoom.zoom,
             )
 
             if (mapCameraZoom.durationMs > 0) {
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocationSearch.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocationSearch.kt
index b694fc698..ec13bdd6f 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocationSearch.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocationSearch.kt
@@ -46,7 +46,7 @@ internal fun ColumnScope.SearchContents(
     Box(
         modifier = Modifier
             .fillMaxWidth()
-            .weight(1f)
+            .weight(1f),
     ) {
         BusyIndicatorFloatingTopCenter(isBusySearching)
 
@@ -155,7 +155,7 @@ private fun ListSearchResults(
                             enabled = isEditable,
                             onClick = { onAddressSelect(keyAddress.address) },
                         )
-                        .listItemOptionPadding()
+                        .listItemOptionPadding(),
                 ) {
                     with(keyAddress.address) {
                         Column {
@@ -167,4 +167,4 @@ private fun ListSearchResults(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/MoveLocationOnMapScreen.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/MoveLocationOnMapScreen.kt
index 79ef3353a..3a441c192 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/MoveLocationOnMapScreen.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/MoveLocationOnMapScreen.kt
@@ -128,8 +128,8 @@ private fun BoxScope.MoveMapUnderLocation(
     val onMapLoaded = remember(viewModel) { { editor.onMapLoaded() } }
     val onMapCameraChange = remember(viewModel) {
         { position: CameraPosition,
-          projection: Projection?,
-          isUserInteraction: Boolean ->
+                projection: Projection?,
+                isUserInteraction: Boolean, ->
             editor.onMapCameraChange(position, projection, isUserInteraction)
         }
     }
@@ -172,7 +172,8 @@ private fun BoxScope.MoveMapUnderLocation(
     LaunchedEffect(mapCameraZoom) {
         if (mapCameraZoom.takeApply()) {
             val update = CameraUpdateFactory.newLatLngZoom(
-                mapCameraZoom.center, mapCameraZoom.zoom
+                mapCameraZoom.center,
+                mapCameraZoom.zoom,
             )
 
             if (mapCameraZoom.durationMs > 0) {
@@ -230,4 +231,4 @@ private fun SaveActionBar(
             onClick = onSave,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/NotesFlagsScreen.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/NotesFlagsScreen.kt
index 2925d34ef..666525013 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/NotesFlagsScreen.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/NotesFlagsScreen.kt
@@ -89,8 +89,11 @@ internal fun LazyListScope.staticNoteItems(
         count,
         key = {
             val note = notes[it]
-            if (note.id > 0) note.id
-            else note.createdAt.toEpochMilliseconds()
+            if (note.id > 0) {
+                note.id
+            } else {
+                note.createdAt.toEpochMilliseconds()
+            }
         },
         contentType = { "item-note" },
     ) {
@@ -99,10 +102,13 @@ internal fun LazyListScope.staticNoteItems(
             NoteCardView(note, modifier)
         } else {
             val viewModifier =
-                if (note.isSurvivor) Modifier
-                    .background(survivorNoteColor)
-                    .then(modifier)
-                else modifier
+                if (note.isSurvivor) {
+                    Modifier
+                        .background(survivorNoteColor)
+                        .then(modifier)
+                } else {
+                    modifier
+                }
             NoteView(note, viewModifier)
         }
     }
@@ -195,4 +201,4 @@ private fun SurvivorNoteLegendPreview() {
             SurvivorNoteLegend(listItemModifier)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/PropertyDataScreen.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/PropertyDataScreen.kt
index 99c99eaaf..4efa40db1 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/PropertyDataScreen.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/PropertyDataScreen.kt
@@ -109,7 +109,7 @@ internal fun PropertyFormView(
         onNext = clearEmailError,
         enabled = isEditable,
         imeAction = ImeAction.Done,
-        onEnter = closeKeyboard
+        onEnter = closeKeyboard,
     )
 
     val autoContactFrequencyLabel = translator("casesVue.auto_contact_frequency")
@@ -126,7 +126,7 @@ internal fun PropertyFormView(
                 .listItemHorizontalPadding()
                 // TODO Common dimensions
                 .padding(top = 16.dp),
-            showHelp = showHelp
+            showHelp = showHelp,
         )
     }
     val updateContactFrequency = remember(inputData) {
@@ -211,7 +211,7 @@ private fun PropertyFormResidentNameView(
                 expanded = !hideDropdown,
                 onDismissRequest = onStopSuggestions,
                 offset = listItemDropdownMenuOffset,
-                properties = PopupProperties(focusable = false)
+                properties = PopupProperties(focusable = false),
             ) {
                 // TODO Add same option in location search dropdown.
                 //      Stop searching entirely for the editing session when selected.
@@ -234,4 +234,4 @@ private fun PropertyFormResidentNameView(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/PropertyNotesFlagsView.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/PropertyNotesFlagsView.kt
index 2ee4dee48..7cce62a76 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/PropertyNotesFlagsView.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/PropertyNotesFlagsView.kt
@@ -61,11 +61,14 @@ internal fun PropertyNotesFlagsView(
     val showAllNotes = remember(inputData) { { showAllNotesDialog = true } }
     val isExpandable = notes.size > collapsedNotesVisibleCount
     Row(
-        modifier = if (isExpandable) Modifier
-            .fillMaxWidth()
-            .listItemHeight()
-            .listItemHorizontalPadding()
-        else listItemModifier,
+        modifier = if (isExpandable) {
+            Modifier
+                .fillMaxWidth()
+                .listItemHeight()
+                .listItemHorizontalPadding()
+        } else {
+            listItemModifier
+        },
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Text(
@@ -147,7 +150,7 @@ private fun AllNotes(
                     Modifier
                         // TODO Common dimensions
                         .padding(top = 16.dp)
-                        .weight(weight = 1f, fill = false)
+                        .weight(weight = 1f, fill = false),
                 ) {
                     LazyColumn {
                         staticNoteItems(
@@ -160,7 +163,7 @@ private fun AllNotes(
                 Box(
                     Modifier
                         .listItemPadding()
-                        .align(Alignment.End)
+                        .align(Alignment.End),
                 ) {
                     CrisisCleanupTextButton(
                         onClick = onDismiss,
@@ -171,4 +174,4 @@ private fun AllNotes(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/SectionHeader.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/SectionHeader.kt
index 058e3c714..74a23947f 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/SectionHeader.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/SectionHeader.kt
@@ -41,11 +41,11 @@ private fun CircleNumber(
                     color = attentionBackgroundColor,
                     radius = this.size.maxDimension * 0.5f,
                 )
-            }
+            },
     ) {
         Text(
             "$number",
-            Modifier.testTag("circleNumberText_${number}").align(Alignment.Center),
+            Modifier.testTag("circleNumberText_$number").align(Alignment.Center),
             style = style,
             textAlign = TextAlign.Center,
         )
@@ -53,7 +53,8 @@ private fun CircleNumber(
 }
 
 private val headerTextStyle: TextStyle
-    @Composable @ReadOnlyComposable get() = LocalFontStyles.current.header3
+    @Composable @ReadOnlyComposable
+    get() = LocalFontStyles.current.header3
 
 @Composable
 internal fun SectionHeaderCollapsible(
@@ -116,7 +117,7 @@ internal fun SectionHeader(
         )
         Text(
             sectionTitle,
-            Modifier.testTag("sectionHeaderTitle_${sIndex}_${sectionTitle}").listRowItemStartPadding(),
+            Modifier.testTag("sectionHeaderTitle_${sIndex}_$sectionTitle").listRowItemStartPadding(),
             style = textStyle,
         )
         trailingContent?.let {
@@ -130,4 +131,4 @@ internal fun SectionHeader(
 @Composable
 private fun CircleNumberPreview() {
     CircleNumber(number = 1)
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ShareCaseScreen.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ShareCaseScreen.kt
index f309dc892..d3f729134 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ShareCaseScreen.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ShareCaseScreen.kt
@@ -325,8 +325,11 @@ private fun LazyListScope.shareCaseInput(
 
     item {
         val hintTranslationKey =
-            if (viewModel.isEmailContactMethod) "shareWorksite.manually_enter_emails"
-            else "shareWorksite.manually_enter_phones"
+            if (viewModel.isEmailContactMethod) {
+                "shareWorksite.manually_enter_emails"
+            } else {
+                "shareWorksite.manually_enter_phones"
+            }
         val receiverContact by viewModel.receiverContactManual.collectAsStateWithLifecycle()
         Row(
             listItemModifier,
@@ -417,7 +420,7 @@ private fun ReceiverContactItem(
                                 onClick = { onRemoveContact(index) },
                                 role = Role.Button,
                             ),
-                        contentAlignment = Alignment.Center
+                        contentAlignment = Alignment.Center,
                     ) {
                         Icon(
                             imageVector = CrisisCleanupIcons.Clear,
@@ -491,8 +494,8 @@ private fun LazyListScope.contactSuggestionsItem(
             ) {
                 derivedStateOf {
                     contactOptions.isNotEmpty() &&
-                            receiverContact.isNotBlank() &&
-                            dismissSuggestionsQuery != receiverContact
+                        receiverContact.isNotBlank() &&
+                        dismissSuggestionsQuery != receiverContact
                 }
             }
             DropdownMenu(
@@ -503,7 +506,7 @@ private fun LazyListScope.contactSuggestionsItem(
                 expanded = showDropdown,
                 onDismissRequest = dismissDropdown,
                 offset = listItemDropdownMenuOffset,
-                properties = PopupProperties(focusable = false)
+                properties = PopupProperties(focusable = false),
             ) {
                 BackHandler {
                     dismissDropdown()
@@ -523,4 +526,4 @@ private fun LazyListScope.contactSuggestionsItem(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/TransferWorkTypesScreen.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/TransferWorkTypesScreen.kt
index eb32a523e..e961a16f4 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/TransferWorkTypesScreen.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/TransferWorkTypesScreen.kt
@@ -56,7 +56,9 @@ internal fun TransferWorkTypesRoute(
 
     val isTransferring by viewModel.isTransferring.collectAsStateWithLifecycle()
     val isEditable = !isTransferring
-    val conditionalBack = if (isEditable) onBack else {
+    val conditionalBack = if (isEditable) {
+        onBack
+    } else {
         {}
     }
     BackHandler(isEditable) {
@@ -278,4 +280,4 @@ private fun BottomActionBar(
             onClick = onTransfer,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ViewUtil.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ViewUtil.kt
index 089588135..8eaa819f5 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ViewUtil.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ViewUtil.kt
@@ -47,4 +47,4 @@ internal fun CrisisCleanupIconTextButton(
         iconTint = actionLinkColor,
         textColor = actionLinkColor,
     )
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/WorkTypeStatusOptions.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/WorkTypeStatusOptions.kt
index 89ac6c94b..3ec7f8497 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/WorkTypeStatusOptions.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/WorkTypeStatusOptions.kt
@@ -45,7 +45,7 @@ internal fun WorkTypeStatusDropdown(
     var showOptions by remember { mutableStateOf(false) }
     val toggleShowOptions = { showOptions = !showOptions }
     Box {
-        val restingModifier = if (applySpacing)
+        val restingModifier = if (applySpacing) {
             Modifier
                 .listCheckboxAlignItemPaddingCounterOffset()
                 .clickable(
@@ -54,13 +54,14 @@ internal fun WorkTypeStatusDropdown(
                 )
                 .listItemHeight()
                 .listItemPadding()
-        else
+        } else {
             Modifier
                 .clickable(
                     enabled = enabled,
                     onClick = toggleShowOptions,
                 )
                 .listItemHeight()
+        }
         WorkTypeStatusOption(
             selectedStatus,
             restingModifier,
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/AddFlagScreen.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/AddFlagScreen.kt
index 9741059be..d1848587d 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/AddFlagScreen.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/AddFlagScreen.kt
@@ -288,8 +288,8 @@ internal fun OrganizationsSearch(
         ) {
             derivedStateOf {
                 orgSuggestions.isNotEmpty() &&
-                        dismissSuggestionsQuery != orgQuery &&
-                        selectedOptionQuery != orgQuery
+                    dismissSuggestionsQuery != orgQuery &&
+                    selectedOptionQuery != orgQuery
             }
         }
         DropdownMenu(
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/HighPriorityFlagView.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/HighPriorityFlagView.kt
index 39751da04..ad648b366 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/HighPriorityFlagView.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/HighPriorityFlagView.kt
@@ -70,7 +70,7 @@ internal fun ColumnScope.HighPriorityFlagView(
         Modifier
             .scrollFlingListener(closeKeyboard)
             .weight(1f)
-            .fillMaxWidth()
+            .fillMaxWidth(),
     ) {
         labelTextItem(translator("flag.please_describe_why_high_priority"))
 
@@ -193,4 +193,4 @@ private fun ContactsDialog(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/ReportAbuseFlagView.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/ReportAbuseFlagView.kt
index 13e27b057..0a2e347d6 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/ReportAbuseFlagView.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/ReportAbuseFlagView.kt
@@ -52,7 +52,7 @@ internal fun ColumnScope.ReportAbuseFlagView(
         Modifier
             .scrollFlingListener(closeKeyboard)
             .weight(1f)
-            .fillMaxWidth()
+            .fillMaxWidth(),
     ) {
         listTextItem(translator("flag.organizations_complaining_about"))
 
@@ -146,4 +146,4 @@ internal fun ColumnScope.ReportAbuseFlagView(
         onCancel = onBack,
         enabled = isEditable,
     )
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/UpsetClientFlagView.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/UpsetClientFlagView.kt
index 623dc0d86..7d74799b3 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/UpsetClientFlagView.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/UpsetClientFlagView.kt
@@ -49,7 +49,7 @@ internal fun ColumnScope.UpsetClientFlagView(
         Modifier
             .scrollFlingListener(closeKeyboard)
             .weight(1f)
-            .fillMaxWidth()
+            .fillMaxWidth(),
     ) {
         labelTextItem(translator("flag.explain_why_client_upset"))
 
@@ -116,4 +116,4 @@ internal fun ColumnScope.UpsetClientFlagView(
         onCancel = onBack,
         enabled = isEditable,
     )
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/WrongIncidentFlagView.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/WrongIncidentFlagView.kt
index 19d61299f..acee7fe28 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/WrongIncidentFlagView.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/WrongIncidentFlagView.kt
@@ -72,7 +72,7 @@ internal fun ColumnScope.WrongIncidentFlagView(
         Modifier
             .scrollFlingListener(closeKeyboard)
             .weight(1f)
-            .fillMaxWidth()
+            .fillMaxWidth(),
     ) {
         item {
             Row(
@@ -126,10 +126,10 @@ internal fun ColumnScope.WrongIncidentFlagView(
                 ) {
                     derivedStateOf {
                         incidentSuggestions.isNotEmpty() &&
-                                dismissSuggestionsQuery != incidentQuery &&
-                                selectedOptionQuery != incidentQuery &&
-                                isQueryIdentical &&
-                                isIncidentListed
+                            dismissSuggestionsQuery != incidentQuery &&
+                            selectedOptionQuery != incidentQuery &&
+                            isQueryIdentical &&
+                            isIncidentListed
                     }
                 }
                 DropdownMenu(
@@ -140,7 +140,7 @@ internal fun ColumnScope.WrongIncidentFlagView(
                     expanded = showDropdown,
                     onDismissRequest = dismissDropdown,
                     offset = listItemDropdownMenuOffset,
-                    properties = PopupProperties(focusable = false)
+                    properties = PopupProperties(focusable = false),
                 ) {
                     BackHandler {
                         dismissDropdown()
@@ -194,4 +194,4 @@ internal fun ColumnScope.WrongIncidentFlagView(
         onCancel = onBack,
         enabled = isEditable && isSelected,
     )
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/WrongLocationFlagView.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/WrongLocationFlagView.kt
index 0d27fb05a..93e986b7c 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/WrongLocationFlagView.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/WrongLocationFlagView.kt
@@ -53,7 +53,7 @@ internal fun ColumnScope.WrongLocationFlagView(
         Modifier
             .scrollFlingListener(closeKeyboard)
             .weight(1f)
-            .fillMaxWidth()
+            .fillMaxWidth(),
     ) {
         listTextItem(translator("flag.move_case_pin"))
 
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/util/CommonCaseView.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/util/CommonCaseView.kt
index 4f3a50afd..76d31a688 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/util/CommonCaseView.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/util/CommonCaseView.kt
@@ -91,4 +91,4 @@ internal fun TwoActionBar(
             indicateBusy = isBusy,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/util/WorkTypeUtil.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/util/WorkTypeUtil.kt
index 37637bb82..b614e123b 100644
--- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/util/WorkTypeUtil.kt
+++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/util/WorkTypeUtil.kt
@@ -32,8 +32,8 @@ fun updateWorkTypeStatuses(
         .filter {
             with(it.value) {
                 dynamicValue.isBooleanTrue &&
-                        isWorkTypeGroup &&
-                        workTypeLookup[key] != null
+                    isWorkTypeGroup &&
+                    workTypeLookup[key] != null
             }
         }
         .forEach {
@@ -52,7 +52,7 @@ fun updateWorkTypeStatuses(
                             recur = recur,
                             statusLiteral = workTypeStatus.literal,
                             workTypeLiteral = workTypeLiteral,
-                        )
+                        ),
                     )
                 } else {
                     val isRecurChanged = recur != existingWorkType.recur
@@ -72,7 +72,9 @@ fun updateWorkTypeStatuses(
             .associateBy(WorkType::workType)
             .values
             .sortedBy { workType -> worksite.workTypes.indexOf(workType) }
-    } else worksite.workTypes
+    } else {
+        worksite.workTypes
+    }
 
     workTypes = workTypes
         .mapNotNull { keepWorkTypes[it.workTypeLiteral] }
@@ -85,5 +87,5 @@ fun updateWorkTypeStatuses(
 fun Worksite.updateKeyWorkType(reference: Worksite) = copy(
     keyWorkType = reference.keyWorkType?.workType?.let { matchWorkType ->
         workTypes.find { it.workType == matchWorkType }
-    } ?: workTypes.firstOrNull()
-)
\ No newline at end of file
+    } ?: workTypes.firstOrNull(),
+)
diff --git a/feature/caseeditor/src/test/java/com/crisiscleanup/feature/caseeditor/RruleHumanReadableTextTest.kt b/feature/caseeditor/src/test/java/com/crisiscleanup/feature/caseeditor/RruleHumanReadableTextTest.kt
index 5443b4b4b..eb515414d 100644
--- a/feature/caseeditor/src/test/java/com/crisiscleanup/feature/caseeditor/RruleHumanReadableTextTest.kt
+++ b/feature/caseeditor/src/test/java/com/crisiscleanup/feature/caseeditor/RruleHumanReadableTextTest.kt
@@ -141,7 +141,7 @@ class RruleHumanReadableTextTest {
                 Weekday.Saturday,
                 Weekday.Sunday,
                 Weekday.Friday,
-            )
+            ),
         ).toHumanReadableText(translator)
         val expected = "Every 2 weeks every day."
         assertEquals(expected, actual)
@@ -158,7 +158,7 @@ class RruleHumanReadableTextTest {
                 Weekday.Friday,
                 Weekday.Tuesday,
                 Weekday.Wednesday,
-            )
+            ),
         ).toHumanReadableText(translator)
         val expected = "Every week on weekdays (M-F)."
         assertEquals(expected, actual)
@@ -216,4 +216,4 @@ class RruleHumanReadableTextTest {
         val expectedD = "Every 6 weeks on Sunday and Wednesday."
         assertEquals(expectedD, actualD)
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/test/java/com/crisiscleanup/feature/caseeditor/model/FormDataCopyModifiedTest.kt b/feature/caseeditor/src/test/java/com/crisiscleanup/feature/caseeditor/model/FormDataCopyModifiedTest.kt
index 06dc4877b..7370448d1 100644
--- a/feature/caseeditor/src/test/java/com/crisiscleanup/feature/caseeditor/model/FormDataCopyModifiedTest.kt
+++ b/feature/caseeditor/src/test/java/com/crisiscleanup/feature/caseeditor/model/FormDataCopyModifiedTest.kt
@@ -12,12 +12,13 @@ class FormDataCopyModifiedTest {
 
         assertEquals(worksite.formData, worksite.copyModifiedFormData(emptyMap()))
         assertEquals(
-            worksite.formData, worksite.copyModifiedFormData(
+            worksite.formData,
+            worksite.copyModifiedFormData(
                 mapOf(
                     "a" to DynamicValue(""),
                     "b" to DynamicValue("", true),
-                )
-            )
+                ),
+            ),
         )
     }
 
@@ -28,7 +29,7 @@ class FormDataCopyModifiedTest {
                 "a" to WorksiteFormValue(false, ""),
                 "b" to WorksiteFormValue(true, "", true),
                 "c" to WorksiteFormValue(true, "", false),
-            )
+            ),
         )
 
         // Remove only
@@ -39,7 +40,7 @@ class FormDataCopyModifiedTest {
             ),
             worksite.copyModifiedFormData(
                 mapOf("b" to DynamicValue("", isBoolean = true, false)),
-            )
+            ),
         )
 
         assertEquals(
@@ -49,9 +50,9 @@ class FormDataCopyModifiedTest {
             worksite.copyModifiedFormData(
                 mapOf(
                     "b" to DynamicValue("", isBoolean = true, false),
-                    "c" to DynamicValue("", isBoolean = true, false)
-                )
-            )
+                    "c" to DynamicValue("", isBoolean = true, false),
+                ),
+            ),
         )
 
         // Change/add only
@@ -64,8 +65,8 @@ class FormDataCopyModifiedTest {
             worksite.copyModifiedFormData(
                 mapOf(
                     "c" to DynamicValue("", isBoolean = true, true),
-                )
-            )
+                ),
+            ),
         )
 
         assertEquals(
@@ -78,8 +79,8 @@ class FormDataCopyModifiedTest {
             worksite.copyModifiedFormData(
                 mapOf(
                     "d" to DynamicValue("", isBoolean = true, true),
-                )
-            )
+                ),
+            ),
         )
 
         // Changes
@@ -92,8 +93,8 @@ class FormDataCopyModifiedTest {
                 mapOf(
                     "b" to DynamicValue("", isBoolean = true, true),
                     "c" to DynamicValue("", isBoolean = true, false),
-                )
-            )
+                ),
+            ),
         )
 
         assertEquals(
@@ -105,8 +106,8 @@ class FormDataCopyModifiedTest {
                 mapOf(
                     "b" to DynamicValue("", isBoolean = true, false),
                     "c" to DynamicValue("", isBoolean = true, true),
-                )
-            )
+                ),
+            ),
         )
     }
 
@@ -118,7 +119,7 @@ class FormDataCopyModifiedTest {
                 "b" to WorksiteFormValue(true, "", true),
                 "c" to WorksiteFormValue(true, "", false),
                 "d" to WorksiteFormValue(false, "early"),
-            )
+            ),
         )
 
         // Remove only
@@ -131,8 +132,8 @@ class FormDataCopyModifiedTest {
             worksite.copyModifiedFormData(
                 mapOf(
                     "d" to DynamicValue(""),
-                )
-            )
+                ),
+            ),
         )
 
         assertEquals(
@@ -144,8 +145,8 @@ class FormDataCopyModifiedTest {
             worksite.copyModifiedFormData(
                 mapOf(
                     "a" to DynamicValue(""),
-                )
-            )
+                ),
+            ),
         )
 
         assertEquals(
@@ -157,8 +158,8 @@ class FormDataCopyModifiedTest {
                 mapOf(
                     "a" to DynamicValue(""),
                     "d" to DynamicValue(""),
-                )
-            )
+                ),
+            ),
         )
 
         // Change/add
@@ -172,8 +173,8 @@ class FormDataCopyModifiedTest {
             worksite.copyModifiedFormData(
                 mapOf(
                     "a" to DynamicValue("change-a"),
-                )
-            )
+                ),
+            ),
         )
 
         assertEquals(
@@ -182,14 +183,14 @@ class FormDataCopyModifiedTest {
                 "b" to WorksiteFormValue(true, "", true),
                 "c" to WorksiteFormValue(true, "", false),
                 "d" to WorksiteFormValue(false, "early"),
-                "e" to WorksiteFormValue(false, "add-e")
+                "e" to WorksiteFormValue(false, "add-e"),
             ),
             worksite.copyModifiedFormData(
                 mapOf(
                     "a" to DynamicValue("change-a"),
                     "e" to DynamicValue("add-e"),
-                )
-            )
+                ),
+            ),
         )
 
         // Changes
@@ -198,15 +199,15 @@ class FormDataCopyModifiedTest {
                 "b" to WorksiteFormValue(true, "", true),
                 "c" to WorksiteFormValue(true, "", false),
                 "d" to WorksiteFormValue(false, "change-d"),
-                "e" to WorksiteFormValue(false, "add-e")
+                "e" to WorksiteFormValue(false, "add-e"),
             ),
             worksite.copyModifiedFormData(
                 mapOf(
                     "a" to DynamicValue(""),
                     "d" to DynamicValue("change-d "),
                     "e" to DynamicValue("add-e"),
-                )
-            )
+                ),
+            ),
         )
     }
 
@@ -221,7 +222,7 @@ class FormDataCopyModifiedTest {
                 "e" to WorksiteFormValue(false, "early"),
                 "f" to WorksiteFormValue(true, "", true),
                 "g" to WorksiteFormValue(false, " g "),
-            )
+            ),
         )
 
         // Remove only
@@ -258,8 +259,8 @@ class FormDataCopyModifiedTest {
                     "l" to DynamicValue("", true),
                     // Add
                     "m" to DynamicValue("morrey", isBoolean = true, true),
-                )
-            )
+                ),
+            ),
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/caseeditor/src/test/java/com/crisiscleanup/feature/caseeditor/model/LocationInputDataFlagFormDataTest.kt b/feature/caseeditor/src/test/java/com/crisiscleanup/feature/caseeditor/model/LocationInputDataFlagFormDataTest.kt
index d9a9edd91..41df661dd 100644
--- a/feature/caseeditor/src/test/java/com/crisiscleanup/feature/caseeditor/model/LocationInputDataFlagFormDataTest.kt
+++ b/feature/caseeditor/src/test/java/com/crisiscleanup/feature/caseeditor/model/LocationInputDataFlagFormDataTest.kt
@@ -76,6 +76,7 @@ class LocationInputDataFlagFormDataTest {
             "flag.worksite_wrong_location",
             "",
             "",
+            attr = null,
         )
         assertEquals(expectedFlag, lastFlag)
     }
@@ -86,7 +87,7 @@ class LocationInputDataFlagFormDataTest {
             listOf(
                 makeTestWorksiteFlag(createdAtA, "reason-a"),
                 makeTestWorksiteFlag(createdAtB, "reason-b"),
-            )
+            ),
         )
 
         val locationInputData = LocationInputData(translator, worksite)
@@ -102,7 +103,7 @@ class LocationInputDataFlagFormDataTest {
         val worksite = worksiteFlagsTest(
             listOf(
                 makeTestWorksiteFlag(createdAtA, "reason-a"),
-            )
+            ),
         )
 
         val locationInputData = LocationInputData(translator, worksite)
@@ -156,7 +157,7 @@ class LocationInputDataFlagFormDataTest {
             listOf(
                 makeTestWorksiteFlag(createdAtA, "flag.worksite_wrong_location"),
                 makeTestWorksiteFlag(createdAtB, "reason-b"),
-            )
+            ),
         )
 
         val locationInputData = LocationInputData(translator, worksite)
@@ -167,9 +168,11 @@ class LocationInputDataFlagFormDataTest {
         val updated = locationInputData.updateCase()
 
         assertRemoveWrongLocationFlag(
-            worksite, updated, listOf(
+            worksite,
+            updated,
+            listOf(
                 makeTestWorksiteFlag(createdAtB, "reason-b"),
-            )
+            ),
         )
     }
 
@@ -178,7 +181,7 @@ class LocationInputDataFlagFormDataTest {
         val worksite = worksiteFlagsTest(
             listOf(
                 makeTestWorksiteFlag(createdAtA, "flag.worksite_wrong_location"),
-            )
+            ),
         )
 
         val locationInputData = LocationInputData(translator, worksite)
@@ -246,9 +249,9 @@ class LocationInputDataFlagFormDataTest {
                 "form-data-b" to WorksiteFormValue(
                     isBoolean = true,
                     valueString = "",
-                    valueBoolean = false
+                    valueBoolean = false,
                 ),
-            )
+            ),
         )
         val locationInputData = LocationInputData(translator, worksite)
         locationInputData.crossStreetNearbyLandmark = "cross-street"
@@ -263,7 +266,7 @@ class LocationInputDataFlagFormDataTest {
         val worksite = worksiteFormTest(
             mapOf(
                 "form-data-a" to WorksiteFormValue(valueString = "a"),
-            )
+            ),
         )
         val locationInputData = LocationInputData(translator, worksite)
         locationInputData.crossStreetNearbyLandmark = "cross-street"
@@ -316,9 +319,9 @@ class LocationInputDataFlagFormDataTest {
                 "form-data-b" to WorksiteFormValue(
                     isBoolean = true,
                     valueString = "",
-                    valueBoolean = false
+                    valueBoolean = false,
                 ),
-            )
+            ),
         )
         val locationInputData = LocationInputData(translator, worksite)
         assertEquals("cross-street-a", locationInputData.crossStreetNearbyLandmark)
@@ -328,13 +331,15 @@ class LocationInputDataFlagFormDataTest {
         val update = locationInputData.updateCase()
 
         assertRemoveCrossStreet(
-            worksite, update, mapOf(
+            worksite,
+            update,
+            mapOf(
                 "form-data-b" to WorksiteFormValue(
                     isBoolean = true,
                     valueString = "",
-                    valueBoolean = false
+                    valueBoolean = false,
                 ),
-            )
+            ),
         )
     }
 
@@ -343,7 +348,7 @@ class LocationInputDataFlagFormDataTest {
         val worksite = worksiteFormTest(
             mapOf(
                 "cross_street" to WorksiteFormValue(valueString = "cross-street-a"),
-            )
+            ),
         )
         val locationInputData = LocationInputData(translator, worksite)
         assertEquals("cross-street-a", locationInputData.crossStreetNearbyLandmark)
@@ -363,7 +368,7 @@ private val baseFlags = listOf(
         createdAt = prevCreatedAt,
         isHighPriority = false,
         reasonT = "worksite-flag",
-    )
+    ),
 )
 private val baseFormData = mapOf(
     "boolean-data" to WorksiteFormValue(isBoolean = true, valueString = "", valueBoolean = true),
@@ -381,5 +386,5 @@ private fun worksiteFormTest(formData: Map<String, WorksiteFormValue>?) = makeTe
     prevCreatedAt,
     prevCreatedAt,
     baseFlags,
-    formData
-)
\ No newline at end of file
+    formData,
+)
diff --git a/feature/caseeditor/src/test/java/com/crisiscleanup/feature/caseeditor/model/WorksiteFormDataChangeTest.kt b/feature/caseeditor/src/test/java/com/crisiscleanup/feature/caseeditor/model/WorksiteFormDataChangeTest.kt
index a9031b4a0..c2ec0338a 100644
--- a/feature/caseeditor/src/test/java/com/crisiscleanup/feature/caseeditor/model/WorksiteFormDataChangeTest.kt
+++ b/feature/caseeditor/src/test/java/com/crisiscleanup/feature/caseeditor/model/WorksiteFormDataChangeTest.kt
@@ -41,7 +41,7 @@ class WorksiteFormDataChangeTest {
                 "b" to WorksiteFormValue(false, " b"),
                 "c" to WorksiteFormValue(true, "doesn't matter", false),
                 "d" to WorksiteFormValue(true, "irrelevant", true),
-            )
+            ),
         )
 
         val dynamicData = mapOf(
@@ -66,10 +66,10 @@ class WorksiteFormDataChangeTest {
         val worksiteNull = makeTestWorksiteFormData()
         val worksiteEmpty = makeTestWorksiteFormData(emptyMap())
         val worksiteFalse = makeTestWorksiteFormData(
-            mapOf("a" to WorksiteFormValue(true, "", false))
+            mapOf("a" to WorksiteFormValue(true, "", false)),
         )
         val worksiteTrue = makeTestWorksiteFormData(
-            mapOf("a" to WorksiteFormValue(true, "", true))
+            mapOf("a" to WorksiteFormValue(true, "", true)),
         )
 
         val dynamicDataEmpty = emptyMap<String, DynamicValue>()
@@ -90,13 +90,13 @@ class WorksiteFormDataChangeTest {
         val worksiteNull = makeTestWorksiteFormData()
         val worksiteEmpty = makeTestWorksiteFormData(emptyMap())
         val worksiteWhitespace = makeTestWorksiteFormData(
-            mapOf("a" to WorksiteFormValue(false, "  "))
+            mapOf("a" to WorksiteFormValue(false, "  ")),
         )
         val worksiteLowercase = makeTestWorksiteFormData(
-            mapOf("a" to WorksiteFormValue(false, "animal"))
+            mapOf("a" to WorksiteFormValue(false, "animal")),
         )
         val worksiteCaps = makeTestWorksiteFormData(
-            mapOf("a" to WorksiteFormValue(false, "ANIMAL"))
+            mapOf("a" to WorksiteFormValue(false, "ANIMAL")),
         )
 
         val dynamicDataEmpty = emptyMap<String, DynamicValue>()
@@ -139,10 +139,10 @@ class WorksiteFormDataChangeTest {
 
 val dateA = Clock.System.now().minus(1.days)
 internal fun makeTestWorksiteFormData(
-    formData: Map<String, WorksiteFormValue>? = null
+    formData: Map<String, WorksiteFormValue>? = null,
 ) = makeTestWorksite(
     dateA,
     dateA,
     null,
     formData,
-)
\ No newline at end of file
+)
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesConstant.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesConstant.kt
index 317b747c4..f96a55f3e 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesConstant.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesConstant.kt
@@ -7,4 +7,4 @@ object CasesConstant {
      * The next zoom level markers are interactive and can trigger details/navigation.
      */
     const val InteractiveZoomLevel = 9
-}
\ No newline at end of file
+}
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesQueryStateManager.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesQueryStateManager.kt
index eab954e97..f6e76e1e2 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesQueryStateManager.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesQueryStateManager.kt
@@ -62,4 +62,4 @@ internal class CasesQueryStateManager(
         }
             .launchIn(coroutineScope)
     }
-}
\ No newline at end of file
+}
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesSearchViewModel.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesSearchViewModel.kt
index a2bc2dc19..929557562 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesSearchViewModel.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesSearchViewModel.kt
@@ -164,7 +164,6 @@ class CasesSearchViewModel @Inject constructor(
         }
         .flowOn(ioDispatcher)
 
-
     val searchResults = combine(
         incidentSearchQuery,
         localSearchResults,
@@ -246,8 +245,11 @@ class CasesSearchViewModel @Inject constructor(
             try {
                 val incidentId = incidentSelector.incidentId.value
                 val worksiteId = with(result) {
-                    if (summary.id > 0) summary.id
-                    else worksitesRepository.getLocalId(networkWorksiteId)
+                    if (summary.id > 0) {
+                        summary.id
+                    } else {
+                        worksitesRepository.getLocalId(networkWorksiteId)
+                    }
                 }
                 selectedWorksite.value = Pair(incidentId, worksiteId)
             } catch (e: Exception) {
@@ -267,4 +269,4 @@ data class CasesSearchResults(
     val q: String = "",
     val isShortQ: Boolean = true,
     val options: List<CaseSummaryResult> = emptyList(),
-)
\ No newline at end of file
+)
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesTableViewDataLoader.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesTableViewDataLoader.kt
index 7252303b8..f69ff1f49 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesTableViewDataLoader.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesTableViewDataLoader.kt
@@ -121,8 +121,8 @@ class CasesTableViewDataLoader(
                 .map { it.workType }
             val claimedWorkTypes = worksite.workTypes.filter {
                 it.orgClaim != null &&
-                        !affiliateIds.contains(it.orgClaim) &&
-                        !requested.contains(it.workTypeLiteral)
+                    !affiliateIds.contains(it.orgClaim) &&
+                    !requested.contains(it.workTypeLiteral)
             }
             worksiteProvider.editableWorksite.value = worksite
             transferWorkTypeProvider.startTransfer(
@@ -138,8 +138,11 @@ class CasesTableViewDataLoader(
             TableWorksiteClaimAction.Claim -> {
                 if (claimStatus == TableWorksiteClaimStatus.HasUnclaimed) {
                     val changeWorkTypes = worksite.workTypes.map {
-                        if (it.isClaimed) it
-                        else it.copy(orgClaim = myOrgId)
+                        if (it.isClaimed) {
+                            it
+                        } else {
+                            it.copy(orgClaim = myOrgId)
+                        }
                     }
                     saveChanges(worksite, changeWorkTypes, myOrgId)
                     return WorksiteClaimActionResult(isSuccess = true)
@@ -149,8 +152,11 @@ class CasesTableViewDataLoader(
             TableWorksiteClaimAction.Unclaim -> {
                 if (claimStatus == TableWorksiteClaimStatus.ClaimedByMyOrg) {
                     val changeWorkTypes = worksite.workTypes.map {
-                        if (it.orgClaim != myOrgId) it
-                        else it.copy(orgClaim = null)
+                        if (it.orgClaim != myOrgId) {
+                            it
+                        } else {
+                            it.copy(orgClaim = null)
+                        }
                     }
                     saveChanges(worksite, changeWorkTypes, myOrgId)
                     return WorksiteClaimActionResult(isSuccess = true)
@@ -231,4 +237,4 @@ data class WorksiteClaimActionResult(
     val isActionInProgress: Boolean = false,
     val statusChangedTo: TableWorksiteClaimStatus? = null,
     val errorMessage: String = "",
-)
\ No newline at end of file
+)
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesViewModel.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesViewModel.kt
index ae88513ac..d5122b208 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesViewModel.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/CasesViewModel.kt
@@ -265,9 +265,9 @@ class CasesViewModel @Inject constructor(
             val id = wqs.incidentId
 
             val skipMarkers = !isMapLoaded ||
-                    wqs.isTableView ||
-                    id == EmptyIncident.id ||
-                    mapTileRenderer.rendersAt(wqs.zoom)
+                wqs.isTableView ||
+                id == EmptyIncident.id ||
+                mapTileRenderer.rendersAt(wqs.zoom)
 
             if (skipMarkers) {
                 emptyList()
@@ -381,11 +381,15 @@ class CasesViewModel @Inject constructor(
             val visibleCount = markers.filterNot { it.isFilteredOut }.size
 
             val countText = if (visibleCount == totalCount || visibleCount == 0) {
-                if (visibleCount == 0) translator("info.t_of_t_cases")
-                    .replace("{visible_count}", "$totalCount")
-                else if (totalCount == 1) translator("info.1_of_1_case")
-                else translator("info.t_of_t_cases")
-                    .replace("{visible_count}", "$totalCount")
+                if (visibleCount == 0) {
+                    translator("info.t_of_t_cases")
+                        .replace("{visible_count}", "$totalCount")
+                } else if (totalCount == 1) {
+                    translator("info.1_of_1_case")
+                } else {
+                    translator("info.t_of_t_cases")
+                        .replace("{visible_count}", "$totalCount")
+                }
             } else {
                 translator("info.v_of_t_cases")
                     .replace("{visible_count}", "$visibleCount")
@@ -509,8 +513,10 @@ class CasesViewModel @Inject constructor(
             val distance = if (hasLocation) {
                 val worksite = tableData.worksite
                 haversineDistance(
-                    latitudeRad, longitudeRad,
-                    worksite.latitude.radians, worksite.longitude.radians,
+                    latitudeRad,
+                    longitudeRad,
+                    worksite.latitude.radians,
+                    worksite.longitude.radians,
                 ).kmToMiles
             } else {
                 -1.0
@@ -647,8 +653,8 @@ class CasesViewModel @Inject constructor(
                 val sinceLastRefresh = now - tileRefreshedInstant
                 val projectedDelta = projectedFinish - now
                 refreshTiles = now - pullStart > tileClearRefreshInterval &&
-                        sinceLastRefresh > tileClearRefreshInterval &&
-                        projectedDelta > tileClearRefreshInterval
+                    sinceLastRefresh > tileClearRefreshInterval &&
+                    projectedDelta > tileClearRefreshInterval
                 if (idCount.totalCount - tileClearWorksitesCount >= 6000 &&
                     dataCount - tileClearWorksitesCount > 3000
                 ) {
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/MemoryWorksiteProvider.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/MemoryWorksiteProvider.kt
index fe8432fea..78f0f61b5 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/MemoryWorksiteProvider.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/MemoryWorksiteProvider.kt
@@ -24,6 +24,6 @@ interface WorksiteProviderModule {
     @Binds
     @Singleton
     fun bindsWorksiteProvider(
-        provider: MemoryWorksiteProvider
+        provider: MemoryWorksiteProvider,
     ): WorksiteProvider
-}
\ No newline at end of file
+}
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/SelectIncidentViewModel.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/SelectIncidentViewModel.kt
index 77511e865..e6ec2bf0c 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/SelectIncidentViewModel.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/SelectIncidentViewModel.kt
@@ -33,4 +33,4 @@ class SelectIncidentViewModel @Inject constructor(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/di/MapTileModule.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/di/MapTileModule.kt
index f9b0ac7d7..17e3274e1 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/di/MapTileModule.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/di/MapTileModule.kt
@@ -15,10 +15,10 @@ interface MapTileModule {
     @Singleton
     @Binds
     fun bindsTileRenderer(
-        renderer: CaseDotsMapTileRenderer
+        renderer: CaseDotsMapTileRenderer,
     ): CasesOverviewMapTileRenderer
 
     @Singleton
     @Binds
     fun bindsTileProvider(provider: CaseDotsMapTileRenderer): TileProvider
-}
\ No newline at end of file
+}
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/CasesMapBoundsManager.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/CasesMapBoundsManager.kt
index 7caa0706f..c32b46cb4 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/CasesMapBoundsManager.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/CasesMapBoundsManager.kt
@@ -110,4 +110,4 @@ internal class CasesMapBoundsManager(
             mapBoundsCache = latLngBounds
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/CasesMapTileLayerManager.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/CasesMapTileLayerManager.kt
index ace295346..c66895c0b 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/CasesMapTileLayerManager.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/CasesMapTileLayerManager.kt
@@ -73,4 +73,4 @@ internal class CasesMapTileLayerManager(
     private fun onTileChange(dataChangeValue: Long) {
         tileDataChangeKey.longValue = dataChangeValue % 1_000_000
     }
-}
\ No newline at end of file
+}
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/CasesOverviewMapTileRenderer.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/CasesOverviewMapTileRenderer.kt
index f841d1487..c3a103bcb 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/CasesOverviewMapTileRenderer.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/CasesOverviewMapTileRenderer.kt
@@ -216,8 +216,11 @@ class CaseDotsMapTileRenderer @Inject constructor(
             }
 
             if (worksites.isNotEmpty() && bitmap == null) {
-                bitmap = if (isRenderingBorder) borderTile.copy()
-                else squareBitmap(tileSizePx)
+                bitmap = if (isRenderingBorder) {
+                    borderTile.copy()
+                } else {
+                    squareBitmap(tileSizePx)
+                }
                 canvas = Canvas(bitmap)
             }
 
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/CoordinateUtil.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/CoordinateUtil.kt
index ce95adfe8..4034dce29 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/CoordinateUtil.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/CoordinateUtil.kt
@@ -10,9 +10,13 @@ object CoordinateUtil {
         }
 
         val longitude = ((right + l) * 0.5) % 360
-        return if (longitude < -180) longitude + 360
-        else if (longitude > 180) longitude - 360
-        else longitude
+        return if (longitude < -180) {
+            longitude + 360
+        } else if (longitude > 180) {
+            longitude - 360
+        } else {
+            longitude
+        }
     }
 
     fun getMiddleCoordinate(sw: LatLng, ne: LatLng) = LatLng(
@@ -32,7 +36,6 @@ object CoordinateUtil {
             val wrappedTo = to - 360
             val longitude = from + (wrappedTo - from) * lerp
             return if (longitude < -180) longitude + 360 else longitude
-
         } else {
             if (to >= from) {
                 return from + (to - from) * lerp
@@ -43,4 +46,4 @@ object CoordinateUtil {
             return if (longitude > 180) longitude - 360 else longitude
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/DrawnDotManager.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/DrawnDotManager.kt
index 180b75053..7a4509713 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/DrawnDotManager.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/map/DrawnDotManager.kt
@@ -36,7 +36,7 @@ internal class DrawnDotManager(
     fun isDotOccupied(
         zoom: Int,
         xNorm: Double,
-        yNorm: Double
+        yNorm: Double,
     ): Boolean {
         if (worksitesCount < smallWorksitesCount ||
             zoom > farZoomThreshold
@@ -66,4 +66,4 @@ internal class DrawnDotManager(
 
     override fun toString(): String =
         "Skipped $skipDotCounter, drawn ${drawnDotIndexes.size}, delta time $timingDeltaMillis"
-}
\ No newline at end of file
+}
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/navigation/CasesFilterNavigation.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/navigation/CasesFilterNavigation.kt
index d4a16058c..dfdf79601 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/navigation/CasesFilterNavigation.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/navigation/CasesFilterNavigation.kt
@@ -19,4 +19,4 @@ fun NavGraphBuilder.casesFilterScreen(
             onBack,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/navigation/CasesNavigation.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/navigation/CasesNavigation.kt
index 517d955df..868a594f8 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/navigation/CasesNavigation.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/navigation/CasesNavigation.kt
@@ -51,4 +51,4 @@ fun NavGraphBuilder.casesGraph(
 
         nestedGraphs()
     }
-}
\ No newline at end of file
+}
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/navigation/CasesSearchNavigation.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/navigation/CasesSearchNavigation.kt
index 237ac505c..6dfb85b36 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/navigation/CasesSearchNavigation.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/navigation/CasesSearchNavigation.kt
@@ -21,4 +21,4 @@ fun NavGraphBuilder.casesSearchScreen(
             openCase = openCase,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesActionBar.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesActionBar.kt
index a1f342946..67633caca 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesActionBar.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesActionBar.kt
@@ -91,7 +91,10 @@ internal fun CasesActionBar(
         horizontalArrangement = Arrangement.spacedBy(adjacentButtonSpace),
     ) {
         CasesActionButton(
-            modifier, CasesAction.Search, onCasesAction, shape = actionStartRoundCornerShape
+            modifier,
+            CasesAction.Search,
+            onCasesAction,
+            shape = actionStartRoundCornerShape,
         )
         FilterButtonBadge(filtersCount) {
             CasesActionButton(
@@ -146,4 +149,4 @@ fun CasesActionBarPreview() {
 @Composable
 fun CasesZoomBarPreview() {
     CasesZoomBar()
-}
\ No newline at end of file
+}
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesFilterScreen.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesFilterScreen.kt
index 339cf3cb1..7ad8307fc 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesFilterScreen.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesFilterScreen.kt
@@ -381,7 +381,7 @@ private fun LazyListScope.rangeSliderItem(
                 Text(
                     text,
                     modifier = Modifier
-                        .testTag("filterSectionHeader_${text}")
+                        .testTag("filterSectionHeader_$text")
                         .listItemVerticalPadding(),
                     style = LocalFontStyles.current.header3,
                     fontWeight = FontWeight.Bold,
@@ -398,7 +398,7 @@ private fun LazyListScope.rangeSliderItem(
                     ) {
                         HelpRow(
                             text = label,
-                            modifier = Modifier.testTag("filterSectionHeaderHelpRow_${label}"),
+                            modifier = Modifier.testTag("filterSectionHeaderHelpRow_$label"),
                             iconContentDescription = label,
                             showHelp = showHelp,
                             isBold = true,
@@ -481,12 +481,15 @@ private fun FilterHeaderCollapsible(
     ) {
         Text(
             sectionTitle,
-            modifier = Modifier.testTag("filterHeaderCollapsibleTitle_${sectionTitle}"),
+            modifier = Modifier.testTag("filterHeaderCollapsibleTitle_$sectionTitle"),
             style = LocalFontStyles.current.header3,
         )
         val iconVector =
-            if (isCollapsed) CrisisCleanupIcons.ExpandLess
-            else CrisisCleanupIcons.ExpandMore
+            if (isCollapsed) {
+                CrisisCleanupIcons.ExpandLess
+            } else {
+                CrisisCleanupIcons.ExpandMore
+            }
         Spacer(Modifier.weight(1f))
 
         CollapsibleIcon(isCollapsed, sectionTitle, iconVector)
@@ -525,7 +528,7 @@ private fun LazyListScope.collapsibleSectionHeader(
     ) {
         FilterHeaderCollapsible(
             sectionTitle = LocalAppTranslator.current(translationKey),
-            modifier = Modifier.testTag("filterHeaderCollapsible_${translationKey}"),
+            modifier = Modifier.testTag("filterHeaderCollapsible_$translationKey"),
             isCollapsed = !isSectionExpanded,
             toggleCollapse = toggleSection,
         )
@@ -560,12 +563,12 @@ private fun LazyListScope.distanceOptions(
                 ) {
                     Text(
                         translator(messageKey),
-                        modifier = Modifier.testTag("filterText_${messageKey}"),
+                        modifier = Modifier.testTag("filterText_$messageKey"),
                     )
 
                     CrisisCleanupButton(
                         text = translator(actionKey),
-                        modifier = Modifier.testTag("filterCCUBtn_${actionKey}"),
+                        modifier = Modifier.testTag("filterCCUBtn_$actionKey"),
                         onClick = requestLocationPermission,
                     )
                 }
@@ -591,7 +594,7 @@ private fun LazyListScope.subsectionHeader(
     item(contentType = "subsection-header") {
         Text(
             text = LocalAppTranslator.current(translateKey),
-            modifier = listItemModifier.testTag("filterSubSectionHeader_${translateKey}"),
+            modifier = listItemModifier.testTag("filterSubSectionHeader_$translateKey"),
             style = LocalFontStyles.current.header4,
         )
     }
@@ -605,7 +608,7 @@ private fun LazyListScope.checkboxItem(
 ) {
     item(contentType = "filter-checkbox") {
         CrisisCleanupTextCheckbox(
-            listItemModifier.testTag("filterCheckbox_${textTranslateKey}"),
+            listItemModifier.testTag("filterCheckbox_$textTranslateKey"),
             text = LocalAppTranslator.current(textTranslateKey),
             checked = isChecked,
             onCheckChange = onCheckChange,
@@ -824,7 +827,7 @@ private fun LazyListScope.workOptions(
         for (workType in workTypes) {
             val isChecked = filters.workTypes.contains(workType)
             checkboxItem(
-                "workType.${workType}",
+                "workType.$workType",
                 isChecked,
                 { b: Boolean -> updateWorkTypes(workType, b) },
                 { updateWorkTypes(workType, !isChecked) },
@@ -854,7 +857,7 @@ private fun LazyListScope.dateItem(
         Text(
             label,
             Modifier
-                .testTag("dateItemLabel_${label}")
+                .testTag("dateItemLabel_$label")
                 .listItemHorizontalPadding(),
             style = MaterialTheme.typography.bodyLarge,
         )
@@ -862,7 +865,7 @@ private fun LazyListScope.dateItem(
             label,
             listItemModifier
                 .padding(bottom = 8.dp)
-                .testTag("dateItemDatePicker_${label}"),
+                .testTag("dateItemDatePicker_$label"),
             dateRange = dateRange,
             onDateChange = onDateChange,
         )
@@ -996,4 +999,3 @@ fun BottomActionBar(
         )
     }
 }
-
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesScreen.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesScreen.kt
index affbab812..4ce323516 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesScreen.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesScreen.kt
@@ -493,7 +493,8 @@ internal fun BoxScope.CasesMapView(
             // TODO Make padding dp a parameter
             val padding = with(currentLocalDensity) { 8.dp.toPx() }
             val update = CameraUpdateFactory.newLatLngBounds(
-                mapCameraBounds.bounds, padding.toInt(),
+                mapCameraBounds.bounds,
+                padding.toInt(),
             )
             if (mapCameraBounds.durationMs > 0) {
                 cameraPositionState.animate(update, mapCameraBounds.durationMs)
@@ -506,7 +507,8 @@ internal fun BoxScope.CasesMapView(
     LaunchedEffect(mapCameraZoom) {
         if (mapCameraZoom.takeApply()) {
             val update = CameraUpdateFactory.newLatLngZoom(
-                mapCameraZoom.center, mapCameraZoom.zoom,
+                mapCameraZoom.center,
+                mapCameraZoom.zoom,
             )
             if (mapCameraZoom.durationMs > 0) {
                 cameraPositionState.animate(update, mapCameraZoom.durationMs)
@@ -748,4 +750,4 @@ fun NoCasesLoadingPreview() {
 @Composable
 fun NoCasesRetryPreview() {
     NoCasesScreen()
-}
\ No newline at end of file
+}
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesScreenTableView.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesScreenTableView.kt
index 7da2f0a95..bacf13e10 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesScreenTableView.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesScreenTableView.kt
@@ -327,8 +327,11 @@ private fun TableViewSortSelect(
             expanded = showOptions,
             onDismissRequest = { showOptions = false },
         ) {
-            val selectedSort = if (tableSort == WorksiteSortBy.None) WorksiteSortBy.CaseNumber
-            else tableSort
+            val selectedSort = if (tableSort == WorksiteSortBy.None) {
+                WorksiteSortBy.CaseNumber
+            } else {
+                tableSort
+            }
             for (option in sortByOptions) {
                 key(option) {
                     DropdownMenuItem(
@@ -539,12 +542,18 @@ private fun TableViewItem(
 
                 TableWorksiteClaimStatus.ClaimedByOthers -> {
                     val isReleasable = isTurnOnRelease && worksite.isReleaseEligible
-                    val actionText = if (isReleasable) translator("actions.release")
-                    else translator("actions.request")
+                    val actionText = if (isReleasable) {
+                        translator("actions.release")
+                    } else {
+                        translator("actions.request")
+                    }
                     WorkTypeAction(actionText, isClaimActionEditable) {
                         val action =
-                            if (isReleasable) TableWorksiteClaimAction.Release
-                            else TableWorksiteClaimAction.Request
+                            if (isReleasable) {
+                                TableWorksiteClaimAction.Release
+                            } else {
+                                TableWorksiteClaimAction.Request
+                            }
                         onWorksiteClaimAction(action)
                     }
                 }
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesSearchScreen.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesSearchScreen.kt
index a3107496d..641ded692 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesSearchScreen.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesSearchScreen.kt
@@ -141,8 +141,11 @@ private fun ListCases(
                     item {
                         val translator = LocalAppTranslator.current
                         val message =
-                            if (isShortQ) translator("info.search_query_is_short")
-                            else translator("info.no_search_results").replace("{search_string}", q)
+                            if (isShortQ) {
+                                translator("info.search_query_is_short")
+                            } else {
+                                translator("info.no_search_results").replace("{search_string}", q)
+                            }
                         Text(message, listItemModifier)
                     }
                 }
@@ -166,4 +169,4 @@ private fun LazyListScope.recentCases(
     }
 
     listCaseResults(cases, onSelect, isEditable = isEditable)
-}
\ No newline at end of file
+}
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/FilterButtonBadge.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/FilterButtonBadge.kt
index fb00f2efc..5916f254e 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/FilterButtonBadge.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/FilterButtonBadge.kt
@@ -28,7 +28,7 @@ internal fun FilterButtonBadge(
                 ) {
                     Text(
                         "$filtersCount",
-                        modifier = Modifier.testTag("filterButtonBadge_${filtersCount}"),
+                        modifier = Modifier.testTag("filterButtonBadge_$filtersCount"),
                     )
                 }
             },
diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/SelectIncidentScreen.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/SelectIncidentScreen.kt
index fb9bad232..c59b884a9 100644
--- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/SelectIncidentScreen.kt
+++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/SelectIncidentScreen.kt
@@ -65,7 +65,7 @@ fun SelectIncidentDialog(
     textPadding: Dp = 16.dp,
 ) {
     val incidentsData by selectIncidentViewModel.incidentsData.collectAsStateWithLifecycle(
-        IncidentsData.Loading
+        IncidentsData.Loading,
     )
 
     WrapInDialog(onBackClick) {
@@ -140,7 +140,7 @@ private fun ColumnScope.IncidentSelectContent(
                 val fontWeight = if (isSelected) FontWeight.Bold else null
                 Text(
                     modifier = modifier
-                        .testTag("selectIncidentItem_${id}")
+                        .testTag("selectIncidentItem_$id")
                         .fillParentMaxWidth()
                         .clickable(enabled = enableInput) {
                             onSelectIncident(incident)
diff --git a/feature/cases/src/test/java/com/crisiscleanup/feature/cases/map/CoordinateUtilTest.kt b/feature/cases/src/test/java/com/crisiscleanup/feature/cases/map/CoordinateUtilTest.kt
index 59b22a629..622f64d05 100644
--- a/feature/cases/src/test/java/com/crisiscleanup/feature/cases/map/CoordinateUtilTest.kt
+++ b/feature/cases/src/test/java/com/crisiscleanup/feature/cases/map/CoordinateUtilTest.kt
@@ -69,4 +69,4 @@ class CoordinateUtilTest {
             assertEquals(expecteds[i], actual, 1e-9)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/dashboard/src/main/java/com/crisiscleanup/feature/dashboard/DashboardScreen.kt b/feature/dashboard/src/main/java/com/crisiscleanup/feature/dashboard/DashboardScreen.kt
index 409a83b12..aa63f2abe 100644
--- a/feature/dashboard/src/main/java/com/crisiscleanup/feature/dashboard/DashboardScreen.kt
+++ b/feature/dashboard/src/main/java/com/crisiscleanup/feature/dashboard/DashboardScreen.kt
@@ -15,16 +15,16 @@ import androidx.hilt.navigation.compose.hiltViewModel
 @Composable
 internal fun DashboardRoute(
     modifier: Modifier = Modifier,
-    viewModel: DashboardViewModel = hiltViewModel()
+    viewModel: DashboardViewModel = hiltViewModel(),
 ) {
     DashboardScreen(
-        modifier = modifier
+        modifier = modifier,
     )
 }
 
 @Composable
 internal fun DashboardScreen(
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Box(Modifier.fillMaxSize()) {
         Text(
@@ -33,7 +33,7 @@ internal fun DashboardScreen(
                 .fillMaxWidth()
                 .padding(48.dp),
             textAlign = TextAlign.Center,
-            style = MaterialTheme.typography.bodySmall
+            style = MaterialTheme.typography.bodySmall,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/dashboard/src/main/java/com/crisiscleanup/feature/dashboard/DashboardViewModel.kt b/feature/dashboard/src/main/java/com/crisiscleanup/feature/dashboard/DashboardViewModel.kt
index 5e2e2d0e7..9bd3f6a22 100644
--- a/feature/dashboard/src/main/java/com/crisiscleanup/feature/dashboard/DashboardViewModel.kt
+++ b/feature/dashboard/src/main/java/com/crisiscleanup/feature/dashboard/DashboardViewModel.kt
@@ -5,5 +5,4 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
-class DashboardViewModel @Inject constructor() : ViewModel() {
-}
\ No newline at end of file
+class DashboardViewModel @Inject constructor() : ViewModel()
diff --git a/feature/mediamanage/src/main/java/com/crisiscleanup/feature/mediamanage/ViewImageViewModel.kt b/feature/mediamanage/src/main/java/com/crisiscleanup/feature/mediamanage/ViewImageViewModel.kt
index ce01d4ced..37611d7cb 100644
--- a/feature/mediamanage/src/main/java/com/crisiscleanup/feature/mediamanage/ViewImageViewModel.kt
+++ b/feature/mediamanage/src/main/java/com/crisiscleanup/feature/mediamanage/ViewImageViewModel.kt
@@ -111,9 +111,13 @@ class ViewImageViewModel @Inject constructor(
                             // TODO Test all three states show correctly
                             // TODO String res
                             val messageKey =
-                                if (isOffline.value) "worksiteImages.connect_to_download_photo"
-                                else if (isTokenInvalid) "worksiteImages.login_and_refresh_image"
-                                else "worksiteImages.try_refreshing_open_image"
+                                if (isOffline.value) {
+                                    "worksiteImages.connect_to_download_photo"
+                                } else if (isTokenInvalid) {
+                                    "worksiteImages.login_and_refresh_image"
+                                } else {
+                                    "worksiteImages.try_refreshing_open_image"
+                                }
                             val message = translate(messageKey)
                             channel.trySend(ViewImageUiState.Error(message))
                         },
@@ -148,8 +152,11 @@ class ViewImageViewModel @Inject constructor(
             ViewImageUiState.Error(message)
         }
 
-    private val imageState = if (isNetworkImage) streamNetworkImageState
-    else streamLocalImageState
+    private val imageState = if (isNetworkImage) {
+        streamNetworkImageState
+    } else {
+        streamLocalImageState
+    }
 
     val uiState = imageState
         .stateIn(
@@ -174,8 +181,8 @@ class ViewImageViewModel @Inject constructor(
         ::Triple,
     ).map { (state, syncing, deleting) ->
         state is ViewImageUiState.Image &&
-                imageId > 0 &&
-                !(syncing || deleting)
+            imageId > 0 &&
+            !(syncing || deleting)
     }
         .stateIn(
             scope = viewModelScope,
@@ -246,4 +253,4 @@ sealed interface ViewImageUiState {
     data class Error(
         val message: String,
     ) : ViewImageUiState
-}
\ No newline at end of file
+}
diff --git a/feature/mediamanage/src/main/java/com/crisiscleanup/feature/mediamanage/ui/ViewImageScreen.kt b/feature/mediamanage/src/main/java/com/crisiscleanup/feature/mediamanage/ui/ViewImageScreen.kt
index 80e24ecc4..18817a78b 100644
--- a/feature/mediamanage/src/main/java/com/crisiscleanup/feature/mediamanage/ui/ViewImageScreen.kt
+++ b/feature/mediamanage/src/main/java/com/crisiscleanup/feature/mediamanage/ui/ViewImageScreen.kt
@@ -298,8 +298,11 @@ private fun DynamicImageView(
                                 else -> scale.snapToNearest(fitScale, fillScale)
                             }
                         } else {
-                            scale = if (scale > fillScale) fillScale
-                            else fitScale
+                            scale = if (scale > fillScale) {
+                                fillScale
+                            } else {
+                                fitScale
+                            }
                             translation = Offset.Zero
                         }
                     }
@@ -342,11 +345,11 @@ private fun ImageActionBar(
             Spacer(Modifier.weight(1f))
             CrisisCleanupIconButton(
                 imageVector = CrisisCleanupIcons.RotateCcw,
-                onClick = { viewModel.rotateImage(false) }
+                onClick = { viewModel.rotateImage(false) },
             )
             CrisisCleanupIconButton(
                 imageVector = CrisisCleanupIcons.RotateClockwise,
-                onClick = { viewModel.rotateImage(true) }
+                onClick = { viewModel.rotateImage(true) },
             )
             Spacer(Modifier.weight(1f))
         }
@@ -395,4 +398,4 @@ private data class RectangularScale(
             return RectangularScale(minScale, maxScale, fitScale, fillScale, fitScalePx)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/menu/src/main/java/com/crisiscleanup/feature/menu/MenuScreen.kt b/feature/menu/src/main/java/com/crisiscleanup/feature/menu/MenuScreen.kt
index 603980d0b..8e2c39498 100644
--- a/feature/menu/src/main/java/com/crisiscleanup/feature/menu/MenuScreen.kt
+++ b/feature/menu/src/main/java/com/crisiscleanup/feature/menu/MenuScreen.kt
@@ -140,4 +140,4 @@ internal fun MenuScreenDebug(
         onClick = { viewModel.syncWorksitesFull() },
         text = "Sync full",
     )
-}
\ No newline at end of file
+}
diff --git a/feature/menu/src/main/java/com/crisiscleanup/feature/menu/MenuViewModel.kt b/feature/menu/src/main/java/com/crisiscleanup/feature/menu/MenuViewModel.kt
index cd642824b..b9a2f7c74 100644
--- a/feature/menu/src/main/java/com/crisiscleanup/feature/menu/MenuViewModel.kt
+++ b/feature/menu/src/main/java/com/crisiscleanup/feature/menu/MenuViewModel.kt
@@ -40,8 +40,11 @@ class MenuViewModel @Inject constructor(
     val versionText: String
         get() {
             val version = appVersionProvider.version
-            return if (isNotProduction) "${version.second} (${version.first})"
-            else version.second
+            return if (isNotProduction) {
+                "${version.second} (${version.first})"
+            } else {
+                version.second
+            }
         }
 
     val databaseVersionText: String
@@ -84,4 +87,4 @@ class MenuViewModel @Inject constructor(
             syncPuller.scheduleSyncWorksitesFull()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/feature/syncinsights/src/main/java/com/crisiscleanup/feature/syncinsights/SyncInsightsViewModel.kt b/feature/syncinsights/src/main/java/com/crisiscleanup/feature/syncinsights/SyncInsightsViewModel.kt
index 3bd2db0a5..01dadeb60 100644
--- a/feature/syncinsights/src/main/java/com/crisiscleanup/feature/syncinsights/SyncInsightsViewModel.kt
+++ b/feature/syncinsights/src/main/java/com/crisiscleanup/feature/syncinsights/SyncInsightsViewModel.kt
@@ -147,14 +147,17 @@ data class LogListQueryState(
     private val hasInnerBoundary = boundaryPositions.first < boundaryPositions.second
 
     fun isBoundaryPosition(position: Int) = hasInnerBoundary &&
-            (position < boundaryPositions.first || position > boundaryPositions.second)
+        (position < boundaryPositions.first || position > boundaryPositions.second)
 
-    fun getLog(index: Int) = if (index in startIndex until endIndex) data[index - startIndex]
-    else null
+    fun getLog(index: Int) = if (index in startIndex until endIndex) {
+        data[index - startIndex]
+    } else {
+        null
+    }
 }
 
 data class SyncLogItem(
     val syncLog: SyncLog,
     val isContinuingLogType: Boolean,
     val relativeTime: String,
-)
\ No newline at end of file
+)
diff --git a/feature/syncinsights/src/main/java/com/crisiscleanup/feature/syncinsights/navigation/SyncInsightsNavigation.kt b/feature/syncinsights/src/main/java/com/crisiscleanup/feature/syncinsights/navigation/SyncInsightsNavigation.kt
index c416e7b3f..651d0bc18 100644
--- a/feature/syncinsights/src/main/java/com/crisiscleanup/feature/syncinsights/navigation/SyncInsightsNavigation.kt
+++ b/feature/syncinsights/src/main/java/com/crisiscleanup/feature/syncinsights/navigation/SyncInsightsNavigation.kt
@@ -17,4 +17,4 @@ fun NavGraphBuilder.syncInsightsScreen(
     composable(route = RouteConstant.syncInsightsRoute) {
         SyncInsightsRoute(openCase = openCase)
     }
-}
\ No newline at end of file
+}
diff --git a/feature/syncinsights/src/main/java/com/crisiscleanup/feature/syncinsights/ui/SyncInsightsScreen.kt b/feature/syncinsights/src/main/java/com/crisiscleanup/feature/syncinsights/ui/SyncInsightsScreen.kt
index f3687600f..4404f5ff8 100644
--- a/feature/syncinsights/src/main/java/com/crisiscleanup/feature/syncinsights/ui/SyncInsightsScreen.kt
+++ b/feature/syncinsights/src/main/java/com/crisiscleanup/feature/syncinsights/ui/SyncInsightsScreen.kt
@@ -111,8 +111,11 @@ internal fun SyncInsightsRoute(
                 logs.count,
                 key = { it },
                 contentType = {
-                    if (logs.getLog(it)?.isContinuingLogType == true) "detail-log-item"
-                    else "one-line-log-item"
+                    if (logs.getLog(it)?.isContinuingLogType == true) {
+                        "detail-log-item"
+                    } else {
+                        "one-line-log-item"
+                    }
                 },
             ) { index ->
                 val log = logs.getLog(index)
@@ -122,12 +125,15 @@ internal fun SyncInsightsRoute(
                         Modifier.listItemPadding(),
                     )
                 } else {
-                    val modifier = if (log.isContinuingLogType) Modifier
-                        .padding(start = 16.dp)
-                        .listItemBottomPadding()
-                    else Modifier
-                        .listItemPadding()
-                        .listItemTopPadding()
+                    val modifier = if (log.isContinuingLogType) {
+                        Modifier
+                            .padding(start = 16.dp)
+                            .listItemBottomPadding()
+                    } else {
+                        Modifier
+                            .listItemPadding()
+                            .listItemTopPadding()
+                    }
                     Column(modifier.clickable { viewModel.onExpandLog(log.syncLog) }) {
                         SyncLogDetail(log)
                     }
diff --git a/feature/team/src/main/java/com/crisiscleanup/feature/team/TeamScreen.kt b/feature/team/src/main/java/com/crisiscleanup/feature/team/TeamScreen.kt
index 7c48a74e3..baad9e8f5 100644
--- a/feature/team/src/main/java/com/crisiscleanup/feature/team/TeamScreen.kt
+++ b/feature/team/src/main/java/com/crisiscleanup/feature/team/TeamScreen.kt
@@ -15,16 +15,16 @@ import androidx.hilt.navigation.compose.hiltViewModel
 @Composable
 internal fun TeamRoute(
     modifier: Modifier = Modifier,
-    viewModel: TeamViewModel = hiltViewModel()
+    viewModel: TeamViewModel = hiltViewModel(),
 ) {
     TeamScreen(
-        modifier = modifier
+        modifier = modifier,
     )
 }
 
 @Composable
 internal fun TeamScreen(
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
 ) {
     Box(Modifier.fillMaxSize()) {
         Text(
@@ -33,7 +33,7 @@ internal fun TeamScreen(
                 .fillMaxWidth()
                 .padding(48.dp),
             textAlign = TextAlign.Center,
-            style = MaterialTheme.typography.bodySmall
+            style = MaterialTheme.typography.bodySmall,
         )
     }
-}
\ No newline at end of file
+}
diff --git a/feature/team/src/main/java/com/crisiscleanup/feature/team/TeamViewModel.kt b/feature/team/src/main/java/com/crisiscleanup/feature/team/TeamViewModel.kt
index 3d4771dfd..c240cbb25 100644
--- a/feature/team/src/main/java/com/crisiscleanup/feature/team/TeamViewModel.kt
+++ b/feature/team/src/main/java/com/crisiscleanup/feature/team/TeamViewModel.kt
@@ -5,5 +5,4 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
-class TeamViewModel @Inject constructor() : ViewModel() {
-}
\ No newline at end of file
+class TeamViewModel @Inject constructor() : ViewModel()
diff --git a/feature/userfeedback/src/main/java/com/crisiscleanup/feature/userfeedback/UserFeedbackViewModel.kt b/feature/userfeedback/src/main/java/com/crisiscleanup/feature/userfeedback/UserFeedbackViewModel.kt
index 29a487db7..0703834a6 100644
--- a/feature/userfeedback/src/main/java/com/crisiscleanup/feature/userfeedback/UserFeedbackViewModel.kt
+++ b/feature/userfeedback/src/main/java/com/crisiscleanup/feature/userfeedback/UserFeedbackViewModel.kt
@@ -18,7 +18,7 @@ class UserFeedbackViewModel @Inject constructor(
     val accountId = accountDataRepository.accountData.map { it.id }
 
     init {
-        WebView.setWebContentsDebuggingEnabled(true);
+        WebView.setWebContentsDebuggingEnabled(true)
     }
 
     fun onSaveFileCallback(callback: ValueCallback<Array<Uri>>?) {
@@ -29,4 +29,4 @@ class UserFeedbackViewModel @Inject constructor(
         fileCallback?.onReceiveValue(arrayOf(uri))
         fileCallback = null
     }
-}
\ No newline at end of file
+}
diff --git a/feature/userfeedback/src/main/java/com/crisiscleanup/feature/userfeedback/navigation/UserFeedbackNavigation.kt b/feature/userfeedback/src/main/java/com/crisiscleanup/feature/userfeedback/navigation/UserFeedbackNavigation.kt
index c101d3fe9..b3b74c2a4 100644
--- a/feature/userfeedback/src/main/java/com/crisiscleanup/feature/userfeedback/navigation/UserFeedbackNavigation.kt
+++ b/feature/userfeedback/src/main/java/com/crisiscleanup/feature/userfeedback/navigation/UserFeedbackNavigation.kt
@@ -7,7 +7,6 @@ import androidx.navigation.compose.composable
 import com.crisiscleanup.core.appnav.RouteConstant
 import com.crisiscleanup.feature.userfeedback.ui.UserFeedbackRoute
 
-
 fun NavController.navigateToUserFeedback(navOptions: NavOptions? = null) {
     this.navigate(RouteConstant.userFeedbackRoute, navOptions)
 }
@@ -18,4 +17,4 @@ fun NavGraphBuilder.userFeedbackScreen(
     composable(route = RouteConstant.userFeedbackRoute) {
         UserFeedbackRoute(onBack = onBack)
     }
-}
\ No newline at end of file
+}
diff --git a/feature/userfeedback/src/main/java/com/crisiscleanup/feature/userfeedback/ui/UserFeedbackScreen.kt b/feature/userfeedback/src/main/java/com/crisiscleanup/feature/userfeedback/ui/UserFeedbackScreen.kt
index b6f82dea1..ae1f099e8 100644
--- a/feature/userfeedback/src/main/java/com/crisiscleanup/feature/userfeedback/ui/UserFeedbackScreen.kt
+++ b/feature/userfeedback/src/main/java/com/crisiscleanup/feature/userfeedback/ui/UserFeedbackScreen.kt
@@ -44,7 +44,7 @@ fun UserFeedbackRoute(
         val accountId by viewModel.accountId.collectAsStateWithLifecycle(0)
         if (accountId > 0) {
             val selectImageLauncher = rememberLauncherForActivityResult(
-                contract = ActivityResultContracts.PickVisualMedia()
+                contract = ActivityResultContracts.PickVisualMedia(),
             ) { uri: Uri? ->
                 uri?.let {
                     viewModel.onMediaSelected(uri)
@@ -54,7 +54,7 @@ fun UserFeedbackRoute(
                 { callback: ValueCallback<Array<Uri>>? ->
                     viewModel.onSaveFileCallback(callback)
                     selectImageLauncher.launch(
-                        PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly)
+                        PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly),
                     )
                 }
             }
@@ -69,7 +69,8 @@ fun UserFeedbackRoute(
                             onChooseFileCallback,
                         )
                     }
-                })
+                },
+            )
         } else {
             Box(Modifier.fillMaxSize()) {
                 BusyIndicatorFloatingTopCenter(true)
@@ -78,16 +79,15 @@ fun UserFeedbackRoute(
     }
 }
 
-
 private fun getChromeClient(
     onChooseFileCallback: (ValueCallback<Array<Uri>>?) -> Unit = {},
-    printLogs: Boolean = false
+    printLogs: Boolean = false,
 ): WebChromeClient {
     return object : WebChromeClient() {
         override fun onShowFileChooser(
             webView: WebView?,
             filePathCallback: ValueCallback<Array<Uri>>?,
-            fileChooserParams: FileChooserParams?
+            fileChooserParams: FileChooserParams?,
         ): Boolean {
             onChooseFileCallback(filePathCallback)
             return true
@@ -107,4 +107,4 @@ private fun getChromeClient(
             return true
         }
     }
-}
\ No newline at end of file
+}
diff --git a/gradle/init.gradle.kts b/gradle/init.gradle.kts
index 57f91da08..8006cd715 100644
--- a/gradle/init.gradle.kts
+++ b/gradle/init.gradle.kts
@@ -35,7 +35,14 @@ rootProject {
             kotlin {
                 target("**/*.kt")
                 targetExclude("**/build/**/*.kt")
-                ktlint(ktlintVersion).userData(mapOf("android" to "true"))
+                ktlint(ktlintVersion)
+                    .editorConfigOverride(
+                        mapOf(
+                            "ktlint_standard_no-wildcard-imports" to "disabled",
+                            "ktlint_standard_filename" to "disabled",
+                        ),
+                    )
+                    .userData(mapOf("android" to "true"))
                 licenseHeaderFile(rootProject.file("spotless/copyright.kt"))
             }
             format("kts") {
diff --git a/lint/build.gradle.kts b/lint/build.gradle.kts
index 4ae719aa6..c106f0daa 100644
--- a/lint/build.gradle.kts
+++ b/lint/build.gradle.kts
@@ -1,18 +1,3 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
diff --git a/lint/src/main/java/com/crisiscleanup/lint/designsystem/DesignSystemDetector.kt b/lint/src/main/java/com/crisiscleanup/lint/designsystem/DesignSystemDetector.kt
index 1bdb92b78..be35bd360 100644
--- a/lint/src/main/java/com/crisiscleanup/lint/designsystem/DesignSystemDetector.kt
+++ b/lint/src/main/java/com/crisiscleanup/lint/designsystem/DesignSystemDetector.kt
@@ -47,8 +47,8 @@ class DesignSystemDetector : Detector(), Detector.UastScanner {
             id = "DesignSystem",
             briefDescription = "Design system",
             explanation = "This check highlights calls in code that use Compose Material " +
-                    "composables instead of equivalents from the design system " +
-                    "module.",
+                "composables instead of equivalents from the design system " +
+                "module.",
             category = Category.CUSTOM_LINT_CHECKS,
             priority = 7,
             severity = Severity.ERROR,
@@ -85,10 +85,10 @@ class DesignSystemDetector : Detector(), Detector.UastScanner {
             "OutlinedIconToggleButton" to "CrisisCleanupIconToggleButton",
             "SmallTopAppBar" to "CrisisCleanupTopAppBar",
             "MediumTopAppBar" to "CrisisCleanupTopAppBar",
-            "LargeTopAppBar" to "CrisisCleanupTopAppBar"
+            "LargeTopAppBar" to "CrisisCleanupTopAppBar",
         )
         val RECEIVER_NAMES = mapOf(
-            "Icons" to "CrisisCleanupIcons"
+            "Icons" to "CrisisCleanupIcons",
         )
 
         fun reportIssue(
@@ -105,4 +105,4 @@ class DesignSystemDetector : Detector(), Detector.UastScanner {
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lint/src/main/java/com/crisiscleanup/lint/designsystem/DesignSystemIssueRegistry.kt b/lint/src/main/java/com/crisiscleanup/lint/designsystem/DesignSystemIssueRegistry.kt
index 68c4f2b50..cfa072894 100644
--- a/lint/src/main/java/com/crisiscleanup/lint/designsystem/DesignSystemIssueRegistry.kt
+++ b/lint/src/main/java/com/crisiscleanup/lint/designsystem/DesignSystemIssueRegistry.kt
@@ -19,6 +19,6 @@ class DesignSystemIssueRegistry : IssueRegistry() {
         vendorName = "Crisis Cleanup",
         // TODO Update once repo is created
         feedbackUrl = "https://github.com/CrisisCleanup/crisis-cleanup-android/issues",
-        contact = "https://github.com/CrisisCleanup/crisis-cleanup-android"
+        contact = "https://github.com/CrisisCleanup/crisis-cleanup-android",
     )
 }
diff --git a/spotless/copyright.kt b/spotless/copyright.kt
new file mode 100644
index 000000000..e69de29bb
diff --git a/spotless/copyright.kts b/spotless/copyright.kts
new file mode 100644
index 000000000..e69de29bb
diff --git a/spotless/copyright.xml b/spotless/copyright.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/sync/sync-test/src/main/AndroidManifest.xml b/sync/sync-test/src/main/AndroidManifest.xml
index 568741e54..227314eeb 100644
--- a/sync/sync-test/src/main/AndroidManifest.xml
+++ b/sync/sync-test/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
 <manifest />
\ No newline at end of file
diff --git a/sync/sync-test/src/main/java/com/crisiscleanup/core/sync/test/NeverSyncingSyncStatusMonitor.kt b/sync/sync-test/src/main/java/com/crisiscleanup/core/sync/test/NeverSyncingSyncStatusMonitor.kt
index 4e359ccdc..c5482367f 100644
--- a/sync/sync-test/src/main/java/com/crisiscleanup/core/sync/test/NeverSyncingSyncStatusMonitor.kt
+++ b/sync/sync-test/src/main/java/com/crisiscleanup/core/sync/test/NeverSyncingSyncStatusMonitor.kt
@@ -7,4 +7,4 @@ import javax.inject.Inject
 
 class NeverSyncingSyncStatusMonitor @Inject constructor() : SyncStatusMonitor {
     override val isSyncing: Flow<Boolean> = flowOf(false)
-}
\ No newline at end of file
+}
diff --git a/sync/sync-test/src/main/java/com/crisiscleanup/core/sync/test/TestSyncModule.kt b/sync/sync-test/src/main/java/com/crisiscleanup/core/sync/test/TestSyncModule.kt
index ca475c33f..a7b852cad 100644
--- a/sync/sync-test/src/main/java/com/crisiscleanup/core/sync/test/TestSyncModule.kt
+++ b/sync/sync-test/src/main/java/com/crisiscleanup/core/sync/test/TestSyncModule.kt
@@ -10,7 +10,7 @@ import dagger.hilt.testing.TestInstallIn
 @Module
 @TestInstallIn(
     components = [SingletonComponent::class],
-    replaces = [SyncModule::class]
+    replaces = [SyncModule::class],
 )
 interface TestSyncModule {
     @Binds
diff --git a/sync/work/src/main/AndroidManifest.xml b/sync/work/src/main/AndroidManifest.xml
index e97229360..97ba477a0 100644
--- a/sync/work/src/main/AndroidManifest.xml
+++ b/sync/work/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
diff --git a/sync/work/src/main/java/com/crisiscleanup/sync/AppSyncer.kt b/sync/work/src/main/java/com/crisiscleanup/sync/AppSyncer.kt
index 823bf7297..f235acb4f 100644
--- a/sync/work/src/main/java/com/crisiscleanup/sync/AppSyncer.kt
+++ b/sync/work/src/main/java/com/crisiscleanup/sync/AppSyncer.kt
@@ -99,8 +99,11 @@ class AppSyncer @Inject constructor(
             worksitesRepository,
             appPreferences,
         )
-        val plan = if (force) unforcedPlan.copy(pullIncidents = true)
-        else unforcedPlan
+        val plan = if (force) {
+            unforcedPlan.copy(pullIncidents = true)
+        } else {
+            unforcedPlan
+        }
         if (!plan.requiresSync) {
             syncLogger.log("Skipping unforced sync")
             scheduleSyncWorksitesFull()
@@ -275,8 +278,11 @@ class AppSyncer @Inject constructor(
                     } catch (e: CancellationException) {
                         true
                     }
-                    if (isSynced) SyncResult.Success("Incident $incidentId worksites full")
-                    else SyncResult.Partial("$incidentId full sync did not finish")
+                    if (isSynced) {
+                        SyncResult.Success("Incident $incidentId worksites full")
+                    } else {
+                        SyncResult.Partial("$incidentId full sync did not finish")
+                    }
                 } else {
                     SyncResult.NotAttempted("Incident not selected")
                 }
@@ -370,8 +376,11 @@ class AppSyncer @Inject constructor(
             }
 
             val isSyncAttempted = worksiteChangeRepository.syncWorksites()
-            return@async if (isSyncAttempted) SyncResult.Success("")
-            else SyncResult.NotAttempted("Sync not attempted")
+            return@async if (isSyncAttempted) {
+                SyncResult.Success("")
+            } else {
+                SyncResult.NotAttempted("Sync not attempted")
+            }
         }
         pushJob = deferred
         return deferred
@@ -384,8 +393,11 @@ class AppSyncer @Inject constructor(
 
         return try {
             val isSyncAll = worksiteChangeRepository.syncWorksiteMedia()
-            return if (isSyncAll) SyncResult.Success("")
-            else SyncResult.Partial("Sync partial worksite media")
+            return if (isSyncAll) {
+                SyncResult.Success("")
+            } else {
+                SyncResult.Partial("Sync partial worksite media")
+            }
         } catch (e: Exception) {
             SyncResult.Error(e.message ?: "Sync media fail")
         }
diff --git a/sync/work/src/main/java/com/crisiscleanup/sync/initializers/SyncWorkHelpers.kt b/sync/work/src/main/java/com/crisiscleanup/sync/initializers/SyncWorkHelpers.kt
index bd737d551..2c564bcee 100644
--- a/sync/work/src/main/java/com/crisiscleanup/sync/initializers/SyncWorkHelpers.kt
+++ b/sync/work/src/main/java/com/crisiscleanup/sync/initializers/SyncWorkHelpers.kt
@@ -31,7 +31,7 @@ fun scheduleSync(context: Context) {
         enqueueUniqueWork(
             SyncWorkName,
             ExistingWorkPolicy.APPEND_OR_REPLACE,
-            SyncWorker.oneTimeSyncWork()
+            SyncWorker.oneTimeSyncWork(),
         )
     }
 }
@@ -41,7 +41,7 @@ fun scheduleSyncMedia(context: Context) {
         enqueueUniqueWork(
             SyncMediaWorkName,
             ExistingWorkPolicy.KEEP,
-            SyncMediaWorker.oneTimeSyncWork()
+            SyncMediaWorker.oneTimeSyncWork(),
         )
     }
 }
@@ -51,7 +51,7 @@ fun scheduleSyncWorksitesFull(context: Context) {
         enqueueUniqueWork(
             SyncWorksitesFullWorkName,
             ExistingWorkPolicy.REPLACE,
-            SyncWorksitesFullWorker.oneTimeSyncWork()
+            SyncWorksitesFullWorker.oneTimeSyncWork(),
         )
     }
 }
diff --git a/sync/work/src/main/java/com/crisiscleanup/sync/model/SyncPlan.kt b/sync/work/src/main/java/com/crisiscleanup/sync/model/SyncPlan.kt
index aee182657..9e2783223 100644
--- a/sync/work/src/main/java/com/crisiscleanup/sync/model/SyncPlan.kt
+++ b/sync/work/src/main/java/com/crisiscleanup/sync/model/SyncPlan.kt
@@ -28,4 +28,4 @@ data class SyncPlan(
             )
         }
     }
-}
\ No newline at end of file
+}
diff --git a/sync/work/src/main/java/com/crisiscleanup/sync/status/WorkManagerSyncStatusMonitor.kt b/sync/work/src/main/java/com/crisiscleanup/sync/status/WorkManagerSyncStatusMonitor.kt
index cc947fc0d..43c116d37 100644
--- a/sync/work/src/main/java/com/crisiscleanup/sync/status/WorkManagerSyncStatusMonitor.kt
+++ b/sync/work/src/main/java/com/crisiscleanup/sync/status/WorkManagerSyncStatusMonitor.kt
@@ -16,7 +16,7 @@ import javax.inject.Inject
  * [SyncStatusMonitor] backed by [WorkInfo] from [WorkManager]
  */
 class WorkManagerSyncStatusMonitor @Inject constructor(
-    @ApplicationContext context: Context
+    @ApplicationContext context: Context,
 ) : SyncStatusMonitor {
     override val isSyncing: Flow<Boolean> =
         WorkManager.getInstance(context).getWorkInfosForUniqueWorkLiveData(SyncWorkName)
diff --git a/sync/work/src/main/java/com/crisiscleanup/sync/workers/DelegatingWorker.kt b/sync/work/src/main/java/com/crisiscleanup/sync/workers/DelegatingWorker.kt
index 28e9e1a20..e71d12e4c 100644
--- a/sync/work/src/main/java/com/crisiscleanup/sync/workers/DelegatingWorker.kt
+++ b/sync/work/src/main/java/com/crisiscleanup/sync/workers/DelegatingWorker.kt
@@ -53,7 +53,7 @@ class DelegatingWorker(
         EntryPointAccessors.fromApplication<HiltWorkerFactoryEntryPoint>(appContext)
             .hiltWorkerFactory()
             .createWorker(appContext, workerClassName, workerParams)
-                as? CoroutineWorker
+            as? CoroutineWorker
             ?: throw IllegalArgumentException("Unable to find appropriate worker")
 
     override suspend fun getForegroundInfo(): ForegroundInfo =
diff --git a/sync/work/src/main/java/com/crisiscleanup/sync/workers/SyncMediaWorker.kt b/sync/work/src/main/java/com/crisiscleanup/sync/workers/SyncMediaWorker.kt
index 8e65784d3..5602b3f51 100644
--- a/sync/work/src/main/java/com/crisiscleanup/sync/workers/SyncMediaWorker.kt
+++ b/sync/work/src/main/java/com/crisiscleanup/sync/workers/SyncMediaWorker.kt
@@ -59,8 +59,11 @@ class SyncMediaWorker @AssistedInject constructor(
 
             appContext.channelNotificationManager()?.cancel(SyncMediaNotificationId)
 
-            if (isSyncSuccess) Result.success()
-            else Result.retry()
+            if (isSyncSuccess) {
+                Result.success()
+            } else {
+                Result.retry()
+            }
         }
     }
 
@@ -76,4 +79,4 @@ class SyncMediaWorker @AssistedInject constructor(
                 .build()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/sync/work/src/main/java/com/crisiscleanup/sync/workers/SyncWorker.kt b/sync/work/src/main/java/com/crisiscleanup/sync/workers/SyncWorker.kt
index 5e3331fce..6563430ff 100644
--- a/sync/work/src/main/java/com/crisiscleanup/sync/workers/SyncWorker.kt
+++ b/sync/work/src/main/java/com/crisiscleanup/sync/workers/SyncWorker.kt
@@ -59,8 +59,11 @@ class SyncWorker @AssistedInject constructor(
 
             appContext.channelNotificationManager()?.cancel(SyncNotificationId)
 
-            if (isSyncSuccess) Result.success()
-            else Result.retry()
+            if (isSyncSuccess) {
+                Result.success()
+            } else {
+                Result.retry()
+            }
         }
     }
 
diff --git a/sync/work/src/main/java/com/crisiscleanup/sync/workers/SyncWorksitesFullWorker.kt b/sync/work/src/main/java/com/crisiscleanup/sync/workers/SyncWorksitesFullWorker.kt
index 2fef581bf..ed120a6d3 100644
--- a/sync/work/src/main/java/com/crisiscleanup/sync/workers/SyncWorksitesFullWorker.kt
+++ b/sync/work/src/main/java/com/crisiscleanup/sync/workers/SyncWorksitesFullWorker.kt
@@ -70,17 +70,19 @@ class SyncWorksitesFullWorker @AssistedInject constructor(
                         pullCount < totalCount
                     ) {
                         val title = appContext.getString(R.string.syncing_text, it.incidentName)
-                        val text = if (isApproximateTotal)
+                        val text = if (isApproximateTotal) {
                             appContext.getString(
                                 R.string.saved_cases_approximate_out_of,
                                 pullCount,
                                 totalCount,
                             )
-                        else appContext.getString(
-                            R.string.saved_cases_out_of,
-                            pullCount,
-                            totalCount,
-                        )
+                        } else {
+                            appContext.getString(
+                                R.string.saved_cases_out_of,
+                                pullCount,
+                                totalCount,
+                            )
+                        }
                         val progress = pullCount / totalCount.toFloat()
                         val stopSyncIntent = PendingIntent.getBroadcast(
                             appContext,
@@ -97,7 +99,7 @@ class SyncWorksitesFullWorker @AssistedInject constructor(
                                     appContext.getString(R.string.stop_syncing),
                                     stopSyncIntent,
                                 )
-                                .build()
+                                .build(),
                         )
                     }
                 }
@@ -132,8 +134,11 @@ class SyncWorksitesFullWorker @AssistedInject constructor(
                     .log("Worksites full sync end. success=$isSyncSuccess")
                     .flush()
 
-                if (isSyncSuccess) Result.success()
-                else Result.retry()
+                if (isSyncSuccess) {
+                    Result.success()
+                } else {
+                    Result.retry()
+                }
             } finally {
                 isSyncing.set(false)
                 appContext.unregisterReceiver(stopSyncingReceiver)
@@ -156,4 +161,4 @@ class SyncWorksitesFullWorker @AssistedInject constructor(
                 .build()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/sync/work/src/main/res/values/strings.xml b/sync/work/src/main/res/values/strings.xml
index a64df1c2f..8b38b447f 100644
--- a/sync/work/src/main/res/values/strings.xml
+++ b/sync/work/src/main/res/values/strings.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="sync_notification_title">@string/crisis_cleanup</string>
     <string name="sync_notification_channel_name">Sync</string>
diff --git a/ui-test-hilt-manifest/build.gradle.kts b/ui-test-hilt-manifest/build.gradle.kts
index d09530e3d..2c0099458 100644
--- a/ui-test-hilt-manifest/build.gradle.kts
+++ b/ui-test-hilt-manifest/build.gradle.kts
@@ -1,18 +1,3 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 plugins {
     id("nowinandroid.android.library")
     kotlin("kapt")
diff --git a/ui-test-hilt-manifest/src/main/AndroidManifest.xml b/ui-test-hilt-manifest/src/main/AndroidManifest.xml
index 8fbb1c299..b70164f18 100644
--- a/ui-test-hilt-manifest/src/main/AndroidManifest.xml
+++ b/ui-test-hilt-manifest/src/main/AndroidManifest.xml
@@ -1,19 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright 2022 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
diff --git a/ui-test-hilt-manifest/src/main/java/com/crisiscleanup/uitesthiltmanifest/HiltComponentActivity.kt b/ui-test-hilt-manifest/src/main/java/com/crisiscleanup/uitesthiltmanifest/HiltComponentActivity.kt
index 4966b0ca0..a5d24f9a4 100644
--- a/ui-test-hilt-manifest/src/main/java/com/crisiscleanup/uitesthiltmanifest/HiltComponentActivity.kt
+++ b/ui-test-hilt-manifest/src/main/java/com/crisiscleanup/uitesthiltmanifest/HiltComponentActivity.kt
@@ -1,19 +1,3 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 package com.crisiscleanup.uitesthiltmanifest
 
 import androidx.activity.ComponentActivity