⚡️ Remove currency parameter from billing API

It let Stripe figure it out
baptisteArno · Nov 19, 2024 · 6088a56 · 6088a56
1 parent 05cc23e
commit 6088a56
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 76 deletions.
diff --git a/apps/builder/src/features/billing/api/createCheckoutSession.ts b/apps/builder/src/features/billing/api/createCheckoutSession.ts
@@ -18,7 +18,6 @@ export const createCheckoutSession = authenticatedProcedure
       email: z.string(),
       company: z.string(),
       workspaceId: z.string(),
-      currency: z.enum(["usd", "eur"]),
       plan: z.enum([Plan.STARTER, Plan.PRO]),
       returnUrl: z.string(),
       vat: z

diff --git a/apps/builder/src/features/billing/api/updateSubscription.ts b/apps/builder/src/features/billing/api/updateSubscription.ts
@@ -19,7 +19,6 @@ export const updateSubscription = authenticatedProcedure
       returnUrl: z.string(),
       workspaceId: z.string(),
       plan: z.enum([Plan.STARTER, Plan.PRO]),
-      currency: z.enum(["usd", "eur"]),
     }),
   )
   .output(

diff --git a/apps/builder/src/features/billing/components/ChangePlanForm.tsx b/apps/builder/src/features/billing/components/ChangePlanForm.tsx
@@ -68,9 +68,6 @@ export const ChangePlanForm = ({
     const newSubscription = {
       plan,
       workspaceId: workspace.id,
-      currency:
-        data?.subscription?.currency ??
-        (guessIfUserIsEuropean() ? "eur" : "usd"),
     } as const;
     if (workspace.stripeId) {
       updateSubscription({
@@ -82,15 +79,6 @@ export const ChangePlanForm = ({
     }
   };
 
-  const updateCurrency = (currency: "eur" | "usd") => {
-    if (preCheckoutPlan) {
-      setPreCheckoutPlan({
-        ...preCheckoutPlan,
-        currency,
-      });
-    }
-  };
-
   if (
     data?.subscription?.cancelDate ||
     data?.subscription?.status === "past_due"
@@ -129,7 +117,6 @@ export const ChangePlanForm = ({
             existingEmail={user?.email ?? undefined}
             existingCompany={user?.company ?? undefined}
             onClose={() => setPreCheckoutPlan(undefined)}
-            onCurrencyChange={updateCurrency}
           />
         </ParentModalProvider>
       )}
@@ -141,9 +128,7 @@ export const ChangePlanForm = ({
                 currentPlan={workspace.plan}
                 onPayClick={() => handlePayClick(Plan.STARTER)}
                 isLoading={isUpdatingSubscription}
-                currency={
-                  preCheckoutPlan?.currency ?? data.subscription?.currency
-                }
+                currency={data.subscription?.currency}
               />
             )}
 
@@ -152,9 +137,7 @@ export const ChangePlanForm = ({
                 currentPlan={workspace.plan}
                 onPayClick={() => handlePayClick(Plan.PRO)}
                 isLoading={isUpdatingSubscription}
-                currency={
-                  preCheckoutPlan?.currency ?? data.subscription?.currency
-                }
+                currency={data.subscription?.currency}
               />
             )}
           </HStack>

diff --git a/apps/builder/src/features/billing/components/PreCheckoutModal.tsx b/apps/builder/src/features/billing/components/PreCheckoutModal.tsx
@@ -27,12 +27,10 @@ export type PreCheckoutModalProps = {
     | {
         plan: "STARTER" | "PRO";
         workspaceId: string;
-        currency: "eur" | "usd";
       }
     | undefined;
   existingCompany?: string;
   existingEmail?: string;
-  onCurrencyChange: (currency: "eur" | "usd") => void;
   onClose: () => void;
 };
 
@@ -48,7 +46,6 @@ export const PreCheckoutModal = ({
   selectedSubscription,
   existingCompany,
   existingEmail,
-  onCurrencyChange,
   onClose,
 }: PreCheckoutModalProps) => {
   const { t } = useTranslate();
@@ -127,10 +124,6 @@ export const PreCheckoutModal = ({
     });
   };
 
-  const updateCurrency = (currency: "EUR" | "USD") => {
-    onCurrencyChange(currency.toLowerCase() as "eur" | "usd");
-  };
-
   return (
     <Modal isOpen={isDefined(selectedSubscription)} onClose={onClose}>
       <ModalOverlay />
@@ -172,16 +165,6 @@ export const PreCheckoutModal = ({
                 />
               </HStack>
             </FormControl>
-            <FormControl as={HStack} justify="space-between">
-              <FormLabel>Currency:</FormLabel>
-              {selectedSubscription && (
-                <DropdownList
-                  items={["USD", "EUR"]}
-                  currentItem={selectedSubscription.currency.toUpperCase()}
-                  onItemSelect={updateCurrency}
-                />
-              )}
-            </FormControl>
 
             <Button
               type="submit"

diff --git a/apps/builder/src/features/dashboard/components/DashboardPage.tsx b/apps/builder/src/features/dashboard/components/DashboardPage.tsx
@@ -11,7 +11,6 @@ import { useWorkspace } from "@/features/workspace/WorkspaceProvider";
 import { trpc } from "@/lib/trpc";
 import { Spinner, Stack, Text, VStack } from "@chakra-ui/react";
 import { useTranslate } from "@tolgee/react";
-import { guessIfUserIsEuropean } from "@typebot.io/billing/helpers/guessIfUserIsEuropean";
 import type { Plan } from "@typebot.io/prisma/enum";
 import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
@@ -51,20 +50,10 @@ export const DashboardPage = () => {
       setPreCheckoutPlan({
         plan: subscribePlan as "PRO" | "STARTER",
         workspaceId: workspace.id,
-        currency: guessIfUserIsEuropean() ? "eur" : "usd",
       });
     }
   }, [createCustomCheckoutSession, router.query, user, workspace]);
 
-  const updateCurrency = (currency: "eur" | "usd") => {
-    if (preCheckoutPlan) {
-      setPreCheckoutPlan({
-        ...preCheckoutPlan,
-        currency,
-      });
-    }
-  };
-
   return (
     <Stack minH="100vh">
       <Seo title={workspace?.name ?? t("dashboard.title")} />
@@ -76,7 +65,6 @@ export const DashboardPage = () => {
             existingEmail={user?.email ?? undefined}
             existingCompany={workspace?.name ?? undefined}
             onClose={() => setPreCheckoutPlan(undefined)}
-            onCurrencyChange={updateCurrency}
           />
         </ParentModalProvider>
       )}

diff --git a/apps/docs/openapi/builder.json b/apps/docs/openapi/builder.json
@@ -9309,13 +9309,6 @@
                   "workspaceId": {
                     "type": "string"
                   },
-                  "currency": {
-                    "type": "string",
-                    "enum": [
-                      "usd",
-                      "eur"
-                    ]
-                  },
                   "plan": {
                     "type": "string",
                     "enum": [
@@ -9346,7 +9339,6 @@
                   "email",
                   "company",
                   "workspaceId",
-                  "currency",
                   "plan",
                   "returnUrl"
                 ]
@@ -9447,20 +9439,12 @@
                       "STARTER",
                       "PRO"
                     ]
-                  },
-                  "currency": {
-                    "type": "string",
-                    "enum": [
-                      "usd",
-                      "eur"
-                    ]
                   }
                 },
                 "required": [
                   "returnUrl",
                   "workspaceId",
-                  "plan",
-                  "currency"
+                  "plan"
                 ]
               }
             }

diff --git a/packages/billing/src/api/createCheckoutSession.ts b/packages/billing/src/api/createCheckoutSession.ts
@@ -14,7 +14,6 @@ type Props = {
   email: string;
   company: string;
   plan: "STARTER" | "PRO";
-  currency: "usd" | "eur";
   vat?: {
     type: string;
     value: string;
@@ -28,7 +27,6 @@ export const createCheckoutSession = async ({
   email,
   company,
   plan,
-  currency,
   vat,
 }: Props) => {
   if (!env.STRIPE_SECRET_KEY)
@@ -92,7 +90,6 @@ export const createCheckoutSession = async ({
     customerId: customer.id,
     userId: user.id,
     workspaceId,
-    currency,
     plan,
     returnUrl,
   });

diff --git a/packages/billing/src/api/updateSubscription.ts b/packages/billing/src/api/updateSubscription.ts
@@ -13,15 +13,13 @@ type Props = {
   user: Pick<User, "email" | "id">;
   plan: "STARTER" | "PRO";
   returnUrl: string;
-  currency: "usd" | "eur";
 };
 
 export const updateSubscription = async ({
   workspaceId,
   user,
   plan,
   returnUrl,
-  currency,
 }: Props) => {
   if (!env.STRIPE_SECRET_KEY)
     throw new TRPCError({
@@ -125,7 +123,6 @@ export const updateSubscription = async ({
       customerId: workspace.stripeId,
       userId: user.id,
       workspaceId,
-      currency,
       plan,
       returnUrl,
     });

diff --git a/packages/billing/src/helpers/createCheckoutSessionUrl.ts b/packages/billing/src/helpers/createCheckoutSessionUrl.ts
@@ -4,15 +4,14 @@ import type Stripe from "stripe";
 type Props = {
   customerId: string;
   workspaceId: string;
-  currency: "usd" | "eur";
   plan: "STARTER" | "PRO";
   returnUrl: string;
   userId: string;
 };
 
 export const createCheckoutSessionUrl =
   (stripe: Stripe) =>
-  async ({ customerId, workspaceId, currency, plan, returnUrl }: Props) => {
+  async ({ customerId, workspaceId, plan, returnUrl }: Props) => {
     const session = await stripe.checkout.sessions.create({
       success_url: `${returnUrl}?stripe=${plan}&success=true`,
       cancel_url: `${returnUrl}?stripe=cancel`,
@@ -27,7 +26,6 @@ export const createCheckoutSessionUrl =
         workspaceId,
         plan,
       },
-      currency,
       billing_address_collection: "required",
       automatic_tax: { enabled: true },
       line_items: [