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

Additional reward cards for point history #93

Merged
merged 2 commits into from
Apr 18, 2020
Merged

Conversation

tommypoa
Copy link
Contributor

What's new in this PR

  • Implemented 2 new types of reward cards for the Points History page
    • Reward redeemed card
    • Reward unlocked card

Relevant Links

  • NA

Related PRs

  • NA

How to review

  • See if it looks like the designs in Figma
  • Suggest ordering for the 3 types of reward cards

Next steps

  • Perhaps adding monthly date filtering

Tests Performed, Edge Cases

Screenshots

image

CC: @anniero98 @wangannie

@wangannie wangannie requested review from wangannie and thumn April 16, 2020 15:14
Copy link
Member

@wangannie wangannie left a comment

Choose a reason for hiding this comment

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

Great work Tommy! A couple of cleanup + reordering comments, but then I think it's good to go 👍

components/rewards/Transaction.js Outdated Show resolved Hide resolved
</Caption>
<Subhead>{`${pointsEarned} points earned`}</Subhead>
<Caption color={Colors.secondaryText}>
{`for ${displayDollarValue(totalSale || 0)} of healthy products`}
Copy link
Member

Choose a reason for hiding this comment

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

I know it was like this before but would this make more sense to be subtotal?

Copy link
Member

Choose a reason for hiding this comment

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

Oh nevermind I guess it makes sense that the number of points directly corresponds to the total sale (bc the rewards points are deducted?) but this language might not fit since they did actually pay more for the total healthy products...if that makes sense
cc @12aschen ?

Copy link
Collaborator

Choose a reason for hiding this comment

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

It's probably easiest to match what we do in Clerk (which I cannot currently recall) but I would guess this is a quacetion that we can defer. Just don't forget to check in on it 😅

screens/auth/AuthLoadingScreen.js Outdated Show resolved Hide resolved
navigation/AppNavigator.js Outdated Show resolved Hide resolved
Copy link
Member

@wangannie wangannie left a comment

Choose a reason for hiding this comment

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

LGTM!

@wangannie wangannie requested a review from annieyro April 18, 2020 18:12
Copy link
Collaborator

@annieyro annieyro left a comment

Choose a reason for hiding this comment

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

Looks good!! (': One thing before merge - didn't we need to update the rewardPointValue to 1500 in both repos?

@wangannie wangannie merged commit 036b191 into master Apr 18, 2020
@wangannie wangannie deleted the tommy/reward_cards branch April 18, 2020 19:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants