Skip to content
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

Fix minor pledge screen issues #815

Merged
merged 6 commits into from
Aug 27, 2019

Conversation

dusi
Copy link
Contributor

@dusi dusi commented Aug 23, 2019

📲 What

Fixes

  • Shipping location button styles
  • Dims pledge screen's dismiss button when shipping location picker is presented
  • Enables elasticity for when the card still fits the screen

🤔 Why

UI improvements

👀 See

Focus on the X button in the navigation bar (previously we did not dim it which made it look tap-able but since the picker takes over the screen that's not the case - this could be very confusing to the user). The other visual change was done to the Cancel and Done button, which now look more like buttons, don't support Dynamic Type (for consistency with the rest of the codebase) and are consistent with our styles/colors.

Before 🐛 After 🦋
Screen Shot 2019-08-23 at 1 02 55 PM Screen Shot 2019-08-23 at 12 53 44 PM

✅ Acceptance criteria

  • The X button on the pledge screen dims when shipping location picker is presented
  • The X button on the pledge screen reverts back to normal when shipping location picker is
    dismissed using the Cancel button
  • The X button on the pledge screen reverts back to normal when shipping location picker is dismissed using the Done button

@dusi dusi assigned ifbarrera and jamielynnroth and unassigned ifbarrera Aug 23, 2019
@dusi dusi requested a review from cdolm92 August 26, 2019 14:42
@dusi dusi added the blocked a PR that is blocked for external reasons label Aug 26, 2019
@dusi
Copy link
Contributor Author

dusi commented Aug 26, 2019

Blocked for now until we release 3.20.0

@dusi
Copy link
Contributor Author

dusi commented Aug 27, 2019

Let's actually try to squeeze it in the release (we've already dome some tweaks to DeprecatedRewardsPledgeScreen so this should not add too much overhead

@dusi dusi added needs review and removed blocked a PR that is blocked for external reasons labels Aug 27, 2019
@dusi dusi assigned cdolm92 and unassigned jamielynnroth Aug 27, 2019
@@ -352,6 +352,7 @@ internal final class DeprecatedRewardPledgeViewController: UIViewController {
|> UIScrollView.lens.layoutMargins .~ .init(leftRight: Styles.grid(2))
|> UIScrollView.lens.delaysContentTouches .~ false
|> UIScrollView.lens.keyboardDismissMode .~ .interactive
|> \.alwaysBounceVertical .~ true
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also fixed in #819

@cdolm92
Copy link
Contributor

cdolm92 commented Aug 27, 2019

For the second ACs of: "The X button on the pledge screen reverts back to normal when shipping location picker is dismissed" this only happens when the Cancel button is tapped. The X is still dimmed when Done is tapped to dismiss the picker. Is that expected?

Copy link
Contributor

@cdolm92 cdolm92 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Pavel this is g2g!!🛳🛳🛳

@dusi dusi merged commit 09190ba into master Aug 27, 2019
@dusi dusi deleted the fix-deprecated-pledge-screen-bottom-margin branch August 27, 2019 17:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants