fix: handle counterparty channel closes - #806

Merged
ovitrif merged 32 commits into
fix/reimport-channel-monitorfrom
fix/channel-close-ui
Mar 3, 2026
Merged

fix: handle counterparty channel closes#806
ovitrif merged 32 commits into
fix/reimport-channel-monitorfrom
fix/channel-close-ui

Conversation

@jvsena42

@jvsena42jvsena42 commented Feb 25, 2026•
edited
Loading

Copy link
Copy Markdown
Member

Closes#802 (comment)

This PR:

  1. Adds counterparty channel close detection and user notification via a "Connection Closed" sheet
  2. Creates transfer records for counterparty-initiated channel closes (force and cooperative)
  3. Improves syncTransferStates to handle batched force-close sweeps correctly

Description

  • Classifies ClosureReason variants to detect counterparty-initiated closes (force close vs cooperative)
  • Creates a transfer when a counterparty closes a channel, looking up the channel balance from lightning balances or closed channel records
  • Shows a "Connection Closed" bottom sheet to inform the user
  • Adds PendingSweepBalance extension functions for extracting channel IDs and spending txids
  • Improves force close settlement logic in syncTransferStates: checks on-chain activity for the channel, falls back to pending sweep status, and handles batched sweeps where LDK links a single transaction to multiple channels
  • Adds helper methods in CoreService.ActivityService for querying on-chain activity by channel or txid
  • Adds unit tests for the new force close sync scenarios

Preview

coop-close.webm
counterparty-coop-close.webm
conterparty-force-close.webm
force-close-settle.webm

The timestamps didn't change because of a bug caused by fast mining 146 blocks DataException: confirm_timestamp must be greater than or equal to timestamp

QA Notes

for counterparty closing use the slack command /regtest-ln-close-channel <fundingTx:vout> [force]

  1. Counterparty force close detection

    • In regtest, open a channel with the LSP
    • Force close the channel from the LSP side
    • Mine 1 block
    • Verify the "Connection Closed" sheet appears
    • Mine 146 blocks
    • Verify a transfer banner appears on the savings screen tracking the sweep

  2. ** Counterparty cooperative close detection**

    • Trigger a cooperative close from the counterparty
    • Verify the transfer is created
    • Verify the spending balance is imediately subtracted

  3. Cooperative close detection

    • Transfer to spending flow
    • Verify the transfer is created
    • Verify the spending balance is imediately subtracted

@jvsena42jvsena42 self-assigned this Feb 25, 2026
@jvsena42
jvsena42 changed the base branch from master to fix/reimport-channel-monitorFebruary 25, 2026 18:29
@jvsena42
jvsena42 marked this pull request as ready for review February 26, 2026 11:32
@pwltr
pwltr self-requested a review February 26, 2026 14:06
@pwltr

pwltr commented Feb 26, 2026

Copy link
Copy Markdown
Contributor

The easier way of triggering a force-close on Blocktank side is simulating #802 bug

Can also use the staging bot /regtest-ln-close-channel <fundingTx:vout> [force]

@pwltr

This comment was marked as resolved.

Sign in to view
pwltr
pwltr requested changes Feb 26, 2026
View reviewed changes
Comment threadapp/src/main/java/to/bitkit/ui/sheets/ConnectionClosedSheet.kt Outdated
@pwltr

This comment was marked as resolved.

Sign in to view
@jvsena42
jvsena42 marked this pull request as draft February 26, 2026 17:44
@jvsena42
jvsena42 marked this pull request as ready for review February 27, 2026 16:34
@jvsena42

jvsena42 commented Feb 27, 2026

Copy link
Copy Markdown
MemberAuthor

E2E

https://github.com/synonymdev/bitkit-android/actions/runs/22494919042

@jvsena42
jvsena42 requested a review from pwltrFebruary 27, 2026 16:39
@jvsena42jvsena42 mentioned this pull request Feb 27, 2026
Merged
pwltr
pwltr approved these changes Mar 2, 2026
View reviewed changes

@pwltrpwltr left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested, LGTM.

I noticed an issue with total balance but saw that was already tracked in #808.

Leaving code review to @ovitrif

ovitrif
ovitrif approved these changes Mar 3, 2026
View reviewed changes

@ovitrifovitrif left a comment •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code changes LGTM, well structured, clean, and nicely tested 👏🏻

None of my review comments warrant changes in this PR.

Going to merge this into parent PR and run one testing round there.

