Merge branch 'main' of https://github.com/formbricks/formbricks into feat/estonian-language-surveys

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

apps/web/modules/ee/billing/actions.test.ts

@@ -106,10 +106,7 @@ describe("billing actions", () => {
     });
     expect(mocks.getOrganization).toHaveBeenCalledWith("org_1");
     expect(mocks.ensureStripeCustomerForOrganization).toHaveBeenCalledWith("org_1");
-    expect(mocks.reconcileCloudStripeSubscriptionsForOrganization).toHaveBeenCalledWith(
-      "org_1",
-      "start-hobby"
-    );
+    expect(mocks.reconcileCloudStripeSubscriptionsForOrganization).toHaveBeenCalledWith("org_1");
     expect(mocks.syncOrganizationBillingFromStripe).toHaveBeenCalledWith("org_1");
     expect(result).toEqual({ success: true });
   });
@@ -128,10 +125,7 @@ describe("billing actions", () => {
     } as any);
 
     expect(mocks.ensureStripeCustomerForOrganization).not.toHaveBeenCalled();
-    expect(mocks.reconcileCloudStripeSubscriptionsForOrganization).toHaveBeenCalledWith(
-      "org_1",
-      "start-hobby"
-    );
+    expect(mocks.reconcileCloudStripeSubscriptionsForOrganization).toHaveBeenCalledWith("org_1");
     expect(mocks.syncOrganizationBillingFromStripe).toHaveBeenCalledWith("org_1");
     expect(result).toEqual({ success: true });
   });
@@ -145,7 +139,7 @@ describe("billing actions", () => {
     expect(mocks.getOrganization).toHaveBeenCalledWith("org_1");
     expect(mocks.ensureStripeCustomerForOrganization).toHaveBeenCalledWith("org_1");
     expect(mocks.createProTrialSubscription).toHaveBeenCalledWith("org_1", "cus_1");
-    expect(mocks.reconcileCloudStripeSubscriptionsForOrganization).toHaveBeenCalledWith("org_1", "pro-trial");
+    expect(mocks.reconcileCloudStripeSubscriptionsForOrganization).toHaveBeenCalledWith("org_1");
     expect(mocks.syncOrganizationBillingFromStripe).toHaveBeenCalledWith("org_1");
     expect(result).toEqual({ success: true });
   });
@@ -165,7 +159,7 @@ describe("billing actions", () => {
 
     expect(mocks.ensureStripeCustomerForOrganization).not.toHaveBeenCalled();
     expect(mocks.createProTrialSubscription).toHaveBeenCalledWith("org_1", "cus_existing");
-    expect(mocks.reconcileCloudStripeSubscriptionsForOrganization).toHaveBeenCalledWith("org_1", "pro-trial");
+    expect(mocks.reconcileCloudStripeSubscriptionsForOrganization).toHaveBeenCalledWith("org_1");
     expect(mocks.syncOrganizationBillingFromStripe).toHaveBeenCalledWith("org_1");
     expect(result).toEqual({ success: true });
   });

apps/web/modules/ee/billing/actions.ts

@@ -216,7 +216,7 @@ export const startHobbyAction = authenticatedActionClient
       throw new ResourceNotFoundError("OrganizationBilling", parsedInput.organizationId);
     }
 
-    await reconcileCloudStripeSubscriptionsForOrganization(parsedInput.organizationId, "start-hobby");
+    await reconcileCloudStripeSubscriptionsForOrganization(parsedInput.organizationId);
     await syncOrganizationBillingFromStripe(parsedInput.organizationId);
     return { success: true };
   });
@@ -248,7 +248,7 @@ export const startProTrialAction = authenticatedActionClient
     }
 
     await createProTrialSubscription(parsedInput.organizationId, customerId);
-    await reconcileCloudStripeSubscriptionsForOrganization(parsedInput.organizationId, "pro-trial");
+    await reconcileCloudStripeSubscriptionsForOrganization(parsedInput.organizationId);
     await syncOrganizationBillingFromStripe(parsedInput.organizationId);
     return { success: true };
   });

