Skip to content
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
b84afee
fix: use Flow instead of LiveData when observing Work
HashEngineering May 6, 2025
7972260
fix: updates for components
HashEngineering Jun 6, 2025
684c697
remove duplicate setupRadioGroup method
HashEngineering Jun 11, 2025
d96c826
feat: add exists method
HashEngineering Jun 11, 2025
6450f28
feat: enable transaction metadata saving on prod flavor
HashEngineering Jun 12, 2025
c4fcb59
feat: build out saving historical data
HashEngineering Jun 12, 2025
29df3bd
fix: improve logging
HashEngineering Jun 12, 2025
41ffbb3
fix: enable reset wallet
HashEngineering Jun 23, 2025
9bb2756
fix: make TransactionMetadataDocument a data class
HashEngineering Jun 25, 2025
6c4a5af
fix: improve some functions for metadata
HashEngineering Jun 25, 2025
10f5eb9
fix: improve publish transaction metadata worker
HashEngineering Jun 25, 2025
e70f14b
fix: improve publish transaction metadata functions
HashEngineering Jun 25, 2025
8584b97
fix: update should save methods in DashPayConfig
HashEngineering Jun 25, 2025
e8649d2
fix: use dpp 2.0.0-TX-SNAPSHOT
HashEngineering Jun 25, 2025
7ea8749
fix: update save status and progress
HashEngineering Jul 1, 2025
98b7000
fix: last fixes for QA found issues
HashEngineering Jul 4, 2025
5bfef4b
fix: coderabbit issues
HashEngineering Jul 4, 2025
182a30c
fix: compile issues
HashEngineering Jul 6, 2025
40d0bb8
fix: remove commented code
HashEngineering Jul 7, 2025
b6d7af8
fix: remove unneeded argument
HashEngineering Jul 7, 2025
9b80a26
fix: remove unneeded nav graphs
HashEngineering Jul 7, 2025
d44869b
fix: remove unneeded nav graphs
HashEngineering Jul 7, 2025
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
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
coroutinesVersion = '1.6.4'
ok_http_version = '4.9.1'
dashjVersion = '21.1.8'
dppVersion = "1.7.6-SNAPSHOT"
dppVersion = "2.0.0-TX-SNAPSHOT"
hiltVersion = '2.53'
hiltCompilerVersion = '1.2.0'
hiltWorkVersion = '1.2.0'
Expand Down Expand Up @@ -76,5 +76,6 @@ allprojects {
mavenCentral()
maven { url 'https://jitpack.io' }
maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
maven { url 'https://central.sonatype.com/repository/maven-snapshots/' }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@ interface TransactionMetadataProvider {
markAddressAsync(address, false, TaxCategory.TransferIn, service)
}

/**
* check if the tx metadata table has metadata for the given tx.
*/
suspend fun exists(txId: Sha256Hash): Boolean

// Reset methods
suspend fun clear()
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.defaultMinSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
Expand Down Expand Up @@ -55,26 +53,27 @@ fun DashButton(
style == Style.Filled -> DashBlue
style == Style.FilledBlue -> DashBlue
style == Style.FilledRed -> MyTheme.Colors.red
style == Style.TintedBlue -> Color(0x0D008DE4)
style == Style.TintedBlue -> MyTheme.Colors.dashBlue5
style == Style.TintedGray -> Color(0x1AB0B6BC)
style == Style.TintedRed -> MyTheme.Colors.red5
style == Style.FilledWhiteBlue -> Color(0xFFFFFFFF)
style == Style.FilledWhiteBlue -> MyTheme.Colors.backgroundPrimary
style == Style.TintedWhite -> Color(0x1AFFFFFF)
style == Style.PlainRed -> MyTheme.Colors.red5
else -> Color.Transparent
}

val contentColor = when {
!isEnabled -> Color(0xFF191C1F).copy(alpha = 0.40f)
!isEnabled -> MyTheme.Colors.textPrimary.copy(alpha = 0.40f)
style == Style.Filled -> Color.White
style == Style.FilledBlue -> Color.White
style == Style.FilledRed -> Color.White
style == Style.TintedBlue -> DashBlue
style == Style.PlainBlue -> DashBlue
style == Style.PlainBlack -> Color(0xFF191C1F)
style == Style.PlainRed -> Color(0xFFEA3943)
style == Style.TintedRed -> Color(0xFFEA3943)
style == Style.TintedGray -> Color(0xFF191C1F)
style == Style.StrokeGray -> Color(0xFF191C1F)
style == Style.PlainBlack -> MyTheme.Colors.textPrimary
style == Style.PlainRed -> MyTheme.Colors.red
style == Style.TintedRed -> MyTheme.Colors.red
style == Style.TintedGray -> MyTheme.Colors.textPrimary
style == Style.StrokeGray -> MyTheme.Colors.textPrimary
style == Style.FilledWhiteBlue -> DashBlue
style == Style.TintedWhite -> Color.White

Expand Down Expand Up @@ -125,7 +124,6 @@ fun DashButton(
strokeWidth = 2.dp,
modifier = Modifier
.size(size.iconSize)
.padding(vertical = 2.dp)
)
Spacer(modifier = Modifier.width(size.paddingHorizontal))
}
Expand All @@ -134,7 +132,7 @@ fun DashButton(
text,
fontSize = size.fontSize,
lineHeight = size.lineSize,
fontFamily = MyTheme.InterFont,
fontFamily = MyTheme.interRegular,
fontWeight = FontWeight.SemiBold,
color = contentColor,
overflow = TextOverflow.Ellipsis,
Expand All @@ -155,7 +153,7 @@ fun DashButton(
}

enum class Style {
Plain,
Plain,
Outlined,
Filled,
FilledBlue,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import org.dash.wallet.common.R

@Composable
Expand All @@ -40,7 +38,8 @@ fun DashCheckbox(
Row(
modifier = modifier
.fillMaxWidth()
.clip(RoundedCornerShape(8.dp))
.defaultMinSize(minHeight = 50.dp)
//.clip(RoundedCornerShape(8.dp))
.background(Color.White)
.padding(horizontal = 10.dp, vertical = 8.dp)
.clickable(
Expand Down Expand Up @@ -107,7 +106,8 @@ fun DashCheckbox(
// Trailing text content
if (trailingText != null || trailingHelpText != null) {
Column(
verticalArrangement = Arrangement.Center
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.End
) {
trailingText?.let {
Text(
Expand Down Expand Up @@ -168,9 +168,20 @@ fun CheckboxSample() {
Column(
modifier = Modifier
.fillMaxWidth()
.background(Color.White)
.padding(16.dp),
verticalArrangement = Arrangement.spacedBy(16.dp)
) {

DashCheckbox(
checked = isChecked4,
onCheckedChange = { isChecked4 = it },
leadingIcon = R.drawable.ic_preview,
title = "text",
subtitle = "help text",
trailingText = "text",
trailingHelpText = "help text"
)
// Example 1: Simple checkbox with leading text
DashCheckbox(
checked = true,
Expand Down Expand Up @@ -200,7 +211,7 @@ fun CheckboxSample() {

// Example 1: Simple checkbox with leading text
DashCheckbox(
checked = isChecked,
checked = isChecked2,
onCheckedChange = { isChecked2 = it },
title = "Accept terms and conditions (Disabled)",
subtitle = "Required for account creation (1 line)",
Expand All @@ -210,20 +221,13 @@ fun CheckboxSample() {

// Example 1: Simple checkbox with long leading text
DashCheckbox(
checked = isChecked,
checked = isChecked3,
onCheckedChange = { isChecked3 = it },
title = "Accept terms and conditions",
subtitle = "Required for account creation and large downloads of information (two lines)."
)

// Example 2: Checkbox with both leading and trailing content
DashCheckbox(
checked = isChecked,
onCheckedChange = { isChecked4 = it },
title = "Promotional emails",
subtitle = "Receive updates and offers",
trailingText = "Optional",
trailingHelpText = "You can change this later"
)

}
}
Loading
Loading