Comment threadapp/src/main/java/to/bitkit/services/CoreService.kt
Comment threadapp/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt
walletRepo.balanceState,
transferRepo.forceCloseRemainingDuration,
) { balanceState, remainingDuration ->
val defaultTitle = context.getString(R.string.lightning__transfer_in_progress)

@ovitrifovitrifMar 3, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: can be lifted out of combine (before it) so it doesn't have to recompute with each collection.

although I think there is close to zero perf impact, the resource values are probably cached/ lazy-loaded.

Comment threadapp/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt
) { balanceState, remainingDuration ->
val defaultTitle = context.getString(R.string.lightning__transfer_in_progress)
val savingsTitle = remainingDuration?.let {
context.getString(R.string.lightning__transfer_ready_in, it)

@ovitrifovitrifMar 3, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noop: nice, maybe we should slowly transition to the builtin parametrization standards, makes our agent's job easier.

Comment threadapp/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
}

private suspend fun createTransferForCounterpartyClose(channelId: String, isForceClose: Boolean) {
val transferType = if (isForceClose) TransferType.FORCE_CLOSE else TransferType.COOP_CLOSE

@ovitrifovitrifMar 3, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could've been the type of the 2nd param in the tuple/pair returned by classifyClosureReason, ie: Pair<Boolean, TransferType>

Comment threadapp/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
}

// TODO Temporary fix while these schemes can't be decoded https://github.com/synonymdev/bitkit-core/issues/70
@Suppress("SpellCheckingInspection")

@ovitrifovitrifMar 3, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: my IDE was highlighting the string value passed to the regex ctors from the replace chain 🥲

@ovitrifovitrif mentioned this pull request Mar 3, 2026
Open
@ovitrif
ovitrif merged commit a401035 into fix/reimport-channel-monitorMar 3, 2026
22 checks passed
@ovitrif
ovitrif deleted the fix/channel-close-ui branch March 3, 2026 13:23
@ovitrifovitrif added this to the 2.1.0 milestone Mar 9, 2026
@claudeclaudeBot mentioned this pull request Mar 9, 2026
Closed
@ovitrifovitrif linked an issue Mar 9, 2026 that may be closed by this pull request
Transfer animation remain visible while channel is open #576
Closed
@ovitrifovitrif mentioned this pull request Jun 24, 2026
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ovitrifovitrifovitrif approved these changes
@pwltrpwltrpwltr approved these changes

Assignees

@jvsena42jvsena42

Labels

None yet

Projects

None yet

Milestone

2.1.0

Development

Successfully merging this pull request may close these issues.

Transfer animation remain visible while channel is open

3 participants

@jvsena42@pwltr@ovitrif
, '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
fix: handle counterparty channel closes - #806
Merged
ovitrif merged 32 commits into
fix/reimport-channel-monitorfrom 
fix/channel-close-ui
Mar 3, 2026
Merged
fix: handle counterparty channel closes#806
ovitrif merged 32 commits into
fix/reimport-channel-monitorfrom 
fix/channel-close-ui
Conversation
@jvsena42
@jvsena42jvsena42
commented
Feb 25, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Closes#802 (comment)
This PR:
  1. Adds counterparty channel close detection and user notification via a "Connection Closed" sheet
  2. Creates transfer records for counterparty-initiated channel closes (force and cooperative)
  3. Improves syncTransferStates to handle batched force-close sweeps correctly
Description
  • Classifies ClosureReason variants to detect counterparty-initiated closes (force close vs cooperative)
  • Creates a transfer when a counterparty closes a channel, looking up the channel balance from lightning balances or closed channel records
  • Shows a "Connection Closed" bottom sheet to inform the user
  • Adds PendingSweepBalance extension functions for extracting channel IDs and spending txids
  • Improves force close settlement logic in syncTransferStates: checks on-chain activity for the channel, falls back to pending sweep status, and handles batched sweeps where LDK links a single transaction to multiple channels
  • Adds helper methods in CoreService.ActivityService for querying on-chain activity by channel or txid
  • Adds unit tests for the new force close sync scenarios
Preview
coop-close.webm
counterparty-coop-close.webm
conterparty-force-close.webm
force-close-settle.webm
The timestamps didn't change because of a bug caused by fast mining 146 blocks  DataException: confirm_timestamp must be greater than or equal to timestamp
QA Notes
for counterparty closing use the slack command /regtest-ln-close-channel <fundingTx:vout> [force] 
  1. Counterparty force close detection
    • In regtest, open a channel with the LSP
    • Force close the channel from the LSP side
    • Mine 1 block
    • Verify the "Connection Closed" sheet appears
    • Mine 146 blocks
    • Verify a transfer banner appears on the savings screen tracking the sweep
  2. ** Counterparty cooperative close detection**
    • Trigger a cooperative close from the counterparty
    • Verify the transfer is created
    • Verify the spending balance is imediately subtracted
  3. Cooperative close detection
    • Transfer to spending flow
    • Verify the transfer is created
    • Verify the spending balance is imediately subtracted
@jvsena42jvsena42
self-assigned this
Feb 25, 2026
@jvsena42
jvsena42
changed the base branch from
master
to
fix/reimport-channel-monitorFebruary 25, 2026 18:29
@jvsena42
jvsena42
marked this pull request as ready for review
February 26, 2026 11:32
@pwltr
pwltr
self-requested a review
February 26, 2026 14:06
@pwltr
pwltr
commented
Feb 26, 2026

Copy link


Copy Markdown

Contributor
The easier way of triggering a force-close on Blocktank side is simulating #802 bug
Can also use the staging bot /regtest-ln-close-channel <fundingTx:vout> [force]
@pwltr

This comment was marked as resolved.

Sign in to view
pwltr
pwltr
requested changes
Feb 26, 2026
View reviewed changes
Comment threadapp/src/main/java/to/bitkit/ui/sheets/ConnectionClosedSheet.kt
Outdated

@pwltr

This comment was marked as resolved.

Sign in to view
@jvsena42
jvsena42
marked this pull request as draft
February 26, 2026 17:44
@jvsena42
jvsena42
marked this pull request as ready for review
February 27, 2026 16:34
@jvsena42
jvsena42
commented
Feb 27, 2026

Copy link


Copy Markdown

MemberAuthor
E2E
https://github.com/synonymdev/bitkit-android/actions/runs/22494919042
@jvsena42
jvsena42
requested a review
from pwltrFebruary 27, 2026 16:39
@jvsena42jvsena42
mentioned this pull request
Feb 27, 2026
 Merged

pwltr
pwltr
approved these changes
Mar 2, 2026
View reviewed changes
@pwltrpwltr
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested, LGTM.
I noticed an issue with total balance but saw that was already tracked in #808.
Leaving code review to @ovitrif
ovitrif
ovitrif
approved these changes
Mar 3, 2026
View reviewed changes
@ovitrifovitrif
left a comment
•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code changes LGTM, well structured, clean, and nicely tested 👏🏻
None of my review comments warrant changes in this PR.
Going to merge this into parent PR and run one testing round there.
Comment threadapp/src/main/java/to/bitkit/services/CoreService.kt
Comment threadapp/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt
 walletRepo.balanceState,
 transferRepo.forceCloseRemainingDuration,
 ) { balanceState, remainingDuration ->
 val defaultTitle = context.getString(R.string.lightning__transfer_in_progress)
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: can be lifted out of combine (before it) so it doesn't have to recompute with each collection.
although I think there is close to zero perf impact, the resource values are probably cached/ lazy-loaded.
Comment threadapp/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt
 ) { balanceState, remainingDuration ->
 val defaultTitle = context.getString(R.string.lightning__transfer_in_progress)
 val savingsTitle = remainingDuration?.let {
 context.getString(R.string.lightning__transfer_ready_in, it)
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noop: nice, maybe we should slowly transition to the builtin parametrization standards, makes our agent's job easier.
Comment threadapp/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
 }

 private suspend fun createTransferForCounterpartyClose(channelId: String, isForceClose: Boolean) {
 val transferType = if (isForceClose) TransferType.FORCE_CLOSE else TransferType.COOP_CLOSE
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could've been the type of the 2nd param in the tuple/pair returned by classifyClosureReason, ie: Pair<Boolean, TransferType>
Comment threadapp/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
 }

 // TODO Temporary fix while these schemes can't be decoded https://github.com/synonymdev/bitkit-core/issues/70
 @Suppress("SpellCheckingInspection")
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: my IDE was highlighting the string value passed to the regex ctors from the replace chain 🥲
@ovitrifovitrif
mentioned this pull request
Mar 3, 2026

Open

@ovitrif
ovitrif
merged commit a401035
into
fix/reimport-channel-monitorMar 3, 2026

22 checks passed

@ovitrif
ovitrif
deleted the

fix/channel-close-ui

branch
March 3, 2026 13:23
@ovitrifovitrif
added this to the 2.1.0 milestone
Mar 9, 2026
@claudeclaudeBot
mentioned this pull request
Mar 9, 2026

Closed

@ovitrifovitrif
linked an issue
Mar 9, 2026
that may be
closed
by this pull request


Transfer animation remain visible while channel is open
#576

Closed

@ovitrifovitrif
mentioned this pull request
Jun 24, 2026

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ovitrifovitrifovitrif approved these changes
@pwltrpwltrpwltr approved these changes

Assignees

@jvsena42jvsena42

Labels


None yet


Projects


None yet


Milestone

2.1.0

Development

Successfully merging this pull request may close these issues.

Transfer animation remain visible while channel is open


3 participants

@jvsena42@pwltr@ovitrif

, '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
fix: handle counterparty channel closes - #806
Merged
ovitrif merged 32 commits into
fix/reimport-channel-monitorfrom 
fix/channel-close-ui
Mar 3, 2026
Merged
fix: handle counterparty channel closes#806
ovitrif merged 32 commits into
fix/reimport-channel-monitorfrom 
fix/channel-close-ui
Conversation
@jvsena42
@jvsena42jvsena42
commented
Feb 25, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Closes#802 (comment)
This PR:
  1. Adds counterparty channel close detection and user notification via a "Connection Closed" sheet
  2. Creates transfer records for counterparty-initiated channel closes (force and cooperative)
  3. Improves syncTransferStates to handle batched force-close sweeps correctly
Description
  • Classifies ClosureReason variants to detect counterparty-initiated closes (force close vs cooperative)
  • Creates a transfer when a counterparty closes a channel, looking up the channel balance from lightning balances or closed channel records
  • Shows a "Connection Closed" bottom sheet to inform the user
  • Adds PendingSweepBalance extension functions for extracting channel IDs and spending txids
  • Improves force close settlement logic in syncTransferStates: checks on-chain activity for the channel, falls back to pending sweep status, and handles batched sweeps where LDK links a single transaction to multiple channels
  • Adds helper methods in CoreService.ActivityService for querying on-chain activity by channel or txid
  • Adds unit tests for the new force close sync scenarios
Preview
coop-close.webm
counterparty-coop-close.webm
conterparty-force-close.webm
force-close-settle.webm
The timestamps didn't change because of a bug caused by fast mining 146 blocks  DataException: confirm_timestamp must be greater than or equal to timestamp
QA Notes
for counterparty closing use the slack command /regtest-ln-close-channel <fundingTx:vout> [force] 
  1. Counterparty force close detection
    • In regtest, open a channel with the LSP
    • Force close the channel from the LSP side
    • Mine 1 block
    • Verify the "Connection Closed" sheet appears
    • Mine 146 blocks
    • Verify a transfer banner appears on the savings screen tracking the sweep
  2. ** Counterparty cooperative close detection**
    • Trigger a cooperative close from the counterparty
    • Verify the transfer is created
    • Verify the spending balance is imediately subtracted
  3. Cooperative close detection
    • Transfer to spending flow
    • Verify the transfer is created
    • Verify the spending balance is imediately subtracted
@jvsena42jvsena42
self-assigned this
Feb 25, 2026
@jvsena42
jvsena42
changed the base branch from
master
to
fix/reimport-channel-monitorFebruary 25, 2026 18:29
@jvsena42
jvsena42
marked this pull request as ready for review
February 26, 2026 11:32
@pwltr
pwltr
self-requested a review
February 26, 2026 14:06
@pwltr
pwltr
commented
Feb 26, 2026

Copy link


Copy Markdown

Contributor
The easier way of triggering a force-close on Blocktank side is simulating #802 bug
Can also use the staging bot /regtest-ln-close-channel <fundingTx:vout> [force]
@pwltr

This comment was marked as resolved.

Sign in to view
pwltr
pwltr
requested changes
Feb 26, 2026
View reviewed changes
Comment threadapp/src/main/java/to/bitkit/ui/sheets/ConnectionClosedSheet.kt
Outdated

@pwltr

This comment was marked as resolved.

Sign in to view
@jvsena42
jvsena42
marked this pull request as draft
February 26, 2026 17:44
@jvsena42
jvsena42
marked this pull request as ready for review
February 27, 2026 16:34
@jvsena42
jvsena42
commented
Feb 27, 2026

Copy link


Copy Markdown

MemberAuthor
E2E
https://github.com/synonymdev/bitkit-android/actions/runs/22494919042
@jvsena42
jvsena42
requested a review
from pwltrFebruary 27, 2026 16:39
@jvsena42jvsena42
mentioned this pull request
Feb 27, 2026
 Merged

pwltr
pwltr
approved these changes
Mar 2, 2026
View reviewed changes
@pwltrpwltr
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested, LGTM.
I noticed an issue with total balance but saw that was already tracked in #808.
Leaving code review to @ovitrif
ovitrif
ovitrif
approved these changes
Mar 3, 2026
View reviewed changes
@ovitrifovitrif
left a comment
•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code changes LGTM, well structured, clean, and nicely tested 👏🏻
None of my review comments warrant changes in this PR.
Going to merge this into parent PR and run one testing round there.
Comment threadapp/src/main/java/to/bitkit/services/CoreService.kt
Comment threadapp/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt
 walletRepo.balanceState,
 transferRepo.forceCloseRemainingDuration,
 ) { balanceState, remainingDuration ->
 val defaultTitle = context.getString(R.string.lightning__transfer_in_progress)
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: can be lifted out of combine (before it) so it doesn't have to recompute with each collection.
although I think there is close to zero perf impact, the resource values are probably cached/ lazy-loaded.
Comment threadapp/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt
 ) { balanceState, remainingDuration ->
 val defaultTitle = context.getString(R.string.lightning__transfer_in_progress)
 val savingsTitle = remainingDuration?.let {
 context.getString(R.string.lightning__transfer_ready_in, it)
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noop: nice, maybe we should slowly transition to the builtin parametrization standards, makes our agent's job easier.
Comment threadapp/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
 }

 private suspend fun createTransferForCounterpartyClose(channelId: String, isForceClose: Boolean) {
 val transferType = if (isForceClose) TransferType.FORCE_CLOSE else TransferType.COOP_CLOSE
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could've been the type of the 2nd param in the tuple/pair returned by classifyClosureReason, ie: Pair<Boolean, TransferType>
Comment threadapp/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
 }

 // TODO Temporary fix while these schemes can't be decoded https://github.com/synonymdev/bitkit-core/issues/70
 @Suppress("SpellCheckingInspection")
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: my IDE was highlighting the string value passed to the regex ctors from the replace chain 🥲
@ovitrifovitrif
mentioned this pull request
Mar 3, 2026

Open

@ovitrif
ovitrif
merged commit a401035
into
fix/reimport-channel-monitorMar 3, 2026

22 checks passed

@ovitrif
ovitrif
deleted the

fix/channel-close-ui

branch
March 3, 2026 13:23
@ovitrifovitrif
added this to the 2.1.0 milestone
Mar 9, 2026
@claudeclaudeBot
mentioned this pull request
Mar 9, 2026

Closed

@ovitrifovitrif
linked an issue
Mar 9, 2026
that may be
closed
by this pull request


Transfer animation remain visible while channel is open
#576

Closed

@ovitrifovitrif
mentioned this pull request
Jun 24, 2026

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ovitrifovitrifovitrif approved these changes
@pwltrpwltrpwltr approved these changes

Assignees

@jvsena42jvsena42

Labels


None yet


Projects


None yet


Milestone

2.1.0

Development

Successfully merging this pull request may close these issues.

Transfer animation remain visible while channel is open


3 participants

@jvsena42@pwltr@ovitrif

, '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
fix: handle counterparty channel closes - #806
Merged
ovitrif merged 32 commits into
fix/reimport-channel-monitorfrom 
fix/channel-close-ui
Mar 3, 2026
Merged
fix: handle counterparty channel closes#806
ovitrif merged 32 commits into
fix/reimport-channel-monitorfrom 
fix/channel-close-ui
Conversation
@jvsena42
@jvsena42jvsena42
commented
Feb 25, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Closes#802 (comment)
This PR:
  1. Adds counterparty channel close detection and user notification via a "Connection Closed" sheet
  2. Creates transfer records for counterparty-initiated channel closes (force and cooperative)
  3. Improves syncTransferStates to handle batched force-close sweeps correctly
Description
  • Classifies ClosureReason variants to detect counterparty-initiated closes (force close vs cooperative)
  • Creates a transfer when a counterparty closes a channel, looking up the channel balance from lightning balances or closed channel records
  • Shows a "Connection Closed" bottom sheet to inform the user
  • Adds PendingSweepBalance extension functions for extracting channel IDs and spending txids
  • Improves force close settlement logic in syncTransferStates: checks on-chain activity for the channel, falls back to pending sweep status, and handles batched sweeps where LDK links a single transaction to multiple channels
  • Adds helper methods in CoreService.ActivityService for querying on-chain activity by channel or txid
  • Adds unit tests for the new force close sync scenarios
Preview
coop-close.webm
counterparty-coop-close.webm
conterparty-force-close.webm
force-close-settle.webm
The timestamps didn't change because of a bug caused by fast mining 146 blocks  DataException: confirm_timestamp must be greater than or equal to timestamp
QA Notes
for counterparty closing use the slack command /regtest-ln-close-channel <fundingTx:vout> [force] 
  1. Counterparty force close detection
    • In regtest, open a channel with the LSP
    • Force close the channel from the LSP side
    • Mine 1 block
    • Verify the "Connection Closed" sheet appears
    • Mine 146 blocks
    • Verify a transfer banner appears on the savings screen tracking the sweep
  2. ** Counterparty cooperative close detection**
    • Trigger a cooperative close from the counterparty
    • Verify the transfer is created
    • Verify the spending balance is imediately subtracted
  3. Cooperative close detection
    • Transfer to spending flow
    • Verify the transfer is created
    • Verify the spending balance is imediately subtracted
@jvsena42jvsena42
self-assigned this
Feb 25, 2026
@jvsena42
jvsena42
changed the base branch from
master
to
fix/reimport-channel-monitorFebruary 25, 2026 18:29
@jvsena42
jvsena42
marked this pull request as ready for review
February 26, 2026 11:32
@pwltr
pwltr
self-requested a review
February 26, 2026 14:06
@pwltr
pwltr
commented
Feb 26, 2026

Copy link


Copy Markdown

Contributor
The easier way of triggering a force-close on Blocktank side is simulating #802 bug
Can also use the staging bot /regtest-ln-close-channel <fundingTx:vout> [force]
@pwltr

This comment was marked as resolved.

Sign in to view
pwltr
pwltr
requested changes
Feb 26, 2026
View reviewed changes
Comment threadapp/src/main/java/to/bitkit/ui/sheets/ConnectionClosedSheet.kt
Outdated

@pwltr

This comment was marked as resolved.

Sign in to view
@jvsena42
jvsena42
marked this pull request as draft
February 26, 2026 17:44
@jvsena42
jvsena42
marked this pull request as ready for review
February 27, 2026 16:34
@jvsena42
jvsena42
commented
Feb 27, 2026

Copy link


Copy Markdown

MemberAuthor
E2E
https://github.com/synonymdev/bitkit-android/actions/runs/22494919042
@jvsena42
jvsena42
requested a review
from pwltrFebruary 27, 2026 16:39
@jvsena42jvsena42
mentioned this pull request
Feb 27, 2026
 Merged

pwltr
pwltr
approved these changes
Mar 2, 2026
View reviewed changes
@pwltrpwltr
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested, LGTM.
I noticed an issue with total balance but saw that was already tracked in #808.
Leaving code review to @ovitrif
ovitrif
ovitrif
approved these changes
Mar 3, 2026
View reviewed changes
@ovitrifovitrif
left a comment
•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code changes LGTM, well structured, clean, and nicely tested 👏🏻
None of my review comments warrant changes in this PR.
Going to merge this into parent PR and run one testing round there.
Comment threadapp/src/main/java/to/bitkit/services/CoreService.kt
Comment threadapp/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt
 walletRepo.balanceState,
 transferRepo.forceCloseRemainingDuration,
 ) { balanceState, remainingDuration ->
 val defaultTitle = context.getString(R.string.lightning__transfer_in_progress)
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: can be lifted out of combine (before it) so it doesn't have to recompute with each collection.
although I think there is close to zero perf impact, the resource values are probably cached/ lazy-loaded.
Comment threadapp/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt
 ) { balanceState, remainingDuration ->
 val defaultTitle = context.getString(R.string.lightning__transfer_in_progress)
 val savingsTitle = remainingDuration?.let {
 context.getString(R.string.lightning__transfer_ready_in, it)
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noop: nice, maybe we should slowly transition to the builtin parametrization standards, makes our agent's job easier.
Comment threadapp/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
 }

 private suspend fun createTransferForCounterpartyClose(channelId: String, isForceClose: Boolean) {
 val transferType = if (isForceClose) TransferType.FORCE_CLOSE else TransferType.COOP_CLOSE
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could've been the type of the 2nd param in the tuple/pair returned by classifyClosureReason, ie: Pair<Boolean, TransferType>
Comment threadapp/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
 }

 // TODO Temporary fix while these schemes can't be decoded https://github.com/synonymdev/bitkit-core/issues/70
 @Suppress("SpellCheckingInspection")
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: my IDE was highlighting the string value passed to the regex ctors from the replace chain 🥲
@ovitrifovitrif
mentioned this pull request
Mar 3, 2026

Open

@ovitrif
ovitrif
merged commit a401035
into
fix/reimport-channel-monitorMar 3, 2026

22 checks passed

@ovitrif
ovitrif
deleted the

fix/channel-close-ui

branch
March 3, 2026 13:23
@ovitrifovitrif
added this to the 2.1.0 milestone
Mar 9, 2026
@claudeclaudeBot
mentioned this pull request
Mar 9, 2026

Closed

@ovitrifovitrif
linked an issue
Mar 9, 2026
that may be
closed
by this pull request


Transfer animation remain visible while channel is open
#576

Closed

@ovitrifovitrif
mentioned this pull request
Jun 24, 2026

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ovitrifovitrifovitrif approved these changes
@pwltrpwltrpwltr approved these changes

Assignees

@jvsena42jvsena42

Labels


None yet


Projects


None yet


Milestone

2.1.0

Development

Successfully merging this pull request may close these issues.

Transfer animation remain visible while channel is open


3 participants

@jvsena42@pwltr@ovitrif

, '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
fix: handle counterparty channel closes - #806
Merged
ovitrif merged 32 commits into
fix/reimport-channel-monitorfrom 
fix/channel-close-ui
Mar 3, 2026
Merged
fix: handle counterparty channel closes#806
ovitrif merged 32 commits into
fix/reimport-channel-monitorfrom 
fix/channel-close-ui
Conversation
@jvsena42
@jvsena42jvsena42
commented
Feb 25, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Closes#802 (comment)
This PR:
  1. Adds counterparty channel close detection and user notification via a "Connection Closed" sheet
  2. Creates transfer records for counterparty-initiated channel closes (force and cooperative)
  3. Improves syncTransferStates to handle batched force-close sweeps correctly
Description
  • Classifies ClosureReason variants to detect counterparty-initiated closes (force close vs cooperative)
  • Creates a transfer when a counterparty closes a channel, looking up the channel balance from lightning balances or closed channel records
  • Shows a "Connection Closed" bottom sheet to inform the user
  • Adds PendingSweepBalance extension functions for extracting channel IDs and spending txids
  • Improves force close settlement logic in syncTransferStates: checks on-chain activity for the channel, falls back to pending sweep status, and handles batched sweeps where LDK links a single transaction to multiple channels
  • Adds helper methods in CoreService.ActivityService for querying on-chain activity by channel or txid
  • Adds unit tests for the new force close sync scenarios
Preview
coop-close.webm
counterparty-coop-close.webm
conterparty-force-close.webm
force-close-settle.webm
The timestamps didn't change because of a bug caused by fast mining 146 blocks  DataException: confirm_timestamp must be greater than or equal to timestamp
QA Notes
for counterparty closing use the slack command /regtest-ln-close-channel <fundingTx:vout> [force] 
  1. Counterparty force close detection
    • In regtest, open a channel with the LSP
    • Force close the channel from the LSP side
    • Mine 1 block
    • Verify the "Connection Closed" sheet appears
    • Mine 146 blocks
    • Verify a transfer banner appears on the savings screen tracking the sweep
  2. ** Counterparty cooperative close detection**
    • Trigger a cooperative close from the counterparty
    • Verify the transfer is created
    • Verify the spending balance is imediately subtracted
  3. Cooperative close detection
    • Transfer to spending flow
    • Verify the transfer is created
    • Verify the spending balance is imediately subtracted
@jvsena42jvsena42
self-assigned this
Feb 25, 2026
@jvsena42
jvsena42
changed the base branch from
master
to
fix/reimport-channel-monitorFebruary 25, 2026 18:29
@jvsena42
jvsena42
marked this pull request as ready for review
February 26, 2026 11:32
@pwltr
pwltr
self-requested a review
February 26, 2026 14:06
@pwltr
pwltr
commented
Feb 26, 2026

Copy link


Copy Markdown

Contributor
The easier way of triggering a force-close on Blocktank side is simulating #802 bug
Can also use the staging bot /regtest-ln-close-channel <fundingTx:vout> [force]
@pwltr

This comment was marked as resolved.

Sign in to view
pwltr
pwltr
requested changes
Feb 26, 2026
View reviewed changes
Comment threadapp/src/main/java/to/bitkit/ui/sheets/ConnectionClosedSheet.kt
Outdated

@pwltr

This comment was marked as resolved.

Sign in to view
@jvsena42
jvsena42
marked this pull request as draft
February 26, 2026 17:44
@jvsena42
jvsena42
marked this pull request as ready for review
February 27, 2026 16:34
@jvsena42
jvsena42
commented
Feb 27, 2026

Copy link


Copy Markdown

MemberAuthor
E2E
https://github.com/synonymdev/bitkit-android/actions/runs/22494919042
@jvsena42
jvsena42
requested a review
from pwltrFebruary 27, 2026 16:39
@jvsena42jvsena42
mentioned this pull request
Feb 27, 2026
 Merged

pwltr
pwltr
approved these changes
Mar 2, 2026
View reviewed changes
@pwltrpwltr
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested, LGTM.
I noticed an issue with total balance but saw that was already tracked in #808.
Leaving code review to @ovitrif
ovitrif
ovitrif
approved these changes
Mar 3, 2026
View reviewed changes
@ovitrifovitrif
left a comment
•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code changes LGTM, well structured, clean, and nicely tested 👏🏻
None of my review comments warrant changes in this PR.
Going to merge this into parent PR and run one testing round there.
Comment threadapp/src/main/java/to/bitkit/services/CoreService.kt
Comment threadapp/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt
 walletRepo.balanceState,
 transferRepo.forceCloseRemainingDuration,
 ) { balanceState, remainingDuration ->
 val defaultTitle = context.getString(R.string.lightning__transfer_in_progress)
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: can be lifted out of combine (before it) so it doesn't have to recompute with each collection.
although I think there is close to zero perf impact, the resource values are probably cached/ lazy-loaded.
Comment threadapp/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt
 ) { balanceState, remainingDuration ->
 val defaultTitle = context.getString(R.string.lightning__transfer_in_progress)
 val savingsTitle = remainingDuration?.let {
 context.getString(R.string.lightning__transfer_ready_in, it)
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noop: nice, maybe we should slowly transition to the builtin parametrization standards, makes our agent's job easier.
Comment threadapp/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
 }

 private suspend fun createTransferForCounterpartyClose(channelId: String, isForceClose: Boolean) {
 val transferType = if (isForceClose) TransferType.FORCE_CLOSE else TransferType.COOP_CLOSE
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could've been the type of the 2nd param in the tuple/pair returned by classifyClosureReason, ie: Pair<Boolean, TransferType>
Comment threadapp/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
 }

 // TODO Temporary fix while these schemes can't be decoded https://github.com/synonymdev/bitkit-core/issues/70
 @Suppress("SpellCheckingInspection")
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: my IDE was highlighting the string value passed to the regex ctors from the replace chain 🥲
@ovitrifovitrif
mentioned this pull request
Mar 3, 2026

Open

@ovitrif
ovitrif
merged commit a401035
into
fix/reimport-channel-monitorMar 3, 2026

22 checks passed

@ovitrif
ovitrif
deleted the

fix/channel-close-ui

branch
March 3, 2026 13:23
@ovitrifovitrif
added this to the 2.1.0 milestone
Mar 9, 2026
@claudeclaudeBot
mentioned this pull request
Mar 9, 2026

Closed

@ovitrifovitrif
linked an issue
Mar 9, 2026
that may be
closed
by this pull request


Transfer animation remain visible while channel is open
#576

Closed

@ovitrifovitrif
mentioned this pull request
Jun 24, 2026

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ovitrifovitrifovitrif approved these changes
@pwltrpwltrpwltr approved these changes

Assignees

@jvsena42jvsena42

Labels


None yet


Projects


None yet


Milestone

2.1.0

Development

Successfully merging this pull request may close these issues.

Transfer animation remain visible while channel is open


3 participants

@jvsena42@pwltr@ovitrif

, '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
fix: handle counterparty channel closes - #806
Merged
ovitrif merged 32 commits into
fix/reimport-channel-monitorfrom 
fix/channel-close-ui
Mar 3, 2026
Merged
fix: handle counterparty channel closes#806
ovitrif merged 32 commits into
fix/reimport-channel-monitorfrom 
fix/channel-close-ui
Conversation
@jvsena42
@jvsena42jvsena42
commented
Feb 25, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Closes#802 (comment)
This PR:
  1. Adds counterparty channel close detection and user notification via a "Connection Closed" sheet
  2. Creates transfer records for counterparty-initiated channel closes (force and cooperative)
  3. Improves syncTransferStates to handle batched force-close sweeps correctly
Description
  • Classifies ClosureReason variants to detect counterparty-initiated closes (force close vs cooperative)
  • Creates a transfer when a counterparty closes a channel, looking up the channel balance from lightning balances or closed channel records
  • Shows a "Connection Closed" bottom sheet to inform the user
  • Adds PendingSweepBalance extension functions for extracting channel IDs and spending txids
  • Improves force close settlement logic in syncTransferStates: checks on-chain activity for the channel, falls back to pending sweep status, and handles batched sweeps where LDK links a single transaction to multiple channels
  • Adds helper methods in CoreService.ActivityService for querying on-chain activity by channel or txid
  • Adds unit tests for the new force close sync scenarios
Preview
coop-close.webm
counterparty-coop-close.webm
conterparty-force-close.webm
force-close-settle.webm
The timestamps didn't change because of a bug caused by fast mining 146 blocks  DataException: confirm_timestamp must be greater than or equal to timestamp
QA Notes
for counterparty closing use the slack command /regtest-ln-close-channel <fundingTx:vout> [force] 
  1. Counterparty force close detection
    • In regtest, open a channel with the LSP
    • Force close the channel from the LSP side
    • Mine 1 block
    • Verify the "Connection Closed" sheet appears
    • Mine 146 blocks
    • Verify a transfer banner appears on the savings screen tracking the sweep
  2. ** Counterparty cooperative close detection**
    • Trigger a cooperative close from the counterparty
    • Verify the transfer is created
    • Verify the spending balance is imediately subtracted
  3. Cooperative close detection
    • Transfer to spending flow
    • Verify the transfer is created
    • Verify the spending balance is imediately subtracted
@jvsena42jvsena42
self-assigned this
Feb 25, 2026
@jvsena42
jvsena42
changed the base branch from
master
to
fix/reimport-channel-monitorFebruary 25, 2026 18:29
@jvsena42
jvsena42
marked this pull request as ready for review
February 26, 2026 11:32
@pwltr
pwltr
self-requested a review
February 26, 2026 14:06
@pwltr
pwltr
commented
Feb 26, 2026

Copy link


Copy Markdown

Contributor
The easier way of triggering a force-close on Blocktank side is simulating #802 bug
Can also use the staging bot /regtest-ln-close-channel <fundingTx:vout> [force]
@pwltr

This comment was marked as resolved.

Sign in to view
pwltr
pwltr
requested changes
Feb 26, 2026
View reviewed changes
Comment threadapp/src/main/java/to/bitkit/ui/sheets/ConnectionClosedSheet.kt
Outdated

@pwltr

This comment was marked as resolved.

Sign in to view
@jvsena42
jvsena42
marked this pull request as draft
February 26, 2026 17:44
@jvsena42
jvsena42
marked this pull request as ready for review
February 27, 2026 16:34
@jvsena42
jvsena42
commented
Feb 27, 2026

Copy link


Copy Markdown

MemberAuthor
E2E
https://github.com/synonymdev/bitkit-android/actions/runs/22494919042
@jvsena42
jvsena42
requested a review
from pwltrFebruary 27, 2026 16:39
@jvsena42jvsena42
mentioned this pull request
Feb 27, 2026
 Merged

pwltr
pwltr
approved these changes
Mar 2, 2026
View reviewed changes
@pwltrpwltr
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested, LGTM.
I noticed an issue with total balance but saw that was already tracked in #808.
Leaving code review to @ovitrif
ovitrif
ovitrif
approved these changes
Mar 3, 2026
View reviewed changes
@ovitrifovitrif
left a comment
•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code changes LGTM, well structured, clean, and nicely tested 👏🏻
None of my review comments warrant changes in this PR.
Going to merge this into parent PR and run one testing round there.
Comment threadapp/src/main/java/to/bitkit/services/CoreService.kt
Comment threadapp/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt
 walletRepo.balanceState,
 transferRepo.forceCloseRemainingDuration,
 ) { balanceState, remainingDuration ->
 val defaultTitle = context.getString(R.string.lightning__transfer_in_progress)
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: can be lifted out of combine (before it) so it doesn't have to recompute with each collection.
although I think there is close to zero perf impact, the resource values are probably cached/ lazy-loaded.
Comment threadapp/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt
 ) { balanceState, remainingDuration ->
 val defaultTitle = context.getString(R.string.lightning__transfer_in_progress)
 val savingsTitle = remainingDuration?.let {
 context.getString(R.string.lightning__transfer_ready_in, it)
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noop: nice, maybe we should slowly transition to the builtin parametrization standards, makes our agent's job easier.
Comment threadapp/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
 }

 private suspend fun createTransferForCounterpartyClose(channelId: String, isForceClose: Boolean) {
 val transferType = if (isForceClose) TransferType.FORCE_CLOSE else TransferType.COOP_CLOSE
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could've been the type of the 2nd param in the tuple/pair returned by classifyClosureReason, ie: Pair<Boolean, TransferType>
Comment threadapp/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
 }

 // TODO Temporary fix while these schemes can't be decoded https://github.com/synonymdev/bitkit-core/issues/70
 @Suppress("SpellCheckingInspection")
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: my IDE was highlighting the string value passed to the regex ctors from the replace chain 🥲
@ovitrifovitrif
mentioned this pull request
Mar 3, 2026

Open

@ovitrif
ovitrif
merged commit a401035
into
fix/reimport-channel-monitorMar 3, 2026

22 checks passed

@ovitrif
ovitrif
deleted the

fix/channel-close-ui

branch
March 3, 2026 13:23
@ovitrifovitrif
added this to the 2.1.0 milestone
Mar 9, 2026
@claudeclaudeBot
mentioned this pull request
Mar 9, 2026

Closed

@ovitrifovitrif
linked an issue
Mar 9, 2026
that may be
closed
by this pull request


Transfer animation remain visible while channel is open
#576

Closed

@ovitrifovitrif
mentioned this pull request
Jun 24, 2026

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ovitrifovitrifovitrif approved these changes
@pwltrpwltrpwltr approved these changes

Assignees

@jvsena42jvsena42

Labels


None yet


Projects


None yet


Milestone

2.1.0

Development

Successfully merging this pull request may close these issues.

Transfer animation remain visible while channel is open


3 participants

@jvsena42@pwltr@ovitrif

, '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
fix: handle counterparty channel closes - #806
Merged
ovitrif merged 32 commits into
fix/reimport-channel-monitorfrom 
fix/channel-close-ui
Mar 3, 2026
Merged
fix: handle counterparty channel closes#806
ovitrif merged 32 commits into
fix/reimport-channel-monitorfrom 
fix/channel-close-ui
Conversation
@jvsena42
@jvsena42jvsena42
commented
Feb 25, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Closes#802 (comment)
This PR:
  1. Adds counterparty channel close detection and user notification via a "Connection Closed" sheet
  2. Creates transfer records for counterparty-initiated channel closes (force and cooperative)
  3. Improves syncTransferStates to handle batched force-close sweeps correctly
Description
  • Classifies ClosureReason variants to detect counterparty-initiated closes (force close vs cooperative)
  • Creates a transfer when a counterparty closes a channel, looking up the channel balance from lightning balances or closed channel records
  • Shows a "Connection Closed" bottom sheet to inform the user
  • Adds PendingSweepBalance extension functions for extracting channel IDs and spending txids
  • Improves force close settlement logic in syncTransferStates: checks on-chain activity for the channel, falls back to pending sweep status, and handles batched sweeps where LDK links a single transaction to multiple channels
  • Adds helper methods in CoreService.ActivityService for querying on-chain activity by channel or txid
  • Adds unit tests for the new force close sync scenarios
Preview
coop-close.webm
counterparty-coop-close.webm
conterparty-force-close.webm
force-close-settle.webm
The timestamps didn't change because of a bug caused by fast mining 146 blocks  DataException: confirm_timestamp must be greater than or equal to timestamp
QA Notes
for counterparty closing use the slack command /regtest-ln-close-channel <fundingTx:vout> [force] 
  1. Counterparty force close detection
    • In regtest, open a channel with the LSP
    • Force close the channel from the LSP side
    • Mine 1 block
    • Verify the "Connection Closed" sheet appears
    • Mine 146 blocks
    • Verify a transfer banner appears on the savings screen tracking the sweep
  2. ** Counterparty cooperative close detection**
    • Trigger a cooperative close from the counterparty
    • Verify the transfer is created
    • Verify the spending balance is imediately subtracted
  3. Cooperative close detection
    • Transfer to spending flow
    • Verify the transfer is created
    • Verify the spending balance is imediately subtracted
@jvsena42jvsena42
self-assigned this
Feb 25, 2026
@jvsena42
jvsena42
changed the base branch from
master
to
fix/reimport-channel-monitorFebruary 25, 2026 18:29
@jvsena42
jvsena42
marked this pull request as ready for review
February 26, 2026 11:32
@pwltr
pwltr
self-requested a review
February 26, 2026 14:06
@pwltr
pwltr
commented
Feb 26, 2026

Copy link


Copy Markdown

Contributor
The easier way of triggering a force-close on Blocktank side is simulating #802 bug
Can also use the staging bot /regtest-ln-close-channel <fundingTx:vout> [force]
@pwltr

This comment was marked as resolved.

Sign in to view
pwltr
pwltr
requested changes
Feb 26, 2026
View reviewed changes
Comment threadapp/src/main/java/to/bitkit/ui/sheets/ConnectionClosedSheet.kt
Outdated

@pwltr

This comment was marked as resolved.

Sign in to view
@jvsena42
jvsena42
marked this pull request as draft
February 26, 2026 17:44
@jvsena42
jvsena42
marked this pull request as ready for review
February 27, 2026 16:34
@jvsena42
jvsena42
commented
Feb 27, 2026

Copy link


Copy Markdown

MemberAuthor
E2E
https://github.com/synonymdev/bitkit-android/actions/runs/22494919042
@jvsena42
jvsena42
requested a review
from pwltrFebruary 27, 2026 16:39
@jvsena42jvsena42
mentioned this pull request
Feb 27, 2026
 Merged

pwltr
pwltr
approved these changes
Mar 2, 2026
View reviewed changes
@pwltrpwltr
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested, LGTM.
I noticed an issue with total balance but saw that was already tracked in #808.
Leaving code review to @ovitrif
ovitrif
ovitrif
approved these changes
Mar 3, 2026
View reviewed changes
@ovitrifovitrif
left a comment
•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code changes LGTM, well structured, clean, and nicely tested 👏🏻
None of my review comments warrant changes in this PR.
Going to merge this into parent PR and run one testing round there.
Comment threadapp/src/main/java/to/bitkit/services/CoreService.kt
Comment threadapp/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt
 walletRepo.balanceState,
 transferRepo.forceCloseRemainingDuration,
 ) { balanceState, remainingDuration ->
 val defaultTitle = context.getString(R.string.lightning__transfer_in_progress)
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: can be lifted out of combine (before it) so it doesn't have to recompute with each collection.
although I think there is close to zero perf impact, the resource values are probably cached/ lazy-loaded.
Comment threadapp/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt
 ) { balanceState, remainingDuration ->
 val defaultTitle = context.getString(R.string.lightning__transfer_in_progress)
 val savingsTitle = remainingDuration?.let {
 context.getString(R.string.lightning__transfer_ready_in, it)
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noop: nice, maybe we should slowly transition to the builtin parametrization standards, makes our agent's job easier.
Comment threadapp/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
 }

 private suspend fun createTransferForCounterpartyClose(channelId: String, isForceClose: Boolean) {
 val transferType = if (isForceClose) TransferType.FORCE_CLOSE else TransferType.COOP_CLOSE
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could've been the type of the 2nd param in the tuple/pair returned by classifyClosureReason, ie: Pair<Boolean, TransferType>
Comment threadapp/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
 }

 // TODO Temporary fix while these schemes can't be decoded https://github.com/synonymdev/bitkit-core/issues/70
 @Suppress("SpellCheckingInspection")
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: my IDE was highlighting the string value passed to the regex ctors from the replace chain 🥲
@ovitrifovitrif
mentioned this pull request
Mar 3, 2026

Open

@ovitrif
ovitrif
merged commit a401035
into
fix/reimport-channel-monitorMar 3, 2026

22 checks passed

@ovitrif
ovitrif
deleted the

fix/channel-close-ui

branch
March 3, 2026 13:23
@ovitrifovitrif
added this to the 2.1.0 milestone
Mar 9, 2026
@claudeclaudeBot
mentioned this pull request
Mar 9, 2026

Closed

@ovitrifovitrif
linked an issue
Mar 9, 2026
that may be
closed
by this pull request


Transfer animation remain visible while channel is open
#576

Closed

@ovitrifovitrif
mentioned this pull request
Jun 24, 2026

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ovitrifovitrifovitrif approved these changes
@pwltrpwltrpwltr approved these changes

Assignees

@jvsena42jvsena42

Labels


None yet


Projects


None yet


Milestone

2.1.0

Development

Successfully merging this pull request may close these issues.

Transfer animation remain visible while channel is open


3 participants

@jvsena42@pwltr@ovitrif

, '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
fix: handle counterparty channel closes - #806
Merged
ovitrif merged 32 commits into
fix/reimport-channel-monitorfrom 
fix/channel-close-ui
Mar 3, 2026
Merged
fix: handle counterparty channel closes#806
ovitrif merged 32 commits into
fix/reimport-channel-monitorfrom 
fix/channel-close-ui
Conversation
@jvsena42
@jvsena42jvsena42
commented
Feb 25, 2026•

edited

Loading

Copy link


Copy Markdown

Member
Closes#802 (comment)
This PR:
  1. Adds counterparty channel close detection and user notification via a "Connection Closed" sheet
  2. Creates transfer records for counterparty-initiated channel closes (force and cooperative)
  3. Improves syncTransferStates to handle batched force-close sweeps correctly
Description
  • Classifies ClosureReason variants to detect counterparty-initiated closes (force close vs cooperative)
  • Creates a transfer when a counterparty closes a channel, looking up the channel balance from lightning balances or closed channel records
  • Shows a "Connection Closed" bottom sheet to inform the user
  • Adds PendingSweepBalance extension functions for extracting channel IDs and spending txids
  • Improves force close settlement logic in syncTransferStates: checks on-chain activity for the channel, falls back to pending sweep status, and handles batched sweeps where LDK links a single transaction to multiple channels
  • Adds helper methods in CoreService.ActivityService for querying on-chain activity by channel or txid
  • Adds unit tests for the new force close sync scenarios
Preview
coop-close.webm
counterparty-coop-close.webm
conterparty-force-close.webm
force-close-settle.webm
The timestamps didn't change because of a bug caused by fast mining 146 blocks  DataException: confirm_timestamp must be greater than or equal to timestamp
QA Notes
for counterparty closing use the slack command /regtest-ln-close-channel <fundingTx:vout> [force] 
  1. Counterparty force close detection
    • In regtest, open a channel with the LSP
    • Force close the channel from the LSP side
    • Mine 1 block
    • Verify the "Connection Closed" sheet appears
    • Mine 146 blocks
    • Verify a transfer banner appears on the savings screen tracking the sweep
  2. ** Counterparty cooperative close detection**
    • Trigger a cooperative close from the counterparty
    • Verify the transfer is created
    • Verify the spending balance is imediately subtracted
  3. Cooperative close detection
    • Transfer to spending flow
    • Verify the transfer is created
    • Verify the spending balance is imediately subtracted
@jvsena42jvsena42
self-assigned this
Feb 25, 2026
@jvsena42
jvsena42
changed the base branch from
master
to
fix/reimport-channel-monitorFebruary 25, 2026 18:29
@jvsena42
jvsena42
marked this pull request as ready for review
February 26, 2026 11:32
@pwltr
pwltr
self-requested a review
February 26, 2026 14:06
@pwltr
pwltr
commented
Feb 26, 2026

Copy link


Copy Markdown

Contributor
The easier way of triggering a force-close on Blocktank side is simulating #802 bug
Can also use the staging bot /regtest-ln-close-channel <fundingTx:vout> [force]
@pwltr

This comment was marked as resolved.

Sign in to view
pwltr
pwltr
requested changes
Feb 26, 2026
View reviewed changes
Comment threadapp/src/main/java/to/bitkit/ui/sheets/ConnectionClosedSheet.kt
Outdated

@pwltr

This comment was marked as resolved.

Sign in to view
@jvsena42
jvsena42
marked this pull request as draft
February 26, 2026 17:44
@jvsena42
jvsena42
marked this pull request as ready for review
February 27, 2026 16:34
@jvsena42
jvsena42
commented
Feb 27, 2026

Copy link


Copy Markdown

MemberAuthor
E2E
https://github.com/synonymdev/bitkit-android/actions/runs/22494919042
@jvsena42
jvsena42
requested a review
from pwltrFebruary 27, 2026 16:39
@jvsena42jvsena42
mentioned this pull request
Feb 27, 2026
 Merged

pwltr
pwltr
approved these changes
Mar 2, 2026
View reviewed changes
@pwltrpwltr
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested, LGTM.
I noticed an issue with total balance but saw that was already tracked in #808.
Leaving code review to @ovitrif
ovitrif
ovitrif
approved these changes
Mar 3, 2026
View reviewed changes
@ovitrifovitrif
left a comment
•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code changes LGTM, well structured, clean, and nicely tested 👏🏻
None of my review comments warrant changes in this PR.
Going to merge this into parent PR and run one testing round there.
Comment threadapp/src/main/java/to/bitkit/services/CoreService.kt
Comment threadapp/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt
 walletRepo.balanceState,
 transferRepo.forceCloseRemainingDuration,
 ) { balanceState, remainingDuration ->
 val defaultTitle = context.getString(R.string.lightning__transfer_in_progress)
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: can be lifted out of combine (before it) so it doesn't have to recompute with each collection.
although I think there is close to zero perf impact, the resource values are probably cached/ lazy-loaded.
Comment threadapp/src/main/java/to/bitkit/ui/screens/wallets/HomeViewModel.kt
 ) { balanceState, remainingDuration ->
 val defaultTitle = context.getString(R.string.lightning__transfer_in_progress)
 val savingsTitle = remainingDuration?.let {
 context.getString(R.string.lightning__transfer_ready_in, it)
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noop: nice, maybe we should slowly transition to the builtin parametrization standards, makes our agent's job easier.
Comment threadapp/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
 }

 private suspend fun createTransferForCounterpartyClose(channelId: String, isForceClose: Boolean) {
 val transferType = if (isForceClose) TransferType.FORCE_CLOSE else TransferType.COOP_CLOSE
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: could've been the type of the 2nd param in the tuple/pair returned by classifyClosureReason, ie: Pair<Boolean, TransferType>
Comment threadapp/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
 }

 // TODO Temporary fix while these schemes can't be decoded https://github.com/synonymdev/bitkit-core/issues/70
 @Suppress("SpellCheckingInspection")
@ovitrifovitrifMar 3, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: my IDE was highlighting the string value passed to the regex ctors from the replace chain 🥲
@ovitrifovitrif
mentioned this pull request
Mar 3, 2026

Open

@ovitrif
ovitrif
merged commit a401035
into
fix/reimport-channel-monitorMar 3, 2026

22 checks passed

@ovitrif
ovitrif
deleted the

fix/channel-close-ui

branch
March 3, 2026 13:23
@ovitrifovitrif
added this to the 2.1.0 milestone
Mar 9, 2026
@claudeclaudeBot
mentioned this pull request
Mar 9, 2026

Closed

@ovitrifovitrif
linked an issue
Mar 9, 2026
that may be
closed
by this pull request


Transfer animation remain visible while channel is open
#576

Closed

@ovitrifovitrif
mentioned this pull request
Jun 24, 2026

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ovitrifovitrifovitrif approved these changes
@pwltrpwltrpwltr approved these changes

Assignees

@jvsena42jvsena42

Labels


None yet


Projects


None yet


Milestone

2.1.0

Development

Successfully merging this pull request may close these issues.

Transfer animation remain visible while channel is open


3 participants

@jvsena42@pwltr@ovitrif