diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm index a544f58e..97a4c2aa 100644 Binary files a/app/release/baselineProfiles/0/app-release.dm and b/app/release/baselineProfiles/0/app-release.dm differ diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm index fe4da258..30efef50 100644 Binary files a/app/release/baselineProfiles/1/app-release.dm and b/app/release/baselineProfiles/1/app-release.dm differ diff --git a/app/release/bitchat-cashu.apk.zip b/app/release/bitchat-cashu.apk.zip index ebc08e6a..bdd519f1 100644 Binary files a/app/release/bitchat-cashu.apk.zip and b/app/release/bitchat-cashu.apk.zip differ diff --git a/app/src/main/java/com/bitchat/android/parsing/MessageComponents.kt b/app/src/main/java/com/bitchat/android/parsing/MessageComponents.kt index 50827073..80d3684a 100644 --- a/app/src/main/java/com/bitchat/android/parsing/MessageComponents.kt +++ b/app/src/main/java/com/bitchat/android/parsing/MessageComponents.kt @@ -95,7 +95,7 @@ fun TextRow(elements: List) { } /** - * Chip component for displaying Cashu payments inline + * Chip component for displaying Cashu payments inline pill */ @Composable fun CashuPaymentChip( @@ -132,7 +132,7 @@ fun CashuPaymentChip( // Top row: Bitcoin icon and "bitcoin" text Row( verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(2.dp) + horizontalArrangement = Arrangement.spacedBy(3.dp) ) { // Orange Bitcoin circle with symbol inside Box( @@ -146,9 +146,16 @@ fun CashuPaymentChip( ) { Text( text = "₿", - fontSize = 8.sp, + fontSize = 10.sp, color = Color(0xFF140C01), - fontFamily = FontFamily.Monospace + fontFamily = FontFamily.Monospace, + textAlign = TextAlign.Center, + style = androidx.compose.ui.text.TextStyle( + lineHeight = 10.sp, + platformStyle = androidx.compose.ui.text.PlatformTextStyle( + includeFontPadding = false + ) + ) ) } diff --git a/app/src/main/java/com/bitchat/android/wallet/ui/WalletScreen.kt b/app/src/main/java/com/bitchat/android/wallet/ui/WalletScreen.kt index 0913b3d1..3b0b5372 100644 --- a/app/src/main/java/com/bitchat/android/wallet/ui/WalletScreen.kt +++ b/app/src/main/java/com/bitchat/android/wallet/ui/WalletScreen.kt @@ -115,7 +115,8 @@ fun WalletScreen( 2 -> MintsScreen(viewModel = walletViewModel, modifier = Modifier.weight(1f)) 3 -> WalletSettings( viewModel = walletViewModel, - onBackClick = { /* No back action needed in tab navigation */ } + onBackClick = { /* No back action needed in tab navigation */ }, + modifier = Modifier.weight(1f) ) } diff --git a/app/src/main/java/com/bitchat/android/wallet/ui/WalletSettings.kt b/app/src/main/java/com/bitchat/android/wallet/ui/WalletSettings.kt index e6c3f809..d9476fea 100644 --- a/app/src/main/java/com/bitchat/android/wallet/ui/WalletSettings.kt +++ b/app/src/main/java/com/bitchat/android/wallet/ui/WalletSettings.kt @@ -22,22 +22,20 @@ import com.bitchat.android.wallet.viewmodel.WalletViewModel @Composable fun WalletSettings( viewModel: WalletViewModel = viewModel(), - onBackClick: () -> Unit = {} + onBackClick: () -> Unit = {}, + modifier: Modifier = Modifier ) { val colorScheme = MaterialTheme.colorScheme var showClearDataDialog by remember { mutableStateOf(false) } var showExportDialog by remember { mutableStateOf(false) } - Column( - modifier = Modifier + LazyColumn( + modifier = modifier .fillMaxSize() - .background(Color.Black) + .background(Color.Black), + contentPadding = PaddingValues(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp) ) { - LazyColumn( - modifier = Modifier.fillMaxSize(), - contentPadding = PaddingValues(16.dp), - verticalArrangement = Arrangement.spacedBy(16.dp) - ) { // Wallet Info Section item { SettingsSection(title = "Wallet Information") { @@ -165,7 +163,6 @@ fun WalletSettings( } } } - } // Clear Data Confirmation Dialog if (showClearDataDialog) {