apps/web/modules/ee/billing/api/lib/stripe-webhook.ts

@@ -150,7 +150,7 @@ export const webhookHandler = async (requestBody: string, stripeSignature: strin
       await handleSetupCheckoutCompleted(event.data.object, stripe);
     }
 
-    await reconcileCloudStripeSubscriptionsForOrganization(organizationId, event.id);
+    await reconcileCloudStripeSubscriptionsForOrganization(organizationId);
     await syncOrganizationBillingFromStripe(organizationId, {
       id: event.id,
       created: event.created,

apps/web/modules/ee/billing/lib/organization-billing.test.ts

@@ -1905,7 +1905,7 @@ describe("organization-billing", () => {
         items: [{ price: "price_hobby_monthly", quantity: 1 }],
         metadata: { organizationId: "org_1" },
       },
-      { idempotencyKey: "ensure-hobby-subscription-org_1-bootstrap" }
+      { idempotencyKey: "ensure-hobby-subscription-org_1-0" }
     );
     expect(mocks.prismaOrganizationBillingUpdate).toHaveBeenCalledWith({
       where: { organizationId: "org_1" },
@@ -1974,7 +1974,7 @@ describe("organization-billing", () => {
       ],
     });
 
-    await reconcileCloudStripeSubscriptionsForOrganization("org_1", "evt_123");
+    await reconcileCloudStripeSubscriptionsForOrganization("org_1");
 
     expect(mocks.subscriptionsCancel).toHaveBeenCalledWith("sub_hobby", { prorate: false });
     expect(mocks.subscriptionsCreate).not.toHaveBeenCalled();

apps/web/modules/ee/billing/lib/organization-billing.ts

@@ -458,18 +458,21 @@ const resolvePendingChangeEffectiveAt = (
 const ensureHobbySubscription = async (
   organizationId: string,
   customerId: string,
-  idempotencySuffix: string
+  subscriptionCount: number
 ): Promise<void> => {
   if (!stripeClient) return;
   const hobbyItems = await getCatalogItemsForPlan("hobby", "monthly");
 
+  // Include subscriptionCount so the key is stable across concurrent calls (same
+  // count → same key → Stripe deduplicates) but changes after a cancellation
+  // (count increases → new key → allows legitimate re-creation).
   await stripeClient.subscriptions.create(
     {
       customer: customerId,
       items: hobbyItems,
       metadata: { organizationId },
     },
-    { idempotencyKey: `ensure-hobby-subscription-${organizationId}-${idempotencySuffix}` }
+    { idempotencyKey: `ensure-hobby-subscription-${organizationId}-${subscriptionCount}` }
   );
 };
 
@@ -1264,8 +1267,7 @@ export const findOrganizationIdByStripeCustomerId = async (customerId: string):
 };
 
 export const reconcileCloudStripeSubscriptionsForOrganization = async (
-  organizationId: string,
-  idempotencySuffix = "reconcile"
+  organizationId: string
 ): Promise<void> => {
   const client = stripeClient;
   if (!IS_FORMBRICKS_CLOUD || !client) return;
@@ -1342,12 +1344,14 @@ export const reconcileCloudStripeSubscriptionsForOrganization = async (
     // (e.g. webhook + bootstrap) both seeing 0 and creating duplicate hobbies.
     const freshSubscriptions = await client.subscriptions.list({
       customer: customerId,
-      status: "active",
-      limit: 1,
+      status: "all",
+      limit: 20,
     });
 
-    if (freshSubscriptions.data.length === 0) {
-      await ensureHobbySubscription(organizationId, customerId, idempotencySuffix);
+    const freshActive = freshSubscriptions.data.filter((sub) => ACTIVE_SUBSCRIPTION_STATUSES.has(sub.status));
+
+    if (freshActive.length === 0) {
+      await ensureHobbySubscription(organizationId, customerId, freshSubscriptions.data.length);
     }
   }
 };
@@ -1355,6 +1359,6 @@ export const reconcileCloudStripeSubscriptionsForOrganization = async (
 export const ensureCloudStripeSetupForOrganization = async (organizationId: string): Promise<void> => {
   if (!IS_FORMBRICKS_CLOUD || !stripeClient) return;
   await ensureStripeCustomerForOrganization(organizationId);
-  await reconcileCloudStripeSubscriptionsForOrganization(organizationId, "bootstrap");
+  await reconcileCloudStripeSubscriptionsForOrganization(organizationId);
   await syncOrganizationBillingFromStripe(organizationId);
 };

apps/web/modules/ui/components/button/index.tsx

@@ -42,14 +42,14 @@ export interface ButtonProps
 }
 
 const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
-  ({ className, variant, size, loading, asChild = false, children, ...props }, ref) => {
+  ({ className, variant, size, loading, asChild = false, disabled, children, ...props }, ref) => {
     const Comp = asChild ? Slot : "button";
     return (
       <Comp
         className={cn(buttonVariants({ variant, size, loading, className }))}
-        disabled={loading}
         ref={ref}
-        {...props}>
+        {...props}
+        disabled={loading || disabled}>
         {loading ? (
           <>
             <Loader2 className="animate-spin" />

packages/surveys/locales/et.json

@@ -0,0 +1,85 @@
+{
+  "common": {
+    "and": "ja",
+    "apply": "rakenda",
+    "auto_close_wrapper": "Automaatse sulgemise ümbris",
+    "back": "Tagasi",
+    "close_survey": "Sulge küsitlus",
+    "company_logo": "Ettevõtte logo",
+    "finish": "Lõpeta",
+    "language_switch": "Keele vahetamine",
+    "next": "Edasi",
+    "no_results_found": "Tulemusi ei leitud",
+    "open_in_new_tab": "Ava uuel vahelehel",
+    "people_responded": "{count, plural, one {1 inimene vastas} other {{count} inimest vastas}}",
+    "please_retry_now_or_try_again_later": "Palun proovi uuesti kohe või hiljem.",
+    "powered_by": "Teenust pakub",
+    "privacy_policy": "Privaatsuspoliitika",
+    "protected_by_reCAPTCHA_and_the_Google": "Kaitstud reCAPTCHA ja Google'i poolt",
+    "question": "Küsimus",
+    "question_video": "Küsimuse video",
+    "required": "Kohustuslik",
+    "respondents_will_not_see_this_card": "Vastajad ei näe seda kaarti",
+    "retry": "Proovi uuesti",
+    "retrying": "Proovin uuesti…",
+    "search": "Otsi...",
+    "select_option": "Vali variant",
+    "select_options": "Vali variandid",
+    "sending_responses": "Vastuste saatmine…",
+    "takes_less_than_x_minutes": "{count, plural, one {Võtab vähem kui 1 minuti} other {Võtab vähem kui {count} minutit}}",
+    "takes_x_minutes": "{count, plural, one {Võtab 1 minuti} other {Võtab {count} minutit}}",
+    "takes_x_plus_minutes": "Võtab {count}+ minutit",
+    "terms_of_service": "Teenusetingimused",
+    "the_servers_cannot_be_reached_at_the_moment": "Serveritega ei saa hetkel ühendust.",
+    "they_will_be_redirected_immediately": "Nad suunatakse kohe ümber",
+    "your_feedback_is_stuck": "Sinu tagasiside on kinni jäänud :("
+  },
+  "errors": {
+    "all_options_must_be_ranked": "Palun järjesta kõik variandid",
+    "all_rows_must_be_answered": "Palun vasta kõikidele ridadele",
+    "file_extension_must_be": "Faililaiend peab olema {extension}",
+    "file_extension_must_not_be": "Faililaiend ei tohi olla {extension}",
+    "file_input": {
+      "duplicate_files": "Järgmised failid on juba üles laaditud: {duplicateNames}. Duplikaatfailid ei ole lubatud.",
+      "file_size_exceeded": "Järgmised failid ületavad maksimaalse suuruse {maxSizeInMB} MB ja eemaldati: {fileNames}",
+      "file_size_exceeded_alert": "Fail peab olema väiksem kui {maxSizeInMB} MB",
+      "no_valid_file_types_selected": "Ühtegi kehtivat failitüüpi pole valitud. Palun vali kehtiv failitüüp.",
+      "only_one_file_can_be_uploaded_at_a_time": "Korraga saab üles laadida ainult ühe faili.",
+      "placeholder_text": "Klõpsa või lohista failide üleslaadimiseks",
+      "upload_failed": "Üleslaadimine ebaõnnestus! Palun proovi uuesti.",
+      "uploading": "Üleslaadimine...",
+      "you_can_only_upload_a_maximum_of_files": "Saad üles laadida maksimaalselt {FILE_LIMIT} faili."
+    },
+    "invalid_device_error": {
+      "message": "Palun keela küsitluse seadetes rämpsposti kaitse, et jätkata selle seadmega.",
+      "title": "See seade ei toeta rämpsposti kaitset."
+    },
+    "invalid_format": "Palun sisesta kehtiv vorming",
+    "is_between": "Palun vali kuupäev vahemikus {startDate} kuni {endDate}",
+    "is_earlier_than": "Palun vali kuupäev enne {date}",
+    "is_greater_than": "Palun sisesta väärtus, mis on suurem kui {min}",
+    "is_later_than": "Palun vali kuupäev pärast {date}",
+    "is_less_than": "Palun sisesta väärtus, mis on väiksem kui {max}",
+    "is_not_between": "Palun vali kuupäev, mis ei jää vahemikku {startDate} kuni {endDate}",
+    "max_length": "Palun sisesta mitte rohkem kui {max} tähemärki",
+    "max_selections": "Palun vali mitte rohkem kui {max} varianti",
+    "max_value": "Palun sisesta väärtus, mis ei ole suurem kui {max}",
+    "min_length": "Palun sisesta vähemalt {min} tähemärki",
+    "min_selections": "Palun vali vähemalt {min} varianti",
+    "min_value": "Palun sisesta väärtus vähemalt {min}",
+    "minimum_options_ranked": "Palun järjesta vähemalt {min} varianti",
+    "minimum_rows_answered": "Palun vasta vähemalt {min} reale",
+    "please_enter_a_valid_email_address": "Palun sisesta kehtiv e-posti aadress",
+    "please_enter_a_valid_phone_number": "Palun sisesta kehtiv telefoninumber",
+    "please_enter_a_valid_url": "Palun sisesta kehtiv URL",
+    "please_fill_out_this_field": "Palun täida see väli",
+    "recaptcha_error": {
+      "message": "Sinu vastust ei saanud esitada, kuna see märgiti automatiseeritud tegevuseks. Kui sa hingad, palun proovi uuesti.",
+      "title": "Me ei suutnud kinnitada, et sa oled inimene."
+    },
+    "value_must_contain": "Väärtus peab sisaldama {value}",
+    "value_must_equal": "Väärtus peab võrduma {value}",
+    "value_must_not_contain": "Väärtus ei tohi sisaldada {value}",
+    "value_must_not_equal": "Väärtus ei tohi võrduda {value}"
+  }
+}

packages/surveys/src/lib/i18n.config.ts

@@ -6,6 +6,7 @@ import daTranslations from "../../locales/da.json";
 import deTranslations from "../../locales/de.json";
 import enTranslations from "../../locales/en.json";
 import esTranslations from "../../locales/es.json";
+import etTranslations from "../../locales/et.json";
 import frTranslations from "../../locales/fr.json";
 import hiTranslations from "../../locales/hi.json";
 import huTranslations from "../../locales/hu.json";
@@ -30,6 +31,7 @@ i18n
       "de",
       "en",
       "es",
+      "et",
       "fr",
       "hi",
       "hu",
@@ -50,6 +52,7 @@ i18n
       de: { translation: deTranslations },
       en: { translation: enTranslations },
       es: { translation: esTranslations },
+      et: { translation: etTranslations },
       fr: { translation: frTranslations },
       hi: { translation: hiTranslations },
       hu: { translation: huTranslations },