Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,5 +6,6 @@ import kotlinx.serialization.Serializable
data class PendingBoostActivity(
val txId: String,
val updatedAt: ULong,
val activityToDelete: String?
val activityToDelete: String?,
val boostTxIds: List<String> = emptyList(),
)
9 changes: 6 additions & 3 deletions app/src/main/java/to/bitkit/repositories/ActivityRepo.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -428,22 +428,25 @@ class ActivityRepo @Inject constructor(
val updatedActivity = Activity.Onchain(
v1 = newOnChainActivity.v1.copy(
isBoosted = true,
updatedAt = pendingBoostActivity.updatedAt
boostTxIds = pendingBoostActivity.boostTxIds,
updatedAt = pendingBoostActivity.updatedAt,
)
)

if (pendingBoostActivity.activityToDelete != null) {
// RBF: Replace old activity with new one, applying parent chain boostTxIds
replaceActivity(
id = updatedActivity.v1.id,
activity = updatedActivity,
activityIdToDelete = pendingBoostActivity.activityToDelete
activityIdToDelete = pendingBoostActivity.activityToDelete,
).onSuccess {
cacheStore.removeActivityFromPendingBoost(pendingBoostActivity)
}
} else {
// CPFP: Update existing activity (though CPFP is handled immediately now)
updateActivity(
id = updatedActivity.v1.id,
activity = updatedActivity
activity = updatedActivity,
).onSuccess {
cacheStore.removeActivityFromPendingBoost(pendingBoostActivity)
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,13 +116,6 @@ fun ActivityExploreScreen(
val intent = Intent(Intent.ACTION_VIEW, url.toUri())
context.startActivity(intent)
},
onClickParent = { id ->
app.toast(
type = Toast.ToastType.WARNING,
title = "TODO",
description = "Navigate to Activity Detail for: $id",
)
},
)
}
}
Expand All@@ -133,7 +126,6 @@ private fun ActivityExploreContent(
txDetails: TxDetails? = null,
onCopy: (String) -> Unit = {},
onClickExplore: (String) -> Unit = {},
onClickParent: (String) -> Unit = {},
) {
Column(
modifier = Modifier
Expand DownExpand Up@@ -164,7 +156,6 @@ private fun ActivityExploreContent(
onchain = item,
onCopy = onCopy,
txDetails = txDetails,
onClickParent = onClickParent,
)
Spacer(modifier = Modifier.weight(1f))
PrimaryButton(
Expand DownExpand Up@@ -226,7 +217,6 @@ private fun ColumnScope.OnchainDetails(
onchain: Activity.Onchain,
onCopy: (String) -> Unit,
txDetails: TxDetails?,
onClickParent: (String) -> Unit,
) {
val txId = onchain.v1.txId
Section(
Expand DownExpand Up@@ -271,13 +261,9 @@ private fun ColumnScope.OnchainDetails(
.size(16.dp)
.align(Alignment.CenterHorizontally)
)
} // TODO use real boosted parents from bitkit-core/ldk-node when available
val boostedParents = listOfNotNull(
"todo_first_parent_txid".takeIf { onchain.isBoosted() && !onchain.v1.confirmed },
"todo_second_parent_txid".takeIf { onchain.isBoosted() && onchain.v1.confirmed },
)
}

boostedParents.forEachIndexed { index, parent ->
onchain.v1.boostTxIds.forEachIndexed { index, parent ->
val isRbf = onchain.boostType() == BoostType.RBF
Section(
title = stringResource(
Expand All@@ -289,9 +275,11 @@ private fun ColumnScope.OnchainDetails(
}
},
modifier = Modifier
.clickableAlpha {
onClickParent(parent)
}
.clickableAlpha(
onClick = copyToClipboard(parent) {
onCopy(it)
}
)
.testTag(if (isRbf) "RBFBoosted" else "CPFPBoosted")
)
}
Expand Down
38 changes: 27 additions & 11 deletions app/src/main/java/to/bitkit/ui/sheets/BoostTransactionViewModel.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.dto.PendingBoostActivity
import to.bitkit.ext.BoostType
import to.bitkit.ext.boostType
import to.bitkit.ext.nowMillis
import to.bitkit.ext.nowTimestamp
import to.bitkit.models.TransactionSpeed
import to.bitkit.repositories.ActivityRepo
Expand DownExpand Up@@ -203,6 +204,8 @@ class BoostTransactionViewModel @Inject constructor(
destinationAddress = walletRepo.getOnchainAddress(),
).fold(
onSuccess = { newTxId ->
// For CPFP, immediately update parent with child txId
Logger.debug("CPFP successful. Appending child txId $newTxId to parent's boostTxIds", context = TAG)
handleBoostSuccess(newTxId, isRBF = false)
},
onFailure = { error ->
Expand DownExpand Up@@ -283,7 +286,7 @@ class BoostTransactionViewModel @Inject constructor(
/**
* Updates activity based on boost type:
* - RBF: Updates current activity with boost data, then replaces with new transaction
* - CPFP: Simply updates the current activity
* - CPFP: Updates parent activity by appending child txId to boostTxIds
*/
private suspend fun updateActivity(newTxId: Txid, isRBF: Boolean): Result<Unit> {
Logger.debug("Updating activity for txId: $newTxId. isRBF: $isRBF", context = TAG)
Expand All@@ -294,24 +297,25 @@ class BoostTransactionViewModel @Inject constructor(
return if (isRBF) {
handleRBFUpdate(newTxId, currentActivity)
} else {
handleCPFPUpdate(currentActivity)
handleCPFPUpdate(currentActivity, newTxId)
}
}

/**
* Handles CPFP (Child Pays For Parent) update by simply updating the current activity
* Handles CPFP (Child Pays For Parent) update by appending child txId to parent's boostTxIds
*/
private suspend fun handleCPFPUpdate(currentActivity: OnchainActivity): Result<Unit> {
private suspend fun handleCPFPUpdate(currentActivity: OnchainActivity, childTxId: Txid): Result<Unit> {
val updatedActivity = Activity.Onchain(
v1 = currentActivity.copy(
isBoosted = true,
updatedAt = nowTimestamp().toEpochMilli().toULong()
boostTxIds = currentActivity.boostTxIds + childTxId,
updatedAt = nowMillis().toULong(),
)
)

return activityRepo.updateActivity(
id = updatedActivity.v1.id,
activity = updatedActivity
activity = updatedActivity,
)
}

Expand All@@ -328,13 +332,13 @@ class BoostTransactionViewModel @Inject constructor(
isBoosted = true,
feeRate = _uiState.value.feeRate,
fee = _uiState.value.totalFeeSats,
updatedAt = nowTimestamp().toEpochMilli().toULong()
updatedAt = nowMillis().toULong(),
)
)

activityRepo.updateActivity(
id = updatedCurrentActivity.v1.id,
activity = updatedCurrentActivity
activity = updatedCurrentActivity,
)

// Then find and replace with the new activity
Expand DownExpand Up@@ -379,7 +383,7 @@ class BoostTransactionViewModel @Inject constructor(
v1 = newOnChainActivity.v1.copy(
isBoosted = true,
feeRate = _uiState.value.feeRate,
updatedAt = nowTimestamp().toEpochMilli().toULong()
updatedAt = nowMillis().toULong(),
)
)

Expand DownExpand Up@@ -412,13 +416,25 @@ class BoostTransactionViewModel @Inject constructor(

/**
* Caches activity data for pending boost operation
* - For RBF: stores parent chain (existing boostTxIds + current txId)
* - For CPFP: stores empty list (child tx is added to parent's boostTxIds during sync)
*/
private suspend fun cachePendingBoostActivity(newTxId: Txid, activityToDelete: String?) {
val currentActivity = activity?.v1
val boostTxIds = if (activityToDelete != null && currentActivity != null) {
// RBF: Track full parent chain (existing boostTxIds + current txId being replaced)
currentActivity.boostTxIds + currentActivity.txId
} else {
// CPFP: No parent tracking needed
emptyList()
}

activityRepo.addActivityToPendingBoost(
PendingBoostActivity(
txId = newTxId,
updatedAt = nowTimestamp().toEpochMilli().toULong(),
activityToDelete = activityToDelete
updatedAt = nowMillis().toULong(),
activityToDelete = activityToDelete,
boostTxIds = boostTxIds,
)
)
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,5 +6,6 @@ import kotlinx.serialization.Serializable
data class PendingBoostActivity(
val txId: String,
val updatedAt: ULong,
val activityToDelete: String?
val activityToDelete: String?,
val boostTxIds: List<String> = emptyList(),
)
9 changes: 6 additions & 3 deletions app/src/main/java/to/bitkit/repositories/ActivityRepo.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -428,22 +428,25 @@ class ActivityRepo @Inject constructor(
val updatedActivity = Activity.Onchain(
v1 = newOnChainActivity.v1.copy(
isBoosted = true,
updatedAt = pendingBoostActivity.updatedAt
boostTxIds = pendingBoostActivity.boostTxIds,
updatedAt = pendingBoostActivity.updatedAt,
)
)

if (pendingBoostActivity.activityToDelete != null) {
// RBF: Replace old activity with new one, applying parent chain boostTxIds
replaceActivity(
id = updatedActivity.v1.id,
activity = updatedActivity,
activityIdToDelete = pendingBoostActivity.activityToDelete
activityIdToDelete = pendingBoostActivity.activityToDelete,
).onSuccess {
cacheStore.removeActivityFromPendingBoost(pendingBoostActivity)
}
} else {
// CPFP: Update existing activity (though CPFP is handled immediately now)
updateActivity(
id = updatedActivity.v1.id,
activity = updatedActivity
activity = updatedActivity,
).onSuccess {
cacheStore.removeActivityFromPendingBoost(pendingBoostActivity)
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,13 +116,6 @@ fun ActivityExploreScreen(
val intent = Intent(Intent.ACTION_VIEW, url.toUri())
context.startActivity(intent)
},
onClickParent = { id ->
app.toast(
type = Toast.ToastType.WARNING,
title = "TODO",
description = "Navigate to Activity Detail for: $id",
)
},
)
}
}
Expand All@@ -133,7 +126,6 @@ private fun ActivityExploreContent(
txDetails: TxDetails? = null,
onCopy: (String) -> Unit = {},
onClickExplore: (String) -> Unit = {},
onClickParent: (String) -> Unit = {},
) {
Column(
modifier = Modifier
Expand DownExpand Up@@ -164,7 +156,6 @@ private fun ActivityExploreContent(
onchain = item,
onCopy = onCopy,
txDetails = txDetails,
onClickParent = onClickParent,
)
Spacer(modifier = Modifier.weight(1f))
PrimaryButton(
Expand DownExpand Up@@ -226,7 +217,6 @@ private fun ColumnScope.OnchainDetails(
onchain: Activity.Onchain,
onCopy: (String) -> Unit,
txDetails: TxDetails?,
onClickParent: (String) -> Unit,
) {
val txId = onchain.v1.txId
Section(
Expand DownExpand Up@@ -271,13 +261,9 @@ private fun ColumnScope.OnchainDetails(
.size(16.dp)
.align(Alignment.CenterHorizontally)
)
} // TODO use real boosted parents from bitkit-core/ldk-node when available
val boostedParents = listOfNotNull(
"todo_first_parent_txid".takeIf { onchain.isBoosted() && !onchain.v1.confirmed },
"todo_second_parent_txid".takeIf { onchain.isBoosted() && onchain.v1.confirmed },
)
}

boostedParents.forEachIndexed { index, parent ->
onchain.v1.boostTxIds.forEachIndexed { index, parent ->
val isRbf = onchain.boostType() == BoostType.RBF
Section(
title = stringResource(
Expand All@@ -289,9 +275,11 @@ private fun ColumnScope.OnchainDetails(
}
},
modifier = Modifier
.clickableAlpha {
onClickParent(parent)
}
.clickableAlpha(
onClick = copyToClipboard(parent) {
onCopy(it)
}
)
.testTag(if (isRbf) "RBFBoosted" else "CPFPBoosted")
)
}
Expand Down
38 changes: 27 additions & 11 deletions app/src/main/java/to/bitkit/ui/sheets/BoostTransactionViewModel.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.dto.PendingBoostActivity
import to.bitkit.ext.BoostType
import to.bitkit.ext.boostType
import to.bitkit.ext.nowMillis
import to.bitkit.ext.nowTimestamp
import to.bitkit.models.TransactionSpeed
import to.bitkit.repositories.ActivityRepo
Expand DownExpand Up@@ -203,6 +204,8 @@ class BoostTransactionViewModel @Inject constructor(
destinationAddress = walletRepo.getOnchainAddress(),
).fold(
onSuccess = { newTxId ->
// For CPFP, immediately update parent with child txId
Logger.debug("CPFP successful. Appending child txId $newTxId to parent's boostTxIds", context = TAG)
handleBoostSuccess(newTxId, isRBF = false)
},
onFailure = { error ->
Expand DownExpand Up@@ -283,7 +286,7 @@ class BoostTransactionViewModel @Inject constructor(
/**
* Updates activity based on boost type:
* - RBF: Updates current activity with boost data, then replaces with new transaction
* - CPFP: Simply updates the current activity
* - CPFP: Updates parent activity by appending child txId to boostTxIds
*/
private suspend fun updateActivity(newTxId: Txid, isRBF: Boolean): Result<Unit> {
Logger.debug("Updating activity for txId: $newTxId. isRBF: $isRBF", context = TAG)
Expand All@@ -294,24 +297,25 @@ class BoostTransactionViewModel @Inject constructor(
return if (isRBF) {
handleRBFUpdate(newTxId, currentActivity)
} else {
handleCPFPUpdate(currentActivity)
handleCPFPUpdate(currentActivity, newTxId)
}
}

/**
* Handles CPFP (Child Pays For Parent) update by simply updating the current activity
* Handles CPFP (Child Pays For Parent) update by appending child txId to parent's boostTxIds
*/
private suspend fun handleCPFPUpdate(currentActivity: OnchainActivity): Result<Unit> {
private suspend fun handleCPFPUpdate(currentActivity: OnchainActivity, childTxId: Txid): Result<Unit> {
val updatedActivity = Activity.Onchain(
v1 = currentActivity.copy(
isBoosted = true,
updatedAt = nowTimestamp().toEpochMilli().toULong()
boostTxIds = currentActivity.boostTxIds + childTxId,
updatedAt = nowMillis().toULong(),
)
)

return activityRepo.updateActivity(
id = updatedActivity.v1.id,
activity = updatedActivity
activity = updatedActivity,
)
}

Expand All@@ -328,13 +332,13 @@ class BoostTransactionViewModel @Inject constructor(
isBoosted = true,
feeRate = _uiState.value.feeRate,
fee = _uiState.value.totalFeeSats,
updatedAt = nowTimestamp().toEpochMilli().toULong()
updatedAt = nowMillis().toULong(),
)
)

activityRepo.updateActivity(
id = updatedCurrentActivity.v1.id,
activity = updatedCurrentActivity
activity = updatedCurrentActivity,
)

// Then find and replace with the new activity
Expand DownExpand Up@@ -379,7 +383,7 @@ class BoostTransactionViewModel @Inject constructor(
v1 = newOnChainActivity.v1.copy(
isBoosted = true,
feeRate = _uiState.value.feeRate,
updatedAt = nowTimestamp().toEpochMilli().toULong()
updatedAt = nowMillis().toULong(),
)
)

Expand DownExpand Up@@ -412,13 +416,25 @@ class BoostTransactionViewModel @Inject constructor(

/**
* Caches activity data for pending boost operation
* - For RBF: stores parent chain (existing boostTxIds + current txId)
* - For CPFP: stores empty list (child tx is added to parent's boostTxIds during sync)
*/
private suspend fun cachePendingBoostActivity(newTxId: Txid, activityToDelete: String?) {
val currentActivity = activity?.v1
val boostTxIds = if (activityToDelete != null && currentActivity != null) {
// RBF: Track full parent chain (existing boostTxIds + current txId being replaced)
currentActivity.boostTxIds + currentActivity.txId
} else {
// CPFP: No parent tracking needed
emptyList()
}

activityRepo.addActivityToPendingBoost(
PendingBoostActivity(
txId = newTxId,
updatedAt = nowTimestamp().toEpochMilli().toULong(),
activityToDelete = activityToDelete
updatedAt = nowMillis().toULong(),
activityToDelete = activityToDelete,
boostTxIds = boostTxIds,
)
)
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,5 +6,6 @@ import kotlinx.serialization.Serializable
data class PendingBoostActivity(
val txId: String,
val updatedAt: ULong,
val activityToDelete: String?
val activityToDelete: String?,
val boostTxIds: List<String> = emptyList(),
)
9 changes: 6 additions & 3 deletions app/src/main/java/to/bitkit/repositories/ActivityRepo.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -428,22 +428,25 @@ class ActivityRepo @Inject constructor(
val updatedActivity = Activity.Onchain(
v1 = newOnChainActivity.v1.copy(
isBoosted = true,
updatedAt = pendingBoostActivity.updatedAt
boostTxIds = pendingBoostActivity.boostTxIds,
updatedAt = pendingBoostActivity.updatedAt,
)
)

if (pendingBoostActivity.activityToDelete != null) {
// RBF: Replace old activity with new one, applying parent chain boostTxIds
replaceActivity(
id = updatedActivity.v1.id,
activity = updatedActivity,
activityIdToDelete = pendingBoostActivity.activityToDelete
activityIdToDelete = pendingBoostActivity.activityToDelete,
).onSuccess {
cacheStore.removeActivityFromPendingBoost(pendingBoostActivity)
}
} else {
// CPFP: Update existing activity (though CPFP is handled immediately now)
updateActivity(
id = updatedActivity.v1.id,
activity = updatedActivity
activity = updatedActivity,
).onSuccess {
cacheStore.removeActivityFromPendingBoost(pendingBoostActivity)
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,13 +116,6 @@ fun ActivityExploreScreen(
val intent = Intent(Intent.ACTION_VIEW, url.toUri())
context.startActivity(intent)
},
onClickParent = { id ->
app.toast(
type = Toast.ToastType.WARNING,
title = "TODO",
description = "Navigate to Activity Detail for: $id",
)
},
)
}
}
Expand All@@ -133,7 +126,6 @@ private fun ActivityExploreContent(
txDetails: TxDetails? = null,
onCopy: (String) -> Unit = {},
onClickExplore: (String) -> Unit = {},
onClickParent: (String) -> Unit = {},
) {
Column(
modifier = Modifier
Expand DownExpand Up@@ -164,7 +156,6 @@ private fun ActivityExploreContent(
onchain = item,
onCopy = onCopy,
txDetails = txDetails,
onClickParent = onClickParent,
)
Spacer(modifier = Modifier.weight(1f))
PrimaryButton(
Expand DownExpand Up@@ -226,7 +217,6 @@ private fun ColumnScope.OnchainDetails(
onchain: Activity.Onchain,
onCopy: (String) -> Unit,
txDetails: TxDetails?,
onClickParent: (String) -> Unit,
) {
val txId = onchain.v1.txId
Section(
Expand DownExpand Up@@ -271,13 +261,9 @@ private fun ColumnScope.OnchainDetails(
.size(16.dp)
.align(Alignment.CenterHorizontally)
)
} // TODO use real boosted parents from bitkit-core/ldk-node when available
val boostedParents = listOfNotNull(
"todo_first_parent_txid".takeIf { onchain.isBoosted() && !onchain.v1.confirmed },
"todo_second_parent_txid".takeIf { onchain.isBoosted() && onchain.v1.confirmed },
)
}

boostedParents.forEachIndexed { index, parent ->
onchain.v1.boostTxIds.forEachIndexed { index, parent ->
val isRbf = onchain.boostType() == BoostType.RBF
Section(
title = stringResource(
Expand All@@ -289,9 +275,11 @@ private fun ColumnScope.OnchainDetails(
}
},
modifier = Modifier
.clickableAlpha {
onClickParent(parent)
}
.clickableAlpha(
onClick = copyToClipboard(parent) {
onCopy(it)
}
)
.testTag(if (isRbf) "RBFBoosted" else "CPFPBoosted")
)
}
Expand Down
38 changes: 27 additions & 11 deletions app/src/main/java/to/bitkit/ui/sheets/BoostTransactionViewModel.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.dto.PendingBoostActivity
import to.bitkit.ext.BoostType
import to.bitkit.ext.boostType
import to.bitkit.ext.nowMillis
import to.bitkit.ext.nowTimestamp
import to.bitkit.models.TransactionSpeed
import to.bitkit.repositories.ActivityRepo
Expand DownExpand Up@@ -203,6 +204,8 @@ class BoostTransactionViewModel @Inject constructor(
destinationAddress = walletRepo.getOnchainAddress(),
).fold(
onSuccess = { newTxId ->
// For CPFP, immediately update parent with child txId
Logger.debug("CPFP successful. Appending child txId $newTxId to parent's boostTxIds", context = TAG)
handleBoostSuccess(newTxId, isRBF = false)
},
onFailure = { error ->
Expand DownExpand Up@@ -283,7 +286,7 @@ class BoostTransactionViewModel @Inject constructor(
/**
* Updates activity based on boost type:
* - RBF: Updates current activity with boost data, then replaces with new transaction
* - CPFP: Simply updates the current activity
* - CPFP: Updates parent activity by appending child txId to boostTxIds
*/
private suspend fun updateActivity(newTxId: Txid, isRBF: Boolean): Result<Unit> {
Logger.debug("Updating activity for txId: $newTxId. isRBF: $isRBF", context = TAG)
Expand All@@ -294,24 +297,25 @@ class BoostTransactionViewModel @Inject constructor(
return if (isRBF) {
handleRBFUpdate(newTxId, currentActivity)
} else {
handleCPFPUpdate(currentActivity)
handleCPFPUpdate(currentActivity, newTxId)
}
}

/**
* Handles CPFP (Child Pays For Parent) update by simply updating the current activity
* Handles CPFP (Child Pays For Parent) update by appending child txId to parent's boostTxIds
*/
private suspend fun handleCPFPUpdate(currentActivity: OnchainActivity): Result<Unit> {
private suspend fun handleCPFPUpdate(currentActivity: OnchainActivity, childTxId: Txid): Result<Unit> {
val updatedActivity = Activity.Onchain(
v1 = currentActivity.copy(
isBoosted = true,
updatedAt = nowTimestamp().toEpochMilli().toULong()
boostTxIds = currentActivity.boostTxIds + childTxId,
updatedAt = nowMillis().toULong(),
)
)

return activityRepo.updateActivity(
id = updatedActivity.v1.id,
activity = updatedActivity
activity = updatedActivity,
)
}

Expand All@@ -328,13 +332,13 @@ class BoostTransactionViewModel @Inject constructor(
isBoosted = true,
feeRate = _uiState.value.feeRate,
fee = _uiState.value.totalFeeSats,
updatedAt = nowTimestamp().toEpochMilli().toULong()
updatedAt = nowMillis().toULong(),
)
)

activityRepo.updateActivity(
id = updatedCurrentActivity.v1.id,
activity = updatedCurrentActivity
activity = updatedCurrentActivity,
)

// Then find and replace with the new activity
Expand DownExpand Up@@ -379,7 +383,7 @@ class BoostTransactionViewModel @Inject constructor(
v1 = newOnChainActivity.v1.copy(
isBoosted = true,
feeRate = _uiState.value.feeRate,
updatedAt = nowTimestamp().toEpochMilli().toULong()
updatedAt = nowMillis().toULong(),
)
)

Expand DownExpand Up@@ -412,13 +416,25 @@ class BoostTransactionViewModel @Inject constructor(

/**
* Caches activity data for pending boost operation
* - For RBF: stores parent chain (existing boostTxIds + current txId)
* - For CPFP: stores empty list (child tx is added to parent's boostTxIds during sync)
*/
private suspend fun cachePendingBoostActivity(newTxId: Txid, activityToDelete: String?) {
val currentActivity = activity?.v1
val boostTxIds = if (activityToDelete != null && currentActivity != null) {
// RBF: Track full parent chain (existing boostTxIds + current txId being replaced)
currentActivity.boostTxIds + currentActivity.txId
} else {
// CPFP: No parent tracking needed
emptyList()
}

activityRepo.addActivityToPendingBoost(
PendingBoostActivity(
txId = newTxId,
updatedAt = nowTimestamp().toEpochMilli().toULong(),
activityToDelete = activityToDelete
updatedAt = nowMillis().toULong(),
activityToDelete = activityToDelete,
boostTxIds = boostTxIds,
)
)
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,5 +6,6 @@ import kotlinx.serialization.Serializable
data class PendingBoostActivity(
val txId: String,
val updatedAt: ULong,
val activityToDelete: String?
val activityToDelete: String?,
val boostTxIds: List<String> = emptyList(),
)
9 changes: 6 additions & 3 deletions app/src/main/java/to/bitkit/repositories/ActivityRepo.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -428,22 +428,25 @@ class ActivityRepo @Inject constructor(
val updatedActivity = Activity.Onchain(
v1 = newOnChainActivity.v1.copy(
isBoosted = true,
updatedAt = pendingBoostActivity.updatedAt
boostTxIds = pendingBoostActivity.boostTxIds,
updatedAt = pendingBoostActivity.updatedAt,
)
)

if (pendingBoostActivity.activityToDelete != null) {
// RBF: Replace old activity with new one, applying parent chain boostTxIds
replaceActivity(
id = updatedActivity.v1.id,
activity = updatedActivity,
activityIdToDelete = pendingBoostActivity.activityToDelete
activityIdToDelete = pendingBoostActivity.activityToDelete,
).onSuccess {
cacheStore.removeActivityFromPendingBoost(pendingBoostActivity)
}
} else {
// CPFP: Update existing activity (though CPFP is handled immediately now)
updateActivity(
id = updatedActivity.v1.id,
activity = updatedActivity
activity = updatedActivity,
).onSuccess {
cacheStore.removeActivityFromPendingBoost(pendingBoostActivity)
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,13 +116,6 @@ fun ActivityExploreScreen(
val intent = Intent(Intent.ACTION_VIEW, url.toUri())
context.startActivity(intent)
},
onClickParent = { id ->
app.toast(
type = Toast.ToastType.WARNING,
title = "TODO",
description = "Navigate to Activity Detail for: $id",
)
},
)
}
}
Expand All@@ -133,7 +126,6 @@ private fun ActivityExploreContent(
txDetails: TxDetails? = null,
onCopy: (String) -> Unit = {},
onClickExplore: (String) -> Unit = {},
onClickParent: (String) -> Unit = {},
) {
Column(
modifier = Modifier
Expand DownExpand Up@@ -164,7 +156,6 @@ private fun ActivityExploreContent(
onchain = item,
onCopy = onCopy,
txDetails = txDetails,
onClickParent = onClickParent,
)
Spacer(modifier = Modifier.weight(1f))
PrimaryButton(
Expand DownExpand Up@@ -226,7 +217,6 @@ private fun ColumnScope.OnchainDetails(
onchain: Activity.Onchain,
onCopy: (String) -> Unit,
txDetails: TxDetails?,
onClickParent: (String) -> Unit,
) {
val txId = onchain.v1.txId
Section(
Expand DownExpand Up@@ -271,13 +261,9 @@ private fun ColumnScope.OnchainDetails(
.size(16.dp)
.align(Alignment.CenterHorizontally)
)
} // TODO use real boosted parents from bitkit-core/ldk-node when available
val boostedParents = listOfNotNull(
"todo_first_parent_txid".takeIf { onchain.isBoosted() && !onchain.v1.confirmed },
"todo_second_parent_txid".takeIf { onchain.isBoosted() && onchain.v1.confirmed },
)
}

boostedParents.forEachIndexed { index, parent ->
onchain.v1.boostTxIds.forEachIndexed { index, parent ->
val isRbf = onchain.boostType() == BoostType.RBF
Section(
title = stringResource(
Expand All@@ -289,9 +275,11 @@ private fun ColumnScope.OnchainDetails(
}
},
modifier = Modifier
.clickableAlpha {
onClickParent(parent)
}
.clickableAlpha(
onClick = copyToClipboard(parent) {
onCopy(it)
}
)
.testTag(if (isRbf) "RBFBoosted" else "CPFPBoosted")
)
}
Expand Down
38 changes: 27 additions & 11 deletions app/src/main/java/to/bitkit/ui/sheets/BoostTransactionViewModel.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.dto.PendingBoostActivity
import to.bitkit.ext.BoostType
import to.bitkit.ext.boostType
import to.bitkit.ext.nowMillis
import to.bitkit.ext.nowTimestamp
import to.bitkit.models.TransactionSpeed
import to.bitkit.repositories.ActivityRepo
Expand DownExpand Up@@ -203,6 +204,8 @@ class BoostTransactionViewModel @Inject constructor(
destinationAddress = walletRepo.getOnchainAddress(),
).fold(
onSuccess = { newTxId ->
// For CPFP, immediately update parent with child txId
Logger.debug("CPFP successful. Appending child txId $newTxId to parent's boostTxIds", context = TAG)
handleBoostSuccess(newTxId, isRBF = false)
},
onFailure = { error ->
Expand DownExpand Up@@ -283,7 +286,7 @@ class BoostTransactionViewModel @Inject constructor(
/**
* Updates activity based on boost type:
* - RBF: Updates current activity with boost data, then replaces with new transaction
* - CPFP: Simply updates the current activity
* - CPFP: Updates parent activity by appending child txId to boostTxIds
*/
private suspend fun updateActivity(newTxId: Txid, isRBF: Boolean): Result<Unit> {
Logger.debug("Updating activity for txId: $newTxId. isRBF: $isRBF", context = TAG)
Expand All@@ -294,24 +297,25 @@ class BoostTransactionViewModel @Inject constructor(
return if (isRBF) {
handleRBFUpdate(newTxId, currentActivity)
} else {
handleCPFPUpdate(currentActivity)
handleCPFPUpdate(currentActivity, newTxId)
}
}

/**
* Handles CPFP (Child Pays For Parent) update by simply updating the current activity
* Handles CPFP (Child Pays For Parent) update by appending child txId to parent's boostTxIds
*/
private suspend fun handleCPFPUpdate(currentActivity: OnchainActivity): Result<Unit> {
private suspend fun handleCPFPUpdate(currentActivity: OnchainActivity, childTxId: Txid): Result<Unit> {
val updatedActivity = Activity.Onchain(
v1 = currentActivity.copy(
isBoosted = true,
updatedAt = nowTimestamp().toEpochMilli().toULong()
boostTxIds = currentActivity.boostTxIds + childTxId,
updatedAt = nowMillis().toULong(),
)
)

return activityRepo.updateActivity(
id = updatedActivity.v1.id,
activity = updatedActivity
activity = updatedActivity,
)
}

Expand All@@ -328,13 +332,13 @@ class BoostTransactionViewModel @Inject constructor(
isBoosted = true,
feeRate = _uiState.value.feeRate,
fee = _uiState.value.totalFeeSats,
updatedAt = nowTimestamp().toEpochMilli().toULong()
updatedAt = nowMillis().toULong(),
)
)

activityRepo.updateActivity(
id = updatedCurrentActivity.v1.id,
activity = updatedCurrentActivity
activity = updatedCurrentActivity,
)

// Then find and replace with the new activity
Expand DownExpand Up@@ -379,7 +383,7 @@ class BoostTransactionViewModel @Inject constructor(
v1 = newOnChainActivity.v1.copy(
isBoosted = true,
feeRate = _uiState.value.feeRate,
updatedAt = nowTimestamp().toEpochMilli().toULong()
updatedAt = nowMillis().toULong(),
)
)

Expand DownExpand Up@@ -412,13 +416,25 @@ class BoostTransactionViewModel @Inject constructor(

/**
* Caches activity data for pending boost operation
* - For RBF: stores parent chain (existing boostTxIds + current txId)
* - For CPFP: stores empty list (child tx is added to parent's boostTxIds during sync)
*/
private suspend fun cachePendingBoostActivity(newTxId: Txid, activityToDelete: String?) {
val currentActivity = activity?.v1
val boostTxIds = if (activityToDelete != null && currentActivity != null) {
// RBF: Track full parent chain (existing boostTxIds + current txId being replaced)
currentActivity.boostTxIds + currentActivity.txId
} else {
// CPFP: No parent tracking needed
emptyList()
}

activityRepo.addActivityToPendingBoost(
PendingBoostActivity(
txId = newTxId,
updatedAt = nowTimestamp().toEpochMilli().toULong(),
activityToDelete = activityToDelete
updatedAt = nowMillis().toULong(),
activityToDelete = activityToDelete,
boostTxIds = boostTxIds,
)
)
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,5 +6,6 @@ import kotlinx.serialization.Serializable
data class PendingBoostActivity(
val txId: String,
val updatedAt: ULong,
val activityToDelete: String?
val activityToDelete: String?,
val boostTxIds: List<String> = emptyList(),
)
9 changes: 6 additions & 3 deletions app/src/main/java/to/bitkit/repositories/ActivityRepo.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -428,22 +428,25 @@ class ActivityRepo @Inject constructor(
val updatedActivity = Activity.Onchain(
v1 = newOnChainActivity.v1.copy(
isBoosted = true,
updatedAt = pendingBoostActivity.updatedAt
boostTxIds = pendingBoostActivity.boostTxIds,
updatedAt = pendingBoostActivity.updatedAt,
)
)

if (pendingBoostActivity.activityToDelete != null) {
// RBF: Replace old activity with new one, applying parent chain boostTxIds
replaceActivity(
id = updatedActivity.v1.id,
activity = updatedActivity,
activityIdToDelete = pendingBoostActivity.activityToDelete
activityIdToDelete = pendingBoostActivity.activityToDelete,
).onSuccess {
cacheStore.removeActivityFromPendingBoost(pendingBoostActivity)
}
} else {
// CPFP: Update existing activity (though CPFP is handled immediately now)
updateActivity(
id = updatedActivity.v1.id,
activity = updatedActivity
activity = updatedActivity,
).onSuccess {
cacheStore.removeActivityFromPendingBoost(pendingBoostActivity)
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,13 +116,6 @@ fun ActivityExploreScreen(
val intent = Intent(Intent.ACTION_VIEW, url.toUri())
context.startActivity(intent)
},
onClickParent = { id ->
app.toast(
type = Toast.ToastType.WARNING,
title = "TODO",
description = "Navigate to Activity Detail for: $id",
)
},
)
}
}
Expand All@@ -133,7 +126,6 @@ private fun ActivityExploreContent(
txDetails: TxDetails? = null,
onCopy: (String) -> Unit = {},
onClickExplore: (String) -> Unit = {},
onClickParent: (String) -> Unit = {},
) {
Column(
modifier = Modifier
Expand DownExpand Up@@ -164,7 +156,6 @@ private fun ActivityExploreContent(
onchain = item,
onCopy = onCopy,
txDetails = txDetails,
onClickParent = onClickParent,
)
Spacer(modifier = Modifier.weight(1f))
PrimaryButton(
Expand DownExpand Up@@ -226,7 +217,6 @@ private fun ColumnScope.OnchainDetails(
onchain: Activity.Onchain,
onCopy: (String) -> Unit,
txDetails: TxDetails?,
onClickParent: (String) -> Unit,
) {
val txId = onchain.v1.txId
Section(
Expand DownExpand Up@@ -271,13 +261,9 @@ private fun ColumnScope.OnchainDetails(
.size(16.dp)
.align(Alignment.CenterHorizontally)
)
} // TODO use real boosted parents from bitkit-core/ldk-node when available
val boostedParents = listOfNotNull(
"todo_first_parent_txid".takeIf { onchain.isBoosted() && !onchain.v1.confirmed },
"todo_second_parent_txid".takeIf { onchain.isBoosted() && onchain.v1.confirmed },
)
}

boostedParents.forEachIndexed { index, parent ->
onchain.v1.boostTxIds.forEachIndexed { index, parent ->
val isRbf = onchain.boostType() == BoostType.RBF
Section(
title = stringResource(
Expand All@@ -289,9 +275,11 @@ private fun ColumnScope.OnchainDetails(
}
},
modifier = Modifier
.clickableAlpha {
onClickParent(parent)
}
.clickableAlpha(
onClick = copyToClipboard(parent) {
onCopy(it)
}
)
.testTag(if (isRbf) "RBFBoosted" else "CPFPBoosted")
)
}
Expand Down
38 changes: 27 additions & 11 deletions app/src/main/java/to/bitkit/ui/sheets/BoostTransactionViewModel.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.dto.PendingBoostActivity
import to.bitkit.ext.BoostType
import to.bitkit.ext.boostType
import to.bitkit.ext.nowMillis
import to.bitkit.ext.nowTimestamp
import to.bitkit.models.TransactionSpeed
import to.bitkit.repositories.ActivityRepo
Expand DownExpand Up@@ -203,6 +204,8 @@ class BoostTransactionViewModel @Inject constructor(
destinationAddress = walletRepo.getOnchainAddress(),
).fold(
onSuccess = { newTxId ->
// For CPFP, immediately update parent with child txId
Logger.debug("CPFP successful. Appending child txId $newTxId to parent's boostTxIds", context = TAG)
handleBoostSuccess(newTxId, isRBF = false)
},
onFailure = { error ->
Expand DownExpand Up@@ -283,7 +286,7 @@ class BoostTransactionViewModel @Inject constructor(
/**
* Updates activity based on boost type:
* - RBF: Updates current activity with boost data, then replaces with new transaction
* - CPFP: Simply updates the current activity
* - CPFP: Updates parent activity by appending child txId to boostTxIds
*/
private suspend fun updateActivity(newTxId: Txid, isRBF: Boolean): Result<Unit> {
Logger.debug("Updating activity for txId: $newTxId. isRBF: $isRBF", context = TAG)
Expand All@@ -294,24 +297,25 @@ class BoostTransactionViewModel @Inject constructor(
return if (isRBF) {
handleRBFUpdate(newTxId, currentActivity)
} else {
handleCPFPUpdate(currentActivity)
handleCPFPUpdate(currentActivity, newTxId)
}
}

/**
* Handles CPFP (Child Pays For Parent) update by simply updating the current activity
* Handles CPFP (Child Pays For Parent) update by appending child txId to parent's boostTxIds
*/
private suspend fun handleCPFPUpdate(currentActivity: OnchainActivity): Result<Unit> {
private suspend fun handleCPFPUpdate(currentActivity: OnchainActivity, childTxId: Txid): Result<Unit> {
val updatedActivity = Activity.Onchain(
v1 = currentActivity.copy(
isBoosted = true,
updatedAt = nowTimestamp().toEpochMilli().toULong()
boostTxIds = currentActivity.boostTxIds + childTxId,
updatedAt = nowMillis().toULong(),
)
)

return activityRepo.updateActivity(
id = updatedActivity.v1.id,
activity = updatedActivity
activity = updatedActivity,
)
}

Expand All@@ -328,13 +332,13 @@ class BoostTransactionViewModel @Inject constructor(
isBoosted = true,
feeRate = _uiState.value.feeRate,
fee = _uiState.value.totalFeeSats,
updatedAt = nowTimestamp().toEpochMilli().toULong()
updatedAt = nowMillis().toULong(),
)
)

activityRepo.updateActivity(
id = updatedCurrentActivity.v1.id,
activity = updatedCurrentActivity
activity = updatedCurrentActivity,
)

// Then find and replace with the new activity
Expand DownExpand Up@@ -379,7 +383,7 @@ class BoostTransactionViewModel @Inject constructor(
v1 = newOnChainActivity.v1.copy(
isBoosted = true,
feeRate = _uiState.value.feeRate,
updatedAt = nowTimestamp().toEpochMilli().toULong()
updatedAt = nowMillis().toULong(),
)
)

Expand DownExpand Up@@ -412,13 +416,25 @@ class BoostTransactionViewModel @Inject constructor(

/**
* Caches activity data for pending boost operation
* - For RBF: stores parent chain (existing boostTxIds + current txId)
* - For CPFP: stores empty list (child tx is added to parent's boostTxIds during sync)
*/
private suspend fun cachePendingBoostActivity(newTxId: Txid, activityToDelete: String?) {
val currentActivity = activity?.v1
val boostTxIds = if (activityToDelete != null && currentActivity != null) {
// RBF: Track full parent chain (existing boostTxIds + current txId being replaced)
currentActivity.boostTxIds + currentActivity.txId
} else {
// CPFP: No parent tracking needed
emptyList()
}

activityRepo.addActivityToPendingBoost(
PendingBoostActivity(
txId = newTxId,
updatedAt = nowTimestamp().toEpochMilli().toULong(),
activityToDelete = activityToDelete
updatedAt = nowMillis().toULong(),
activityToDelete = activityToDelete,
boostTxIds = boostTxIds,
)
)
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,5 +6,6 @@ import kotlinx.serialization.Serializable
data class PendingBoostActivity(
val txId: String,
val updatedAt: ULong,
val activityToDelete: String?
val activityToDelete: String?,
val boostTxIds: List<String> = emptyList(),
)
9 changes: 6 additions & 3 deletions app/src/main/java/to/bitkit/repositories/ActivityRepo.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -428,22 +428,25 @@ class ActivityRepo @Inject constructor(
val updatedActivity = Activity.Onchain(
v1 = newOnChainActivity.v1.copy(
isBoosted = true,
updatedAt = pendingBoostActivity.updatedAt
boostTxIds = pendingBoostActivity.boostTxIds,
updatedAt = pendingBoostActivity.updatedAt,
)
)

if (pendingBoostActivity.activityToDelete != null) {
// RBF: Replace old activity with new one, applying parent chain boostTxIds
replaceActivity(
id = updatedActivity.v1.id,
activity = updatedActivity,
activityIdToDelete = pendingBoostActivity.activityToDelete
activityIdToDelete = pendingBoostActivity.activityToDelete,
).onSuccess {
cacheStore.removeActivityFromPendingBoost(pendingBoostActivity)
}
} else {
// CPFP: Update existing activity (though CPFP is handled immediately now)
updateActivity(
id = updatedActivity.v1.id,
activity = updatedActivity
activity = updatedActivity,
).onSuccess {
cacheStore.removeActivityFromPendingBoost(pendingBoostActivity)
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,13 +116,6 @@ fun ActivityExploreScreen(
val intent = Intent(Intent.ACTION_VIEW, url.toUri())
context.startActivity(intent)
},
onClickParent = { id ->
app.toast(
type = Toast.ToastType.WARNING,
title = "TODO",
description = "Navigate to Activity Detail for: $id",
)
},
)
}
}
Expand All@@ -133,7 +126,6 @@ private fun ActivityExploreContent(
txDetails: TxDetails? = null,
onCopy: (String) -> Unit = {},
onClickExplore: (String) -> Unit = {},
onClickParent: (String) -> Unit = {},
) {
Column(
modifier = Modifier
Expand DownExpand Up@@ -164,7 +156,6 @@ private fun ActivityExploreContent(
onchain = item,
onCopy = onCopy,
txDetails = txDetails,
onClickParent = onClickParent,
)
Spacer(modifier = Modifier.weight(1f))
PrimaryButton(
Expand DownExpand Up@@ -226,7 +217,6 @@ private fun ColumnScope.OnchainDetails(
onchain: Activity.Onchain,
onCopy: (String) -> Unit,
txDetails: TxDetails?,
onClickParent: (String) -> Unit,
) {
val txId = onchain.v1.txId
Section(
Expand DownExpand Up@@ -271,13 +261,9 @@ private fun ColumnScope.OnchainDetails(
.size(16.dp)
.align(Alignment.CenterHorizontally)
)
} // TODO use real boosted parents from bitkit-core/ldk-node when available
val boostedParents = listOfNotNull(
"todo_first_parent_txid".takeIf { onchain.isBoosted() && !onchain.v1.confirmed },
"todo_second_parent_txid".takeIf { onchain.isBoosted() && onchain.v1.confirmed },
)
}

boostedParents.forEachIndexed { index, parent ->
onchain.v1.boostTxIds.forEachIndexed { index, parent ->
val isRbf = onchain.boostType() == BoostType.RBF
Section(
title = stringResource(
Expand All@@ -289,9 +275,11 @@ private fun ColumnScope.OnchainDetails(
}
},
modifier = Modifier
.clickableAlpha {
onClickParent(parent)
}
.clickableAlpha(
onClick = copyToClipboard(parent) {
onCopy(it)
}
)
.testTag(if (isRbf) "RBFBoosted" else "CPFPBoosted")
)
}
Expand Down
38 changes: 27 additions & 11 deletions app/src/main/java/to/bitkit/ui/sheets/BoostTransactionViewModel.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.dto.PendingBoostActivity
import to.bitkit.ext.BoostType
import to.bitkit.ext.boostType
import to.bitkit.ext.nowMillis
import to.bitkit.ext.nowTimestamp
import to.bitkit.models.TransactionSpeed
import to.bitkit.repositories.ActivityRepo
Expand DownExpand Up@@ -203,6 +204,8 @@ class BoostTransactionViewModel @Inject constructor(
destinationAddress = walletRepo.getOnchainAddress(),
).fold(
onSuccess = { newTxId ->
// For CPFP, immediately update parent with child txId
Logger.debug("CPFP successful. Appending child txId $newTxId to parent's boostTxIds", context = TAG)
handleBoostSuccess(newTxId, isRBF = false)
},
onFailure = { error ->
Expand DownExpand Up@@ -283,7 +286,7 @@ class BoostTransactionViewModel @Inject constructor(
/**
* Updates activity based on boost type:
* - RBF: Updates current activity with boost data, then replaces with new transaction
* - CPFP: Simply updates the current activity
* - CPFP: Updates parent activity by appending child txId to boostTxIds
*/
private suspend fun updateActivity(newTxId: Txid, isRBF: Boolean): Result<Unit> {
Logger.debug("Updating activity for txId: $newTxId. isRBF: $isRBF", context = TAG)
Expand All@@ -294,24 +297,25 @@ class BoostTransactionViewModel @Inject constructor(
return if (isRBF) {
handleRBFUpdate(newTxId, currentActivity)
} else {
handleCPFPUpdate(currentActivity)
handleCPFPUpdate(currentActivity, newTxId)
}
}

/**
* Handles CPFP (Child Pays For Parent) update by simply updating the current activity
* Handles CPFP (Child Pays For Parent) update by appending child txId to parent's boostTxIds
*/
private suspend fun handleCPFPUpdate(currentActivity: OnchainActivity): Result<Unit> {
private suspend fun handleCPFPUpdate(currentActivity: OnchainActivity, childTxId: Txid): Result<Unit> {
val updatedActivity = Activity.Onchain(
v1 = currentActivity.copy(
isBoosted = true,
updatedAt = nowTimestamp().toEpochMilli().toULong()
boostTxIds = currentActivity.boostTxIds + childTxId,
updatedAt = nowMillis().toULong(),
)
)

return activityRepo.updateActivity(
id = updatedActivity.v1.id,
activity = updatedActivity
activity = updatedActivity,
)
}

Expand All@@ -328,13 +332,13 @@ class BoostTransactionViewModel @Inject constructor(
isBoosted = true,
feeRate = _uiState.value.feeRate,
fee = _uiState.value.totalFeeSats,
updatedAt = nowTimestamp().toEpochMilli().toULong()
updatedAt = nowMillis().toULong(),
)
)

activityRepo.updateActivity(
id = updatedCurrentActivity.v1.id,
activity = updatedCurrentActivity
activity = updatedCurrentActivity,
)

// Then find and replace with the new activity
Expand DownExpand Up@@ -379,7 +383,7 @@ class BoostTransactionViewModel @Inject constructor(
v1 = newOnChainActivity.v1.copy(
isBoosted = true,
feeRate = _uiState.value.feeRate,
updatedAt = nowTimestamp().toEpochMilli().toULong()
updatedAt = nowMillis().toULong(),
)
)

Expand DownExpand Up@@ -412,13 +416,25 @@ class BoostTransactionViewModel @Inject constructor(

/**
* Caches activity data for pending boost operation
* - For RBF: stores parent chain (existing boostTxIds + current txId)
* - For CPFP: stores empty list (child tx is added to parent's boostTxIds during sync)
*/
private suspend fun cachePendingBoostActivity(newTxId: Txid, activityToDelete: String?) {
val currentActivity = activity?.v1
val boostTxIds = if (activityToDelete != null && currentActivity != null) {
// RBF: Track full parent chain (existing boostTxIds + current txId being replaced)
currentActivity.boostTxIds + currentActivity.txId
} else {
// CPFP: No parent tracking needed
emptyList()
}

activityRepo.addActivityToPendingBoost(
PendingBoostActivity(
txId = newTxId,
updatedAt = nowTimestamp().toEpochMilli().toULong(),
activityToDelete = activityToDelete
updatedAt = nowMillis().toULong(),
activityToDelete = activityToDelete,
boostTxIds = boostTxIds,
)
)
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,5 +6,6 @@ import kotlinx.serialization.Serializable
data class PendingBoostActivity(
val txId: String,
val updatedAt: ULong,
val activityToDelete: String?
val activityToDelete: String?,
val boostTxIds: List<String> = emptyList(),
)
9 changes: 6 additions & 3 deletions app/src/main/java/to/bitkit/repositories/ActivityRepo.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -428,22 +428,25 @@ class ActivityRepo @Inject constructor(
val updatedActivity = Activity.Onchain(
v1 = newOnChainActivity.v1.copy(
isBoosted = true,
updatedAt = pendingBoostActivity.updatedAt
boostTxIds = pendingBoostActivity.boostTxIds,
updatedAt = pendingBoostActivity.updatedAt,
)
)

if (pendingBoostActivity.activityToDelete != null) {
// RBF: Replace old activity with new one, applying parent chain boostTxIds
replaceActivity(
id = updatedActivity.v1.id,
activity = updatedActivity,
activityIdToDelete = pendingBoostActivity.activityToDelete
activityIdToDelete = pendingBoostActivity.activityToDelete,
).onSuccess {
cacheStore.removeActivityFromPendingBoost(pendingBoostActivity)
}
} else {
// CPFP: Update existing activity (though CPFP is handled immediately now)
updateActivity(
id = updatedActivity.v1.id,
activity = updatedActivity
activity = updatedActivity,
).onSuccess {
cacheStore.removeActivityFromPendingBoost(pendingBoostActivity)
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,13 +116,6 @@ fun ActivityExploreScreen(
val intent = Intent(Intent.ACTION_VIEW, url.toUri())
context.startActivity(intent)
},
onClickParent = { id ->
app.toast(
type = Toast.ToastType.WARNING,
title = "TODO",
description = "Navigate to Activity Detail for: $id",
)
},
)
}
}
Expand All@@ -133,7 +126,6 @@ private fun ActivityExploreContent(
txDetails: TxDetails? = null,
onCopy: (String) -> Unit = {},
onClickExplore: (String) -> Unit = {},
onClickParent: (String) -> Unit = {},
) {
Column(
modifier = Modifier
Expand DownExpand Up@@ -164,7 +156,6 @@ private fun ActivityExploreContent(
onchain = item,
onCopy = onCopy,
txDetails = txDetails,
onClickParent = onClickParent,
)
Spacer(modifier = Modifier.weight(1f))
PrimaryButton(
Expand DownExpand Up@@ -226,7 +217,6 @@ private fun ColumnScope.OnchainDetails(
onchain: Activity.Onchain,
onCopy: (String) -> Unit,
txDetails: TxDetails?,
onClickParent: (String) -> Unit,
) {
val txId = onchain.v1.txId
Section(
Expand DownExpand Up@@ -271,13 +261,9 @@ private fun ColumnScope.OnchainDetails(
.size(16.dp)
.align(Alignment.CenterHorizontally)
)
} // TODO use real boosted parents from bitkit-core/ldk-node when available
val boostedParents = listOfNotNull(
"todo_first_parent_txid".takeIf { onchain.isBoosted() && !onchain.v1.confirmed },
"todo_second_parent_txid".takeIf { onchain.isBoosted() && onchain.v1.confirmed },
)
}

boostedParents.forEachIndexed { index, parent ->
onchain.v1.boostTxIds.forEachIndexed { index, parent ->
val isRbf = onchain.boostType() == BoostType.RBF
Section(
title = stringResource(
Expand All@@ -289,9 +275,11 @@ private fun ColumnScope.OnchainDetails(
}
},
modifier = Modifier
.clickableAlpha {
onClickParent(parent)
}
.clickableAlpha(
onClick = copyToClipboard(parent) {
onCopy(it)
}
)
.testTag(if (isRbf) "RBFBoosted" else "CPFPBoosted")
)
}
Expand Down
38 changes: 27 additions & 11 deletions app/src/main/java/to/bitkit/ui/sheets/BoostTransactionViewModel.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.dto.PendingBoostActivity
import to.bitkit.ext.BoostType
import to.bitkit.ext.boostType
import to.bitkit.ext.nowMillis
import to.bitkit.ext.nowTimestamp
import to.bitkit.models.TransactionSpeed
import to.bitkit.repositories.ActivityRepo
Expand DownExpand Up@@ -203,6 +204,8 @@ class BoostTransactionViewModel @Inject constructor(
destinationAddress = walletRepo.getOnchainAddress(),
).fold(
onSuccess = { newTxId ->
// For CPFP, immediately update parent with child txId
Logger.debug("CPFP successful. Appending child txId $newTxId to parent's boostTxIds", context = TAG)
handleBoostSuccess(newTxId, isRBF = false)
},
onFailure = { error ->
Expand DownExpand Up@@ -283,7 +286,7 @@ class BoostTransactionViewModel @Inject constructor(
/**
* Updates activity based on boost type:
* - RBF: Updates current activity with boost data, then replaces with new transaction
* - CPFP: Simply updates the current activity
* - CPFP: Updates parent activity by appending child txId to boostTxIds
*/
private suspend fun updateActivity(newTxId: Txid, isRBF: Boolean): Result<Unit> {
Logger.debug("Updating activity for txId: $newTxId. isRBF: $isRBF", context = TAG)
Expand All@@ -294,24 +297,25 @@ class BoostTransactionViewModel @Inject constructor(
return if (isRBF) {
handleRBFUpdate(newTxId, currentActivity)
} else {
handleCPFPUpdate(currentActivity)
handleCPFPUpdate(currentActivity, newTxId)
}
}

/**
* Handles CPFP (Child Pays For Parent) update by simply updating the current activity
* Handles CPFP (Child Pays For Parent) update by appending child txId to parent's boostTxIds
*/
private suspend fun handleCPFPUpdate(currentActivity: OnchainActivity): Result<Unit> {
private suspend fun handleCPFPUpdate(currentActivity: OnchainActivity, childTxId: Txid): Result<Unit> {
val updatedActivity = Activity.Onchain(
v1 = currentActivity.copy(
isBoosted = true,
updatedAt = nowTimestamp().toEpochMilli().toULong()
boostTxIds = currentActivity.boostTxIds + childTxId,
updatedAt = nowMillis().toULong(),
)
)

return activityRepo.updateActivity(
id = updatedActivity.v1.id,
activity = updatedActivity
activity = updatedActivity,
)
}

Expand All@@ -328,13 +332,13 @@ class BoostTransactionViewModel @Inject constructor(
isBoosted = true,
feeRate = _uiState.value.feeRate,
fee = _uiState.value.totalFeeSats,
updatedAt = nowTimestamp().toEpochMilli().toULong()
updatedAt = nowMillis().toULong(),
)
)

activityRepo.updateActivity(
id = updatedCurrentActivity.v1.id,
activity = updatedCurrentActivity
activity = updatedCurrentActivity,
)

// Then find and replace with the new activity
Expand DownExpand Up@@ -379,7 +383,7 @@ class BoostTransactionViewModel @Inject constructor(
v1 = newOnChainActivity.v1.copy(
isBoosted = true,
feeRate = _uiState.value.feeRate,
updatedAt = nowTimestamp().toEpochMilli().toULong()
updatedAt = nowMillis().toULong(),
)
)

Expand DownExpand Up@@ -412,13 +416,25 @@ class BoostTransactionViewModel @Inject constructor(

/**
* Caches activity data for pending boost operation
* - For RBF: stores parent chain (existing boostTxIds + current txId)
* - For CPFP: stores empty list (child tx is added to parent's boostTxIds during sync)
*/
private suspend fun cachePendingBoostActivity(newTxId: Txid, activityToDelete: String?) {
val currentActivity = activity?.v1
val boostTxIds = if (activityToDelete != null && currentActivity != null) {
// RBF: Track full parent chain (existing boostTxIds + current txId being replaced)
currentActivity.boostTxIds + currentActivity.txId
} else {
// CPFP: No parent tracking needed
emptyList()
}

activityRepo.addActivityToPendingBoost(
PendingBoostActivity(
txId = newTxId,
updatedAt = nowTimestamp().toEpochMilli().toULong(),
activityToDelete = activityToDelete
updatedAt = nowMillis().toULong(),
activityToDelete = activityToDelete,
boostTxIds = boostTxIds,
)
)
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,5 +6,6 @@ import kotlinx.serialization.Serializable
data class PendingBoostActivity(
val txId: String,
val updatedAt: ULong,
val activityToDelete: String?
val activityToDelete: String?,
val boostTxIds: List<String> = emptyList(),
)
9 changes: 6 additions & 3 deletions app/src/main/java/to/bitkit/repositories/ActivityRepo.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -428,22 +428,25 @@ class ActivityRepo @Inject constructor(
val updatedActivity = Activity.Onchain(
v1 = newOnChainActivity.v1.copy(
isBoosted = true,
updatedAt = pendingBoostActivity.updatedAt
boostTxIds = pendingBoostActivity.boostTxIds,
updatedAt = pendingBoostActivity.updatedAt,
)
)

if (pendingBoostActivity.activityToDelete != null) {
// RBF: Replace old activity with new one, applying parent chain boostTxIds
replaceActivity(
id = updatedActivity.v1.id,
activity = updatedActivity,
activityIdToDelete = pendingBoostActivity.activityToDelete
activityIdToDelete = pendingBoostActivity.activityToDelete,
).onSuccess {
cacheStore.removeActivityFromPendingBoost(pendingBoostActivity)
}
} else {
// CPFP: Update existing activity (though CPFP is handled immediately now)
updateActivity(
id = updatedActivity.v1.id,
activity = updatedActivity
activity = updatedActivity,
).onSuccess {
cacheStore.removeActivityFromPendingBoost(pendingBoostActivity)
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,13 +116,6 @@ fun ActivityExploreScreen(
val intent = Intent(Intent.ACTION_VIEW, url.toUri())
context.startActivity(intent)
},
onClickParent = { id ->
app.toast(
type = Toast.ToastType.WARNING,
title = "TODO",
description = "Navigate to Activity Detail for: $id",
)
},
)
}
}
Expand All@@ -133,7 +126,6 @@ private fun ActivityExploreContent(
txDetails: TxDetails? = null,
onCopy: (String) -> Unit = {},
onClickExplore: (String) -> Unit = {},
onClickParent: (String) -> Unit = {},
) {
Column(
modifier = Modifier
Expand DownExpand Up@@ -164,7 +156,6 @@ private fun ActivityExploreContent(
onchain = item,
onCopy = onCopy,
txDetails = txDetails,
onClickParent = onClickParent,
)
Spacer(modifier = Modifier.weight(1f))
PrimaryButton(
Expand DownExpand Up@@ -226,7 +217,6 @@ private fun ColumnScope.OnchainDetails(
onchain: Activity.Onchain,
onCopy: (String) -> Unit,
txDetails: TxDetails?,
onClickParent: (String) -> Unit,
) {
val txId = onchain.v1.txId
Section(
Expand DownExpand Up@@ -271,13 +261,9 @@ private fun ColumnScope.OnchainDetails(
.size(16.dp)
.align(Alignment.CenterHorizontally)
)
} // TODO use real boosted parents from bitkit-core/ldk-node when available
val boostedParents = listOfNotNull(
"todo_first_parent_txid".takeIf { onchain.isBoosted() && !onchain.v1.confirmed },
"todo_second_parent_txid".takeIf { onchain.isBoosted() && onchain.v1.confirmed },
)
}

boostedParents.forEachIndexed { index, parent ->
onchain.v1.boostTxIds.forEachIndexed { index, parent ->
val isRbf = onchain.boostType() == BoostType.RBF
Section(
title = stringResource(
Expand All@@ -289,9 +275,11 @@ private fun ColumnScope.OnchainDetails(
}
},
modifier = Modifier
.clickableAlpha {
onClickParent(parent)
}
.clickableAlpha(
onClick = copyToClipboard(parent) {
onCopy(it)
}
)
.testTag(if (isRbf) "RBFBoosted" else "CPFPBoosted")
)
}
Expand Down
38 changes: 27 additions & 11 deletions app/src/main/java/to/bitkit/ui/sheets/BoostTransactionViewModel.kt
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import org.lightningdevkit.ldknode.Txid
import to.bitkit.data.dto.PendingBoostActivity
import to.bitkit.ext.BoostType
import to.bitkit.ext.boostType
import to.bitkit.ext.nowMillis
import to.bitkit.ext.nowTimestamp
import to.bitkit.models.TransactionSpeed
import to.bitkit.repositories.ActivityRepo
Expand DownExpand Up@@ -203,6 +204,8 @@ class BoostTransactionViewModel @Inject constructor(
destinationAddress = walletRepo.getOnchainAddress(),
).fold(
onSuccess = { newTxId ->
// For CPFP, immediately update parent with child txId
Logger.debug("CPFP successful. Appending child txId $newTxId to parent's boostTxIds", context = TAG)
handleBoostSuccess(newTxId, isRBF = false)
},
onFailure = { error ->
Expand DownExpand Up@@ -283,7 +286,7 @@ class BoostTransactionViewModel @Inject constructor(
/**
* Updates activity based on boost type:
* - RBF: Updates current activity with boost data, then replaces with new transaction
* - CPFP: Simply updates the current activity
* - CPFP: Updates parent activity by appending child txId to boostTxIds
*/
private suspend fun updateActivity(newTxId: Txid, isRBF: Boolean): Result<Unit> {
Logger.debug("Updating activity for txId: $newTxId. isRBF: $isRBF", context = TAG)
Expand All@@ -294,24 +297,25 @@ class BoostTransactionViewModel @Inject constructor(
return if (isRBF) {
handleRBFUpdate(newTxId, currentActivity)
} else {
handleCPFPUpdate(currentActivity)
handleCPFPUpdate(currentActivity, newTxId)
}
}

/**
* Handles CPFP (Child Pays For Parent) update by simply updating the current activity
* Handles CPFP (Child Pays For Parent) update by appending child txId to parent's boostTxIds
*/
private suspend fun handleCPFPUpdate(currentActivity: OnchainActivity): Result<Unit> {
private suspend fun handleCPFPUpdate(currentActivity: OnchainActivity, childTxId: Txid): Result<Unit> {
val updatedActivity = Activity.Onchain(
v1 = currentActivity.copy(
isBoosted = true,
updatedAt = nowTimestamp().toEpochMilli().toULong()
boostTxIds = currentActivity.boostTxIds + childTxId,
updatedAt = nowMillis().toULong(),
)
)

return activityRepo.updateActivity(
id = updatedActivity.v1.id,
activity = updatedActivity
activity = updatedActivity,
)
}

Expand All@@ -328,13 +332,13 @@ class BoostTransactionViewModel @Inject constructor(
isBoosted = true,
feeRate = _uiState.value.feeRate,
fee = _uiState.value.totalFeeSats,
updatedAt = nowTimestamp().toEpochMilli().toULong()
updatedAt = nowMillis().toULong(),
)
)

activityRepo.updateActivity(
id = updatedCurrentActivity.v1.id,
activity = updatedCurrentActivity
activity = updatedCurrentActivity,
)

// Then find and replace with the new activity
Expand DownExpand Up@@ -379,7 +383,7 @@ class BoostTransactionViewModel @Inject constructor(
v1 = newOnChainActivity.v1.copy(
isBoosted = true,
feeRate = _uiState.value.feeRate,
updatedAt = nowTimestamp().toEpochMilli().toULong()
updatedAt = nowMillis().toULong(),
)
)

Expand DownExpand Up@@ -412,13 +416,25 @@ class BoostTransactionViewModel @Inject constructor(

/**
* Caches activity data for pending boost operation
* - For RBF: stores parent chain (existing boostTxIds + current txId)
* - For CPFP: stores empty list (child tx is added to parent's boostTxIds during sync)
*/
private suspend fun cachePendingBoostActivity(newTxId: Txid, activityToDelete: String?) {
val currentActivity = activity?.v1
val boostTxIds = if (activityToDelete != null && currentActivity != null) {
// RBF: Track full parent chain (existing boostTxIds + current txId being replaced)
currentActivity.boostTxIds + currentActivity.txId
} else {
// CPFP: No parent tracking needed
emptyList()
}

activityRepo.addActivityToPendingBoost(
PendingBoostActivity(
txId = newTxId,
updatedAt = nowTimestamp().toEpochMilli().toULong(),
activityToDelete = activityToDelete
updatedAt = nowMillis().toULong(),
activityToDelete = activityToDelete,
boostTxIds = boostTxIds,
)
)
}
Expand Down