[NT-502] Fix pledge total & update pledge amount for No Reward backings #921
Conversation
β¦NT-502 # Conflicts: # Library/ViewModels/PledgeAmountViewModel.swift
| @@ -19,7 +21,6 @@ public protocol PledgeAmountViewModelInputs { | |||
| } | |||
|
|
|||
| public protocol PledgeAmountViewModelOutputs { | |||
| var amount: Signal<PledgeAmountData, Never> { get } | |||
There was a problem hiding this comment.
Renamed this output to something more descriptive.
| @@ -4,6 +4,8 @@ import Prelude | |||
| import ReactiveExtensions | |||
| import ReactiveSwift | |||
|
|
|||
| public typealias PledgeAmountData = (amount: Double, min: Double, max: Double, isValid: Bool) | |||
There was a problem hiding this comment.
This typealias was previously in PledgeViewModel for some reason. I thought it made more sense for it to live here.
| self.amount.map { $0.0 } | ||
| ) | ||
| .skipRepeats() | ||
| self.stepperValue = self.notifyDelegateAmountUpdated.map { $0.0 }.skipRepeats() |
There was a problem hiding this comment.
There's no real need to merge with minValue - this is already taken into account in notifyDelegateAmountUpdated.
| @@ -261,8 +259,9 @@ private func rounded(_ value: Double) -> Double { | |||
| return round(value * 100) / 100 | |||
| } | |||
|
|
|||
| private func initialPledgeAmount(from backing: Backing?, reward: Reward, minValue: Double) -> Double { | |||
| guard let backing = backing, reward.id == backing.rewardId else { return minValue } | |||
There was a problem hiding this comment.
Here, the bug was essentially that No Reward's rewardId in backing.rewardId comes back as nil, even though the "No reward" Reward object has an id of 0 Β―_(γ)_/Β―
Our shared function userIsBacking(reward) accounts for this, so using that fixed the issue.
There was a problem hiding this comment.
Ah very silly, thanks!
π² What
Fixes a bug where the "Update pledge amount" and "Change payment method" screens were displaying the incorrect pledge amount and totals on No Reward backings that have pledge amounts that are different from the reward minimum ($1).
π€ Why
Need to fix the πs
π How
There was a bug in the function in
PledgeAmountViewModelthat determines whether a user is backing a given reward, because of the strange structure of No Reward objects.Updating this logic to use our shared function
userIsBacking(reward:inProject)fixed this issue.I also added more robust tests.
π See
Change Payment Method screen
Update Pledge Amount screen
βΏοΈ Accessibility
N/A
π Performance
N/A
β Acceptance criteria
Backing with no shipping
Change payment method screen:
- Pledge amount should reflect the backing amount
- total should reflect the backing amount
Update pledge amount
- pledge amount should start at the backing amount
Backing with shipping
Change payment method screen:
- Pledge amount should reflect the backing amount, not including shipping
- shipping amount should reflect the selected shipping method amount
- total should reflect the total backing amount including shipping
Update pledge amount
- pledge amount should start at the backing amount
- shipping amount should start at the original shipping amount
No reward backing
Change payment method screen:
- Pledge amount should reflect the backing amount
- total should reflect the backing amount
Update pledge amount
- pledge amount should start at the backing amount
No reward backing where pledged amount is higher than min
Change payment method screen:
- Pledge amount should reflect the backing amount
- total should reflect the backing amount
Update pledge amount
- pledge amount should start at the backing amount