-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
💲[Native Checkout] Update pledge button copy #788
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
bfda264
Update pledge button copy
justinswart 2c8c6a6
SwiftFormat
justinswart b979661
Merge branch 'master' into pledge-button-copy-update
justinswart 87db665
Remove unused argument
justinswart 678b91e
Merge branch 'master' into pledge-button-copy-update
justinswart 3e7eb13
Update snapshots
justinswart File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -192,14 +192,14 @@ final class RewardCardContainerViewModelTests: TestCase { | |
self.pledgeButtonEnabled.assertValues([true, true, true, true, false, false, false, true]) | ||
self.pledgeButtonHidden.assertValues([false, false, false, false, false, false, false, false]) | ||
self.pledgeButtonTitleText.assertValues([ | ||
"Pledge £6 or more", | ||
"Pledge £6 or more", | ||
"Pledge £6 or more", | ||
"Pledge £6 or more", | ||
"Select", | ||
"Select", | ||
"Select", | ||
"Select", | ||
"No longer available", | ||
"No longer available", | ||
"No longer available", | ||
"Pledge £1 or more" | ||
"Make a pledge without a reward" | ||
]) | ||
} | ||
|
||
|
@@ -234,14 +234,14 @@ final class RewardCardContainerViewModelTests: TestCase { | |
self.pledgeButtonEnabled.assertValues([true, true, true, true, false, false, false, true]) | ||
self.pledgeButtonHidden.assertValues([false, false, false, false, false, false, false, false]) | ||
self.pledgeButtonTitleText.assertValues([ | ||
"Pledge £6 or more", | ||
"Pledge £6 or more", | ||
"Pledge £6 or more", | ||
"Pledge £6 or more", | ||
"Select", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Here too. |
||
"Select", | ||
"Select", | ||
"Select", | ||
"No longer available", | ||
"No longer available", | ||
"No longer available", | ||
"Pledge £1 or more" | ||
"Make a pledge without a reward" | ||
]) | ||
} | ||
|
||
|
Binary file modified
BIN
-2.31 KB
(97%)
...ackedProject_LoggedIn_AvailableLimitedReward_lang_en_device_phone4_7inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.31 KB
(97%)
...ect_LoggedIn_AvailableLimitedTimebasedReward_lang_en_device_phone4_7inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.18 KB
(97%)
...edProject_LoggedIn_AvailableNonLimitedReward_lang_en_device_phone4_7inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.18 KB
(97%)
...ject_LoggedIn_AvailableShippingEnabledReward_lang_en_device_phone4_7inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.32 KB
(97%)
...kedProject_LoggedIn_AvailableTimebasedReward_lang_en_device_phone4_7inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+2.33 KB
(100%)
.../testLive_NonBackedProject_LoggedIn_NoReward_lang_en_device_phone4_7inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.31 KB
(97%)
...ckedProject_LoggedOut_AvailableLimitedReward_lang_en_device_phone4_7inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.31 KB
(97%)
...ct_LoggedOut_AvailableLimitedTimebasedReward_lang_en_device_phone4_7inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.18 KB
(97%)
...dProject_LoggedOut_AvailableNonLimitedReward_lang_en_device_phone4_7inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.18 KB
(97%)
...ect_LoggedOut_AvailableShippingEnabledReward_lang_en_device_phone4_7inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.32 KB
(97%)
...edProject_LoggedOut_AvailableTimebasedReward_lang_en_device_phone4_7inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+2.33 KB
(100%)
...testLive_NonBackedProject_LoggedOut_NoReward_lang_en_device_phone4_7inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.02 KB
(99%)
...llerTests/testRewards_NonBacker_LiveProject_Landscape_lang_de_device_pad@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-1.83 KB
(98%)
.../testRewards_NonBacker_LiveProject_Landscape_lang_de_device_phone4_7inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-1.88 KB
(98%)
.../testRewards_NonBacker_LiveProject_Landscape_lang_de_device_phone5_8inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.44 KB
(99%)
...llerTests/testRewards_NonBacker_LiveProject_Landscape_lang_en_device_pad@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.32 KB
(98%)
.../testRewards_NonBacker_LiveProject_Landscape_lang_en_device_phone4_7inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.49 KB
(98%)
.../testRewards_NonBacker_LiveProject_Landscape_lang_en_device_phone5_8inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.5 KB
(99%)
...llerTests/testRewards_NonBacker_LiveProject_Landscape_lang_es_device_pad@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.13 KB
(98%)
.../testRewards_NonBacker_LiveProject_Landscape_lang_es_device_phone4_7inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.25 KB
(98%)
.../testRewards_NonBacker_LiveProject_Landscape_lang_es_device_phone5_8inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-3.16 KB
(98%)
...llerTests/testRewards_NonBacker_LiveProject_Landscape_lang_fr_device_pad@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.83 KB
(97%)
.../testRewards_NonBacker_LiveProject_Landscape_lang_fr_device_phone4_7inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-3.07 KB
(97%)
.../testRewards_NonBacker_LiveProject_Landscape_lang_fr_device_phone5_8inch@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.98 KB
(98%)
...llerTests/testRewards_NonBacker_LiveProject_Landscape_lang_ja_device_pad@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-2.69 KB
(97%)
.../testRewards_NonBacker_LiveProject_Landscape_lang_ja_device_phone4_7inch@2x.png
Oops, something went wrong.
Binary file modified
BIN
-2.89 KB
(97%)
.../testRewards_NonBacker_LiveProject_Landscape_lang_ja_device_phone5_8inch@2x.png
Oops, something went wrong.
Binary file modified
BIN
-1.82 KB
(99%)
...ViewControllerTests/testRewards_NonBacker_LiveProject_lang_de_device_pad@2x.png
Oops, something went wrong.
Binary file modified
BIN
-1.64 KB
(97%)
...ollerTests/testRewards_NonBacker_LiveProject_lang_de_device_phone4_7inch@2x.png
Oops, something went wrong.
Binary file modified
BIN
-1.66 KB
(98%)
...ollerTests/testRewards_NonBacker_LiveProject_lang_de_device_phone5_8inch@2x.png
Oops, something went wrong.
Binary file modified
BIN
-2.48 KB
(98%)
...ViewControllerTests/testRewards_NonBacker_LiveProject_lang_en_device_pad@2x.png
Oops, something went wrong.
Binary file modified
BIN
-2.3 KB
(96%)
...ollerTests/testRewards_NonBacker_LiveProject_lang_en_device_phone4_7inch@2x.png
Oops, something went wrong.
Binary file modified
BIN
-2.36 KB
(97%)
...ollerTests/testRewards_NonBacker_LiveProject_lang_en_device_phone5_8inch@2x.png
Oops, something went wrong.
Binary file modified
BIN
-2.19 KB
(99%)
...ViewControllerTests/testRewards_NonBacker_LiveProject_lang_es_device_pad@2x.png
Oops, something went wrong.
Binary file modified
BIN
-2.15 KB
(97%)
...ollerTests/testRewards_NonBacker_LiveProject_lang_es_device_phone4_7inch@2x.png
Oops, something went wrong.
Binary file modified
BIN
-2.19 KB
(97%)
...ollerTests/testRewards_NonBacker_LiveProject_lang_es_device_phone5_8inch@2x.png
Oops, something went wrong.
Binary file modified
BIN
-2.93 KB
(98%)
...ViewControllerTests/testRewards_NonBacker_LiveProject_lang_fr_device_pad@2x.png
Oops, something went wrong.
Binary file modified
BIN
-2.78 KB
(96%)
...ollerTests/testRewards_NonBacker_LiveProject_lang_fr_device_phone4_7inch@2x.png
Oops, something went wrong.
Binary file modified
BIN
-2.82 KB
(96%)
...ollerTests/testRewards_NonBacker_LiveProject_lang_fr_device_phone5_8inch@2x.png
Oops, something went wrong.
Binary file modified
BIN
-2.45 KB
(98%)
...ViewControllerTests/testRewards_NonBacker_LiveProject_lang_ja_device_pad@2x.png
Oops, something went wrong.
Binary file modified
BIN
-2.43 KB
(96%)
...ollerTests/testRewards_NonBacker_LiveProject_lang_ja_device_phone4_7inch@2x.png
Oops, something went wrong.
Binary file modified
BIN
-2.52 KB
(96%)
...ollerTests/testRewards_NonBacker_LiveProject_lang_ja_device_phone5_8inch@2x.png
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we use
Strings.Select()
,Strings.No_longer_available()
, andStrings.Make_a_pledge_without_a_reward()
instead?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So this is an interesting question. I realize we've been fairly inconsistent in tests with this but I'd like to actually do a sweep sometime to change every
String
assertion to be explicit rather than throughStrings.*
. I think the reason being that if the underlying string changes we'd actually want our tests to fail and for us to validate whether the test needs to be updated 🤔cc @Scollaco @ifbarrera for discussion.