fixed issues with bonus amount being displayed incorrectly and being …

…unable to be decremented
kickstarter · Apr 2, 2024 · 0b1c376 · 0b1c376
1 parent cc0b55f
commit 0b1c376
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...main/java/com/kickstarter/ui/activities/compose/projectpage/ConfirmPledgeDetailsScreen.kt b/...main/java/com/kickstarter/ui/activities/compose/projectpage/ConfirmPledgeDetailsScreen.kt
@@ -685,7 +685,11 @@ fun ItemizedRewardListContainer(
 
             Row {
                 Text(
-                    text = stringResource(id = R.string.Bonus_support),
+                    text = stringResource(
+                        id =
+                        if (rewardsList.isNotEmpty()) R.string.Bonus_support
+                        else R.string.Pledge_without_a_reward
+                    ),
                     style = typography.subheadlineMedium,
                     color = colors.textSecondary
                 )

diff --git a/app/src/main/java/com/kickstarter/viewmodels/projectpage/ConfirmDetailsViewModel.kt b/app/src/main/java/com/kickstarter/viewmodels/projectpage/ConfirmDetailsViewModel.kt
@@ -99,6 +99,7 @@ class ConfirmDetailsViewModel(val environment: Environment) : ViewModel() {
         if (::projectData.isInitialized) {
             pledgeReason = pledgeDataAndPledgeReason(projectData, reward).second
         }
+        addedBonusSupport = 0.0
 
         updateShippingAmount()
 
@@ -230,7 +231,7 @@ class ConfirmDetailsViewModel(val environment: Environment) : ViewModel() {
     }
 
     fun decrementBonusSupport() {
-        if (addedBonusSupport - minStepAmount >= initialBonusSupport) {
+        if ((addedBonusSupport + initialBonusSupport) - minStepAmount >= initialBonusSupport) {
             addedBonusSupport -= minStepAmount
             totalAmount = calculateTotal()
             viewModelScope.launch {