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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: make pricing pages consistent #1567

Merged
merged 1 commit into from
Nov 6, 2023

Conversation

ShubhamPalriwala
Copy link
Contributor

What does this PR do?

Fixes #1565

Type of change

  • Bug fix (non-breaking change which fixes an issue)

Checklist

Required

  • Filled out the "How to test" section in this PR
  • Read How we Code at Formbricks
  • Self-reviewed my own code
  • Commented on my code in hard-to-understand bits
  • Ran pnpm build
  • Checked for warnings, there are none
  • Removed all console.logs
  • Merged the latest changes from main onto my branch with git pull origin main
  • My changes don't cause any responsiveness issues
  • First PR at Formbricks? Please sign the CLA! Without it we wont be able to merge it 馃檹

Appreciated

  • If a UI change was made: Added a screen recording or screenshots to this PR
  • Updated the Formbricks Docs if changes were necessary

Copy link

vercel bot commented Nov 3, 2023

The latest updates on your projects. Learn more about Vercel for Git 鈫楋笌

2 Ignored Deployments
Name Status Preview Updated (UTC)
formbricks-cloud 猬滐笍 Ignored (Inspect) Nov 3, 2023 9:03am
formbricks-com 猬滐笍 Ignored (Inspect) Nov 3, 2023 9:03am

@github-actions github-actions bot added the bug Something isn't working label Nov 3, 2023
Copy link
Contributor

github-actions bot commented Nov 3, 2023

Thank you for following the naming conventions for pull request titles! 馃檹

Copy link
Contributor

apps/web/app/(app)/environments/[environmentId]/settings/billing/components/PricingTable.tsx

There is a repetition of the same code block for setting the state of loadingCustomerPortal to true. This can be refactored to improve the readability of the code.
Create Issue

    const openCustomerPortal = async () => {
      setLoadingCustomerPortal(true);
      const sessionUrl = await manageSubscriptionAction(team.id, environmentId);
      router.push(sessionUrl);
    };

The error handling in the handleDeleteSubscription function can be improved by logging the error message. This will help in debugging and identifying the root cause of the error.
Create Issue

    const handleDeleteSubscription = async () => {
      try {
        if (!activeLookupKey) throw new Error("No active lookup key");
        await removeSubscriptionAction(team.id, environmentId, [activeLookupKey]);
        router.refresh();
        toast.success("Subscription deleted successfully");
      } catch (err) {
        console.error(err.message);
        toast.error("Unable to delete subscription");
      } finally {
        setOpenDeleteModal(false);
      }
    };

The paidFeatures prop in the PricingCard component can be refactored to improve readability. Instead of using a filter method inside the prop, you can create a variable before the return statement and use that variable as the prop value.
Create Issue

    const paidFeaturesInAppSurvey = coreAndWebAppSurveyFeatures.filter((feature) => {
      if (team.billing.features.inAppSurvey.unlimited) {
        return feature.unlimited !== false;
      } else {
        return feature.unlimited !== true;
      }
    });

    // In the return statement
    <PricingCard
      ...
      paidFeatures={paidFeaturesInAppSurvey}
      ...
    />

@mattinannt mattinannt added this pull request to the merge queue Nov 6, 2023
Merged via the queue into main with commit 2dc0350 Nov 6, 2023
14 checks passed
@mattinannt mattinannt deleted the shubham/make-pricing-pages-consistent branch November 6, 2023 08:50
kevinkong91 added a commit to kevinkong91/formbricks that referenced this pull request Nov 7, 2023
* main: (42 commits)
  chore: add revert to oss-friends (formbricks#745)
  fix: pass authOptions to getServerSession in authLayout (formbricks#1584)
  fix: fixed URL example for "Create Survey" API endpoint is wrong formbricks#1555 (formbricks#1586)
  fix(docs): default account info docs changes (formbricks#1583)
  chore: Add docker packages to Github Packages on release (formbricks#1585)
  feat: avatar upload (formbricks#1546)
  fix: editor crashing (formbricks#1582)
  fix: Add scroll to the setting navbar  (formbricks#1398)
  are you sure modal missing fix:formbricks#1419 (formbricks#1485)
  fix: github linting issues (formbricks#1510)
  refactor: added authorization to airtable integration and create a common actions file (formbricks#1538)
  docs: add docs for airtable (formbricks#1541)
  fix: missing static generation store in revalidation due to pages dir (formbricks#1581)
  feat: Pagination for other values in multi choice (formbricks#1560)
  feat:  $199 pricing model for unlimited plans (formbricks#1564)
  fix: make pricing pages consistent (formbricks#1567)
  fix: openText issue (formbricks#1579)
  fix: avoid blocking the request if it does not have an associated ip (formbricks#1540)
  feat: Add Unkey to OSS Friends (formbricks#1574)
  feat: FOR-683 Role Switch (formbricks#1450)
  ...
kevinkong91 added a commit to kevinkong91/formbricks that referenced this pull request Nov 7, 2023
* main: (70 commits)
  chore: add revert to oss-friends (formbricks#745)
  fix: pass authOptions to getServerSession in authLayout (formbricks#1584)
  fix: fixed URL example for "Create Survey" API endpoint is wrong formbricks#1555 (formbricks#1586)
  fix(docs): default account info docs changes (formbricks#1583)
  chore: Add docker packages to Github Packages on release (formbricks#1585)
  feat: avatar upload (formbricks#1546)
  fix: editor crashing (formbricks#1582)
  fix: Add scroll to the setting navbar  (formbricks#1398)
  are you sure modal missing fix:formbricks#1419 (formbricks#1485)
  fix: github linting issues (formbricks#1510)
  refactor: added authorization to airtable integration and create a common actions file (formbricks#1538)
  docs: add docs for airtable (formbricks#1541)
  fix: missing static generation store in revalidation due to pages dir (formbricks#1581)
  feat: Pagination for other values in multi choice (formbricks#1560)
  feat:  $199 pricing model for unlimited plans (formbricks#1564)
  fix: make pricing pages consistent (formbricks#1567)
  fix: openText issue (formbricks#1579)
  fix: avoid blocking the request if it does not have an associated ip (formbricks#1540)
  feat: Add Unkey to OSS Friends (formbricks#1574)
  feat: FOR-683 Role Switch (formbricks#1450)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Misleading pricing page: File Upload and potentially other features?
2 participants