@@ -193,13 +193,6 @@ fun ReceiveQrScreen(
193193 )
194194
195195 Spacer (Modifier .height(16 .dp))
196-
197- ReceiveNodeStateIndicator (
198- selectedTab = selectedTab,
199- cjitActive = cjitActive.value
200- )
201-
202- Spacer (Modifier .height(24 .dp))
203196 }
204197 }
205198}
@@ -508,11 +501,11 @@ private fun ReceiveQrSlide(
508501}
509502
510503@Composable
511- private fun CopyValuesSlide (
504+ private fun CopyValuesBox (
512505 onchainAddress : String ,
513506 bolt11 : String ,
514507 cjitInvoice : String? ,
515- receiveOnSpendingBalance : Boolean ,
508+ selectedTab : ReceiveTab ,
516509) {
517510 Card (
518511 colors = CardDefaults .cardColors(containerColor = Colors .White10 ),
@@ -527,20 +520,23 @@ private fun CopyValuesSlide(
527520 testTag = " ReceiveOnchainAddress" ,
528521 )
529522 }
530- if (bolt11.isNotEmpty() && receiveOnSpendingBalance) {
531- CopyAddressCard (
532- title = stringResource(R .string.wallet__receive_lightning_invoice),
533- address = bolt11,
534- type = CopyAddressType .LIGHTNING ,
535- testTag = " ReceiveLightningAddress" ,
536- )
537- } else if (cjitInvoice != null ) {
538- CopyAddressCard (
539- title = stringResource(R .string.wallet__receive_lightning_invoice),
540- address = cjitInvoice,
541- type = CopyAddressType .LIGHTNING ,
542- testTag = " ReceiveLightningAddress" ,
543- )
523+
524+ if (selectedTab == ReceiveTab .AUTO || selectedTab == ReceiveTab .SPENDING ) {
525+ if (bolt11.isNotEmpty()) {
526+ CopyAddressCard (
527+ title = stringResource(R .string.wallet__receive_lightning_invoice),
528+ address = bolt11,
529+ type = CopyAddressType .LIGHTNING ,
530+ testTag = " ReceiveLightningAddress" ,
531+ )
532+ } else if (cjitInvoice != null ) {
533+ CopyAddressCard (
534+ title = stringResource(R .string.wallet__receive_lightning_invoice),
535+ address = cjitInvoice,
536+ type = CopyAddressType .LIGHTNING ,
537+ testTag = " ReceiveLightningAddress" ,
538+ )
539+ }
544540 }
545541 }
546542 }
@@ -704,11 +700,11 @@ private fun PreviewSlide2() {
704700 .gradientBackground()
705701 .padding(16 .dp)
706702 ) {
707- CopyValuesSlide (
703+ CopyValuesBox (
708704 onchainAddress = " bcrt1qfserxgtuesul4m9zva56wzk849yf9l8rk4qy0l" ,
709705 bolt11 = " lnbcrt500u1pn7umn7pp5x0s9lt9fwrff6rp70pz3guwnjgw97sjuv79..." ,
710706 cjitInvoice = null ,
711- true
707+ selectedTab = ReceiveTab . AUTO
712708 )
713709 }
714710 }
0 commit comments