diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionsFilterFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionsFilterFragment.kt index 04651769e46..047f977961a 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionsFilterFragment.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionsFilterFragment.kt @@ -18,6 +18,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.livedata.observeAsState import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow @@ -105,8 +106,9 @@ fun FilterScreen( CellSingleLineLawrenceSection( listOf { FilterDropdownCell( - title = stringResource(R.string.Market_Filter_Blockchains), - value = filterBlockchain?.name, + title = stringResource(R.string.Transactions_Filter_Blockchain), + value = filterBlockchain?.name ?: stringResource(id = R.string.Transactions_Filter_AllBlockchains) , + valueColor = if (filterBlockchain != null) ComposeAppTheme.colors.leah else ComposeAppTheme.colors.grey, onClick = { navController.slideFromRight(R.id.filterBlockchainFragment) } @@ -117,8 +119,9 @@ fun FilterScreen( CellSingleLineLawrenceSection( listOf { FilterDropdownCell( - title = stringResource(R.string.Transactions_Coins), - value = selectedCoinFilterTitle, + title = stringResource(R.string.Transactions_Filter_Coin), + value = selectedCoinFilterTitle ?: stringResource(id = R.string.Transactions_Filter_AllCoins) , + valueColor = if (filterBlockchain != null) ComposeAppTheme.colors.leah else ComposeAppTheme.colors.grey, onClick = { navController.slideFromRight(R.id.filterCoinFragment) } @@ -161,7 +164,8 @@ fun FilterScreen( @Composable private fun FilterDropdownCell( title: String, - value: String?, + value: String, + valueColor: Color, onClick: () -> Unit ) { Row( @@ -187,7 +191,7 @@ private fun FilterDropdownCell( text = value ?: stringResource(R.string.Any), maxLines = 1, style = ComposeAppTheme.typography.body, - color = if (value != null) ComposeAppTheme.colors.leah else ComposeAppTheme.colors.grey, + color = valueColor ) Icon( modifier = Modifier.padding(start = 4.dp), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d536fd5c8ae..f8b9dbaf25c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -710,7 +710,8 @@ from %s unlimited %s All - Filter by blockchain + Blockchain + Coin All Blockchains All Coins Choose Coin @@ -723,8 +724,7 @@ Transaction can not be parsed Multiple Filter - Coins - Hide Suspicious Txs + Hide suspicious tx Hiding incoming transactions with the dust amount in stablecoins, this partially solves the address poisoning attack problems.