fix: propagate rbf contact updates

Author: ben-kaufman

app/src/main/java/to/bitkit/repositories/ActivityRepo.kt

@@ -386,11 +386,29 @@ class ActivityRepo @Inject constructor(
             val updatedAt = nowTimestamp().epochSecond.toULong()
             val updatedActivity = activity.withContact(normalizedKey, updatedAt)
             updateActivity(updatedActivity.rawId(), updatedActivity).getOrThrow()
+            updateReplacementContactIfNeeded(updatedActivity, normalizedKey, updatedAt)
         }.onFailure {
             Logger.error("Failed to set contact for payment '$forPaymentId'", it, context = TAG)
         }
     }
 
+    private suspend fun updateReplacementContactIfNeeded(
+        activity: Activity,
+        normalizedKey: String,
+        updatedAt: ULong,
+    ) {
+        if (activity !is Activity.Onchain || activity.v1.doesExist || activity.v1.txType != PaymentType.SENT) return
+
+        getActivities(filter = ActivityFilter.ONCHAIN).getOrThrow()
+            .filterIsInstance<Activity.Onchain>()
+            .filter { activity.v1.txId in it.v1.boostTxIds }
+            .filterNot { PubkyPublicKeyFormat.matches(it.v1.contact, normalizedKey) }
+            .forEach {
+                val updatedReplacement = Activity.Onchain(it.v1.copy(contact = normalizedKey, updatedAt = updatedAt))
+                updateActivity(updatedReplacement.rawId(), updatedReplacement).getOrThrow()
+            }
+    }
+
     private suspend fun findActivityForPaymentId(forPaymentId: String, syncLdkPayments: Boolean): Activity? {
         val activity = getActivityByPaymentId(forPaymentId)
         if (activity != null) return activity

app/src/test/java/to/bitkit/repositories/ActivityRepoTest.kt

@@ -304,6 +304,56 @@ class ActivityRepoTest : BaseUnitTest() {
         assertEquals(listOf(replacementActivity), result.getOrThrow())
     }
 
+    @Test
+    fun `setContact propagates contact to replacement transaction`() = test {
+        val contactPublicKey = "pubky3rsduhcxpw74snwyct86m38c63j3pq8x4ycqikxg64roik8yw5xg"
+        val replacedTxId = "replaced_tx_id"
+        val replacedActivity = createOnchainActivity(
+            id = "replaced_activity_id",
+            txId = replacedTxId,
+            doesExist = false,
+        )
+        val replacementActivity = createOnchainActivity(
+            id = "replacement_activity_id",
+            txId = "replacement_tx_id",
+            boostTxIds = listOf(replacedTxId),
+        )
+        whenever(coreService.activity.getActivity(replacedTxId)).thenReturn(null)
+        whenever(coreService.activity.getOnchainActivityByTxId(replacedTxId)).thenReturn(replacedActivity.v1)
+        whenever(
+            coreService.activity.get(
+                filter = ActivityFilter.ONCHAIN,
+                txType = null,
+                tags = null,
+                search = null,
+                minDate = null,
+                maxDate = null,
+                limit = null,
+                sortDirection = null,
+            )
+        ).thenReturn(listOf(replacedActivity, replacementActivity))
+
+        val result = sut.setContact(
+            contactPublicKey = contactPublicKey,
+            forPaymentId = replacedTxId,
+            syncLdkPayments = false,
+        )
+
+        assertTrue(result.isSuccess)
+        verify(coreService.activity).update(
+            eq(replacedActivity.v1.id),
+            argThat {
+                this is Activity.Onchain && v1.contact == contactPublicKey
+            },
+        )
+        verify(coreService.activity).update(
+            eq(replacementActivity.v1.id),
+            argThat {
+                this is Activity.Onchain && v1.contact == contactPublicKey
+            },
+        )
+    }
+
     @Test
     fun `updateActivity updates successfully when not deleted`() = test {
         val activityId = "activity123"