ABW-2899 - Icon added to deposit rules content in transaction review.…

… Icon for accept known fixed.
radixdlt · Jan 31, 2024 · f39fcb5 · f39fcb5
1 parent 5121f27
commit f39fcb5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/...droid/presentation/account/settings/thirdpartydeposits/AccountThirdPartyDepositsScreen.kt b/...droid/presentation/account/settings/thirdpartydeposits/AccountThirdPartyDepositsScreen.kt
@@ -2,6 +2,7 @@ package com.babylon.wallet.android.presentation.account.settings.thirdpartydepos
 
 import androidx.activity.compose.BackHandler
 import androidx.annotation.DrawableRes
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -300,7 +301,7 @@ fun getDepositRuleCopiesAndIcon(depositRule: Network.Account.OnLedgerSettings.Th
             Triple(
                 stringResource(id = R.string.accountSettings_thirdPartyDeposits_onlyKnown),
                 stringResource(id = R.string.accountSettings_thirdPartyDeposits_onlyKnownSubtitle),
-                com.babylon.wallet.android.designsystem.R.drawable.ic_accept_all,
+                com.babylon.wallet.android.designsystem.R.drawable.ic_accept_known,
             )
         }
 
@@ -335,7 +336,7 @@ fun DepositOptionItem(
         horizontalArrangement = Arrangement.spacedBy(RadixTheme.dimensions.paddingMedium)
     ) {
         icon?.let {
-            Icon(painter = painterResource(id = it), contentDescription = null)
+            Image(painter = painterResource(id = it), contentDescription = null)
         }
         Column(
             modifier = Modifier

diff --git a/.../wallet/android/presentation/transaction/composables/AccountDepositSettingsTypeContent.kt b/.../wallet/android/presentation/transaction/composables/AccountDepositSettingsTypeContent.kt
@@ -1,5 +1,6 @@
 package com.babylon.wallet.android.presentation.transaction.composables
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -68,16 +69,31 @@ fun AccountDepositSettingsTypeContent(
                             AccountDefaultDepositRule.ALLOW_EXISTING -> R.string.transactionReview_accountDepositSettings_acceptKnownRule
                         }
                     ).formattedSpans(boldStyle = SpanStyle(fontWeight = FontWeight.SemiBold, color = RadixTheme.colors.gray1))
+                    val icon = when (newRule) {
+                        AccountDefaultDepositRule.ACCEPT -> com.babylon.wallet.android.designsystem.R.drawable.ic_accept_all
+                        AccountDefaultDepositRule.REJECT -> com.babylon.wallet.android.designsystem.R.drawable.ic_deny_all
+                        AccountDefaultDepositRule.ALLOW_EXISTING -> com.babylon.wallet.android.designsystem.R.drawable.ic_accept_known
+                    }
                     val ruleBackgroundShape =
                         if (accountWithSettings.onlyDepositRuleChanged) RadixTheme.shapes.roundedRectBottomMedium else RectangleShape
-                    Text(
-                        text = ruleText,
-                        style = RadixTheme.typography.body1Regular,
+
+                    Row(
                         modifier = Modifier
                             .background(RadixTheme.colors.gray5, shape = ruleBackgroundShape)
                             .padding(RadixTheme.dimensions.paddingDefault),
-                        color = RadixTheme.colors.gray1
-                    )
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        Image(
+                            modifier = Modifier.padding(end = RadixTheme.dimensions.paddingDefault),
+                            painter = painterResource(id = icon),
+                            contentDescription = null
+                        )
+                        Text(
+                            text = ruleText,
+                            style = RadixTheme.typography.body1Regular,
+                            color = RadixTheme.colors.gray1
+                        )
+                    }
                 }
             }
         }