fix: channel detail black screen and nav issues#690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ovitrif wants to merge 2 commits into from
Closed

fix: channel detail black screen and nav issues #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
929fa54
fix: resolve channel detail black screen and navigation issues
github-actions[bot] Jan 20, 2026
691ca22
chore: add compose preview for channel loading
ovitrif Jan 22, 2026
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
4 changes: 3 additions & 1 deletion app/src/main/java/to/bitkit/ui/ContentView.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,9 +1204,11 @@ private fun NavGraphBuilder.lightningConnections(
composableWithDefaultTransitions<Routes.ChannelDetail> {
val parentEntry = remember(it) { navController.getBackStackEntry(Routes.ConnectionsNav) }
val viewModel = hiltViewModel<LightningConnectionsViewModel>(parentEntry)
val route = it.toRoute<Routes.ChannelDetail>()
ChannelDetailScreen(
navController = navController,
viewModel = viewModel,
channelId = route.channelId,
)
}
composableWithDefaultTransitions<Routes.CloseConnection> {
Expand DownExpand Up@@ -1836,7 +1838,7 @@ sealed interface Routes {
data object LightningConnections : Routes

@Serializable
data object ChannelDetail : Routes
data class ChannelDetail(val channelId: String) : Routes

@Serializable
data object CloseConnection : Routes
Expand Down
90 changes: 61 additions & 29 deletions app/src/main/java/to/bitkit/ui/settings/lightning/ChannelDetailScreen.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.pulltorefresh.PullToRefreshBox
Expand DownExpand Up@@ -85,19 +86,32 @@ import java.util.Locale
fun ChannelDetailScreen(
navController: NavController,
viewModel: LightningConnectionsViewModel,
channelId: String,
) {
val context = LocalContext.current
val app = appViewModel ?: return
val wallet = walletViewModel ?: return

LaunchedEffect(channelId) {
viewModel.findAndSelectChannel(channelId)
}

val selectedChannel by viewModel.selectedChannel.collectAsStateWithLifecycle()
val channel = selectedChannel ?: return
val channel = selectedChannel

val uiState by viewModel.uiState.collectAsStateWithLifecycle()
val paidOrders by viewModel.blocktankRepo.blocktankState.collectAsStateWithLifecycle()
val lightningState by wallet.lightningState.collectAsStateWithLifecycle()

if (channel == null) {
Content(
channel = null,
onBack = { navController.popBackStack() },
)
return
}

val isClosedChannel = uiState.closedChannels.any { it.details.channelId == channel.details.channelId }
val lightningState by wallet.lightningState.collectAsStateWithLifecycle()

// Fetch transaction details for funding transaction if available
LaunchedEffect(channel.details.fundingTxo?.txid) {
Expand All@@ -108,8 +122,8 @@ fun ChannelDetailScreen(

// Fetch activity timestamp for transfer activity with matching channel ID
LaunchedEffect(channel.details.channelId) {
channel.details.channelId?.let { channelId ->
viewModel.fetchActivityTimestamp(channelId)
channel.details.channelId.let { id ->
viewModel.fetchActivityTimestamp(id)
}
}

Expand DownExpand Up@@ -148,7 +162,7 @@ fun ChannelDetailScreen(
@Suppress("CyclomaticComplexMethod")
@Composable
private fun Content(
channel: ChannelUi,
channel: ChannelUi?,
blocktankOrders: List<IBtOrder> = emptyList(),
cjitEntries: List<IcJitEntry> = emptyList(),
txTime: ULong? = null,
Expand All@@ -161,36 +175,46 @@ private fun Content(
onSupport: (Any) -> Unit = {},
onCloseConnection: () -> Unit = {},
) {
// Check if the channel was opened via CJIT
val cjitEntry = cjitEntries.find { entry ->
entry.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
}

// Check if the channel was opened via blocktank order
val blocktankOrder = blocktankOrders.find { order ->
// real channel
if (channel.details.fundingTxo?.txid != null) {
order.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
} else {
// fake channel
order.id == channel.details.channelId
}
}

val order = blocktankOrder ?: cjitEntry

val capacity = channel.details.channelValueSats.toLong()
val localBalance = channel.details.amountOnClose.toLong()
val remoteBalance = (channel.details.inboundCapacityMsat / 1000u).toLong()
val reserveBalance = (channel.details.unspendablePunishmentReserve ?: 0u).toLong()

ScreenColumn {
AppTopBar(
titleText = channel.name,
titleText = channel?.name ?: "",
onBackClick = onBack,
actions = { DrawerNavIcon() },
)

if (channel == null) {
Box(
contentAlignment = Alignment.Center,
modifier = Modifier.fillMaxSize(),
) {
CircularProgressIndicator()
}
return@ScreenColumn
}

// Check if the channel was opened via CJIT
val cjitEntry = cjitEntries.find { entry ->
entry.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
}

// Check if the channel was opened via blocktank order
val blocktankOrder = blocktankOrders.find { order ->
// real channel
if (channel.details.fundingTxo?.txid != null) {
order.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
} else {
// fake channel
order.id == channel.details.channelId
}
}

val order = blocktankOrder ?: cjitEntry

val capacity = channel.details.channelValueSats.toLong()
val localBalance = channel.details.amountOnClose.toLong()
val remoteBalance = (channel.details.inboundCapacityMsat / 1000u).toLong()
val reserveBalance = (channel.details.unspendablePunishmentReserve ?: 0u).toLong()

PullToRefreshBox(
isRefreshing = isRefreshing,
onRefresh = onRefresh,
Expand DownExpand Up@@ -628,6 +652,14 @@ private fun createSupportEmailIntent(
return Intent(Intent.ACTION_SENDTO, uri)
}

@Preview
@Composable
private fun PreviewLoadingState() {
AppThemeSurface {
Content(channel = null)
}
}

@Preview
@Composable
private fun PreviewOpenChannel() {
Expand Down
16 changes: 5 additions & 11 deletions app/src/main/java/to/bitkit/ui/settings/lightning/LightningConnectionsScreen.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,18 +88,13 @@ fun LightningConnectionsScreen(
viewModel.refreshObservedState()
viewModel.clearSelectedChannel()
viewModel.clearTransactionDetails()
}

LaunchedEffect(navController.currentBackStackEntry) {
val selectedChannelId = navController.previousBackStackEntry?.savedStateHandle?.get<String>("selectedChannelId")
if (selectedChannelId == null) return@LaunchedEffect

navController.previousBackStackEntry?.savedStateHandle?.remove<String>("selectedChannelId")
delay(CHANNEL_SELECTION_DELAY_MS)
if (viewModel.findAndSelectChannel(selectedChannelId)) {
navController.navigate(Routes.ChannelDetail) {
if (selectedChannelId != null) {
navController.previousBackStackEntry?.savedStateHandle?.remove<String>("selectedChannelId")
delay(CHANNEL_SELECTION_DELAY_MS)
navController.navigate(Routes.ChannelDetail(selectedChannelId)) {
launchSingleTop = true
popUpTo(Routes.ConnectionsNav) { inclusive = false }
}
}
}
Expand All@@ -112,8 +107,7 @@ fun LightningConnectionsScreen(
viewModel.zipLogsForSharing { uri -> context.shareZipFile(uri) }
},
onClickChannel = { channelUi ->
viewModel.setSelectedChannel(channelUi)
navController.navigate(Routes.ChannelDetail)
navController.navigate(Routes.ChannelDetail(channelUi.details.channelId))
},
onRefresh = {
viewModel.onPullToRefresh()
Expand Down
Loading
, '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: channel detail black screen and nav issues#690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

ovitrif
wants to merge
2
commits into

from

 Closed


fix: channel detail black screen and nav issues
#690
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
929fa54

fix: resolve channel detail black screen and navigation issues


github-actions[bot] Jan 20, 2026
691ca22

chore: add compose preview for channel loading


ovitrif Jan 22, 2026

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


4 changes: 3 additions & 1 deletion
app/src/main/java/to/bitkit/ui/ContentView.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,9 +1204,11 @@ private fun NavGraphBuilder.lightningConnections(
 composableWithDefaultTransitions<Routes.ChannelDetail> {
 val parentEntry = remember(it) { navController.getBackStackEntry(Routes.ConnectionsNav) }
 val viewModel = hiltViewModel<LightningConnectionsViewModel>(parentEntry)
 val route = it.toRoute<Routes.ChannelDetail>()
 ChannelDetailScreen(
 navController = navController,
 viewModel = viewModel,
 channelId = route.channelId,
 )
 }
 composableWithDefaultTransitions<Routes.CloseConnection> {
Expand DownExpand Up@@ -1836,7 +1838,7 @@ sealed interface Routes {
 data object LightningConnections : Routes

 @Serializable
 data object ChannelDetail : Routes
 data class ChannelDetail(val channelId: String) : Routes

 @Serializable
 data object CloseConnection : Routes
Expand Down

90 changes: 61 additions & 29 deletions
app/src/main/java/to/bitkit/ui/settings/lightning/ChannelDetailScreen.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.pulltorefresh.PullToRefreshBox
Expand DownExpand Up@@ -85,19 +86,32 @@ import java.util.Locale
fun ChannelDetailScreen(
 navController: NavController,
 viewModel: LightningConnectionsViewModel,
 channelId: String,
) {
 val context = LocalContext.current
 val app = appViewModel ?: return
 val wallet = walletViewModel ?: return

 LaunchedEffect(channelId) {
 viewModel.findAndSelectChannel(channelId)
 }

 val selectedChannel by viewModel.selectedChannel.collectAsStateWithLifecycle()
 val channel = selectedChannel ?: return
 val channel = selectedChannel

 val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 val paidOrders by viewModel.blocktankRepo.blocktankState.collectAsStateWithLifecycle()
 val lightningState by wallet.lightningState.collectAsStateWithLifecycle()

 if (channel == null) {
 Content(
 channel = null,
 onBack = { navController.popBackStack() },
 )
 return
 }

 val isClosedChannel = uiState.closedChannels.any { it.details.channelId == channel.details.channelId }
 val lightningState by wallet.lightningState.collectAsStateWithLifecycle()

 // Fetch transaction details for funding transaction if available
 LaunchedEffect(channel.details.fundingTxo?.txid) {
Expand All@@ -108,8 +122,8 @@ fun ChannelDetailScreen(

 // Fetch activity timestamp for transfer activity with matching channel ID
 LaunchedEffect(channel.details.channelId) {
 channel.details.channelId?.let { channelId ->
 viewModel.fetchActivityTimestamp(channelId)
 channel.details.channelId.let { id ->
 viewModel.fetchActivityTimestamp(id)
 }
 }

Expand DownExpand Up@@ -148,7 +162,7 @@ fun ChannelDetailScreen(
@Suppress("CyclomaticComplexMethod")
@Composable
private fun Content(
 channel: ChannelUi,
 channel: ChannelUi?,
 blocktankOrders: List<IBtOrder> = emptyList(),
 cjitEntries: List<IcJitEntry> = emptyList(),
 txTime: ULong? = null,
Expand All@@ -161,36 +175,46 @@ private fun Content(
 onSupport: (Any) -> Unit = {},
 onCloseConnection: () -> Unit = {},
) {
 // Check if the channel was opened via CJIT
 val cjitEntry = cjitEntries.find { entry ->
 entry.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 }

 // Check if the channel was opened via blocktank order
 val blocktankOrder = blocktankOrders.find { order ->
 // real channel
 if (channel.details.fundingTxo?.txid != null) {
 order.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 } else {
 // fake channel
 order.id == channel.details.channelId
 }
 }

 val order = blocktankOrder ?: cjitEntry

 val capacity = channel.details.channelValueSats.toLong()
 val localBalance = channel.details.amountOnClose.toLong()
 val remoteBalance = (channel.details.inboundCapacityMsat / 1000u).toLong()
 val reserveBalance = (channel.details.unspendablePunishmentReserve ?: 0u).toLong()

 ScreenColumn {
 AppTopBar(
 titleText = channel.name,
 titleText = channel?.name ?: "",
 onBackClick = onBack,
 actions = { DrawerNavIcon() },
 )

 if (channel == null) {
 Box(
 contentAlignment = Alignment.Center,
 modifier = Modifier.fillMaxSize(),
 ) {
 CircularProgressIndicator()
 }
 return@ScreenColumn
 }

 // Check if the channel was opened via CJIT
 val cjitEntry = cjitEntries.find { entry ->
 entry.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 }

 // Check if the channel was opened via blocktank order
 val blocktankOrder = blocktankOrders.find { order ->
 // real channel
 if (channel.details.fundingTxo?.txid != null) {
 order.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 } else {
 // fake channel
 order.id == channel.details.channelId
 }
 }

 val order = blocktankOrder ?: cjitEntry

 val capacity = channel.details.channelValueSats.toLong()
 val localBalance = channel.details.amountOnClose.toLong()
 val remoteBalance = (channel.details.inboundCapacityMsat / 1000u).toLong()
 val reserveBalance = (channel.details.unspendablePunishmentReserve ?: 0u).toLong()

 PullToRefreshBox(
 isRefreshing = isRefreshing,
 onRefresh = onRefresh,
Expand DownExpand Up@@ -628,6 +652,14 @@ private fun createSupportEmailIntent(
 return Intent(Intent.ACTION_SENDTO, uri)
}

@Preview
@Composable
private fun PreviewLoadingState() {
 AppThemeSurface {
 Content(channel = null)
 }
}

@Preview
@Composable
private fun PreviewOpenChannel() {
Expand Down

16 changes: 5 additions & 11 deletions
app/src/main/java/to/bitkit/ui/settings/lightning/LightningConnectionsScreen.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,18 +88,13 @@ fun LightningConnectionsScreen(
 viewModel.refreshObservedState()
 viewModel.clearSelectedChannel()
 viewModel.clearTransactionDetails()
 }

 LaunchedEffect(navController.currentBackStackEntry) {
 val selectedChannelId = navController.previousBackStackEntry?.savedStateHandle?.get<String>("selectedChannelId")
 if (selectedChannelId == null) return@LaunchedEffect

 navController.previousBackStackEntry?.savedStateHandle?.remove<String>("selectedChannelId")
 delay(CHANNEL_SELECTION_DELAY_MS)
 if (viewModel.findAndSelectChannel(selectedChannelId)) {
 navController.navigate(Routes.ChannelDetail) {
 if (selectedChannelId != null) {
 navController.previousBackStackEntry?.savedStateHandle?.remove<String>("selectedChannelId")
 delay(CHANNEL_SELECTION_DELAY_MS)
 navController.navigate(Routes.ChannelDetail(selectedChannelId)) {
 launchSingleTop = true
 popUpTo(Routes.ConnectionsNav) { inclusive = false }
 }
 }
 }
Expand All@@ -112,8 +107,7 @@ fun LightningConnectionsScreen(
 viewModel.zipLogsForSharing { uri -> context.shareZipFile(uri) }
 },
 onClickChannel = { channelUi ->
 viewModel.setSelectedChannel(channelUi)
 navController.navigate(Routes.ChannelDetail)
 navController.navigate(Routes.ChannelDetail(channelUi.details.channelId))
 },
 onRefresh = {
 viewModel.onPullToRefresh()
Expand Down
Loading

, '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: channel detail black screen and nav issues#690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

ovitrif
wants to merge
2
commits into

from

 Closed


fix: channel detail black screen and nav issues
#690
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
929fa54

fix: resolve channel detail black screen and navigation issues


github-actions[bot] Jan 20, 2026
691ca22

chore: add compose preview for channel loading


ovitrif Jan 22, 2026

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


4 changes: 3 additions & 1 deletion
app/src/main/java/to/bitkit/ui/ContentView.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,9 +1204,11 @@ private fun NavGraphBuilder.lightningConnections(
 composableWithDefaultTransitions<Routes.ChannelDetail> {
 val parentEntry = remember(it) { navController.getBackStackEntry(Routes.ConnectionsNav) }
 val viewModel = hiltViewModel<LightningConnectionsViewModel>(parentEntry)
 val route = it.toRoute<Routes.ChannelDetail>()
 ChannelDetailScreen(
 navController = navController,
 viewModel = viewModel,
 channelId = route.channelId,
 )
 }
 composableWithDefaultTransitions<Routes.CloseConnection> {
Expand DownExpand Up@@ -1836,7 +1838,7 @@ sealed interface Routes {
 data object LightningConnections : Routes

 @Serializable
 data object ChannelDetail : Routes
 data class ChannelDetail(val channelId: String) : Routes

 @Serializable
 data object CloseConnection : Routes
Expand Down

90 changes: 61 additions & 29 deletions
app/src/main/java/to/bitkit/ui/settings/lightning/ChannelDetailScreen.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.pulltorefresh.PullToRefreshBox
Expand DownExpand Up@@ -85,19 +86,32 @@ import java.util.Locale
fun ChannelDetailScreen(
 navController: NavController,
 viewModel: LightningConnectionsViewModel,
 channelId: String,
) {
 val context = LocalContext.current
 val app = appViewModel ?: return
 val wallet = walletViewModel ?: return

 LaunchedEffect(channelId) {
 viewModel.findAndSelectChannel(channelId)
 }

 val selectedChannel by viewModel.selectedChannel.collectAsStateWithLifecycle()
 val channel = selectedChannel ?: return
 val channel = selectedChannel

 val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 val paidOrders by viewModel.blocktankRepo.blocktankState.collectAsStateWithLifecycle()
 val lightningState by wallet.lightningState.collectAsStateWithLifecycle()

 if (channel == null) {
 Content(
 channel = null,
 onBack = { navController.popBackStack() },
 )
 return
 }

 val isClosedChannel = uiState.closedChannels.any { it.details.channelId == channel.details.channelId }
 val lightningState by wallet.lightningState.collectAsStateWithLifecycle()

 // Fetch transaction details for funding transaction if available
 LaunchedEffect(channel.details.fundingTxo?.txid) {
Expand All@@ -108,8 +122,8 @@ fun ChannelDetailScreen(

 // Fetch activity timestamp for transfer activity with matching channel ID
 LaunchedEffect(channel.details.channelId) {
 channel.details.channelId?.let { channelId ->
 viewModel.fetchActivityTimestamp(channelId)
 channel.details.channelId.let { id ->
 viewModel.fetchActivityTimestamp(id)
 }
 }

Expand DownExpand Up@@ -148,7 +162,7 @@ fun ChannelDetailScreen(
@Suppress("CyclomaticComplexMethod")
@Composable
private fun Content(
 channel: ChannelUi,
 channel: ChannelUi?,
 blocktankOrders: List<IBtOrder> = emptyList(),
 cjitEntries: List<IcJitEntry> = emptyList(),
 txTime: ULong? = null,
Expand All@@ -161,36 +175,46 @@ private fun Content(
 onSupport: (Any) -> Unit = {},
 onCloseConnection: () -> Unit = {},
) {
 // Check if the channel was opened via CJIT
 val cjitEntry = cjitEntries.find { entry ->
 entry.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 }

 // Check if the channel was opened via blocktank order
 val blocktankOrder = blocktankOrders.find { order ->
 // real channel
 if (channel.details.fundingTxo?.txid != null) {
 order.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 } else {
 // fake channel
 order.id == channel.details.channelId
 }
 }

 val order = blocktankOrder ?: cjitEntry

 val capacity = channel.details.channelValueSats.toLong()
 val localBalance = channel.details.amountOnClose.toLong()
 val remoteBalance = (channel.details.inboundCapacityMsat / 1000u).toLong()
 val reserveBalance = (channel.details.unspendablePunishmentReserve ?: 0u).toLong()

 ScreenColumn {
 AppTopBar(
 titleText = channel.name,
 titleText = channel?.name ?: "",
 onBackClick = onBack,
 actions = { DrawerNavIcon() },
 )

 if (channel == null) {
 Box(
 contentAlignment = Alignment.Center,
 modifier = Modifier.fillMaxSize(),
 ) {
 CircularProgressIndicator()
 }
 return@ScreenColumn
 }

 // Check if the channel was opened via CJIT
 val cjitEntry = cjitEntries.find { entry ->
 entry.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 }

 // Check if the channel was opened via blocktank order
 val blocktankOrder = blocktankOrders.find { order ->
 // real channel
 if (channel.details.fundingTxo?.txid != null) {
 order.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 } else {
 // fake channel
 order.id == channel.details.channelId
 }
 }

 val order = blocktankOrder ?: cjitEntry

 val capacity = channel.details.channelValueSats.toLong()
 val localBalance = channel.details.amountOnClose.toLong()
 val remoteBalance = (channel.details.inboundCapacityMsat / 1000u).toLong()
 val reserveBalance = (channel.details.unspendablePunishmentReserve ?: 0u).toLong()

 PullToRefreshBox(
 isRefreshing = isRefreshing,
 onRefresh = onRefresh,
Expand DownExpand Up@@ -628,6 +652,14 @@ private fun createSupportEmailIntent(
 return Intent(Intent.ACTION_SENDTO, uri)
}

@Preview
@Composable
private fun PreviewLoadingState() {
 AppThemeSurface {
 Content(channel = null)
 }
}

@Preview
@Composable
private fun PreviewOpenChannel() {
Expand Down

16 changes: 5 additions & 11 deletions
app/src/main/java/to/bitkit/ui/settings/lightning/LightningConnectionsScreen.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,18 +88,13 @@ fun LightningConnectionsScreen(
 viewModel.refreshObservedState()
 viewModel.clearSelectedChannel()
 viewModel.clearTransactionDetails()
 }

 LaunchedEffect(navController.currentBackStackEntry) {
 val selectedChannelId = navController.previousBackStackEntry?.savedStateHandle?.get<String>("selectedChannelId")
 if (selectedChannelId == null) return@LaunchedEffect

 navController.previousBackStackEntry?.savedStateHandle?.remove<String>("selectedChannelId")
 delay(CHANNEL_SELECTION_DELAY_MS)
 if (viewModel.findAndSelectChannel(selectedChannelId)) {
 navController.navigate(Routes.ChannelDetail) {
 if (selectedChannelId != null) {
 navController.previousBackStackEntry?.savedStateHandle?.remove<String>("selectedChannelId")
 delay(CHANNEL_SELECTION_DELAY_MS)
 navController.navigate(Routes.ChannelDetail(selectedChannelId)) {
 launchSingleTop = true
 popUpTo(Routes.ConnectionsNav) { inclusive = false }
 }
 }
 }
Expand All@@ -112,8 +107,7 @@ fun LightningConnectionsScreen(
 viewModel.zipLogsForSharing { uri -> context.shareZipFile(uri) }
 },
 onClickChannel = { channelUi ->
 viewModel.setSelectedChannel(channelUi)
 navController.navigate(Routes.ChannelDetail)
 navController.navigate(Routes.ChannelDetail(channelUi.details.channelId))
 },
 onRefresh = {
 viewModel.onPullToRefresh()
Expand Down
Loading

, '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: channel detail black screen and nav issues#690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

ovitrif
wants to merge
2
commits into

from

 Closed


fix: channel detail black screen and nav issues
#690
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
929fa54

fix: resolve channel detail black screen and navigation issues


github-actions[bot] Jan 20, 2026
691ca22

chore: add compose preview for channel loading


ovitrif Jan 22, 2026

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


4 changes: 3 additions & 1 deletion
app/src/main/java/to/bitkit/ui/ContentView.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,9 +1204,11 @@ private fun NavGraphBuilder.lightningConnections(
 composableWithDefaultTransitions<Routes.ChannelDetail> {
 val parentEntry = remember(it) { navController.getBackStackEntry(Routes.ConnectionsNav) }
 val viewModel = hiltViewModel<LightningConnectionsViewModel>(parentEntry)
 val route = it.toRoute<Routes.ChannelDetail>()
 ChannelDetailScreen(
 navController = navController,
 viewModel = viewModel,
 channelId = route.channelId,
 )
 }
 composableWithDefaultTransitions<Routes.CloseConnection> {
Expand DownExpand Up@@ -1836,7 +1838,7 @@ sealed interface Routes {
 data object LightningConnections : Routes

 @Serializable
 data object ChannelDetail : Routes
 data class ChannelDetail(val channelId: String) : Routes

 @Serializable
 data object CloseConnection : Routes
Expand Down

90 changes: 61 additions & 29 deletions
app/src/main/java/to/bitkit/ui/settings/lightning/ChannelDetailScreen.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.pulltorefresh.PullToRefreshBox
Expand DownExpand Up@@ -85,19 +86,32 @@ import java.util.Locale
fun ChannelDetailScreen(
 navController: NavController,
 viewModel: LightningConnectionsViewModel,
 channelId: String,
) {
 val context = LocalContext.current
 val app = appViewModel ?: return
 val wallet = walletViewModel ?: return

 LaunchedEffect(channelId) {
 viewModel.findAndSelectChannel(channelId)
 }

 val selectedChannel by viewModel.selectedChannel.collectAsStateWithLifecycle()
 val channel = selectedChannel ?: return
 val channel = selectedChannel

 val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 val paidOrders by viewModel.blocktankRepo.blocktankState.collectAsStateWithLifecycle()
 val lightningState by wallet.lightningState.collectAsStateWithLifecycle()

 if (channel == null) {
 Content(
 channel = null,
 onBack = { navController.popBackStack() },
 )
 return
 }

 val isClosedChannel = uiState.closedChannels.any { it.details.channelId == channel.details.channelId }
 val lightningState by wallet.lightningState.collectAsStateWithLifecycle()

 // Fetch transaction details for funding transaction if available
 LaunchedEffect(channel.details.fundingTxo?.txid) {
Expand All@@ -108,8 +122,8 @@ fun ChannelDetailScreen(

 // Fetch activity timestamp for transfer activity with matching channel ID
 LaunchedEffect(channel.details.channelId) {
 channel.details.channelId?.let { channelId ->
 viewModel.fetchActivityTimestamp(channelId)
 channel.details.channelId.let { id ->
 viewModel.fetchActivityTimestamp(id)
 }
 }

Expand DownExpand Up@@ -148,7 +162,7 @@ fun ChannelDetailScreen(
@Suppress("CyclomaticComplexMethod")
@Composable
private fun Content(
 channel: ChannelUi,
 channel: ChannelUi?,
 blocktankOrders: List<IBtOrder> = emptyList(),
 cjitEntries: List<IcJitEntry> = emptyList(),
 txTime: ULong? = null,
Expand All@@ -161,36 +175,46 @@ private fun Content(
 onSupport: (Any) -> Unit = {},
 onCloseConnection: () -> Unit = {},
) {
 // Check if the channel was opened via CJIT
 val cjitEntry = cjitEntries.find { entry ->
 entry.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 }

 // Check if the channel was opened via blocktank order
 val blocktankOrder = blocktankOrders.find { order ->
 // real channel
 if (channel.details.fundingTxo?.txid != null) {
 order.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 } else {
 // fake channel
 order.id == channel.details.channelId
 }
 }

 val order = blocktankOrder ?: cjitEntry

 val capacity = channel.details.channelValueSats.toLong()
 val localBalance = channel.details.amountOnClose.toLong()
 val remoteBalance = (channel.details.inboundCapacityMsat / 1000u).toLong()
 val reserveBalance = (channel.details.unspendablePunishmentReserve ?: 0u).toLong()

 ScreenColumn {
 AppTopBar(
 titleText = channel.name,
 titleText = channel?.name ?: "",
 onBackClick = onBack,
 actions = { DrawerNavIcon() },
 )

 if (channel == null) {
 Box(
 contentAlignment = Alignment.Center,
 modifier = Modifier.fillMaxSize(),
 ) {
 CircularProgressIndicator()
 }
 return@ScreenColumn
 }

 // Check if the channel was opened via CJIT
 val cjitEntry = cjitEntries.find { entry ->
 entry.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 }

 // Check if the channel was opened via blocktank order
 val blocktankOrder = blocktankOrders.find { order ->
 // real channel
 if (channel.details.fundingTxo?.txid != null) {
 order.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 } else {
 // fake channel
 order.id == channel.details.channelId
 }
 }

 val order = blocktankOrder ?: cjitEntry

 val capacity = channel.details.channelValueSats.toLong()
 val localBalance = channel.details.amountOnClose.toLong()
 val remoteBalance = (channel.details.inboundCapacityMsat / 1000u).toLong()
 val reserveBalance = (channel.details.unspendablePunishmentReserve ?: 0u).toLong()

 PullToRefreshBox(
 isRefreshing = isRefreshing,
 onRefresh = onRefresh,
Expand DownExpand Up@@ -628,6 +652,14 @@ private fun createSupportEmailIntent(
 return Intent(Intent.ACTION_SENDTO, uri)
}

@Preview
@Composable
private fun PreviewLoadingState() {
 AppThemeSurface {
 Content(channel = null)
 }
}

@Preview
@Composable
private fun PreviewOpenChannel() {
Expand Down

16 changes: 5 additions & 11 deletions
app/src/main/java/to/bitkit/ui/settings/lightning/LightningConnectionsScreen.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,18 +88,13 @@ fun LightningConnectionsScreen(
 viewModel.refreshObservedState()
 viewModel.clearSelectedChannel()
 viewModel.clearTransactionDetails()
 }

 LaunchedEffect(navController.currentBackStackEntry) {
 val selectedChannelId = navController.previousBackStackEntry?.savedStateHandle?.get<String>("selectedChannelId")
 if (selectedChannelId == null) return@LaunchedEffect

 navController.previousBackStackEntry?.savedStateHandle?.remove<String>("selectedChannelId")
 delay(CHANNEL_SELECTION_DELAY_MS)
 if (viewModel.findAndSelectChannel(selectedChannelId)) {
 navController.navigate(Routes.ChannelDetail) {
 if (selectedChannelId != null) {
 navController.previousBackStackEntry?.savedStateHandle?.remove<String>("selectedChannelId")
 delay(CHANNEL_SELECTION_DELAY_MS)
 navController.navigate(Routes.ChannelDetail(selectedChannelId)) {
 launchSingleTop = true
 popUpTo(Routes.ConnectionsNav) { inclusive = false }
 }
 }
 }
Expand All@@ -112,8 +107,7 @@ fun LightningConnectionsScreen(
 viewModel.zipLogsForSharing { uri -> context.shareZipFile(uri) }
 },
 onClickChannel = { channelUi ->
 viewModel.setSelectedChannel(channelUi)
 navController.navigate(Routes.ChannelDetail)
 navController.navigate(Routes.ChannelDetail(channelUi.details.channelId))
 },
 onRefresh = {
 viewModel.onPullToRefresh()
Expand Down
Loading

, '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: channel detail black screen and nav issues#690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

ovitrif
wants to merge
2
commits into

from

 Closed


fix: channel detail black screen and nav issues
#690
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
929fa54

fix: resolve channel detail black screen and navigation issues


github-actions[bot] Jan 20, 2026
691ca22

chore: add compose preview for channel loading


ovitrif Jan 22, 2026

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


4 changes: 3 additions & 1 deletion
app/src/main/java/to/bitkit/ui/ContentView.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,9 +1204,11 @@ private fun NavGraphBuilder.lightningConnections(
 composableWithDefaultTransitions<Routes.ChannelDetail> {
 val parentEntry = remember(it) { navController.getBackStackEntry(Routes.ConnectionsNav) }
 val viewModel = hiltViewModel<LightningConnectionsViewModel>(parentEntry)
 val route = it.toRoute<Routes.ChannelDetail>()
 ChannelDetailScreen(
 navController = navController,
 viewModel = viewModel,
 channelId = route.channelId,
 )
 }
 composableWithDefaultTransitions<Routes.CloseConnection> {
Expand DownExpand Up@@ -1836,7 +1838,7 @@ sealed interface Routes {
 data object LightningConnections : Routes

 @Serializable
 data object ChannelDetail : Routes
 data class ChannelDetail(val channelId: String) : Routes

 @Serializable
 data object CloseConnection : Routes
Expand Down

90 changes: 61 additions & 29 deletions
app/src/main/java/to/bitkit/ui/settings/lightning/ChannelDetailScreen.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.pulltorefresh.PullToRefreshBox
Expand DownExpand Up@@ -85,19 +86,32 @@ import java.util.Locale
fun ChannelDetailScreen(
 navController: NavController,
 viewModel: LightningConnectionsViewModel,
 channelId: String,
) {
 val context = LocalContext.current
 val app = appViewModel ?: return
 val wallet = walletViewModel ?: return

 LaunchedEffect(channelId) {
 viewModel.findAndSelectChannel(channelId)
 }

 val selectedChannel by viewModel.selectedChannel.collectAsStateWithLifecycle()
 val channel = selectedChannel ?: return
 val channel = selectedChannel

 val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 val paidOrders by viewModel.blocktankRepo.blocktankState.collectAsStateWithLifecycle()
 val lightningState by wallet.lightningState.collectAsStateWithLifecycle()

 if (channel == null) {
 Content(
 channel = null,
 onBack = { navController.popBackStack() },
 )
 return
 }

 val isClosedChannel = uiState.closedChannels.any { it.details.channelId == channel.details.channelId }
 val lightningState by wallet.lightningState.collectAsStateWithLifecycle()

 // Fetch transaction details for funding transaction if available
 LaunchedEffect(channel.details.fundingTxo?.txid) {
Expand All@@ -108,8 +122,8 @@ fun ChannelDetailScreen(

 // Fetch activity timestamp for transfer activity with matching channel ID
 LaunchedEffect(channel.details.channelId) {
 channel.details.channelId?.let { channelId ->
 viewModel.fetchActivityTimestamp(channelId)
 channel.details.channelId.let { id ->
 viewModel.fetchActivityTimestamp(id)
 }
 }

Expand DownExpand Up@@ -148,7 +162,7 @@ fun ChannelDetailScreen(
@Suppress("CyclomaticComplexMethod")
@Composable
private fun Content(
 channel: ChannelUi,
 channel: ChannelUi?,
 blocktankOrders: List<IBtOrder> = emptyList(),
 cjitEntries: List<IcJitEntry> = emptyList(),
 txTime: ULong? = null,
Expand All@@ -161,36 +175,46 @@ private fun Content(
 onSupport: (Any) -> Unit = {},
 onCloseConnection: () -> Unit = {},
) {
 // Check if the channel was opened via CJIT
 val cjitEntry = cjitEntries.find { entry ->
 entry.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 }

 // Check if the channel was opened via blocktank order
 val blocktankOrder = blocktankOrders.find { order ->
 // real channel
 if (channel.details.fundingTxo?.txid != null) {
 order.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 } else {
 // fake channel
 order.id == channel.details.channelId
 }
 }

 val order = blocktankOrder ?: cjitEntry

 val capacity = channel.details.channelValueSats.toLong()
 val localBalance = channel.details.amountOnClose.toLong()
 val remoteBalance = (channel.details.inboundCapacityMsat / 1000u).toLong()
 val reserveBalance = (channel.details.unspendablePunishmentReserve ?: 0u).toLong()

 ScreenColumn {
 AppTopBar(
 titleText = channel.name,
 titleText = channel?.name ?: "",
 onBackClick = onBack,
 actions = { DrawerNavIcon() },
 )

 if (channel == null) {
 Box(
 contentAlignment = Alignment.Center,
 modifier = Modifier.fillMaxSize(),
 ) {
 CircularProgressIndicator()
 }
 return@ScreenColumn
 }

 // Check if the channel was opened via CJIT
 val cjitEntry = cjitEntries.find { entry ->
 entry.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 }

 // Check if the channel was opened via blocktank order
 val blocktankOrder = blocktankOrders.find { order ->
 // real channel
 if (channel.details.fundingTxo?.txid != null) {
 order.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 } else {
 // fake channel
 order.id == channel.details.channelId
 }
 }

 val order = blocktankOrder ?: cjitEntry

 val capacity = channel.details.channelValueSats.toLong()
 val localBalance = channel.details.amountOnClose.toLong()
 val remoteBalance = (channel.details.inboundCapacityMsat / 1000u).toLong()
 val reserveBalance = (channel.details.unspendablePunishmentReserve ?: 0u).toLong()

 PullToRefreshBox(
 isRefreshing = isRefreshing,
 onRefresh = onRefresh,
Expand DownExpand Up@@ -628,6 +652,14 @@ private fun createSupportEmailIntent(
 return Intent(Intent.ACTION_SENDTO, uri)
}

@Preview
@Composable
private fun PreviewLoadingState() {
 AppThemeSurface {
 Content(channel = null)
 }
}

@Preview
@Composable
private fun PreviewOpenChannel() {
Expand Down

16 changes: 5 additions & 11 deletions
app/src/main/java/to/bitkit/ui/settings/lightning/LightningConnectionsScreen.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,18 +88,13 @@ fun LightningConnectionsScreen(
 viewModel.refreshObservedState()
 viewModel.clearSelectedChannel()
 viewModel.clearTransactionDetails()
 }

 LaunchedEffect(navController.currentBackStackEntry) {
 val selectedChannelId = navController.previousBackStackEntry?.savedStateHandle?.get<String>("selectedChannelId")
 if (selectedChannelId == null) return@LaunchedEffect

 navController.previousBackStackEntry?.savedStateHandle?.remove<String>("selectedChannelId")
 delay(CHANNEL_SELECTION_DELAY_MS)
 if (viewModel.findAndSelectChannel(selectedChannelId)) {
 navController.navigate(Routes.ChannelDetail) {
 if (selectedChannelId != null) {
 navController.previousBackStackEntry?.savedStateHandle?.remove<String>("selectedChannelId")
 delay(CHANNEL_SELECTION_DELAY_MS)
 navController.navigate(Routes.ChannelDetail(selectedChannelId)) {
 launchSingleTop = true
 popUpTo(Routes.ConnectionsNav) { inclusive = false }
 }
 }
 }
Expand All@@ -112,8 +107,7 @@ fun LightningConnectionsScreen(
 viewModel.zipLogsForSharing { uri -> context.shareZipFile(uri) }
 },
 onClickChannel = { channelUi ->
 viewModel.setSelectedChannel(channelUi)
 navController.navigate(Routes.ChannelDetail)
 navController.navigate(Routes.ChannelDetail(channelUi.details.channelId))
 },
 onRefresh = {
 viewModel.onPullToRefresh()
Expand Down
Loading

, '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: channel detail black screen and nav issues#690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

ovitrif
wants to merge
2
commits into

from

 Closed


fix: channel detail black screen and nav issues
#690
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
929fa54

fix: resolve channel detail black screen and navigation issues


github-actions[bot] Jan 20, 2026
691ca22

chore: add compose preview for channel loading


ovitrif Jan 22, 2026

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


4 changes: 3 additions & 1 deletion
app/src/main/java/to/bitkit/ui/ContentView.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,9 +1204,11 @@ private fun NavGraphBuilder.lightningConnections(
 composableWithDefaultTransitions<Routes.ChannelDetail> {
 val parentEntry = remember(it) { navController.getBackStackEntry(Routes.ConnectionsNav) }
 val viewModel = hiltViewModel<LightningConnectionsViewModel>(parentEntry)
 val route = it.toRoute<Routes.ChannelDetail>()
 ChannelDetailScreen(
 navController = navController,
 viewModel = viewModel,
 channelId = route.channelId,
 )
 }
 composableWithDefaultTransitions<Routes.CloseConnection> {
Expand DownExpand Up@@ -1836,7 +1838,7 @@ sealed interface Routes {
 data object LightningConnections : Routes

 @Serializable
 data object ChannelDetail : Routes
 data class ChannelDetail(val channelId: String) : Routes

 @Serializable
 data object CloseConnection : Routes
Expand Down

90 changes: 61 additions & 29 deletions
app/src/main/java/to/bitkit/ui/settings/lightning/ChannelDetailScreen.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.pulltorefresh.PullToRefreshBox
Expand DownExpand Up@@ -85,19 +86,32 @@ import java.util.Locale
fun ChannelDetailScreen(
 navController: NavController,
 viewModel: LightningConnectionsViewModel,
 channelId: String,
) {
 val context = LocalContext.current
 val app = appViewModel ?: return
 val wallet = walletViewModel ?: return

 LaunchedEffect(channelId) {
 viewModel.findAndSelectChannel(channelId)
 }

 val selectedChannel by viewModel.selectedChannel.collectAsStateWithLifecycle()
 val channel = selectedChannel ?: return
 val channel = selectedChannel

 val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 val paidOrders by viewModel.blocktankRepo.blocktankState.collectAsStateWithLifecycle()
 val lightningState by wallet.lightningState.collectAsStateWithLifecycle()

 if (channel == null) {
 Content(
 channel = null,
 onBack = { navController.popBackStack() },
 )
 return
 }

 val isClosedChannel = uiState.closedChannels.any { it.details.channelId == channel.details.channelId }
 val lightningState by wallet.lightningState.collectAsStateWithLifecycle()

 // Fetch transaction details for funding transaction if available
 LaunchedEffect(channel.details.fundingTxo?.txid) {
Expand All@@ -108,8 +122,8 @@ fun ChannelDetailScreen(

 // Fetch activity timestamp for transfer activity with matching channel ID
 LaunchedEffect(channel.details.channelId) {
 channel.details.channelId?.let { channelId ->
 viewModel.fetchActivityTimestamp(channelId)
 channel.details.channelId.let { id ->
 viewModel.fetchActivityTimestamp(id)
 }
 }

Expand DownExpand Up@@ -148,7 +162,7 @@ fun ChannelDetailScreen(
@Suppress("CyclomaticComplexMethod")
@Composable
private fun Content(
 channel: ChannelUi,
 channel: ChannelUi?,
 blocktankOrders: List<IBtOrder> = emptyList(),
 cjitEntries: List<IcJitEntry> = emptyList(),
 txTime: ULong? = null,
Expand All@@ -161,36 +175,46 @@ private fun Content(
 onSupport: (Any) -> Unit = {},
 onCloseConnection: () -> Unit = {},
) {
 // Check if the channel was opened via CJIT
 val cjitEntry = cjitEntries.find { entry ->
 entry.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 }

 // Check if the channel was opened via blocktank order
 val blocktankOrder = blocktankOrders.find { order ->
 // real channel
 if (channel.details.fundingTxo?.txid != null) {
 order.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 } else {
 // fake channel
 order.id == channel.details.channelId
 }
 }

 val order = blocktankOrder ?: cjitEntry

 val capacity = channel.details.channelValueSats.toLong()
 val localBalance = channel.details.amountOnClose.toLong()
 val remoteBalance = (channel.details.inboundCapacityMsat / 1000u).toLong()
 val reserveBalance = (channel.details.unspendablePunishmentReserve ?: 0u).toLong()

 ScreenColumn {
 AppTopBar(
 titleText = channel.name,
 titleText = channel?.name ?: "",
 onBackClick = onBack,
 actions = { DrawerNavIcon() },
 )

 if (channel == null) {
 Box(
 contentAlignment = Alignment.Center,
 modifier = Modifier.fillMaxSize(),
 ) {
 CircularProgressIndicator()
 }
 return@ScreenColumn
 }

 // Check if the channel was opened via CJIT
 val cjitEntry = cjitEntries.find { entry ->
 entry.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 }

 // Check if the channel was opened via blocktank order
 val blocktankOrder = blocktankOrders.find { order ->
 // real channel
 if (channel.details.fundingTxo?.txid != null) {
 order.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 } else {
 // fake channel
 order.id == channel.details.channelId
 }
 }

 val order = blocktankOrder ?: cjitEntry

 val capacity = channel.details.channelValueSats.toLong()
 val localBalance = channel.details.amountOnClose.toLong()
 val remoteBalance = (channel.details.inboundCapacityMsat / 1000u).toLong()
 val reserveBalance = (channel.details.unspendablePunishmentReserve ?: 0u).toLong()

 PullToRefreshBox(
 isRefreshing = isRefreshing,
 onRefresh = onRefresh,
Expand DownExpand Up@@ -628,6 +652,14 @@ private fun createSupportEmailIntent(
 return Intent(Intent.ACTION_SENDTO, uri)
}

@Preview
@Composable
private fun PreviewLoadingState() {
 AppThemeSurface {
 Content(channel = null)
 }
}

@Preview
@Composable
private fun PreviewOpenChannel() {
Expand Down

16 changes: 5 additions & 11 deletions
app/src/main/java/to/bitkit/ui/settings/lightning/LightningConnectionsScreen.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,18 +88,13 @@ fun LightningConnectionsScreen(
 viewModel.refreshObservedState()
 viewModel.clearSelectedChannel()
 viewModel.clearTransactionDetails()
 }

 LaunchedEffect(navController.currentBackStackEntry) {
 val selectedChannelId = navController.previousBackStackEntry?.savedStateHandle?.get<String>("selectedChannelId")
 if (selectedChannelId == null) return@LaunchedEffect

 navController.previousBackStackEntry?.savedStateHandle?.remove<String>("selectedChannelId")
 delay(CHANNEL_SELECTION_DELAY_MS)
 if (viewModel.findAndSelectChannel(selectedChannelId)) {
 navController.navigate(Routes.ChannelDetail) {
 if (selectedChannelId != null) {
 navController.previousBackStackEntry?.savedStateHandle?.remove<String>("selectedChannelId")
 delay(CHANNEL_SELECTION_DELAY_MS)
 navController.navigate(Routes.ChannelDetail(selectedChannelId)) {
 launchSingleTop = true
 popUpTo(Routes.ConnectionsNav) { inclusive = false }
 }
 }
 }
Expand All@@ -112,8 +107,7 @@ fun LightningConnectionsScreen(
 viewModel.zipLogsForSharing { uri -> context.shareZipFile(uri) }
 },
 onClickChannel = { channelUi ->
 viewModel.setSelectedChannel(channelUi)
 navController.navigate(Routes.ChannelDetail)
 navController.navigate(Routes.ChannelDetail(channelUi.details.channelId))
 },
 onRefresh = {
 viewModel.onPullToRefresh()
Expand Down
Loading

, '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: channel detail black screen and nav issues#690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

ovitrif
wants to merge
2
commits into

from

 Closed


fix: channel detail black screen and nav issues
#690
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
929fa54

fix: resolve channel detail black screen and navigation issues


github-actions[bot] Jan 20, 2026
691ca22

chore: add compose preview for channel loading


ovitrif Jan 22, 2026

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


4 changes: 3 additions & 1 deletion
app/src/main/java/to/bitkit/ui/ContentView.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,9 +1204,11 @@ private fun NavGraphBuilder.lightningConnections(
 composableWithDefaultTransitions<Routes.ChannelDetail> {
 val parentEntry = remember(it) { navController.getBackStackEntry(Routes.ConnectionsNav) }
 val viewModel = hiltViewModel<LightningConnectionsViewModel>(parentEntry)
 val route = it.toRoute<Routes.ChannelDetail>()
 ChannelDetailScreen(
 navController = navController,
 viewModel = viewModel,
 channelId = route.channelId,
 )
 }
 composableWithDefaultTransitions<Routes.CloseConnection> {
Expand DownExpand Up@@ -1836,7 +1838,7 @@ sealed interface Routes {
 data object LightningConnections : Routes

 @Serializable
 data object ChannelDetail : Routes
 data class ChannelDetail(val channelId: String) : Routes

 @Serializable
 data object CloseConnection : Routes
Expand Down

90 changes: 61 additions & 29 deletions
app/src/main/java/to/bitkit/ui/settings/lightning/ChannelDetailScreen.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.pulltorefresh.PullToRefreshBox
Expand DownExpand Up@@ -85,19 +86,32 @@ import java.util.Locale
fun ChannelDetailScreen(
 navController: NavController,
 viewModel: LightningConnectionsViewModel,
 channelId: String,
) {
 val context = LocalContext.current
 val app = appViewModel ?: return
 val wallet = walletViewModel ?: return

 LaunchedEffect(channelId) {
 viewModel.findAndSelectChannel(channelId)
 }

 val selectedChannel by viewModel.selectedChannel.collectAsStateWithLifecycle()
 val channel = selectedChannel ?: return
 val channel = selectedChannel

 val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 val paidOrders by viewModel.blocktankRepo.blocktankState.collectAsStateWithLifecycle()
 val lightningState by wallet.lightningState.collectAsStateWithLifecycle()

 if (channel == null) {
 Content(
 channel = null,
 onBack = { navController.popBackStack() },
 )
 return
 }

 val isClosedChannel = uiState.closedChannels.any { it.details.channelId == channel.details.channelId }
 val lightningState by wallet.lightningState.collectAsStateWithLifecycle()

 // Fetch transaction details for funding transaction if available
 LaunchedEffect(channel.details.fundingTxo?.txid) {
Expand All@@ -108,8 +122,8 @@ fun ChannelDetailScreen(

 // Fetch activity timestamp for transfer activity with matching channel ID
 LaunchedEffect(channel.details.channelId) {
 channel.details.channelId?.let { channelId ->
 viewModel.fetchActivityTimestamp(channelId)
 channel.details.channelId.let { id ->
 viewModel.fetchActivityTimestamp(id)
 }
 }

Expand DownExpand Up@@ -148,7 +162,7 @@ fun ChannelDetailScreen(
@Suppress("CyclomaticComplexMethod")
@Composable
private fun Content(
 channel: ChannelUi,
 channel: ChannelUi?,
 blocktankOrders: List<IBtOrder> = emptyList(),
 cjitEntries: List<IcJitEntry> = emptyList(),
 txTime: ULong? = null,
Expand All@@ -161,36 +175,46 @@ private fun Content(
 onSupport: (Any) -> Unit = {},
 onCloseConnection: () -> Unit = {},
) {
 // Check if the channel was opened via CJIT
 val cjitEntry = cjitEntries.find { entry ->
 entry.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 }

 // Check if the channel was opened via blocktank order
 val blocktankOrder = blocktankOrders.find { order ->
 // real channel
 if (channel.details.fundingTxo?.txid != null) {
 order.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 } else {
 // fake channel
 order.id == channel.details.channelId
 }
 }

 val order = blocktankOrder ?: cjitEntry

 val capacity = channel.details.channelValueSats.toLong()
 val localBalance = channel.details.amountOnClose.toLong()
 val remoteBalance = (channel.details.inboundCapacityMsat / 1000u).toLong()
 val reserveBalance = (channel.details.unspendablePunishmentReserve ?: 0u).toLong()

 ScreenColumn {
 AppTopBar(
 titleText = channel.name,
 titleText = channel?.name ?: "",
 onBackClick = onBack,
 actions = { DrawerNavIcon() },
 )

 if (channel == null) {
 Box(
 contentAlignment = Alignment.Center,
 modifier = Modifier.fillMaxSize(),
 ) {
 CircularProgressIndicator()
 }
 return@ScreenColumn
 }

 // Check if the channel was opened via CJIT
 val cjitEntry = cjitEntries.find { entry ->
 entry.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 }

 // Check if the channel was opened via blocktank order
 val blocktankOrder = blocktankOrders.find { order ->
 // real channel
 if (channel.details.fundingTxo?.txid != null) {
 order.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 } else {
 // fake channel
 order.id == channel.details.channelId
 }
 }

 val order = blocktankOrder ?: cjitEntry

 val capacity = channel.details.channelValueSats.toLong()
 val localBalance = channel.details.amountOnClose.toLong()
 val remoteBalance = (channel.details.inboundCapacityMsat / 1000u).toLong()
 val reserveBalance = (channel.details.unspendablePunishmentReserve ?: 0u).toLong()

 PullToRefreshBox(
 isRefreshing = isRefreshing,
 onRefresh = onRefresh,
Expand DownExpand Up@@ -628,6 +652,14 @@ private fun createSupportEmailIntent(
 return Intent(Intent.ACTION_SENDTO, uri)
}

@Preview
@Composable
private fun PreviewLoadingState() {
 AppThemeSurface {
 Content(channel = null)
 }
}

@Preview
@Composable
private fun PreviewOpenChannel() {
Expand Down

16 changes: 5 additions & 11 deletions
app/src/main/java/to/bitkit/ui/settings/lightning/LightningConnectionsScreen.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,18 +88,13 @@ fun LightningConnectionsScreen(
 viewModel.refreshObservedState()
 viewModel.clearSelectedChannel()
 viewModel.clearTransactionDetails()
 }

 LaunchedEffect(navController.currentBackStackEntry) {
 val selectedChannelId = navController.previousBackStackEntry?.savedStateHandle?.get<String>("selectedChannelId")
 if (selectedChannelId == null) return@LaunchedEffect

 navController.previousBackStackEntry?.savedStateHandle?.remove<String>("selectedChannelId")
 delay(CHANNEL_SELECTION_DELAY_MS)
 if (viewModel.findAndSelectChannel(selectedChannelId)) {
 navController.navigate(Routes.ChannelDetail) {
 if (selectedChannelId != null) {
 navController.previousBackStackEntry?.savedStateHandle?.remove<String>("selectedChannelId")
 delay(CHANNEL_SELECTION_DELAY_MS)
 navController.navigate(Routes.ChannelDetail(selectedChannelId)) {
 launchSingleTop = true
 popUpTo(Routes.ConnectionsNav) { inclusive = false }
 }
 }
 }
Expand All@@ -112,8 +107,7 @@ fun LightningConnectionsScreen(
 viewModel.zipLogsForSharing { uri -> context.shareZipFile(uri) }
 },
 onClickChannel = { channelUi ->
 viewModel.setSelectedChannel(channelUi)
 navController.navigate(Routes.ChannelDetail)
 navController.navigate(Routes.ChannelDetail(channelUi.details.channelId))
 },
 onRefresh = {
 viewModel.onPullToRefresh()
Expand Down
Loading

, '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: channel detail black screen and nav issues#690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

ovitrif
wants to merge
2
commits into

from

 Closed


fix: channel detail black screen and nav issues
#690
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
929fa54

fix: resolve channel detail black screen and navigation issues


github-actions[bot] Jan 20, 2026
691ca22

chore: add compose preview for channel loading


ovitrif Jan 22, 2026

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


4 changes: 3 additions & 1 deletion
app/src/main/java/to/bitkit/ui/ContentView.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1204,9 +1204,11 @@ private fun NavGraphBuilder.lightningConnections(
 composableWithDefaultTransitions<Routes.ChannelDetail> {
 val parentEntry = remember(it) { navController.getBackStackEntry(Routes.ConnectionsNav) }
 val viewModel = hiltViewModel<LightningConnectionsViewModel>(parentEntry)
 val route = it.toRoute<Routes.ChannelDetail>()
 ChannelDetailScreen(
 navController = navController,
 viewModel = viewModel,
 channelId = route.channelId,
 )
 }
 composableWithDefaultTransitions<Routes.CloseConnection> {
Expand DownExpand Up@@ -1836,7 +1838,7 @@ sealed interface Routes {
 data object LightningConnections : Routes

 @Serializable
 data object ChannelDetail : Routes
 data class ChannelDetail(val channelId: String) : Routes

 @Serializable
 data object CloseConnection : Routes
Expand Down

90 changes: 61 additions & 29 deletions
app/src/main/java/to/bitkit/ui/settings/lightning/ChannelDetailScreen.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.pulltorefresh.PullToRefreshBox
Expand DownExpand Up@@ -85,19 +86,32 @@ import java.util.Locale
fun ChannelDetailScreen(
 navController: NavController,
 viewModel: LightningConnectionsViewModel,
 channelId: String,
) {
 val context = LocalContext.current
 val app = appViewModel ?: return
 val wallet = walletViewModel ?: return

 LaunchedEffect(channelId) {
 viewModel.findAndSelectChannel(channelId)
 }

 val selectedChannel by viewModel.selectedChannel.collectAsStateWithLifecycle()
 val channel = selectedChannel ?: return
 val channel = selectedChannel

 val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 val paidOrders by viewModel.blocktankRepo.blocktankState.collectAsStateWithLifecycle()
 val lightningState by wallet.lightningState.collectAsStateWithLifecycle()

 if (channel == null) {
 Content(
 channel = null,
 onBack = { navController.popBackStack() },
 )
 return
 }

 val isClosedChannel = uiState.closedChannels.any { it.details.channelId == channel.details.channelId }
 val lightningState by wallet.lightningState.collectAsStateWithLifecycle()

 // Fetch transaction details for funding transaction if available
 LaunchedEffect(channel.details.fundingTxo?.txid) {
Expand All@@ -108,8 +122,8 @@ fun ChannelDetailScreen(

 // Fetch activity timestamp for transfer activity with matching channel ID
 LaunchedEffect(channel.details.channelId) {
 channel.details.channelId?.let { channelId ->
 viewModel.fetchActivityTimestamp(channelId)
 channel.details.channelId.let { id ->
 viewModel.fetchActivityTimestamp(id)
 }
 }

Expand DownExpand Up@@ -148,7 +162,7 @@ fun ChannelDetailScreen(
@Suppress("CyclomaticComplexMethod")
@Composable
private fun Content(
 channel: ChannelUi,
 channel: ChannelUi?,
 blocktankOrders: List<IBtOrder> = emptyList(),
 cjitEntries: List<IcJitEntry> = emptyList(),
 txTime: ULong? = null,
Expand All@@ -161,36 +175,46 @@ private fun Content(
 onSupport: (Any) -> Unit = {},
 onCloseConnection: () -> Unit = {},
) {
 // Check if the channel was opened via CJIT
 val cjitEntry = cjitEntries.find { entry ->
 entry.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 }

 // Check if the channel was opened via blocktank order
 val blocktankOrder = blocktankOrders.find { order ->
 // real channel
 if (channel.details.fundingTxo?.txid != null) {
 order.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 } else {
 // fake channel
 order.id == channel.details.channelId
 }
 }

 val order = blocktankOrder ?: cjitEntry

 val capacity = channel.details.channelValueSats.toLong()
 val localBalance = channel.details.amountOnClose.toLong()
 val remoteBalance = (channel.details.inboundCapacityMsat / 1000u).toLong()
 val reserveBalance = (channel.details.unspendablePunishmentReserve ?: 0u).toLong()

 ScreenColumn {
 AppTopBar(
 titleText = channel.name,
 titleText = channel?.name ?: "",
 onBackClick = onBack,
 actions = { DrawerNavIcon() },
 )

 if (channel == null) {
 Box(
 contentAlignment = Alignment.Center,
 modifier = Modifier.fillMaxSize(),
 ) {
 CircularProgressIndicator()
 }
 return@ScreenColumn
 }

 // Check if the channel was opened via CJIT
 val cjitEntry = cjitEntries.find { entry ->
 entry.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 }

 // Check if the channel was opened via blocktank order
 val blocktankOrder = blocktankOrders.find { order ->
 // real channel
 if (channel.details.fundingTxo?.txid != null) {
 order.channel?.fundingTx?.id == channel.details.fundingTxo?.txid
 } else {
 // fake channel
 order.id == channel.details.channelId
 }
 }

 val order = blocktankOrder ?: cjitEntry

 val capacity = channel.details.channelValueSats.toLong()
 val localBalance = channel.details.amountOnClose.toLong()
 val remoteBalance = (channel.details.inboundCapacityMsat / 1000u).toLong()
 val reserveBalance = (channel.details.unspendablePunishmentReserve ?: 0u).toLong()

 PullToRefreshBox(
 isRefreshing = isRefreshing,
 onRefresh = onRefresh,
Expand DownExpand Up@@ -628,6 +652,14 @@ private fun createSupportEmailIntent(
 return Intent(Intent.ACTION_SENDTO, uri)
}

@Preview
@Composable
private fun PreviewLoadingState() {
 AppThemeSurface {
 Content(channel = null)
 }
}

@Preview
@Composable
private fun PreviewOpenChannel() {
Expand Down

16 changes: 5 additions & 11 deletions
app/src/main/java/to/bitkit/ui/settings/lightning/LightningConnectionsScreen.kt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,18 +88,13 @@ fun LightningConnectionsScreen(
 viewModel.refreshObservedState()
 viewModel.clearSelectedChannel()
 viewModel.clearTransactionDetails()
 }

 LaunchedEffect(navController.currentBackStackEntry) {
 val selectedChannelId = navController.previousBackStackEntry?.savedStateHandle?.get<String>("selectedChannelId")
 if (selectedChannelId == null) return@LaunchedEffect

 navController.previousBackStackEntry?.savedStateHandle?.remove<String>("selectedChannelId")
 delay(CHANNEL_SELECTION_DELAY_MS)
 if (viewModel.findAndSelectChannel(selectedChannelId)) {
 navController.navigate(Routes.ChannelDetail) {
 if (selectedChannelId != null) {
 navController.previousBackStackEntry?.savedStateHandle?.remove<String>("selectedChannelId")
 delay(CHANNEL_SELECTION_DELAY_MS)
 navController.navigate(Routes.ChannelDetail(selectedChannelId)) {
 launchSingleTop = true
 popUpTo(Routes.ConnectionsNav) { inclusive = false }
 }
 }
 }
Expand All@@ -112,8 +107,7 @@ fun LightningConnectionsScreen(
 viewModel.zipLogsForSharing { uri -> context.shareZipFile(uri) }
 },
 onClickChannel = { channelUi ->
 viewModel.setSelectedChannel(channelUi)
 navController.navigate(Routes.ChannelDetail)
 navController.navigate(Routes.ChannelDetail(channelUi.details.channelId))
 },
 onRefresh = {
 viewModel.onPullToRefresh()
Expand Down
Loading