[NT-489] Default card selection improvement #931
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
justinswart
commented
Nov 5, 2019
| let cardIsSelected = cardAndSelectedCard | ||
| .map(==) | ||
| let cardIsSelected = Signal.merge( | ||
| creditCard.mapConst(false), |
There was a problem hiding this comment.
Emitting false here to ensure that the card has a title even though we're not setting a selected card.
| guard let cardBrand = card.type?.rawValue else { return nil } | ||
|
|
||
| let isAvailableCardType = availableCardTypes.contains(cardBrand) | ||
|
|
||
| return (card, isAvailableCardType, project.location.displayableName) | ||
| } | ||
|
|
||
| guard let backing = project.personalization.backing else { |
There was a problem hiding this comment.
If this project hasn't been backed then we do just select the first card.
Scollaco
reviewed
Nov 6, 2019
| backedCard = cards.first | ||
| } | ||
|
|
||
| return (data, backedCard) |
There was a problem hiding this comment.
Here I think we could simply use
let backedCard = cards.first(where: { $0.id == backing.paymentSource?.id })
There was a problem hiding this comment.
lol thanks that's much better
| func testReloadPaymentMethods_LoggedIn_ApplePayCapable_isTrue_BackedCardRemoved() { | ||
| let filteredCards = GraphUserCreditCard.template.storedCards.nodes | ||
| .filter { $0.id != GraphUserCreditCard.visa.id | ||
| } |
There was a problem hiding this comment.
Could you put the } on the same line?
| self.applePayButtonHidden.assertValues([false]) | ||
| self.reloadPaymentMethodsCards.assertValue(response.me.storedCards.nodes) | ||
| self.reloadPaymentMethodsAvailableCardTypes.assertValues([ | ||
| [true, true, true, true, true, false, true] |
There was a problem hiding this comment.
Why is there an unavailable card? 🤔
There was a problem hiding this comment.
This is just the Project template's available card types, I copied this test from the one above it.
Scollaco
approved these changes
Nov 6, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
📲 What
Fixes an issue where the first stored card was always selected in any context where the payment method could be set even when it was not used to back the project.
🤔 Why
Our logic for handling this was a bit shortsighted in that it would simply select the first card in the list every time. Instead we need to confirm that the card was in fact used to back the project and hasn't since been removed.
🛠 How
Updated our logic for this to take into account the
PaymentSourceof theBackingand if it's set, check that the card is still an available payment source.✅ Acceptance criteria
Confirmbutton should be disabled.