Show backed amount total (#810)

* Show total backed amount * Fix tests
kickstarter · Aug 21, 2019 · 4554b82 · 4554b82
1 parent 861ea22
commit 4554b82
Show file tree

Hide file tree

Showing 28 changed files with 5 additions and 19 deletions.
diff --git a/Library/SharedFunctions.swift b/Library/SharedFunctions.swift
@@ -201,12 +201,8 @@ public func formattedAmountForRewardOrBacking(
       omitCurrencyCode: project.stats.omitUSCurrencyCode
     )
   case let .right(backing):
-    let amount = backing.amount
-    let backingAmount = floor(amount) == backing.amount
-      ? String(Int(amount))
-      : String(format: "%.2f", backing.amount)
     return Format.formattedCurrency(
-      backingAmount,
+      backing.amount,
       country: project.country,
       omitCurrencyCode: project.stats.omitUSCurrencyCode
     )

diff --git a/Library/ViewModels/PledgeCTAContainerViewViewModel.swift b/Library/ViewModels/PledgeCTAContainerViewViewModel.swift
@@ -125,11 +125,9 @@ private func subtitle(project: Project, pledgeState: PledgeStateCTAType) -> Stri
 
   if pledgeState == .fix { return pledgeState.subtitleLabel ?? "" }
 
-  let basicPledge = formattedAmount(for: backing)
-  let amount = Format.formattedCurrency(
-    basicPledge,
-    country: project.country,
-    omitCurrencyCode: project.stats.omitUSCurrencyCode
+  let amount = formattedAmountForRewardOrBacking(
+    project: project,
+    rewardOrBacking: .right(backing)
   )
 
   let reward = backing.reward
@@ -139,11 +137,3 @@ private func subtitle(project: Project, pledgeState: PledgeStateCTAType) -> Stri
   guard let rewardTitle = reward.title else { return "\(amount)" }
   return "\(amount) • \(rewardTitle)"
 }
-
-private func formattedAmount(for backing: Backing) -> String {
-  let amount = backing.amount - Double(backing.shippingAmount ?? 0)
-  let backingAmount = floor(amount) == amount
-    ? String(Int(amount))
-    : String(format: "%.2f", backing.amount)
-  return backingAmount
-}
diff --git a/Library/ViewModels/PledgeCTAContainerViewViewModelTests.swift b/Library/ViewModels/PledgeCTAContainerViewViewModelTests.swift
@@ -47,7 +47,7 @@ internal final class PledgeCTAContainerViewViewModelTests: TestCase {
     self.buttonStyleType.assertValues([ButtonStyleType.blue])
     self.buttonTitleText.assertValues([Strings.Manage()])
     self.titleText.assertValues([Strings.Youre_a_backer()])
-    self.subtitleText.assertValues(["$8 • Magic Lamp"])
+    self.subtitleText.assertValues(["$10 • Magic Lamp"])
     self.spacerIsHidden.assertValues([false])
     self.stackViewIsHidden.assertValues([false])
   }

diff --git a/...estLoggedIn_Backer_LiveProject_NativeCheckout_Enabled_lang_de_device_pad@2x.png b/...estLoggedIn_Backer_LiveProject_NativeCheckout_Enabled_lang_de_device_pad@2x.png
diff --git a/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_de_device_phone4_7inch@2x.png b/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_de_device_phone4_7inch@2x.png
diff --git a/...edIn_Backer_LiveProject_NativeCheckout_Enabled_lang_de_device_phone4inch@2x.png b/...edIn_Backer_LiveProject_NativeCheckout_Enabled_lang_de_device_phone4inch@2x.png
diff --git a/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_de_device_phone5_5inch@2x.png b/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_de_device_phone5_5inch@2x.png
diff --git a/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_de_device_phone5_8inch@2x.png b/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_de_device_phone5_8inch@2x.png
diff --git a/...estLoggedIn_Backer_LiveProject_NativeCheckout_Enabled_lang_en_device_pad@2x.png b/...estLoggedIn_Backer_LiveProject_NativeCheckout_Enabled_lang_en_device_pad@2x.png
diff --git a/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_en_device_phone4_7inch@2x.png b/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_en_device_phone4_7inch@2x.png
diff --git a/...edIn_Backer_LiveProject_NativeCheckout_Enabled_lang_en_device_phone4inch@2x.png b/...edIn_Backer_LiveProject_NativeCheckout_Enabled_lang_en_device_phone4inch@2x.png
diff --git a/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_en_device_phone5_5inch@2x.png b/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_en_device_phone5_5inch@2x.png
diff --git a/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_en_device_phone5_8inch@2x.png b/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_en_device_phone5_8inch@2x.png
diff --git a/...estLoggedIn_Backer_LiveProject_NativeCheckout_Enabled_lang_es_device_pad@2x.png b/...estLoggedIn_Backer_LiveProject_NativeCheckout_Enabled_lang_es_device_pad@2x.png
diff --git a/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_es_device_phone4_7inch@2x.png b/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_es_device_phone4_7inch@2x.png
diff --git a/...edIn_Backer_LiveProject_NativeCheckout_Enabled_lang_es_device_phone4inch@2x.png b/...edIn_Backer_LiveProject_NativeCheckout_Enabled_lang_es_device_phone4inch@2x.png
diff --git a/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_es_device_phone5_5inch@2x.png b/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_es_device_phone5_5inch@2x.png
diff --git a/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_es_device_phone5_8inch@2x.png b/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_es_device_phone5_8inch@2x.png
diff --git a/...estLoggedIn_Backer_LiveProject_NativeCheckout_Enabled_lang_fr_device_pad@2x.png b/...estLoggedIn_Backer_LiveProject_NativeCheckout_Enabled_lang_fr_device_pad@2x.png
diff --git a/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_fr_device_phone4_7inch@2x.png b/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_fr_device_phone4_7inch@2x.png
diff --git a/...edIn_Backer_LiveProject_NativeCheckout_Enabled_lang_fr_device_phone4inch@2x.png b/...edIn_Backer_LiveProject_NativeCheckout_Enabled_lang_fr_device_phone4inch@2x.png
diff --git a/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_fr_device_phone5_5inch@2x.png b/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_fr_device_phone5_5inch@2x.png
diff --git a/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_fr_device_phone5_8inch@2x.png b/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_fr_device_phone5_8inch@2x.png
diff --git a/...estLoggedIn_Backer_LiveProject_NativeCheckout_Enabled_lang_ja_device_pad@2x.png b/...estLoggedIn_Backer_LiveProject_NativeCheckout_Enabled_lang_ja_device_pad@2x.png
diff --git a/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_ja_device_phone4_7inch@2x.png b/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_ja_device_phone4_7inch@2x.png
diff --git a/...edIn_Backer_LiveProject_NativeCheckout_Enabled_lang_ja_device_phone4inch@2x.png b/...edIn_Backer_LiveProject_NativeCheckout_Enabled_lang_ja_device_phone4inch@2x.png
diff --git a/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_ja_device_phone5_5inch@2x.png b/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_ja_device_phone5_5inch@2x.png
diff --git a/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_ja_device_phone5_8inch@2x.png b/...In_Backer_LiveProject_NativeCheckout_Enabled_lang_ja_device_phone5_8inch@2x.png