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.

Sign up for GitHub

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

Jump to bottom

Show correct UI on plans page when there are inactive/multiple plans #4400

Merged
merged 25 commits into from Apr 11, 2023
Merged

Show correct UI on plans page when there are inactive/multiple plans #4400

merged 25 commits into from Apr 11, 2023

Conversation

LMNTL
Copy link
Contributor

@LMNTL LMNTL commented Apr 4, 2023 •
edited

Checklist

  1. If you've added code that should be tested, add tests
  2. If you've changed APIs, update (or create!) the documentation
  3. Ensure the tests pass
  4. Make sure that your code lints and that you've followed our coding style
  5. Write a description of your work suitable for publishing on our forum
  6. Mention any related issues in this repository (as #ISSUE) and in other repositories (as kobotoolbox/other#ISSUE)
  7. Open an issue in the docs if there are UI/UX changes

Description

Fixes an issue that caused the Plans page to falsely show the user as belonging to no plan when they had a subscription that wasn't active.

Related issues

Should also prevent this issue mentioned in PR#4385
Fixes issue where clicking 'Manage' and then hitting back would sometimes leave buttons uninteractable.
Fixes issue where plans were sometimes not displaying in proper order.
Makes the Plans page refresh subscriptions and other API data when navigating back/forward with bfcache enabled.

@LMNTL LMNTL requested a review from srartese April 5, 2023 16:35
srartese
srartese reviewed Apr 6, 2023
View reviewed changes
Copy link
Contributor

@srartese srartese left a comment

Choose a reason for hiding this comment

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

I really like the clean. I think it makes it way more readable. Thanks! I am going to pull in my branch and resolve any merge conflicts then if everything looks okay to you we should merge to my branch

jsapp/js/account/plan.component.tsx
}
return [];
};
return {
Copy link
Contributor

Choose a reason for hiding this comment

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

Great clean up!

srartese and others added 15 commits April 5, 2023 18:50
@srartese
Merge branch 'feature/add-subscription-tiers' of github.com:kobotoolb…
554de2a 
…ox/kpi into feature/billing-stripe-statuses

# Conflicts:
#	jsapp/js/account/plan.component.tsx
@LMNTL
clean up handling of button disabled state
9564b86
@LMNTL
use toasts instead of alert()
f96fcb6
@LMNTL
remove unnecessary/misleading null check
26ea732
@LMNTL
sort Products by lowest price (ascending)
7856980
@LMNTL
clarify unit_amount comment
deab387
@LMNTL
updated viewset description
7ee6293
@LMNTL
fix Upgrade not becoming uninteractable, make buttons only
54a1200 
 re-enable on error
@LMNTL
attempt to resolve browser state issues, fix typo
199f6f9
@LMNTL
update useEffect dependencies
e18c6e8
@LMNTL
remove useLocation and try pageshow event
ee88038
@LMNTL
re-fetch API data on back/forward
d69caf1
@LMNTL
Merge branch 'feature/add-subscription-tiers' into feature/billing-st…
ac0963e 
…ripe-statuses
@LMNTL
fix typo
03b7097
@LMNTL
update comment
985f84e
@LMNTL LMNTL marked this pull request as draft April 7, 2023 18:36
@LMNTL LMNTL marked this pull request as ready for review April 7, 2023 19:21
@LMNTL LMNTL merged commit 44d34b9 into feature/add-subscription-tiers Apr 11, 2023
4 checks passed
@LMNTL LMNTL deleted the feature/billing-stripe-statuses branch July 28, 2023 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@srartese srartese srartese left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@LMNTL @srartese