Merge branch 'master' into fix/address-validation

jvsena42 · web-flow · commit b890f55cdff7 · 2026-01-16T13:02:46.000-03:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -47,8 +47,8 @@ android {
         applicationId = "to.bitkit"
         minSdk = 28
         targetSdk = 36
-        versionCode = 163
-        versionName = "2.0.0-rc.1"
+        versionCode = 168
+        versionName = "2.0.0-rc.2"
         testInstrumentationRunner = "to.bitkit.test.HiltTestRunner"
         vectorDrawables {
             useSupportLibrary = true
diff --git a/app/src/main/java/to/bitkit/ui/screens/common/ComingSoonScreen.kt b/app/src/main/java/to/bitkit/ui/screens/common/ComingSoonScreen.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -17,7 +18,7 @@ import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
-import to.bitkit.ui.scaffold.ScreenColumn
+import to.bitkit.ui.shared.util.screen
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
 import to.bitkit.ui.utils.withAccent
@@ -26,14 +27,18 @@ import to.bitkit.ui.utils.withAccent
 fun ComingSoonScreen(
     onWalletOverviewClick: () -> Unit,
     onBackClick: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
-    ScreenColumn {
+    Column(
+        modifier = modifier
+            .screen()
+            .testTag("ComingSoonScreen")
+    ) {
         AppTopBar(
             titleText = stringResource(R.string.coming_soon__title),
             onBackClick = onBackClick,
             actions = { DrawerNavIcon() },
         )
-
         Column(
             modifier = Modifier.padding(horizontal = 32.dp)
         ) {
@@ -44,10 +49,9 @@ fun ComingSoonScreen(
                     .fillMaxWidth()
                     .weight(1f)
             )
-
             Display(
                 text = stringResource(R.string.coming_soon__headline).withAccent(accentColor = Colors.Brand),
-                color = Colors.White
+                color = Colors.White,
             )
             VerticalSpacer(8.dp)
             BodyM(text = stringResource(R.string.coming_soon__description), color = Colors.White64)
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityDetailScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityDetailScreen.kt
@@ -78,6 +78,7 @@ import to.bitkit.ui.screens.wallets.activity.components.ActivityIcon
 import to.bitkit.ui.shared.modifiers.clickableAlpha
 import to.bitkit.ui.shared.modifiers.sheetHeight
 import to.bitkit.ui.sheets.BoostTransactionSheet
+import to.bitkit.ui.sheets.ComingSoonSheet
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
 import to.bitkit.ui.utils.copyToClipboard
@@ -168,6 +169,7 @@ fun ActivityDetailScreen(
                 val tags by detailViewModel.tags.collectAsStateWithLifecycle()
                 val boostSheetVisible by detailViewModel.boostSheetVisible.collectAsStateWithLifecycle()
                 var showAddTagSheet by remember { mutableStateOf(false) }
+                var showAssignSheet by remember { mutableStateOf(false) }
                 var isCpfpChild by remember { mutableStateOf(false) }
                 var boostTxDoesExist by remember { mutableStateOf<Map<String, Boolean>>(emptyMap()) }
 
@@ -217,6 +219,7 @@ fun ActivityDetailScreen(
                         tags = tags,
                         onRemoveTag = { detailViewModel.removeTag(it) },
                         onAddTagClick = { showAddTagSheet = true },
+                        onAssignClick = { showAssignSheet = true },
                         onClickBoost = detailViewModel::onClickBoost,
                         onExploreClick = onExploreClick,
                         onChannelClick = onChannelClick,
@@ -282,6 +285,13 @@ fun ActivityDetailScreen(
                         )
                     }
                 }
+
+                if (showAssignSheet) {
+                    ComingSoonSheet(
+                        onWalletOverviewClick = onCloseClick,
+                        onBack = { showAssignSheet = false },
+                    )
+                }
             }
         }
     }
@@ -294,6 +304,7 @@ private fun ActivityDetailContent(
     tags: List<String>,
     onRemoveTag: (String) -> Unit,
     onAddTagClick: () -> Unit,
+    onAssignClick: () -> Unit,
     onClickBoost: () -> Unit,
     onExploreClick: (String) -> Unit,
     onChannelClick: ((String) -> Unit)?,
@@ -572,7 +583,7 @@ private fun ActivityDetailContent(
                 PrimaryButton(
                     text = stringResource(R.string.wallet__activity_assign),
                     size = ButtonSize.Small,
-                    onClick = { /* TODO: Implement assign functionality */ },
+                    onClick = onAssignClick,
                     enabled = !isSelfSend,
                     icon = {
                         Icon(
@@ -849,6 +860,7 @@ private fun PreviewLightningSent() {
             tags = listOf("Lunch", "Drinks"),
             onRemoveTag = {},
             onAddTagClick = {},
+            onAssignClick = {},
             onExploreClick = {},
             onChannelClick = null,
             onCopy = {},
@@ -879,6 +891,7 @@ private fun PreviewOnchain() {
             tags = emptyList(),
             onRemoveTag = {},
             onAddTagClick = {},
+            onAssignClick = {},
             onExploreClick = {},
             onChannelClick = null,
             onCopy = {},
@@ -910,6 +923,7 @@ private fun PreviewSheetSmallScreen() {
                 tags = listOf("Lunch", "Drinks"),
                 onRemoveTag = {},
                 onAddTagClick = {},
+                onAssignClick = {},
                 onExploreClick = {},
                 onChannelClick = null,
                 onCopy = {},
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityAddTagSheet.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityAddTagSheet.kt
@@ -29,6 +29,7 @@ import to.bitkit.viewmodels.TagsViewModel
 fun ActivityAddTagSheet(
     listViewModel: ActivityListViewModel,
     activityViewModel: ActivityDetailViewModel,
+    modifier: Modifier = Modifier,
     tagsViewModel: TagsViewModel = hiltViewModel(),
     onDismiss: () -> Unit,
 ) {
@@ -66,7 +67,7 @@ fun ActivityAddTagSheet(
             focusOnShow = true,
             tagInputTestTag = "TagInput",
             addButtonTestTag = "ActivityTagsSubmit",
-            modifier = Modifier
+            modifier = modifier
                 .semantics { testTagsAsResourceId = true }
                 .sheetHeight(SheetSize.SMALL, isModal = true)
                 .gradientBackground()
@@ -87,9 +88,7 @@ private fun Preview() {
                 onTagConfirmed = {},
                 onInputUpdated = {},
                 onBack = {},
-                modifier = Modifier
-                    .sheetHeight(SheetSize.SMALL, isModal = true)
-                    .gradientBackground()
+                modifier = Modifier.sheetHeight(SheetSize.SMALL, isModal = true)
             )
         }
     }
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendRecipientScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/send/SendRecipientScreen.kt
@@ -258,9 +258,7 @@ fun SendRecipientScreen(
                 galleryLauncher.launch("image/*")
             }
         },
-        onClickContact = {
-            app?.toast(AppError("Coming soon: Contact"))
-        },
+        onClickContact = { onEvent(SendEvent.Contacts) },
         onClickPaste = { onEvent(SendEvent.Paste) },
         onClickManual = { onEvent(SendEvent.EnterManually) },
         cameraPermissionGranted = cameraPermissionState.status.isGranted,
diff --git a/app/src/main/java/to/bitkit/ui/sheets/ComingSoonSheet.kt b/app/src/main/java/to/bitkit/ui/sheets/ComingSoonSheet.kt
@@ -0,0 +1,101 @@
+package to.bitkit.ui.sheets
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import to.bitkit.R
+import to.bitkit.ui.components.BodyM
+import to.bitkit.ui.components.BottomSheet
+import to.bitkit.ui.components.BottomSheetPreview
+import to.bitkit.ui.components.Display
+import to.bitkit.ui.components.PrimaryButton
+import to.bitkit.ui.components.SheetSize
+import to.bitkit.ui.components.VerticalSpacer
+import to.bitkit.ui.scaffold.SheetTopBar
+import to.bitkit.ui.shared.modifiers.sheetHeight
+import to.bitkit.ui.shared.util.gradientBackground
+import to.bitkit.ui.theme.AppThemeSurface
+import to.bitkit.ui.theme.Colors
+import to.bitkit.ui.utils.withAccent
+
+private fun Modifier.sheet() = this then sheetHeight(SheetSize.MEDIUM, isModal = true)
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ComingSoonSheet(
+    onWalletOverviewClick: () -> Unit,
+    onBack: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    BottomSheet(onDismissRequest = onBack) {
+        ComingSoonSheetContent(
+            onWalletOverviewClick = onWalletOverviewClick,
+            onBack = onBack,
+            modifier = modifier.sheet()
+        )
+    }
+}
+
+@Composable
+fun ComingSoonSheetContent(
+    onWalletOverviewClick: () -> Unit,
+    onBack: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .fillMaxSize()
+            .gradientBackground()
+            .navigationBarsPadding()
+            .testTag("ComingSoonSheet")
+    ) {
+        SheetTopBar(titleText = stringResource(R.string.coming_soon__title), onBack = onBack)
+        Column(
+            modifier = Modifier.padding(horizontal = 32.dp)
+        ) {
+            Image(
+                painter = painterResource(R.drawable.img_cronometer),
+                contentDescription = null,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .weight(1f)
+            )
+            Display(
+                text = stringResource(R.string.coming_soon__headline).withAccent(accentColor = Colors.Brand),
+                color = Colors.White,
+            )
+            VerticalSpacer(8.dp)
+            BodyM(text = stringResource(R.string.coming_soon__description), color = Colors.White64)
+            VerticalSpacer(54.dp)
+            PrimaryButton(
+                text = stringResource(R.string.coming_soon__button),
+                onClick = onWalletOverviewClick,
+            )
+        }
+    }
+}
+
+@Preview(showSystemUi = true)
+@Composable
+private fun Preview() {
+    AppThemeSurface {
+        BottomSheetPreview {
+            ComingSoonSheetContent(
+                onWalletOverviewClick = {},
+                onBack = {},
+                modifier = Modifier.sheet()
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/to/bitkit/ui/sheets/SendSheet.kt b/app/src/main/java/to/bitkit/ui/sheets/SendSheet.kt
@@ -89,6 +89,7 @@ fun SendSheet(
                     is SendEffect.NavigateToWithdrawError -> navController.navigate(SendRoute.WithdrawError)
                     is SendEffect.NavigateToFee -> navController.navigate(SendRoute.FeeRate)
                     is SendEffect.NavigateToFeeCustom -> navController.navigate(SendRoute.FeeCustom)
+                    is SendEffect.NavigateToComingSoon -> navController.navigate(SendRoute.ComingSoon)
                 }
             }
         }
@@ -267,6 +268,12 @@ fun SendSheet(
                     }
                 )
             }
+            composableWithDefaultTransitions<SendRoute.ComingSoon> {
+                ComingSoonSheetContent(
+                    onWalletOverviewClick = { appViewModel.hideSheet() },
+                    onBack = { navController.popBackStack() },
+                )
+            }
             composableWithDefaultTransitions<SendRoute.Error> {
                 val route = it.toRoute<SendRoute.Error>()
                 SendErrorScreen(
@@ -338,6 +345,9 @@ sealed interface SendRoute {
     @Serializable
     data object Success : SendRoute
 
+    @Serializable
+    data object ComingSoon : SendRoute
+
     @Serializable
     data class Error(val errorMessage: String) : SendRoute
 }
diff --git a/app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt b/app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
@@ -653,6 +653,7 @@ class AppViewModel @Inject constructor(
                     SendEvent.ClearPayConfirmation -> _sendUiState.update { s -> s.copy(shouldConfirmPay = false) }
                     SendEvent.BackToAmount -> setSendEffect(SendEffect.PopBack(SendRoute.Amount))
                     SendEvent.NavToAddress -> setSendEffect(SendEffect.NavigateToAddress)
+                    SendEvent.Contacts -> setSendEffect(SendEffect.NavigateToComingSoon)
                 }
             }
         }
@@ -2191,6 +2192,7 @@ sealed class SendEffect {
     data object NavigateToQuickPay : SendEffect()
     data object NavigateToFee : SendEffect()
     data object NavigateToFeeCustom : SendEffect()
+    data object NavigateToComingSoon : SendEffect()
     data class PaymentSuccess(val sheet: NewTransactionSheetDetails? = null) : SendEffect()
 }
 
@@ -2231,6 +2233,7 @@ sealed interface SendEvent {
     data object ClearPayConfirmation : SendEvent
     data object BackToAmount : SendEvent
     data object NavToAddress : SendEvent
+    data object Contacts : SendEvent
 }
 
 sealed interface LnurlParams {

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ fun SendSheet(`
`89`	`89`	`is SendEffect.NavigateToWithdrawError -> navController.navigate(SendRoute.WithdrawError)`
`90`	`90`	`is SendEffect.NavigateToFee -> navController.navigate(SendRoute.FeeRate)`
`91`	`91`	`is SendEffect.NavigateToFeeCustom -> navController.navigate(SendRoute.FeeCustom)`
	`92`	`+ is SendEffect.NavigateToComingSoon -> navController.navigate(SendRoute.ComingSoon)`
`92`	`93`	`}`
`93`	`94`	`}`
`94`	`95`	`}`
`@@ -267,6 +268,12 @@ fun SendSheet(`
`267`	`268`	`}`
`268`	`269`	`)`
`269`	`270`	`}`
	`271`	`+ composableWithDefaultTransitions<SendRoute.ComingSoon> {`
	`272`	`+ ComingSoonSheetContent(`
	`273`	`+ onWalletOverviewClick = { appViewModel.hideSheet() },`
	`274`	`+ onBack = { navController.popBackStack() },`
	`275`	`+ )`
	`276`	`+ }`
`270`	`277`	`composableWithDefaultTransitions<SendRoute.Error> {`
`271`	`278`	`val route = it.toRoute<SendRoute.Error>()`
`272`	`279`	`SendErrorScreen(`
`@@ -338,6 +345,9 @@ sealed interface SendRoute {`
`338`	`345`	`@Serializable`
`339`	`346`	`data object Success : SendRoute`
`340`	`347`
	`348`	`+ @Serializable`
	`349`	`+ data object ComingSoon : SendRoute`
	`350`	`+`
`341`	`351`	`@Serializable`
`342`	`352`	`data class Error(val errorMessage: String) : SendRoute`
`343`	`353`	`}`
Original file line number	Diff line number	Diff line change
`@@ -653,6 +653,7 @@ class AppViewModel @Inject constructor(`
`653`	`653`	`SendEvent.ClearPayConfirmation -> _sendUiState.update { s -> s.copy(shouldConfirmPay = false) }`
`654`	`654`	`SendEvent.BackToAmount -> setSendEffect(SendEffect.PopBack(SendRoute.Amount))`
`655`	`655`	`SendEvent.NavToAddress -> setSendEffect(SendEffect.NavigateToAddress)`
	`656`	`+ SendEvent.Contacts -> setSendEffect(SendEffect.NavigateToComingSoon)`
`656`	`657`	`}`
`657`	`658`	`}`
`658`	`659`	`}`
`@@ -2191,6 +2192,7 @@ sealed class SendEffect {`
`2191`	`2192`	`data object NavigateToQuickPay : SendEffect()`
`2192`	`2193`	`data object NavigateToFee : SendEffect()`
`2193`	`2194`	`data object NavigateToFeeCustom : SendEffect()`
	`2195`	`+ data object NavigateToComingSoon : SendEffect()`
`2194`	`2196`	`data class PaymentSuccess(val sheet: NewTransactionSheetDetails? = null) : SendEffect()`
`2195`	`2197`	`}`
`2196`	`2198`
`@@ -2231,6 +2233,7 @@ sealed interface SendEvent {`
`2231`	`2233`	`data object ClearPayConfirmation : SendEvent`
`2232`	`2234`	`data object BackToAmount : SendEvent`
`2233`	`2235`	`data object NavToAddress : SendEvent`
	`2236`	`+ data object Contacts : SendEvent`
`2234`	`2237`	`}`
`2235`	`2238`
`2236`	`2239`	`sealed interface LnurlParams {`