[NT-363] Select a new reward #894
Conversation
# Conflicts: # Screenshots/_64/Kickstarter_Framework_iOSTests.PledgeViewControllerTests/testView_UpdateContext_lang_de_device_pad@2x.png # Screenshots/_64/Kickstarter_Framework_iOSTests.PledgeViewControllerTests/testView_UpdateContext_lang_de_device_phone4_7inch@2x.png # Screenshots/_64/Kickstarter_Framework_iOSTests.PledgeViewControllerTests/testView_UpdateContext_lang_es_device_pad@2x.png # Screenshots/_64/Kickstarter_Framework_iOSTests.PledgeViewControllerTests/testView_UpdateContext_lang_es_device_phone4_7inch@2x.png # Screenshots/_64/Kickstarter_Framework_iOSTests.PledgeViewControllerTests/testView_UpdateContext_lang_fr_device_pad@2x.png # Screenshots/_64/Kickstarter_Framework_iOSTests.PledgeViewControllerTests/testView_UpdateContext_lang_fr_device_phone4_7inch@2x.png # Screenshots/_64/Kickstarter_Framework_iOSTests.PledgeViewControllerTests/testView_UpdateContext_lang_ja_device_pad@2x.png # Screenshots/_64/Kickstarter_Framework_iOSTests.PledgeViewControllerTests/testView_UpdateContext_lang_ja_device_phone4_7inch@2x.png
Generated by 🚫 Danger |
|
@ifbarrera I'll update this to hide the payment methods. I think we'll still need the additional context for that because it looks like we do show the summary view with the thumbnail. |
justinswart
changed the base branch from
change-payment-method-mutation
to
master
# Conflicts: # Kickstarter-iOS/Views/Controllers/PledgeAmountSummaryViewController.swift # Library/PledgeViewContext.swift # Library/PledgeViewContextTests.swift # Library/ViewModels/PledgeViewModel.swift # Library/ViewModels/PledgeViewModelTests.swift # Screenshots/_64/Kickstarter_Framework_iOSTests.PledgeViewControllerTests/testView_ChangePaymentMethodContext_lang_de_device_phone4_7inch@2x.png # Screenshots/_64/Kickstarter_Framework_iOSTests.PledgeViewControllerTests/testView_ChangePaymentMethodContext_lang_en_device_phone4_7inch@2x.png # Screenshots/_64/Kickstarter_Framework_iOSTests.PledgeViewControllerTests/testView_ChangePaymentMethodContext_lang_fr_device_phone4_7inch@2x.png
# Conflicts: # Library/ViewModels/PledgeViewModelTests.swift
| @@ -163,8 +163,13 @@ private func shippingValue(of project: Project, with shippingRuleCost: Double) - | |||
| private func determineShippingRule(with project: Project, shippingRules: [ShippingRule]) -> ShippingRule? { | |||
| guard | |||
| let backing = project.personalization.backing, | |||
| let selectedRule = shippingRules.filter({ $0.location.id == backing.locationId }).first | |||
| let selectedRule = shippingRules.filter({ $0.location.id == backing.locationId }).first, | |||
| locationId(selectedRule.location.id, isValidIn: shippingRules) | |||
There was a problem hiding this comment.
I'm a little confused by this line that was added. Doesn't it do the same thing as line 166? 🤔
There was a problem hiding this comment.
Let's say you picked Reward A and selected Canada as your shipping location. Now if you're changing to Reward B it will pre-select Canada, but only if Reward B also ships to Canada. So the locationId(_:isValidIn:) check is this second bit of logic. If it fails it returns the default shipping rule.
|
|
||
| self.vm.inputs.shippingRuleSelected(.init(cost: 1, id: 1, location: .brooklyn)) | ||
|
|
||
| self.submitButtonEnabled.assertValues( |
There was a problem hiding this comment.
Should we also test for the behavior when the submit button is tapped? 🤔
There was a problem hiding this comment.
Ah yes, thanks.
| with: (amount: 690, min: 25.0, max: 10_000.0, isValid: true) | ||
| ) | ||
|
|
||
| self.submitButtonEnabled.assertValues([false, false], "Amount unchanged") |
There was a problem hiding this comment.
I might be missing something with this test, but why is the submit button disabled here? I would expect that because the VM is being configured with reward (which is different from project.backing.reward) that the submit button would be enabled because the pledge amount is between the min and max of the new reward. What am I missing here?
There was a problem hiding this comment.
The reward has shipping enabled so the way the validation rules are working is that a shipping rule needs to be selected in order to change the reward.
| self.vm.inputs.shippingRuleSelected(.init(cost: 1, id: 1, location: .brooklyn)) | ||
|
|
||
| self.submitButtonEnabled.assertValues([false, false], "Shipping rule and amount unchanged") | ||
| self.submitButtonEnabled.assertValues([false, false, false], "Shipping rule and amount unchanged") |
There was a problem hiding this comment.
Should we consider throwing a skipRepeats() on this output? 😅
There was a problem hiding this comment.
Maybe, but not right now 😅
📲 What
Continues work in #887, #893, #890. This is based off the branch of #893.
Adds yet another context to
PledgeViewModel,updateReward. Attempts to treat updating a reward the same as creating a new pledge, save for the fact that we make use of theUpdateBackingmutation.🤔 Why
This allows backers to update the reward that they've selected for a project.
🛠 How
updateRewardtoPledgeViewContext.PledgeShippingLocationViewModelto only return the currently selectedShippingRuleif the new reward also shared that location.PledgeAmountViewModelto return the initial value as being the minimum for the newly selected reward.PledgeViewModelto ignore values being the same when a new reward is being selected.✅ Acceptance criteria
Back a project using the correct environment and with the stars aligned, navigate to manage pledge, select Choose another reward from the context menu.
RewardsCollectionViewControlleris presented and allows you to select a different reward taking you to thePledgeViewController.* As mentioned in #893 the payment method does not have the correct default selection behaviour, although this may be the way that we'd prefer it for updating a reward.