Fix merge conflict on import

Created by Github action

---------

Co-authored-by: github-actions <github-actions@twenty.com>

.cursor/rules/README.md

@@ -52,7 +52,7 @@ npx nx run twenty-server:test              # Run unit tests
 npx nx run twenty-server:test:integration:with-db-reset # Run integration tests
 
 # Migrations
-npx nx run twenty-server:typeorm migration:generate src/database/typeorm/metadata/migrations/[name] -d src/database/typeorm/metadata/metadata.datasource.ts
+npx nx run twenty-server:typeorm migration:generate src/database/typeorm/core/migrations/[name] -d src/database/typeorm/core/core.datasource.ts
 
 # Workspace
 npx nx run twenty-server:command workspace:sync-metadata -f  # Sync metadata

.cursor/rules/nx-rules.mdc

@@ -0,0 +1,33 @@
+---
+description: Guidelines and best practices for working with Nx in the Twenty workspace, including workspace architecture understanding, configuration management, and generator usage.
+globs: 
+alwaysApply: false
+---
+
+// This file is automatically generated by Nx Console
+
+You are in an nx workspace using Nx 18.3.3 and yarn as the package manager.
+
+You have access to the Nx MCP server and the tools it provides. Use them. Follow these guidelines in order to best help the user:
+
+# General Guidelines
+- When answering questions, use the nx_workspace tool first to gain an understanding of the workspace architecture
+- For questions around nx configuration, best practices or if you're unsure, use the nx_docs tool to get relevant, up-to-date docs!! Always use this instead of assuming things about nx configuration
+- If the user needs help with an Nx configuration or project graph error, use the 'nx_workspace' tool to get any errors
+- To help answer questions about the workspace structure or simply help with demonstrating how tasks depend on each other, use the 'nx_visualize_graph' tool
+
+# Generation Guidelines
+If the user wants to generate something, use the following flow: 
+
+- learn about the nx workspace and any specifics the user needs by using the 'nx_workspace' tool and the 'nx_project_details' tool if applicable
+- get the available generators using the 'nx_generators' tool
+- decide which generator to use. If no generators seem relevant, check the 'nx_available_plugins' tool to see if the user could install a plugin to help them
+- get generator details using the 'nx_generator_schema' tool
+- you may use the 'nx_docs' tool to learn more about a specific generator or technology if you're unsure
+- decide which options to provide in order to best complete the user's request. Don't make any assumptions and keep the options minimalistic
+- open the generator UI using the 'nx_open_generate_ui' tool
+- wait for the user to finish the generator
+- read the generator log file using the 'nx_read_generator_log' tool
+- use the information provided in the log file to answer the user's question or continue with what they were doing
+
+

.cursor/rules/react-state-management-guidelines.md

@@ -84,7 +84,7 @@ Twenty uses a combination of Recoil for global state and Apollo Client for serve
   `;
 
   export const GET_USER = gql`
