diff --git a/app/src/main/java/app/closer/data/remote/FirestoreBucketListDataSource.kt b/app/src/main/java/app/closer/data/remote/FirestoreBucketListDataSource.kt
index fb5a149a..19b2bc3d 100644
--- a/app/src/main/java/app/closer/data/remote/FirestoreBucketListDataSource.kt
+++ b/app/src/main/java/app/closer/data/remote/FirestoreBucketListDataSource.kt
@@ -22,9 +22,7 @@ import kotlin.coroutines.resumeWithException
  * Categories: Adventure, Travel, Food, Learning, Romance, Intimacy, Seasonal.
  */
 @Singleton
-class FirestoreBucketListDataSource @Inject constructor() {
-
-    private val db = FirebaseFirestore.getInstance()
+class FirestoreBucketListDataSource @Inject constructor(private val db: FirebaseFirestore) {
     private fun itemsRef(coupleId: String) =
         db.collection(FirestoreCollections.COUPLES).document(coupleId)
             .collection(FirestoreCollections.Couples.BUCKET_LIST)
diff --git a/app/src/main/java/app/closer/data/remote/FirestoreCoupleDataSource.kt b/app/src/main/java/app/closer/data/remote/FirestoreCoupleDataSource.kt
index bf3cb5e7..2533694b 100644
--- a/app/src/main/java/app/closer/data/remote/FirestoreCoupleDataSource.kt
+++ b/app/src/main/java/app/closer/data/remote/FirestoreCoupleDataSource.kt
@@ -12,9 +12,7 @@ import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 
 @Singleton
-class FirestoreCoupleDataSource @Inject constructor() {
-
-    private val db = FirebaseFirestore.getInstance()
+class FirestoreCoupleDataSource @Inject constructor(private val db: FirebaseFirestore) {
     private fun coupleRef(coupleId: String) = db.collection(FirestoreCollections.COUPLES).document(coupleId)
     private fun userRef(uid: String) = db.collection(FirestoreCollections.USERS).document(uid)
 
diff --git a/app/src/main/java/app/closer/data/remote/FirestoreDateMatchDataSource.kt b/app/src/main/java/app/closer/data/remote/FirestoreDateMatchDataSource.kt
index db3c138d..883fb480 100644
--- a/app/src/main/java/app/closer/data/remote/FirestoreDateMatchDataSource.kt
+++ b/app/src/main/java/app/closer/data/remote/FirestoreDateMatchDataSource.kt
@@ -32,9 +32,7 @@ import kotlin.coroutines.resumeWithException
  * still exposes a create helper for the function trigger path.
  */
 @Singleton
-class FirestoreDateMatchDataSource @Inject constructor() {
-
-    private val db = FirebaseFirestore.getInstance()
+class FirestoreDateMatchDataSource @Inject constructor(private val db: FirebaseFirestore) {
     private fun matchesRef(coupleId: String) =
         db.collection(FirestoreCollections.COUPLES).document(coupleId)
             .collection(FirestoreCollections.Couples.DATE_MATCHES)
diff --git a/app/src/main/java/app/closer/data/remote/FirestoreDatePlanDataSource.kt b/app/src/main/java/app/closer/data/remote/FirestoreDatePlanDataSource.kt
index 15846eb1..032ef615 100644
--- a/app/src/main/java/app/closer/data/remote/FirestoreDatePlanDataSource.kt
+++ b/app/src/main/java/app/closer/data/remote/FirestoreDatePlanDataSource.kt
@@ -25,9 +25,7 @@ import kotlin.coroutines.resumeWithException
  * Local-first: Preferences stored in Room. Plans synced to Firestore when explicitly shared/scheduled.
  */
 @Singleton
-class FirestoreDatePlanDataSource @Inject constructor() {
-
-    private val db = FirebaseFirestore.getInstance()
+class FirestoreDatePlanDataSource @Inject constructor(private val db: FirebaseFirestore) {
     private fun preferencesRef(coupleId: String) =
         db.collection(FirestoreCollections.COUPLES).document(coupleId)
             .collection(FirestoreCollections.Couples.DATE_PLAN_PREFERENCES)
diff --git a/app/src/main/java/app/closer/data/remote/FirestoreDateSwipeDataSource.kt b/app/src/main/java/app/closer/data/remote/FirestoreDateSwipeDataSource.kt
index b31ebbb0..708ead25 100644
--- a/app/src/main/java/app/closer/data/remote/FirestoreDateSwipeDataSource.kt
+++ b/app/src/main/java/app/closer/data/remote/FirestoreDateSwipeDataSource.kt
@@ -33,9 +33,7 @@ import kotlin.coroutines.resumeWithException
  * only write their own action entry.
  */
 @Singleton
-class FirestoreDateSwipeDataSource @Inject constructor() {
-
-    private val db = FirebaseFirestore.getInstance()
+class FirestoreDateSwipeDataSource @Inject constructor(private val db: FirebaseFirestore) {
     private fun swipesRef(coupleId: String) =
         db.collection(FirestoreCollections.COUPLES).document(coupleId)
             .collection(FirestoreCollections.Couples.DATE_SWIPES)
diff --git a/app/src/main/java/app/closer/data/remote/FirestoreInviteDataSource.kt b/app/src/main/java/app/closer/data/remote/FirestoreInviteDataSource.kt
index ec7b2ea6..feb0715b 100644
--- a/app/src/main/java/app/closer/data/remote/FirestoreInviteDataSource.kt
+++ b/app/src/main/java/app/closer/data/remote/FirestoreInviteDataSource.kt
@@ -11,9 +11,7 @@ import kotlin.coroutines.resumeWithException
 import kotlin.random.Random
 
 @Singleton
-class FirestoreInviteDataSource @Inject constructor() {
-
-    private val db = FirebaseFirestore.getInstance()
+class FirestoreInviteDataSource @Inject constructor(private val db: FirebaseFirestore) {
     private fun inviteRef(code: String) = db.collection(FirestoreCollections.INVITES).document(code)
 
     fun generateCode(): String = (1..6)
diff --git a/app/src/main/java/app/closer/data/remote/FirestoreQuestionThreadDataSource.kt b/app/src/main/java/app/closer/data/remote/FirestoreQuestionThreadDataSource.kt
index 0a5e0726..42691027 100644
--- a/app/src/main/java/app/closer/data/remote/FirestoreQuestionThreadDataSource.kt
+++ b/app/src/main/java/app/closer/data/remote/FirestoreQuestionThreadDataSource.kt
@@ -19,9 +19,7 @@ import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 
 @Singleton
-class FirestoreQuestionThreadDataSource @Inject constructor() {
-
-    private val db = FirebaseFirestore.getInstance()
+class FirestoreQuestionThreadDataSource @Inject constructor(private val db: FirebaseFirestore) {
 
     private fun threadsRef(coupleId: String) =
         db.collection(FirestoreCollections.COUPLES).document(coupleId)
diff --git a/app/src/main/java/app/closer/data/remote/FirestoreUserDataSource.kt b/app/src/main/java/app/closer/data/remote/FirestoreUserDataSource.kt
index d2b5bff8..80152a65 100644
--- a/app/src/main/java/app/closer/data/remote/FirestoreUserDataSource.kt
+++ b/app/src/main/java/app/closer/data/remote/FirestoreUserDataSource.kt
@@ -11,9 +11,7 @@ import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 
 @Singleton
-class FirestoreUserDataSource @Inject constructor() {
-
-    private val db = FirebaseFirestore.getInstance()
+class FirestoreUserDataSource @Inject constructor(private val db: FirebaseFirestore) {
     private fun userRef(uid: String) = db.collection(FirestoreCollections.USERS).document(uid)
 
     suspend fun getUser(uid: String): User? =