fix: logic jump (#4501)

Co-authored-by: Anshuman Pandey <54475686+pandeymangg@users.noreply.github.com>

.env.example

@@ -185,4 +185,7 @@ UNSPLASH_ACCESS_KEY=
 # AI_AZURE_RESSOURCE_NAME=
 # AI_AZURE_API_KEY=
 # AI_AZURE_EMBEDDINGS_DEPLOYMENT_ID=
-# AI_AZURE_LLM_DEPLOYMENT_ID=
+# AI_AZURE_LLM_DEPLOYMENT_ID=
+
+# NEXT_PUBLIC_INTERCOM_APP_ID=
+# INTERCOM_SECRET_KEY=

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -29,4 +29,4 @@ body:
         ### Additional resources 🤓
 
         - Check out our [Contributor Docs](https://formbricks.com/docs/developer-docs/contributing/get-started)
-        - Anything unclear? [Ask in Discord](https://formbricks.com/discord)
+        - Anything unclear? [Ask in Github Discussions](https://github.com/formbricks/formbricks/discussions)

.github/workflows/e2e.yml

@@ -60,7 +60,8 @@ jobs:
 
       - name: Apply Prisma Migrations
         run: |
-          pnpm prisma migrate deploy
+          # pnpm prisma migrate deploy
+          pnpm db:migrate:dev
 
       - name: Run App
         run: |

.github/workflows/release-docker-github-data-migration.yml

@@ -23,6 +23,14 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
+      # https://github.com/docker/setup-qemu-action
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      # https://github.com/docker/setup-buildx-action
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Install cosign
         if: github.event_name != 'pull_request'
         uses: sigstore/cosign-installer@v3.5.0
@@ -48,6 +56,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
+          platforms: linux/amd64,linux/arm64
           file: ./packages/database/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}

.github/workflows/welcome-new-contributors.yml

@@ -22,6 +22,6 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           pr-message: |-
             Thank you so much for making your first Pull Request and taking the time to improve Formbricks! 🚀🙏❤️
-            Feel free to join the conversation at [Discord](https://formbricks.com/discord)
+            Feel free to join the conversation on [Github Discussions](https://github.com/formbricks/formbricks/discussions) if you need any help or have any questions. 😊
           issue-message: |
             Thank you for opening your first issue! 🙏❤️ One of our team members will review it and get back to you as soon as it possible. 😊

.gitignore

@@ -60,3 +60,5 @@ packages/lib/uploads
 
 # js compiled assets
 apps/web/public/js
+
+packages/database/migrations

.nvmrc

@@ -1 +1 @@
-20.18.0
+22.1.0

CONTRIBUTING.md

@@ -24,7 +24,7 @@ Ready to dive into the code and make a real impact? Here's your path:
 
 1. **Pull Request Act:** If you're ready to go, craft a new pull request closely following our PR template 🙏
 
-Would you prefer a chat before you dive into a lot of work? Our [Discord server](https://formbricks.com/discord) is your harbor. Share your thoughts, and we'll meet you there with open arms. We're responsive and friendly, promise!
+Would you prefer a chat before you dive into a lot of work? [Github Discussions](https://github.com/formbricks/formbricks/discussions) is your harbor. Share your thoughts, and we'll meet you there with open arms. We're responsive and friendly, promise!
 
 ## 🚀 Aspiring Features
 

README.md

@@ -15,12 +15,12 @@
 <p align="center">
 Harvest user-insights, build irresistible experiences.
 <br />
-<a href="https://formbricks.com/">Website</a> | <a href="https://formbricks.com/discord">Join Discord community</a>
+<a href="https://formbricks.com/">Website</a>
 </p>
 </p>
 
 <p align="center">
-<a href="https://github.com/formbricks/formbricks/blob/main/LICENSE"><img src="https://img.shields.io/badge/License-AGPL-purple" alt="License"></a> <a href="https://formbricks.com/discord"><img src="https://img.shields.io/discord/979077669410979880?label=Discord&logo=discord&logoColor=%23fff" alt="Join Formbricks Discord"></a> <a href="https://github.com/formbricks/formbricks/stargazers"><img src="https://img.shields.io/github/stars/formbricks/formbricks?logo=github" alt="Github Stars"></a>
+<a href="https://github.com/formbricks/formbricks/blob/main/LICENSE"><img src="https://img.shields.io/badge/License-AGPL-purple" alt="License"></a> <a href="https://github.com/formbricks/formbricks/stargazers"><img src="https://img.shields.io/github/stars/formbricks/formbricks?logo=github" alt="Github Stars"></a>
 <a href="https://news.ycombinator.com/item?id=32303986"><img src="https://img.shields.io/badge/Hacker%20News-122-%23FF6600" alt="Hacker News"></a>
 <a href="[https://www.producthunt.com/products/formbricks](https://www.producthunt.com/posts/formbricks)"><img src="https://img.shields.io/badge/Product%20Hunt-455-orange?logo=producthunt&logoColor=%23fff" alt="Product Hunt"></a>
 <a href="https://github.blog/2023-04-12-github-accelerator-our-first-cohort-and-whats-next/"><img src="https://img.shields.io/badge/2023-blue?logo=github&label=Github%20Accelerator" alt="Github Accelerator"></a>
@@ -232,10 +232,10 @@ Additional to the AGPL licensed Formbricks core, this repository contains code l
 
 ### White-Labeling Formbricks and Other Licensing Needs
 
-We currently do not offer Formbricks white-labeled. Any other needs? [Send us an email](mailto:hola@formbricks.com).
+We currently do not offer Formbricks white-labeled. That means that we don't sell a license which let's other companies resell Formbricks to third parties under their name nor take parts (like the survey editor) out of Formbricks to add to their own software products. Any other needs? [Send us an email](mailto:hola@formbricks.com).
 
 ### Why charge for Enterprise Features?
 
-The Enterprise Edition and White-Label Licenses allow us to fund the development of Formbricks sustainably. It guarantees that the open-source surveying infrastructure we're building will be around for decades to come.
+The Enterprise Edition allows us to fund the development of Formbricks sustainably. It guarantees that the free and open-source surveying infrastructure we're building will be around for decades to come.
 
 <p align="right"><a href="#top">🔼 Back to top</a></p>

SECURITY.md

@@ -1,7 +1,7 @@
 # Security Policy of Formbricks
 
 This is Formbrick's security policy. Please reach out to us
-on our Discord or, if privately, via <security@formbricks.com>
+on Github or, if privately, via <security@formbricks.com>
 
 ## Introduction
 
@@ -40,7 +40,7 @@ We invite you to report if:
 
 Avoid reporting if:
 
-- Assistance is needed to optimize Formbricks for security – please engage on our Discord for this.
+- Assistance is needed to optimize Formbricks for security – please engage on Github Discussions for this.
 - Help is required for applying security-related updates.
 - The concern is not related to security.
 

apps/demo-react-native/package.json

@@ -13,17 +13,17 @@
   "dependencies": {
     "@formbricks/js": "workspace:*",
     "@formbricks/react-native": "workspace:*",
-    "expo": "51.0.26",
-    "expo-status-bar": "1.12.1",
-    "react": "19.0.0-rc-ed15d500-20241110",
-    "react-dom": "19.0.0-rc-ed15d500-20241110",
-    "react-native": "0.74.4",
-    "react-native-webview": "13.8.6"
+    "expo": "52.0.18",
+    "expo-status-bar": "2.0.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "react-native": "0.76.5",
+    "react-native-webview": "13.12.5"
   },
   "devDependencies": {
-    "@babel/core": "7.25.2",
-    "@types/react": "18.3.11",
-    "typescript": "5.3.3"
+    "@babel/core": "7.26.0",
+    "@types/react": "19.0.1",
+    "typescript": "5.7.2"
   },
   "private": true
 }

apps/demo/next-env.d.ts

@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
+// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.

apps/demo/package.json

@@ -4,21 +4,21 @@
   "private": true,
   "scripts": {
     "clean": "rimraf .turbo node_modules .next",
-    "dev": "next dev -p 3002 --turbo",
-    "go": "next dev -p 3002 --turbo",
+    "dev": "next dev -p 3002 --turbopack",
+    "go": "next dev -p 3002 --turbopack",
     "build": "next build",
     "start": "next start",
     "lint": "next lint"
   },
   "dependencies": {
     "@formbricks/js": "workspace:*",
-    "lucide-react": "0.452.0",
-    "next": "15.0.3",
-    "react": "19.0.0-rc-ed15d500-20241110",
-    "react-dom": "19.0.0-rc-ed15d500-20241110"
+    "lucide-react": "0.468.0",
+    "next": "15.1.0",
+    "react": "19.0.0",
+    "react-dom": "19.0.0"
   },
   "devDependencies": {
-    "@formbricks/eslint-config": "workspace:*",
-    "@formbricks/config-typescript": "workspace:*"
+    "@formbricks/config-typescript": "workspace:*",
+    "@formbricks/eslint-config": "workspace:*"
   }
 }

apps/demo/pages/index.tsx

@@ -56,7 +56,7 @@ const AppPage = ({}) => {
         router.events.off("routeChangeComplete", handleRouteChange);
       };
     }
-  }, []);
+  }, [router.events]);
 
   return (
     <div className="min-h-screen bg-white px-12 py-6 dark:bg-slate-800">

apps/docs/app/[survey-type]/global/access-roles/page.mdx

@@ -36,20 +36,20 @@ Here are the different access permissions, ranked from highest to lowest access
 All users and their organization-level roles are listed in **Organization Settings > General**. Users can hold any of the following org-level roles:
 
 - **Billing** users can manage payment and compliance details in the organization.
-- **Org Members** can view most data in the organization and act in the products they are members of. They cannot join products on their own and need to be assigned.
-- **Org Managers** have full management access to all teams and products. They can also manage the organization's membership. Org Managers can perform Team Admin actions without needing to join the team. They cannot change other organization settings.
+- **Org Members** can view most data in the organization and act in the projects they are members of. They cannot join projects on their own and need to be assigned.
+- **Org Managers** have full management access to all teams and projects. They can also manage the organization's membership. Org Managers can perform Team Admin actions without needing to join the team. They cannot change other organization settings.
 - **Org Owners** have full access to the organization, its data, and settings. Org Owners can perform Team Admin actions without needing to join the team.
 
-### Permissions at product level
+### Permissions at project level
 
-- **read**: read access to all resources (except settings) in the product.
-- **read & write**: read & write access to all resources (except settings) in the product.
-- **manage**: read & write access to all resources including settings in the product.
+- **read**: read access to all resources (except settings) in the project.
+- **read & write**: read & write access to all resources (except settings) in the project.
+- **manage**: read & write access to all resources including settings in the project.
 
 ### Team-level Roles
 
 - **Team Contributors** can view and act on surveys and responses.
-- **Team Admins** have additional permissions to manage their team's membership and products. These permissions are granted at the team-level, and don't apply to teams where they're not a Team Admin.
+- **Team Admins** have additional permissions to manage their team's membership and projects. These permissions are granted at the team-level, and don't apply to teams where they're not a Team Admin.
 
 For more information on user roles & permissions, see below:
 
@@ -62,13 +62,13 @@ For more information on user roles & permissions, see below:
 | Delete Member                    | ✅    | ✅      | ❌      | ❌     |
 | Update Member Access             | ✅    | ✅      | ❌      | ❌     |
 | Update Billing                   | ✅    | ✅      | ✅      | ❌     |
-| **Product**                      |       |         |         |        |
-| Create Product                   | ✅    | ✅      | ❌      | ❌     |
-| Update Product Name              | ✅    | ✅      | ❌      | ✅\*\* |
-| Update Product Recontact Options | ✅    | ✅      | ❌      | ✅\*\* |
+| **Project**                      |       |         |         |        |
+| Create Project                   | ✅    | ✅      | ❌      | ❌     |
+| Update Project Name              | ✅    | ✅      | ❌      | ✅\*\* |
+| Update Project Recontact Options | ✅    | ✅      | ❌      | ✅\*\* |
 | Update Look & Feel               | ✅    | ✅      | ❌      | ✅\*\* |
 | Update Survey Languages          | ✅    | ✅      | ❌      | ✅\*\* |
-| Delete Product                   | ✅    | ✅      | ❌      | ❌     |
+| Delete Project                   | ✅    | ✅      | ❌      | ❌     |
 | **Surveys**                      |       |         |         |        |
 | Create New Survey                | ✅    | ✅      | ❌      | ✅\*   |
 | Edit Survey                      | ✅    | ✅      | ❌      | ✅\*   |

apps/docs/app/[survey-type]/global/add-image-or-video-question/page.mdx

@@ -4,7 +4,7 @@ import AddImageOrVideoToQuestionImage from "./images/add-image-or-video-to-quest
 import AddImageOrVideoToQuestionVideo from "./images/add-image-or-video-to-question-video.webp";
 import AddImageOrVideoToQuestion from "./images/add-image-or-video-to-question.webp";
 
-#### Add Image or Video to a Question
+# Add Image or Video to a Question
 
 Enhance your questions by adding images or videos. This makes instructions clearer and the survey more engaging.
 

apps/docs/app/[survey-type]/global/conditional-logic/page.mdx

@@ -21,7 +21,7 @@ export const metadata = {
     "Create complex survey logic with the Logic Editor. Use conditions, actions, and variables to create a personalized survey experience.",
 };
 
-# Logic Editor
+# Conditional Logic
 
 Create complex survey logic with the Logic Editor. Use conditions, actions, and variables to create a personalized survey experience.
 

apps/docs/app/[survey-type]/global/hidden-fields/page.mdx

@@ -10,15 +10,13 @@ export const metadata = {
   description: "Add hidden fields to your surveys to capture additional data without requiring user inputs!",
 };
 
-#### Link Surveys
-
 # Hidden Fields
 
 Hidden fields are a powerful feature in Formbricks that allows you to add data to a submission without asking the user to type it in. This feature is especially useful when you already have information about a user that you want to use in the analysis of the survey results (e.g. `payment plan` or `email`)
 
 ## How to Add Hidden Fields
 
-### Enable them in the Survey Builder
+### Enable Hidden Fields
 
 1. Edit the survey you want to add hidden fields to & switch to the Questions tab and scroll down to the bottom of the page. You will see a section called **Hidden Fields**. Make sure to enable it by toggling the switch.
 
@@ -29,6 +27,8 @@ Hidden fields are a powerful feature in Formbricks that allows you to add data t
   className="max-w-full rounded-lg sm:max-w-3xl"
 />
 
+### Add Hidden Field IDs
+
 2. Now click on it to add a new hidden field ID. You can add as many hidden fields as you want.
 
 <MdxImage
@@ -45,7 +45,11 @@ Hidden fields are a powerful feature in Formbricks that allows you to add data t
   className="max-w-full rounded-lg sm:max-w-3xl"
 />
 
-### Set Single Hidden Field
+## Set Hidden Field in Responses
+
+### Link Surveys
+
+Single Hidden Field:
 
 <Col>
 <CodeGroup title="Example Screen from which the User filled it">
@@ -57,7 +61,7 @@ https://formbricks.com/clin3dxja02k8l80hpwmx4bjy?screen=pricing
 </CodeGroup>
 </Col>
 
-### Set Multiple Hidden Fields
+Multiple Hidden Fields:
 
 <Col>
 <CodeGroup title="Example Screen from which the User filled it">
@@ -69,6 +73,24 @@ https://formbricks.com/clin3dxja02k8l80hpwmx4bjy?screen=landing_page&job=Founder
 </CodeGroup>
 </Col>
 
+### App & Website Surveys
+For in-product surveys, you can set hidden fields in the response by adding them to the `formbricks.track` call:
+
+<Col>
+<CodeGroup title="Example Screen from which the User filled it">
+
+```sh
+formbricks.track("my event", {
+  hiddenFields: {
+    screen: "landing_page",
+    job: "Founder"
+  },
+});
+```
+
+</CodeGroup>
+</Col>
+
 ## View Hidden Fields in Responses
 
 These hidden fields will now be visible in the responses tab just like other fields in the Summary as well as the Response Cards, and you can use them to filter and analyze your responses.
@@ -84,4 +106,4 @@ These hidden fields will now be visible in the responses tab just like other fie
 
 - **Tracking Source**: You can add a hidden field to track the source of the survey. For a detailed guide on Source Tracking, check out the [Source Tracking](/link-surveys/source-tracking) guide.
 - **User Metadata**: You can add hidden fields to capture user metadata such as user ID, email, or any other user-specific information.
-- **Survey Metadata**: You can add hidden fields to capture other metadata, e.g. the screen from which the survey was filled, or any other app specific information.
+- **Survey Metadata**: You can add hidden fields to capture other metadata, e.g. the screen from which the survey was filled, or any other app specific information.

apps/docs/app/[survey-type]/global/metadata/page.mdx

@@ -62,4 +62,4 @@ You can export the metadata of your responses along with the response data. When
 
 ---
 
-Can’t figure it out? Join our [Discord](https://discord.com/invite/3YFcABF2Ts)!
+**Can’t figure it out?**: **[Get help in Github Discussions](https://github.com/formbricks/formbricks/discussions)**

apps/docs/app/[survey-type]/global/multi-language-surveys/page.mdx

@@ -24,17 +24,13 @@ Multi-Language Surveys allow you to create surveys that support multiple languag
 
 How to deliver a specific language depends on the survey type (app or link survey):
 
-- app survey: Set a `language` attribute for the user. [See the guide below for App Surveys](#app-surveys-configuration)
+- App & Website survey: Set a `language` attribute for the user. [See the guide below for App Surveys](#app-surveys-configuration)
 - Link survey: Add a `lang` parameter in the survey URL. [See the guide below for Link Surveys](#link-surveys-configuration)
 
-<Note>
-  Multi-Language is feature of the Enterprise Edition. You can use it for **free** by adding your credit card
-  details on the Formbricks Cloud.
-</Note>
-
-
-<ResponsiveVideo title="Formbricks Multi-language Surveys"
- src="https://www.youtube-nocookie.com/embed/Vol5zjYIoos?si=bdP2y3uk8-xR0uSD&amp;controls=0" />
+<ResponsiveVideo
+  title="Formbricks Multi-language Surveys"
+  src="https://www.youtube-nocookie.com/embed/Vol5zjYIoos?si=bdP2y3uk8-xR0uSD&amp;controls=0"
+/>
 
 ---
 
@@ -58,11 +54,11 @@ How to deliver a specific language depends on the survey type (app or link surve
   className="max-w-full rounded-lg sm:max-w-3xl"
 />
 
-3. Select the preferred language from the dropdown and assign an identifier Alias. Click the **Add language** button to add the language to your product.
+3. Select the preferred language from the dropdown and assign an identifier Alias. Click the **Add language** button to add the language to your project.
 
 <MdxImage
   src={AddLanguages}
-  alt="Add Multiple Languages to your Product"
+  alt="Add Multiple Languages to your Project"
   quality="100"
   className="max-w-full rounded-lg sm:max-w-3xl"
 />
@@ -72,7 +68,7 @@ You can come back to this page anytime to add more languages or remove existing
 
 <MdxImage
   src={SurveysHome}
-  alt="Add Multiple Languages to your Product"
+  alt="Add Multiple Languages to your Project"
   quality="100"
   className="max-w-full rounded-lg sm:max-w-3xl"
 />
@@ -168,4 +164,4 @@ Without the `lang` parameter, Formbricks will show the survey in the default lan
 
 You can now start collecting responses in multiple languages!
 
-Can’t figure it out? Join our [Discord](https://discord.com/invite/3YFcABF2Ts)!
+**Can’t figure it out?**: **[Get help in Github Discussions](https://github.com/formbricks/formbricks/discussions)**

apps/docs/app/[survey-type]/global/overwrite-styling/page.mdx

@@ -19,8 +19,9 @@ export const metadata = {
 
 Overwrite the global styling theme for individual surveys to create unique styles for each survey.
 
-<Note>To set a styling theme for all surveys, please see the [Styling Theme](/global/styling-theme) manual. </Note>
-
+<Note>
+  To set a styling theme for all surveys, please see the [Styling Theme](/core-features/global/styling-theme) manual.{" "}
+</Note>
 
 ### Overwrite Styling Theme
 
@@ -30,16 +31,16 @@ Overwrite the global styling theme for individual surveys to create unique style
   src={StepNine}
   alt="Choose a link survey template"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl "
+  className="max-w-full rounded-lg sm:max-w-3xl"
 />
 
-2. Activate the **Add Custom Styles** toggle to override the default product styling:
+2. Activate the **Add Custom Styles** toggle to override the default project styling:
 
 <MdxImage
   src={StepTen}
   alt="Choose a link survey template"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl "
+  className="max-w-full rounded-lg sm:max-w-3xl"
 />
 
 3. Customize your survey's style as needed:
@@ -48,7 +49,7 @@ Overwrite the global styling theme for individual surveys to create unique style
   src={StepEleven}
   alt="Choose a link survey template"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl "
+  className="max-w-full rounded-lg sm:max-w-3xl"
 />
 
 Voila! just hit the save button to apply your changes. Your survey is now ready to impress with its unique look!
@@ -98,7 +99,7 @@ We have an example of this in our [Demo project](https://github.com/formbricks/f
   src={Mario}
   alt="Choose a link survey template"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl "
+  className="max-w-full rounded-lg sm:max-w-3xl"
 />
 
 - **Hipster Living**: Does your monstera get enough water?
@@ -107,7 +108,7 @@ We have an example of this in our [Demo project](https://github.com/formbricks/f
   src={HipsterLiving}
   alt="Choose a link survey template"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl "
+  className="max-w-full rounded-lg sm:max-w-3xl"
 />
 
 - **Windows XP**: Hach, nostalgia. Made us wanna play Mafia.
@@ -116,7 +117,7 @@ We have an example of this in our [Demo project](https://github.com/formbricks/f
   src={WindowsXp}
   alt="Choose a link survey template"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl "
+  className="max-w-full rounded-lg sm:max-w-3xl"
 />
 
 - **Whosagooooodbooooy**: Things you've likely said to your dog.
@@ -125,7 +126,7 @@ We have an example of this in our [Demo project](https://github.com/formbricks/f
   src={Doggo}
   alt="Choose a link survey template"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl "
+  className="max-w-full rounded-lg sm:max-w-3xl"
 />
 
 ---