-    query GetUser($id: ID!) {
+    query GetUser($id: UUID!) {
       user(id: $id) {
         ...UserFields
       }

.github/workflows/actions/yarn-install/action.yaml

@@ -2,7 +2,7 @@ name: Yarn Install
 inputs:
   node-version:
     required: false
-    default: '18'
+    default: '22'
 
 runs:
   using: "composite"

.github/workflows/ci-chrome-extension.yaml

@@ -39,7 +39,7 @@ jobs:
         run: npx nx build twenty-chrome-extension
   ci-chrome-extension-status-check:
     if: always() && !cancelled()
-    timeout-minutes: 1
+    timeout-minutes: 5
     runs-on: ubuntu-latest
     needs: [changed-files-check, chrome-extension-build]
     steps:

.github/workflows/ci-e2e.yaml

@@ -124,7 +124,7 @@ jobs:
         retention-days: 30
   ci-e2e-status-check:
       if: always() && !cancelled()
-      timeout-minutes: 1
+      timeout-minutes: 5
       runs-on: ubuntu-latest
       needs: [changed-files-check, test]
       steps:

.github/workflows/ci-emails.yaml

@@ -53,7 +53,7 @@ jobs:
           kill $SERVER_PID
   ci-emails-status-check:
     if: always() && !cancelled()
-    timeout-minutes: 1
+    timeout-minutes: 5
     runs-on: depot-ubuntu-24.04-8
     needs: [changed-files-check, emails-test]
     steps:

.github/workflows/ci-front.yaml

@@ -189,7 +189,7 @@ jobs:
           key: ${{ steps.restore-task-cache.outputs.cache-primary-key }}
   ci-front-status-check:
     if: always() && !cancelled()
-    timeout-minutes: 1
+    timeout-minutes: 5
     runs-on: depot-ubuntu-24.04-8
     needs:
       [

.github/workflows/ci-server.yaml

@@ -89,19 +89,15 @@ jobs:
           fi
       - name: Server / Check for Pending Migrations
         run: |
-          METADATA_MIGRATION_OUTPUT=$(npx nx run twenty-server:typeorm migration:generate metadata-migration-check -d src/database/typeorm/metadata/metadata.datasource.ts || true)
-
           CORE_MIGRATION_OUTPUT=$(npx nx run twenty-server:typeorm migration:generate core-migration-check -d src/database/typeorm/core/core.datasource.ts || true)
 
-          METADATA_MIGRATION_FILE=$(ls packages/twenty-server/*metadata-migration-check.ts 2>/dev/null || echo "")
           CORE_MIGRATION_FILE=$(ls packages/twenty-server/*core-migration-check.ts 2>/dev/null || echo "")
 
-          if [ -n "$METADATA_MIGRATION_FILE" ] || [ -n "$CORE_MIGRATION_FILE" ]; then
+          if [ -n "$CORE_MIGRATION_FILE" ]; then
             echo "::error::Unexpected migration files were generated. Please create a proper migration manually."
-            echo "$METADATA_MIGRATION_OUTPUT"
             echo "$CORE_MIGRATION_OUTPUT"
 
-            rm -f packages/twenty-server/*metadata-migration-check.ts packages/twenty-server/*core-migration-check.ts
+            rm -f packages/twenty-server/*core-migration-check.ts
             
             exit 1
           fi
@@ -232,7 +228,7 @@ jobs:
           path: reset-logs.log
   ci-server-status-check:
     if: always() && !cancelled()
-    timeout-minutes: 1
+    timeout-minutes: 5
     runs-on: depot-ubuntu-24.04-8
     needs: [changed-files-check, server-setup, server-test, server-integration-test]
     steps:

.github/workflows/ci-shared.yaml

@@ -44,7 +44,7 @@ jobs:
           tasks: ${{ matrix.task }}
   ci-shared-status-check:
     if: always() && !cancelled()
-    timeout-minutes: 1
+    timeout-minutes: 5
     runs-on: ubuntu-latest
     needs: [changed-files-check, shared-test]
     steps:

.github/workflows/ci-test-docker-compose.yaml

@@ -84,7 +84,7 @@ jobs:
         working-directory: ./packages/twenty-docker/
   ci-test-docker-compose-status-check:
     if: always() && !cancelled()
-    timeout-minutes: 1
+    timeout-minutes: 5
     runs-on: ubuntu-latest
     needs: [changed-files-check, test]
     steps:

.github/workflows/ci-website.yaml

@@ -62,7 +62,7 @@ jobs:
           NEXT_PUBLIC_KEYSTATIC_GITHUB_APP_SLUG: xxx
   ci-website-status-check:
     if: always() && !cancelled()
-    timeout-minutes: 10
+    timeout-minutes: 5
     runs-on: ubuntu-latest
     needs: [changed-files-check, website-build]
     steps:

.github/workflows/preview-env-dispatch.yaml

@@ -0,0 +1,36 @@
+name: 'Preview Environment Dispatch'
+
+on:
+  # Using pull_request_target instead of pull_request to have access to secrets for external contributors
+  # Security note: This is safe because we're only using the repository-dispatch action with limited scope
+  # and not checking out or running any code from the external contributor's PR
+  pull_request_target:
+    types: [opened, synchronize, reopened, labeled]
+    paths:
+      - packages/twenty-docker/**
+      - packages/twenty-server/**
+      - packages/twenty-front/**
+      - .github/workflows/preview-env-dispatch.yaml
+      - .github/workflows/preview-env-keepalive.yaml
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  trigger-preview:
+    permissions:
+      contents: write
+      actions: write
+      pull-requests: read
+    if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.action == 'reopened' || (github.event.action == 'labeled' && github.event.label.name == 'preview-app')
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger preview environment workflow
+        uses: peter-evans/repository-dispatch@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          repository: ${{ github.repository }}
+          event-type: preview-environment
+          client-payload: '{"pr_number": "${{ github.event.pull_request.number }}", "pr_head_sha": "${{ github.event.pull_request.head.sha }}", "repo_full_name": "${{ github.repository }}"}'

.github/workflows/preview-env-keepalive.yaml

@@ -0,0 +1,150 @@
+name: 'Preview Environment Keep Alive'
+
+on:
+  repository_dispatch:
+    types: [preview-environment]
+
+jobs:
+  preview-environment:
+    timeout-minutes: 310
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout PR
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.client_payload.pr_head_sha }}
+      
+      - name: Run compose setup
+        run: |
+          echo "Patching docker-compose.yml..."
+          # change image to localbuild using yq
+          yq eval 'del(.services.server.image)' -i packages/twenty-docker/docker-compose.yml
+          yq eval '.services.server.build.context = "../../"' -i packages/twenty-docker/docker-compose.yml
+          yq eval '.services.server.build.dockerfile = "./packages/twenty-docker/twenty/Dockerfile"' -i packages/twenty-docker/docker-compose.yml
+          
+          yq eval 'del(.services.worker.image)' -i packages/twenty-docker/docker-compose.yml
+          yq eval '.services.worker.build.context = "../../"' -i packages/twenty-docker/docker-compose.yml
+          yq eval '.services.worker.build.dockerfile = "./packages/twenty-docker/twenty/Dockerfile"' -i packages/twenty-docker/docker-compose.yml
+          
+          echo "Setting up .env file..."
+          cp packages/twenty-docker/.env.example packages/twenty-docker/.env
+          
+          echo "Generating secrets..."
+          echo "# === Randomly generated secrets ===" >> packages/twenty-docker/.env
+          echo "APP_SECRET=$(openssl rand -base64 32)" >> packages/twenty-docker/.env
+          echo "PG_DATABASE_PASSWORD=$(openssl rand -hex 16)" >> packages/twenty-docker/.env
+          echo "SIGN_IN_PREFILLED=true" >> packages/twenty-docker/.env
+          echo "Docker compose build..."
+          cd packages/twenty-docker/
+          docker compose build
+        working-directory: ./
+      
+      - name: Create Tunnel
+        id: expose-tunnel
+        uses: codetalkio/expose-tunnel@v1.5.0
+        with:
+          service: bore.pub
+          port: 3000
+      
+      - name: Start services with correct SERVER_URL
+        run: |
+          cd packages/twenty-docker/
+          
+          # Update the SERVER_URL with the tunnel URL
+          echo "Setting SERVER_URL to ${{ steps.expose-tunnel.outputs.tunnel-url }}"
+          sed -i '/SERVER_URL=/d' .env
+          echo "SERVER_URL=${{ steps.expose-tunnel.outputs.tunnel-url }}" >> .env
+          
+          # Start the services
+          echo "Docker compose up..."
+          docker compose up -d || {
+              echo "Docker compose failed to start"
+              docker compose logs
+              exit 1
+          }
+          
+          echo "Waiting for services to be ready..."
+          count=0
+          while [ ! $(docker inspect --format='{{.State.Health.Status}}' twenty-db-1) = "healthy" ] || [ ! $(docker inspect --format='{{.State.Health.Status}}' twenty-server-1) = "healthy" ]; do
+              sleep 5
+              count=$((count+1))
+              if [ $count -gt 60 ]; then
+                  echo "Timeout waiting for services to be ready"
+                  docker compose logs
+                  exit 1
+              fi
+              echo "Still waiting for services... ($count/60)"
+          done
+          
+          echo "All services are up and running!"
+        working-directory: ./
+
+      - name: Seed Dev Workspace
+        run: |
+          cd packages/twenty-docker/
+          echo "Seeding full dev workspace..."
+          if ! docker compose exec -T server yarn command:prod -- workspace:seed:dev; then
+            echo "❌ Seeding full dev workspace failed. Dumping server logs..."
+            docker compose logs server
+            exit 1
+          fi
+        working-directory: ./
+
+      - name: Output tunnel URL to logs
+        run: |
+          echo "✅ Preview Environment Ready!"
+          echo "🔗 Preview URL: ${{ steps.expose-tunnel.outputs.tunnel-url }}"
+          echo "⏱️ This environment will be available for 5 hours"
+      
+      - name: Post comment on PR
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            const COMMENT_MARKER = '<!-- PR_PREVIEW_ENV -->';
+            const commentBody = `${COMMENT_MARKER}
+            🚀 **Preview Environment Ready!**
+            
+            Your preview environment is available at: ${{ steps.expose-tunnel.outputs.tunnel-url }}
+            
+            This environment will automatically shut down when the PR is closed or after 5 hours.`;
+            
+            // Get all comments
+            const {data: comments} = await github.rest.issues.listComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: ${{ github.event.client_payload.pr_number }},
+            });
+            
+            // Find our comment
+            const botComment = comments.find(comment => comment.body.includes(COMMENT_MARKER));
+            
+            if (botComment) {
+              // Update existing comment
+              await github.rest.issues.updateComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                comment_id: botComment.id,
+                body: commentBody
+              });
+              console.log('Updated existing comment');
+            } else {
+              // Create new comment
+              await github.rest.issues.createComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: ${{ github.event.client_payload.pr_number }},
+                body: commentBody
+              });
+              console.log('Created new comment');
+            }
+      
+      - name: Keep tunnel alive for 5 hours
+        run: timeout 300m sleep 18000 # Stop on whichever we reach first (300m or 5hour sleep)
+      
+      - name: Cleanup
+        if: always()
+        run: |
+          cd packages/twenty-docker/
+          docker compose down -v
+        working-directory: ./ 

.gitignore

@@ -43,4 +43,6 @@ dump.rdb
 /flake.nix
 
 .crowdin.yml
-.react-email/
+.react-email/
+
+mcp.json

.nvmrc

@@ -1 +1 @@
-18.17.1
+22.12.0

.vscode/launch.json

@@ -37,7 +37,7 @@
       "type": "node",
       "request": "launch",
       "runtimeExecutable": "npx",
-      "runtimeVersion": "18",
+      "runtimeVersion": "^22.12.0",
       "runtimeArgs": [
         "nx",
         "run",

.vscode/settings.json

@@ -43,12 +43,11 @@
   ],
   "typescript.preferences.importModuleSpecifier": "non-relative",
   "search.exclude": {
-    "**/.yarn": true,
+    "**/.yarn": true
   },
   "eslint.debug": true,
   "files.associations": {
     ".cursorrules": "markdown"
   },
   "jestrunner.codeLensSelector": "**/*.{test,spec,integration-spec}.{js,jsx,ts,tsx}"
-  }
 }

Makefile

@@ -1,12 +1,12 @@
 postgres-on-docker:
 	docker run -d \
 	--name twenty_pg \
-	-e PGUSER_SUPERUSER=postgres \
-	-e PGPASSWORD_SUPERUSER=postgres \
+	-e POSTGRES_USER=postgres \
+	-e POSTGRES_PASSWORD=postgres \
 	-e ALLOW_NOSSL=true \
-	-v twenty_db_data:/home/postgres/pgdata \
+	-v twenty_db_data:/var/lib/postgresql/data \
 	-p 5432:5432 \
-	twentycrm/twenty-postgres-spilo:latest
+	postgres:16
 	@echo "Waiting for PostgreSQL to be ready..."
 	@until docker exec twenty_pg psql -U postgres -d postgres \
 		-c 'SELECT pg_is_in_recovery();' 2>/dev/null | grep -q 'f'; do \
@@ -20,4 +20,4 @@ redis-on-docker:
 	docker run -d --name twenty_redis -p 6379:6379 redis/redis-stack-server:latest
 
 clickhouse-on-docker:
-	docker run -d --name twenty_clickhouse -p 8123:8123 -p 9000:9000 -e CLICKHOUSE_PASSWORD=devPassword clickhouse/clickhouse-server:latest
+	docker run -d --name twenty_clickhouse -p 8123:8123 -p 9000:9000 -e CLICKHOUSE_PASSWORD=clickhousePassword clickhouse/clickhouse-server:latest \

README.md

@@ -1,28 +1,28 @@
 
-<br>
+<br />
 <p align="center">
   <a href="https://www.twenty.com">
     <img src="./packages/twenty-website/public/images/core/logo.svg" width="100px" alt="Twenty logo" />
   </a>
 </p>
 
-<h2 align="center" >The #1 Open-Source CRM </h3>
+<h2 align="center" >The #1 Open-Source CRM </h2>
 
-<p align="center"><a href="https://twenty.com">🌐 Website</a> · <a href="https://twenty.com/developers">📚 Documentation</a> · <a href="https://github.com/orgs/twentyhq/projects/1"><img src="./packages/twenty-website/public/images/readme/planner-icon.svg" width="12" height="12"/> Roadmap </a> · <a href="https://discord.gg/cx5n4Jzs57"><img src="./packages/twenty-website/public/images/readme/discord-icon.svg" width="12" height="12"/> Discord</a> · <a href="https://www.figma.com/file/xt8O9mFeLl46C5InWwoMrN/Twenty"><img src="./packages/twenty-website/public/images/readme/figma-icon.png"  width="12" height="12"/>  Figma</a><p>
+<p align="center"><a href="https://twenty.com">🌐 Website</a> · <a href="https://twenty.com/developers">📚 Documentation</a> · <a href="https://github.com/orgs/twentyhq/projects/1"><img src="./packages/twenty-website/public/images/readme/planner-icon.svg" width="12" height="12"/> Roadmap </a> · <a href="https://discord.gg/cx5n4Jzs57"><img src="./packages/twenty-website/public/images/readme/discord-icon.svg" width="12" height="12"/> Discord</a> · <a href="https://www.figma.com/file/xt8O9mFeLl46C5InWwoMrN/Twenty"><img src="./packages/twenty-website/public/images/readme/figma-icon.png"  width="12" height="12"/>  Figma</a></p>
 <br />
 
 
 <p align="center">
   <a href="https://www.twenty.com">
     <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/preview-dark.png">
-      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/preview-light.png">
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/preview-dark.png" />
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/preview-light.png" />
       <img src="./packages/twenty-docs/static/img/preview-light.png" alt="Companies view" />
     </picture>
   </a>
 </p>
 
-<br>
+<br />
 
 # Installation 
 
@@ -40,7 +40,7 @@ We built Twenty for three reasons:
 
 **We believe in Open-source and community.** Hundreds of developers are already building Twenty together. Once we have plugin capabilities, a whole ecosystem will grow around it.
 
-<br>
+<br />
 
 # What You Can Do With Twenty
 We're currently developing Twenty's beta version.  
@@ -60,8 +60,8 @@ Below are a few features we have implemented to date:
 
 <p align="center">
     <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/index-dark.png">
-      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/index-light.png">
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/index-dark.png" />
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/index-light.png" />
       <img src="./packages/twenty-docs/static/img/visualise-customer-light.png" alt="Companies view" />
     </picture>
 </p>
@@ -70,9 +70,9 @@ Below are a few features we have implemented to date:
 
 <p align="center">
     <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/kanban-dark.png">
-      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/kanban-light.png">
-      <img src="./packages/twenty-docs/static/img/follow-your-deals-light.png" alt="Companies view" />
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/kanban-dark.png" />
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/kanban-light.png" />
+      <img src="./packages/twenty-docs/static/img/follow-your-deals-light.png" alt="Opportunities view" />
     </picture>
 </p>
 
@@ -80,9 +80,9 @@ Below are a few features we have implemented to date:
 
 <p align="center">
     <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/emails-dark.png">
-      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/emails-light.png">
-      <img src="./packages/twenty-docs/static/img/rich-notes-light.png" alt="Companies view" />
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/emails-dark.png" />
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/emails-light.png" />
+      <img src="./packages/twenty-docs/static/img/emails-light.png" alt="Emails" />
     </picture>
 </p>
 
@@ -90,9 +90,9 @@ Below are a few features we have implemented to date:
 
 <p align="center">
     <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/data-dark.png">
-      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/data-light.png">
-      <img src="./packages/twenty-docs/static/img/rich-notes-light.png" alt="Companies view" />
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/data-dark.png" />
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/data-light.png" />
+      <img src="./packages/twenty-docs/static/img/data-light.png" alt="Data model" />
     </picture>
 </p>
 
@@ -100,9 +100,9 @@ Below are a few features we have implemented to date:
 
 <p align="center">
     <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/notes-dark.png">
-      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/notes-light.png">
-      <img src="./packages/twenty-docs/static/img/rich-notes-light.png" alt="Companies view" />
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/notes-dark.png" />
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/notes-light.png" />
+      <img src="./packages/twenty-docs/static/img/notes-light.png" alt="Rich notes" />
     </picture>
 </p>
 
@@ -110,9 +110,9 @@ Below are a few features we have implemented to date:
 
 <p align="center">
     <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/tasks-dark.png">
-      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/tasks-light.png">
-      <img src="./packages/twenty-docs/static/img/create-tasks-light.png" alt="Companies view" />
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/tasks-dark.png" />
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/tasks-light.png" />
+      <img src="./packages/twenty-docs/static/img/create-tasks-light.png" alt="Tasks" />
     </picture>
 </p>
 
@@ -120,9 +120,9 @@ Below are a few features we have implemented to date:
 
 <p align="center">
     <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/keyboard-dark.png">
-      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/keyboard-light.png">
-      <img src="./packages/twenty-docs/static/img/shortcut-navigation-light.png" alt="Companies view" />
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/keyboard-dark.png" />
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/keyboard-light.png" />
+      <img src="./packages/twenty-docs/static/img/keyboard-dark.png" alt="Keyboard shortcuts" />
     </picture>
 </p>
 
@@ -130,22 +130,33 @@ Below are a few features we have implemented to date:
 
 <p align="center">
     <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/api-dark.png">
-      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/api-light.png">
-      <img src="./packages/twenty-docs/static/img/shortcut-navigation-light.png" alt="Companies view" />
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/api-dark.png" />
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/twentyhq/twenty/v0.12.0/packages/twenty-docs/static/img/api-light.png" />
+      <img src="./packages/twenty-docs/static/img/api-light.png" alt="API" />
     </picture>
 </p>
 
 
-<br>
+<br />
 
 # Stack
 - [TypeScript](https://www.typescriptlang.org/)
 - [Nx](https://nx.dev/)
 - [NestJS](https://nestjs.com/), with [BullMQ](https://bullmq.io/), [PostgreSQL](https://www.postgresql.org/), [Redis](https://redis.io/)
-- [React](https://reactjs.org/), with [Recoil](https://recoiljs.org/) and [Emotion](https://emotion.sh/)
-- [Greptile](https://greptile.com) for code reviews.
-- [Lingui](https://lingui.dev/) and [Crowdin](https://twenty.crowdin.com/twenty) for translations.
+- [React](https://reactjs.org/), with [Recoil](https://recoiljs.org/), [Emotion](https://emotion.sh/) and [Lingui](https://lingui.dev/)
+
+
+
+# Thanks
+
+<p align="center">
+  <a href="https://www.chromatic.com/"><img src="./packages/twenty-website/public/images/readme/chromatic.png" height="30" alt="Chromatic" /></a>
+  <a href="https://greptile.com"><img src="./packages/twenty-website/public/images/readme/greptile.png" height="30" alt="Greptile" /></a>
+  <a href="https://sentry.io/"><img src="./packages/twenty-website/public/images/readme/sentry.png" height="30" alt="Sentry" /></a>
+  <a href="https://crowdin.com/"><img src="./packages/twenty-website/public/images/readme/crowdin.png" height="30" alt="Crowdin" /></a>
+</p>
+
+  Thanks to these amazing services that we use and recommend for UI testing (Chromatic), code review (Greptile), catching bugs (Sentry) and translating (Crowdin).
 
 
 # Join the Community

package.json

@@ -1,16 +1,12 @@
 {
   "private": true,
   "dependencies": {
-    "@air/react-drag-to-select": "^5.0.8",
     "@apollo/client": "^3.7.17",
     "@apollo/server": "^4.7.3",
-    "@aws-sdk/client-lambda": "^3.614.0",
-    "@aws-sdk/client-s3": "^3.363.0",
-    "@aws-sdk/client-sts": "^3.744.0",
-    "@aws-sdk/credential-providers": "^3.363.0",
-    "@blocknote/mantine": "^0.22.0",
-    "@blocknote/react": "^0.22.0",
-    "@blocknote/server-util": "0.17.1",
+    "@aws-sdk/client-lambda": "^3.700.0",
+    "@aws-sdk/client-s3": "^3.700.0",
+    "@aws-sdk/client-sts": "^3.700.0",
+    "@aws-sdk/credential-providers": "^3.700.0",
     "@codesandbox/sandpack-react": "^2.13.5",
     "@dagrejs/dagre": "^1.1.2",
     "@emotion/react": "^11.11.1",
@@ -46,9 +42,9 @@
     "@ptc-org/nestjs-query-typeorm": "4.2.1-alpha.2",
     "@react-email/components": "0.0.35",
     "@react-email/render": "0.0.17",
-    "@sentry/node": "^8",
-    "@sentry/profiling-node": "^8",
-    "@sentry/react": "^8",
+    "@sentry/node": "^9.26.0",
+    "@sentry/profiling-node": "^9.26.0",
+    "@sentry/react": "^9.26.0",
     "@sniptt/guards": "^0.2.0",
     "@stoplight/elements": "^8.0.5",
     "@swc/jest": "^0.2.29",
@@ -71,12 +67,12 @@
     "archiver": "^7.0.1",
     "axios": "^1.6.2",
     "bcrypt": "^5.1.1",
-    "better-sqlite3": "^9.2.2",
     "body-parser": "^1.20.2",
     "bullmq": "^5.40.0",
     "bytes": "^3.1.2",
     "class-transformer": "^0.5.1",
     "clsx": "^2.1.1",
+    "cron-parser": "^5.1.1",
     "cron-validate": "^1.4.5",
     "cross-env": "^7.0.3",
     "css-loader": "^7.1.2",
@@ -93,6 +89,7 @@
     "facepaint": "^1.2.1",
     "file-type": "16.5.4",
     "framer-motion": "^11.18.0",
+    "fuse.js": "^7.1.0",
     "googleapis": "105",
     "graphiql": "^3.1.1",
     "graphql": "16.8.0",
@@ -190,7 +187,6 @@
     "tsup": "^8.2.4",
     "type-fest": "4.10.1",
     "typescript": "5.3.3",
-    "use-context-selector": "^2.0.0",
     "use-debounce": "^10.0.0",
     "uuid": "^9.0.0",
     "vite-tsconfig-paths": "^4.2.1",
@@ -221,7 +217,7 @@
     "@nx/vite": "18.3.3",
     "@nx/web": "18.3.3",
     "@playwright/test": "^1.46.0",
-    "@sentry/types": "^7.109.0",
+    "@sentry/types": "^8",
     "@storybook/addon-actions": "^7.6.3",
     "@storybook/addon-coverage": "^1.0.0",
     "@storybook/addon-essentials": "^7.6.7",
@@ -242,12 +238,11 @@
     "@swc/cli": "^0.3.12",
     "@swc/core": "1.7.42",
     "@swc/helpers": "~0.5.2",
-    "@testing-library/jest-dom": "^6.1.5",
-    "@testing-library/react": "14.0.0",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^16.3.0",
     "@types/addressparser": "^1.0.3",
     "@types/apollo-upload-client": "^17.0.2",
     "@types/bcrypt": "^5.0.0",
-    "@types/better-sqlite3": "^7.6.8",
     "@types/bytes": "^3.1.1",
     "@types/chrome": "^0.0.267",
     "@types/deep-equal": "^1.0.1",
@@ -274,7 +269,7 @@
     "@types/lodash.upperfirst": "^4.3.7",
     "@types/luxon": "^3.3.0",
     "@types/ms": "^0.7.31",
-    "@types/node": "18.19.26",
+    "@types/node": "^22.0.0",
     "@types/passport-google-oauth20": "^2.0.11",
     "@types/passport-jwt": "^3.0.8",
     "@types/pluralize": "^0.0.33",
@@ -316,7 +311,7 @@
     "eslint-plugin-unused-imports": "^3.0.0",
     "http-server": "^14.1.1",
     "jest": "29.7.0",
-    "jest-environment-jsdom": "29.7.0",
+    "jest-environment-jsdom": "30.0.0-beta.3",
     "jest-environment-node": "^29.4.1",
     "jest-fetch-mock": "^3.0.3",
     "jsdom": "~22.1.0",
@@ -338,14 +333,15 @@
     "ts-node": "10.9.1",
     "tsconfig-paths": "^4.2.0",
     "tsx": "^4.17.0",
-    "vite": "^5.4.0",
+    "vite": "^6.3.5",
     "vite-plugin-checker": "^0.6.2",
+    "vite-plugin-cjs-interop": "^2.2.0",
     "vite-plugin-dts": "3.8.1",
     "vite-plugin-svgr": "^4.2.0",
     "vitest": "1.4.0"
   },
   "engines": {
-    "node": "^18.17.1",
+    "node": "^22.12.0",
     "npm": "please-use-yarn",
     "yarn": ">=4.0.2"
   },
@@ -356,9 +352,8 @@
     "graphql": "16.8.0",
     "type-fest": "4.10.1",
     "typescript": "5.3.3",
-    "prosemirror-model": "1.23.0",
-    "yjs": "13.6.18",
-    "graphql-redis-subscriptions/ioredis": "^5.6.0"
+    "graphql-redis-subscriptions/ioredis": "^5.6.0",
+    "prosemirror-view": "1.40.0"
   },
   "version": "0.2.1",
   "nx": {},

packages/twenty-chrome-extension/loading.html

@@ -1,7 +1,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" href="/icons/android/android-launchericon-48-48.png" />
+    <link rel="icon" href="images/icons/android/android-launchericon-48-48.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Twenty</title>
   </head>

packages/twenty-chrome-extension/page-inaccessible.html

@@ -1,7 +1,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" href="/icons/android/android-launchericon-48-48.png" />
+    <link rel="icon" href="images/icons/android/android-launchericon-48-48.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Twenty</title>
   </head>

packages/twenty-chrome-extension/sidepanel.html

@@ -1,7 +1,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" href="/icons/android/android-launchericon-48-48.png" />
+    <link rel="icon" href="images/icons/android/android-launchericon-48-48.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Twenty</title>
     <style>

packages/twenty-chrome-extension/src/generated/graphql.tsx

@@ -6358,7 +6358,7 @@ export type RelationConnection = {
 };
 
 export type RelationDefinition = {
-  direction: RelationDefinitionType;
+  direction: RelationType;
   relationId: Scalars['UUID'];
   sourceFieldMetadata: Field;
   sourceObjectMetadata: Object;
@@ -6367,7 +6367,7 @@ export type RelationDefinition = {
 };
 
 /** Relation definition type */
-export enum RelationDefinitionType {
+export enum RelationType {
   ManyToMany = 'MANY_TO_MANY',
   ManyToOne = 'MANY_TO_ONE',
   OneToMany = 'ONE_TO_MANY',

packages/twenty-docker/.env.example

@@ -7,7 +7,6 @@ TAG=latest
 #REDIS_URL=redis://redis:6379
 
 SERVER_URL=http://localhost:3000
-SIGN_IN_PREFILLED=false
 
 # Use openssl rand -base64 32 for each secret
 # APP_SECRET=replace_me_with_a_random_string

packages/twenty-docker/docker-compose.yml

@@ -1,22 +1,10 @@
 name: twenty
 
 services:
-  change-vol-ownership:
-    image: ubuntu
-    user: root
-    volumes:
-      - server-local-data:/tmp/server-local-data
-      - docker-data:/tmp/docker-data
-    command: >
-      bash -c "
-      chown -R 1000:1000 /tmp/server-local-data
-      && chown -R 1000:1000 /tmp/docker-data"
-
   server:
     image: twentycrm/twenty:${TAG:-latest}
     volumes:
-      - server-local-data:/app/packages/twenty-server/${STORAGE_LOCAL_PATH:-.local-storage}
-      - docker-data:/app/docker-data
+      - server-local-data:/app/packages/twenty-server/.local-storage
     ports:
       - "3000:3000"
     environment:
@@ -31,7 +19,6 @@ services:
       STORAGE_S3_ENDPOINT: ${STORAGE_S3_ENDPOINT}
 
       APP_SECRET: ${APP_SECRET:-replace_me_with_a_random_string}
-
       # MESSAGING_PROVIDER_GMAIL_ENABLED: ${MESSAGING_PROVIDER_GMAIL_ENABLED}
       # CALENDAR_PROVIDER_GOOGLE_ENABLED: ${CALENDAR_PROVIDER_GOOGLE_ENABLED}
       # AUTH_GOOGLE_CLIENT_ID: ${AUTH_GOOGLE_CLIENT_ID}
@@ -57,15 +44,13 @@ services:
       # EMAIL_SMTP_PASSWORD: ${EMAIL_SMTP_PASSWORD:-}
 
     depends_on:
-      change-vol-ownership:
-        condition: service_completed_successfully
       db:
         condition: service_healthy
     healthcheck:
       test: curl --fail http://localhost:3000/healthz
       interval: 5s
       timeout: 5s
-      retries: 10
+      retries: 20
     restart: always
 
   worker:
@@ -85,7 +70,6 @@ services:
       STORAGE_S3_ENDPOINT: ${STORAGE_S3_ENDPOINT}
 
       APP_SECRET: ${APP_SECRET:-replace_me_with_a_random_string}
-
       # MESSAGING_PROVIDER_GMAIL_ENABLED: ${MESSAGING_PROVIDER_GMAIL_ENABLED}
       # CALENDAR_PROVIDER_GOOGLE_ENABLED: ${CALENDAR_PROVIDER_GOOGLE_ENABLED}
       # AUTH_GOOGLE_CLIENT_ID: ${AUTH_GOOGLE_CLIENT_ID}
@@ -109,7 +93,7 @@ services:
       # EMAIL_SMTP_PORT: ${EMAIL_SMTP_PORT:-465}
       # EMAIL_SMTP_USER: ${EMAIL_SMTP_USER:-}
       # EMAIL_SMTP_PASSWORD: ${EMAIL_SMTP_PASSWORD:-}
-      
+
     depends_on:
       db:
         condition: service_healthy
@@ -134,8 +118,8 @@ services:
   redis:
     image: redis
     restart: always
+    command: ["--maxmemory-policy", "noeviction"]
 
 volumes:
-  docker-data:
   db-data:
   server-local-data:

packages/twenty-docker/k8s/manifests/deployment-redis.yaml

@@ -25,9 +25,10 @@ spec:
         - name: redis
           image: redis/redis-stack-server:latest
           imagePullPolicy: Always
+          args: ["--maxmemory-policy", "noeviction"]
           env:
             - name: PORT
-              value: 6379
+              value: "6379"
           ports:
             - containerPort: 6379
               name: redis

packages/twenty-docker/podman/podman-compose.yml

@@ -7,13 +7,14 @@ services:
     environment:
       POSTGRES_DB: twenty
       POSTGRES_USER: twenty
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_PASSWORD: ${PG_DATABASE_PASSWORD}
     volumes:
       - twenty-db-data:/var/lib/postgresql/data:Z
 
   redis:
     container_name: twenty-redis
     image: redis:latest
+    command: ["--maxmemory-policy", "noeviction"]
     volumes:
       - twenty-redis-data:/data:Z
 
@@ -23,7 +24,7 @@ services:
     environment:
       NODE_PORT: "3000"
       SERVER_URL: ${SERVER_URL}
-      PG_DATABASE_URL: "postgresql://twenty:${POSTGRES_PASSWORD}@twenty-db:5432/twenty"
+      PG_DATABASE_URL: "postgresql://twenty:${PG_DATABASE_PASSWORD}@twenty-db:5432/twenty"
       REDIS_URL: "redis://twenty-redis:6379"
       APP_SECRET: ${APP_SECRET}
       NODE_ENV: production
@@ -39,7 +40,7 @@ services:
     command: yarn worker:prod
     environment:
       SERVER_URL: ${SERVER_URL}
-      PG_DATABASE_URL: "postgresql://twenty:${POSTGRES_PASSWORD}@twenty-db:5432/twenty"
+      PG_DATABASE_URL: "postgresql://twenty:${PG_DATABASE_PASSWORD}@twenty-db:5432/twenty"
       REDIS_URL: "redis://twenty-redis:6379"
       APP_SECRET: ${APP_SECRET}
       DISABLE_DB_MIGRATIONS: "true"

packages/twenty-docker/twenty-website/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.17.1-alpine as twenty-website-build
+FROM node:22-alpine as twenty-website-build
 
 
 WORKDIR /app
@@ -23,7 +23,7 @@ COPY ./packages/twenty-ui /app/packages/twenty-ui
 COPY ./packages/twenty-website /app/packages/twenty-website
 RUN npx nx build twenty-website
 
-FROM node:18.17.1-alpine as twenty-website
+FROM node:22-alpine as twenty-website
 
 WORKDIR /app/packages/twenty-website
 

packages/twenty-docker/twenty/Dockerfile

@@ -1,5 +1,5 @@
 # Base image for common dependencies
-FROM node:18.17.1-alpine as common-deps
+FROM node:22-alpine as common-deps
 
 WORKDIR /app
 
@@ -49,7 +49,7 @@ RUN npx nx build twenty-front
 
 
 # Final stage: Run the application
-FROM node:18.17.1-alpine as twenty
+FROM node:22-alpine as twenty
 
 # Used to run healthcheck in docker
 RUN apk add --no-cache curl jq
@@ -77,8 +77,8 @@ COPY --chown=1000 --from=twenty-front-build /app/packages/twenty-front/build /ap
 LABEL org.opencontainers.image.source=https://github.com/twentyhq/twenty
 LABEL org.opencontainers.image.description="This image provides a consistent and reproducible environment for the backend and frontend, ensuring it deploys faster and runs the same way regardless of the deployment environment."
 
-RUN mkdir /app/.local-storage
-RUN chown -R 1000 /app
+RUN mkdir -p /app/.local-storage /app/packages/twenty-server/.local-storage && \
+    chown -R 1000:1000 /app
 
 # Use non root user with uid 1000
 USER 1000

packages/twenty-docker/twenty/entrypoint.sh

@@ -1,28 +1,34 @@
 #!/bin/sh
 set -e
 
-# Check if the initialization has already been done and that we enabled automatic migration
-if [ "${DISABLE_DB_MIGRATIONS}" != "true" ] && [ ! -f /app/docker-data/db_status ]; then
-    echo "Running database setup and migrations..."
+setup_and_migrate_db() {
+    if [ "${DISABLE_DB_MIGRATIONS}" = "true" ]; then
+        echo "Database setup and migrations are disabled, skipping..."
+        return
+    fi
 
-    # Creating the database if it doesn't exist
+    echo "Running database setup and migrations..."
     PGUSER=$(echo $PG_DATABASE_URL | awk -F '//' '{print $2}' | awk -F ':' '{print $1}')
     PGPASS=$(echo $PG_DATABASE_URL | awk -F ':' '{print $3}' | awk -F '@' '{print $1}')
     PGHOST=$(echo $PG_DATABASE_URL | awk -F '@' '{print $2}' | awk -F ':' '{print $1}')
     PGPORT=$(echo $PG_DATABASE_URL | awk -F ':' '{print $4}' | awk -F '/' '{print $1}')
     PGDATABASE=$(echo $PG_DATABASE_URL | awk -F ':' '{print $4}' | awk -F '/' '{print $2}')
-    PGPASSWORD=${PGPASS} psql -h ${PGHOST} -p ${PGPORT} -U ${PGUSER} -d postgres -tc "SELECT 1 FROM pg_database WHERE datname = '${PGDATABASE}'" | grep -q 1 || \
-    PGPASSWORD=${PGPASS} psql -h ${PGHOST} -p ${PGPORT} -U ${PGUSER} -d postgres -c "CREATE DATABASE \"${PGDATABASE}\""
 
-    # Run setup and migration scripts
-    NODE_OPTIONS="--max-old-space-size=1500" tsx ./scripts/setup-db.ts
-    yarn database:migrate:prod
+    # Creating the database if it doesn't exist
+    db_count=$(PGPASSWORD=${PGPASS} psql -h ${PGHOST} -p ${PGPORT} -U ${PGUSER} -d postgres -tAc "SELECT COUNT(*) FROM pg_database WHERE datname = '${PGDATABASE}'")
+    if [ "$db_count" = "0" ]; then
+        echo "Database ${PGDATABASE} does not exist, creating..."
+        PGPASSWORD=${PGPASS} psql -h ${PGHOST} -p ${PGPORT} -U ${PGUSER} -d postgres -c "CREATE DATABASE \"${PGDATABASE}\""
+
+        # Run setup and migration scripts
+        NODE_OPTIONS="--max-old-space-size=1500" tsx ./scripts/setup-db.ts
+        yarn database:migrate:prod
+    fi
+    
     yarn command:prod upgrade
-
-    # Mark initialization as done
-    echo "Successfuly migrated DB!"
-    touch /app/docker-data/db_status
-fi
+    echo "Successfully migrated DB!"
+}
+setup_and_migrate_db
 
 # Continue with the original Docker command
 exec "$@"

packages/twenty-e2e-testing/.env.example

@@ -2,5 +2,5 @@
 FRONTEND_BASE_URL=http://localhost:3001
 BACKEND_BASE_URL=http://localhost:3000
 DEFAULT_LOGIN=tim@apple.dev
-DEFAULT_PASSWORD=Applecar2025
+DEFAULT_PASSWORD=tim@apple.dev
 WEBSITE_URL=https://twenty.com

packages/twenty-e2e-testing/lib/fixtures/blank-workflow.ts

@@ -24,6 +24,8 @@ export class WorkflowVisualizerPage {
   readonly useAsDraftButton: Locator;
   readonly overrideDraftButton: Locator;
   readonly discardDraftButton: Locator;
+  readonly seeRunsButton: Locator;
+  readonly goBackInCommandMenu: Locator;
 
   #actionNames: Record<WorkflowActionType, string> = {
     'create-record': 'Create Record',
@@ -31,6 +33,7 @@ export class WorkflowVisualizerPage {
     'delete-record': 'Delete Record',
     code: 'Code',
     'send-email': 'Send Email',
+    form: 'Form',
   };
 
   #createdActionNames: Record<WorkflowActionType, string> = {
@@ -39,6 +42,7 @@ export class WorkflowVisualizerPage {
     'delete-record': 'Delete Record',
     code: 'Code - Serverless Function',
     'send-email': 'Send Email',
+    form: 'Form',
   };
 
   #triggerNames: Record<WorkflowTriggerType, string> = {
@@ -84,6 +88,10 @@ export class WorkflowVisualizerPage {
     this.discardDraftButton = page.getByRole('button', {
       name: 'Discard Draft',
     });
+    this.seeRunsButton = page.getByRole('link', { name: 'See runs' });
+    this.goBackInCommandMenu = this.commandMenu
+      .getByRole('button')
+      .and(this.commandMenu.getByTestId('command-menu-go-back-button'));
   }
 
   async createOneWorkflow() {
@@ -250,29 +258,64 @@ export class WorkflowVisualizerPage {
 
     await expect(this.#page.getByTestId('command-menu')).not.toBeVisible();
   }
+
+  async goToWorkflowsIndexPage() {
+    await this.#page.goto('/objects/workflows');
+  }
+
+  async setWorkflowsOpenInMode(mode: 'side-panel' | 'record-page') {
+    const recordTableOptionsButton = this.#page.getByText('Options');
+    await recordTableOptionsButton.click();
+
+    const layoutButton = this.#page.getByText('Layout');
+    await layoutButton.click();
+
+    const openInButton = this.#page.getByText('Open in');
+    await openInButton.click();
+
+    if (mode === 'side-panel') {
+      const openInSidePanelOption = this.#page.getByRole('option', {
+        name: 'Side Panel',
+      });
+
+      await openInSidePanelOption.click();
+    } else {
+      const openInRecordPageOption = this.#page.getByRole('option', {
+        name: 'Record Page',
+      });
+
+      await openInRecordPageOption.click();
+    }
+
+    // Close the dropdown
+    await recordTableOptionsButton.click();
+  }
 }
 
-export const test = base.extend<{ workflowVisualizer: WorkflowVisualizerPage }>(
-  {
-    workflowVisualizer: async ({ page }, use) => {
-      const workflowVisualizer = new WorkflowVisualizerPage({
-        page,
-        workflowName: 'Test Workflow',
-      });
+export const test = base.extend<{
+  workflowVisualizer: WorkflowVisualizerPage;
+}>({
+  workflowVisualizer: async ({ page }, use) => {
+    const workflowVisualizer = new WorkflowVisualizerPage({
+      page,
+      workflowName: 'Test Workflow',
+    });
 
-      await workflowVisualizer.createOneWorkflow();
-      await workflowVisualizer.goToWorkflowVisualizerPage();
+    await workflowVisualizer.createOneWorkflow();
+    await workflowVisualizer.goToWorkflowVisualizerPage();
 
-      await use(workflowVisualizer);
+    await use(workflowVisualizer);
 
-      await deleteWorkflow({
-        page,
-        workflowId: workflowVisualizer.workflowId,
-      });
-      await destroyWorkflow({
-        page,
-        workflowId: workflowVisualizer.workflowId,
-      });
-    },
+    await deleteWorkflow({
+      page,
+      workflowId: workflowVisualizer.workflowId,
+    });
+    await destroyWorkflow({
+      page,
+      workflowId: workflowVisualizer.workflowId,
+    });
+
+    await workflowVisualizer.goToWorkflowsIndexPage();
+    await workflowVisualizer.setWorkflowsOpenInMode('record-page');
   },
-);
+});

packages/twenty-e2e-testing/lib/requests/delete-workflow.ts

@@ -19,7 +19,7 @@ export const deleteWorkflow = async ({
       operationName: 'DeleteOneWorkflow',
       variables: { idToDelete: workflowId },
       query:
-        'mutation DeleteOneWorkflow($idToDelete: ID!) {\n  deleteWorkflow(id: $idToDelete) {\n    __typename\n    deletedAt\n    id\n  }\n}',
+        'mutation DeleteOneWorkflow($idToDelete: UUID!) {\n  deleteWorkflow(id: $idToDelete) {\n    __typename\n    deletedAt\n    id\n  }\n}',
     },
   });
 };

packages/twenty-e2e-testing/lib/requests/destroy-workflow.ts

@@ -19,7 +19,7 @@ export const destroyWorkflow = async ({
       operationName: 'DestroyOneWorkflow',
       variables: { idToDestroy: workflowId },
       query:
-        'mutation DestroyOneWorkflow($idToDestroy: ID!) {\n  destroyWorkflow(id: $idToDestroy) {\n    id\n    __typename\n  }\n}',
+        'mutation DestroyOneWorkflow($idToDestroy: UUID!) {\n  destroyWorkflow(id: $idToDestroy) {\n    id\n    __typename\n  }\n}',
     },
   });
 };

packages/twenty-e2e-testing/lib/types/workflows.ts

@@ -9,4 +9,5 @@ export type WorkflowActionType =
   | 'update-record'
   | 'delete-record'
   | 'code'
-  | 'send-email';
+  | 'send-email'
+  | 'form';

packages/twenty-e2e-testing/tests/workflow-run.spec.ts

@@ -56,3 +56,97 @@ test('The workflow run visualizer shows the executed draft version without the l
     'Create Record',
   );
 });
+
+test('Workflow Runs with a pending form step can be opened in the side panel and then in full screen', async ({
+  workflowVisualizer,
+  page,
+}) => {
+  await workflowVisualizer.createInitialTrigger('manual');
+
+  const manualTriggerAvailabilitySelect = page.getByRole('button', {
+    name: 'When record(s) are selected',
+  });
+
+  await manualTriggerAvailabilitySelect.click();
+
+  const alwaysAvailableOption = page.getByText(
+    'When no record(s) are selected',
+  );
+
+  await alwaysAvailableOption.click();
+
+  await workflowVisualizer.closeSidePanel();
+
+  const { createdStepId: firstStepId } =
+    await workflowVisualizer.createStep('form');
+
+  await workflowVisualizer.closeSidePanel();
+
+  const launchTestButton = page.getByLabel(workflowVisualizer.workflowName);
+
+  await launchTestButton.click();
+
+  const goToExecutionPageLink = page.getByRole('link', {
+    name: 'View execution details',
+  });
+
+  await expect(goToExecutionPageLink).toBeVisible();
+
+  await workflowVisualizer.seeRunsButton.click();
+
+  const workflowRunName = `#1 - ${workflowVisualizer.workflowName}`;
+
+  const workflowRunNameCell = page.getByRole('cell', { name: workflowRunName });
+
+  await expect(workflowRunNameCell).toBeVisible();
+
+  await workflowVisualizer.setWorkflowsOpenInMode('side-panel');
+
+  // 1. Exit the dropdown
+  await workflowRunNameCell.click();
+  // 2. Actually open the workflow run in the side panel
+  await workflowRunNameCell.click();
+
+  await expect(workflowVisualizer.stepHeaderInCommandMenu).toContainText(
+    'Form',
+  );
+
+  await workflowVisualizer.goBackInCommandMenu.click();
+
+  const workflowRunNameInCommandMenu =
+    workflowVisualizer.commandMenu.getByText(workflowRunName);
+
+  await expect(workflowRunNameInCommandMenu).toBeVisible();
+
+  await workflowVisualizer.triggerNode.click();
+
+  await expect(workflowVisualizer.stepHeaderInCommandMenu).toContainText(
+    'Launch manually',
+  );
+
+  await workflowVisualizer.goBackInCommandMenu.click();
+
+  const formStep = workflowVisualizer.getStepNode(firstStepId);
+
+  await formStep.click();
+
+  await workflowVisualizer.goBackInCommandMenu.click();
+
+  const openInFullScreenButton = workflowVisualizer.commandMenu.getByRole(
+    'button',
+    { name: 'Open' },
+  );
+
+  await openInFullScreenButton.click();
+
+  const workflowRunNameInShowPage = page
+    .getByText(`#1 - ${workflowVisualizer.workflowName}`)
+    .nth(1);
+
+  await expect(workflowRunNameInShowPage).toBeVisible();
+
+  // Expect the side panel to be opened by default on the form.
+  await expect(workflowVisualizer.stepHeaderInCommandMenu).toContainText(
+    'Form',
+  );
+});

packages/twenty-e2e-testing/tests/workflow-use-as-draft.spec.ts

@@ -8,25 +8,19 @@ test('Use an old version as draft', async ({ workflowVisualizer, page }) => {
 
   await workflowVisualizer.background.click();
 
-  await Promise.all([
-    expect(workflowVisualizer.workflowStatus).toHaveText('Active'),
+  await workflowVisualizer.activateWorkflowButton.click();
 
-    workflowVisualizer.activateWorkflowButton.click(),
-  ]);
+  await expect(workflowVisualizer.workflowStatus).toHaveText('Active');
 
-  await Promise.all([
-    expect(workflowVisualizer.workflowStatus).toHaveText('Draft'),
+  await workflowVisualizer.createStep('delete-record');
 
-    workflowVisualizer.createStep('delete-record'),
-  ]);
+  await expect(workflowVisualizer.workflowStatus).toHaveText('Draft');
 
-  await workflowVisualizer.background.click();
+  await workflowVisualizer.closeSidePanel();
 
-  await Promise.all([
-    expect(workflowVisualizer.workflowStatus).toHaveText('Active'),
+  await workflowVisualizer.activateWorkflowButton.click();
 
-    workflowVisualizer.activateWorkflowButton.click(),
-  ]);
+  await expect(workflowVisualizer.workflowStatus).toHaveText('Active');
 
   await expect(workflowVisualizer.triggerNode).toContainText(
     'Record is Created',
@@ -41,6 +35,8 @@ test('Use an old version as draft', async ({ workflowVisualizer, page }) => {
   const workflowsLink = page.getByRole('link', { name: 'Workflows' });
   await workflowsLink.click();
 
+  await workflowVisualizer.setWorkflowsOpenInMode('record-page');
+
   const recordTableRowForWorkflow = page.getByRole('row', {
     name: workflowVisualizer.workflowName,
   });
@@ -48,7 +44,7 @@ test('Use an old version as draft', async ({ workflowVisualizer, page }) => {
   const linkToWorkflow = recordTableRowForWorkflow.getByRole('link', {
     name: workflowVisualizer.workflowName,
   });
-  expect(linkToWorkflow).toBeVisible();
+  await expect(linkToWorkflow).toBeVisible();
 
   const linkToFirstWorkflowVersion = recordTableRowForWorkflow.getByRole(
     'link',
@@ -69,11 +65,9 @@ test('Use an old version as draft', async ({ workflowVisualizer, page }) => {
   ]);
   await expect(workflowVisualizer.getAllStepNodes()).toHaveCount(1);
 
-  await Promise.all([
-    page.waitForURL(`/object/workflow/${workflowVisualizer.workflowId}`),
+  await workflowVisualizer.useAsDraftButton.click();
 
-    workflowVisualizer.useAsDraftButton.click(),
-  ]);
+  await page.waitForURL(`/object/workflow/${workflowVisualizer.workflowId}`);
 
   await expect(workflowVisualizer.workflowStatus).toHaveText('Draft');
   await expect(workflowVisualizer.useAsDraftButton).not.toBeVisible();
@@ -96,17 +90,13 @@ test('Use an old version as draft while having a pending draft version', async (
 
   await workflowVisualizer.background.click();
 
-  await Promise.all([
-    expect(workflowVisualizer.workflowStatus).toHaveText('Active'),
+  await workflowVisualizer.activateWorkflowButton.click();
 
-    workflowVisualizer.activateWorkflowButton.click(),
-  ]);
+  await expect(workflowVisualizer.workflowStatus).toHaveText('Active');
 
-  await Promise.all([
-    expect(workflowVisualizer.workflowStatus).toHaveText('Draft'),
+  await workflowVisualizer.createStep('delete-record');
 
-    workflowVisualizer.createStep('delete-record'),
-  ]);
+  await expect(workflowVisualizer.workflowStatus).toHaveText('Draft');
 
   await expect(workflowVisualizer.triggerNode).toContainText(
     'Record is Created',
@@ -130,7 +120,7 @@ test('Use an old version as draft while having a pending draft version', async (
   const linkToWorkflow = recordTableRowForWorkflow.getByRole('link', {
     name: workflowVisualizer.workflowName,
   });
-  expect(linkToWorkflow).toBeVisible();
+  await expect(linkToWorkflow).toBeVisible();
 
   const linkToFirstWorkflowVersion = recordTableRowForWorkflow.getByRole(
     'link',
@@ -151,17 +141,13 @@ test('Use an old version as draft while having a pending draft version', async (
   ]);
   await expect(workflowVisualizer.getAllStepNodes()).toHaveCount(1);
 
-  await Promise.all([
-    expect(workflowVisualizer.overrideDraftButton).toBeVisible(),
+  await workflowVisualizer.useAsDraftButton.click();
 
-    workflowVisualizer.useAsDraftButton.click(),
-  ]);
+  await expect(workflowVisualizer.overrideDraftButton).toBeVisible();
 
-  await Promise.all([
-    page.waitForURL(`/object/workflow/${workflowVisualizer.workflowId}`),
+  await workflowVisualizer.overrideDraftButton.click();
 
-    workflowVisualizer.overrideDraftButton.click(),
-  ]);
+  await page.waitForURL(`/object/workflow/${workflowVisualizer.workflowId}`);
 
   await expect(workflowVisualizer.workflowStatus).toHaveText('Draft');
   await expect(workflowVisualizer.useAsDraftButton).not.toBeVisible();

packages/twenty-emails/package.json

@@ -27,13 +27,13 @@
   },
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.mjs",
-      "require": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.js"
     }
   },
   "engines": {
-    "node": "^18.17.1",
+    "node": "^22.12.0",
     "npm": "please-use-yarn",
     "yarn": "^4.0.2"
   }

packages/twenty-emails/src/common-style.ts

@@ -54,8 +54,7 @@ export const emailTheme = {
   },
   background: {
     colors: { highlight: grayScale.gray15 },
-    radialGradient: `radial-gradient(50% 62.62% at 50% 0%, #505050 0%, ${grayScale.gray60} 100%)`,
-    radialGradientHover: `radial-gradient(76.32% 95.59% at 50% 0%, #505050 0%, ${grayScale.gray60} 100%)`,
+    button: grayScale.gray60,
     transparent: {
       medium: 'rgba(0, 0, 0, 0.08)',
       light: 'rgba(0, 0, 0, 0.04)',

packages/twenty-emails/src/components/CallToAction.tsx

@@ -3,15 +3,16 @@ import { Button } from '@react-email/components';
 import { emailTheme } from 'src/common-style';
 
 const callToActionStyle = {
-  display: 'flex',
+  display: 'inline-flex',
   padding: '8px 32px',
   borderRadius: emailTheme.border.radius.md,
   border: `1px solid ${emailTheme.background.transparent.light}`,
-  background: emailTheme.background.radialGradient,
+  background: emailTheme.background.button,
   boxShadow: `0px 2px 4px 0px ${emailTheme.background.transparent.light}, 0px 0px 4px 0px ${emailTheme.background.transparent.medium}`,
   color: emailTheme.font.colors.inverted,
   fontSize: emailTheme.font.size.md,
   fontWeight: emailTheme.font.weight.bold,
+  width: 'auto',
 };
 
 type CallToActionProps = {

packages/twenty-emails/src/components/Logo.tsx

@@ -7,7 +7,7 @@ const logoStyle = {
 export const Logo = () => {
   return (
     <Img
-      src="https://app.twenty.com/icons/windows11/Square150x150Logo.scale-100.png"
+      src="https://app.twenty.com/images/icons/windows11/Square150x150Logo.scale-100.png"
       alt="Twenty logo"
       width="40"
       height="40"

packages/twenty-emails/src/emails/clean-suspended-workspace.email.tsx

@@ -42,10 +42,13 @@ export const CleanSuspendedWorkspaceEmail = ({
         <br />
         <Trans id="If you wish to use Twenty again, you can create a new workspace." />
       </MainText>
+      <br />
       <CallToAction
         href="https://app.twenty.com/"
         value={i18n._('Create a new workspace')}
       />
+      <br />
+      <br />
     </BaseEmail>
   );
 };

packages/twenty-emails/src/emails/password-reset-link.email.tsx

@@ -21,7 +21,6 @@ export const PasswordResetLinkEmail = ({
   return (
     <BaseEmail locale={locale}>
       <Title value={i18n._('Reset your password 🗝')} />
-      <CallToAction href={link} value={i18n._('Reset')} />
       <MainText>
         <Trans
           id="This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
@@ -30,6 +29,10 @@ export const PasswordResetLinkEmail = ({
         <br />
         <Link href={link} value={link} />
       </MainText>
+      <br />
+      <CallToAction href={link} value={i18n._('Reset')} />
+      <br />
+      <br />
     </BaseEmail>
   );
 };

packages/twenty-emails/src/emails/password-update-notify.email.tsx

@@ -41,7 +41,10 @@ export const PasswordUpdateNotifyEmail = ({
         <Trans id="If you did not initiate this change, please contact your workspace owner immediately." />
         <br />
       </MainText>
+      <br />
       <CallToAction value={i18n._('Connect to Twenty')} href={link} />
+      <br />
+      <br />
     </BaseEmail>
   );
 };

packages/twenty-emails/src/emails/send-email-verification-link.email.tsx

@@ -18,12 +18,13 @@ export const SendEmailVerificationLinkEmail = ({
   return (
     <BaseEmail width={333} locale={locale}>
       <Title value={i18n._('Confirm your email address')} />
+      <MainText>
+        <Trans id="Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address." />
+      </MainText>
+      <br />
       <CallToAction href={link} value={i18n._('Verify Email')} />
       <br />
       <br />
-      <MainText>
-        <Trans id="Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address." />
-      </MainText>
     </BaseEmail>
   );
 };

packages/twenty-emails/src/emails/test.email.tsx

@@ -13,6 +13,8 @@ export const TestEmail = ({ locale }: TestEmailProps) => {
   return (
     <BaseEmail locale={locale}>
       <Title value={i18n._('Test email')} />
+      <br />
+      <br />
     </BaseEmail>
   );
 };

packages/twenty-emails/src/emails/validate-approved-access-domain.email.tsx

@@ -76,6 +76,7 @@ export const SendApprovedAccessDomainValidation = ({
         {workspace.name ? <HighlightedText value={workspace.name} /> : <></>}
         <CallToAction href={link} value={i18n._('Validate domain')} />
       </HighlightedContainer>
+      <br />
     </BaseEmail>
   );
 };

packages/twenty-emails/src/emails/warn-suspended-workspace.email.tsx

@@ -54,10 +54,13 @@ export const WarnSuspendedWorkspaceEmail = ({
           values={{ remainingDays, dayOrDays }}
         />
       </MainText>
+      <br />
       <CallToAction
         href="https://app.twenty.com/settings/billing"
         value={i18n._('Update your subscription')}
       />
+      <br />
+      <br />
     </BaseEmail>
   );
 };

packages/twenty-emails/src/locales/af-ZA.po

@@ -95,12 +95,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Verify Email"
+msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address."
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+msgid "Verify Email"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -130,12 +130,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "Reset"
+msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
+msgid "Reset"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -223,6 +223,11 @@ msgstr ""
 msgid "San Francisco / Paris"
 msgstr ""
 
+#. js-lingui-explicit-id
+#: src/emails/send-email-verification-link.email.tsx
+#~ msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+#~ msgstr ""
+
 #. js-lingui-id: 4WPI3S
 #: src/emails/send-invite-link.email.tsx
 #~ msgid "Accept invite"

packages/twenty-emails/src/locales/ar-SA.po

@@ -95,12 +95,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Verify Email"
+msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address."
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+msgid "Verify Email"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -130,12 +130,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "Reset"
+msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
+msgid "Reset"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -223,6 +223,11 @@ msgstr ""
 msgid "San Francisco / Paris"
 msgstr ""
 
+#. js-lingui-explicit-id
+#: src/emails/send-email-verification-link.email.tsx
+#~ msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+#~ msgstr ""
+
 #. js-lingui-id: 4WPI3S
 #: src/emails/send-invite-link.email.tsx
 #~ msgid "Accept invite"

packages/twenty-emails/src/locales/ca-ES.po

@@ -95,12 +95,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Verify Email"
+msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address."
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+msgid "Verify Email"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -130,12 +130,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "Reset"
+msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
+msgid "Reset"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -223,6 +223,11 @@ msgstr ""
 msgid "San Francisco / Paris"
 msgstr ""
 
+#. js-lingui-explicit-id
+#: src/emails/send-email-verification-link.email.tsx
+#~ msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+#~ msgstr ""
+
 #. js-lingui-id: 4WPI3S
 #: src/emails/send-invite-link.email.tsx
 #~ msgid "Accept invite"

packages/twenty-emails/src/locales/cs-CZ.po

@@ -95,12 +95,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Verify Email"
+msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address."
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+msgid "Verify Email"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -130,12 +130,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "Reset"
+msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
+msgid "Reset"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -223,6 +223,11 @@ msgstr ""
 msgid "San Francisco / Paris"
 msgstr ""
 
+#. js-lingui-explicit-id
+#: src/emails/send-email-verification-link.email.tsx
+#~ msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+#~ msgstr ""
+
 #. js-lingui-id: 4WPI3S
 #: src/emails/send-invite-link.email.tsx
 #~ msgid "Accept invite"

packages/twenty-emails/src/locales/da-DK.po

@@ -95,12 +95,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Verify Email"
+msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address."
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+msgid "Verify Email"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -130,12 +130,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "Reset"
+msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
+msgid "Reset"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -223,6 +223,11 @@ msgstr ""
 msgid "San Francisco / Paris"
 msgstr ""
 
+#. js-lingui-explicit-id
+#: src/emails/send-email-verification-link.email.tsx
+#~ msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+#~ msgstr ""
+
 #. js-lingui-id: 4WPI3S
 #: src/emails/send-invite-link.email.tsx
 #~ msgid "Accept invite"

packages/twenty-emails/src/locales/de-DE.po

@@ -95,12 +95,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Verify Email"
+msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address."
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+msgid "Verify Email"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -130,12 +130,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "Reset"
+msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
+msgid "Reset"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -223,6 +223,11 @@ msgstr ""
 msgid "San Francisco / Paris"
 msgstr ""
 
+#. js-lingui-explicit-id
+#: src/emails/send-email-verification-link.email.tsx
+#~ msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+#~ msgstr ""
+
 #. js-lingui-id: 4WPI3S
 #: src/emails/send-invite-link.email.tsx
 #~ msgid "Accept invite"

packages/twenty-emails/src/locales/el-GR.po

@@ -95,12 +95,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Verify Email"
+msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address."
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+msgid "Verify Email"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -130,12 +130,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "Reset"
+msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
+msgid "Reset"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -223,6 +223,11 @@ msgstr ""
 msgid "San Francisco / Paris"
 msgstr ""
 
+#. js-lingui-explicit-id
+#: src/emails/send-email-verification-link.email.tsx
+#~ msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+#~ msgstr ""
+
 #. js-lingui-id: 4WPI3S
 #: src/emails/send-invite-link.email.tsx
 #~ msgid "Accept invite"

packages/twenty-emails/src/locales/en.po

@@ -90,13 +90,13 @@ msgstr "Confirm your email address"
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Verify Email"
-msgstr "Verify Email"
+msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address."
+msgstr "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address."
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
-msgstr "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+msgid "Verify Email"
+msgstr "Verify Email"
 
 #. js-lingui-explicit-id
 #: src/emails/password-update-notify.email.tsx
@@ -125,13 +125,13 @@ msgstr "Reset your password 🗝"
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "Reset"
-msgstr "Reset"
+msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
+msgstr "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
-msgstr "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
+msgid "Reset"
+msgstr "Reset"
 
 #. js-lingui-explicit-id
 #: src/emails/clean-suspended-workspace.email.tsx
@@ -218,6 +218,11 @@ msgstr "Twenty.com, Public Benefit Corporation"
 msgid "San Francisco / Paris"
 msgstr "San Francisco / Paris"
 
+#. js-lingui-explicit-id
+#: src/emails/send-email-verification-link.email.tsx
+#~ msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+#~ msgstr "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+
 #. js-lingui-id: 4WPI3S
 #: src/emails/send-invite-link.email.tsx
 #~ msgid "Accept invite"

packages/twenty-emails/src/locales/es-ES.po

@@ -95,12 +95,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Verify Email"
+msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address."
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+msgid "Verify Email"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -130,12 +130,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "Reset"
+msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
+msgid "Reset"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -223,6 +223,11 @@ msgstr ""
 msgid "San Francisco / Paris"
 msgstr ""
 
+#. js-lingui-explicit-id
+#: src/emails/send-email-verification-link.email.tsx
+#~ msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+#~ msgstr ""
+
 #. js-lingui-id: 4WPI3S
 #: src/emails/send-invite-link.email.tsx
 #~ msgid "Accept invite"

packages/twenty-emails/src/locales/fi-FI.po

@@ -95,12 +95,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Verify Email"
+msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address."
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+msgid "Verify Email"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -130,12 +130,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "Reset"
+msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
+msgid "Reset"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -223,6 +223,11 @@ msgstr ""
 msgid "San Francisco / Paris"
 msgstr ""
 
+#. js-lingui-explicit-id
+#: src/emails/send-email-verification-link.email.tsx
+#~ msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+#~ msgstr ""
+
 #. js-lingui-id: 4WPI3S
 #: src/emails/send-invite-link.email.tsx
 #~ msgid "Accept invite"

packages/twenty-emails/src/locales/fr-FR.po

@@ -95,12 +95,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Verify Email"
+msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address."
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+msgid "Verify Email"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -130,12 +130,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "Reset"
+msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
+msgid "Reset"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -223,6 +223,11 @@ msgstr ""
 msgid "San Francisco / Paris"
 msgstr ""
 
+#. js-lingui-explicit-id
+#: src/emails/send-email-verification-link.email.tsx
+#~ msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+#~ msgstr ""
+
 #. js-lingui-id: 4WPI3S
 #: src/emails/send-invite-link.email.tsx
 #~ msgid "Accept invite"

packages/twenty-emails/src/locales/he-IL.po

@@ -95,12 +95,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Verify Email"
+msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address."
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+msgid "Verify Email"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -130,12 +130,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "Reset"
+msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
+msgid "Reset"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -223,6 +223,11 @@ msgstr ""
 msgid "San Francisco / Paris"
 msgstr ""
 
+#. js-lingui-explicit-id
+#: src/emails/send-email-verification-link.email.tsx
+#~ msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+#~ msgstr ""
+
 #. js-lingui-id: 4WPI3S
 #: src/emails/send-invite-link.email.tsx
 #~ msgid "Accept invite"

packages/twenty-emails/src/locales/hu-HU.po

@@ -95,12 +95,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Verify Email"
+msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address."
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+msgid "Verify Email"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -130,12 +130,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "Reset"
+msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
+msgid "Reset"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -223,6 +223,11 @@ msgstr ""
 msgid "San Francisco / Paris"
 msgstr ""
 
+#. js-lingui-explicit-id
+#: src/emails/send-email-verification-link.email.tsx
+#~ msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+#~ msgstr ""
+
 #. js-lingui-id: 4WPI3S
 #: src/emails/send-invite-link.email.tsx
 #~ msgid "Accept invite"

packages/twenty-emails/src/locales/it-IT.po

@@ -95,12 +95,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Verify Email"
+msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address."
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+msgid "Verify Email"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -130,12 +130,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "Reset"
+msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
+msgid "Reset"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -223,6 +223,11 @@ msgstr ""
 msgid "San Francisco / Paris"
 msgstr ""
 
+#. js-lingui-explicit-id
+#: src/emails/send-email-verification-link.email.tsx
+#~ msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+#~ msgstr ""
+
 #. js-lingui-id: 4WPI3S
 #: src/emails/send-invite-link.email.tsx
 #~ msgid "Accept invite"

packages/twenty-emails/src/locales/ja-JP.po

@@ -95,12 +95,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Verify Email"
+msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address."
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+msgid "Verify Email"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -130,12 +130,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "Reset"
+msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
+msgid "Reset"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -223,6 +223,11 @@ msgstr ""
 msgid "San Francisco / Paris"
 msgstr ""
 
+#. js-lingui-explicit-id
+#: src/emails/send-email-verification-link.email.tsx
+#~ msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+#~ msgstr ""
+
 #. js-lingui-id: 4WPI3S
 #: src/emails/send-invite-link.email.tsx
 #~ msgid "Accept invite"

packages/twenty-emails/src/locales/ko-KR.po

@@ -95,12 +95,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Verify Email"
+msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address."
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+msgid "Verify Email"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -130,12 +130,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "Reset"
+msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
+msgid "Reset"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -223,6 +223,11 @@ msgstr ""
 msgid "San Francisco / Paris"
 msgstr ""
 
+#. js-lingui-explicit-id
+#: src/emails/send-email-verification-link.email.tsx
+#~ msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+#~ msgstr ""
+
 #. js-lingui-id: 4WPI3S
 #: src/emails/send-invite-link.email.tsx
 #~ msgid "Accept invite"

packages/twenty-emails/src/locales/nl-NL.po

@@ -95,12 +95,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Verify Email"
+msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address."
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+msgid "Verify Email"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -130,12 +130,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "Reset"
+msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
+msgid "Reset"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -223,6 +223,11 @@ msgstr ""
 msgid "San Francisco / Paris"
 msgstr ""
 
+#. js-lingui-explicit-id
+#: src/emails/send-email-verification-link.email.tsx
+#~ msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+#~ msgstr ""
+
 #. js-lingui-id: 4WPI3S
 #: src/emails/send-invite-link.email.tsx
 #~ msgid "Accept invite"

packages/twenty-emails/src/locales/no-NO.po

@@ -95,12 +95,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Verify Email"
+msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click below to verify your email address."
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/send-email-verification-link.email.tsx
-msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+msgid "Verify Email"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -130,12 +130,12 @@ msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "Reset"
+msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
 msgstr ""
 
 #. js-lingui-explicit-id
 #: src/emails/password-reset-link.email.tsx
-msgid "This link is only valid for the next {duration}. If the link does not work, you can use the login verification link directly:"
+msgid "Reset"
 msgstr ""
 
 #. js-lingui-explicit-id
@@ -223,6 +223,11 @@ msgstr ""
 msgid "San Francisco / Paris"
 msgstr ""
 
+#. js-lingui-explicit-id
+#: src/emails/send-email-verification-link.email.tsx
+#~ msgid "Thanks for registering for an account on Twenty! Before we get started, we just need to confirm that this is you. Click above to verify your email address."
+#~ msgstr ""
+
 #. js-lingui-id: 4WPI3S
 #: src/emails/send-invite-link.email.tsx
 #~ msgid "Accept invite"