diff --git a/.cursorrules b/.cursorrules
index 13fcbabadc26..aed6eed699f1 100644
--- a/.cursorrules
+++ b/.cursorrules
@@ -65,6 +65,13 @@
 - Types in types/
 - PascalCase components, camelCase others
 
+## Translation
+- Use @lingui/react/macro
+- Use <Trans> within components
+- Use t`string` elsewhere (from useLingui hook)
+- Don't translate metadata (field names, object names, etc)
+- Don't translate mocks
+
 ## Code Style
 - Early returns
 - No nested ternaries
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 95f91b2a78be..e1345956eb1e 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -1,7 +1,14 @@
 module.exports = {
   root: true,
-  extends: ['plugin:prettier/recommended'],
-  plugins: ['@nx', 'prefer-arrow', 'import', 'unused-imports', 'unicorn'],
+  extends: ['plugin:prettier/recommended', 'plugin:lingui/recommended'],
+  plugins: [
+    '@nx',
+    'prefer-arrow',
+    'import',
+    'unused-imports',
+    'unicorn',
+    'lingui',
+  ],
   rules: {
     'func-style': ['error', 'declaration', { allowArrowFunctions: true }],
     'no-console': ['warn', { allow: ['group', 'groupCollapsed', 'groupEnd'] }],
@@ -29,6 +36,10 @@ module.exports = {
             sourceTag: 'scope:frontend',
             onlyDependOnLibsWithTags: ['scope:shared', 'scope:frontend'],
           },
+          {
+            sourceTag: 'scope:zapier',
+            onlyDependOnLibsWithTags: ['scope:shared'],
+          },
         ],
       },
     ],
@@ -96,7 +107,11 @@ module.exports = {
       rules: {},
     },
     {
-      files: ['*.spec.@(ts|tsx|js|jsx)', '*.test.@(ts|tsx|js|jsx)'],
+      files: [
+        '*.spec.@(ts|tsx|js|jsx)',
+        '*.integration-spec.@(ts|tsx|js|jsx)',
+        '*.test.@(ts|tsx|js|jsx)',
+      ],
       env: {
         jest: true,
       },
diff --git a/.github/workflows/actions/nx-affected/action.yaml b/.github/workflows/actions/nx-affected/action.yaml
index af5ba29aa47e..7c2cdcfe7601 100644
--- a/.github/workflows/actions/nx-affected/action.yaml
+++ b/.github/workflows/actions/nx-affected/action.yaml
@@ -2,14 +2,11 @@ name: Nx Affected CI
 inputs:
   parallel:
     required: false
-    types: [number]
-    default: 3
+    default: '3'
   tag:
     required: false
-    types: [string]
   tasks:
     required: true
-    types: [string]
 
 runs:
   using: "composite"
diff --git a/.github/workflows/actions/restore-cache/action.yaml b/.github/workflows/actions/restore-cache/action.yaml
new file mode 100644
index 000000000000..c970556032ba
--- /dev/null
+++ b/.github/workflows/actions/restore-cache/action.yaml
@@ -0,0 +1,35 @@
+name: Restore cache
+inputs:
+  key:
+    required: true
+    description: Prefix to the cache key
+  additional-paths:
+    required: false
+outputs:
+  cache-primary-key:
+    description: actions/cache/restore cache-primary-key outputs proxy
+    value: ${{ steps.restore-cache.outputs.cache-primary-key }}
+  cache-hit:
+    description: String bool indicating whether cache has been directly or indirectly hit
+    value: ${{ steps.restore-cache.outputs.cache-hit == 'true' || steps.restore-cache.outputs.cache-matched-key != '' }}
+
+runs:
+  using: composite
+  steps:
+    - name: Cache primary key builder
+      id: cache-primary-key-builder
+      shell: bash
+      run: |
+        echo "CACHE_PRIMARY_KEY_PREFIX=${{ inputs.key }}-${{ github.ref_name }}" >> "${GITHUB_OUTPUT}"
+    - name: Restore cache
+      uses: actions/cache/restore@v4
+      id: restore-cache
+      with:
+        key:  ${{ steps.cache-primary-key-builder.outputs.CACHE_PRIMARY_KEY_PREFIX }}-${{ github.sha }}
+        restore-keys: ${{ steps.cache-primary-key-builder.outputs.CACHE_PRIMARY_KEY_PREFIX }}-
+        path: |
+          .cache
+          .nx/cache
+          node_modules/.cache
+          packages/*/node_modules/.cache
+          ${{ inputs.additional-paths }}
\ No newline at end of file
diff --git a/.github/workflows/actions/save-cache/action.yaml b/.github/workflows/actions/save-cache/action.yaml
new file mode 100644
index 000000000000..b51a5d478bdd
--- /dev/null
+++ b/.github/workflows/actions/save-cache/action.yaml
@@ -0,0 +1,21 @@
+name: Save cache
+inputs:
+  key:
+    required: true
+    description: Primary key to the cache, should be retrieved from `cache-restore` composite action outputs.
+  additional-paths:
+    required: false
+
+runs:
+  using: "composite"
+  steps:
+    - name: Save cache
+      uses: actions/cache/save@v4
+      with:
+        key: ${{ inputs.key }}
+        path: |
+          .cache
+          .nx/cache
+          node_modules/.cache
+          packages/*/node_modules/.cache
+          ${{ inputs.additional-paths }}
\ No newline at end of file
diff --git a/.github/workflows/actions/task-cache/action.yaml b/.github/workflows/actions/task-cache/action.yaml
deleted file mode 100644
index c622c84a1e05..000000000000
--- a/.github/workflows/actions/task-cache/action.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Restore Tasks Cache CI
-inputs:
-  tag:
-    required: false
-    types: [string]
-  tasks:
-    required: false
-    types: [string]
-    default: all
-  suffix:
-    required: false
-    types: [string]
-
-runs:
-  using: "composite"
-  steps:
-    - name: Compute tasks key
-      id: tasks-key
-      shell: bash
-      run: echo "key=${{ inputs.tasks }}" | tr , - >> $GITHUB_OUTPUT
-    - name: Restore tasks cache
-      uses: actions/cache@v3
-      with:
-        path: |
-          .cache
-          .nx/cache
-          node_modules/.cache
-          packages/*/node_modules/.cache
-        key: tasks-cache-${{ github.ref_name }}-${{ inputs.tag }}-${{ steps.tasks-key.outputs.key }}${{ inputs.suffix }}-${{ github.sha }}
-        restore-keys: |
-          tasks-cache-${{ github.ref_name }}-${{ inputs.tag }}-${{ steps.tasks-key.outputs.key }}${{ inputs.suffix }}-
\ No newline at end of file
diff --git a/.github/workflows/actions/yarn-install/action.yaml b/.github/workflows/actions/yarn-install/action.yaml
index d17134a6131c..3cdef5493eab 100644
--- a/.github/workflows/actions/yarn-install/action.yaml
+++ b/.github/workflows/actions/yarn-install/action.yaml
@@ -1,23 +1,43 @@
 name: Yarn Install
+inputs:
+  node-version:
+    required: false
+    default: '18'
 
 runs:
   using: "composite"
   steps:
+    - name: Cache primary key builder
+      id: globals
+      shell: bash
+      run: |
+        echo "ACTION_SHELL=bash" >> "${GITHUB_OUTPUT}"
+        echo "CACHE_KEY_PREFIX=node_modules-cache-node-${{ inputs.node-version }}-${{ hashFiles('yarn.lock') }}"  >> "${GITHUB_OUTPUT}"
+        echo 'PATH_TO_CACHE<<EOF' >> $GITHUB_OUTPUT
+        echo "node_modules" >> $GITHUB_OUTPUT
+        echo "packages/*/node_modules" >> $GITHUB_OUTPUT
+        echo 'EOF' >> $GITHUB_OUTPUT
     - name: Setup Node.js and get yarn cache
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
-        node-version: "18"
-        cache: yarn
-    - name: Cache node modules
-      id: node-modules-cache
-      uses: actions/cache@v3
+        node-version: ${{ inputs.node-version }}
+    - name: Restore node_modules
+      id: cache-node-modules
+      uses: actions/cache/restore@v4
       with:
-        path: |
-          node_modules
-          packages/*/node_modules
-        key: root-node_modules-${{ hashFiles('yarn.lock') }}
-        restore-keys: root-node_modules-
+        key: ${{ steps.globals.outputs.CACHE_KEY_PREFIX }}-${{github.sha}}
+        restore-keys: ${{ steps.globals.outputs.CACHE_KEY_PREFIX }}-
+        path: ${{ steps.globals.outputs.PATH_TO_CACHE }}
     - name: Install Dependencies
-      shell: bash
-      run: yarn --immutable --check-cache
-      if: steps.node-modules-cache.outputs.cache-hit != 'true'
\ No newline at end of file
+      if: ${{ steps.cache-node-modules.outputs.cache-hit != 'true' && steps.cache-node-modules.outputs.cache-matched-key == '' }}
+      shell: ${{ steps.globals.outputs.ACTION_SHELL }}
+      run: |
+        yarn config set enableHardenedMode true
+        yarn --immutable --check-cache
+    - name: Save cache
+      if: ${{ steps.cache-node-modules.outputs.cache-hit != 'true' && steps.cache-node-modules.outputs.cache-matched-key == '' }}
+      uses: actions/cache/save@v4
+      with:
+        key: ${{ steps.cache-node-modules.outputs.cache-primary-key }}
+        path: ${{ steps.globals.outputs.PATH_TO_CACHE }}
+      
\ No newline at end of file
diff --git a/.github/workflows/changed-files.yaml b/.github/workflows/changed-files.yaml
new file mode 100644
index 000000000000..b1d028dde345
--- /dev/null
+++ b/.github/workflows/changed-files.yaml
@@ -0,0 +1,27 @@
+name: Changed files reusable workflow
+on:
+  workflow_call:
+    inputs:
+      files:
+        required: true
+        type: string
+    outputs:
+      any_changed:
+        value: ${{ jobs.changed-files.outputs.any_changed }}
+
+jobs:
+  changed-files:
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    outputs:
+      any_changed: ${{ steps.changed-files.outputs.any_changed }}
+    steps:
+      - name: Fetch custom Github Actions and base branch history
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Check for changed files
+        id: changed-files
+        uses: tj-actions/changed-files@v45
+        with:
+          files: ${{ inputs.files }}
diff --git a/.github/workflows/ci-chrome-extension.yaml b/.github/workflows/ci-chrome-extension.yaml
index 63c7094f7044..3bdbfb61eb49 100644
--- a/.github/workflows/ci-chrome-extension.yaml
+++ b/.github/workflows/ci-chrome-extension.yaml
@@ -3,15 +3,23 @@ on:
   push:
     branches:
       - main
-  
+
   pull_request:
-    
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
+  changed-files-check:
+    uses: ./.github/workflows/changed-files.yaml
+    with:
+      files: |
+        package.json
+        packages/twenty-chrome-extension/**
   chrome-extension-build:
+    needs: changed-files-check
+    if: needs.changed-files-check.outputs.any_changed == 'true'
     timeout-minutes: 15
     runs-on: ubuntu-latest
     env:
@@ -25,23 +33,16 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
-      - name: Check for changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v11
-        with:
-          files: |
-            package.json
-            packages/twenty-chrome-extension/**
-             
       - name: Install dependencies
-        if: steps.changed-files.outputs.any_changed == 'true'
         uses: ./.github/workflows/actions/yarn-install
       - name: Chrome Extension / Run build
-        if: steps.changed-files.outputs.any_changed == 'true'
         run: npx nx build twenty-chrome-extension
-
-      - name: Mark as Valid if No Changes
-        if: steps.changed-files.outputs.changed != 'true'
-        run: |
-          echo "No relevant changes detected. Marking as valid."  
+  ci-chrome-extension-status-check:
+    if: always() && !cancelled()
+    timeout-minutes: 1
+    runs-on: ubuntu-latest
+    needs: [changed-files-check, chrome-extension-build]
+    steps:
+      - name: Fail job if any needs failed
+        if: contains(needs.*.result, 'failure')
+        run: exit 1
diff --git a/.github/workflows/ci-e2e.yml b/.github/workflows/ci-e2e.yaml
similarity index 70%
rename from .github/workflows/ci-e2e.yml
rename to .github/workflows/ci-e2e.yaml
index 9b94cb938b2f..4b5bf5603c3b 100644
--- a/.github/workflows/ci-e2e.yml
+++ b/.github/workflows/ci-e2e.yaml
@@ -1,18 +1,27 @@
-name: CI E2E Tests
+name: CI E2E Playwright Tests
 on:
   push:
     branches:
       - main
   pull_request:
+    types: [opened, synchronize, reopened, labeled]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
+  changed-files-check:
+    uses: ./.github/workflows/changed-files.yaml
+    with:
+      files: |
+          packages/**
+          playwright.config.ts
+          .github/workflows/ci-e2e.yaml
   test:
     runs-on: ubuntu-latest
-    if: github.event_name == 'push' || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'run-e2e'))
+    needs: changed-files-check
+    if: needs.changed-files-check.outputs.any_changed == 'true' && ( github.event_name == 'push' || (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'run-e2e')))
     timeout-minutes: 30
     env:
       NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
@@ -54,76 +63,50 @@ jobs:
         echo "CPU info:"
         lscpu
 
-    - name: Check for changed files
-      id: changed-files
-      uses: tj-actions/changed-files@v11
-      with:
-        files: |
-          packages/**
-          playwright.config.ts
-          .github/workflows/ci-e2e.yml
-
-    - name: Skip if no relevant changes
-      if: steps.changed-files.outputs.any_changed == 'false'
-      run: echo "No relevant changes detected. Marking as valid."
-
     - name: Install dependencies
-      if: steps.changed-files.outputs.any_changed == 'true'
       uses: ./.github/workflows/actions/yarn-install
 
     - name: Build twenty-shared
-      if: steps.changed-files.outputs.any_changed == 'true'
       run: npx nx build twenty-shared
 
+    - name: Install Playwright Browsers
+      run: npx nx setup twenty-e2e-testing
+
     - name: Setup environment files
-      if: steps.changed-files.outputs.any_changed == 'true'
       run: |
-        cp packages/twenty-e2e-testing/.env.example packages/twenty-e2e-testing/.env
         cp packages/twenty-front/.env.example packages/twenty-front/.env
-        cp packages/twenty-e2e-testing/.env.example packages/twenty-e2e-testing/.env
         npx nx reset:env twenty-server
 
     - name: Build frontend
-      if: steps.changed-files.outputs.any_changed == 'true'
       run: NODE_ENV=production NODE_OPTIONS="--max-old-space-size=10240" npx nx build twenty-front
 
     - name: Build server
-      if: steps.changed-files.outputs.any_changed == 'true'
       run: NODE_ENV=production npx nx build twenty-server
 
     - name: Create and setup database
-      if: steps.changed-files.outputs.any_changed == 'true'
       run: |
         PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -d postgres -c 'CREATE DATABASE "default";'
         PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -d postgres -c 'CREATE DATABASE "test";'
         npx nx run twenty-server:database:reset
-        
+
     - name: Start server
-      if: steps.changed-files.outputs.any_changed == 'true'
       run: |
         npx nx start twenty-server &
         echo "Waiting for server to be ready..."
         timeout 60 bash -c 'until curl -s http://localhost:3000/health; do sleep 2; done'
 
     - name: Start frontend
-      if: steps.changed-files.outputs.any_changed == 'true'
       run: |
         npm_config_yes=true npx serve -s packages/twenty-front/build -l 3001 &
         echo "Waiting for frontend to be ready..."
         timeout 60 bash -c 'until curl -s http://localhost:3001; do sleep 2; done'
         
     - name: Start worker
-      if: steps.changed-files.outputs.any_changed == 'true'
       run: |
         npx nx run twenty-server:worker:ci &
         echo "Worker started"
 
-    - name: Install Playwright Browsers
-      if: steps.changed-files.outputs.any_changed == 'true'
-      run: npx nx setup twenty-e2e-testing
-
     - name: Run Playwright tests
-      if: steps.changed-files.outputs.any_changed == 'true'
       run: npx nx test twenty-e2e-testing
 
     - uses: actions/upload-artifact@v4
@@ -139,3 +122,12 @@ jobs:
         name: playwright-report
         path: packages/twenty-e2e-testing/playwright-report/
         retention-days: 30
+  ci-e2e-status-check:
+      if: always() && !cancelled()
+      timeout-minutes: 1
+      runs-on: ubuntu-latest
+      needs: [changed-files-check, test]
+      steps:
+        - name: Fail job if any needs failed
+          if: contains(needs.*.result, 'failure')
+          run: exit 1
diff --git a/.github/workflows/ci-front.yaml b/.github/workflows/ci-front.yaml
index 95f18fc990fc..f22bbb556da2 100644
--- a/.github/workflows/ci-front.yaml
+++ b/.github/workflows/ci-front.yaml
@@ -3,17 +3,30 @@ on:
   push:
     branches:
       - main
-    
+
   pull_request:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  STORYBOOK_BUILD_CACHE_KEY: storybook-build-depot-ubuntu-24.04-8-runner
+
 jobs:
+  changed-files-check:
+    uses: ./.github/workflows/changed-files.yaml
+    with:
+      files: |
+        package.json
+        packages/twenty-front/**
+        packages/twenty-ui/**
+        packages/twenty-shared/**
   front-sb-build:
+    needs: [changed-files-check]
+    if: needs.changed-files-check.outputs.any_changed == 'true'
     timeout-minutes: 30
-    runs-on: ubuntu-latest
+    runs-on: depot-ubuntu-24.04-8
     env:
       REACT_APP_SERVER_BASE_URL: http://localhost:3000
       NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
@@ -26,47 +39,34 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
-      - name: Check for changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v11
-        with:
-          files: |
-            package.json
-            packages/twenty-front/**
-            packages/twenty-ui/**
-            packages/twenty-shared/**
-
-      - name: Skip if no relevant changes
-        if: steps.changed-files.outputs.any_changed == 'false'
-        run: echo "No relevant changes. Skipping CI."
-
       - name: Install dependencies
-        if: steps.changed-files.outputs.any_changed == 'true' 
         uses: ./.github/workflows/actions/yarn-install
       - name: Diagnostic disk space issue
-        if: steps.changed-files.outputs.any_changed == 'true'
         run: df -h
-      - name: Front / Restore Storybook Task Cache
-        if: steps.changed-files.outputs.any_changed == 'true'
-        uses: ./.github/workflows/actions/task-cache
+      - name: Restore storybook build cache
+        id: restore-storybook-build-cache
+        uses: ./.github/workflows/actions/restore-cache
         with:
-          tag: scope:frontend
-          tasks: storybook:build
+          key: ${{ env.STORYBOOK_BUILD_CACHE_KEY }}
       - name: Front / Write .env
-        if: steps.changed-files.outputs.any_changed == 'true'
         run: npx nx reset:env twenty-front
       - name: Front / Build storybook
-        if: steps.changed-files.outputs.any_changed == 'true'
         run: npx nx storybook:build twenty-front
+      - name: Save storybook build cache
+        uses: ./.github/workflows/actions/save-cache
+        with:
+          key: ${{ steps.restore-storybook-build-cache.outputs.cache-primary-key }}
   front-sb-test:
     timeout-minutes: 30
-    runs-on: shipfox-8vcpu-ubuntu-2204
+    runs-on: depot-ubuntu-24.04-8
     needs: front-sb-build
     strategy:
+      fail-fast: false
       matrix:
-        storybook_scope: [pages, modules]
+        shard: [1, 2, 3, 4]
+        storybook_scope: [modules, pages, performance]
     env:
+      SHARD_COUNTER: 4
       REACT_APP_SERVER_BASE_URL: http://localhost:3000
       NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
     steps:
@@ -74,73 +74,57 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Check for changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v11
-        with:
-          files: |
-            packages/twenty-front/**  
-      - name: Skip if no relevant changes
-        if: steps.changed-files.outputs.any_changed == 'false'
-        run: echo "No relevant changes. Skipping CI." 
-
       - name: Install dependencies
-        if: steps.changed-files.outputs.any_changed == 'true'
         uses: ./.github/workflows/actions/yarn-install
       - name: Install Playwright
-        if: steps.changed-files.outputs.any_changed == 'true'
         run: cd packages/twenty-front && npx playwright install
-      - name: Front / Restore Storybook Task Cache
-        if: steps.changed-files.outputs.any_changed == 'true'
-        uses: ./.github/workflows/actions/task-cache
+      - name: Restore storybook build cache
+        uses: ./.github/workflows/actions/restore-cache
         with:
-          tag: scope:frontend
-          tasks: storybook:build
+          key: ${{ env.STORYBOOK_BUILD_CACHE_KEY }}
       - name: Front / Write .env
-        if: steps.changed-files.outputs.any_changed == 'true'
         run: npx nx reset:env twenty-front
       - name: Run storybook tests
-        if: steps.changed-files.outputs.any_changed == 'true'
-        run: npx nx storybook:serve-and-test:static twenty-front --configuration=${{ matrix.storybook_scope }}
-  front-sb-test-performance:
+        run: npx nx storybook:serve-and-test:static twenty-front --configuration=${{ matrix.storybook_scope }} --shard=${{ matrix.shard }}/${{ env.SHARD_COUNTER }} --checkCoverage=false
+      - name: Rename coverage file
+        run: mv packages/twenty-front/coverage/storybook/coverage-storybook.json packages/twenty-front/coverage/storybook/coverage-shard-${{matrix.shard}}.json
+      - name: Upload coverage artifact
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 1
+          name: coverage-artifacts-${{ matrix.storybook_scope }}-${{ github.run_id }}-${{ matrix.shard }}
+          path: packages/twenty-front/coverage/storybook/coverage-shard-${{matrix.shard}}.json
+  merge-reports-and-check-coverage:
     timeout-minutes: 30
-    runs-on: shipfox-8vcpu-ubuntu-2204
+    runs-on: depot-ubuntu-24.04-8
+    needs: front-sb-test
     env:
-      REACT_APP_SERVER_BASE_URL: http://localhost:3000
-      NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
+      PATH_TO_COVERAGE: packages/twenty-front/coverage/storybook
+    strategy:
+      matrix:
+        storybook_scope: [modules, pages, performance]
     steps:
-      - name: Fetch local actions
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Check for changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v11
-        with:
-          files: |
-            packages/twenty-front/**
-
-      - name: Skip if no relevant changes
-        if: steps.changed-files.outputs.any_changed == 'false'
-        run: echo "No relevant changes. Skipping CI."
-
       - name: Install dependencies
-        if: steps.changed-files.outputs.any_changed == 'true'
         uses: ./.github/workflows/actions/yarn-install
-      - name: Install Playwright
-        if: steps.changed-files.outputs.any_changed == 'true'
-        run: cd packages/twenty-front && npx playwright install
-      - name: Front / Write .env
-        if: steps.changed-files.outputs.any_changed == 'true'
-        run: npx nx reset:env twenty-front
-      - name: Run storybook tests
-        if: steps.changed-files.outputs.any_changed == 'true'
-        run: npx nx run twenty-front:storybook:serve-and-test:static:performance
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: coverage-artifacts-${{ matrix.storybook_scope }}-${{ github.run_id }}-*
+          merge-multiple: true
+          path: coverage-artifacts
+      - name: Merge coverage reports
+        run: |
+          mkdir -p ${{ env.PATH_TO_COVERAGE }}
+          npx nyc merge coverage-artifacts ${{ env.PATH_TO_COVERAGE }}/coverage-storybook.json
+      - name: Checking coverage
+        run: npx nx storybook:coverage twenty-front --checkCoverage=true --configuration=${{ matrix.storybook_scope }}
   front-chromatic-deployment:
     timeout-minutes: 30
     if: contains(github.event.pull_request.labels.*.name, 'run-chromatic') || github.event_name == 'push'
     needs: front-sb-build
-    runs-on: ubuntu-latest
+    runs-on: depot-ubuntu-24.04-8
     env:
       REACT_APP_SERVER_BASE_URL: http://127.0.0.1:3000
       CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
@@ -149,41 +133,27 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
-      - name: Check for changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v11
-        with:
-          files: |
-            packages/twenty-front/**
-
-      - name: Skip if no relevant changes
-        if: steps.changed-files.outputs.any_changed == 'false'
-        run: echo "No relevant changes. Skipping CI."
-
       - name: Install dependencies
-        if: steps.changed-files.outputs.any_changed == 'true'
         uses: ./.github/workflows/actions/yarn-install
-      - name: Front / Restore Storybook Task Cache
-        if: steps.changed-files.outputs.any_changed == 'true'
-        uses: ./.github/workflows/actions/task-cache
+      - name: Restore storybook build cache
+        uses: ./.github/workflows/actions/restore-cache
         with:
-          tag: scope:frontend
-          tasks: storybook:build
+          key: ${{ env.STORYBOOK_BUILD_CACHE_KEY }}
       - name: Front / Write .env
-        if: steps.changed-files.outputs.any_changed == 'true'
         run: |
           cd packages/twenty-front
           touch .env
           echo "REACT_APP_SERVER_BASE_URL: $REACT_APP_SERVER_BASE_URL" >> .env
       - name: Publish to Chromatic
-        if: steps.changed-files.outputs.any_changed == 'true'
         run: npx nx run twenty-front:chromatic:ci
   front-task:
+    needs: changed-files-check
+    if: needs.changed-files-check.outputs.any_changed == 'true'
     timeout-minutes: 30
-    runs-on: ubuntu-latest
+    runs-on: depot-ubuntu-24.04-8
     env:
       NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
+      TASK_CACHE_KEY: front-task-${{ matrix.task }}
     strategy:
       matrix:
         task: [lint, typecheck, test]
@@ -196,35 +166,41 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Check for changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v11
-        with:
-          files: |
-            packages/twenty-front/**
-
-      - name: Skip if no relevant changes
-        if: steps.changed-files.outputs.any_changed == 'false'
-        run: echo "No relevant changes. Skipping CI."
-
       - name: Install dependencies
-        if: steps.changed-files.outputs.any_changed == 'true'
         uses: ./.github/workflows/actions/yarn-install
-      - name: Front / Restore ${{ matrix.task }} task cache
-        if: steps.changed-files.outputs.any_changed == 'true'
-        uses: ./.github/workflows/actions/task-cache
+      - name: Restore ${{ matrix.task }} cache
+        id: restore-task-cache
+        uses: ./.github/workflows/actions/restore-cache
         with:
-          tag: scope:frontend
-          tasks: ${{ matrix.task }}
+          key: ${{ env.TASK_CACHE_KEY }}
       - name: Reset .env
-        if: steps.changed-files.outputs.any_changed == 'true'
         uses: ./.github/workflows/actions/nx-affected
         with:
           tag: scope:frontend
           tasks: reset:env
       - name: Run ${{ matrix.task }} task
-        if: steps.changed-files.outputs.any_changed == 'true'
         uses: ./.github/workflows/actions/nx-affected
         with:
           tag: scope:frontend
           tasks: ${{ matrix.task }}
+      - name: Save ${{ matrix.task }} cache
+        uses: ./.github/workflows/actions/save-cache
+        with:
+          key: ${{ steps.restore-task-cache.outputs.cache-primary-key }}
+  ci-front-status-check:
+    if: always() && !cancelled()
+    timeout-minutes: 1
+    runs-on: depot-ubuntu-24.04-8
+    needs:
+      [
+        changed-files-check,
+        front-task,
+        front-chromatic-deployment,
+        merge-reports-and-check-coverage,
+        front-sb-test,
+        front-sb-build,
+      ]
+    steps:
+      - name: Fail job if any needs failed
+        if: contains(needs.*.result, 'failure')
+        run: exit 1
diff --git a/.github/workflows/ci-server.yaml b/.github/workflows/ci-server.yaml
index 5e71284fdc01..ba7a40e342b7 100644
--- a/.github/workflows/ci-server.yaml
+++ b/.github/workflows/ci-server.yaml
@@ -5,15 +5,28 @@ on:
       - main
 
   pull_request:
-   
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  SERVER_SETUP_CACHE_KEY: server-setup
+
 jobs:
+  changed-files-check:
+    uses: ./.github/workflows/changed-files.yaml
+    with:
+      files: |
+        package.json
+        packages/twenty-server/**
+        packages/twenty-emails/**
+        packages/twenty-shared/**
   server-setup:
+    needs: changed-files-check
+    if: needs.changed-files-check.outputs.any_changed == 'true'
     timeout-minutes: 30
-    runs-on: ubuntu-latest
+    runs-on: depot-ubuntu-24.04-8
     env:
       NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
     services:
@@ -22,8 +35,8 @@ jobs:
         env:
           PGUSER_SUPERUSER: postgres
           PGPASSWORD_SUPERUSER: postgres
-          ALLOW_NOSSL: "true"
-          SPILO_PROVIDER: "local"
+          ALLOW_NOSSL: 'true'
+          SPILO_PROVIDER: 'local'
         ports:
           - 5432:5432
         options: >-
@@ -40,52 +53,33 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
-      - name: Check for changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v11
-        with:
-          files: |
-            package.json
-            packages/twenty-server/**
-            packages/twenty-emails/**
-            packages/twenty-shared/**
-
       - name: Install dependencies
-        if: steps.changed-files.outputs.any_changed == 'true'
         uses: ./.github/workflows/actions/yarn-install
+      - name: Restore server setup
+        id: restore-server-setup-cache
+        uses: ./.github/workflows/actions/restore-cache
+        with:
+          key: ${{ env.SERVER_SETUP_CACHE_KEY }}
       - name: Build twenty-shared
-        if: steps.changed-files.outputs.any_changed == 'true'
         run: npx nx build twenty-shared
-      - name: Server / Restore Task Cache
-        if: steps.changed-files.outputs.any_changed == 'true'
-        uses: ./.github/workflows/actions/task-cache
-        with:
-          tag: scope:backend
       - name: Server / Run lint & typecheck
-        if: steps.changed-files.outputs.any_changed == 'true'
         uses: ./.github/workflows/actions/nx-affected
         with:
           tag: scope:backend
           tasks: lint,typecheck
       - name: Server / Build
-        if: steps.changed-files.outputs.any_changed == 'true'
         run: npx nx build twenty-server
       - name: Server / Write .env
-        if: steps.changed-files.outputs.any_changed == 'true'
         run: npx nx reset:env twenty-server
       - name: Server / Create DB
-        if: steps.changed-files.outputs.any_changed == 'true'
         run: |
           PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -d postgres -c 'CREATE DATABASE "default";'
           PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -d postgres -c 'CREATE DATABASE "test";'
           npx nx run twenty-server:database:init:prod
           npx nx run twenty-server:database:migrate:prod
       - name: Worker / Run
-        if: steps.changed-files.outputs.any_changed == 'true'
         run: npx nx run twenty-server:worker:ci
       - name: Server / Check for Pending Migrations
-        if: steps.changed-files.outputs.any_changed == 'true'
         run: |
           METADATA_MIGRATION_OUTPUT=$(npx nx run twenty-server:typeorm migration:generate metadata-migration-check -d src/database/typeorm/metadata/metadata.datasource.ts || true)
 
@@ -103,10 +97,27 @@ jobs:
             
             exit 1
           fi
+      - name: GraphQL / Check for Pending Generation
+        if: steps.changed-files.outputs.any_changed == 'true'
+        run: |
+          GRAPHQL_GENERATE_OUTPUT=$(npx nx run twenty-front:graphql:generate || true)
+          GRAPHQL_METADATA_OUTPUT=$(npx nx run twenty-front:graphql:generate --configuration=metadata || true)
+          if [[ $GRAPHQL_GENERATE_OUTPUT == *"No changes detected"* && $GRAPHQL_METADATA_OUTPUT == *"No changes detected"* ]]; then
+            echo "GraphQL generation check passed."
+          else
+            echo "::error::Unexpected GraphQL changes detected. Please run the required commands and commit the changes."
+            echo "$GRAPHQL_GENERATE_OUTPUT"
+            echo "$GRAPHQL_METADATA_OUTPUT"
+            exit 1    
+          fi
+      - name: Save server setup
+        uses: ./.github/workflows/actions/save-cache
+        with:
+          key: ${{ steps.restore-server-setup-cache.outputs.cache-primary-key }}
 
   server-test:
     timeout-minutes: 30
-    runs-on: ubuntu-latest
+    runs-on: depot-ubuntu-24.04-8
     needs: server-setup
     env:
       NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
@@ -115,27 +126,13 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
-      - name: Check for changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v11
-        with:
-          files: |
-            package.json
-            packages/twenty-server/**
-            packages/twenty-emails/**
-            packages/twenty-shared/**
-
       - name: Install dependencies
-        if: steps.changed-files.outputs.any_changed == 'true'
         uses: ./.github/workflows/actions/yarn-install
-      - name: Server / Restore Task Cache
-        if: steps.changed-files.outputs.any_changed == 'true'
-        uses: ./.github/workflows/actions/task-cache
+      - name: Restore server setup
+        uses: ./.github/workflows/actions/restore-cache
         with:
-          tag: scope:backend
-      - name:  Server / Run Tests
-        if: steps.changed-files.outputs.any_changed == 'true'
+          key: ${{ env.SERVER_SETUP_CACHE_KEY }}
+      - name: Server / Run Tests
         uses: ./.github/workflows/actions/nx-affected
         with:
           tag: scope:backend
@@ -143,7 +140,7 @@ jobs:
 
   server-integration-test:
     timeout-minutes: 30
-    runs-on: ubuntu-latest
+    runs-on: depot-ubuntu-24.04-8
     needs: server-setup
     services:
       postgres:
@@ -151,8 +148,8 @@ jobs:
         env:
           PGUSER_SUPERUSER: postgres
           PGPASSWORD_SUPERUSER: postgres
-          ALLOW_NOSSL: "true"
-          SPILO_PROVIDER: "local"
+          ALLOW_NOSSL: 'true'
+          SPILO_PROVIDER: 'local'
         ports:
           - 5432:5432
         options: >-
@@ -171,33 +168,35 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
-      - name: Check for changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v11
-        with:
-          files: |
-            package.json
-            packages/twenty-server/**
-            packages/twenty-emails/**
-
       - name: Install dependencies
-        if: steps.changed-files.outputs.any_changed == 'true'
         uses: ./.github/workflows/actions/yarn-install
-      - name: Server / Restore Task Cache
-        if: steps.changed-files.outputs.any_changed == 'true'
-        uses: ./.github/workflows/actions/task-cache
+      - name: Update .env.test for billing
+        run: |
+          echo "IS_BILLING_ENABLED=true" >> .env.test
+          echo "BILLING_STRIPE_API_KEY=test-api-key" >> .env.test
+          echo "BILLING_STRIPE_BASE_PLAN_PRODUCT_ID=test-base-plan-product-id" >> .env.test
+          echo "BILLING_STRIPE_WEBHOOK_SECRET=test-webhook-secret" >> .env.test
+      - name: Restore server setup
+        uses: ./.github/workflows/actions/restore-cache
         with:
-          tag: scope:backend
+          key: ${{ env.SERVER_SETUP_CACHE_KEY }}
       - name: Server / Run Integration Tests
-        if: steps.changed-files.outputs.any_changed == 'true'
         uses: ./.github/workflows/actions/nx-affected
         with:
           tag: scope:backend
-          tasks: "test:integration:with-db-reset"
+          tasks: 'test:integration:with-db-reset'
       - name: Server / Upload reset-logs file
         if: always()
         uses: actions/upload-artifact@v4
         with:
           name: reset-logs
           path: reset-logs.log
+  ci-server-status-check:
+    if: always() && !cancelled()
+    timeout-minutes: 1
+    runs-on: depot-ubuntu-24.04-8
+    needs: [changed-files-check, server-setup, server-test, server-integration-test]
+    steps:
+      - name: Fail job if any needs failed 
+        if: contains(needs.*.result, 'failure')
+        run: exit 1
diff --git a/.github/workflows/ci-shared.yaml b/.github/workflows/ci-shared.yaml
index 41c334e054ed..1df2b36c399e 100644
--- a/.github/workflows/ci-shared.yaml
+++ b/.github/workflows/ci-shared.yaml
@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - main
-    
+
   pull_request:
 
 concurrency:
@@ -11,7 +11,14 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  changed-files-check:
+    uses: ./.github/workflows/changed-files.yaml
+    with:
+      files: |
+        packages/twenty-shared/**
   shared-test:
+    needs: changed-files-check
+    if: needs.changed-files-check.outputs.any_changed == 'true'
     timeout-minutes: 30
     runs-on: ubuntu-latest
     env:
@@ -28,21 +35,19 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Check for changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v11
-        with:
-          files: |
-            packages/twenty-shared/**
-      - name: Skip if no relevant changes
-        if: steps.changed-files.outputs.any_changed == 'false'
-        run: echo "No relevant changes. Skipping CI."
       - name: Install dependencies
-        if: steps.changed-files.outputs.any_changed == 'true'
         uses: ./.github/workflows/actions/yarn-install
       - name: Run ${{ matrix.task }} task
-        if: steps.changed-files.outputs.any_changed == 'true'
         uses: ./.github/workflows/actions/nx-affected
         with:
           tag: scope:frontend
           tasks: ${{ matrix.task }}
+  ci-shared-status-check:
+    if: always() && !cancelled()
+    timeout-minutes: 1
+    runs-on: ubuntu-latest
+    needs: [changed-files-check, shared-test]
+    steps:
+      - name: Fail job if any needs failed
+        if: contains(needs.*.result, 'failure')
+        run: exit 1
diff --git a/.github/workflows/ci-test-docker-compose.yaml b/.github/workflows/ci-test-docker-compose.yaml
index a9a076da33a3..21a8db3863df 100644
--- a/.github/workflows/ci-test-docker-compose.yaml
+++ b/.github/workflows/ci-test-docker-compose.yaml
@@ -1,92 +1,97 @@
 name: 'Test Docker Compose'
 on:
   pull_request:
-   
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
+  changed-files-check:
+    uses: ./.github/workflows/changed-files.yaml
+    with:
+      files: |
+        packages/twenty-docker/**
+        docker-compose.yml
   test:
+    needs: changed-files-check
+    if: needs.changed-files-check.outputs.any_changed == 'true'
     timeout-minutes: 30
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Check for changed files
-      id: changed-files
-      uses: tj-actions/changed-files@v11
-      with:
-          files: |
-            packages/twenty-docker/**
-            docker-compose.yml
-    - name: Skip if no relevant changes
-      if: steps.changed-files.outputs.any_changed != 'true'
-      run: echo "No relevant changes detected. Marking as valid."
-
-    - name: Run compose
-      if: steps.changed-files.outputs.any_changed == 'true'
-      run: |
-        echo "Patching docker-compose.yml..."
-        # change image to localbuild using yq
-        yq eval 'del(.services.server.image)' -i docker-compose.yml
-        yq eval '.services.server.build.context = "../../"' -i docker-compose.yml
-        yq eval '.services.server.build.dockerfile = "./packages/twenty-docker/twenty/Dockerfile"' -i docker-compose.yml
-        yq eval '.services.server.restart = "no"' -i docker-compose.yml
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Run compose
+        run: |
+          echo "Patching docker-compose.yml..."
+          # change image to localbuild using yq
+          yq eval 'del(.services.server.image)' -i docker-compose.yml
+          yq eval '.services.server.build.context = "../../"' -i docker-compose.yml
+          yq eval '.services.server.build.dockerfile = "./packages/twenty-docker/twenty/Dockerfile"' -i docker-compose.yml
+          yq eval '.services.server.restart = "no"' -i docker-compose.yml
 
-        yq eval 'del(.services.db.image)' -i docker-compose.yml
-        yq eval '.services.db.build.context = "../../"' -i docker-compose.yml
-        yq eval '.services.db.build.dockerfile = "./packages/twenty-docker/twenty-postgres-spilo/Dockerfile"' -i docker-compose.yml
+          yq eval 'del(.services.db.image)' -i docker-compose.yml
+          yq eval '.services.db.build.context = "../../"' -i docker-compose.yml
+          yq eval '.services.db.build.dockerfile = "./packages/twenty-docker/twenty-postgres-spilo/Dockerfile"' -i docker-compose.yml
 
-        echo "Setting up .env file..."
-        cp .env.example .env
-        echo "Generating secrets..."
-        echo "# === Randomly generated secrets ===" >>.env
-        echo "APP_SECRET=$(openssl rand -base64 32)" >>.env
-        echo "PGPASSWORD_SUPERUSER=$(openssl rand -base64 32)" >>.env
+          echo "Setting up .env file..."
+          cp .env.example .env
+          echo "Generating secrets..."
+          echo "# === Randomly generated secrets ===" >>.env
+          echo "APP_SECRET=$(openssl rand -base64 32)" >>.env
+          echo "PGPASSWORD_SUPERUSER=$(openssl rand -base64 32)" >>.env
 
-        echo "Docker compose up..."
-        docker compose up -d || {
-            echo "Docker compose failed to start"
-            docker compose logs
-            exit 1
-        }
-        docker compose logs db server -f &
-        pid=$!
+          echo "Docker compose up..."
+          docker compose up -d || {
+              echo "Docker compose failed to start"
+              docker compose logs
+              exit 1
+          }
+          docker compose logs db server -f &
+          pid=$!
 
-        echo "Waiting for database to start..."
-        count=0
-        while [ ! $(docker inspect --format='{{.State.Health.Status}}' twenty-db-1) = "healthy" ]; do
-            sleep 1;
-            count=$((count+1));
-            if [ $(docker inspect --format='{{.State.Status}}' twenty-db-1) = "exited" ]; then
-                echo "Database exited"
-                docker compose logs db
-                exit 1
-            fi
-            if [ $count -gt 300 ]; then
-                echo "Failed to start database after 5 minutes"
-                docker compose logs db
-                exit 1
-            fi
-            echo "Still waiting for database... (${count}/60)"
-        done
+          echo "Waiting for database to start..."
+          count=0
+          while [ ! $(docker inspect --format='{{.State.Health.Status}}' twenty-db-1) = "healthy" ]; do
+              sleep 1;
+              count=$((count+1));
+              if [ $(docker inspect --format='{{.State.Status}}' twenty-db-1) = "exited" ]; then
+                  echo "Database exited"
+                  docker compose logs db
+                  exit 1
+              fi
+              if [ $count -gt 300 ]; then
+                  echo "Failed to start database after 5 minutes"
+                  docker compose logs db
+                  exit 1
+              fi
+              echo "Still waiting for database... (${count}/60)"
+          done
 
-        echo "Waiting for server to start..."
-        count=0
-        while [ ! $(docker inspect --format='{{.State.Health.Status}}' twenty-server-1) = "healthy" ]; do
-            sleep 1;
-            count=$((count+1));
-            if [ $(docker inspect --format='{{.State.Status}}' twenty-server-1) = "exited" ]; then
-                echo "Server exited"
-                docker compose logs server
-                exit 1
-            fi
-            if [ $count -gt 300 ]; then
-                echo "Failed to start server after 5 minutes"
-                docker compose logs server
-                exit 1
-            fi
-            echo "Still waiting for server... (${count}/300s)"
-        done
-      working-directory: ./packages/twenty-docker/
+          echo "Waiting for server to start..."
+          count=0
+          while [ ! $(docker inspect --format='{{.State.Health.Status}}' twenty-server-1) = "healthy" ]; do
+              sleep 1;
+              count=$((count+1));
+              if [ $(docker inspect --format='{{.State.Status}}' twenty-server-1) = "exited" ]; then
+                  echo "Server exited"
+                  docker compose logs server
+                  exit 1
+              fi
+              if [ $count -gt 300 ]; then
+                  echo "Failed to start server after 5 minutes"
+                  docker compose logs server
+                  exit 1
+              fi
+              echo "Still waiting for server... (${count}/300s)"
+          done
+        working-directory: ./packages/twenty-docker/
+  ci-test-docker-compose-status-check:
+    if: always() && !cancelled()
+    timeout-minutes: 1
+    runs-on: ubuntu-latest
+    needs: [changed-files-check, test]
+    steps:
+      - name: Fail job if any needs failed
+        if: contains(needs.*.result, 'failure')
+        run: exit 1
diff --git a/.github/workflows/ci-website.yaml b/.github/workflows/ci-website.yaml
index ed5247a487c5..b92d2bae1a28 100644
--- a/.github/workflows/ci-website.yaml
+++ b/.github/workflows/ci-website.yaml
@@ -5,14 +5,21 @@ on:
       - main
 
   pull_request:
-    
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
+  changed-files-check:
+    uses: ./.github/workflows/changed-files.yaml
+    with:
+      files: |
+        package.json
+        packages/twenty-website/**
   website-build:
+    needs: changed-files-check
+    if: needs.changed-files-check.outputs.any_changed == 'true'
     timeout-minutes: 3
     runs-on: ubuntu-latest
     services:
@@ -21,8 +28,8 @@ jobs:
         env:
           PGUSER_SUPERUSER: postgres
           PGPASSWORD_SUPERUSER: postgres
-          ALLOW_NOSSL: "true"
-          SPILO_PROVIDER: "local"
+          ALLOW_NOSSL: 'true'
+          SPILO_PROVIDER: 'local'
         ports:
           - 5432:5432
         options: >-
@@ -34,31 +41,27 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Check for changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v11
-        with:
-          files: 'package.json, packages/twenty-website/**'
 
       - name: Install dependencies
-        if: steps.changed-files.outputs.changed == 'true' 
         uses: ./.github/workflows/actions/yarn-install
 
       - name: Server / Create DB
-        if: steps.changed-files.outputs.any_changed == 'true'
         run: PGPASSWORD=postgres psql -h localhost -p 5432 -U postgres -d postgres -c 'CREATE DATABASE "default";'
 
       - name: Website / Run migrations
-        if: steps.changed-files.outputs.changed == 'true' 
-        run: npx nx database:migrate twenty-website 
+        run: npx nx database:migrate twenty-website
         env:
           DATABASE_PG_URL: postgres://postgres:postgres@localhost:5432/default
       - name: Website / Build Website
-        if: steps.changed-files.outputs.changed == 'true' 
         run: npx nx build twenty-website
         env:
           DATABASE_PG_URL: postgres://postgres:postgres@localhost:5432/default
-
-      - name: Mark as VALID
-        if: steps.changed-files.outputs.changed != 'true'  # If no changes, mark as valid
-        run: echo "No relevant changes detected. CI is valid."    
\ No newline at end of file
+  ci-website-status-check:
+    if: always() && !cancelled()
+    timeout-minutes: 1
+    runs-on: ubuntu-latest
+    needs: [changed-files-check, website-build]
+    steps:
+      - name: Fail job if any needs failed
+        if: contains(needs.*.result, 'failure')
+        run: exit 1
diff --git a/.gitignore b/.gitignore
index 48296f0cb14f..03c7ae81b143 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@
 !.yarn/sdks
 !.yarn/versions
 .vercel
+.swc
 
 **/**/logs/**
 
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 15a0022d81d1..03197b7470c5 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -49,4 +49,6 @@
   "files.associations": {
     ".cursorrules": "markdown"
   },
+  "jestrunner.codeLensSelector": "**/*.{test,spec,integration-spec}.{js,jsx,ts,tsx}"
+  }
 }
diff --git a/README.md b/README.md
index 430d5015a2b0..be50ee1439f7 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 <h2 align="center" >The #1 Open-Source CRM </h3>
 
-<p align="center"><a href="https://twenty.com">🌐 Website</a> · <a href="https://twenty.com/developers">📚 Documentation</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 />
 
 
@@ -26,12 +26,6 @@
 
 # Demo 
 
-<!--
-You can use the following url to sign up to the cloud version without providing a credit card:
-
-<a href="https://demo.twenty.com/?billingCheckoutSession={"plan":"PRO","recurringInterval":"MONTHLY","requirePaymentMethod":false,"skipPlanPage":true}">https://demo.twenty.com/?billingCheckoutSession={"plan":"PRO","recurringInterval":"MONTHLY","requirePaymentMethod":false,"skipPlanPage":true}</a>
-
--->
 Go to <a href="https://demo.twenty.com/">demo.twenty.com</a> and login with the following credentials:
 
 ```
@@ -158,6 +152,7 @@ Below are a few features we have implemented to date:
 - [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.
+- [TranslationIO](https://translation.io/) for translations.
 
 
 # Join the Community
diff --git a/nx.json b/nx.json
index d73a57ed16e1..f001673687d2 100644
--- a/nx.json
+++ b/nx.json
@@ -14,6 +14,7 @@
       "!{projectRoot}/**/tsconfig.spec.json",
       "!{projectRoot}/**/*.test.(ts|tsx)",
       "!{projectRoot}/**/*.spec.(ts|tsx)",
+      "!{projectRoot}/**/*.integration-spec.ts",
       "!{projectRoot}/**/__tests__/*"
     ],
     "production": [
@@ -115,7 +116,7 @@
       "outputs": ["{projectRoot}/{options.output-dir}"],
       "options": {
         "cwd": "{projectRoot}",
-        "command": "VITE_DISABLE_TYPESCRIPT_CHECKER=true VITE_DISABLE_ESLINT_CHECKER=true storybook build",
+        "command": "VITE_DISABLE_TYPESCRIPT_CHECKER=true VITE_DISABLE_ESLINT_CHECKER=true storybook build --test",
         "output-dir": "storybook-static",
         "config-dir": ".storybook"
       },
@@ -151,12 +152,14 @@
       "options": {
         "cwd": "{projectRoot}",
         "commands": [
-          "test-storybook --url http://localhost:{args.port} --maxWorkers=3 --coverage --coverageDirectory={args.coverageDir}",
-          "nx storybook:coverage {projectName} --coverageDir={args.coverageDir}"
+          "test-storybook --url http://localhost:{args.port} --maxWorkers=3 --coverage --coverageDirectory={args.coverageDir} --shard={args.shard}",
+          "nx storybook:coverage {projectName} --coverageDir={args.coverageDir} --checkCoverage={args.checkCoverage}"
         ],
+        "shard": "1/1",
         "parallel": false,
         "coverageDir": "coverage/storybook",
-        "port": 6006
+        "port": 6006,
+        "checkCoverage": true
       }
     },
     "storybook:test:no-coverage": {
@@ -183,9 +186,10 @@
         "!{projectRoot}/coverage/storybook/coverage-storybook.json"
       ],
       "options": {
-        "command": "npx nyc report --reporter={args.reporter} --reporter=text-summary -t {args.coverageDir} --report-dir {args.coverageDir} --check-coverage --cwd={projectRoot}",
+        "command": "npx nyc report --reporter={args.reporter} --reporter=text-summary -t {args.coverageDir} --report-dir {args.coverageDir} --check-coverage={args.checkCoverage} --cwd={projectRoot}",
         "coverageDir": "coverage/storybook",
-        "reporter": "lcov"
+        "reporter": "lcov",
+        "checkCoverage": true
       },
       "configurations": {
         "text": { "reporter": "text" }
@@ -195,8 +199,10 @@
       "executor": "nx:run-commands",
       "options": {
         "commands": [
-          "npx concurrently --kill-others --success=first -n SB,TEST 'nx storybook:serve:static {projectName} --port={args.port} --configuration={args.performance}' 'npx wait-on tcp:{args.port} && nx storybook:test {projectName} --port={args.port} --configuration={args.scope}'"
+          "npx concurrently --kill-others --success=first -n SB,TEST 'nx storybook:serve:static {projectName} --port={args.port}' 'npx wait-on tcp:{args.port} && nx storybook:test {projectName} --shard={args.shard} --checkCoverage={args.checkCoverage} --port={args.port} --configuration={args.scope}'"
         ],
+        "shard": "1/1",
+        "checkCoverage": true,
         "port": 6006
       }
     },
diff --git a/package.json b/package.json
index f9b0f86ca8d3..cc2b07dfed49 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,8 @@
     "@jsdevtools/rehype-toc": "^3.0.2",
     "@linaria/core": "^6.2.0",
     "@linaria/react": "^6.2.1",
+    "@lingui/core": "^5.1.2",
+    "@lingui/react": "^5.1.2",
     "@mdx-js/react": "^3.0.0",
     "@microsoft/microsoft-graph-client": "^3.0.7",
     "@nestjs/apollo": "^11.0.5",
@@ -88,7 +90,7 @@
     "esbuild-plugin-svgr": "^2.1.0",
     "facepaint": "^1.2.1",
     "file-type": "16.5.4",
-    "framer-motion": "^10.12.17",
+    "framer-motion": "^11.18.0",
     "googleapis": "105",
     "graphiql": "^3.1.1",
     "graphql": "16.8.0",
@@ -202,6 +204,9 @@
     "@graphql-codegen/typescript": "^3.0.4",
     "@graphql-codegen/typescript-operations": "^3.0.4",
     "@graphql-codegen/typescript-react-apollo": "^3.3.7",
+    "@lingui/cli": "^5.1.2",
+    "@lingui/swc-plugin": "^5.0.2",
+    "@lingui/vite-plugin": "^5.1.2",
     "@microsoft/microsoft-graph-types": "^2.40.0",
     "@nestjs/cli": "^9.0.0",
     "@nestjs/schematics": "^9.0.0",
@@ -297,6 +302,7 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-jsx-a11y": "^6.8.0",
+    "eslint-plugin-lingui": "^0.9.0",
     "eslint-plugin-prefer-arrow": "^1.2.3",
     "eslint-plugin-prettier": "^5.1.2",
     "eslint-plugin-project-structure": "^3.9.1",
diff --git a/packages/twenty-chrome-extension/tsconfig.json b/packages/twenty-chrome-extension/tsconfig.json
index 840e10a78c08..d9bd2f66b549 100644
--- a/packages/twenty-chrome-extension/tsconfig.json
+++ b/packages/twenty-chrome-extension/tsconfig.json
@@ -9,8 +9,8 @@
     "skipLibCheck": true,
     "esModuleInterop": true,
     "paths": {
-      "@/*": ["packages/twenty-chrome-extension/src/options/modules/*"],
-      "~/*": ["packages/twenty-chrome-extension/src/*"]
+      "@/*": ["./src/options/modules/*"],
+      "~/*": ["./src/*"]
     },
 
     /* Bundler mode */
diff --git a/packages/twenty-docker/.env.example b/packages/twenty-docker/.env.example
index 40efdf33e7d0..591e4c91be11 100644
--- a/packages/twenty-docker/.env.example
+++ b/packages/twenty-docker/.env.example
@@ -6,6 +6,7 @@ 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
diff --git a/packages/twenty-docker/docker-compose.yml b/packages/twenty-docker/docker-compose.yml
index 0f32467e2331..df3293cbfc40 100644
--- a/packages/twenty-docker/docker-compose.yml
+++ b/packages/twenty-docker/docker-compose.yml
@@ -1,4 +1,3 @@
-version: "3.9"
 name: twenty
 
 services:
@@ -14,7 +13,7 @@ services:
       && chown -R 1000:1000 /tmp/docker-data"
 
   server:
-    image: twentycrm/twenty:${TAG}
+    image: twentycrm/twenty:${TAG:-latest}
     volumes:
       - server-local-data:/app/packages/twenty-server/${STORAGE_LOCAL_PATH:-.local-storage}
       - docker-data:/app/docker-data
@@ -26,7 +25,6 @@ services:
       SERVER_URL: ${SERVER_URL}
       REDIS_URL: ${REDIS_URL:-redis://redis:6379}
 
-      SIGN_IN_PREFILLED: ${SIGN_IN_PREFILLED}
       STORAGE_TYPE: ${STORAGE_TYPE}
       STORAGE_S3_REGION: ${STORAGE_S3_REGION}
       STORAGE_S3_NAME: ${STORAGE_S3_NAME}
@@ -46,7 +44,7 @@ services:
     restart: always
 
   worker:
-    image: twentycrm/twenty:${TAG}
+    image: twentycrm/twenty:${TAG:-latest}
     command: ["yarn", "worker:prod"]
     environment:
       PG_DATABASE_URL: postgres://${PGUSER_SUPERUSER:-postgres}:${PGPASSWORD_SUPERUSER:-postgres}@${PG_DATABASE_HOST:-db:5432}/default
@@ -68,7 +66,7 @@ services:
     restart: always
 
   db:
-    image: twentycrm/twenty-postgres-spilo:${TAG}
+    image: twentycrm/twenty-postgres-spilo:${TAG:-latest}
     volumes:
       - db-data:/home/postgres/pgdata
     environment:
diff --git a/packages/twenty-docker/k8s/manifests/deployment-db.yaml b/packages/twenty-docker/k8s/manifests/deployment-db.yaml
index 02a97c31bcfd..c797972e0578 100644
--- a/packages/twenty-docker/k8s/manifests/deployment-db.yaml
+++ b/packages/twenty-docker/k8s/manifests/deployment-db.yaml
@@ -27,13 +27,17 @@ spec:
             claimName: twentycrm-db-pvc
       containers:
         - name: twentycrm
-          image: twentycrm/twenty-postgres:latest
+          image: twentycrm/twenty-postgres-spilo:latest
           imagePullPolicy: Always
           env:
             - name: PGUSER_SUPERUSER
               value: "postgres"
             - name: PGPASSWORD_SUPERUSER
               value: "postgres"
+            - name: SPILO_PROVIDER
+              value: "local"
+            - name: ALLOW_NOSSL
+              value: "true"
           ports:
             - containerPort: 5432
               name: tcp
diff --git a/packages/twenty-docker/scripts/install.sh b/packages/twenty-docker/scripts/install.sh
index 0eec572b80de..5d560d6c773c 100755
--- a/packages/twenty-docker/scripts/install.sh
+++ b/packages/twenty-docker/scripts/install.sh
@@ -44,10 +44,10 @@ function on_exit {
 trap on_exit EXIT
 
 # Use environment variables VERSION and BRANCH, with defaults if not set
-version=${VERSION:-$(curl -s https://api.github.com/repos/twentyhq/twenty/tags | grep '"name":' | head -n 1 | cut -d '"' -f 4)}
-branch=${BRANCH:-$version}
+version=${VERSION:-$(curl -s "https://hub.docker.com/v2/repositories/twentycrm/twenty/tags" | grep -o '"name":"[^"]*"' | grep -v 'latest' | cut -d'"' -f4 | sort -V | tail -n1)}
+branch=${BRANCH:-$(curl -s https://api.github.com/repos/twentyhq/twenty/tags | grep '"name":' | head -n 1 | cut -d '"' -f 4)}
 
-echo "🚀 Using version $version and branch $branch"
+echo "🚀 Using docker version $version and Github branch $branch"
 
 dir_name="twenty"
 function ask_directory {
@@ -90,10 +90,12 @@ else
 fi
 
 # Generate random strings for secrets
-echo "# === Randomly generated secrets ===" >>.env
+echo "# === Randomly generated secret ===" >>.env
 echo "APP_SECRET=$(openssl rand -base64 32)" >>.env
-echo "" >>.env
-echo "PGPASSWORD_SUPERUSER=$(openssl rand -hex 16)" >>.env
+
+# Issue with Postgres spilo?
+#echo "" >>.env
+#echo "PGPASSWORD_SUPERUSER=$(openssl rand -hex 16)" >>.env
 
 echo -e "\t• .env configuration completed"
 
diff --git a/packages/twenty-e2e-testing/.env.example b/packages/twenty-e2e-testing/.env.example
index 4cebcc1107c1..9f0b80f99380 100644
--- a/packages/twenty-e2e-testing/.env.example
+++ b/packages/twenty-e2e-testing/.env.example
@@ -1,8 +1,7 @@
 # Note that provide always without trailing forward slash to have expected behaviour
 FRONTEND_BASE_URL=http://localhost:3001
+BACKEND_BASE_URL=http://localhost:3000
 DEFAULT_LOGIN=tim@apple.dev
-NEW_WORKSPACE_LOGIN=test@apple.dev
-DEMO_DEFAULT_LOGIN=noah@demo.dev
 DEFAULT_PASSWORD=Applecar2025
 WEBSITE_URL=https://twenty.com
 
diff --git a/packages/twenty-e2e-testing/config/customreporter.ts b/packages/twenty-e2e-testing/config/customreporter.ts
deleted file mode 100644
index 62a602ef8e7b..000000000000
--- a/packages/twenty-e2e-testing/config/customreporter.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import {
-  Reporter,
-  FullConfig,
-  Suite,
-  TestCase,
-  TestResult,
-  FullResult,
-} from '@playwright/test/reporter';
-
-class CustomReporter implements Reporter {
-  constructor(options: { customOption?: string } = {}) {
-    console.log(
-      `my-awesome-reporter setup with customOption set to ${options.customOption}`,
-    );
-  }
-
-  onBegin(config: FullConfig, suite: Suite) {
-    console.log(`Starting the run with ${suite.allTests().length} tests`);
-  }
-
-  onTestBegin(test: TestCase) {
-    console.log(`Starting test ${test.title}`);
-  }
-
-  onTestEnd(test: TestCase, result: TestResult) {
-    console.log(`Finished test ${test.title}: ${result.status}`);
-  }
-
-  onEnd(result: FullResult) {
-    console.log(`Finished the run: ${result.status}`);
-  }
-}
-export default CustomReporter;
diff --git a/packages/twenty-e2e-testing/drivers/env_variables.ts b/packages/twenty-e2e-testing/drivers/env_variables.ts
deleted file mode 100644
index 768b1872c9ef..000000000000
--- a/packages/twenty-e2e-testing/drivers/env_variables.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import * as fs from 'fs';
-import path from 'path';
-
-export const envVariables = (variables: string) => {
-  let payload = `
-  PG_DATABASE_URL=postgres://postgres:postgres@localhost:5432/default
-  ACCESS_TOKEN_SECRET=replace_me_with_a_random_string_access
-  LOGIN_TOKEN_SECRET=replace_me_with_a_random_string_login
-  REFRESH_TOKEN_SECRET=replace_me_with_a_random_string_refresh
-  FILE_TOKEN_SECRET=replace_me_with_a_random_string_refresh
-  REDIS_URL=redis://localhost:6379
-  `;
-  payload = payload.concat(variables);
-  fs.writeFile(
-    path.join(__dirname, '..', '..', 'twenty-server', '.env'),
-    payload,
-    (err) => {
-      throw err;
-    },
-  );
-};
diff --git a/packages/twenty-e2e-testing/drivers/shell_driver.ts b/packages/twenty-e2e-testing/drivers/shell_driver.ts
deleted file mode 100644
index cf293c032bf1..000000000000
--- a/packages/twenty-e2e-testing/drivers/shell_driver.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { exec } from 'child_process';
-
-export async function sh(cmd) {
-  return new Promise((resolve, reject) => {
-    exec(cmd, (err, stdout, stderr) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve({ stdout, stderr });
-      }
-    });
-  });
-}
diff --git a/packages/twenty-e2e-testing/lib/fixtures/blank-workflow.ts b/packages/twenty-e2e-testing/lib/fixtures/blank-workflow.ts
new file mode 100644
index 000000000000..b6f96a20ab97
--- /dev/null
+++ b/packages/twenty-e2e-testing/lib/fixtures/blank-workflow.ts
@@ -0,0 +1,249 @@
+import { test as base, expect, Locator, Page } from '@playwright/test';
+import { randomUUID } from 'node:crypto';
+import { createWorkflow } from '../requests/create-workflow';
+import { deleteWorkflow } from '../requests/delete-workflow';
+import { destroyWorkflow } from '../requests/destroy-workflow';
+import { WorkflowActionType, WorkflowTriggerType } from '../types/workflows';
+
+export class WorkflowVisualizerPage {
+  #page: Page;
+
+  workflowId: string;
+  workflowName: string;
+
+  readonly addStepButton: Locator;
+  readonly workflowStatus: Locator;
+  readonly activateWorkflowButton: Locator;
+  readonly deactivateWorkflowButton: Locator;
+  readonly addTriggerButton: Locator;
+  readonly commandMenu: Locator;
+  readonly workflowNameButton: Locator;
+  readonly triggerNode: Locator;
+  readonly background: Locator;
+
+  #actionNames: Record<WorkflowActionType, string> = {
+    'create-record': 'Create Record',
+    'update-record': 'Update Record',
+    'delete-record': 'Delete Record',
+    code: 'Code',
+    'send-email': 'Send Email',
+  };
+
+  #createdActionNames: Record<WorkflowActionType, string> = {
+    'create-record': 'Create Record',
+    'update-record': 'Update Record',
+    'delete-record': 'Delete Record',
+    code: 'Code - Serverless Function',
+    'send-email': 'Send Email',
+  };
+
+  #triggerNames: Record<WorkflowTriggerType, string> = {
+    'record-created': 'Record is Created',
+    'record-updated': 'Record is Updated',
+    'record-deleted': 'Record is Deleted',
+    manual: 'Launch manually',
+  };
+
+  #createdTriggerNames: Record<WorkflowTriggerType, string> = {
+    'record-created': 'Record is Created',
+    'record-updated': 'Record is Updated',
+    'record-deleted': 'Record is Deleted',
+    manual: 'Manual Trigger',
+  };
+
+  constructor({ page, workflowName }: { page: Page; workflowName: string }) {
+    this.#page = page;
+    this.workflowName = workflowName;
+
+    this.addStepButton = page.getByLabel('Add a step');
+    this.workflowStatus = page.getByTestId('workflow-visualizer-status');
+    this.activateWorkflowButton = page.getByLabel('Activate Workflow', {
+      exact: true,
+    });
+    this.deactivateWorkflowButton = page.getByLabel('Deactivate Workflow', {
+      exact: true,
+    });
+    this.addTriggerButton = page.getByText('Add a Trigger');
+    this.commandMenu = page.getByTestId('command-menu');
+    this.workflowNameButton = page.getByRole('button', {
+      name: this.workflowName,
+    });
+    this.triggerNode = this.#page.getByTestId('rf__node-trigger');
+    this.background = page.locator('.react-flow__pane');
+  }
+
+  async createOneWorkflow() {
+    const id = randomUUID();
+
+    const response = await createWorkflow({
+      page: this.#page,
+      workflowId: id,
+      workflowName: this.workflowName,
+    });
+
+    expect(response.status()).toBe(200);
+
+    const responseBody = await response.json();
+    expect(responseBody.data.createWorkflow.id).toBe(id);
+
+    this.workflowId = id;
+  }
+
+  async waitForWorkflowVisualizerLoad() {
+    await expect(this.workflowNameButton).toBeVisible();
+  }
+
+  async goToWorkflowVisualizerPage() {
+    await Promise.all([
+      this.#page.goto(`/object/workflow/${this.workflowId}`),
+
+      this.waitForWorkflowVisualizerLoad(),
+    ]);
+  }
+
+  async createInitialTrigger(trigger: WorkflowTriggerType) {
+    await this.addTriggerButton.click();
+
+    const triggerName = this.#triggerNames[trigger];
+    const createdTriggerName = this.#createdTriggerNames[trigger];
+
+    const triggerOption = this.#page.getByText(triggerName);
+    await triggerOption.click();
+
+    await expect(this.triggerNode).toHaveClass(/selected/);
+    await expect(this.triggerNode).toContainText(createdTriggerName);
+  }
+
+  async createStep(action: WorkflowActionType) {
+    await this.addStepButton.click();
+
+    const actionName = this.#actionNames[action];
+    const createdActionName = this.#createdActionNames[action];
+
+    const actionToCreateOption = this.commandMenu.getByText(actionName);
+
+    const [createWorkflowStepResponse] = await Promise.all([
+      this.#page.waitForResponse((response) => {
+        if (!response.url().endsWith('/graphql')) {
+          return false;
+        }
+
+        const requestBody = response.request().postDataJSON();
+
+        return requestBody.operationName === 'CreateWorkflowVersionStep';
+      }),
+
+      actionToCreateOption.click(),
+    ]);
+    const createWorkflowStepResponseBody =
+      await createWorkflowStepResponse.json();
+    const createdStepId =
+      createWorkflowStepResponseBody.data.createWorkflowVersionStep.id;
+
+    await expect(
+      this.#page.getByTestId('command-menu').getByRole('textbox').first(),
+    ).toHaveValue(createdActionName);
+
+    const createdActionNode = this.#page
+      .locator('.react-flow__node.selected')
+      .getByText(createdActionName);
+
+    await expect(createdActionNode).toBeVisible();
+
+    const selectedNodes = this.#page.locator('.react-flow__node.selected');
+
+    await expect(selectedNodes).toHaveCount(1);
+
+    return {
+      createdStepId,
+    };
+  }
+
+  getStepNode(stepId: string) {
+    return this.#page.getByTestId(`rf__node-${stepId}`);
+  }
+
+  getDeleteNodeButton(nodeLocator: Locator) {
+    return nodeLocator.getByRole('button');
+  }
+
+  getAllStepNodes() {
+    return this.#page
+      .getByTestId(/^rf__node-.+$/)
+      .and(this.#page.getByTestId(/^((?!rf__node-trigger).)*$/))
+      .and(
+        this.#page.getByTestId(/^((?!rf__node-branch-\d+__create-step).)*$/),
+      );
+  }
+
+  async deleteStep(stepId: string) {
+    const stepNode = this.getStepNode(stepId);
+
+    await stepNode.click();
+
+    await Promise.all([
+      expect(stepNode).not.toBeVisible(),
+      this.#page.waitForResponse((response) => {
+        if (!response.url().endsWith('/graphql')) {
+          return false;
+        }
+
+        const requestBody = response.request().postDataJSON();
+
+        return (
+          requestBody.operationName === 'DeleteWorkflowVersionStep' &&
+          requestBody.variables.input.stepId === stepId
+        );
+      }),
+
+      this.getDeleteNodeButton(stepNode).click(),
+    ]);
+  }
+
+  async deleteTrigger() {
+    await this.triggerNode.click();
+
+    await Promise.all([
+      expect(this.triggerNode).toContainText('Add a Trigger'),
+      this.#page.waitForResponse((response) => {
+        if (!response.url().endsWith('/graphql')) {
+          return false;
+        }
+
+        const requestBody = response.request().postDataJSON();
+
+        return (
+          requestBody.operationName === 'UpdateOneWorkflowVersion' &&
+          requestBody.variables.input.trigger === null
+        );
+      }),
+
+      this.getDeleteNodeButton(this.triggerNode).click(),
+    ]);
+  }
+}
+
+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 use(workflowVisualizer);
+
+      await deleteWorkflow({
+        page,
+        workflowId: workflowVisualizer.workflowId,
+      });
+      await destroyWorkflow({
+        page,
+        workflowId: workflowVisualizer.workflowId,
+      });
+    },
+  },
+);
diff --git a/packages/twenty-e2e-testing/lib/pom/loginPage.ts b/packages/twenty-e2e-testing/lib/pom/loginPage.ts
index 15aa1ca22277..6f69a683feb2 100644
--- a/packages/twenty-e2e-testing/lib/pom/loginPage.ts
+++ b/packages/twenty-e2e-testing/lib/pom/loginPage.ts
@@ -1,4 +1,4 @@
-import { Locator, Page } from '@playwright/test';
+import { expect, Locator, Page } from '@playwright/test';
 
 export class LoginPage {
   private readonly loginWithGoogleButton: Locator;
@@ -98,6 +98,8 @@ export class LoginPage {
   }
 
   async typeEmail(email: string) {
+    await expect(this.emailField).toBeVisible();
+
     await this.emailField.fill(email);
   }
 
diff --git a/packages/twenty-e2e-testing/lib/requests/backend.ts b/packages/twenty-e2e-testing/lib/requests/backend.ts
new file mode 100644
index 000000000000..73d57b1a52a8
--- /dev/null
+++ b/packages/twenty-e2e-testing/lib/requests/backend.ts
@@ -0,0 +1,4 @@
+export const backendGraphQLUrl = new URL(
+  '/graphql',
+  process.env.BACKEND_BASE_URL,
+).toString();
diff --git a/packages/twenty-e2e-testing/lib/requests/create-workflow.ts b/packages/twenty-e2e-testing/lib/requests/create-workflow.ts
new file mode 100644
index 000000000000..33aa22783790
--- /dev/null
+++ b/packages/twenty-e2e-testing/lib/requests/create-workflow.ts
@@ -0,0 +1,32 @@
+import { Page } from '@playwright/test';
+import { getAuthToken } from '../utils/getAuthToken';
+import { backendGraphQLUrl } from './backend';
+
+export const createWorkflow = async ({
+  page,
+  workflowId,
+  workflowName,
+}: {
+  page: Page;
+  workflowId: string;
+  workflowName: string;
+}) => {
+  const { authToken } = await getAuthToken(page);
+
+  return page.request.post(backendGraphQLUrl, {
+    headers: {
+      Authorization: `Bearer ${authToken}`,
+    },
+    data: {
+      operationName: 'CreateOneWorkflow',
+      query:
+        'mutation CreateOneWorkflow($input: WorkflowCreateInput!) {  createWorkflow(data: $input) { __typename id } }',
+      variables: {
+        input: {
+          id: workflowId,
+          name: workflowName,
+        },
+      },
+    },
+  });
+};
diff --git a/packages/twenty-e2e-testing/lib/requests/delete-workflow.ts b/packages/twenty-e2e-testing/lib/requests/delete-workflow.ts
new file mode 100644
index 000000000000..299768d6725a
--- /dev/null
+++ b/packages/twenty-e2e-testing/lib/requests/delete-workflow.ts
@@ -0,0 +1,25 @@
+import { Page } from '@playwright/test';
+import { getAuthToken } from '../utils/getAuthToken';
+import { backendGraphQLUrl } from './backend';
+
+export const deleteWorkflow = async ({
+  page,
+  workflowId,
+}: {
+  page: Page;
+  workflowId: string;
+}) => {
+  const { authToken } = await getAuthToken(page);
+
+  return page.request.post(backendGraphQLUrl, {
+    headers: {
+      Authorization: `Bearer ${authToken}`,
+    },
+    data: {
+      operationName: 'DeleteOneWorkflow',
+      variables: { idToDelete: workflowId },
+      query:
+        'mutation DeleteOneWorkflow($idToDelete: ID!) {\n  deleteWorkflow(id: $idToDelete) {\n    __typename\n    deletedAt\n    id\n  }\n}',
+    },
+  });
+};
diff --git a/packages/twenty-e2e-testing/lib/requests/destroy-workflow.ts b/packages/twenty-e2e-testing/lib/requests/destroy-workflow.ts
new file mode 100644
index 000000000000..2191a3e3dc52
--- /dev/null
+++ b/packages/twenty-e2e-testing/lib/requests/destroy-workflow.ts
@@ -0,0 +1,25 @@
+import { Page } from '@playwright/test';
+import { getAuthToken } from '../utils/getAuthToken';
+import { backendGraphQLUrl } from './backend';
+
+export const destroyWorkflow = async ({
+  page,
+  workflowId,
+}: {
+  page: Page;
+  workflowId: string;
+}) => {
+  const { authToken } = await getAuthToken(page);
+
+  return page.request.post(backendGraphQLUrl, {
+    headers: {
+      Authorization: `Bearer ${authToken}`,
+    },
+    data: {
+      operationName: 'DestroyOneWorkflow',
+      variables: { idToDestroy: workflowId },
+      query:
+        'mutation DestroyOneWorkflow($idToDestroy: ID!) {\n  destroyWorkflow(id: $idToDestroy) {\n    id\n    __typename\n  }\n}',
+    },
+  });
+};
diff --git a/packages/twenty-e2e-testing/lib/types/workflows.ts b/packages/twenty-e2e-testing/lib/types/workflows.ts
new file mode 100644
index 000000000000..6b1f4bec8d0f
--- /dev/null
+++ b/packages/twenty-e2e-testing/lib/types/workflows.ts
@@ -0,0 +1,12 @@
+export type WorkflowTriggerType =
+  | 'record-created'
+  | 'record-updated'
+  | 'record-deleted'
+  | 'manual';
+
+export type WorkflowActionType =
+  | 'create-record'
+  | 'update-record'
+  | 'delete-record'
+  | 'code'
+  | 'send-email';
diff --git a/packages/twenty-e2e-testing/lib/utils/getAuthToken.ts b/packages/twenty-e2e-testing/lib/utils/getAuthToken.ts
new file mode 100644
index 000000000000..38534fdf23c4
--- /dev/null
+++ b/packages/twenty-e2e-testing/lib/utils/getAuthToken.ts
@@ -0,0 +1,15 @@
+import { Page } from '@playwright/test';
+
+export const getAuthToken = async (page: Page) => {
+  const storageState = await page.context().storageState();
+  const authCookie = storageState.cookies.find(
+    (cookie) => cookie.name === 'tokenPair',
+  );
+  if (!authCookie) {
+    throw new Error('No auth cookie found');
+  }
+  const token = JSON.parse(decodeURIComponent(authCookie.value)).accessToken
+    .token;
+
+  return { authToken: token };
+};
diff --git a/packages/twenty-e2e-testing/package.json b/packages/twenty-e2e-testing/package.json
index 8f21de70c784..1794579297e8 100644
--- a/packages/twenty-e2e-testing/package.json
+++ b/packages/twenty-e2e-testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twenty-e2e-testing",
-  "version": "0.40.0-canary",
+  "version": "0.41.0-canary",
   "description": "",
   "author": "",
   "private": true,
diff --git a/packages/twenty-e2e-testing/playwright.config.ts b/packages/twenty-e2e-testing/playwright.config.ts
index 6e76d0c5e238..6fea9a702145 100644
--- a/packages/twenty-e2e-testing/playwright.config.ts
+++ b/packages/twenty-e2e-testing/playwright.config.ts
@@ -16,10 +16,10 @@ if (envResult.error) {
  * See https://playwright.dev/docs/test-configuration.
  */
 export default defineConfig({
-  testDir: '.',
+  testDir: './tests',
   outputDir: 'run_results/', // directory for screenshots and videos
   snapshotPathTemplate: '{testDir}/__screenshots__/{testFilePath}/{arg}{ext}', // just in case, do not delete it
-  fullyParallel: true, // false only for specific tests, overwritten in specific projects or global setups of projects
+  fullyParallel: false, // parallelization of tests will be done later in the future
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 2 : 0,
   workers: 1, // 1 worker = 1 test at the time, tests can't be parallelized
@@ -30,10 +30,6 @@ export default defineConfig({
     screenshot: 'on', // either 'on' here or in different method in modules, if 'on' all screenshots are overwritten each time the test is run
     headless: true, // instead of changing it to false, run 'yarn test:e2e:debug' or 'yarn test:e2e:ui'
     testIdAttribute: 'data-testid', // taken from Twenty source
-    viewport: { width: 1920, height: 1080 }, // most laptops use this resolution
-    launchOptions: {
-      slowMo: 500, // time in milliseconds between each step, better to use it than explicitly define timeout in tests
-    },
   },
   expect: {
     timeout: 5000,
@@ -41,33 +37,17 @@ export default defineConfig({
   reporter: process.env.CI ? 'github' : 'list',
   projects: [
     {
-      name: 'Login setup',
-      testMatch: /login\.setup\.ts/, // finds all tests matching this regex, in this case only 1 test should be found
-    },
-    {
-      name: 'Demo check',
-      use: {
-        ...devices['Desktop Chrome'],
-      },
-      testMatch: /demo\/demo_basic\.spec\.ts/,
+      name: 'setup',
+      testMatch: /.*\.setup\.ts/,
     },
     {
-      name: 'chromium',
+      name: 'chrome',
       use: {
         ...devices['Desktop Chrome'],
+        permissions: ['clipboard-read', 'clipboard-write'],
         storageState: path.resolve(__dirname, '.auth', 'user.json'), // takes saved cookies from directory
       },
-      dependencies: ['Login setup'], // forces to run login setup before running tests from this project - CASE SENSITIVE
-      testMatch: /all\/.+\.e2e-spec\.ts/,
-    },
-    {
-      name: 'firefox',
-      use: {
-        ...devices['Desktop Firefox'],
-        storageState: path.resolve(__dirname, '.auth', 'user.json'),
-      },
-      dependencies: ['Login setup'],
-      testMatch: /all\/.+\.e2e-spec\.ts/,
+      dependencies: ['setup'],
     },
 
     //{
diff --git a/packages/twenty-e2e-testing/project.json b/packages/twenty-e2e-testing/project.json
index 9dd38917f8df..e820fd17297e 100644
--- a/packages/twenty-e2e-testing/project.json
+++ b/packages/twenty-e2e-testing/project.json
@@ -8,7 +8,8 @@
       "options": {
         "cwd": "packages/twenty-e2e-testing",
         "commands": [
-          "yarn playwright install"
+          "yarn playwright install",
+          "cp .env.example .env"
         ]
       }
     },
diff --git a/packages/twenty-e2e-testing/tests/all/companies.e2e-spec.ts b/packages/twenty-e2e-testing/tests/all/companies.e2e-spec.ts
deleted file mode 100644
index a2cdd2ad7d3c..000000000000
--- a/packages/twenty-e2e-testing/tests/all/companies.e2e-spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { expect, test } from '../../lib/fixtures/screenshot';
-
-test.describe('Basic check', () => {
-  test('Checking if table in Companies is visible', async ({ page }) => {
-    await expect(page.getByTestId('tooltip').nth(0)).toHaveText('Companies');
-    await expect(page.getByTestId('tooltip').nth(0)).toBeVisible();
-    expect(page.url()).toContain('/companies');
-    await expect(page.locator('table')).toBeVisible();
-    await expect(page.locator('tbody > tr')).toHaveCount(13); // shouldn't be hardcoded in case of tests on demo
-  });
-
-  test('', async ({ page }) => {
-    await page.getByRole('link', { name: 'Opportunities' }).click();
-    await expect(page.locator('table')).toBeVisible();
-  });
-});
diff --git a/packages/twenty-e2e-testing/tests/all/workspaces.e2e-spec.ts b/packages/twenty-e2e-testing/tests/all/workspaces.e2e-spec.ts
deleted file mode 100644
index 24816e13e8b9..000000000000
--- a/packages/twenty-e2e-testing/tests/all/workspaces.e2e-spec.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { test } from '@playwright/test';
-import { sh } from '../../drivers/shell_driver';
-
-test.describe('', () => {
-  test.use({ storageState: { cookies: [], origins: [] } });
-
-  /*
-
-  test('Creating new workspace', async ({ page, browserName }) => {
-    // this test must use only 1 browser, otherwise it will lead to success and fail (1 workspace is created instead of x workspaces)
-    if (browserName == 'chromium') {
-      await sh(
-        'npx nx run twenty-server:database:reset --configuration=no-seed',
-      );
-
-      await page.goto('/');
-      await page.getByRole('button', { name: 'Continue With Email' }).click();
-      await page.getByPlaceholder('Email').fill('test@apple.dev'); // email must be changed each time test is run
-      await page.getByPlaceholder('Email').press('Enter'); // otherwise if tests fails after this step, new workspace is created
-      await page.getByPlaceholder('Password').fill('Applecar2025');
-      await page.getByPlaceholder('Password').press('Enter');
-      await page.getByPlaceholder('Apple').fill('Test');
-      await page.getByRole('button', { name: 'Continue' }).click();
-      await page.getByPlaceholder('Tim').click();
-      await page.getByPlaceholder('Tim').fill('Test2');
-      await page.getByPlaceholder('Cook').click();
-      await page.getByPlaceholder('Cook').fill('Test2');
-      await page.getByRole('button', { name: 'Continue' }).click();
-      await page.getByText('Continue without sync').click();
-      await page.getByRole('button', { name: 'Finish' }).click();
-      await expect(page.locator('table')).toBeVisible({ timeout: 1000 });
-      await sh('npx nx run twenty-server:database:reset');
-   }
-  });
-  */
-
-  test('Syncing all workspaces', async () => {
-    await sh('npx nx run twenty-server:command workspace:sync-metadata -f');
-  });
-});
diff --git a/packages/twenty-e2e-testing/tests/authentication/fixture.ts b/packages/twenty-e2e-testing/tests/authentication/fixture.ts
new file mode 100644
index 000000000000..16cf35becaf8
--- /dev/null
+++ b/packages/twenty-e2e-testing/tests/authentication/fixture.ts
@@ -0,0 +1,45 @@
+import { test as base } from '../../lib/fixtures/screenshot';
+import { LoginPage } from '../../lib/pom/loginPage';
+import { LeftMenu } from '../../lib/pom/leftMenu';
+import { SettingsPage } from '../../lib/pom/settingsPage';
+import { MembersSection } from '../../lib/pom/settings/membersSection';
+import { ProfileSection } from '../../lib/pom/settings/profileSection';
+import { ConfirmationModal } from '../../lib/pom/helper/confirmationModal';
+
+type Fixtures = {
+  confirmationModal: ConfirmationModal;
+  loginPage: LoginPage;
+  leftMenu: LeftMenu;
+  settingsPage: SettingsPage;
+  membersSection: MembersSection;
+  profileSection: ProfileSection;
+};
+
+export const test = base.extend<Fixtures>({
+  confirmationModal: async ({ page }, use) => {
+    const confirmationModal = new ConfirmationModal(page);
+    await use(confirmationModal);
+  },
+  loginPage: async ({ page }, use) => {
+    const loginPage = new LoginPage(page);
+    await use(loginPage);
+  },
+  leftMenu: async ({ page }, use) => {
+    const leftMenu = new LeftMenu(page);
+    await use(leftMenu);
+  },
+  settingsPage: async ({ page }, use) => {
+    const settingsPage = new SettingsPage(page);
+    await use(settingsPage);
+  },
+  membersSection: async ({ page }, use) => {
+    const membersSection = new MembersSection(page);
+    await use(membersSection);
+  },
+  profileSection: async ({ page }, use) => {
+    const profileSection = new ProfileSection(page);
+    await use(profileSection);
+  },
+});
+
+export { expect } from '@playwright/test';
diff --git a/packages/twenty-e2e-testing/tests/authentication/signup_invite_email.spec.ts b/packages/twenty-e2e-testing/tests/authentication/signup_invite_email.spec.ts
new file mode 100644
index 000000000000..f36ba109483b
--- /dev/null
+++ b/packages/twenty-e2e-testing/tests/authentication/signup_invite_email.spec.ts
@@ -0,0 +1,60 @@
+import { randomUUID } from 'crypto';
+import { expect, test } from './fixture';
+
+test('Sign up with invite link via email', async ({
+  page,
+  loginPage,
+  leftMenu,
+  membersSection,
+  settingsPage,
+  profileSection,
+  confirmationModal,
+}) => {
+  const email = `test${randomUUID().replaceAll('-', '')}@apple.dev`;
+  const firstName = 'John';
+  const lastName = 'Doe';
+
+  const inviteLink: string =
+    await test.step('Go to Settings and copy invite link', async () => {
+      await page.goto(process.env.LINK); // skip login page (and redirect) when running on environments with multi-workspace enabled
+      await leftMenu.goToSettings();
+      await settingsPage.goToMembersSection();
+      await membersSection.copyInviteLink();
+      return await page.evaluate('navigator.clipboard.readText()');
+    });
+
+  await test.step('Go to invite link', async () => {
+    await settingsPage.logout();
+
+    await Promise.all([
+      expect(page.getByText(/Join .+ team/)).toBeVisible(),
+
+      page.goto(inviteLink),
+    ]);
+  });
+
+  await test.step('Create new account', async () => {
+    await loginPage.clickLoginWithEmail();
+    await loginPage.typeEmail(email);
+    await loginPage.clickContinueButton();
+    await loginPage.typePassword(process.env.DEFAULT_PASSWORD);
+    await loginPage.clickSignUpButton();
+    await loginPage.typeFirstName(firstName);
+    await loginPage.typeLastName(lastName);
+    await loginPage.clickContinueButton();
+    await loginPage.noSyncWithGoogle();
+  });
+
+  await test.step('Delete account from workspace', async () => {
+    await leftMenu.goToSettings();
+    await settingsPage.goToProfileSection();
+    await profileSection.deleteAccount();
+    await confirmationModal.typePlaceholderToInput();
+
+    await Promise.all([
+      page.waitForURL('/welcome'),
+
+      confirmationModal.clickConfirmButton(),
+    ]);
+  });
+});
diff --git a/packages/twenty-e2e-testing/tests/demo/demo_basic.e2e-spec.ts b/packages/twenty-e2e-testing/tests/demo/demo_basic.spec.ts
similarity index 100%
rename from packages/twenty-e2e-testing/tests/demo/demo_basic.e2e-spec.ts
rename to packages/twenty-e2e-testing/tests/demo/demo_basic.spec.ts
diff --git a/packages/twenty-e2e-testing/tests/login.setup.ts b/packages/twenty-e2e-testing/tests/login.setup.ts
index 74150ea3ff0d..bb730f9b94ba 100644
--- a/packages/twenty-e2e-testing/tests/login.setup.ts
+++ b/packages/twenty-e2e-testing/tests/login.setup.ts
@@ -1,38 +1,42 @@
-import { expect, test as setup } from '@playwright/test';
+import { test as base, expect } from '@playwright/test';
 import path from 'path';
+import { LoginPage } from '../lib/pom/loginPage';
+
+// fixture
+const test = base.extend<{ loginPage: LoginPage }>({
+  loginPage: async ({ page }, use) => {
+    const loginPage = new LoginPage(page);
+    await use(loginPage);
+  },
+});
 
-setup('Login test', async ({ page }) => {
-  console.log('Starting login test');
-
-  await page.goto('/');
-  console.log('Navigated to homepage');
-
-  await page.getByRole('button', { name: 'Continue With Email' }).click();
-  console.log('Clicked email login button');
-
-  console.log('Default login', process.env.DEFAULT_LOGIN);
-  await page.getByPlaceholder('Email').fill(process.env.DEFAULT_LOGIN ?? '');
-  console.log('Filled email field');
-
-  await page.getByRole('button', { name: 'Continue', exact: true }).click();
-  console.log('Clicked continue button');
-
-  await page
-    .getByPlaceholder('Password')
-    .fill(process.env.DEFAULT_PASSWORD ?? '');
-  console.log('Filled password field');
-
-  await page.getByRole('button', { name: 'Sign in' }).click();
-  console.log('Clicked sign in button');
-
-  await page.waitForLoadState('networkidle');
-  console.log('Waited for network to be idle');
-
-  await expect(page.getByText('Welcome to Twenty')).not.toBeVisible();
-  console.log('Verified welcome message not visible');
-
-  await page.context().storageState({
-    path: path.resolve(__dirname, '..', '.auth', 'user.json'),
+test('Login test', async ({ loginPage, page }) => {
+  await test.step('Navigated to login page', async () => {
+    await page.goto('/');
+  });
+  await test.step(
+    'Logging in '.concat(page.url(), ' as ', process.env.DEFAULT_LOGIN),
+    async () => {
+      await page.waitForLoadState('networkidle');
+      if (
+        page.url().includes('demo.twenty.com') ||
+        !page.url().includes('app.localhost:3001')
+      ) {
+        await loginPage.clickLoginWithEmail();
+      }
+      await loginPage.typeEmail(process.env.DEFAULT_LOGIN);
+      await loginPage.clickContinueButton();
+      await loginPage.typePassword(process.env.DEFAULT_PASSWORD);
+      await page.waitForLoadState('networkidle');
+      await loginPage.clickSignInButton();
+      await expect(page.getByText(/Welcome to .+/)).not.toBeVisible();
+    },
+  );
+
+  await test.step('Saved auth state', async () => {
+    await page.context().storageState({
+      path: path.resolve(__dirname, '..', '.auth', 'user.json'),
+    });
+    process.env.LINK = page.url();
   });
-  console.log('Saved auth state');
 });
diff --git a/packages/twenty-e2e-testing/tests/workflow-creation.spec.ts b/packages/twenty-e2e-testing/tests/workflow-creation.spec.ts
new file mode 100644
index 000000000000..049837891b57
--- /dev/null
+++ b/packages/twenty-e2e-testing/tests/workflow-creation.spec.ts
@@ -0,0 +1,52 @@
+import { expect, test } from '@playwright/test';
+import { deleteWorkflow } from '../lib/requests/delete-workflow';
+import { destroyWorkflow } from '../lib/requests/destroy-workflow';
+
+test('Create workflow', async ({ page }) => {
+  const NEW_WORKFLOW_NAME = 'Test Workflow';
+
+  await page.goto('/');
+
+  const workflowsLink = page.getByRole('link', { name: 'Workflows' });
+  await workflowsLink.click();
+
+  const createWorkflowButton = page.getByRole('button', { name: 'New record' });
+
+  const [createWorkflowResponse] = await Promise.all([
+    page.waitForResponse(async (response) => {
+      if (!response.url().endsWith('/graphql')) {
+        return false;
+      }
+
+      const requestBody = response.request().postDataJSON();
+
+      return requestBody.operationName === 'CreateOneWorkflow';
+    }),
+
+    await createWorkflowButton.click(),
+  ]);
+
+  const nameInput = page.getByRole('textbox');
+  await nameInput.fill(NEW_WORKFLOW_NAME);
+  await nameInput.press('Enter');
+
+  const body = await createWorkflowResponse.json();
+  const newWorkflowId = body.data.createWorkflow.id;
+
+  try {
+    const workflowName = page.getByRole('button', { name: NEW_WORKFLOW_NAME });
+
+    await expect(workflowName).toBeVisible();
+
+    await expect(page).toHaveURL(`/object/workflow/${newWorkflowId}`);
+  } finally {
+    await deleteWorkflow({
+      page,
+      workflowId: newWorkflowId,
+    });
+    await destroyWorkflow({
+      page,
+      workflowId: newWorkflowId,
+    });
+  }
+});
diff --git a/packages/twenty-e2e-testing/tests/workflow-visualizer.spec.ts b/packages/twenty-e2e-testing/tests/workflow-visualizer.spec.ts
new file mode 100644
index 000000000000..e411cad0c9b0
--- /dev/null
+++ b/packages/twenty-e2e-testing/tests/workflow-visualizer.spec.ts
@@ -0,0 +1,186 @@
+import { expect } from '@playwright/test';
+import { test } from '../lib/fixtures/blank-workflow';
+
+test('Create workflow with every possible step', async ({
+  workflowVisualizer,
+  page,
+}) => {
+  await workflowVisualizer.createInitialTrigger('record-created');
+
+  await workflowVisualizer.createStep('create-record');
+  await workflowVisualizer.createStep('update-record');
+  await workflowVisualizer.createStep('delete-record');
+  await workflowVisualizer.createStep('code');
+  await workflowVisualizer.createStep('send-email');
+
+  await workflowVisualizer.background.click();
+
+  const draftWorkflowStatus =
+    workflowVisualizer.workflowStatus.getByText('Draft');
+
+  await expect(draftWorkflowStatus).toBeVisible();
+
+  await workflowVisualizer.activateWorkflowButton.click();
+
+  const activeWorkflowStatus =
+    workflowVisualizer.workflowStatus.getByText('Active');
+
+  await expect(draftWorkflowStatus).not.toBeVisible();
+  await expect(activeWorkflowStatus).toBeVisible();
+  await expect(workflowVisualizer.activateWorkflowButton).not.toBeVisible();
+  await expect(workflowVisualizer.deactivateWorkflowButton).toBeVisible();
+});
+
+test('Delete steps from draft version', async ({
+  workflowVisualizer,
+  page,
+}) => {
+  await workflowVisualizer.createInitialTrigger('record-created');
+
+  const { createdStepId: firstStepId } =
+    await workflowVisualizer.createStep('create-record');
+  const { createdStepId: secondStepId } =
+    await workflowVisualizer.createStep('update-record');
+  const { createdStepId: thirdStepId } =
+    await workflowVisualizer.createStep('delete-record');
+  const { createdStepId: fourthStepId } =
+    await workflowVisualizer.createStep('code');
+  const { createdStepId: fifthStepId } =
+    await workflowVisualizer.createStep('send-email');
+
+  await expect(workflowVisualizer.getAllStepNodes()).toContainText([
+    'Create Record',
+    'Update Record',
+    'Delete Record',
+    'Code - Serverless Function',
+    'Send Email',
+  ]);
+  await expect(workflowVisualizer.getAllStepNodes()).toHaveCount(5);
+
+  await workflowVisualizer.deleteStep(firstStepId);
+
+  await expect(workflowVisualizer.getAllStepNodes()).toContainText([
+    'Update Record',
+    'Delete Record',
+    'Code - Serverless Function',
+    'Send Email',
+  ]);
+  await expect(workflowVisualizer.getAllStepNodes()).toHaveCount(4);
+
+  await workflowVisualizer.deleteStep(fifthStepId);
+
+  await expect(workflowVisualizer.getAllStepNodes()).toContainText([
+    'Update Record',
+    'Delete Record',
+    'Code - Serverless Function',
+  ]);
+  await expect(workflowVisualizer.getAllStepNodes()).toHaveCount(3);
+
+  await workflowVisualizer.deleteStep(secondStepId);
+
+  await expect(workflowVisualizer.getAllStepNodes()).toContainText([
+    'Delete Record',
+    'Code - Serverless Function',
+  ]);
+  await expect(workflowVisualizer.getAllStepNodes()).toHaveCount(2);
+
+  await workflowVisualizer.deleteStep(fourthStepId);
+
+  await expect(workflowVisualizer.getAllStepNodes()).toContainText([
+    'Delete Record',
+  ]);
+  await expect(workflowVisualizer.getAllStepNodes()).toHaveCount(1);
+
+  await workflowVisualizer.deleteStep(thirdStepId);
+
+  await expect(workflowVisualizer.getAllStepNodes()).toHaveCount(0);
+
+  await Promise.all([
+    page.reload(),
+
+    expect(workflowVisualizer.triggerNode).toBeVisible(),
+  ]);
+
+  await expect(workflowVisualizer.getAllStepNodes()).toHaveCount(0);
+});
+
+test('Add a step to an active version', async ({
+  workflowVisualizer,
+  page,
+}) => {
+  await workflowVisualizer.createInitialTrigger('record-created');
+
+  await workflowVisualizer.createStep('create-record');
+
+  await expect(workflowVisualizer.workflowStatus).toHaveText('Draft');
+
+  await workflowVisualizer.background.click();
+
+  await Promise.all([
+    expect(workflowVisualizer.workflowStatus).toHaveText('Active'),
+
+    workflowVisualizer.activateWorkflowButton.click(),
+  ]);
+
+  await expect(workflowVisualizer.activateWorkflowButton).not.toBeVisible();
+
+  const assertEndState = async () => {
+    await expect(workflowVisualizer.workflowStatus).toHaveText('Active');
+    await expect(workflowVisualizer.triggerNode).toContainText(
+      'Record is Created',
+    );
+    await expect(workflowVisualizer.getAllStepNodes()).toContainText([
+      'Create Record',
+    ]);
+    await expect(workflowVisualizer.getAllStepNodes()).toHaveCount(1);
+  };
+
+  await assertEndState();
+
+  await page.reload();
+
+  await assertEndState();
+});
+
+test('Replace the trigger of an active version', async ({
+  workflowVisualizer,
+  page,
+}) => {
+  await workflowVisualizer.createInitialTrigger('record-created');
+
+  await workflowVisualizer.createStep('create-record');
+
+  await workflowVisualizer.background.click();
+
+  await Promise.all([
+    expect(workflowVisualizer.workflowStatus).toHaveText('Active'),
+
+    workflowVisualizer.activateWorkflowButton.click(),
+  ]);
+
+  await Promise.all([
+    expect(workflowVisualizer.workflowStatus).toHaveText('Draft'),
+
+    workflowVisualizer.deleteTrigger(),
+  ]);
+
+  await workflowVisualizer.createInitialTrigger('record-deleted');
+
+  await workflowVisualizer.background.click();
+
+  await Promise.all([
+    expect(workflowVisualizer.workflowStatus).toHaveText('Active'),
+
+    workflowVisualizer.activateWorkflowButton.click(),
+  ]);
+
+  await page.reload();
+
+  await expect(workflowVisualizer.triggerNode).toContainText(
+    'Record is Deleted',
+  );
+  await expect(workflowVisualizer.getAllStepNodes()).toHaveCount(1);
+  await expect(workflowVisualizer.getAllStepNodes()).toContainText([
+    'Create Record',
+  ]);
+});
diff --git a/packages/twenty-emails/package.json b/packages/twenty-emails/package.json
index 9887a8b94024..19c1cc660708 100644
--- a/packages/twenty-emails/package.json
+++ b/packages/twenty-emails/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twenty-emails",
-  "version": "0.40.0-canary",
+  "version": "0.41.0-canary",
   "description": "",
   "author": "",
   "private": true,
diff --git a/packages/twenty-emails/src/components/Footer.tsx b/packages/twenty-emails/src/components/Footer.tsx
new file mode 100644
index 000000000000..919686fb86a7
--- /dev/null
+++ b/packages/twenty-emails/src/components/Footer.tsx
@@ -0,0 +1,55 @@
+import { Column, Row } from '@react-email/components';
+import { Link } from 'src/components/Link';
+import { ShadowText } from 'src/components/ShadowText';
+
+export const Footer = () => {
+  return (
+    <>
+      <Row>
+        <Column>
+          <ShadowText>
+            <Link
+              href="https://twenty.com/"
+              value="Website"
+              aria-label="Visit Twenty's website"
+            />
+          </ShadowText>
+        </Column>
+        <Column>
+          <ShadowText>
+            <Link
+              href="https://github.com/twentyhq/twenty"
+              value="Github"
+              aria-label="Visit Twenty's GitHub repository"
+            />
+          </ShadowText>
+        </Column>
+        <Column>
+          <ShadowText>
+            <Link
+              href="https://twenty.com/user-guide"
+              value="User guide"
+              aria-label="Read Twenty's user guide"
+            />
+          </ShadowText>
+        </Column>
+        <Column>
+          <ShadowText>
+            <Link
+              href="https://docs.twenty.com/"
+              value="Developers"
+              aria-label="Visit Twenty's developer documentation"
+            />
+          </ShadowText>
+        </Column>
+      </Row>
+      <ShadowText>
+        Twenty.com Public Benefit Corporation
+        <br />
+        2261 Market Street #5275
+        <br />
+        San Francisco, CA 94114
+      </ShadowText>
+    </>
+  );
+};
diff --git a/packages/twenty-emails/src/components/WhatIsTwenty.tsx b/packages/twenty-emails/src/components/WhatIsTwenty.tsx
index 9b3913f78331..6b905a1f3e1a 100644
--- a/packages/twenty-emails/src/components/WhatIsTwenty.tsx
+++ b/packages/twenty-emails/src/components/WhatIsTwenty.tsx
@@ -1,8 +1,7 @@
-import { Column, Row } from '@react-email/components';
-import { Link } from 'src/components/Link';
+import { Footer } from 'src/components/Footer';
 import { MainText } from 'src/components/MainText';
-import { ShadowText } from 'src/components/ShadowText';
 import { SubTitle } from 'src/components/SubTitle';
+
 export const WhatIsTwenty = () => {
   return (
     <>
@@ -11,35 +10,7 @@ export const WhatIsTwenty = () => {
         It's a CRM, a software to help businesses manage their customer data and
         relationships efficiently.
       </MainText>
-      <Row>
-        <Column>
-          <ShadowText>
-            <Link href="https://twenty.com/" value="Website" />
-          </ShadowText>
-        </Column>
-        <Column>
-          <ShadowText>
-            <Link href="https://github.com/twentyhq/twenty" value="Github" />
-          </ShadowText>
-        </Column>
-        <Column>
-          <ShadowText>
-            <Link href="https://twenty.com/user-guide" value="User guide" />
-          </ShadowText>
-        </Column>
-        <Column>
-          <ShadowText>
-            <Link href="https://docs.twenty.com/" value="Developers" />
-          </ShadowText>
-        </Column>
-      </Row>
-      <ShadowText>
-        Twenty.com Public Benefit Corporation
-        <br />
-        2261 Market Street #5275
-        <br />
-        San Francisco, CA 94114
-      </ShadowText>
+      <Footer />
     </>
   );
 };
diff --git a/packages/twenty-emails/src/emails/send-email-verification-link.email.tsx b/packages/twenty-emails/src/emails/send-email-verification-link.email.tsx
new file mode 100644
index 000000000000..e157ad6ea4fc
--- /dev/null
+++ b/packages/twenty-emails/src/emails/send-email-verification-link.email.tsx
@@ -0,0 +1,28 @@
+import { BaseEmail } from 'src/components/BaseEmail';
+import { CallToAction } from 'src/components/CallToAction';
+import { Footer } from 'src/components/Footer';
+import { MainText } from 'src/components/MainText';
+import { Title } from 'src/components/Title';
+
+type SendEmailVerificationLinkEmailProps = {
+  link: string;
+};
+
+export const SendEmailVerificationLinkEmail = ({
+  link,
+}: SendEmailVerificationLinkEmailProps) => {
+  return (
+    <BaseEmail width={333}>
+      <Title value="Confirm your email address" />
+      <CallToAction href={link} value="Verify Email" />
+      <br />
+      <br />
+      <MainText>
+        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>
+      <Footer />
+    </BaseEmail>
+  );
+};
diff --git a/packages/twenty-emails/src/index.ts b/packages/twenty-emails/src/index.ts
index ddecb05c8655..5bb9cd0c9f5a 100644
--- a/packages/twenty-emails/src/index.ts
+++ b/packages/twenty-emails/src/index.ts
@@ -2,4 +2,5 @@ export * from './emails/clean-inactive-workspaces.email';
 export * from './emails/delete-inactive-workspaces.email';
 export * from './emails/password-reset-link.email';
 export * from './emails/password-update-notify.email';
+export * from './emails/send-email-verification-link.email';
 export * from './emails/send-invite-link.email';
diff --git a/packages/twenty-front/.env.example b/packages/twenty-front/.env.example
index 049be24db35c..c1203ab90033 100644
--- a/packages/twenty-front/.env.example
+++ b/packages/twenty-front/.env.example
@@ -1,5 +1,7 @@
 REACT_APP_SERVER_BASE_URL=http://localhost:3000
 GENERATE_SOURCEMAP=false
+TRANSLATION_IO_API_KEY=xxx
+
 
 # ———————— Optional ————————
 # REACT_APP_PORT=3001
diff --git a/packages/twenty-front/.eslintrc.cjs b/packages/twenty-front/.eslintrc.cjs
index 4d14adac114f..7d4a4d87f6a5 100644
--- a/packages/twenty-front/.eslintrc.cjs
+++ b/packages/twenty-front/.eslintrc.cjs
@@ -25,13 +25,63 @@ module.exports = {
       },
       plugins: ['project-structure'],
       settings: {
-        'project-structure/folder-structure-config-path':path.resolve(
+        'project-structure/folder-structure-config-path': path.join(
           __dirname,
-          'folderStructure.json'
-        )
+          'folderStructure.json',
+        ),
       },
       rules: {
         'project-structure/folder-structure': 'error',
+        /* 
+        Uncomment this rule when we have a way to work on 
+        'lingui/no-unlocalized-strings': [
+          'error',
+          {
+            ignore: [
+              '^(?![A-Z])\\S+$',
+              '^[A-Z0-9_-]+$'
+            ],
+            ignoreNames: [
+              { regex: { pattern: 'className', flags: 'i' } },
+              { regex: { pattern: '^[A-Z0-9_-]+$' } },
+              'styleName',
+              'src',
+              'srcSet', 
+              'type',
+              'id',
+              'width',
+              'height',
+              'displayName',
+              'Authorization'
+            ],
+            ignoreFunctions: [
+              'cva',
+              'cn',
+              'track',
+              'Error',
+              'console.*',
+              '*headers.set',
+              '*.addEventListener',
+              '*.removeEventListener',
+              '*.postMessage',
+              '*.getElementById',
+              '*.dispatch',
+              '*.commit',
+              '*.includes',
+              '*.indexOf',
+              '*.endsWith',
+              '*.startsWith',
+              'require'
+            ],
+            useTsTypes: true,
+            ignoreMethodsOnTypes: [
+              'Map.get',
+              'Map.has',
+              'Set.has'
+            ]
+          }
+        ]
+          */
       },
     },
   ],
diff --git a/packages/twenty-front/.storybook/main.ts b/packages/twenty-front/.storybook/main.ts
index 6d34593abb2c..c320d97500ad 100644
--- a/packages/twenty-front/.storybook/main.ts
+++ b/packages/twenty-front/.storybook/main.ts
@@ -31,6 +31,14 @@ const computeStoriesGlob = () => {
 const config: StorybookConfig = {
   stories: computeStoriesGlob(),
   staticDirs: ['../public'],
+  build: {
+    test: {
+      disabledAddons: [
+        '@storybook/addon-docs',
+        '@storybook/addon-essentials/docs',
+      ],
+    }
+  },
   addons: [
     '@storybook/addon-links',
     '@storybook/addon-essentials',
diff --git a/packages/twenty-front/.storybook/manager-head.html b/packages/twenty-front/.storybook/manager-head.html
index 0be4849fca4e..347c19b21f17 100644
--- a/packages/twenty-front/.storybook/manager-head.html
+++ b/packages/twenty-front/.storybook/manager-head.html
@@ -2,4 +2,7 @@
     [data-is-storybook="true"] {
         background-color: transparent!important;
     }
-</style>
\ No newline at end of file
+    :has(#storybook-panel-root) {
+        z-index: 100;
+    }
+</style>
diff --git a/packages/twenty-front/.swcrc b/packages/twenty-front/.swcrc
index 6de32e423cef..8632a08ea2ba 100644
--- a/packages/twenty-front/.swcrc
+++ b/packages/twenty-front/.swcrc
@@ -19,6 +19,19 @@
       "hidden": {
         "jest": true
       }
+    },
+    "experimental": {
+      "plugins": [
+        [
+          "@lingui/swc-plugin",
+          {
+            "runtimeModules": {
+              "i18n": ["@lingui/core", "i18n"],
+              "trans": ["@lingui/react", "Trans"]
+            }
+          }
+        ]
+      ]
     }
   },
   "module": {
diff --git a/packages/twenty-front/codegen-metadata.cjs b/packages/twenty-front/codegen-metadata.cjs
index 10b82ffdb8ba..e9ddf7575d51 100644
--- a/packages/twenty-front/codegen-metadata.cjs
+++ b/packages/twenty-front/codegen-metadata.cjs
@@ -16,6 +16,9 @@ module.exports = {
       presetConfig: {
         fragmentMasking: false,
       },
+      config: {
+        namingConvention: { enumValues: 'keep' },
+      }
     },
   },
 };
diff --git a/packages/twenty-front/codegen.cjs b/packages/twenty-front/codegen.cjs
index d0ea0e8aae4d..588bb245bda9 100644
--- a/packages/twenty-front/codegen.cjs
+++ b/packages/twenty-front/codegen.cjs
@@ -29,6 +29,7 @@ module.exports = {
         scalars: {
           DateTime: 'string',
         },
+        namingConvention: { enumValues: 'keep' },
       },
     },
   },
diff --git a/packages/twenty-front/jest.config.ts b/packages/twenty-front/jest.config.ts
index d257c24bd19f..7c3777ae481e 100644
--- a/packages/twenty-front/jest.config.ts
+++ b/packages/twenty-front/jest.config.ts
@@ -12,19 +12,30 @@ const jestConfig: JestConfigWithTsJest = {
   testEnvironment: 'jsdom',
   transformIgnorePatterns: ['../../node_modules/'],
   transform: {
-    '^.+\\.(ts|js|tsx|jsx)$': '@swc/jest',
+    '^.+\\.(ts|js|tsx|jsx)$': [
+      '@swc/jest',
+      {
+        jsc: {
+          experimental: {
+            plugins: [], // Disable Lingui plugin during tests
+          },
+        },
+      },
+    ],
   },
   moduleNameMapper: {
     '\\.(jpg|jpeg|png|gif|webp|svg|svg\\?react)$':
       '<rootDir>/__mocks__/imageMock.js',
     '\\.css$': '<rootDir>/__mocks__/styleMock.js',
-    ...pathsToModuleNameMapper(tsConfig.compilerOptions.paths),
+    ...pathsToModuleNameMapper(tsConfig.compilerOptions.paths, {
+      prefix: '<rootDir>/../../',
+    }),
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   extensionsToTreatAsEsm: ['.ts', '.tsx'],
   coverageThreshold: {
     global: {
-      statements: 58,
+      statements: 57,
       lines: 55,
       functions: 47,
     },
diff --git a/packages/twenty-front/lingui.config.ts b/packages/twenty-front/lingui.config.ts
new file mode 100644
index 000000000000..9f53c141719e
--- /dev/null
+++ b/packages/twenty-front/lingui.config.ts
@@ -0,0 +1,32 @@
+import { defineConfig } from '@lingui/cli';
+
+export default defineConfig({
+  sourceLocale: 'en',
+  locales: [
+    'en',
+    'fr',
+    'pt',
+    'de',
+    'it',
+    'es',
+    'zh-Hans',
+    'zh-Hant',
+    'pseudo-en',
+  ],
+  pseudoLocale: 'pseudo-en',
+  fallbackLocales: {
+    'pseudo-en': 'en',
+  },
+  catalogs: [
+    {
+      path: '<rootDir>/src/locales/{locale}',
+      include: ['src'],
+    },
+  ],
+  catalogsMergePath: '<rootDir>/src/locales/generated/{locale}',
+  compileNamespace: 'ts',
+  service: {
+    name: 'TranslationIO',
+    apiKey: process.env.TRANSLATION_IO_API_KEY ?? '',
+  },
+});
diff --git a/packages/twenty-front/nyc.config.cjs b/packages/twenty-front/nyc.config.cjs
index 639a738ff9e4..29f6d82cb56f 100644
--- a/packages/twenty-front/nyc.config.cjs
+++ b/packages/twenty-front/nyc.config.cjs
@@ -1,15 +1,16 @@
+// @ts-check
 const globalCoverage = {
-  branches: 45,
-  statements: 60,
-  lines: 60,
-  functions: 60,
+  branches: 23,
+  statements: 39,
+  lines: 39,
+  functions: 28,
   exclude: ['src/generated/**/*'],
 };
 
 const modulesCoverage = {
   branches: 25,
-  statements: 49,
-  lines: 50,
+  statements: 44,
+  lines: 44,
   functions: 38,
   include: ['src/modules/**/*'],
   exclude: ['src/**/*.ts'],
@@ -31,13 +32,18 @@ const performanceCoverage = {
   exclude: ['src/generated/**/*', 'src/modules/**/*', 'src/**/*.ts'],
 };
 
-const storybookStoriesFolders = process.env.STORYBOOK_SCOPE;
+const getCoverageConfig = () => {
+  const storybookStoriesFolders = process.env.STORYBOOK_SCOPE;
+  switch (storybookStoriesFolders) {
+    case 'pages':
+      return pagesCoverage;
+    case 'modules':
+      return modulesCoverage;
+    case 'performance':
+      return performanceCoverage;
+    default:
+      return globalCoverage;
+  }
+};
 
-module.exports =
-  storybookStoriesFolders === 'pages'
-    ? pagesCoverage
-    : storybookStoriesFolders === 'modules'
-      ? modulesCoverage
-      : storybookStoriesFolders === 'performance'
-        ? performanceCoverage
-      : globalCoverage;
+module.exports = getCoverageConfig();
diff --git a/packages/twenty-front/package.json b/packages/twenty-front/package.json
index 2e8fedd079bf..0815aa19c0a3 100644
--- a/packages/twenty-front/package.json
+++ b/packages/twenty-front/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twenty-front",
-  "version": "0.40.0-canary",
+  "version": "0.41.0-canary",
   "private": true,
   "type": "module",
   "scripts": {
@@ -49,7 +49,8 @@
     "docx": "^9.1.0",
     "file-saver": "^2.0.5",
     "recoil-sync": "^0.2.0",
-    "transliteration": "^2.3.5"
+    "transliteration": "^2.3.5",
+    "twenty-shared": "workspace:*"
   },
   "devDependencies": {
     "@types/file-saver": "^2"
diff --git a/packages/twenty-front/project.json b/packages/twenty-front/project.json
index 19618f949d91..4f541de4f587 100644
--- a/packages/twenty-front/project.json
+++ b/packages/twenty-front/project.json
@@ -153,6 +153,20 @@
       "configurations": {
         "ci": {}
       }
+    },
+    "lingui:extract": {
+      "executor": "nx:run-commands",
+      "options": {
+        "cwd": "{projectRoot}",
+        "command": "lingui extract --overwrite"
+      }
+    },
+    "lingui:compile": {
+      "executor": "nx:run-commands",
+      "options": {
+        "cwd": "{projectRoot}",
+        "command": "lingui compile --typescript"
+      }
     }
   }
 }
diff --git a/packages/twenty-front/src/__stories__/AppRouter.stories.tsx b/packages/twenty-front/src/__stories__/AppRouter.stories.tsx
deleted file mode 100644
index f322919baeea..000000000000
--- a/packages/twenty-front/src/__stories__/AppRouter.stories.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import { getOperationName } from '@apollo/client/utilities';
-import { jest } from '@storybook/jest';
-import { Meta, StoryObj } from '@storybook/react';
-import { HttpResponse, graphql } from 'msw';
-import { HelmetProvider } from 'react-helmet-async';
-import { RecoilRoot } from 'recoil';
-
-import { AppErrorBoundary } from '@/error-handler/components/AppErrorBoundary';
-import indexAppPath from '@/navigation/utils/indexAppPath';
-import { SnackBarProviderScope } from '@/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope';
-import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
-
-import { AppRouter } from '@/app/components/AppRouter';
-import { AppPath } from '@/types/AppPath';
-import { IconsProvider } from 'twenty-ui';
-import { graphqlMocks } from '~/testing/graphqlMocks';
-import { mockedUserData } from '~/testing/mock-data/users';
-
-const meta: Meta<typeof AppRouter> = {
-  title: 'App/AppRouter',
-  component: AppRouter,
-  decorators: [
-    (Story) => {
-      return (
-        <RecoilRoot>
-          <AppErrorBoundary>
-            <SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
-              <IconsProvider>
-                <HelmetProvider>
-                  <Story />
-                </HelmetProvider>
-              </IconsProvider>
-            </SnackBarProviderScope>
-          </AppErrorBoundary>
-        </RecoilRoot>
-      );
-    },
-  ],
-  parameters: {
-    msw: graphqlMocks,
-  },
-};
-
-export default meta;
-export type Story = StoryObj<typeof AppRouter>;
-
-export const Default: Story = {
-  play: async () => {
-    jest
-      .spyOn(indexAppPath, 'getIndexAppPath')
-      .mockReturnValue('iframe.html' as AppPath);
-  },
-};
-
-export const DarkMode: Story = {
-  play: async () => {
-    jest
-      .spyOn(indexAppPath, 'getIndexAppPath')
-      .mockReturnValue('iframe.html' as AppPath);
-  },
-  parameters: {
-    msw: {
-      handlers: [
-        ...graphqlMocks.handlers.filter((handler) => {
-          return (handler.info as any).operationName !== 'GetCurrentUser';
-        }),
-        graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
-          return HttpResponse.json({
-            data: {
-              currentUser: {
-                ...mockedUserData,
-                workspaceMember: {
-                  ...mockedUserData.workspaceMember,
-                  colorScheme: 'Dark',
-                },
-              },
-            },
-          });
-        }),
-      ],
-    },
-  },
-};
diff --git a/packages/twenty-front/src/generated-metadata/gql.ts b/packages/twenty-front/src/generated-metadata/gql.ts
index 32e777227fc2..79b65434056a 100644
--- a/packages/twenty-front/src/generated-metadata/gql.ts
+++ b/packages/twenty-front/src/generated-metadata/gql.ts
@@ -33,7 +33,7 @@ const documents = {
     "\n  mutation DeleteOneFieldMetadataItem($idToDelete: UUID!) {\n    deleteOneField(input: { id: $idToDelete }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n      settings\n    }\n  }\n": types.DeleteOneFieldMetadataItemDocument,
     "\n  mutation DeleteOneRelationMetadataItem($idToDelete: UUID!) {\n    deleteOneRelation(input: { id: $idToDelete }) {\n      id\n    }\n  }\n": types.DeleteOneRelationMetadataItemDocument,
     "\n  query ObjectMetadataItems(\n    $objectFilter: objectFilter\n    $fieldFilter: fieldFilter\n  ) {\n    objects(paging: { first: 1000 }, filter: $objectFilter) {\n      edges {\n        node {\n          id\n          dataSourceId\n          nameSingular\n          namePlural\n          labelSingular\n          labelPlural\n          description\n          icon\n          isCustom\n          isRemote\n          isActive\n          isSystem\n          createdAt\n          updatedAt\n          labelIdentifierFieldMetadataId\n          imageIdentifierFieldMetadataId\n          shortcut\n          isLabelSyncedWithName\n          indexMetadatas(paging: { first: 100 }) {\n            edges {\n              node {\n                id\n                createdAt\n                updatedAt\n                name\n                indexWhereClause\n                indexType\n                isUnique\n                indexFieldMetadatas(paging: { first: 100 }) {\n                  edges {\n                    node {\n                      id\n                      createdAt\n                      updatedAt\n                      order\n                      fieldMetadataId\n                    }\n                  }\n                }\n              }\n            }\n          }\n          fields(paging: { first: 1000 }, filter: $fieldFilter) {\n            edges {\n              node {\n                id\n                type\n                name\n                label\n                description\n                icon\n                isCustom\n                isActive\n                isSystem\n                isNullable\n                isUnique\n                createdAt\n                updatedAt\n                defaultValue\n                options\n                settings\n                isLabelSyncedWithName\n                relationDefinition {\n                  relationId\n                  direction\n                  sourceObjectMetadata {\n                    id\n                    nameSingular\n                    namePlural\n                  }\n                  sourceFieldMetadata {\n                    id\n                    name\n                  }\n                  targetObjectMetadata {\n                    id\n                    nameSingular\n                    namePlural\n                  }\n                  targetFieldMetadata {\n                    id\n                    name\n                  }\n                }\n              }\n            }\n            pageInfo {\n              hasNextPage\n              hasPreviousPage\n              startCursor\n              endCursor\n            }\n          }\n        }\n      }\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n    }\n  }\n": types.ObjectMetadataItemsDocument,
-    "\n  fragment ServerlessFunctionFields on ServerlessFunction {\n    id\n    name\n    description\n    runtime\n    syncStatus\n    latestVersion\n    latestVersionInputSchema\n    publishedVersions\n    createdAt\n    updatedAt\n  }\n": types.ServerlessFunctionFieldsFragmentDoc,
+    "\n  fragment ServerlessFunctionFields on ServerlessFunction {\n    id\n    name\n    description\n    runtime\n    timeoutSeconds\n    syncStatus\n    latestVersion\n    latestVersionInputSchema\n    publishedVersions\n    createdAt\n    updatedAt\n  }\n": types.ServerlessFunctionFieldsFragmentDoc,
     "\n  \n  mutation CreateOneServerlessFunctionItem(\n    $input: CreateServerlessFunctionInput!\n  ) {\n    createOneServerlessFunction(input: $input) {\n      ...ServerlessFunctionFields\n    }\n  }\n": types.CreateOneServerlessFunctionItemDocument,
     "\n  \n  mutation DeleteOneServerlessFunction($input: ServerlessFunctionIdInput!) {\n    deleteOneServerlessFunction(input: $input) {\n      ...ServerlessFunctionFields\n    }\n  }\n": types.DeleteOneServerlessFunctionDocument,
     "\n  mutation ExecuteOneServerlessFunction(\n    $input: ExecuteServerlessFunctionInput!\n  ) {\n    executeOneServerlessFunction(input: $input) {\n      data\n      duration\n      status\n      error\n    }\n  }\n": types.ExecuteOneServerlessFunctionDocument,
@@ -142,7 +142,7 @@ export function graphql(source: "\n  query ObjectMetadataItems(\n    $objectFilt
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  fragment ServerlessFunctionFields on ServerlessFunction {\n    id\n    name\n    description\n    runtime\n    syncStatus\n    latestVersion\n    latestVersionInputSchema\n    publishedVersions\n    createdAt\n    updatedAt\n  }\n"): (typeof documents)["\n  fragment ServerlessFunctionFields on ServerlessFunction {\n    id\n    name\n    description\n    runtime\n    syncStatus\n    latestVersion\n    latestVersionInputSchema\n    publishedVersions\n    createdAt\n    updatedAt\n  }\n"];
+export function graphql(source: "\n  fragment ServerlessFunctionFields on ServerlessFunction {\n    id\n    name\n    description\n    runtime\n    timeoutSeconds\n    syncStatus\n    latestVersion\n    latestVersionInputSchema\n    publishedVersions\n    createdAt\n    updatedAt\n  }\n"): (typeof documents)["\n  fragment ServerlessFunctionFields on ServerlessFunction {\n    id\n    name\n    description\n    runtime\n    timeoutSeconds\n    syncStatus\n    latestVersion\n    latestVersionInputSchema\n    publishedVersions\n    createdAt\n    updatedAt\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index 5d4ba1c77128..2e838d5dbef4 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -117,17 +117,83 @@ export type AvailableWorkspaceOutput = {
 
 export type Billing = {
   __typename?: 'Billing';
-  billingFreeTrialDurationInDays?: Maybe<Scalars['Float']['output']>;
   billingUrl?: Maybe<Scalars['String']['output']>;
   isBillingEnabled: Scalars['Boolean']['output'];
+  trialPeriods: Array<BillingTrialPeriodDto>;
 };
 
 /** The different billing plans available */
 export enum BillingPlanKey {
-  Enterprise = 'ENTERPRISE',
-  Pro = 'PRO'
+  ENTERPRISE = 'ENTERPRISE',
+  PRO = 'PRO'
 }
 
+export type BillingPlanOutput = {
+  __typename?: 'BillingPlanOutput';
+  baseProduct: BillingProductDto;
+  meteredProducts: Array<BillingProductDto>;
+  otherLicensedProducts: Array<BillingProductDto>;
+  planKey: BillingPlanKey;
+};
+
+export type BillingPriceLicensedDto = {
+  __typename?: 'BillingPriceLicensedDTO';
+  recurringInterval: SubscriptionInterval;
+  stripePriceId: Scalars['String']['output'];
+  unitAmount: Scalars['Float']['output'];
+};
+
+export type BillingPriceMeteredDto = {
+  __typename?: 'BillingPriceMeteredDTO';
+  recurringInterval: SubscriptionInterval;
+  stripePriceId: Scalars['String']['output'];
+  tiers?: Maybe<Array<BillingPriceTierDto>>;
+  tiersMode?: Maybe<BillingPriceTiersMode>;
+};
+
+export type BillingPriceTierDto = {
+  __typename?: 'BillingPriceTierDTO';
+  flatAmount?: Maybe<Scalars['Float']['output']>;
+  unitAmount?: Maybe<Scalars['Float']['output']>;
+  upTo?: Maybe<Scalars['Float']['output']>;
+};
+
+/** The different billing price tiers modes */
+export enum BillingPriceTiersMode {
+  GRADUATED = 'GRADUATED',
+  VOLUME = 'VOLUME'
+}
+
+export type BillingPriceUnionDto = BillingPriceLicensedDto | BillingPriceMeteredDto;
+
+export type BillingProductDto = {
+  __typename?: 'BillingProductDTO';
+  description: Scalars['String']['output'];
+  images?: Maybe<Array<Scalars['String']['output']>>;
+  name: Scalars['String']['output'];
+  prices: Array<Maybe<BillingPriceUnionDto>>;
+  type: BillingUsageType;
+};
+
+export type BillingProductPriceDto = {
+  __typename?: 'BillingProductPriceDTO';
+  created: Scalars['Float']['output'];
+  recurringInterval: SubscriptionInterval;
+  stripePriceId: Scalars['String']['output'];
+  unitAmount: Scalars['Float']['output'];
+};
+
+export type BillingProductPricesOutput = {
+  __typename?: 'BillingProductPricesOutput';
+  productPrices: Array<BillingProductPriceDto>;
+  totalNumberOfPrices: Scalars['Int']['output'];
+};
+
+export type BillingSessionOutput = {
+  __typename?: 'BillingSessionOutput';
+  url?: Maybe<Scalars['String']['output']>;
+};
+
 export type BillingSubscription = {
   __typename?: 'BillingSubscription';
   id: Scalars['UUID']['output'];
@@ -135,20 +201,21 @@ export type BillingSubscription = {
   status: SubscriptionStatus;
 };
 
-export type BillingSubscriptionFilter = {
-  and?: InputMaybe<Array<BillingSubscriptionFilter>>;
-  id?: InputMaybe<UuidFilterComparison>;
-  or?: InputMaybe<Array<BillingSubscriptionFilter>>;
+export type BillingTrialPeriodDto = {
+  __typename?: 'BillingTrialPeriodDTO';
+  duration: Scalars['Float']['output'];
+  isCreditCardRequired: Scalars['Boolean']['output'];
 };
 
-export type BillingSubscriptionSort = {
-  direction: SortDirection;
-  field: BillingSubscriptionSortFields;
-  nulls?: InputMaybe<SortNulls>;
+export type BillingUpdateOutput = {
+  __typename?: 'BillingUpdateOutput';
+  /** Boolean that confirms query was successful */
+  success: Scalars['Boolean']['output'];
 };
 
-export enum BillingSubscriptionSortFields {
-  Id = 'id'
+export enum BillingUsageType {
+  LICENSED = 'LICENSED',
+  METERED = 'METERED'
 }
 
 export type BooleanFieldComparison = {
@@ -157,8 +224,8 @@ export type BooleanFieldComparison = {
 };
 
 export enum CalendarChannelVisibility {
-  Metadata = 'METADATA',
-  ShareEverything = 'SHARE_EVERYTHING'
+  METADATA = 'METADATA',
+  SHARE_EVERYTHING = 'SHARE_EVERYTHING'
 }
 
 export type Captcha = {
@@ -178,13 +245,15 @@ export type ClientConfig = {
   api: ApiConfig;
   authProviders: AuthProviders;
   billing: Billing;
+  canManageFeatureFlags: Scalars['Boolean']['output'];
   captcha: Captcha;
   chromeExtensionId?: Maybe<Scalars['String']['output']>;
   debugMode: Scalars['Boolean']['output'];
   defaultSubdomain?: Maybe<Scalars['String']['output']>;
   frontDomain: Scalars['String']['output'];
+  isEmailVerificationRequired: Scalars['Boolean']['output'];
   isMultiWorkspaceEnabled: Scalars['Boolean']['output'];
-  isSSOEnabled: Scalars['Boolean']['output'];
+  publicFeatureFlags: Array<PublicFeatureFlag>;
   sentry: Sentry;
   signInPrefilled: Scalars['Boolean']['output'];
   support: Support;
@@ -285,6 +354,7 @@ export type CreateRemoteServerInput = {
 export type CreateServerlessFunctionInput = {
   description?: InputMaybe<Scalars['String']['input']>;
   name: Scalars['String']['input'];
+  timeoutSeconds?: InputMaybe<Scalars['Float']['input']>;
 };
 
 export type CreateWorkflowVersionStepInput = {
@@ -338,10 +408,10 @@ export type DeleteWorkflowVersionStepInput = {
 
 /** Schema update on a table */
 export enum DistantTableUpdate {
-  ColumnsAdded = 'COLUMNS_ADDED',
-  ColumnsDeleted = 'COLUMNS_DELETED',
-  ColumnsTypeChanged = 'COLUMNS_TYPE_CHANGED',
-  TableDeleted = 'TABLE_DELETED'
+  COLUMNS_ADDED = 'COLUMNS_ADDED',
+  COLUMNS_DELETED = 'COLUMNS_DELETED',
+  COLUMNS_TYPE_CHANGED = 'COLUMNS_TYPE_CHANGED',
+  TABLE_DELETED = 'TABLE_DELETED'
 }
 
 export type EditSsoInput = {
@@ -381,44 +451,24 @@ export type FeatureFlag = {
   workspaceId: Scalars['String']['output'];
 };
 
-export type FeatureFlagFilter = {
-  and?: InputMaybe<Array<FeatureFlagFilter>>;
-  id?: InputMaybe<UuidFilterComparison>;
-  or?: InputMaybe<Array<FeatureFlagFilter>>;
-};
-
 export enum FeatureFlagKey {
   IsAdvancedFiltersEnabled = 'IsAdvancedFiltersEnabled',
-  IsAggregateQueryEnabled = 'IsAggregateQueryEnabled',
   IsAirtableIntegrationEnabled = 'IsAirtableIntegrationEnabled',
   IsAnalyticsV2Enabled = 'IsAnalyticsV2Enabled',
+  IsBillingPlansEnabled = 'IsBillingPlansEnabled',
+  IsCommandMenuV2Enabled = 'IsCommandMenuV2Enabled',
   IsCopilotEnabled = 'IsCopilotEnabled',
-  IsCrmMigrationEnabled = 'IsCrmMigrationEnabled',
   IsEventObjectEnabled = 'IsEventObjectEnabled',
   IsFreeAccessEnabled = 'IsFreeAccessEnabled',
-  IsFunctionSettingsEnabled = 'IsFunctionSettingsEnabled',
-  IsGmailSendEmailScopeEnabled = 'IsGmailSendEmailScopeEnabled',
   IsJsonFilterEnabled = 'IsJsonFilterEnabled',
+  IsLocalizationEnabled = 'IsLocalizationEnabled',
   IsMicrosoftSyncEnabled = 'IsMicrosoftSyncEnabled',
-  IsPageHeaderV2Enabled = 'IsPageHeaderV2Enabled',
-  IsPostgreSqlIntegrationEnabled = 'IsPostgreSQLIntegrationEnabled',
-  IsSsoEnabled = 'IsSSOEnabled',
+  IsPostgreSQLIntegrationEnabled = 'IsPostgreSQLIntegrationEnabled',
   IsStripeIntegrationEnabled = 'IsStripeIntegrationEnabled',
   IsUniqueIndexesEnabled = 'IsUniqueIndexesEnabled',
-  IsViewGroupsEnabled = 'IsViewGroupsEnabled',
   IsWorkflowEnabled = 'IsWorkflowEnabled'
 }
 
-export type FeatureFlagSort = {
-  direction: SortDirection;
-  field: FeatureFlagSortFields;
-  nulls?: InputMaybe<SortNulls>;
-};
-
-export enum FeatureFlagSortFields {
-  Id = 'id'
-}
-
 export type FieldConnection = {
   __typename?: 'FieldConnection';
   /** Array of edges. */
@@ -429,29 +479,29 @@ export type FieldConnection = {
 
 /** Type of the field */
 export enum FieldMetadataType {
-  Actor = 'ACTOR',
-  Address = 'ADDRESS',
-  Array = 'ARRAY',
-  Boolean = 'BOOLEAN',
-  Currency = 'CURRENCY',
-  Date = 'DATE',
-  DateTime = 'DATE_TIME',
-  Emails = 'EMAILS',
-  FullName = 'FULL_NAME',
-  Links = 'LINKS',
-  MultiSelect = 'MULTI_SELECT',
-  Number = 'NUMBER',
-  Numeric = 'NUMERIC',
-  Phones = 'PHONES',
-  Position = 'POSITION',
-  Rating = 'RATING',
-  RawJson = 'RAW_JSON',
-  Relation = 'RELATION',
-  RichText = 'RICH_TEXT',
-  Select = 'SELECT',
-  Text = 'TEXT',
-  TsVector = 'TS_VECTOR',
-  Uuid = 'UUID'
+  ACTOR = 'ACTOR',
+  ADDRESS = 'ADDRESS',
+  ARRAY = 'ARRAY',
+  BOOLEAN = 'BOOLEAN',
+  CURRENCY = 'CURRENCY',
+  DATE = 'DATE',
+  DATE_TIME = 'DATE_TIME',
+  EMAILS = 'EMAILS',
+  FULL_NAME = 'FULL_NAME',
+  LINKS = 'LINKS',
+  MULTI_SELECT = 'MULTI_SELECT',
+  NUMBER = 'NUMBER',
+  NUMERIC = 'NUMERIC',
+  PHONES = 'PHONES',
+  POSITION = 'POSITION',
+  RATING = 'RATING',
+  RAW_JSON = 'RAW_JSON',
+  RELATION = 'RELATION',
+  RICH_TEXT = 'RICH_TEXT',
+  SELECT = 'SELECT',
+  TEXT = 'TEXT',
+  TS_VECTOR = 'TS_VECTOR',
+  UUID = 'UUID'
 }
 
 export enum FileFolder {
@@ -504,8 +554,8 @@ export type GetServerlessFunctionSourceCodeInput = {
 };
 
 export enum IdentityProviderType {
-  Oidc = 'OIDC',
-  Saml = 'SAML'
+  OIDC = 'OIDC',
+  SAML = 'SAML'
 }
 
 export type ImpersonateOutput = {
@@ -540,8 +590,8 @@ export type IndexObjectMetadataConnection = {
 
 /** Type of the index */
 export enum IndexType {
-  Btree = 'BTREE',
-  Gin = 'GIN'
+  BTREE = 'BTREE',
+  GIN = 'GIN'
 }
 
 export type InvalidatePassword = {
@@ -569,22 +619,20 @@ export type LoginToken = {
 };
 
 export enum MessageChannelVisibility {
-  Metadata = 'METADATA',
-  ShareEverything = 'SHARE_EVERYTHING',
-  Subject = 'SUBJECT'
+  METADATA = 'METADATA',
+  SHARE_EVERYTHING = 'SHARE_EVERYTHING',
+  SUBJECT = 'SUBJECT'
 }
 
 export type Mutation = {
   __typename?: 'Mutation';
   activateWorkflowVersion: Scalars['Boolean']['output'];
   activateWorkspace: Workspace;
-  addUserToWorkspace: User;
-  addUserToWorkspaceByInviteToken: User;
   authorizeApp: AuthorizeApp;
   challenge: LoginToken;
-  checkoutSession: SessionEntity;
+  checkoutSession: BillingSessionOutput;
   computeStepOutputSchema: Scalars['JSON']['output'];
-  createDraftFromWorkflowVersion: Scalars['Boolean']['output'];
+  createDraftFromWorkflowVersion: WorkflowVersion;
   createOIDCIdentityProvider: SetupSsoOutput;
   createOneAppToken: AppToken;
   createOneField: Field;
@@ -613,20 +661,22 @@ export type Mutation = {
   generateApiKeyToken: ApiKeyToken;
   generateTransientToken: TransientToken;
   getAuthorizationUrl: GetAuthorizationUrlOutput;
+  getLoginTokenFromEmailVerificationToken: LoginToken;
   impersonate: ImpersonateOutput;
   publishServerlessFunction: ServerlessFunction;
   renewToken: AuthTokens;
+  resendEmailVerificationToken: ResendEmailVerificationTokenOutput;
   resendWorkspaceInvitation: SendInvitationsOutput;
   runWorkflowVersion: WorkflowRun;
   sendInvitations: SendInvitationsOutput;
   signUp: SignUpOutput;
   skipSyncEmailOnboardingStep: OnboardingStepSuccess;
-  switchWorkspace: PublicWorkspaceDataOutput;
   syncRemoteTable: RemoteTable;
   syncRemoteTableSchemaChanges: RemoteTable;
   track: Analytics;
   unsyncRemoteTable: RemoteTable;
-  updateBillingSubscription: UpdateBillingEntity;
+  updateBillingSubscription: BillingUpdateOutput;
+  updateLabPublicFeatureFlag: Scalars['Boolean']['output'];
   updateOneField: Field;
   updateOneObject: Object;
   updateOneRemoteServer: RemoteServer;
@@ -654,16 +704,6 @@ export type MutationActivateWorkspaceArgs = {
 };
 
 
-export type MutationAddUserToWorkspaceArgs = {
-  inviteHash: Scalars['String']['input'];
-};
-
-
-export type MutationAddUserToWorkspaceByInviteTokenArgs = {
-  inviteToken: Scalars['String']['input'];
-};
-
-
 export type MutationAuthorizeAppArgs = {
   clientId: Scalars['String']['input'];
   codeChallenge?: InputMaybe<Scalars['String']['input']>;
@@ -812,6 +852,12 @@ export type MutationGetAuthorizationUrlArgs = {
 };
 
 
+export type MutationGetLoginTokenFromEmailVerificationTokenArgs = {
+  captchaToken?: InputMaybe<Scalars['String']['input']>;
+  emailVerificationToken: Scalars['String']['input'];
+};
+
+
 export type MutationImpersonateArgs = {
   userId: Scalars['String']['input'];
   workspaceId: Scalars['String']['input'];
@@ -828,6 +874,11 @@ export type MutationRenewTokenArgs = {
 };
 
 
+export type MutationResendEmailVerificationTokenArgs = {
+  email: Scalars['String']['input'];
+};
+
+
 export type MutationResendWorkspaceInvitationArgs = {
   appTokenId: Scalars['String']['input'];
 };
@@ -847,16 +898,12 @@ export type MutationSignUpArgs = {
   captchaToken?: InputMaybe<Scalars['String']['input']>;
   email: Scalars['String']['input'];
   password: Scalars['String']['input'];
+  workspaceId?: InputMaybe<Scalars['String']['input']>;
   workspaceInviteHash?: InputMaybe<Scalars['String']['input']>;
   workspacePersonalInviteToken?: InputMaybe<Scalars['String']['input']>;
 };
 
 
-export type MutationSwitchWorkspaceArgs = {
-  workspaceId: Scalars['String']['input'];
-};
-
-
 export type MutationSyncRemoteTableArgs = {
   input: RemoteTableInput;
 };
@@ -878,6 +925,11 @@ export type MutationUnsyncRemoteTableArgs = {
 };
 
 
+export type MutationUpdateLabPublicFeatureFlagArgs = {
+  input: UpdateLabPublicFeatureFlagInput;
+};
+
+
 export type MutationUpdateOneFieldArgs = {
   input: UpdateOneFieldMetadataInput;
 };
@@ -978,12 +1030,12 @@ export type ObjectIndexMetadatasConnection = {
 
 /** Onboarding status */
 export enum OnboardingStatus {
-  Completed = 'COMPLETED',
-  InviteTeam = 'INVITE_TEAM',
-  PlanRequired = 'PLAN_REQUIRED',
-  ProfileCreation = 'PROFILE_CREATION',
-  SyncEmail = 'SYNC_EMAIL',
-  WorkspaceActivation = 'WORKSPACE_ACTIVATION'
+  COMPLETED = 'COMPLETED',
+  INVITE_TEAM = 'INVITE_TEAM',
+  PLAN_REQUIRED = 'PLAN_REQUIRED',
+  PROFILE_CREATION = 'PROFILE_CREATION',
+  SYNC_EMAIL = 'SYNC_EMAIL',
+  WORKSPACE_ACTIVATION = 'WORKSPACE_ACTIVATION'
 }
 
 export type OnboardingStepSuccess = {
@@ -1012,18 +1064,17 @@ export type PostgresCredentials = {
   workspaceId: Scalars['String']['output'];
 };
 
-export type ProductPriceEntity = {
-  __typename?: 'ProductPriceEntity';
-  created: Scalars['Float']['output'];
-  recurringInterval: SubscriptionInterval;
-  stripePriceId: Scalars['String']['output'];
-  unitAmount: Scalars['Float']['output'];
+export type PublicFeatureFlag = {
+  __typename?: 'PublicFeatureFlag';
+  key: FeatureFlagKey;
+  metadata: PublicFeatureFlagMetadata;
 };
 
-export type ProductPricesEntity = {
-  __typename?: 'ProductPricesEntity';
-  productPrices: Array<ProductPriceEntity>;
-  totalNumberOfPrices: Scalars['Int']['output'];
+export type PublicFeatureFlagMetadata = {
+  __typename?: 'PublicFeatureFlagMetadata';
+  description: Scalars['String']['output'];
+  imagePath: Scalars['String']['output'];
+  label: Scalars['String']['output'];
 };
 
 export type PublicWorkspaceDataOutput = {
@@ -1042,7 +1093,7 @@ export type PublishServerlessFunctionInput = {
 
 export type Query = {
   __typename?: 'Query';
-  billingPortalSession: SessionEntity;
+  billingPortalSession: BillingSessionOutput;
   checkUserExists: UserExistsOutput;
   checkWorkspaceInviteHashIsValid: WorkspaceInviteHashValid;
   clientConfig: ClientConfig;
@@ -1060,7 +1111,7 @@ export type Query = {
   findWorkspaceInvitations: Array<WorkspaceInvitation>;
   getAvailablePackages: Scalars['JSON']['output'];
   getPostgresCredentials?: Maybe<PostgresCredentials>;
-  getProductPrices: ProductPricesEntity;
+  getProductPrices: BillingProductPricesOutput;
   getPublicWorkspaceDataBySubdomain: PublicWorkspaceDataOutput;
   getServerlessFunctionSourceCode?: Maybe<Scalars['JSON']['output']>;
   getTimelineCalendarEventsFromCompanyId: TimelineCalendarEventsWithTotal;
@@ -1072,6 +1123,7 @@ export type Query = {
   listSSOIdentityProvidersByWorkspaceId: Array<FindAvailableSsoidpOutput>;
   object: Object;
   objects: ObjectConnection;
+  plans: Array<BillingPlanOutput>;
   relation: Relation;
   relations: RelationConnection;
   validatePasswordResetToken: ValidatePasswordResetToken;
@@ -1234,18 +1286,18 @@ export type RelationDefinition = {
 
 /** Relation definition type */
 export enum RelationDefinitionType {
-  ManyToMany = 'MANY_TO_MANY',
-  ManyToOne = 'MANY_TO_ONE',
-  OneToMany = 'ONE_TO_MANY',
-  OneToOne = 'ONE_TO_ONE'
+  MANY_TO_MANY = 'MANY_TO_MANY',
+  MANY_TO_ONE = 'MANY_TO_ONE',
+  ONE_TO_MANY = 'ONE_TO_MANY',
+  ONE_TO_ONE = 'ONE_TO_ONE'
 }
 
 /** Type of the relation */
 export enum RelationMetadataType {
-  ManyToMany = 'MANY_TO_MANY',
-  ManyToOne = 'MANY_TO_ONE',
-  OneToMany = 'ONE_TO_MANY',
-  OneToOne = 'ONE_TO_ONE'
+  MANY_TO_MANY = 'MANY_TO_MANY',
+  MANY_TO_ONE = 'MANY_TO_ONE',
+  ONE_TO_MANY = 'ONE_TO_MANY',
+  ONE_TO_ONE = 'ONE_TO_ONE'
 }
 
 export type RemoteServer = {
@@ -1286,10 +1338,15 @@ export type RemoteTableInput = {
 
 /** Status of the table */
 export enum RemoteTableStatus {
-  NotSynced = 'NOT_SYNCED',
-  Synced = 'SYNCED'
+  NOT_SYNCED = 'NOT_SYNCED',
+  SYNCED = 'SYNCED'
 }
 
+export type ResendEmailVerificationTokenOutput = {
+  __typename?: 'ResendEmailVerificationTokenOutput';
+  success: Scalars['Boolean']['output'];
+};
+
 export type RunWorkflowVersionInput = {
   /** Execution result in JSON format */
   payload?: InputMaybe<Scalars['JSON']['input']>;
@@ -1347,6 +1404,7 @@ export type ServerlessFunction = {
   publishedVersions: Array<Scalars['String']['output']>;
   runtime: Scalars['String']['output'];
   syncStatus: ServerlessFunctionSyncStatus;
+  timeoutSeconds: Scalars['Float']['output'];
   updatedAt: Scalars['DateTime']['output'];
 };
 
@@ -1364,8 +1422,8 @@ export type ServerlessFunctionExecutionResult = {
 
 /** Status of the serverless function execution */
 export enum ServerlessFunctionExecutionStatus {
-  Error = 'ERROR',
-  Success = 'SUCCESS'
+  ERROR = 'ERROR',
+  SUCCESS = 'SUCCESS'
 }
 
 export type ServerlessFunctionIdInput = {
@@ -1375,15 +1433,10 @@ export type ServerlessFunctionIdInput = {
 
 /** SyncStatus of the serverlessFunction */
 export enum ServerlessFunctionSyncStatus {
-  NotReady = 'NOT_READY',
-  Ready = 'READY'
+  NOT_READY = 'NOT_READY',
+  READY = 'READY'
 }
 
-export type SessionEntity = {
-  __typename?: 'SessionEntity';
-  url?: Maybe<Scalars['String']['output']>;
-};
-
 export type SetupOidcSsoInput = {
   clientID: Scalars['String']['input'];
   clientSecret: Scalars['String']['input'];
@@ -1415,18 +1468,6 @@ export type SignUpOutput = {
   workspace: WorkspaceSubdomainAndId;
 };
 
-/** Sort Directions */
-export enum SortDirection {
-  Asc = 'ASC',
-  Desc = 'DESC'
-}
-
-/** Sort Nulls Options */
-export enum SortNulls {
-  NullsFirst = 'NULLS_FIRST',
-  NullsLast = 'NULLS_LAST'
-}
-
 export enum SubscriptionInterval {
   Day = 'Day',
   Month = 'Month',
@@ -1537,12 +1578,6 @@ export type UuidFilterComparison = {
   notLike?: InputMaybe<Scalars['UUID']['input']>;
 };
 
-export type UpdateBillingEntity = {
-  __typename?: 'UpdateBillingEntity';
-  /** Boolean that confirms query was successful */
-  success: Scalars['Boolean']['output'];
-};
-
 export type UpdateFieldInput = {
   defaultValue?: InputMaybe<Scalars['JSON']['input']>;
   description?: InputMaybe<Scalars['String']['input']>;
@@ -1559,6 +1594,11 @@ export type UpdateFieldInput = {
   settings?: InputMaybe<Scalars['JSON']['input']>;
 };
 
+export type UpdateLabPublicFeatureFlagInput = {
+  publicFeatureFlag: Scalars['String']['input'];
+  value: Scalars['Boolean']['input'];
+};
+
 export type UpdateObjectPayload = {
   description?: InputMaybe<Scalars['String']['input']>;
   icon?: InputMaybe<Scalars['String']['input']>;
@@ -1600,6 +1640,7 @@ export type UpdateServerlessFunctionInput = {
   /** Id of the serverless function to execute */
   id: Scalars['UUID']['input'];
   name: Scalars['String']['input'];
+  timeoutSeconds?: InputMaybe<Scalars['Float']['input']>;
 };
 
 export type UpdateWorkflowVersionStepInput = {
@@ -1632,9 +1673,9 @@ export type User = {
   deletedAt?: Maybe<Scalars['DateTime']['output']>;
   disabled?: Maybe<Scalars['Boolean']['output']>;
   email: Scalars['String']['output'];
-  emailVerified: Scalars['Boolean']['output'];
   firstName: Scalars['String']['output'];
   id: Scalars['UUID']['output'];
+  isEmailVerified: Scalars['Boolean']['output'];
   lastName: Scalars['String']['output'];
   onboardingStatus?: Maybe<OnboardingStatus>;
   passwordHash?: Maybe<Scalars['String']['output']>;
@@ -1658,6 +1699,7 @@ export type UserExists = {
   __typename?: 'UserExists';
   availableWorkspaces: Array<AvailableWorkspaceOutput>;
   exists: Scalars['Boolean']['output'];
+  isEmailVerified: Scalars['Boolean']['output'];
 };
 
 export type UserExistsOutput = UserExists | UserNotExists;
@@ -1728,13 +1770,16 @@ export type WorkflowRun = {
   workflowRunId: Scalars['UUID']['output'];
 };
 
+export type WorkflowVersion = {
+  __typename?: 'WorkflowVersion';
+  id: Scalars['UUID']['output'];
+};
+
 export type Workspace = {
   __typename?: 'Workspace';
   activationStatus: WorkspaceActivationStatus;
   allowImpersonation: Scalars['Boolean']['output'];
-  billingCustomers?: Maybe<Array<BillingCustomer>>;
-  billingEntitlements?: Maybe<Array<BillingEntitlement>>;
-  billingSubscriptions?: Maybe<Array<BillingSubscription>>;
+  billingSubscriptions: Array<BillingSubscription>;
   createdAt: Scalars['DateTime']['output'];
   currentBillingSubscription?: Maybe<BillingSubscription>;
   databaseSchema: Scalars['String']['output'];
@@ -1757,35 +1802,12 @@ export type Workspace = {
   workspaceMembersCount?: Maybe<Scalars['Float']['output']>;
 };
 
-
-export type WorkspaceBillingCustomersArgs = {
-  filter?: BillingCustomerFilter;
-  sorting?: Array<BillingCustomerSort>;
-};
-
-
-export type WorkspaceBillingEntitlementsArgs = {
-  filter?: BillingEntitlementFilter;
-  sorting?: Array<BillingEntitlementSort>;
-};
-
-
-export type WorkspaceBillingSubscriptionsArgs = {
-  filter?: BillingSubscriptionFilter;
-  sorting?: Array<BillingSubscriptionSort>;
-};
-
-
-export type WorkspaceFeatureFlagsArgs = {
-  filter?: FeatureFlagFilter;
-  sorting?: Array<FeatureFlagSort>;
-};
-
 export enum WorkspaceActivationStatus {
-  Active = 'ACTIVE',
-  Inactive = 'INACTIVE',
-  OngoingCreation = 'ONGOING_CREATION',
-  PendingCreation = 'PENDING_CREATION'
+  ACTIVE = 'ACTIVE',
+  INACTIVE = 'INACTIVE',
+  ONGOING_CREATION = 'ONGOING_CREATION',
+  PENDING_CREATION = 'PENDING_CREATION',
+  SUSPENDED = 'SUSPENDED'
 }
 
 export type WorkspaceEdge = {
@@ -1833,17 +1855,17 @@ export type WorkspaceMember = {
 
 /** Date format as Month first, Day first, Year first or system as default */
 export enum WorkspaceMemberDateFormatEnum {
-  DayFirst = 'DAY_FIRST',
-  MonthFirst = 'MONTH_FIRST',
-  System = 'SYSTEM',
-  YearFirst = 'YEAR_FIRST'
+  DAY_FIRST = 'DAY_FIRST',
+  MONTH_FIRST = 'MONTH_FIRST',
+  SYSTEM = 'SYSTEM',
+  YEAR_FIRST = 'YEAR_FIRST'
 }
 
 /** Time time as Military, Standard or system as default */
 export enum WorkspaceMemberTimeFormatEnum {
-  Hour_12 = 'HOUR_12',
-  Hour_24 = 'HOUR_24',
-  System = 'SYSTEM'
+  HOUR_12 = 'HOUR_12',
+  HOUR_24 = 'HOUR_24',
+  SYSTEM = 'SYSTEM'
 }
 
 export type WorkspaceNameAndId = {
@@ -1858,51 +1880,6 @@ export type WorkspaceSubdomainAndId = {
   subdomain: Scalars['String']['output'];
 };
 
-export type BillingCustomer = {
-  __typename?: 'billingCustomer';
-  id: Scalars['UUID']['output'];
-};
-
-export type BillingCustomerFilter = {
-  and?: InputMaybe<Array<BillingCustomerFilter>>;
-  id?: InputMaybe<UuidFilterComparison>;
-  or?: InputMaybe<Array<BillingCustomerFilter>>;
-};
-
-export type BillingCustomerSort = {
-  direction: SortDirection;
-  field: BillingCustomerSortFields;
-  nulls?: InputMaybe<SortNulls>;
-};
-
-export enum BillingCustomerSortFields {
-  Id = 'id'
-}
-
-export type BillingEntitlement = {
-  __typename?: 'billingEntitlement';
-  id: Scalars['UUID']['output'];
-  key: Scalars['String']['output'];
-  value: Scalars['Boolean']['output'];
-  workspaceId: Scalars['String']['output'];
-};
-
-export type BillingEntitlementFilter = {
-  and?: InputMaybe<Array<BillingEntitlementFilter>>;
-  id?: InputMaybe<UuidFilterComparison>;
-  or?: InputMaybe<Array<BillingEntitlementFilter>>;
-};
-
-export type BillingEntitlementSort = {
-  direction: SortDirection;
-  field: BillingEntitlementSortFields;
-  nulls?: InputMaybe<SortNulls>;
-};
-
-export enum BillingEntitlementSortFields {
-  Id = 'id'
-}
-
 export type Field = {
   __typename?: 'field';
   createdAt: Scalars['DateTime']['output'];
@@ -2219,21 +2196,21 @@ export type ObjectMetadataItemsQueryVariables = Exact<{
 
 export type ObjectMetadataItemsQuery = { __typename?: 'Query', objects: { __typename?: 'ObjectConnection', edges: Array<{ __typename?: 'objectEdge', node: { __typename?: 'object', id: any, dataSourceId: string, nameSingular: string, namePlural: string, labelSingular: string, labelPlural: string, description?: string | null, icon?: string | null, isCustom: boolean, isRemote: boolean, isActive: boolean, isSystem: boolean, createdAt: any, updatedAt: any, labelIdentifierFieldMetadataId?: string | null, imageIdentifierFieldMetadataId?: string | null, shortcut?: string | null, isLabelSyncedWithName: boolean, indexMetadatas: { __typename?: 'ObjectIndexMetadatasConnection', edges: Array<{ __typename?: 'indexEdge', node: { __typename?: 'index', id: any, createdAt: any, updatedAt: any, name: string, indexWhereClause?: string | null, indexType: IndexType, isUnique: boolean, indexFieldMetadatas: { __typename?: 'IndexIndexFieldMetadatasConnection', edges: Array<{ __typename?: 'indexFieldEdge', node: { __typename?: 'indexField', id: any, createdAt: any, updatedAt: any, order: number, fieldMetadataId: any } }> } } }> }, fields: { __typename?: 'ObjectFieldsConnection', edges: Array<{ __typename?: 'fieldEdge', node: { __typename?: 'field', id: any, type: FieldMetadataType, name: string, label: string, description?: string | null, icon?: string | null, isCustom?: boolean | null, isActive?: boolean | null, isSystem?: boolean | null, isNullable?: boolean | null, isUnique?: boolean | null, createdAt: any, updatedAt: any, defaultValue?: any | null, options?: any | null, settings?: any | null, isLabelSyncedWithName?: boolean | null, relationDefinition?: { __typename?: 'RelationDefinition', relationId: any, direction: RelationDefinitionType, sourceObjectMetadata: { __typename?: 'object', id: any, nameSingular: string, namePlural: string }, sourceFieldMetadata: { __typename?: 'field', id: any, name: string }, targetObjectMetadata: { __typename?: 'object', id: any, nameSingular: string, namePlural: string }, targetFieldMetadata: { __typename?: 'field', id: any, name: string } } | null } }>, pageInfo: { __typename?: 'PageInfo', hasNextPage?: boolean | null, hasPreviousPage?: boolean | null, startCursor?: any | null, endCursor?: any | null } } } }>, pageInfo: { __typename?: 'PageInfo', hasNextPage?: boolean | null, hasPreviousPage?: boolean | null, startCursor?: any | null, endCursor?: any | null } } };
 
-export type ServerlessFunctionFieldsFragment = { __typename?: 'ServerlessFunction', id: any, name: string, description?: string | null, runtime: string, syncStatus: ServerlessFunctionSyncStatus, latestVersion?: string | null, latestVersionInputSchema?: any | null, publishedVersions: Array<string>, createdAt: any, updatedAt: any };
+export type ServerlessFunctionFieldsFragment = { __typename?: 'ServerlessFunction', id: any, name: string, description?: string | null, runtime: string, timeoutSeconds: number, syncStatus: ServerlessFunctionSyncStatus, latestVersion?: string | null, latestVersionInputSchema?: any | null, publishedVersions: Array<string>, createdAt: any, updatedAt: any };
 
 export type CreateOneServerlessFunctionItemMutationVariables = Exact<{
   input: CreateServerlessFunctionInput;
 }>;
 
 
-export type CreateOneServerlessFunctionItemMutation = { __typename?: 'Mutation', createOneServerlessFunction: { __typename?: 'ServerlessFunction', id: any, name: string, description?: string | null, runtime: string, syncStatus: ServerlessFunctionSyncStatus, latestVersion?: string | null, latestVersionInputSchema?: any | null, publishedVersions: Array<string>, createdAt: any, updatedAt: any } };
+export type CreateOneServerlessFunctionItemMutation = { __typename?: 'Mutation', createOneServerlessFunction: { __typename?: 'ServerlessFunction', id: any, name: string, description?: string | null, runtime: string, timeoutSeconds: number, syncStatus: ServerlessFunctionSyncStatus, latestVersion?: string | null, latestVersionInputSchema?: any | null, publishedVersions: Array<string>, createdAt: any, updatedAt: any } };
 
 export type DeleteOneServerlessFunctionMutationVariables = Exact<{
   input: ServerlessFunctionIdInput;
 }>;
 
 
-export type DeleteOneServerlessFunctionMutation = { __typename?: 'Mutation', deleteOneServerlessFunction: { __typename?: 'ServerlessFunction', id: any, name: string, description?: string | null, runtime: string, syncStatus: ServerlessFunctionSyncStatus, latestVersion?: string | null, latestVersionInputSchema?: any | null, publishedVersions: Array<string>, createdAt: any, updatedAt: any } };
+export type DeleteOneServerlessFunctionMutation = { __typename?: 'Mutation', deleteOneServerlessFunction: { __typename?: 'ServerlessFunction', id: any, name: string, description?: string | null, runtime: string, timeoutSeconds: number, syncStatus: ServerlessFunctionSyncStatus, latestVersion?: string | null, latestVersionInputSchema?: any | null, publishedVersions: Array<string>, createdAt: any, updatedAt: any } };
 
 export type ExecuteOneServerlessFunctionMutationVariables = Exact<{
   input: ExecuteServerlessFunctionInput;
@@ -2247,14 +2224,14 @@ export type PublishOneServerlessFunctionMutationVariables = Exact<{
 }>;
 
 
-export type PublishOneServerlessFunctionMutation = { __typename?: 'Mutation', publishServerlessFunction: { __typename?: 'ServerlessFunction', id: any, name: string, description?: string | null, runtime: string, syncStatus: ServerlessFunctionSyncStatus, latestVersion?: string | null, latestVersionInputSchema?: any | null, publishedVersions: Array<string>, createdAt: any, updatedAt: any } };
+export type PublishOneServerlessFunctionMutation = { __typename?: 'Mutation', publishServerlessFunction: { __typename?: 'ServerlessFunction', id: any, name: string, description?: string | null, runtime: string, timeoutSeconds: number, syncStatus: ServerlessFunctionSyncStatus, latestVersion?: string | null, latestVersionInputSchema?: any | null, publishedVersions: Array<string>, createdAt: any, updatedAt: any } };
 
 export type UpdateOneServerlessFunctionMutationVariables = Exact<{
   input: UpdateServerlessFunctionInput;
 }>;
 
 
-export type UpdateOneServerlessFunctionMutation = { __typename?: 'Mutation', updateOneServerlessFunction: { __typename?: 'ServerlessFunction', id: any, name: string, description?: string | null, runtime: string, syncStatus: ServerlessFunctionSyncStatus, latestVersion?: string | null, latestVersionInputSchema?: any | null, publishedVersions: Array<string>, createdAt: any, updatedAt: any } };
+export type UpdateOneServerlessFunctionMutation = { __typename?: 'Mutation', updateOneServerlessFunction: { __typename?: 'ServerlessFunction', id: any, name: string, description?: string | null, runtime: string, timeoutSeconds: number, syncStatus: ServerlessFunctionSyncStatus, latestVersion?: string | null, latestVersionInputSchema?: any | null, publishedVersions: Array<string>, createdAt: any, updatedAt: any } };
 
 export type FindManyAvailablePackagesQueryVariables = Exact<{
   input: ServerlessFunctionIdInput;
@@ -2266,14 +2243,14 @@ export type FindManyAvailablePackagesQuery = { __typename?: 'Query', getAvailabl
 export type GetManyServerlessFunctionsQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetManyServerlessFunctionsQuery = { __typename?: 'Query', findManyServerlessFunctions: Array<{ __typename?: 'ServerlessFunction', id: any, name: string, description?: string | null, runtime: string, syncStatus: ServerlessFunctionSyncStatus, latestVersion?: string | null, latestVersionInputSchema?: any | null, publishedVersions: Array<string>, createdAt: any, updatedAt: any }> };
+export type GetManyServerlessFunctionsQuery = { __typename?: 'Query', findManyServerlessFunctions: Array<{ __typename?: 'ServerlessFunction', id: any, name: string, description?: string | null, runtime: string, timeoutSeconds: number, syncStatus: ServerlessFunctionSyncStatus, latestVersion?: string | null, latestVersionInputSchema?: any | null, publishedVersions: Array<string>, createdAt: any, updatedAt: any }> };
 
 export type GetOneServerlessFunctionQueryVariables = Exact<{
   input: ServerlessFunctionIdInput;
 }>;
 
 
-export type GetOneServerlessFunctionQuery = { __typename?: 'Query', findOneServerlessFunction: { __typename?: 'ServerlessFunction', id: any, name: string, description?: string | null, runtime: string, syncStatus: ServerlessFunctionSyncStatus, latestVersion?: string | null, latestVersionInputSchema?: any | null, publishedVersions: Array<string>, createdAt: any, updatedAt: any } };
+export type GetOneServerlessFunctionQuery = { __typename?: 'Query', findOneServerlessFunction: { __typename?: 'ServerlessFunction', id: any, name: string, description?: string | null, runtime: string, timeoutSeconds: number, syncStatus: ServerlessFunctionSyncStatus, latestVersion?: string | null, latestVersionInputSchema?: any | null, publishedVersions: Array<string>, createdAt: any, updatedAt: any } };
 
 export type FindOneServerlessFunctionSourceCodeQueryVariables = Exact<{
   input: GetServerlessFunctionSourceCodeInput;
@@ -2284,7 +2261,7 @@ export type FindOneServerlessFunctionSourceCodeQuery = { __typename?: 'Query', g
 
 export const RemoteServerFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"RemoteServerFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteServer"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"foreignDataWrapperId"}},{"kind":"Field","name":{"kind":"Name","value":"foreignDataWrapperOptions"}},{"kind":"Field","name":{"kind":"Name","value":"foreignDataWrapperType"}},{"kind":"Field","name":{"kind":"Name","value":"userMappingOptions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user"}}]}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"schema"}},{"kind":"Field","name":{"kind":"Name","value":"label"}}]}}]} as unknown as DocumentNode<RemoteServerFieldsFragment, unknown>;
 export const RemoteTableFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"RemoteTableFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteTable"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"schema"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"schemaPendingUpdates"}}]}}]} as unknown as DocumentNode<RemoteTableFieldsFragment, unknown>;
-export const ServerlessFunctionFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerlessFunctionFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerlessFunction"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"runtime"}},{"kind":"Field","name":{"kind":"Name","value":"syncStatus"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersion"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersionInputSchema"}},{"kind":"Field","name":{"kind":"Name","value":"publishedVersions"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<ServerlessFunctionFieldsFragment, unknown>;
+export const ServerlessFunctionFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerlessFunctionFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerlessFunction"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"runtime"}},{"kind":"Field","name":{"kind":"Name","value":"timeoutSeconds"}},{"kind":"Field","name":{"kind":"Name","value":"syncStatus"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersion"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersionInputSchema"}},{"kind":"Field","name":{"kind":"Name","value":"publishedVersions"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<ServerlessFunctionFieldsFragment, unknown>;
 export const CreateServerDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"createServer"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateRemoteServerInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createOneRemoteServer"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"RemoteServerFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"RemoteServerFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteServer"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"foreignDataWrapperId"}},{"kind":"Field","name":{"kind":"Name","value":"foreignDataWrapperOptions"}},{"kind":"Field","name":{"kind":"Name","value":"foreignDataWrapperType"}},{"kind":"Field","name":{"kind":"Name","value":"userMappingOptions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user"}}]}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"schema"}},{"kind":"Field","name":{"kind":"Name","value":"label"}}]}}]} as unknown as DocumentNode<CreateServerMutation, CreateServerMutationVariables>;
 export const DeleteServerDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"deleteServer"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteServerIdInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteOneRemoteServer"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]} as unknown as DocumentNode<DeleteServerMutation, DeleteServerMutationVariables>;
 export const SyncRemoteTableDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"syncRemoteTable"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteTableInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"syncRemoteTable"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"RemoteTableFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"RemoteTableFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"RemoteTable"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"schema"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"schemaPendingUpdates"}}]}}]} as unknown as DocumentNode<SyncRemoteTableMutation, SyncRemoteTableMutationVariables>;
@@ -2303,12 +2280,12 @@ export const DeleteOneObjectMetadataItemDocument = {"kind":"Document","definitio
 export const DeleteOneFieldMetadataItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteOneFieldMetadataItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"idToDelete"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteOneField"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"idToDelete"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isNullable"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"settings"}}]}}]}}]} as unknown as DocumentNode<DeleteOneFieldMetadataItemMutation, DeleteOneFieldMetadataItemMutationVariables>;
 export const DeleteOneRelationMetadataItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteOneRelationMetadataItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"idToDelete"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteOneRelation"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"idToDelete"}}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]} as unknown as DocumentNode<DeleteOneRelationMetadataItemMutation, DeleteOneRelationMetadataItemMutationVariables>;
 export const ObjectMetadataItemsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ObjectMetadataItems"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"objectFilter"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"objectFilter"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"fieldFilter"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"fieldFilter"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"objects"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"paging"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"1000"}}]}},{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"Variable","name":{"kind":"Name","value":"objectFilter"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"dataSourceId"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}},{"kind":"Field","name":{"kind":"Name","value":"labelSingular"}},{"kind":"Field","name":{"kind":"Name","value":"labelPlural"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isRemote"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isSystem"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"labelIdentifierFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"imageIdentifierFieldMetadataId"}},{"kind":"Field","name":{"kind":"Name","value":"shortcut"}},{"kind":"Field","name":{"kind":"Name","value":"isLabelSyncedWithName"}},{"kind":"Field","name":{"kind":"Name","value":"indexMetadatas"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"paging"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"100"}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"indexWhereClause"}},{"kind":"Field","name":{"kind":"Name","value":"indexType"}},{"kind":"Field","name":{"kind":"Name","value":"isUnique"}},{"kind":"Field","name":{"kind":"Name","value":"indexFieldMetadatas"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"paging"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"100"}}]}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"order"}},{"kind":"Field","name":{"kind":"Name","value":"fieldMetadataId"}}]}}]}}]}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"fields"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"paging"},"value":{"kind":"ObjectValue","fields":[{"kind":"ObjectField","name":{"kind":"Name","value":"first"},"value":{"kind":"IntValue","value":"1000"}}]}},{"kind":"Argument","name":{"kind":"Name","value":"filter"},"value":{"kind":"Variable","name":{"kind":"Name","value":"fieldFilter"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"edges"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"node"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"label"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"Field","name":{"kind":"Name","value":"isCustom"}},{"kind":"Field","name":{"kind":"Name","value":"isActive"}},{"kind":"Field","name":{"kind":"Name","value":"isSystem"}},{"kind":"Field","name":{"kind":"Name","value":"isNullable"}},{"kind":"Field","name":{"kind":"Name","value":"isUnique"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}},{"kind":"Field","name":{"kind":"Name","value":"defaultValue"}},{"kind":"Field","name":{"kind":"Name","value":"options"}},{"kind":"Field","name":{"kind":"Name","value":"settings"}},{"kind":"Field","name":{"kind":"Name","value":"isLabelSyncedWithName"}},{"kind":"Field","name":{"kind":"Name","value":"relationDefinition"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"relationId"}},{"kind":"Field","name":{"kind":"Name","value":"direction"}},{"kind":"Field","name":{"kind":"Name","value":"sourceObjectMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}}]}},{"kind":"Field","name":{"kind":"Name","value":"sourceFieldMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"targetObjectMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"nameSingular"}},{"kind":"Field","name":{"kind":"Name","value":"namePlural"}}]}},{"kind":"Field","name":{"kind":"Name","value":"targetFieldMetadata"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"pageInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"hasNextPage"}},{"kind":"Field","name":{"kind":"Name","value":"hasPreviousPage"}},{"kind":"Field","name":{"kind":"Name","value":"startCursor"}},{"kind":"Field","name":{"kind":"Name","value":"endCursor"}}]}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"pageInfo"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"hasNextPage"}},{"kind":"Field","name":{"kind":"Name","value":"hasPreviousPage"}},{"kind":"Field","name":{"kind":"Name","value":"startCursor"}},{"kind":"Field","name":{"kind":"Name","value":"endCursor"}}]}}]}}]}}]} as unknown as DocumentNode<ObjectMetadataItemsQuery, ObjectMetadataItemsQueryVariables>;
-export const CreateOneServerlessFunctionItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateOneServerlessFunctionItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateServerlessFunctionInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createOneServerlessFunction"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerlessFunctionFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerlessFunctionFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerlessFunction"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"runtime"}},{"kind":"Field","name":{"kind":"Name","value":"syncStatus"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersion"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersionInputSchema"}},{"kind":"Field","name":{"kind":"Name","value":"publishedVersions"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<CreateOneServerlessFunctionItemMutation, CreateOneServerlessFunctionItemMutationVariables>;
-export const DeleteOneServerlessFunctionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteOneServerlessFunction"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ServerlessFunctionIdInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteOneServerlessFunction"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerlessFunctionFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerlessFunctionFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerlessFunction"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"runtime"}},{"kind":"Field","name":{"kind":"Name","value":"syncStatus"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersion"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersionInputSchema"}},{"kind":"Field","name":{"kind":"Name","value":"publishedVersions"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<DeleteOneServerlessFunctionMutation, DeleteOneServerlessFunctionMutationVariables>;
+export const CreateOneServerlessFunctionItemDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateOneServerlessFunctionItem"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateServerlessFunctionInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createOneServerlessFunction"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerlessFunctionFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerlessFunctionFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerlessFunction"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"runtime"}},{"kind":"Field","name":{"kind":"Name","value":"timeoutSeconds"}},{"kind":"Field","name":{"kind":"Name","value":"syncStatus"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersion"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersionInputSchema"}},{"kind":"Field","name":{"kind":"Name","value":"publishedVersions"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<CreateOneServerlessFunctionItemMutation, CreateOneServerlessFunctionItemMutationVariables>;
+export const DeleteOneServerlessFunctionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteOneServerlessFunction"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ServerlessFunctionIdInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteOneServerlessFunction"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerlessFunctionFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerlessFunctionFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerlessFunction"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"runtime"}},{"kind":"Field","name":{"kind":"Name","value":"timeoutSeconds"}},{"kind":"Field","name":{"kind":"Name","value":"syncStatus"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersion"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersionInputSchema"}},{"kind":"Field","name":{"kind":"Name","value":"publishedVersions"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<DeleteOneServerlessFunctionMutation, DeleteOneServerlessFunctionMutationVariables>;
 export const ExecuteOneServerlessFunctionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"ExecuteOneServerlessFunction"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ExecuteServerlessFunctionInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"executeOneServerlessFunction"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"data"}},{"kind":"Field","name":{"kind":"Name","value":"duration"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"error"}}]}}]}}]} as unknown as DocumentNode<ExecuteOneServerlessFunctionMutation, ExecuteOneServerlessFunctionMutationVariables>;
-export const PublishOneServerlessFunctionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"PublishOneServerlessFunction"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"PublishServerlessFunctionInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"publishServerlessFunction"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerlessFunctionFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerlessFunctionFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerlessFunction"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"runtime"}},{"kind":"Field","name":{"kind":"Name","value":"syncStatus"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersion"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersionInputSchema"}},{"kind":"Field","name":{"kind":"Name","value":"publishedVersions"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<PublishOneServerlessFunctionMutation, PublishOneServerlessFunctionMutationVariables>;
-export const UpdateOneServerlessFunctionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateOneServerlessFunction"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateServerlessFunctionInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateOneServerlessFunction"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerlessFunctionFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerlessFunctionFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerlessFunction"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"runtime"}},{"kind":"Field","name":{"kind":"Name","value":"syncStatus"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersion"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersionInputSchema"}},{"kind":"Field","name":{"kind":"Name","value":"publishedVersions"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<UpdateOneServerlessFunctionMutation, UpdateOneServerlessFunctionMutationVariables>;
+export const PublishOneServerlessFunctionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"PublishOneServerlessFunction"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"PublishServerlessFunctionInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"publishServerlessFunction"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerlessFunctionFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerlessFunctionFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerlessFunction"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"runtime"}},{"kind":"Field","name":{"kind":"Name","value":"timeoutSeconds"}},{"kind":"Field","name":{"kind":"Name","value":"syncStatus"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersion"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersionInputSchema"}},{"kind":"Field","name":{"kind":"Name","value":"publishedVersions"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<PublishOneServerlessFunctionMutation, PublishOneServerlessFunctionMutationVariables>;
+export const UpdateOneServerlessFunctionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateOneServerlessFunction"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateServerlessFunctionInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateOneServerlessFunction"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerlessFunctionFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerlessFunctionFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerlessFunction"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"runtime"}},{"kind":"Field","name":{"kind":"Name","value":"timeoutSeconds"}},{"kind":"Field","name":{"kind":"Name","value":"syncStatus"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersion"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersionInputSchema"}},{"kind":"Field","name":{"kind":"Name","value":"publishedVersions"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<UpdateOneServerlessFunctionMutation, UpdateOneServerlessFunctionMutationVariables>;
 export const FindManyAvailablePackagesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindManyAvailablePackages"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ServerlessFunctionIdInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getAvailablePackages"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}]}]}}]} as unknown as DocumentNode<FindManyAvailablePackagesQuery, FindManyAvailablePackagesQueryVariables>;
-export const GetManyServerlessFunctionsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetManyServerlessFunctions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"findManyServerlessFunctions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerlessFunctionFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerlessFunctionFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerlessFunction"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"runtime"}},{"kind":"Field","name":{"kind":"Name","value":"syncStatus"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersion"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersionInputSchema"}},{"kind":"Field","name":{"kind":"Name","value":"publishedVersions"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<GetManyServerlessFunctionsQuery, GetManyServerlessFunctionsQueryVariables>;
-export const GetOneServerlessFunctionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetOneServerlessFunction"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ServerlessFunctionIdInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"findOneServerlessFunction"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerlessFunctionFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerlessFunctionFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerlessFunction"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"runtime"}},{"kind":"Field","name":{"kind":"Name","value":"syncStatus"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersion"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersionInputSchema"}},{"kind":"Field","name":{"kind":"Name","value":"publishedVersions"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<GetOneServerlessFunctionQuery, GetOneServerlessFunctionQueryVariables>;
+export const GetManyServerlessFunctionsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetManyServerlessFunctions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"findManyServerlessFunctions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerlessFunctionFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerlessFunctionFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerlessFunction"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"runtime"}},{"kind":"Field","name":{"kind":"Name","value":"timeoutSeconds"}},{"kind":"Field","name":{"kind":"Name","value":"syncStatus"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersion"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersionInputSchema"}},{"kind":"Field","name":{"kind":"Name","value":"publishedVersions"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<GetManyServerlessFunctionsQuery, GetManyServerlessFunctionsQueryVariables>;
+export const GetOneServerlessFunctionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetOneServerlessFunction"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ServerlessFunctionIdInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"findOneServerlessFunction"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ServerlessFunctionFields"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ServerlessFunctionFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ServerlessFunction"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"runtime"}},{"kind":"Field","name":{"kind":"Name","value":"timeoutSeconds"}},{"kind":"Field","name":{"kind":"Name","value":"syncStatus"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersion"}},{"kind":"Field","name":{"kind":"Name","value":"latestVersionInputSchema"}},{"kind":"Field","name":{"kind":"Name","value":"publishedVersions"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<GetOneServerlessFunctionQuery, GetOneServerlessFunctionQueryVariables>;
 export const FindOneServerlessFunctionSourceCodeDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindOneServerlessFunctionSourceCode"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"GetServerlessFunctionSourceCodeInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getServerlessFunctionSourceCode"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}]}]}}]} as unknown as DocumentNode<FindOneServerlessFunctionSourceCodeQuery, FindOneServerlessFunctionSourceCodeQueryVariables>;
\ No newline at end of file
diff --git a/packages/twenty-front/src/generated/graphql.tsx b/packages/twenty-front/src/generated/graphql.tsx
index 1bd6c5271464..61ef992049f7 100644
--- a/packages/twenty-front/src/generated/graphql.tsx
+++ b/packages/twenty-front/src/generated/graphql.tsx
@@ -110,17 +110,83 @@ export type AvailableWorkspaceOutput = {
 
 export type Billing = {
   __typename?: 'Billing';
-  billingFreeTrialDurationInDays?: Maybe<Scalars['Float']>;
   billingUrl?: Maybe<Scalars['String']>;
   isBillingEnabled: Scalars['Boolean'];
+  trialPeriods: Array<BillingTrialPeriodDto>;
 };
 
 /** The different billing plans available */
 export enum BillingPlanKey {
-  Enterprise = 'ENTERPRISE',
-  Pro = 'PRO'
+  ENTERPRISE = 'ENTERPRISE',
+  PRO = 'PRO'
 }
 
+export type BillingPlanOutput = {
+  __typename?: 'BillingPlanOutput';
+  baseProduct: BillingProductDto;
+  meteredProducts: Array<BillingProductDto>;
+  otherLicensedProducts: Array<BillingProductDto>;
+  planKey: BillingPlanKey;
+};
+
+export type BillingPriceLicensedDto = {
+  __typename?: 'BillingPriceLicensedDTO';
+  recurringInterval: SubscriptionInterval;
+  stripePriceId: Scalars['String'];
+  unitAmount: Scalars['Float'];
+};
+
+export type BillingPriceMeteredDto = {
+  __typename?: 'BillingPriceMeteredDTO';
+  recurringInterval: SubscriptionInterval;
+  stripePriceId: Scalars['String'];
+  tiers?: Maybe<Array<BillingPriceTierDto>>;
+  tiersMode?: Maybe<BillingPriceTiersMode>;
+};
+
+export type BillingPriceTierDto = {
+  __typename?: 'BillingPriceTierDTO';
+  flatAmount?: Maybe<Scalars['Float']>;
+  unitAmount?: Maybe<Scalars['Float']>;
+  upTo?: Maybe<Scalars['Float']>;
+};
+
+/** The different billing price tiers modes */
+export enum BillingPriceTiersMode {
+  GRADUATED = 'GRADUATED',
+  VOLUME = 'VOLUME'
+}
+
+export type BillingPriceUnionDto = BillingPriceLicensedDto | BillingPriceMeteredDto;
+
+export type BillingProductDto = {
+  __typename?: 'BillingProductDTO';
+  description: Scalars['String'];
+  images?: Maybe<Array<Scalars['String']>>;
+  name: Scalars['String'];
+  prices: Array<Maybe<BillingPriceUnionDto>>;
+  type: BillingUsageType;
+};
+
+export type BillingProductPriceDto = {
+  __typename?: 'BillingProductPriceDTO';
+  created: Scalars['Float'];
+  recurringInterval: SubscriptionInterval;
+  stripePriceId: Scalars['String'];
+  unitAmount: Scalars['Float'];
+};
+
+export type BillingProductPricesOutput = {
+  __typename?: 'BillingProductPricesOutput';
+  productPrices: Array<BillingProductPriceDto>;
+  totalNumberOfPrices: Scalars['Int'];
+};
+
+export type BillingSessionOutput = {
+  __typename?: 'BillingSessionOutput';
+  url?: Maybe<Scalars['String']>;
+};
+
 export type BillingSubscription = {
   __typename?: 'BillingSubscription';
   id: Scalars['UUID'];
@@ -128,20 +194,21 @@ export type BillingSubscription = {
   status: SubscriptionStatus;
 };
 
-export type BillingSubscriptionFilter = {
-  and?: InputMaybe<Array<BillingSubscriptionFilter>>;
-  id?: InputMaybe<UuidFilterComparison>;
-  or?: InputMaybe<Array<BillingSubscriptionFilter>>;
+export type BillingTrialPeriodDto = {
+  __typename?: 'BillingTrialPeriodDTO';
+  duration: Scalars['Float'];
+  isCreditCardRequired: Scalars['Boolean'];
 };
 
-export type BillingSubscriptionSort = {
-  direction: SortDirection;
-  field: BillingSubscriptionSortFields;
-  nulls?: InputMaybe<SortNulls>;
+export type BillingUpdateOutput = {
+  __typename?: 'BillingUpdateOutput';
+  /** Boolean that confirms query was successful */
+  success: Scalars['Boolean'];
 };
 
-export enum BillingSubscriptionSortFields {
-  Id = 'id'
+export enum BillingUsageType {
+  LICENSED = 'LICENSED',
+  METERED = 'METERED'
 }
 
 export type BooleanFieldComparison = {
@@ -150,8 +217,8 @@ export type BooleanFieldComparison = {
 };
 
 export enum CalendarChannelVisibility {
-  Metadata = 'METADATA',
-  ShareEverything = 'SHARE_EVERYTHING'
+  METADATA = 'METADATA',
+  SHARE_EVERYTHING = 'SHARE_EVERYTHING'
 }
 
 export type Captcha = {
@@ -171,13 +238,15 @@ export type ClientConfig = {
   api: ApiConfig;
   authProviders: AuthProviders;
   billing: Billing;
+  canManageFeatureFlags: Scalars['Boolean'];
   captcha: Captcha;
   chromeExtensionId?: Maybe<Scalars['String']>;
   debugMode: Scalars['Boolean'];
   defaultSubdomain?: Maybe<Scalars['String']>;
   frontDomain: Scalars['String'];
+  isEmailVerificationRequired: Scalars['Boolean'];
   isMultiWorkspaceEnabled: Scalars['Boolean'];
-  isSSOEnabled: Scalars['Boolean'];
+  publicFeatureFlags: Array<PublicFeatureFlag>;
   sentry: Sentry;
   signInPrefilled: Scalars['Boolean'];
   support: Support;
@@ -222,6 +291,7 @@ export type CreateOneFieldMetadataInput = {
 export type CreateServerlessFunctionInput = {
   description?: InputMaybe<Scalars['String']>;
   name: Scalars['String'];
+  timeoutSeconds?: InputMaybe<Scalars['Float']>;
 };
 
 export type CreateWorkflowVersionStepInput = {
@@ -270,10 +340,10 @@ export type DeleteWorkflowVersionStepInput = {
 
 /** Schema update on a table */
 export enum DistantTableUpdate {
-  ColumnsAdded = 'COLUMNS_ADDED',
-  ColumnsDeleted = 'COLUMNS_DELETED',
-  ColumnsTypeChanged = 'COLUMNS_TYPE_CHANGED',
-  TableDeleted = 'TABLE_DELETED'
+  COLUMNS_ADDED = 'COLUMNS_ADDED',
+  COLUMNS_DELETED = 'COLUMNS_DELETED',
+  COLUMNS_TYPE_CHANGED = 'COLUMNS_TYPE_CHANGED',
+  TABLE_DELETED = 'TABLE_DELETED'
 }
 
 export type EditSsoInput = {
@@ -313,44 +383,24 @@ export type FeatureFlag = {
   workspaceId: Scalars['String'];
 };
 
-export type FeatureFlagFilter = {
-  and?: InputMaybe<Array<FeatureFlagFilter>>;
-  id?: InputMaybe<UuidFilterComparison>;
-  or?: InputMaybe<Array<FeatureFlagFilter>>;
-};
-
 export enum FeatureFlagKey {
   IsAdvancedFiltersEnabled = 'IsAdvancedFiltersEnabled',
-  IsAggregateQueryEnabled = 'IsAggregateQueryEnabled',
   IsAirtableIntegrationEnabled = 'IsAirtableIntegrationEnabled',
   IsAnalyticsV2Enabled = 'IsAnalyticsV2Enabled',
+  IsBillingPlansEnabled = 'IsBillingPlansEnabled',
+  IsCommandMenuV2Enabled = 'IsCommandMenuV2Enabled',
   IsCopilotEnabled = 'IsCopilotEnabled',
-  IsCrmMigrationEnabled = 'IsCrmMigrationEnabled',
   IsEventObjectEnabled = 'IsEventObjectEnabled',
   IsFreeAccessEnabled = 'IsFreeAccessEnabled',
-  IsFunctionSettingsEnabled = 'IsFunctionSettingsEnabled',
-  IsGmailSendEmailScopeEnabled = 'IsGmailSendEmailScopeEnabled',
   IsJsonFilterEnabled = 'IsJsonFilterEnabled',
+  IsLocalizationEnabled = 'IsLocalizationEnabled',
   IsMicrosoftSyncEnabled = 'IsMicrosoftSyncEnabled',
-  IsPageHeaderV2Enabled = 'IsPageHeaderV2Enabled',
-  IsPostgreSqlIntegrationEnabled = 'IsPostgreSQLIntegrationEnabled',
-  IsSsoEnabled = 'IsSSOEnabled',
+  IsPostgreSQLIntegrationEnabled = 'IsPostgreSQLIntegrationEnabled',
   IsStripeIntegrationEnabled = 'IsStripeIntegrationEnabled',
   IsUniqueIndexesEnabled = 'IsUniqueIndexesEnabled',
-  IsViewGroupsEnabled = 'IsViewGroupsEnabled',
   IsWorkflowEnabled = 'IsWorkflowEnabled'
 }
 
-export type FeatureFlagSort = {
-  direction: SortDirection;
-  field: FeatureFlagSortFields;
-  nulls?: InputMaybe<SortNulls>;
-};
-
-export enum FeatureFlagSortFields {
-  Id = 'id'
-}
-
 export type FieldConnection = {
   __typename?: 'FieldConnection';
   /** Array of edges. */
@@ -361,29 +411,29 @@ export type FieldConnection = {
 
 /** Type of the field */
 export enum FieldMetadataType {
-  Actor = 'ACTOR',
-  Address = 'ADDRESS',
-  Array = 'ARRAY',
-  Boolean = 'BOOLEAN',
-  Currency = 'CURRENCY',
-  Date = 'DATE',
-  DateTime = 'DATE_TIME',
-  Emails = 'EMAILS',
-  FullName = 'FULL_NAME',
-  Links = 'LINKS',
-  MultiSelect = 'MULTI_SELECT',
-  Number = 'NUMBER',
-  Numeric = 'NUMERIC',
-  Phones = 'PHONES',
-  Position = 'POSITION',
-  Rating = 'RATING',
-  RawJson = 'RAW_JSON',
-  Relation = 'RELATION',
-  RichText = 'RICH_TEXT',
-  Select = 'SELECT',
-  Text = 'TEXT',
-  TsVector = 'TS_VECTOR',
-  Uuid = 'UUID'
+  ACTOR = 'ACTOR',
+  ADDRESS = 'ADDRESS',
+  ARRAY = 'ARRAY',
+  BOOLEAN = 'BOOLEAN',
+  CURRENCY = 'CURRENCY',
+  DATE = 'DATE',
+  DATE_TIME = 'DATE_TIME',
+  EMAILS = 'EMAILS',
+  FULL_NAME = 'FULL_NAME',
+  LINKS = 'LINKS',
+  MULTI_SELECT = 'MULTI_SELECT',
+  NUMBER = 'NUMBER',
+  NUMERIC = 'NUMERIC',
+  PHONES = 'PHONES',
+  POSITION = 'POSITION',
+  RATING = 'RATING',
+  RAW_JSON = 'RAW_JSON',
+  RELATION = 'RELATION',
+  RICH_TEXT = 'RICH_TEXT',
+  SELECT = 'SELECT',
+  TEXT = 'TEXT',
+  TS_VECTOR = 'TS_VECTOR',
+  UUID = 'UUID'
 }
 
 export enum FileFolder {
@@ -429,8 +479,8 @@ export type GetServerlessFunctionSourceCodeInput = {
 };
 
 export enum IdentityProviderType {
-  Oidc = 'OIDC',
-  Saml = 'SAML'
+  OIDC = 'OIDC',
+  SAML = 'SAML'
 }
 
 export type ImpersonateOutput = {
@@ -465,8 +515,8 @@ export type IndexObjectMetadataConnection = {
 
 /** Type of the index */
 export enum IndexType {
-  Btree = 'BTREE',
-  Gin = 'GIN'
+  BTREE = 'BTREE',
+  GIN = 'GIN'
 }
 
 export type InvalidatePassword = {
@@ -494,22 +544,20 @@ export type LoginToken = {
 };
 
 export enum MessageChannelVisibility {
-  Metadata = 'METADATA',
-  ShareEverything = 'SHARE_EVERYTHING',
-  Subject = 'SUBJECT'
+  METADATA = 'METADATA',
+  SHARE_EVERYTHING = 'SHARE_EVERYTHING',
+  SUBJECT = 'SUBJECT'
 }
 
 export type Mutation = {
   __typename?: 'Mutation';
   activateWorkflowVersion: Scalars['Boolean'];
   activateWorkspace: Workspace;
-  addUserToWorkspace: User;
-  addUserToWorkspaceByInviteToken: User;
   authorizeApp: AuthorizeApp;
   challenge: LoginToken;
-  checkoutSession: SessionEntity;
+  checkoutSession: BillingSessionOutput;
   computeStepOutputSchema: Scalars['JSON'];
-  createDraftFromWorkflowVersion: Scalars['Boolean'];
+  createDraftFromWorkflowVersion: WorkflowVersion;
   createOIDCIdentityProvider: SetupSsoOutput;
   createOneAppToken: AppToken;
   createOneField: Field;
@@ -534,17 +582,19 @@ export type Mutation = {
   generateApiKeyToken: ApiKeyToken;
   generateTransientToken: TransientToken;
   getAuthorizationUrl: GetAuthorizationUrlOutput;
+  getLoginTokenFromEmailVerificationToken: LoginToken;
   impersonate: ImpersonateOutput;
   publishServerlessFunction: ServerlessFunction;
   renewToken: AuthTokens;
+  resendEmailVerificationToken: ResendEmailVerificationTokenOutput;
   resendWorkspaceInvitation: SendInvitationsOutput;
   runWorkflowVersion: WorkflowRun;
   sendInvitations: SendInvitationsOutput;
   signUp: SignUpOutput;
   skipSyncEmailOnboardingStep: OnboardingStepSuccess;
-  switchWorkspace: PublicWorkspaceDataOutput;
   track: Analytics;
-  updateBillingSubscription: UpdateBillingEntity;
+  updateBillingSubscription: BillingUpdateOutput;
+  updateLabPublicFeatureFlag: Scalars['Boolean'];
   updateOneField: Field;
   updateOneObject: Object;
   updateOneServerlessFunction: ServerlessFunction;
@@ -571,16 +621,6 @@ export type MutationActivateWorkspaceArgs = {
 };
 
 
-export type MutationAddUserToWorkspaceArgs = {
-  inviteHash: Scalars['String'];
-};
-
-
-export type MutationAddUserToWorkspaceByInviteTokenArgs = {
-  inviteToken: Scalars['String'];
-};
-
-
 export type MutationAuthorizeAppArgs = {
   clientId: Scalars['String'];
   codeChallenge?: InputMaybe<Scalars['String']>;
@@ -699,6 +739,12 @@ export type MutationGetAuthorizationUrlArgs = {
 };
 
 
+export type MutationGetLoginTokenFromEmailVerificationTokenArgs = {
+  captchaToken?: InputMaybe<Scalars['String']>;
+  emailVerificationToken: Scalars['String'];
+};
+
+
 export type MutationImpersonateArgs = {
   userId: Scalars['String'];
   workspaceId: Scalars['String'];
@@ -715,6 +761,11 @@ export type MutationRenewTokenArgs = {
 };
 
 
+export type MutationResendEmailVerificationTokenArgs = {
+  email: Scalars['String'];
+};
+
+
 export type MutationResendWorkspaceInvitationArgs = {
   appTokenId: Scalars['String'];
 };
@@ -734,22 +785,23 @@ export type MutationSignUpArgs = {
   captchaToken?: InputMaybe<Scalars['String']>;
   email: Scalars['String'];
   password: Scalars['String'];
+  workspaceId?: InputMaybe<Scalars['String']>;
   workspaceInviteHash?: InputMaybe<Scalars['String']>;
   workspacePersonalInviteToken?: InputMaybe<Scalars['String']>;
 };
 
 
-export type MutationSwitchWorkspaceArgs = {
-  workspaceId: Scalars['String'];
-};
-
-
 export type MutationTrackArgs = {
   action: Scalars['String'];
   payload: Scalars['JSON'];
 };
 
 
+export type MutationUpdateLabPublicFeatureFlagArgs = {
+  input: UpdateLabPublicFeatureFlagInput;
+};
+
+
 export type MutationUpdateOneFieldArgs = {
   input: UpdateOneFieldMetadataInput;
 };
@@ -845,12 +897,12 @@ export type ObjectIndexMetadatasConnection = {
 
 /** Onboarding status */
 export enum OnboardingStatus {
-  Completed = 'COMPLETED',
-  InviteTeam = 'INVITE_TEAM',
-  PlanRequired = 'PLAN_REQUIRED',
-  ProfileCreation = 'PROFILE_CREATION',
-  SyncEmail = 'SYNC_EMAIL',
-  WorkspaceActivation = 'WORKSPACE_ACTIVATION'
+  COMPLETED = 'COMPLETED',
+  INVITE_TEAM = 'INVITE_TEAM',
+  PLAN_REQUIRED = 'PLAN_REQUIRED',
+  PROFILE_CREATION = 'PROFILE_CREATION',
+  SYNC_EMAIL = 'SYNC_EMAIL',
+  WORKSPACE_ACTIVATION = 'WORKSPACE_ACTIVATION'
 }
 
 export type OnboardingStepSuccess = {
@@ -879,18 +931,17 @@ export type PostgresCredentials = {
   workspaceId: Scalars['String'];
 };
 
-export type ProductPriceEntity = {
-  __typename?: 'ProductPriceEntity';
-  created: Scalars['Float'];
-  recurringInterval: SubscriptionInterval;
-  stripePriceId: Scalars['String'];
-  unitAmount: Scalars['Float'];
+export type PublicFeatureFlag = {
+  __typename?: 'PublicFeatureFlag';
+  key: FeatureFlagKey;
+  metadata: PublicFeatureFlagMetadata;
 };
 
-export type ProductPricesEntity = {
-  __typename?: 'ProductPricesEntity';
-  productPrices: Array<ProductPriceEntity>;
-  totalNumberOfPrices: Scalars['Int'];
+export type PublicFeatureFlagMetadata = {
+  __typename?: 'PublicFeatureFlagMetadata';
+  description: Scalars['String'];
+  imagePath: Scalars['String'];
+  label: Scalars['String'];
 };
 
 export type PublicWorkspaceDataOutput = {
@@ -909,7 +960,7 @@ export type PublishServerlessFunctionInput = {
 
 export type Query = {
   __typename?: 'Query';
-  billingPortalSession: SessionEntity;
+  billingPortalSession: BillingSessionOutput;
   checkUserExists: UserExistsOutput;
   checkWorkspaceInviteHashIsValid: WorkspaceInviteHashValid;
   clientConfig: ClientConfig;
@@ -924,7 +975,7 @@ export type Query = {
   findWorkspaceInvitations: Array<WorkspaceInvitation>;
   getAvailablePackages: Scalars['JSON'];
   getPostgresCredentials?: Maybe<PostgresCredentials>;
-  getProductPrices: ProductPricesEntity;
+  getProductPrices: BillingProductPricesOutput;
   getPublicWorkspaceDataBySubdomain: PublicWorkspaceDataOutput;
   getServerlessFunctionSourceCode?: Maybe<Scalars['JSON']>;
   getTimelineCalendarEventsFromCompanyId: TimelineCalendarEventsWithTotal;
@@ -936,6 +987,7 @@ export type Query = {
   listSSOIdentityProvidersByWorkspaceId: Array<FindAvailableSsoidpOutput>;
   object: Object;
   objects: ObjectConnection;
+  plans: Array<BillingPlanOutput>;
   validatePasswordResetToken: ValidatePasswordResetToken;
 };
 
@@ -1038,18 +1090,18 @@ export type RelationDefinition = {
 
 /** Relation definition type */
 export enum RelationDefinitionType {
-  ManyToMany = 'MANY_TO_MANY',
-  ManyToOne = 'MANY_TO_ONE',
-  OneToMany = 'ONE_TO_MANY',
-  OneToOne = 'ONE_TO_ONE'
+  MANY_TO_MANY = 'MANY_TO_MANY',
+  MANY_TO_ONE = 'MANY_TO_ONE',
+  ONE_TO_MANY = 'ONE_TO_MANY',
+  ONE_TO_ONE = 'ONE_TO_ONE'
 }
 
 /** Type of the relation */
 export enum RelationMetadataType {
-  ManyToMany = 'MANY_TO_MANY',
-  ManyToOne = 'MANY_TO_ONE',
-  OneToMany = 'ONE_TO_MANY',
-  OneToOne = 'ONE_TO_ONE'
+  MANY_TO_MANY = 'MANY_TO_MANY',
+  MANY_TO_ONE = 'MANY_TO_ONE',
+  ONE_TO_MANY = 'ONE_TO_MANY',
+  ONE_TO_ONE = 'ONE_TO_ONE'
 }
 
 export type RemoteServer = {
@@ -1076,10 +1128,15 @@ export type RemoteTable = {
 
 /** Status of the table */
 export enum RemoteTableStatus {
-  NotSynced = 'NOT_SYNCED',
-  Synced = 'SYNCED'
+  NOT_SYNCED = 'NOT_SYNCED',
+  SYNCED = 'SYNCED'
 }
 
+export type ResendEmailVerificationTokenOutput = {
+  __typename?: 'ResendEmailVerificationTokenOutput';
+  success: Scalars['Boolean'];
+};
+
 export type RunWorkflowVersionInput = {
   /** Execution result in JSON format */
   payload?: InputMaybe<Scalars['JSON']>;
@@ -1137,6 +1194,7 @@ export type ServerlessFunction = {
   publishedVersions: Array<Scalars['String']>;
   runtime: Scalars['String'];
   syncStatus: ServerlessFunctionSyncStatus;
+  timeoutSeconds: Scalars['Float'];
   updatedAt: Scalars['DateTime'];
 };
 
@@ -1154,8 +1212,8 @@ export type ServerlessFunctionExecutionResult = {
 
 /** Status of the serverless function execution */
 export enum ServerlessFunctionExecutionStatus {
-  Error = 'ERROR',
-  Success = 'SUCCESS'
+  ERROR = 'ERROR',
+  SUCCESS = 'SUCCESS'
 }
 
 export type ServerlessFunctionIdInput = {
@@ -1165,15 +1223,10 @@ export type ServerlessFunctionIdInput = {
 
 /** SyncStatus of the serverlessFunction */
 export enum ServerlessFunctionSyncStatus {
-  NotReady = 'NOT_READY',
-  Ready = 'READY'
+  NOT_READY = 'NOT_READY',
+  READY = 'READY'
 }
 
-export type SessionEntity = {
-  __typename?: 'SessionEntity';
-  url?: Maybe<Scalars['String']>;
-};
-
 export type SetupOidcSsoInput = {
   clientID: Scalars['String'];
   clientSecret: Scalars['String'];
@@ -1205,18 +1258,6 @@ export type SignUpOutput = {
   workspace: WorkspaceSubdomainAndId;
 };
 
-/** Sort Directions */
-export enum SortDirection {
-  Asc = 'ASC',
-  Desc = 'DESC'
-}
-
-/** Sort Nulls Options */
-export enum SortNulls {
-  NullsFirst = 'NULLS_FIRST',
-  NullsLast = 'NULLS_LAST'
-}
-
 export enum SubscriptionInterval {
   Day = 'Day',
   Month = 'Month',
@@ -1327,12 +1368,6 @@ export type UuidFilterComparison = {
   notLike?: InputMaybe<Scalars['UUID']>;
 };
 
-export type UpdateBillingEntity = {
-  __typename?: 'UpdateBillingEntity';
-  /** Boolean that confirms query was successful */
-  success: Scalars['Boolean'];
-};
-
 export type UpdateFieldInput = {
   defaultValue?: InputMaybe<Scalars['JSON']>;
   description?: InputMaybe<Scalars['String']>;
@@ -1349,6 +1384,11 @@ export type UpdateFieldInput = {
   settings?: InputMaybe<Scalars['JSON']>;
 };
 
+export type UpdateLabPublicFeatureFlagInput = {
+  publicFeatureFlag: Scalars['String'];
+  value: Scalars['Boolean'];
+};
+
 export type UpdateObjectPayload = {
   description?: InputMaybe<Scalars['String']>;
   icon?: InputMaybe<Scalars['String']>;
@@ -1382,6 +1422,7 @@ export type UpdateServerlessFunctionInput = {
   /** Id of the serverless function to execute */
   id: Scalars['UUID'];
   name: Scalars['String'];
+  timeoutSeconds?: InputMaybe<Scalars['Float']>;
 };
 
 export type UpdateWorkflowVersionStepInput = {
@@ -1414,9 +1455,9 @@ export type User = {
   deletedAt?: Maybe<Scalars['DateTime']>;
   disabled?: Maybe<Scalars['Boolean']>;
   email: Scalars['String'];
-  emailVerified: Scalars['Boolean'];
   firstName: Scalars['String'];
   id: Scalars['UUID'];
+  isEmailVerified: Scalars['Boolean'];
   lastName: Scalars['String'];
   onboardingStatus?: Maybe<OnboardingStatus>;
   passwordHash?: Maybe<Scalars['String']>;
@@ -1440,6 +1481,7 @@ export type UserExists = {
   __typename?: 'UserExists';
   availableWorkspaces: Array<AvailableWorkspaceOutput>;
   exists: Scalars['Boolean'];
+  isEmailVerified: Scalars['Boolean'];
 };
 
 export type UserExistsOutput = UserExists | UserNotExists;
@@ -1500,13 +1542,16 @@ export type WorkflowRun = {
   workflowRunId: Scalars['UUID'];
 };
 
+export type WorkflowVersion = {
+  __typename?: 'WorkflowVersion';
+  id: Scalars['UUID'];
+};
+
 export type Workspace = {
   __typename?: 'Workspace';
   activationStatus: WorkspaceActivationStatus;
   allowImpersonation: Scalars['Boolean'];
-  billingCustomers?: Maybe<Array<BillingCustomer>>;
-  billingEntitlements?: Maybe<Array<BillingEntitlement>>;
-  billingSubscriptions?: Maybe<Array<BillingSubscription>>;
+  billingSubscriptions: Array<BillingSubscription>;
   createdAt: Scalars['DateTime'];
   currentBillingSubscription?: Maybe<BillingSubscription>;
   databaseSchema: Scalars['String'];
@@ -1529,35 +1574,12 @@ export type Workspace = {
   workspaceMembersCount?: Maybe<Scalars['Float']>;
 };
 
-
-export type WorkspaceBillingCustomersArgs = {
-  filter?: BillingCustomerFilter;
-  sorting?: Array<BillingCustomerSort>;
-};
-
-
-export type WorkspaceBillingEntitlementsArgs = {
-  filter?: BillingEntitlementFilter;
-  sorting?: Array<BillingEntitlementSort>;
-};
-
-
-export type WorkspaceBillingSubscriptionsArgs = {
-  filter?: BillingSubscriptionFilter;
-  sorting?: Array<BillingSubscriptionSort>;
-};
-
-
-export type WorkspaceFeatureFlagsArgs = {
-  filter?: FeatureFlagFilter;
-  sorting?: Array<FeatureFlagSort>;
-};
-
 export enum WorkspaceActivationStatus {
-  Active = 'ACTIVE',
-  Inactive = 'INACTIVE',
-  OngoingCreation = 'ONGOING_CREATION',
-  PendingCreation = 'PENDING_CREATION'
+  ACTIVE = 'ACTIVE',
+  INACTIVE = 'INACTIVE',
+  ONGOING_CREATION = 'ONGOING_CREATION',
+  PENDING_CREATION = 'PENDING_CREATION',
+  SUSPENDED = 'SUSPENDED'
 }
 
 export type WorkspaceEdge = {
@@ -1605,17 +1627,17 @@ export type WorkspaceMember = {
 
 /** Date format as Month first, Day first, Year first or system as default */
 export enum WorkspaceMemberDateFormatEnum {
-  DayFirst = 'DAY_FIRST',
-  MonthFirst = 'MONTH_FIRST',
-  System = 'SYSTEM',
-  YearFirst = 'YEAR_FIRST'
+  DAY_FIRST = 'DAY_FIRST',
+  MONTH_FIRST = 'MONTH_FIRST',
+  SYSTEM = 'SYSTEM',
+  YEAR_FIRST = 'YEAR_FIRST'
 }
 
 /** Time time as Military, Standard or system as default */
 export enum WorkspaceMemberTimeFormatEnum {
-  Hour_12 = 'HOUR_12',
-  Hour_24 = 'HOUR_24',
-  System = 'SYSTEM'
+  HOUR_12 = 'HOUR_12',
+  HOUR_24 = 'HOUR_24',
+  SYSTEM = 'SYSTEM'
 }
 
 export type WorkspaceNameAndId = {
@@ -1630,51 +1652,6 @@ export type WorkspaceSubdomainAndId = {
   subdomain: Scalars['String'];
 };
 
-export type BillingCustomer = {
-  __typename?: 'billingCustomer';
-  id: Scalars['UUID'];
-};
-
-export type BillingCustomerFilter = {
-  and?: InputMaybe<Array<BillingCustomerFilter>>;
-  id?: InputMaybe<UuidFilterComparison>;
-  or?: InputMaybe<Array<BillingCustomerFilter>>;
-};
-
-export type BillingCustomerSort = {
-  direction: SortDirection;
-  field: BillingCustomerSortFields;
-  nulls?: InputMaybe<SortNulls>;
-};
-
-export enum BillingCustomerSortFields {
-  Id = 'id'
-}
-
-export type BillingEntitlement = {
-  __typename?: 'billingEntitlement';
-  id: Scalars['UUID'];
-  key: Scalars['String'];
-  value: Scalars['Boolean'];
-  workspaceId: Scalars['String'];
-};
-
-export type BillingEntitlementFilter = {
-  and?: InputMaybe<Array<BillingEntitlementFilter>>;
-  id?: InputMaybe<UuidFilterComparison>;
-  or?: InputMaybe<Array<BillingEntitlementFilter>>;
-};
-
-export type BillingEntitlementSort = {
-  direction: SortDirection;
-  field: BillingEntitlementSortFields;
-  nulls?: InputMaybe<SortNulls>;
-};
-
-export enum BillingEntitlementSortFields {
-  Id = 'id'
-}
-
 export type Field = {
   __typename?: 'field';
   createdAt: Scalars['DateTime'];
@@ -1981,6 +1958,14 @@ export type GetAuthorizationUrlMutationVariables = Exact<{
 
 export type GetAuthorizationUrlMutation = { __typename?: 'Mutation', getAuthorizationUrl: { __typename?: 'GetAuthorizationUrlOutput', id: string, type: string, authorizationURL: string } };
 
+export type GetLoginTokenFromEmailVerificationTokenMutationVariables = Exact<{
+  emailVerificationToken: Scalars['String'];
+  captchaToken?: InputMaybe<Scalars['String']>;
+}>;
+
+
+export type GetLoginTokenFromEmailVerificationTokenMutation = { __typename?: 'Mutation', getLoginTokenFromEmailVerificationToken: { __typename?: 'LoginToken', loginToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } };
+
 export type ImpersonateMutationVariables = Exact<{
   userId: Scalars['String'];
   workspaceId: Scalars['String'];
@@ -1996,24 +1981,25 @@ export type RenewTokenMutationVariables = Exact<{
 
 export type RenewTokenMutation = { __typename?: 'Mutation', renewToken: { __typename?: 'AuthTokens', tokens: { __typename?: 'AuthTokenPair', accessToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, refreshToken: { __typename?: 'AuthToken', token: string, expiresAt: string } } } };
 
+export type ResendEmailVerificationTokenMutationVariables = Exact<{
+  email: Scalars['String'];
+}>;
+
+
+export type ResendEmailVerificationTokenMutation = { __typename?: 'Mutation', resendEmailVerificationToken: { __typename?: 'ResendEmailVerificationTokenOutput', success: boolean } };
+
 export type SignUpMutationVariables = Exact<{
   email: Scalars['String'];
   password: Scalars['String'];
   workspaceInviteHash?: InputMaybe<Scalars['String']>;
   workspacePersonalInviteToken?: InputMaybe<Scalars['String']>;
   captchaToken?: InputMaybe<Scalars['String']>;
+  workspaceId?: InputMaybe<Scalars['String']>;
 }>;
 
 
 export type SignUpMutation = { __typename?: 'Mutation', signUp: { __typename?: 'SignUpOutput', loginToken: { __typename?: 'AuthToken', token: string, expiresAt: string }, workspace: { __typename?: 'WorkspaceSubdomainAndId', id: string, subdomain: string } } };
 
-export type SwitchWorkspaceMutationVariables = Exact<{
-  workspaceId: Scalars['String'];
-}>;
-
-
-export type SwitchWorkspaceMutation = { __typename?: 'Mutation', switchWorkspace: { __typename?: 'PublicWorkspaceDataOutput', id: string, subdomain: string, authProviders: { __typename?: 'AuthProviders', google: boolean, magicLink: boolean, password: boolean, microsoft: boolean, sso: Array<{ __typename?: 'SSOIdentityProvider', id: string, name: string, type: IdentityProviderType, status: SsoIdentityProviderStatus, issuer: string }> } } };
-
 export type UpdatePasswordViaResetTokenMutationVariables = Exact<{
   token: Scalars['String'];
   newPassword: Scalars['String'];
@@ -2035,7 +2021,7 @@ export type CheckUserExistsQueryVariables = Exact<{
 }>;
 
 
-export type CheckUserExistsQuery = { __typename?: 'Query', checkUserExists: { __typename: 'UserExists', exists: boolean, availableWorkspaces: Array<{ __typename?: 'AvailableWorkspaceOutput', id: string, displayName?: string | null, subdomain: string, logo?: string | null, sso: Array<{ __typename?: 'SSOConnection', type: IdentityProviderType, id: string, issuer: string, name: string, status: SsoIdentityProviderStatus }> }> } | { __typename: 'UserNotExists', exists: boolean } };
+export type CheckUserExistsQuery = { __typename?: 'Query', checkUserExists: { __typename: 'UserExists', exists: boolean, isEmailVerified: boolean, availableWorkspaces: Array<{ __typename?: 'AvailableWorkspaceOutput', id: string, displayName?: string | null, subdomain: string, logo?: string | null, sso: Array<{ __typename?: 'SSOConnection', type: IdentityProviderType, id: string, issuer: string, name: string, status: SsoIdentityProviderStatus }> }> } | { __typename: 'UserNotExists', exists: boolean } };
 
 export type GetPublicWorkspaceDataBySubdomainQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -2054,7 +2040,7 @@ export type BillingPortalSessionQueryVariables = Exact<{
 }>;
 
 
-export type BillingPortalSessionQuery = { __typename?: 'Query', billingPortalSession: { __typename?: 'SessionEntity', url?: string | null } };
+export type BillingPortalSessionQuery = { __typename?: 'Query', billingPortalSession: { __typename?: 'BillingSessionOutput', url?: string | null } };
 
 export type CheckoutSessionMutationVariables = Exact<{
   recurringInterval: SubscriptionInterval;
@@ -2064,24 +2050,24 @@ export type CheckoutSessionMutationVariables = Exact<{
 }>;
 
 
-export type CheckoutSessionMutation = { __typename?: 'Mutation', checkoutSession: { __typename?: 'SessionEntity', url?: string | null } };
+export type CheckoutSessionMutation = { __typename?: 'Mutation', checkoutSession: { __typename?: 'BillingSessionOutput', url?: string | null } };
 
 export type GetProductPricesQueryVariables = Exact<{
   product: Scalars['String'];
 }>;
 
 
-export type GetProductPricesQuery = { __typename?: 'Query', getProductPrices: { __typename?: 'ProductPricesEntity', productPrices: Array<{ __typename?: 'ProductPriceEntity', created: number, recurringInterval: SubscriptionInterval, stripePriceId: string, unitAmount: number }> } };
+export type GetProductPricesQuery = { __typename?: 'Query', getProductPrices: { __typename?: 'BillingProductPricesOutput', productPrices: Array<{ __typename?: 'BillingProductPriceDTO', created: number, recurringInterval: SubscriptionInterval, stripePriceId: string, unitAmount: number }> } };
 
 export type UpdateBillingSubscriptionMutationVariables = Exact<{ [key: string]: never; }>;
 
 
-export type UpdateBillingSubscriptionMutation = { __typename?: 'Mutation', updateBillingSubscription: { __typename?: 'UpdateBillingEntity', success: boolean } };
+export type UpdateBillingSubscriptionMutation = { __typename?: 'Mutation', updateBillingSubscription: { __typename?: 'BillingUpdateOutput', success: boolean } };
 
 export type GetClientConfigQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetClientConfigQuery = { __typename?: 'Query', clientConfig: { __typename?: 'ClientConfig', signInPrefilled: boolean, isMultiWorkspaceEnabled: boolean, isSSOEnabled: boolean, defaultSubdomain?: string | null, frontDomain: string, debugMode: boolean, analyticsEnabled: boolean, chromeExtensionId?: string | null, billing: { __typename?: 'Billing', isBillingEnabled: boolean, billingUrl?: string | null, billingFreeTrialDurationInDays?: number | null }, authProviders: { __typename?: 'AuthProviders', google: boolean, password: boolean, microsoft: boolean, sso: Array<{ __typename?: 'SSOIdentityProvider', id: string, name: string, type: IdentityProviderType, status: SsoIdentityProviderStatus, issuer: string }> }, support: { __typename?: 'Support', supportDriver: string, supportFrontChatId?: string | null }, sentry: { __typename?: 'Sentry', dsn?: string | null, environment?: string | null, release?: string | null }, captcha: { __typename?: 'Captcha', provider?: CaptchaDriverType | null, siteKey?: string | null }, api: { __typename?: 'ApiConfig', mutationMaximumAffectedRecords: number } } };
+export type GetClientConfigQuery = { __typename?: 'Query', clientConfig: { __typename?: 'ClientConfig', signInPrefilled: boolean, isMultiWorkspaceEnabled: boolean, isEmailVerificationRequired: boolean, defaultSubdomain?: string | null, frontDomain: string, debugMode: boolean, analyticsEnabled: boolean, chromeExtensionId?: string | null, canManageFeatureFlags: boolean, billing: { __typename?: 'Billing', isBillingEnabled: boolean, billingUrl?: string | null, trialPeriods: Array<{ __typename?: 'BillingTrialPeriodDTO', duration: number, isCreditCardRequired: boolean }> }, authProviders: { __typename?: 'AuthProviders', google: boolean, password: boolean, microsoft: boolean, sso: Array<{ __typename?: 'SSOIdentityProvider', id: string, name: string, type: IdentityProviderType, status: SsoIdentityProviderStatus, issuer: string }> }, support: { __typename?: 'Support', supportDriver: string, supportFrontChatId?: string | null }, sentry: { __typename?: 'Sentry', dsn?: string | null, environment?: string | null, release?: string | null }, captcha: { __typename?: 'Captcha', provider?: CaptchaDriverType | null, siteKey?: string | null }, api: { __typename?: 'ApiConfig', mutationMaximumAffectedRecords: number }, publicFeatureFlags: Array<{ __typename?: 'PublicFeatureFlag', key: FeatureFlagKey, metadata: { __typename?: 'PublicFeatureFlagMetadata', label: string, description: string, imagePath: string } }> } };
 
 export type SkipSyncEmailOnboardingStepMutationVariables = Exact<{ [key: string]: never; }>;
 
@@ -2104,6 +2090,13 @@ export type UserLookupAdminPanelMutationVariables = Exact<{
 
 export type UserLookupAdminPanelMutation = { __typename?: 'Mutation', userLookupAdminPanel: { __typename?: 'UserLookup', user: { __typename?: 'UserInfo', id: string, email: string, firstName?: string | null, lastName?: string | null }, workspaces: Array<{ __typename?: 'WorkspaceInfo', id: string, name: string, logo?: string | null, totalUsers: number, allowImpersonation: boolean, users: Array<{ __typename?: 'UserInfo', id: string, email: string, firstName?: string | null, lastName?: string | null }>, featureFlags: Array<{ __typename?: 'FeatureFlag', key: FeatureFlagKey, value: boolean }> }> } };
 
+export type UpdateLabPublicFeatureFlagMutationVariables = Exact<{
+  input: UpdateLabPublicFeatureFlagInput;
+}>;
+
+
+export type UpdateLabPublicFeatureFlagMutation = { __typename?: 'Mutation', updateLabPublicFeatureFlag: boolean };
+
 export type CreateOidcIdentityProviderMutationVariables = Exact<{
   input: SetupOidcSsoInput;
 }>;
@@ -2137,7 +2130,7 @@ export type ListSsoIdentityProvidersByWorkspaceIdQueryVariables = Exact<{ [key:
 
 export type ListSsoIdentityProvidersByWorkspaceIdQuery = { __typename?: 'Query', listSSOIdentityProvidersByWorkspaceId: Array<{ __typename?: 'FindAvailableSSOIDPOutput', type: IdentityProviderType, id: string, name: string, issuer: string, status: SsoIdentityProviderStatus }> };
 
-export type UserQueryFragmentFragment = { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, analyticsTinybirdJwts?: { __typename?: 'AnalyticsTinybirdJwtMap', getWebhookAnalytics: string, getPageviewsAnalytics: string, getUsersAnalytics: string, getServerlessFunctionDuration: string, getServerlessFunctionSuccessRate: string, getServerlessFunctionErrorCount: string } | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, currentWorkspace?: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, isPublicInviteLinkEnabled: boolean, isGoogleAuthEnabled: boolean, isMicrosoftAuthEnabled: boolean, isPasswordAuthEnabled: boolean, subdomain: string, hasValidEntrepriseKey: boolean, metadataVersion: number, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: FeatureFlagKey, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null } | null, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null, subdomain: string } | null }> };
+export type UserQueryFragmentFragment = { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, analyticsTinybirdJwts?: { __typename?: 'AnalyticsTinybirdJwtMap', getWebhookAnalytics: string, getPageviewsAnalytics: string, getUsersAnalytics: string, getServerlessFunctionDuration: string, getServerlessFunctionSuccessRate: string, getServerlessFunctionErrorCount: string } | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, currentWorkspace?: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, isPublicInviteLinkEnabled: boolean, isGoogleAuthEnabled: boolean, isMicrosoftAuthEnabled: boolean, isPasswordAuthEnabled: boolean, subdomain: string, hasValidEntrepriseKey: boolean, metadataVersion: number, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: FeatureFlagKey, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null, billingSubscriptions: Array<{ __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus }> } | null, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null, subdomain: string } | null }> };
 
 export type DeleteUserAccountMutationVariables = Exact<{ [key: string]: never; }>;
 
@@ -2154,7 +2147,7 @@ export type UploadProfilePictureMutation = { __typename?: 'Mutation', uploadProf
 export type GetCurrentUserQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type GetCurrentUserQuery = { __typename?: 'Query', currentUser: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, analyticsTinybirdJwts?: { __typename?: 'AnalyticsTinybirdJwtMap', getWebhookAnalytics: string, getPageviewsAnalytics: string, getUsersAnalytics: string, getServerlessFunctionDuration: string, getServerlessFunctionSuccessRate: string, getServerlessFunctionErrorCount: string } | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, currentWorkspace?: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, isPublicInviteLinkEnabled: boolean, isGoogleAuthEnabled: boolean, isMicrosoftAuthEnabled: boolean, isPasswordAuthEnabled: boolean, subdomain: string, hasValidEntrepriseKey: boolean, metadataVersion: number, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: FeatureFlagKey, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null } | null, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null, subdomain: string } | null }> } };
+export type GetCurrentUserQuery = { __typename?: 'Query', currentUser: { __typename?: 'User', id: any, firstName: string, lastName: string, email: string, canImpersonate: boolean, supportUserHash?: string | null, onboardingStatus?: OnboardingStatus | null, userVars: any, analyticsTinybirdJwts?: { __typename?: 'AnalyticsTinybirdJwtMap', getWebhookAnalytics: string, getPageviewsAnalytics: string, getUsersAnalytics: string, getServerlessFunctionDuration: string, getServerlessFunctionSuccessRate: string, getServerlessFunctionErrorCount: string } | null, workspaceMember?: { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } } | null, workspaceMembers?: Array<{ __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } }> | null, currentWorkspace?: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, domainName?: string | null, inviteHash?: string | null, allowImpersonation: boolean, activationStatus: WorkspaceActivationStatus, isPublicInviteLinkEnabled: boolean, isGoogleAuthEnabled: boolean, isMicrosoftAuthEnabled: boolean, isPasswordAuthEnabled: boolean, subdomain: string, hasValidEntrepriseKey: boolean, metadataVersion: number, workspaceMembersCount?: number | null, featureFlags?: Array<{ __typename?: 'FeatureFlag', id: any, key: FeatureFlagKey, value: boolean, workspaceId: string }> | null, currentBillingSubscription?: { __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus, interval?: SubscriptionInterval | null } | null, billingSubscriptions: Array<{ __typename?: 'BillingSubscription', id: any, status: SubscriptionStatus }> } | null, workspaces: Array<{ __typename?: 'UserWorkspace', workspace?: { __typename?: 'Workspace', id: any, logo?: string | null, displayName?: string | null, domainName?: string | null, subdomain: string } | null }> } };
 
 export type ActivateWorkflowVersionMutationVariables = Exact<{
   workflowVersionId: Scalars['String'];
@@ -2170,6 +2163,13 @@ export type ComputeStepOutputSchemaMutationVariables = Exact<{
 
 export type ComputeStepOutputSchemaMutation = { __typename?: 'Mutation', computeStepOutputSchema: any };
 
+export type CreateDraftFromWorkflowVersionMutationVariables = Exact<{
+  input: CreateDraftFromWorkflowVersionInput;
+}>;
+
+
+export type CreateDraftFromWorkflowVersionMutation = { __typename?: 'Mutation', createDraftFromWorkflowVersion: { __typename?: 'WorkflowVersion', id: any } };
+
 export type CreateWorkflowVersionStepMutationVariables = Exact<{
   input: CreateWorkflowVersionStepInput;
 }>;
@@ -2191,13 +2191,6 @@ export type DeleteWorkflowVersionStepMutationVariables = Exact<{
 
 export type DeleteWorkflowVersionStepMutation = { __typename?: 'Mutation', deleteWorkflowVersionStep: { __typename?: 'WorkflowAction', id: any, name: string, type: string, settings: any, valid: boolean } };
 
-export type CreateDraftFromWorkflowVersionMutationVariables = Exact<{
-  input: CreateDraftFromWorkflowVersionInput;
-}>;
-
-
-export type CreateDraftFromWorkflowVersionMutation = { __typename?: 'Mutation', createDraftFromWorkflowVersion: boolean };
-
 export type RunWorkflowVersionMutationVariables = Exact<{
   input: RunWorkflowVersionInput;
 }>;
@@ -2240,20 +2233,6 @@ export type GetWorkspaceInvitationsQuery = { __typename?: 'Query', findWorkspace
 
 export type WorkspaceMemberQueryFragmentFragment = { __typename?: 'WorkspaceMember', id: any, colorScheme: string, avatarUrl?: string | null, locale?: string | null, timeZone?: string | null, dateFormat?: WorkspaceMemberDateFormatEnum | null, timeFormat?: WorkspaceMemberTimeFormatEnum | null, name: { __typename?: 'FullName', firstName: string, lastName: string } };
 
-export type AddUserToWorkspaceMutationVariables = Exact<{
-  inviteHash: Scalars['String'];
-}>;
-
-
-export type AddUserToWorkspaceMutation = { __typename?: 'Mutation', addUserToWorkspace: { __typename?: 'User', id: any } };
-
-export type AddUserToWorkspaceByInviteTokenMutationVariables = Exact<{
-  inviteToken: Scalars['String'];
-}>;
-
-
-export type AddUserToWorkspaceByInviteTokenMutation = { __typename?: 'Mutation', addUserToWorkspaceByInviteToken: { __typename?: 'User', id: any } };
-
 export type ActivateWorkspaceMutationVariables = Exact<{
   input: ActivateWorkspaceInput;
 }>;
@@ -2285,7 +2264,7 @@ export type GetWorkspaceFromInviteHashQueryVariables = Exact<{
 }>;
 
 
-export type GetWorkspaceFromInviteHashQuery = { __typename?: 'Query', findWorkspaceFromInviteHash: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, allowImpersonation: boolean } };
+export type GetWorkspaceFromInviteHashQuery = { __typename?: 'Query', findWorkspaceFromInviteHash: { __typename?: 'Workspace', id: any, displayName?: string | null, logo?: string | null, allowImpersonation: boolean, subdomain: string } };
 
 export const TimelineCalendarEventParticipantFragmentFragmentDoc = gql`
     fragment TimelineCalendarEventParticipantFragment on TimelineCalendarEventParticipant {
@@ -2450,6 +2429,10 @@ export const UserQueryFragmentFragmentDoc = gql`
       status
       interval
     }
+    billingSubscriptions {
+      id
+      status
+    }
     workspaceMembersCount
   }
   workspaces {
@@ -2938,6 +2921,45 @@ export function useGetAuthorizationUrlMutation(baseOptions?: Apollo.MutationHook
 export type GetAuthorizationUrlMutationHookResult = ReturnType<typeof useGetAuthorizationUrlMutation>;
 export type GetAuthorizationUrlMutationResult = Apollo.MutationResult<GetAuthorizationUrlMutation>;
 export type GetAuthorizationUrlMutationOptions = Apollo.BaseMutationOptions<GetAuthorizationUrlMutation, GetAuthorizationUrlMutationVariables>;
+export const GetLoginTokenFromEmailVerificationTokenDocument = gql`
+    mutation GetLoginTokenFromEmailVerificationToken($emailVerificationToken: String!, $captchaToken: String) {
+  getLoginTokenFromEmailVerificationToken(
+    emailVerificationToken: $emailVerificationToken
+    captchaToken: $captchaToken
+  ) {
+    loginToken {
+      ...AuthTokenFragment
+    }
+  }
+}
+    ${AuthTokenFragmentFragmentDoc}`;
+export type GetLoginTokenFromEmailVerificationTokenMutationFn = Apollo.MutationFunction<GetLoginTokenFromEmailVerificationTokenMutation, GetLoginTokenFromEmailVerificationTokenMutationVariables>;
+
+/**
+ * __useGetLoginTokenFromEmailVerificationTokenMutation__
+ *
+ * To run a mutation, you first call `useGetLoginTokenFromEmailVerificationTokenMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useGetLoginTokenFromEmailVerificationTokenMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [getLoginTokenFromEmailVerificationTokenMutation, { data, loading, error }] = useGetLoginTokenFromEmailVerificationTokenMutation({
+ *   variables: {
+ *      emailVerificationToken: // value for 'emailVerificationToken'
+ *      captchaToken: // value for 'captchaToken'
+ *   },
+ * });
+ */
+export function useGetLoginTokenFromEmailVerificationTokenMutation(baseOptions?: Apollo.MutationHookOptions<GetLoginTokenFromEmailVerificationTokenMutation, GetLoginTokenFromEmailVerificationTokenMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<GetLoginTokenFromEmailVerificationTokenMutation, GetLoginTokenFromEmailVerificationTokenMutationVariables>(GetLoginTokenFromEmailVerificationTokenDocument, options);
+      }
+export type GetLoginTokenFromEmailVerificationTokenMutationHookResult = ReturnType<typeof useGetLoginTokenFromEmailVerificationTokenMutation>;
+export type GetLoginTokenFromEmailVerificationTokenMutationResult = Apollo.MutationResult<GetLoginTokenFromEmailVerificationTokenMutation>;
+export type GetLoginTokenFromEmailVerificationTokenMutationOptions = Apollo.BaseMutationOptions<GetLoginTokenFromEmailVerificationTokenMutation, GetLoginTokenFromEmailVerificationTokenMutationVariables>;
 export const ImpersonateDocument = gql`
     mutation Impersonate($userId: String!, $workspaceId: String!) {
   impersonate(userId: $userId, workspaceId: $workspaceId) {
@@ -3013,14 +3035,48 @@ export function useRenewTokenMutation(baseOptions?: Apollo.MutationHookOptions<R
 export type RenewTokenMutationHookResult = ReturnType<typeof useRenewTokenMutation>;
 export type RenewTokenMutationResult = Apollo.MutationResult<RenewTokenMutation>;
 export type RenewTokenMutationOptions = Apollo.BaseMutationOptions<RenewTokenMutation, RenewTokenMutationVariables>;
+export const ResendEmailVerificationTokenDocument = gql`
+    mutation ResendEmailVerificationToken($email: String!) {
+  resendEmailVerificationToken(email: $email) {
+    success
+  }
+}
+    `;
+export type ResendEmailVerificationTokenMutationFn = Apollo.MutationFunction<ResendEmailVerificationTokenMutation, ResendEmailVerificationTokenMutationVariables>;
+
+/**
+ * __useResendEmailVerificationTokenMutation__
+ *
+ * To run a mutation, you first call `useResendEmailVerificationTokenMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useResendEmailVerificationTokenMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [resendEmailVerificationTokenMutation, { data, loading, error }] = useResendEmailVerificationTokenMutation({
+ *   variables: {
+ *      email: // value for 'email'
+ *   },
+ * });
+ */
+export function useResendEmailVerificationTokenMutation(baseOptions?: Apollo.MutationHookOptions<ResendEmailVerificationTokenMutation, ResendEmailVerificationTokenMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<ResendEmailVerificationTokenMutation, ResendEmailVerificationTokenMutationVariables>(ResendEmailVerificationTokenDocument, options);
+      }
+export type ResendEmailVerificationTokenMutationHookResult = ReturnType<typeof useResendEmailVerificationTokenMutation>;
+export type ResendEmailVerificationTokenMutationResult = Apollo.MutationResult<ResendEmailVerificationTokenMutation>;
+export type ResendEmailVerificationTokenMutationOptions = Apollo.BaseMutationOptions<ResendEmailVerificationTokenMutation, ResendEmailVerificationTokenMutationVariables>;
 export const SignUpDocument = gql`
-    mutation SignUp($email: String!, $password: String!, $workspaceInviteHash: String, $workspacePersonalInviteToken: String = null, $captchaToken: String) {
+    mutation SignUp($email: String!, $password: String!, $workspaceInviteHash: String, $workspacePersonalInviteToken: String = null, $captchaToken: String, $workspaceId: String) {
   signUp(
     email: $email
     password: $password
     workspaceInviteHash: $workspaceInviteHash
     workspacePersonalInviteToken: $workspacePersonalInviteToken
     captchaToken: $captchaToken
+    workspaceId: $workspaceId
   ) {
     loginToken {
       ...AuthTokenFragment
@@ -3052,6 +3108,7 @@ export type SignUpMutationFn = Apollo.MutationFunction<SignUpMutation, SignUpMut
  *      workspaceInviteHash: // value for 'workspaceInviteHash'
  *      workspacePersonalInviteToken: // value for 'workspacePersonalInviteToken'
  *      captchaToken: // value for 'captchaToken'
+ *      workspaceId: // value for 'workspaceId'
  *   },
  * });
  */
@@ -3062,53 +3119,6 @@ export function useSignUpMutation(baseOptions?: Apollo.MutationHookOptions<SignU
 export type SignUpMutationHookResult = ReturnType<typeof useSignUpMutation>;
 export type SignUpMutationResult = Apollo.MutationResult<SignUpMutation>;
 export type SignUpMutationOptions = Apollo.BaseMutationOptions<SignUpMutation, SignUpMutationVariables>;
-export const SwitchWorkspaceDocument = gql`
-    mutation SwitchWorkspace($workspaceId: String!) {
-  switchWorkspace(workspaceId: $workspaceId) {
-    id
-    subdomain
-    authProviders {
-      sso {
-        id
-        name
-        type
-        status
-        issuer
-      }
-      google
-      magicLink
-      password
-      microsoft
-    }
-  }
-}
-    `;
-export type SwitchWorkspaceMutationFn = Apollo.MutationFunction<SwitchWorkspaceMutation, SwitchWorkspaceMutationVariables>;
-
-/**
- * __useSwitchWorkspaceMutation__
- *
- * To run a mutation, you first call `useSwitchWorkspaceMutation` within a React component and pass it any options that fit your needs.
- * When your component renders, `useSwitchWorkspaceMutation` returns a tuple that includes:
- * - A mutate function that you can call at any time to execute the mutation
- * - An object with fields that represent the current status of the mutation's execution
- *
- * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
- *
- * @example
- * const [switchWorkspaceMutation, { data, loading, error }] = useSwitchWorkspaceMutation({
- *   variables: {
- *      workspaceId: // value for 'workspaceId'
- *   },
- * });
- */
-export function useSwitchWorkspaceMutation(baseOptions?: Apollo.MutationHookOptions<SwitchWorkspaceMutation, SwitchWorkspaceMutationVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useMutation<SwitchWorkspaceMutation, SwitchWorkspaceMutationVariables>(SwitchWorkspaceDocument, options);
-      }
-export type SwitchWorkspaceMutationHookResult = ReturnType<typeof useSwitchWorkspaceMutation>;
-export type SwitchWorkspaceMutationResult = Apollo.MutationResult<SwitchWorkspaceMutation>;
-export type SwitchWorkspaceMutationOptions = Apollo.BaseMutationOptions<SwitchWorkspaceMutation, SwitchWorkspaceMutationVariables>;
 export const UpdatePasswordViaResetTokenDocument = gql`
     mutation UpdatePasswordViaResetToken($token: String!, $newPassword: String!) {
   updatePasswordViaResetToken(
@@ -3200,6 +3210,7 @@ export const CheckUserExistsDocument = gql`
           status
         }
       }
+      isEmailVerified
     }
     ... on UserNotExists {
       exists
@@ -3476,7 +3487,10 @@ export const GetClientConfigDocument = gql`
     billing {
       isBillingEnabled
       billingUrl
-      billingFreeTrialDurationInDays
+      trialPeriods {
+        duration
+        isCreditCardRequired
+      }
     }
     authProviders {
       google
@@ -3492,7 +3506,7 @@ export const GetClientConfigDocument = gql`
     }
     signInPrefilled
     isMultiWorkspaceEnabled
-    isSSOEnabled
+    isEmailVerificationRequired
     defaultSubdomain
     frontDomain
     debugMode
@@ -3514,6 +3528,15 @@ export const GetClientConfigDocument = gql`
       mutationMaximumAffectedRecords
     }
     chromeExtensionId
+    canManageFeatureFlags
+    publicFeatureFlags {
+      key
+      metadata {
+        label
+        description
+        imagePath
+      }
+    }
   }
 }
     `;
@@ -3668,6 +3691,37 @@ export function useUserLookupAdminPanelMutation(baseOptions?: Apollo.MutationHoo
 export type UserLookupAdminPanelMutationHookResult = ReturnType<typeof useUserLookupAdminPanelMutation>;
 export type UserLookupAdminPanelMutationResult = Apollo.MutationResult<UserLookupAdminPanelMutation>;
 export type UserLookupAdminPanelMutationOptions = Apollo.BaseMutationOptions<UserLookupAdminPanelMutation, UserLookupAdminPanelMutationVariables>;
+export const UpdateLabPublicFeatureFlagDocument = gql`
+    mutation UpdateLabPublicFeatureFlag($input: UpdateLabPublicFeatureFlagInput!) {
+  updateLabPublicFeatureFlag(input: $input)
+}
+    `;
+export type UpdateLabPublicFeatureFlagMutationFn = Apollo.MutationFunction<UpdateLabPublicFeatureFlagMutation, UpdateLabPublicFeatureFlagMutationVariables>;
+
+/**
+ * __useUpdateLabPublicFeatureFlagMutation__
+ *
+ * To run a mutation, you first call `useUpdateLabPublicFeatureFlagMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useUpdateLabPublicFeatureFlagMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [updateLabPublicFeatureFlagMutation, { data, loading, error }] = useUpdateLabPublicFeatureFlagMutation({
+ *   variables: {
+ *      input: // value for 'input'
+ *   },
+ * });
+ */
+export function useUpdateLabPublicFeatureFlagMutation(baseOptions?: Apollo.MutationHookOptions<UpdateLabPublicFeatureFlagMutation, UpdateLabPublicFeatureFlagMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<UpdateLabPublicFeatureFlagMutation, UpdateLabPublicFeatureFlagMutationVariables>(UpdateLabPublicFeatureFlagDocument, options);
+      }
+export type UpdateLabPublicFeatureFlagMutationHookResult = ReturnType<typeof useUpdateLabPublicFeatureFlagMutation>;
+export type UpdateLabPublicFeatureFlagMutationResult = Apollo.MutationResult<UpdateLabPublicFeatureFlagMutation>;
+export type UpdateLabPublicFeatureFlagMutationOptions = Apollo.BaseMutationOptions<UpdateLabPublicFeatureFlagMutation, UpdateLabPublicFeatureFlagMutationVariables>;
 export const CreateOidcIdentityProviderDocument = gql`
     mutation CreateOIDCIdentityProvider($input: SetupOIDCSsoInput!) {
   createOIDCIdentityProvider(input: $input) {
@@ -4009,6 +4063,39 @@ export function useComputeStepOutputSchemaMutation(baseOptions?: Apollo.Mutation
 export type ComputeStepOutputSchemaMutationHookResult = ReturnType<typeof useComputeStepOutputSchemaMutation>;
 export type ComputeStepOutputSchemaMutationResult = Apollo.MutationResult<ComputeStepOutputSchemaMutation>;
 export type ComputeStepOutputSchemaMutationOptions = Apollo.BaseMutationOptions<ComputeStepOutputSchemaMutation, ComputeStepOutputSchemaMutationVariables>;
+export const CreateDraftFromWorkflowVersionDocument = gql`
+    mutation CreateDraftFromWorkflowVersion($input: CreateDraftFromWorkflowVersionInput!) {
+  createDraftFromWorkflowVersion(input: $input) {
+    id
+  }
+}
+    `;
+export type CreateDraftFromWorkflowVersionMutationFn = Apollo.MutationFunction<CreateDraftFromWorkflowVersionMutation, CreateDraftFromWorkflowVersionMutationVariables>;
+
+/**
+ * __useCreateDraftFromWorkflowVersionMutation__
+ *
+ * To run a mutation, you first call `useCreateDraftFromWorkflowVersionMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useCreateDraftFromWorkflowVersionMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [createDraftFromWorkflowVersionMutation, { data, loading, error }] = useCreateDraftFromWorkflowVersionMutation({
+ *   variables: {
+ *      input: // value for 'input'
+ *   },
+ * });
+ */
+export function useCreateDraftFromWorkflowVersionMutation(baseOptions?: Apollo.MutationHookOptions<CreateDraftFromWorkflowVersionMutation, CreateDraftFromWorkflowVersionMutationVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useMutation<CreateDraftFromWorkflowVersionMutation, CreateDraftFromWorkflowVersionMutationVariables>(CreateDraftFromWorkflowVersionDocument, options);
+      }
+export type CreateDraftFromWorkflowVersionMutationHookResult = ReturnType<typeof useCreateDraftFromWorkflowVersionMutation>;
+export type CreateDraftFromWorkflowVersionMutationResult = Apollo.MutationResult<CreateDraftFromWorkflowVersionMutation>;
+export type CreateDraftFromWorkflowVersionMutationOptions = Apollo.BaseMutationOptions<CreateDraftFromWorkflowVersionMutation, CreateDraftFromWorkflowVersionMutationVariables>;
 export const CreateWorkflowVersionStepDocument = gql`
     mutation CreateWorkflowVersionStep($input: CreateWorkflowVersionStepInput!) {
   createWorkflowVersionStep(input: $input) {
@@ -4114,37 +4201,6 @@ export function useDeleteWorkflowVersionStepMutation(baseOptions?: Apollo.Mutati
 export type DeleteWorkflowVersionStepMutationHookResult = ReturnType<typeof useDeleteWorkflowVersionStepMutation>;
 export type DeleteWorkflowVersionStepMutationResult = Apollo.MutationResult<DeleteWorkflowVersionStepMutation>;
 export type DeleteWorkflowVersionStepMutationOptions = Apollo.BaseMutationOptions<DeleteWorkflowVersionStepMutation, DeleteWorkflowVersionStepMutationVariables>;
-export const CreateDraftFromWorkflowVersionDocument = gql`
-    mutation CreateDraftFromWorkflowVersion($input: CreateDraftFromWorkflowVersionInput!) {
-  createDraftFromWorkflowVersion(input: $input)
-}
-    `;
-export type CreateDraftFromWorkflowVersionMutationFn = Apollo.MutationFunction<CreateDraftFromWorkflowVersionMutation, CreateDraftFromWorkflowVersionMutationVariables>;
-
-/**
- * __useCreateDraftFromWorkflowVersionMutation__
- *
- * To run a mutation, you first call `useCreateDraftFromWorkflowVersionMutation` within a React component and pass it any options that fit your needs.
- * When your component renders, `useCreateDraftFromWorkflowVersionMutation` returns a tuple that includes:
- * - A mutate function that you can call at any time to execute the mutation
- * - An object with fields that represent the current status of the mutation's execution
- *
- * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
- *
- * @example
- * const [createDraftFromWorkflowVersionMutation, { data, loading, error }] = useCreateDraftFromWorkflowVersionMutation({
- *   variables: {
- *      input: // value for 'input'
- *   },
- * });
- */
-export function useCreateDraftFromWorkflowVersionMutation(baseOptions?: Apollo.MutationHookOptions<CreateDraftFromWorkflowVersionMutation, CreateDraftFromWorkflowVersionMutationVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useMutation<CreateDraftFromWorkflowVersionMutation, CreateDraftFromWorkflowVersionMutationVariables>(CreateDraftFromWorkflowVersionDocument, options);
-      }
-export type CreateDraftFromWorkflowVersionMutationHookResult = ReturnType<typeof useCreateDraftFromWorkflowVersionMutation>;
-export type CreateDraftFromWorkflowVersionMutationResult = Apollo.MutationResult<CreateDraftFromWorkflowVersionMutation>;
-export type CreateDraftFromWorkflowVersionMutationOptions = Apollo.BaseMutationOptions<CreateDraftFromWorkflowVersionMutation, CreateDraftFromWorkflowVersionMutationVariables>;
 export const RunWorkflowVersionDocument = gql`
     mutation RunWorkflowVersion($input: RunWorkflowVersionInput!) {
   runWorkflowVersion(input: $input) {
@@ -4364,72 +4420,6 @@ export function useGetWorkspaceInvitationsLazyQuery(baseOptions?: Apollo.LazyQue
 export type GetWorkspaceInvitationsQueryHookResult = ReturnType<typeof useGetWorkspaceInvitationsQuery>;
 export type GetWorkspaceInvitationsLazyQueryHookResult = ReturnType<typeof useGetWorkspaceInvitationsLazyQuery>;
 export type GetWorkspaceInvitationsQueryResult = Apollo.QueryResult<GetWorkspaceInvitationsQuery, GetWorkspaceInvitationsQueryVariables>;
-export const AddUserToWorkspaceDocument = gql`
-    mutation AddUserToWorkspace($inviteHash: String!) {
-  addUserToWorkspace(inviteHash: $inviteHash) {
-    id
-  }
-}
-    `;
-export type AddUserToWorkspaceMutationFn = Apollo.MutationFunction<AddUserToWorkspaceMutation, AddUserToWorkspaceMutationVariables>;
-
-/**
- * __useAddUserToWorkspaceMutation__
- *
- * To run a mutation, you first call `useAddUserToWorkspaceMutation` within a React component and pass it any options that fit your needs.
- * When your component renders, `useAddUserToWorkspaceMutation` returns a tuple that includes:
- * - A mutate function that you can call at any time to execute the mutation
- * - An object with fields that represent the current status of the mutation's execution
- *
- * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
- *
- * @example
- * const [addUserToWorkspaceMutation, { data, loading, error }] = useAddUserToWorkspaceMutation({
- *   variables: {
- *      inviteHash: // value for 'inviteHash'
- *   },
- * });
- */
-export function useAddUserToWorkspaceMutation(baseOptions?: Apollo.MutationHookOptions<AddUserToWorkspaceMutation, AddUserToWorkspaceMutationVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useMutation<AddUserToWorkspaceMutation, AddUserToWorkspaceMutationVariables>(AddUserToWorkspaceDocument, options);
-      }
-export type AddUserToWorkspaceMutationHookResult = ReturnType<typeof useAddUserToWorkspaceMutation>;
-export type AddUserToWorkspaceMutationResult = Apollo.MutationResult<AddUserToWorkspaceMutation>;
-export type AddUserToWorkspaceMutationOptions = Apollo.BaseMutationOptions<AddUserToWorkspaceMutation, AddUserToWorkspaceMutationVariables>;
-export const AddUserToWorkspaceByInviteTokenDocument = gql`
-    mutation AddUserToWorkspaceByInviteToken($inviteToken: String!) {
-  addUserToWorkspaceByInviteToken(inviteToken: $inviteToken) {
-    id
-  }
-}
-    `;
-export type AddUserToWorkspaceByInviteTokenMutationFn = Apollo.MutationFunction<AddUserToWorkspaceByInviteTokenMutation, AddUserToWorkspaceByInviteTokenMutationVariables>;
-
-/**
- * __useAddUserToWorkspaceByInviteTokenMutation__
- *
- * To run a mutation, you first call `useAddUserToWorkspaceByInviteTokenMutation` within a React component and pass it any options that fit your needs.
- * When your component renders, `useAddUserToWorkspaceByInviteTokenMutation` returns a tuple that includes:
- * - A mutate function that you can call at any time to execute the mutation
- * - An object with fields that represent the current status of the mutation's execution
- *
- * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
- *
- * @example
- * const [addUserToWorkspaceByInviteTokenMutation, { data, loading, error }] = useAddUserToWorkspaceByInviteTokenMutation({
- *   variables: {
- *      inviteToken: // value for 'inviteToken'
- *   },
- * });
- */
-export function useAddUserToWorkspaceByInviteTokenMutation(baseOptions?: Apollo.MutationHookOptions<AddUserToWorkspaceByInviteTokenMutation, AddUserToWorkspaceByInviteTokenMutationVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useMutation<AddUserToWorkspaceByInviteTokenMutation, AddUserToWorkspaceByInviteTokenMutationVariables>(AddUserToWorkspaceByInviteTokenDocument, options);
-      }
-export type AddUserToWorkspaceByInviteTokenMutationHookResult = ReturnType<typeof useAddUserToWorkspaceByInviteTokenMutation>;
-export type AddUserToWorkspaceByInviteTokenMutationResult = Apollo.MutationResult<AddUserToWorkspaceByInviteTokenMutation>;
-export type AddUserToWorkspaceByInviteTokenMutationOptions = Apollo.BaseMutationOptions<AddUserToWorkspaceByInviteTokenMutation, AddUserToWorkspaceByInviteTokenMutationVariables>;
 export const ActivateWorkspaceDocument = gql`
     mutation ActivateWorkspace($input: ActivateWorkspaceInput!) {
   activateWorkspace(data: $input) {
@@ -4576,6 +4566,7 @@ export const GetWorkspaceFromInviteHashDocument = gql`
     displayName
     logo
     allowImpersonation
+    subdomain
   }
 }
     `;
diff --git a/packages/twenty-front/src/hooks/__tests__/useNavigateApp.test.tsx b/packages/twenty-front/src/hooks/__tests__/useNavigateApp.test.tsx
new file mode 100644
index 000000000000..3ef38ac74207
--- /dev/null
+++ b/packages/twenty-front/src/hooks/__tests__/useNavigateApp.test.tsx
@@ -0,0 +1,72 @@
+import { renderHook } from '@testing-library/react';
+import { MemoryRouter, useNavigate } from 'react-router-dom';
+
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { AppPath } from '@/types/AppPath';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: jest.fn(),
+}));
+
+const Wrapper = ({ children }: { children: React.ReactNode }) => (
+  <MemoryRouter>{children}</MemoryRouter>
+);
+
+describe('useNavigateApp', () => {
+  const mockNavigate = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (useNavigate as jest.Mock).mockReturnValue(mockNavigate);
+  });
+
+  it('should navigate to the correct path without params', () => {
+    const { result } = renderHook(() => useNavigateApp(), {
+      wrapper: Wrapper,
+    });
+
+    result.current(AppPath.Index);
+
+    expect(mockNavigate).toHaveBeenCalledWith('/', undefined);
+  });
+
+  it('should navigate to the correct path with params', () => {
+    const { result } = renderHook(() => useNavigateApp(), {
+      wrapper: Wrapper,
+    });
+
+    result.current(AppPath.RecordShowPage, {
+      objectNameSingular: CoreObjectNameSingular.Company,
+      objectRecordId: '123',
+    });
+
+    expect(mockNavigate).toHaveBeenCalledWith('/object/company/123', undefined);
+  });
+
+  it('should navigate with query params', () => {
+    const { result } = renderHook(() => useNavigateApp(), {
+      wrapper: Wrapper,
+    });
+
+    const queryParams = { viewId: '123', filter: 'test' };
+    result.current(AppPath.Index, undefined, queryParams);
+
+    expect(mockNavigate).toHaveBeenCalledWith(
+      '/?viewId=123&filter=test',
+      undefined,
+    );
+  });
+
+  it('should navigate with options', () => {
+    const { result } = renderHook(() => useNavigateApp(), {
+      wrapper: Wrapper,
+    });
+
+    const options = { replace: true, state: { test: true } };
+    result.current(AppPath.Index, undefined, undefined, options);
+
+    expect(mockNavigate).toHaveBeenCalledWith('/', options);
+  });
+});
diff --git a/packages/twenty-front/src/hooks/__tests__/useNavigateSettings.test.tsx b/packages/twenty-front/src/hooks/__tests__/useNavigateSettings.test.tsx
new file mode 100644
index 000000000000..24b41e1fbcb5
--- /dev/null
+++ b/packages/twenty-front/src/hooks/__tests__/useNavigateSettings.test.tsx
@@ -0,0 +1,74 @@
+import { renderHook } from '@testing-library/react';
+import { MemoryRouter, useNavigate } from 'react-router-dom';
+
+import { SettingsPath } from '@/types/SettingsPath';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: jest.fn(),
+}));
+
+const Wrapper = ({ children }: { children: React.ReactNode }) => (
+  <MemoryRouter>{children}</MemoryRouter>
+);
+
+describe('useNavigateSettings', () => {
+  const mockNavigate = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (useNavigate as jest.Mock).mockReturnValue(mockNavigate);
+  });
+
+  it('should navigate to the correct settings path without params', () => {
+    const { result } = renderHook(() => useNavigateSettings(), {
+      wrapper: Wrapper,
+    });
+
+    result.current(SettingsPath.Accounts);
+
+    expect(mockNavigate).toHaveBeenCalledWith('/settings/accounts', undefined);
+  });
+
+  it('should navigate to the correct settings path with params', () => {
+    const { result } = renderHook(() => useNavigateSettings(), {
+      wrapper: Wrapper,
+    });
+
+    result.current(SettingsPath.ObjectFieldEdit, {
+      objectNamePlural: 'companies',
+      fieldName: 'name',
+    });
+
+    expect(mockNavigate).toHaveBeenCalledWith(
+      '/settings/objects/companies/name',
+      undefined,
+    );
+  });
+
+  it('should navigate with query params', () => {
+    const { result } = renderHook(() => useNavigateSettings(), {
+      wrapper: Wrapper,
+    });
+
+    const queryParams = { viewId: '123', filter: 'test' };
+    result.current(SettingsPath.Accounts, undefined, queryParams);
+
+    expect(mockNavigate).toHaveBeenCalledWith(
+      '/settings/accounts?viewId=123&filter=test',
+      undefined,
+    );
+  });
+
+  it('should navigate with options', () => {
+    const { result } = renderHook(() => useNavigateSettings(), {
+      wrapper: Wrapper,
+    });
+
+    const options = { replace: true, state: { test: true } };
+    result.current(SettingsPath.Accounts, undefined, undefined, options);
+
+    expect(mockNavigate).toHaveBeenCalledWith('/settings/accounts', options);
+  });
+});
diff --git a/packages/twenty-front/src/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts b/packages/twenty-front/src/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts
index d5166179e1ca..57a78a5d926d 100644
--- a/packages/twenty-front/src/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts
+++ b/packages/twenty-front/src/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts
@@ -2,9 +2,9 @@ import { useIsLogged } from '@/auth/hooks/useIsLogged';
 import { useDefaultHomePagePath } from '@/navigation/hooks/useDefaultHomePagePath';
 import { useOnboardingStatus } from '@/onboarding/hooks/useOnboardingStatus';
 import { AppPath } from '@/types/AppPath';
+import { useIsWorkspaceActivationStatusSuspended } from '@/workspace/hooks/useIsWorkspaceActivationStatusSuspended';
 
-import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
-import { OnboardingStatus, SubscriptionStatus } from '~/generated/graphql';
+import { OnboardingStatus } from '~/generated/graphql';
 
 import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
 import { usePageChangeEffectNavigateLocation } from '~/hooks/usePageChangeEffectNavigateLocation';
@@ -17,11 +17,13 @@ const setupMockOnboardingStatus = (
   jest.mocked(useOnboardingStatus).mockReturnValueOnce(onboardingStatus);
 };
 
-jest.mock('@/workspace/hooks/useSubscriptionStatus');
-const setupMockSubscriptionStatus = (
-  subscriptionStatus: SubscriptionStatus | undefined,
+jest.mock('@/workspace/hooks/useIsWorkspaceActivationStatusSuspended');
+const setupMockIsWorkspaceActivationStatusSuspended = (
+  isWorkspaceSuspended: boolean,
 ) => {
-  jest.mocked(useSubscriptionStatus).mockReturnValueOnce(subscriptionStatus);
+  jest
+    .mocked(useIsWorkspaceActivationStatusSuspended)
+    .mockReturnValueOnce(isWorkspaceSuspended);
 };
 
 jest.mock('~/hooks/useIsMatchingLocation');
@@ -47,251 +49,215 @@ jest.mocked(useDefaultHomePagePath).mockReturnValue({
 
 // prettier-ignore
 const testCases = [
-  { loc: AppPath.Verify, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
-  { loc: AppPath.Verify, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.Verify, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.Verify, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
-  { loc: AppPath.Verify, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: undefined },
-  { loc: AppPath.Verify, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.Verify, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.Verify, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.Verify, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.Verify, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
-
-  { loc: AppPath.SignInUp, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
-  { loc: AppPath.SignInUp, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.SignInUp, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.SignInUp, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
-  { loc: AppPath.SignInUp, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: undefined },
-  { loc: AppPath.SignInUp, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.SignInUp, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.SignInUp, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.SignInUp, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.SignInUp, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
-
-  { loc: AppPath.Invite, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: undefined },
-  { loc: AppPath.Invite, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.Invite, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.Invite, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.Invite, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: undefined },
-  { loc: AppPath.Invite, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: undefined },
-  { loc: AppPath.Invite, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: undefined },
-  { loc: AppPath.Invite, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: undefined },
-  { loc: AppPath.Invite, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: undefined },
-  { loc: AppPath.Invite, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-
-  { loc: AppPath.ResetPassword, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: undefined },
-  { loc: AppPath.ResetPassword, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.ResetPassword, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.ResetPassword, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.ResetPassword, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: undefined },
-  { loc: AppPath.ResetPassword, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: undefined },
-  { loc: AppPath.ResetPassword, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: undefined },
-  { loc: AppPath.ResetPassword, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: undefined },
-  { loc: AppPath.ResetPassword, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: undefined },
-  { loc: AppPath.ResetPassword, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-
-  { loc: AppPath.CreateWorkspace, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
-  { loc: AppPath.CreateWorkspace, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.CreateWorkspace, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.CreateWorkspace, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
-  { loc: AppPath.CreateWorkspace, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
-  { loc: AppPath.CreateWorkspace, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: undefined },
-  { loc: AppPath.CreateWorkspace, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.CreateWorkspace, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.CreateWorkspace, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.CreateWorkspace, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
-
-  { loc: AppPath.CreateProfile, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
-  { loc: AppPath.CreateProfile, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.CreateProfile, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.CreateProfile, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
-  { loc: AppPath.CreateProfile, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
-  { loc: AppPath.CreateProfile, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.CreateProfile, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: undefined },
-  { loc: AppPath.CreateProfile, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.CreateProfile, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.CreateProfile, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
-
-  { loc: AppPath.SyncEmails, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
-  { loc: AppPath.SyncEmails, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.SyncEmails, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.SyncEmails, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
-  { loc: AppPath.SyncEmails, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
-  { loc: AppPath.SyncEmails, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.SyncEmails, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.SyncEmails, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: undefined },
-  { loc: AppPath.SyncEmails, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.SyncEmails, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
-
-  { loc: AppPath.InviteTeam, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
-  { loc: AppPath.InviteTeam, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.InviteTeam, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.InviteTeam, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
-  { loc: AppPath.InviteTeam, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
-  { loc: AppPath.InviteTeam, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.InviteTeam, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.InviteTeam, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.InviteTeam, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: undefined },
-  { loc: AppPath.InviteTeam, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
-
-  { loc: AppPath.PlanRequired, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: undefined },
-  { loc: AppPath.PlanRequired, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.PlanRequired, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.PlanRequired, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
-  { loc: AppPath.PlanRequired, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
-  { loc: AppPath.PlanRequired, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.PlanRequired, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.PlanRequired, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.PlanRequired, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.PlanRequired, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
-
-  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
-  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
-  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
-  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: undefined },
-  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
-
-  { loc: AppPath.Index, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
-  { loc: AppPath.Index, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.Index, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.Index, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
-  { loc: AppPath.Index, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
-  { loc: AppPath.Index, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.Index, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.Index, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.Index, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.Index, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: defaultHomePagePath },
-
-  { loc: AppPath.TasksPage, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
-  { loc: AppPath.TasksPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.TasksPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.TasksPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.TasksPage, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
-  { loc: AppPath.TasksPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.TasksPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.TasksPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.TasksPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.TasksPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-
-  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
-  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.OpportunitiesPage, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
-  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-
-  { loc: AppPath.RecordIndexPage, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
-  { loc: AppPath.RecordIndexPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.RecordIndexPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.RecordIndexPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.RecordIndexPage, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
-  { loc: AppPath.RecordIndexPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.RecordIndexPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.RecordIndexPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.RecordIndexPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.RecordIndexPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-
-  { loc: AppPath.RecordShowPage, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
-  { loc: AppPath.RecordShowPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.RecordShowPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.RecordShowPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.RecordShowPage, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
-  { loc: AppPath.RecordShowPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.RecordShowPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.RecordShowPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.RecordShowPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.RecordShowPage, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-
-  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
-  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.SettingsCatchAll, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
-  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-
-  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
-  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.DevelopersCatchAll, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
-  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-
-  { loc: AppPath.Authorize, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
-  { loc: AppPath.Authorize, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.Authorize, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.Authorize, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.Authorize, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
-  { loc: AppPath.Authorize, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.Authorize, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.Authorize, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.Authorize, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.Authorize, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-
-  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
-  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.NotFoundWildcard, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
-  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-
-  { loc: AppPath.NotFound, isLoggedIn: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: AppPath.PlanRequired },
-  { loc: AppPath.NotFound, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.NotFound, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: '/settings/billing' },
-  { loc: AppPath.NotFound, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: undefined },
-  { loc: AppPath.NotFound, isLoggedIn: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: AppPath.SignInUp },
-  { loc: AppPath.NotFound, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: AppPath.CreateWorkspace },
-  { loc: AppPath.NotFound, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: AppPath.CreateProfile },
-  { loc: AppPath.NotFound, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: AppPath.SyncEmails },
-  { loc: AppPath.NotFound, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: AppPath.InviteTeam },
-  { loc: AppPath.NotFound, isLoggedIn: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: undefined },
+  { loc: AppPath.Verify, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },
+  { loc: AppPath.Verify, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: '/settings/billing' },
+  { loc: AppPath.Verify, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: undefined },
+  { loc: AppPath.Verify, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.CreateWorkspace },
+  { loc: AppPath.Verify, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },
+  { loc: AppPath.Verify, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },
+  { loc: AppPath.Verify, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },
+  { loc: AppPath.Verify, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },
+
+  { loc: AppPath.SignInUp, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },
+  { loc: AppPath.SignInUp, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: '/settings/billing' },
+  { loc: AppPath.SignInUp, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: undefined },
+  { loc: AppPath.SignInUp, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.CreateWorkspace },
+  { loc: AppPath.SignInUp, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },
+  { loc: AppPath.SignInUp, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },
+  { loc: AppPath.SignInUp, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },
+  { loc: AppPath.SignInUp, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },
+
+  { loc: AppPath.Invite, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: undefined },
+  { loc: AppPath.Invite, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },
+  { loc: AppPath.Invite, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: undefined },
+  { loc: AppPath.Invite, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: undefined },
+  { loc: AppPath.Invite, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: undefined },
+  { loc: AppPath.Invite, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: undefined },
+  { loc: AppPath.Invite, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: undefined },
+  { loc: AppPath.Invite, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },
+
+  { loc: AppPath.ResetPassword, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: undefined },
+  { loc: AppPath.ResetPassword, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },
+  { loc: AppPath.ResetPassword, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: undefined },
+  { loc: AppPath.ResetPassword, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: undefined },
+  { loc: AppPath.ResetPassword, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: undefined },
+  { loc: AppPath.ResetPassword, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: undefined },
+  { loc: AppPath.ResetPassword, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: undefined },
+  { loc: AppPath.ResetPassword, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },
+
+  { loc: AppPath.VerifyEmail, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: undefined },
+  { loc: AppPath.VerifyEmail, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },
+  { loc: AppPath.VerifyEmail, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: undefined },
+  { loc: AppPath.VerifyEmail, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: undefined },
+  { loc: AppPath.VerifyEmail, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: undefined },
+  { loc: AppPath.VerifyEmail, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: undefined },
+  { loc: AppPath.VerifyEmail, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: undefined },
+  { loc: AppPath.VerifyEmail, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },
+
+  { loc: AppPath.CreateWorkspace, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },
+  { loc: AppPath.CreateWorkspace, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: '/settings/billing' },
+  { loc: AppPath.CreateWorkspace, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.CreateWorkspace, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: undefined },
+  { loc: AppPath.CreateWorkspace, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },
+  { loc: AppPath.CreateWorkspace, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },
+  { loc: AppPath.CreateWorkspace, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },
+  { loc: AppPath.CreateWorkspace, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },
+
+  { loc: AppPath.CreateProfile, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },
+  { loc: AppPath.CreateProfile, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: '/settings/billing' },
+  { loc: AppPath.CreateProfile, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.CreateProfile, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.CreateWorkspace },
+  { loc: AppPath.CreateProfile, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: undefined },
+  { loc: AppPath.CreateProfile, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },
+  { loc: AppPath.CreateProfile, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },
+  { loc: AppPath.CreateProfile, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },
+
+  { loc: AppPath.SyncEmails, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },
+  { loc: AppPath.SyncEmails, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: '/settings/billing' },
+  { loc: AppPath.SyncEmails, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.SyncEmails, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.CreateWorkspace },
+  { loc: AppPath.SyncEmails, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },
+  { loc: AppPath.SyncEmails, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: undefined },
+  { loc: AppPath.SyncEmails, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },
+  { loc: AppPath.SyncEmails, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },
+
+  { loc: AppPath.InviteTeam, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },
+  { loc: AppPath.InviteTeam, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: '/settings/billing' },
+  { loc: AppPath.InviteTeam, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.InviteTeam, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.CreateWorkspace },
+  { loc: AppPath.InviteTeam, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },
+  { loc: AppPath.InviteTeam, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },
+  { loc: AppPath.InviteTeam, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: undefined },
+  { loc: AppPath.InviteTeam, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },
+
+  { loc: AppPath.PlanRequired, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: undefined },
+  { loc: AppPath.PlanRequired, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: '/settings/billing' },
+  { loc: AppPath.PlanRequired, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.PlanRequired, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.CreateWorkspace },
+  { loc: AppPath.PlanRequired, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },
+  { loc: AppPath.PlanRequired, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },
+  { loc: AppPath.PlanRequired, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },
+  { loc: AppPath.PlanRequired, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },
+
+  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: undefined },
+  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: '/settings/billing' },
+  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: undefined },
+  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },
+  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },
+  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },
+  { loc: AppPath.PlanRequiredSuccess, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },
+
+  { loc: AppPath.Index, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },
+  { loc: AppPath.Index, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: '/settings/billing' },
+  { loc: AppPath.Index, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.Index, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.CreateWorkspace },
+  { loc: AppPath.Index, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },
+  { loc: AppPath.Index, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },
+  { loc: AppPath.Index, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },
+  { loc: AppPath.Index, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: defaultHomePagePath },
+
+  { loc: AppPath.TasksPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },
+  { loc: AppPath.TasksPage, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: '/settings/billing' },
+  { loc: AppPath.TasksPage, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.TasksPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.CreateWorkspace },
+  { loc: AppPath.TasksPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },
+  { loc: AppPath.TasksPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },
+  { loc: AppPath.TasksPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },
+  { loc: AppPath.TasksPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },
+
+  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },
+  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: '/settings/billing' },
+  { loc: AppPath.OpportunitiesPage, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.CreateWorkspace },
+  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },
+  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },
+  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },
+  { loc: AppPath.OpportunitiesPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },
+
+  { loc: AppPath.RecordIndexPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },
+  { loc: AppPath.RecordIndexPage, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: '/settings/billing' },
+  { loc: AppPath.RecordIndexPage, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.RecordIndexPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.CreateWorkspace },
+  { loc: AppPath.RecordIndexPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },
+  { loc: AppPath.RecordIndexPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },
+  { loc: AppPath.RecordIndexPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },
+  { loc: AppPath.RecordIndexPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },
+
+  { loc: AppPath.RecordShowPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },
+  { loc: AppPath.RecordShowPage, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: '/settings/billing' },
+  { loc: AppPath.RecordShowPage, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.RecordShowPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.CreateWorkspace },
+  { loc: AppPath.RecordShowPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },
+  { loc: AppPath.RecordShowPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },
+  { loc: AppPath.RecordShowPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },
+  { loc: AppPath.RecordShowPage, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },
+
+  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },
+  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },
+  { loc: AppPath.SettingsCatchAll, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.CreateWorkspace },
+  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },
+  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },
+  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },
+  { loc: AppPath.SettingsCatchAll, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },
+
+  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },
+  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: '/settings/billing' },
+  { loc: AppPath.DevelopersCatchAll, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.CreateWorkspace },
+  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },
+  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },
+  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },
+  { loc: AppPath.DevelopersCatchAll, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },
+
+  { loc: AppPath.Authorize, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },
+  { loc: AppPath.Authorize, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: '/settings/billing' },
+  { loc: AppPath.Authorize, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.Authorize, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.CreateWorkspace },
+  { loc: AppPath.Authorize, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },
+  { loc: AppPath.Authorize, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },
+  { loc: AppPath.Authorize, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },
+  { loc: AppPath.Authorize, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },
+
+  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },
+  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: '/settings/billing' },
+  { loc: AppPath.NotFoundWildcard, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.CreateWorkspace },
+  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },
+  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },
+  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },
+  { loc: AppPath.NotFoundWildcard, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },
+
+  { loc: AppPath.NotFound, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: AppPath.PlanRequired },
+  { loc: AppPath.NotFound, isLoggedIn: true, isWorkspaceSuspended: true, onboardingStatus: OnboardingStatus.COMPLETED, res: '/settings/billing' },
+  { loc: AppPath.NotFound, isLoggedIn: false, isWorkspaceSuspended: false, onboardingStatus: undefined, res: AppPath.SignInUp },
+  { loc: AppPath.NotFound, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: AppPath.CreateWorkspace },
+  { loc: AppPath.NotFound, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: AppPath.CreateProfile },
+  { loc: AppPath.NotFound, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: AppPath.SyncEmails },
+  { loc: AppPath.NotFound, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: AppPath.InviteTeam },
+  { loc: AppPath.NotFound, isLoggedIn: true, isWorkspaceSuspended: false, onboardingStatus: OnboardingStatus.COMPLETED, res: undefined },
 ];
 
 describe('usePageChangeEffectNavigateLocation', () => {
   testCases.forEach((testCase) => {
-    it(`with location ${testCase.loc} and onboardingStatus ${testCase.onboardingStatus} and subscriptionStatus ${testCase.subscriptionStatus} should return ${testCase.res}`, () => {
+    it(`with location ${testCase.loc} and onboardingStatus ${testCase.onboardingStatus} and isWorkspaceSuspended ${testCase.isWorkspaceSuspended} should return ${testCase.res}`, () => {
       setupMockIsMatchingLocation(testCase.loc);
       setupMockOnboardingStatus(testCase.onboardingStatus);
-      setupMockSubscriptionStatus(testCase.subscriptionStatus);
+      setupMockIsWorkspaceActivationStatusSuspended(
+        testCase.isWorkspaceSuspended,
+      );
       setupMockIsLogged(testCase.isLoggedIn);
       expect(usePageChangeEffectNavigateLocation()).toEqual(testCase.res);
     });
   });
 
   describe('tests should be exhaustive', () => {
-    it('all location and onboarding status should be tested', () => {
-      const untestedSubscriptionStatus = [
-        SubscriptionStatus.Incomplete,
-        SubscriptionStatus.IncompleteExpired,
-        SubscriptionStatus.Paused,
-        SubscriptionStatus.Trialing,
-      ];
+    it('all location, onboarding status and suspended/not suspended workspace activation status should be tested', () => {
       expect(testCases.length).toEqual(
         (Object.keys(AppPath).length - UNTESTED_APP_PATHS.length) *
           (Object.keys(OnboardingStatus).length +
-            (Object.keys(SubscriptionStatus).length -
-              untestedSubscriptionStatus.length)),
+            ['isWorkspaceSuspended:true', 'isWorkspaceSuspended:false'].length),
       );
     });
   });
diff --git a/packages/twenty-front/src/hooks/useCleanRecoilState.ts b/packages/twenty-front/src/hooks/useCleanRecoilState.ts
deleted file mode 100644
index 9da98c006af9..000000000000
--- a/packages/twenty-front/src/hooks/useCleanRecoilState.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { apiKeyTokenState } from '@/settings/developers/states/generatedApiKeyTokenState';
-import { AppPath } from '@/types/AppPath';
-import { SettingsPath } from '@/types/SettingsPath';
-import { useRecoilValue, useResetRecoilState } from 'recoil';
-import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
-
-import { isDefined } from '~/utils/isDefined';
-
-export const useCleanRecoilState = () => {
-  const isMatchingLocation = useIsMatchingLocation();
-  const resetApiKeyToken = useResetRecoilState(apiKeyTokenState);
-  const apiKeyToken = useRecoilValue(apiKeyTokenState);
-  const cleanRecoilState = () => {
-    if (
-      !isMatchingLocation(
-        `${AppPath.Settings}/${AppPath.Developers}/${SettingsPath.DevelopersApiKeyDetail}`,
-      ) &&
-      isDefined(apiKeyToken)
-    ) {
-      resetApiKeyToken();
-    }
-  };
-
-  return {
-    cleanRecoilState,
-  };
-};
diff --git a/packages/twenty-front/src/hooks/useNavigateApp.ts b/packages/twenty-front/src/hooks/useNavigateApp.ts
new file mode 100644
index 000000000000..99c24d5b31c8
--- /dev/null
+++ b/packages/twenty-front/src/hooks/useNavigateApp.ts
@@ -0,0 +1,20 @@
+import { AppPath } from '@/types/AppPath';
+import { useNavigate } from 'react-router-dom';
+import { getAppPath } from '~/utils/navigation/getAppPath';
+
+export const useNavigateApp = () => {
+  const navigate = useNavigate();
+
+  return <T extends AppPath>(
+    to: T,
+    params?: Parameters<typeof getAppPath<T>>[1],
+    queryParams?: Record<string, any>,
+    options?: {
+      replace?: boolean;
+      state?: any;
+    },
+  ) => {
+    const path = getAppPath(to, params, queryParams);
+    return navigate(path, options);
+  };
+};
diff --git a/packages/twenty-front/src/hooks/useNavigateSettings.ts b/packages/twenty-front/src/hooks/useNavigateSettings.ts
new file mode 100644
index 000000000000..1303e9d2d872
--- /dev/null
+++ b/packages/twenty-front/src/hooks/useNavigateSettings.ts
@@ -0,0 +1,20 @@
+import { SettingsPath } from '@/types/SettingsPath';
+import { useNavigate } from 'react-router-dom';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
+
+export const useNavigateSettings = () => {
+  const navigate = useNavigate();
+
+  return <T extends SettingsPath>(
+    to: T,
+    params?: Parameters<typeof getSettingsPath<T>>[1],
+    queryParams?: Record<string, any>,
+    options?: {
+      replace?: boolean;
+      state?: any;
+    },
+  ) => {
+    const path = getSettingsPath(to, params, queryParams);
+    return navigate(path, options);
+  };
+};
diff --git a/packages/twenty-front/src/hooks/usePageChangeEffectNavigateLocation.ts b/packages/twenty-front/src/hooks/usePageChangeEffectNavigateLocation.ts
index 5d637c77b5fb..111b9c573935 100644
--- a/packages/twenty-front/src/hooks/usePageChangeEffectNavigateLocation.ts
+++ b/packages/twenty-front/src/hooks/usePageChangeEffectNavigateLocation.ts
@@ -3,20 +3,21 @@ import { useDefaultHomePagePath } from '@/navigation/hooks/useDefaultHomePagePat
 import { useOnboardingStatus } from '@/onboarding/hooks/useOnboardingStatus';
 import { AppPath } from '@/types/AppPath';
 import { SettingsPath } from '@/types/SettingsPath';
-import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
-import { OnboardingStatus, SubscriptionStatus } from '~/generated/graphql';
+import { useIsWorkspaceActivationStatusSuspended } from '@/workspace/hooks/useIsWorkspaceActivationStatusSuspended';
+import { OnboardingStatus } from '~/generated/graphql';
 import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
 
 export const usePageChangeEffectNavigateLocation = () => {
   const isMatchingLocation = useIsMatchingLocation();
   const isLoggedIn = useIsLogged();
   const onboardingStatus = useOnboardingStatus();
-  const subscriptionStatus = useSubscriptionStatus();
+  const isWorkspaceSuspended = useIsWorkspaceActivationStatusSuspended();
   const { defaultHomePagePath } = useDefaultHomePagePath();
 
   const isMatchingOpenRoute =
     isMatchingLocation(AppPath.Invite) ||
-    isMatchingLocation(AppPath.ResetPassword);
+    isMatchingLocation(AppPath.ResetPassword) ||
+    isMatchingLocation(AppPath.VerifyEmail);
 
   const isMatchingOngoingUserCreationRoute =
     isMatchingOpenRoute ||
@@ -41,35 +42,21 @@ export const usePageChangeEffectNavigateLocation = () => {
   }
 
   if (
-    onboardingStatus === OnboardingStatus.PlanRequired &&
-    !isMatchingLocation(AppPath.PlanRequired)
+    onboardingStatus === OnboardingStatus.PLAN_REQUIRED &&
+    !isMatchingLocation(AppPath.PlanRequired) &&
+    !isMatchingLocation(AppPath.PlanRequiredSuccess)
   ) {
     return AppPath.PlanRequired;
   }
 
-  if (
-    subscriptionStatus === SubscriptionStatus.Unpaid &&
-    !isMatchingLocation(AppPath.SettingsCatchAll)
-  ) {
+  if (isWorkspaceSuspended && !isMatchingLocation(AppPath.SettingsCatchAll)) {
     return `${AppPath.SettingsCatchAll.replace('/*', '')}/${
       SettingsPath.Billing
     }`;
   }
 
   if (
-    subscriptionStatus === SubscriptionStatus.Canceled &&
-    !(
-      isMatchingLocation(AppPath.SettingsCatchAll) ||
-      isMatchingLocation(AppPath.PlanRequired)
-    )
-  ) {
-    return `${AppPath.SettingsCatchAll.replace('/*', '')}/${
-      SettingsPath.Billing
-    }`;
-  }
-
-  if (
-    onboardingStatus === OnboardingStatus.WorkspaceActivation &&
+    onboardingStatus === OnboardingStatus.WORKSPACE_ACTIVATION &&
     !isMatchingLocation(AppPath.CreateWorkspace) &&
     !isMatchingLocation(AppPath.PlanRequiredSuccess)
   ) {
@@ -77,36 +64,28 @@ export const usePageChangeEffectNavigateLocation = () => {
   }
 
   if (
-    onboardingStatus === OnboardingStatus.ProfileCreation &&
+    onboardingStatus === OnboardingStatus.PROFILE_CREATION &&
     !isMatchingLocation(AppPath.CreateProfile)
   ) {
     return AppPath.CreateProfile;
   }
 
   if (
-    onboardingStatus === OnboardingStatus.SyncEmail &&
+    onboardingStatus === OnboardingStatus.SYNC_EMAIL &&
     !isMatchingLocation(AppPath.SyncEmails)
   ) {
     return AppPath.SyncEmails;
   }
 
   if (
-    onboardingStatus === OnboardingStatus.InviteTeam &&
+    onboardingStatus === OnboardingStatus.INVITE_TEAM &&
     !isMatchingLocation(AppPath.InviteTeam)
   ) {
     return AppPath.InviteTeam;
   }
 
   if (
-    onboardingStatus === OnboardingStatus.Completed &&
-    subscriptionStatus === SubscriptionStatus.Canceled &&
-    isMatchingLocation(AppPath.PlanRequired)
-  ) {
-    return;
-  }
-
-  if (
-    onboardingStatus === OnboardingStatus.Completed &&
+    onboardingStatus === OnboardingStatus.COMPLETED &&
     isMatchingOnboardingRoute &&
     isLoggedIn
   ) {
diff --git a/packages/twenty-front/src/loading/components/LeftPanelSkeletonLoader.tsx b/packages/twenty-front/src/loading/components/LeftPanelSkeletonLoader.tsx
index b3ea1eda955e..bd529524c624 100644
--- a/packages/twenty-front/src/loading/components/LeftPanelSkeletonLoader.tsx
+++ b/packages/twenty-front/src/loading/components/LeftPanelSkeletonLoader.tsx
@@ -1,11 +1,12 @@
 import styled from '@emotion/styled';
 import { motion } from 'framer-motion';
 import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
-import { ANIMATION, BACKGROUND_LIGHT, GRAY_SCALE } from 'twenty-ui';
+import { ANIMATION } from 'twenty-ui';
 
 import { SKELETON_LOADER_HEIGHT_SIZES } from '@/activities/components/SkeletonLoader';
 import { NAV_DRAWER_WIDTHS } from '@/ui/navigation/navigation-drawer/constants/NavDrawerWidths';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
+import { useTheme } from '@emotion/react';
 import { MainNavigationDrawerItemsSkeletonLoader } from '~/loading/components/MainNavigationDrawerItemsSkeletonLoader';
 
 const StyledAnimatedContainer = styled(motion.div)`
@@ -47,6 +48,7 @@ const StyledSkeletonTitleContainer = styled.div`
 
 export const LeftPanelSkeletonLoader = () => {
   const isMobile = useIsMobile();
+  const theme = useTheme();
 
   return (
     <StyledAnimatedContainer
@@ -57,15 +59,13 @@ export const LeftPanelSkeletonLoader = () => {
           : NAV_DRAWER_WIDTHS.menu.desktop.expanded,
         opacity: isMobile ? 0 : 1,
       }}
-      transition={{
-        duration: ANIMATION.duration.fast,
-      }}
+      transition={{ duration: ANIMATION.duration.fast }}
     >
       <StyledItemsContainer>
         <StyledSkeletonTitleContainer>
           <SkeletonTheme
-            baseColor={GRAY_SCALE.gray15}
-            highlightColor={BACKGROUND_LIGHT.transparent.lighter}
+            baseColor={theme.background.tertiary}
+            highlightColor={theme.background.transparent.lighter}
             borderRadius={4}
           >
             <Skeleton
diff --git a/packages/twenty-front/src/loading/components/MainNavigationDrawerItemsSkeletonLoader.tsx b/packages/twenty-front/src/loading/components/MainNavigationDrawerItemsSkeletonLoader.tsx
index bfa360a98070..c14db0c9a22b 100644
--- a/packages/twenty-front/src/loading/components/MainNavigationDrawerItemsSkeletonLoader.tsx
+++ b/packages/twenty-front/src/loading/components/MainNavigationDrawerItemsSkeletonLoader.tsx
@@ -1,7 +1,7 @@
 import { SKELETON_LOADER_HEIGHT_SIZES } from '@/activities/components/SkeletonLoader';
+import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
-import { BACKGROUND_LIGHT, GRAY_SCALE } from 'twenty-ui';
 
 const StyledSkeletonContainer = styled.div`
   align-items: flex-start;
@@ -20,11 +20,13 @@ export const MainNavigationDrawerItemsSkeletonLoader = ({
   title?: boolean;
   length: number;
 }) => {
+  const theme = useTheme();
+
   return (
     <StyledSkeletonContainer>
       <SkeletonTheme
-        baseColor={GRAY_SCALE.gray15}
-        highlightColor={BACKGROUND_LIGHT.transparent.lighter}
+        baseColor={theme.background.tertiary}
+        highlightColor={theme.background.transparent.lighter}
         borderRadius={4}
       >
         {title && (
diff --git a/packages/twenty-front/src/loading/components/RightDrawerSkeletonLoader.tsx b/packages/twenty-front/src/loading/components/RightDrawerSkeletonLoader.tsx
index e1e755d094af..7e592415b6ae 100644
--- a/packages/twenty-front/src/loading/components/RightDrawerSkeletonLoader.tsx
+++ b/packages/twenty-front/src/loading/components/RightDrawerSkeletonLoader.tsx
@@ -1,6 +1,6 @@
-import styled from '@emotion/styled';
-import { BACKGROUND_LIGHT, GRAY_SCALE } from 'twenty-ui';
 import { SKELETON_LOADER_HEIGHT_SIZES } from '@/activities/components/SkeletonLoader';
+import { useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
 import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
 
 const StyledRightDrawerContainer = styled.div`
@@ -11,10 +11,12 @@ const StyledRightDrawerContainer = styled.div`
 `;
 
 const StyledSkeletonLoader = () => {
+  const theme = useTheme();
+
   return (
     <SkeletonTheme
-      baseColor={GRAY_SCALE.gray15}
-      highlightColor={BACKGROUND_LIGHT.transparent.lighter}
+      baseColor={theme.background.tertiary}
+      highlightColor={theme.background.transparent.lighter}
       borderRadius={4}
     >
       <Skeleton height={SKELETON_LOADER_HEIGHT_SIZES.standard.m} width={140} />
diff --git a/packages/twenty-front/src/loading/components/RightPanelSkeletonLoader.tsx b/packages/twenty-front/src/loading/components/RightPanelSkeletonLoader.tsx
index 9e98594369ab..013b6aa08a86 100644
--- a/packages/twenty-front/src/loading/components/RightPanelSkeletonLoader.tsx
+++ b/packages/twenty-front/src/loading/components/RightPanelSkeletonLoader.tsx
@@ -1,16 +1,11 @@
 import { SKELETON_LOADER_HEIGHT_SIZES } from '@/activities/components/SkeletonLoader';
+import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
-import {
-  BACKGROUND_LIGHT,
-  BORDER_COMMON,
-  BORDER_LIGHT,
-  GRAY_SCALE,
-  MOBILE_VIEWPORT,
-} from 'twenty-ui';
+import { BORDER_COMMON, MOBILE_VIEWPORT } from 'twenty-ui';
 
 const StyledMainContainer = styled.div`
-  background: ${BACKGROUND_LIGHT.noisy};
+  background: ${({ theme }) => theme.background.noisy};
   box-sizing: border-box;
   display: flex;
   flex: 1 1 auto;
@@ -27,8 +22,8 @@ const StyledMainContainer = styled.div`
 `;
 
 const StyledPanel = styled.div`
-  background: ${BACKGROUND_LIGHT.primary};
-  border: 1px solid ${BORDER_LIGHT.color.medium};
+  background: ${({ theme }) => theme.background.primary};
+  border: 1px solid ${({ theme }) => theme.border.color.medium};
   border-radius: ${BORDER_COMMON.radius.md};
   height: 100%;
   overflow: auto;
@@ -54,11 +49,13 @@ const StyledRightPanelFlexContainer = styled.div`
 `;
 
 const StyledSkeletonHeaderLoader = () => {
+  const theme = useTheme();
+
   return (
     <StyledHeaderContainer>
       <SkeletonTheme
-        baseColor={GRAY_SCALE.gray15}
-        highlightColor={BACKGROUND_LIGHT.transparent.lighter}
+        baseColor={theme.background.tertiary}
+        highlightColor={theme.background.transparent.lighter}
         borderRadius={4}
       >
         <Skeleton
@@ -71,10 +68,12 @@ const StyledSkeletonHeaderLoader = () => {
 };
 
 const StyledSkeletonAddLoader = () => {
+  const theme = useTheme();
+
   return (
     <SkeletonTheme
-      baseColor={GRAY_SCALE.gray15}
-      highlightColor={BACKGROUND_LIGHT.transparent.lighter}
+      baseColor={theme.background.tertiary}
+      highlightColor={theme.background.transparent.lighter}
       borderRadius={4}
     >
       <Skeleton width={132} height={SKELETON_LOADER_HEIGHT_SIZES.standard.s} />
diff --git a/packages/twenty-front/src/loading/components/UserOrMetadataLoader.tsx b/packages/twenty-front/src/loading/components/UserOrMetadataLoader.tsx
index e241a6aa0483..8f33bb80043b 100644
--- a/packages/twenty-front/src/loading/components/UserOrMetadataLoader.tsx
+++ b/packages/twenty-front/src/loading/components/UserOrMetadataLoader.tsx
@@ -1,12 +1,12 @@
 import styled from '@emotion/styled';
-import { BACKGROUND_LIGHT, MOBILE_VIEWPORT } from 'twenty-ui';
+import { MOBILE_VIEWPORT } from 'twenty-ui';
 
 import { NAV_DRAWER_WIDTHS } from '@/ui/navigation/navigation-drawer/constants/NavDrawerWidths';
 import { LeftPanelSkeletonLoader } from '~/loading/components/LeftPanelSkeletonLoader';
 import { RightPanelSkeletonLoader } from '~/loading/components/RightPanelSkeletonLoader';
 
 const StyledContainer = styled.div`
-  background: ${BACKGROUND_LIGHT.noisy};
+  background: ${({ theme }) => theme.background.noisy};
   box-sizing: border-box;
   display: flex;
   flex-direction: row;
diff --git a/packages/twenty-front/src/loading/components/__stories__/PrefetchLoading.stories.tsx b/packages/twenty-front/src/loading/components/__stories__/PrefetchLoading.stories.tsx
index 3b6779f0e4c4..3e84058d31fd 100644
--- a/packages/twenty-front/src/loading/components/__stories__/PrefetchLoading.stories.tsx
+++ b/packages/twenty-front/src/loading/components/__stories__/PrefetchLoading.stories.tsx
@@ -36,6 +36,6 @@ export const Default: Story = {
     await canvas.findByText('Search');
     await canvas.findByText('Settings');
     await canvas.findByText('Linkedin');
-    await canvas.findByText('All companies (v2)');
+    await canvas.findByText('All');
   },
 };
diff --git a/packages/twenty-front/src/loading/components/__stories__/UserOrMetadataLoader.stories.tsx b/packages/twenty-front/src/loading/components/__stories__/UserOrMetadataLoader.stories.tsx
index ac5a371869be..54ed635eb86e 100644
--- a/packages/twenty-front/src/loading/components/__stories__/UserOrMetadataLoader.stories.tsx
+++ b/packages/twenty-front/src/loading/components/__stories__/UserOrMetadataLoader.stories.tsx
@@ -2,8 +2,9 @@ import { getOperationName } from '@apollo/client/utilities';
 import { expect } from '@storybook/jest';
 import { Meta, StoryObj } from '@storybook/react';
 import { within } from '@storybook/test';
-import { graphql, HttpResponse } from 'msw';
+import { HttpResponse, graphql } from 'msw';
 
+import { GET_PUBLIC_WORKSPACE_DATA_BY_SUBDOMAIN } from '@/auth/graphql/queries/getPublicWorkspaceDataBySubdomain';
 import { GET_CLIENT_CONFIG } from '@/client-config/graphql/queries/getClientConfig';
 import { FIND_MANY_OBJECT_METADATA_ITEMS } from '@/object-metadata/graphql/queries';
 import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
@@ -14,6 +15,7 @@ import {
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks, metadataGraphql } from '~/testing/graphqlMocks';
 import { mockedClientConfig } from '~/testing/mock-data/config';
+import { mockedPublicWorkspaceDataBySubdomain } from '~/testing/mock-data/publicWorkspaceDataBySubdomain';
 import { mockedUserData } from '~/testing/mock-data/users';
 
 const userMetadataLoaderMocks = {
@@ -33,6 +35,17 @@ const userMetadataLoaderMocks = {
           },
         });
       }),
+      graphql.query(
+        getOperationName(GET_PUBLIC_WORKSPACE_DATA_BY_SUBDOMAIN) ?? '',
+        () => {
+          return HttpResponse.json({
+            data: {
+              publicWorkspaceDataBySubdomain:
+                mockedPublicWorkspaceDataBySubdomain,
+            },
+          });
+        },
+      ),
       metadataGraphql.query(
         getOperationName(FIND_MANY_OBJECT_METADATA_ITEMS) ?? '',
         () => {
diff --git a/packages/twenty-front/src/locales/de.po b/packages/twenty-front/src/locales/de.po
new file mode 100644
index 000000000000..c4215a39a33f
--- /dev/null
+++ b/packages/twenty-front/src/locales/de.po
@@ -0,0 +1,1147 @@
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2025-01-21 13:07+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: @lingui/cli\n"
+"Language: de\n"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:92
+msgid "1 000 workflow node executions"
+msgstr "1 000 Workflow-Knotenausführungen"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:63
+msgid "12h ({hour12Label})"
+msgstr "12h ({hour12Label})"
+
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:198
+msgid "2. Configure field"
+msgstr "2. Feld konfigurieren"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:59
+msgid "24h ({hour24Label})"
+msgstr "24h ({hour24Label})"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:91
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:179
+msgid "API & Webhooks"
+msgstr "API & Webhooks"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:182
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:190
+msgid "API Key"
+msgstr "API-Schlüssel"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:166
+msgid "API Name"
+msgstr "API-Name"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:49
+msgid "API keys"
+msgstr "API-Schlüssel"
+
+#: src/modules/ui/input/components/ImageInput.tsx:157
+msgid "Abort"
+msgstr "Abbrechen"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:93
+msgid "About"
+msgstr "Über"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:40
+#: src/pages/settings/accounts/SettingsAccounts.tsx:46
+msgid "Account"
+msgstr "Konto"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:321
+#: src/modules/settings/profile/components/DeleteAccount.tsx:45
+msgid "Account Deletion"
+msgstr "Konto-Löschung"
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:21
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:114
+msgid "Accounts"
+msgstr "Konten"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:259
+msgid "Activate"
+msgstr "Aktivieren Sie"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:193
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:201
+msgid "Active"
+msgstr "Aktiv"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:50
+msgid "Active API keys created by you or your team."
+msgstr "Aktive API-Schlüssel, die von Ihnen oder Ihrem Team erstellt wurden."
+
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:39
+msgid "Add Field"
+msgstr "Feld hinzufügen"
+
+#: src/modules/settings/security/components/SettingsSSOIdentitiesProvidersListCard.tsx:59
+msgid "Add SSO Identity Provider"
+msgstr "SSO-Identitätsanbieter hinzufügen"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:149
+msgid "Add object"
+msgstr "Objekt hinzufügen"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:105
+msgid "Add to blocklist"
+msgstr "Zur Blockliste hinzufügen"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:135
+msgid "Allow logins through Google's single sign-on functionality."
+msgstr "Erlauben Sie Anmeldungen über die Google-Single-Sign-On-Funktion."
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:146
+msgid "Allow logins through Microsoft's single sign-on functionality."
+msgstr "Erlauben Sie Anmeldungen über Microsofts Single Sign-On-Funktion."
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:168
+msgid "Allow the invitation of new users by sharing an invite link."
+msgstr "Erlauben Sie die Einladung neuer Benutzer durch die Freigabe eines Einladungslinks."
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:157
+msgid "Allow users to sign in with an email and password."
+msgstr "Erlauben Sie den Benutzern, sich mit einer E-Mail und einem Passwort anzumelden."
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:251
+msgid "An optional description"
+msgstr "Eine optionale Beschreibung"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:37
+msgid "Appearance"
+msgstr "Erscheinungsbild"
+
+#: src/pages/settings/SettingsBilling.tsx:190
+msgid "Are you sure that you want to change your billing interval?"
+msgstr "Sind Sie sicher, dass Sie Ihr Abrechnungsintervall ändern möchten?"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:73
+msgid "At least one authentication method must be enabled"
+msgstr "Mindestens eine Authentifizierungsmethode muss aktiviert sein"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:63
+msgid "Authentication"
+msgstr "Authentifizierung"
+
+#: src/pages/auth/Authorize.tsx:127
+msgid "Authorize"
+msgstr "Autorisieren Sie"
+
+#: src/pages/not-found/NotFound.tsx:58
+msgid "Back to content"
+msgstr "Zurück zum Inhalt"
+
+#: src/pages/settings/SettingsBilling.tsx:129
+#: src/pages/settings/SettingsBilling.tsx:135
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:149
+msgid "Billing"
+msgstr "Rechnungsstellung"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx:46
+msgid "Blocklist"
+msgstr "Blockliste"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:210
+msgid "Book a Call"
+msgstr "Buchen Sie einen Anruf"
+
+#: src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx:72
+msgid "Calculate"
+msgstr "Berechnen Sie"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:57
+msgid "Calendar"
+msgstr "Kalender"
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:14
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:24
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:78
+msgid "Calendars"
+msgstr "Kalendarien"
+
+#: src/pages/auth/Authorize.tsx:124
+#: src/modules/ui/layout/modal/components/ConfirmationModal.tsx:151
+#: src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx:198
+#: src/modules/settings/components/SaveAndCancelButtons/CancelButton.tsx:16
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: src/pages/settings/SettingsBilling.tsx:175
+msgid "Cancel Plan"
+msgstr "Plan stornieren"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:152
+msgid "Cancel anytime"
+msgstr "Jederzeit abbrechen"
+
+#: src/pages/settings/SettingsBilling.tsx:170
+msgid "Cancel your subscription"
+msgstr "Ihr Abonnement kündigen"
+
+#: src/pages/auth/PasswordReset.tsx:246
+#: src/modules/settings/profile/components/ChangePassword.tsx:52
+#: src/modules/settings/profile/components/ChangePassword.tsx:58
+msgid "Change Password"
+msgstr "Passwort ändern"
+
+#: src/pages/settings/SettingsBilling.tsx:194
+msgid "Change {to}"
+msgstr "Ändern {to}"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:86
+msgid "Chinese — Simplified"
+msgstr "Chinesisch - Vereinfacht"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:90
+msgid "Chinese — Traditional"
+msgstr "Chinesisch - Traditionell"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:281
+msgid "Choose an object"
+msgstr "Wählen Sie ein Objekt"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:147
+msgid "Choose your Trial"
+msgstr "Wählen Sie Ihre Probezeit"
+
+#: src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx:201
+msgid "Close"
+msgstr "Schließen Sie"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:133
+msgid "Companies"
+msgstr "Unternehmen"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:48
+msgid "Configure an SSO connection"
+msgstr "Konfigurieren Sie eine SSO-Verbindung"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:58
+msgid "Configure and customize your calendar preferences."
+msgstr "Konfigurieren Sie Ihre Kalendereinstellungen und passen Sie sie an."
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:43
+msgid "Configure how dates are displayed across the app"
+msgstr "Konfigurieren Sie die Anzeige von Daten in der App"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:34
+msgid "Configure your emails and calendar settings."
+msgstr "Konfigurieren Sie Ihre E-Mail- und Kalendereinstellungen."
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:13
+msgid "Connect a Google account"
+msgstr "Verbinden Sie ein Google-Konto"
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:11
+msgid "Connect a new account to your workspace"
+msgstr "Verbinden Sie ein neues Konto mit Ihrem Arbeitsbereich"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:51
+msgid "Connect with Google"
+msgstr "Mit Google verbinden"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:59
+msgid "Connect with Microsoft"
+msgstr "Verbindung mit Microsoft"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:56
+msgid "Connected accounts"
+msgstr "Verbundene Konten"
+
+#: src/pages/onboarding/InviteTeam.tsx:228
+#: src/pages/onboarding/ChooseYourPlan.tsx:198
+msgid "Continue"
+msgstr "Weiter"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:105
+msgid "Copilot"
+msgstr "Kopilot"
+
+#: src/pages/onboarding/InviteTeam.tsx:217
+msgid "Copy invitation link"
+msgstr "Link zur Einladung kopieren"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:183
+msgid "Copy this key as it will not be visible again"
+msgstr "Kopieren Sie diesen Schlüssel, da er nicht mehr sichtbar sein wird"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:56
+msgid "Create API key"
+msgstr "API-Schlüssel erstellen"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:72
+msgid "Create Webhook"
+msgstr "Webhook erstellen"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:149
+msgid "Custom Objects"
+msgstr "Benutzerdefinierte Objekte"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:90
+msgid "Custom objects"
+msgstr "Benutzerdefinierte Objekte"
+
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:28
+msgid "Customise the fields available in the {objectLabelSingular} views."
+msgstr "Passen Sie die in den {objectLabelSingular}-Ansichten verfügbaren Felder an."
+
+#: src/pages/settings/SettingsWorkspace.tsx:56
+msgid "Customize Domain"
+msgstr "Domäne anpassen"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:64
+msgid "Customize your workspace security"
+msgstr "Passen Sie die Sicherheit Ihres Arbeitsbereichs an"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:341
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:237
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:250
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:30
+#: src/modules/settings/profile/components/DeleteAccount.tsx:29
+msgid "Danger zone"
+msgstr "Gefahrenzone"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:144
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:155
+msgid "Data model"
+msgstr "Datenmodell"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:42
+msgid "Date and time"
+msgstr "Datum und Uhrzeit"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:259
+msgid "Deactivate"
+msgstr "Deaktivieren Sie"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:105
+msgid "Deactivate \"Synchronize Objects Labels and API Names\" to set a custom API name"
+msgstr "Deaktivieren Sie \"Objektbezeichnungen und API-Namen synchronisieren\", um einen benutzerdefinierten API-Namen festzulegen"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:251
+msgid "Deactivate this field"
+msgstr "Deaktivieren Sie dieses Feld"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:94
+msgid "Define the name and description of your object"
+msgstr "Definieren Sie den Namen und die Beschreibung Ihres Objekts"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:347
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:243
+msgid "Delete"
+msgstr "Löschen"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:256
+msgid "Delete API key"
+msgstr "API-Schlüssel löschen"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:332
+#: src/modules/settings/profile/components/DeleteAccount.tsx:37
+#: src/modules/settings/profile/components/DeleteAccount.tsx:53
+msgid "Delete account"
+msgstr "Konto löschen"
+
+#: src/modules/settings/profile/components/DeleteAccount.tsx:30
+msgid "Delete account and all the associated data"
+msgstr "Konto und alle zugehörigen Daten löschen"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:342
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:238
+msgid "Delete this integration"
+msgstr "Löschen Sie diese Integration"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:356
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:364
+msgid "Delete webhook"
+msgstr "Webhook löschen"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:36
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:54
+msgid "Delete workspace"
+msgstr "Arbeitsbereich löschen"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:31
+msgid "Delete your whole workspace"
+msgstr "Löschen Sie Ihren gesamten Arbeitsbereich"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:250
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:239
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:266
+msgid "Description"
+msgstr "Beschreibung"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:35
+#: src/pages/settings/developers/SettingsDevelopers.tsx:42
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:78
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:220
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:89
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:171
+msgid "Developers"
+msgstr "Entwickler"
+
+#: src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx:48
+msgid "Display as relative date"
+msgstr "Anzeige als relatives Datum"
+
+#: src/pages/settings/SettingsWorkspace.tsx:51
+#: src/pages/settings/workspace/SettingsDomain.tsx:125
+#: src/pages/settings/workspace/SettingsDomain.tsx:135
+#: src/pages/settings/workspace/SettingsDomain.tsx:150
+msgid "Domain"
+msgstr "Domäne"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:108
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:225
+msgid "E.g. backoffice integration"
+msgstr "Z.B. Backoffice-Integration"
+
+#: src/pages/settings/SettingsBilling.tsx:157
+msgid "Edit billing interval"
+msgstr "Abrechnungsintervall bearbeiten"
+
+#: src/pages/settings/SettingsBilling.tsx:145
+msgid "Edit payment method, see your invoices and more"
+msgstr "Zahlungsmethode bearbeiten, Rechnungen einsehen und mehr"
+
+#: src/pages/settings/SettingsWorkspace.tsx:52
+msgid "Edit your subdomain name or set a custom domain."
+msgstr "Bearbeiten Sie den Namen Ihrer Subdomain oder legen Sie eine benutzerdefinierte Domain fest."
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:180
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:256
+#: src/pages/settings/SettingsProfile.tsx:42
+#: src/pages/auth/PasswordReset.tsx:206
+msgid "Email"
+msgstr "E-Mail"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:89
+msgid "Email integration"
+msgstr "E-Mail-Integration"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:55
+msgid "Email or domain is already in blocklist"
+msgstr "E-Mail oder Domain ist bereits in der Blockliste"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:72
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:45
+msgid "Emails"
+msgstr "E-Mails"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:137
+msgid "Employees"
+msgstr "Mitarbeiter"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:96
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:238
+msgid "Endpoint URL"
+msgstr "Endpunkt-URL"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:82
+msgid "English"
+msgstr "Englisch"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:157
+msgid "Enjoy a {withCreditCardTrialPeriodDuration}-days free trial"
+msgstr "Genießen Sie eine {withCreditCardTrialPeriodDuration}-tägige kostenlose Testphase"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:51
+msgid "Enterprise"
+msgstr "Unternehmen"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:98
+msgid "Error deleting api key: {err}"
+msgstr "Fehler beim Löschen des Api-Schlüssels: {err}"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:150
+msgid "Error regenerating api key: {err}"
+msgstr "Fehler beim Regenerieren des Api-Schlüssels: {err}"
+
+#: src/pages/settings/SettingsBilling.tsx:121
+msgid "Error while switching subscription {to}."
+msgstr "Fehler beim Umschalten des Abonnements {to}."
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:66
+msgid "Establish Webhook endpoints for notifications on asynchronous events."
+msgstr "Erstellen Sie Webhook-Endpunkte für Benachrichtigungen über asynchrone Ereignisse."
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx:47
+msgid "Exclude the following people and domains from my email sync"
+msgstr "Die folgenden Personen und Domänen von der E-Mail-Synchronisierung ausschließen"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:167
+msgid "Existing objects"
+msgstr "Vorhandene Objekte"
+
+#: src/modules/navigation/components/AppNavigationDrawer.tsx:36
+msgid "Exit Settings"
+msgstr "Beenden der Einstellungen"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:26
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:32
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:108
+msgid "Experience"
+msgstr "Erfahrung"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:221
+msgid "Expiration"
+msgstr "Verfallsdatum"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:126
+msgid "Expiration Date"
+msgstr "Verfallsdatum"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:259
+msgid "Expires in"
+msgstr "Läuft ab in"
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:42
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:27
+msgid "Fields"
+msgstr "Felder"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:265
+msgid "Filters"
+msgstr "Filter"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:66
+msgid "French"
+msgstr "Französisch"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:87
+msgid "Full access"
+msgstr "Vollständiger Zugang"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:187
+msgid "Functions"
+msgstr "Funktionen"
+
+#: src/pages/settings/SettingsWorkspace.tsx:29
+#: src/pages/settings/SettingsWorkspace.tsx:35
+#: src/pages/settings/workspace/SettingsDomain.tsx:132
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:138
+msgid "General"
+msgstr "Allgemein"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:70
+msgid "German"
+msgstr "Deutsch"
+
+#: src/pages/onboarding/InviteTeam.tsx:184
+msgid "Get the most out of your workspace by inviting your team."
+msgstr "Holen Sie das Beste aus Ihrem Arbeitsplatz heraus, indem Sie Ihr Team einladen."
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:148
+msgid "Get your subscription"
+msgstr "Holen Sie sich Ihr Abonnement"
+
+#: src/pages/settings/SettingsWorkspace.tsx:65
+msgid "Grant Twenty support temporary access to your workspace so we can troubleshoot problems or recover content on your behalf. You can revoke access at any time."
+msgstr "Gewähren Sie dem Twenty-Support vorübergehend Zugang zu Ihrem Arbeitsbereich, damit wir Probleme beheben oder Inhalte in Ihrem Namen wiederherstellen können. Sie können den Zugriff jederzeit widerrufen."
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:208
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:239
+msgid "Icon and Name"
+msgstr "Icon und Name"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:275
+msgid "If you’ve lost this key, you can regenerate it, but be aware that any script using this key will need to be updated. Please type\"{confirmationValue}\" to confirm."
+msgstr "Wenn Sie diesen Schlüssel verloren haben, können Sie ihn neu generieren, aber beachten Sie, dass jedes Skript, das diesen Schlüssel verwendet, aktualisiert werden muss. Bitte geben Sie zur Bestätigung \"{confirmationValue}\" ein."
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:218
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:215
+msgid "Inactive"
+msgstr "Inaktiv"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:106
+msgid "Input must be in camel case and cannot start with a number"
+msgstr "Die Eingabe muss in Großbuchstaben erfolgen und darf nicht mit einer Zahl beginnen"
+
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:15
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:21
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:160
+msgid "Integrations"
+msgstr "Integrationen"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:57
+msgid "Invalid auth provider"
+msgstr "Ungültiger Autorisierungsanbieter"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:21
+msgid "Invalid email"
+msgstr "Ungültige E-Mail"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:44
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:50
+msgid "Invalid email or domain"
+msgstr "Ungültige E-Mail oder Domäne"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:87
+msgid "Invalid form values"
+msgstr "Ungültige Formularwerte"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:167
+msgid "Invite by Link"
+msgstr "Einladen per Link"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:244
+msgid "Invite by email"
+msgstr "Per E-Mail einladen"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:157
+msgid "Invite by link"
+msgstr "Per Link einladen"
+
+#: src/pages/onboarding/InviteTeam.tsx:152
+msgid "Invite link sent to email addresses"
+msgstr "Einladungslink an E-Mail-Adressen gesendet"
+
+#: src/pages/onboarding/InviteTeam.tsx:181
+msgid "Invite your team"
+msgstr "Laden Sie Ihr Team ein"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:74
+msgid "Italian"
+msgstr "Italienisch"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:51
+msgid "Language"
+msgstr "Sprache"
+
+#: src/pages/onboarding/InviteTeam.tsx:127
+msgid "Link copied to clipboard"
+msgstr "Link in die Zwischenablage kopiert"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:206
+msgid "Log out"
+msgstr "Abmelden"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:209
+msgid "Logout"
+msgstr "Abmeldung"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:167
+msgid "Manage Members"
+msgstr "Mitglieder verwalten"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:168
+msgid "Manage the members of your space here"
+msgstr "Verwalten Sie hier die Mitglieder Ihres Bereichs"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:57
+msgid "Manage your internet accounts."
+msgstr "Verwalten Sie Ihre Internetkonten."
+
+#: src/pages/settings/SettingsBilling.tsx:144
+msgid "Manage your subscription"
+msgstr "Verwalten Sie Ihr Abonnement"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:143
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:149
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:143
+msgid "Members"
+msgstr "Mitglieder"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:177
+#: src/pages/settings/SettingsWorkspace.tsx:44
+#: src/pages/settings/SettingsProfile.tsx:35
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:106
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:211
+#: src/modules/settings/workspace/components/NameField.tsx:91
+msgid "Name"
+msgstr "Name"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:106
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:211
+msgid "Name of your API key"
+msgstr "Name Ihres API-Schlüssels"
+
+#: src/pages/settings/SettingsWorkspace.tsx:44
+msgid "Name of your workspace"
+msgstr "Name Ihres Arbeitsbereichs"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:125
+msgid "Navigate"
+msgstr "Navigieren"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:79
+msgid "New"
+msgstr "Neu"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:92
+msgid "New Key"
+msgstr "Neuer Schlüssel"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:69
+msgid "New Object"
+msgstr "Neues Objekt"
+
+#: src/pages/auth/PasswordReset.tsx:233
+msgid "New Password"
+msgstr "Neues Passwort"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:81
+msgid "New Webhook"
+msgstr "Neuer Webhook"
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:10
+msgid "New account"
+msgstr "Neues Konto"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:82
+msgid "New key"
+msgstr "Neuer Schlüssel"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:46
+msgid "No connected account"
+msgstr "Kein verbundenes Konto"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:141
+msgid "Notes"
+msgstr "Anmerkungen"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:160
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:179
+#: src/pages/settings/data-model/SettingsNewObject.tsx:76
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:205
+msgid "Objects"
+msgstr "Objekte"
+
+#: src/pages/not-found/NotFound.tsx:47
+msgid "Off the beaten path"
+msgstr "Abseits der ausgetretenen Pfade"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:137
+msgid "Opportunities"
+msgstr "Möglichkeiten"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:195
+msgid "Other"
+msgstr "Andere"
+
+#: src/pages/not-found/NotFound.tsx:41
+msgid "Page Not Found"
+msgstr "Seite nicht gefunden"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:156
+msgid "Password"
+msgstr "Passwort"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:34
+msgid "Password reset link has been sent to the email"
+msgstr "Der Link zum Zurücksetzen des Passworts wurde an die E-Mail gesendet"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:129
+msgid "People"
+msgstr "Menschen"
+
+#: src/pages/settings/SettingsWorkspace.tsx:40
+#: src/pages/settings/SettingsProfile.tsx:30
+msgid "Picture"
+msgstr "Bild"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:102
+msgid "Please enter a valid URL"
+msgstr "Bitte geben Sie eine gültige URL ein"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:258
+msgid "Please type \"{confirmationValue}\" to confirm you want to delete this API Key. Be aware that any script using this key will stop working."
+msgstr "Bitte geben Sie \"{confirmationValue}\" ein, um zu bestätigen, dass Sie diesen API-Schlüssel löschen möchten. Beachten Sie, dass jedes Skript, das diesen Schlüssel verwendet, nicht mehr funktioniert."
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:358
+msgid "Please type {confirmationText} to confirm you want to delete this webhook."
+msgstr "Bitte geben Sie {confirmationText} ein, um zu bestätigen, dass Sie diesen Webhook löschen möchten."
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:62
+msgid "Portuguese"
+msgstr "Portugiesisch"
+
+#: src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx:62
+#: src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx:30
+msgid "Preview"
+msgstr "Vorschau"
+
+#: src/pages/settings/SettingsProfile.tsx:19
+#: src/pages/settings/SettingsProfile.tsx:25
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:103
+msgid "Profile"
+msgstr "Profil"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:97
+msgid "Pseudo-English"
+msgstr "Pseudo-Englisch"
+
+#: src/modules/settings/developers/components/SettingsReadDocumentationButton.tsx:9
+msgid "Read documentation"
+msgstr "Dokumentation lesen"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:53
+msgid "Receive an email containing password update link"
+msgstr "Sie erhalten eine E-Mail mit einem Link zur Passwortaktualisierung"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:109
+msgid "Record Selection"
+msgstr "Datensatz-Auswahl"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:195
+msgid "Regenerate Key"
+msgstr "Schlüssel regenerieren"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:191
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:273
+msgid "Regenerate an API key"
+msgstr "Einen API-Schlüssel neu generieren"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:282
+msgid "Regenerate key"
+msgstr "Schlüssel neu generieren"
+
+#: src/pages/settings/Releases.tsx:111
+#: src/pages/settings/Releases.tsx:117
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:204
+msgid "Releases"
+msgstr "Veröffentlichungen"
+
+#: src/modules/ui/input/components/ImageInput.tsx:173
+msgid "Remove"
+msgstr "Entfernen"
+
+#: src/pages/auth/PasswordReset.tsx:177
+msgid "Reset Password"
+msgstr "Passwort zurücksetzen"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:47
+msgid "SSO"
+msgstr "SSO"
+
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:44
+#: src/modules/navigation/components/MainNavigationDrawerItems.tsx:50
+msgid "Search"
+msgstr "Suche"
+
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:183
+msgid "Search a field..."
+msgstr "Ein Feld suchen..."
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:116
+msgid "Search an index..."
+msgstr "Suche in einem Index..."
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:171
+msgid "Search for an object..."
+msgstr "Suche nach einem Objekt..."
+
+#: src/pages/settings/security/SettingsSecurity.tsx:33
+#: src/pages/settings/security/SettingsSecurity.tsx:40
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:166
+msgid "Security"
+msgstr "Sicherheit"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:266
+msgid "Select the events you wish to send to this endpoint"
+msgstr "Wählen Sie die Ereignisse aus, die Sie an diesen Endpunkt senden möchten"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:52
+msgid "Select your preferred language"
+msgstr "Wählen Sie Ihre bevorzugte Sprache"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:245
+msgid "Send an invite email to your team"
+msgstr "Senden Sie eine Einladungs-E-Mail an Ihr Team"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:198
+msgid "Server Admin Panel"
+msgstr "Server-Verwaltungsbereich"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:46
+msgid "Set email visibility, manage your blocklist and more."
+msgstr "Legen Sie die Sichtbarkeit von E-Mails fest, verwalten Sie Ihre Blockliste und vieles mehr."
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:151
+msgid "Set the name of your subdomain"
+msgstr "Legen Sie den Namen Ihrer Subdomain fest"
+
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:50
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:33
+#: src/modules/navigation/components/MainNavigationDrawerItems.tsx:56
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:158
+msgid "Share this link to invite users to join your workspace"
+msgstr "Geben Sie diesen Link weiter, um Benutzer einzuladen, Ihrem Arbeitsbereich beizutreten"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:212
+msgid "Should changing a field's label also change the API name?"
+msgstr "Sollte die Änderung einer Feldbezeichnung auch den API-Namen ändern?"
+
+#: src/pages/onboarding/InviteTeam.tsx:236
+msgid "Skip"
+msgstr "Überspringen"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:78
+msgid "Spanish"
+msgstr "Spanisch"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:107
+msgid "Subdomain already taken"
+msgstr "Subdomain bereits belegt"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:49
+msgid "Subdomain can not be longer than 30 characters"
+msgstr "Die Subdomain darf nicht länger als 30 Zeichen sein"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:48
+msgid "Subdomain can not be shorter than 3 characters"
+msgstr "Die Subdomain darf nicht kürzer als 3 Zeichen sein"
+
+#: src/pages/settings/SettingsBilling.tsx:117
+msgid "Subscription has been switched {to}"
+msgstr "Das Abonnement wurde umgestellt {to}"
+
+#: src/pages/settings/SettingsWorkspace.tsx:63
+msgid "Support"
+msgstr "Unterstützung"
+
+#: src/pages/settings/SettingsBilling.tsx:188
+msgid "Switch billing {to}"
+msgstr "Abrechnung wechseln {to}"
+
+#: src/pages/settings/SettingsBilling.tsx:158
+msgid "Switch {from}"
+msgstr "Schalter {from}"
+
+#: src/pages/settings/SettingsBilling.tsx:162
+msgid "Switch {to}"
+msgstr "Schalter {to}"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:211
+msgid "Synchronize Field Label and API Name"
+msgstr "Feldbezeichnung und API-Name synchronisieren"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:55
+msgid "System Settings - {systemTimeFormatLabel}"
+msgstr "Systemeinstellungen - {systemTimeFormatLabel}"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx:42
+msgid "System settings - {systemDateFormatLabel}"
+msgstr "Systemeinstellungen - {systemDateFormatLabel}"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:145
+msgid "Tasks"
+msgstr "Aufgaben"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:240
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:267
+msgid "The description of this field"
+msgstr "Die Beschreibung dieses Feldes"
+
+#: src/pages/settings/SettingsProfile.tsx:43
+msgid "The email associated to your account"
+msgstr "Die mit Ihrem Konto verbundene E-Mail"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:209
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:240
+msgid "The name and icon of this field"
+msgstr "Der Name und das Symbol dieses Feldes"
+
+#: src/pages/not-found/NotFound.tsx:50
+msgid "The page you're seeking is either gone or never was. Let's get you back on track"
+msgstr "Die Seite, die Sie suchen, ist entweder nicht mehr vorhanden oder wurde nie angezeigt. Bringen wir Sie wieder auf den richtigen Weg"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:229
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:252
+msgid "The values of this field"
+msgstr "Die Werte dieses Feldes"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:224
+msgid "The values of this field must be unique"
+msgstr "Die Werte dieses Feldes müssen eindeutig sein"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:38
+msgid "There was an issue"
+msgstr "Es gab ein Problem"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:323
+msgid "This action cannot be undone. This will permanently delete this user and remove them from all their assignments."
+msgstr "Diese Aktion kann nicht rückgängig gemacht werden. Dadurch wird dieser Benutzer dauerhaft gelöscht und aus allen seinen Aufgaben entfernt."
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:48
+msgid "This action cannot be undone. This will permanently delete your entire workspace. <0/> Please type in your email to confirm."
+msgstr "Diese Aktion kann nicht rückgängig gemacht werden. Dadurch wird Ihr gesamter Arbeitsbereich dauerhaft gelöscht. <0/> Bitte geben Sie Ihre E-Mail zur Bestätigung ein."
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:49
+msgid "Time format"
+msgstr "Zeitformat"
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:55
+msgid "Type"
+msgstr "Typ"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:100
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:242
+msgid "URL"
+msgstr "URL"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:88
+msgid "Unlimited contacts"
+msgstr "Unbegrenzte Kontakte"
+
+#: src/modules/ui/input/components/ImageInput.tsx:165
+msgid "Upload"
+msgstr "Hochladen"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:51
+msgid "Use letter, number and dash only. Start and finish with a letter or a number"
+msgstr "Verwenden Sie nur Buchstaben, Zahlen und Bindestriche. Beginnen und enden Sie mit einem Buchstaben oder einer Zahl"
+
+#: src/pages/settings/SettingsProfile.tsx:22
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:29
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:17
+#: src/pages/settings/accounts/SettingsAccounts.tsx:43
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:101
+msgid "User"
+msgstr "Benutzer"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:51
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:106
+msgid "User is not logged in"
+msgstr "Benutzer ist nicht eingeloggt"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:223
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:228
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:251
+msgid "Values"
+msgstr "Werte"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:117
+msgid "View"
+msgstr "Siehe"
+
+#: src/pages/settings/SettingsBilling.tsx:149
+msgid "View billing details"
+msgstr "Details zur Rechnungsstellung anzeigen"
+
+#: src/modules/settings/data-model/objects/components/SettingsObjectCoverImage.tsx:35
+msgid "Visualize"
+msgstr "Visualisieren Sie"
+
+#: src/modules/ui/input/components/ImageInput.tsx:178
+msgid "We support your square PNGs, JPEGs and GIFs under 10MB"
+msgstr "Wir unterstützen Ihre quadratischen PNGs, JPEGs und GIFs unter 10MB"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:97
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:239
+msgid "We will send POST requests to this endpoint for every new event"
+msgstr "Für jedes neue Ereignis werden POST-Anfragen an diesen Endpunkt gesendet"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:223
+msgid "Webhook"
+msgstr "Webhook"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:65
+msgid "Webhooks"
+msgstr "Webhooks"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:127
+msgid "When the API key will expire."
+msgstr "Wann der API-Schlüssel abläuft."
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:222
+msgid "When the key will be disabled"
+msgstr "Wenn die Taste deaktiviert wird"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:113
+msgid "Workflow Record Selection"
+msgstr "Workflow Datensatzauswahl"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:121
+msgid "Workflows"
+msgstr "Arbeitsabläufe"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:146
+#: src/pages/settings/SettingsWorkspace.tsx:32
+#: src/pages/settings/SettingsBilling.tsx:132
+#: src/pages/settings/Releases.tsx:114
+#: src/pages/settings/workspace/SettingsDomain.tsx:128
+#: src/pages/settings/security/SettingsSecurity.tsx:37
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:18
+#: src/pages/settings/developers/SettingsDevelopers.tsx:39
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:74
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:216
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:85
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:167
+#: src/pages/settings/data-model/SettingsObjects.tsx:157
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:175
+#: src/pages/settings/data-model/SettingsNewObject.tsx:72
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:201
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:58
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:136
+msgid "Workspace"
+msgstr "Arbeitsbereich"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:46
+msgid "Workspace Deletion"
+msgstr "Löschen von Arbeitsbereichen"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:254
+msgid "Write a description"
+msgstr "Schreiben Sie eine Beschreibung"
+
+#: src/pages/settings/SettingsBilling.tsx:46
+msgid "You will be charged immediately for the full year."
+msgstr "Sie werden sofort für das gesamte Jahr belastet."
+
+#: src/pages/settings/SettingsBilling.tsx:53
+msgid "Your credit balance will be used to pay the monthly bills."
+msgstr "Ihr Guthaben wird zur Begleichung der monatlichen Rechnungen verwendet."
+
+#: src/pages/settings/SettingsProfile.tsx:36
+msgid "Your name as it will be displayed"
+msgstr "Ihr Name, wie er angezeigt werden soll"
+
+#: src/pages/settings/SettingsBilling.tsx:171
+msgid "Your workspace will be disabled"
+msgstr "Ihr Arbeitsbereich wird deaktiviert"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:167
+msgid "employees"
+msgstr "mitarbeiter"
+
+#: src/pages/settings/SettingsBilling.tsx:45
+msgid "from monthly to yearly"
+msgstr "von monatlich bis jährlich"
+
+#: src/pages/settings/SettingsBilling.tsx:52
+msgid "from yearly to monthly"
+msgstr "von jährlich auf monatlich"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:108
+msgid "not allowed"
+msgstr "nicht erlaubt"
+
+#: src/pages/onboarding/InviteTeam.tsx:213
+msgid "or"
+msgstr "oder"
+
+#: src/pages/settings/SettingsBilling.tsx:51
+msgid "to monthly"
+msgstr "auf monatlich"
+
+#: src/pages/settings/SettingsBilling.tsx:44
+msgid "to yearly"
+msgstr "bis jährlich"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:209
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:158
+msgid "yes"
+msgstr "ja"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:174
+msgid "{apiKeyName} API Key"
+msgstr "{apiKeyName} API-Schlüssel"
diff --git a/packages/twenty-front/src/locales/en.po b/packages/twenty-front/src/locales/en.po
new file mode 100644
index 000000000000..ee70a85a19b3
--- /dev/null
+++ b/packages/twenty-front/src/locales/en.po
@@ -0,0 +1,1234 @@
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2025-01-16 21:57+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: @lingui/cli\n"
+"Language: en\n"
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Plural-Forms: \n"
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:126
+#~ msgid "{0}"
+#~ msgstr "{0}"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:174
+msgid "{apiKeyName} API Key"
+msgstr "{apiKeyName} API Key"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:92
+msgid "1 000 workflow node executions"
+msgstr "1 000 workflow node executions"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:63
+msgid "12h ({hour12Label})"
+msgstr "12h ({hour12Label})"
+
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:198
+msgid "2. Configure field"
+msgstr "2. Configure field"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:59
+msgid "24h ({hour24Label})"
+msgstr "24h ({hour24Label})"
+
+#: src/modules/ui/input/components/ImageInput.tsx:157
+msgid "Abort"
+msgstr "Abort"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:93
+msgid "About"
+msgstr "About"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:40
+#: src/pages/settings/accounts/SettingsAccounts.tsx:46
+msgid "Account"
+msgstr "Account"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:321
+#: src/modules/settings/profile/components/DeleteAccount.tsx:45
+msgid "Account Deletion"
+msgstr "Account Deletion"
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:21
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:114
+msgid "Accounts"
+msgstr "Accounts"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:259
+msgid "Activate"
+msgstr "Activate"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:193
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:201
+msgid "Active"
+msgstr "Active"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:50
+msgid "Active API keys created by you or your team."
+msgstr "Active API keys created by you or your team."
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:50
+#~ msgid "Active APIs keys created by you or your team."
+#~ msgstr "Active APIs keys created by you or your team."
+
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:39
+msgid "Add Field"
+msgstr "Add Field"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:149
+msgid "Add object"
+msgstr "Add object"
+
+#: src/modules/settings/security/components/SettingsSSOIdentitiesProvidersListCard.tsx:59
+msgid "Add SSO Identity Provider"
+msgstr "Add SSO Identity Provider"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:105
+msgid "Add to blocklist"
+msgstr "Add to blocklist"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:135
+msgid "Allow logins through Google's single sign-on functionality."
+msgstr "Allow logins through Google's single sign-on functionality."
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:146
+msgid "Allow logins through Microsoft's single sign-on functionality."
+msgstr "Allow logins through Microsoft's single sign-on functionality."
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:168
+msgid "Allow the invitation of new users by sharing an invite link."
+msgstr "Allow the invitation of new users by sharing an invite link."
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:157
+msgid "Allow users to sign in with an email and password."
+msgstr "Allow users to sign in with an email and password."
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:251
+msgid "An optional description"
+msgstr "An optional description"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:91
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:179
+msgid "API & Webhooks"
+msgstr "API & Webhooks"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:182
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:190
+msgid "API Key"
+msgstr "API Key"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:49
+msgid "API keys"
+msgstr "API keys"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:166
+msgid "API Name"
+msgstr "API Name"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:37
+msgid "Appearance"
+msgstr "Appearance"
+
+#: src/pages/settings/SettingsBilling.tsx:190
+msgid "Are you sure that you want to change your billing interval?"
+msgstr "Are you sure that you want to change your billing interval?"
+
+#: src/pages/settings/SettingsBilling.tsx:190
+#~ msgid "Are you sure that you want to change your billing interval? {5}"
+#~ msgstr "Are you sure that you want to change your billing interval? {5}"
+
+#: src/pages/settings/SettingsBilling.tsx:189
+#~ msgid "Are you sure that you want to change your billing interval? {impact}"
+#~ msgstr "Are you sure that you want to change your billing interval? {impact}"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:73
+msgid "At least one authentication method must be enabled"
+msgstr "At least one authentication method must be enabled"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:63
+msgid "Authentication"
+msgstr "Authentication"
+
+#: src/pages/auth/Authorize.tsx:127
+msgid "Authorize"
+msgstr "Authorize"
+
+#: src/pages/not-found/NotFound.tsx:58
+msgid "Back to content"
+msgstr "Back to content"
+
+#: src/pages/settings/SettingsBilling.tsx:129
+#: src/pages/settings/SettingsBilling.tsx:135
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:149
+msgid "Billing"
+msgstr "Billing"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx:46
+msgid "Blocklist"
+msgstr "Blocklist"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:210
+msgid "Book a Call"
+msgstr "Book a Call"
+
+#: src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx:72
+msgid "Calculate"
+msgstr "Calculate"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:57
+msgid "Calendar"
+msgstr "Calendar"
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:14
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:24
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:78
+msgid "Calendars"
+msgstr "Calendars"
+
+#: src/pages/auth/Authorize.tsx:124
+#: src/modules/ui/layout/modal/components/ConfirmationModal.tsx:151
+#: src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx:198
+#: src/modules/settings/components/SaveAndCancelButtons/CancelButton.tsx:16
+msgid "Cancel"
+msgstr "Cancel"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:152
+msgid "Cancel anytime"
+msgstr "Cancel anytime"
+
+#: src/pages/settings/SettingsBilling.tsx:175
+msgid "Cancel Plan"
+msgstr "Cancel Plan"
+
+#: src/pages/settings/SettingsBilling.tsx:170
+msgid "Cancel your subscription"
+msgstr "Cancel your subscription"
+
+#: src/pages/settings/SettingsBilling.tsx:194
+#~ msgid "Change {6}"
+#~ msgstr "Change {6}"
+
+#: src/pages/settings/SettingsBilling.tsx:194
+msgid "Change {to}"
+msgstr "Change {to}"
+
+#: src/pages/auth/PasswordReset.tsx:246
+#: src/modules/settings/profile/components/ChangePassword.tsx:52
+#: src/modules/settings/profile/components/ChangePassword.tsx:58
+msgid "Change Password"
+msgstr "Change Password"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:86
+#~ msgid "Chinese"
+#~ msgstr "Chinese"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:86
+msgid "Chinese — Simplified"
+msgstr "Chinese — Simplified"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:90
+msgid "Chinese — Traditional"
+msgstr "Chinese — Traditional"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:281
+msgid "Choose an object"
+msgstr "Choose an object"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:147
+msgid "Choose your Trial"
+msgstr "Choose your Trial"
+
+#: src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx:201
+msgid "Close"
+msgstr "Close"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:133
+msgid "Companies"
+msgstr "Companies"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:48
+msgid "Configure an SSO connection"
+msgstr "Configure an SSO connection"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:58
+msgid "Configure and customize your calendar preferences."
+msgstr "Configure and customize your calendar preferences."
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:43
+msgid "Configure how dates are displayed across the app"
+msgstr "Configure how dates are displayed across the app"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:34
+msgid "Configure your emails and calendar settings."
+msgstr "Configure your emails and calendar settings."
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:13
+msgid "Connect a Google account"
+msgstr "Connect a Google account"
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:11
+msgid "Connect a new account to your workspace"
+msgstr "Connect a new account to your workspace"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:51
+msgid "Connect with Google"
+msgstr "Connect with Google"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:59
+msgid "Connect with Microsoft"
+msgstr "Connect with Microsoft"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:56
+msgid "Connected accounts"
+msgstr "Connected accounts"
+
+#: src/pages/onboarding/InviteTeam.tsx:228
+#: src/pages/onboarding/ChooseYourPlan.tsx:198
+msgid "Continue"
+msgstr "Continue"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:105
+msgid "Copilot"
+msgstr "Copilot"
+
+#: src/pages/onboarding/InviteTeam.tsx:217
+msgid "Copy invitation link"
+msgstr "Copy invitation link"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:183
+msgid "Copy this key as it will not be visible again"
+msgstr "Copy this key as it will not be visible again"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:172
+#~ msgid "Copy this key as it will only be visible this one time"
+#~ msgstr "Copy this key as it will only be visible this one time"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:56
+msgid "Create API key"
+msgstr "Create API key"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:72
+msgid "Create Webhook"
+msgstr "Create Webhook"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:90
+msgid "Custom objects"
+msgstr "Custom objects"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:149
+msgid "Custom Objects"
+msgstr "Custom Objects"
+
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:28
+msgid "Customise the fields available in the {objectLabelSingular} views."
+msgstr "Customise the fields available in the {objectLabelSingular} views."
+
+#: src/pages/settings/SettingsWorkspace.tsx:56
+msgid "Customize Domain"
+msgstr "Customize Domain"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:64
+msgid "Customize your workspace security"
+msgstr "Customize your workspace security"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:341
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:237
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:250
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:30
+#: src/modules/settings/profile/components/DeleteAccount.tsx:29
+msgid "Danger zone"
+msgstr "Danger zone"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:144
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:155
+msgid "Data model"
+msgstr "Data model"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:42
+msgid "Date and time"
+msgstr "Date and time"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:259
+msgid "Deactivate"
+msgstr "Deactivate"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:105
+msgid "Deactivate \"Synchronize Objects Labels and API Names\" to set a custom API name"
+msgstr "Deactivate \"Synchronize Objects Labels and API Names\" to set a custom API name"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:251
+msgid "Deactivate this field"
+msgstr "Deactivate this field"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:94
+msgid "Define the name and description of your object"
+msgstr "Define the name and description of your object"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:347
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:243
+msgid "Delete"
+msgstr "Delete"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:332
+#: src/modules/settings/profile/components/DeleteAccount.tsx:37
+#: src/modules/settings/profile/components/DeleteAccount.tsx:53
+msgid "Delete account"
+msgstr "Delete account"
+
+#: src/modules/settings/profile/components/DeleteAccount.tsx:30
+msgid "Delete account and all the associated data"
+msgstr "Delete account and all the associated data"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:256
+msgid "Delete API key"
+msgstr "Delete API key"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:342
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:238
+msgid "Delete this integration"
+msgstr "Delete this integration"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:356
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:364
+msgid "Delete webhook"
+msgstr "Delete webhook"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:36
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:54
+msgid "Delete workspace"
+msgstr "Delete workspace"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:31
+msgid "Delete your whole workspace"
+msgstr "Delete your whole workspace"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:250
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:239
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:266
+msgid "Description"
+msgstr "Description"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:35
+#: src/pages/settings/developers/SettingsDevelopers.tsx:42
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:78
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:220
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:89
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:171
+msgid "Developers"
+msgstr "Developers"
+
+#: src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx:48
+msgid "Display as relative date"
+msgstr "Display as relative date"
+
+#: src/pages/settings/SettingsWorkspace.tsx:51
+#: src/pages/settings/workspace/SettingsDomain.tsx:125
+#: src/pages/settings/workspace/SettingsDomain.tsx:135
+#: src/pages/settings/workspace/SettingsDomain.tsx:150
+msgid "Domain"
+msgstr "Domain"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:108
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:225
+msgid "E.g. backoffice integration"
+msgstr "E.g. backoffice integration"
+
+#: src/pages/settings/SettingsBilling.tsx:157
+msgid "Edit billing interval"
+msgstr "Edit billing interval"
+
+#: src/pages/settings/SettingsBilling.tsx:145
+msgid "Edit payment method, see your invoices and more"
+msgstr "Edit payment method, see your invoices and more"
+
+#: src/pages/settings/SettingsWorkspace.tsx:52
+msgid "Edit your subdomain name or set a custom domain."
+msgstr "Edit your subdomain name or set a custom domain."
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:180
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:256
+#: src/pages/settings/SettingsProfile.tsx:42
+#: src/pages/auth/PasswordReset.tsx:206
+msgid "Email"
+msgstr "Email"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:89
+msgid "Email integration"
+msgstr "Email integration"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:55
+msgid "Email or domain is already in blocklist"
+msgstr "Email or domain is already in blocklist"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:72
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:45
+msgid "Emails"
+msgstr "Emails"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:167
+msgid "employees"
+msgstr "employees"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:137
+msgid "Employees"
+msgstr "Employees"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:96
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:238
+msgid "Endpoint URL"
+msgstr "Endpoint URL"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:82
+msgid "English"
+msgstr "English"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:157
+msgid "Enjoy a {withCreditCardTrialPeriodDuration}-days free trial"
+msgstr "Enjoy a {withCreditCardTrialPeriodDuration}-days free trial"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:51
+msgid "Enterprise"
+msgstr "Enterprise"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:98
+msgid "Error deleting api key: {err}"
+msgstr "Error deleting api key: {err}"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:150
+msgid "Error regenerating api key: {err}"
+msgstr "Error regenerating api key: {err}"
+
+#: src/pages/settings/SettingsBilling.tsx:118
+#~ msgid "Error while switching subscription {1}."
+#~ msgstr "Error while switching subscription {1}."
+
+#: src/pages/settings/SettingsBilling.tsx:121
+msgid "Error while switching subscription {to}."
+msgstr "Error while switching subscription {to}."
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:66
+msgid "Establish Webhook endpoints for notifications on asynchronous events."
+msgstr "Establish Webhook endpoints for notifications on asynchronous events."
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx:47
+msgid "Exclude the following people and domains from my email sync"
+msgstr "Exclude the following people and domains from my email sync"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:167
+msgid "Existing objects"
+msgstr "Existing objects"
+
+#: src/modules/navigation/components/AppNavigationDrawer.tsx:36
+#~ msgid "Exit settings"
+#~ msgstr "Exit settings"
+
+#: src/modules/navigation/components/AppNavigationDrawer.tsx:36
+msgid "Exit Settings"
+msgstr "Exit Settings"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:26
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:32
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:108
+msgid "Experience"
+msgstr "Experience"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:221
+msgid "Expiration"
+msgstr "Expiration"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:126
+msgid "Expiration Date"
+msgstr "Expiration Date"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:259
+msgid "Expires in"
+msgstr "Expires in"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:57
+#~ msgid "Failed to create object"
+#~ msgstr "Failed to create object"
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:42
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:27
+msgid "Fields"
+msgstr "Fields"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:265
+msgid "Filters"
+msgstr "Filters"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:66
+msgid "French"
+msgstr "French"
+
+#: src/pages/settings/SettingsBilling.tsx:45
+msgid "from monthly to yearly"
+msgstr "from monthly to yearly"
+
+#: src/pages/settings/SettingsBilling.tsx:52
+msgid "from yearly to monthly"
+msgstr "from yearly to monthly"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:87
+msgid "Full access"
+msgstr "Full access"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:187
+msgid "Functions"
+msgstr "Functions"
+
+#: src/pages/settings/SettingsWorkspace.tsx:29
+#: src/pages/settings/SettingsWorkspace.tsx:35
+#: src/pages/settings/workspace/SettingsDomain.tsx:132
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:138
+msgid "General"
+msgstr "General"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:70
+msgid "German"
+msgstr "German"
+
+#: src/pages/onboarding/InviteTeam.tsx:184
+msgid "Get the most out of your workspace by inviting your team."
+msgstr "Get the most out of your workspace by inviting your team."
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:148
+msgid "Get your subscription"
+msgstr "Get your subscription"
+
+#: src/pages/settings/SettingsWorkspace.tsx:65
+msgid "Grant Twenty support temporary access to your workspace so we can troubleshoot problems or recover content on your behalf. You can revoke access at any time."
+msgstr "Grant Twenty support temporary access to your workspace so we can troubleshoot problems or recover content on your behalf. You can revoke access at any time."
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:208
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:239
+msgid "Icon and Name"
+msgstr "Icon and Name"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:275
+msgid "If you’ve lost this key, you can regenerate it, but be aware that any script using this key will need to be updated. Please type\"{confirmationValue}\" to confirm."
+msgstr "If you’ve lost this key, you can regenerate it, but be aware that any script using this key will need to be updated. Please type\"{confirmationValue}\" to confirm."
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:218
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:215
+msgid "Inactive"
+msgstr "Inactive"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:106
+msgid "Input must be in camel case and cannot start with a number"
+msgstr "Input must be in camel case and cannot start with a number"
+
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:15
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:21
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:160
+msgid "Integrations"
+msgstr "Integrations"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:57
+msgid "Invalid auth provider"
+msgstr "Invalid auth provider"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:21
+msgid "Invalid email"
+msgstr "Invalid email"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:44
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:50
+msgid "Invalid email or domain"
+msgstr "Invalid email or domain"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:87
+msgid "Invalid form values"
+msgstr "Invalid form values"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:53
+#~ msgid "Invalid object data"
+#~ msgstr "Invalid object data"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:244
+msgid "Invite by email"
+msgstr "Invite by email"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:157
+msgid "Invite by link"
+msgstr "Invite by link"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:167
+msgid "Invite by Link"
+msgstr "Invite by Link"
+
+#: src/pages/onboarding/InviteTeam.tsx:152
+msgid "Invite link sent to email addresses"
+msgstr "Invite link sent to email addresses"
+
+#: src/pages/onboarding/InviteTeam.tsx:181
+msgid "Invite your team"
+msgstr "Invite your team"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:74
+msgid "Italian"
+msgstr "Italian"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:51
+msgid "Language"
+msgstr "Language"
+
+#: src/pages/onboarding/InviteTeam.tsx:127
+msgid "Link copied to clipboard"
+msgstr "Link copied to clipboard"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:206
+msgid "Log out"
+msgstr "Log out"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:209
+msgid "Logout"
+msgstr "Logout"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:167
+msgid "Manage Members"
+msgstr "Manage Members"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:168
+msgid "Manage the members of your space here"
+msgstr "Manage the members of your space here"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:57
+msgid "Manage your internet accounts."
+msgstr "Manage your internet accounts."
+
+#: src/pages/settings/SettingsBilling.tsx:144
+msgid "Manage your subscription"
+msgstr "Manage your subscription"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:143
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:149
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:143
+msgid "Members"
+msgstr "Members"
+
+#: src/pages/settings/crm-migration/SettingsCRMMigration.tsx:22
+#: src/pages/settings/crm-migration/SettingsCRMMigration.tsx:28
+#~ msgid "Migrate"
+#~ msgstr "Migrate"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:177
+#: src/pages/settings/SettingsWorkspace.tsx:44
+#: src/pages/settings/SettingsProfile.tsx:35
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:106
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:211
+#: src/modules/settings/workspace/components/NameField.tsx:91
+msgid "Name"
+msgstr "Name"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:106
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:211
+msgid "Name of your API key"
+msgstr "Name of your API key"
+
+#: src/pages/settings/SettingsWorkspace.tsx:44
+msgid "Name of your workspace"
+msgstr "Name of your workspace"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:125
+msgid "Navigate"
+msgstr "Navigate"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:79
+msgid "New"
+msgstr "New"
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:10
+msgid "New account"
+msgstr "New account"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:82
+msgid "New key"
+msgstr "New key"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:92
+msgid "New Key"
+msgstr "New Key"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:69
+msgid "New Object"
+msgstr "New Object"
+
+#: src/pages/auth/PasswordReset.tsx:233
+msgid "New Password"
+msgstr "New Password"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:81
+msgid "New Webhook"
+msgstr "New Webhook"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:46
+msgid "No connected account"
+msgstr "No connected account"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:108
+msgid "not allowed"
+msgstr "not allowed"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:141
+msgid "Notes"
+msgstr "Notes"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:46
+#~ msgid "Object created successfully"
+#~ msgstr "Object created successfully"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:160
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:179
+#: src/pages/settings/data-model/SettingsNewObject.tsx:76
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:205
+msgid "Objects"
+msgstr "Objects"
+
+#: src/pages/not-found/NotFound.tsx:47
+msgid "Off the beaten path"
+msgstr "Off the beaten path"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:137
+msgid "Opportunities"
+msgstr "Opportunities"
+
+#: src/pages/onboarding/InviteTeam.tsx:213
+msgid "or"
+msgstr "or"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:195
+msgid "Other"
+msgstr "Other"
+
+#: src/pages/not-found/NotFound.tsx:41
+msgid "Page Not Found"
+msgstr "Page Not Found"
+
+#: src/pages/not-found/NotFound.tsx:41
+#~ msgid "Page Not Found | Twenty"
+#~ msgstr "Page Not Found | Twenty"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:156
+msgid "Password"
+msgstr "Password"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:34
+msgid "Password reset link has been sent to the email"
+msgstr "Password reset link has been sent to the email"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:129
+msgid "People"
+msgstr "People"
+
+#: src/pages/settings/SettingsWorkspace.tsx:40
+#: src/pages/settings/SettingsProfile.tsx:30
+msgid "Picture"
+msgstr "Picture"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:102
+msgid "Please enter a valid URL"
+msgstr "Please enter a valid URL"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:258
+msgid "Please type \"{confirmationValue}\" to confirm you want to delete this API Key. Be aware that any script using this key will stop working."
+msgstr "Please type \"{confirmationValue}\" to confirm you want to delete this API Key. Be aware that any script using this key will stop working."
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:358
+msgid "Please type {confirmationText} to confirm you want to delete this webhook."
+msgstr "Please type {confirmationText} to confirm you want to delete this webhook."
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:62
+msgid "Portuguese"
+msgstr "Portuguese"
+
+#: src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx:62
+#: src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx:30
+msgid "Preview"
+msgstr "Preview"
+
+#: src/pages/settings/SettingsProfile.tsx:19
+#: src/pages/settings/SettingsProfile.tsx:25
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:103
+msgid "Profile"
+msgstr "Profile"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:97
+msgid "Pseudo-English"
+msgstr "Pseudo-English"
+
+#: src/modules/settings/developers/components/SettingsReadDocumentationButton.tsx:9
+msgid "Read documentation"
+msgstr "Read documentation"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:53
+msgid "Receive an email containing password update link"
+msgstr "Receive an email containing password update link"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:109
+msgid "Record Selection"
+msgstr "Record Selection"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:191
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:273
+msgid "Regenerate an API key"
+msgstr "Regenerate an API key"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:282
+msgid "Regenerate key"
+msgstr "Regenerate key"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:195
+msgid "Regenerate Key"
+msgstr "Regenerate Key"
+
+#: src/pages/settings/Releases.tsx:111
+#: src/pages/settings/Releases.tsx:117
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:204
+msgid "Releases"
+msgstr "Releases"
+
+#: src/modules/ui/input/components/ImageInput.tsx:173
+msgid "Remove"
+msgstr "Remove"
+
+#: src/pages/auth/PasswordReset.tsx:177
+msgid "Reset Password"
+msgstr "Reset Password"
+
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:44
+#: src/modules/navigation/components/MainNavigationDrawerItems.tsx:50
+msgid "Search"
+msgstr "Search"
+
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:183
+msgid "Search a field..."
+msgstr "Search a field..."
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:116
+msgid "Search an index..."
+msgstr "Search an index..."
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:171
+#~ msgid "Search an object..."
+#~ msgstr "Search an object..."
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:171
+msgid "Search for an object..."
+msgstr "Search for an object..."
+
+#: src/pages/settings/security/SettingsSecurity.tsx:33
+#: src/pages/settings/security/SettingsSecurity.tsx:40
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:166
+msgid "Security"
+msgstr "Security"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:266
+msgid "Select the events you wish to send to this endpoint"
+msgstr "Select the events you wish to send to this endpoint"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:52
+msgid "Select your preferred language"
+msgstr "Select your preferred language"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:245
+msgid "Send an invite email to your team"
+msgstr "Send an invite email to your team"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:198
+msgid "Server Admin Panel"
+msgstr "Server Admin Panel"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:46
+msgid "Set email visibility, manage your blocklist and more."
+msgstr "Set email visibility, manage your blocklist and more."
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:151
+msgid "Set the name of your subdomain"
+msgstr "Set the name of your subdomain"
+
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:50
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:33
+#: src/modules/navigation/components/MainNavigationDrawerItems.tsx:56
+msgid "Settings"
+msgstr "Settings"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:158
+msgid "Share this link to invite users to join your workspace"
+msgstr "Share this link to invite users to join your workspace"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:212
+msgid "Should changing a field's label also change the API name?"
+msgstr "Should changing a field's label also change the API name?"
+
+#: src/pages/onboarding/InviteTeam.tsx:236
+msgid "Skip"
+msgstr "Skip"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:78
+msgid "Spanish"
+msgstr "Spanish"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:47
+msgid "SSO"
+msgstr "SSO"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:107
+msgid "Subdomain already taken"
+msgstr "Subdomain already taken"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:49
+msgid "Subdomain can not be longer than 30 characters"
+msgstr "Subdomain can not be longer than 30 characters"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:48
+msgid "Subdomain can not be shorter than 3 characters"
+msgstr "Subdomain can not be shorter than 3 characters"
+
+#: src/pages/settings/SettingsBilling.tsx:113
+#~ msgid "Subscription has been switched {0}"
+#~ msgstr "Subscription has been switched {0}"
+
+#: src/pages/settings/SettingsBilling.tsx:117
+msgid "Subscription has been switched {to}"
+msgstr "Subscription has been switched {to}"
+
+#: src/pages/settings/SettingsWorkspace.tsx:63
+msgid "Support"
+msgstr "Support"
+
+#: src/pages/settings/SettingsBilling.tsx:157
+#~ msgid "Switch {2}"
+#~ msgstr "Switch {2}"
+
+#: src/pages/settings/SettingsBilling.tsx:161
+#~ msgid "Switch {3}"
+#~ msgstr "Switch {3}"
+
+#: src/pages/settings/SettingsBilling.tsx:158
+msgid "Switch {from}"
+msgstr "Switch {from}"
+
+#: src/pages/settings/SettingsBilling.tsx:162
+msgid "Switch {to}"
+msgstr "Switch {to}"
+
+#: src/pages/settings/SettingsBilling.tsx:187
+#~ msgid "Switch billing {4}"
+#~ msgstr "Switch billing {4}"
+
+#: src/pages/settings/SettingsBilling.tsx:188
+msgid "Switch billing {to}"
+msgstr "Switch billing {to}"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:211
+msgid "Synchronize Field Label and API Name"
+msgstr "Synchronize Field Label and API Name"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx:42
+msgid "System settings - {systemDateFormatLabel}"
+msgstr "System settings - {systemDateFormatLabel}"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:55
+msgid "System Settings - {systemTimeFormatLabel}"
+msgstr "System Settings - {systemTimeFormatLabel}"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:145
+msgid "Tasks"
+msgstr "Tasks"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:240
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:267
+msgid "The description of this field"
+msgstr "The description of this field"
+
+#: src/pages/settings/SettingsProfile.tsx:43
+msgid "The email associated to your account"
+msgstr "The email associated to your account"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:209
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:240
+msgid "The name and icon of this field"
+msgstr "The name and icon of this field"
+
+#: src/pages/not-found/NotFound.tsx:50
+msgid "The page you're seeking is either gone or never was. Let's get you back on track"
+msgstr "The page you're seeking is either gone or never was. Let's get you back on track"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:229
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:252
+msgid "The values of this field"
+msgstr "The values of this field"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:224
+msgid "The values of this field must be unique"
+msgstr "The values of this field must be unique"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:38
+msgid "There was an issue"
+msgstr "There was an issue"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:323
+#~ msgid "This action cannot be undone. This will permanently delete this user and remove them from all their assignements."
+#~ msgstr "This action cannot be undone. This will permanently delete this user and remove them from all their assignements."
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:323
+msgid "This action cannot be undone. This will permanently delete this user and remove them from all their assignments."
+msgstr "This action cannot be undone. This will permanently delete this user and remove them from all their assignments."
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:48
+msgid "This action cannot be undone. This will permanently delete your entire workspace. <0/> Please type in your email to confirm."
+msgstr "This action cannot be undone. This will permanently delete your entire workspace. <0/> Please type in your email to confirm."
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:49
+msgid "Time format"
+msgstr "Time format"
+
+#: src/pages/settings/SettingsBilling.tsx:51
+msgid "to monthly"
+msgstr "to monthly"
+
+#: src/pages/settings/SettingsBilling.tsx:44
+msgid "to yearly"
+msgstr "to yearly"
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:55
+msgid "Type"
+msgstr "Type"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:88
+msgid "Unlimited contacts"
+msgstr "Unlimited contacts"
+
+#: src/modules/ui/input/components/ImageInput.tsx:165
+msgid "Upload"
+msgstr "Upload"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:100
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:242
+msgid "URL"
+msgstr "URL"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:51
+msgid "Use letter, number and dash only. Start and finish with a letter or a number"
+msgstr "Use letter, number and dash only. Start and finish with a letter or a number"
+
+#: src/pages/settings/SettingsProfile.tsx:22
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:29
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:17
+#: src/pages/settings/accounts/SettingsAccounts.tsx:43
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:101
+msgid "User"
+msgstr "User"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:51
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:106
+msgid "User is not logged in"
+msgstr "User is not logged in"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:223
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:228
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:251
+msgid "Values"
+msgstr "Values"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:117
+msgid "View"
+msgstr "View"
+
+#: src/pages/settings/SettingsBilling.tsx:149
+msgid "View billing details"
+msgstr "View billing details"
+
+#: src/modules/settings/data-model/objects/components/SettingsObjectCoverImage.tsx:35
+msgid "Visualize"
+msgstr "Visualize"
+
+#: src/modules/ui/input/components/ImageInput.tsx:178
+msgid "We support your square PNGs, JPEGs and GIFs under 10MB"
+msgstr "We support your square PNGs, JPEGs and GIFs under 10MB"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:97
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:239
+msgid "We will send POST requests to this endpoint for every new event"
+msgstr "We will send POST requests to this endpoint for every new event"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:223
+msgid "Webhook"
+msgstr "Webhook"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:65
+msgid "Webhooks"
+msgstr "Webhooks"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:127
+msgid "When the API key will expire."
+msgstr "When the API key will expire."
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:222
+msgid "When the key will be disabled"
+msgstr "When the key will be disabled"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:113
+msgid "Workflow Record Selection"
+msgstr "Workflow Record Selection"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:121
+msgid "Workflows"
+msgstr "Workflows"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:146
+#: src/pages/settings/SettingsWorkspace.tsx:32
+#: src/pages/settings/SettingsBilling.tsx:132
+#: src/pages/settings/Releases.tsx:114
+#: src/pages/settings/workspace/SettingsDomain.tsx:128
+#: src/pages/settings/security/SettingsSecurity.tsx:37
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:18
+#: src/pages/settings/developers/SettingsDevelopers.tsx:39
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:74
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:216
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:85
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:167
+#: src/pages/settings/data-model/SettingsObjects.tsx:157
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:175
+#: src/pages/settings/data-model/SettingsNewObject.tsx:72
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:201
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:58
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:136
+msgid "Workspace"
+msgstr "Workspace"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:46
+msgid "Workspace Deletion"
+msgstr "Workspace Deletion"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:254
+msgid "Write a description"
+msgstr "Write a description"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:209
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:158
+msgid "yes"
+msgstr "yes"
+
+#: src/pages/settings/SettingsBilling.tsx:46
+msgid "You will be charged immediately for the full year."
+msgstr "You will be charged immediately for the full year."
+
+#: src/pages/settings/SettingsBilling.tsx:53
+msgid "Your credit balance will be used to pay the monthly bills."
+msgstr "Your credit balance will be used to pay the monthly bills."
+
+#: src/pages/settings/SettingsProfile.tsx:36
+msgid "Your name as it will be displayed"
+msgstr "Your name as it will be displayed"
+
+#: src/pages/settings/SettingsBilling.tsx:171
+msgid "Your workspace will be disabled"
+msgstr "Your workspace will be disabled"
diff --git a/packages/twenty-front/src/locales/es.po b/packages/twenty-front/src/locales/es.po
new file mode 100644
index 000000000000..0b51d299b943
--- /dev/null
+++ b/packages/twenty-front/src/locales/es.po
@@ -0,0 +1,1147 @@
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2025-01-21 13:07+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: @lingui/cli\n"
+"Language: es\n"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:92
+msgid "1 000 workflow node executions"
+msgstr "1 000 ejecuciones de nodos de flujo de trabajo"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:63
+msgid "12h ({hour12Label})"
+msgstr "12h ({hour12Label})"
+
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:198
+msgid "2. Configure field"
+msgstr "2. Configurar campo"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:59
+msgid "24h ({hour24Label})"
+msgstr "24h ({hour24Label})"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:91
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:179
+msgid "API & Webhooks"
+msgstr "API y Webhooks"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:182
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:190
+msgid "API Key"
+msgstr "Clave API"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:166
+msgid "API Name"
+msgstr "Nombre API"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:49
+msgid "API keys"
+msgstr "Claves API"
+
+#: src/modules/ui/input/components/ImageInput.tsx:157
+msgid "Abort"
+msgstr "Abortar"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:93
+msgid "About"
+msgstr "Acerca de"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:40
+#: src/pages/settings/accounts/SettingsAccounts.tsx:46
+msgid "Account"
+msgstr "Cuenta"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:321
+#: src/modules/settings/profile/components/DeleteAccount.tsx:45
+msgid "Account Deletion"
+msgstr "Eliminación de la cuenta"
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:21
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:114
+msgid "Accounts"
+msgstr "Cuentas"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:259
+msgid "Activate"
+msgstr "Activar"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:193
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:201
+msgid "Active"
+msgstr "Activo"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:50
+msgid "Active API keys created by you or your team."
+msgstr "Claves API activas creadas por usted o su equipo."
+
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:39
+msgid "Add Field"
+msgstr "Añadir campo"
+
+#: src/modules/settings/security/components/SettingsSSOIdentitiesProvidersListCard.tsx:59
+msgid "Add SSO Identity Provider"
+msgstr "Añadir proveedor de identidad SSO"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:149
+msgid "Add object"
+msgstr "Añadir objeto"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:105
+msgid "Add to blocklist"
+msgstr "Añadir a la lista de bloqueo"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:135
+msgid "Allow logins through Google's single sign-on functionality."
+msgstr "Permitir el inicio de sesión a través de la funcionalidad de inicio de sesión único de Google."
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:146
+msgid "Allow logins through Microsoft's single sign-on functionality."
+msgstr "Permitir el inicio de sesión a través de la funcionalidad de inicio de sesión único de Microsoft."
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:168
+msgid "Allow the invitation of new users by sharing an invite link."
+msgstr "Permitir la invitación de nuevos usuarios compartiendo un enlace de invitación."
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:157
+msgid "Allow users to sign in with an email and password."
+msgstr "Permitir que los usuarios se registren con un correo electrónico y una contraseña."
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:251
+msgid "An optional description"
+msgstr "Una descripción opcional"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:37
+msgid "Appearance"
+msgstr "Apariencia"
+
+#: src/pages/settings/SettingsBilling.tsx:190
+msgid "Are you sure that you want to change your billing interval?"
+msgstr "¿Está seguro de que desea cambiar el intervalo de facturación?"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:73
+msgid "At least one authentication method must be enabled"
+msgstr "Al menos un método de autenticación debe estar activado"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:63
+msgid "Authentication"
+msgstr "Autenticación"
+
+#: src/pages/auth/Authorize.tsx:127
+msgid "Authorize"
+msgstr "Autorizar"
+
+#: src/pages/not-found/NotFound.tsx:58
+msgid "Back to content"
+msgstr "Volver al contenido"
+
+#: src/pages/settings/SettingsBilling.tsx:129
+#: src/pages/settings/SettingsBilling.tsx:135
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:149
+msgid "Billing"
+msgstr "Facturación"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx:46
+msgid "Blocklist"
+msgstr "Lista de bloqueo"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:210
+msgid "Book a Call"
+msgstr "Reservar una llamada"
+
+#: src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx:72
+msgid "Calculate"
+msgstr "Calcule"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:57
+msgid "Calendar"
+msgstr "Calendario"
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:14
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:24
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:78
+msgid "Calendars"
+msgstr "Calendarios"
+
+#: src/pages/auth/Authorize.tsx:124
+#: src/modules/ui/layout/modal/components/ConfirmationModal.tsx:151
+#: src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx:198
+#: src/modules/settings/components/SaveAndCancelButtons/CancelButton.tsx:16
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/pages/settings/SettingsBilling.tsx:175
+msgid "Cancel Plan"
+msgstr "Cancelar plan"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:152
+msgid "Cancel anytime"
+msgstr "Cancelar"
+
+#: src/pages/settings/SettingsBilling.tsx:170
+msgid "Cancel your subscription"
+msgstr "Cancelar su suscripción"
+
+#: src/pages/auth/PasswordReset.tsx:246
+#: src/modules/settings/profile/components/ChangePassword.tsx:52
+#: src/modules/settings/profile/components/ChangePassword.tsx:58
+msgid "Change Password"
+msgstr "Cambiar contraseña"
+
+#: src/pages/settings/SettingsBilling.tsx:194
+msgid "Change {to}"
+msgstr "Cambiar {to}"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:86
+msgid "Chinese — Simplified"
+msgstr "Chino simplificado"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:90
+msgid "Chinese — Traditional"
+msgstr "Chino - Tradicional"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:281
+msgid "Choose an object"
+msgstr "Elija un objeto"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:147
+msgid "Choose your Trial"
+msgstr "Elija su prueba"
+
+#: src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx:201
+msgid "Close"
+msgstr "Cerrar"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:133
+msgid "Companies"
+msgstr "Empresas"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:48
+msgid "Configure an SSO connection"
+msgstr "Configurar una conexión SSO"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:58
+msgid "Configure and customize your calendar preferences."
+msgstr "Configura y personaliza tus preferencias de calendario."
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:43
+msgid "Configure how dates are displayed across the app"
+msgstr "Configurar cómo se muestran las fechas en la aplicación"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:34
+msgid "Configure your emails and calendar settings."
+msgstr "Configura tus correos electrónicos y calendario."
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:13
+msgid "Connect a Google account"
+msgstr "Conectar una cuenta de Google"
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:11
+msgid "Connect a new account to your workspace"
+msgstr "Conectar una nueva cuenta a su espacio de trabajo"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:51
+msgid "Connect with Google"
+msgstr "Conectar con Google"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:59
+msgid "Connect with Microsoft"
+msgstr "Conectar con Microsoft"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:56
+msgid "Connected accounts"
+msgstr "Cuentas conectadas"
+
+#: src/pages/onboarding/InviteTeam.tsx:228
+#: src/pages/onboarding/ChooseYourPlan.tsx:198
+msgid "Continue"
+msgstr "Continúe"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:105
+msgid "Copilot"
+msgstr "Copiloto"
+
+#: src/pages/onboarding/InviteTeam.tsx:217
+msgid "Copy invitation link"
+msgstr "Copiar enlace de invitación"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:183
+msgid "Copy this key as it will not be visible again"
+msgstr "Copie esta clave ya que no será visible de nuevo"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:56
+msgid "Create API key"
+msgstr "Crear clave API"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:72
+msgid "Create Webhook"
+msgstr "Crear Webhook"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:149
+msgid "Custom Objects"
+msgstr "Objetos personalizados"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:90
+msgid "Custom objects"
+msgstr "Objetos personalizados"
+
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:28
+msgid "Customise the fields available in the {objectLabelSingular} views."
+msgstr "Personalice los campos disponibles en las vistas {objectLabelSingular}."
+
+#: src/pages/settings/SettingsWorkspace.tsx:56
+msgid "Customize Domain"
+msgstr "Personalizar dominio"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:64
+msgid "Customize your workspace security"
+msgstr "Personalice la seguridad de su espacio de trabajo"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:341
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:237
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:250
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:30
+#: src/modules/settings/profile/components/DeleteAccount.tsx:29
+msgid "Danger zone"
+msgstr "Zona de peligro"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:144
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:155
+msgid "Data model"
+msgstr "Modelo de datos"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:42
+msgid "Date and time"
+msgstr "Fecha y hora"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:259
+msgid "Deactivate"
+msgstr "Desactivar"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:105
+msgid "Deactivate \"Synchronize Objects Labels and API Names\" to set a custom API name"
+msgstr "Desactive \"Sincronizar etiquetas de objetos y nombres de API\" para establecer un nombre de API personalizado"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:251
+msgid "Deactivate this field"
+msgstr "Desactivar este campo"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:94
+msgid "Define the name and description of your object"
+msgstr "Defina el nombre y la descripción de su objeto"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:347
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:243
+msgid "Delete"
+msgstr "Borrar"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:256
+msgid "Delete API key"
+msgstr "Borrar clave API"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:332
+#: src/modules/settings/profile/components/DeleteAccount.tsx:37
+#: src/modules/settings/profile/components/DeleteAccount.tsx:53
+msgid "Delete account"
+msgstr "Eliminar cuenta"
+
+#: src/modules/settings/profile/components/DeleteAccount.tsx:30
+msgid "Delete account and all the associated data"
+msgstr "Eliminar la cuenta y todos los datos asociados"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:342
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:238
+msgid "Delete this integration"
+msgstr "Eliminar esta integración"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:356
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:364
+msgid "Delete webhook"
+msgstr "Borrar webhook"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:36
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:54
+msgid "Delete workspace"
+msgstr "Eliminar espacio de trabajo"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:31
+msgid "Delete your whole workspace"
+msgstr "Borrar todo el espacio de trabajo"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:250
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:239
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:266
+msgid "Description"
+msgstr "Descripción"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:35
+#: src/pages/settings/developers/SettingsDevelopers.tsx:42
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:78
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:220
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:89
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:171
+msgid "Developers"
+msgstr "Desarrolladores"
+
+#: src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx:48
+msgid "Display as relative date"
+msgstr "Mostrar como fecha relativa"
+
+#: src/pages/settings/SettingsWorkspace.tsx:51
+#: src/pages/settings/workspace/SettingsDomain.tsx:125
+#: src/pages/settings/workspace/SettingsDomain.tsx:135
+#: src/pages/settings/workspace/SettingsDomain.tsx:150
+msgid "Domain"
+msgstr "Dominio"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:108
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:225
+msgid "E.g. backoffice integration"
+msgstr "Por ejemplo, integración de backoffice"
+
+#: src/pages/settings/SettingsBilling.tsx:157
+msgid "Edit billing interval"
+msgstr "Editar el intervalo de facturación"
+
+#: src/pages/settings/SettingsBilling.tsx:145
+msgid "Edit payment method, see your invoices and more"
+msgstr "Editar la forma de pago, ver sus facturas y mucho más"
+
+#: src/pages/settings/SettingsWorkspace.tsx:52
+msgid "Edit your subdomain name or set a custom domain."
+msgstr "Edite el nombre de su subdominio o establezca un dominio personalizado."
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:180
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:256
+#: src/pages/settings/SettingsProfile.tsx:42
+#: src/pages/auth/PasswordReset.tsx:206
+msgid "Email"
+msgstr "Correo electrónico"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:89
+msgid "Email integration"
+msgstr "Integración del correo electrónico"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:55
+msgid "Email or domain is already in blocklist"
+msgstr "El correo electrónico o el dominio ya están en la lista de bloqueo"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:72
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:45
+msgid "Emails"
+msgstr "Correos electrónicos"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:137
+msgid "Employees"
+msgstr "Empleados"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:96
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:238
+msgid "Endpoint URL"
+msgstr "URL del punto final"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:82
+msgid "English"
+msgstr "Inglés"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:157
+msgid "Enjoy a {withCreditCardTrialPeriodDuration}-days free trial"
+msgstr "Disfrute de {withCreditCardTrialPeriodDuration}-días de prueba gratis"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:51
+msgid "Enterprise"
+msgstr "Empresa"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:98
+msgid "Error deleting api key: {err}"
+msgstr "Error al borrar la clave api: {err}"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:150
+msgid "Error regenerating api key: {err}"
+msgstr "Error al regenerar la clave api: {err}"
+
+#: src/pages/settings/SettingsBilling.tsx:121
+msgid "Error while switching subscription {to}."
+msgstr "Error al cambiar de abono {to}."
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:66
+msgid "Establish Webhook endpoints for notifications on asynchronous events."
+msgstr "Establezca puntos finales Webhook para notificaciones sobre eventos asíncronos."
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx:47
+msgid "Exclude the following people and domains from my email sync"
+msgstr "Excluir a las siguientes personas y dominios de mi sincronización de correo electrónico"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:167
+msgid "Existing objects"
+msgstr "Objetos existentes"
+
+#: src/modules/navigation/components/AppNavigationDrawer.tsx:36
+msgid "Exit Settings"
+msgstr "Salir de Ajustes"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:26
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:32
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:108
+msgid "Experience"
+msgstr "Experiencia"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:221
+msgid "Expiration"
+msgstr "Caducidad"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:126
+msgid "Expiration Date"
+msgstr "Fecha de expiración"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:259
+msgid "Expires in"
+msgstr "Expira en"
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:42
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:27
+msgid "Fields"
+msgstr "Campos"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:265
+msgid "Filters"
+msgstr "Filtros"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:66
+msgid "French"
+msgstr "Francés"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:87
+msgid "Full access"
+msgstr "Acceso total"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:187
+msgid "Functions"
+msgstr "Funciones"
+
+#: src/pages/settings/SettingsWorkspace.tsx:29
+#: src/pages/settings/SettingsWorkspace.tsx:35
+#: src/pages/settings/workspace/SettingsDomain.tsx:132
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:138
+msgid "General"
+msgstr "General"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:70
+msgid "German"
+msgstr "Alemán"
+
+#: src/pages/onboarding/InviteTeam.tsx:184
+msgid "Get the most out of your workspace by inviting your team."
+msgstr "Aproveche al máximo su espacio de trabajo invitando a su equipo."
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:148
+msgid "Get your subscription"
+msgstr "Consiga su abono"
+
+#: src/pages/settings/SettingsWorkspace.tsx:65
+msgid "Grant Twenty support temporary access to your workspace so we can troubleshoot problems or recover content on your behalf. You can revoke access at any time."
+msgstr "Concede al servicio de asistencia de Twenty acceso temporal a tu espacio de trabajo para que podamos solucionar problemas o recuperar contenidos en tu nombre. Puedes revocar el acceso en cualquier momento."
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:208
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:239
+msgid "Icon and Name"
+msgstr "Icono y nombre"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:275
+msgid "If you’ve lost this key, you can regenerate it, but be aware that any script using this key will need to be updated. Please type\"{confirmationValue}\" to confirm."
+msgstr "Si has perdido esta clave, puedes regenerarla, pero ten en cuenta que cualquier script que utilice esta clave tendrá que ser actualizado. Escribe \"{confirmationValue}\" para confirmar."
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:218
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:215
+msgid "Inactive"
+msgstr "Inactivo"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:106
+msgid "Input must be in camel case and cannot start with a number"
+msgstr "La entrada debe ir en mayúsculas y no puede empezar por un número"
+
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:15
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:21
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:160
+msgid "Integrations"
+msgstr "Integraciones"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:57
+msgid "Invalid auth provider"
+msgstr "Proveedor de autenticación no válido"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:21
+msgid "Invalid email"
+msgstr "Correo electrónico no válido"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:44
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:50
+msgid "Invalid email or domain"
+msgstr "Correo electrónico o dominio no válidos"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:87
+msgid "Invalid form values"
+msgstr "Valores de formulario no válidos"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:167
+msgid "Invite by Link"
+msgstr "Invitar por enlace"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:244
+msgid "Invite by email"
+msgstr "Invitar por correo electrónico"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:157
+msgid "Invite by link"
+msgstr "Invitar por enlace"
+
+#: src/pages/onboarding/InviteTeam.tsx:152
+msgid "Invite link sent to email addresses"
+msgstr "Envío del enlace de invitación a las direcciones de correo electrónico"
+
+#: src/pages/onboarding/InviteTeam.tsx:181
+msgid "Invite your team"
+msgstr "Invite a su equipo"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:74
+msgid "Italian"
+msgstr "Italiano"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:51
+msgid "Language"
+msgstr "Idioma"
+
+#: src/pages/onboarding/InviteTeam.tsx:127
+msgid "Link copied to clipboard"
+msgstr "Enlace copiado en el portapapeles"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:206
+msgid "Log out"
+msgstr "Cerrar sesión"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:209
+msgid "Logout"
+msgstr "Cierre de sesión"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:167
+msgid "Manage Members"
+msgstr "Gestionar miembros"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:168
+msgid "Manage the members of your space here"
+msgstr "Gestione aquí los miembros de su espacio"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:57
+msgid "Manage your internet accounts."
+msgstr "Gestione sus cuentas de Internet."
+
+#: src/pages/settings/SettingsBilling.tsx:144
+msgid "Manage your subscription"
+msgstr "Gestione su suscripción"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:143
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:149
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:143
+msgid "Members"
+msgstr "Miembros"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:177
+#: src/pages/settings/SettingsWorkspace.tsx:44
+#: src/pages/settings/SettingsProfile.tsx:35
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:106
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:211
+#: src/modules/settings/workspace/components/NameField.tsx:91
+msgid "Name"
+msgstr "Nombre"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:106
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:211
+msgid "Name of your API key"
+msgstr "Nombre de su clave API"
+
+#: src/pages/settings/SettingsWorkspace.tsx:44
+msgid "Name of your workspace"
+msgstr "Nombre de su espacio de trabajo"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:125
+msgid "Navigate"
+msgstr "Navegue por"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:79
+msgid "New"
+msgstr "Nuevo"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:92
+msgid "New Key"
+msgstr "Nueva llave"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:69
+msgid "New Object"
+msgstr "Nuevo objeto"
+
+#: src/pages/auth/PasswordReset.tsx:233
+msgid "New Password"
+msgstr "Nueva contraseña"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:81
+msgid "New Webhook"
+msgstr "Nuevo Webhook"
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:10
+msgid "New account"
+msgstr "Nueva cuenta"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:82
+msgid "New key"
+msgstr "Nueva llave"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:46
+msgid "No connected account"
+msgstr "Ninguna cuenta conectada"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:141
+msgid "Notes"
+msgstr "Notas"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:160
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:179
+#: src/pages/settings/data-model/SettingsNewObject.tsx:76
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:205
+msgid "Objects"
+msgstr "Objetos"
+
+#: src/pages/not-found/NotFound.tsx:47
+msgid "Off the beaten path"
+msgstr "Fuera de los caminos trillados"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:137
+msgid "Opportunities"
+msgstr "Oportunidades"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:195
+msgid "Other"
+msgstr "Otros"
+
+#: src/pages/not-found/NotFound.tsx:41
+msgid "Page Not Found"
+msgstr "Página no encontrada"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:156
+msgid "Password"
+msgstr "Contraseña"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:34
+msgid "Password reset link has been sent to the email"
+msgstr "Se ha enviado el enlace de restablecimiento de contraseña al correo electrónico"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:129
+msgid "People"
+msgstr "Personas"
+
+#: src/pages/settings/SettingsWorkspace.tsx:40
+#: src/pages/settings/SettingsProfile.tsx:30
+msgid "Picture"
+msgstr "Fotografía"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:102
+msgid "Please enter a valid URL"
+msgstr "Introduzca una URL válida"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:258
+msgid "Please type \"{confirmationValue}\" to confirm you want to delete this API Key. Be aware that any script using this key will stop working."
+msgstr "Escriba \"{confirmationValue}\" para confirmar que desea eliminar esta clave de API. Tenga en cuenta que cualquier script que utilice esta clave dejará de funcionar."
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:358
+msgid "Please type {confirmationText} to confirm you want to delete this webhook."
+msgstr "Por favor, escriba {confirmationText} para confirmar que desea eliminar este webhook."
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:62
+msgid "Portuguese"
+msgstr "Portugués"
+
+#: src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx:62
+#: src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx:30
+msgid "Preview"
+msgstr "Vista previa"
+
+#: src/pages/settings/SettingsProfile.tsx:19
+#: src/pages/settings/SettingsProfile.tsx:25
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:103
+msgid "Profile"
+msgstr "Perfil"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:97
+msgid "Pseudo-English"
+msgstr "Pseudoinglés"
+
+#: src/modules/settings/developers/components/SettingsReadDocumentationButton.tsx:9
+msgid "Read documentation"
+msgstr "Leer la documentación"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:53
+msgid "Receive an email containing password update link"
+msgstr "Recibir un correo electrónico con un enlace para actualizar la contraseña"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:109
+msgid "Record Selection"
+msgstr "Selección de discos"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:195
+msgid "Regenerate Key"
+msgstr "Regenerar llave"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:191
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:273
+msgid "Regenerate an API key"
+msgstr "Regenerar una clave API"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:282
+msgid "Regenerate key"
+msgstr "Regenerar llave"
+
+#: src/pages/settings/Releases.tsx:111
+#: src/pages/settings/Releases.tsx:117
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:204
+msgid "Releases"
+msgstr "Comunicados"
+
+#: src/modules/ui/input/components/ImageInput.tsx:173
+msgid "Remove"
+msgstr "Eliminar"
+
+#: src/pages/auth/PasswordReset.tsx:177
+msgid "Reset Password"
+msgstr "Restablecer contraseña"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:47
+msgid "SSO"
+msgstr "SSO"
+
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:44
+#: src/modules/navigation/components/MainNavigationDrawerItems.tsx:50
+msgid "Search"
+msgstr "Buscar en"
+
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:183
+msgid "Search a field..."
+msgstr "Buscar un campo..."
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:116
+msgid "Search an index..."
+msgstr "Buscar en un índice..."
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:171
+msgid "Search for an object..."
+msgstr "Busca un objeto..."
+
+#: src/pages/settings/security/SettingsSecurity.tsx:33
+#: src/pages/settings/security/SettingsSecurity.tsx:40
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:166
+msgid "Security"
+msgstr "Seguridad"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:266
+msgid "Select the events you wish to send to this endpoint"
+msgstr "Seleccione los eventos que desea enviar a este endpoint"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:52
+msgid "Select your preferred language"
+msgstr "Seleccione su idioma preferido"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:245
+msgid "Send an invite email to your team"
+msgstr "Envíe una invitación por correo electrónico a su equipo"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:198
+msgid "Server Admin Panel"
+msgstr "Panel de administración del servidor"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:46
+msgid "Set email visibility, manage your blocklist and more."
+msgstr "Establezca la visibilidad del correo electrónico, gestione su lista de bloqueo y mucho más."
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:151
+msgid "Set the name of your subdomain"
+msgstr "Establezca el nombre de su subdominio"
+
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:50
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:33
+#: src/modules/navigation/components/MainNavigationDrawerItems.tsx:56
+msgid "Settings"
+msgstr "Ajustes"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:158
+msgid "Share this link to invite users to join your workspace"
+msgstr "Comparte este enlace para invitar a los usuarios a unirse a tu espacio de trabajo"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:212
+msgid "Should changing a field's label also change the API name?"
+msgstr "¿Debería cambiar también el nombre de la API al cambiar la etiqueta de un campo?"
+
+#: src/pages/onboarding/InviteTeam.tsx:236
+msgid "Skip"
+msgstr "Saltar"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:78
+msgid "Spanish"
+msgstr "Español"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:107
+msgid "Subdomain already taken"
+msgstr "Subdominio ya ocupado"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:49
+msgid "Subdomain can not be longer than 30 characters"
+msgstr "El subdominio no puede tener más de 30 caracteres"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:48
+msgid "Subdomain can not be shorter than 3 characters"
+msgstr "El subdominio no puede tener menos de 3 caracteres"
+
+#: src/pages/settings/SettingsBilling.tsx:117
+msgid "Subscription has been switched {to}"
+msgstr "Se ha cambiado la suscripción {to}"
+
+#: src/pages/settings/SettingsWorkspace.tsx:63
+msgid "Support"
+msgstr "Ayuda"
+
+#: src/pages/settings/SettingsBilling.tsx:188
+msgid "Switch billing {to}"
+msgstr "Facturación del interruptor {to}"
+
+#: src/pages/settings/SettingsBilling.tsx:158
+msgid "Switch {from}"
+msgstr "Interruptor {from}"
+
+#: src/pages/settings/SettingsBilling.tsx:162
+msgid "Switch {to}"
+msgstr "Interruptor {to}"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:211
+msgid "Synchronize Field Label and API Name"
+msgstr "Sincronizar etiqueta de campo y nombre de API"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:55
+msgid "System Settings - {systemTimeFormatLabel}"
+msgstr "Ajustes del sistema - {systemTimeFormatLabel}"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx:42
+msgid "System settings - {systemDateFormatLabel}"
+msgstr "Ajustes del sistema - {systemDateFormatLabel}"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:145
+msgid "Tasks"
+msgstr "Tareas"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:240
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:267
+msgid "The description of this field"
+msgstr "Descripción de este campo"
+
+#: src/pages/settings/SettingsProfile.tsx:43
+msgid "The email associated to your account"
+msgstr "El correo electrónico asociado a su cuenta"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:209
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:240
+msgid "The name and icon of this field"
+msgstr "Nombre e icono de este campo"
+
+#: src/pages/not-found/NotFound.tsx:50
+msgid "The page you're seeking is either gone or never was. Let's get you back on track"
+msgstr "La página que busca ha desaparecido o nunca existió. Volvamos a la pista"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:229
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:252
+msgid "The values of this field"
+msgstr "Los valores de este campo"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:224
+msgid "The values of this field must be unique"
+msgstr "Los valores de este campo deben ser únicos"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:38
+msgid "There was an issue"
+msgstr "Hubo un problema"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:323
+msgid "This action cannot be undone. This will permanently delete this user and remove them from all their assignments."
+msgstr "Esta acción no se puede deshacer. Esto borrará permanentemente a este usuario y lo eliminará de todas sus asignaciones."
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:48
+msgid "This action cannot be undone. This will permanently delete your entire workspace. <0/> Please type in your email to confirm."
+msgstr "Esta acción no se puede deshacer. Esto borrará permanentemente todo tu espacio de trabajo. <0/> Escriba su correo electrónico para confirmar."
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:49
+msgid "Time format"
+msgstr "Formato de hora"
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:55
+msgid "Type"
+msgstr "Tipo"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:100
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:242
+msgid "URL"
+msgstr "URL"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:88
+msgid "Unlimited contacts"
+msgstr "Contactos ilimitados"
+
+#: src/modules/ui/input/components/ImageInput.tsx:165
+msgid "Upload"
+msgstr "Cargar"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:51
+msgid "Use letter, number and dash only. Start and finish with a letter or a number"
+msgstr "Utilice sólo letra, número y guión. Empiece y termine con una letra o un número"
+
+#: src/pages/settings/SettingsProfile.tsx:22
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:29
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:17
+#: src/pages/settings/accounts/SettingsAccounts.tsx:43
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:101
+msgid "User"
+msgstr "Usuario"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:51
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:106
+msgid "User is not logged in"
+msgstr "El usuario no ha iniciado sesión"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:223
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:228
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:251
+msgid "Values"
+msgstr "Valores"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:117
+msgid "View"
+msgstr "Ver"
+
+#: src/pages/settings/SettingsBilling.tsx:149
+msgid "View billing details"
+msgstr "Ver detalles de facturación"
+
+#: src/modules/settings/data-model/objects/components/SettingsObjectCoverImage.tsx:35
+msgid "Visualize"
+msgstr "Visualice"
+
+#: src/modules/ui/input/components/ImageInput.tsx:178
+msgid "We support your square PNGs, JPEGs and GIFs under 10MB"
+msgstr "Admitimos tus PNG, JPEG y GIF cuadrados de menos de 10 MB"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:97
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:239
+msgid "We will send POST requests to this endpoint for every new event"
+msgstr "Enviaremos peticiones POST a este endpoint para cada nuevo evento"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:223
+msgid "Webhook"
+msgstr "Gancho web"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:65
+msgid "Webhooks"
+msgstr "Webhooks"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:127
+msgid "When the API key will expire."
+msgstr "Cuándo caducará la clave API."
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:222
+msgid "When the key will be disabled"
+msgstr "Cuándo se desactivará la tecla"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:113
+msgid "Workflow Record Selection"
+msgstr "Selección de registros del flujo de trabajo"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:121
+msgid "Workflows"
+msgstr "Flujos de trabajo"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:146
+#: src/pages/settings/SettingsWorkspace.tsx:32
+#: src/pages/settings/SettingsBilling.tsx:132
+#: src/pages/settings/Releases.tsx:114
+#: src/pages/settings/workspace/SettingsDomain.tsx:128
+#: src/pages/settings/security/SettingsSecurity.tsx:37
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:18
+#: src/pages/settings/developers/SettingsDevelopers.tsx:39
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:74
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:216
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:85
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:167
+#: src/pages/settings/data-model/SettingsObjects.tsx:157
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:175
+#: src/pages/settings/data-model/SettingsNewObject.tsx:72
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:201
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:58
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:136
+msgid "Workspace"
+msgstr "Espacio de trabajo"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:46
+msgid "Workspace Deletion"
+msgstr "Eliminación del espacio de trabajo"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:254
+msgid "Write a description"
+msgstr "Escriba una descripción"
+
+#: src/pages/settings/SettingsBilling.tsx:46
+msgid "You will be charged immediately for the full year."
+msgstr "Se le cobrará inmediatamente el año completo."
+
+#: src/pages/settings/SettingsBilling.tsx:53
+msgid "Your credit balance will be used to pay the monthly bills."
+msgstr "Su saldo de crédito se utilizará para pagar las facturas mensuales."
+
+#: src/pages/settings/SettingsProfile.tsx:36
+msgid "Your name as it will be displayed"
+msgstr "Su nombre tal y como se mostrará"
+
+#: src/pages/settings/SettingsBilling.tsx:171
+msgid "Your workspace will be disabled"
+msgstr "Tu espacio de trabajo se desactivará"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:167
+msgid "employees"
+msgstr "empleados"
+
+#: src/pages/settings/SettingsBilling.tsx:45
+msgid "from monthly to yearly"
+msgstr "de mensual a anual"
+
+#: src/pages/settings/SettingsBilling.tsx:52
+msgid "from yearly to monthly"
+msgstr "de anual a mensual"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:108
+msgid "not allowed"
+msgstr "no autorizado"
+
+#: src/pages/onboarding/InviteTeam.tsx:213
+msgid "or"
+msgstr "o"
+
+#: src/pages/settings/SettingsBilling.tsx:51
+msgid "to monthly"
+msgstr "al mes"
+
+#: src/pages/settings/SettingsBilling.tsx:44
+msgid "to yearly"
+msgstr "al año"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:209
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:158
+msgid "yes"
+msgstr "sí"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:174
+msgid "{apiKeyName} API Key"
+msgstr "{apiKeyName} Clave API"
diff --git a/packages/twenty-front/src/locales/fr.po b/packages/twenty-front/src/locales/fr.po
new file mode 100644
index 000000000000..b258b869cf52
--- /dev/null
+++ b/packages/twenty-front/src/locales/fr.po
@@ -0,0 +1,1147 @@
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2025-01-21 13:07+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: @lingui/cli\n"
+"Language: fr\n"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:92
+msgid "1 000 workflow node executions"
+msgstr "1 000 exécutions de nœuds de flux de travail"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:63
+msgid "12h ({hour12Label})"
+msgstr "12h ({hour12Label})"
+
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:198
+msgid "2. Configure field"
+msgstr "2. Configurer le champ"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:59
+msgid "24h ({hour24Label})"
+msgstr "24h ({hour24Label})"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:91
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:179
+msgid "API & Webhooks"
+msgstr "API & Webhooks"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:182
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:190
+msgid "API Key"
+msgstr "Clé API"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:166
+msgid "API Name"
+msgstr "Nom de l'API"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:49
+msgid "API keys"
+msgstr "Clés API"
+
+#: src/modules/ui/input/components/ImageInput.tsx:157
+msgid "Abort"
+msgstr "Abandonner"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:93
+msgid "About"
+msgstr "A propos de"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:40
+#: src/pages/settings/accounts/SettingsAccounts.tsx:46
+msgid "Account"
+msgstr "Compte"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:321
+#: src/modules/settings/profile/components/DeleteAccount.tsx:45
+msgid "Account Deletion"
+msgstr "Suppression de compte"
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:21
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:114
+msgid "Accounts"
+msgstr "Comptes"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:259
+msgid "Activate"
+msgstr "Activer"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:193
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:201
+msgid "Active"
+msgstr "Actif"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:50
+msgid "Active API keys created by you or your team."
+msgstr "Clés API actives créées par vous ou votre équipe."
+
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:39
+msgid "Add Field"
+msgstr "Ajouter un champ"
+
+#: src/modules/settings/security/components/SettingsSSOIdentitiesProvidersListCard.tsx:59
+msgid "Add SSO Identity Provider"
+msgstr "Ajouter un fournisseur d'identité SSO"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:149
+msgid "Add object"
+msgstr "Ajouter un objet"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:105
+msgid "Add to blocklist"
+msgstr "Ajouter à la liste de blocage"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:135
+msgid "Allow logins through Google's single sign-on functionality."
+msgstr "Autoriser les connexions via la fonctionnalité d'authentification unique de Google."
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:146
+msgid "Allow logins through Microsoft's single sign-on functionality."
+msgstr "Autoriser les connexions via la fonctionnalité d'authentification unique de Microsoft."
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:168
+msgid "Allow the invitation of new users by sharing an invite link."
+msgstr "Permettre l'invitation de nouveaux utilisateurs en partageant un lien d'invitation."
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:157
+msgid "Allow users to sign in with an email and password."
+msgstr "Permettre aux utilisateurs de se connecter à l'aide d'un courriel et d'un mot de passe."
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:251
+msgid "An optional description"
+msgstr "Une description facultative"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:37
+msgid "Appearance"
+msgstr "Apparence"
+
+#: src/pages/settings/SettingsBilling.tsx:190
+msgid "Are you sure that you want to change your billing interval?"
+msgstr "Êtes-vous sûr de vouloir modifier votre intervalle de facturation ?"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:73
+msgid "At least one authentication method must be enabled"
+msgstr "Au moins une méthode d'authentification doit être activée"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:63
+msgid "Authentication"
+msgstr "Authentification"
+
+#: src/pages/auth/Authorize.tsx:127
+msgid "Authorize"
+msgstr "Autoriser"
+
+#: src/pages/not-found/NotFound.tsx:58
+msgid "Back to content"
+msgstr "Retour au contenu"
+
+#: src/pages/settings/SettingsBilling.tsx:129
+#: src/pages/settings/SettingsBilling.tsx:135
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:149
+msgid "Billing"
+msgstr "Facturation"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx:46
+msgid "Blocklist"
+msgstr "Liste de blocage"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:210
+msgid "Book a Call"
+msgstr "Réserver un appel"
+
+#: src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx:72
+msgid "Calculate"
+msgstr "Calculer"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:57
+msgid "Calendar"
+msgstr "Calendrier"
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:14
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:24
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:78
+msgid "Calendars"
+msgstr "Calendriers"
+
+#: src/pages/auth/Authorize.tsx:124
+#: src/modules/ui/layout/modal/components/ConfirmationModal.tsx:151
+#: src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx:198
+#: src/modules/settings/components/SaveAndCancelButtons/CancelButton.tsx:16
+msgid "Cancel"
+msgstr "Annuler"
+
+#: src/pages/settings/SettingsBilling.tsx:175
+msgid "Cancel Plan"
+msgstr "Annuler le plan"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:152
+msgid "Cancel anytime"
+msgstr "Annuler à tout moment"
+
+#: src/pages/settings/SettingsBilling.tsx:170
+msgid "Cancel your subscription"
+msgstr "Annuler votre abonnement"
+
+#: src/pages/auth/PasswordReset.tsx:246
+#: src/modules/settings/profile/components/ChangePassword.tsx:52
+#: src/modules/settings/profile/components/ChangePassword.tsx:58
+msgid "Change Password"
+msgstr "Modifier le mot de passe"
+
+#: src/pages/settings/SettingsBilling.tsx:194
+msgid "Change {to}"
+msgstr "Modifier {to}"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:86
+msgid "Chinese — Simplified"
+msgstr "Chinois - simplifié"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:90
+msgid "Chinese — Traditional"
+msgstr "Chinois - Traditionnel"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:281
+msgid "Choose an object"
+msgstr "Choisir un objet"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:147
+msgid "Choose your Trial"
+msgstr "Choisissez votre essai"
+
+#: src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx:201
+msgid "Close"
+msgstr "Fermer"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:133
+msgid "Companies"
+msgstr "Entreprises"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:48
+msgid "Configure an SSO connection"
+msgstr "Configurer une connexion SSO"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:58
+msgid "Configure and customize your calendar preferences."
+msgstr "Configurez et personnalisez vos préférences en matière de calendrier."
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:43
+msgid "Configure how dates are displayed across the app"
+msgstr "Configurer l'affichage des dates dans l'application"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:34
+msgid "Configure your emails and calendar settings."
+msgstr "Configurez vos courriels et votre calendrier."
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:13
+msgid "Connect a Google account"
+msgstr "Connecter un compte Google"
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:11
+msgid "Connect a new account to your workspace"
+msgstr "Connecter un nouveau compte à votre espace de travail"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:51
+msgid "Connect with Google"
+msgstr "Se connecter à Google"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:59
+msgid "Connect with Microsoft"
+msgstr "Se connecter avec Microsoft"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:56
+msgid "Connected accounts"
+msgstr "Comptes connectés"
+
+#: src/pages/onboarding/InviteTeam.tsx:228
+#: src/pages/onboarding/ChooseYourPlan.tsx:198
+msgid "Continue"
+msgstr "Continuer"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:105
+msgid "Copilot"
+msgstr "Copilote"
+
+#: src/pages/onboarding/InviteTeam.tsx:217
+msgid "Copy invitation link"
+msgstr "Copier le lien de l'invitation"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:183
+msgid "Copy this key as it will not be visible again"
+msgstr "Copiez cette clé car elle ne sera pas visible à nouveau"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:56
+msgid "Create API key"
+msgstr "Créer une clé API"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:72
+msgid "Create Webhook"
+msgstr "Créer un Webhook"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:149
+msgid "Custom Objects"
+msgstr "Objets personnalisés"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:90
+msgid "Custom objects"
+msgstr "Objets personnalisés"
+
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:28
+msgid "Customise the fields available in the {objectLabelSingular} views."
+msgstr "Personnaliser les champs disponibles dans les vues {objectLabelSingular}."
+
+#: src/pages/settings/SettingsWorkspace.tsx:56
+msgid "Customize Domain"
+msgstr "Personnaliser le domaine"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:64
+msgid "Customize your workspace security"
+msgstr "Personnalisez la sécurité de votre espace de travail"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:341
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:237
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:250
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:30
+#: src/modules/settings/profile/components/DeleteAccount.tsx:29
+msgid "Danger zone"
+msgstr "Zone de danger"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:144
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:155
+msgid "Data model"
+msgstr "Modèle de données"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:42
+msgid "Date and time"
+msgstr "Date et heure"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:259
+msgid "Deactivate"
+msgstr "Désactiver"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:105
+msgid "Deactivate \"Synchronize Objects Labels and API Names\" to set a custom API name"
+msgstr "Désactiver la fonction \"Synchroniser les étiquettes des objets et les noms des API\" pour définir un nom d'API personnalisé"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:251
+msgid "Deactivate this field"
+msgstr "Désactiver ce champ"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:94
+msgid "Define the name and description of your object"
+msgstr "Définir le nom et la description de votre objet"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:347
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:243
+msgid "Delete"
+msgstr "Supprimer"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:256
+msgid "Delete API key"
+msgstr "Supprimer la clé API"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:332
+#: src/modules/settings/profile/components/DeleteAccount.tsx:37
+#: src/modules/settings/profile/components/DeleteAccount.tsx:53
+msgid "Delete account"
+msgstr "Supprimer le compte"
+
+#: src/modules/settings/profile/components/DeleteAccount.tsx:30
+msgid "Delete account and all the associated data"
+msgstr "Supprimer le compte et toutes les données associées"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:342
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:238
+msgid "Delete this integration"
+msgstr "Supprimer cette intégration"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:356
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:364
+msgid "Delete webhook"
+msgstr "Supprimer le webhook"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:36
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:54
+msgid "Delete workspace"
+msgstr "Supprimer l'espace de travail"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:31
+msgid "Delete your whole workspace"
+msgstr "Supprimer l'ensemble de l'espace de travail"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:250
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:239
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:266
+msgid "Description"
+msgstr "Description"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:35
+#: src/pages/settings/developers/SettingsDevelopers.tsx:42
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:78
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:220
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:89
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:171
+msgid "Developers"
+msgstr "Développeurs"
+
+#: src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx:48
+msgid "Display as relative date"
+msgstr "Affichage en tant que date relative"
+
+#: src/pages/settings/SettingsWorkspace.tsx:51
+#: src/pages/settings/workspace/SettingsDomain.tsx:125
+#: src/pages/settings/workspace/SettingsDomain.tsx:135
+#: src/pages/settings/workspace/SettingsDomain.tsx:150
+msgid "Domain"
+msgstr "Domaine"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:108
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:225
+msgid "E.g. backoffice integration"
+msgstr "Par exemple, l'intégration du backoffice"
+
+#: src/pages/settings/SettingsBilling.tsx:157
+msgid "Edit billing interval"
+msgstr "Modifier l'intervalle de facturation"
+
+#: src/pages/settings/SettingsBilling.tsx:145
+msgid "Edit payment method, see your invoices and more"
+msgstr "Modifier le mode de paiement, consulter vos factures et plus encore"
+
+#: src/pages/settings/SettingsWorkspace.tsx:52
+msgid "Edit your subdomain name or set a custom domain."
+msgstr "Modifiez le nom de votre sous-domaine ou définissez un domaine personnalisé."
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:180
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:256
+#: src/pages/settings/SettingsProfile.tsx:42
+#: src/pages/auth/PasswordReset.tsx:206
+msgid "Email"
+msgstr "Courriel"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:89
+msgid "Email integration"
+msgstr "Intégration du courrier électronique"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:55
+msgid "Email or domain is already in blocklist"
+msgstr "L'email ou le domaine est déjà dans la liste de blocage"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:72
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:45
+msgid "Emails"
+msgstr "Emails"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:137
+msgid "Employees"
+msgstr "Salariés"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:96
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:238
+msgid "Endpoint URL"
+msgstr "URL du point final"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:82
+msgid "English"
+msgstr "Anglais"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:157
+msgid "Enjoy a {withCreditCardTrialPeriodDuration}-days free trial"
+msgstr "Profitez d'un essai gratuit de {withCreditCardTrialPeriodDuration}-jours"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:51
+msgid "Enterprise"
+msgstr "Entreprise"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:98
+msgid "Error deleting api key: {err}"
+msgstr "Erreur lors de la suppression de la clé api : {err}"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:150
+msgid "Error regenerating api key: {err}"
+msgstr "Erreur de régénération de la clé api : {err}"
+
+#: src/pages/settings/SettingsBilling.tsx:121
+msgid "Error while switching subscription {to}."
+msgstr "Erreur lors de la commutation de l'abonnement {to}."
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:66
+msgid "Establish Webhook endpoints for notifications on asynchronous events."
+msgstr "Établir des points de terminaison Webhook pour les notifications d'événements asynchrones."
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx:47
+msgid "Exclude the following people and domains from my email sync"
+msgstr "Exclure les personnes et domaines suivants de ma synchronisation d'emails"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:167
+msgid "Existing objects"
+msgstr "Objets existants"
+
+#: src/modules/navigation/components/AppNavigationDrawer.tsx:36
+msgid "Exit Settings"
+msgstr "Quitter les paramètres"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:26
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:32
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:108
+msgid "Experience"
+msgstr "Expérience"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:221
+msgid "Expiration"
+msgstr "Expiration"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:126
+msgid "Expiration Date"
+msgstr "Date d'expiration"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:259
+msgid "Expires in"
+msgstr "Expire en"
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:42
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:27
+msgid "Fields"
+msgstr "Domaines"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:265
+msgid "Filters"
+msgstr "Filtres"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:66
+msgid "French"
+msgstr "Français"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:87
+msgid "Full access"
+msgstr "Accès complet"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:187
+msgid "Functions"
+msgstr "Fonctions"
+
+#: src/pages/settings/SettingsWorkspace.tsx:29
+#: src/pages/settings/SettingsWorkspace.tsx:35
+#: src/pages/settings/workspace/SettingsDomain.tsx:132
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:138
+msgid "General"
+msgstr "Général"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:70
+msgid "German"
+msgstr "Allemand"
+
+#: src/pages/onboarding/InviteTeam.tsx:184
+msgid "Get the most out of your workspace by inviting your team."
+msgstr "Tirez le meilleur parti de votre espace de travail en y invitant votre équipe."
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:148
+msgid "Get your subscription"
+msgstr "S'abonner"
+
+#: src/pages/settings/SettingsWorkspace.tsx:65
+msgid "Grant Twenty support temporary access to your workspace so we can troubleshoot problems or recover content on your behalf. You can revoke access at any time."
+msgstr "Accordez à Twenty support un accès temporaire à votre espace de travail afin que nous puissions résoudre des problèmes ou récupérer du contenu en votre nom. Vous pouvez révoquer l'accès à tout moment."
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:208
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:239
+msgid "Icon and Name"
+msgstr "Icône et nom"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:275
+msgid "If you’ve lost this key, you can regenerate it, but be aware that any script using this key will need to be updated. Please type\"{confirmationValue}\" to confirm."
+msgstr "Si vous avez perdu cette clé, vous pouvez la régénérer, mais sachez que tout script utilisant cette clé devra être mis à jour. Veuillez taper \"{confirmationValue}\" pour confirmer."
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:218
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:215
+msgid "Inactive"
+msgstr "Inactif"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:106
+msgid "Input must be in camel case and cannot start with a number"
+msgstr "Les données doivent être en majuscules et ne peuvent pas commencer par un chiffre"
+
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:15
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:21
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:160
+msgid "Integrations"
+msgstr "Intégrations"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:57
+msgid "Invalid auth provider"
+msgstr "Fournisseur d'authentification invalide"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:21
+msgid "Invalid email"
+msgstr "Courriel non valide"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:44
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:50
+msgid "Invalid email or domain"
+msgstr "Courriel ou domaine invalide"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:87
+msgid "Invalid form values"
+msgstr "Valeurs de formulaire non valides"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:167
+msgid "Invite by Link"
+msgstr "Inviter par lien"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:244
+msgid "Invite by email"
+msgstr "Inviter par courriel"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:157
+msgid "Invite by link"
+msgstr "Inviter par lien"
+
+#: src/pages/onboarding/InviteTeam.tsx:152
+msgid "Invite link sent to email addresses"
+msgstr "Lien d'invitation envoyé aux adresses électroniques"
+
+#: src/pages/onboarding/InviteTeam.tsx:181
+msgid "Invite your team"
+msgstr "Invitez votre équipe"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:74
+msgid "Italian"
+msgstr "Italien"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:51
+msgid "Language"
+msgstr "Langue"
+
+#: src/pages/onboarding/InviteTeam.tsx:127
+msgid "Link copied to clipboard"
+msgstr "Lien copié dans le presse-papiers"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:206
+msgid "Log out"
+msgstr "Déconnexion"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:209
+msgid "Logout"
+msgstr "Déconnexion"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:167
+msgid "Manage Members"
+msgstr "Gérer les membres"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:168
+msgid "Manage the members of your space here"
+msgstr "Gérez les membres de votre espace ici"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:57
+msgid "Manage your internet accounts."
+msgstr "Gérer vos comptes internet."
+
+#: src/pages/settings/SettingsBilling.tsx:144
+msgid "Manage your subscription"
+msgstr "Gérer votre abonnement"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:143
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:149
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:143
+msgid "Members"
+msgstr "Les membres"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:177
+#: src/pages/settings/SettingsWorkspace.tsx:44
+#: src/pages/settings/SettingsProfile.tsx:35
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:106
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:211
+#: src/modules/settings/workspace/components/NameField.tsx:91
+msgid "Name"
+msgstr "Nom"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:106
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:211
+msgid "Name of your API key"
+msgstr "Nom de votre clé API"
+
+#: src/pages/settings/SettingsWorkspace.tsx:44
+msgid "Name of your workspace"
+msgstr "Nom de votre espace de travail"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:125
+msgid "Navigate"
+msgstr "Naviguer"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:79
+msgid "New"
+msgstr "Nouveau"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:92
+msgid "New Key"
+msgstr "Nouvelle clé"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:69
+msgid "New Object"
+msgstr "Nouvel objet"
+
+#: src/pages/auth/PasswordReset.tsx:233
+msgid "New Password"
+msgstr "Nouveau mot de passe"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:81
+msgid "New Webhook"
+msgstr "Nouveau Webhook"
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:10
+msgid "New account"
+msgstr "Nouveau compte"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:82
+msgid "New key"
+msgstr "Nouvelle clé"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:46
+msgid "No connected account"
+msgstr "Pas de compte connecté"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:141
+msgid "Notes"
+msgstr "Notes"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:160
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:179
+#: src/pages/settings/data-model/SettingsNewObject.tsx:76
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:205
+msgid "Objects"
+msgstr "Objets"
+
+#: src/pages/not-found/NotFound.tsx:47
+msgid "Off the beaten path"
+msgstr "Hors des sentiers battus"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:137
+msgid "Opportunities"
+msgstr "Opportunités"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:195
+msgid "Other"
+msgstr "Autres"
+
+#: src/pages/not-found/NotFound.tsx:41
+msgid "Page Not Found"
+msgstr "Page non trouvée"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:156
+msgid "Password"
+msgstr "Mot de passe"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:34
+msgid "Password reset link has been sent to the email"
+msgstr "Le lien de réinitialisation du mot de passe a été envoyé à l'email"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:129
+msgid "People"
+msgstr "Les personnes"
+
+#: src/pages/settings/SettingsWorkspace.tsx:40
+#: src/pages/settings/SettingsProfile.tsx:30
+msgid "Picture"
+msgstr "Photo"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:102
+msgid "Please enter a valid URL"
+msgstr "Veuillez saisir une URL valide"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:258
+msgid "Please type \"{confirmationValue}\" to confirm you want to delete this API Key. Be aware that any script using this key will stop working."
+msgstr "Veuillez taper \"{confirmationValue}\" pour confirmer que vous souhaitez supprimer cette clé API. Sachez que tout script utilisant cette clé cessera de fonctionner."
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:358
+msgid "Please type {confirmationText} to confirm you want to delete this webhook."
+msgstr "Veuillez taper {confirmationText} pour confirmer que vous souhaitez supprimer ce webhook."
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:62
+msgid "Portuguese"
+msgstr "Portugais"
+
+#: src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx:62
+#: src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx:30
+msgid "Preview"
+msgstr "Avant-première"
+
+#: src/pages/settings/SettingsProfile.tsx:19
+#: src/pages/settings/SettingsProfile.tsx:25
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:103
+msgid "Profile"
+msgstr "Profil"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:97
+msgid "Pseudo-English"
+msgstr "Pseudo-anglais"
+
+#: src/modules/settings/developers/components/SettingsReadDocumentationButton.tsx:9
+msgid "Read documentation"
+msgstr "Lire la documentation"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:53
+msgid "Receive an email containing password update link"
+msgstr "Recevoir un courriel contenant un lien de mise à jour du mot de passe"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:109
+msgid "Record Selection"
+msgstr "Sélection des enregistrements"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:195
+msgid "Regenerate Key"
+msgstr "Régénérer la clé"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:191
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:273
+msgid "Regenerate an API key"
+msgstr "Régénérer une clé API"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:282
+msgid "Regenerate key"
+msgstr "Régénérer la clé"
+
+#: src/pages/settings/Releases.tsx:111
+#: src/pages/settings/Releases.tsx:117
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:204
+msgid "Releases"
+msgstr "Communiqués"
+
+#: src/modules/ui/input/components/ImageInput.tsx:173
+msgid "Remove"
+msgstr "Retirer"
+
+#: src/pages/auth/PasswordReset.tsx:177
+msgid "Reset Password"
+msgstr "Réinitialiser le mot de passe"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:47
+msgid "SSO"
+msgstr "SSO"
+
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:44
+#: src/modules/navigation/components/MainNavigationDrawerItems.tsx:50
+msgid "Search"
+msgstr "Recherche"
+
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:183
+msgid "Search a field..."
+msgstr "Rechercher un champ..."
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:116
+msgid "Search an index..."
+msgstr "Rechercher un index..."
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:171
+msgid "Search for an object..."
+msgstr "Recherche d'un objet..."
+
+#: src/pages/settings/security/SettingsSecurity.tsx:33
+#: src/pages/settings/security/SettingsSecurity.tsx:40
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:166
+msgid "Security"
+msgstr "Sécurité"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:266
+msgid "Select the events you wish to send to this endpoint"
+msgstr "Sélectionnez les événements que vous souhaitez envoyer à ce point de contact"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:52
+msgid "Select your preferred language"
+msgstr "Sélectionnez votre langue préférée"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:245
+msgid "Send an invite email to your team"
+msgstr "Envoyez un courriel d'invitation à votre équipe"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:198
+msgid "Server Admin Panel"
+msgstr "Panneau d'administration du serveur"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:46
+msgid "Set email visibility, manage your blocklist and more."
+msgstr "Définissez la visibilité des e-mails, gérez votre liste de blocage et bien plus encore."
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:151
+msgid "Set the name of your subdomain"
+msgstr "Définissez le nom de votre sous-domaine"
+
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:50
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:33
+#: src/modules/navigation/components/MainNavigationDrawerItems.tsx:56
+msgid "Settings"
+msgstr "Paramètres"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:158
+msgid "Share this link to invite users to join your workspace"
+msgstr "Partagez ce lien pour inviter les utilisateurs à rejoindre votre espace de travail"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:212
+msgid "Should changing a field's label also change the API name?"
+msgstr "La modification de l'intitulé d'un champ doit-elle également entraîner la modification du nom de l'API ?"
+
+#: src/pages/onboarding/InviteTeam.tsx:236
+msgid "Skip"
+msgstr "Sauter"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:78
+msgid "Spanish"
+msgstr "Espagnol"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:107
+msgid "Subdomain already taken"
+msgstr "Sous-domaine déjà pris"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:49
+msgid "Subdomain can not be longer than 30 characters"
+msgstr "Le sous-domaine ne doit pas comporter plus de 30 caractères"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:48
+msgid "Subdomain can not be shorter than 3 characters"
+msgstr "Le sous-domaine ne peut être inférieur à 3 caractères"
+
+#: src/pages/settings/SettingsBilling.tsx:117
+msgid "Subscription has been switched {to}"
+msgstr "L'abonnement a été modifié {to}"
+
+#: src/pages/settings/SettingsWorkspace.tsx:63
+msgid "Support"
+msgstr "Soutien"
+
+#: src/pages/settings/SettingsBilling.tsx:188
+msgid "Switch billing {to}"
+msgstr "Changer la facturation en {to}"
+
+#: src/pages/settings/SettingsBilling.tsx:158
+msgid "Switch {from}"
+msgstr "Changer en {from}"
+
+#: src/pages/settings/SettingsBilling.tsx:162
+msgid "Switch {to}"
+msgstr "Changer en {to}"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:211
+msgid "Synchronize Field Label and API Name"
+msgstr "Synchroniser l'étiquette du champ et le nom de l'API"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:55
+msgid "System Settings - {systemTimeFormatLabel}"
+msgstr "Paramètres du système - {systemTimeFormatLabel}"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx:42
+msgid "System settings - {systemDateFormatLabel}"
+msgstr "Paramètres du système - {systemDateFormatLabel}"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:145
+msgid "Tasks"
+msgstr "Tâches"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:240
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:267
+msgid "The description of this field"
+msgstr "La description de ce champ"
+
+#: src/pages/settings/SettingsProfile.tsx:43
+msgid "The email associated to your account"
+msgstr "L'email associé à votre compte"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:209
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:240
+msgid "The name and icon of this field"
+msgstr "Le nom et l'icône de ce champ"
+
+#: src/pages/not-found/NotFound.tsx:50
+msgid "The page you're seeking is either gone or never was. Let's get you back on track"
+msgstr "La page que vous recherchez a disparu ou n'a jamais existé. Remettons les choses en ordre"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:229
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:252
+msgid "The values of this field"
+msgstr "Les valeurs de ce champ"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:224
+msgid "The values of this field must be unique"
+msgstr "Les valeurs de ce champ doivent être uniques"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:38
+msgid "There was an issue"
+msgstr "Il y a eu un problème"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:323
+msgid "This action cannot be undone. This will permanently delete this user and remove them from all their assignments."
+msgstr "Cette action ne peut être annulée. Cette action supprimera définitivement l'utilisateur et l'exclura de toutes ses affectations."
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:48
+msgid "This action cannot be undone. This will permanently delete your entire workspace. <0/> Please type in your email to confirm."
+msgstr "Cette action ne peut être annulée. Elle supprimera définitivement l'ensemble de votre espace de travail. <0/> Veuillez saisir votre adresse électronique pour confirmer."
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:49
+msgid "Time format"
+msgstr "Format de l'heure"
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:55
+msgid "Type"
+msgstr "Type"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:100
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:242
+msgid "URL"
+msgstr "URL"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:88
+msgid "Unlimited contacts"
+msgstr "Nombre illimité de contacts"
+
+#: src/modules/ui/input/components/ImageInput.tsx:165
+msgid "Upload"
+msgstr "Télécharger"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:51
+msgid "Use letter, number and dash only. Start and finish with a letter or a number"
+msgstr "Utilisez uniquement des lettres, des chiffres et des tirets. Commencer et terminer par une lettre ou un chiffre"
+
+#: src/pages/settings/SettingsProfile.tsx:22
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:29
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:17
+#: src/pages/settings/accounts/SettingsAccounts.tsx:43
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:101
+msgid "User"
+msgstr "Utilisateur"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:51
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:106
+msgid "User is not logged in"
+msgstr "L'utilisateur n'est pas connecté"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:223
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:228
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:251
+msgid "Values"
+msgstr "Valeurs"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:117
+msgid "View"
+msgstr "Voir"
+
+#: src/pages/settings/SettingsBilling.tsx:149
+msgid "View billing details"
+msgstr "Voir les détails de la facturation"
+
+#: src/modules/settings/data-model/objects/components/SettingsObjectCoverImage.tsx:35
+msgid "Visualize"
+msgstr "Visualiser"
+
+#: src/modules/ui/input/components/ImageInput.tsx:178
+msgid "We support your square PNGs, JPEGs and GIFs under 10MB"
+msgstr "Nous prenons en charge vos PNG, JPEG et GIF carrés de moins de 10 Mo"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:97
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:239
+msgid "We will send POST requests to this endpoint for every new event"
+msgstr "Nous enverrons des requêtes POST à ce point de terminaison pour chaque nouvel événement"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:223
+msgid "Webhook"
+msgstr "Crochet Web"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:65
+msgid "Webhooks"
+msgstr "Crochets Web"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:127
+msgid "When the API key will expire."
+msgstr "Date d'expiration de la clé API."
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:222
+msgid "When the key will be disabled"
+msgstr "Quand la clé sera désactivée"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:113
+msgid "Workflow Record Selection"
+msgstr "Sélection des enregistrements du flux de travail"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:121
+msgid "Workflows"
+msgstr "Flux de travail"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:146
+#: src/pages/settings/SettingsWorkspace.tsx:32
+#: src/pages/settings/SettingsBilling.tsx:132
+#: src/pages/settings/Releases.tsx:114
+#: src/pages/settings/workspace/SettingsDomain.tsx:128
+#: src/pages/settings/security/SettingsSecurity.tsx:37
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:18
+#: src/pages/settings/developers/SettingsDevelopers.tsx:39
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:74
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:216
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:85
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:167
+#: src/pages/settings/data-model/SettingsObjects.tsx:157
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:175
+#: src/pages/settings/data-model/SettingsNewObject.tsx:72
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:201
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:58
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:136
+msgid "Workspace"
+msgstr "Espace de travail"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:46
+msgid "Workspace Deletion"
+msgstr "Suppression de l'espace de travail"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:254
+msgid "Write a description"
+msgstr "Rédiger une description"
+
+#: src/pages/settings/SettingsBilling.tsx:46
+msgid "You will be charged immediately for the full year."
+msgstr "Vous serez immédiatement facturé pour l'année entière."
+
+#: src/pages/settings/SettingsBilling.tsx:53
+msgid "Your credit balance will be used to pay the monthly bills."
+msgstr "Votre solde créditeur sera utilisé pour payer les factures mensuelles."
+
+#: src/pages/settings/SettingsProfile.tsx:36
+msgid "Your name as it will be displayed"
+msgstr "Votre nom tel qu'il sera affiché"
+
+#: src/pages/settings/SettingsBilling.tsx:171
+msgid "Your workspace will be disabled"
+msgstr "Votre espace de travail sera désactivé"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:167
+msgid "employees"
+msgstr "employés"
+
+#: src/pages/settings/SettingsBilling.tsx:45
+msgid "from monthly to yearly"
+msgstr "de mensuel à annuel"
+
+#: src/pages/settings/SettingsBilling.tsx:52
+msgid "from yearly to monthly"
+msgstr "d'annuel à mensuel"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:108
+msgid "not allowed"
+msgstr "non autorisé"
+
+#: src/pages/onboarding/InviteTeam.tsx:213
+msgid "or"
+msgstr "ou"
+
+#: src/pages/settings/SettingsBilling.tsx:51
+msgid "to monthly"
+msgstr "au mois"
+
+#: src/pages/settings/SettingsBilling.tsx:44
+msgid "to yearly"
+msgstr "à l'année"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:209
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:158
+msgid "yes"
+msgstr "oui"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:174
+msgid "{apiKeyName} API Key"
+msgstr "{apiKeyName} Clé API"
diff --git a/packages/twenty-front/src/locales/generated/de.ts b/packages/twenty-front/src/locales/generated/de.ts
new file mode 100644
index 000000000000..5b9586274ead
--- /dev/null
+++ b/packages/twenty-front/src/locales/generated/de.ts
@@ -0,0 +1 @@
+/*eslint-disable*/import type{Messages}from"@lingui/core";export const messages=JSON.parse("{\"J/hVSQ\":[[\"0\"]],\"uogEAL\":[[\"apiKeyName\"],\" API-Schlüssel\"],\"YT0WJ4\":[\"1 000 Workflow-Knotenausführungen\"],\"4EdXYs\":[\"12h (\",[\"hour12Label\"],\")\"],\"0HAF12\":[\"2. Feld konfigurieren\"],\"QsMprd\":[\"24h (\",[\"hour24Label\"],\")\"],\"ssjjFt\":[\"Abbrechen\"],\"uyJsf6\":[\"Über\"],\"AeXO77\":[\"Konto\"],\"nD0Y+a\":[\"Konto-Löschung\"],\"bPwFdf\":[\"Konten\"],\"FQBaXG\":[\"Aktivieren Sie\"],\"F6pfE9\":[\"Aktiv\"],\"Mue4oc\":[\"Aktive API-Schlüssel, die von Ihnen oder Ihrem Team erstellt wurden.\"],\"Z+OxK0\":[\"Active APIs keys created by you or your team.\"],\"DpV70M\":[\"Feld hinzufügen\"],\"dEO3Zx\":[\"Objekt hinzufügen\"],\"sgXUv+\":[\"SSO-Identitätsanbieter hinzufügen\"],\"5+ttxv\":[\"Zur Blockliste hinzufügen\"],\"GMx1K0\":[\"Erlauben Sie Anmeldungen über die Google-Single-Sign-On-Funktion.\"],\"dea+zy\":[\"Erlauben Sie Anmeldungen über Microsofts Single Sign-On-Funktion.\"],\"wMg43c\":[\"Erlauben Sie die Einladung neuer Benutzer durch die Freigabe eines Einladungslinks.\"],\"vHeVg5\":[\"Erlauben Sie den Benutzern, sich mit einer E-Mail und einem Passwort anzumelden.\"],\"mJ6m4C\":[\"Eine optionale Beschreibung\"],\"0RqpZr\":[\"API & Webhooks\"],\"yRnk5W\":[\"API-Schlüssel\"],\"5h8ooz\":[\"API-Schlüssel\"],\"kAtj+q\":[\"API-Name\"],\"aAIQg2\":[\"Erscheinungsbild\"],\"3iX0kh\":[\"Sind Sie sicher, dass Sie Ihr Abrechnungsintervall ändern möchten?\"],\"TmDqlR\":[\"Are you sure that you want to change your billing interval? \",[\"5\"]],\"jQyP8N\":[\"Are you sure that you want to change your billing interval? \",[\"impact\"]],\"Y7Dx6e\":[\"Mindestens eine Authentifizierungsmethode muss aktiviert sein\"],\"P8fBlG\":[\"Authentifizierung\"],\"yIVrHZ\":[\"Autorisieren Sie\"],\"Dht9W3\":[\"Zurück zum Inhalt\"],\"R+w/Va\":[\"Rechnungsstellung\"],\"K1172m\":[\"Blockliste\"],\"2yl5lQ\":[\"Buchen Sie einen Anruf\"],\"PmmvzS\":[\"Berechnen Sie\"],\"AjVXBS\":[\"Kalender\"],\"EUpfsd\":[\"Kalendarien\"],\"dEgA5A\":[\"Abbrechen\"],\"0TllC8\":[\"Jederzeit abbrechen\"],\"rRK/Lf\":[\"Plan stornieren\"],\"N6gPiD\":[\"Ihr Abonnement kündigen\"],\"JcIGyw\":[\"Change \",[\"6\"]],\"OfzMnb\":[\"Ändern \",[\"to\"]],\"VhMDMg\":[\"Passwort ändern\"],\"h1IXFK\":[\"Chinese\"],\"SviKkE\":[\"Chinesisch - Vereinfacht\"],\"dzb4Ep\":[\"Chinesisch - Traditionell\"],\"JEFFOR\":[\"Wählen Sie ein Objekt\"],\"9qP96p\":[\"Wählen Sie Ihre Probezeit\"],\"yz7wBu\":[\"Schließen Sie\"],\"s2QZS6\":[\"Unternehmen\"],\"+zUMwJ\":[\"Konfigurieren Sie eine SSO-Verbindung\"],\"QTNsSm\":[\"Konfigurieren Sie Ihre Kalendereinstellungen und passen Sie sie an.\"],\"aGwm+D\":[\"Konfigurieren Sie die Anzeige von Daten in der App\"],\"Bh4GBD\":[\"Konfigurieren Sie Ihre E-Mail- und Kalendereinstellungen.\"],\"pA86+/\":[\"Verbinden Sie ein Google-Konto\"],\"D8ATlr\":[\"Verbinden Sie ein neues Konto mit Ihrem Arbeitsbereich\"],\"Zgi9Fd\":[\"Mit Google verbinden\"],\"IOfqM8\":[\"Verbindung mit Microsoft\"],\"9TzudL\":[\"Verbundene Konten\"],\"xGVfLh\":[\"Weiter\"],\"CcGOj+\":[\"Kopilot\"],\"7eVkEH\":[\"Link zur Einladung kopieren\"],\"Ej5euX\":[\"Kopieren Sie diesen Schlüssel, da er nicht mehr sichtbar sein wird\"],\"hgTg6d\":[\"Copy this key as it will only be visible this one time\"],\"uXGLuq\":[\"API-Schlüssel erstellen\"],\"dkAPxi\":[\"Webhook erstellen\"],\"8skTDV\":[\"Benutzerdefinierte Objekte\"],\"ekOgDG\":[\"Benutzerdefinierte Objekte\"],\"qt+EaC\":[\"Passen Sie die in den \",[\"objectLabelSingular\"],\"-Ansichten verfügbaren Felder an.\"],\"CMhr4u\":[\"Domäne anpassen\"],\"bCJa9l\":[\"Passen Sie die Sicherheit Ihres Arbeitsbereichs an\"],\"Zz6Cxn\":[\"Gefahrenzone\"],\"5cNMFz\":[\"Datenmodell\"],\"Ud9zHv\":[\"Datum und Uhrzeit\"],\"5y3O+A\":[\"Deaktivieren Sie\"],\"qk4i22\":[\"Deaktivieren Sie \\\"Objektbezeichnungen und API-Namen synchronisieren\\\", um einen benutzerdefinierten API-Namen festzulegen\"],\"gexAq8\":[\"Deaktivieren Sie dieses Feld\"],\"Y2ImVJ\":[\"Definieren Sie den Namen und die Beschreibung Ihres Objekts\"],\"cnGeoo\":[\"Löschen\"],\"ZDGm40\":[\"Konto löschen\"],\"gAz0S5\":[\"Konto und alle zugehörigen Daten löschen\"],\"hGfWDm\":[\"API-Schlüssel löschen\"],\"T6S2Ns\":[\"Löschen Sie diese Integration\"],\"snMaH4\":[\"Webhook löschen\"],\"kYu0eF\":[\"Arbeitsbereich löschen\"],\"mk2Ygs\":[\"Löschen Sie Ihren gesamten Arbeitsbereich\"],\"Nu4oKW\":[\"Beschreibung\"],\"n+SX4g\":[\"Entwickler\"],\"i66xz9\":[\"Anzeige als relatives Datum\"],\"EoKe5U\":[\"Domäne\"],\"QVVmxi\":[\"Z.B. Backoffice-Integration\"],\"v+uKyy\":[\"Abrechnungsintervall bearbeiten\"],\"h2KoTu\":[\"Zahlungsmethode bearbeiten, Rechnungen einsehen und mehr\"],\"6o1M/Q\":[\"Bearbeiten Sie den Namen Ihrer Subdomain oder legen Sie eine benutzerdefinierte Domain fest.\"],\"O3oNi5\":[\"E-Mail\"],\"lfQsvW\":[\"E-Mail-Integration\"],\"QT/Wo7\":[\"E-Mail oder Domain ist bereits in der Blockliste\"],\"BXEcos\":[\"E-Mails\"],\"eXoH4Q\":[\"mitarbeiter\"],\"gqv5ZL\":[\"Mitarbeiter\"],\"T3juzf\":[\"Endpunkt-URL\"],\"lYGfRP\":[\"Englisch\"],\"/bfFKe\":[\"Genießen Sie eine \",[\"withCreditCardTrialPeriodDuration\"],\"-tägige kostenlose Testphase\"],\"GpB8YV\":[\"Unternehmen\"],\"c3qGJX\":[\"Fehler beim Löschen des Api-Schlüssels: \",[\"err\"]],\"bj7nh3\":[\"Fehler beim Regenerieren des Api-Schlüssels: \",[\"err\"]],\"RgSsJ3\":[\"Error while switching subscription \",[\"1\"],\".\"],\"VSQxWH\":[\"Fehler beim Umschalten des Abonnements \",[\"to\"],\".\"],\"JLxMta\":[\"Erstellen Sie Webhook-Endpunkte für Benachrichtigungen über asynchrone Ereignisse.\"],\"cIgBjB\":[\"Die folgenden Personen und Domänen von der E-Mail-Synchronisierung ausschließen\"],\"fV7V51\":[\"Vorhandene Objekte\"],\"AUC8ds\":[\"Exit settings\"],\"IZ4o2e\":[\"Beenden der Einstellungen\"],\"bKBhgb\":[\"Erfahrung\"],\"LxRNPw\":[\"Verfallsdatum\"],\"SkXfL0\":[\"Verfallsdatum\"],\"i9qiyR\":[\"Läuft ab in\"],\"Q0iobh\":[\"Failed to create object\"],\"vF68cg\":[\"Felder\"],\"cSev+j\":[\"Filter\"],\"nLC6tu\":[\"Französisch\"],\"aTieE0\":[\"von monatlich bis jährlich\"],\"K04lE5\":[\"von jährlich auf monatlich\"],\"scmRyR\":[\"Vollständiger Zugang\"],\"xANKBj\":[\"Funktionen\"],\"Weq9zb\":[\"Allgemein\"],\"DDcvSo\":[\"Deutsch\"],\"NXEW3h\":[\"Holen Sie das Beste aus Ihrem Arbeitsplatz heraus, indem Sie Ihr Team einladen.\"],\"zSGbaR\":[\"Holen Sie sich Ihr Abonnement\"],\"hWp1MY\":[\"Gewähren Sie dem Twenty-Support vorübergehend Zugang zu Ihrem Arbeitsbereich, damit wir Probleme beheben oder Inhalte in Ihrem Namen wiederherstellen können. Sie können den Zugriff jederzeit widerrufen.\"],\"XTWO+W\":[\"Icon und Name\"],\"j843N3\":[\"Wenn Sie diesen Schlüssel verloren haben, können Sie ihn neu generieren, aber beachten Sie, dass jedes Skript, das diesen Schlüssel verwendet, aktualisiert werden muss. Bitte geben Sie zur Bestätigung \\\"\",[\"confirmationValue\"],\"\\\" ein.\"],\"NoNwIX\":[\"Inaktiv\"],\"JE2tjr\":[\"Die Eingabe muss in Großbuchstaben erfolgen und darf nicht mit einer Zahl beginnen\"],\"nbfdhU\":[\"Integrationen\"],\"NtFk/Z\":[\"Ungültiger Autorisierungsanbieter\"],\"B2Tpo0\":[\"Ungültige E-Mail\"],\"/m52AE\":[\"Ungültige E-Mail oder Domäne\"],\"QdoUFL\":[\"Ungültige Formularwerte\"],\"/Wrd4p\":[\"Invalid object data\"],\"0M8+El\":[\"Per E-Mail einladen\"],\"PWIq/W\":[\"Per Link einladen\"],\"3athPG\":[\"Einladen per Link\"],\"5IfmKA\":[\"Einladungslink an E-Mail-Adressen gesendet\"],\"d+Y+rP\":[\"Laden Sie Ihr Team ein\"],\"Lj7sBL\":[\"Italienisch\"],\"vXIe7J\":[\"Sprache\"],\"pQjjYo\":[\"Link in die Zwischenablage kopiert\"],\"FgAxTj\":[\"Abmelden\"],\"nOhz3x\":[\"Abmeldung\"],\"T6YjCk\":[\"Mitglieder verwalten\"],\"4cjU2u\":[\"Verwalten Sie hier die Mitglieder Ihres Bereichs\"],\"FyFNsd\":[\"Verwalten Sie Ihre Internetkonten.\"],\"36kYu0\":[\"Verwalten Sie Ihr Abonnement\"],\"wlQNTg\":[\"Mitglieder\"],\"y5rS9U\":[\"Migrate\"],\"6YtxFj\":[\"Name\"],\"z+6jaZ\":[\"Name Ihres API-Schlüssels\"],\"J7w8lI\":[\"Name Ihres Arbeitsbereichs\"],\"dbDjdV\":[\"Navigieren\"],\"isRobC\":[\"Neu\"],\"Kcr9Fr\":[\"Neues Konto\"],\"o8MyXb\":[\"Neuer Schlüssel\"],\"j313SZ\":[\"Neuer Schlüssel\"],\"hFxdey\":[\"Neues Objekt\"],\"7vhWI8\":[\"Neues Passwort\"],\"U1DAok\":[\"Neuer Webhook\"],\"pwenQu\":[\"Kein verbundenes Konto\"],\"+FLRjr\":[\"nicht erlaubt\"],\"1DBGsz\":[\"Anmerkungen\"],\"FU94q4\":[\"Object created successfully\"],\"B3toQF\":[\"Objekte\"],\"KNz3EF\":[\"Abseits der ausgetretenen Pfade\"],\"4MyDFl\":[\"Möglichkeiten\"],\"BzEFor\":[\"oder\"],\"/IX/7x\":[\"Andere\"],\"boJlGf\":[\"Seite nicht gefunden\"],\"NRvxzv\":[\"Page Not Found | Twenty\"],\"8ZsakT\":[\"Passwort\"],\"mi6Rel\":[\"Der Link zum Zurücksetzen des Passworts wurde an die E-Mail gesendet\"],\"1wdjme\":[\"Menschen\"],\"N0+GsR\":[\"Bild\"],\"jEw0Mr\":[\"Bitte geben Sie eine gültige URL ein\"],\"6nsIo3\":[\"Bitte geben Sie \\\"\",[\"confirmationValue\"],\"\\\" ein, um zu bestätigen, dass Sie diesen API-Schlüssel löschen möchten. Beachten Sie, dass jedes Skript, das diesen Schlüssel verwendet, nicht mehr funktioniert.\"],\"mFZTXr\":[\"Bitte geben Sie \",[\"confirmationText\"],\" ein, um zu bestätigen, dass Sie diesen Webhook löschen möchten.\"],\"MOERNx\":[\"Portugiesisch\"],\"rdUucN\":[\"Vorschau\"],\"vERlcd\":[\"Profil\"],\"YJgRqq\":[\"Pseudo-Englisch\"],\"ibPuCP\":[\"Dokumentation lesen\"],\"v3xM25\":[\"Sie erhalten eine E-Mail mit einem Link zur Passwortaktualisierung\"],\"dSCufP\":[\"Datensatz-Auswahl\"],\"vpZcGd\":[\"Einen API-Schlüssel neu generieren\"],\"Mwqo5m\":[\"Schlüssel neu generieren\"],\"D+Mv78\":[\"Schlüssel regenerieren\"],\"5icoS1\":[\"Veröffentlichungen\"],\"t/YqKh\":[\"Entfernen\"],\"KbS2K9\":[\"Passwort zurücksetzen\"],\"A1taO8\":[\"Suche\"],\"l1/uy2\":[\"Ein Feld suchen...\"],\"k7kp5/\":[\"Suche in einem Index...\"],\"BoNHR0\":[\"Search an object...\"],\"ofuw3g\":[\"Suche nach einem Objekt...\"],\"a3LDKx\":[\"Sicherheit\"],\"xraglu\":[\"Wählen Sie die Ereignisse aus, die Sie an diesen Endpunkt senden möchten\"],\"AXTJAW\":[\"Wählen Sie Ihre bevorzugte Sprache\"],\"mjK8F3\":[\"Senden Sie eine Einladungs-E-Mail an Ihr Team\"],\"yy5k7a\":[\"Server-Verwaltungsbereich\"],\"V7fgiB\":[\"Legen Sie die Sichtbarkeit von E-Mails fest, verwalten Sie Ihre Blockliste und vieles mehr.\"],\"tn41zE\":[\"Legen Sie den Namen Ihrer Subdomain fest\"],\"Tz0i8g\":[\"Einstellungen\"],\"Vy9kmk\":[\"Geben Sie diesen Link weiter, um Benutzer einzuladen, Ihrem Arbeitsbereich beizutreten\"],\"gWk8gY\":[\"Sollte die Änderung einer Feldbezeichnung auch den API-Namen ändern?\"],\"6Uau97\":[\"Überspringen\"],\"65A04M\":[\"Spanisch\"],\"vnS6Rf\":[\"SSO\"],\"omhc+7\":[\"Subdomain bereits belegt\"],\"OlC/tU\":[\"Die Subdomain darf nicht länger als 30 Zeichen sein\"],\"ZETwlU\":[\"Die Subdomain darf nicht kürzer als 3 Zeichen sein\"],\"AymUjZ\":[\"Subscription has been switched \",[\"0\"]],\"B5jRKH\":[\"Das Abonnement wurde umgestellt \",[\"to\"]],\"XYLcNv\":[\"Unterstützung\"],\"Sk5fyO\":[\"Switch \",[\"2\"]],\"z9maAp\":[\"Switch \",[\"3\"]],\"9yk9d1\":[\"Schalter \",[\"from\"]],\"qi74XZ\":[\"Schalter \",[\"to\"]],\"FwAweN\":[\"Switch billing \",[\"4\"]],\"L6Fg36\":[\"Abrechnung wechseln \",[\"to\"]],\"AtzMpB\":[\"Feldbezeichnung und API-Name synchronisieren\"],\"E3AMmw\":[\"Systemeinstellungen - \",[\"systemDateFormatLabel\"]],\"0ZgB1e\":[\"Systemeinstellungen - \",[\"systemTimeFormatLabel\"]],\"GtycJ/\":[\"Aufgaben\"],\"2OUtmv\":[\"Die Beschreibung dieses Feldes\"],\"VGZYbZ\":[\"Die mit Ihrem Konto verbundene E-Mail\"],\"h8mvCd\":[\"Der Name und das Symbol dieses Feldes\"],\"L97sPr\":[\"Die Seite, die Sie suchen, ist entweder nicht mehr vorhanden oder wurde nie angezeigt. Bringen wir Sie wieder auf den richtigen Weg\"],\"uWikAA\":[\"Die Werte dieses Feldes\"],\"+69KDk\":[\"Die Werte dieses Feldes müssen eindeutig sein\"],\"PmtLRf\":[\"Es gab ein Problem\"],\"7YiCMg\":[\"This action cannot be undone. This will permanently delete this user and remove them from all their assignements.\"],\"hqCwGc\":[\"Diese Aktion kann nicht rückgängig gemacht werden. Dadurch wird dieser Benutzer dauerhaft gelöscht und aus allen seinen Aufgaben entfernt.\"],\"gWGuHC\":[\"Diese Aktion kann nicht rückgängig gemacht werden. Dadurch wird Ihr gesamter Arbeitsbereich dauerhaft gelöscht. <0/> Bitte geben Sie Ihre E-Mail zur Bestätigung ein.\"],\"n9nSNJ\":[\"Zeitformat\"],\"aqMzDX\":[\"auf monatlich\"],\"WXXiXO\":[\"bis jährlich\"],\"+zy2Nq\":[\"Typ\"],\"GQCXQS\":[\"Unbegrenzte Kontakte\"],\"ONWvwQ\":[\"Hochladen\"],\"IagCbF\":[\"URL\"],\"oTTQsc\":[\"Verwenden Sie nur Buchstaben, Zahlen und Bindestriche. Beginnen und enden Sie mit einem Buchstaben oder einer Zahl\"],\"7PzzBU\":[\"Benutzer\"],\"IjyOjp\":[\"Benutzer ist nicht eingeloggt\"],\"fXVIZq\":[\"Werte\"],\"jpctdh\":[\"Siehe\"],\"KANz0G\":[\"Details zur Rechnungsstellung anzeigen\"],\"6n7jtr\":[\"Visualisieren Sie\"],\"id6ein\":[\"Wir unterstützen Ihre quadratischen PNGs, JPEGs und GIFs unter 10MB\"],\"ZS7vYp\":[\"Für jedes neue Ereignis werden POST-Anfragen an diesen Endpunkt gesendet\"],\"TRDppN\":[\"Webhook\"],\"v1kQyJ\":[\"Webhooks\"],\"C51ilI\":[\"Wann der API-Schlüssel abläuft.\"],\"leUubq\":[\"Wenn die Taste deaktiviert wird\"],\"yLOrIT\":[\"Workflow Datensatzauswahl\"],\"woYYQq\":[\"Arbeitsabläufe\"],\"pmUArF\":[\"Arbeitsbereich\"],\"VicISP\":[\"Löschen von Arbeitsbereichen\"],\"Q9pNST\":[\"Schreiben Sie eine Beschreibung\"],\"3d1wCB\":[\"ja\"],\"zSkMV0\":[\"Sie werden sofort für das gesamte Jahr belastet.\"],\"XVnj6K\":[\"Ihr Guthaben wird zur Begleichung der monatlichen Rechnungen verwendet.\"],\"9ivpwk\":[\"Ihr Name, wie er angezeigt werden soll\"],\"RhNbPE\":[\"Ihr Arbeitsbereich wird deaktiviert\"]}")as Messages;
\ No newline at end of file
diff --git a/packages/twenty-front/src/locales/generated/en.ts b/packages/twenty-front/src/locales/generated/en.ts
new file mode 100644
index 000000000000..094b9ca91e9f
--- /dev/null
+++ b/packages/twenty-front/src/locales/generated/en.ts
@@ -0,0 +1 @@
+/*eslint-disable*/import type{Messages}from"@lingui/core";export const messages=JSON.parse("{\"J/hVSQ\":[[\"0\"]],\"uogEAL\":[[\"apiKeyName\"],\" API Key\"],\"YT0WJ4\":[\"1 000 workflow node executions\"],\"4EdXYs\":[\"12h (\",[\"hour12Label\"],\")\"],\"0HAF12\":[\"2. Configure field\"],\"QsMprd\":[\"24h (\",[\"hour24Label\"],\")\"],\"ssjjFt\":[\"Abort\"],\"uyJsf6\":[\"About\"],\"AeXO77\":[\"Account\"],\"nD0Y+a\":[\"Account Deletion\"],\"bPwFdf\":[\"Accounts\"],\"FQBaXG\":[\"Activate\"],\"F6pfE9\":[\"Active\"],\"Mue4oc\":[\"Active API keys created by you or your team.\"],\"Z+OxK0\":[\"Active APIs keys created by you or your team.\"],\"DpV70M\":[\"Add Field\"],\"dEO3Zx\":[\"Add object\"],\"sgXUv+\":[\"Add SSO Identity Provider\"],\"5+ttxv\":[\"Add to blocklist\"],\"GMx1K0\":[\"Allow logins through Google's single sign-on functionality.\"],\"dea+zy\":[\"Allow logins through Microsoft's single sign-on functionality.\"],\"wMg43c\":[\"Allow the invitation of new users by sharing an invite link.\"],\"vHeVg5\":[\"Allow users to sign in with an email and password.\"],\"mJ6m4C\":[\"An optional description\"],\"0RqpZr\":[\"API & Webhooks\"],\"yRnk5W\":[\"API Key\"],\"5h8ooz\":[\"API keys\"],\"kAtj+q\":[\"API Name\"],\"aAIQg2\":[\"Appearance\"],\"3iX0kh\":[\"Are you sure that you want to change your billing interval?\"],\"TmDqlR\":[\"Are you sure that you want to change your billing interval? \",[\"5\"]],\"jQyP8N\":[\"Are you sure that you want to change your billing interval? \",[\"impact\"]],\"Y7Dx6e\":[\"At least one authentication method must be enabled\"],\"P8fBlG\":[\"Authentication\"],\"yIVrHZ\":[\"Authorize\"],\"Dht9W3\":[\"Back to content\"],\"R+w/Va\":[\"Billing\"],\"K1172m\":[\"Blocklist\"],\"2yl5lQ\":[\"Book a Call\"],\"PmmvzS\":[\"Calculate\"],\"AjVXBS\":[\"Calendar\"],\"EUpfsd\":[\"Calendars\"],\"dEgA5A\":[\"Cancel\"],\"0TllC8\":[\"Cancel anytime\"],\"rRK/Lf\":[\"Cancel Plan\"],\"N6gPiD\":[\"Cancel your subscription\"],\"JcIGyw\":[\"Change \",[\"6\"]],\"OfzMnb\":[\"Change \",[\"to\"]],\"VhMDMg\":[\"Change Password\"],\"h1IXFK\":[\"Chinese\"],\"SviKkE\":[\"Chinese — Simplified\"],\"dzb4Ep\":[\"Chinese — Traditional\"],\"JEFFOR\":[\"Choose an object\"],\"9qP96p\":[\"Choose your Trial\"],\"yz7wBu\":[\"Close\"],\"s2QZS6\":[\"Companies\"],\"+zUMwJ\":[\"Configure an SSO connection\"],\"QTNsSm\":[\"Configure and customize your calendar preferences.\"],\"aGwm+D\":[\"Configure how dates are displayed across the app\"],\"Bh4GBD\":[\"Configure your emails and calendar settings.\"],\"pA86+/\":[\"Connect a Google account\"],\"D8ATlr\":[\"Connect a new account to your workspace\"],\"Zgi9Fd\":[\"Connect with Google\"],\"IOfqM8\":[\"Connect with Microsoft\"],\"9TzudL\":[\"Connected accounts\"],\"xGVfLh\":[\"Continue\"],\"CcGOj+\":[\"Copilot\"],\"7eVkEH\":[\"Copy invitation link\"],\"Ej5euX\":[\"Copy this key as it will not be visible again\"],\"hgTg6d\":[\"Copy this key as it will only be visible this one time\"],\"uXGLuq\":[\"Create API key\"],\"dkAPxi\":[\"Create Webhook\"],\"8skTDV\":[\"Custom objects\"],\"ekOgDG\":[\"Custom Objects\"],\"qt+EaC\":[\"Customise the fields available in the \",[\"objectLabelSingular\"],\" views.\"],\"CMhr4u\":[\"Customize Domain\"],\"bCJa9l\":[\"Customize your workspace security\"],\"Zz6Cxn\":[\"Danger zone\"],\"5cNMFz\":[\"Data model\"],\"Ud9zHv\":[\"Date and time\"],\"5y3O+A\":[\"Deactivate\"],\"qk4i22\":[\"Deactivate \\\"Synchronize Objects Labels and API Names\\\" to set a custom API name\"],\"gexAq8\":[\"Deactivate this field\"],\"Y2ImVJ\":[\"Define the name and description of your object\"],\"cnGeoo\":[\"Delete\"],\"ZDGm40\":[\"Delete account\"],\"gAz0S5\":[\"Delete account and all the associated data\"],\"hGfWDm\":[\"Delete API key\"],\"T6S2Ns\":[\"Delete this integration\"],\"snMaH4\":[\"Delete webhook\"],\"kYu0eF\":[\"Delete workspace\"],\"mk2Ygs\":[\"Delete your whole workspace\"],\"Nu4oKW\":[\"Description\"],\"n+SX4g\":[\"Developers\"],\"i66xz9\":[\"Display as relative date\"],\"EoKe5U\":[\"Domain\"],\"QVVmxi\":[\"E.g. backoffice integration\"],\"v+uKyy\":[\"Edit billing interval\"],\"h2KoTu\":[\"Edit payment method, see your invoices and more\"],\"6o1M/Q\":[\"Edit your subdomain name or set a custom domain.\"],\"O3oNi5\":[\"Email\"],\"lfQsvW\":[\"Email integration\"],\"QT/Wo7\":[\"Email or domain is already in blocklist\"],\"BXEcos\":[\"Emails\"],\"eXoH4Q\":[\"employees\"],\"gqv5ZL\":[\"Employees\"],\"T3juzf\":[\"Endpoint URL\"],\"lYGfRP\":[\"English\"],\"/bfFKe\":[\"Enjoy a \",[\"withCreditCardTrialPeriodDuration\"],\"-days free trial\"],\"GpB8YV\":[\"Enterprise\"],\"c3qGJX\":[\"Error deleting api key: \",[\"err\"]],\"bj7nh3\":[\"Error regenerating api key: \",[\"err\"]],\"RgSsJ3\":[\"Error while switching subscription \",[\"1\"],\".\"],\"VSQxWH\":[\"Error while switching subscription \",[\"to\"],\".\"],\"JLxMta\":[\"Establish Webhook endpoints for notifications on asynchronous events.\"],\"cIgBjB\":[\"Exclude the following people and domains from my email sync\"],\"fV7V51\":[\"Existing objects\"],\"AUC8ds\":[\"Exit settings\"],\"IZ4o2e\":[\"Exit Settings\"],\"bKBhgb\":[\"Experience\"],\"LxRNPw\":[\"Expiration\"],\"SkXfL0\":[\"Expiration Date\"],\"i9qiyR\":[\"Expires in\"],\"Q0iobh\":[\"Failed to create object\"],\"vF68cg\":[\"Fields\"],\"cSev+j\":[\"Filters\"],\"nLC6tu\":[\"French\"],\"aTieE0\":[\"from monthly to yearly\"],\"K04lE5\":[\"from yearly to monthly\"],\"scmRyR\":[\"Full access\"],\"xANKBj\":[\"Functions\"],\"Weq9zb\":[\"General\"],\"DDcvSo\":[\"German\"],\"NXEW3h\":[\"Get the most out of your workspace by inviting your team.\"],\"zSGbaR\":[\"Get your subscription\"],\"hWp1MY\":[\"Grant Twenty support temporary access to your workspace so we can troubleshoot problems or recover content on your behalf. You can revoke access at any time.\"],\"XTWO+W\":[\"Icon and Name\"],\"j843N3\":[\"If you’ve lost this key, you can regenerate it, but be aware that any script using this key will need to be updated. Please type\\\"\",[\"confirmationValue\"],\"\\\" to confirm.\"],\"NoNwIX\":[\"Inactive\"],\"JE2tjr\":[\"Input must be in camel case and cannot start with a number\"],\"nbfdhU\":[\"Integrations\"],\"NtFk/Z\":[\"Invalid auth provider\"],\"B2Tpo0\":[\"Invalid email\"],\"/m52AE\":[\"Invalid email or domain\"],\"QdoUFL\":[\"Invalid form values\"],\"/Wrd4p\":[\"Invalid object data\"],\"0M8+El\":[\"Invite by email\"],\"PWIq/W\":[\"Invite by link\"],\"3athPG\":[\"Invite by Link\"],\"5IfmKA\":[\"Invite link sent to email addresses\"],\"d+Y+rP\":[\"Invite your team\"],\"Lj7sBL\":[\"Italian\"],\"vXIe7J\":[\"Language\"],\"pQjjYo\":[\"Link copied to clipboard\"],\"FgAxTj\":[\"Log out\"],\"nOhz3x\":[\"Logout\"],\"T6YjCk\":[\"Manage Members\"],\"4cjU2u\":[\"Manage the members of your space here\"],\"FyFNsd\":[\"Manage your internet accounts.\"],\"36kYu0\":[\"Manage your subscription\"],\"wlQNTg\":[\"Members\"],\"y5rS9U\":[\"Migrate\"],\"6YtxFj\":[\"Name\"],\"z+6jaZ\":[\"Name of your API key\"],\"J7w8lI\":[\"Name of your workspace\"],\"dbDjdV\":[\"Navigate\"],\"isRobC\":[\"New\"],\"Kcr9Fr\":[\"New account\"],\"o8MyXb\":[\"New key\"],\"j313SZ\":[\"New Key\"],\"hFxdey\":[\"New Object\"],\"7vhWI8\":[\"New Password\"],\"U1DAok\":[\"New Webhook\"],\"pwenQu\":[\"No connected account\"],\"+FLRjr\":[\"not allowed\"],\"1DBGsz\":[\"Notes\"],\"FU94q4\":[\"Object created successfully\"],\"B3toQF\":[\"Objects\"],\"KNz3EF\":[\"Off the beaten path\"],\"4MyDFl\":[\"Opportunities\"],\"BzEFor\":[\"or\"],\"/IX/7x\":[\"Other\"],\"boJlGf\":[\"Page Not Found\"],\"NRvxzv\":[\"Page Not Found | Twenty\"],\"8ZsakT\":[\"Password\"],\"mi6Rel\":[\"Password reset link has been sent to the email\"],\"1wdjme\":[\"People\"],\"N0+GsR\":[\"Picture\"],\"jEw0Mr\":[\"Please enter a valid URL\"],\"6nsIo3\":[\"Please type \\\"\",[\"confirmationValue\"],\"\\\" to confirm you want to delete this API Key. Be aware that any script using this key will stop working.\"],\"mFZTXr\":[\"Please type \",[\"confirmationText\"],\" to confirm you want to delete this webhook.\"],\"MOERNx\":[\"Portuguese\"],\"rdUucN\":[\"Preview\"],\"vERlcd\":[\"Profile\"],\"YJgRqq\":[\"Pseudo-English\"],\"ibPuCP\":[\"Read documentation\"],\"v3xM25\":[\"Receive an email containing password update link\"],\"dSCufP\":[\"Record Selection\"],\"vpZcGd\":[\"Regenerate an API key\"],\"Mwqo5m\":[\"Regenerate key\"],\"D+Mv78\":[\"Regenerate Key\"],\"5icoS1\":[\"Releases\"],\"t/YqKh\":[\"Remove\"],\"KbS2K9\":[\"Reset Password\"],\"A1taO8\":[\"Search\"],\"l1/uy2\":[\"Search a field...\"],\"k7kp5/\":[\"Search an index...\"],\"BoNHR0\":[\"Search an object...\"],\"ofuw3g\":[\"Search for an object...\"],\"a3LDKx\":[\"Security\"],\"xraglu\":[\"Select the events you wish to send to this endpoint\"],\"AXTJAW\":[\"Select your preferred language\"],\"mjK8F3\":[\"Send an invite email to your team\"],\"yy5k7a\":[\"Server Admin Panel\"],\"V7fgiB\":[\"Set email visibility, manage your blocklist and more.\"],\"tn41zE\":[\"Set the name of your subdomain\"],\"Tz0i8g\":[\"Settings\"],\"Vy9kmk\":[\"Share this link to invite users to join your workspace\"],\"gWk8gY\":[\"Should changing a field's label also change the API name?\"],\"6Uau97\":[\"Skip\"],\"65A04M\":[\"Spanish\"],\"vnS6Rf\":[\"SSO\"],\"omhc+7\":[\"Subdomain already taken\"],\"OlC/tU\":[\"Subdomain can not be longer than 30 characters\"],\"ZETwlU\":[\"Subdomain can not be shorter than 3 characters\"],\"AymUjZ\":[\"Subscription has been switched \",[\"0\"]],\"B5jRKH\":[\"Subscription has been switched \",[\"to\"]],\"XYLcNv\":[\"Support\"],\"Sk5fyO\":[\"Switch \",[\"2\"]],\"z9maAp\":[\"Switch \",[\"3\"]],\"9yk9d1\":[\"Switch \",[\"from\"]],\"qi74XZ\":[\"Switch \",[\"to\"]],\"FwAweN\":[\"Switch billing \",[\"4\"]],\"L6Fg36\":[\"Switch billing \",[\"to\"]],\"AtzMpB\":[\"Synchronize Field Label and API Name\"],\"E3AMmw\":[\"System settings - \",[\"systemDateFormatLabel\"]],\"0ZgB1e\":[\"System Settings - \",[\"systemTimeFormatLabel\"]],\"GtycJ/\":[\"Tasks\"],\"2OUtmv\":[\"The description of this field\"],\"VGZYbZ\":[\"The email associated to your account\"],\"h8mvCd\":[\"The name and icon of this field\"],\"L97sPr\":[\"The page you're seeking is either gone or never was. Let's get you back on track\"],\"uWikAA\":[\"The values of this field\"],\"+69KDk\":[\"The values of this field must be unique\"],\"PmtLRf\":[\"There was an issue\"],\"7YiCMg\":[\"This action cannot be undone. This will permanently delete this user and remove them from all their assignements.\"],\"hqCwGc\":[\"This action cannot be undone. This will permanently delete this user and remove them from all their assignments.\"],\"gWGuHC\":[\"This action cannot be undone. This will permanently delete your entire workspace. <0/> Please type in your email to confirm.\"],\"n9nSNJ\":[\"Time format\"],\"aqMzDX\":[\"to monthly\"],\"WXXiXO\":[\"to yearly\"],\"+zy2Nq\":[\"Type\"],\"GQCXQS\":[\"Unlimited contacts\"],\"ONWvwQ\":[\"Upload\"],\"IagCbF\":[\"URL\"],\"oTTQsc\":[\"Use letter, number and dash only. Start and finish with a letter or a number\"],\"7PzzBU\":[\"User\"],\"IjyOjp\":[\"User is not logged in\"],\"fXVIZq\":[\"Values\"],\"jpctdh\":[\"View\"],\"KANz0G\":[\"View billing details\"],\"6n7jtr\":[\"Visualize\"],\"id6ein\":[\"We support your square PNGs, JPEGs and GIFs under 10MB\"],\"ZS7vYp\":[\"We will send POST requests to this endpoint for every new event\"],\"TRDppN\":[\"Webhook\"],\"v1kQyJ\":[\"Webhooks\"],\"C51ilI\":[\"When the API key will expire.\"],\"leUubq\":[\"When the key will be disabled\"],\"yLOrIT\":[\"Workflow Record Selection\"],\"woYYQq\":[\"Workflows\"],\"pmUArF\":[\"Workspace\"],\"VicISP\":[\"Workspace Deletion\"],\"Q9pNST\":[\"Write a description\"],\"3d1wCB\":[\"yes\"],\"zSkMV0\":[\"You will be charged immediately for the full year.\"],\"XVnj6K\":[\"Your credit balance will be used to pay the monthly bills.\"],\"9ivpwk\":[\"Your name as it will be displayed\"],\"RhNbPE\":[\"Your workspace will be disabled\"]}")as Messages;
\ No newline at end of file
diff --git a/packages/twenty-front/src/locales/generated/es.ts b/packages/twenty-front/src/locales/generated/es.ts
new file mode 100644
index 000000000000..f5d7ee3ece5e
--- /dev/null
+++ b/packages/twenty-front/src/locales/generated/es.ts
@@ -0,0 +1 @@
+/*eslint-disable*/import type{Messages}from"@lingui/core";export const messages=JSON.parse("{\"J/hVSQ\":[[\"0\"]],\"uogEAL\":[[\"apiKeyName\"],\" Clave API\"],\"YT0WJ4\":[\"1 000 ejecuciones de nodos de flujo de trabajo\"],\"4EdXYs\":[\"12h (\",[\"hour12Label\"],\")\"],\"0HAF12\":[\"2. Configurar campo\"],\"QsMprd\":[\"24h (\",[\"hour24Label\"],\")\"],\"ssjjFt\":[\"Abortar\"],\"uyJsf6\":[\"Acerca de\"],\"AeXO77\":[\"Cuenta\"],\"nD0Y+a\":[\"Eliminación de la cuenta\"],\"bPwFdf\":[\"Cuentas\"],\"FQBaXG\":[\"Activar\"],\"F6pfE9\":[\"Activo\"],\"Mue4oc\":[\"Claves API activas creadas por usted o su equipo.\"],\"Z+OxK0\":[\"Active APIs keys created by you or your team.\"],\"DpV70M\":[\"Añadir campo\"],\"dEO3Zx\":[\"Añadir objeto\"],\"sgXUv+\":[\"Añadir proveedor de identidad SSO\"],\"5+ttxv\":[\"Añadir a la lista de bloqueo\"],\"GMx1K0\":[\"Permitir el inicio de sesión a través de la funcionalidad de inicio de sesión único de Google.\"],\"dea+zy\":[\"Permitir el inicio de sesión a través de la funcionalidad de inicio de sesión único de Microsoft.\"],\"wMg43c\":[\"Permitir la invitación de nuevos usuarios compartiendo un enlace de invitación.\"],\"vHeVg5\":[\"Permitir que los usuarios se registren con un correo electrónico y una contraseña.\"],\"mJ6m4C\":[\"Una descripción opcional\"],\"0RqpZr\":[\"API y Webhooks\"],\"yRnk5W\":[\"Clave API\"],\"5h8ooz\":[\"Claves API\"],\"kAtj+q\":[\"Nombre API\"],\"aAIQg2\":[\"Apariencia\"],\"3iX0kh\":[\"¿Está seguro de que desea cambiar el intervalo de facturación?\"],\"TmDqlR\":[\"Are you sure that you want to change your billing interval? \",[\"5\"]],\"jQyP8N\":[\"Are you sure that you want to change your billing interval? \",[\"impact\"]],\"Y7Dx6e\":[\"Al menos un método de autenticación debe estar activado\"],\"P8fBlG\":[\"Autenticación\"],\"yIVrHZ\":[\"Autorizar\"],\"Dht9W3\":[\"Volver al contenido\"],\"R+w/Va\":[\"Facturación\"],\"K1172m\":[\"Lista de bloqueo\"],\"2yl5lQ\":[\"Reservar una llamada\"],\"PmmvzS\":[\"Calcule\"],\"AjVXBS\":[\"Calendario\"],\"EUpfsd\":[\"Calendarios\"],\"dEgA5A\":[\"Cancelar\"],\"0TllC8\":[\"Cancelar\"],\"rRK/Lf\":[\"Cancelar plan\"],\"N6gPiD\":[\"Cancelar su suscripción\"],\"JcIGyw\":[\"Change \",[\"6\"]],\"OfzMnb\":[\"Cambiar \",[\"to\"]],\"VhMDMg\":[\"Cambiar contraseña\"],\"h1IXFK\":[\"Chinese\"],\"SviKkE\":[\"Chino simplificado\"],\"dzb4Ep\":[\"Chino - Tradicional\"],\"JEFFOR\":[\"Elija un objeto\"],\"9qP96p\":[\"Elija su prueba\"],\"yz7wBu\":[\"Cerrar\"],\"s2QZS6\":[\"Empresas\"],\"+zUMwJ\":[\"Configurar una conexión SSO\"],\"QTNsSm\":[\"Configura y personaliza tus preferencias de calendario.\"],\"aGwm+D\":[\"Configurar cómo se muestran las fechas en la aplicación\"],\"Bh4GBD\":[\"Configura tus correos electrónicos y calendario.\"],\"pA86+/\":[\"Conectar una cuenta de Google\"],\"D8ATlr\":[\"Conectar una nueva cuenta a su espacio de trabajo\"],\"Zgi9Fd\":[\"Conectar con Google\"],\"IOfqM8\":[\"Conectar con Microsoft\"],\"9TzudL\":[\"Cuentas conectadas\"],\"xGVfLh\":[\"Continúe\"],\"CcGOj+\":[\"Copiloto\"],\"7eVkEH\":[\"Copiar enlace de invitación\"],\"Ej5euX\":[\"Copie esta clave ya que no será visible de nuevo\"],\"hgTg6d\":[\"Copy this key as it will only be visible this one time\"],\"uXGLuq\":[\"Crear clave API\"],\"dkAPxi\":[\"Crear Webhook\"],\"8skTDV\":[\"Objetos personalizados\"],\"ekOgDG\":[\"Objetos personalizados\"],\"qt+EaC\":[\"Personalice los campos disponibles en las vistas \",[\"objectLabelSingular\"],\".\"],\"CMhr4u\":[\"Personalizar dominio\"],\"bCJa9l\":[\"Personalice la seguridad de su espacio de trabajo\"],\"Zz6Cxn\":[\"Zona de peligro\"],\"5cNMFz\":[\"Modelo de datos\"],\"Ud9zHv\":[\"Fecha y hora\"],\"5y3O+A\":[\"Desactivar\"],\"qk4i22\":[\"Desactive \\\"Sincronizar etiquetas de objetos y nombres de API\\\" para establecer un nombre de API personalizado\"],\"gexAq8\":[\"Desactivar este campo\"],\"Y2ImVJ\":[\"Defina el nombre y la descripción de su objeto\"],\"cnGeoo\":[\"Borrar\"],\"ZDGm40\":[\"Eliminar cuenta\"],\"gAz0S5\":[\"Eliminar la cuenta y todos los datos asociados\"],\"hGfWDm\":[\"Borrar clave API\"],\"T6S2Ns\":[\"Eliminar esta integración\"],\"snMaH4\":[\"Borrar webhook\"],\"kYu0eF\":[\"Eliminar espacio de trabajo\"],\"mk2Ygs\":[\"Borrar todo el espacio de trabajo\"],\"Nu4oKW\":[\"Descripción\"],\"n+SX4g\":[\"Desarrolladores\"],\"i66xz9\":[\"Mostrar como fecha relativa\"],\"EoKe5U\":[\"Dominio\"],\"QVVmxi\":[\"Por ejemplo, integración de backoffice\"],\"v+uKyy\":[\"Editar el intervalo de facturación\"],\"h2KoTu\":[\"Editar la forma de pago, ver sus facturas y mucho más\"],\"6o1M/Q\":[\"Edite el nombre de su subdominio o establezca un dominio personalizado.\"],\"O3oNi5\":[\"Correo electrónico\"],\"lfQsvW\":[\"Integración del correo electrónico\"],\"QT/Wo7\":[\"El correo electrónico o el dominio ya están en la lista de bloqueo\"],\"BXEcos\":[\"Correos electrónicos\"],\"eXoH4Q\":[\"empleados\"],\"gqv5ZL\":[\"Empleados\"],\"T3juzf\":[\"URL del punto final\"],\"lYGfRP\":[\"Inglés\"],\"/bfFKe\":[\"Disfrute de \",[\"withCreditCardTrialPeriodDuration\"],\"-días de prueba gratis\"],\"GpB8YV\":[\"Empresa\"],\"c3qGJX\":[\"Error al borrar la clave api: \",[\"err\"]],\"bj7nh3\":[\"Error al regenerar la clave api: \",[\"err\"]],\"RgSsJ3\":[\"Error while switching subscription \",[\"1\"],\".\"],\"VSQxWH\":[\"Error al cambiar de abono \",[\"to\"],\".\"],\"JLxMta\":[\"Establezca puntos finales Webhook para notificaciones sobre eventos asíncronos.\"],\"cIgBjB\":[\"Excluir a las siguientes personas y dominios de mi sincronización de correo electrónico\"],\"fV7V51\":[\"Objetos existentes\"],\"AUC8ds\":[\"Exit settings\"],\"IZ4o2e\":[\"Salir de Ajustes\"],\"bKBhgb\":[\"Experiencia\"],\"LxRNPw\":[\"Caducidad\"],\"SkXfL0\":[\"Fecha de expiración\"],\"i9qiyR\":[\"Expira en\"],\"Q0iobh\":[\"Failed to create object\"],\"vF68cg\":[\"Campos\"],\"cSev+j\":[\"Filtros\"],\"nLC6tu\":[\"Francés\"],\"aTieE0\":[\"de mensual a anual\"],\"K04lE5\":[\"de anual a mensual\"],\"scmRyR\":[\"Acceso total\"],\"xANKBj\":[\"Funciones\"],\"Weq9zb\":[\"General\"],\"DDcvSo\":[\"Alemán\"],\"NXEW3h\":[\"Aproveche al máximo su espacio de trabajo invitando a su equipo.\"],\"zSGbaR\":[\"Consiga su abono\"],\"hWp1MY\":[\"Concede al servicio de asistencia de Twenty acceso temporal a tu espacio de trabajo para que podamos solucionar problemas o recuperar contenidos en tu nombre. Puedes revocar el acceso en cualquier momento.\"],\"XTWO+W\":[\"Icono y nombre\"],\"j843N3\":[\"Si has perdido esta clave, puedes regenerarla, pero ten en cuenta que cualquier script que utilice esta clave tendrá que ser actualizado. Escribe \\\"\",[\"confirmationValue\"],\"\\\" para confirmar.\"],\"NoNwIX\":[\"Inactivo\"],\"JE2tjr\":[\"La entrada debe ir en mayúsculas y no puede empezar por un número\"],\"nbfdhU\":[\"Integraciones\"],\"NtFk/Z\":[\"Proveedor de autenticación no válido\"],\"B2Tpo0\":[\"Correo electrónico no válido\"],\"/m52AE\":[\"Correo electrónico o dominio no válidos\"],\"QdoUFL\":[\"Valores de formulario no válidos\"],\"/Wrd4p\":[\"Invalid object data\"],\"0M8+El\":[\"Invitar por correo electrónico\"],\"PWIq/W\":[\"Invitar por enlace\"],\"3athPG\":[\"Invitar por enlace\"],\"5IfmKA\":[\"Envío del enlace de invitación a las direcciones de correo electrónico\"],\"d+Y+rP\":[\"Invite a su equipo\"],\"Lj7sBL\":[\"Italiano\"],\"vXIe7J\":[\"Idioma\"],\"pQjjYo\":[\"Enlace copiado en el portapapeles\"],\"FgAxTj\":[\"Cerrar sesión\"],\"nOhz3x\":[\"Cierre de sesión\"],\"T6YjCk\":[\"Gestionar miembros\"],\"4cjU2u\":[\"Gestione aquí los miembros de su espacio\"],\"FyFNsd\":[\"Gestione sus cuentas de Internet.\"],\"36kYu0\":[\"Gestione su suscripción\"],\"wlQNTg\":[\"Miembros\"],\"y5rS9U\":[\"Migrate\"],\"6YtxFj\":[\"Nombre\"],\"z+6jaZ\":[\"Nombre de su clave API\"],\"J7w8lI\":[\"Nombre de su espacio de trabajo\"],\"dbDjdV\":[\"Navegue por\"],\"isRobC\":[\"Nuevo\"],\"Kcr9Fr\":[\"Nueva cuenta\"],\"o8MyXb\":[\"Nueva llave\"],\"j313SZ\":[\"Nueva llave\"],\"hFxdey\":[\"Nuevo objeto\"],\"7vhWI8\":[\"Nueva contraseña\"],\"U1DAok\":[\"Nuevo Webhook\"],\"pwenQu\":[\"Ninguna cuenta conectada\"],\"+FLRjr\":[\"no autorizado\"],\"1DBGsz\":[\"Notas\"],\"FU94q4\":[\"Object created successfully\"],\"B3toQF\":[\"Objetos\"],\"KNz3EF\":[\"Fuera de los caminos trillados\"],\"4MyDFl\":[\"Oportunidades\"],\"BzEFor\":[\"o\"],\"/IX/7x\":[\"Otros\"],\"boJlGf\":[\"Página no encontrada\"],\"NRvxzv\":[\"Page Not Found | Twenty\"],\"8ZsakT\":[\"Contraseña\"],\"mi6Rel\":[\"Se ha enviado el enlace de restablecimiento de contraseña al correo electrónico\"],\"1wdjme\":[\"Personas\"],\"N0+GsR\":[\"Fotografía\"],\"jEw0Mr\":[\"Introduzca una URL válida\"],\"6nsIo3\":[\"Escriba \\\"\",[\"confirmationValue\"],\"\\\" para confirmar que desea eliminar esta clave de API. Tenga en cuenta que cualquier script que utilice esta clave dejará de funcionar.\"],\"mFZTXr\":[\"Por favor, escriba \",[\"confirmationText\"],\" para confirmar que desea eliminar este webhook.\"],\"MOERNx\":[\"Portugués\"],\"rdUucN\":[\"Vista previa\"],\"vERlcd\":[\"Perfil\"],\"YJgRqq\":[\"Pseudoinglés\"],\"ibPuCP\":[\"Leer la documentación\"],\"v3xM25\":[\"Recibir un correo electrónico con un enlace para actualizar la contraseña\"],\"dSCufP\":[\"Selección de discos\"],\"vpZcGd\":[\"Regenerar una clave API\"],\"Mwqo5m\":[\"Regenerar llave\"],\"D+Mv78\":[\"Regenerar llave\"],\"5icoS1\":[\"Comunicados\"],\"t/YqKh\":[\"Eliminar\"],\"KbS2K9\":[\"Restablecer contraseña\"],\"A1taO8\":[\"Buscar en\"],\"l1/uy2\":[\"Buscar un campo...\"],\"k7kp5/\":[\"Buscar en un índice...\"],\"BoNHR0\":[\"Search an object...\"],\"ofuw3g\":[\"Busca un objeto...\"],\"a3LDKx\":[\"Seguridad\"],\"xraglu\":[\"Seleccione los eventos que desea enviar a este endpoint\"],\"AXTJAW\":[\"Seleccione su idioma preferido\"],\"mjK8F3\":[\"Envíe una invitación por correo electrónico a su equipo\"],\"yy5k7a\":[\"Panel de administración del servidor\"],\"V7fgiB\":[\"Establezca la visibilidad del correo electrónico, gestione su lista de bloqueo y mucho más.\"],\"tn41zE\":[\"Establezca el nombre de su subdominio\"],\"Tz0i8g\":[\"Ajustes\"],\"Vy9kmk\":[\"Comparte este enlace para invitar a los usuarios a unirse a tu espacio de trabajo\"],\"gWk8gY\":[\"¿Debería cambiar también el nombre de la API al cambiar la etiqueta de un campo?\"],\"6Uau97\":[\"Saltar\"],\"65A04M\":[\"Español\"],\"vnS6Rf\":[\"SSO\"],\"omhc+7\":[\"Subdominio ya ocupado\"],\"OlC/tU\":[\"El subdominio no puede tener más de 30 caracteres\"],\"ZETwlU\":[\"El subdominio no puede tener menos de 3 caracteres\"],\"AymUjZ\":[\"Subscription has been switched \",[\"0\"]],\"B5jRKH\":[\"Se ha cambiado la suscripción \",[\"to\"]],\"XYLcNv\":[\"Ayuda\"],\"Sk5fyO\":[\"Switch \",[\"2\"]],\"z9maAp\":[\"Switch \",[\"3\"]],\"9yk9d1\":[\"Interruptor \",[\"from\"]],\"qi74XZ\":[\"Interruptor \",[\"to\"]],\"FwAweN\":[\"Switch billing \",[\"4\"]],\"L6Fg36\":[\"Facturación del interruptor \",[\"to\"]],\"AtzMpB\":[\"Sincronizar etiqueta de campo y nombre de API\"],\"E3AMmw\":[\"Ajustes del sistema - \",[\"systemDateFormatLabel\"]],\"0ZgB1e\":[\"Ajustes del sistema - \",[\"systemTimeFormatLabel\"]],\"GtycJ/\":[\"Tareas\"],\"2OUtmv\":[\"Descripción de este campo\"],\"VGZYbZ\":[\"El correo electrónico asociado a su cuenta\"],\"h8mvCd\":[\"Nombre e icono de este campo\"],\"L97sPr\":[\"La página que busca ha desaparecido o nunca existió. Volvamos a la pista\"],\"uWikAA\":[\"Los valores de este campo\"],\"+69KDk\":[\"Los valores de este campo deben ser únicos\"],\"PmtLRf\":[\"Hubo un problema\"],\"7YiCMg\":[\"This action cannot be undone. This will permanently delete this user and remove them from all their assignements.\"],\"hqCwGc\":[\"Esta acción no se puede deshacer. Esto borrará permanentemente a este usuario y lo eliminará de todas sus asignaciones.\"],\"gWGuHC\":[\"Esta acción no se puede deshacer. Esto borrará permanentemente todo tu espacio de trabajo. <0/> Escriba su correo electrónico para confirmar.\"],\"n9nSNJ\":[\"Formato de hora\"],\"aqMzDX\":[\"al mes\"],\"WXXiXO\":[\"al año\"],\"+zy2Nq\":[\"Tipo\"],\"GQCXQS\":[\"Contactos ilimitados\"],\"ONWvwQ\":[\"Cargar\"],\"IagCbF\":[\"URL\"],\"oTTQsc\":[\"Utilice sólo letra, número y guión. Empiece y termine con una letra o un número\"],\"7PzzBU\":[\"Usuario\"],\"IjyOjp\":[\"El usuario no ha iniciado sesión\"],\"fXVIZq\":[\"Valores\"],\"jpctdh\":[\"Ver\"],\"KANz0G\":[\"Ver detalles de facturación\"],\"6n7jtr\":[\"Visualice\"],\"id6ein\":[\"Admitimos tus PNG, JPEG y GIF cuadrados de menos de 10 MB\"],\"ZS7vYp\":[\"Enviaremos peticiones POST a este endpoint para cada nuevo evento\"],\"TRDppN\":[\"Gancho web\"],\"v1kQyJ\":[\"Webhooks\"],\"C51ilI\":[\"Cuándo caducará la clave API.\"],\"leUubq\":[\"Cuándo se desactivará la tecla\"],\"yLOrIT\":[\"Selección de registros del flujo de trabajo\"],\"woYYQq\":[\"Flujos de trabajo\"],\"pmUArF\":[\"Espacio de trabajo\"],\"VicISP\":[\"Eliminación del espacio de trabajo\"],\"Q9pNST\":[\"Escriba una descripción\"],\"3d1wCB\":[\"sí\"],\"zSkMV0\":[\"Se le cobrará inmediatamente el año completo.\"],\"XVnj6K\":[\"Su saldo de crédito se utilizará para pagar las facturas mensuales.\"],\"9ivpwk\":[\"Su nombre tal y como se mostrará\"],\"RhNbPE\":[\"Tu espacio de trabajo se desactivará\"]}")as Messages;
\ No newline at end of file
diff --git a/packages/twenty-front/src/locales/generated/fr.ts b/packages/twenty-front/src/locales/generated/fr.ts
new file mode 100644
index 000000000000..e2eedf750122
--- /dev/null
+++ b/packages/twenty-front/src/locales/generated/fr.ts
@@ -0,0 +1 @@
+/*eslint-disable*/import type{Messages}from"@lingui/core";export const messages=JSON.parse("{\"J/hVSQ\":[[\"0\"]],\"uogEAL\":[[\"apiKeyName\"],\" Clé API\"],\"YT0WJ4\":[\"1 000 exécutions de nœuds de flux de travail\"],\"4EdXYs\":[\"12h (\",[\"hour12Label\"],\")\"],\"0HAF12\":[\"2. Configurer le champ\"],\"QsMprd\":[\"24h (\",[\"hour24Label\"],\")\"],\"ssjjFt\":[\"Abandonner\"],\"uyJsf6\":[\"A propos de\"],\"AeXO77\":[\"Compte\"],\"nD0Y+a\":[\"Suppression de compte\"],\"bPwFdf\":[\"Comptes\"],\"FQBaXG\":[\"Activer\"],\"F6pfE9\":[\"Actif\"],\"Mue4oc\":[\"Clés API actives créées par vous ou votre équipe.\"],\"Z+OxK0\":[\"Active APIs keys created by you or your team.\"],\"DpV70M\":[\"Ajouter un champ\"],\"dEO3Zx\":[\"Ajouter un objet\"],\"sgXUv+\":[\"Ajouter un fournisseur d'identité SSO\"],\"5+ttxv\":[\"Ajouter à la liste de blocage\"],\"GMx1K0\":[\"Autoriser les connexions via la fonctionnalité d'authentification unique de Google.\"],\"dea+zy\":[\"Autoriser les connexions via la fonctionnalité d'authentification unique de Microsoft.\"],\"wMg43c\":[\"Permettre l'invitation de nouveaux utilisateurs en partageant un lien d'invitation.\"],\"vHeVg5\":[\"Permettre aux utilisateurs de se connecter à l'aide d'un courriel et d'un mot de passe.\"],\"mJ6m4C\":[\"Une description facultative\"],\"0RqpZr\":[\"API & Webhooks\"],\"yRnk5W\":[\"Clé API\"],\"5h8ooz\":[\"Clés API\"],\"kAtj+q\":[\"Nom de l'API\"],\"aAIQg2\":[\"Apparence\"],\"3iX0kh\":[\"Êtes-vous sûr de vouloir modifier votre intervalle de facturation ?\"],\"TmDqlR\":[\"Are you sure that you want to change your billing interval? \",[\"5\"]],\"jQyP8N\":[\"Are you sure that you want to change your billing interval? \",[\"impact\"]],\"Y7Dx6e\":[\"Au moins une méthode d'authentification doit être activée\"],\"P8fBlG\":[\"Authentification\"],\"yIVrHZ\":[\"Autoriser\"],\"Dht9W3\":[\"Retour au contenu\"],\"R+w/Va\":[\"Facturation\"],\"K1172m\":[\"Liste de blocage\"],\"2yl5lQ\":[\"Réserver un appel\"],\"PmmvzS\":[\"Calculer\"],\"AjVXBS\":[\"Calendrier\"],\"EUpfsd\":[\"Calendriers\"],\"dEgA5A\":[\"Annuler\"],\"0TllC8\":[\"Annuler à tout moment\"],\"rRK/Lf\":[\"Annuler le plan\"],\"N6gPiD\":[\"Annuler votre abonnement\"],\"JcIGyw\":[\"Change \",[\"6\"]],\"OfzMnb\":[\"Modifier \",[\"to\"]],\"VhMDMg\":[\"Modifier le mot de passe\"],\"h1IXFK\":[\"Chinese\"],\"SviKkE\":[\"Chinois - simplifié\"],\"dzb4Ep\":[\"Chinois - Traditionnel\"],\"JEFFOR\":[\"Choisir un objet\"],\"9qP96p\":[\"Choisissez votre essai\"],\"yz7wBu\":[\"Fermer\"],\"s2QZS6\":[\"Entreprises\"],\"+zUMwJ\":[\"Configurer une connexion SSO\"],\"QTNsSm\":[\"Configurez et personnalisez vos préférences en matière de calendrier.\"],\"aGwm+D\":[\"Configurer l'affichage des dates dans l'application\"],\"Bh4GBD\":[\"Configurez vos courriels et votre calendrier.\"],\"pA86+/\":[\"Connecter un compte Google\"],\"D8ATlr\":[\"Connecter un nouveau compte à votre espace de travail\"],\"Zgi9Fd\":[\"Se connecter à Google\"],\"IOfqM8\":[\"Se connecter avec Microsoft\"],\"9TzudL\":[\"Comptes connectés\"],\"xGVfLh\":[\"Continuer\"],\"CcGOj+\":[\"Copilote\"],\"7eVkEH\":[\"Copier le lien de l'invitation\"],\"Ej5euX\":[\"Copiez cette clé car elle ne sera pas visible à nouveau\"],\"hgTg6d\":[\"Copy this key as it will only be visible this one time\"],\"uXGLuq\":[\"Créer une clé API\"],\"dkAPxi\":[\"Créer un Webhook\"],\"8skTDV\":[\"Objets personnalisés\"],\"ekOgDG\":[\"Objets personnalisés\"],\"qt+EaC\":[\"Personnaliser les champs disponibles dans les vues \",[\"objectLabelSingular\"],\".\"],\"CMhr4u\":[\"Personnaliser le domaine\"],\"bCJa9l\":[\"Personnalisez la sécurité de votre espace de travail\"],\"Zz6Cxn\":[\"Zone de danger\"],\"5cNMFz\":[\"Modèle de données\"],\"Ud9zHv\":[\"Date et heure\"],\"5y3O+A\":[\"Désactiver\"],\"qk4i22\":[\"Désactiver la fonction \\\"Synchroniser les étiquettes des objets et les noms des API\\\" pour définir un nom d'API personnalisé\"],\"gexAq8\":[\"Désactiver ce champ\"],\"Y2ImVJ\":[\"Définir le nom et la description de votre objet\"],\"cnGeoo\":[\"Supprimer\"],\"ZDGm40\":[\"Supprimer le compte\"],\"gAz0S5\":[\"Supprimer le compte et toutes les données associées\"],\"hGfWDm\":[\"Supprimer la clé API\"],\"T6S2Ns\":[\"Supprimer cette intégration\"],\"snMaH4\":[\"Supprimer le webhook\"],\"kYu0eF\":[\"Supprimer l'espace de travail\"],\"mk2Ygs\":[\"Supprimer l'ensemble de l'espace de travail\"],\"Nu4oKW\":[\"Description\"],\"n+SX4g\":[\"Développeurs\"],\"i66xz9\":[\"Affichage en tant que date relative\"],\"EoKe5U\":[\"Domaine\"],\"QVVmxi\":[\"Par exemple, l'intégration du backoffice\"],\"v+uKyy\":[\"Modifier l'intervalle de facturation\"],\"h2KoTu\":[\"Modifier le mode de paiement, consulter vos factures et plus encore\"],\"6o1M/Q\":[\"Modifiez le nom de votre sous-domaine ou définissez un domaine personnalisé.\"],\"O3oNi5\":[\"Courriel\"],\"lfQsvW\":[\"Intégration du courrier électronique\"],\"QT/Wo7\":[\"L'email ou le domaine est déjà dans la liste de blocage\"],\"BXEcos\":[\"Emails\"],\"eXoH4Q\":[\"employés\"],\"gqv5ZL\":[\"Salariés\"],\"T3juzf\":[\"URL du point final\"],\"lYGfRP\":[\"Anglais\"],\"/bfFKe\":[\"Profitez d'un essai gratuit de \",[\"withCreditCardTrialPeriodDuration\"],\"-jours\"],\"GpB8YV\":[\"Entreprise\"],\"c3qGJX\":[\"Erreur lors de la suppression de la clé api : \",[\"err\"]],\"bj7nh3\":[\"Erreur de régénération de la clé api : \",[\"err\"]],\"RgSsJ3\":[\"Error while switching subscription \",[\"1\"],\".\"],\"VSQxWH\":[\"Erreur lors de la commutation de l'abonnement \",[\"to\"],\".\"],\"JLxMta\":[\"Établir des points de terminaison Webhook pour les notifications d'événements asynchrones.\"],\"cIgBjB\":[\"Exclure les personnes et domaines suivants de ma synchronisation d'emails\"],\"fV7V51\":[\"Objets existants\"],\"AUC8ds\":[\"Exit settings\"],\"IZ4o2e\":[\"Quitter les paramètres\"],\"bKBhgb\":[\"Expérience\"],\"LxRNPw\":[\"Expiration\"],\"SkXfL0\":[\"Date d'expiration\"],\"i9qiyR\":[\"Expire en\"],\"Q0iobh\":[\"Failed to create object\"],\"vF68cg\":[\"Domaines\"],\"cSev+j\":[\"Filtres\"],\"nLC6tu\":[\"Français\"],\"aTieE0\":[\"de mensuel à annuel\"],\"K04lE5\":[\"d'annuel à mensuel\"],\"scmRyR\":[\"Accès complet\"],\"xANKBj\":[\"Fonctions\"],\"Weq9zb\":[\"Général\"],\"DDcvSo\":[\"Allemand\"],\"NXEW3h\":[\"Tirez le meilleur parti de votre espace de travail en y invitant votre équipe.\"],\"zSGbaR\":[\"S'abonner\"],\"hWp1MY\":[\"Accordez à Twenty support un accès temporaire à votre espace de travail afin que nous puissions résoudre des problèmes ou récupérer du contenu en votre nom. Vous pouvez révoquer l'accès à tout moment.\"],\"XTWO+W\":[\"Icône et nom\"],\"j843N3\":[\"Si vous avez perdu cette clé, vous pouvez la régénérer, mais sachez que tout script utilisant cette clé devra être mis à jour. Veuillez taper \\\"\",[\"confirmationValue\"],\"\\\" pour confirmer.\"],\"NoNwIX\":[\"Inactif\"],\"JE2tjr\":[\"Les données doivent être en majuscules et ne peuvent pas commencer par un chiffre\"],\"nbfdhU\":[\"Intégrations\"],\"NtFk/Z\":[\"Fournisseur d'authentification invalide\"],\"B2Tpo0\":[\"Courriel non valide\"],\"/m52AE\":[\"Courriel ou domaine invalide\"],\"QdoUFL\":[\"Valeurs de formulaire non valides\"],\"/Wrd4p\":[\"Invalid object data\"],\"0M8+El\":[\"Inviter par courriel\"],\"PWIq/W\":[\"Inviter par lien\"],\"3athPG\":[\"Inviter par lien\"],\"5IfmKA\":[\"Lien d'invitation envoyé aux adresses électroniques\"],\"d+Y+rP\":[\"Invitez votre équipe\"],\"Lj7sBL\":[\"Italien\"],\"vXIe7J\":[\"Langue\"],\"pQjjYo\":[\"Lien copié dans le presse-papiers\"],\"FgAxTj\":[\"Déconnexion\"],\"nOhz3x\":[\"Déconnexion\"],\"T6YjCk\":[\"Gérer les membres\"],\"4cjU2u\":[\"Gérez les membres de votre espace ici\"],\"FyFNsd\":[\"Gérer vos comptes internet.\"],\"36kYu0\":[\"Gérer votre abonnement\"],\"wlQNTg\":[\"Les membres\"],\"y5rS9U\":[\"Migrate\"],\"6YtxFj\":[\"Nom\"],\"z+6jaZ\":[\"Nom de votre clé API\"],\"J7w8lI\":[\"Nom de votre espace de travail\"],\"dbDjdV\":[\"Naviguer\"],\"isRobC\":[\"Nouveau\"],\"Kcr9Fr\":[\"Nouveau compte\"],\"o8MyXb\":[\"Nouvelle clé\"],\"j313SZ\":[\"Nouvelle clé\"],\"hFxdey\":[\"Nouvel objet\"],\"7vhWI8\":[\"Nouveau mot de passe\"],\"U1DAok\":[\"Nouveau Webhook\"],\"pwenQu\":[\"Pas de compte connecté\"],\"+FLRjr\":[\"non autorisé\"],\"1DBGsz\":[\"Notes\"],\"FU94q4\":[\"Object created successfully\"],\"B3toQF\":[\"Objets\"],\"KNz3EF\":[\"Hors des sentiers battus\"],\"4MyDFl\":[\"Opportunités\"],\"BzEFor\":[\"ou\"],\"/IX/7x\":[\"Autres\"],\"boJlGf\":[\"Page non trouvée\"],\"NRvxzv\":[\"Page Not Found | Twenty\"],\"8ZsakT\":[\"Mot de passe\"],\"mi6Rel\":[\"Le lien de réinitialisation du mot de passe a été envoyé à l'email\"],\"1wdjme\":[\"Les personnes\"],\"N0+GsR\":[\"Photo\"],\"jEw0Mr\":[\"Veuillez saisir une URL valide\"],\"6nsIo3\":[\"Veuillez taper \\\"\",[\"confirmationValue\"],\"\\\" pour confirmer que vous souhaitez supprimer cette clé API. Sachez que tout script utilisant cette clé cessera de fonctionner.\"],\"mFZTXr\":[\"Veuillez taper \",[\"confirmationText\"],\" pour confirmer que vous souhaitez supprimer ce webhook.\"],\"MOERNx\":[\"Portugais\"],\"rdUucN\":[\"Avant-première\"],\"vERlcd\":[\"Profil\"],\"YJgRqq\":[\"Pseudo-anglais\"],\"ibPuCP\":[\"Lire la documentation\"],\"v3xM25\":[\"Recevoir un courriel contenant un lien de mise à jour du mot de passe\"],\"dSCufP\":[\"Sélection des enregistrements\"],\"vpZcGd\":[\"Régénérer une clé API\"],\"Mwqo5m\":[\"Régénérer la clé\"],\"D+Mv78\":[\"Régénérer la clé\"],\"5icoS1\":[\"Communiqués\"],\"t/YqKh\":[\"Retirer\"],\"KbS2K9\":[\"Réinitialiser le mot de passe\"],\"A1taO8\":[\"Recherche\"],\"l1/uy2\":[\"Rechercher un champ...\"],\"k7kp5/\":[\"Rechercher un index...\"],\"BoNHR0\":[\"Search an object...\"],\"ofuw3g\":[\"Recherche d'un objet...\"],\"a3LDKx\":[\"Sécurité\"],\"xraglu\":[\"Sélectionnez les événements que vous souhaitez envoyer à ce point de contact\"],\"AXTJAW\":[\"Sélectionnez votre langue préférée\"],\"mjK8F3\":[\"Envoyez un courriel d'invitation à votre équipe\"],\"yy5k7a\":[\"Panneau d'administration du serveur\"],\"V7fgiB\":[\"Définissez la visibilité des e-mails, gérez votre liste de blocage et bien plus encore.\"],\"tn41zE\":[\"Définissez le nom de votre sous-domaine\"],\"Tz0i8g\":[\"Paramètres\"],\"Vy9kmk\":[\"Partagez ce lien pour inviter les utilisateurs à rejoindre votre espace de travail\"],\"gWk8gY\":[\"La modification de l'intitulé d'un champ doit-elle également entraîner la modification du nom de l'API ?\"],\"6Uau97\":[\"Sauter\"],\"65A04M\":[\"Espagnol\"],\"vnS6Rf\":[\"SSO\"],\"omhc+7\":[\"Sous-domaine déjà pris\"],\"OlC/tU\":[\"Le sous-domaine ne doit pas comporter plus de 30 caractères\"],\"ZETwlU\":[\"Le sous-domaine ne peut être inférieur à 3 caractères\"],\"AymUjZ\":[\"Subscription has been switched \",[\"0\"]],\"B5jRKH\":[\"L'abonnement a été modifié \",[\"to\"]],\"XYLcNv\":[\"Soutien\"],\"Sk5fyO\":[\"Switch \",[\"2\"]],\"z9maAp\":[\"Switch \",[\"3\"]],\"9yk9d1\":[\"Changer en \",[\"from\"]],\"qi74XZ\":[\"Changer en \",[\"to\"]],\"FwAweN\":[\"Switch billing \",[\"4\"]],\"L6Fg36\":[\"Changer la facturation en \",[\"to\"]],\"AtzMpB\":[\"Synchroniser l'étiquette du champ et le nom de l'API\"],\"E3AMmw\":[\"Paramètres du système - \",[\"systemDateFormatLabel\"]],\"0ZgB1e\":[\"Paramètres du système - \",[\"systemTimeFormatLabel\"]],\"GtycJ/\":[\"Tâches\"],\"2OUtmv\":[\"La description de ce champ\"],\"VGZYbZ\":[\"L'email associé à votre compte\"],\"h8mvCd\":[\"Le nom et l'icône de ce champ\"],\"L97sPr\":[\"La page que vous recherchez a disparu ou n'a jamais existé. Remettons les choses en ordre\"],\"uWikAA\":[\"Les valeurs de ce champ\"],\"+69KDk\":[\"Les valeurs de ce champ doivent être uniques\"],\"PmtLRf\":[\"Il y a eu un problème\"],\"7YiCMg\":[\"This action cannot be undone. This will permanently delete this user and remove them from all their assignements.\"],\"hqCwGc\":[\"Cette action ne peut être annulée. Cette action supprimera définitivement l'utilisateur et l'exclura de toutes ses affectations.\"],\"gWGuHC\":[\"Cette action ne peut être annulée. Elle supprimera définitivement l'ensemble de votre espace de travail. <0/> Veuillez saisir votre adresse électronique pour confirmer.\"],\"n9nSNJ\":[\"Format de l'heure\"],\"aqMzDX\":[\"au mois\"],\"WXXiXO\":[\"à l'année\"],\"+zy2Nq\":[\"Type\"],\"GQCXQS\":[\"Nombre illimité de contacts\"],\"ONWvwQ\":[\"Télécharger\"],\"IagCbF\":[\"URL\"],\"oTTQsc\":[\"Utilisez uniquement des lettres, des chiffres et des tirets. Commencer et terminer par une lettre ou un chiffre\"],\"7PzzBU\":[\"Utilisateur\"],\"IjyOjp\":[\"L'utilisateur n'est pas connecté\"],\"fXVIZq\":[\"Valeurs\"],\"jpctdh\":[\"Voir\"],\"KANz0G\":[\"Voir les détails de la facturation\"],\"6n7jtr\":[\"Visualiser\"],\"id6ein\":[\"Nous prenons en charge vos PNG, JPEG et GIF carrés de moins de 10 Mo\"],\"ZS7vYp\":[\"Nous enverrons des requêtes POST à ce point de terminaison pour chaque nouvel événement\"],\"TRDppN\":[\"Crochet Web\"],\"v1kQyJ\":[\"Crochets Web\"],\"C51ilI\":[\"Date d'expiration de la clé API.\"],\"leUubq\":[\"Quand la clé sera désactivée\"],\"yLOrIT\":[\"Sélection des enregistrements du flux de travail\"],\"woYYQq\":[\"Flux de travail\"],\"pmUArF\":[\"Espace de travail\"],\"VicISP\":[\"Suppression de l'espace de travail\"],\"Q9pNST\":[\"Rédiger une description\"],\"3d1wCB\":[\"oui\"],\"zSkMV0\":[\"Vous serez immédiatement facturé pour l'année entière.\"],\"XVnj6K\":[\"Votre solde créditeur sera utilisé pour payer les factures mensuelles.\"],\"9ivpwk\":[\"Votre nom tel qu'il sera affiché\"],\"RhNbPE\":[\"Votre espace de travail sera désactivé\"]}")as Messages;
\ No newline at end of file
diff --git a/packages/twenty-front/src/locales/generated/it.ts b/packages/twenty-front/src/locales/generated/it.ts
new file mode 100644
index 000000000000..6702134f8590
--- /dev/null
+++ b/packages/twenty-front/src/locales/generated/it.ts
@@ -0,0 +1 @@
+/*eslint-disable*/import type{Messages}from"@lingui/core";export const messages=JSON.parse("{\"J/hVSQ\":[[\"0\"]],\"uogEAL\":[[\"apiKeyName\"],\" Chiave API\"],\"YT0WJ4\":[\"1 000 esecuzioni di nodi del flusso di lavoro\"],\"4EdXYs\":[\"12h (\",[\"hour12Label\"],\")\"],\"0HAF12\":[\"2. Configurare il campo\"],\"QsMprd\":[\"24h (\",[\"hour24Label\"],\")\"],\"ssjjFt\":[\"Interruzione\"],\"uyJsf6\":[\"Circa\"],\"AeXO77\":[\"Conto\"],\"nD0Y+a\":[\"Cancellazione del conto\"],\"bPwFdf\":[\"Conti\"],\"FQBaXG\":[\"Attivare\"],\"F6pfE9\":[\"Attivo\"],\"Mue4oc\":[\"Chiavi API attive create da voi o dal vostro team.\"],\"Z+OxK0\":[\"Active APIs keys created by you or your team.\"],\"DpV70M\":[\"Aggiungi campo\"],\"dEO3Zx\":[\"Aggiungi oggetto\"],\"sgXUv+\":[\"Aggiungere il provider di identità SSO\"],\"5+ttxv\":[\"Aggiungi alla lista di blocco\"],\"GMx1K0\":[\"Consentire l'accesso tramite la funzionalità single sign-on di Google.\"],\"dea+zy\":[\"Consentire l'accesso tramite la funzionalità single sign-on di Microsoft.\"],\"wMg43c\":[\"Consentire l'invito di nuovi utenti condividendo un link di invito.\"],\"vHeVg5\":[\"Consentire agli utenti di accedere con un'e-mail e una password.\"],\"mJ6m4C\":[\"Una descrizione opzionale\"],\"0RqpZr\":[\"API e Webhook\"],\"yRnk5W\":[\"Chiave API\"],\"5h8ooz\":[\"Chiavi API\"],\"kAtj+q\":[\"Nome API\"],\"aAIQg2\":[\"Aspetto\"],\"3iX0kh\":[\"Siete sicuri di voler cambiare l'intervallo di fatturazione?\"],\"TmDqlR\":[\"Are you sure that you want to change your billing interval? \",[\"5\"]],\"jQyP8N\":[\"Are you sure that you want to change your billing interval? \",[\"impact\"]],\"Y7Dx6e\":[\"Deve essere abilitato almeno un metodo di autenticazione\"],\"P8fBlG\":[\"Autenticazione\"],\"yIVrHZ\":[\"Autorizzare\"],\"Dht9W3\":[\"Torna al contenuto\"],\"R+w/Va\":[\"Fatturazione\"],\"K1172m\":[\"Elenco di blocco\"],\"2yl5lQ\":[\"Prenota una chiamata\"],\"PmmvzS\":[\"Calcolare\"],\"AjVXBS\":[\"Calendario\"],\"EUpfsd\":[\"Calendari\"],\"dEgA5A\":[\"Annullamento\"],\"0TllC8\":[\"Annullamento in qualsiasi momento\"],\"rRK/Lf\":[\"Annullamento del piano\"],\"N6gPiD\":[\"Annullamento dell'abbonamento\"],\"JcIGyw\":[\"Change \",[\"6\"]],\"OfzMnb\":[\"Cambiare \",[\"to\"]],\"VhMDMg\":[\"Modifica della password\"],\"h1IXFK\":[\"Chinese\"],\"SviKkE\":[\"Cinese semplificato\"],\"dzb4Ep\":[\"Cinese tradizionale\"],\"JEFFOR\":[\"Scegliere un oggetto\"],\"9qP96p\":[\"Scegliete la vostra prova\"],\"yz7wBu\":[\"Chiudere\"],\"s2QZS6\":[\"Aziende\"],\"+zUMwJ\":[\"Configurare una connessione SSO\"],\"QTNsSm\":[\"Configurare e personalizzare le preferenze del calendario.\"],\"aGwm+D\":[\"Configurare la visualizzazione delle date nell'app\"],\"Bh4GBD\":[\"Configurare le impostazioni di e-mail e calendario.\"],\"pA86+/\":[\"Collegare un account Google\"],\"D8ATlr\":[\"Collegare un nuovo account al proprio spazio di lavoro\"],\"Zgi9Fd\":[\"Connettersi con Google\"],\"IOfqM8\":[\"Connettetevi con Microsoft\"],\"9TzudL\":[\"Conti collegati\"],\"xGVfLh\":[\"Continua\"],\"CcGOj+\":[\"Copilota\"],\"7eVkEH\":[\"Copiare il link dell'invito\"],\"Ej5euX\":[\"Copiate questa chiave perché non sarà più visibile\"],\"hgTg6d\":[\"Copy this key as it will only be visible this one time\"],\"uXGLuq\":[\"Creare la chiave API\"],\"dkAPxi\":[\"Creare un webhook\"],\"8skTDV\":[\"Oggetti personalizzati\"],\"ekOgDG\":[\"Oggetti personalizzati\"],\"qt+EaC\":[\"Personalizzare i campi disponibili nelle viste \",[\"objectLabelSingular\"],\".\"],\"CMhr4u\":[\"Personalizzare il dominio\"],\"bCJa9l\":[\"Personalizzate la sicurezza del vostro spazio di lavoro\"],\"Zz6Cxn\":[\"Zona di pericolo\"],\"5cNMFz\":[\"Modello di dati\"],\"Ud9zHv\":[\"Data e ora\"],\"5y3O+A\":[\"Disattivare\"],\"qk4i22\":[\"Disattivare \\\"Sincronizza etichette degli oggetti e nomi API\\\" per impostare un nome API personalizzato\"],\"gexAq8\":[\"Disattivare questo campo\"],\"Y2ImVJ\":[\"Definire il nome e la descrizione dell'oggetto\"],\"cnGeoo\":[\"Cancellare\"],\"ZDGm40\":[\"Cancellare l'account\"],\"gAz0S5\":[\"Eliminare l'account e tutti i dati associati\"],\"hGfWDm\":[\"Cancellare la chiave API\"],\"T6S2Ns\":[\"Eliminare questa integrazione\"],\"snMaH4\":[\"Cancellare il webhook\"],\"kYu0eF\":[\"Cancellare l'area di lavoro\"],\"mk2Ygs\":[\"Cancellare l'intero spazio di lavoro\"],\"Nu4oKW\":[\"Descrizione\"],\"n+SX4g\":[\"Sviluppatori\"],\"i66xz9\":[\"Visualizzazione come data relativa\"],\"EoKe5U\":[\"Dominio\"],\"QVVmxi\":[\"Ad esempio, l'integrazione del backoffice\"],\"v+uKyy\":[\"Modifica dell'intervallo di fatturazione\"],\"h2KoTu\":[\"Modifica del metodo di pagamento, visualizzazione delle fatture e altro ancora\"],\"6o1M/Q\":[\"Modificare il nome del sottodominio o impostare un dominio personalizzato.\"],\"O3oNi5\":[\"Email\"],\"lfQsvW\":[\"Integrazione delle e-mail\"],\"QT/Wo7\":[\"L'e-mail o il dominio è già presente nella blocklist\"],\"BXEcos\":[\"Email\"],\"eXoH4Q\":[\"dipendenti\"],\"gqv5ZL\":[\"I dipendenti\"],\"T3juzf\":[\"URL del punto finale\"],\"lYGfRP\":[\"Inglese\"],\"/bfFKe\":[\"Approfittate di un \",[\"withCreditCardTrialPeriodDuration\"],\"-giorni di prova gratuita\"],\"GpB8YV\":[\"Impresa\"],\"c3qGJX\":[\"Errore nell'eliminazione della chiave api: \",[\"err\"]],\"bj7nh3\":[\"Errore nella rigenerazione della chiave api: \",[\"err\"]],\"RgSsJ3\":[\"Error while switching subscription \",[\"1\"],\".\"],\"VSQxWH\":[\"Errore durante la commutazione dell'abbonamento \",[\"to\"],\".\"],\"JLxMta\":[\"Stabilire endpoint Webhook per le notifiche di eventi asincroni.\"],\"cIgBjB\":[\"Escludere le seguenti persone e domini dalla mia sincronizzazione e-mail\"],\"fV7V51\":[\"Oggetti esistenti\"],\"AUC8ds\":[\"Exit settings\"],\"IZ4o2e\":[\"Impostazioni di uscita\"],\"bKBhgb\":[\"Esperienza\"],\"LxRNPw\":[\"Scadenza\"],\"SkXfL0\":[\"Data di scadenza\"],\"i9qiyR\":[\"Scade in\"],\"Q0iobh\":[\"Failed to create object\"],\"vF68cg\":[\"Campi\"],\"cSev+j\":[\"Filtri\"],\"nLC6tu\":[\"Francese\"],\"aTieE0\":[\"da mensile a annuale\"],\"K04lE5\":[\"da annuale a mensile\"],\"scmRyR\":[\"Accesso completo\"],\"xANKBj\":[\"Funzioni\"],\"Weq9zb\":[\"Generale\"],\"DDcvSo\":[\"Tedesco\"],\"NXEW3h\":[\"Sfruttate al massimo il vostro spazio di lavoro invitando il vostro team.\"],\"zSGbaR\":[\"Abbonamento\"],\"hWp1MY\":[\"Concedete al supporto Twenty l'accesso temporaneo al vostro spazio di lavoro, in modo che possiamo risolvere i problemi o recuperare i contenuti per vostro conto. È possibile revocare l'accesso in qualsiasi momento.\"],\"XTWO+W\":[\"Icona e nome\"],\"j843N3\":[\"Se avete perso questa chiave, potete rigenerarla, ma sappiate che qualsiasi script che utilizza questa chiave dovrà essere aggiornato. Digitare\\\"\",[\"confirmationValue\"],\"\\\" per confermare.\"],\"NoNwIX\":[\"Inattivo\"],\"JE2tjr\":[\"L'input deve essere in lettere maiuscole e non può iniziare con un numero\"],\"nbfdhU\":[\"Integrazioni\"],\"NtFk/Z\":[\"Provider di autenticazione non valido\"],\"B2Tpo0\":[\"Email non valida\"],\"/m52AE\":[\"Email o dominio non validi\"],\"QdoUFL\":[\"Valori del modulo non validi\"],\"/Wrd4p\":[\"Invalid object data\"],\"0M8+El\":[\"Invito via e-mail\"],\"PWIq/W\":[\"Invito tramite link\"],\"3athPG\":[\"Invito tramite link\"],\"5IfmKA\":[\"Link di invito inviato agli indirizzi e-mail\"],\"d+Y+rP\":[\"Invita il tuo team\"],\"Lj7sBL\":[\"Italiano\"],\"vXIe7J\":[\"Lingua\"],\"pQjjYo\":[\"Link copiato negli appunti\"],\"FgAxTj\":[\"Disconnettersi\"],\"nOhz3x\":[\"Disconnessione\"],\"T6YjCk\":[\"Gestione dei membri\"],\"4cjU2u\":[\"Gestite qui i membri del vostro spazio\"],\"FyFNsd\":[\"Gestire gli account Internet.\"],\"36kYu0\":[\"Gestire l'abbonamento\"],\"wlQNTg\":[\"Membri\"],\"y5rS9U\":[\"Migrate\"],\"6YtxFj\":[\"Nome\"],\"z+6jaZ\":[\"Nome della chiave API\"],\"J7w8lI\":[\"Nome dell'area di lavoro\"],\"dbDjdV\":[\"Navigare\"],\"isRobC\":[\"Nuovo\"],\"Kcr9Fr\":[\"Nuovo account\"],\"o8MyXb\":[\"Nuova chiave\"],\"j313SZ\":[\"Nuova chiave\"],\"hFxdey\":[\"Nuovo oggetto\"],\"7vhWI8\":[\"Nuova password\"],\"U1DAok\":[\"Nuovo webhook\"],\"pwenQu\":[\"Nessun account collegato\"],\"+FLRjr\":[\"non consentito\"],\"1DBGsz\":[\"Note\"],\"FU94q4\":[\"Object created successfully\"],\"B3toQF\":[\"Oggetti\"],\"KNz3EF\":[\"Fuori dai sentieri battuti\"],\"4MyDFl\":[\"Opportunità\"],\"BzEFor\":[\"o\"],\"/IX/7x\":[\"Altro\"],\"boJlGf\":[\"Pagina non trovata\"],\"NRvxzv\":[\"Page Not Found | Twenty\"],\"8ZsakT\":[\"Password\"],\"mi6Rel\":[\"Il link per la reimpostazione della password è stato inviato all'e-mail\"],\"1wdjme\":[\"Persone\"],\"N0+GsR\":[\"Immagine\"],\"jEw0Mr\":[\"Inserire un URL valido\"],\"6nsIo3\":[\"Digitare \\\"\",[\"confirmationValue\"],\"\\\" per confermare che si desidera eliminare questa chiave API. Si noti che qualsiasi script che utilizza questa chiave smetterà di funzionare.\"],\"mFZTXr\":[\"Digitare \",[\"confirmationText\"],\" per confermare l'eliminazione di questo webhook.\"],\"MOERNx\":[\"Portoghese\"],\"rdUucN\":[\"Anteprima\"],\"vERlcd\":[\"Profilo\"],\"YJgRqq\":[\"Pseudoinglese\"],\"ibPuCP\":[\"Leggi la documentazione\"],\"v3xM25\":[\"Ricevere un'e-mail contenente il link per l'aggiornamento della password\"],\"dSCufP\":[\"Selezione dei record\"],\"vpZcGd\":[\"Rigenerare una chiave API\"],\"Mwqo5m\":[\"Rigenerazione della chiave\"],\"D+Mv78\":[\"Chiave di rigenerazione\"],\"5icoS1\":[\"Comunicati\"],\"t/YqKh\":[\"Rimuovere\"],\"KbS2K9\":[\"Reimpostare la password\"],\"A1taO8\":[\"Ricerca\"],\"l1/uy2\":[\"Ricerca in un campo...\"],\"k7kp5/\":[\"Ricerca in un indice...\"],\"BoNHR0\":[\"Search an object...\"],\"ofuw3g\":[\"Ricerca di un oggetto...\"],\"a3LDKx\":[\"Sicurezza\"],\"xraglu\":[\"Selezionare gli eventi che si desidera inviare a questo endpoint\"],\"AXTJAW\":[\"Selezionare la lingua preferita\"],\"mjK8F3\":[\"Inviate un'e-mail di invito al vostro team\"],\"yy5k7a\":[\"Pannello di amministrazione del server\"],\"V7fgiB\":[\"Impostate la visibilità delle e-mail, gestite la vostra blocklist e altro ancora.\"],\"tn41zE\":[\"Impostare il nome del sottodominio\"],\"Tz0i8g\":[\"Impostazioni\"],\"Vy9kmk\":[\"Condividete questo link per invitare gli utenti a unirsi al vostro spazio di lavoro\"],\"gWk8gY\":[\"La modifica dell'etichetta di un campo deve cambiare anche il nome dell'API?\"],\"6Uau97\":[\"Salto\"],\"65A04M\":[\"Spagnolo\"],\"vnS6Rf\":[\"SSO\"],\"omhc+7\":[\"Sottodominio già occupato\"],\"OlC/tU\":[\"Il sottodominio non può essere più lungo di 30 caratteri\"],\"ZETwlU\":[\"Il sottodominio non può essere più breve di 3 caratteri\"],\"AymUjZ\":[\"Subscription has been switched \",[\"0\"]],\"B5jRKH\":[\"L'abbonamento è stato commutato \",[\"to\"]],\"XYLcNv\":[\"Supporto\"],\"Sk5fyO\":[\"Switch \",[\"2\"]],\"z9maAp\":[\"Switch \",[\"3\"]],\"9yk9d1\":[\"Interruttore \",[\"from\"]],\"qi74XZ\":[\"Interruttore \",[\"to\"]],\"FwAweN\":[\"Switch billing \",[\"4\"]],\"L6Fg36\":[\"Fatturazione interruttore \",[\"to\"]],\"AtzMpB\":[\"Sincronizzare l'etichetta del campo e il nome dell'API\"],\"E3AMmw\":[\"Impostazioni di sistema - \",[\"systemDateFormatLabel\"]],\"0ZgB1e\":[\"Impostazioni di sistema - \",[\"systemTimeFormatLabel\"]],\"GtycJ/\":[\"Compiti\"],\"2OUtmv\":[\"La descrizione di questo campo\"],\"VGZYbZ\":[\"L'e-mail associata al vostro account\"],\"h8mvCd\":[\"Il nome e l'icona di questo campo\"],\"L97sPr\":[\"La pagina che state cercando è sparita o non è mai esistita. Riportiamo la pagina in carreggiata\"],\"uWikAA\":[\"I valori di questo campo\"],\"+69KDk\":[\"I valori di questo campo devono essere unici\"],\"PmtLRf\":[\"C'è stato un problema\"],\"7YiCMg\":[\"This action cannot be undone. This will permanently delete this user and remove them from all their assignements.\"],\"hqCwGc\":[\"Questa azione non può essere annullata. L'utente verrà eliminato definitivamente e rimosso da tutti i suoi incarichi.\"],\"gWGuHC\":[\"Questa azione non può essere annullata. L'intera area di lavoro verrà eliminata in modo permanente. <0/> Digitare il proprio indirizzo e-mail per confermare.\"],\"n9nSNJ\":[\"Formato dell'ora\"],\"aqMzDX\":[\"al mese\"],\"WXXiXO\":[\"all'anno\"],\"+zy2Nq\":[\"Tipo\"],\"GQCXQS\":[\"Contatti illimitati\"],\"ONWvwQ\":[\"Caricare\"],\"IagCbF\":[\"URL\"],\"oTTQsc\":[\"Utilizzare solo lettere, numeri e trattini. Iniziare e terminare con una lettera o un numero\"],\"7PzzBU\":[\"Utente\"],\"IjyOjp\":[\"L'utente non è connesso\"],\"fXVIZq\":[\"Valori\"],\"jpctdh\":[\"Vista\"],\"KANz0G\":[\"Visualizza i dettagli della fatturazione\"],\"6n7jtr\":[\"Visualizzare\"],\"id6ein\":[\"Supportiamo PNG, JPEG e GIF quadrati di dimensioni inferiori a 10 MB\"],\"ZS7vYp\":[\"Verranno inviate richieste POST a questo endpoint per ogni nuovo evento\"],\"TRDppN\":[\"Webhook\"],\"v1kQyJ\":[\"Ganci web\"],\"C51ilI\":[\"Quando scadrà la chiave API.\"],\"leUubq\":[\"Quando il tasto sarà disabilitato\"],\"yLOrIT\":[\"Selezione dei record del flusso di lavoro\"],\"woYYQq\":[\"Flussi di lavoro\"],\"pmUArF\":[\"Spazio di lavoro\"],\"VicISP\":[\"Eliminazione dello spazio di lavoro\"],\"Q9pNST\":[\"Scrivere una descrizione\"],\"3d1wCB\":[\"sì\"],\"zSkMV0\":[\"L'addebito sarà immediato per l'intero anno.\"],\"XVnj6K\":[\"Il saldo del credito verrà utilizzato per pagare le fatture mensili.\"],\"9ivpwk\":[\"Il vostro nome come verrà visualizzato\"],\"RhNbPE\":[\"L'area di lavoro verrà disabilitata\"]}")as Messages;
\ No newline at end of file
diff --git a/packages/twenty-front/src/locales/generated/pseudo-en.ts b/packages/twenty-front/src/locales/generated/pseudo-en.ts
new file mode 100644
index 000000000000..93750c49b8ad
--- /dev/null
+++ b/packages/twenty-front/src/locales/generated/pseudo-en.ts
@@ -0,0 +1 @@
+/*eslint-disable*/import type{Messages}from"@lingui/core";export const messages=JSON.parse("{\"J/hVSQ\":[[\"0\"]],\"uogEAL\":[[\"apiKeyName\"],\" ÀƤĨ Ķēŷ\"],\"YT0WJ4\":[\"1 000 ŵōŕķƒĺōŵ ńōďē ēxēćũţĩōńś\"],\"4EdXYs\":[\"12ĥ (\",[\"hour12Label\"],\")\"],\"0HAF12\":[\"2. Ćōńƒĩĝũŕē ƒĩēĺď\"],\"QsMprd\":[\"24ĥ (\",[\"hour24Label\"],\")\"],\"ssjjFt\":[\"Àƀōŕţ\"],\"uyJsf6\":[\"Àƀōũţ\"],\"AeXO77\":[\"Àććōũńţ\"],\"nD0Y+a\":[\"Àććōũńţ Ďēĺēţĩōń\"],\"bPwFdf\":[\"Àććōũńţś\"],\"FQBaXG\":[\"Àćţĩvàţē\"],\"F6pfE9\":[\"Àćţĩvē\"],\"Mue4oc\":[\"Àćţĩvē ÀƤĨ ķēŷś ćŕēàţēď ƀŷ ŷōũ ōŕ ŷōũŕ ţēàḿ.\"],\"Z+OxK0\":[\"Àćţĩvē ÀƤĨś ķēŷś ćŕēàţēď ƀŷ ŷōũ ōŕ ŷōũŕ ţēàḿ.\"],\"DpV70M\":[\"Àďď Ƒĩēĺď\"],\"dEO3Zx\":[\"Àďď ōƀĴēćţ\"],\"sgXUv+\":[\"Àďď ŚŚŌ Ĩďēńţĩţŷ Ƥŕōvĩďēŕ\"],\"5+ttxv\":[\"Àďď ţō ƀĺōćķĺĩśţ\"],\"GMx1K0\":[\"Àĺĺōŵ ĺōĝĩńś ţĥŕōũĝĥ Ĝōōĝĺē'ś śĩńĝĺē śĩĝń-ōń ƒũńćţĩōńàĺĩţŷ.\"],\"dea+zy\":[\"Àĺĺōŵ ĺōĝĩńś ţĥŕōũĝĥ Ḿĩćŕōśōƒţ'ś śĩńĝĺē śĩĝń-ōń ƒũńćţĩōńàĺĩţŷ.\"],\"wMg43c\":[\"Àĺĺōŵ ţĥē ĩńvĩţàţĩōń ōƒ ńēŵ ũśēŕś ƀŷ śĥàŕĩńĝ àń ĩńvĩţē ĺĩńķ.\"],\"vHeVg5\":[\"Àĺĺōŵ ũśēŕś ţō śĩĝń ĩń ŵĩţĥ àń ēḿàĩĺ àńď ƥàśśŵōŕď.\"],\"mJ6m4C\":[\"Àń ōƥţĩōńàĺ ďēśćŕĩƥţĩōń\"],\"0RqpZr\":[\"ÀƤĨ & Ŵēƀĥōōķś\"],\"yRnk5W\":[\"ÀƤĨ Ķēŷ\"],\"5h8ooz\":[\"ÀƤĨ ķēŷś\"],\"kAtj+q\":[\"ÀƤĨ Ńàḿē\"],\"aAIQg2\":[\"Àƥƥēàŕàńćē\"],\"3iX0kh\":[\"Àŕē ŷōũ śũŕē ţĥàţ ŷōũ ŵàńţ ţō ćĥàńĝē ŷōũŕ ƀĩĺĺĩńĝ ĩńţēŕvàĺ?\"],\"TmDqlR\":[\"Àŕē ŷōũ śũŕē ţĥàţ ŷōũ ŵàńţ ţō ćĥàńĝē ŷōũŕ ƀĩĺĺĩńĝ ĩńţēŕvàĺ? \",[\"5\"]],\"jQyP8N\":[\"Àŕē ŷōũ śũŕē ţĥàţ ŷōũ ŵàńţ ţō ćĥàńĝē ŷōũŕ ƀĩĺĺĩńĝ ĩńţēŕvàĺ? \",[\"impact\"]],\"Y7Dx6e\":[\"Àţ ĺēàśţ ōńē àũţĥēńţĩćàţĩōń ḿēţĥōď ḿũśţ ƀē ēńàƀĺēď\"],\"P8fBlG\":[\"Àũţĥēńţĩćàţĩōń\"],\"yIVrHZ\":[\"Àũţĥōŕĩźē\"],\"Dht9W3\":[\"ßàćķ ţō ćōńţēńţ\"],\"R+w/Va\":[\"ßĩĺĺĩńĝ\"],\"K1172m\":[\"ßĺōćķĺĩśţ\"],\"2yl5lQ\":[\"ßōōķ à Ćàĺĺ\"],\"PmmvzS\":[\"Ćàĺćũĺàţē\"],\"AjVXBS\":[\"Ćàĺēńďàŕ\"],\"EUpfsd\":[\"Ćàĺēńďàŕś\"],\"dEgA5A\":[\"Ćàńćēĺ\"],\"0TllC8\":[\"Ćàńćēĺ àńŷţĩḿē\"],\"rRK/Lf\":[\"Ćàńćēĺ Ƥĺàń\"],\"N6gPiD\":[\"Ćàńćēĺ ŷōũŕ śũƀśćŕĩƥţĩōń\"],\"JcIGyw\":[\"Ćĥàńĝē \",[\"6\"]],\"OfzMnb\":[\"Ćĥàńĝē \",[\"to\"]],\"VhMDMg\":[\"Ćĥàńĝē Ƥàśśŵōŕď\"],\"h1IXFK\":[\"Ćĥĩńēśē\"],\"SviKkE\":[\"Ćĥĩńēśē — Śĩḿƥĺĩƒĩēď\"],\"dzb4Ep\":[\"Ćĥĩńēśē — Ţŕàďĩţĩōńàĺ\"],\"JEFFOR\":[\"Ćĥōōśē àń ōƀĴēćţ\"],\"9qP96p\":[\"Ćĥōōśē ŷōũŕ Ţŕĩàĺ\"],\"yz7wBu\":[\"Ćĺōśē\"],\"s2QZS6\":[\"Ćōḿƥàńĩēś\"],\"+zUMwJ\":[\"Ćōńƒĩĝũŕē àń ŚŚŌ ćōńńēćţĩōń\"],\"QTNsSm\":[\"Ćōńƒĩĝũŕē àńď ćũśţōḿĩźē ŷōũŕ ćàĺēńďàŕ ƥŕēƒēŕēńćēś.\"],\"aGwm+D\":[\"Ćōńƒĩĝũŕē ĥōŵ ďàţēś àŕē ďĩśƥĺàŷēď àćŕōśś ţĥē àƥƥ\"],\"Bh4GBD\":[\"Ćōńƒĩĝũŕē ŷōũŕ ēḿàĩĺś àńď ćàĺēńďàŕ śēţţĩńĝś.\"],\"pA86+/\":[\"Ćōńńēćţ à Ĝōōĝĺē àććōũńţ\"],\"D8ATlr\":[\"Ćōńńēćţ à ńēŵ àććōũńţ ţō ŷōũŕ ŵōŕķśƥàćē\"],\"Zgi9Fd\":[\"Ćōńńēćţ ŵĩţĥ Ĝōōĝĺē\"],\"IOfqM8\":[\"Ćōńńēćţ ŵĩţĥ Ḿĩćŕōśōƒţ\"],\"9TzudL\":[\"Ćōńńēćţēď àććōũńţś\"],\"xGVfLh\":[\"Ćōńţĩńũē\"],\"CcGOj+\":[\"Ćōƥĩĺōţ\"],\"7eVkEH\":[\"Ćōƥŷ ĩńvĩţàţĩōń ĺĩńķ\"],\"Ej5euX\":[\"Ćōƥŷ ţĥĩś ķēŷ àś ĩţ ŵĩĺĺ ńōţ ƀē vĩśĩƀĺē àĝàĩń\"],\"hgTg6d\":[\"Ćōƥŷ ţĥĩś ķēŷ àś ĩţ ŵĩĺĺ ōńĺŷ ƀē vĩśĩƀĺē ţĥĩś ōńē ţĩḿē\"],\"uXGLuq\":[\"Ćŕēàţē ÀƤĨ ķēŷ\"],\"dkAPxi\":[\"Ćŕēàţē Ŵēƀĥōōķ\"],\"8skTDV\":[\"Ćũśţōḿ ōƀĴēćţś\"],\"ekOgDG\":[\"Ćũśţōḿ ŌƀĴēćţś\"],\"qt+EaC\":[\"Ćũśţōḿĩśē ţĥē ƒĩēĺďś àvàĩĺàƀĺē ĩń ţĥē \",[\"objectLabelSingular\"],\" vĩēŵś.\"],\"CMhr4u\":[\"Ćũśţōḿĩźē Ďōḿàĩń\"],\"bCJa9l\":[\"Ćũśţōḿĩźē ŷōũŕ ŵōŕķśƥàćē śēćũŕĩţŷ\"],\"Zz6Cxn\":[\"Ďàńĝēŕ źōńē\"],\"5cNMFz\":[\"Ďàţà ḿōďēĺ\"],\"Ud9zHv\":[\"Ďàţē àńď ţĩḿē\"],\"5y3O+A\":[\"Ďēàćţĩvàţē\"],\"qk4i22\":[\"Ďēàćţĩvàţē \\\"Śŷńćĥŕōńĩźē ŌƀĴēćţś Ĺàƀēĺś àńď ÀƤĨ Ńàḿēś\\\" ţō śēţ à ćũśţōḿ ÀƤĨ ńàḿē\"],\"gexAq8\":[\"Ďēàćţĩvàţē ţĥĩś ƒĩēĺď\"],\"Y2ImVJ\":[\"Ďēƒĩńē ţĥē ńàḿē àńď ďēśćŕĩƥţĩōń ōƒ ŷōũŕ ōƀĴēćţ\"],\"cnGeoo\":[\"Ďēĺēţē\"],\"ZDGm40\":[\"Ďēĺēţē àććōũńţ\"],\"gAz0S5\":[\"Ďēĺēţē àććōũńţ àńď àĺĺ ţĥē àśśōćĩàţēď ďàţà\"],\"hGfWDm\":[\"Ďēĺēţē ÀƤĨ ķēŷ\"],\"T6S2Ns\":[\"Ďēĺēţē ţĥĩś ĩńţēĝŕàţĩōń\"],\"snMaH4\":[\"Ďēĺēţē ŵēƀĥōōķ\"],\"kYu0eF\":[\"Ďēĺēţē ŵōŕķśƥàćē\"],\"mk2Ygs\":[\"Ďēĺēţē ŷōũŕ ŵĥōĺē ŵōŕķśƥàćē\"],\"Nu4oKW\":[\"Ďēśćŕĩƥţĩōń\"],\"n+SX4g\":[\"Ďēvēĺōƥēŕś\"],\"i66xz9\":[\"Ďĩśƥĺàŷ àś ŕēĺàţĩvē ďàţē\"],\"EoKe5U\":[\"Ďōḿàĩń\"],\"QVVmxi\":[\"Ē.ĝ. ƀàćķōƒƒĩćē ĩńţēĝŕàţĩōń\"],\"v+uKyy\":[\"Ēďĩţ ƀĩĺĺĩńĝ ĩńţēŕvàĺ\"],\"h2KoTu\":[\"Ēďĩţ ƥàŷḿēńţ ḿēţĥōď, śēē ŷōũŕ ĩńvōĩćēś àńď ḿōŕē\"],\"6o1M/Q\":[\"Ēďĩţ ŷōũŕ śũƀďōḿàĩń ńàḿē ōŕ śēţ à ćũśţōḿ ďōḿàĩń.\"],\"O3oNi5\":[\"Ēḿàĩĺ\"],\"lfQsvW\":[\"Ēḿàĩĺ ĩńţēĝŕàţĩōń\"],\"QT/Wo7\":[\"Ēḿàĩĺ ōŕ ďōḿàĩń ĩś àĺŕēàďŷ ĩń ƀĺōćķĺĩśţ\"],\"BXEcos\":[\"Ēḿàĩĺś\"],\"eXoH4Q\":[\"ēḿƥĺōŷēēś\"],\"gqv5ZL\":[\"Ēḿƥĺōŷēēś\"],\"T3juzf\":[\"Ēńďƥōĩńţ ŨŔĹ\"],\"lYGfRP\":[\"Ēńĝĺĩśĥ\"],\"/bfFKe\":[\"ĒńĴōŷ à \",[\"withCreditCardTrialPeriodDuration\"],\"-ďàŷś ƒŕēē ţŕĩàĺ\"],\"GpB8YV\":[\"Ēńţēŕƥŕĩśē\"],\"c3qGJX\":[\"Ēŕŕōŕ ďēĺēţĩńĝ àƥĩ ķēŷ: \",[\"err\"]],\"bj7nh3\":[\"Ēŕŕōŕ ŕēĝēńēŕàţĩńĝ àƥĩ ķēŷ: \",[\"err\"]],\"RgSsJ3\":[\"Ēŕŕōŕ ŵĥĩĺē śŵĩţćĥĩńĝ śũƀśćŕĩƥţĩōń \",[\"1\"],\".\"],\"VSQxWH\":[\"Ēŕŕōŕ ŵĥĩĺē śŵĩţćĥĩńĝ śũƀśćŕĩƥţĩōń \",[\"to\"],\".\"],\"JLxMta\":[\"Ēśţàƀĺĩśĥ Ŵēƀĥōōķ ēńďƥōĩńţś ƒōŕ ńōţĩƒĩćàţĩōńś ōń àśŷńćĥŕōńōũś ēvēńţś.\"],\"cIgBjB\":[\"Ēxćĺũďē ţĥē ƒōĺĺōŵĩńĝ ƥēōƥĺē àńď ďōḿàĩńś ƒŕōḿ ḿŷ ēḿàĩĺ śŷńć\"],\"fV7V51\":[\"Ēxĩśţĩńĝ ōƀĴēćţś\"],\"AUC8ds\":[\"Ēxĩţ śēţţĩńĝś\"],\"IZ4o2e\":[\"Ēxĩţ Śēţţĩńĝś\"],\"bKBhgb\":[\"Ēxƥēŕĩēńćē\"],\"LxRNPw\":[\"Ēxƥĩŕàţĩōń\"],\"SkXfL0\":[\"Ēxƥĩŕàţĩōń Ďàţē\"],\"i9qiyR\":[\"Ēxƥĩŕēś ĩń\"],\"Q0iobh\":[\"Ƒàĩĺēď ţō ćŕēàţē ōƀĴēćţ\"],\"vF68cg\":[\"Ƒĩēĺďś\"],\"cSev+j\":[\"Ƒĩĺţēŕś\"],\"nLC6tu\":[\"Ƒŕēńćĥ\"],\"aTieE0\":[\"ƒŕōḿ ḿōńţĥĺŷ ţō ŷēàŕĺŷ\"],\"K04lE5\":[\"ƒŕōḿ ŷēàŕĺŷ ţō ḿōńţĥĺŷ\"],\"scmRyR\":[\"Ƒũĺĺ àććēśś\"],\"xANKBj\":[\"Ƒũńćţĩōńś\"],\"Weq9zb\":[\"Ĝēńēŕàĺ\"],\"DDcvSo\":[\"Ĝēŕḿàń\"],\"NXEW3h\":[\"Ĝēţ ţĥē ḿōśţ ōũţ ōƒ ŷōũŕ ŵōŕķśƥàćē ƀŷ ĩńvĩţĩńĝ ŷōũŕ ţēàḿ.\"],\"zSGbaR\":[\"Ĝēţ ŷōũŕ śũƀśćŕĩƥţĩōń\"],\"hWp1MY\":[\"Ĝŕàńţ Ţŵēńţŷ śũƥƥōŕţ ţēḿƥōŕàŕŷ àććēśś ţō ŷōũŕ ŵōŕķśƥàćē śō ŵē ćàń ţŕōũƀĺēśĥōōţ ƥŕōƀĺēḿś ōŕ ŕēćōvēŕ ćōńţēńţ ōń ŷōũŕ ƀēĥàĺƒ. Ŷōũ ćàń ŕēvōķē àććēśś àţ àńŷ ţĩḿē.\"],\"XTWO+W\":[\"Ĩćōń àńď Ńàḿē\"],\"j843N3\":[\"Ĩƒ ŷōũ’vē ĺōśţ ţĥĩś ķēŷ, ŷōũ ćàń ŕēĝēńēŕàţē ĩţ, ƀũţ ƀē àŵàŕē ţĥàţ àńŷ śćŕĩƥţ ũśĩńĝ ţĥĩś ķēŷ ŵĩĺĺ ńēēď ţō ƀē ũƥďàţēď. Ƥĺēàśē ţŷƥē\\\"\",[\"confirmationValue\"],\"\\\" ţō ćōńƒĩŕḿ.\"],\"NoNwIX\":[\"Ĩńàćţĩvē\"],\"JE2tjr\":[\"Ĩńƥũţ ḿũśţ ƀē ĩń ćàḿēĺ ćàśē àńď ćàńńōţ śţàŕţ ŵĩţĥ à ńũḿƀēŕ\"],\"nbfdhU\":[\"Ĩńţēĝŕàţĩōńś\"],\"NtFk/Z\":[\"Ĩńvàĺĩď àũţĥ ƥŕōvĩďēŕ\"],\"B2Tpo0\":[\"Ĩńvàĺĩď ēḿàĩĺ\"],\"/m52AE\":[\"Ĩńvàĺĩď ēḿàĩĺ ōŕ ďōḿàĩń\"],\"QdoUFL\":[\"Ĩńvàĺĩď ƒōŕḿ vàĺũēś\"],\"/Wrd4p\":[\"Ĩńvàĺĩď ōƀĴēćţ ďàţà\"],\"0M8+El\":[\"Ĩńvĩţē ƀŷ ēḿàĩĺ\"],\"PWIq/W\":[\"Ĩńvĩţē ƀŷ ĺĩńķ\"],\"3athPG\":[\"Ĩńvĩţē ƀŷ Ĺĩńķ\"],\"5IfmKA\":[\"Ĩńvĩţē ĺĩńķ śēńţ ţō ēḿàĩĺ àďďŕēśśēś\"],\"d+Y+rP\":[\"Ĩńvĩţē ŷōũŕ ţēàḿ\"],\"Lj7sBL\":[\"Ĩţàĺĩàń\"],\"vXIe7J\":[\"Ĺàńĝũàĝē\"],\"pQjjYo\":[\"Ĺĩńķ ćōƥĩēď ţō ćĺĩƥƀōàŕď\"],\"FgAxTj\":[\"Ĺōĝ ōũţ\"],\"nOhz3x\":[\"Ĺōĝōũţ\"],\"T6YjCk\":[\"Ḿàńàĝē Ḿēḿƀēŕś\"],\"4cjU2u\":[\"Ḿàńàĝē ţĥē ḿēḿƀēŕś ōƒ ŷōũŕ śƥàćē ĥēŕē\"],\"FyFNsd\":[\"Ḿàńàĝē ŷōũŕ ĩńţēŕńēţ àććōũńţś.\"],\"36kYu0\":[\"Ḿàńàĝē ŷōũŕ śũƀśćŕĩƥţĩōń\"],\"wlQNTg\":[\"Ḿēḿƀēŕś\"],\"y5rS9U\":[\"Ḿĩĝŕàţē\"],\"6YtxFj\":[\"Ńàḿē\"],\"z+6jaZ\":[\"Ńàḿē ōƒ ŷōũŕ ÀƤĨ ķēŷ\"],\"J7w8lI\":[\"Ńàḿē ōƒ ŷōũŕ ŵōŕķśƥàćē\"],\"dbDjdV\":[\"Ńàvĩĝàţē\"],\"isRobC\":[\"Ńēŵ\"],\"Kcr9Fr\":[\"Ńēŵ àććōũńţ\"],\"o8MyXb\":[\"Ńēŵ ķēŷ\"],\"j313SZ\":[\"Ńēŵ Ķēŷ\"],\"hFxdey\":[\"Ńēŵ ŌƀĴēćţ\"],\"7vhWI8\":[\"Ńēŵ Ƥàśśŵōŕď\"],\"U1DAok\":[\"Ńēŵ Ŵēƀĥōōķ\"],\"pwenQu\":[\"Ńō ćōńńēćţēď àććōũńţ\"],\"+FLRjr\":[\"ńōţ àĺĺōŵēď\"],\"1DBGsz\":[\"Ńōţēś\"],\"FU94q4\":[\"ŌƀĴēćţ ćŕēàţēď śũććēśśƒũĺĺŷ\"],\"B3toQF\":[\"ŌƀĴēćţś\"],\"KNz3EF\":[\"Ōƒƒ ţĥē ƀēàţēń ƥàţĥ\"],\"4MyDFl\":[\"Ōƥƥōŕţũńĩţĩēś\"],\"BzEFor\":[\"ōŕ\"],\"/IX/7x\":[\"Ōţĥēŕ\"],\"boJlGf\":[\"Ƥàĝē Ńōţ Ƒōũńď\"],\"NRvxzv\":[\"Ƥàĝē Ńōţ Ƒōũńď | Ţŵēńţŷ\"],\"8ZsakT\":[\"Ƥàśśŵōŕď\"],\"mi6Rel\":[\"Ƥàśśŵōŕď ŕēśēţ ĺĩńķ ĥàś ƀēēń śēńţ ţō ţĥē ēḿàĩĺ\"],\"1wdjme\":[\"Ƥēōƥĺē\"],\"N0+GsR\":[\"Ƥĩćţũŕē\"],\"jEw0Mr\":[\"Ƥĺēàśē ēńţēŕ à vàĺĩď ŨŔĹ\"],\"6nsIo3\":[\"Ƥĺēàśē ţŷƥē \\\"\",[\"confirmationValue\"],\"\\\" ţō ćōńƒĩŕḿ ŷōũ ŵàńţ ţō ďēĺēţē ţĥĩś ÀƤĨ Ķēŷ. ßē àŵàŕē ţĥàţ àńŷ śćŕĩƥţ ũśĩńĝ ţĥĩś ķēŷ ŵĩĺĺ śţōƥ ŵōŕķĩńĝ.\"],\"mFZTXr\":[\"Ƥĺēàśē ţŷƥē \",[\"confirmationText\"],\" ţō ćōńƒĩŕḿ ŷōũ ŵàńţ ţō ďēĺēţē ţĥĩś ŵēƀĥōōķ.\"],\"MOERNx\":[\"Ƥōŕţũĝũēśē\"],\"rdUucN\":[\"Ƥŕēvĩēŵ\"],\"vERlcd\":[\"Ƥŕōƒĩĺē\"],\"YJgRqq\":[\"Ƥśēũďō-Ēńĝĺĩśĥ\"],\"ibPuCP\":[\"Ŕēàď ďōćũḿēńţàţĩōń\"],\"v3xM25\":[\"Ŕēćēĩvē àń ēḿàĩĺ ćōńţàĩńĩńĝ ƥàśśŵōŕď ũƥďàţē ĺĩńķ\"],\"dSCufP\":[\"Ŕēćōŕď Śēĺēćţĩōń\"],\"vpZcGd\":[\"Ŕēĝēńēŕàţē àń ÀƤĨ ķēŷ\"],\"Mwqo5m\":[\"Ŕēĝēńēŕàţē ķēŷ\"],\"D+Mv78\":[\"Ŕēĝēńēŕàţē Ķēŷ\"],\"5icoS1\":[\"Ŕēĺēàśēś\"],\"t/YqKh\":[\"Ŕēḿōvē\"],\"KbS2K9\":[\"Ŕēśēţ Ƥàśśŵōŕď\"],\"A1taO8\":[\"Śēàŕćĥ\"],\"l1/uy2\":[\"Śēàŕćĥ à ƒĩēĺď...\"],\"k7kp5/\":[\"Śēàŕćĥ àń ĩńďēx...\"],\"BoNHR0\":[\"Śēàŕćĥ àń ōƀĴēćţ...\"],\"ofuw3g\":[\"Śēàŕćĥ ƒōŕ àń ōƀĴēćţ...\"],\"a3LDKx\":[\"Śēćũŕĩţŷ\"],\"xraglu\":[\"Śēĺēćţ ţĥē ēvēńţś ŷōũ ŵĩśĥ ţō śēńď ţō ţĥĩś ēńďƥōĩńţ\"],\"AXTJAW\":[\"Śēĺēćţ ŷōũŕ ƥŕēƒēŕŕēď ĺàńĝũàĝē\"],\"mjK8F3\":[\"Śēńď àń ĩńvĩţē ēḿàĩĺ ţō ŷōũŕ ţēàḿ\"],\"yy5k7a\":[\"Śēŕvēŕ Àďḿĩń Ƥàńēĺ\"],\"V7fgiB\":[\"Śēţ ēḿàĩĺ vĩśĩƀĩĺĩţŷ, ḿàńàĝē ŷōũŕ ƀĺōćķĺĩśţ àńď ḿōŕē.\"],\"tn41zE\":[\"Śēţ ţĥē ńàḿē ōƒ ŷōũŕ śũƀďōḿàĩń\"],\"Tz0i8g\":[\"Śēţţĩńĝś\"],\"Vy9kmk\":[\"Śĥàŕē ţĥĩś ĺĩńķ ţō ĩńvĩţē ũśēŕś ţō Ĵōĩń ŷōũŕ ŵōŕķśƥàćē\"],\"gWk8gY\":[\"Śĥōũĺď ćĥàńĝĩńĝ à ƒĩēĺď'ś ĺàƀēĺ àĺśō ćĥàńĝē ţĥē ÀƤĨ ńàḿē?\"],\"6Uau97\":[\"Śķĩƥ\"],\"65A04M\":[\"Śƥàńĩśĥ\"],\"vnS6Rf\":[\"ŚŚŌ\"],\"omhc+7\":[\"Śũƀďōḿàĩń àĺŕēàďŷ ţàķēń\"],\"OlC/tU\":[\"Śũƀďōḿàĩń ćàń ńōţ ƀē ĺōńĝēŕ ţĥàń 30 ćĥàŕàćţēŕś\"],\"ZETwlU\":[\"Śũƀďōḿàĩń ćàń ńōţ ƀē śĥōŕţēŕ ţĥàń 3 ćĥàŕàćţēŕś\"],\"AymUjZ\":[\"Śũƀśćŕĩƥţĩōń ĥàś ƀēēń śŵĩţćĥēď \",[\"0\"]],\"B5jRKH\":[\"Śũƀśćŕĩƥţĩōń ĥàś ƀēēń śŵĩţćĥēď \",[\"to\"]],\"XYLcNv\":[\"Śũƥƥōŕţ\"],\"Sk5fyO\":[\"Śŵĩţćĥ \",[\"2\"]],\"z9maAp\":[\"Śŵĩţćĥ \",[\"3\"]],\"9yk9d1\":[\"Śŵĩţćĥ \",[\"from\"]],\"qi74XZ\":[\"Śŵĩţćĥ \",[\"to\"]],\"FwAweN\":[\"Śŵĩţćĥ ƀĩĺĺĩńĝ \",[\"4\"]],\"L6Fg36\":[\"Śŵĩţćĥ ƀĩĺĺĩńĝ \",[\"to\"]],\"AtzMpB\":[\"Śŷńćĥŕōńĩźē Ƒĩēĺď Ĺàƀēĺ àńď ÀƤĨ Ńàḿē\"],\"E3AMmw\":[\"Śŷśţēḿ śēţţĩńĝś - \",[\"systemDateFormatLabel\"]],\"0ZgB1e\":[\"Śŷśţēḿ Śēţţĩńĝś - \",[\"systemTimeFormatLabel\"]],\"GtycJ/\":[\"Ţàśķś\"],\"2OUtmv\":[\"Ţĥē ďēśćŕĩƥţĩōń ōƒ ţĥĩś ƒĩēĺď\"],\"VGZYbZ\":[\"Ţĥē ēḿàĩĺ àśśōćĩàţēď ţō ŷōũŕ àććōũńţ\"],\"h8mvCd\":[\"Ţĥē ńàḿē àńď ĩćōń ōƒ ţĥĩś ƒĩēĺď\"],\"L97sPr\":[\"Ţĥē ƥàĝē ŷōũ'ŕē śēēķĩńĝ ĩś ēĩţĥēŕ ĝōńē ōŕ ńēvēŕ ŵàś. Ĺēţ'ś ĝēţ ŷōũ ƀàćķ ōń ţŕàćķ\"],\"uWikAA\":[\"Ţĥē vàĺũēś ōƒ ţĥĩś ƒĩēĺď\"],\"+69KDk\":[\"Ţĥē vàĺũēś ōƒ ţĥĩś ƒĩēĺď ḿũśţ ƀē ũńĩǫũē\"],\"PmtLRf\":[\"Ţĥēŕē ŵàś àń ĩśśũē\"],\"7YiCMg\":[\"Ţĥĩś àćţĩōń ćàńńōţ ƀē ũńďōńē. Ţĥĩś ŵĩĺĺ ƥēŕḿàńēńţĺŷ ďēĺēţē ţĥĩś ũśēŕ àńď ŕēḿōvē ţĥēḿ ƒŕōḿ àĺĺ ţĥēĩŕ àśśĩĝńēḿēńţś.\"],\"hqCwGc\":[\"Ţĥĩś àćţĩōń ćàńńōţ ƀē ũńďōńē. Ţĥĩś ŵĩĺĺ ƥēŕḿàńēńţĺŷ ďēĺēţē ţĥĩś ũśēŕ àńď ŕēḿōvē ţĥēḿ ƒŕōḿ àĺĺ ţĥēĩŕ àśśĩĝńḿēńţś.\"],\"gWGuHC\":[\"Ţĥĩś àćţĩōń ćàńńōţ ƀē ũńďōńē. Ţĥĩś ŵĩĺĺ ƥēŕḿàńēńţĺŷ ďēĺēţē ŷōũŕ ēńţĩŕē ŵōŕķśƥàćē. <0/> Ƥĺēàśē ţŷƥē ĩń ŷōũŕ ēḿàĩĺ ţō ćōńƒĩŕḿ.\"],\"n9nSNJ\":[\"Ţĩḿē ƒōŕḿàţ\"],\"aqMzDX\":[\"ţō ḿōńţĥĺŷ\"],\"WXXiXO\":[\"ţō ŷēàŕĺŷ\"],\"+zy2Nq\":[\"Ţŷƥē\"],\"GQCXQS\":[\"Ũńĺĩḿĩţēď ćōńţàćţś\"],\"ONWvwQ\":[\"Ũƥĺōàď\"],\"IagCbF\":[\"ŨŔĹ\"],\"oTTQsc\":[\"Ũśē ĺēţţēŕ, ńũḿƀēŕ àńď ďàśĥ ōńĺŷ. Śţàŕţ àńď ƒĩńĩśĥ ŵĩţĥ à ĺēţţēŕ ōŕ à ńũḿƀēŕ\"],\"7PzzBU\":[\"Ũśēŕ\"],\"IjyOjp\":[\"Ũśēŕ ĩś ńōţ ĺōĝĝēď ĩń\"],\"fXVIZq\":[\"Vàĺũēś\"],\"jpctdh\":[\"Vĩēŵ\"],\"KANz0G\":[\"Vĩēŵ ƀĩĺĺĩńĝ ďēţàĩĺś\"],\"6n7jtr\":[\"Vĩśũàĺĩźē\"],\"id6ein\":[\"Ŵē śũƥƥōŕţ ŷōũŕ śǫũàŕē ƤŃĜś, ĵƤĒĜś àńď ĜĨƑś ũńďēŕ 10Ḿß\"],\"ZS7vYp\":[\"Ŵē ŵĩĺĺ śēńď ƤŌŚŢ ŕēǫũēśţś ţō ţĥĩś ēńďƥōĩńţ ƒōŕ ēvēŕŷ ńēŵ ēvēńţ\"],\"TRDppN\":[\"Ŵēƀĥōōķ\"],\"v1kQyJ\":[\"Ŵēƀĥōōķś\"],\"C51ilI\":[\"Ŵĥēń ţĥē ÀƤĨ ķēŷ ŵĩĺĺ ēxƥĩŕē.\"],\"leUubq\":[\"Ŵĥēń ţĥē ķēŷ ŵĩĺĺ ƀē ďĩśàƀĺēď\"],\"yLOrIT\":[\"Ŵōŕķƒĺōŵ Ŕēćōŕď Śēĺēćţĩōń\"],\"woYYQq\":[\"Ŵōŕķƒĺōŵś\"],\"pmUArF\":[\"Ŵōŕķśƥàćē\"],\"VicISP\":[\"Ŵōŕķśƥàćē Ďēĺēţĩōń\"],\"Q9pNST\":[\"Ŵŕĩţē à ďēśćŕĩƥţĩōń\"],\"3d1wCB\":[\"ŷēś\"],\"zSkMV0\":[\"Ŷōũ ŵĩĺĺ ƀē ćĥàŕĝēď ĩḿḿēďĩàţēĺŷ ƒōŕ ţĥē ƒũĺĺ ŷēàŕ.\"],\"XVnj6K\":[\"Ŷōũŕ ćŕēďĩţ ƀàĺàńćē ŵĩĺĺ ƀē ũśēď ţō ƥàŷ ţĥē ḿōńţĥĺŷ ƀĩĺĺś.\"],\"9ivpwk\":[\"Ŷōũŕ ńàḿē àś ĩţ ŵĩĺĺ ƀē ďĩśƥĺàŷēď\"],\"RhNbPE\":[\"Ŷōũŕ ŵōŕķśƥàćē ŵĩĺĺ ƀē ďĩśàƀĺēď\"]}")as Messages;
\ No newline at end of file
diff --git a/packages/twenty-front/src/locales/generated/pt.ts b/packages/twenty-front/src/locales/generated/pt.ts
new file mode 100644
index 000000000000..821cfbc4d604
--- /dev/null
+++ b/packages/twenty-front/src/locales/generated/pt.ts
@@ -0,0 +1 @@
+/*eslint-disable*/import type{Messages}from"@lingui/core";export const messages=JSON.parse("{\"J/hVSQ\":[[\"0\"]],\"uogEAL\":[[\"apiKeyName\"],\" Chave da API\"],\"YT0WJ4\":[\"1 000 execuções de nós de fluxo de trabalho\"],\"4EdXYs\":[\"12h (\",[\"hour12Label\"],\")\"],\"0HAF12\":[\"2. Configurar campo\"],\"QsMprd\":[\"24h (\",[\"hour24Label\"],\")\"],\"ssjjFt\":[\"Abortar\"],\"uyJsf6\":[\"Sobre\"],\"AeXO77\":[\"Conta\"],\"nD0Y+a\":[\"Eliminação da conta\"],\"bPwFdf\":[\"Contas\"],\"FQBaXG\":[\"Ativar\"],\"F6pfE9\":[\"Ativo\"],\"Mue4oc\":[\"Chaves de API activas criadas por si ou pela sua equipa.\"],\"Z+OxK0\":[\"Active APIs keys created by you or your team.\"],\"DpV70M\":[\"Adicionar campo\"],\"dEO3Zx\":[\"Adicionar objeto\"],\"sgXUv+\":[\"Adicionar fornecedor de identidade SSO\"],\"5+ttxv\":[\"Adicionar à lista de bloqueio\"],\"GMx1K0\":[\"Permitir logins através da funcionalidade de início de sessão único do Google.\"],\"dea+zy\":[\"Permitir inícios de sessão através da funcionalidade de início de sessão único da Microsoft.\"],\"wMg43c\":[\"Permitir o convite de novos utilizadores através da partilha de uma ligação de convite.\"],\"vHeVg5\":[\"Permitir que os utilizadores iniciem sessão com um e-mail e uma palavra-passe.\"],\"mJ6m4C\":[\"Uma descrição opcional\"],\"0RqpZr\":[\"API e Webhooks\"],\"yRnk5W\":[\"Chave API\"],\"5h8ooz\":[\"Chaves API\"],\"kAtj+q\":[\"Nome da API\"],\"aAIQg2\":[\"Aparência\"],\"3iX0kh\":[\"Tem a certeza de que pretende alterar o seu intervalo de faturação?\"],\"TmDqlR\":[\"Are you sure that you want to change your billing interval? \",[\"5\"]],\"jQyP8N\":[\"Are you sure that you want to change your billing interval? \",[\"impact\"]],\"Y7Dx6e\":[\"Pelo menos um método de autenticação deve estar ativado\"],\"P8fBlG\":[\"Autenticação\"],\"yIVrHZ\":[\"Autorizar\"],\"Dht9W3\":[\"Voltar ao conteúdo\"],\"R+w/Va\":[\"Faturação\"],\"K1172m\":[\"Lista de bloqueios\"],\"2yl5lQ\":[\"Marcar uma chamada\"],\"PmmvzS\":[\"Calcular\"],\"AjVXBS\":[\"Calendário\"],\"EUpfsd\":[\"Calendários\"],\"dEgA5A\":[\"Cancelar\"],\"0TllC8\":[\"Cancelar a qualquer momento\"],\"rRK/Lf\":[\"Cancelar plano\"],\"N6gPiD\":[\"Cancelar a sua subscrição\"],\"JcIGyw\":[\"Change \",[\"6\"]],\"OfzMnb\":[\"Alterar \",[\"to\"]],\"VhMDMg\":[\"Alterar a palavra-passe\"],\"h1IXFK\":[\"Chinese\"],\"SviKkE\":[\"Chinês - Simplificado\"],\"dzb4Ep\":[\"Chinês - Tradicional\"],\"JEFFOR\":[\"Escolher um objeto\"],\"9qP96p\":[\"Escolha o seu teste\"],\"yz7wBu\":[\"Fechar\"],\"s2QZS6\":[\"Empresas\"],\"+zUMwJ\":[\"Configurar uma ligação SSO\"],\"QTNsSm\":[\"Configure e personalize as suas preferências de calendário.\"],\"aGwm+D\":[\"Configurar a forma como as datas são apresentadas na aplicação\"],\"Bh4GBD\":[\"Configurar as definições de correio eletrónico e calendário.\"],\"pA86+/\":[\"Ligar uma conta Google\"],\"D8ATlr\":[\"Ligar uma nova conta ao seu espaço de trabalho\"],\"Zgi9Fd\":[\"Ligar ao Google\"],\"IOfqM8\":[\"Ligar à Microsoft\"],\"9TzudL\":[\"Contas ligadas\"],\"xGVfLh\":[\"Continuar\"],\"CcGOj+\":[\"Copiloto\"],\"7eVkEH\":[\"Copiar a hiperligação do convite\"],\"Ej5euX\":[\"Copiar esta chave, uma vez que não voltará a ser visível\"],\"hgTg6d\":[\"Copy this key as it will only be visible this one time\"],\"uXGLuq\":[\"Criar chave API\"],\"dkAPxi\":[\"Criar Webhook\"],\"8skTDV\":[\"Objectos personalizados\"],\"ekOgDG\":[\"Objectos personalizados\"],\"qt+EaC\":[\"Personalizar os campos disponíveis nas vistas \",[\"objectLabelSingular\"],\".\"],\"CMhr4u\":[\"Personalizar domínio\"],\"bCJa9l\":[\"Personalize a segurança do seu espaço de trabalho\"],\"Zz6Cxn\":[\"Zona de perigo\"],\"5cNMFz\":[\"Modelo de dados\"],\"Ud9zHv\":[\"Data e hora\"],\"5y3O+A\":[\"Desativar\"],\"qk4i22\":[\"Desativar \\\"Sincronizar etiquetas de objectos e nomes de API\\\" para definir um nome de API personalizado\"],\"gexAq8\":[\"Desativar este campo\"],\"Y2ImVJ\":[\"Definir o nome e a descrição do seu objeto\"],\"cnGeoo\":[\"Eliminar\"],\"ZDGm40\":[\"Eliminar a conta\"],\"gAz0S5\":[\"Eliminar a conta e todos os dados associados\"],\"hGfWDm\":[\"Eliminar a chave API\"],\"T6S2Ns\":[\"Eliminar esta integração\"],\"snMaH4\":[\"Eliminar webhook\"],\"kYu0eF\":[\"Eliminar espaço de trabalho\"],\"mk2Ygs\":[\"Eliminar todo o seu espaço de trabalho\"],\"Nu4oKW\":[\"Descrição\"],\"n+SX4g\":[\"Programadores\"],\"i66xz9\":[\"Exibir como data relativa\"],\"EoKe5U\":[\"Domínio\"],\"QVVmxi\":[\"Por exemplo, integração de backoffice\"],\"v+uKyy\":[\"Editar intervalo de faturação\"],\"h2KoTu\":[\"Editar o método de pagamento, ver as suas facturas e muito mais\"],\"6o1M/Q\":[\"Edite o nome do seu subdomínio ou defina um domínio personalizado.\"],\"O3oNi5\":[\"Correio eletrónico\"],\"lfQsvW\":[\"Integração de correio eletrónico\"],\"QT/Wo7\":[\"O e-mail ou domínio já está na lista de bloqueio\"],\"BXEcos\":[\"Emails\"],\"eXoH4Q\":[\"empregados\"],\"gqv5ZL\":[\"Empregados\"],\"T3juzf\":[\"URL do ponto final\"],\"lYGfRP\":[\"Inglês\"],\"/bfFKe\":[\"Desfrute de um período experimental gratuito de \",[\"withCreditCardTrialPeriodDuration\"],\"-dias\"],\"GpB8YV\":[\"Empresa\"],\"c3qGJX\":[\"Erro ao eliminar a chave api: \",[\"err\"]],\"bj7nh3\":[\"Erro ao regenerar a chave api: \",[\"err\"]],\"RgSsJ3\":[\"Error while switching subscription \",[\"1\"],\".\"],\"VSQxWH\":[\"Erro ao mudar de subscrição \",[\"to\"],\".\"],\"JLxMta\":[\"Estabelecer pontos de extremidade Webhook para notificações sobre eventos assíncronos.\"],\"cIgBjB\":[\"Excluir as seguintes pessoas e domínios da minha sincronização de correio eletrónico\"],\"fV7V51\":[\"Objectos existentes\"],\"AUC8ds\":[\"Exit settings\"],\"IZ4o2e\":[\"Sair das definições\"],\"bKBhgb\":[\"Experiência\"],\"LxRNPw\":[\"Prazo de validade\"],\"SkXfL0\":[\"Data de expiração\"],\"i9qiyR\":[\"Expira em\"],\"Q0iobh\":[\"Failed to create object\"],\"vF68cg\":[\"Campos\"],\"cSev+j\":[\"Filtros\"],\"nLC6tu\":[\"Francês\"],\"aTieE0\":[\"de mensal para anual\"],\"K04lE5\":[\"de anual para mensal\"],\"scmRyR\":[\"Acesso total\"],\"xANKBj\":[\"Funções\"],\"Weq9zb\":[\"Geral\"],\"DDcvSo\":[\"Alemão\"],\"NXEW3h\":[\"Tire o máximo partido do seu espaço de trabalho convidando a sua equipa.\"],\"zSGbaR\":[\"Obter a sua subscrição\"],\"hWp1MY\":[\"Conceda ao suporte do Twenty acesso temporário ao seu espaço de trabalho para que possamos solucionar problemas ou recuperar conteúdo em seu nome. Pode revogar o acesso em qualquer altura.\"],\"XTWO+W\":[\"Ícone e nome\"],\"j843N3\":[\"Se perdeu esta chave, pode regenerá-la, mas tenha em atenção que qualquer script que utilize esta chave terá de ser atualizado. Digite\\\"\",[\"confirmationValue\"],\"\\\" para confirmar.\"],\"NoNwIX\":[\"Inativo\"],\"JE2tjr\":[\"A entrada deve estar em maiúsculas e minúsculas e não pode começar com um número\"],\"nbfdhU\":[\"Integrações\"],\"NtFk/Z\":[\"Fornecedor de autenticação inválido\"],\"B2Tpo0\":[\"Correio eletrónico inválido\"],\"/m52AE\":[\"Correio eletrónico ou domínio inválido\"],\"QdoUFL\":[\"Valores de formulário inválidos\"],\"/Wrd4p\":[\"Invalid object data\"],\"0M8+El\":[\"Convite por correio eletrónico\"],\"PWIq/W\":[\"Convidar por ligação\"],\"3athPG\":[\"Convidar por ligação\"],\"5IfmKA\":[\"Ligação de convite enviada para endereços de correio eletrónico\"],\"d+Y+rP\":[\"Convide a sua equipa\"],\"Lj7sBL\":[\"Italiano\"],\"vXIe7J\":[\"Língua\"],\"pQjjYo\":[\"Ligação copiada para a área de transferência\"],\"FgAxTj\":[\"Terminar sessão\"],\"nOhz3x\":[\"Terminar sessão\"],\"T6YjCk\":[\"Gerir membros\"],\"4cjU2u\":[\"Gerir os membros do seu espaço aqui\"],\"FyFNsd\":[\"Gerir as suas contas de Internet.\"],\"36kYu0\":[\"Gerir a sua subscrição\"],\"wlQNTg\":[\"Membros\"],\"y5rS9U\":[\"Migrate\"],\"6YtxFj\":[\"Nome\"],\"z+6jaZ\":[\"Nome da sua chave API\"],\"J7w8lI\":[\"Nome do seu espaço de trabalho\"],\"dbDjdV\":[\"Navegar\"],\"isRobC\":[\"Novo\"],\"Kcr9Fr\":[\"Nova conta\"],\"o8MyXb\":[\"Nova chave\"],\"j313SZ\":[\"Nova chave\"],\"hFxdey\":[\"Novo objeto\"],\"7vhWI8\":[\"Nova palavra-passe\"],\"U1DAok\":[\"Novo Webhook\"],\"pwenQu\":[\"Nenhuma conta ligada\"],\"+FLRjr\":[\"não autorizado\"],\"1DBGsz\":[\"Notas\"],\"FU94q4\":[\"Object created successfully\"],\"B3toQF\":[\"Objectos\"],\"KNz3EF\":[\"Fora do caminho tradicional\"],\"4MyDFl\":[\"Oportunidades\"],\"BzEFor\":[\"ou\"],\"/IX/7x\":[\"Outros\"],\"boJlGf\":[\"Página não encontrada\"],\"NRvxzv\":[\"Page Not Found | Twenty\"],\"8ZsakT\":[\"Palavra-passe\"],\"mi6Rel\":[\"A ligação de reposição da palavra-passe foi enviada para o e-mail\"],\"1wdjme\":[\"Pessoas\"],\"N0+GsR\":[\"Imagem\"],\"jEw0Mr\":[\"Introduzir um URL válido\"],\"6nsIo3\":[\"Digite \\\"\",[\"confirmationValue\"],\"\\\" para confirmar que deseja excluir essa chave de API. Tenha em atenção que qualquer script que utilize esta chave deixará de funcionar.\"],\"mFZTXr\":[\"Introduza \",[\"confirmationText\"],\" para confirmar que pretende eliminar este webhook.\"],\"MOERNx\":[\"Português\"],\"rdUucN\":[\"Pré-visualização\"],\"vERlcd\":[\"Perfil\"],\"YJgRqq\":[\"Pseudo-inglês\"],\"ibPuCP\":[\"Ler a documentação\"],\"v3xM25\":[\"Receber uma mensagem de correio eletrónico com uma ligação para atualização da palavra-passe\"],\"dSCufP\":[\"Seleção de registos\"],\"vpZcGd\":[\"Regenerar uma chave API\"],\"Mwqo5m\":[\"Regenerar chave\"],\"D+Mv78\":[\"Regenerar chave\"],\"5icoS1\":[\"Lançamentos\"],\"t/YqKh\":[\"Remover\"],\"KbS2K9\":[\"Repor a palavra-passe\"],\"A1taO8\":[\"Pesquisar\"],\"l1/uy2\":[\"Pesquisar um campo...\"],\"k7kp5/\":[\"Pesquisar um índice...\"],\"BoNHR0\":[\"Search an object...\"],\"ofuw3g\":[\"Procurar um objeto...\"],\"a3LDKx\":[\"Segurança\"],\"xraglu\":[\"Selecione os eventos que pretende enviar para este ponto final\"],\"AXTJAW\":[\"Selecione a sua língua preferida\"],\"mjK8F3\":[\"Enviar um convite por correio eletrónico à sua equipa\"],\"yy5k7a\":[\"Painel de administração do servidor\"],\"V7fgiB\":[\"Defina a visibilidade do correio eletrónico, gira a sua lista de bloqueio e muito mais.\"],\"tn41zE\":[\"Defina o nome do seu subdomínio\"],\"Tz0i8g\":[\"Definições\"],\"Vy9kmk\":[\"Partilhe esta ligação para convidar utilizadores a juntarem-se ao seu espaço de trabalho\"],\"gWk8gY\":[\"A alteração do rótulo de um campo deve também alterar o nome da API?\"],\"6Uau97\":[\"Saltar\"],\"65A04M\":[\"Espanhol\"],\"vnS6Rf\":[\"SSO\"],\"omhc+7\":[\"Subdomínio já ocupado\"],\"OlC/tU\":[\"O subdomínio não pode ter mais de 30 caracteres\"],\"ZETwlU\":[\"O subdomínio não pode ter menos de 3 caracteres\"],\"AymUjZ\":[\"Subscription has been switched \",[\"0\"]],\"B5jRKH\":[\"A subscrição foi mudada \",[\"to\"]],\"XYLcNv\":[\"Apoio\"],\"Sk5fyO\":[\"Switch \",[\"2\"]],\"z9maAp\":[\"Switch \",[\"3\"]],\"9yk9d1\":[\"Comutador \",[\"from\"]],\"qi74XZ\":[\"Comutador \",[\"to\"]],\"FwAweN\":[\"Switch billing \",[\"4\"]],\"L6Fg36\":[\"Mudar a faturação \",[\"to\"]],\"AtzMpB\":[\"Sincronizar a etiqueta do campo e o nome da API\"],\"E3AMmw\":[\"Definições do sistema - \",[\"systemDateFormatLabel\"]],\"0ZgB1e\":[\"Definições do sistema - \",[\"systemTimeFormatLabel\"]],\"GtycJ/\":[\"Tarefas\"],\"2OUtmv\":[\"A descrição deste campo\"],\"VGZYbZ\":[\"O correio eletrónico associado à sua conta\"],\"h8mvCd\":[\"O nome e o ícone deste campo\"],\"L97sPr\":[\"A página que procura desapareceu ou nunca existiu. Vamos voltar a pô-lo no caminho certo\"],\"uWikAA\":[\"Os valores deste campo\"],\"+69KDk\":[\"Os valores deste campo devem ser únicos\"],\"PmtLRf\":[\"Houve um problema\"],\"7YiCMg\":[\"This action cannot be undone. This will permanently delete this user and remove them from all their assignements.\"],\"hqCwGc\":[\"Esta ação não pode ser anulada. Esta ação elimina permanentemente este utilizador e retira-o de todas as suas tarefas.\"],\"gWGuHC\":[\"Esta ação não pode ser anulada. Esta ação eliminará permanentemente todo o seu espaço de trabalho. <0/> Introduza o seu e-mail para confirmar.\"],\"n9nSNJ\":[\"Formato da hora\"],\"aqMzDX\":[\"ao mês\"],\"WXXiXO\":[\"a anual\"],\"+zy2Nq\":[\"Tipo\"],\"GQCXQS\":[\"Contactos ilimitados\"],\"ONWvwQ\":[\"Carregar\"],\"IagCbF\":[\"URL\"],\"oTTQsc\":[\"Utilizar apenas letras, números e traços. Comece e termine com uma letra ou um número\"],\"7PzzBU\":[\"Utilizador\"],\"IjyOjp\":[\"O utilizador não tem sessão iniciada\"],\"fXVIZq\":[\"Valores\"],\"jpctdh\":[\"Ver\"],\"KANz0G\":[\"Ver detalhes da faturação\"],\"6n7jtr\":[\"Visualizar\"],\"id6ein\":[\"Suportamos os seus PNGs, JPEGs e GIFs quadrados com menos de 10 MB\"],\"ZS7vYp\":[\"Enviaremos pedidos POST a este ponto final para cada novo evento\"],\"TRDppN\":[\"Webhook\"],\"v1kQyJ\":[\"Webhooks\"],\"C51ilI\":[\"Quando é que a chave da API expira.\"],\"leUubq\":[\"Quando a tecla será desactivada\"],\"yLOrIT\":[\"Seleção de registos de fluxo de trabalho\"],\"woYYQq\":[\"Fluxos de trabalho\"],\"pmUArF\":[\"Espaço de trabalho\"],\"VicISP\":[\"Eliminação do espaço de trabalho\"],\"Q9pNST\":[\"Escrever uma descrição\"],\"3d1wCB\":[\"sim\"],\"zSkMV0\":[\"Ser-lhe-á cobrado imediatamente o valor total do ano.\"],\"XVnj6K\":[\"O seu saldo de crédito será utilizado para pagar as facturas mensais.\"],\"9ivpwk\":[\"O seu nome como será apresentado\"],\"RhNbPE\":[\"O seu espaço de trabalho será desativado\"]}")as Messages;
\ No newline at end of file
diff --git a/packages/twenty-front/src/locales/generated/zh-Hans.ts b/packages/twenty-front/src/locales/generated/zh-Hans.ts
new file mode 100644
index 000000000000..808f8b924a07
--- /dev/null
+++ b/packages/twenty-front/src/locales/generated/zh-Hans.ts
@@ -0,0 +1 @@
+/*eslint-disable*/import type{Messages}from"@lingui/core";export const messages=JSON.parse("{\"J/hVSQ\":[[\"0\"]],\"uogEAL\":[[\"apiKeyName\"],\" 应用程序接口密钥\"],\"YT0WJ4\":[\"1 000 次工作流节点执行\"],\"4EdXYs\":[\"12h （[\",[\"hour12Label\"],\"）\"],\"0HAF12\":[\"2.配置字段\"],\"QsMprd\":[\"24小时（[\",[\"hour24Label\"],\"）\"],\"ssjjFt\":[\"中止\"],\"uyJsf6\":[\"关于\"],\"AeXO77\":[\"账户\"],\"nD0Y+a\":[\"账户删除\"],\"bPwFdf\":[\"账户\"],\"FQBaXG\":[\"激活\"],\"F6pfE9\":[\"活跃\"],\"Mue4oc\":[\"由您或您的团队创建的活动 API 密钥。\"],\"Z+OxK0\":[\"Active APIs keys created by you or your team.\"],\"DpV70M\":[\"添加字段\"],\"dEO3Zx\":[\"添加对象\"],\"sgXUv+\":[\"添加 SSO 身份供应商\"],\"5+ttxv\":[\"添加到拦截列表\"],\"GMx1K0\":[\"允许通过 Google 的单点登录功能登录。\"],\"dea+zy\":[\"允许通过微软的单点登录功能登录。\"],\"wMg43c\":[\"允许通过共享邀请链接来邀请新用户。\"],\"vHeVg5\":[\"允许用户使用电子邮件和密码登录。\"],\"mJ6m4C\":[\"可选描述\"],\"0RqpZr\":[\"应用程序接口和网络钩子\"],\"yRnk5W\":[\"API 密钥\"],\"5h8ooz\":[\"API 密钥\"],\"kAtj+q\":[\"应用程序接口名称\"],\"aAIQg2\":[\"外观\"],\"3iX0kh\":[\"您确定要更改计费间隔吗？\"],\"TmDqlR\":[\"Are you sure that you want to change your billing interval? \",[\"5\"]],\"jQyP8N\":[\"Are you sure that you want to change your billing interval? \",[\"impact\"]],\"Y7Dx6e\":[\"必须启用至少一种身份验证方法\"],\"P8fBlG\":[\"认证\"],\"yIVrHZ\":[\"授权\"],\"Dht9W3\":[\"返回内容\"],\"R+w/Va\":[\"账单\"],\"K1172m\":[\"拦截列表\"],\"2yl5lQ\":[\"预约电话\"],\"PmmvzS\":[\"计算\"],\"AjVXBS\":[\"日历\"],\"EUpfsd\":[\"日历\"],\"dEgA5A\":[\"取消\"],\"0TllC8\":[\"随时取消\"],\"rRK/Lf\":[\"取消计划\"],\"N6gPiD\":[\"取消订阅\"],\"JcIGyw\":[\"Change \",[\"6\"]],\"OfzMnb\":[\"更改 \",[\"to\"]],\"VhMDMg\":[\"更改密码\"],\"h1IXFK\":[\"Chinese\"],\"SviKkE\":[\"简体中文\"],\"dzb4Ep\":[\"繁体中文\"],\"JEFFOR\":[\"选择对象\"],\"9qP96p\":[\"选择试用\"],\"yz7wBu\":[\"关闭\"],\"s2QZS6\":[\"公司\"],\"+zUMwJ\":[\"配置 SSO 连接\"],\"QTNsSm\":[\"配置和自定义日历偏好。\"],\"aGwm+D\":[\"配置整个应用程序的日期显示方式\"],\"Bh4GBD\":[\"配置电子邮件和日历设置。\"],\"pA86+/\":[\"连接 Google 账户\"],\"D8ATlr\":[\"将新账户连接到工作区\"],\"Zgi9Fd\":[\"与谷歌连接\"],\"IOfqM8\":[\"与微软联系\"],\"9TzudL\":[\"连接账户\"],\"xGVfLh\":[\"继续\"],\"CcGOj+\":[\"副驾驶\"],\"7eVkEH\":[\"复制邀请链接\"],\"Ej5euX\":[\"复制此密钥，因为它将不再可见\"],\"hgTg6d\":[\"Copy this key as it will only be visible this one time\"],\"uXGLuq\":[\"创建应用程序接口密钥\"],\"dkAPxi\":[\"创建 Webhook\"],\"8skTDV\":[\"自定义对象\"],\"ekOgDG\":[\"自定义对象\"],\"qt+EaC\":[\"自定义 \",[\"objectLabelSingular\"],\" 视图中可用的字段。\"],\"CMhr4u\":[\"自定义域名\"],\"bCJa9l\":[\"自定义工作空间安全\"],\"Zz6Cxn\":[\"危险区\"],\"5cNMFz\":[\"数据模型\"],\"Ud9zHv\":[\"日期和时间\"],\"5y3O+A\":[\"停用\"],\"qk4i22\":[\"停用 \\\"同步对象标签和 API 名称 \\\"以设置自定义 API 名称\"],\"gexAq8\":[\"停用该字段\"],\"Y2ImVJ\":[\"定义对象的名称和描述\"],\"cnGeoo\":[\"删除\"],\"ZDGm40\":[\"删除帐户\"],\"gAz0S5\":[\"删除账户和所有相关数据\"],\"hGfWDm\":[\"删除 API 密钥\"],\"T6S2Ns\":[\"删除此集成\"],\"snMaH4\":[\"删除网络钩子\"],\"kYu0eF\":[\"删除工作区\"],\"mk2Ygs\":[\"删除整个工作区\"],\"Nu4oKW\":[\"说明\"],\"n+SX4g\":[\"开发人员\"],\"i66xz9\":[\"显示为相对日期\"],\"EoKe5U\":[\"域名\"],\"QVVmxi\":[\"例如后台整合\"],\"v+uKyy\":[\"编辑计费间隔\"],\"h2KoTu\":[\"编辑付款方式、查看发票等\"],\"6o1M/Q\":[\"编辑子域名或设置自定义域名。\"],\"O3oNi5\":[\"电子邮件\"],\"lfQsvW\":[\"电子邮件集成\"],\"QT/Wo7\":[\"电子邮件或域名已在拦截列表中\"],\"BXEcos\":[\"电子邮件\"],\"eXoH4Q\":[\"员工\"],\"gqv5ZL\":[\"员工\"],\"T3juzf\":[\"端点 URL\"],\"lYGfRP\":[\"英语\"],\"/bfFKe\":[\"享受 \",[\"withCreditCardTrialPeriodDuration\"],\" 天的免费试用期\"],\"GpB8YV\":[\"企业\"],\"c3qGJX\":[\"删除 api 密钥时出错： \",[\"err\"]],\"bj7nh3\":[\"重新生成 api 密钥时出错： \",[\"err\"]],\"RgSsJ3\":[\"Error while switching subscription \",[\"1\"],\".\"],\"VSQxWH\":[\"切换订阅 \",[\"to\"],\" 时出错。\"],\"JLxMta\":[\"建立 Webhook 端点，用于通知异步事件。\"],\"cIgBjB\":[\"从我的电子邮件同步中排除以下人员和域\"],\"fV7V51\":[\"现有对象\"],\"AUC8ds\":[\"Exit settings\"],\"IZ4o2e\":[\"退出设置\"],\"bKBhgb\":[\"经验\"],\"LxRNPw\":[\"到期\"],\"SkXfL0\":[\"有效期\"],\"i9qiyR\":[\"到期时间\"],\"Q0iobh\":[\"Failed to create object\"],\"vF68cg\":[\"字段\"],\"cSev+j\":[\"过滤器\"],\"nLC6tu\":[\"法语\"],\"aTieE0\":[\"从每月到每年\"],\"K04lE5\":[\"从每年到每月\"],\"scmRyR\":[\"完全访问\"],\"xANKBj\":[\"功能\"],\"Weq9zb\":[\"一般情况\"],\"DDcvSo\":[\"德国\"],\"NXEW3h\":[\"邀请您的团队，充分利用您的工作空间。\"],\"zSGbaR\":[\"获取订阅\"],\"hWp1MY\":[\"授予 Twenty 支持临时访问您工作区的权限，以便我们代表您排除故障或恢复内容。您可以随时撤销访问权限。\"],\"XTWO+W\":[\"图标和名称\"],\"j843N3\":[\"如果您丢失了此密钥，可以重新生成，但请注意，任何使用此密钥的脚本都需要更新。请键入\\\"\",[\"confirmationValue\"],\"\\\"确认。\"],\"NoNwIX\":[\"不活动\"],\"JE2tjr\":[\"输入内容必须使用驼峰字体，且不能以数字开头\"],\"nbfdhU\":[\"集成\"],\"NtFk/Z\":[\"无效验证提供程序\"],\"B2Tpo0\":[\"无效电子邮件\"],\"/m52AE\":[\"无效电子邮件或域名\"],\"QdoUFL\":[\"无效表格值\"],\"/Wrd4p\":[\"Invalid object data\"],\"0M8+El\":[\"电子邮件邀请\"],\"PWIq/W\":[\"通过链接邀请\"],\"3athPG\":[\"通过链接邀请\"],\"5IfmKA\":[\"向电子邮件地址发送邀请链接\"],\"d+Y+rP\":[\"邀请您的团队\"],\"Lj7sBL\":[\"意大利语\"],\"vXIe7J\":[\"语言\"],\"pQjjYo\":[\"链接复制到剪贴板\"],\"FgAxTj\":[\"退出登录\"],\"nOhz3x\":[\"注销\"],\"T6YjCk\":[\"管理成员\"],\"4cjU2u\":[\"在此管理空间成员\"],\"FyFNsd\":[\"管理互联网账户\"],\"36kYu0\":[\"管理您的订阅\"],\"wlQNTg\":[\"成员\"],\"y5rS9U\":[\"Migrate\"],\"6YtxFj\":[\"名称\"],\"z+6jaZ\":[\"API 密钥名称\"],\"J7w8lI\":[\"工作区名称\"],\"dbDjdV\":[\"导航\"],\"isRobC\":[\"新\"],\"Kcr9Fr\":[\"新账户\"],\"o8MyXb\":[\"新钥匙\"],\"j313SZ\":[\"新钥匙\"],\"hFxdey\":[\"新对象\"],\"7vhWI8\":[\"新密码\"],\"U1DAok\":[\"新 Webhook\"],\"pwenQu\":[\"无连接账户\"],\"+FLRjr\":[\"不允许\"],\"1DBGsz\":[\"说明\"],\"FU94q4\":[\"Object created successfully\"],\"B3toQF\":[\"对象\"],\"KNz3EF\":[\"偏离常规路线\"],\"4MyDFl\":[\"机会\"],\"BzEFor\":[\"或\"],\"/IX/7x\":[\"其他\"],\"boJlGf\":[\"页面未找到\"],\"NRvxzv\":[\"Page Not Found | Twenty\"],\"8ZsakT\":[\"密码\"],\"mi6Rel\":[\"密码重置链接已发送至邮箱\"],\"1wdjme\":[\"人\"],\"N0+GsR\":[\"图片\"],\"jEw0Mr\":[\"请输入有效的 URL\"],\"6nsIo3\":[\"请键入\\\"\",[\"confirmationValue\"],\"\\\"确认要删除此 API 密钥。请注意，任何使用此密钥的脚本都将停止工作。\"],\"mFZTXr\":[\"请键入 \",[\"confirmationText\"],\" 确认要删除此网络钩子。\"],\"MOERNx\":[\"葡萄牙语\"],\"rdUucN\":[\"预览\"],\"vERlcd\":[\"简介\"],\"YJgRqq\":[\"伪英语\"],\"ibPuCP\":[\"阅读文件\"],\"v3xM25\":[\"接收包含密码更新链接的电子邮件\"],\"dSCufP\":[\"记录选择\"],\"vpZcGd\":[\"重新生成 API 密钥\"],\"Mwqo5m\":[\"再生钥匙\"],\"D+Mv78\":[\"再生密钥\"],\"5icoS1\":[\"发布\"],\"t/YqKh\":[\"移除\"],\"KbS2K9\":[\"重置密码\"],\"A1taO8\":[\"搜索\"],\"l1/uy2\":[\"搜索字段...\"],\"k7kp5/\":[\"搜索索引...\"],\"BoNHR0\":[\"Search an object...\"],\"ofuw3g\":[\"搜索对象...\"],\"a3LDKx\":[\"安全\"],\"xraglu\":[\"选择要发送到该端点的事件\"],\"AXTJAW\":[\"选择您喜欢的语言\"],\"mjK8F3\":[\"向团队发送邀请电子邮件\"],\"yy5k7a\":[\"服务器管理面板\"],\"V7fgiB\":[\"设置电子邮件可见性、管理屏蔽列表等。\"],\"tn41zE\":[\"设置子域名称\"],\"Tz0i8g\":[\"设置\"],\"Vy9kmk\":[\"分享此链接以邀请用户加入您的工作区\"],\"gWk8gY\":[\"更改字段标签是否也要更改 API 名称？\"],\"6Uau97\":[\"跳过\"],\"65A04M\":[\"西班牙语\"],\"vnS6Rf\":[\"SSO\"],\"omhc+7\":[\"子域已被占用\"],\"OlC/tU\":[\"子域名长度不得超过 30 个字符\"],\"ZETwlU\":[\"子域名不能少于 3 个字符\"],\"AymUjZ\":[\"Subscription has been switched \",[\"0\"]],\"B5jRKH\":[\"订阅已切换 \",[\"to\"]],\"XYLcNv\":[\"支持\"],\"Sk5fyO\":[\"Switch \",[\"2\"]],\"z9maAp\":[\"Switch \",[\"3\"]],\"9yk9d1\":[\"开关 \",[\"from\"]],\"qi74XZ\":[\"开关 \",[\"to\"]],\"FwAweN\":[\"Switch billing \",[\"4\"]],\"L6Fg36\":[\"开关计费 \",[\"to\"]],\"AtzMpB\":[\"同步字段标签和 API 名称\"],\"E3AMmw\":[\"系统设置 - \",[\"systemDateFormatLabel\"]],\"0ZgB1e\":[\"系统设置 - [\",[\"systemTimeFormatLabel\"],\"］\"],\"GtycJ/\":[\"任务\"],\"2OUtmv\":[\"该字段的说明\"],\"VGZYbZ\":[\"与您的账户关联的电子邮件\"],\"h8mvCd\":[\"该字段的名称和图标\"],\"L97sPr\":[\"您正在寻找的页面要么已经消失，要么从未出现过。让我们帮您恢复正常\"],\"uWikAA\":[\"该字段的值\"],\"+69KDk\":[\"该字段的值必须是唯一的\"],\"PmtLRf\":[\"有一个问题\"],\"7YiCMg\":[\"This action cannot be undone. This will permanently delete this user and remove them from all their assignements.\"],\"hqCwGc\":[\"此操作不可撤销。这将永久删除该用户，并将其从所有任务中删除。\"],\"gWGuHC\":[\"此操作无法撤销。这将永久删除您的整个工作区。 <0/> 请输入您的电子邮件以确认。\"],\"n9nSNJ\":[\"时间格式\"],\"aqMzDX\":[\"至每月\"],\"WXXiXO\":[\"每年\"],\"+zy2Nq\":[\"类型\"],\"GQCXQS\":[\"无限联系人\"],\"ONWvwQ\":[\"上传\"],\"IagCbF\":[\"网址\"],\"oTTQsc\":[\"只能使用字母、数字和破折号。以字母或数字开头和结尾\"],\"7PzzBU\":[\"用户\"],\"IjyOjp\":[\"用户未登录\"],\"fXVIZq\":[\"价值观\"],\"jpctdh\":[\"查看\"],\"KANz0G\":[\"查看账单详情\"],\"6n7jtr\":[\"可视化\"],\"id6ein\":[\"我们支持 10MB 以下的正方形 PNG、JPEG 和 GIF 文件\"],\"ZS7vYp\":[\"我们将为每个新事件向该端点发送 POST 请求\"],\"TRDppN\":[\"网络钩子\"],\"v1kQyJ\":[\"网络钩子\"],\"C51ilI\":[\"API 密钥的过期时间。\"],\"leUubq\":[\"何时禁用按键\"],\"yLOrIT\":[\"工作流程记录选择\"],\"woYYQq\":[\"工作流程\"],\"pmUArF\":[\"工作空间\"],\"VicISP\":[\"删除工作区\"],\"Q9pNST\":[\"撰写说明\"],\"3d1wCB\":[\"是\"],\"zSkMV0\":[\"您将立即被收取全年的费用。\"],\"XVnj6K\":[\"您的信贷余额将用于支付每月账单。\"],\"9ivpwk\":[\"显示您的姓名\"],\"RhNbPE\":[\"您的工作区将被禁用\"]}")as Messages;
\ No newline at end of file
diff --git a/packages/twenty-front/src/locales/generated/zh-Hant.ts b/packages/twenty-front/src/locales/generated/zh-Hant.ts
new file mode 100644
index 000000000000..13e99d546786
--- /dev/null
+++ b/packages/twenty-front/src/locales/generated/zh-Hant.ts
@@ -0,0 +1 @@
+/*eslint-disable*/import type{Messages}from"@lingui/core";export const messages=JSON.parse("{\"J/hVSQ\":[[\"0\"]],\"uogEAL\":[[\"apiKeyName\"],\" 应用程序接口密钥\"],\"YT0WJ4\":[\"1 000 次工作流节点执行\"],\"4EdXYs\":[\"12h （[\",[\"hour12Label\"],\"）\"],\"0HAF12\":[\"2.配置字段\"],\"QsMprd\":[\"24小时（[\",[\"hour24Label\"],\"）\"],\"ssjjFt\":[\"中止\"],\"uyJsf6\":[\"关于\"],\"AeXO77\":[\"账户\"],\"nD0Y+a\":[\"账户删除\"],\"bPwFdf\":[\"账户\"],\"FQBaXG\":[\"激活\"],\"F6pfE9\":[\"活跃\"],\"Mue4oc\":[\"由您或您的团队创建的活动 API 密钥。\"],\"Z+OxK0\":[\"Active APIs keys created by you or your team.\"],\"DpV70M\":[\"添加字段\"],\"dEO3Zx\":[\"添加对象\"],\"sgXUv+\":[\"添加 SSO 身份供应商\"],\"5+ttxv\":[\"添加到拦截列表\"],\"GMx1K0\":[\"允许通过 Google 的单点登录功能登录。\"],\"dea+zy\":[\"允许通过微软的单点登录功能登录。\"],\"wMg43c\":[\"允许通过共享邀请链接来邀请新用户。\"],\"vHeVg5\":[\"允许用户使用电子邮件和密码登录。\"],\"mJ6m4C\":[\"可选描述\"],\"0RqpZr\":[\"应用程序接口和网络钩子\"],\"yRnk5W\":[\"API 密钥\"],\"5h8ooz\":[\"API 密钥\"],\"kAtj+q\":[\"应用程序接口名称\"],\"aAIQg2\":[\"外观\"],\"3iX0kh\":[\"您确定要更改计费间隔吗？\"],\"TmDqlR\":[\"Are you sure that you want to change your billing interval? \",[\"5\"]],\"jQyP8N\":[\"Are you sure that you want to change your billing interval? \",[\"impact\"]],\"Y7Dx6e\":[\"必须启用至少一种身份验证方法\"],\"P8fBlG\":[\"认证\"],\"yIVrHZ\":[\"授权\"],\"Dht9W3\":[\"返回内容\"],\"R+w/Va\":[\"账单\"],\"K1172m\":[\"拦截列表\"],\"2yl5lQ\":[\"预约电话\"],\"PmmvzS\":[\"计算\"],\"AjVXBS\":[\"日历\"],\"EUpfsd\":[\"日历\"],\"dEgA5A\":[\"取消\"],\"0TllC8\":[\"随时取消\"],\"rRK/Lf\":[\"取消计划\"],\"N6gPiD\":[\"取消订阅\"],\"JcIGyw\":[\"Change \",[\"6\"]],\"OfzMnb\":[\"更改 \",[\"to\"]],\"VhMDMg\":[\"更改密码\"],\"h1IXFK\":[\"Chinese\"],\"SviKkE\":[\"简体中文\"],\"dzb4Ep\":[\"繁体中文\"],\"JEFFOR\":[\"选择对象\"],\"9qP96p\":[\"选择试用\"],\"yz7wBu\":[\"关闭\"],\"s2QZS6\":[\"公司\"],\"+zUMwJ\":[\"配置 SSO 连接\"],\"QTNsSm\":[\"配置和自定义日历偏好。\"],\"aGwm+D\":[\"配置整个应用程序的日期显示方式\"],\"Bh4GBD\":[\"配置电子邮件和日历设置。\"],\"pA86+/\":[\"连接 Google 账户\"],\"D8ATlr\":[\"将新账户连接到工作区\"],\"Zgi9Fd\":[\"与谷歌连接\"],\"IOfqM8\":[\"与微软联系\"],\"9TzudL\":[\"连接账户\"],\"xGVfLh\":[\"继续\"],\"CcGOj+\":[\"副驾驶\"],\"7eVkEH\":[\"复制邀请链接\"],\"Ej5euX\":[\"复制此密钥，因为它将不再可见\"],\"hgTg6d\":[\"Copy this key as it will only be visible this one time\"],\"uXGLuq\":[\"创建应用程序接口密钥\"],\"dkAPxi\":[\"创建 Webhook\"],\"8skTDV\":[\"自定义对象\"],\"ekOgDG\":[\"自定义对象\"],\"qt+EaC\":[\"自定义 \",[\"objectLabelSingular\"],\" 视图中可用的字段。\"],\"CMhr4u\":[\"自定义域名\"],\"bCJa9l\":[\"自定义工作区安全\"],\"Zz6Cxn\":[\"危险区\"],\"5cNMFz\":[\"数据模型\"],\"Ud9zHv\":[\"日期和时间\"],\"5y3O+A\":[\"停用\"],\"qk4i22\":[\"停用 \\\"同步对象标签和 API 名称 \\\"以设置自定义 API 名称\"],\"gexAq8\":[\"停用该字段\"],\"Y2ImVJ\":[\"定义对象的名称和描述\"],\"cnGeoo\":[\"删除\"],\"ZDGm40\":[\"删除帐户\"],\"gAz0S5\":[\"删除账户和所有相关数据\"],\"hGfWDm\":[\"删除 API 密钥\"],\"T6S2Ns\":[\"删除此集成\"],\"snMaH4\":[\"删除网络钩子\"],\"kYu0eF\":[\"删除工作区\"],\"mk2Ygs\":[\"删除整个工作区\"],\"Nu4oKW\":[\"说明\"],\"n+SX4g\":[\"开发人员\"],\"i66xz9\":[\"显示为相对日期\"],\"EoKe5U\":[\"域名\"],\"QVVmxi\":[\"例如后台整合\"],\"v+uKyy\":[\"编辑计费间隔\"],\"h2KoTu\":[\"编辑付款方式、查看发票等\"],\"6o1M/Q\":[\"编辑子域名或设置自定义域名。\"],\"O3oNi5\":[\"电子邮件\"],\"lfQsvW\":[\"电子邮件集成\"],\"QT/Wo7\":[\"电子邮件或域名已在拦截列表中\"],\"BXEcos\":[\"电子邮件\"],\"eXoH4Q\":[\"员工\"],\"gqv5ZL\":[\"员工\"],\"T3juzf\":[\"端点 URL\"],\"lYGfRP\":[\"英语\"],\"/bfFKe\":[\"享受 \",[\"withCreditCardTrialPeriodDuration\"],\" 天的免费试用期\"],\"GpB8YV\":[\"企业\"],\"c3qGJX\":[\"删除 api 密钥时出错： \",[\"err\"]],\"bj7nh3\":[\"重新生成 api 密钥时出错： \",[\"err\"]],\"RgSsJ3\":[\"Error while switching subscription \",[\"1\"],\".\"],\"VSQxWH\":[\"切换订阅 \",[\"to\"],\" 时出错。\"],\"JLxMta\":[\"建立 Webhook 端点，用于通知异步事件。\"],\"cIgBjB\":[\"从我的电子邮件同步中排除以下人员和域\"],\"fV7V51\":[\"现有对象\"],\"AUC8ds\":[\"Exit settings\"],\"IZ4o2e\":[\"退出设置\"],\"bKBhgb\":[\"经验\"],\"LxRNPw\":[\"到期\"],\"SkXfL0\":[\"有效期\"],\"i9qiyR\":[\"到期时间\"],\"Q0iobh\":[\"Failed to create object\"],\"vF68cg\":[\"字段\"],\"cSev+j\":[\"过滤器\"],\"nLC6tu\":[\"法语\"],\"aTieE0\":[\"从每月到每年\"],\"K04lE5\":[\"从每年到每月\"],\"scmRyR\":[\"完全访问\"],\"xANKBj\":[\"功能\"],\"Weq9zb\":[\"一般情况\"],\"DDcvSo\":[\"德国\"],\"NXEW3h\":[\"邀请您的团队，充分利用您的工作空间。\"],\"zSGbaR\":[\"获取订阅\"],\"hWp1MY\":[\"授予 Twenty 支持临时访问您工作区的权限，以便我们为您排除故障或恢复内容。您可以随时撤销访问权限。\"],\"XTWO+W\":[\"图标和名称\"],\"j843N3\":[\"如果您丢失了此密钥，可以重新生成，但请注意，任何使用此密钥的脚本都需要更新。请键入\\\"\",[\"confirmationValue\"],\"\\\"确认。\"],\"NoNwIX\":[\"不活动\"],\"JE2tjr\":[\"输入内容必须使用驼峰字体，且不能以数字开头\"],\"nbfdhU\":[\"集成\"],\"NtFk/Z\":[\"无效验证提供程序\"],\"B2Tpo0\":[\"无效电子邮件\"],\"/m52AE\":[\"无效电子邮件或域名\"],\"QdoUFL\":[\"无效表格值\"],\"/Wrd4p\":[\"Invalid object data\"],\"0M8+El\":[\"电子邮件邀请\"],\"PWIq/W\":[\"通过链接邀请\"],\"3athPG\":[\"通过链接邀请\"],\"5IfmKA\":[\"向电子邮件地址发送邀请链接\"],\"d+Y+rP\":[\"邀请您的团队\"],\"Lj7sBL\":[\"意大利语\"],\"vXIe7J\":[\"语言\"],\"pQjjYo\":[\"链接复制到剪贴板\"],\"FgAxTj\":[\"退出登录\"],\"nOhz3x\":[\"注销\"],\"T6YjCk\":[\"管理成员\"],\"4cjU2u\":[\"在此管理空间成员\"],\"FyFNsd\":[\"管理互联网账户\"],\"36kYu0\":[\"管理您的订阅\"],\"wlQNTg\":[\"成员\"],\"y5rS9U\":[\"Migrate\"],\"6YtxFj\":[\"名称\"],\"z+6jaZ\":[\"API 密钥名称\"],\"J7w8lI\":[\"工作区名称\"],\"dbDjdV\":[\"导航\"],\"isRobC\":[\"新\"],\"Kcr9Fr\":[\"新账户\"],\"o8MyXb\":[\"新钥匙\"],\"j313SZ\":[\"新钥匙\"],\"hFxdey\":[\"新对象\"],\"7vhWI8\":[\"新密码\"],\"U1DAok\":[\"新 Webhook\"],\"pwenQu\":[\"无连接账户\"],\"+FLRjr\":[\"不允许\"],\"1DBGsz\":[\"说明\"],\"FU94q4\":[\"Object created successfully\"],\"B3toQF\":[\"对象\"],\"KNz3EF\":[\"偏离常规路线\"],\"4MyDFl\":[\"机会\"],\"BzEFor\":[\"或\"],\"/IX/7x\":[\"其他\"],\"boJlGf\":[\"页面未找到\"],\"NRvxzv\":[\"Page Not Found | Twenty\"],\"8ZsakT\":[\"密码\"],\"mi6Rel\":[\"密码重置链接已发送至邮箱\"],\"1wdjme\":[\"人\"],\"N0+GsR\":[\"图片\"],\"jEw0Mr\":[\"请输入有效的 URL\"],\"6nsIo3\":[\"请键入\\\"\",[\"confirmationValue\"],\"\\\"确认要删除此 API 密钥。请注意，任何使用此密钥的脚本都将停止工作。\"],\"mFZTXr\":[\"请键入 \",[\"confirmationText\"],\" 确认要删除此网络钩子。\"],\"MOERNx\":[\"葡萄牙语\"],\"rdUucN\":[\"预览\"],\"vERlcd\":[\"简介\"],\"YJgRqq\":[\"伪英语\"],\"ibPuCP\":[\"阅读文件\"],\"v3xM25\":[\"接收包含密码更新链接的电子邮件\"],\"dSCufP\":[\"记录选择\"],\"vpZcGd\":[\"重新生成 API 密钥\"],\"Mwqo5m\":[\"再生钥匙\"],\"D+Mv78\":[\"再生密钥\"],\"5icoS1\":[\"发布\"],\"t/YqKh\":[\"移除\"],\"KbS2K9\":[\"重置密码\"],\"A1taO8\":[\"搜索\"],\"l1/uy2\":[\"搜索字段...\"],\"k7kp5/\":[\"搜索索引...\"],\"BoNHR0\":[\"Search an object...\"],\"ofuw3g\":[\"搜索对象...\"],\"a3LDKx\":[\"安全\"],\"xraglu\":[\"选择要发送到该端点的事件\"],\"AXTJAW\":[\"选择您喜欢的语言\"],\"mjK8F3\":[\"向团队发送邀请电子邮件\"],\"yy5k7a\":[\"服务器管理面板\"],\"V7fgiB\":[\"设置电子邮件可见性、管理屏蔽列表等。\"],\"tn41zE\":[\"设置子域名称\"],\"Tz0i8g\":[\"设置\"],\"Vy9kmk\":[\"分享此链接以邀请用户加入您的工作区\"],\"gWk8gY\":[\"更改字段标签是否也要更改 API 名称？\"],\"6Uau97\":[\"跳过\"],\"65A04M\":[\"西班牙语\"],\"vnS6Rf\":[\"SSO\"],\"omhc+7\":[\"子域已被占用\"],\"OlC/tU\":[\"子域名长度不得超过 30 个字符\"],\"ZETwlU\":[\"子域名不能少于 3 个字符\"],\"AymUjZ\":[\"Subscription has been switched \",[\"0\"]],\"B5jRKH\":[\"订阅已切换 \",[\"to\"]],\"XYLcNv\":[\"支持\"],\"Sk5fyO\":[\"Switch \",[\"2\"]],\"z9maAp\":[\"Switch \",[\"3\"]],\"9yk9d1\":[\"开关 \",[\"from\"]],\"qi74XZ\":[\"开关 \",[\"to\"]],\"FwAweN\":[\"Switch billing \",[\"4\"]],\"L6Fg36\":[\"开关计费 \",[\"to\"]],\"AtzMpB\":[\"同步字段标签和 API 名称\"],\"E3AMmw\":[\"系统设置 - \",[\"systemDateFormatLabel\"]],\"0ZgB1e\":[\"系统设置 - [\",[\"systemTimeFormatLabel\"],\"］\"],\"GtycJ/\":[\"任务\"],\"2OUtmv\":[\"该字段的说明\"],\"VGZYbZ\":[\"与您的账户关联的电子邮件\"],\"h8mvCd\":[\"该字段的名称和图标\"],\"L97sPr\":[\"您正在寻找的页面要么已经消失，要么从未出现过。让我们帮您恢复正常\"],\"uWikAA\":[\"该字段的值\"],\"+69KDk\":[\"该字段的值必须是唯一的\"],\"PmtLRf\":[\"有一个问题\"],\"7YiCMg\":[\"This action cannot be undone. This will permanently delete this user and remove them from all their assignements.\"],\"hqCwGc\":[\"此操作不可撤销。这将永久删除该用户，并将其从所有任务中删除。\"],\"gWGuHC\":[\"此操作无法撤销。这将永久删除您的整个工作区。 <0/> 请输入您的电子邮件以确认。\"],\"n9nSNJ\":[\"时间格式\"],\"aqMzDX\":[\"至每月\"],\"WXXiXO\":[\"每年\"],\"+zy2Nq\":[\"类型\"],\"GQCXQS\":[\"无限联系人\"],\"ONWvwQ\":[\"上传\"],\"IagCbF\":[\"网址\"],\"oTTQsc\":[\"只能使用字母、数字和破折号。以字母或数字开头和结尾\"],\"7PzzBU\":[\"用户\"],\"IjyOjp\":[\"用户未登录\"],\"fXVIZq\":[\"价值观\"],\"jpctdh\":[\"查看\"],\"KANz0G\":[\"查看账单详情\"],\"6n7jtr\":[\"可视化\"],\"id6ein\":[\"我们支持 10MB 以下的正方形 PNG、JPEG 和 GIF 文件\"],\"ZS7vYp\":[\"我们将为每个新事件向该端点发送 POST 请求\"],\"TRDppN\":[\"网络钩子\"],\"v1kQyJ\":[\"网络钩子\"],\"C51ilI\":[\"API 密钥的过期时间。\"],\"leUubq\":[\"何时禁用按键\"],\"yLOrIT\":[\"工作流程记录选择\"],\"woYYQq\":[\"工作流程\"],\"pmUArF\":[\"工作空间\"],\"VicISP\":[\"删除工作区\"],\"Q9pNST\":[\"编写说明\"],\"3d1wCB\":[\"是\"],\"zSkMV0\":[\"您将立即被收取全年的费用。\"],\"XVnj6K\":[\"您的信用余额将用于支付每月账单。\"],\"9ivpwk\":[\"显示您的姓名\"],\"RhNbPE\":[\"您的工作区将被禁用\"]}")as Messages;
\ No newline at end of file
diff --git a/packages/twenty-front/src/locales/generated/zh.ts b/packages/twenty-front/src/locales/generated/zh.ts
new file mode 100644
index 000000000000..12b2051ce1ed
--- /dev/null
+++ b/packages/twenty-front/src/locales/generated/zh.ts
@@ -0,0 +1 @@
+/*eslint-disable*/import type{Messages}from"@lingui/core";export const messages=JSON.parse("{\"J/hVSQ\":[[\"0\"]],\"ssjjFt\":[\"Abort\"],\"uyJsf6\":[\"About\"],\"nD0Y+a\":[\"Account Deletion\"],\"bPwFdf\":[\"Accounts\"],\"F6pfE9\":[\"Active\"],\"Mue4oc\":[\"Active API keys created by you or your team.\"],\"Z+OxK0\":[\"Active APIs keys created by you or your team.\"],\"dEO3Zx\":[\"Add object\"],\"5h8ooz\":[\"API keys\"],\"aAIQg2\":[\"Appearance\"],\"3iX0kh\":[\"Are you sure that you want to change your billing interval?\"],\"TmDqlR\":[\"Are you sure that you want to change your billing interval? \",[\"5\"]],\"jQyP8N\":[\"Are you sure that you want to change your billing interval? \",[\"impact\"]],\"P8fBlG\":[\"Authentication\"],\"Dht9W3\":[\"Back to content\"],\"R+w/Va\":[\"Billing\"],\"EUpfsd\":[\"Calendars\"],\"rRK/Lf\":[\"Cancel Plan\"],\"N6gPiD\":[\"Cancel your subscription\"],\"JcIGyw\":[\"Change \",[\"6\"]],\"OfzMnb\":[\"Change \",[\"to\"]],\"h1IXFK\":[\"Chinese\"],\"+zUMwJ\":[\"Configure an SSO connection\"],\"aGwm+D\":[\"Configure how dates are displayed across the app\"],\"xGVfLh\":[\"Continue\"],\"7eVkEH\":[\"Copy invitation link\"],\"uXGLuq\":[\"Create API key\"],\"dkAPxi\":[\"Create Webhook\"],\"CMhr4u\":[\"Customize Domain\"],\"bCJa9l\":[\"Customize your workspace security\"],\"Zz6Cxn\":[\"Danger zone\"],\"5cNMFz\":[\"Data model\"],\"Ud9zHv\":[\"Date and time\"],\"Y2ImVJ\":[\"Define the name and description of your object\"],\"ZDGm40\":[\"Delete account\"],\"kYu0eF\":[\"Delete workspace\"],\"mk2Ygs\":[\"Delete your whole workspace\"],\"n+SX4g\":[\"Developers\"],\"EoKe5U\":[\"Domain\"],\"v+uKyy\":[\"Edit billing interval\"],\"h2KoTu\":[\"Edit payment method, see your invoices and more\"],\"6o1M/Q\":[\"Edit your subdomain name or set a custom domain.\"],\"O3oNi5\":[\"Email\"],\"lYGfRP\":[\"English\"],\"GpB8YV\":[\"Enterprise\"],\"RgSsJ3\":[\"Error while switching subscription \",[\"1\"],\".\"],\"VSQxWH\":[\"Error while switching subscription \",[\"to\"],\".\"],\"JLxMta\":[\"Establish Webhook endpoints for notifications on asynchronous events.\"],\"fV7V51\":[\"Existing objects\"],\"bKBhgb\":[\"Experience\"],\"i9qiyR\":[\"Expires in\"],\"Q0iobh\":[\"Failed to create object\"],\"vF68cg\":[\"Fields\"],\"nLC6tu\":[\"French\"],\"aTieE0\":[\"from monthly to yearly\"],\"K04lE5\":[\"from yearly to monthly\"],\"Weq9zb\":[\"General\"],\"DDcvSo\":[\"German\"],\"NXEW3h\":[\"Get the most out of your workspace by inviting your team.\"],\"hWp1MY\":[\"Grant Twenty support temporary access to your workspace so we can troubleshoot problems or recover content on your behalf. You can revoke access at any time.\"],\"NoNwIX\":[\"Inactive\"],\"nbfdhU\":[\"Integrations\"],\"QdoUFL\":[\"Invalid form values\"],\"/Wrd4p\":[\"Invalid object data\"],\"0M8+El\":[\"Invite by email\"],\"PWIq/W\":[\"Invite by link\"],\"5IfmKA\":[\"Invite link sent to email addresses\"],\"d+Y+rP\":[\"Invite your team\"],\"Lj7sBL\":[\"Italian\"],\"vXIe7J\":[\"Language\"],\"pQjjYo\":[\"Link copied to clipboard\"],\"T6YjCk\":[\"Manage Members\"],\"4cjU2u\":[\"Manage the members of your space here\"],\"36kYu0\":[\"Manage your subscription\"],\"wlQNTg\":[\"Members\"],\"y5rS9U\":[\"Migrate\"],\"6YtxFj\":[\"Name\"],\"J7w8lI\":[\"Name of your workspace\"],\"isRobC\":[\"New\"],\"hFxdey\":[\"New Object\"],\"+FLRjr\":[\"not allowed\"],\"FU94q4\":[\"Object created successfully\"],\"B3toQF\":[\"Objects\"],\"KNz3EF\":[\"Off the beaten path\"],\"BzEFor\":[\"or\"],\"NRvxzv\":[\"Page Not Found | Twenty\"],\"N0+GsR\":[\"Picture\"],\"MOERNx\":[\"Portuguese\"],\"vERlcd\":[\"Profile\"],\"YJgRqq\":[\"Pseudo-English\"],\"5icoS1\":[\"Releases\"],\"t/YqKh\":[\"Remove\"],\"l1/uy2\":[\"Search a field...\"],\"k7kp5/\":[\"Search an index...\"],\"BoNHR0\":[\"Search an object...\"],\"ofuw3g\":[\"Search for an object...\"],\"a3LDKx\":[\"Security\"],\"AXTJAW\":[\"Select your preferred language\"],\"mjK8F3\":[\"Send an invite email to your team\"],\"tn41zE\":[\"Set the name of your subdomain\"],\"Vy9kmk\":[\"Share this link to invite users to join your workspace\"],\"6Uau97\":[\"Skip\"],\"65A04M\":[\"Spanish\"],\"vnS6Rf\":[\"SSO\"],\"omhc+7\":[\"Subdomain already taken\"],\"OlC/tU\":[\"Subdomain can not be longer than 30 characters\"],\"ZETwlU\":[\"Subdomain can not be shorter than 3 characters\"],\"AymUjZ\":[\"Subscription has been switched \",[\"0\"]],\"B5jRKH\":[\"Subscription has been switched \",[\"to\"]],\"XYLcNv\":[\"Support\"],\"Sk5fyO\":[\"Switch \",[\"2\"]],\"z9maAp\":[\"Switch \",[\"3\"]],\"9yk9d1\":[\"Switch \",[\"from\"]],\"qi74XZ\":[\"Switch \",[\"to\"]],\"FwAweN\":[\"Switch billing \",[\"4\"]],\"L6Fg36\":[\"Switch billing \",[\"to\"]],\"VGZYbZ\":[\"The email associated to your account\"],\"L97sPr\":[\"The page you're seeking is either gone or never was. Let's get you back on track\"],\"7YiCMg\":[\"This action cannot be undone. This will permanently delete this user and remove them from all their assignements.\"],\"gWGuHC\":[\"This action cannot be undone. This will permanently delete your entire workspace. <0/> Please type in your email to confirm.\"],\"aqMzDX\":[\"to monthly\"],\"WXXiXO\":[\"to yearly\"],\"+zy2Nq\":[\"Type\"],\"ONWvwQ\":[\"Upload\"],\"oTTQsc\":[\"Use letter, number and dash only. Start and finish with a letter or a number\"],\"7PzzBU\":[\"User\"],\"KANz0G\":[\"View billing details\"],\"v1kQyJ\":[\"Webhooks\"],\"pmUArF\":[\"Workspace\"],\"VicISP\":[\"Workspace Deletion\"],\"zSkMV0\":[\"You will be charged immediately for the full year.\"],\"XVnj6K\":[\"Your credit balance will be used to pay the monthly bills.\"],\"9ivpwk\":[\"Your name as it will be displayed\"],\"RhNbPE\":[\"Your workspace will be disabled\"]}")as Messages;
\ No newline at end of file
diff --git a/packages/twenty-front/src/locales/it.po b/packages/twenty-front/src/locales/it.po
new file mode 100644
index 000000000000..705939b6db5b
--- /dev/null
+++ b/packages/twenty-front/src/locales/it.po
@@ -0,0 +1,1147 @@
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2025-01-21 13:07+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: @lingui/cli\n"
+"Language: it\n"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:92
+msgid "1 000 workflow node executions"
+msgstr "1 000 esecuzioni di nodi del flusso di lavoro"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:63
+msgid "12h ({hour12Label})"
+msgstr "12h ({hour12Label})"
+
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:198
+msgid "2. Configure field"
+msgstr "2. Configurare il campo"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:59
+msgid "24h ({hour24Label})"
+msgstr "24h ({hour24Label})"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:91
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:179
+msgid "API & Webhooks"
+msgstr "API e Webhook"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:182
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:190
+msgid "API Key"
+msgstr "Chiave API"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:166
+msgid "API Name"
+msgstr "Nome API"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:49
+msgid "API keys"
+msgstr "Chiavi API"
+
+#: src/modules/ui/input/components/ImageInput.tsx:157
+msgid "Abort"
+msgstr "Interruzione"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:93
+msgid "About"
+msgstr "Circa"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:40
+#: src/pages/settings/accounts/SettingsAccounts.tsx:46
+msgid "Account"
+msgstr "Conto"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:321
+#: src/modules/settings/profile/components/DeleteAccount.tsx:45
+msgid "Account Deletion"
+msgstr "Cancellazione del conto"
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:21
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:114
+msgid "Accounts"
+msgstr "Conti"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:259
+msgid "Activate"
+msgstr "Attivare"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:193
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:201
+msgid "Active"
+msgstr "Attivo"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:50
+msgid "Active API keys created by you or your team."
+msgstr "Chiavi API attive create da voi o dal vostro team."
+
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:39
+msgid "Add Field"
+msgstr "Aggiungi campo"
+
+#: src/modules/settings/security/components/SettingsSSOIdentitiesProvidersListCard.tsx:59
+msgid "Add SSO Identity Provider"
+msgstr "Aggiungere il provider di identità SSO"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:149
+msgid "Add object"
+msgstr "Aggiungi oggetto"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:105
+msgid "Add to blocklist"
+msgstr "Aggiungi alla lista di blocco"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:135
+msgid "Allow logins through Google's single sign-on functionality."
+msgstr "Consentire l'accesso tramite la funzionalità single sign-on di Google."
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:146
+msgid "Allow logins through Microsoft's single sign-on functionality."
+msgstr "Consentire l'accesso tramite la funzionalità single sign-on di Microsoft."
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:168
+msgid "Allow the invitation of new users by sharing an invite link."
+msgstr "Consentire l'invito di nuovi utenti condividendo un link di invito."
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:157
+msgid "Allow users to sign in with an email and password."
+msgstr "Consentire agli utenti di accedere con un'e-mail e una password."
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:251
+msgid "An optional description"
+msgstr "Una descrizione opzionale"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:37
+msgid "Appearance"
+msgstr "Aspetto"
+
+#: src/pages/settings/SettingsBilling.tsx:190
+msgid "Are you sure that you want to change your billing interval?"
+msgstr "Siete sicuri di voler cambiare l'intervallo di fatturazione?"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:73
+msgid "At least one authentication method must be enabled"
+msgstr "Deve essere abilitato almeno un metodo di autenticazione"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:63
+msgid "Authentication"
+msgstr "Autenticazione"
+
+#: src/pages/auth/Authorize.tsx:127
+msgid "Authorize"
+msgstr "Autorizzare"
+
+#: src/pages/not-found/NotFound.tsx:58
+msgid "Back to content"
+msgstr "Torna al contenuto"
+
+#: src/pages/settings/SettingsBilling.tsx:129
+#: src/pages/settings/SettingsBilling.tsx:135
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:149
+msgid "Billing"
+msgstr "Fatturazione"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx:46
+msgid "Blocklist"
+msgstr "Elenco di blocco"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:210
+msgid "Book a Call"
+msgstr "Prenota una chiamata"
+
+#: src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx:72
+msgid "Calculate"
+msgstr "Calcolare"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:57
+msgid "Calendar"
+msgstr "Calendario"
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:14
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:24
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:78
+msgid "Calendars"
+msgstr "Calendari"
+
+#: src/pages/auth/Authorize.tsx:124
+#: src/modules/ui/layout/modal/components/ConfirmationModal.tsx:151
+#: src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx:198
+#: src/modules/settings/components/SaveAndCancelButtons/CancelButton.tsx:16
+msgid "Cancel"
+msgstr "Annullamento"
+
+#: src/pages/settings/SettingsBilling.tsx:175
+msgid "Cancel Plan"
+msgstr "Annullamento del piano"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:152
+msgid "Cancel anytime"
+msgstr "Annullamento in qualsiasi momento"
+
+#: src/pages/settings/SettingsBilling.tsx:170
+msgid "Cancel your subscription"
+msgstr "Annullamento dell'abbonamento"
+
+#: src/pages/auth/PasswordReset.tsx:246
+#: src/modules/settings/profile/components/ChangePassword.tsx:52
+#: src/modules/settings/profile/components/ChangePassword.tsx:58
+msgid "Change Password"
+msgstr "Modifica della password"
+
+#: src/pages/settings/SettingsBilling.tsx:194
+msgid "Change {to}"
+msgstr "Cambiare {to}"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:86
+msgid "Chinese — Simplified"
+msgstr "Cinese semplificato"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:90
+msgid "Chinese — Traditional"
+msgstr "Cinese tradizionale"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:281
+msgid "Choose an object"
+msgstr "Scegliere un oggetto"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:147
+msgid "Choose your Trial"
+msgstr "Scegliete la vostra prova"
+
+#: src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx:201
+msgid "Close"
+msgstr "Chiudere"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:133
+msgid "Companies"
+msgstr "Aziende"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:48
+msgid "Configure an SSO connection"
+msgstr "Configurare una connessione SSO"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:58
+msgid "Configure and customize your calendar preferences."
+msgstr "Configurare e personalizzare le preferenze del calendario."
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:43
+msgid "Configure how dates are displayed across the app"
+msgstr "Configurare la visualizzazione delle date nell'app"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:34
+msgid "Configure your emails and calendar settings."
+msgstr "Configurare le impostazioni di e-mail e calendario."
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:13
+msgid "Connect a Google account"
+msgstr "Collegare un account Google"
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:11
+msgid "Connect a new account to your workspace"
+msgstr "Collegare un nuovo account al proprio spazio di lavoro"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:51
+msgid "Connect with Google"
+msgstr "Connettersi con Google"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:59
+msgid "Connect with Microsoft"
+msgstr "Connettetevi con Microsoft"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:56
+msgid "Connected accounts"
+msgstr "Conti collegati"
+
+#: src/pages/onboarding/InviteTeam.tsx:228
+#: src/pages/onboarding/ChooseYourPlan.tsx:198
+msgid "Continue"
+msgstr "Continua"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:105
+msgid "Copilot"
+msgstr "Copilota"
+
+#: src/pages/onboarding/InviteTeam.tsx:217
+msgid "Copy invitation link"
+msgstr "Copiare il link dell'invito"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:183
+msgid "Copy this key as it will not be visible again"
+msgstr "Copiate questa chiave perché non sarà più visibile"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:56
+msgid "Create API key"
+msgstr "Creare la chiave API"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:72
+msgid "Create Webhook"
+msgstr "Creare un webhook"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:149
+msgid "Custom Objects"
+msgstr "Oggetti personalizzati"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:90
+msgid "Custom objects"
+msgstr "Oggetti personalizzati"
+
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:28
+msgid "Customise the fields available in the {objectLabelSingular} views."
+msgstr "Personalizzare i campi disponibili nelle viste {objectLabelSingular}."
+
+#: src/pages/settings/SettingsWorkspace.tsx:56
+msgid "Customize Domain"
+msgstr "Personalizzare il dominio"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:64
+msgid "Customize your workspace security"
+msgstr "Personalizzate la sicurezza del vostro spazio di lavoro"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:341
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:237
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:250
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:30
+#: src/modules/settings/profile/components/DeleteAccount.tsx:29
+msgid "Danger zone"
+msgstr "Zona di pericolo"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:144
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:155
+msgid "Data model"
+msgstr "Modello di dati"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:42
+msgid "Date and time"
+msgstr "Data e ora"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:259
+msgid "Deactivate"
+msgstr "Disattivare"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:105
+msgid "Deactivate \"Synchronize Objects Labels and API Names\" to set a custom API name"
+msgstr "Disattivare \"Sincronizza etichette degli oggetti e nomi API\" per impostare un nome API personalizzato"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:251
+msgid "Deactivate this field"
+msgstr "Disattivare questo campo"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:94
+msgid "Define the name and description of your object"
+msgstr "Definire il nome e la descrizione dell'oggetto"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:347
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:243
+msgid "Delete"
+msgstr "Cancellare"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:256
+msgid "Delete API key"
+msgstr "Cancellare la chiave API"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:332
+#: src/modules/settings/profile/components/DeleteAccount.tsx:37
+#: src/modules/settings/profile/components/DeleteAccount.tsx:53
+msgid "Delete account"
+msgstr "Cancellare l'account"
+
+#: src/modules/settings/profile/components/DeleteAccount.tsx:30
+msgid "Delete account and all the associated data"
+msgstr "Eliminare l'account e tutti i dati associati"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:342
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:238
+msgid "Delete this integration"
+msgstr "Eliminare questa integrazione"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:356
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:364
+msgid "Delete webhook"
+msgstr "Cancellare il webhook"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:36
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:54
+msgid "Delete workspace"
+msgstr "Cancellare l'area di lavoro"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:31
+msgid "Delete your whole workspace"
+msgstr "Cancellare l'intero spazio di lavoro"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:250
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:239
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:266
+msgid "Description"
+msgstr "Descrizione"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:35
+#: src/pages/settings/developers/SettingsDevelopers.tsx:42
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:78
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:220
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:89
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:171
+msgid "Developers"
+msgstr "Sviluppatori"
+
+#: src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx:48
+msgid "Display as relative date"
+msgstr "Visualizzazione come data relativa"
+
+#: src/pages/settings/SettingsWorkspace.tsx:51
+#: src/pages/settings/workspace/SettingsDomain.tsx:125
+#: src/pages/settings/workspace/SettingsDomain.tsx:135
+#: src/pages/settings/workspace/SettingsDomain.tsx:150
+msgid "Domain"
+msgstr "Dominio"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:108
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:225
+msgid "E.g. backoffice integration"
+msgstr "Ad esempio, l'integrazione del backoffice"
+
+#: src/pages/settings/SettingsBilling.tsx:157
+msgid "Edit billing interval"
+msgstr "Modifica dell'intervallo di fatturazione"
+
+#: src/pages/settings/SettingsBilling.tsx:145
+msgid "Edit payment method, see your invoices and more"
+msgstr "Modifica del metodo di pagamento, visualizzazione delle fatture e altro ancora"
+
+#: src/pages/settings/SettingsWorkspace.tsx:52
+msgid "Edit your subdomain name or set a custom domain."
+msgstr "Modificare il nome del sottodominio o impostare un dominio personalizzato."
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:180
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:256
+#: src/pages/settings/SettingsProfile.tsx:42
+#: src/pages/auth/PasswordReset.tsx:206
+msgid "Email"
+msgstr "Email"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:89
+msgid "Email integration"
+msgstr "Integrazione delle e-mail"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:55
+msgid "Email or domain is already in blocklist"
+msgstr "L'e-mail o il dominio è già presente nella blocklist"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:72
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:45
+msgid "Emails"
+msgstr "Email"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:137
+msgid "Employees"
+msgstr "I dipendenti"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:96
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:238
+msgid "Endpoint URL"
+msgstr "URL del punto finale"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:82
+msgid "English"
+msgstr "Inglese"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:157
+msgid "Enjoy a {withCreditCardTrialPeriodDuration}-days free trial"
+msgstr "Approfittate di un {withCreditCardTrialPeriodDuration}-giorni di prova gratuita"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:51
+msgid "Enterprise"
+msgstr "Impresa"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:98
+msgid "Error deleting api key: {err}"
+msgstr "Errore nell'eliminazione della chiave api: {err}"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:150
+msgid "Error regenerating api key: {err}"
+msgstr "Errore nella rigenerazione della chiave api: {err}"
+
+#: src/pages/settings/SettingsBilling.tsx:121
+msgid "Error while switching subscription {to}."
+msgstr "Errore durante la commutazione dell'abbonamento {to}."
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:66
+msgid "Establish Webhook endpoints for notifications on asynchronous events."
+msgstr "Stabilire endpoint Webhook per le notifiche di eventi asincroni."
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx:47
+msgid "Exclude the following people and domains from my email sync"
+msgstr "Escludere le seguenti persone e domini dalla mia sincronizzazione e-mail"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:167
+msgid "Existing objects"
+msgstr "Oggetti esistenti"
+
+#: src/modules/navigation/components/AppNavigationDrawer.tsx:36
+msgid "Exit Settings"
+msgstr "Impostazioni di uscita"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:26
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:32
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:108
+msgid "Experience"
+msgstr "Esperienza"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:221
+msgid "Expiration"
+msgstr "Scadenza"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:126
+msgid "Expiration Date"
+msgstr "Data di scadenza"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:259
+msgid "Expires in"
+msgstr "Scade in"
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:42
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:27
+msgid "Fields"
+msgstr "Campi"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:265
+msgid "Filters"
+msgstr "Filtri"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:66
+msgid "French"
+msgstr "Francese"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:87
+msgid "Full access"
+msgstr "Accesso completo"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:187
+msgid "Functions"
+msgstr "Funzioni"
+
+#: src/pages/settings/SettingsWorkspace.tsx:29
+#: src/pages/settings/SettingsWorkspace.tsx:35
+#: src/pages/settings/workspace/SettingsDomain.tsx:132
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:138
+msgid "General"
+msgstr "Generale"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:70
+msgid "German"
+msgstr "Tedesco"
+
+#: src/pages/onboarding/InviteTeam.tsx:184
+msgid "Get the most out of your workspace by inviting your team."
+msgstr "Sfruttate al massimo il vostro spazio di lavoro invitando il vostro team."
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:148
+msgid "Get your subscription"
+msgstr "Abbonamento"
+
+#: src/pages/settings/SettingsWorkspace.tsx:65
+msgid "Grant Twenty support temporary access to your workspace so we can troubleshoot problems or recover content on your behalf. You can revoke access at any time."
+msgstr "Concedete al supporto Twenty l'accesso temporaneo al vostro spazio di lavoro, in modo che possiamo risolvere i problemi o recuperare i contenuti per vostro conto. È possibile revocare l'accesso in qualsiasi momento."
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:208
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:239
+msgid "Icon and Name"
+msgstr "Icona e nome"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:275
+msgid "If you’ve lost this key, you can regenerate it, but be aware that any script using this key will need to be updated. Please type\"{confirmationValue}\" to confirm."
+msgstr "Se avete perso questa chiave, potete rigenerarla, ma sappiate che qualsiasi script che utilizza questa chiave dovrà essere aggiornato. Digitare\"{confirmationValue}\" per confermare."
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:218
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:215
+msgid "Inactive"
+msgstr "Inattivo"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:106
+msgid "Input must be in camel case and cannot start with a number"
+msgstr "L'input deve essere in lettere maiuscole e non può iniziare con un numero"
+
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:15
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:21
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:160
+msgid "Integrations"
+msgstr "Integrazioni"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:57
+msgid "Invalid auth provider"
+msgstr "Provider di autenticazione non valido"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:21
+msgid "Invalid email"
+msgstr "Email non valida"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:44
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:50
+msgid "Invalid email or domain"
+msgstr "Email o dominio non validi"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:87
+msgid "Invalid form values"
+msgstr "Valori del modulo non validi"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:167
+msgid "Invite by Link"
+msgstr "Invito tramite link"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:244
+msgid "Invite by email"
+msgstr "Invito via e-mail"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:157
+msgid "Invite by link"
+msgstr "Invito tramite link"
+
+#: src/pages/onboarding/InviteTeam.tsx:152
+msgid "Invite link sent to email addresses"
+msgstr "Link di invito inviato agli indirizzi e-mail"
+
+#: src/pages/onboarding/InviteTeam.tsx:181
+msgid "Invite your team"
+msgstr "Invita il tuo team"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:74
+msgid "Italian"
+msgstr "Italiano"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:51
+msgid "Language"
+msgstr "Lingua"
+
+#: src/pages/onboarding/InviteTeam.tsx:127
+msgid "Link copied to clipboard"
+msgstr "Link copiato negli appunti"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:206
+msgid "Log out"
+msgstr "Disconnettersi"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:209
+msgid "Logout"
+msgstr "Disconnessione"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:167
+msgid "Manage Members"
+msgstr "Gestione dei membri"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:168
+msgid "Manage the members of your space here"
+msgstr "Gestite qui i membri del vostro spazio"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:57
+msgid "Manage your internet accounts."
+msgstr "Gestire gli account Internet."
+
+#: src/pages/settings/SettingsBilling.tsx:144
+msgid "Manage your subscription"
+msgstr "Gestire l'abbonamento"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:143
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:149
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:143
+msgid "Members"
+msgstr "Membri"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:177
+#: src/pages/settings/SettingsWorkspace.tsx:44
+#: src/pages/settings/SettingsProfile.tsx:35
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:106
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:211
+#: src/modules/settings/workspace/components/NameField.tsx:91
+msgid "Name"
+msgstr "Nome"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:106
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:211
+msgid "Name of your API key"
+msgstr "Nome della chiave API"
+
+#: src/pages/settings/SettingsWorkspace.tsx:44
+msgid "Name of your workspace"
+msgstr "Nome dell'area di lavoro"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:125
+msgid "Navigate"
+msgstr "Navigare"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:79
+msgid "New"
+msgstr "Nuovo"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:92
+msgid "New Key"
+msgstr "Nuova chiave"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:69
+msgid "New Object"
+msgstr "Nuovo oggetto"
+
+#: src/pages/auth/PasswordReset.tsx:233
+msgid "New Password"
+msgstr "Nuova password"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:81
+msgid "New Webhook"
+msgstr "Nuovo webhook"
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:10
+msgid "New account"
+msgstr "Nuovo account"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:82
+msgid "New key"
+msgstr "Nuova chiave"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:46
+msgid "No connected account"
+msgstr "Nessun account collegato"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:141
+msgid "Notes"
+msgstr "Note"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:160
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:179
+#: src/pages/settings/data-model/SettingsNewObject.tsx:76
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:205
+msgid "Objects"
+msgstr "Oggetti"
+
+#: src/pages/not-found/NotFound.tsx:47
+msgid "Off the beaten path"
+msgstr "Fuori dai sentieri battuti"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:137
+msgid "Opportunities"
+msgstr "Opportunità"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:195
+msgid "Other"
+msgstr "Altro"
+
+#: src/pages/not-found/NotFound.tsx:41
+msgid "Page Not Found"
+msgstr "Pagina non trovata"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:156
+msgid "Password"
+msgstr "Password"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:34
+msgid "Password reset link has been sent to the email"
+msgstr "Il link per la reimpostazione della password è stato inviato all'e-mail"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:129
+msgid "People"
+msgstr "Persone"
+
+#: src/pages/settings/SettingsWorkspace.tsx:40
+#: src/pages/settings/SettingsProfile.tsx:30
+msgid "Picture"
+msgstr "Immagine"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:102
+msgid "Please enter a valid URL"
+msgstr "Inserire un URL valido"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:258
+msgid "Please type \"{confirmationValue}\" to confirm you want to delete this API Key. Be aware that any script using this key will stop working."
+msgstr "Digitare \"{confirmationValue}\" per confermare che si desidera eliminare questa chiave API. Si noti che qualsiasi script che utilizza questa chiave smetterà di funzionare."
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:358
+msgid "Please type {confirmationText} to confirm you want to delete this webhook."
+msgstr "Digitare {confirmationText} per confermare l'eliminazione di questo webhook."
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:62
+msgid "Portuguese"
+msgstr "Portoghese"
+
+#: src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx:62
+#: src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx:30
+msgid "Preview"
+msgstr "Anteprima"
+
+#: src/pages/settings/SettingsProfile.tsx:19
+#: src/pages/settings/SettingsProfile.tsx:25
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:103
+msgid "Profile"
+msgstr "Profilo"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:97
+msgid "Pseudo-English"
+msgstr "Pseudoinglese"
+
+#: src/modules/settings/developers/components/SettingsReadDocumentationButton.tsx:9
+msgid "Read documentation"
+msgstr "Leggi la documentazione"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:53
+msgid "Receive an email containing password update link"
+msgstr "Ricevere un'e-mail contenente il link per l'aggiornamento della password"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:109
+msgid "Record Selection"
+msgstr "Selezione dei record"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:195
+msgid "Regenerate Key"
+msgstr "Chiave di rigenerazione"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:191
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:273
+msgid "Regenerate an API key"
+msgstr "Rigenerare una chiave API"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:282
+msgid "Regenerate key"
+msgstr "Rigenerazione della chiave"
+
+#: src/pages/settings/Releases.tsx:111
+#: src/pages/settings/Releases.tsx:117
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:204
+msgid "Releases"
+msgstr "Comunicati"
+
+#: src/modules/ui/input/components/ImageInput.tsx:173
+msgid "Remove"
+msgstr "Rimuovere"
+
+#: src/pages/auth/PasswordReset.tsx:177
+msgid "Reset Password"
+msgstr "Reimpostare la password"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:47
+msgid "SSO"
+msgstr "SSO"
+
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:44
+#: src/modules/navigation/components/MainNavigationDrawerItems.tsx:50
+msgid "Search"
+msgstr "Ricerca"
+
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:183
+msgid "Search a field..."
+msgstr "Ricerca in un campo..."
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:116
+msgid "Search an index..."
+msgstr "Ricerca in un indice..."
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:171
+msgid "Search for an object..."
+msgstr "Ricerca di un oggetto..."
+
+#: src/pages/settings/security/SettingsSecurity.tsx:33
+#: src/pages/settings/security/SettingsSecurity.tsx:40
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:166
+msgid "Security"
+msgstr "Sicurezza"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:266
+msgid "Select the events you wish to send to this endpoint"
+msgstr "Selezionare gli eventi che si desidera inviare a questo endpoint"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:52
+msgid "Select your preferred language"
+msgstr "Selezionare la lingua preferita"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:245
+msgid "Send an invite email to your team"
+msgstr "Inviate un'e-mail di invito al vostro team"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:198
+msgid "Server Admin Panel"
+msgstr "Pannello di amministrazione del server"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:46
+msgid "Set email visibility, manage your blocklist and more."
+msgstr "Impostate la visibilità delle e-mail, gestite la vostra blocklist e altro ancora."
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:151
+msgid "Set the name of your subdomain"
+msgstr "Impostare il nome del sottodominio"
+
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:50
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:33
+#: src/modules/navigation/components/MainNavigationDrawerItems.tsx:56
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:158
+msgid "Share this link to invite users to join your workspace"
+msgstr "Condividete questo link per invitare gli utenti a unirsi al vostro spazio di lavoro"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:212
+msgid "Should changing a field's label also change the API name?"
+msgstr "La modifica dell'etichetta di un campo deve cambiare anche il nome dell'API?"
+
+#: src/pages/onboarding/InviteTeam.tsx:236
+msgid "Skip"
+msgstr "Salto"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:78
+msgid "Spanish"
+msgstr "Spagnolo"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:107
+msgid "Subdomain already taken"
+msgstr "Sottodominio già occupato"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:49
+msgid "Subdomain can not be longer than 30 characters"
+msgstr "Il sottodominio non può essere più lungo di 30 caratteri"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:48
+msgid "Subdomain can not be shorter than 3 characters"
+msgstr "Il sottodominio non può essere più breve di 3 caratteri"
+
+#: src/pages/settings/SettingsBilling.tsx:117
+msgid "Subscription has been switched {to}"
+msgstr "L'abbonamento è stato commutato {to}"
+
+#: src/pages/settings/SettingsWorkspace.tsx:63
+msgid "Support"
+msgstr "Supporto"
+
+#: src/pages/settings/SettingsBilling.tsx:188
+msgid "Switch billing {to}"
+msgstr "Fatturazione interruttore {to}"
+
+#: src/pages/settings/SettingsBilling.tsx:158
+msgid "Switch {from}"
+msgstr "Interruttore {from}"
+
+#: src/pages/settings/SettingsBilling.tsx:162
+msgid "Switch {to}"
+msgstr "Interruttore {to}"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:211
+msgid "Synchronize Field Label and API Name"
+msgstr "Sincronizzare l'etichetta del campo e il nome dell'API"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:55
+msgid "System Settings - {systemTimeFormatLabel}"
+msgstr "Impostazioni di sistema - {systemTimeFormatLabel}"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx:42
+msgid "System settings - {systemDateFormatLabel}"
+msgstr "Impostazioni di sistema - {systemDateFormatLabel}"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:145
+msgid "Tasks"
+msgstr "Compiti"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:240
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:267
+msgid "The description of this field"
+msgstr "La descrizione di questo campo"
+
+#: src/pages/settings/SettingsProfile.tsx:43
+msgid "The email associated to your account"
+msgstr "L'e-mail associata al vostro account"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:209
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:240
+msgid "The name and icon of this field"
+msgstr "Il nome e l'icona di questo campo"
+
+#: src/pages/not-found/NotFound.tsx:50
+msgid "The page you're seeking is either gone or never was. Let's get you back on track"
+msgstr "La pagina che state cercando è sparita o non è mai esistita. Riportiamo la pagina in carreggiata"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:229
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:252
+msgid "The values of this field"
+msgstr "I valori di questo campo"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:224
+msgid "The values of this field must be unique"
+msgstr "I valori di questo campo devono essere unici"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:38
+msgid "There was an issue"
+msgstr "C'è stato un problema"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:323
+msgid "This action cannot be undone. This will permanently delete this user and remove them from all their assignments."
+msgstr "Questa azione non può essere annullata. L'utente verrà eliminato definitivamente e rimosso da tutti i suoi incarichi."
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:48
+msgid "This action cannot be undone. This will permanently delete your entire workspace. <0/> Please type in your email to confirm."
+msgstr "Questa azione non può essere annullata. L'intera area di lavoro verrà eliminata in modo permanente. <0/> Digitare il proprio indirizzo e-mail per confermare."
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:49
+msgid "Time format"
+msgstr "Formato dell'ora"
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:55
+msgid "Type"
+msgstr "Tipo"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:100
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:242
+msgid "URL"
+msgstr "URL"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:88
+msgid "Unlimited contacts"
+msgstr "Contatti illimitati"
+
+#: src/modules/ui/input/components/ImageInput.tsx:165
+msgid "Upload"
+msgstr "Caricare"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:51
+msgid "Use letter, number and dash only. Start and finish with a letter or a number"
+msgstr "Utilizzare solo lettere, numeri e trattini. Iniziare e terminare con una lettera o un numero"
+
+#: src/pages/settings/SettingsProfile.tsx:22
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:29
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:17
+#: src/pages/settings/accounts/SettingsAccounts.tsx:43
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:101
+msgid "User"
+msgstr "Utente"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:51
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:106
+msgid "User is not logged in"
+msgstr "L'utente non è connesso"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:223
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:228
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:251
+msgid "Values"
+msgstr "Valori"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:117
+msgid "View"
+msgstr "Vista"
+
+#: src/pages/settings/SettingsBilling.tsx:149
+msgid "View billing details"
+msgstr "Visualizza i dettagli della fatturazione"
+
+#: src/modules/settings/data-model/objects/components/SettingsObjectCoverImage.tsx:35
+msgid "Visualize"
+msgstr "Visualizzare"
+
+#: src/modules/ui/input/components/ImageInput.tsx:178
+msgid "We support your square PNGs, JPEGs and GIFs under 10MB"
+msgstr "Supportiamo PNG, JPEG e GIF quadrati di dimensioni inferiori a 10 MB"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:97
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:239
+msgid "We will send POST requests to this endpoint for every new event"
+msgstr "Verranno inviate richieste POST a questo endpoint per ogni nuovo evento"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:223
+msgid "Webhook"
+msgstr "Webhook"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:65
+msgid "Webhooks"
+msgstr "Ganci web"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:127
+msgid "When the API key will expire."
+msgstr "Quando scadrà la chiave API."
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:222
+msgid "When the key will be disabled"
+msgstr "Quando il tasto sarà disabilitato"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:113
+msgid "Workflow Record Selection"
+msgstr "Selezione dei record del flusso di lavoro"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:121
+msgid "Workflows"
+msgstr "Flussi di lavoro"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:146
+#: src/pages/settings/SettingsWorkspace.tsx:32
+#: src/pages/settings/SettingsBilling.tsx:132
+#: src/pages/settings/Releases.tsx:114
+#: src/pages/settings/workspace/SettingsDomain.tsx:128
+#: src/pages/settings/security/SettingsSecurity.tsx:37
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:18
+#: src/pages/settings/developers/SettingsDevelopers.tsx:39
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:74
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:216
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:85
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:167
+#: src/pages/settings/data-model/SettingsObjects.tsx:157
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:175
+#: src/pages/settings/data-model/SettingsNewObject.tsx:72
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:201
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:58
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:136
+msgid "Workspace"
+msgstr "Spazio di lavoro"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:46
+msgid "Workspace Deletion"
+msgstr "Eliminazione dello spazio di lavoro"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:254
+msgid "Write a description"
+msgstr "Scrivere una descrizione"
+
+#: src/pages/settings/SettingsBilling.tsx:46
+msgid "You will be charged immediately for the full year."
+msgstr "L'addebito sarà immediato per l'intero anno."
+
+#: src/pages/settings/SettingsBilling.tsx:53
+msgid "Your credit balance will be used to pay the monthly bills."
+msgstr "Il saldo del credito verrà utilizzato per pagare le fatture mensili."
+
+#: src/pages/settings/SettingsProfile.tsx:36
+msgid "Your name as it will be displayed"
+msgstr "Il vostro nome come verrà visualizzato"
+
+#: src/pages/settings/SettingsBilling.tsx:171
+msgid "Your workspace will be disabled"
+msgstr "L'area di lavoro verrà disabilitata"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:167
+msgid "employees"
+msgstr "dipendenti"
+
+#: src/pages/settings/SettingsBilling.tsx:45
+msgid "from monthly to yearly"
+msgstr "da mensile a annuale"
+
+#: src/pages/settings/SettingsBilling.tsx:52
+msgid "from yearly to monthly"
+msgstr "da annuale a mensile"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:108
+msgid "not allowed"
+msgstr "non consentito"
+
+#: src/pages/onboarding/InviteTeam.tsx:213
+msgid "or"
+msgstr "o"
+
+#: src/pages/settings/SettingsBilling.tsx:51
+msgid "to monthly"
+msgstr "al mese"
+
+#: src/pages/settings/SettingsBilling.tsx:44
+msgid "to yearly"
+msgstr "all'anno"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:209
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:158
+msgid "yes"
+msgstr "sì"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:174
+msgid "{apiKeyName} API Key"
+msgstr "{apiKeyName} Chiave API"
diff --git a/packages/twenty-front/src/locales/pseudo-en.po b/packages/twenty-front/src/locales/pseudo-en.po
new file mode 100644
index 000000000000..10b996986da5
--- /dev/null
+++ b/packages/twenty-front/src/locales/pseudo-en.po
@@ -0,0 +1,1234 @@
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2025-01-16 21:57+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: @lingui/cli\n"
+"Language: pseudo-en\n"
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Plural-Forms: \n"
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:126
+#~ msgid "{0}"
+#~ msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:174
+msgid "{apiKeyName} API Key"
+msgstr ""
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:92
+msgid "1 000 workflow node executions"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:63
+msgid "12h ({hour12Label})"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:198
+msgid "2. Configure field"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:59
+msgid "24h ({hour24Label})"
+msgstr ""
+
+#: src/modules/ui/input/components/ImageInput.tsx:157
+msgid "Abort"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:93
+msgid "About"
+msgstr ""
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:40
+#: src/pages/settings/accounts/SettingsAccounts.tsx:46
+msgid "Account"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:321
+#: src/modules/settings/profile/components/DeleteAccount.tsx:45
+msgid "Account Deletion"
+msgstr ""
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:21
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:114
+msgid "Accounts"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:259
+msgid "Activate"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:193
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:201
+msgid "Active"
+msgstr ""
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:50
+msgid "Active API keys created by you or your team."
+msgstr ""
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:50
+#~ msgid "Active APIs keys created by you or your team."
+#~ msgstr ""
+
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:39
+msgid "Add Field"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:149
+msgid "Add object"
+msgstr ""
+
+#: src/modules/settings/security/components/SettingsSSOIdentitiesProvidersListCard.tsx:59
+msgid "Add SSO Identity Provider"
+msgstr ""
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:105
+msgid "Add to blocklist"
+msgstr ""
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:135
+msgid "Allow logins through Google's single sign-on functionality."
+msgstr ""
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:146
+msgid "Allow logins through Microsoft's single sign-on functionality."
+msgstr ""
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:168
+msgid "Allow the invitation of new users by sharing an invite link."
+msgstr ""
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:157
+msgid "Allow users to sign in with an email and password."
+msgstr ""
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:251
+msgid "An optional description"
+msgstr ""
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:91
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:179
+msgid "API & Webhooks"
+msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:182
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:190
+msgid "API Key"
+msgstr ""
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:49
+msgid "API keys"
+msgstr ""
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:166
+msgid "API Name"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:37
+msgid "Appearance"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:190
+msgid "Are you sure that you want to change your billing interval?"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:190
+#~ msgid "Are you sure that you want to change your billing interval? {5}"
+#~ msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:189
+#~ msgid "Are you sure that you want to change your billing interval? {impact}"
+#~ msgstr ""
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:73
+msgid "At least one authentication method must be enabled"
+msgstr ""
+
+#: src/pages/settings/security/SettingsSecurity.tsx:63
+msgid "Authentication"
+msgstr ""
+
+#: src/pages/auth/Authorize.tsx:127
+msgid "Authorize"
+msgstr ""
+
+#: src/pages/not-found/NotFound.tsx:58
+msgid "Back to content"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:129
+#: src/pages/settings/SettingsBilling.tsx:135
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:149
+msgid "Billing"
+msgstr ""
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx:46
+msgid "Blocklist"
+msgstr ""
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:210
+msgid "Book a Call"
+msgstr ""
+
+#: src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx:72
+msgid "Calculate"
+msgstr ""
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:57
+msgid "Calendar"
+msgstr ""
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:14
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:24
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:78
+msgid "Calendars"
+msgstr ""
+
+#: src/pages/auth/Authorize.tsx:124
+#: src/modules/ui/layout/modal/components/ConfirmationModal.tsx:151
+#: src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx:198
+#: src/modules/settings/components/SaveAndCancelButtons/CancelButton.tsx:16
+msgid "Cancel"
+msgstr ""
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:152
+msgid "Cancel anytime"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:175
+msgid "Cancel Plan"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:170
+msgid "Cancel your subscription"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:194
+#~ msgid "Change {6}"
+#~ msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:194
+msgid "Change {to}"
+msgstr ""
+
+#: src/pages/auth/PasswordReset.tsx:246
+#: src/modules/settings/profile/components/ChangePassword.tsx:52
+#: src/modules/settings/profile/components/ChangePassword.tsx:58
+msgid "Change Password"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:86
+#~ msgid "Chinese"
+#~ msgstr ""
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:86
+msgid "Chinese — Simplified"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:90
+msgid "Chinese — Traditional"
+msgstr ""
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:281
+msgid "Choose an object"
+msgstr ""
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:147
+msgid "Choose your Trial"
+msgstr ""
+
+#: src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx:201
+msgid "Close"
+msgstr ""
+
+#: src/modules/command-menu/components/CommandMenu.tsx:133
+msgid "Companies"
+msgstr ""
+
+#: src/pages/settings/security/SettingsSecurity.tsx:48
+msgid "Configure an SSO connection"
+msgstr ""
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:58
+msgid "Configure and customize your calendar preferences."
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:43
+msgid "Configure how dates are displayed across the app"
+msgstr ""
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:34
+msgid "Configure your emails and calendar settings."
+msgstr ""
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:13
+msgid "Connect a Google account"
+msgstr ""
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:11
+msgid "Connect a new account to your workspace"
+msgstr ""
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:51
+msgid "Connect with Google"
+msgstr ""
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:59
+msgid "Connect with Microsoft"
+msgstr ""
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:56
+msgid "Connected accounts"
+msgstr ""
+
+#: src/pages/onboarding/InviteTeam.tsx:228
+#: src/pages/onboarding/ChooseYourPlan.tsx:198
+msgid "Continue"
+msgstr ""
+
+#: src/modules/command-menu/components/CommandMenu.tsx:105
+msgid "Copilot"
+msgstr ""
+
+#: src/pages/onboarding/InviteTeam.tsx:217
+msgid "Copy invitation link"
+msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:183
+msgid "Copy this key as it will not be visible again"
+msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:172
+#~ msgid "Copy this key as it will only be visible this one time"
+#~ msgstr ""
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:56
+msgid "Create API key"
+msgstr ""
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:72
+msgid "Create Webhook"
+msgstr ""
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:90
+msgid "Custom objects"
+msgstr ""
+
+#: src/modules/command-menu/components/CommandMenu.tsx:149
+msgid "Custom Objects"
+msgstr ""
+
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:28
+msgid "Customise the fields available in the {objectLabelSingular} views."
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspace.tsx:56
+msgid "Customize Domain"
+msgstr ""
+
+#: src/pages/settings/security/SettingsSecurity.tsx:64
+msgid "Customize your workspace security"
+msgstr ""
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:341
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:237
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:250
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:30
+#: src/modules/settings/profile/components/DeleteAccount.tsx:29
+msgid "Danger zone"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:144
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:155
+msgid "Data model"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:42
+msgid "Date and time"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:259
+msgid "Deactivate"
+msgstr ""
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:105
+msgid "Deactivate \"Synchronize Objects Labels and API Names\" to set a custom API name"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:251
+msgid "Deactivate this field"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:94
+msgid "Define the name and description of your object"
+msgstr ""
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:347
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:243
+msgid "Delete"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:332
+#: src/modules/settings/profile/components/DeleteAccount.tsx:37
+#: src/modules/settings/profile/components/DeleteAccount.tsx:53
+msgid "Delete account"
+msgstr ""
+
+#: src/modules/settings/profile/components/DeleteAccount.tsx:30
+msgid "Delete account and all the associated data"
+msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:256
+msgid "Delete API key"
+msgstr ""
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:342
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:238
+msgid "Delete this integration"
+msgstr ""
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:356
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:364
+msgid "Delete webhook"
+msgstr ""
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:36
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:54
+msgid "Delete workspace"
+msgstr ""
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:31
+msgid "Delete your whole workspace"
+msgstr ""
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:250
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:239
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:266
+msgid "Description"
+msgstr ""
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:35
+#: src/pages/settings/developers/SettingsDevelopers.tsx:42
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:78
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:220
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:89
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:171
+msgid "Developers"
+msgstr ""
+
+#: src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx:48
+msgid "Display as relative date"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspace.tsx:51
+#: src/pages/settings/workspace/SettingsDomain.tsx:125
+#: src/pages/settings/workspace/SettingsDomain.tsx:135
+#: src/pages/settings/workspace/SettingsDomain.tsx:150
+msgid "Domain"
+msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:108
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:225
+msgid "E.g. backoffice integration"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:157
+msgid "Edit billing interval"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:145
+msgid "Edit payment method, see your invoices and more"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspace.tsx:52
+msgid "Edit your subdomain name or set a custom domain."
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:180
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:256
+#: src/pages/settings/SettingsProfile.tsx:42
+#: src/pages/auth/PasswordReset.tsx:206
+msgid "Email"
+msgstr ""
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:89
+msgid "Email integration"
+msgstr ""
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:55
+msgid "Email or domain is already in blocklist"
+msgstr ""
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:72
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:45
+msgid "Emails"
+msgstr ""
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:167
+msgid "employees"
+msgstr ""
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:137
+msgid "Employees"
+msgstr ""
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:96
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:238
+msgid "Endpoint URL"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:82
+msgid "English"
+msgstr ""
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:157
+msgid "Enjoy a {withCreditCardTrialPeriodDuration}-days free trial"
+msgstr ""
+
+#: src/pages/settings/security/SettingsSecurity.tsx:51
+msgid "Enterprise"
+msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:98
+msgid "Error deleting api key: {err}"
+msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:150
+msgid "Error regenerating api key: {err}"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:118
+#~ msgid "Error while switching subscription {1}."
+#~ msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:121
+msgid "Error while switching subscription {to}."
+msgstr ""
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:66
+msgid "Establish Webhook endpoints for notifications on asynchronous events."
+msgstr ""
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx:47
+msgid "Exclude the following people and domains from my email sync"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:167
+msgid "Existing objects"
+msgstr ""
+
+#: src/modules/navigation/components/AppNavigationDrawer.tsx:36
+#~ msgid "Exit settings"
+#~ msgstr ""
+
+#: src/modules/navigation/components/AppNavigationDrawer.tsx:36
+msgid "Exit Settings"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:26
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:32
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:108
+msgid "Experience"
+msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:221
+msgid "Expiration"
+msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:126
+msgid "Expiration Date"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:259
+msgid "Expires in"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:57
+#~ msgid "Failed to create object"
+#~ msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:42
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:27
+msgid "Fields"
+msgstr ""
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:265
+msgid "Filters"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:66
+msgid "French"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:45
+msgid "from monthly to yearly"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:52
+msgid "from yearly to monthly"
+msgstr ""
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:87
+msgid "Full access"
+msgstr ""
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:187
+msgid "Functions"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspace.tsx:29
+#: src/pages/settings/SettingsWorkspace.tsx:35
+#: src/pages/settings/workspace/SettingsDomain.tsx:132
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:138
+msgid "General"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:70
+msgid "German"
+msgstr ""
+
+#: src/pages/onboarding/InviteTeam.tsx:184
+msgid "Get the most out of your workspace by inviting your team."
+msgstr ""
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:148
+msgid "Get your subscription"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspace.tsx:65
+msgid "Grant Twenty support temporary access to your workspace so we can troubleshoot problems or recover content on your behalf. You can revoke access at any time."
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:208
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:239
+msgid "Icon and Name"
+msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:275
+msgid "If you’ve lost this key, you can regenerate it, but be aware that any script using this key will need to be updated. Please type\"{confirmationValue}\" to confirm."
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:218
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:215
+msgid "Inactive"
+msgstr ""
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:106
+msgid "Input must be in camel case and cannot start with a number"
+msgstr ""
+
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:15
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:21
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:160
+msgid "Integrations"
+msgstr ""
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:57
+msgid "Invalid auth provider"
+msgstr ""
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:21
+msgid "Invalid email"
+msgstr ""
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:44
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:50
+msgid "Invalid email or domain"
+msgstr ""
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:87
+msgid "Invalid form values"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:53
+#~ msgid "Invalid object data"
+#~ msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:244
+msgid "Invite by email"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:157
+msgid "Invite by link"
+msgstr ""
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:167
+msgid "Invite by Link"
+msgstr ""
+
+#: src/pages/onboarding/InviteTeam.tsx:152
+msgid "Invite link sent to email addresses"
+msgstr ""
+
+#: src/pages/onboarding/InviteTeam.tsx:181
+msgid "Invite your team"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:74
+msgid "Italian"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:51
+msgid "Language"
+msgstr ""
+
+#: src/pages/onboarding/InviteTeam.tsx:127
+msgid "Link copied to clipboard"
+msgstr ""
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:206
+msgid "Log out"
+msgstr ""
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:209
+msgid "Logout"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:167
+msgid "Manage Members"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:168
+msgid "Manage the members of your space here"
+msgstr ""
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:57
+msgid "Manage your internet accounts."
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:144
+msgid "Manage your subscription"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:143
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:149
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:143
+msgid "Members"
+msgstr ""
+
+#: src/pages/settings/crm-migration/SettingsCRMMigration.tsx:22
+#: src/pages/settings/crm-migration/SettingsCRMMigration.tsx:28
+#~ msgid "Migrate"
+#~ msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:177
+#: src/pages/settings/SettingsWorkspace.tsx:44
+#: src/pages/settings/SettingsProfile.tsx:35
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:106
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:211
+#: src/modules/settings/workspace/components/NameField.tsx:91
+msgid "Name"
+msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:106
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:211
+msgid "Name of your API key"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspace.tsx:44
+msgid "Name of your workspace"
+msgstr ""
+
+#: src/modules/command-menu/components/CommandMenu.tsx:125
+msgid "Navigate"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:79
+msgid "New"
+msgstr ""
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:10
+msgid "New account"
+msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:82
+msgid "New key"
+msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:92
+msgid "New Key"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:69
+msgid "New Object"
+msgstr ""
+
+#: src/pages/auth/PasswordReset.tsx:233
+msgid "New Password"
+msgstr ""
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:81
+msgid "New Webhook"
+msgstr ""
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:46
+msgid "No connected account"
+msgstr ""
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:108
+msgid "not allowed"
+msgstr ""
+
+#: src/modules/command-menu/components/CommandMenu.tsx:141
+msgid "Notes"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:46
+#~ msgid "Object created successfully"
+#~ msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:160
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:179
+#: src/pages/settings/data-model/SettingsNewObject.tsx:76
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:205
+msgid "Objects"
+msgstr ""
+
+#: src/pages/not-found/NotFound.tsx:47
+msgid "Off the beaten path"
+msgstr ""
+
+#: src/modules/command-menu/components/CommandMenu.tsx:137
+msgid "Opportunities"
+msgstr ""
+
+#: src/pages/onboarding/InviteTeam.tsx:213
+msgid "or"
+msgstr ""
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:195
+msgid "Other"
+msgstr ""
+
+#: src/pages/not-found/NotFound.tsx:41
+msgid "Page Not Found"
+msgstr ""
+
+#: src/pages/not-found/NotFound.tsx:41
+#~ msgid "Page Not Found | Twenty"
+#~ msgstr ""
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:156
+msgid "Password"
+msgstr ""
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:34
+msgid "Password reset link has been sent to the email"
+msgstr ""
+
+#: src/modules/command-menu/components/CommandMenu.tsx:129
+msgid "People"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspace.tsx:40
+#: src/pages/settings/SettingsProfile.tsx:30
+msgid "Picture"
+msgstr ""
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:102
+msgid "Please enter a valid URL"
+msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:258
+msgid "Please type \"{confirmationValue}\" to confirm you want to delete this API Key. Be aware that any script using this key will stop working."
+msgstr ""
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:358
+msgid "Please type {confirmationText} to confirm you want to delete this webhook."
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:62
+msgid "Portuguese"
+msgstr ""
+
+#: src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx:62
+#: src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx:30
+msgid "Preview"
+msgstr ""
+
+#: src/pages/settings/SettingsProfile.tsx:19
+#: src/pages/settings/SettingsProfile.tsx:25
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:103
+msgid "Profile"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:97
+msgid "Pseudo-English"
+msgstr ""
+
+#: src/modules/settings/developers/components/SettingsReadDocumentationButton.tsx:9
+msgid "Read documentation"
+msgstr ""
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:53
+msgid "Receive an email containing password update link"
+msgstr ""
+
+#: src/modules/command-menu/components/CommandMenu.tsx:109
+msgid "Record Selection"
+msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:191
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:273
+msgid "Regenerate an API key"
+msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:282
+msgid "Regenerate key"
+msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:195
+msgid "Regenerate Key"
+msgstr ""
+
+#: src/pages/settings/Releases.tsx:111
+#: src/pages/settings/Releases.tsx:117
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:204
+msgid "Releases"
+msgstr ""
+
+#: src/modules/ui/input/components/ImageInput.tsx:173
+msgid "Remove"
+msgstr ""
+
+#: src/pages/auth/PasswordReset.tsx:177
+msgid "Reset Password"
+msgstr ""
+
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:44
+#: src/modules/navigation/components/MainNavigationDrawerItems.tsx:50
+msgid "Search"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:183
+msgid "Search a field..."
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:116
+msgid "Search an index..."
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:171
+#~ msgid "Search an object..."
+#~ msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:171
+msgid "Search for an object..."
+msgstr ""
+
+#: src/pages/settings/security/SettingsSecurity.tsx:33
+#: src/pages/settings/security/SettingsSecurity.tsx:40
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:166
+msgid "Security"
+msgstr ""
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:266
+msgid "Select the events you wish to send to this endpoint"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:52
+msgid "Select your preferred language"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:245
+msgid "Send an invite email to your team"
+msgstr ""
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:198
+msgid "Server Admin Panel"
+msgstr ""
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:46
+msgid "Set email visibility, manage your blocklist and more."
+msgstr ""
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:151
+msgid "Set the name of your subdomain"
+msgstr ""
+
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:50
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:33
+#: src/modules/navigation/components/MainNavigationDrawerItems.tsx:56
+msgid "Settings"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:158
+msgid "Share this link to invite users to join your workspace"
+msgstr ""
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:212
+msgid "Should changing a field's label also change the API name?"
+msgstr ""
+
+#: src/pages/onboarding/InviteTeam.tsx:236
+msgid "Skip"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:78
+msgid "Spanish"
+msgstr ""
+
+#: src/pages/settings/security/SettingsSecurity.tsx:47
+msgid "SSO"
+msgstr ""
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:107
+msgid "Subdomain already taken"
+msgstr ""
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:49
+msgid "Subdomain can not be longer than 30 characters"
+msgstr ""
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:48
+msgid "Subdomain can not be shorter than 3 characters"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:113
+#~ msgid "Subscription has been switched {0}"
+#~ msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:117
+msgid "Subscription has been switched {to}"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspace.tsx:63
+msgid "Support"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:157
+#~ msgid "Switch {2}"
+#~ msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:161
+#~ msgid "Switch {3}"
+#~ msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:158
+msgid "Switch {from}"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:162
+msgid "Switch {to}"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:187
+#~ msgid "Switch billing {4}"
+#~ msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:188
+msgid "Switch billing {to}"
+msgstr ""
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:211
+msgid "Synchronize Field Label and API Name"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx:42
+msgid "System settings - {systemDateFormatLabel}"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:55
+msgid "System Settings - {systemTimeFormatLabel}"
+msgstr ""
+
+#: src/modules/command-menu/components/CommandMenu.tsx:145
+msgid "Tasks"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:240
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:267
+msgid "The description of this field"
+msgstr ""
+
+#: src/pages/settings/SettingsProfile.tsx:43
+msgid "The email associated to your account"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:209
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:240
+msgid "The name and icon of this field"
+msgstr ""
+
+#: src/pages/not-found/NotFound.tsx:50
+msgid "The page you're seeking is either gone or never was. Let's get you back on track"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:229
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:252
+msgid "The values of this field"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:224
+msgid "The values of this field must be unique"
+msgstr ""
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:38
+msgid "There was an issue"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:323
+#~ msgid "This action cannot be undone. This will permanently delete this user and remove them from all their assignements."
+#~ msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:323
+msgid "This action cannot be undone. This will permanently delete this user and remove them from all their assignments."
+msgstr ""
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:48
+msgid "This action cannot be undone. This will permanently delete your entire workspace. <0/> Please type in your email to confirm."
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:49
+msgid "Time format"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:51
+msgid "to monthly"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:44
+msgid "to yearly"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:55
+msgid "Type"
+msgstr ""
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:88
+msgid "Unlimited contacts"
+msgstr ""
+
+#: src/modules/ui/input/components/ImageInput.tsx:165
+msgid "Upload"
+msgstr ""
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:100
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:242
+msgid "URL"
+msgstr ""
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:51
+msgid "Use letter, number and dash only. Start and finish with a letter or a number"
+msgstr ""
+
+#: src/pages/settings/SettingsProfile.tsx:22
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:29
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:17
+#: src/pages/settings/accounts/SettingsAccounts.tsx:43
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:101
+msgid "User"
+msgstr ""
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:51
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:106
+msgid "User is not logged in"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:223
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:228
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:251
+msgid "Values"
+msgstr ""
+
+#: src/modules/command-menu/components/CommandMenu.tsx:117
+msgid "View"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:149
+msgid "View billing details"
+msgstr ""
+
+#: src/modules/settings/data-model/objects/components/SettingsObjectCoverImage.tsx:35
+msgid "Visualize"
+msgstr ""
+
+#: src/modules/ui/input/components/ImageInput.tsx:178
+msgid "We support your square PNGs, JPEGs and GIFs under 10MB"
+msgstr ""
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:97
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:239
+msgid "We will send POST requests to this endpoint for every new event"
+msgstr ""
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:223
+msgid "Webhook"
+msgstr ""
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:65
+msgid "Webhooks"
+msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:127
+msgid "When the API key will expire."
+msgstr ""
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:222
+msgid "When the key will be disabled"
+msgstr ""
+
+#: src/modules/command-menu/components/CommandMenu.tsx:113
+msgid "Workflow Record Selection"
+msgstr ""
+
+#: src/modules/command-menu/components/CommandMenu.tsx:121
+msgid "Workflows"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:146
+#: src/pages/settings/SettingsWorkspace.tsx:32
+#: src/pages/settings/SettingsBilling.tsx:132
+#: src/pages/settings/Releases.tsx:114
+#: src/pages/settings/workspace/SettingsDomain.tsx:128
+#: src/pages/settings/security/SettingsSecurity.tsx:37
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:18
+#: src/pages/settings/developers/SettingsDevelopers.tsx:39
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:74
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:216
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:85
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:167
+#: src/pages/settings/data-model/SettingsObjects.tsx:157
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:175
+#: src/pages/settings/data-model/SettingsNewObject.tsx:72
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:201
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:58
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:136
+msgid "Workspace"
+msgstr ""
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:46
+msgid "Workspace Deletion"
+msgstr ""
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:254
+msgid "Write a description"
+msgstr ""
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:209
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:158
+msgid "yes"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:46
+msgid "You will be charged immediately for the full year."
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:53
+msgid "Your credit balance will be used to pay the monthly bills."
+msgstr ""
+
+#: src/pages/settings/SettingsProfile.tsx:36
+msgid "Your name as it will be displayed"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:171
+msgid "Your workspace will be disabled"
+msgstr ""
diff --git a/packages/twenty-front/src/locales/pt.po b/packages/twenty-front/src/locales/pt.po
new file mode 100644
index 000000000000..dee4edbd41b6
--- /dev/null
+++ b/packages/twenty-front/src/locales/pt.po
@@ -0,0 +1,1147 @@
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2025-01-21 13:07+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: @lingui/cli\n"
+"Language: pt\n"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:92
+msgid "1 000 workflow node executions"
+msgstr "1 000 execuções de nós de fluxo de trabalho"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:63
+msgid "12h ({hour12Label})"
+msgstr "12h ({hour12Label})"
+
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:198
+msgid "2. Configure field"
+msgstr "2. Configurar campo"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:59
+msgid "24h ({hour24Label})"
+msgstr "24h ({hour24Label})"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:91
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:179
+msgid "API & Webhooks"
+msgstr "API e Webhooks"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:182
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:190
+msgid "API Key"
+msgstr "Chave API"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:166
+msgid "API Name"
+msgstr "Nome da API"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:49
+msgid "API keys"
+msgstr "Chaves API"
+
+#: src/modules/ui/input/components/ImageInput.tsx:157
+msgid "Abort"
+msgstr "Abortar"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:93
+msgid "About"
+msgstr "Sobre"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:40
+#: src/pages/settings/accounts/SettingsAccounts.tsx:46
+msgid "Account"
+msgstr "Conta"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:321
+#: src/modules/settings/profile/components/DeleteAccount.tsx:45
+msgid "Account Deletion"
+msgstr "Eliminação da conta"
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:21
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:114
+msgid "Accounts"
+msgstr "Contas"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:259
+msgid "Activate"
+msgstr "Ativar"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:193
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:201
+msgid "Active"
+msgstr "Ativo"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:50
+msgid "Active API keys created by you or your team."
+msgstr "Chaves de API activas criadas por si ou pela sua equipa."
+
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:39
+msgid "Add Field"
+msgstr "Adicionar campo"
+
+#: src/modules/settings/security/components/SettingsSSOIdentitiesProvidersListCard.tsx:59
+msgid "Add SSO Identity Provider"
+msgstr "Adicionar fornecedor de identidade SSO"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:149
+msgid "Add object"
+msgstr "Adicionar objeto"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:105
+msgid "Add to blocklist"
+msgstr "Adicionar à lista de bloqueio"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:135
+msgid "Allow logins through Google's single sign-on functionality."
+msgstr "Permitir logins através da funcionalidade de início de sessão único do Google."
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:146
+msgid "Allow logins through Microsoft's single sign-on functionality."
+msgstr "Permitir inícios de sessão através da funcionalidade de início de sessão único da Microsoft."
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:168
+msgid "Allow the invitation of new users by sharing an invite link."
+msgstr "Permitir o convite de novos utilizadores através da partilha de uma ligação de convite."
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:157
+msgid "Allow users to sign in with an email and password."
+msgstr "Permitir que os utilizadores iniciem sessão com um e-mail e uma palavra-passe."
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:251
+msgid "An optional description"
+msgstr "Uma descrição opcional"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:37
+msgid "Appearance"
+msgstr "Aparência"
+
+#: src/pages/settings/SettingsBilling.tsx:190
+msgid "Are you sure that you want to change your billing interval?"
+msgstr "Tem a certeza de que pretende alterar o seu intervalo de faturação?"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:73
+msgid "At least one authentication method must be enabled"
+msgstr "Pelo menos um método de autenticação deve estar ativado"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:63
+msgid "Authentication"
+msgstr "Autenticação"
+
+#: src/pages/auth/Authorize.tsx:127
+msgid "Authorize"
+msgstr "Autorizar"
+
+#: src/pages/not-found/NotFound.tsx:58
+msgid "Back to content"
+msgstr "Voltar ao conteúdo"
+
+#: src/pages/settings/SettingsBilling.tsx:129
+#: src/pages/settings/SettingsBilling.tsx:135
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:149
+msgid "Billing"
+msgstr "Faturação"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx:46
+msgid "Blocklist"
+msgstr "Lista de bloqueios"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:210
+msgid "Book a Call"
+msgstr "Marcar uma chamada"
+
+#: src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx:72
+msgid "Calculate"
+msgstr "Calcular"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:57
+msgid "Calendar"
+msgstr "Calendário"
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:14
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:24
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:78
+msgid "Calendars"
+msgstr "Calendários"
+
+#: src/pages/auth/Authorize.tsx:124
+#: src/modules/ui/layout/modal/components/ConfirmationModal.tsx:151
+#: src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx:198
+#: src/modules/settings/components/SaveAndCancelButtons/CancelButton.tsx:16
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/pages/settings/SettingsBilling.tsx:175
+msgid "Cancel Plan"
+msgstr "Cancelar plano"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:152
+msgid "Cancel anytime"
+msgstr "Cancelar a qualquer momento"
+
+#: src/pages/settings/SettingsBilling.tsx:170
+msgid "Cancel your subscription"
+msgstr "Cancelar a sua subscrição"
+
+#: src/pages/auth/PasswordReset.tsx:246
+#: src/modules/settings/profile/components/ChangePassword.tsx:52
+#: src/modules/settings/profile/components/ChangePassword.tsx:58
+msgid "Change Password"
+msgstr "Alterar a palavra-passe"
+
+#: src/pages/settings/SettingsBilling.tsx:194
+msgid "Change {to}"
+msgstr "Alterar {to}"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:86
+msgid "Chinese — Simplified"
+msgstr "Chinês - Simplificado"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:90
+msgid "Chinese — Traditional"
+msgstr "Chinês - Tradicional"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:281
+msgid "Choose an object"
+msgstr "Escolher um objeto"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:147
+msgid "Choose your Trial"
+msgstr "Escolha o seu teste"
+
+#: src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx:201
+msgid "Close"
+msgstr "Fechar"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:133
+msgid "Companies"
+msgstr "Empresas"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:48
+msgid "Configure an SSO connection"
+msgstr "Configurar uma ligação SSO"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:58
+msgid "Configure and customize your calendar preferences."
+msgstr "Configure e personalize as suas preferências de calendário."
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:43
+msgid "Configure how dates are displayed across the app"
+msgstr "Configurar a forma como as datas são apresentadas na aplicação"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:34
+msgid "Configure your emails and calendar settings."
+msgstr "Configurar as definições de correio eletrónico e calendário."
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:13
+msgid "Connect a Google account"
+msgstr "Ligar uma conta Google"
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:11
+msgid "Connect a new account to your workspace"
+msgstr "Ligar uma nova conta ao seu espaço de trabalho"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:51
+msgid "Connect with Google"
+msgstr "Ligar ao Google"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:59
+msgid "Connect with Microsoft"
+msgstr "Ligar à Microsoft"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:56
+msgid "Connected accounts"
+msgstr "Contas ligadas"
+
+#: src/pages/onboarding/InviteTeam.tsx:228
+#: src/pages/onboarding/ChooseYourPlan.tsx:198
+msgid "Continue"
+msgstr "Continuar"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:105
+msgid "Copilot"
+msgstr "Copiloto"
+
+#: src/pages/onboarding/InviteTeam.tsx:217
+msgid "Copy invitation link"
+msgstr "Copiar a hiperligação do convite"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:183
+msgid "Copy this key as it will not be visible again"
+msgstr "Copiar esta chave, uma vez que não voltará a ser visível"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:56
+msgid "Create API key"
+msgstr "Criar chave API"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:72
+msgid "Create Webhook"
+msgstr "Criar Webhook"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:149
+msgid "Custom Objects"
+msgstr "Objectos personalizados"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:90
+msgid "Custom objects"
+msgstr "Objectos personalizados"
+
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:28
+msgid "Customise the fields available in the {objectLabelSingular} views."
+msgstr "Personalizar os campos disponíveis nas vistas {objectLabelSingular}."
+
+#: src/pages/settings/SettingsWorkspace.tsx:56
+msgid "Customize Domain"
+msgstr "Personalizar domínio"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:64
+msgid "Customize your workspace security"
+msgstr "Personalize a segurança do seu espaço de trabalho"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:341
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:237
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:250
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:30
+#: src/modules/settings/profile/components/DeleteAccount.tsx:29
+msgid "Danger zone"
+msgstr "Zona de perigo"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:144
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:155
+msgid "Data model"
+msgstr "Modelo de dados"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:42
+msgid "Date and time"
+msgstr "Data e hora"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:259
+msgid "Deactivate"
+msgstr "Desativar"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:105
+msgid "Deactivate \"Synchronize Objects Labels and API Names\" to set a custom API name"
+msgstr "Desativar \"Sincronizar etiquetas de objectos e nomes de API\" para definir um nome de API personalizado"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:251
+msgid "Deactivate this field"
+msgstr "Desativar este campo"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:94
+msgid "Define the name and description of your object"
+msgstr "Definir o nome e a descrição do seu objeto"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:347
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:243
+msgid "Delete"
+msgstr "Eliminar"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:256
+msgid "Delete API key"
+msgstr "Eliminar a chave API"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:332
+#: src/modules/settings/profile/components/DeleteAccount.tsx:37
+#: src/modules/settings/profile/components/DeleteAccount.tsx:53
+msgid "Delete account"
+msgstr "Eliminar a conta"
+
+#: src/modules/settings/profile/components/DeleteAccount.tsx:30
+msgid "Delete account and all the associated data"
+msgstr "Eliminar a conta e todos os dados associados"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:342
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:238
+msgid "Delete this integration"
+msgstr "Eliminar esta integração"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:356
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:364
+msgid "Delete webhook"
+msgstr "Eliminar webhook"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:36
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:54
+msgid "Delete workspace"
+msgstr "Eliminar espaço de trabalho"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:31
+msgid "Delete your whole workspace"
+msgstr "Eliminar todo o seu espaço de trabalho"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:250
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:239
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:266
+msgid "Description"
+msgstr "Descrição"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:35
+#: src/pages/settings/developers/SettingsDevelopers.tsx:42
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:78
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:220
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:89
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:171
+msgid "Developers"
+msgstr "Programadores"
+
+#: src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx:48
+msgid "Display as relative date"
+msgstr "Exibir como data relativa"
+
+#: src/pages/settings/SettingsWorkspace.tsx:51
+#: src/pages/settings/workspace/SettingsDomain.tsx:125
+#: src/pages/settings/workspace/SettingsDomain.tsx:135
+#: src/pages/settings/workspace/SettingsDomain.tsx:150
+msgid "Domain"
+msgstr "Domínio"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:108
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:225
+msgid "E.g. backoffice integration"
+msgstr "Por exemplo, integração de backoffice"
+
+#: src/pages/settings/SettingsBilling.tsx:157
+msgid "Edit billing interval"
+msgstr "Editar intervalo de faturação"
+
+#: src/pages/settings/SettingsBilling.tsx:145
+msgid "Edit payment method, see your invoices and more"
+msgstr "Editar o método de pagamento, ver as suas facturas e muito mais"
+
+#: src/pages/settings/SettingsWorkspace.tsx:52
+msgid "Edit your subdomain name or set a custom domain."
+msgstr "Edite o nome do seu subdomínio ou defina um domínio personalizado."
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:180
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:256
+#: src/pages/settings/SettingsProfile.tsx:42
+#: src/pages/auth/PasswordReset.tsx:206
+msgid "Email"
+msgstr "Correio eletrónico"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:89
+msgid "Email integration"
+msgstr "Integração de correio eletrónico"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:55
+msgid "Email or domain is already in blocklist"
+msgstr "O e-mail ou domínio já está na lista de bloqueio"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:72
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:45
+msgid "Emails"
+msgstr "Emails"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:137
+msgid "Employees"
+msgstr "Empregados"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:96
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:238
+msgid "Endpoint URL"
+msgstr "URL do ponto final"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:82
+msgid "English"
+msgstr "Inglês"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:157
+msgid "Enjoy a {withCreditCardTrialPeriodDuration}-days free trial"
+msgstr "Desfrute de um período experimental gratuito de {withCreditCardTrialPeriodDuration}-dias"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:51
+msgid "Enterprise"
+msgstr "Empresa"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:98
+msgid "Error deleting api key: {err}"
+msgstr "Erro ao eliminar a chave api: {err}"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:150
+msgid "Error regenerating api key: {err}"
+msgstr "Erro ao regenerar a chave api: {err}"
+
+#: src/pages/settings/SettingsBilling.tsx:121
+msgid "Error while switching subscription {to}."
+msgstr "Erro ao mudar de subscrição {to}."
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:66
+msgid "Establish Webhook endpoints for notifications on asynchronous events."
+msgstr "Estabelecer pontos de extremidade Webhook para notificações sobre eventos assíncronos."
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx:47
+msgid "Exclude the following people and domains from my email sync"
+msgstr "Excluir as seguintes pessoas e domínios da minha sincronização de correio eletrónico"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:167
+msgid "Existing objects"
+msgstr "Objectos existentes"
+
+#: src/modules/navigation/components/AppNavigationDrawer.tsx:36
+msgid "Exit Settings"
+msgstr "Sair das definições"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:26
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:32
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:108
+msgid "Experience"
+msgstr "Experiência"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:221
+msgid "Expiration"
+msgstr "Prazo de validade"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:126
+msgid "Expiration Date"
+msgstr "Data de expiração"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:259
+msgid "Expires in"
+msgstr "Expira em"
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:42
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:27
+msgid "Fields"
+msgstr "Campos"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:265
+msgid "Filters"
+msgstr "Filtros"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:66
+msgid "French"
+msgstr "Francês"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:87
+msgid "Full access"
+msgstr "Acesso total"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:187
+msgid "Functions"
+msgstr "Funções"
+
+#: src/pages/settings/SettingsWorkspace.tsx:29
+#: src/pages/settings/SettingsWorkspace.tsx:35
+#: src/pages/settings/workspace/SettingsDomain.tsx:132
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:138
+msgid "General"
+msgstr "Geral"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:70
+msgid "German"
+msgstr "Alemão"
+
+#: src/pages/onboarding/InviteTeam.tsx:184
+msgid "Get the most out of your workspace by inviting your team."
+msgstr "Tire o máximo partido do seu espaço de trabalho convidando a sua equipa."
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:148
+msgid "Get your subscription"
+msgstr "Obter a sua subscrição"
+
+#: src/pages/settings/SettingsWorkspace.tsx:65
+msgid "Grant Twenty support temporary access to your workspace so we can troubleshoot problems or recover content on your behalf. You can revoke access at any time."
+msgstr "Conceda ao suporte do Twenty acesso temporário ao seu espaço de trabalho para que possamos solucionar problemas ou recuperar conteúdo em seu nome. Pode revogar o acesso em qualquer altura."
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:208
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:239
+msgid "Icon and Name"
+msgstr "Ícone e nome"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:275
+msgid "If you’ve lost this key, you can regenerate it, but be aware that any script using this key will need to be updated. Please type\"{confirmationValue}\" to confirm."
+msgstr "Se perdeu esta chave, pode regenerá-la, mas tenha em atenção que qualquer script que utilize esta chave terá de ser atualizado. Digite\"{confirmationValue}\" para confirmar."
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:218
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:215
+msgid "Inactive"
+msgstr "Inativo"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:106
+msgid "Input must be in camel case and cannot start with a number"
+msgstr "A entrada deve estar em maiúsculas e minúsculas e não pode começar com um número"
+
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:15
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:21
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:160
+msgid "Integrations"
+msgstr "Integrações"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:57
+msgid "Invalid auth provider"
+msgstr "Fornecedor de autenticação inválido"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:21
+msgid "Invalid email"
+msgstr "Correio eletrónico inválido"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:44
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:50
+msgid "Invalid email or domain"
+msgstr "Correio eletrónico ou domínio inválido"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:87
+msgid "Invalid form values"
+msgstr "Valores de formulário inválidos"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:167
+msgid "Invite by Link"
+msgstr "Convidar por ligação"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:244
+msgid "Invite by email"
+msgstr "Convite por correio eletrónico"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:157
+msgid "Invite by link"
+msgstr "Convidar por ligação"
+
+#: src/pages/onboarding/InviteTeam.tsx:152
+msgid "Invite link sent to email addresses"
+msgstr "Ligação de convite enviada para endereços de correio eletrónico"
+
+#: src/pages/onboarding/InviteTeam.tsx:181
+msgid "Invite your team"
+msgstr "Convide a sua equipa"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:74
+msgid "Italian"
+msgstr "Italiano"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:51
+msgid "Language"
+msgstr "Língua"
+
+#: src/pages/onboarding/InviteTeam.tsx:127
+msgid "Link copied to clipboard"
+msgstr "Ligação copiada para a área de transferência"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:206
+msgid "Log out"
+msgstr "Terminar sessão"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:209
+msgid "Logout"
+msgstr "Terminar sessão"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:167
+msgid "Manage Members"
+msgstr "Gerir membros"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:168
+msgid "Manage the members of your space here"
+msgstr "Gerir os membros do seu espaço aqui"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:57
+msgid "Manage your internet accounts."
+msgstr "Gerir as suas contas de Internet."
+
+#: src/pages/settings/SettingsBilling.tsx:144
+msgid "Manage your subscription"
+msgstr "Gerir a sua subscrição"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:143
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:149
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:143
+msgid "Members"
+msgstr "Membros"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:177
+#: src/pages/settings/SettingsWorkspace.tsx:44
+#: src/pages/settings/SettingsProfile.tsx:35
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:106
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:211
+#: src/modules/settings/workspace/components/NameField.tsx:91
+msgid "Name"
+msgstr "Nome"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:106
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:211
+msgid "Name of your API key"
+msgstr "Nome da sua chave API"
+
+#: src/pages/settings/SettingsWorkspace.tsx:44
+msgid "Name of your workspace"
+msgstr "Nome do seu espaço de trabalho"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:125
+msgid "Navigate"
+msgstr "Navegar"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:79
+msgid "New"
+msgstr "Novo"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:92
+msgid "New Key"
+msgstr "Nova chave"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:69
+msgid "New Object"
+msgstr "Novo objeto"
+
+#: src/pages/auth/PasswordReset.tsx:233
+msgid "New Password"
+msgstr "Nova palavra-passe"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:81
+msgid "New Webhook"
+msgstr "Novo Webhook"
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:10
+msgid "New account"
+msgstr "Nova conta"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:82
+msgid "New key"
+msgstr "Nova chave"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:46
+msgid "No connected account"
+msgstr "Nenhuma conta ligada"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:141
+msgid "Notes"
+msgstr "Notas"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:160
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:179
+#: src/pages/settings/data-model/SettingsNewObject.tsx:76
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:205
+msgid "Objects"
+msgstr "Objectos"
+
+#: src/pages/not-found/NotFound.tsx:47
+msgid "Off the beaten path"
+msgstr "Fora do caminho tradicional"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:137
+msgid "Opportunities"
+msgstr "Oportunidades"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:195
+msgid "Other"
+msgstr "Outros"
+
+#: src/pages/not-found/NotFound.tsx:41
+msgid "Page Not Found"
+msgstr "Página não encontrada"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:156
+msgid "Password"
+msgstr "Palavra-passe"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:34
+msgid "Password reset link has been sent to the email"
+msgstr "A ligação de reposição da palavra-passe foi enviada para o e-mail"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:129
+msgid "People"
+msgstr "Pessoas"
+
+#: src/pages/settings/SettingsWorkspace.tsx:40
+#: src/pages/settings/SettingsProfile.tsx:30
+msgid "Picture"
+msgstr "Imagem"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:102
+msgid "Please enter a valid URL"
+msgstr "Introduzir um URL válido"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:258
+msgid "Please type \"{confirmationValue}\" to confirm you want to delete this API Key. Be aware that any script using this key will stop working."
+msgstr "Digite \"{confirmationValue}\" para confirmar que deseja excluir essa chave de API. Tenha em atenção que qualquer script que utilize esta chave deixará de funcionar."
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:358
+msgid "Please type {confirmationText} to confirm you want to delete this webhook."
+msgstr "Introduza {confirmationText} para confirmar que pretende eliminar este webhook."
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:62
+msgid "Portuguese"
+msgstr "Português"
+
+#: src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx:62
+#: src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx:30
+msgid "Preview"
+msgstr "Pré-visualização"
+
+#: src/pages/settings/SettingsProfile.tsx:19
+#: src/pages/settings/SettingsProfile.tsx:25
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:103
+msgid "Profile"
+msgstr "Perfil"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:97
+msgid "Pseudo-English"
+msgstr "Pseudo-inglês"
+
+#: src/modules/settings/developers/components/SettingsReadDocumentationButton.tsx:9
+msgid "Read documentation"
+msgstr "Ler a documentação"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:53
+msgid "Receive an email containing password update link"
+msgstr "Receber uma mensagem de correio eletrónico com uma ligação para atualização da palavra-passe"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:109
+msgid "Record Selection"
+msgstr "Seleção de registos"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:195
+msgid "Regenerate Key"
+msgstr "Regenerar chave"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:191
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:273
+msgid "Regenerate an API key"
+msgstr "Regenerar uma chave API"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:282
+msgid "Regenerate key"
+msgstr "Regenerar chave"
+
+#: src/pages/settings/Releases.tsx:111
+#: src/pages/settings/Releases.tsx:117
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:204
+msgid "Releases"
+msgstr "Lançamentos"
+
+#: src/modules/ui/input/components/ImageInput.tsx:173
+msgid "Remove"
+msgstr "Remover"
+
+#: src/pages/auth/PasswordReset.tsx:177
+msgid "Reset Password"
+msgstr "Repor a palavra-passe"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:47
+msgid "SSO"
+msgstr "SSO"
+
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:44
+#: src/modules/navigation/components/MainNavigationDrawerItems.tsx:50
+msgid "Search"
+msgstr "Pesquisar"
+
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:183
+msgid "Search a field..."
+msgstr "Pesquisar um campo..."
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:116
+msgid "Search an index..."
+msgstr "Pesquisar um índice..."
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:171
+msgid "Search for an object..."
+msgstr "Procurar um objeto..."
+
+#: src/pages/settings/security/SettingsSecurity.tsx:33
+#: src/pages/settings/security/SettingsSecurity.tsx:40
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:166
+msgid "Security"
+msgstr "Segurança"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:266
+msgid "Select the events you wish to send to this endpoint"
+msgstr "Selecione os eventos que pretende enviar para este ponto final"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:52
+msgid "Select your preferred language"
+msgstr "Selecione a sua língua preferida"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:245
+msgid "Send an invite email to your team"
+msgstr "Enviar um convite por correio eletrónico à sua equipa"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:198
+msgid "Server Admin Panel"
+msgstr "Painel de administração do servidor"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:46
+msgid "Set email visibility, manage your blocklist and more."
+msgstr "Defina a visibilidade do correio eletrónico, gira a sua lista de bloqueio e muito mais."
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:151
+msgid "Set the name of your subdomain"
+msgstr "Defina o nome do seu subdomínio"
+
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:50
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:33
+#: src/modules/navigation/components/MainNavigationDrawerItems.tsx:56
+msgid "Settings"
+msgstr "Definições"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:158
+msgid "Share this link to invite users to join your workspace"
+msgstr "Partilhe esta ligação para convidar utilizadores a juntarem-se ao seu espaço de trabalho"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:212
+msgid "Should changing a field's label also change the API name?"
+msgstr "A alteração do rótulo de um campo deve também alterar o nome da API?"
+
+#: src/pages/onboarding/InviteTeam.tsx:236
+msgid "Skip"
+msgstr "Saltar"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:78
+msgid "Spanish"
+msgstr "Espanhol"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:107
+msgid "Subdomain already taken"
+msgstr "Subdomínio já ocupado"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:49
+msgid "Subdomain can not be longer than 30 characters"
+msgstr "O subdomínio não pode ter mais de 30 caracteres"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:48
+msgid "Subdomain can not be shorter than 3 characters"
+msgstr "O subdomínio não pode ter menos de 3 caracteres"
+
+#: src/pages/settings/SettingsBilling.tsx:117
+msgid "Subscription has been switched {to}"
+msgstr "A subscrição foi mudada {to}"
+
+#: src/pages/settings/SettingsWorkspace.tsx:63
+msgid "Support"
+msgstr "Apoio"
+
+#: src/pages/settings/SettingsBilling.tsx:188
+msgid "Switch billing {to}"
+msgstr "Mudar a faturação {to}"
+
+#: src/pages/settings/SettingsBilling.tsx:158
+msgid "Switch {from}"
+msgstr "Comutador {from}"
+
+#: src/pages/settings/SettingsBilling.tsx:162
+msgid "Switch {to}"
+msgstr "Comutador {to}"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:211
+msgid "Synchronize Field Label and API Name"
+msgstr "Sincronizar a etiqueta do campo e o nome da API"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:55
+msgid "System Settings - {systemTimeFormatLabel}"
+msgstr "Definições do sistema - {systemTimeFormatLabel}"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx:42
+msgid "System settings - {systemDateFormatLabel}"
+msgstr "Definições do sistema - {systemDateFormatLabel}"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:145
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:240
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:267
+msgid "The description of this field"
+msgstr "A descrição deste campo"
+
+#: src/pages/settings/SettingsProfile.tsx:43
+msgid "The email associated to your account"
+msgstr "O correio eletrónico associado à sua conta"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:209
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:240
+msgid "The name and icon of this field"
+msgstr "O nome e o ícone deste campo"
+
+#: src/pages/not-found/NotFound.tsx:50
+msgid "The page you're seeking is either gone or never was. Let's get you back on track"
+msgstr "A página que procura desapareceu ou nunca existiu. Vamos voltar a pô-lo no caminho certo"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:229
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:252
+msgid "The values of this field"
+msgstr "Os valores deste campo"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:224
+msgid "The values of this field must be unique"
+msgstr "Os valores deste campo devem ser únicos"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:38
+msgid "There was an issue"
+msgstr "Houve um problema"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:323
+msgid "This action cannot be undone. This will permanently delete this user and remove them from all their assignments."
+msgstr "Esta ação não pode ser anulada. Esta ação elimina permanentemente este utilizador e retira-o de todas as suas tarefas."
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:48
+msgid "This action cannot be undone. This will permanently delete your entire workspace. <0/> Please type in your email to confirm."
+msgstr "Esta ação não pode ser anulada. Esta ação eliminará permanentemente todo o seu espaço de trabalho. <0/> Introduza o seu e-mail para confirmar."
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:49
+msgid "Time format"
+msgstr "Formato da hora"
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:55
+msgid "Type"
+msgstr "Tipo"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:100
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:242
+msgid "URL"
+msgstr "URL"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:88
+msgid "Unlimited contacts"
+msgstr "Contactos ilimitados"
+
+#: src/modules/ui/input/components/ImageInput.tsx:165
+msgid "Upload"
+msgstr "Carregar"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:51
+msgid "Use letter, number and dash only. Start and finish with a letter or a number"
+msgstr "Utilizar apenas letras, números e traços. Comece e termine com uma letra ou um número"
+
+#: src/pages/settings/SettingsProfile.tsx:22
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:29
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:17
+#: src/pages/settings/accounts/SettingsAccounts.tsx:43
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:101
+msgid "User"
+msgstr "Utilizador"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:51
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:106
+msgid "User is not logged in"
+msgstr "O utilizador não tem sessão iniciada"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:223
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:228
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:251
+msgid "Values"
+msgstr "Valores"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:117
+msgid "View"
+msgstr "Ver"
+
+#: src/pages/settings/SettingsBilling.tsx:149
+msgid "View billing details"
+msgstr "Ver detalhes da faturação"
+
+#: src/modules/settings/data-model/objects/components/SettingsObjectCoverImage.tsx:35
+msgid "Visualize"
+msgstr "Visualizar"
+
+#: src/modules/ui/input/components/ImageInput.tsx:178
+msgid "We support your square PNGs, JPEGs and GIFs under 10MB"
+msgstr "Suportamos os seus PNGs, JPEGs e GIFs quadrados com menos de 10 MB"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:97
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:239
+msgid "We will send POST requests to this endpoint for every new event"
+msgstr "Enviaremos pedidos POST a este ponto final para cada novo evento"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:223
+msgid "Webhook"
+msgstr "Webhook"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:65
+msgid "Webhooks"
+msgstr "Webhooks"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:127
+msgid "When the API key will expire."
+msgstr "Quando é que a chave da API expira."
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:222
+msgid "When the key will be disabled"
+msgstr "Quando a tecla será desactivada"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:113
+msgid "Workflow Record Selection"
+msgstr "Seleção de registos de fluxo de trabalho"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:121
+msgid "Workflows"
+msgstr "Fluxos de trabalho"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:146
+#: src/pages/settings/SettingsWorkspace.tsx:32
+#: src/pages/settings/SettingsBilling.tsx:132
+#: src/pages/settings/Releases.tsx:114
+#: src/pages/settings/workspace/SettingsDomain.tsx:128
+#: src/pages/settings/security/SettingsSecurity.tsx:37
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:18
+#: src/pages/settings/developers/SettingsDevelopers.tsx:39
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:74
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:216
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:85
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:167
+#: src/pages/settings/data-model/SettingsObjects.tsx:157
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:175
+#: src/pages/settings/data-model/SettingsNewObject.tsx:72
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:201
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:58
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:136
+msgid "Workspace"
+msgstr "Espaço de trabalho"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:46
+msgid "Workspace Deletion"
+msgstr "Eliminação do espaço de trabalho"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:254
+msgid "Write a description"
+msgstr "Escrever uma descrição"
+
+#: src/pages/settings/SettingsBilling.tsx:46
+msgid "You will be charged immediately for the full year."
+msgstr "Ser-lhe-á cobrado imediatamente o valor total do ano."
+
+#: src/pages/settings/SettingsBilling.tsx:53
+msgid "Your credit balance will be used to pay the monthly bills."
+msgstr "O seu saldo de crédito será utilizado para pagar as facturas mensais."
+
+#: src/pages/settings/SettingsProfile.tsx:36
+msgid "Your name as it will be displayed"
+msgstr "O seu nome como será apresentado"
+
+#: src/pages/settings/SettingsBilling.tsx:171
+msgid "Your workspace will be disabled"
+msgstr "O seu espaço de trabalho será desativado"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:167
+msgid "employees"
+msgstr "empregados"
+
+#: src/pages/settings/SettingsBilling.tsx:45
+msgid "from monthly to yearly"
+msgstr "de mensal para anual"
+
+#: src/pages/settings/SettingsBilling.tsx:52
+msgid "from yearly to monthly"
+msgstr "de anual para mensal"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:108
+msgid "not allowed"
+msgstr "não autorizado"
+
+#: src/pages/onboarding/InviteTeam.tsx:213
+msgid "or"
+msgstr "ou"
+
+#: src/pages/settings/SettingsBilling.tsx:51
+msgid "to monthly"
+msgstr "ao mês"
+
+#: src/pages/settings/SettingsBilling.tsx:44
+msgid "to yearly"
+msgstr "a anual"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:209
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:158
+msgid "yes"
+msgstr "sim"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:174
+msgid "{apiKeyName} API Key"
+msgstr "{apiKeyName} Chave da API"
diff --git a/packages/twenty-front/src/locales/zh-Hans.po b/packages/twenty-front/src/locales/zh-Hans.po
new file mode 100644
index 000000000000..f55cb16c9bf4
--- /dev/null
+++ b/packages/twenty-front/src/locales/zh-Hans.po
@@ -0,0 +1,1147 @@
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2025-01-21 13:07+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: @lingui/cli\n"
+"Language: zh-Hans\n"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:92
+msgid "1 000 workflow node executions"
+msgstr "1 000 次工作流节点执行"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:63
+msgid "12h ({hour12Label})"
+msgstr "12h （[{hour12Label}）"
+
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:198
+msgid "2. Configure field"
+msgstr "2.配置字段"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:59
+msgid "24h ({hour24Label})"
+msgstr "24小时（[{hour24Label}）"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:91
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:179
+msgid "API & Webhooks"
+msgstr "应用程序接口和网络钩子"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:182
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:190
+msgid "API Key"
+msgstr "API 密钥"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:166
+msgid "API Name"
+msgstr "应用程序接口名称"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:49
+msgid "API keys"
+msgstr "API 密钥"
+
+#: src/modules/ui/input/components/ImageInput.tsx:157
+msgid "Abort"
+msgstr "中止"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:93
+msgid "About"
+msgstr "关于"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:40
+#: src/pages/settings/accounts/SettingsAccounts.tsx:46
+msgid "Account"
+msgstr "账户"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:321
+#: src/modules/settings/profile/components/DeleteAccount.tsx:45
+msgid "Account Deletion"
+msgstr "账户删除"
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:21
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:114
+msgid "Accounts"
+msgstr "账户"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:259
+msgid "Activate"
+msgstr "激活"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:193
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:201
+msgid "Active"
+msgstr "活跃"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:50
+msgid "Active API keys created by you or your team."
+msgstr "由您或您的团队创建的活动 API 密钥。"
+
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:39
+msgid "Add Field"
+msgstr "添加字段"
+
+#: src/modules/settings/security/components/SettingsSSOIdentitiesProvidersListCard.tsx:59
+msgid "Add SSO Identity Provider"
+msgstr "添加 SSO 身份供应商"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:149
+msgid "Add object"
+msgstr "添加对象"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:105
+msgid "Add to blocklist"
+msgstr "添加到拦截列表"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:135
+msgid "Allow logins through Google's single sign-on functionality."
+msgstr "允许通过 Google 的单点登录功能登录。"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:146
+msgid "Allow logins through Microsoft's single sign-on functionality."
+msgstr "允许通过微软的单点登录功能登录。"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:168
+msgid "Allow the invitation of new users by sharing an invite link."
+msgstr "允许通过共享邀请链接来邀请新用户。"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:157
+msgid "Allow users to sign in with an email and password."
+msgstr "允许用户使用电子邮件和密码登录。"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:251
+msgid "An optional description"
+msgstr "可选描述"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:37
+msgid "Appearance"
+msgstr "外观"
+
+#: src/pages/settings/SettingsBilling.tsx:190
+msgid "Are you sure that you want to change your billing interval?"
+msgstr "您确定要更改计费间隔吗？"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:73
+msgid "At least one authentication method must be enabled"
+msgstr "必须启用至少一种身份验证方法"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:63
+msgid "Authentication"
+msgstr "认证"
+
+#: src/pages/auth/Authorize.tsx:127
+msgid "Authorize"
+msgstr "授权"
+
+#: src/pages/not-found/NotFound.tsx:58
+msgid "Back to content"
+msgstr "返回内容"
+
+#: src/pages/settings/SettingsBilling.tsx:129
+#: src/pages/settings/SettingsBilling.tsx:135
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:149
+msgid "Billing"
+msgstr "账单"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx:46
+msgid "Blocklist"
+msgstr "拦截列表"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:210
+msgid "Book a Call"
+msgstr "预约电话"
+
+#: src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx:72
+msgid "Calculate"
+msgstr "计算"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:57
+msgid "Calendar"
+msgstr "日历"
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:14
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:24
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:78
+msgid "Calendars"
+msgstr "日历"
+
+#: src/pages/auth/Authorize.tsx:124
+#: src/modules/ui/layout/modal/components/ConfirmationModal.tsx:151
+#: src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx:198
+#: src/modules/settings/components/SaveAndCancelButtons/CancelButton.tsx:16
+msgid "Cancel"
+msgstr "取消"
+
+#: src/pages/settings/SettingsBilling.tsx:175
+msgid "Cancel Plan"
+msgstr "取消计划"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:152
+msgid "Cancel anytime"
+msgstr "随时取消"
+
+#: src/pages/settings/SettingsBilling.tsx:170
+msgid "Cancel your subscription"
+msgstr "取消订阅"
+
+#: src/pages/auth/PasswordReset.tsx:246
+#: src/modules/settings/profile/components/ChangePassword.tsx:52
+#: src/modules/settings/profile/components/ChangePassword.tsx:58
+msgid "Change Password"
+msgstr "更改密码"
+
+#: src/pages/settings/SettingsBilling.tsx:194
+msgid "Change {to}"
+msgstr "更改 {to}"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:86
+msgid "Chinese — Simplified"
+msgstr "简体中文"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:90
+msgid "Chinese — Traditional"
+msgstr "繁体中文"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:281
+msgid "Choose an object"
+msgstr "选择对象"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:147
+msgid "Choose your Trial"
+msgstr "选择试用"
+
+#: src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx:201
+msgid "Close"
+msgstr "关闭"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:133
+msgid "Companies"
+msgstr "公司"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:48
+msgid "Configure an SSO connection"
+msgstr "配置 SSO 连接"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:58
+msgid "Configure and customize your calendar preferences."
+msgstr "配置和自定义日历偏好。"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:43
+msgid "Configure how dates are displayed across the app"
+msgstr "配置整个应用程序的日期显示方式"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:34
+msgid "Configure your emails and calendar settings."
+msgstr "配置电子邮件和日历设置。"
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:13
+msgid "Connect a Google account"
+msgstr "连接 Google 账户"
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:11
+msgid "Connect a new account to your workspace"
+msgstr "将新账户连接到工作区"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:51
+msgid "Connect with Google"
+msgstr "与谷歌连接"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:59
+msgid "Connect with Microsoft"
+msgstr "与微软联系"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:56
+msgid "Connected accounts"
+msgstr "连接账户"
+
+#: src/pages/onboarding/InviteTeam.tsx:228
+#: src/pages/onboarding/ChooseYourPlan.tsx:198
+msgid "Continue"
+msgstr "继续"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:105
+msgid "Copilot"
+msgstr "副驾驶"
+
+#: src/pages/onboarding/InviteTeam.tsx:217
+msgid "Copy invitation link"
+msgstr "复制邀请链接"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:183
+msgid "Copy this key as it will not be visible again"
+msgstr "复制此密钥，因为它将不再可见"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:56
+msgid "Create API key"
+msgstr "创建应用程序接口密钥"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:72
+msgid "Create Webhook"
+msgstr "创建 Webhook"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:149
+msgid "Custom Objects"
+msgstr "自定义对象"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:90
+msgid "Custom objects"
+msgstr "自定义对象"
+
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:28
+msgid "Customise the fields available in the {objectLabelSingular} views."
+msgstr "自定义 {objectLabelSingular} 视图中可用的字段。"
+
+#: src/pages/settings/SettingsWorkspace.tsx:56
+msgid "Customize Domain"
+msgstr "自定义域名"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:64
+msgid "Customize your workspace security"
+msgstr "自定义工作空间安全"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:341
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:237
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:250
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:30
+#: src/modules/settings/profile/components/DeleteAccount.tsx:29
+msgid "Danger zone"
+msgstr "危险区"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:144
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:155
+msgid "Data model"
+msgstr "数据模型"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:42
+msgid "Date and time"
+msgstr "日期和时间"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:259
+msgid "Deactivate"
+msgstr "停用"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:105
+msgid "Deactivate \"Synchronize Objects Labels and API Names\" to set a custom API name"
+msgstr "停用 \"同步对象标签和 API 名称 \"以设置自定义 API 名称"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:251
+msgid "Deactivate this field"
+msgstr "停用该字段"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:94
+msgid "Define the name and description of your object"
+msgstr "定义对象的名称和描述"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:347
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:243
+msgid "Delete"
+msgstr "删除"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:256
+msgid "Delete API key"
+msgstr "删除 API 密钥"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:332
+#: src/modules/settings/profile/components/DeleteAccount.tsx:37
+#: src/modules/settings/profile/components/DeleteAccount.tsx:53
+msgid "Delete account"
+msgstr "删除帐户"
+
+#: src/modules/settings/profile/components/DeleteAccount.tsx:30
+msgid "Delete account and all the associated data"
+msgstr "删除账户和所有相关数据"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:342
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:238
+msgid "Delete this integration"
+msgstr "删除此集成"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:356
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:364
+msgid "Delete webhook"
+msgstr "删除网络钩子"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:36
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:54
+msgid "Delete workspace"
+msgstr "删除工作区"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:31
+msgid "Delete your whole workspace"
+msgstr "删除整个工作区"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:250
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:239
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:266
+msgid "Description"
+msgstr "说明"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:35
+#: src/pages/settings/developers/SettingsDevelopers.tsx:42
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:78
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:220
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:89
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:171
+msgid "Developers"
+msgstr "开发人员"
+
+#: src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx:48
+msgid "Display as relative date"
+msgstr "显示为相对日期"
+
+#: src/pages/settings/SettingsWorkspace.tsx:51
+#: src/pages/settings/workspace/SettingsDomain.tsx:125
+#: src/pages/settings/workspace/SettingsDomain.tsx:135
+#: src/pages/settings/workspace/SettingsDomain.tsx:150
+msgid "Domain"
+msgstr "域名"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:108
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:225
+msgid "E.g. backoffice integration"
+msgstr "例如后台整合"
+
+#: src/pages/settings/SettingsBilling.tsx:157
+msgid "Edit billing interval"
+msgstr "编辑计费间隔"
+
+#: src/pages/settings/SettingsBilling.tsx:145
+msgid "Edit payment method, see your invoices and more"
+msgstr "编辑付款方式、查看发票等"
+
+#: src/pages/settings/SettingsWorkspace.tsx:52
+msgid "Edit your subdomain name or set a custom domain."
+msgstr "编辑子域名或设置自定义域名。"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:180
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:256
+#: src/pages/settings/SettingsProfile.tsx:42
+#: src/pages/auth/PasswordReset.tsx:206
+msgid "Email"
+msgstr "电子邮件"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:89
+msgid "Email integration"
+msgstr "电子邮件集成"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:55
+msgid "Email or domain is already in blocklist"
+msgstr "电子邮件或域名已在拦截列表中"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:72
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:45
+msgid "Emails"
+msgstr "电子邮件"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:137
+msgid "Employees"
+msgstr "员工"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:96
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:238
+msgid "Endpoint URL"
+msgstr "端点 URL"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:82
+msgid "English"
+msgstr "英语"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:157
+msgid "Enjoy a {withCreditCardTrialPeriodDuration}-days free trial"
+msgstr "享受 {withCreditCardTrialPeriodDuration} 天的免费试用期"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:51
+msgid "Enterprise"
+msgstr "企业"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:98
+msgid "Error deleting api key: {err}"
+msgstr "删除 api 密钥时出错： {err}"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:150
+msgid "Error regenerating api key: {err}"
+msgstr "重新生成 api 密钥时出错： {err}"
+
+#: src/pages/settings/SettingsBilling.tsx:121
+msgid "Error while switching subscription {to}."
+msgstr "切换订阅 {to} 时出错。"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:66
+msgid "Establish Webhook endpoints for notifications on asynchronous events."
+msgstr "建立 Webhook 端点，用于通知异步事件。"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx:47
+msgid "Exclude the following people and domains from my email sync"
+msgstr "从我的电子邮件同步中排除以下人员和域"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:167
+msgid "Existing objects"
+msgstr "现有对象"
+
+#: src/modules/navigation/components/AppNavigationDrawer.tsx:36
+msgid "Exit Settings"
+msgstr "退出设置"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:26
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:32
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:108
+msgid "Experience"
+msgstr "经验"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:221
+msgid "Expiration"
+msgstr "到期"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:126
+msgid "Expiration Date"
+msgstr "有效期"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:259
+msgid "Expires in"
+msgstr "到期时间"
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:42
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:27
+msgid "Fields"
+msgstr "字段"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:265
+msgid "Filters"
+msgstr "过滤器"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:66
+msgid "French"
+msgstr "法语"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:87
+msgid "Full access"
+msgstr "完全访问"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:187
+msgid "Functions"
+msgstr "功能"
+
+#: src/pages/settings/SettingsWorkspace.tsx:29
+#: src/pages/settings/SettingsWorkspace.tsx:35
+#: src/pages/settings/workspace/SettingsDomain.tsx:132
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:138
+msgid "General"
+msgstr "一般情况"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:70
+msgid "German"
+msgstr "德国"
+
+#: src/pages/onboarding/InviteTeam.tsx:184
+msgid "Get the most out of your workspace by inviting your team."
+msgstr "邀请您的团队，充分利用您的工作空间。"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:148
+msgid "Get your subscription"
+msgstr "获取订阅"
+
+#: src/pages/settings/SettingsWorkspace.tsx:65
+msgid "Grant Twenty support temporary access to your workspace so we can troubleshoot problems or recover content on your behalf. You can revoke access at any time."
+msgstr "授予 Twenty 支持临时访问您工作区的权限，以便我们代表您排除故障或恢复内容。您可以随时撤销访问权限。"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:208
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:239
+msgid "Icon and Name"
+msgstr "图标和名称"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:275
+msgid "If you’ve lost this key, you can regenerate it, but be aware that any script using this key will need to be updated. Please type\"{confirmationValue}\" to confirm."
+msgstr "如果您丢失了此密钥，可以重新生成，但请注意，任何使用此密钥的脚本都需要更新。请键入\"{confirmationValue}\"确认。"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:218
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:215
+msgid "Inactive"
+msgstr "不活动"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:106
+msgid "Input must be in camel case and cannot start with a number"
+msgstr "输入内容必须使用驼峰字体，且不能以数字开头"
+
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:15
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:21
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:160
+msgid "Integrations"
+msgstr "集成"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:57
+msgid "Invalid auth provider"
+msgstr "无效验证提供程序"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:21
+msgid "Invalid email"
+msgstr "无效电子邮件"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:44
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:50
+msgid "Invalid email or domain"
+msgstr "无效电子邮件或域名"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:87
+msgid "Invalid form values"
+msgstr "无效表格值"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:167
+msgid "Invite by Link"
+msgstr "通过链接邀请"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:244
+msgid "Invite by email"
+msgstr "电子邮件邀请"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:157
+msgid "Invite by link"
+msgstr "通过链接邀请"
+
+#: src/pages/onboarding/InviteTeam.tsx:152
+msgid "Invite link sent to email addresses"
+msgstr "向电子邮件地址发送邀请链接"
+
+#: src/pages/onboarding/InviteTeam.tsx:181
+msgid "Invite your team"
+msgstr "邀请您的团队"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:74
+msgid "Italian"
+msgstr "意大利语"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:51
+msgid "Language"
+msgstr "语言"
+
+#: src/pages/onboarding/InviteTeam.tsx:127
+msgid "Link copied to clipboard"
+msgstr "链接复制到剪贴板"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:206
+msgid "Log out"
+msgstr "退出登录"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:209
+msgid "Logout"
+msgstr "注销"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:167
+msgid "Manage Members"
+msgstr "管理成员"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:168
+msgid "Manage the members of your space here"
+msgstr "在此管理空间成员"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:57
+msgid "Manage your internet accounts."
+msgstr "管理互联网账户"
+
+#: src/pages/settings/SettingsBilling.tsx:144
+msgid "Manage your subscription"
+msgstr "管理您的订阅"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:143
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:149
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:143
+msgid "Members"
+msgstr "成员"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:177
+#: src/pages/settings/SettingsWorkspace.tsx:44
+#: src/pages/settings/SettingsProfile.tsx:35
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:106
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:211
+#: src/modules/settings/workspace/components/NameField.tsx:91
+msgid "Name"
+msgstr "名称"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:106
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:211
+msgid "Name of your API key"
+msgstr "API 密钥名称"
+
+#: src/pages/settings/SettingsWorkspace.tsx:44
+msgid "Name of your workspace"
+msgstr "工作区名称"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:125
+msgid "Navigate"
+msgstr "导航"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:79
+msgid "New"
+msgstr "新"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:92
+msgid "New Key"
+msgstr "新钥匙"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:69
+msgid "New Object"
+msgstr "新对象"
+
+#: src/pages/auth/PasswordReset.tsx:233
+msgid "New Password"
+msgstr "新密码"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:81
+msgid "New Webhook"
+msgstr "新 Webhook"
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:10
+msgid "New account"
+msgstr "新账户"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:82
+msgid "New key"
+msgstr "新钥匙"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:46
+msgid "No connected account"
+msgstr "无连接账户"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:141
+msgid "Notes"
+msgstr "说明"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:160
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:179
+#: src/pages/settings/data-model/SettingsNewObject.tsx:76
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:205
+msgid "Objects"
+msgstr "对象"
+
+#: src/pages/not-found/NotFound.tsx:47
+msgid "Off the beaten path"
+msgstr "偏离常规路线"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:137
+msgid "Opportunities"
+msgstr "机会"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:195
+msgid "Other"
+msgstr "其他"
+
+#: src/pages/not-found/NotFound.tsx:41
+msgid "Page Not Found"
+msgstr "页面未找到"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:156
+msgid "Password"
+msgstr "密码"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:34
+msgid "Password reset link has been sent to the email"
+msgstr "密码重置链接已发送至邮箱"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:129
+msgid "People"
+msgstr "人"
+
+#: src/pages/settings/SettingsWorkspace.tsx:40
+#: src/pages/settings/SettingsProfile.tsx:30
+msgid "Picture"
+msgstr "图片"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:102
+msgid "Please enter a valid URL"
+msgstr "请输入有效的 URL"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:258
+msgid "Please type \"{confirmationValue}\" to confirm you want to delete this API Key. Be aware that any script using this key will stop working."
+msgstr "请键入\"{confirmationValue}\"确认要删除此 API 密钥。请注意，任何使用此密钥的脚本都将停止工作。"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:358
+msgid "Please type {confirmationText} to confirm you want to delete this webhook."
+msgstr "请键入 {confirmationText} 确认要删除此网络钩子。"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:62
+msgid "Portuguese"
+msgstr "葡萄牙语"
+
+#: src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx:62
+#: src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx:30
+msgid "Preview"
+msgstr "预览"
+
+#: src/pages/settings/SettingsProfile.tsx:19
+#: src/pages/settings/SettingsProfile.tsx:25
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:103
+msgid "Profile"
+msgstr "简介"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:97
+msgid "Pseudo-English"
+msgstr "伪英语"
+
+#: src/modules/settings/developers/components/SettingsReadDocumentationButton.tsx:9
+msgid "Read documentation"
+msgstr "阅读文件"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:53
+msgid "Receive an email containing password update link"
+msgstr "接收包含密码更新链接的电子邮件"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:109
+msgid "Record Selection"
+msgstr "记录选择"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:195
+msgid "Regenerate Key"
+msgstr "再生密钥"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:191
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:273
+msgid "Regenerate an API key"
+msgstr "重新生成 API 密钥"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:282
+msgid "Regenerate key"
+msgstr "再生钥匙"
+
+#: src/pages/settings/Releases.tsx:111
+#: src/pages/settings/Releases.tsx:117
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:204
+msgid "Releases"
+msgstr "发布"
+
+#: src/modules/ui/input/components/ImageInput.tsx:173
+msgid "Remove"
+msgstr "移除"
+
+#: src/pages/auth/PasswordReset.tsx:177
+msgid "Reset Password"
+msgstr "重置密码"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:47
+msgid "SSO"
+msgstr "SSO"
+
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:44
+#: src/modules/navigation/components/MainNavigationDrawerItems.tsx:50
+msgid "Search"
+msgstr "搜索"
+
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:183
+msgid "Search a field..."
+msgstr "搜索字段..."
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:116
+msgid "Search an index..."
+msgstr "搜索索引..."
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:171
+msgid "Search for an object..."
+msgstr "搜索对象..."
+
+#: src/pages/settings/security/SettingsSecurity.tsx:33
+#: src/pages/settings/security/SettingsSecurity.tsx:40
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:166
+msgid "Security"
+msgstr "安全"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:266
+msgid "Select the events you wish to send to this endpoint"
+msgstr "选择要发送到该端点的事件"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:52
+msgid "Select your preferred language"
+msgstr "选择您喜欢的语言"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:245
+msgid "Send an invite email to your team"
+msgstr "向团队发送邀请电子邮件"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:198
+msgid "Server Admin Panel"
+msgstr "服务器管理面板"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:46
+msgid "Set email visibility, manage your blocklist and more."
+msgstr "设置电子邮件可见性、管理屏蔽列表等。"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:151
+msgid "Set the name of your subdomain"
+msgstr "设置子域名称"
+
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:50
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:33
+#: src/modules/navigation/components/MainNavigationDrawerItems.tsx:56
+msgid "Settings"
+msgstr "设置"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:158
+msgid "Share this link to invite users to join your workspace"
+msgstr "分享此链接以邀请用户加入您的工作区"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:212
+msgid "Should changing a field's label also change the API name?"
+msgstr "更改字段标签是否也要更改 API 名称？"
+
+#: src/pages/onboarding/InviteTeam.tsx:236
+msgid "Skip"
+msgstr "跳过"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:78
+msgid "Spanish"
+msgstr "西班牙语"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:107
+msgid "Subdomain already taken"
+msgstr "子域已被占用"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:49
+msgid "Subdomain can not be longer than 30 characters"
+msgstr "子域名长度不得超过 30 个字符"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:48
+msgid "Subdomain can not be shorter than 3 characters"
+msgstr "子域名不能少于 3 个字符"
+
+#: src/pages/settings/SettingsBilling.tsx:117
+msgid "Subscription has been switched {to}"
+msgstr "订阅已切换 {to}"
+
+#: src/pages/settings/SettingsWorkspace.tsx:63
+msgid "Support"
+msgstr "支持"
+
+#: src/pages/settings/SettingsBilling.tsx:188
+msgid "Switch billing {to}"
+msgstr "开关计费 {to}"
+
+#: src/pages/settings/SettingsBilling.tsx:158
+msgid "Switch {from}"
+msgstr "开关 {from}"
+
+#: src/pages/settings/SettingsBilling.tsx:162
+msgid "Switch {to}"
+msgstr "开关 {to}"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:211
+msgid "Synchronize Field Label and API Name"
+msgstr "同步字段标签和 API 名称"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:55
+msgid "System Settings - {systemTimeFormatLabel}"
+msgstr "系统设置 - [{systemTimeFormatLabel}］"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx:42
+msgid "System settings - {systemDateFormatLabel}"
+msgstr "系统设置 - {systemDateFormatLabel}"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:145
+msgid "Tasks"
+msgstr "任务"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:240
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:267
+msgid "The description of this field"
+msgstr "该字段的说明"
+
+#: src/pages/settings/SettingsProfile.tsx:43
+msgid "The email associated to your account"
+msgstr "与您的账户关联的电子邮件"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:209
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:240
+msgid "The name and icon of this field"
+msgstr "该字段的名称和图标"
+
+#: src/pages/not-found/NotFound.tsx:50
+msgid "The page you're seeking is either gone or never was. Let's get you back on track"
+msgstr "您正在寻找的页面要么已经消失，要么从未出现过。让我们帮您恢复正常"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:229
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:252
+msgid "The values of this field"
+msgstr "该字段的值"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:224
+msgid "The values of this field must be unique"
+msgstr "该字段的值必须是唯一的"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:38
+msgid "There was an issue"
+msgstr "有一个问题"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:323
+msgid "This action cannot be undone. This will permanently delete this user and remove them from all their assignments."
+msgstr "此操作不可撤销。这将永久删除该用户，并将其从所有任务中删除。"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:48
+msgid "This action cannot be undone. This will permanently delete your entire workspace. <0/> Please type in your email to confirm."
+msgstr "此操作无法撤销。这将永久删除您的整个工作区。 <0/> 请输入您的电子邮件以确认。"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:49
+msgid "Time format"
+msgstr "时间格式"
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:55
+msgid "Type"
+msgstr "类型"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:100
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:242
+msgid "URL"
+msgstr "网址"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:88
+msgid "Unlimited contacts"
+msgstr "无限联系人"
+
+#: src/modules/ui/input/components/ImageInput.tsx:165
+msgid "Upload"
+msgstr "上传"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:51
+msgid "Use letter, number and dash only. Start and finish with a letter or a number"
+msgstr "只能使用字母、数字和破折号。以字母或数字开头和结尾"
+
+#: src/pages/settings/SettingsProfile.tsx:22
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:29
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:17
+#: src/pages/settings/accounts/SettingsAccounts.tsx:43
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:101
+msgid "User"
+msgstr "用户"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:51
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:106
+msgid "User is not logged in"
+msgstr "用户未登录"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:223
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:228
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:251
+msgid "Values"
+msgstr "价值观"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:117
+msgid "View"
+msgstr "查看"
+
+#: src/pages/settings/SettingsBilling.tsx:149
+msgid "View billing details"
+msgstr "查看账单详情"
+
+#: src/modules/settings/data-model/objects/components/SettingsObjectCoverImage.tsx:35
+msgid "Visualize"
+msgstr "可视化"
+
+#: src/modules/ui/input/components/ImageInput.tsx:178
+msgid "We support your square PNGs, JPEGs and GIFs under 10MB"
+msgstr "我们支持 10MB 以下的正方形 PNG、JPEG 和 GIF 文件"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:97
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:239
+msgid "We will send POST requests to this endpoint for every new event"
+msgstr "我们将为每个新事件向该端点发送 POST 请求"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:223
+msgid "Webhook"
+msgstr "网络钩子"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:65
+msgid "Webhooks"
+msgstr "网络钩子"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:127
+msgid "When the API key will expire."
+msgstr "API 密钥的过期时间。"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:222
+msgid "When the key will be disabled"
+msgstr "何时禁用按键"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:113
+msgid "Workflow Record Selection"
+msgstr "工作流程记录选择"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:121
+msgid "Workflows"
+msgstr "工作流程"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:146
+#: src/pages/settings/SettingsWorkspace.tsx:32
+#: src/pages/settings/SettingsBilling.tsx:132
+#: src/pages/settings/Releases.tsx:114
+#: src/pages/settings/workspace/SettingsDomain.tsx:128
+#: src/pages/settings/security/SettingsSecurity.tsx:37
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:18
+#: src/pages/settings/developers/SettingsDevelopers.tsx:39
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:74
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:216
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:85
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:167
+#: src/pages/settings/data-model/SettingsObjects.tsx:157
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:175
+#: src/pages/settings/data-model/SettingsNewObject.tsx:72
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:201
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:58
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:136
+msgid "Workspace"
+msgstr "工作空间"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:46
+msgid "Workspace Deletion"
+msgstr "删除工作区"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:254
+msgid "Write a description"
+msgstr "撰写说明"
+
+#: src/pages/settings/SettingsBilling.tsx:46
+msgid "You will be charged immediately for the full year."
+msgstr "您将立即被收取全年的费用。"
+
+#: src/pages/settings/SettingsBilling.tsx:53
+msgid "Your credit balance will be used to pay the monthly bills."
+msgstr "您的信贷余额将用于支付每月账单。"
+
+#: src/pages/settings/SettingsProfile.tsx:36
+msgid "Your name as it will be displayed"
+msgstr "显示您的姓名"
+
+#: src/pages/settings/SettingsBilling.tsx:171
+msgid "Your workspace will be disabled"
+msgstr "您的工作区将被禁用"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:167
+msgid "employees"
+msgstr "员工"
+
+#: src/pages/settings/SettingsBilling.tsx:45
+msgid "from monthly to yearly"
+msgstr "从每月到每年"
+
+#: src/pages/settings/SettingsBilling.tsx:52
+msgid "from yearly to monthly"
+msgstr "从每年到每月"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:108
+msgid "not allowed"
+msgstr "不允许"
+
+#: src/pages/onboarding/InviteTeam.tsx:213
+msgid "or"
+msgstr "或"
+
+#: src/pages/settings/SettingsBilling.tsx:51
+msgid "to monthly"
+msgstr "至每月"
+
+#: src/pages/settings/SettingsBilling.tsx:44
+msgid "to yearly"
+msgstr "每年"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:209
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:158
+msgid "yes"
+msgstr "是"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:174
+msgid "{apiKeyName} API Key"
+msgstr "{apiKeyName} 应用程序接口密钥"
diff --git a/packages/twenty-front/src/locales/zh-Hant.po b/packages/twenty-front/src/locales/zh-Hant.po
new file mode 100644
index 000000000000..211983b2037c
--- /dev/null
+++ b/packages/twenty-front/src/locales/zh-Hant.po
@@ -0,0 +1,1147 @@
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2025-01-21 13:07+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: @lingui/cli\n"
+"Language: zh-Hant\n"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:92
+msgid "1 000 workflow node executions"
+msgstr "1 000 次工作流节点执行"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:63
+msgid "12h ({hour12Label})"
+msgstr "12h （[{hour12Label}）"
+
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:198
+msgid "2. Configure field"
+msgstr "2.配置字段"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:59
+msgid "24h ({hour24Label})"
+msgstr "24小时（[{hour24Label}）"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:91
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:179
+msgid "API & Webhooks"
+msgstr "应用程序接口和网络钩子"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:182
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:190
+msgid "API Key"
+msgstr "API 密钥"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:166
+msgid "API Name"
+msgstr "应用程序接口名称"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:49
+msgid "API keys"
+msgstr "API 密钥"
+
+#: src/modules/ui/input/components/ImageInput.tsx:157
+msgid "Abort"
+msgstr "中止"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:93
+msgid "About"
+msgstr "关于"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:40
+#: src/pages/settings/accounts/SettingsAccounts.tsx:46
+msgid "Account"
+msgstr "账户"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:321
+#: src/modules/settings/profile/components/DeleteAccount.tsx:45
+msgid "Account Deletion"
+msgstr "账户删除"
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:21
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:114
+msgid "Accounts"
+msgstr "账户"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:259
+msgid "Activate"
+msgstr "激活"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:193
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:201
+msgid "Active"
+msgstr "活跃"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:50
+msgid "Active API keys created by you or your team."
+msgstr "由您或您的团队创建的活动 API 密钥。"
+
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:39
+msgid "Add Field"
+msgstr "添加字段"
+
+#: src/modules/settings/security/components/SettingsSSOIdentitiesProvidersListCard.tsx:59
+msgid "Add SSO Identity Provider"
+msgstr "添加 SSO 身份供应商"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:149
+msgid "Add object"
+msgstr "添加对象"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:105
+msgid "Add to blocklist"
+msgstr "添加到拦截列表"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:135
+msgid "Allow logins through Google's single sign-on functionality."
+msgstr "允许通过 Google 的单点登录功能登录。"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:146
+msgid "Allow logins through Microsoft's single sign-on functionality."
+msgstr "允许通过微软的单点登录功能登录。"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:168
+msgid "Allow the invitation of new users by sharing an invite link."
+msgstr "允许通过共享邀请链接来邀请新用户。"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:157
+msgid "Allow users to sign in with an email and password."
+msgstr "允许用户使用电子邮件和密码登录。"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:251
+msgid "An optional description"
+msgstr "可选描述"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:37
+msgid "Appearance"
+msgstr "外观"
+
+#: src/pages/settings/SettingsBilling.tsx:190
+msgid "Are you sure that you want to change your billing interval?"
+msgstr "您确定要更改计费间隔吗？"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:73
+msgid "At least one authentication method must be enabled"
+msgstr "必须启用至少一种身份验证方法"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:63
+msgid "Authentication"
+msgstr "认证"
+
+#: src/pages/auth/Authorize.tsx:127
+msgid "Authorize"
+msgstr "授权"
+
+#: src/pages/not-found/NotFound.tsx:58
+msgid "Back to content"
+msgstr "返回内容"
+
+#: src/pages/settings/SettingsBilling.tsx:129
+#: src/pages/settings/SettingsBilling.tsx:135
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:149
+msgid "Billing"
+msgstr "账单"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx:46
+msgid "Blocklist"
+msgstr "拦截列表"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:210
+msgid "Book a Call"
+msgstr "预约电话"
+
+#: src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx:72
+msgid "Calculate"
+msgstr "计算"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:57
+msgid "Calendar"
+msgstr "日历"
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:14
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:24
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:78
+msgid "Calendars"
+msgstr "日历"
+
+#: src/pages/auth/Authorize.tsx:124
+#: src/modules/ui/layout/modal/components/ConfirmationModal.tsx:151
+#: src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx:198
+#: src/modules/settings/components/SaveAndCancelButtons/CancelButton.tsx:16
+msgid "Cancel"
+msgstr "取消"
+
+#: src/pages/settings/SettingsBilling.tsx:175
+msgid "Cancel Plan"
+msgstr "取消计划"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:152
+msgid "Cancel anytime"
+msgstr "随时取消"
+
+#: src/pages/settings/SettingsBilling.tsx:170
+msgid "Cancel your subscription"
+msgstr "取消订阅"
+
+#: src/pages/auth/PasswordReset.tsx:246
+#: src/modules/settings/profile/components/ChangePassword.tsx:52
+#: src/modules/settings/profile/components/ChangePassword.tsx:58
+msgid "Change Password"
+msgstr "更改密码"
+
+#: src/pages/settings/SettingsBilling.tsx:194
+msgid "Change {to}"
+msgstr "更改 {to}"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:86
+msgid "Chinese — Simplified"
+msgstr "简体中文"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:90
+msgid "Chinese — Traditional"
+msgstr "繁体中文"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:281
+msgid "Choose an object"
+msgstr "选择对象"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:147
+msgid "Choose your Trial"
+msgstr "选择试用"
+
+#: src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx:201
+msgid "Close"
+msgstr "关闭"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:133
+msgid "Companies"
+msgstr "公司"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:48
+msgid "Configure an SSO connection"
+msgstr "配置 SSO 连接"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:58
+msgid "Configure and customize your calendar preferences."
+msgstr "配置和自定义日历偏好。"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:43
+msgid "Configure how dates are displayed across the app"
+msgstr "配置整个应用程序的日期显示方式"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:34
+msgid "Configure your emails and calendar settings."
+msgstr "配置电子邮件和日历设置。"
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:13
+msgid "Connect a Google account"
+msgstr "连接 Google 账户"
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:11
+msgid "Connect a new account to your workspace"
+msgstr "将新账户连接到工作区"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:51
+msgid "Connect with Google"
+msgstr "与谷歌连接"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:59
+msgid "Connect with Microsoft"
+msgstr "与微软联系"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:56
+msgid "Connected accounts"
+msgstr "连接账户"
+
+#: src/pages/onboarding/InviteTeam.tsx:228
+#: src/pages/onboarding/ChooseYourPlan.tsx:198
+msgid "Continue"
+msgstr "继续"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:105
+msgid "Copilot"
+msgstr "副驾驶"
+
+#: src/pages/onboarding/InviteTeam.tsx:217
+msgid "Copy invitation link"
+msgstr "复制邀请链接"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:183
+msgid "Copy this key as it will not be visible again"
+msgstr "复制此密钥，因为它将不再可见"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:56
+msgid "Create API key"
+msgstr "创建应用程序接口密钥"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:72
+msgid "Create Webhook"
+msgstr "创建 Webhook"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:149
+msgid "Custom Objects"
+msgstr "自定义对象"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:90
+msgid "Custom objects"
+msgstr "自定义对象"
+
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:28
+msgid "Customise the fields available in the {objectLabelSingular} views."
+msgstr "自定义 {objectLabelSingular} 视图中可用的字段。"
+
+#: src/pages/settings/SettingsWorkspace.tsx:56
+msgid "Customize Domain"
+msgstr "自定义域名"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:64
+msgid "Customize your workspace security"
+msgstr "自定义工作区安全"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:341
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:237
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:250
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:30
+#: src/modules/settings/profile/components/DeleteAccount.tsx:29
+msgid "Danger zone"
+msgstr "危险区"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:144
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:155
+msgid "Data model"
+msgstr "数据模型"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:42
+msgid "Date and time"
+msgstr "日期和时间"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:259
+msgid "Deactivate"
+msgstr "停用"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:105
+msgid "Deactivate \"Synchronize Objects Labels and API Names\" to set a custom API name"
+msgstr "停用 \"同步对象标签和 API 名称 \"以设置自定义 API 名称"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:251
+msgid "Deactivate this field"
+msgstr "停用该字段"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:94
+msgid "Define the name and description of your object"
+msgstr "定义对象的名称和描述"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:347
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:243
+msgid "Delete"
+msgstr "删除"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:256
+msgid "Delete API key"
+msgstr "删除 API 密钥"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:332
+#: src/modules/settings/profile/components/DeleteAccount.tsx:37
+#: src/modules/settings/profile/components/DeleteAccount.tsx:53
+msgid "Delete account"
+msgstr "删除帐户"
+
+#: src/modules/settings/profile/components/DeleteAccount.tsx:30
+msgid "Delete account and all the associated data"
+msgstr "删除账户和所有相关数据"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:342
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:238
+msgid "Delete this integration"
+msgstr "删除此集成"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:356
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:364
+msgid "Delete webhook"
+msgstr "删除网络钩子"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:36
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:54
+msgid "Delete workspace"
+msgstr "删除工作区"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:31
+msgid "Delete your whole workspace"
+msgstr "删除整个工作区"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:250
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:239
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:266
+msgid "Description"
+msgstr "说明"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:35
+#: src/pages/settings/developers/SettingsDevelopers.tsx:42
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:78
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:220
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:89
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:171
+msgid "Developers"
+msgstr "开发人员"
+
+#: src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx:48
+msgid "Display as relative date"
+msgstr "显示为相对日期"
+
+#: src/pages/settings/SettingsWorkspace.tsx:51
+#: src/pages/settings/workspace/SettingsDomain.tsx:125
+#: src/pages/settings/workspace/SettingsDomain.tsx:135
+#: src/pages/settings/workspace/SettingsDomain.tsx:150
+msgid "Domain"
+msgstr "域名"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:108
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:225
+msgid "E.g. backoffice integration"
+msgstr "例如后台整合"
+
+#: src/pages/settings/SettingsBilling.tsx:157
+msgid "Edit billing interval"
+msgstr "编辑计费间隔"
+
+#: src/pages/settings/SettingsBilling.tsx:145
+msgid "Edit payment method, see your invoices and more"
+msgstr "编辑付款方式、查看发票等"
+
+#: src/pages/settings/SettingsWorkspace.tsx:52
+msgid "Edit your subdomain name or set a custom domain."
+msgstr "编辑子域名或设置自定义域名。"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:180
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:256
+#: src/pages/settings/SettingsProfile.tsx:42
+#: src/pages/auth/PasswordReset.tsx:206
+msgid "Email"
+msgstr "电子邮件"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:89
+msgid "Email integration"
+msgstr "电子邮件集成"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:55
+msgid "Email or domain is already in blocklist"
+msgstr "电子邮件或域名已在拦截列表中"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:72
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:45
+msgid "Emails"
+msgstr "电子邮件"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:137
+msgid "Employees"
+msgstr "员工"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:96
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:238
+msgid "Endpoint URL"
+msgstr "端点 URL"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:82
+msgid "English"
+msgstr "英语"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:157
+msgid "Enjoy a {withCreditCardTrialPeriodDuration}-days free trial"
+msgstr "享受 {withCreditCardTrialPeriodDuration} 天的免费试用期"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:51
+msgid "Enterprise"
+msgstr "企业"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:98
+msgid "Error deleting api key: {err}"
+msgstr "删除 api 密钥时出错： {err}"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:150
+msgid "Error regenerating api key: {err}"
+msgstr "重新生成 api 密钥时出错： {err}"
+
+#: src/pages/settings/SettingsBilling.tsx:121
+msgid "Error while switching subscription {to}."
+msgstr "切换订阅 {to} 时出错。"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:66
+msgid "Establish Webhook endpoints for notifications on asynchronous events."
+msgstr "建立 Webhook 端点，用于通知异步事件。"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx:47
+msgid "Exclude the following people and domains from my email sync"
+msgstr "从我的电子邮件同步中排除以下人员和域"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:167
+msgid "Existing objects"
+msgstr "现有对象"
+
+#: src/modules/navigation/components/AppNavigationDrawer.tsx:36
+msgid "Exit Settings"
+msgstr "退出设置"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:26
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:32
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:108
+msgid "Experience"
+msgstr "经验"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:221
+msgid "Expiration"
+msgstr "到期"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:126
+msgid "Expiration Date"
+msgstr "有效期"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:259
+msgid "Expires in"
+msgstr "到期时间"
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:42
+#: src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx:27
+msgid "Fields"
+msgstr "字段"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:265
+msgid "Filters"
+msgstr "过滤器"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:66
+msgid "French"
+msgstr "法语"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:87
+msgid "Full access"
+msgstr "完全访问"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:187
+msgid "Functions"
+msgstr "功能"
+
+#: src/pages/settings/SettingsWorkspace.tsx:29
+#: src/pages/settings/SettingsWorkspace.tsx:35
+#: src/pages/settings/workspace/SettingsDomain.tsx:132
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:138
+msgid "General"
+msgstr "一般情况"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:70
+msgid "German"
+msgstr "德国"
+
+#: src/pages/onboarding/InviteTeam.tsx:184
+msgid "Get the most out of your workspace by inviting your team."
+msgstr "邀请您的团队，充分利用您的工作空间。"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:148
+msgid "Get your subscription"
+msgstr "获取订阅"
+
+#: src/pages/settings/SettingsWorkspace.tsx:65
+msgid "Grant Twenty support temporary access to your workspace so we can troubleshoot problems or recover content on your behalf. You can revoke access at any time."
+msgstr "授予 Twenty 支持临时访问您工作区的权限，以便我们为您排除故障或恢复内容。您可以随时撤销访问权限。"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:208
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:239
+msgid "Icon and Name"
+msgstr "图标和名称"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:275
+msgid "If you’ve lost this key, you can regenerate it, but be aware that any script using this key will need to be updated. Please type\"{confirmationValue}\" to confirm."
+msgstr "如果您丢失了此密钥，可以重新生成，但请注意，任何使用此密钥的脚本都需要更新。请键入\"{confirmationValue}\"确认。"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:218
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:215
+msgid "Inactive"
+msgstr "不活动"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:106
+msgid "Input must be in camel case and cannot start with a number"
+msgstr "输入内容必须使用驼峰字体，且不能以数字开头"
+
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:15
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:21
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:160
+msgid "Integrations"
+msgstr "集成"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:57
+msgid "Invalid auth provider"
+msgstr "无效验证提供程序"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:21
+msgid "Invalid email"
+msgstr "无效电子邮件"
+
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:44
+#: src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx:50
+msgid "Invalid email or domain"
+msgstr "无效电子邮件或域名"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:87
+msgid "Invalid form values"
+msgstr "无效表格值"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:167
+msgid "Invite by Link"
+msgstr "通过链接邀请"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:244
+msgid "Invite by email"
+msgstr "电子邮件邀请"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:157
+msgid "Invite by link"
+msgstr "通过链接邀请"
+
+#: src/pages/onboarding/InviteTeam.tsx:152
+msgid "Invite link sent to email addresses"
+msgstr "向电子邮件地址发送邀请链接"
+
+#: src/pages/onboarding/InviteTeam.tsx:181
+msgid "Invite your team"
+msgstr "邀请您的团队"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:74
+msgid "Italian"
+msgstr "意大利语"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:51
+msgid "Language"
+msgstr "语言"
+
+#: src/pages/onboarding/InviteTeam.tsx:127
+msgid "Link copied to clipboard"
+msgstr "链接复制到剪贴板"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:206
+msgid "Log out"
+msgstr "退出登录"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:209
+msgid "Logout"
+msgstr "注销"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:167
+msgid "Manage Members"
+msgstr "管理成员"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:168
+msgid "Manage the members of your space here"
+msgstr "在此管理空间成员"
+
+#: src/pages/settings/accounts/SettingsAccounts.tsx:57
+msgid "Manage your internet accounts."
+msgstr "管理互联网账户"
+
+#: src/pages/settings/SettingsBilling.tsx:144
+msgid "Manage your subscription"
+msgstr "管理您的订阅"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:143
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:149
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:143
+msgid "Members"
+msgstr "成员"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:177
+#: src/pages/settings/SettingsWorkspace.tsx:44
+#: src/pages/settings/SettingsProfile.tsx:35
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:106
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:211
+#: src/modules/settings/workspace/components/NameField.tsx:91
+msgid "Name"
+msgstr "名称"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:106
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:211
+msgid "Name of your API key"
+msgstr "API 密钥名称"
+
+#: src/pages/settings/SettingsWorkspace.tsx:44
+msgid "Name of your workspace"
+msgstr "工作区名称"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:125
+msgid "Navigate"
+msgstr "导航"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:79
+msgid "New"
+msgstr "新"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:92
+msgid "New Key"
+msgstr "新钥匙"
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:69
+msgid "New Object"
+msgstr "新对象"
+
+#: src/pages/auth/PasswordReset.tsx:233
+msgid "New Password"
+msgstr "新密码"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:81
+msgid "New Webhook"
+msgstr "新 Webhook"
+
+#: src/modules/settings/accounts/components/SettingsNewAccountSection.tsx:10
+msgid "New account"
+msgstr "新账户"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:82
+msgid "New key"
+msgstr "新钥匙"
+
+#: src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx:46
+msgid "No connected account"
+msgstr "无连接账户"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:141
+msgid "Notes"
+msgstr "说明"
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:160
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:179
+#: src/pages/settings/data-model/SettingsNewObject.tsx:76
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:205
+msgid "Objects"
+msgstr "对象"
+
+#: src/pages/not-found/NotFound.tsx:47
+msgid "Off the beaten path"
+msgstr "偏离常规路线"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:137
+msgid "Opportunities"
+msgstr "机会"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:195
+msgid "Other"
+msgstr "其他"
+
+#: src/pages/not-found/NotFound.tsx:41
+msgid "Page Not Found"
+msgstr "页面未找到"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:156
+msgid "Password"
+msgstr "密码"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:34
+msgid "Password reset link has been sent to the email"
+msgstr "密码重置链接已发送至邮箱"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:129
+msgid "People"
+msgstr "人"
+
+#: src/pages/settings/SettingsWorkspace.tsx:40
+#: src/pages/settings/SettingsProfile.tsx:30
+msgid "Picture"
+msgstr "图片"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:102
+msgid "Please enter a valid URL"
+msgstr "请输入有效的 URL"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:258
+msgid "Please type \"{confirmationValue}\" to confirm you want to delete this API Key. Be aware that any script using this key will stop working."
+msgstr "请键入\"{confirmationValue}\"确认要删除此 API 密钥。请注意，任何使用此密钥的脚本都将停止工作。"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:358
+msgid "Please type {confirmationText} to confirm you want to delete this webhook."
+msgstr "请键入 {confirmationText} 确认要删除此网络钩子。"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:62
+msgid "Portuguese"
+msgstr "葡萄牙语"
+
+#: src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx:62
+#: src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx:30
+msgid "Preview"
+msgstr "预览"
+
+#: src/pages/settings/SettingsProfile.tsx:19
+#: src/pages/settings/SettingsProfile.tsx:25
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:103
+msgid "Profile"
+msgstr "简介"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:97
+msgid "Pseudo-English"
+msgstr "伪英语"
+
+#: src/modules/settings/developers/components/SettingsReadDocumentationButton.tsx:9
+msgid "Read documentation"
+msgstr "阅读文件"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:53
+msgid "Receive an email containing password update link"
+msgstr "接收包含密码更新链接的电子邮件"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:109
+msgid "Record Selection"
+msgstr "记录选择"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:195
+msgid "Regenerate Key"
+msgstr "再生密钥"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:191
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:273
+msgid "Regenerate an API key"
+msgstr "重新生成 API 密钥"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:282
+msgid "Regenerate key"
+msgstr "再生钥匙"
+
+#: src/pages/settings/Releases.tsx:111
+#: src/pages/settings/Releases.tsx:117
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:204
+msgid "Releases"
+msgstr "发布"
+
+#: src/modules/ui/input/components/ImageInput.tsx:173
+msgid "Remove"
+msgstr "移除"
+
+#: src/pages/auth/PasswordReset.tsx:177
+msgid "Reset Password"
+msgstr "重置密码"
+
+#: src/pages/settings/security/SettingsSecurity.tsx:47
+msgid "SSO"
+msgstr "SSO"
+
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:44
+#: src/modules/navigation/components/MainNavigationDrawerItems.tsx:50
+msgid "Search"
+msgstr "搜索"
+
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:183
+msgid "Search a field..."
+msgstr "搜索字段..."
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:116
+msgid "Search an index..."
+msgstr "搜索索引..."
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:171
+msgid "Search for an object..."
+msgstr "搜索对象..."
+
+#: src/pages/settings/security/SettingsSecurity.tsx:33
+#: src/pages/settings/security/SettingsSecurity.tsx:40
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:166
+msgid "Security"
+msgstr "安全"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:266
+msgid "Select the events you wish to send to this endpoint"
+msgstr "选择要发送到该端点的事件"
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:52
+msgid "Select your preferred language"
+msgstr "选择您喜欢的语言"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:245
+msgid "Send an invite email to your team"
+msgstr "向团队发送邀请电子邮件"
+
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:198
+msgid "Server Admin Panel"
+msgstr "服务器管理面板"
+
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:46
+msgid "Set email visibility, manage your blocklist and more."
+msgstr "设置电子邮件可见性、管理屏蔽列表等。"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:151
+msgid "Set the name of your subdomain"
+msgstr "设置子域名称"
+
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:50
+#: src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx:33
+#: src/modules/navigation/components/MainNavigationDrawerItems.tsx:56
+msgid "Settings"
+msgstr "设置"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:158
+msgid "Share this link to invite users to join your workspace"
+msgstr "分享此链接以邀请用户加入您的工作区"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:212
+msgid "Should changing a field's label also change the API name?"
+msgstr "更改字段标签是否也要更改 API 名称？"
+
+#: src/pages/onboarding/InviteTeam.tsx:236
+msgid "Skip"
+msgstr "跳过"
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:78
+msgid "Spanish"
+msgstr "西班牙语"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:107
+msgid "Subdomain already taken"
+msgstr "子域已被占用"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:49
+msgid "Subdomain can not be longer than 30 characters"
+msgstr "子域名长度不得超过 30 个字符"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:48
+msgid "Subdomain can not be shorter than 3 characters"
+msgstr "子域名不能少于 3 个字符"
+
+#: src/pages/settings/SettingsBilling.tsx:117
+msgid "Subscription has been switched {to}"
+msgstr "订阅已切换 {to}"
+
+#: src/pages/settings/SettingsWorkspace.tsx:63
+msgid "Support"
+msgstr "支持"
+
+#: src/pages/settings/SettingsBilling.tsx:188
+msgid "Switch billing {to}"
+msgstr "开关计费 {to}"
+
+#: src/pages/settings/SettingsBilling.tsx:158
+msgid "Switch {from}"
+msgstr "开关 {from}"
+
+#: src/pages/settings/SettingsBilling.tsx:162
+msgid "Switch {to}"
+msgstr "开关 {to}"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:211
+msgid "Synchronize Field Label and API Name"
+msgstr "同步字段标签和 API 名称"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:55
+msgid "System Settings - {systemTimeFormatLabel}"
+msgstr "系统设置 - [{systemTimeFormatLabel}］"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx:42
+msgid "System settings - {systemDateFormatLabel}"
+msgstr "系统设置 - {systemDateFormatLabel}"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:145
+msgid "Tasks"
+msgstr "任务"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:240
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:267
+msgid "The description of this field"
+msgstr "该字段的说明"
+
+#: src/pages/settings/SettingsProfile.tsx:43
+msgid "The email associated to your account"
+msgstr "与您的账户关联的电子邮件"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:209
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:240
+msgid "The name and icon of this field"
+msgstr "该字段的名称和图标"
+
+#: src/pages/not-found/NotFound.tsx:50
+msgid "The page you're seeking is either gone or never was. Let's get you back on track"
+msgstr "您正在寻找的页面要么已经消失，要么从未出现过。让我们帮您恢复正常"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:229
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:252
+msgid "The values of this field"
+msgstr "该字段的值"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:224
+msgid "The values of this field must be unique"
+msgstr "该字段的值必须是唯一的"
+
+#: src/modules/settings/profile/components/ChangePassword.tsx:38
+msgid "There was an issue"
+msgstr "有一个问题"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:323
+msgid "This action cannot be undone. This will permanently delete this user and remove them from all their assignments."
+msgstr "此操作不可撤销。这将永久删除该用户，并将其从所有任务中删除。"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:48
+msgid "This action cannot be undone. This will permanently delete your entire workspace. <0/> Please type in your email to confirm."
+msgstr "此操作无法撤销。这将永久删除您的整个工作区。 <0/> 请输入您的电子邮件以确认。"
+
+#: src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx:49
+msgid "Time format"
+msgstr "时间格式"
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:55
+msgid "Type"
+msgstr "类型"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:100
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:242
+msgid "URL"
+msgstr "网址"
+
+#: src/pages/onboarding/ChooseYourPlan.tsx:88
+msgid "Unlimited contacts"
+msgstr "无限联系人"
+
+#: src/modules/ui/input/components/ImageInput.tsx:165
+msgid "Upload"
+msgstr "上传"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:51
+msgid "Use letter, number and dash only. Start and finish with a letter or a number"
+msgstr "只能使用字母、数字和破折号。以字母或数字开头和结尾"
+
+#: src/pages/settings/SettingsProfile.tsx:22
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:29
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:17
+#: src/pages/settings/accounts/SettingsAccounts.tsx:43
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:101
+msgid "User"
+msgstr "用户"
+
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:51
+#: src/modules/settings/security/components/SettingsSecurityOptionsList.tsx:106
+msgid "User is not logged in"
+msgstr "用户未登录"
+
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:223
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:228
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:251
+msgid "Values"
+msgstr "价值观"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:117
+msgid "View"
+msgstr "查看"
+
+#: src/pages/settings/SettingsBilling.tsx:149
+msgid "View billing details"
+msgstr "查看账单详情"
+
+#: src/modules/settings/data-model/objects/components/SettingsObjectCoverImage.tsx:35
+msgid "Visualize"
+msgstr "可视化"
+
+#: src/modules/ui/input/components/ImageInput.tsx:178
+msgid "We support your square PNGs, JPEGs and GIFs under 10MB"
+msgstr "我们支持 10MB 以下的正方形 PNG、JPEG 和 GIF 文件"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:97
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:239
+msgid "We will send POST requests to this endpoint for every new event"
+msgstr "我们将为每个新事件向该端点发送 POST 请求"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:223
+msgid "Webhook"
+msgstr "网络钩子"
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:65
+msgid "Webhooks"
+msgstr "网络钩子"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:127
+msgid "When the API key will expire."
+msgstr "API 密钥的过期时间。"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:222
+msgid "When the key will be disabled"
+msgstr "何时禁用按键"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:113
+msgid "Workflow Record Selection"
+msgstr "工作流程记录选择"
+
+#: src/modules/command-menu/components/CommandMenu.tsx:121
+msgid "Workflows"
+msgstr "工作流程"
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:146
+#: src/pages/settings/SettingsWorkspace.tsx:32
+#: src/pages/settings/SettingsBilling.tsx:132
+#: src/pages/settings/Releases.tsx:114
+#: src/pages/settings/workspace/SettingsDomain.tsx:128
+#: src/pages/settings/security/SettingsSecurity.tsx:37
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:18
+#: src/pages/settings/developers/SettingsDevelopers.tsx:39
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx:74
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:216
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx:85
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:167
+#: src/pages/settings/data-model/SettingsObjects.tsx:157
+#: src/pages/settings/data-model/SettingsObjectFieldEdit.tsx:175
+#: src/pages/settings/data-model/SettingsNewObject.tsx:72
+#: src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx:201
+#: src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx:58
+#: src/modules/settings/components/SettingsNavigationDrawerItems.tsx:136
+msgid "Workspace"
+msgstr "工作空间"
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:46
+msgid "Workspace Deletion"
+msgstr "删除工作区"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:254
+msgid "Write a description"
+msgstr "编写说明"
+
+#: src/pages/settings/SettingsBilling.tsx:46
+msgid "You will be charged immediately for the full year."
+msgstr "您将立即被收取全年的费用。"
+
+#: src/pages/settings/SettingsBilling.tsx:53
+msgid "Your credit balance will be used to pay the monthly bills."
+msgstr "您的信用余额将用于支付每月账单。"
+
+#: src/pages/settings/SettingsProfile.tsx:36
+msgid "Your name as it will be displayed"
+msgstr "显示您的姓名"
+
+#: src/pages/settings/SettingsBilling.tsx:171
+msgid "Your workspace will be disabled"
+msgstr "您的工作区将被禁用"
+
+#: src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx:167
+msgid "employees"
+msgstr "员工"
+
+#: src/pages/settings/SettingsBilling.tsx:45
+msgid "from monthly to yearly"
+msgstr "从每月到每年"
+
+#: src/pages/settings/SettingsBilling.tsx:52
+msgid "from yearly to monthly"
+msgstr "从每年到每月"
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:108
+msgid "not allowed"
+msgstr "不允许"
+
+#: src/pages/onboarding/InviteTeam.tsx:213
+msgid "or"
+msgstr "或"
+
+#: src/pages/settings/SettingsBilling.tsx:51
+msgid "to monthly"
+msgstr "至每月"
+
+#: src/pages/settings/SettingsBilling.tsx:44
+msgid "to yearly"
+msgstr "每年"
+
+#: src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx:209
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:158
+msgid "yes"
+msgstr "是"
+
+#: src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx:174
+msgid "{apiKeyName} API Key"
+msgstr "{apiKeyName} 应用程序接口密钥"
diff --git a/packages/twenty-front/src/locales/zh.po b/packages/twenty-front/src/locales/zh.po
new file mode 100644
index 000000000000..737e8f1737c5
--- /dev/null
+++ b/packages/twenty-front/src/locales/zh.po
@@ -0,0 +1,590 @@
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2025-01-16 21:57+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: @lingui/cli\n"
+"Language: zh\n"
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Plural-Forms: \n"
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:126
+#~ msgid "{0}"
+#~ msgstr ""
+
+#: src/modules/ui/input/components/ImageInput.tsx:157
+msgid "Abort"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:86
+msgid "About"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:321
+msgid "Account Deletion"
+msgstr ""
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:21
+msgid "Accounts"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:193
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:201
+msgid "Active"
+msgstr ""
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:50
+msgid "Active API keys created by you or your team."
+msgstr ""
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:50
+#~ msgid "Active APIs keys created by you or your team."
+#~ msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:149
+msgid "Add object"
+msgstr ""
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:49
+msgid "API keys"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:37
+msgid "Appearance"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:190
+msgid "Are you sure that you want to change your billing interval?"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:190
+#~ msgid "Are you sure that you want to change your billing interval? {5}"
+#~ msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:189
+#~ msgid "Are you sure that you want to change your billing interval? {impact}"
+#~ msgstr ""
+
+#: src/pages/settings/security/SettingsSecurity.tsx:63
+msgid "Authentication"
+msgstr ""
+
+#: src/pages/not-found/NotFound.tsx:58
+msgid "Back to content"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:129
+#: src/pages/settings/SettingsBilling.tsx:135
+msgid "Billing"
+msgstr ""
+
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:14
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:24
+msgid "Calendars"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:175
+msgid "Cancel Plan"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:170
+msgid "Cancel your subscription"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:194
+#~ msgid "Change {6}"
+#~ msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:194
+msgid "Change {to}"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:86
+msgid "Chinese"
+msgstr ""
+
+#: src/pages/settings/security/SettingsSecurity.tsx:48
+msgid "Configure an SSO connection"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:43
+msgid "Configure how dates are displayed across the app"
+msgstr ""
+
+#: src/pages/onboarding/InviteTeam.tsx:228
+msgid "Continue"
+msgstr ""
+
+#: src/pages/onboarding/InviteTeam.tsx:217
+msgid "Copy invitation link"
+msgstr ""
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:56
+msgid "Create API key"
+msgstr ""
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:72
+msgid "Create Webhook"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspace.tsx:56
+msgid "Customize Domain"
+msgstr ""
+
+#: src/pages/settings/security/SettingsSecurity.tsx:64
+msgid "Customize your workspace security"
+msgstr ""
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:30
+msgid "Danger zone"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:144
+msgid "Data model"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:42
+msgid "Date and time"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:87
+msgid "Define the name and description of your object"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:332
+msgid "Delete account"
+msgstr ""
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:36
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:54
+msgid "Delete workspace"
+msgstr ""
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:31
+msgid "Delete your whole workspace"
+msgstr ""
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:35
+#: src/pages/settings/developers/SettingsDevelopers.tsx:42
+msgid "Developers"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspace.tsx:51
+#: src/pages/settings/workspace/SettingsDomain.tsx:125
+#: src/pages/settings/workspace/SettingsDomain.tsx:135
+#: src/pages/settings/workspace/SettingsDomain.tsx:150
+msgid "Domain"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:157
+msgid "Edit billing interval"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:145
+msgid "Edit payment method, see your invoices and more"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspace.tsx:52
+msgid "Edit your subdomain name or set a custom domain."
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:180
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:256
+#: src/pages/settings/SettingsProfile.tsx:42
+msgid "Email"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:82
+msgid "English"
+msgstr ""
+
+#: src/pages/settings/security/SettingsSecurity.tsx:51
+msgid "Enterprise"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:118
+#~ msgid "Error while switching subscription {1}."
+#~ msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:121
+msgid "Error while switching subscription {to}."
+msgstr ""
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:66
+msgid "Establish Webhook endpoints for notifications on asynchronous events."
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:167
+msgid "Existing objects"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:26
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:32
+msgid "Experience"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:259
+msgid "Expires in"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:57
+msgid "Failed to create object"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:42
+msgid "Fields"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:66
+msgid "French"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:45
+msgid "from monthly to yearly"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:52
+msgid "from yearly to monthly"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspace.tsx:29
+#: src/pages/settings/SettingsWorkspace.tsx:35
+#: src/pages/settings/workspace/SettingsDomain.tsx:132
+msgid "General"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:70
+msgid "German"
+msgstr ""
+
+#: src/pages/onboarding/InviteTeam.tsx:184
+msgid "Get the most out of your workspace by inviting your team."
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspace.tsx:65
+msgid "Grant Twenty support temporary access to your workspace so we can troubleshoot problems or recover content on your behalf. You can revoke access at any time."
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:217
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:215
+msgid "Inactive"
+msgstr ""
+
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:15
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:21
+msgid "Integrations"
+msgstr ""
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:87
+msgid "Invalid form values"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:53
+msgid "Invalid object data"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:244
+msgid "Invite by email"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:157
+msgid "Invite by link"
+msgstr ""
+
+#: src/pages/onboarding/InviteTeam.tsx:152
+msgid "Invite link sent to email addresses"
+msgstr ""
+
+#: src/pages/onboarding/InviteTeam.tsx:181
+msgid "Invite your team"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:74
+msgid "Italian"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:51
+msgid "Language"
+msgstr ""
+
+#: src/pages/onboarding/InviteTeam.tsx:127
+msgid "Link copied to clipboard"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:167
+msgid "Manage Members"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:168
+msgid "Manage the members of your space here"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:144
+msgid "Manage your subscription"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:143
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:149
+msgid "Members"
+msgstr ""
+
+#: src/pages/settings/crm-migration/SettingsCRMMigration.tsx:22
+#: src/pages/settings/crm-migration/SettingsCRMMigration.tsx:28
+msgid "Migrate"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:177
+#: src/pages/settings/SettingsWorkspace.tsx:44
+#: src/pages/settings/SettingsProfile.tsx:35
+msgid "Name"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspace.tsx:44
+msgid "Name of your workspace"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:77
+msgid "New"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:67
+msgid "New Object"
+msgstr ""
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:108
+msgid "not allowed"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsNewObject.tsx:46
+msgid "Object created successfully"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:160
+#: src/pages/settings/data-model/SettingsNewObject.tsx:74
+msgid "Objects"
+msgstr ""
+
+#: src/pages/not-found/NotFound.tsx:47
+msgid "Off the beaten path"
+msgstr ""
+
+#: src/pages/onboarding/InviteTeam.tsx:213
+msgid "or"
+msgstr ""
+
+#: src/pages/not-found/NotFound.tsx:41
+msgid "Page Not Found | Twenty"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspace.tsx:40
+#: src/pages/settings/SettingsProfile.tsx:30
+msgid "Picture"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:62
+msgid "Portuguese"
+msgstr ""
+
+#: src/pages/settings/SettingsProfile.tsx:19
+#: src/pages/settings/SettingsProfile.tsx:25
+msgid "Profile"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:93
+msgid "Pseudo-English"
+msgstr ""
+
+#: src/pages/settings/Releases.tsx:111
+#: src/pages/settings/Releases.tsx:117
+msgid "Releases"
+msgstr ""
+
+#: src/modules/ui/input/components/ImageInput.tsx:173
+msgid "Remove"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjectFieldTable.tsx:183
+msgid "Search a field..."
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:116
+msgid "Search an index..."
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:171
+#~ msgid "Search an object..."
+#~ msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjects.tsx:171
+msgid "Search for an object..."
+msgstr ""
+
+#: src/pages/settings/security/SettingsSecurity.tsx:33
+#: src/pages/settings/security/SettingsSecurity.tsx:40
+msgid "Security"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:52
+msgid "Select your preferred language"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:245
+msgid "Send an invite email to your team"
+msgstr ""
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:151
+msgid "Set the name of your subdomain"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:158
+msgid "Share this link to invite users to join your workspace"
+msgstr ""
+
+#: src/pages/onboarding/InviteTeam.tsx:236
+msgid "Skip"
+msgstr ""
+
+#: src/pages/settings/profile/appearance/components/LocalePicker.tsx:78
+msgid "Spanish"
+msgstr ""
+
+#: src/pages/settings/security/SettingsSecurity.tsx:47
+msgid "SSO"
+msgstr ""
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:107
+msgid "Subdomain already taken"
+msgstr ""
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:49
+msgid "Subdomain can not be longer than 30 characters"
+msgstr ""
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:48
+msgid "Subdomain can not be shorter than 3 characters"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:113
+#~ msgid "Subscription has been switched {0}"
+#~ msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:117
+msgid "Subscription has been switched {to}"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspace.tsx:63
+msgid "Support"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:157
+#~ msgid "Switch {2}"
+#~ msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:161
+#~ msgid "Switch {3}"
+#~ msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:158
+msgid "Switch {from}"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:162
+msgid "Switch {to}"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:187
+#~ msgid "Switch billing {4}"
+#~ msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:188
+msgid "Switch billing {to}"
+msgstr ""
+
+#: src/pages/settings/SettingsProfile.tsx:43
+msgid "The email associated to your account"
+msgstr ""
+
+#: src/pages/not-found/NotFound.tsx:50
+msgid "The page you're seeking is either gone or never was. Let's get you back on track"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:323
+msgid "This action cannot be undone. This will permanently delete this user and remove them from all their assignements."
+msgstr ""
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:48
+msgid "This action cannot be undone. This will permanently delete your entire workspace. <0/> Please type in your email to confirm."
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:51
+msgid "to monthly"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:44
+msgid "to yearly"
+msgstr ""
+
+#: src/pages/settings/data-model/SettingsObjectIndexTable.tsx:55
+msgid "Type"
+msgstr ""
+
+#: src/modules/ui/input/components/ImageInput.tsx:165
+msgid "Upload"
+msgstr ""
+
+#: src/pages/settings/workspace/SettingsDomain.tsx:51
+msgid "Use letter, number and dash only. Start and finish with a letter or a number"
+msgstr ""
+
+#: src/pages/settings/SettingsProfile.tsx:22
+#: src/pages/settings/profile/appearance/components/SettingsExperience.tsx:29
+#: src/pages/settings/accounts/SettingsAccountsCalendars.tsx:17
+msgid "User"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:149
+msgid "View billing details"
+msgstr ""
+
+#: src/pages/settings/developers/SettingsDevelopers.tsx:65
+msgid "Webhooks"
+msgstr ""
+
+#: src/pages/settings/SettingsWorkspaceMembers.tsx:146
+#: src/pages/settings/SettingsWorkspace.tsx:32
+#: src/pages/settings/SettingsBilling.tsx:132
+#: src/pages/settings/Releases.tsx:114
+#: src/pages/settings/workspace/SettingsDomain.tsx:128
+#: src/pages/settings/security/SettingsSecurity.tsx:37
+#: src/pages/settings/integrations/SettingsIntegrations.tsx:18
+#: src/pages/settings/developers/SettingsDevelopers.tsx:39
+#: src/pages/settings/data-model/SettingsObjects.tsx:157
+#: src/pages/settings/data-model/SettingsNewObject.tsx:70
+#: src/pages/settings/crm-migration/SettingsCRMMigration.tsx:25
+msgid "Workspace"
+msgstr ""
+
+#: src/modules/settings/profile/components/DeleteWorkspace.tsx:46
+msgid "Workspace Deletion"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:46
+msgid "You will be charged immediately for the full year."
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:53
+msgid "Your credit balance will be used to pay the monthly bills."
+msgstr ""
+
+#: src/pages/settings/SettingsProfile.tsx:36
+msgid "Your name as it will be displayed"
+msgstr ""
+
+#: src/pages/settings/SettingsBilling.tsx:171
+msgid "Your workspace will be disabled"
+msgstr ""
diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/components/RecordActionMenuEntriesSetter.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/components/RecordActionMenuEntriesSetter.tsx
index 5ae6cf1d6bd6..15f8d08502ba 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/components/RecordActionMenuEntriesSetter.tsx
+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/components/RecordActionMenuEntriesSetter.tsx
@@ -35,8 +35,8 @@ export const RecordActionMenuEntriesSetter = () => {
     FeatureFlagKey.IsWorkflowEnabled,
   );
 
-  const isPageHeaderV2Enabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsPageHeaderV2Enabled,
+  const isCommandMenuV2Enabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsCommandMenuV2Enabled,
   );
 
   if (
@@ -53,7 +53,7 @@ export const RecordActionMenuEntriesSetter = () => {
 
   const actionConfig = getActionConfig(
     objectMetadataItem,
-    isPageHeaderV2Enabled,
+    isCommandMenuV2Enabled,
   );
 
   const actionsToRegister = isDefined(viewType)
diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/constants/DefaultActionsConfigV2.ts b/packages/twenty-front/src/modules/action-menu/actions/record-actions/constants/DefaultActionsConfigV2.ts
index f7dd5b223500..c68e731d360c 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/constants/DefaultActionsConfigV2.ts
+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/constants/DefaultActionsConfigV2.ts
@@ -1,6 +1,7 @@
 import { useDeleteMultipleRecordsAction } from '@/action-menu/actions/record-actions/multiple-records/hooks/useDeleteMultipleRecordsAction';
 import { useExportMultipleRecordsAction } from '@/action-menu/actions/record-actions/multiple-records/hooks/useExportMultipleRecordsAction';
 import { MultipleRecordsActionKeys } from '@/action-menu/actions/record-actions/multiple-records/types/MultipleRecordsActionKeys';
+import { useCreateNewTableRecordNoSelectionRecordAction } from '@/action-menu/actions/record-actions/no-selection/hooks/useCreateNewTableRecordNoSelectionRecordAction';
 import { NoSelectionRecordActionKeys } from '@/action-menu/actions/record-actions/no-selection/types/NoSelectionRecordActionsKey';
 import { useAddToFavoritesSingleRecordAction } from '@/action-menu/actions/record-actions/single-record/hooks/useAddToFavoritesSingleRecordAction';
 import { useDeleteSingleRecordAction } from '@/action-menu/actions/record-actions/single-record/hooks/useDeleteSingleRecordAction';
@@ -24,6 +25,7 @@ import {
   IconFileExport,
   IconHeart,
   IconHeartOff,
+  IconPlus,
   IconTrash,
   IconTrashX,
 } from 'twenty-ui';
@@ -34,6 +36,18 @@ export const DEFAULT_ACTIONS_CONFIG_V2: Record<
     actionHook: ActionHook;
   }
 > = {
+  createNewRecord: {
+    type: ActionMenuEntryType.Standard,
+    scope: ActionMenuEntryScope.RecordSelection,
+    key: NoSelectionRecordActionKeys.CREATE_NEW_RECORD,
+    label: 'Create new record',
+    shortLabel: 'New record',
+    position: 0,
+    isPinned: true,
+    Icon: IconPlus,
+    availableOn: [ActionViewType.INDEX_PAGE_NO_SELECTION],
+    actionHook: useCreateNewTableRecordNoSelectionRecordAction,
+  },
   exportNoteToPdf: {
     type: ActionMenuEntryType.Standard,
     scope: ActionMenuEntryScope.RecordSelection,
diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/constants/WorkflowActionsConfig.ts b/packages/twenty-front/src/modules/action-menu/actions/record-actions/constants/WorkflowActionsConfig.ts
index ea7775c1b90f..f3a669850fa5 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/constants/WorkflowActionsConfig.ts
+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/constants/WorkflowActionsConfig.ts
@@ -1,6 +1,7 @@
 import { useDeleteMultipleRecordsAction } from '@/action-menu/actions/record-actions/multiple-records/hooks/useDeleteMultipleRecordsAction';
 import { useExportMultipleRecordsAction } from '@/action-menu/actions/record-actions/multiple-records/hooks/useExportMultipleRecordsAction';
 import { MultipleRecordsActionKeys } from '@/action-menu/actions/record-actions/multiple-records/types/MultipleRecordsActionKeys';
+import { useCreateNewTableRecordNoSelectionRecordAction } from '@/action-menu/actions/record-actions/no-selection/hooks/useCreateNewTableRecordNoSelectionRecordAction';
 import { NoSelectionRecordActionKeys } from '@/action-menu/actions/record-actions/no-selection/types/NoSelectionRecordActionsKey';
 import { useAddToFavoritesSingleRecordAction } from '@/action-menu/actions/record-actions/single-record/hooks/useAddToFavoritesSingleRecordAction';
 import { useDeleteSingleRecordAction } from '@/action-menu/actions/record-actions/single-record/hooks/useDeleteSingleRecordAction';
@@ -34,6 +35,7 @@ import {
   IconHistoryToggle,
   IconPlayerPause,
   IconPlayerPlay,
+  IconPlus,
   IconPower,
   IconTrash,
   IconTrashX,
@@ -45,12 +47,24 @@ export const WORKFLOW_ACTIONS_CONFIG: Record<
     actionHook: ActionHook;
   }
 > = {
+  createNewRecord: {
+    type: ActionMenuEntryType.Standard,
+    scope: ActionMenuEntryScope.RecordSelection,
+    key: NoSelectionRecordActionKeys.CREATE_NEW_RECORD,
+    label: 'Create new record',
+    shortLabel: 'New record',
+    position: 0,
+    isPinned: true,
+    Icon: IconPlus,
+    availableOn: [ActionViewType.INDEX_PAGE_NO_SELECTION],
+    actionHook: useCreateNewTableRecordNoSelectionRecordAction,
+  },
   activateWorkflowSingleRecord: {
     key: WorkflowSingleRecordActionKeys.ACTIVATE,
     label: 'Activate Workflow',
     shortLabel: 'Activate',
     isPinned: true,
-    position: 0,
+    position: 1,
     Icon: IconPower,
     type: ActionMenuEntryType.Standard,
     scope: ActionMenuEntryScope.RecordSelection,
@@ -65,7 +79,7 @@ export const WORKFLOW_ACTIONS_CONFIG: Record<
     label: 'Deactivate Workflow',
     shortLabel: 'Deactivate',
     isPinned: true,
-    position: 1,
+    position: 2,
     Icon: IconPlayerPause,
     type: ActionMenuEntryType.Standard,
     scope: ActionMenuEntryScope.RecordSelection,
@@ -80,7 +94,7 @@ export const WORKFLOW_ACTIONS_CONFIG: Record<
     label: 'Discard Draft',
     shortLabel: 'Discard Draft',
     isPinned: true,
-    position: 2,
+    position: 3,
     Icon: IconTrash,
     type: ActionMenuEntryType.Standard,
     scope: ActionMenuEntryScope.RecordSelection,
@@ -95,7 +109,7 @@ export const WORKFLOW_ACTIONS_CONFIG: Record<
     label: 'See active version',
     shortLabel: 'See active version',
     isPinned: false,
-    position: 3,
+    position: 4,
     Icon: IconHistory,
     type: ActionMenuEntryType.Standard,
     scope: ActionMenuEntryScope.RecordSelection,
@@ -110,7 +124,7 @@ export const WORKFLOW_ACTIONS_CONFIG: Record<
     label: 'See runs',
     shortLabel: 'See runs',
     isPinned: false,
-    position: 4,
+    position: 5,
     Icon: IconHistoryToggle,
     type: ActionMenuEntryType.Standard,
     scope: ActionMenuEntryScope.RecordSelection,
@@ -125,7 +139,7 @@ export const WORKFLOW_ACTIONS_CONFIG: Record<
     label: 'See versions history',
     shortLabel: 'See versions',
     isPinned: false,
-    position: 5,
+    position: 6,
     Icon: IconHistory,
     type: ActionMenuEntryType.Standard,
     scope: ActionMenuEntryScope.RecordSelection,
@@ -140,7 +154,7 @@ export const WORKFLOW_ACTIONS_CONFIG: Record<
     label: 'Test Workflow',
     shortLabel: 'Test',
     isPinned: true,
-    position: 6,
+    position: 7,
     Icon: IconPlayerPlay,
     type: ActionMenuEntryType.Standard,
     scope: ActionMenuEntryScope.RecordSelection,
@@ -156,7 +170,7 @@ export const WORKFLOW_ACTIONS_CONFIG: Record<
     key: SingleRecordActionKeys.NAVIGATE_TO_PREVIOUS_RECORD,
     label: 'Navigate to previous workflow',
     shortLabel: '',
-    position: 7,
+    position: 8,
     Icon: IconChevronUp,
     availableOn: [ActionViewType.SHOW_PAGE],
     actionHook: useNavigateToPreviousRecordSingleRecordAction,
@@ -167,7 +181,7 @@ export const WORKFLOW_ACTIONS_CONFIG: Record<
     key: SingleRecordActionKeys.NAVIGATE_TO_NEXT_RECORD,
     label: 'Navigate to next workflow',
     shortLabel: '',
-    position: 8,
+    position: 9,
     Icon: IconChevronDown,
     availableOn: [ActionViewType.SHOW_PAGE],
     actionHook: useNavigateToNextRecordSingleRecordAction,
@@ -178,7 +192,7 @@ export const WORKFLOW_ACTIONS_CONFIG: Record<
     key: SingleRecordActionKeys.ADD_TO_FAVORITES,
     label: 'Add to favorites',
     shortLabel: 'Add to favorites',
-    position: 9,
+    position: 10,
     isPinned: false,
     Icon: IconHeart,
     availableOn: [
@@ -194,7 +208,7 @@ export const WORKFLOW_ACTIONS_CONFIG: Record<
     label: 'Remove from favorites',
     shortLabel: 'Remove from favorites',
     isPinned: false,
-    position: 10,
+    position: 11,
     Icon: IconHeartOff,
     availableOn: [
       ActionViewType.INDEX_PAGE_SINGLE_RECORD_SELECTION,
@@ -208,7 +222,7 @@ export const WORKFLOW_ACTIONS_CONFIG: Record<
     key: SingleRecordActionKeys.DELETE,
     label: 'Delete record',
     shortLabel: 'Delete',
-    position: 11,
+    position: 12,
     Icon: IconTrash,
     accent: 'danger',
     isPinned: false,
@@ -224,7 +238,7 @@ export const WORKFLOW_ACTIONS_CONFIG: Record<
     key: MultipleRecordsActionKeys.DELETE,
     label: 'Delete records',
     shortLabel: 'Delete',
-    position: 12,
+    position: 13,
     Icon: IconTrash,
     accent: 'danger',
     isPinned: true,
@@ -237,7 +251,7 @@ export const WORKFLOW_ACTIONS_CONFIG: Record<
     key: SingleRecordActionKeys.DESTROY,
     label: 'Permanently destroy record',
     shortLabel: 'Destroy',
-    position: 13,
+    position: 14,
     Icon: IconTrashX,
     accent: 'danger',
     isPinned: false,
@@ -253,7 +267,7 @@ export const WORKFLOW_ACTIONS_CONFIG: Record<
     key: MultipleRecordsActionKeys.EXPORT,
     label: 'Export records',
     shortLabel: 'Export',
-    position: 14,
+    position: 15,
     Icon: IconDatabaseExport,
     accent: 'default',
     isPinned: false,
@@ -266,7 +280,7 @@ export const WORKFLOW_ACTIONS_CONFIG: Record<
     key: NoSelectionRecordActionKeys.EXPORT_VIEW,
     label: 'Export view',
     shortLabel: 'Export',
-    position: 15,
+    position: 16,
     Icon: IconDatabaseExport,
     accent: 'default',
     isPinned: false,
diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/hooks/useDeleteMultipleRecordsAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/hooks/useDeleteMultipleRecordsAction.tsx
index dfcbb5350d48..1bd31b625693 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/hooks/useDeleteMultipleRecordsAction.tsx
+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/multiple-records/hooks/useDeleteMultipleRecordsAction.tsx
@@ -8,8 +8,8 @@ import { DEFAULT_QUERY_PAGE_SIZE } from '@/object-record/constants/DefaultQueryP
 import { DELETE_MAX_COUNT } from '@/object-record/constants/DeleteMaxCount';
 import { useDeleteManyRecords } from '@/object-record/hooks/useDeleteManyRecords';
 import { useLazyFetchAllRecords } from '@/object-record/hooks/useLazyFetchAllRecords';
-import { FilterOperand } from '@/object-record/object-filter-dropdown/types/FilterOperand';
 import { useFilterValueDependencies } from '@/object-record/record-filter/hooks/useFilterValueDependencies';
+import { RecordFilterOperand } from '@/object-record/record-filter/types/RecordFilterOperand';
 import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
 import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
@@ -57,7 +57,7 @@ export const useDeleteMultipleRecordsAction: ActionHookWithObjectMetadataItem =
     const isDeletedFilterActive = contextStoreFilters.some(
       (filter) =>
         filter.fieldMetadataId === deletedAtFieldMetadata?.id &&
-        filter.operand === FilterOperand.IsNotEmpty,
+        filter.operand === RecordFilterOperand.IsNotEmpty,
     );
 
     const { fetchAllRecords: fetchAllRecordIds } = useLazyFetchAllRecords({
diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/no-selection/hooks/useCreateNewTableRecordNoSelectionRecordAction.ts b/packages/twenty-front/src/modules/action-menu/actions/record-actions/no-selection/hooks/useCreateNewTableRecordNoSelectionRecordAction.ts
new file mode 100644
index 000000000000..f640ff6a786f
--- /dev/null
+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/no-selection/hooks/useCreateNewTableRecordNoSelectionRecordAction.ts
@@ -0,0 +1,24 @@
+import { ActionHookWithObjectMetadataItem } from '@/action-menu/actions/types/ActionHook';
+import { useCreateNewTableRecord } from '@/object-record/record-table/hooks/useCreateNewTableRecords';
+import { getRecordIndexIdFromObjectNamePlural } from '@/object-record/utils/getRecordIndexIdFromObjectNamePlural';
+
+export const useCreateNewTableRecordNoSelectionRecordAction: ActionHookWithObjectMetadataItem =
+  ({ objectMetadataItem }) => {
+    const recordTableId = getRecordIndexIdFromObjectNamePlural(
+      objectMetadataItem.namePlural,
+    );
+
+    const { createNewTableRecord } = useCreateNewTableRecord({
+      objectMetadataItem,
+      recordTableId,
+    });
+
+    const onClick = () => {
+      createNewTableRecord();
+    };
+
+    return {
+      shouldBeRegistered: true,
+      onClick,
+    };
+  };
diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/no-selection/types/NoSelectionRecordActionsKey.ts b/packages/twenty-front/src/modules/action-menu/actions/record-actions/no-selection/types/NoSelectionRecordActionsKey.ts
index 1b56de13e6fe..606b49928a28 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/no-selection/types/NoSelectionRecordActionsKey.ts
+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/no-selection/types/NoSelectionRecordActionsKey.ts
@@ -1,3 +1,4 @@
 export enum NoSelectionRecordActionKeys {
   EXPORT_VIEW = 'export-view-no-selection',
+  CREATE_NEW_RECORD = 'create-new-record-no-selection',
 }
diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/types/SingleRecordActionsKey.ts b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/types/SingleRecordActionsKey.ts
index b711d8076a81..128faca609a0 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/types/SingleRecordActionsKey.ts
+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/types/SingleRecordActionsKey.ts
@@ -5,5 +5,5 @@ export enum SingleRecordActionKeys {
   REMOVE_FROM_FAVORITES = 'remove-from-favorites-single-record',
   NAVIGATE_TO_NEXT_RECORD = 'navigate-to-next-record-single-record',
   NAVIGATE_TO_PREVIOUS_RECORD = 'navigate-to-previous-record-single-record',
-  EXPORT_NOTE_TO_PDF = 'export-note-to-pdf',
+  EXPORT_NOTE_TO_PDF = 'export-note-to-pdf-single-record',
 }
diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeActiveVersionWorkflowSingleRecordAction.ts b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeActiveVersionWorkflowSingleRecordAction.ts
index 527df28b493e..e5d653c8887e 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeActiveVersionWorkflowSingleRecordAction.ts
+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeActiveVersionWorkflowSingleRecordAction.ts
@@ -1,10 +1,11 @@
 import { useSelectedRecordIdOrThrow } from '@/action-menu/actions/record-actions/single-record/hooks/useSelectedRecordIdOrThrow';
 import { ActionHookWithoutObjectMetadataItem } from '@/action-menu/actions/types/ActionHook';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { AppPath } from '@/types/AppPath';
 import { useActiveWorkflowVersion } from '@/workflow/hooks/useActiveWorkflowVersion';
 import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
-import { useNavigate } from 'react-router-dom';
 import { isDefined } from 'twenty-ui';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
 
 export const useSeeActiveVersionWorkflowSingleRecordAction: ActionHookWithoutObjectMetadataItem =
   () => {
@@ -16,7 +17,7 @@ export const useSeeActiveVersionWorkflowSingleRecordAction: ActionHookWithoutObj
 
     const workflowActiveVersion = useActiveWorkflowVersion(recordId);
 
-    const navigate = useNavigate();
+    const navigateApp = useNavigateApp();
 
     const shouldBeRegistered = isDefined(workflowActiveVersion) && isDraft;
 
@@ -25,9 +26,10 @@ export const useSeeActiveVersionWorkflowSingleRecordAction: ActionHookWithoutObj
         return;
       }
 
-      navigate(
-        `/object/${CoreObjectNameSingular.WorkflowVersion}/${workflowActiveVersion.id}`,
-      );
+      navigateApp(AppPath.RecordShowPage, {
+        objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
+        objectRecordId: workflowActiveVersion.id,
+      });
     };
 
     return {
diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeRunsWorkflowSingleRecordAction.ts b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeRunsWorkflowSingleRecordAction.ts
index 0b245f7f3e9a..b5933d9a9f1a 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeRunsWorkflowSingleRecordAction.ts
+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeRunsWorkflowSingleRecordAction.ts
@@ -1,11 +1,11 @@
 import { useSelectedRecordIdOrThrow } from '@/action-menu/actions/record-actions/single-record/hooks/useSelectedRecordIdOrThrow';
 import { ActionHookWithoutObjectMetadataItem } from '@/action-menu/actions/types/ActionHook';
 import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';
+import { AppPath } from '@/types/AppPath';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
-import qs from 'qs';
-import { useNavigate } from 'react-router-dom';
 import { isDefined } from 'twenty-ui';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
 
 export const useSeeRunsWorkflowSingleRecordAction: ActionHookWithoutObjectMetadataItem =
   () => {
@@ -13,7 +13,7 @@ export const useSeeRunsWorkflowSingleRecordAction: ActionHookWithoutObjectMetada
 
     const workflowWithCurrentVersion = useWorkflowWithCurrentVersion(recordId);
 
-    const navigate = useNavigate();
+    const navigateApp = useNavigateApp();
 
     const shouldBeRegistered = isDefined(workflowWithCurrentVersion);
 
@@ -22,20 +22,21 @@ export const useSeeRunsWorkflowSingleRecordAction: ActionHookWithoutObjectMetada
         return;
       }
 
-      const filterQueryParams = {
-        filter: {
-          workflow: {
-            [ViewFilterOperand.Is]: {
-              selectedRecordIds: [workflowWithCurrentVersion.id],
+      navigateApp(
+        AppPath.RecordIndexPage,
+        {
+          objectNamePlural: CoreObjectNamePlural.WorkflowRun,
+        },
+        {
+          filter: {
+            workflow: {
+              [ViewFilterOperand.Is]: {
+                selectedRecordIds: [workflowWithCurrentVersion.id],
+              },
             },
           },
         },
-      };
-      const filterLinkHref = `/objects/${CoreObjectNamePlural.WorkflowRun}?${qs.stringify(
-        filterQueryParams,
-      )}`;
-
-      navigate(filterLinkHref);
+      );
     };
 
     return {
diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeVersionsWorkflowSingleRecordAction.ts b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeVersionsWorkflowSingleRecordAction.ts
index 6abcc39932f2..bb2f70f8b0de 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeVersionsWorkflowSingleRecordAction.ts
+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-actions/hooks/useSeeVersionsWorkflowSingleRecordAction.ts
@@ -1,11 +1,11 @@
 import { useSelectedRecordIdOrThrow } from '@/action-menu/actions/record-actions/single-record/hooks/useSelectedRecordIdOrThrow';
 import { ActionHookWithoutObjectMetadataItem } from '@/action-menu/actions/types/ActionHook';
 import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';
+import { AppPath } from '@/types/AppPath';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
-import qs from 'qs';
-import { useNavigate } from 'react-router-dom';
 import { isDefined } from 'twenty-ui';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
 
 export const useSeeVersionsWorkflowSingleRecordAction: ActionHookWithoutObjectMetadataItem =
   () => {
@@ -13,29 +13,28 @@ export const useSeeVersionsWorkflowSingleRecordAction: ActionHookWithoutObjectMe
 
     const workflowWithCurrentVersion = useWorkflowWithCurrentVersion(recordId);
 
-    const navigate = useNavigate();
+    const navigateApp = useNavigateApp();
 
     const shouldBeRegistered = isDefined(workflowWithCurrentVersion);
 
     const onClick = () => {
-      if (!shouldBeRegistered) {
-        return;
-      }
+      if (!shouldBeRegistered) return;
 
-      const filterQueryParams = {
-        filter: {
-          workflow: {
-            [ViewFilterOperand.Is]: {
-              selectedRecordIds: [workflowWithCurrentVersion.id],
+      navigateApp(
+        AppPath.RecordIndexPage,
+        {
+          objectNamePlural: CoreObjectNamePlural.WorkflowVersion,
+        },
+        {
+          filter: {
+            workflow: {
+              [ViewFilterOperand.Is]: {
+                selectedRecordIds: [workflowWithCurrentVersion.id],
+              },
             },
           },
         },
-      };
-      const filterLinkHref = `/objects/${CoreObjectNamePlural.WorkflowVersion}?${qs.stringify(
-        filterQueryParams,
-      )}`;
-
-      navigate(filterLinkHref);
+      );
     };
 
     return {
diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/hooks/useSeeRunsWorkflowVersionSingleRecordAction.ts b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/hooks/useSeeRunsWorkflowVersionSingleRecordAction.ts
index ab5e2795df1b..dc3c0a33bbd1 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/hooks/useSeeRunsWorkflowVersionSingleRecordAction.ts
+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/hooks/useSeeRunsWorkflowVersionSingleRecordAction.ts
@@ -2,12 +2,12 @@ import { useSelectedRecordIdOrThrow } from '@/action-menu/actions/record-actions
 import { ActionHookWithoutObjectMetadataItem } from '@/action-menu/actions/types/ActionHook';
 import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
+import { AppPath } from '@/types/AppPath';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
-import qs from 'qs';
-import { useNavigate } from 'react-router-dom';
 import { useRecoilValue } from 'recoil';
 import { isDefined } from 'twenty-ui';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
 
 export const useSeeRunsWorkflowVersionSingleRecordAction: ActionHookWithoutObjectMetadataItem =
   () => {
@@ -19,32 +19,33 @@ export const useSeeRunsWorkflowVersionSingleRecordAction: ActionHookWithoutObjec
       workflowVersion?.workflow.id,
     );
 
-    const navigate = useNavigate();
+    const navigateApp = useNavigateApp();
 
     const shouldBeRegistered = isDefined(workflowWithCurrentVersion);
 
     const onClick = () => {
       if (!shouldBeRegistered) return;
 
-      const filterQueryParams = {
-        filter: {
-          workflow: {
-            [ViewFilterOperand.Is]: {
-              selectedRecordIds: [workflowWithCurrentVersion.id],
+      navigateApp(
+        AppPath.RecordIndexPage,
+        {
+          objectNamePlural: CoreObjectNamePlural.WorkflowRun,
+        },
+        {
+          filter: {
+            workflow: {
+              [ViewFilterOperand.Is]: {
+                selectedRecordIds: [workflowWithCurrentVersion.id],
+              },
             },
-          },
-          workflowVersion: {
-            [ViewFilterOperand.Is]: {
-              selectedRecordIds: [recordId],
+            workflowVersion: {
+              [ViewFilterOperand.Is]: {
+                selectedRecordIds: [recordId],
+              },
             },
           },
         },
-      };
-      const filterLinkHref = `/objects/${CoreObjectNamePlural.WorkflowRun}?${qs.stringify(
-        filterQueryParams,
-      )}`;
-
-      navigate(filterLinkHref);
+      );
     };
 
     return {
diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/hooks/useSeeVersionsWorkflowVersionSingleRecordAction.ts b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/hooks/useSeeVersionsWorkflowVersionSingleRecordAction.ts
index 61bb53994d58..01c6340bda56 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/hooks/useSeeVersionsWorkflowVersionSingleRecordAction.ts
+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/hooks/useSeeVersionsWorkflowVersionSingleRecordAction.ts
@@ -2,12 +2,12 @@ import { useSelectedRecordIdOrThrow } from '@/action-menu/actions/record-actions
 import { ActionHookWithoutObjectMetadataItem } from '@/action-menu/actions/types/ActionHook';
 import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
+import { AppPath } from '@/types/AppPath';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
-import qs from 'qs';
-import { useNavigate } from 'react-router-dom';
 import { useRecoilValue } from 'recoil';
 import { isDefined } from 'twenty-ui';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
 
 export const useSeeVersionsWorkflowVersionSingleRecordAction: ActionHookWithoutObjectMetadataItem =
   () => {
@@ -19,29 +19,28 @@ export const useSeeVersionsWorkflowVersionSingleRecordAction: ActionHookWithoutO
       workflowVersion?.workflowId,
     );
 
-    const navigate = useNavigate();
+    const navigateApp = useNavigateApp();
 
     const shouldBeRegistered = isDefined(workflowWithCurrentVersion);
 
     const onClick = () => {
-      if (!shouldBeRegistered) {
-        return;
-      }
-
-      const filterQueryParams = {
-        filter: {
-          workflow: {
-            [ViewFilterOperand.Is]: {
-              selectedRecordIds: [workflowWithCurrentVersion.id],
+      if (!shouldBeRegistered) return;
+
+      navigateApp(
+        AppPath.RecordIndexPage,
+        {
+          objectNamePlural: CoreObjectNamePlural.WorkflowVersion,
+        },
+        {
+          filter: {
+            workflow: {
+              [ViewFilterOperand.Is]: {
+                selectedRecordIds: [workflowWithCurrentVersion.id],
+              },
             },
           },
         },
-      };
-      const filterLinkHref = `/objects/${CoreObjectNamePlural.WorkflowVersion}?${qs.stringify(
-        filterQueryParams,
-      )}`;
-
-      navigate(filterLinkHref);
+      );
     };
 
     return {
diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/hooks/useUseAsDraftWorkflowVersionSingleRecordAction.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/hooks/useUseAsDraftWorkflowVersionSingleRecordAction.tsx
index ead701182b18..3f94091f26a4 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/hooks/useUseAsDraftWorkflowVersionSingleRecordAction.tsx
+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/single-record/workflow-version-actions/hooks/useUseAsDraftWorkflowVersionSingleRecordAction.tsx
@@ -1,15 +1,15 @@
 import { useSelectedRecordIdOrThrow } from '@/action-menu/actions/record-actions/single-record/hooks/useSelectedRecordIdOrThrow';
 import { ActionHookWithoutObjectMetadataItem } from '@/action-menu/actions/types/ActionHook';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { buildShowPageURL } from '@/object-record/record-show/utils/buildShowPageURL';
+import { AppPath } from '@/types/AppPath';
 import { OverrideWorkflowDraftConfirmationModal } from '@/workflow/components/OverrideWorkflowDraftConfirmationModal';
 import { useCreateDraftFromWorkflowVersion } from '@/workflow/hooks/useCreateDraftFromWorkflowVersion';
 import { useWorkflowVersion } from '@/workflow/hooks/useWorkflowVersion';
 import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
 import { openOverrideWorkflowDraftConfirmationModalState } from '@/workflow/states/openOverrideWorkflowDraftConfirmationModalState';
-import { useNavigate } from 'react-router-dom';
 import { useSetRecoilState } from 'recoil';
 import { isDefined } from 'twenty-ui';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
 
 export const useUseAsDraftWorkflowVersionSingleRecordAction: ActionHookWithoutObjectMetadataItem =
   () => {
@@ -28,7 +28,7 @@ export const useUseAsDraftWorkflowVersionSingleRecordAction: ActionHookWithoutOb
       openOverrideWorkflowDraftConfirmationModalState,
     );
 
-    const navigate = useNavigate();
+    const navigate = useNavigateApp();
 
     const hasAlreadyDraftVersion =
       workflow?.versions.some((version) => version.status === 'DRAFT') || false;
@@ -48,13 +48,10 @@ export const useUseAsDraftWorkflowVersionSingleRecordAction: ActionHookWithoutOb
           workflowId: workflowVersion.workflow.id,
           workflowVersionIdToCopy: workflowVersion.id,
         });
-
-        navigate(
-          buildShowPageURL(
-            CoreObjectNameSingular.Workflow,
-            workflowVersion.workflow.id,
-          ),
-        );
+        navigate(AppPath.RecordShowPage, {
+          objectNameSingular: CoreObjectNameSingular.Workflow,
+          objectRecordId: workflowVersion.workflow.id,
+        });
       }
     };
 
diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/workflow-run-record-actions/hooks/useWorkflowRunRecordActions.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/workflow-run-record-actions/hooks/useWorkflowRunRecordActions.tsx
index c46f2d29154e..a341ea839d40 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/workflow-run-record-actions/hooks/useWorkflowRunRecordActions.tsx
+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/workflow-run-record-actions/hooks/useWorkflowRunRecordActions.tsx
@@ -13,7 +13,6 @@ import { useRunWorkflowVersion } from '@/workflow/hooks/useRunWorkflowVersion';
 import { useRecoilValue } from 'recoil';
 import { capitalize } from 'twenty-shared';
 import { IconSettingsAutomation, isDefined } from 'twenty-ui';
-
 export const useWorkflowRunRecordActions = ({
   objectMetadataItem,
 }: {
diff --git a/packages/twenty-front/src/modules/action-menu/actions/utils/getActionConfig.ts b/packages/twenty-front/src/modules/action-menu/actions/utils/getActionConfig.ts
index 9d2cd4b216cf..c63566edaa6b 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/utils/getActionConfig.ts
+++ b/packages/twenty-front/src/modules/action-menu/actions/utils/getActionConfig.ts
@@ -8,7 +8,7 @@ import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 
 export const getActionConfig = (
   objectMetadataItem: ObjectMetadataItem,
-  isPageHeaderV2Enabled: boolean,
+  isCommandMenuV2Enabled: boolean,
 ) => {
   switch (objectMetadataItem.nameSingular) {
     case CoreObjectNameSingular.Workflow:
@@ -18,7 +18,7 @@ export const getActionConfig = (
     case CoreObjectNameSingular.WorkflowRun:
       return WORKFLOW_RUNS_ACTIONS_CONFIG;
     default:
-      return isPageHeaderV2Enabled
+      return isCommandMenuV2Enabled
         ? DEFAULT_ACTIONS_CONFIG_V2
         : DEFAULT_ACTIONS_CONFIG_V1;
   }
diff --git a/packages/twenty-front/src/modules/action-menu/components/CmdEnterActionButton.tsx b/packages/twenty-front/src/modules/action-menu/components/CmdEnterActionButton.tsx
index ae21df17c4d9..84951d3b24e9 100644
--- a/packages/twenty-front/src/modules/action-menu/components/CmdEnterActionButton.tsx
+++ b/packages/twenty-front/src/modules/action-menu/components/CmdEnterActionButton.tsx
@@ -1,7 +1,7 @@
-import { Button } from 'twenty-ui';
+import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { Key } from 'ts-key-enum';
-import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope';
+import { Button, getOsControlSymbol } from 'twenty-ui';
 
 export const CmdEnterActionButton = ({
   title,
@@ -24,7 +24,7 @@ export const CmdEnterActionButton = ({
       accent="blue"
       size="medium"
       onClick={onClick}
-      shortcut={'⌘⏎'}
+      hotkeys={[getOsControlSymbol(), '⏎']}
     />
   );
 };
diff --git a/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenu.tsx b/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenu.tsx
index 835322427d3b..2590dadd2465 100644
--- a/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenu.tsx
+++ b/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenu.tsx
@@ -25,8 +25,8 @@ export const RecordIndexActionMenu = ({ indexId }: { indexId: string }) => {
     FeatureFlagKey.IsWorkflowEnabled,
   );
 
-  const isPageHeaderV2Enabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsPageHeaderV2Enabled,
+  const isCommandMenuV2Enabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsCommandMenuV2Enabled,
   );
 
   const isMobile = useIsMobile();
@@ -54,7 +54,7 @@ export const RecordIndexActionMenu = ({ indexId }: { indexId: string }) => {
             },
           }}
         >
-          {isPageHeaderV2Enabled ? (
+          {isCommandMenuV2Enabled ? (
             <>{!isMobile && <RecordIndexActionMenuButtons />}</>
           ) : (
             <RecordIndexActionMenuBar />
diff --git a/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuBar.tsx b/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuBar.tsx
index 2800c622758c..bdecf9e79d26 100644
--- a/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuBar.tsx
+++ b/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuBar.tsx
@@ -39,9 +39,7 @@ export const RecordIndexActionMenuBar = () => {
   return (
     <BottomBar
       bottomBarId={getActionBarIdFromActionMenuId(actionMenuId)}
-      bottomBarHotkeyScopeFromParent={{
-        scope: ActionBarHotkeyScope.ActionBar,
-      }}
+      bottomBarHotkeyScopeFromParent={{ scope: ActionBarHotkeyScope.ActionBar }}
     >
       <StyledLabel>{contextStoreNumberOfSelectedRecords} selected:</StyledLabel>
       {pinnedEntries.map((entry, index) => (
diff --git a/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuBarAllActionsButton.tsx b/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuBarAllActionsButton.tsx
index 336b4f734879..9805b637507e 100644
--- a/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuBarAllActionsButton.tsx
+++ b/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuBarAllActionsButton.tsx
@@ -1,7 +1,7 @@
 import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-import { IconLayoutSidebarRightExpand } from 'twenty-ui';
+import { IconLayoutSidebarRightExpand, getOsControlSymbol } from 'twenty-ui';
 
 const StyledButton = styled.div`
   border-radius: ${({ theme }) => theme.border.radius.sm};
@@ -46,7 +46,7 @@ export const RecordIndexActionMenuBarAllActionsButton = () => {
         <IconLayoutSidebarRightExpand size={theme.icon.size.md} />
         <StyledButtonLabel>All Actions</StyledButtonLabel>
         <StyledSeparator size="sm" />
-        <StyledShortcutLabel>⌘K</StyledShortcutLabel>
+        <StyledShortcutLabel>{getOsControlSymbol()}K</StyledShortcutLabel>
       </StyledButton>
     </>
   );
diff --git a/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuButtons.tsx b/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuButtons.tsx
index 80c1080e0d58..04a45427c9fa 100644
--- a/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuButtons.tsx
+++ b/packages/twenty-front/src/modules/action-menu/components/RecordIndexActionMenuButtons.tsx
@@ -1,23 +1,14 @@
 import { actionMenuEntriesComponentSelector } from '@/action-menu/states/actionMenuEntriesComponentSelector';
-import { contextStoreNumberOfSelectedRecordsComponentState } from '@/context-store/states/contextStoreNumberOfSelectedRecordsComponentState';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { Button } from 'twenty-ui';
 
 export const RecordIndexActionMenuButtons = () => {
-  const contextStoreNumberOfSelectedRecords = useRecoilComponentValueV2(
-    contextStoreNumberOfSelectedRecordsComponentState,
-  );
-
   const actionMenuEntries = useRecoilComponentValueV2(
     actionMenuEntriesComponentSelector,
   );
 
   const pinnedEntries = actionMenuEntries.filter((entry) => entry.isPinned);
 
-  if (contextStoreNumberOfSelectedRecords === 0) {
-    return null;
-  }
-
   return (
     <>
       {pinnedEntries.map((entry, index) => (
diff --git a/packages/twenty-front/src/modules/action-menu/components/RecordShowActionMenu.tsx b/packages/twenty-front/src/modules/action-menu/components/RecordShowActionMenu.tsx
index a1df8e65518c..3d032945b3ed 100644
--- a/packages/twenty-front/src/modules/action-menu/components/RecordShowActionMenu.tsx
+++ b/packages/twenty-front/src/modules/action-menu/components/RecordShowActionMenu.tsx
@@ -33,8 +33,8 @@ export const RecordShowActionMenu = ({
     FeatureFlagKey.IsWorkflowEnabled,
   );
 
-  const isPageHeaderV2Enabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsPageHeaderV2Enabled,
+  const isCommandMenuV2Enabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsCommandMenuV2Enabled,
   );
 
   // TODO: refactor RecordShowPageBaseHeader to use the context store
@@ -48,7 +48,7 @@ export const RecordShowActionMenu = ({
             onActionExecutedCallback: () => {},
           }}
         >
-          {isPageHeaderV2Enabled ? (
+          {isCommandMenuV2Enabled ? (
             <RecordShowActionMenuButtons />
           ) : (
             <RecordShowPageBaseHeader
diff --git a/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerActionMenu.tsx b/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerActionMenu.tsx
index f1984ae41553..ac27204f36a4 100644
--- a/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerActionMenu.tsx
+++ b/packages/twenty-front/src/modules/action-menu/components/RecordShowRightDrawerActionMenu.tsx
@@ -21,11 +21,7 @@ export const RecordShowRightDrawerActionMenu = () => {
   return (
     <>
       {contextStoreCurrentObjectMetadataId && (
-        <ActionMenuContext.Provider
-          value={{
-            isInRightDrawer: true,
-          }}
-        >
+        <ActionMenuContext.Provider value={{ isInRightDrawer: true }}>
           <RightDrawerActionMenuDropdown />
           <ActionMenuConfirmationModals />
           <RecordActionMenuEntriesSetter />
diff --git a/packages/twenty-front/src/modules/action-menu/components/RightDrawerActionMenuDropdown.tsx b/packages/twenty-front/src/modules/action-menu/components/RightDrawerActionMenuDropdown.tsx
index 4c60207d9288..aae8ce6e2a28 100644
--- a/packages/twenty-front/src/modules/action-menu/components/RightDrawerActionMenuDropdown.tsx
+++ b/packages/twenty-front/src/modules/action-menu/components/RightDrawerActionMenuDropdown.tsx
@@ -8,11 +8,14 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
 import { useDropdownV2 } from '@/ui/layout/dropdown/hooks/useDropdownV2';
 import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
+import { AppHotkeyScope } from '@/ui/utilities/hotkey/types/AppHotkeyScope';
 import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 import { useTheme } from '@emotion/react';
 import { Key } from 'ts-key-enum';
-import { Button, MenuItem } from 'twenty-ui';
+import { Button, MenuItem, getOsControlSymbol } from 'twenty-ui';
+import { FeatureFlagKey } from '~/generated/graphql';
 
 export const RightDrawerActionMenuDropdown = () => {
   const actionMenuEntries = useRecoilComponentValueV2(
@@ -27,6 +30,10 @@ export const RightDrawerActionMenuDropdown = () => {
 
   const theme = useTheme();
 
+  const isCommandMenuV2Enabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsCommandMenuV2Enabled,
+  );
+
   useScopedHotkeys(
     [Key.Escape, 'ctrl+o,meta+o'],
     () => {
@@ -45,7 +52,9 @@ export const RightDrawerActionMenuDropdown = () => {
         getRightDrawerActionMenuDropdownIdFromActionMenuId(actionMenuId),
       );
     },
-    RightDrawerHotkeyScope.RightDrawer,
+    isCommandMenuV2Enabled
+      ? AppHotkeyScope.CommandMenuOpen
+      : RightDrawerHotkeyScope.RightDrawer,
     [openDropdown],
   );
 
@@ -59,11 +68,11 @@ export const RightDrawerActionMenuDropdown = () => {
           RightDrawerActionMenuDropdownHotkeyScope.RightDrawerActionMenuDropdown,
       }}
       data-select-disable
-      clickableComponent={<Button title="Actions" shortcut="⌘O" />}
+      clickableComponent={
+        <Button title="Actions" hotkeys={[getOsControlSymbol(), 'O']} />
+      }
       dropdownPlacement="top-end"
-      dropdownOffset={{
-        y: parseInt(theme.spacing(2), 10),
-      }}
+      dropdownOffset={{ y: parseInt(theme.spacing(2), 10) }}
       dropdownComponents={
         <DropdownMenuItemsContainer>
           {actionMenuEntries
diff --git a/packages/twenty-front/src/modules/action-menu/components/__stories__/RecordIndexActionMenuBar.stories.tsx b/packages/twenty-front/src/modules/action-menu/components/__stories__/RecordIndexActionMenuBar.stories.tsx
index ed53303db6f9..4c7b2b538d59 100644
--- a/packages/twenty-front/src/modules/action-menu/components/__stories__/RecordIndexActionMenuBar.stories.tsx
+++ b/packages/twenty-front/src/modules/action-menu/components/__stories__/RecordIndexActionMenuBar.stories.tsx
@@ -10,6 +10,7 @@ import { getActionBarIdFromActionMenuId } from '@/action-menu/utils/getActionBar
 import { contextStoreNumberOfSelectedRecordsComponentState } from '@/context-store/states/contextStoreNumberOfSelectedRecordsComponentState';
 import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
 import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
+import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';
 import { isBottomBarOpenedComponentState } from '@/ui/layout/bottom-bar/states/isBottomBarOpenedComponentState';
 import { expect, jest } from '@storybook/jest';
 import { Meta, StoryObj } from '@storybook/react';
@@ -25,58 +26,63 @@ const meta: Meta<typeof RecordIndexActionMenuBar> = {
   decorators: [
     RouterDecorator,
     (Story) => (
-      <ContextStoreComponentInstanceContext.Provider
+      <RecordFiltersComponentInstanceContext.Provider
         value={{ instanceId: 'story-action-menu' }}
       >
-        <RecoilRoot
-          initializeState={({ set }) => {
-            set(
-              contextStoreTargetedRecordsRuleComponentState.atomFamily({
-                instanceId: 'story-action-menu',
-              }),
-              {
-                mode: 'selection',
-                selectedRecordIds: ['1', '2', '3'],
-              },
-            );
-            set(
-              contextStoreNumberOfSelectedRecordsComponentState.atomFamily({
-                instanceId: 'story-action-menu',
-              }),
-              3,
-            );
-            const map = new Map<string, ActionMenuEntry>();
-            map.set('delete', {
-              isPinned: true,
-              scope: ActionMenuEntryScope.RecordSelection,
-              type: ActionMenuEntryType.Standard,
-              key: 'delete',
-              label: 'Delete',
-              position: 0,
-              Icon: IconTrash,
-              onClick: deleteMock,
-            });
-            set(
-              actionMenuEntriesComponentState.atomFamily({
-                instanceId: 'story-action-menu',
-              }),
-              map,
-            );
-            set(
-              isBottomBarOpenedComponentState.atomFamily({
-                instanceId: getActionBarIdFromActionMenuId('story-action-menu'),
-              }),
-              true,
-            );
-          }}
+        <ContextStoreComponentInstanceContext.Provider
+          value={{ instanceId: 'story-action-menu' }}
         >
-          <ActionMenuComponentInstanceContext.Provider
-            value={{ instanceId: 'story-action-menu' }}
+          <RecoilRoot
+            initializeState={({ set }) => {
+              set(
+                contextStoreTargetedRecordsRuleComponentState.atomFamily({
+                  instanceId: 'story-action-menu',
+                }),
+                {
+                  mode: 'selection',
+                  selectedRecordIds: ['1', '2', '3'],
+                },
+              );
+              set(
+                contextStoreNumberOfSelectedRecordsComponentState.atomFamily({
+                  instanceId: 'story-action-menu',
+                }),
+                3,
+              );
+              const map = new Map<string, ActionMenuEntry>();
+              map.set('delete', {
+                isPinned: true,
+                scope: ActionMenuEntryScope.RecordSelection,
+                type: ActionMenuEntryType.Standard,
+                key: 'delete',
+                label: 'Delete',
+                position: 0,
+                Icon: IconTrash,
+                onClick: deleteMock,
+              });
+              set(
+                actionMenuEntriesComponentState.atomFamily({
+                  instanceId: 'story-action-menu',
+                }),
+                map,
+              );
+              set(
+                isBottomBarOpenedComponentState.atomFamily({
+                  instanceId:
+                    getActionBarIdFromActionMenuId('story-action-menu'),
+                }),
+                true,
+              );
+            }}
           >
-            <Story />
-          </ActionMenuComponentInstanceContext.Provider>
-        </RecoilRoot>
-      </ContextStoreComponentInstanceContext.Provider>
+            <ActionMenuComponentInstanceContext.Provider
+              value={{ instanceId: 'story-action-menu' }}
+            >
+              <Story />
+            </ActionMenuComponentInstanceContext.Provider>
+          </RecoilRoot>
+        </ContextStoreComponentInstanceContext.Provider>
+      </RecordFiltersComponentInstanceContext.Provider>
     ),
   ],
   args: {
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarCurrentEventCursor.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarCurrentEventCursor.tsx
index 9c67353b0c9a..3284431e92e9 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarCurrentEventCursor.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarCurrentEventCursor.tsx
@@ -161,9 +161,7 @@ export const CalendarCurrentEventCursor = ({
               updateCurrentCalendarEvent();
             }
           }}
-          transition={{
-            duration: theme.animation.duration.normal,
-          }}
+          transition={{ duration: theme.animation.duration.normal }}
         >
           <motion.div
             initial={{ opacity: 0 }}
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventDetails.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventDetails.tsx
index 581e6599eb1d..641a99d68ccd 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventDetails.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventDetails.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { css, useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import {
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx
index 5874898e0040..cadf950a5b92 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx
@@ -6,11 +6,11 @@ import { useRecoilValue } from 'recoil';
 import {
   Avatar,
   AvatarGroup,
+  Card,
+  CardContent,
   IconArrowRight,
   IconLock,
   isDefined,
-  Card,
-  CardContent,
 } from 'twenty-ui';
 
 import { CalendarCurrentEventCursor } from '@/activities/calendar/components/CalendarCurrentEventCursor';
@@ -126,7 +126,7 @@ export const CalendarEventRow = ({
     ({ workspaceMemberId }) => workspaceMemberId === currentWorkspaceMember?.id,
   );
   const showTitle =
-    calendarEvent.visibility === CalendarChannelVisibility.ShareEverything;
+    calendarEvent.visibility === CalendarChannelVisibility.SHARE_EVERYTHING;
 
   return (
     <StyledContainer
diff --git a/packages/twenty-front/src/modules/activities/calendar/hooks/__tests__/useCalendarEvents.test.tsx b/packages/twenty-front/src/modules/activities/calendar/hooks/__tests__/useCalendarEvents.test.tsx
index c335d8a8a7a9..1c62ae6fe9f6 100644
--- a/packages/twenty-front/src/modules/activities/calendar/hooks/__tests__/useCalendarEvents.test.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/hooks/__tests__/useCalendarEvents.test.tsx
@@ -11,7 +11,7 @@ const calendarEvents: TimelineCalendarEvent[] = [
     id: '1234',
     isFullDay: false,
     startsAt: '2024-02-17T21:45:27.822Z',
-    visibility: CalendarChannelVisibility.Metadata,
+    visibility: CalendarChannelVisibility.METADATA,
     conferenceLink: {
       primaryLinkUrl: 'https://meet.google.com/abc-def-ghi',
       primaryLinkLabel: 'Google Meet',
@@ -30,7 +30,7 @@ const calendarEvents: TimelineCalendarEvent[] = [
     id: '5678',
     isFullDay: false,
     startsAt: '2024-02-18T21:43:27.754Z',
-    visibility: CalendarChannelVisibility.ShareEverything,
+    visibility: CalendarChannelVisibility.SHARE_EVERYTHING,
     conferenceLink: {
       primaryLinkUrl: 'https://meet.google.com/abc-def-ghi',
       primaryLinkLabel: 'Google Meet',
@@ -49,7 +49,7 @@ const calendarEvents: TimelineCalendarEvent[] = [
     id: '91011',
     isFullDay: true,
     startsAt: '2024-02-19T22:05:27.653Z',
-    visibility: CalendarChannelVisibility.Metadata,
+    visibility: CalendarChannelVisibility.METADATA,
     conferenceLink: {
       primaryLinkUrl: 'https://meet.google.com/abc-def-ghi',
       primaryLinkLabel: 'Google Meet',
@@ -68,7 +68,7 @@ const calendarEvents: TimelineCalendarEvent[] = [
     id: '121314',
     isFullDay: true,
     startsAt: '2024-02-20T23:15:23.150Z',
-    visibility: CalendarChannelVisibility.ShareEverything,
+    visibility: CalendarChannelVisibility.SHARE_EVERYTHING,
     conferenceLink: {
       primaryLinkUrl: 'https://meet.google.com/abc-def-ghi',
       primaryLinkLabel: 'Google Meet',
diff --git a/packages/twenty-front/src/modules/activities/calendar/right-drawer/components/RightDrawerCalendarEvent.tsx b/packages/twenty-front/src/modules/activities/calendar/right-drawer/components/RightDrawerCalendarEvent.tsx
index 24f78d71539e..4e3ee38ae758 100644
--- a/packages/twenty-front/src/modules/activities/calendar/right-drawer/components/RightDrawerCalendarEvent.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/right-drawer/components/RightDrawerCalendarEvent.tsx
@@ -7,6 +7,7 @@ import { CalendarEvent } from '@/activities/calendar/types/CalendarEvent';
 import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
 import { viewableRecordIdState } from '@/object-record/record-right-drawer/states/viewableRecordIdState';
 import { RecordValueSetterEffect } from '@/object-record/record-store/components/RecordValueSetterEffect';
+import { RecordFieldValueSelectorContextProvider } from '@/object-record/record-store/contexts/RecordFieldValueSelectorContext';
 import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore';
 
 export const RightDrawerCalendarEvent = () => {
@@ -26,10 +27,10 @@ export const RightDrawerCalendarEvent = () => {
   }
 
   return (
-    <>
+    <RecordFieldValueSelectorContextProvider>
       <CalendarEventDetailsEffect record={calendarEvent} />
       <RecordValueSetterEffect recordId={calendarEvent.id} />
       <CalendarEventDetails calendarEvent={calendarEvent} />
-    </>
+    </RecordFieldValueSelectorContextProvider>
   );
 };
diff --git a/packages/twenty-front/src/modules/activities/calendar/right-drawer/hooks/useOpenCalendarEventRightDrawer.ts b/packages/twenty-front/src/modules/activities/calendar/right-drawer/hooks/useOpenCalendarEventRightDrawer.ts
index b10743f3533c..4575eb87511a 100644
--- a/packages/twenty-front/src/modules/activities/calendar/right-drawer/hooks/useOpenCalendarEventRightDrawer.ts
+++ b/packages/twenty-front/src/modules/activities/calendar/right-drawer/hooks/useOpenCalendarEventRightDrawer.ts
@@ -5,6 +5,7 @@ import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer';
 import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope';
 import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages';
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
+import { IconCalendarEvent } from 'twenty-ui';
 
 export const useOpenCalendarEventRightDrawer = () => {
   const { openRightDrawer } = useRightDrawer();
@@ -13,7 +14,10 @@ export const useOpenCalendarEventRightDrawer = () => {
 
   const openCalendarEventRightDrawer = (calendarEventId: string) => {
     setHotkeyScope(RightDrawerHotkeyScope.RightDrawer, { goto: false });
-    openRightDrawer(RightDrawerPages.ViewCalendarEvent);
+    openRightDrawer(RightDrawerPages.ViewCalendarEvent, {
+      title: 'Calendar Event',
+      Icon: IconCalendarEvent,
+    });
     setViewableRecordId(calendarEventId);
   };
 
diff --git a/packages/twenty-front/src/modules/activities/components/ActivityRichTextEditor.tsx b/packages/twenty-front/src/modules/activities/components/ActivityRichTextEditor.tsx
index f871566fff4b..4dab9fa2fc60 100644
--- a/packages/twenty-front/src/modules/activities/components/ActivityRichTextEditor.tsx
+++ b/packages/twenty-front/src/modules/activities/components/ActivityRichTextEditor.tsx
@@ -26,9 +26,12 @@ import { Note } from '@/activities/types/Note';
 import { Task } from '@/activities/types/Task';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { BlockEditor } from '@/ui/input/editor/components/BlockEditor';
+import { AppHotkeyScope } from '@/ui/utilities/hotkey/types/AppHotkeyScope';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 import '@blocknote/core/fonts/inter.css';
 import '@blocknote/mantine/style.css';
 import '@blocknote/react/style.css';
+import { FeatureFlagKey } from '~/generated/graphql';
 
 type ActivityRichTextEditorProps = {
   activityId: string;
@@ -46,6 +49,10 @@ export const ActivityRichTextEditor = ({
   const cache = useApolloClient().cache;
   const activity = activityInStore as Task | Note | null;
 
+  const isCommandMenuV2Enabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsCommandMenuV2Enabled,
+  );
+
   const { objectMetadataItem: objectMetadataItemActivity } =
     useObjectMetadataItem({
       objectNameSingular: activityObjectNameSingular,
@@ -166,9 +173,9 @@ export const ActivityRichTextEditor = ({
   }, [activity]);
 
   const handleEditorBuiltInUploadFile = async (file: File) => {
-    const { attachementAbsoluteURL } = await handleUploadAttachment(file);
+    const { attachmentAbsoluteURL } = await handleUploadAttachment(file);
 
-    return attachementAbsoluteURL;
+    return attachmentAbsoluteURL;
   };
 
   const editor = useCreateBlockNote({
@@ -245,7 +252,9 @@ export const ActivityRichTextEditor = ({
       editor.setTextCursorPosition(newBlockId, 'end');
       editor.focus();
     },
-    RightDrawerHotkeyScope.RightDrawer,
+    isCommandMenuV2Enabled
+      ? AppHotkeyScope.CommandMenuOpen
+      : RightDrawerHotkeyScope.RightDrawer,
     [],
     {
       preventDefault: false,
diff --git a/packages/twenty-front/src/modules/activities/components/SkeletonLoader.tsx b/packages/twenty-front/src/modules/activities/components/SkeletonLoader.tsx
index 0b65ab1143c3..eee56973ddf4 100644
--- a/packages/twenty-front/src/modules/activities/components/SkeletonLoader.tsx
+++ b/packages/twenty-front/src/modules/activities/components/SkeletonLoader.tsx
@@ -42,6 +42,7 @@ export const SKELETON_LOADER_HEIGHT_SIZES = {
 
 const SkeletonColumnLoader = ({ height }: { height: number }) => {
   const theme = useTheme();
+
   return (
     <SkeletonTheme
       baseColor={theme.background.tertiary}
diff --git a/packages/twenty-front/src/modules/activities/copilot/right-drawer/hooks/useOpenCopilotRightDrawer.ts b/packages/twenty-front/src/modules/activities/copilot/right-drawer/hooks/useOpenCopilotRightDrawer.ts
index 5369451624e1..8b3e8b4cb36b 100644
--- a/packages/twenty-front/src/modules/activities/copilot/right-drawer/hooks/useOpenCopilotRightDrawer.ts
+++ b/packages/twenty-front/src/modules/activities/copilot/right-drawer/hooks/useOpenCopilotRightDrawer.ts
@@ -2,6 +2,7 @@ import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer';
 import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope';
 import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages';
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
+import { IconSparkles } from 'twenty-ui';
 
 export const useOpenCopilotRightDrawer = () => {
   const { openRightDrawer } = useRightDrawer();
@@ -9,6 +10,9 @@ export const useOpenCopilotRightDrawer = () => {
 
   return () => {
     setHotkeyScope(RightDrawerHotkeyScope.RightDrawer, { goto: false });
-    openRightDrawer(RightDrawerPages.Copilot);
+    openRightDrawer(RightDrawerPages.Copilot, {
+      title: 'Copilot',
+      Icon: IconSparkles,
+    });
   };
 };
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx
index cfa2aa672853..a95cfb57c83e 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx
@@ -106,7 +106,7 @@ export const EmailThreadPreview = ({ thread }: EmailThreadPreviewProps) => {
           .getValue();
 
         const canOpen =
-          thread.visibility === MessageChannelVisibility.ShareEverything &&
+          thread.visibility === MessageChannelVisibility.SHARE_EVERYTHING &&
           (!clickJustTriggeredEmailDrawerClose ||
             emailThreadIdWhenEmailThreadWasClosed !== thread.id);
 
@@ -122,7 +122,7 @@ export const EmailThreadPreview = ({ thread }: EmailThreadPreviewProps) => {
     ],
   );
 
-  const isDisabled = visibility !== MessageChannelVisibility.ShareEverything;
+  const isDisabled = visibility !== MessageChannelVisibility.SHARE_EVERYTHING;
 
   return (
     <ActivityRow
@@ -167,13 +167,13 @@ export const EmailThreadPreview = ({ thread }: EmailThreadPreviewProps) => {
       </StyledHeading>
 
       <StyledSubjectAndBody>
-        {visibility !== MessageChannelVisibility.Metadata && (
+        {visibility !== MessageChannelVisibility.METADATA && (
           <StyledSubject>{thread.subject}</StyledSubject>
         )}
-        {visibility === MessageChannelVisibility.ShareEverything && (
+        {visibility === MessageChannelVisibility.SHARE_EVERYTHING && (
           <StyledBody>{thread.lastMessageBody}</StyledBody>
         )}
-        {visibility !== MessageChannelVisibility.ShareEverything && (
+        {visibility !== MessageChannelVisibility.SHARE_EVERYTHING && (
           <EmailThreadNotShared />
         )}
       </StyledSubjectAndBody>
diff --git a/packages/twenty-front/src/modules/activities/emails/components/MessageThreadSubscribersDropdownButton.tsx b/packages/twenty-front/src/modules/activities/emails/components/MessageThreadSubscribersDropdownButton.tsx
index 2fdf1d634fdd..6f0c50dde5d3 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/MessageThreadSubscribersDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/MessageThreadSubscribersDropdownButton.tsx
@@ -100,9 +100,7 @@ export const MessageThreadSubscribersDropdownButton = ({
           )}
         </DropdownMenu>
       }
-      dropdownHotkeyScope={{
-        scope: MESSAGE_THREAD_SUBSCRIBER_DROPDOWN_ID,
-      }}
+      dropdownHotkeyScope={{ scope: MESSAGE_THREAD_SUBSCRIBER_DROPDOWN_ID }}
     />
   );
 };
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/useEmailThread.ts b/packages/twenty-front/src/modules/activities/emails/hooks/useEmailThread.ts
index c2fa722ed634..e46e8fc5891b 100644
--- a/packages/twenty-front/src/modules/activities/emails/hooks/useEmailThread.ts
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/useEmailThread.ts
@@ -1,12 +1,14 @@
 import { useRecoilCallback } from 'recoil';
 
 import { useOpenEmailThreadRightDrawer } from '@/activities/emails/right-drawer/hooks/useOpenEmailThreadRightDrawer';
+import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
 import { viewableRecordIdState } from '@/object-record/record-right-drawer/states/viewableRecordIdState';
 import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer';
 import { isRightDrawerOpenState } from '@/ui/layout/right-drawer/states/isRightDrawerOpenState';
 
 export const useEmailThread = () => {
   const { closeRightDrawer } = useRightDrawer();
+  const { closeCommandMenu } = useCommandMenu();
   const openEmailThreadRightDrawer = useOpenEmailThreadRightDrawer();
 
   const openEmailThread = useRecoilCallback(
@@ -23,13 +25,14 @@ export const useEmailThread = () => {
         if (isRightDrawerOpen && viewableEmailThreadId === threadId) {
           set(viewableRecordIdState, null);
           closeRightDrawer();
+          closeCommandMenu();
           return;
         }
 
         openEmailThreadRightDrawer();
         set(viewableRecordIdState, threadId);
       },
-    [closeRightDrawer, openEmailThreadRightDrawer],
+    [closeRightDrawer, closeCommandMenu, openEmailThreadRightDrawer],
   );
 
   return { openEmailThread };
diff --git a/packages/twenty-front/src/modules/activities/emails/right-drawer/hooks/__tests__/useOpenEmailThreadRightDrawer.test.ts b/packages/twenty-front/src/modules/activities/emails/right-drawer/hooks/__tests__/useOpenEmailThreadRightDrawer.test.ts
index 8660d7617de1..25c21ee10fef 100644
--- a/packages/twenty-front/src/modules/activities/emails/right-drawer/hooks/__tests__/useOpenEmailThreadRightDrawer.test.ts
+++ b/packages/twenty-front/src/modules/activities/emails/right-drawer/hooks/__tests__/useOpenEmailThreadRightDrawer.test.ts
@@ -4,6 +4,7 @@ import { act } from 'react-dom/test-utils';
 import { useOpenEmailThreadRightDrawer } from '@/activities/emails/right-drawer/hooks/useOpenEmailThreadRightDrawer';
 import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope';
 import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages';
+import { IconMail } from 'twenty-ui';
 
 const mockOpenRightDrawer = jest.fn();
 const mockSetHotkeyScope = jest.fn();
@@ -31,5 +32,9 @@ test('useOpenEmailThreadRightDrawer opens the email thread right drawer', () =>
   );
   expect(mockOpenRightDrawer).toHaveBeenCalledWith(
     RightDrawerPages.ViewEmailThread,
+    {
+      title: 'Email Thread',
+      Icon: IconMail,
+    },
   );
 });
diff --git a/packages/twenty-front/src/modules/activities/emails/right-drawer/hooks/useOpenEmailThreadRightDrawer.ts b/packages/twenty-front/src/modules/activities/emails/right-drawer/hooks/useOpenEmailThreadRightDrawer.ts
index e718d97d2859..1e18a20d4fbe 100644
--- a/packages/twenty-front/src/modules/activities/emails/right-drawer/hooks/useOpenEmailThreadRightDrawer.ts
+++ b/packages/twenty-front/src/modules/activities/emails/right-drawer/hooks/useOpenEmailThreadRightDrawer.ts
@@ -2,6 +2,7 @@ import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer';
 import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope';
 import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages';
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
+import { IconMail } from 'twenty-ui';
 
 export const useOpenEmailThreadRightDrawer = () => {
   const { openRightDrawer } = useRightDrawer();
@@ -9,6 +10,9 @@ export const useOpenEmailThreadRightDrawer = () => {
 
   return () => {
     setHotkeyScope(RightDrawerHotkeyScope.RightDrawer, { goto: false });
-    openRightDrawer(RightDrawerPages.ViewEmailThread);
+    openRightDrawer(RightDrawerPages.ViewEmailThread, {
+      title: 'Email Thread',
+      Icon: IconMail,
+    });
   };
 };
diff --git a/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx b/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx
index 18f926d6425a..88c51bb06162 100644
--- a/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/AttachmentDropdown.tsx
@@ -70,9 +70,7 @@ export const AttachmentDropdown = ({
           />
         </DropdownMenuItemsContainer>
       }
-      dropdownHotkeyScope={{
-        scope: dropdownId,
-      }}
+      dropdownHotkeyScope={{ scope: dropdownId }}
     />
   );
 };
diff --git a/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx b/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx
index f0eca529d762..18f59b8ce000 100644
--- a/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx
@@ -17,7 +17,6 @@ import { useMemo, useState } from 'react';
 import { IconCalendar, OverflowingTextWithTooltip } from 'twenty-ui';
 
 import { formatToHumanReadableDate } from '~/utils/date-utils';
-import { getFileAbsoluteURI } from '~/utils/file/getFileAbsoluteURI';
 import { getFileNameAndExtension } from '~/utils/file/getFileNameAndExtension';
 
 const StyledLeftContent = styled.div`
@@ -139,8 +138,9 @@ export const AttachmentRow = ({ attachment }: { attachment: Attachment }) => {
           ) : (
             <StyledLinkContainer>
               <StyledLink
-                href={getFileAbsoluteURI(attachment.fullPath)}
-                target="__blank"
+                href={attachment.fullPath}
+                target="_blank"
+                rel="noopener noreferrer"
               >
                 <OverflowingTextWithTooltip text={attachment.name} />
               </StyledLink>
diff --git a/packages/twenty-front/src/modules/activities/files/hooks/useUploadAttachmentFile.tsx b/packages/twenty-front/src/modules/activities/files/hooks/useUploadAttachmentFile.tsx
index bbd8d6152af4..46c71f194610 100644
--- a/packages/twenty-front/src/modules/activities/files/hooks/useUploadAttachmentFile.tsx
+++ b/packages/twenty-front/src/modules/activities/files/hooks/useUploadAttachmentFile.tsx
@@ -9,7 +9,6 @@ import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSi
 import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
 import { isNonEmptyString } from '@sniptt/guards';
 import { FileFolder, useUploadFileMutation } from '~/generated/graphql';
-import { getFileAbsoluteURI } from '~/utils/file/getFileAbsoluteURI';
 
 // Note: This is probably not the right way to do this.
 export const computePathWithoutToken = (attachmentPath: string): string => {
@@ -56,11 +55,9 @@ export const useUploadAttachmentFile = () => {
       updatedAt: new Date().toISOString(),
     } as Partial<Attachment>;
 
-    await createOneAttachment(attachmentToCreate);
+    const createdAttachment = await createOneAttachment(attachmentToCreate);
 
-    const attachementAbsoluteURL = getFileAbsoluteURI(attachmentPath);
-
-    return { attachementAbsoluteURL };
+    return { attachmentAbsoluteURL: createdAttachment.fullPath };
   };
 
   return { uploadAttachmentFile };
diff --git a/packages/twenty-front/src/modules/activities/files/utils/__tests__/downloadFile.test.ts b/packages/twenty-front/src/modules/activities/files/utils/__tests__/downloadFile.test.ts
index b25fae0e7c37..2261b584e36f 100644
--- a/packages/twenty-front/src/modules/activities/files/utils/__tests__/downloadFile.test.ts
+++ b/packages/twenty-front/src/modules/activities/files/utils/__tests__/downloadFile.test.ts
@@ -17,12 +17,10 @@ window.URL.revokeObjectURL = jest.fn();
 describe.skip('downloadFile', () => {
   it('should download a file', () => {
     // Call downloadFile
-    downloadFile('path/to/file.pdf', 'file.pdf');
+    downloadFile('url/to/file.pdf', 'file.pdf');
 
     // Assert on fetch
-    expect(fetch).toHaveBeenCalledWith(
-      process.env.REACT_APP_SERVER_BASE_URL + '/files/path/to/file.pdf',
-    );
+    expect(fetch).toHaveBeenCalledWith('url/to/file.pdf');
 
     // Assert on element creation
     const link = document.querySelector(
diff --git a/packages/twenty-front/src/modules/activities/files/utils/downloadFile.ts b/packages/twenty-front/src/modules/activities/files/utils/downloadFile.ts
index af64fed4e226..bdc5ed0fab97 100644
--- a/packages/twenty-front/src/modules/activities/files/utils/downloadFile.ts
+++ b/packages/twenty-front/src/modules/activities/files/utils/downloadFile.ts
@@ -1,8 +1,7 @@
 import { saveAs } from 'file-saver';
-import { getFileAbsoluteURI } from '~/utils/file/getFileAbsoluteURI';
 
 export const downloadFile = (fullPath: string, fileName: string) => {
-  fetch(getFileAbsoluteURI(fullPath))
+  fetch(fullPath)
     .then((resp) =>
       resp.status === 200
         ? resp.blob()
diff --git a/packages/twenty-front/src/modules/activities/hooks/useOpenActivityRightDrawer.ts b/packages/twenty-front/src/modules/activities/hooks/useOpenActivityRightDrawer.ts
index 9abed7130374..5d0aec52a52e 100644
--- a/packages/twenty-front/src/modules/activities/hooks/useOpenActivityRightDrawer.ts
+++ b/packages/twenty-front/src/modules/activities/hooks/useOpenActivityRightDrawer.ts
@@ -7,6 +7,9 @@ import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer';
 import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope';
 import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages';
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
+import { AppHotkeyScope } from '@/ui/utilities/hotkey/types/AppHotkeyScope';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+import { FeatureFlagKey } from '~/generated/graphql';
 
 export const useOpenActivityRightDrawer = ({
   objectNameSingular,
@@ -25,6 +28,10 @@ export const useOpenActivityRightDrawer = ({
 
   const setHotkeyScope = useSetHotkeyScope();
 
+  const isCommandMenuV2Enabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsCommandMenuV2Enabled,
+  );
+
   return (activityId: string) => {
     if (
       isRightDrawerOpen &&
@@ -34,7 +41,12 @@ export const useOpenActivityRightDrawer = ({
       return;
     }
 
-    setHotkeyScope(RightDrawerHotkeyScope.RightDrawer, { goto: false });
+    if (isCommandMenuV2Enabled) {
+      setHotkeyScope(AppHotkeyScope.CommandMenuOpen, { goto: false });
+    } else {
+      setHotkeyScope(RightDrawerHotkeyScope.RightDrawer, { goto: false });
+    }
+
     setViewableRecordId(activityId);
     setViewableRecordNameSingular(objectNameSingular);
     openRightDrawer(RightDrawerPages.ViewRecord);
diff --git a/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts b/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts
index 12fa5ab0f942..bbaf0c183c0e 100644
--- a/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts
+++ b/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts
@@ -17,6 +17,9 @@ import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSi
 import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
 import { isNewViewableRecordLoadingState } from '@/object-record/record-right-drawer/states/isNewViewableRecordLoading';
 import { viewableRecordNameSingularState } from '@/object-record/record-right-drawer/states/viewableRecordNameSingularState';
+import { AppHotkeyScope } from '@/ui/utilities/hotkey/types/AppHotkeyScope';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+import { FeatureFlagKey } from '~/generated/graphql';
 import { ActivityTargetableObject } from '../types/ActivityTargetableEntity';
 
 export const useOpenCreateActivityDrawer = ({
@@ -60,6 +63,10 @@ export const useOpenCreateActivityDrawer = ({
     isUpsertingActivityInDBState,
   );
 
+  const isCommandMenuV2Enabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsCommandMenuV2Enabled,
+  );
+
   const openCreateActivityDrawer = async ({
     targetableObjects,
     customAssignee,
@@ -108,7 +115,12 @@ export const useOpenCreateActivityDrawer = ({
       setActivityTargetableEntityArray([]);
     }
 
-    setHotkeyScope(RightDrawerHotkeyScope.RightDrawer, { goto: false });
+    if (isCommandMenuV2Enabled) {
+      setHotkeyScope(AppHotkeyScope.CommandMenuOpen, { goto: false });
+    } else {
+      setHotkeyScope(RightDrawerHotkeyScope.RightDrawer, { goto: false });
+    }
+
     setViewableRecordId(activity.id);
 
     setIsUpsertingActivityInDB(false);
diff --git a/packages/twenty-front/src/modules/activities/states/activityTitleHasBeenSetFamilyState.ts b/packages/twenty-front/src/modules/activities/states/activityTitleHasBeenSetFamilyState.ts
deleted file mode 100644
index f47e13f84c43..000000000000
--- a/packages/twenty-front/src/modules/activities/states/activityTitleHasBeenSetFamilyState.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
-
-export const activityTitleHasBeenSetFamilyState = createFamilyState<
-  boolean,
-  { activityId: string }
->({
-  key: 'activityTitleHasBeenSetFamilyState',
-  defaultValue: false,
-});
diff --git a/packages/twenty-front/src/modules/activities/tasks/components/ObjectTasks.tsx b/packages/twenty-front/src/modules/activities/tasks/components/ObjectTasks.tsx
index 9e2dd7a4bc54..1aa7b3aafd44 100644
--- a/packages/twenty-front/src/modules/activities/tasks/components/ObjectTasks.tsx
+++ b/packages/twenty-front/src/modules/activities/tasks/components/ObjectTasks.tsx
@@ -2,7 +2,7 @@ import styled from '@emotion/styled';
 
 import { TaskGroups } from '@/activities/tasks/components/TaskGroups';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import { ObjectFilterDropdownScope } from '@/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope';
+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
 
 const StyledContainer = styled.div`
   display: flex;
@@ -19,9 +19,11 @@ export const ObjectTasks = ({
 }) => {
   return (
     <StyledContainer>
-      <ObjectFilterDropdownScope filterScopeId="entity-tasks-filter-scope">
+      <ObjectFilterDropdownComponentInstanceContext.Provider
+        value={{ instanceId: 'entity-tasks-filter-scope' }}
+      >
         <TaskGroups targetableObjects={[targetableObject]} />
-      </ObjectFilterDropdownScope>
+      </ObjectFilterDropdownComponentInstanceContext.Provider>
     </StyledContainer>
   );
 };
diff --git a/packages/twenty-front/src/modules/activities/tasks/components/__stories__/TaskGroups.stories.tsx b/packages/twenty-front/src/modules/activities/tasks/components/__stories__/TaskGroups.stories.tsx
index aefa6f2ed59a..c420ac0f3b1d 100644
--- a/packages/twenty-front/src/modules/activities/tasks/components/__stories__/TaskGroups.stories.tsx
+++ b/packages/twenty-front/src/modules/activities/tasks/components/__stories__/TaskGroups.stories.tsx
@@ -2,7 +2,7 @@ import { Meta, StoryObj } from '@storybook/react';
 
 import { TaskGroups } from '@/activities/tasks/components/TaskGroups';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
-import { ObjectFilterDropdownScope } from '@/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope';
+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
 import { ComponentWithRecoilScopeDecorator } from '~/testing/decorators/ComponentWithRecoilScopeDecorator';
 import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
 import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
@@ -15,9 +15,11 @@ const meta: Meta<typeof TaskGroups> = {
   component: TaskGroups,
   decorators: [
     (Story) => (
-      <ObjectFilterDropdownScope filterScopeId="entity-tasks-filter-scope">
+      <ObjectFilterDropdownComponentInstanceContext.Provider
+        value={{ instanceId: 'entity-tasks-filter-scope' }}
+      >
         <Story />
-      </ObjectFilterDropdownScope>
+      </ObjectFilterDropdownComponentInstanceContext.Provider>
     ),
     ComponentWithRouterDecorator,
     ComponentWithRecoilScopeDecorator,
diff --git a/packages/twenty-front/src/modules/activities/tasks/hooks/__tests__/useTasks.test.tsx b/packages/twenty-front/src/modules/activities/tasks/hooks/__tests__/useTasks.test.tsx
index d24485409e87..a01f814cfcaa 100644
--- a/packages/twenty-front/src/modules/activities/tasks/hooks/__tests__/useTasks.test.tsx
+++ b/packages/twenty-front/src/modules/activities/tasks/hooks/__tests__/useTasks.test.tsx
@@ -4,7 +4,7 @@ import { RecoilRoot } from 'recoil';
 
 import { useActivities } from '@/activities/hooks/useActivities';
 import { useTasks } from '@/activities/tasks/hooks/useTasks';
-import { ObjectFilterDropdownScope } from '@/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope';
+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
 
 const tasks = [
   {
@@ -46,9 +46,11 @@ jest.mock('@/activities/hooks/useActivities', () => ({
 
 const Wrapper = ({ children }: { children: ReactNode }) => (
   <RecoilRoot>
-    <ObjectFilterDropdownScope filterScopeId="entity-tasks-filter-scope">
+    <ObjectFilterDropdownComponentInstanceContext.Provider
+      value={{ instanceId: 'entity-tasks-filter-scope' }}
+    >
       {children}
-    </ObjectFilterDropdownScope>
+    </ObjectFilterDropdownComponentInstanceContext.Provider>
   </RecoilRoot>
 );
 
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/components/__stories__/TimelineActivities.stories.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/components/__stories__/TimelineActivities.stories.tsx
index 7c16632eea75..341b6b59842c 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/components/__stories__/TimelineActivities.stories.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/components/__stories__/TimelineActivities.stories.tsx
@@ -18,9 +18,7 @@ const meta: Meta<typeof TimelineActivities> = {
     (Story) => {
       return (
         <TimelineActivityContext.Provider
-          value={{
-            labelIdentifierValue: 'Mock',
-          }}
+          value={{ labelIdentifierValue: 'Mock' }}
         >
           <Story />
         </TimelineActivityContext.Provider>
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/__stories__/EventCardMessage.stories.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/__stories__/EventCardMessage.stories.tsx
index 40d27298fd5d..876a2570787e 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/__stories__/EventCardMessage.stories.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/message/components/__stories__/EventCardMessage.stories.tsx
@@ -17,9 +17,7 @@ const meta: Meta<typeof EventCardMessage> = {
     (Story) => {
       return (
         <TimelineActivityContext.Provider
-          value={{
-            labelIdentifierValue: 'Mock',
-          }}
+          value={{ labelIdentifierValue: 'Mock' }}
         >
           <Story />
         </TimelineActivityContext.Provider>
diff --git a/packages/twenty-front/src/modules/analytics/components/AnalyticsActivityGraph.tsx b/packages/twenty-front/src/modules/analytics/components/AnalyticsActivityGraph.tsx
index 1a124ad90c52..cf58a78ae3c1 100644
--- a/packages/twenty-front/src/modules/analytics/components/AnalyticsActivityGraph.tsx
+++ b/packages/twenty-front/src/modules/analytics/components/AnalyticsActivityGraph.tsx
@@ -147,9 +147,7 @@ export const AnalyticsActivityGraph = ({
                   match: '*',
                 },
               ]}
-              yScale={{
-                type: 'linear',
-              }}
+              yScale={{ type: 'linear' }}
               axisBottom={{
                 format: '%b %d, %I:%M %p', //TODO: add the user prefered time format for the graph
                 tickValues: 2,
diff --git a/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts b/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts
index 2b72e2c9a96e..3e2352d88bf1 100644
--- a/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts
+++ b/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts
@@ -54,8 +54,8 @@ export const useApolloFactory = (options: Partial<Options<any>> = {}) => {
         }),
       },
       defaultOptions: {
-        watchQuery: {
-          fetchPolicy: 'cache-and-network',
+        query: {
+          fetchPolicy: 'cache-first',
         },
       },
       connectToDevTools: isDebugMode,
@@ -69,7 +69,7 @@ export const useApolloFactory = (options: Partial<Options<any>> = {}) => {
         setCurrentUser(null);
         setCurrentWorkspaceMember(null);
         setCurrentWorkspace(null);
-        setWorkspaces(null);
+        setWorkspaces([]);
         if (
           !isMatchingLocation(AppPath.Verify) &&
           !isMatchingLocation(AppPath.SignInUp) &&
diff --git a/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerUpdateRelationsOptimisticEffect.ts b/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerUpdateRelationsOptimisticEffect.ts
index 4e44e098adcb..dc76f4f293ec 100644
--- a/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerUpdateRelationsOptimisticEffect.ts
+++ b/packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerUpdateRelationsOptimisticEffect.ts
@@ -30,7 +30,7 @@ export const triggerUpdateRelationsOptimisticEffect = ({
   return sourceObjectMetadataItem.fields.forEach(
     (fieldMetadataItemOnSourceRecord) => {
       const notARelationField =
-        fieldMetadataItemOnSourceRecord.type !== FieldMetadataType.Relation;
+        fieldMetadataItemOnSourceRecord.type !== FieldMetadataType.RELATION;
 
       if (notARelationField) {
         return;
diff --git a/packages/twenty-front/src/modules/app/components/App.tsx b/packages/twenty-front/src/modules/app/components/App.tsx
index af4c1eec0104..a36087dea3ba 100644
--- a/packages/twenty-front/src/modules/app/components/App.tsx
+++ b/packages/twenty-front/src/modules/app/components/App.tsx
@@ -5,29 +5,39 @@ import { RecoilDebugObserverEffect } from '@/debug/components/RecoilDebugObserve
 import { AppErrorBoundary } from '@/error-handler/components/AppErrorBoundary';
 import { ExceptionHandlerProvider } from '@/error-handler/components/ExceptionHandlerProvider';
 import { SnackBarProviderScope } from '@/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope';
+import { i18n } from '@lingui/core';
+import { I18nProvider } from '@lingui/react';
 import { HelmetProvider } from 'react-helmet-async';
 import { RecoilRoot } from 'recoil';
 import { RecoilURLSyncJSON } from 'recoil-sync';
 import { IconsProvider } from 'twenty-ui';
+import { messages as enMessages } from '../../../locales/generated/en';
+
+i18n.load({
+  en: enMessages,
+});
+i18n.activate('en');
 
 export const App = () => {
   return (
     <RecoilRoot>
       <RecoilURLSyncJSON location={{ part: 'queryParams' }}>
         <AppErrorBoundary>
-          <CaptchaProvider>
-            <RecoilDebugObserverEffect />
-            <ApolloDevLogEffect />
-            <SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
-              <IconsProvider>
-                <ExceptionHandlerProvider>
-                  <HelmetProvider>
-                    <AppRouter />
-                  </HelmetProvider>
-                </ExceptionHandlerProvider>
-              </IconsProvider>
-            </SnackBarProviderScope>
-          </CaptchaProvider>
+          <I18nProvider i18n={i18n}>
+            <CaptchaProvider>
+              <RecoilDebugObserverEffect />
+              <ApolloDevLogEffect />
+              <SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
+                <IconsProvider>
+                  <ExceptionHandlerProvider>
+                    <HelmetProvider>
+                      <AppRouter />
+                    </HelmetProvider>
+                  </ExceptionHandlerProvider>
+                </IconsProvider>
+              </SnackBarProviderScope>
+            </CaptchaProvider>
+          </I18nProvider>
         </AppErrorBoundary>
       </RecoilURLSyncJSON>
     </RecoilRoot>
diff --git a/packages/twenty-front/src/modules/app/components/AppRouter.tsx b/packages/twenty-front/src/modules/app/components/AppRouter.tsx
index 36081f6195f4..f4637d2c42b1 100644
--- a/packages/twenty-front/src/modules/app/components/AppRouter.tsx
+++ b/packages/twenty-front/src/modules/app/components/AppRouter.tsx
@@ -11,13 +11,9 @@ export const AppRouter = () => {
   const isFreeAccessEnabled = useIsFeatureEnabled(
     FeatureFlagKey.IsFreeAccessEnabled,
   );
-  const isCRMMigrationEnabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsCrmMigrationEnabled,
-  );
-  const isSSOEnabled = useIsFeatureEnabled(FeatureFlagKey.IsSsoEnabled);
-  const isServerlessFunctionSettingsEnabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsFunctionSettingsEnabled,
-  );
+
+  // We want to disable serverless function settings but keep the code for now
+  const isFunctionSettingsEnabled = false;
 
   const isBillingPageEnabled =
     billing?.isBillingEnabled && !isFreeAccessEnabled;
@@ -30,9 +26,7 @@ export const AppRouter = () => {
     <RouterProvider
       router={useCreateAppRouter(
         isBillingPageEnabled,
-        isCRMMigrationEnabled,
-        isServerlessFunctionSettingsEnabled,
-        isSSOEnabled,
+        isFunctionSettingsEnabled,
         isAdminPageEnabled,
       )}
     />
diff --git a/packages/twenty-front/src/modules/app/components/AppRouterProviders.tsx b/packages/twenty-front/src/modules/app/components/AppRouterProviders.tsx
index 43ce095f4a0e..2b2cc8f165f7 100644
--- a/packages/twenty-front/src/modules/app/components/AppRouterProviders.tsx
+++ b/packages/twenty-front/src/modules/app/components/AppRouterProviders.tsx
@@ -6,6 +6,7 @@ import { ChromeExtensionSidecarEffect } from '@/chrome-extension-sidecar/compone
 import { ChromeExtensionSidecarProvider } from '@/chrome-extension-sidecar/components/ChromeExtensionSidecarProvider';
 import { ClientConfigProvider } from '@/client-config/components/ClientConfigProvider';
 import { ClientConfigProviderEffect } from '@/client-config/components/ClientConfigProviderEffect';
+import { ContextStoreViewIdEffect } from '@/context-store/components/ContextStoreViewIdEffect';
 import { PromiseRejectionEffect } from '@/error-handler/components/PromiseRejectionEffect';
 import { ApolloMetadataClientProvider } from '@/object-metadata/components/ApolloMetadataClientProvider';
 import { ObjectMetadataItemsGater } from '@/object-metadata/components/ObjectMetadataItemsGater';
@@ -21,13 +22,15 @@ import { PageTitle } from '@/ui/utilities/page-title/components/PageTitle';
 import { UserProvider } from '@/users/components/UserProvider';
 import { UserProviderEffect } from '@/users/components/UserProviderEffect';
 import { WorkspaceProviderEffect } from '@/workspace/components/WorkspaceProviderEffect';
+import { isNonEmptyString } from '@sniptt/guards';
 import { StrictMode } from 'react';
-import { Outlet, useLocation } from 'react-router-dom';
+import { Outlet, useLocation, useParams } from 'react-router-dom';
 import { getPageTitleFromPath } from '~/utils/title-utils';
 
 export const AppRouterProviders = () => {
   const { pathname } = useLocation();
   const pageTitle = getPageTitleFromPath(pathname);
+  const objectNamePlural = useParams().objectNamePlural;
 
   return (
     <ApolloProvider>
@@ -61,6 +64,11 @@ export const AppRouterProviders = () => {
                       </PrefetchDataProvider>
                     </ObjectMetadataItemsGater>
                     <PageChangeEffect />
+                    {isNonEmptyString(objectNamePlural) && (
+                      <ContextStoreViewIdEffect
+                        objectNamePlural={objectNamePlural}
+                      />
+                    )}
                   </ObjectMetadataItemsProvider>
                 </ApolloMetadataClientProvider>
               </AuthProvider>
diff --git a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx
index 6077e7b457b6..2b1a7473b7ad 100644
--- a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx
+++ b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx
@@ -2,7 +2,6 @@ import { lazy, Suspense } from 'react';
 import { Route, Routes } from 'react-router-dom';
 
 import { SettingsSkeletonLoader } from '@/settings/components/SettingsSkeletonLoader';
-import { AppPath } from '@/types/AppPath';
 import { SettingsPath } from '@/types/SettingsPath';
 
 const SettingsAccountsCalendars = lazy(() =>
@@ -123,11 +122,11 @@ const SettingsProfile = lazy(() =>
   })),
 );
 
-const SettingsAppearance = lazy(() =>
+const SettingsExperience = lazy(() =>
   import(
-    '~/pages/settings/profile/appearance/components/SettingsAppearance'
+    '~/pages/settings/profile/appearance/components/SettingsExperience'
   ).then((module) => ({
-    default: module.SettingsAppearance,
+    default: module.SettingsExperience,
   })),
 );
 
@@ -226,14 +225,6 @@ const SettingsObjectFieldEdit = lazy(() =>
   ),
 );
 
-const SettingsCRMMigration = lazy(() =>
-  import('~/pages/settings/crm-migration/SettingsCRMMigration').then(
-    (module) => ({
-      default: module.SettingsCRMMigration,
-    }),
-  ),
-);
-
 const SettingsSecurity = lazy(() =>
   import('~/pages/settings/security/SettingsSecurity').then((module) => ({
     default: module.SettingsSecurity,
@@ -262,25 +253,27 @@ const SettingsAdminContent = lazy(() =>
   ),
 );
 
+const SettingsLab = lazy(() =>
+  import('~/pages/settings/lab/SettingsLab').then((module) => ({
+    default: module.SettingsLab,
+  })),
+);
+
 type SettingsRoutesProps = {
   isBillingEnabled?: boolean;
-  isCRMMigrationEnabled?: boolean;
-  isServerlessFunctionSettingsEnabled?: boolean;
-  isSSOEnabled?: boolean;
+  isFunctionSettingsEnabled?: boolean;
   isAdminPageEnabled?: boolean;
 };
 
 export const SettingsRoutes = ({
   isBillingEnabled,
-  isCRMMigrationEnabled,
-  isServerlessFunctionSettingsEnabled,
-  isSSOEnabled,
+  isFunctionSettingsEnabled,
   isAdminPageEnabled,
 }: SettingsRoutesProps) => (
   <Suspense fallback={<SettingsSkeletonLoader />}>
     <Routes>
       <Route path={SettingsPath.ProfilePage} element={<SettingsProfile />} />
-      <Route path={SettingsPath.Appearance} element={<SettingsAppearance />} />
+      <Route path={SettingsPath.Experience} element={<SettingsExperience />} />
       <Route path={SettingsPath.Accounts} element={<SettingsAccounts />} />
       <Route path={SettingsPath.NewAccount} element={<SettingsNewAccount />} />
       <Route
@@ -312,36 +305,23 @@ export const SettingsRoutes = ({
       />
       <Route path={SettingsPath.NewObject} element={<SettingsNewObject />} />
       <Route path={SettingsPath.Developers} element={<SettingsDevelopers />} />
-      {isCRMMigrationEnabled && (
-        <Route
-          path={SettingsPath.CRMMigration}
-          element={<SettingsCRMMigration />}
-        />
-      )}
       <Route
-        path={AppPath.DevelopersCatchAll}
-        element={
-          <Routes>
-            <Route
-              path={SettingsPath.DevelopersNewApiKey}
-              element={<SettingsDevelopersApiKeysNew />}
-            />
-            <Route
-              path={SettingsPath.DevelopersApiKeyDetail}
-              element={<SettingsDevelopersApiKeyDetail />}
-            />
-            <Route
-              path={SettingsPath.DevelopersNewWebhook}
-              element={<SettingsDevelopersWebhooksNew />}
-            />
-            <Route
-              path={SettingsPath.DevelopersNewWebhookDetail}
-              element={<SettingsDevelopersWebhooksDetail />}
-            />
-          </Routes>
-        }
+        path={SettingsPath.DevelopersNewApiKey}
+        element={<SettingsDevelopersApiKeysNew />}
       />
-      {isServerlessFunctionSettingsEnabled && (
+      <Route
+        path={SettingsPath.DevelopersApiKeyDetail}
+        element={<SettingsDevelopersApiKeyDetail />}
+      />
+      <Route
+        path={SettingsPath.DevelopersNewWebhook}
+        element={<SettingsDevelopersWebhooksNew />}
+      />
+      <Route
+        path={SettingsPath.DevelopersNewWebhookDetail}
+        element={<SettingsDevelopersWebhooksDetail />}
+      />
+      {isFunctionSettingsEnabled && (
         <>
           <Route
             path={SettingsPath.ServerlessFunctions}
@@ -391,12 +371,10 @@ export const SettingsRoutes = ({
       />
       <Route path={SettingsPath.Releases} element={<Releases />} />
       <Route path={SettingsPath.Security} element={<SettingsSecurity />} />
-      {isSSOEnabled && (
-        <Route
-          path={SettingsPath.NewSSOIdentityProvider}
-          element={<SettingsSecuritySSOIdentifyProvider />}
-        />
-      )}
+      <Route
+        path={SettingsPath.NewSSOIdentityProvider}
+        element={<SettingsSecuritySSOIdentifyProvider />}
+      />
       {isAdminPageEnabled && (
         <>
           <Route path={SettingsPath.AdminPanel} element={<SettingsAdmin />} />
@@ -406,6 +384,7 @@ export const SettingsRoutes = ({
           />
         </>
       )}
+      <Route path={SettingsPath.Lab} element={<SettingsLab />} />
     </Routes>
   </Suspense>
 );
diff --git a/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx b/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx
index 3934d9040d95..3682760521d0 100644
--- a/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx
+++ b/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx
@@ -1,5 +1,10 @@
 import { useEffect, useState } from 'react';
-import { useLocation, useNavigate } from 'react-router-dom';
+import {
+  matchPath,
+  useLocation,
+  useNavigate,
+  useParams,
+} from 'react-router-dom';
 import { useRecoilValue } from 'recoil';
 
 import {
@@ -8,13 +13,14 @@ import {
 } from '@/analytics/hooks/useEventTracker';
 import { useRequestFreshCaptchaToken } from '@/captcha/hooks/useRequestFreshCaptchaToken';
 import { isCaptchaScriptLoadedState } from '@/captcha/states/isCaptchaScriptLoadedState';
+import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';
+import { useResetTableRowSelection } from '@/object-record/record-table/hooks/internal/useResetTableRowSelection';
 import { TableHotkeyScope } from '@/object-record/record-table/types/TableHotkeyScope';
 import { AppBasePath } from '@/types/AppBasePath';
 import { AppPath } from '@/types/AppPath';
 import { PageHotkeyScope } from '@/types/PageHotkeyScope';
 import { SettingsPath } from '@/types/SettingsPath';
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
-import { useCleanRecoilState } from '~/hooks/useCleanRecoilState';
 import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
 import { usePageChangeEffectNavigateLocation } from '~/hooks/usePageChangeEffectNavigateLocation';
 import { isDefined } from '~/utils/isDefined';
@@ -34,13 +40,14 @@ export const PageChangeEffect = () => {
   const pageChangeEffectNavigateLocation =
     usePageChangeEffectNavigateLocation();
 
-  const { cleanRecoilState } = useCleanRecoilState();
-
   const eventTracker = useEventTracker();
 
-  useEffect(() => {
-    cleanRecoilState();
-  }, [cleanRecoilState]);
+  //TODO: refactor useResetTableRowSelection hook to not throw when the argument `recordTableId` is an empty string
+  // - replace CoreObjectNamePlural.Person
+  const objectNamePlural =
+    useParams().objectNamePlural ?? CoreObjectNamePlural.Person;
+
+  const resetTableSelections = useResetTableRowSelection(objectNamePlural);
 
   useEffect(() => {
     if (!previousLocation || previousLocation !== location.pathname) {
@@ -56,6 +63,17 @@ export const PageChangeEffect = () => {
     }
   }, [navigate, pageChangeEffectNavigateLocation]);
 
+  useEffect(() => {
+    const isLeavingRecordIndexPage = !!matchPath(
+      AppPath.RecordIndexPage,
+      previousLocation,
+    );
+
+    if (isLeavingRecordIndexPage) {
+      resetTableSelections();
+    }
+  }, [isMatchingLocation, previousLocation, resetTableSelections]);
+
   useEffect(() => {
     switch (true) {
       case isMatchingLocation(AppPath.RecordIndexPage): {
diff --git a/packages/twenty-front/src/modules/app/hooks/useCreateAppRouter.tsx b/packages/twenty-front/src/modules/app/hooks/useCreateAppRouter.tsx
index 80afc3c8af56..d7f11bac883e 100644
--- a/packages/twenty-front/src/modules/app/hooks/useCreateAppRouter.tsx
+++ b/packages/twenty-front/src/modules/app/hooks/useCreateAppRouter.tsx
@@ -1,6 +1,8 @@
 import { AppRouterProviders } from '@/app/components/AppRouterProviders';
 import { SettingsRoutes } from '@/app/components/SettingsRoutes';
+
 import { VerifyEffect } from '@/auth/components/VerifyEffect';
+import { VerifyEmailEffect } from '@/auth/components/VerifyEmailEffect';
 import indexAppPath from '@/navigation/utils/indexAppPath';
 import { AppPath } from '@/types/AppPath';
 import { BlankLayout } from '@/ui/layout/page/components/BlankLayout';
@@ -26,9 +28,7 @@ import { SyncEmails } from '~/pages/onboarding/SyncEmails';
 
 export const useCreateAppRouter = (
   isBillingEnabled?: boolean,
-  isCRMMigrationEnabled?: boolean,
-  isServerlessFunctionSettingsEnabled?: boolean,
-  isSSOEnabled?: boolean,
+  isFunctionSettingsEnabled?: boolean,
   isAdminPageEnabled?: boolean,
 ) =>
   createBrowserRouter(
@@ -41,6 +41,7 @@ export const useCreateAppRouter = (
       >
         <Route element={<DefaultLayout />}>
           <Route path={AppPath.Verify} element={<VerifyEffect />} />
+          <Route path={AppPath.VerifyEmail} element={<VerifyEmailEffect />} />
           <Route path={AppPath.SignInUp} element={<SignInUp />} />
           <Route path={AppPath.Invite} element={<Invite />} />
           <Route path={AppPath.ResetPassword} element={<PasswordReset />} />
@@ -61,11 +62,7 @@ export const useCreateAppRouter = (
             element={
               <SettingsRoutes
                 isBillingEnabled={isBillingEnabled}
-                isCRMMigrationEnabled={isCRMMigrationEnabled}
-                isServerlessFunctionSettingsEnabled={
-                  isServerlessFunctionSettingsEnabled
-                }
-                isSSOEnabled={isSSOEnabled}
+                isFunctionSettingsEnabled={isFunctionSettingsEnabled}
                 isAdminPageEnabled={isAdminPageEnabled}
               />
             }
diff --git a/packages/twenty-front/src/modules/auth/components/AuthProvider.tsx b/packages/twenty-front/src/modules/auth/components/AuthProvider.tsx
index c174ed3331dc..ce7c7bea7e2b 100644
--- a/packages/twenty-front/src/modules/auth/components/AuthProvider.tsx
+++ b/packages/twenty-front/src/modules/auth/components/AuthProvider.tsx
@@ -8,11 +8,7 @@ export const AuthProvider = ({ children }: React.PropsWithChildren) => {
   const currentWorkspaceMembers = useRecoilValue(currentWorkspaceMembersState);
 
   return (
-    <AuthContext.Provider
-      value={{
-        currentWorkspaceMembers,
-      }}
-    >
+    <AuthContext.Provider value={{ currentWorkspaceMembers }}>
       {children}
     </AuthContext.Provider>
   );
diff --git a/packages/twenty-front/src/modules/auth/components/VerifyEffect.tsx b/packages/twenty-front/src/modules/auth/components/VerifyEffect.tsx
index 6530532fae8f..a314b7ce840f 100644
--- a/packages/twenty-front/src/modules/auth/components/VerifyEffect.tsx
+++ b/packages/twenty-front/src/modules/auth/components/VerifyEffect.tsx
@@ -1,14 +1,15 @@
 import { useEffect } from 'react';
-import { useNavigate, useSearchParams } from 'react-router-dom';
+import { useSearchParams } from 'react-router-dom';
 
 import { useAuth } from '@/auth/hooks/useAuth';
 import { useIsLogged } from '@/auth/hooks/useIsLogged';
 import { isAppWaitingForFreshObjectMetadataState } from '@/object-metadata/states/isAppWaitingForFreshObjectMetadataState';
 import { AppPath } from '@/types/AppPath';
-import { useSetRecoilState } from 'recoil';
-import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { useSetRecoilState } from 'recoil';
 import { isDefined } from 'twenty-ui';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
 
 export const VerifyEffect = () => {
   const [searchParams] = useSearchParams();
@@ -18,7 +19,7 @@ export const VerifyEffect = () => {
   const { enqueueSnackBar } = useSnackBar();
 
   const isLogged = useIsLogged();
-  const navigate = useNavigate();
+  const navigate = useNavigateApp();
 
   const { verify } = useAuth();
 
@@ -27,22 +28,18 @@ export const VerifyEffect = () => {
   );
 
   useEffect(() => {
-    const getTokens = async () => {
-      if (isDefined(errorMessage)) {
-        enqueueSnackBar(errorMessage, {
-          variant: SnackBarVariant.Error,
-        });
-      }
-      if (!loginToken) {
-        navigate(AppPath.SignInUp);
-      } else {
-        setIsAppWaitingForFreshObjectMetadata(true);
-        await verify(loginToken);
-      }
-    };
-
-    if (!isLogged) {
-      getTokens();
+    if (isDefined(errorMessage)) {
+      enqueueSnackBar(errorMessage, {
+        dedupeKey: 'verify-failed-dedupe-key',
+        variant: SnackBarVariant.Error,
+      });
+    }
+
+    if (isDefined(loginToken)) {
+      setIsAppWaitingForFreshObjectMetadata(true);
+      verify(loginToken);
+    } else if (!isLogged) {
+      navigate(AppPath.SignInUp);
     }
     // Verify only needs to run once at mount
     // eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx b/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx
new file mode 100644
index 000000000000..81c0ed330054
--- /dev/null
+++ b/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx
@@ -0,0 +1,69 @@
+import { useAuth } from '@/auth/hooks/useAuth';
+import { AppPath } from '@/types/AppPath';
+import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+
+import { useReadCaptchaToken } from '@/captcha/hooks/useReadCaptchaToken';
+import { useEffect, useState } from 'react';
+import { useSearchParams } from 'react-router-dom';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
+import { EmailVerificationSent } from '../sign-in-up/components/EmailVerificationSent';
+
+export const VerifyEmailEffect = () => {
+  const { getLoginTokenFromEmailVerificationToken } = useAuth();
+
+  const { enqueueSnackBar } = useSnackBar();
+
+  const [searchParams] = useSearchParams();
+  const [isError, setIsError] = useState(false);
+  const email = searchParams.get('email');
+  const emailVerificationToken = searchParams.get('emailVerificationToken');
+
+  const navigate = useNavigateApp();
+  const { readCaptchaToken } = useReadCaptchaToken();
+
+  useEffect(() => {
+    const verifyEmailToken = async () => {
+      if (!email || !emailVerificationToken) {
+        enqueueSnackBar(`Invalid email verification link.`, {
+          dedupeKey: 'email-verification-link-dedupe-key',
+          variant: SnackBarVariant.Error,
+        });
+        return navigate(AppPath.SignInUp);
+      }
+
+      const captchaToken = await readCaptchaToken();
+
+      try {
+        const { loginToken } = await getLoginTokenFromEmailVerificationToken(
+          emailVerificationToken,
+          captchaToken,
+        );
+
+        enqueueSnackBar('Email verified.', {
+          dedupeKey: 'email-verification-dedupe-key',
+          variant: SnackBarVariant.Success,
+        });
+
+        navigate(AppPath.Verify, undefined, { loginToken: loginToken.token });
+      } catch (error) {
+        enqueueSnackBar('Email verification failed.', {
+          dedupeKey: 'email-verification-dedupe-key',
+          variant: SnackBarVariant.Error,
+        });
+        setIsError(true);
+      }
+    };
+
+    verifyEmailToken();
+
+    // Verify email only needs to run once at mount
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  if (isError) {
+    return <EmailVerificationSent email={email} isError={true} />;
+  }
+
+  return <></>;
+};
diff --git a/packages/twenty-front/src/modules/auth/graphql/mutations/getLoginTokenFromEmailVerificationToken.ts b/packages/twenty-front/src/modules/auth/graphql/mutations/getLoginTokenFromEmailVerificationToken.ts
new file mode 100644
index 000000000000..67631c89e51b
--- /dev/null
+++ b/packages/twenty-front/src/modules/auth/graphql/mutations/getLoginTokenFromEmailVerificationToken.ts
@@ -0,0 +1,17 @@
+import { gql } from '@apollo/client';
+
+export const GET_LOGIN_TOKEN_FROM_EMAIL_VERIFICATION_TOKEN = gql`
+  mutation GetLoginTokenFromEmailVerificationToken(
+    $emailVerificationToken: String!
+    $captchaToken: String
+  ) {
+    getLoginTokenFromEmailVerificationToken(
+      emailVerificationToken: $emailVerificationToken
+      captchaToken: $captchaToken
+    ) {
+      loginToken {
+        ...AuthTokenFragment
+      }
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/auth/graphql/mutations/resendEmailVerificationToken.ts b/packages/twenty-front/src/modules/auth/graphql/mutations/resendEmailVerificationToken.ts
new file mode 100644
index 000000000000..7040fd2e2944
--- /dev/null
+++ b/packages/twenty-front/src/modules/auth/graphql/mutations/resendEmailVerificationToken.ts
@@ -0,0 +1,9 @@
+import { gql } from '@apollo/client';
+
+export const RESEND_EMAIL_VERIFICATION_TOKEN = gql`
+  mutation ResendEmailVerificationToken($email: String!) {
+    resendEmailVerificationToken(email: $email) {
+      success
+    }
+  }
+`;
diff --git a/packages/twenty-front/src/modules/auth/graphql/mutations/signUp.ts b/packages/twenty-front/src/modules/auth/graphql/mutations/signUp.ts
index a1b45dc8f386..d15416e2e0d8 100644
--- a/packages/twenty-front/src/modules/auth/graphql/mutations/signUp.ts
+++ b/packages/twenty-front/src/modules/auth/graphql/mutations/signUp.ts
@@ -7,6 +7,7 @@ export const SIGN_UP = gql`
     $workspaceInviteHash: String
     $workspacePersonalInviteToken: String = null
     $captchaToken: String
+    $workspaceId: String
   ) {
     signUp(
       email: $email
@@ -14,6 +15,7 @@ export const SIGN_UP = gql`
       workspaceInviteHash: $workspaceInviteHash
       workspacePersonalInviteToken: $workspacePersonalInviteToken
       captchaToken: $captchaToken
+      workspaceId: $workspaceId
     ) {
       loginToken {
         ...AuthTokenFragment
diff --git a/packages/twenty-front/src/modules/auth/graphql/mutations/switchWorkspace.ts b/packages/twenty-front/src/modules/auth/graphql/mutations/switchWorkspace.ts
deleted file mode 100644
index e4b604ded31c..000000000000
--- a/packages/twenty-front/src/modules/auth/graphql/mutations/switchWorkspace.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const SWITCH_WORKSPACE = gql`
-  mutation SwitchWorkspace($workspaceId: String!) {
-    switchWorkspace(workspaceId: $workspaceId) {
-      id
-      subdomain
-      authProviders {
-        sso {
-          id
-          name
-          type
-          status
-          issuer
-        }
-        google
-        magicLink
-        password
-        microsoft
-      }
-    }
-  }
-`;
diff --git a/packages/twenty-front/src/modules/auth/graphql/queries/checkUserExists.ts b/packages/twenty-front/src/modules/auth/graphql/queries/checkUserExists.ts
index 0a3c9b0aca4e..9ecd200ab115 100644
--- a/packages/twenty-front/src/modules/auth/graphql/queries/checkUserExists.ts
+++ b/packages/twenty-front/src/modules/auth/graphql/queries/checkUserExists.ts
@@ -19,6 +19,7 @@ export const CHECK_USER_EXISTS = gql`
             status
           }
         }
+        isEmailVerified
       }
       ... on UserNotExists {
         exists
diff --git a/packages/twenty-front/src/modules/auth/hooks/__tests__/useAuth.test.tsx b/packages/twenty-front/src/modules/auth/hooks/__tests__/useAuth.test.tsx
index 6430246e359f..073607e1588f 100644
--- a/packages/twenty-front/src/modules/auth/hooks/__tests__/useAuth.test.tsx
+++ b/packages/twenty-front/src/modules/auth/hooks/__tests__/useAuth.test.tsx
@@ -2,6 +2,7 @@ import { useApolloClient } from '@apollo/client';
 import { MockedProvider } from '@apollo/client/testing';
 import { expect } from '@storybook/test';
 import { ReactNode, act } from 'react';
+import { MemoryRouter } from 'react-router-dom';
 import { RecoilRoot, useRecoilValue } from 'recoil';
 import { iconsState } from 'twenty-ui';
 
@@ -13,12 +14,14 @@ import { supportChatState } from '@/client-config/states/supportChatState';
 import { workspaceAuthProvidersState } from '@/workspace/states/workspaceAuthProvidersState';
 
 import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';
-import { email, mocks, password, results, token } from '../__mocks__/useAuth';
 import { renderHook } from '@testing-library/react';
+import { email, mocks, password, results, token } from '../__mocks__/useAuth';
 
 const Wrapper = ({ children }: { children: ReactNode }) => (
   <MockedProvider mocks={mocks} addTypename={false}>
-    <RecoilRoot>{children}</RecoilRoot>
+    <RecoilRoot>
+      <MemoryRouter>{children}</MemoryRouter>
+    </RecoilRoot>
   </MockedProvider>
 );
 
@@ -141,10 +144,7 @@ describe('useAuth', () => {
     const { result } = renderHooks();
 
     await act(async () => {
-      const res = await result.current.signUpWithCredentials(email, password);
-      expect(res).toHaveProperty('user');
-      expect(res).toHaveProperty('workspaceMember');
-      expect(res).toHaveProperty('workspace');
+      await result.current.signUpWithCredentials(email, password);
     });
 
     expect(mocks[2].result).toHaveBeenCalled();
diff --git a/packages/twenty-front/src/modules/auth/hooks/useAuth.ts b/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
index d28d49d59e06..b25b7cb3ecd9 100644
--- a/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
+++ b/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
@@ -1,4 +1,5 @@
-import { useApolloClient } from '@apollo/client';
+import { AppPath } from '@/types/AppPath';
+import { ApolloError, useApolloClient } from '@apollo/client';
 import { useCallback } from 'react';
 import {
   snapshot_UNSTABLE,
@@ -15,7 +16,6 @@ import { isCurrentUserLoadedState } from '@/auth/states/isCurrentUserLoadingStat
 import { isVerifyPendingState } from '@/auth/states/isVerifyPendingState';
 import { workspacesState } from '@/auth/states/workspaces';
 import { billingState } from '@/client-config/states/billingState';
-import { captchaProviderState } from '@/client-config/states/captchaProviderState';
 import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';
 import { isDebugModeState } from '@/client-config/states/isDebugModeState';
 import { supportChatState } from '@/client-config/states/supportChatState';
@@ -25,6 +25,7 @@ import {
   useChallengeMutation,
   useCheckUserExistsLazyQuery,
   useGetCurrentUserLazyQuery,
+  useGetLoginTokenFromEmailVerificationTokenMutation,
   useSignUpMutation,
   useVerifyMutation,
 } from '~/generated/graphql';
@@ -43,17 +44,24 @@ import { getTimeFormatFromWorkspaceTimeFormat } from '@/localization/utils/getTi
 import { currentUserState } from '../states/currentUserState';
 import { tokenPairState } from '../states/tokenPairState';
 
+import {
+  SignInUpStep,
+  signInUpStepState,
+} from '@/auth/states/signInUpStepState';
+import { workspacePublicDataState } from '@/auth/states/workspacePublicDataState';
 import { BillingCheckoutSession } from '@/auth/types/billingCheckoutSession.type';
+import { captchaState } from '@/client-config/states/captchaState';
+import { isEmailVerificationRequiredState } from '@/client-config/states/isEmailVerificationRequiredState';
 import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';
 import { useIsCurrentLocationOnAWorkspaceSubdomain } from '@/domain-manager/hooks/useIsCurrentLocationOnAWorkspaceSubdomain';
 import { useLastAuthenticatedWorkspaceDomain } from '@/domain-manager/hooks/useLastAuthenticatedWorkspaceDomain';
-import { useReadWorkspaceSubdomainFromCurrentLocation } from '@/domain-manager/hooks/useReadWorkspaceSubdomainFromCurrentLocation';
 import { useRedirect } from '@/domain-manager/hooks/useRedirect';
 import { useRedirectToWorkspaceDomain } from '@/domain-manager/hooks/useRedirectToWorkspaceDomain';
 import { domainConfigurationState } from '@/domain-manager/states/domainConfigurationState';
 import { isAppWaitingForFreshObjectMetadataState } from '@/object-metadata/states/isAppWaitingForFreshObjectMetadataState';
-import { AppPath } from '@/types/AppPath';
 import { workspaceAuthProvidersState } from '@/workspace/states/workspaceAuthProvidersState';
+import { useSearchParams } from 'react-router-dom';
+import { dynamicActivate } from '~/utils/i18n/dynamicActivate';
 
 export const useAuth = () => {
   const setTokenPair = useSetRecoilState(tokenPairState);
@@ -68,7 +76,11 @@ export const useAuth = () => {
     currentWorkspaceMembersState,
   );
   const isMultiWorkspaceEnabled = useRecoilValue(isMultiWorkspaceEnabledState);
+  const isEmailVerificationRequired = useRecoilValue(
+    isEmailVerificationRequiredState,
+  );
 
+  const setSignInUpStep = useSetRecoilState(signInUpStepState);
   const setCurrentWorkspace = useSetRecoilState(currentWorkspaceState);
   const setIsVerifyPendingState = useSetRecoilState(isVerifyPendingState);
   const setWorkspaces = useSetRecoilState(workspacesState);
@@ -78,11 +90,14 @@ export const useAuth = () => {
   const [challenge] = useChallengeMutation();
   const [signUp] = useSignUpMutation();
   const [verify] = useVerifyMutation();
+  const [getLoginTokenFromEmailVerificationToken] =
+    useGetLoginTokenFromEmailVerificationTokenMutation();
   const [getCurrentUser] = useGetCurrentUserLazyQuery();
 
   const { isOnAWorkspaceSubdomain } =
     useIsCurrentLocationOnAWorkspaceSubdomain();
-  const { workspaceSubdomain } = useReadWorkspaceSubdomainFromCurrentLocation();
+
+  const workspacePublicData = useRecoilValue(workspacePublicDataState);
 
   const { setLastAuthenticateWorkspaceDomain } =
     useLastAuthenticatedWorkspaceDomain();
@@ -95,6 +110,8 @@ export const useAuth = () => {
 
   const setDateTimeFormat = useSetRecoilState(dateTimeFormatState);
 
+  const [, setSearchParams] = useSearchParams();
+
   const clearSession = useRecoilCallback(
     ({ snapshot }) =>
       async () => {
@@ -109,9 +126,7 @@ export const useAuth = () => {
           .getValue();
         const supportChat = snapshot.getLoadable(supportChatState).getValue();
         const isDebugMode = snapshot.getLoadable(isDebugModeState).getValue();
-        const captchaProvider = snapshot
-          .getLoadable(captchaProviderState)
-          .getValue();
+        const captcha = snapshot.getLoadable(captchaState).getValue();
         const clientConfigApiStatus = snapshot
           .getLoadable(clientConfigApiStatusState)
           .getValue();
@@ -134,7 +149,7 @@ export const useAuth = () => {
           );
           set(supportChatState, supportChat);
           set(isDebugModeState, isDebugMode);
-          set(captchaProviderState, captchaProvider);
+          set(captchaState, captcha);
           set(clientConfigApiStatusState, clientConfigApiStatus);
           set(isCurrentUserLoadedState, isCurrentUserLoaded);
           set(isMultiWorkspaceEnabledState, isMultiWorkspaceEnabled);
@@ -153,29 +168,69 @@ export const useAuth = () => {
 
   const handleChallenge = useCallback(
     async (email: string, password: string, captchaToken?: string) => {
-      const challengeResult = await challenge({
+      try {
+        const challengeResult = await challenge({
+          variables: {
+            email,
+            password,
+            captchaToken,
+          },
+        });
+        if (isDefined(challengeResult.errors)) {
+          throw challengeResult.errors;
+        }
+
+        if (!challengeResult.data?.challenge) {
+          throw new Error('No login token');
+        }
+
+        return challengeResult.data.challenge;
+      } catch (error) {
+        // TODO: Get intellisense for graphql error extensions code (codegen?)
+        if (
+          error instanceof ApolloError &&
+          error.graphQLErrors[0]?.extensions?.code === 'EMAIL_NOT_VERIFIED'
+        ) {
+          setSearchParams({ email });
+          setSignInUpStep(SignInUpStep.EmailVerification);
+          throw error;
+        }
+        throw error;
+      }
+    },
+    [challenge, setSearchParams, setSignInUpStep],
+  );
+
+  const handleGetLoginTokenFromEmailVerificationToken = useCallback(
+    async (emailVerificationToken: string, captchaToken?: string) => {
+      const loginTokenResult = await getLoginTokenFromEmailVerificationToken({
         variables: {
-          email,
-          password,
+          emailVerificationToken,
           captchaToken,
         },
       });
 
-      if (isDefined(challengeResult.errors)) {
-        throw challengeResult.errors;
+      if (isDefined(loginTokenResult.errors)) {
+        throw loginTokenResult.errors;
       }
 
-      if (!challengeResult.data?.challenge) {
+      if (!loginTokenResult.data?.getLoginTokenFromEmailVerificationToken) {
         throw new Error('No login token');
       }
 
-      return challengeResult.data.challenge;
+      return loginTokenResult.data.getLoginTokenFromEmailVerificationToken;
     },
-    [challenge],
+    [getLoginTokenFromEmailVerificationToken],
   );
 
   const loadCurrentUser = useCallback(async () => {
-    const currentUserResult = await getCurrentUser();
+    const currentUserResult = await getCurrentUser({
+      fetchPolicy: 'network-only',
+    });
+
+    if (isDefined(currentUserResult.error)) {
+      throw new Error(currentUserResult.error.message);
+    }
 
     const user = currentUserResult.data?.currentUser;
 
@@ -223,6 +278,7 @@ export const useAuth = () => {
             )
           : TimeFormat[detectTimeFormat()],
       });
+      dynamicActivate(workspaceMember.locale ?? 'en');
     }
 
     const workspace = user.currentWorkspace ?? null;
@@ -268,6 +324,8 @@ export const useAuth = () => {
 
   const handleVerify = useCallback(
     async (loginToken: string) => {
+      setIsVerifyPendingState(true);
+
       const verifyResult = await verify({
         variables: { loginToken },
       });
@@ -282,40 +340,23 @@ export const useAuth = () => {
 
       setTokenPair(verifyResult.data?.verify.tokens);
 
-      const { user, workspaceMember, workspace } = await loadCurrentUser();
+      await loadCurrentUser();
 
-      return {
-        user,
-        workspaceMember,
-        workspace,
-        tokens: verifyResult.data?.verify.tokens,
-      };
+      setIsVerifyPendingState(false);
     },
-    [verify, setTokenPair, loadCurrentUser],
+    [setIsVerifyPendingState, verify, setTokenPair, loadCurrentUser],
   );
 
-  const handleCrendentialsSignIn = useCallback(
+  const handleCredentialsSignIn = useCallback(
     async (email: string, password: string, captchaToken?: string) => {
       const { loginToken } = await handleChallenge(
         email,
         password,
         captchaToken,
       );
-      setIsVerifyPendingState(true);
-
-      const { user, workspaceMember, workspace } = await handleVerify(
-        loginToken.token,
-      );
-
-      setIsVerifyPendingState(false);
-
-      return {
-        user,
-        workspaceMember,
-        workspace,
-      };
+      await handleVerify(loginToken.token);
     },
-    [handleChallenge, handleVerify, setIsVerifyPendingState],
+    [handleChallenge, handleVerify],
   );
 
   const handleSignOut = useCallback(async () => {
@@ -339,6 +380,9 @@ export const useAuth = () => {
           workspaceInviteHash,
           workspacePersonalInviteToken,
           captchaToken,
+          ...(workspacePublicData?.id
+            ? { workspaceId: workspacePublicData.id }
+            : {}),
         },
       });
 
@@ -350,29 +394,36 @@ export const useAuth = () => {
         throw new Error('No login token');
       }
 
+      if (isEmailVerificationRequired) {
+        setSearchParams({ email });
+        setSignInUpStep(SignInUpStep.EmailVerification);
+        return null;
+      }
+
       if (isMultiWorkspaceEnabled) {
         return redirectToWorkspaceDomain(
           signUpResult.data.signUp.workspace.subdomain,
-          AppPath.Verify,
+          isEmailVerificationRequired ? AppPath.SignInUp : AppPath.Verify,
           {
-            loginToken: signUpResult.data.signUp.loginToken.token,
+            ...(!isEmailVerificationRequired && {
+              loginToken: signUpResult.data.signUp.loginToken.token,
+            }),
+            email,
           },
         );
       }
 
-      const { user, workspace, workspaceMember } = await handleVerify(
-        signUpResult.data?.signUp.loginToken.token,
-      );
-
-      setIsVerifyPendingState(false);
-
-      return { user, workspaceMember, workspace };
+      await handleVerify(signUpResult.data?.signUp.loginToken.token);
     },
     [
       setIsVerifyPendingState,
       signUp,
+      workspacePublicData,
       isMultiWorkspaceEnabled,
       handleVerify,
+      setSignInUpStep,
+      setSearchParams,
+      isEmailVerificationRequired,
       redirectToWorkspaceDomain,
     ],
   );
@@ -403,13 +454,13 @@ export const useAuth = () => {
         );
       }
 
-      if (isDefined(workspaceSubdomain)) {
-        url.searchParams.set('workspaceSubdomain', workspaceSubdomain);
+      if (isDefined(workspacePublicData)) {
+        url.searchParams.set('workspaceId', workspacePublicData.id);
       }
 
       return url.toString();
     },
-    [workspaceSubdomain],
+    [workspacePublicData],
   );
 
   const handleGoogleLogin = useCallback(
@@ -436,6 +487,8 @@ export const useAuth = () => {
 
   return {
     challenge: handleChallenge,
+    getLoginTokenFromEmailVerificationToken:
+      handleGetLoginTokenFromEmailVerificationToken,
     verify: handleVerify,
 
     loadCurrentUser,
@@ -444,7 +497,7 @@ export const useAuth = () => {
     clearSession,
     signOut: handleSignOut,
     signUpWithCredentials: handleCredentialsSignUp,
-    signInWithCredentials: handleCrendentialsSignIn,
+    signInWithCredentials: handleCredentialsSignIn,
     signInWithGoogle: handleGoogleLogin,
     signInWithMicrosoft: handleMicrosoftLogin,
   };
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/EmailVerificationSent.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/EmailVerificationSent.tsx
new file mode 100644
index 000000000000..1205e2689d9c
--- /dev/null
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/EmailVerificationSent.tsx
@@ -0,0 +1,79 @@
+import styled from '@emotion/styled';
+
+import { SubTitle } from '@/auth/components/SubTitle';
+import { Title } from '@/auth/components/Title';
+import { useHandleResendEmailVerificationToken } from '@/auth/sign-in-up/hooks/useHandleResendEmailVerificationToken';
+import { useTheme } from '@emotion/react';
+import { AnimatedEaseIn, IconMail, Loader, MainButton, RGBA } from 'twenty-ui';
+
+const StyledMailContainer = styled.div`
+  align-items: center;
+  display: flex;
+  justify-content: center;
+  border: 2px solid ${(props) => props.color};
+  border-radius: ${({ theme }) => theme.border.radius.rounded};
+  box-shadow: ${(props) =>
+    props.color && `-4px 4px 0 -2px ${RGBA(props.color, 1)}`};
+  height: 36px;
+  width: 36px;
+  margin-bottom: ${({ theme }) => theme.spacing(4)};
+`;
+
+const StyledEmail = styled.span`
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+`;
+
+const StyledButtonContainer = styled.div`
+  margin-top: ${({ theme }) => theme.spacing(8)};
+`;
+
+export const EmailVerificationSent = ({
+  email,
+  isError = false,
+}: {
+  email: string | null;
+  isError?: boolean;
+}) => {
+  const theme = useTheme();
+  const color =
+    theme.name === 'light' ? theme.grayScale.gray90 : theme.grayScale.gray10;
+
+  const { handleResendEmailVerificationToken, loading: isLoading } =
+    useHandleResendEmailVerificationToken();
+
+  return (
+    <>
+      <AnimatedEaseIn>
+        <StyledMailContainer color={color}>
+          <IconMail color={color} size={24} stroke={3} />
+        </StyledMailContainer>
+      </AnimatedEaseIn>
+      <Title animate>
+        {isError ? 'Email Verification Failed' : 'Confirm Your Email Address'}
+      </Title>
+      <SubTitle>
+        {isError ? (
+          <>
+            Oops! We encountered an issue verifying{' '}
+            <StyledEmail>{email}</StyledEmail>. Please request a new
+            verification email and try again.
+          </>
+        ) : (
+          <>
+            A verification email has been sent to{' '}
+            <StyledEmail>{email}</StyledEmail>. Please check your inbox and
+            click the link in the email to activate your account.
+          </>
+        )}
+      </SubTitle>
+      <StyledButtonContainer>
+        <MainButton
+          title="Click to resend"
+          onClick={handleResendEmailVerificationToken(email)}
+          Icon={() => (isLoading ? <Loader /> : undefined)}
+          width={200}
+        />
+      </StyledButtonContainer>
+    </>
+  );
+};
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx
index 775667c8056d..0d1fd5d173dd 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpGlobalScopeForm.tsx
@@ -21,6 +21,7 @@ import {
 import { SignInUpMode } from '@/auth/types/signInUpMode';
 import { useReadCaptchaToken } from '@/captcha/hooks/useReadCaptchaToken';
 import { useRequestFreshCaptchaToken } from '@/captcha/hooks/useRequestFreshCaptchaToken';
+import { isRequestingCaptchaTokenState } from '@/captcha/states/isRequestingCaptchaTokenState';
 import { authProvidersState } from '@/client-config/states/authProvidersState';
 import { useRedirectToWorkspaceDomain } from '@/domain-manager/hooks/useRedirectToWorkspaceDomain';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
@@ -49,6 +50,10 @@ export const SignInUpGlobalScopeForm = () => {
   const setSignInUpStep = useSetRecoilState(signInUpStepState);
   const [signInUpMode, setSignInUpMode] = useRecoilState(signInUpModeState);
 
+  const isRequestingCaptchaToken = useRecoilValue(
+    isRequestingCaptchaTokenState,
+  );
+
   const { enqueueSnackBar } = useSnackBar();
   const { requestFreshCaptchaToken } = useRequestFreshCaptchaToken();
 
@@ -118,8 +123,8 @@ export const SignInUpGlobalScopeForm = () => {
                 signInUpMode={signInUpMode}
               />
             )}
-
             <MainButton
+              disabled={isRequestingCaptchaToken}
               title={
                 signInUpStep === SignInUpStep.Password ? 'Sign Up' : 'Continue'
               }
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWithCredentials.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWithCredentials.tsx
index e385edd8cf3a..29691cfa7a8c 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWithCredentials.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWithCredentials.tsx
@@ -1,21 +1,21 @@
+import { useSignInUp } from '@/auth/sign-in-up/hooks/useSignInUp';
+import { Form } from '@/auth/sign-in-up/hooks/useSignInUpForm';
 import {
   SignInUpStep,
   signInUpStepState,
 } from '@/auth/states/signInUpStepState';
-import { useSignInUp } from '@/auth/sign-in-up/hooks/useSignInUp';
-import { Form } from '@/auth/sign-in-up/hooks/useSignInUpForm';
 
-import { Loader, MainButton } from 'twenty-ui';
-import { isDefined } from '~/utils/isDefined';
 import { SignInUpEmailField } from '@/auth/sign-in-up/components/SignInUpEmailField';
-import { useRecoilValue } from 'recoil';
-import styled from '@emotion/styled';
 import { SignInUpPasswordField } from '@/auth/sign-in-up/components/SignInUpPasswordField';
-import { useState, useMemo } from 'react';
-import { captchaProviderState } from '@/client-config/states/captchaProviderState';
+import { SignInUpMode } from '@/auth/types/signInUpMode';
 import { isRequestingCaptchaTokenState } from '@/captcha/states/isRequestingCaptchaTokenState';
+import { captchaState } from '@/client-config/states/captchaState';
+import styled from '@emotion/styled';
+import { useMemo, useState } from 'react';
 import { useFormContext } from 'react-hook-form';
-import { SignInUpMode } from '@/auth/types/signInUpMode';
+import { useRecoilValue } from 'recoil';
+import { Loader, MainButton } from 'twenty-ui';
+import { isDefined } from '~/utils/isDefined';
 
 const StyledForm = styled.form`
   align-items: center;
@@ -29,7 +29,7 @@ export const SignInUpWithCredentials = () => {
 
   const signInUpStep = useRecoilValue(signInUpStepState);
   const [showErrors, setShowErrors] = useState(false);
-  const captchaProvider = useRecoilValue(captchaProviderState);
+  const captcha = useRecoilValue(captchaState);
   const isRequestingCaptchaToken = useRecoilValue(
     isRequestingCaptchaTokenState,
   );
@@ -86,7 +86,7 @@ export const SignInUpWithCredentials = () => {
 
   const shouldWaitForCaptchaToken =
     signInUpStep !== SignInUpStep.Init &&
-    isDefined(captchaProvider?.provider) &&
+    isDefined(captcha?.provider) &&
     isRequestingCaptchaToken;
 
   const isEmailStepSubmitButtonDisabledCondition =
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWorkspaceScopeFormEffect.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWorkspaceScopeFormEffect.tsx
index 530a9dee567d..894b4eaccd2c 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWorkspaceScopeFormEffect.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWorkspaceScopeFormEffect.tsx
@@ -1,34 +1,79 @@
 import { useSignInUp } from '@/auth/sign-in-up/hooks/useSignInUp';
 import { useSignInUpForm } from '@/auth/sign-in-up/hooks/useSignInUpForm';
 import { SignInUpStep } from '@/auth/states/signInUpStepState';
+import { isRequestingCaptchaTokenState } from '@/captcha/states/isRequestingCaptchaTokenState';
+import { captchaState } from '@/client-config/states/captchaState';
 import { workspaceAuthProvidersState } from '@/workspace/states/workspaceAuthProvidersState';
-import { useCallback, useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import { useRecoilValue } from 'recoil';
 import { isDefined } from '~/utils/isDefined';
 
 const searchParams = new URLSearchParams(window.location.search);
 const email = searchParams.get('email');
 
+enum LoadingStatus {
+  Loading = 'loading',
+  RequestingCaptchaToken = 'requestingCaptchaToken',
+  Done = 'done',
+}
+
 export const SignInUpWorkspaceScopeFormEffect = () => {
   const workspaceAuthProviders = useRecoilValue(workspaceAuthProvidersState);
 
+  const isRequestingCaptchaToken = useRecoilValue(
+    isRequestingCaptchaTokenState,
+  );
+
+  const captcha = useRecoilValue(captchaState);
+
+  const [loadingStatus, setLoadingStatus] = useState<LoadingStatus>(
+    LoadingStatus.Loading,
+  );
+
   const { form } = useSignInUpForm();
 
   const { signInUpStep, continueWithEmail, continueWithCredentials } =
     useSignInUp(form);
 
-  const checkAuthProviders = useCallback(() => {
+  useEffect(() => {
+    if (loadingStatus === LoadingStatus.Done) {
+      return;
+    }
+
+    if (!isDefined(captcha?.provider)) {
+      setLoadingStatus(LoadingStatus.Done);
+      return;
+    }
+
+    if (isRequestingCaptchaToken) {
+      setLoadingStatus(LoadingStatus.RequestingCaptchaToken);
+    }
+
+    if (
+      !isRequestingCaptchaToken &&
+      loadingStatus === LoadingStatus.RequestingCaptchaToken
+    ) {
+      setLoadingStatus(LoadingStatus.Done);
+    }
+  }, [captcha?.provider, isRequestingCaptchaToken, loadingStatus]);
+
+  useEffect(() => {
     if (
       signInUpStep === SignInUpStep.Init &&
       !workspaceAuthProviders.google &&
       !workspaceAuthProviders.microsoft &&
       !workspaceAuthProviders.sso
     ) {
-      return continueWithEmail();
+      continueWithEmail();
+      return;
     }
 
-    if (isDefined(email) && workspaceAuthProviders.password) {
-      return continueWithCredentials();
+    if (
+      isDefined(email) &&
+      workspaceAuthProviders.password &&
+      loadingStatus === LoadingStatus.Done
+    ) {
+      continueWithCredentials();
     }
   }, [
     signInUpStep,
@@ -38,11 +83,8 @@ export const SignInUpWorkspaceScopeFormEffect = () => {
     workspaceAuthProviders.password,
     continueWithEmail,
     continueWithCredentials,
+    loadingStatus,
   ]);
 
-  useEffect(() => {
-    checkAuthProviders();
-  }, [checkAuthProviders]);
-
   return <></>;
 };
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInUpForm.test.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInUpForm.test.tsx
new file mode 100644
index 000000000000..9c626b43d5b0
--- /dev/null
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInUpForm.test.tsx
@@ -0,0 +1,68 @@
+import { RecoilRoot, useSetRecoilState } from 'recoil';
+import { renderHook } from '@testing-library/react';
+import { useSignInUpForm } from '@/auth/sign-in-up/hooks/useSignInUpForm';
+import { ReactNode } from 'react';
+import { MemoryRouter } from 'react-router-dom';
+import { isDeveloperDefaultSignInPrefilledState } from '@/client-config/states/isDeveloperDefaultSignInPrefilledState';
+
+describe('useSignInUpForm', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should initialize the form with default values', async () => {
+    const { result } = renderHook(() => useSignInUpForm(), {
+      wrapper: ({ children }: { children: ReactNode }) => (
+        <MemoryRouter>
+          <RecoilRoot>{children}</RecoilRoot>
+        </MemoryRouter>
+      ),
+    });
+    expect(result.current.form).toBeDefined();
+  });
+
+  it('should not prefill sign-in developer defaults when state is false', () => {
+    const { result } = renderHook(() => useSignInUpForm(), {
+      wrapper: ({ children }: { children: ReactNode }) => (
+        <MemoryRouter initialEntries={['?email=test@test.com']}>
+          <RecoilRoot>{children}</RecoilRoot>
+        </MemoryRouter>
+      ),
+    });
+
+    expect(result.current.form.getValues()).toEqual({
+      exist: false,
+      email: 'test@test.com',
+      password: '',
+      captchaToken: '',
+    });
+  });
+
+  it('should prefill developer defaults when the state is true', () => {
+    const { result } = renderHook(
+      () => {
+        const setIsDeveloperDefaultSignInPrefilledState = useSetRecoilState(
+          isDeveloperDefaultSignInPrefilledState,
+        );
+
+        setIsDeveloperDefaultSignInPrefilledState(true);
+
+        return useSignInUpForm();
+      },
+      {
+        wrapper: ({ children }: { children: ReactNode }) => (
+          <MemoryRouter initialEntries={['?email=test@test.com']}>
+            <RecoilRoot>{children}</RecoilRoot>
+          </MemoryRouter>
+        ),
+      },
+    );
+
+    expect(result.current.form.getValues()).toEqual({
+      exist: false,
+      email: 'test@test.com',
+      password: 'Applecar2025',
+      captchaToken: '',
+    });
+  });
+});
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInWithGoogle.test.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInWithGoogle.test.ts
index 5a7072ceacae..90dde88b0ce9 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInWithGoogle.test.ts
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInWithGoogle.test.ts
@@ -8,6 +8,7 @@ import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMeta
 jest.mock('react-router-dom', () => ({
   useParams: jest.fn(),
   useSearchParams: jest.fn(),
+  Link: jest.fn(),
 }));
 
 jest.mock('@/auth/hooks/useAuth', () => ({
@@ -16,10 +17,9 @@ jest.mock('@/auth/hooks/useAuth', () => ({
 
 describe('useSignInWithGoogle', () => {
   const mockBillingCheckoutSession = {
-    plan: BillingPlanKey.Pro,
+    plan: BillingPlanKey.PRO,
     interval: SubscriptionInterval.Month,
     requirePaymentMethod: true,
-    skipPlanPage: false,
   };
 
   const Wrapper = getJestMetadataAndApolloMocksWrapper({
@@ -31,7 +31,7 @@ describe('useSignInWithGoogle', () => {
     const mockUseParams = { workspaceInviteHash: 'testHash' };
 
     const mockSearchParams = new URLSearchParams(
-      'inviteToken=testToken&billingCheckoutSessionState={"plan":"Pro","interval":"Month","requirePaymentMethod":true,"skipPlanPage":false}',
+      'inviteToken=testToken&billingCheckoutSessionState={"plan":"Pro","interval":"Month","requirePaymentMethod":true}',
     );
 
     (useParams as jest.Mock).mockReturnValue(mockUseParams);
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInWithMicrosoft.test.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInWithMicrosoft.test.ts
index 98c9ea527762..577ee72026e6 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInWithMicrosoft.test.ts
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/__tests__/useSignInWithMicrosoft.test.ts
@@ -7,6 +7,7 @@ import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMeta
 jest.mock('react-router-dom', () => ({
   useParams: jest.fn(),
   useSearchParams: jest.fn(),
+  Link: jest.fn(),
 }));
 
 jest.mock('@/auth/hooks/useAuth', () => ({
@@ -22,7 +23,6 @@ describe('useSignInWithMicrosoft', () => {
     plan: 'PRO',
     interval: 'Month',
     requirePaymentMethod: true,
-    skipPlanPage: false,
   };
 
   it('should call signInWithMicrosoft with the correct parameters', () => {
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useHandleResendEmailVerificationToken.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useHandleResendEmailVerificationToken.ts
new file mode 100644
index 000000000000..d1c52dfd99a2
--- /dev/null
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useHandleResendEmailVerificationToken.ts
@@ -0,0 +1,47 @@
+import { useCallback } from 'react';
+
+import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { useResendEmailVerificationTokenMutation } from '~/generated/graphql';
+
+export const useHandleResendEmailVerificationToken = () => {
+  const { enqueueSnackBar } = useSnackBar();
+  const [resendEmailVerificationToken, { loading }] =
+    useResendEmailVerificationTokenMutation();
+
+  const handleResendEmailVerificationToken = useCallback(
+    (email: string | null) => {
+      return async () => {
+        if (!email) {
+          enqueueSnackBar('Invalid email', {
+            variant: SnackBarVariant.Error,
+          });
+          return;
+        }
+
+        try {
+          const { data } = await resendEmailVerificationToken({
+            variables: { email },
+          });
+
+          if (data?.resendEmailVerificationToken?.success === true) {
+            enqueueSnackBar('Email verification link resent!', {
+              variant: SnackBarVariant.Success,
+            });
+          } else {
+            enqueueSnackBar('There was some issue', {
+              variant: SnackBarVariant.Error,
+            });
+          }
+        } catch (error) {
+          enqueueSnackBar((error as Error).message, {
+            variant: SnackBarVariant.Error,
+          });
+        }
+      };
+    },
+    [enqueueSnackBar, resendEmailVerificationToken],
+  );
+
+  return { handleResendEmailVerificationToken, loading };
+};
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts
index 4eec9f55f958..090aee8e3e26 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts
@@ -3,20 +3,20 @@ import { SubmitHandler, UseFormReturn } from 'react-hook-form';
 import { useParams, useSearchParams } from 'react-router-dom';
 
 import { Form } from '@/auth/sign-in-up/hooks/useSignInUpForm';
+import { signInUpModeState } from '@/auth/states/signInUpModeState';
+import {
+  SignInUpStep,
+  signInUpStepState,
+} from '@/auth/states/signInUpStepState';
+import { SignInUpMode } from '@/auth/types/signInUpMode';
 import { useReadCaptchaToken } from '@/captcha/hooks/useReadCaptchaToken';
 import { useRequestFreshCaptchaToken } from '@/captcha/hooks/useRequestFreshCaptchaToken';
+import { AppPath } from '@/types/AppPath';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { useRecoilState } from 'recoil';
 import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
-import {
-  SignInUpStep,
-  signInUpStepState,
-} from '@/auth/states/signInUpStepState';
-import { AppPath } from '@/types/AppPath';
 import { useAuth } from '../../hooks/useAuth';
-import { signInUpModeState } from '@/auth/states/signInUpModeState';
-import { SignInUpMode } from '@/auth/types/signInUpMode';
 
 export const useSignInUp = (form: UseFormReturn<Form>) => {
   const { enqueueSnackBar } = useSnackBar();
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInWithGoogle.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInWithGoogle.ts
index 26908402e4dc..4d8361d037a8 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInWithGoogle.ts
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInWithGoogle.ts
@@ -12,7 +12,6 @@ export const useSignInWithGoogle = () => {
     plan: 'PRO',
     interval: 'Month',
     requirePaymentMethod: true,
-    skipPlanPage: false,
   } as BillingCheckoutSession;
 
   const { signInWithGoogle } = useAuth();
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceFromInviteHash.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceFromInviteHash.ts
index 0e238c3ab706..e2c7e4b0bdcf 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceFromInviteHash.ts
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useWorkspaceFromInviteHash.ts
@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 import { useRecoilValue, useSetRecoilState } from 'recoil';
 
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
@@ -10,11 +10,12 @@ import { isDefaultLayoutAuthModalVisibleState } from '@/ui/layout/states/isDefau
 
 import { AppPath } from '@/types/AppPath';
 import { useGetWorkspaceFromInviteHashQuery } from '~/generated/graphql';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
 import { isDefined } from '~/utils/isDefined';
 
 export const useWorkspaceFromInviteHash = () => {
   const { enqueueSnackBar } = useSnackBar();
-  const navigate = useNavigate();
+  const navigate = useNavigateApp();
   const workspaceInviteHash = useParams().workspaceInviteHash;
   const currentWorkspace = useRecoilValue(currentWorkspaceState);
   const [initiallyLoggedIn] = useState(isDefined(currentWorkspace));
diff --git a/packages/twenty-front/src/modules/auth/states/billingCheckoutSessionState.ts b/packages/twenty-front/src/modules/auth/states/billingCheckoutSessionState.ts
index acfe231a9709..e80cd0e16bd3 100644
--- a/packages/twenty-front/src/modules/auth/states/billingCheckoutSessionState.ts
+++ b/packages/twenty-front/src/modules/auth/states/billingCheckoutSessionState.ts
@@ -1,16 +1,11 @@
 import { BillingCheckoutSession } from '@/auth/types/billingCheckoutSession.type';
+import { BILLING_CHECKOUT_SESSION_DEFAULT_VALUE } from '@/billing/constants/BillingCheckoutSessionDefaultValue';
 import { createState } from '@ui/utilities/state/utils/createState';
 import { syncEffect } from 'recoil-sync';
-import { BillingPlanKey, SubscriptionInterval } from '~/generated/graphql';
 
 export const billingCheckoutSessionState = createState<BillingCheckoutSession>({
   key: 'billingCheckoutSessionState',
-  defaultValue: {
-    plan: BillingPlanKey.Pro,
-    interval: SubscriptionInterval.Month,
-    requirePaymentMethod: true,
-    skipPlanPage: false,
-  },
+  defaultValue: BILLING_CHECKOUT_SESSION_DEFAULT_VALUE,
   effects: [
     syncEffect({
       refine: (value: unknown) => {
@@ -19,8 +14,7 @@ export const billingCheckoutSessionState = createState<BillingCheckoutSession>({
           value !== null &&
           'plan' in value &&
           'interval' in value &&
-          'requirePaymentMethod' in value &&
-          'skipPlanPage' in value
+          'requirePaymentMethod' in value
         ) {
           return {
             type: 'success',
diff --git a/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts b/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts
index 872c6af93ef7..5f2530bc646e 100644
--- a/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts
+++ b/packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts
@@ -11,6 +11,7 @@ export type CurrentWorkspace = Pick<
   | 'allowImpersonation'
   | 'featureFlags'
   | 'activationStatus'
+  | 'billingSubscriptions'
   | 'currentBillingSubscription'
   | 'workspaceMembersCount'
   | 'isPublicInviteLinkEnabled'
diff --git a/packages/twenty-front/src/modules/auth/states/signInUpStepState.ts b/packages/twenty-front/src/modules/auth/states/signInUpStepState.ts
index 81a4023719b7..613d3a019b0f 100644
--- a/packages/twenty-front/src/modules/auth/states/signInUpStepState.ts
+++ b/packages/twenty-front/src/modules/auth/states/signInUpStepState.ts
@@ -4,6 +4,7 @@ export enum SignInUpStep {
   Init = 'init',
   Email = 'email',
   Password = 'password',
+  EmailVerification = 'emailVerification',
   WorkspaceSelection = 'workspaceSelection',
   SSOIdentityProviderSelection = 'SSOIdentityProviderSelection',
 }
diff --git a/packages/twenty-front/src/modules/auth/states/workspaces.ts b/packages/twenty-front/src/modules/auth/states/workspaces.ts
index e38a4a146ad3..b7e7c8758e50 100644
--- a/packages/twenty-front/src/modules/auth/states/workspaces.ts
+++ b/packages/twenty-front/src/modules/auth/states/workspaces.ts
@@ -5,9 +5,9 @@ import { Workspace } from '~/generated/graphql';
 export type Workspaces = Pick<
   Workspace,
   'id' | 'logo' | 'displayName' | 'subdomain'
->;
+>[];
 
-export const workspacesState = createState<Workspaces[] | null>({
+export const workspacesState = createState<Workspaces>({
   key: 'workspacesState',
   defaultValue: [],
 });
diff --git a/packages/twenty-front/src/modules/auth/types/billingCheckoutSession.type.ts b/packages/twenty-front/src/modules/auth/types/billingCheckoutSession.type.ts
index a634e17e2d4b..8de24c98f577 100644
--- a/packages/twenty-front/src/modules/auth/types/billingCheckoutSession.type.ts
+++ b/packages/twenty-front/src/modules/auth/types/billingCheckoutSession.type.ts
@@ -5,5 +5,4 @@ export type BillingCheckoutSession = {
   plan: BillingPlanKey;
   interval: SubscriptionInterval;
   requirePaymentMethod: boolean;
-  skipPlanPage: boolean;
 };
diff --git a/packages/twenty-front/src/modules/billing/components/SubscriptionCard.tsx b/packages/twenty-front/src/modules/billing/components/SubscriptionCard.tsx
deleted file mode 100644
index 5bfbebee7522..000000000000
--- a/packages/twenty-front/src/modules/billing/components/SubscriptionCard.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import styled from '@emotion/styled';
-
-import { SubscriptionCardPrice } from '@/billing/components/SubscriptionCardPrice';
-import { capitalize } from 'twenty-shared';
-
-type SubscriptionCardProps = {
-  type?: string;
-  price: number;
-  info: string;
-};
-
-const StyledSubscriptionCardContainer = styled.div`
-  display: flex;
-  flex-direction: column;
-`;
-
-const StyledTypeContainer = styled.div`
-  color: ${({ theme }) => theme.font.color.secondary};
-  font-size: ${({ theme }) => theme.font.size.sm};
-  display: flex;
-`;
-
-const StyledInfoContainer = styled.div`
-  color: ${({ theme }) => theme.font.color.tertiary};
-  font-size: ${({ theme }) => theme.font.size.sm};
-  display: flex;
-`;
-
-export const SubscriptionCard = ({
-  type,
-  price,
-  info,
-}: SubscriptionCardProps) => {
-  return (
-    <StyledSubscriptionCardContainer>
-      <StyledTypeContainer>{capitalize(type || '')}</StyledTypeContainer>
-      <SubscriptionCardPrice price={price} />
-      <StyledInfoContainer>{info}</StyledInfoContainer>
-    </StyledSubscriptionCardContainer>
-  );
-};
diff --git a/packages/twenty-front/src/modules/billing/components/SubscriptionCardPrice.tsx b/packages/twenty-front/src/modules/billing/components/SubscriptionCardPrice.tsx
deleted file mode 100644
index 8091c72ab3c9..000000000000
--- a/packages/twenty-front/src/modules/billing/components/SubscriptionCardPrice.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import styled from '@emotion/styled';
-
-type SubscriptionCardPriceProps = {
-  price: number;
-};
-const StyledSubscriptionCardPriceContainer = styled.div`
-  align-items: baseline;
-  display: flex;
-  gap: ${({ theme }) => theme.betweenSiblingsGap};
-  margin: ${({ theme }) => theme.spacing(1)} 0
-    ${({ theme }) => theme.spacing(2)};
-`;
-const StyledPriceSpan = styled.span`
-  color: ${({ theme }) => theme.font.color.primary};
-  font-size: ${({ theme }) => theme.font.size.xl};
-  font-weight: ${({ theme }) => theme.font.weight.semiBold};
-`;
-const StyledSeatSpan = styled.span`
-  color: ${({ theme }) => theme.font.color.light};
-  font-size: ${({ theme }) => theme.font.size.md};
-  font-weight: ${({ theme }) => theme.font.weight.medium};
-`;
-export const SubscriptionCardPrice = ({
-  price,
-}: SubscriptionCardPriceProps) => {
-  return (
-    <StyledSubscriptionCardPriceContainer>
-      <StyledPriceSpan>${price}</StyledPriceSpan>
-      <StyledSeatSpan>/</StyledSeatSpan>
-      <StyledSeatSpan>seat</StyledSeatSpan>
-    </StyledSubscriptionCardPriceContainer>
-  );
-};
diff --git a/packages/twenty-front/src/modules/billing/components/SubscriptionPrice.tsx b/packages/twenty-front/src/modules/billing/components/SubscriptionPrice.tsx
new file mode 100644
index 000000000000..206c9b768bad
--- /dev/null
+++ b/packages/twenty-front/src/modules/billing/components/SubscriptionPrice.tsx
@@ -0,0 +1,29 @@
+import styled from '@emotion/styled';
+import { SubscriptionInterval } from '~/generated-metadata/graphql';
+
+type SubscriptionPriceProps = {
+  type: SubscriptionInterval;
+  price: number;
+};
+
+const StyledPriceSpan = styled.span`
+  color: ${({ theme }) => theme.font.color.primary};
+  font-size: ${({ theme }) => theme.font.size.xxl};
+  font-weight: ${({ theme }) => theme.font.weight.semiBold};
+  margin-bottom: ${({ theme }) => theme.spacing(1)};
+`;
+
+const StyledPriceUnitSpan = styled.span`
+  color: ${({ theme }) => theme.font.color.light};
+  font-size: ${({ theme }) => theme.font.size.md};
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+`;
+
+export const SubscriptionPrice = ({ type, price }: SubscriptionPriceProps) => {
+  return (
+    <>
+      <StyledPriceSpan>{`$${price}`}</StyledPriceSpan>
+      <StyledPriceUnitSpan>{`seat / ${type.toLocaleLowerCase()}`}</StyledPriceUnitSpan>
+    </>
+  );
+};
diff --git a/packages/twenty-front/src/modules/billing/components/TrialCard.tsx b/packages/twenty-front/src/modules/billing/components/TrialCard.tsx
new file mode 100644
index 000000000000..0902af3cb8ea
--- /dev/null
+++ b/packages/twenty-front/src/modules/billing/components/TrialCard.tsx
@@ -0,0 +1,33 @@
+import styled from '@emotion/styled';
+
+type TrialCardProps = {
+  duration: number;
+  withCreditCard: boolean;
+};
+
+const StyledTrialCardContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+`;
+
+const StyledTrialDurationContainer = styled.div`
+  color: ${({ theme }) => theme.font.color.secondary};
+  font-size: ${({ theme }) => theme.font.size.md};
+  display: flex;
+  margin-bottom: ${({ theme }) => theme.spacing(2)};
+`;
+
+const StyledCreditCardRequirementContainer = styled.div`
+  color: ${({ theme }) => theme.font.color.tertiary};
+  font-size: ${({ theme }) => theme.font.size.md};
+  display: flex;
+`;
+
+export const TrialCard = ({ duration, withCreditCard }: TrialCardProps) => {
+  return (
+    <StyledTrialCardContainer>
+      <StyledTrialDurationContainer>{`${duration} days trial`}</StyledTrialDurationContainer>
+      <StyledCreditCardRequirementContainer>{`${withCreditCard ? 'With Credit Card' : 'Without Credit Card'}`}</StyledCreditCardRequirementContainer>
+    </StyledTrialCardContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/billing/constants/BillingCheckoutSessionDefaultValue.ts b/packages/twenty-front/src/modules/billing/constants/BillingCheckoutSessionDefaultValue.ts
new file mode 100644
index 000000000000..31ca3dc4ad1f
--- /dev/null
+++ b/packages/twenty-front/src/modules/billing/constants/BillingCheckoutSessionDefaultValue.ts
@@ -0,0 +1,11 @@
+import { BillingCheckoutSession } from '@/auth/types/billingCheckoutSession.type';
+import {
+  BillingPlanKey,
+  SubscriptionInterval,
+} from '~/generated-metadata/graphql';
+
+export const BILLING_CHECKOUT_SESSION_DEFAULT_VALUE: BillingCheckoutSession = {
+  plan: BillingPlanKey.PRO,
+  interval: SubscriptionInterval.Month,
+  requirePaymentMethod: true,
+};
diff --git a/packages/twenty-front/src/modules/billing/hooks/useHandleCheckoutSession.ts b/packages/twenty-front/src/modules/billing/hooks/useHandleCheckoutSession.ts
new file mode 100644
index 000000000000..db10b8f3c05c
--- /dev/null
+++ b/packages/twenty-front/src/modules/billing/hooks/useHandleCheckoutSession.ts
@@ -0,0 +1,53 @@
+import { SettingsPath } from '@/types/SettingsPath';
+import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { useState } from 'react';
+import {
+  BillingPlanKey,
+  SubscriptionInterval,
+} from '~/generated-metadata/graphql';
+import { useCheckoutSessionMutation } from '~/generated/graphql';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
+import { useRedirect } from '@/domain-manager/hooks/useRedirect';
+
+export const useHandleCheckoutSession = ({
+  recurringInterval,
+  plan,
+  requirePaymentMethod,
+}: {
+  recurringInterval: SubscriptionInterval;
+  plan: BillingPlanKey;
+  requirePaymentMethod: boolean;
+}) => {
+  const { redirect } = useRedirect();
+
+  const { enqueueSnackBar } = useSnackBar();
+
+  const [checkoutSession] = useCheckoutSessionMutation();
+
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const handleCheckoutSession = async () => {
+    setIsSubmitting(true);
+    const { data } = await checkoutSession({
+      variables: {
+        recurringInterval,
+        successUrlPath: getSettingsPath(SettingsPath.Billing),
+        plan,
+        requirePaymentMethod,
+      },
+    });
+    setIsSubmitting(false);
+    if (!data?.checkoutSession.url) {
+      enqueueSnackBar(
+        'Checkout session error. Please retry or contact Twenty team',
+        {
+          variant: SnackBarVariant.Error,
+        },
+      );
+      return;
+    }
+    redirect(data.checkoutSession.url);
+  };
+  return { isSubmitting, handleCheckoutSession };
+};
diff --git a/packages/twenty-front/src/modules/captcha/components/CaptchaProviderScriptLoaderEffect.tsx b/packages/twenty-front/src/modules/captcha/components/CaptchaProviderScriptLoaderEffect.tsx
index aae90964f1dd..8611436a8da1 100644
--- a/packages/twenty-front/src/modules/captcha/components/CaptchaProviderScriptLoaderEffect.tsx
+++ b/packages/twenty-front/src/modules/captcha/components/CaptchaProviderScriptLoaderEffect.tsx
@@ -3,23 +3,23 @@ import { useRecoilValue, useSetRecoilState } from 'recoil';
 
 import { isCaptchaScriptLoadedState } from '@/captcha/states/isCaptchaScriptLoadedState';
 import { getCaptchaUrlByProvider } from '@/captcha/utils/getCaptchaUrlByProvider';
-import { captchaProviderState } from '@/client-config/states/captchaProviderState';
+import { captchaState } from '@/client-config/states/captchaState';
 import { CaptchaDriverType } from '~/generated/graphql';
 
 export const CaptchaProviderScriptLoaderEffect = () => {
-  const captchaProvider = useRecoilValue(captchaProviderState);
+  const captcha = useRecoilValue(captchaState);
   const setIsCaptchaScriptLoaded = useSetRecoilState(
     isCaptchaScriptLoadedState,
   );
 
   useEffect(() => {
-    if (!captchaProvider?.provider || !captchaProvider.siteKey) {
+    if (!captcha?.provider || !captcha.siteKey) {
       return;
     }
 
     const scriptUrl = getCaptchaUrlByProvider(
-      captchaProvider.provider,
-      captchaProvider.siteKey,
+      captcha.provider,
+      captcha.siteKey,
     );
     if (!scriptUrl) {
       return;
@@ -32,7 +32,7 @@ export const CaptchaProviderScriptLoaderEffect = () => {
       scriptElement = document.createElement('script');
       scriptElement.src = scriptUrl;
       scriptElement.onload = () => {
-        if (captchaProvider.provider === CaptchaDriverType.GoogleRecaptcha) {
+        if (captcha.provider === CaptchaDriverType.GoogleRecaptcha) {
           window.grecaptcha?.ready(() => {
             setIsCaptchaScriptLoaded(true);
           });
@@ -42,11 +42,7 @@ export const CaptchaProviderScriptLoaderEffect = () => {
       };
       document.body.appendChild(scriptElement);
     }
-  }, [
-    captchaProvider?.provider,
-    captchaProvider?.siteKey,
-    setIsCaptchaScriptLoaded,
-  ]);
+  }, [captcha?.provider, captcha?.siteKey, setIsCaptchaScriptLoaded]);
 
   return <></>;
 };
diff --git a/packages/twenty-front/src/modules/captcha/hooks/useRequestFreshCaptchaToken.ts b/packages/twenty-front/src/modules/captcha/hooks/useRequestFreshCaptchaToken.ts
index 63e6ee725480..13d1fe2c1c5d 100644
--- a/packages/twenty-front/src/modules/captcha/hooks/useRequestFreshCaptchaToken.ts
+++ b/packages/twenty-front/src/modules/captcha/hooks/useRequestFreshCaptchaToken.ts
@@ -2,7 +2,7 @@ import { useRecoilCallback, useSetRecoilState } from 'recoil';
 
 import { captchaTokenState } from '@/captcha/states/captchaTokenState';
 import { isRequestingCaptchaTokenState } from '@/captcha/states/isRequestingCaptchaTokenState';
-import { captchaProviderState } from '@/client-config/states/captchaProviderState';
+import { captchaState } from '@/client-config/states/captchaState';
 import { CaptchaDriverType } from '~/generated-metadata/graphql';
 import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
@@ -22,11 +22,9 @@ export const useRequestFreshCaptchaToken = () => {
   const requestFreshCaptchaToken = useRecoilCallback(
     ({ snapshot }) =>
       async () => {
-        const captchaProvider = snapshot
-          .getLoadable(captchaProviderState)
-          .getValue();
+        const captcha = snapshot.getLoadable(captchaState).getValue();
 
-        if (isUndefinedOrNull(captchaProvider)) {
+        if (isUndefinedOrNull(captcha?.provider)) {
           return;
         }
 
@@ -34,10 +32,10 @@ export const useRequestFreshCaptchaToken = () => {
 
         let captchaWidget: any;
 
-        switch (captchaProvider.provider) {
+        switch (captcha.provider) {
           case CaptchaDriverType.GoogleRecaptcha:
             window.grecaptcha
-              .execute(captchaProvider.siteKey, {
+              .execute(captcha.siteKey, {
                 action: 'submit',
               })
               .then((token: string) => {
@@ -49,7 +47,7 @@ export const useRequestFreshCaptchaToken = () => {
             // TODO: fix workspace-no-hardcoded-colors rule
             // eslint-disable-next-line @nx/workspace-no-hardcoded-colors
             captchaWidget = window.turnstile.render('#captcha-widget', {
-              sitekey: captchaProvider.siteKey,
+              sitekey: captcha.siteKey,
             });
             window.turnstile.execute(captchaWidget, {
               callback: (token: string) => {
diff --git a/packages/twenty-front/src/modules/client-config/components/ClientConfigProviderEffect.tsx b/packages/twenty-front/src/modules/client-config/components/ClientConfigProviderEffect.tsx
index ebbfa965ead7..ac34e0a6f444 100644
--- a/packages/twenty-front/src/modules/client-config/components/ClientConfigProviderEffect.tsx
+++ b/packages/twenty-front/src/modules/client-config/components/ClientConfigProviderEffect.tsx
@@ -1,14 +1,16 @@
 import { apiConfigState } from '@/client-config/states/apiConfigState';
 import { authProvidersState } from '@/client-config/states/authProvidersState';
 import { billingState } from '@/client-config/states/billingState';
-import { captchaProviderState } from '@/client-config/states/captchaProviderState';
+import { canManageFeatureFlagsState } from '@/client-config/states/canManageFeatureFlagsState';
+import { captchaState } from '@/client-config/states/captchaState';
 import { chromeExtensionIdState } from '@/client-config/states/chromeExtensionIdState';
 import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';
 import { isAnalyticsEnabledState } from '@/client-config/states/isAnalyticsEnabledState';
 import { isDebugModeState } from '@/client-config/states/isDebugModeState';
 import { isDeveloperDefaultSignInPrefilledState } from '@/client-config/states/isDeveloperDefaultSignInPrefilledState';
+import { isEmailVerificationRequiredState } from '@/client-config/states/isEmailVerificationRequiredState';
 import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';
-import { isSSOEnabledState } from '@/client-config/states/isSSOEnabledState';
+import { labPublicFeatureFlagsState } from '@/client-config/states/labPublicFeatureFlagsState';
 import { sentryConfigState } from '@/client-config/states/sentryConfigState';
 import { supportChatState } from '@/client-config/states/supportChatState';
 import { domainConfigurationState } from '@/domain-manager/states/domainConfigurationState';
@@ -29,7 +31,9 @@ export const ClientConfigProviderEffect = () => {
   const setIsMultiWorkspaceEnabled = useSetRecoilState(
     isMultiWorkspaceEnabledState,
   );
-  const setIsSSOEnabledState = useSetRecoilState(isSSOEnabledState);
+  const setIsEmailVerificationRequired = useSetRecoilState(
+    isEmailVerificationRequiredState,
+  );
 
   const setBilling = useSetRecoilState(billingState);
   const setSupportChat = useSetRecoilState(supportChatState);
@@ -39,12 +43,20 @@ export const ClientConfigProviderEffect = () => {
     clientConfigApiStatusState,
   );
 
-  const setCaptchaProvider = useSetRecoilState(captchaProviderState);
+  const setCaptcha = useSetRecoilState(captchaState);
 
   const setChromeExtensionId = useSetRecoilState(chromeExtensionIdState);
 
   const setApiConfig = useSetRecoilState(apiConfigState);
 
+  const setCanManageFeatureFlags = useSetRecoilState(
+    canManageFeatureFlagsState,
+  );
+
+  const setLabPublicFeatureFlags = useSetRecoilState(
+    labPublicFeatureFlagsState,
+  );
+
   const { data, loading, error } = useGetClientConfigQuery({
     skip: clientConfigApiStatus.isLoaded,
   });
@@ -86,6 +98,9 @@ export const ClientConfigProviderEffect = () => {
     setIsAnalyticsEnabled(data?.clientConfig.analyticsEnabled);
     setIsDeveloperDefaultSignInPrefilled(data?.clientConfig.signInPrefilled);
     setIsMultiWorkspaceEnabled(data?.clientConfig.isMultiWorkspaceEnabled);
+    setIsEmailVerificationRequired(
+      data?.clientConfig.isEmailVerificationRequired,
+    );
     setBilling(data?.clientConfig.billing);
     setSupportChat(data?.clientConfig.support);
 
@@ -95,36 +110,39 @@ export const ClientConfigProviderEffect = () => {
       environment: data?.clientConfig?.sentry?.environment,
     });
 
-    setCaptchaProvider({
+    setCaptcha({
       provider: data?.clientConfig?.captcha?.provider,
       siteKey: data?.clientConfig?.captcha?.siteKey,
     });
 
     setChromeExtensionId(data?.clientConfig?.chromeExtensionId);
     setApiConfig(data?.clientConfig?.api);
-    setIsSSOEnabledState(data?.clientConfig?.isSSOEnabled);
     setDomainConfiguration({
       defaultSubdomain: data?.clientConfig?.defaultSubdomain,
       frontDomain: data?.clientConfig?.frontDomain,
     });
+    setCanManageFeatureFlags(data?.clientConfig?.canManageFeatureFlags);
+    setLabPublicFeatureFlags(data?.clientConfig?.publicFeatureFlags);
   }, [
     data,
     setIsDebugMode,
     setIsDeveloperDefaultSignInPrefilled,
     setIsMultiWorkspaceEnabled,
+    setIsEmailVerificationRequired,
     setSupportChat,
     setBilling,
     setSentryConfig,
     loading,
     setClientConfigApiStatus,
-    setCaptchaProvider,
+    setCaptcha,
     setChromeExtensionId,
     setApiConfig,
     setIsAnalyticsEnabled,
     error,
     setDomainConfiguration,
-    setIsSSOEnabledState,
     setAuthProviders,
+    setCanManageFeatureFlags,
+    setLabPublicFeatureFlags,
   ]);
 
   return <></>;
diff --git a/packages/twenty-front/src/modules/client-config/graphql/queries/getClientConfig.ts b/packages/twenty-front/src/modules/client-config/graphql/queries/getClientConfig.ts
index 88a696368988..560c237b508a 100644
--- a/packages/twenty-front/src/modules/client-config/graphql/queries/getClientConfig.ts
+++ b/packages/twenty-front/src/modules/client-config/graphql/queries/getClientConfig.ts
@@ -6,7 +6,10 @@ export const GET_CLIENT_CONFIG = gql`
       billing {
         isBillingEnabled
         billingUrl
-        billingFreeTrialDurationInDays
+        trialPeriods {
+          duration
+          isCreditCardRequired
+        }
       }
       authProviders {
         google
@@ -22,7 +25,7 @@ export const GET_CLIENT_CONFIG = gql`
       }
       signInPrefilled
       isMultiWorkspaceEnabled
-      isSSOEnabled
+      isEmailVerificationRequired
       defaultSubdomain
       frontDomain
       debugMode
@@ -44,6 +47,15 @@ export const GET_CLIENT_CONFIG = gql`
         mutationMaximumAffectedRecords
       }
       chromeExtensionId
+      canManageFeatureFlags
+      publicFeatureFlags {
+        key
+        metadata {
+          label
+          description
+          imagePath
+        }
+      }
     }
   }
 `;
diff --git a/packages/twenty-front/src/modules/client-config/states/canManageFeatureFlagsState.ts b/packages/twenty-front/src/modules/client-config/states/canManageFeatureFlagsState.ts
new file mode 100644
index 000000000000..1d0222a6ea9d
--- /dev/null
+++ b/packages/twenty-front/src/modules/client-config/states/canManageFeatureFlagsState.ts
@@ -0,0 +1,6 @@
+import { createState } from 'twenty-ui';
+
+export const canManageFeatureFlagsState = createState<boolean>({
+  key: 'canManageFeatureFlagsState',
+  defaultValue: false,
+});
diff --git a/packages/twenty-front/src/modules/client-config/states/captchaProviderState.ts b/packages/twenty-front/src/modules/client-config/states/captchaState.ts
similarity index 59%
rename from packages/twenty-front/src/modules/client-config/states/captchaProviderState.ts
rename to packages/twenty-front/src/modules/client-config/states/captchaState.ts
index ca312acf047c..8d22c88f6e33 100644
--- a/packages/twenty-front/src/modules/client-config/states/captchaProviderState.ts
+++ b/packages/twenty-front/src/modules/client-config/states/captchaState.ts
@@ -2,7 +2,7 @@ import { createState } from '@ui/utilities/state/utils/createState';
 
 import { Captcha } from '~/generated/graphql';
 
-export const captchaProviderState = createState<Captcha | null>({
-  key: 'captchaProviderState',
+export const captchaState = createState<Captcha | null>({
+  key: 'captchaState',
   defaultValue: null,
 });
diff --git a/packages/twenty-front/src/modules/client-config/states/isEmailVerificationRequiredState.ts b/packages/twenty-front/src/modules/client-config/states/isEmailVerificationRequiredState.ts
new file mode 100644
index 000000000000..e06d73779a3a
--- /dev/null
+++ b/packages/twenty-front/src/modules/client-config/states/isEmailVerificationRequiredState.ts
@@ -0,0 +1,6 @@
+import { createState } from 'twenty-ui';
+
+export const isEmailVerificationRequiredState = createState<boolean>({
+  key: 'isEmailVerificationRequired',
+  defaultValue: false,
+});
diff --git a/packages/twenty-front/src/modules/client-config/states/isSSOEnabledState.ts b/packages/twenty-front/src/modules/client-config/states/isSSOEnabledState.ts
deleted file mode 100644
index 7d40b673350c..000000000000
--- a/packages/twenty-front/src/modules/client-config/states/isSSOEnabledState.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createState } from '@ui/utilities/state/utils/createState';
-
-export const isSSOEnabledState = createState<boolean>({
-  key: 'isSSOEnabledState',
-  defaultValue: false,
-});
diff --git a/packages/twenty-front/src/modules/client-config/states/labPublicFeatureFlagsState.ts b/packages/twenty-front/src/modules/client-config/states/labPublicFeatureFlagsState.ts
new file mode 100644
index 000000000000..f544ed1cd877
--- /dev/null
+++ b/packages/twenty-front/src/modules/client-config/states/labPublicFeatureFlagsState.ts
@@ -0,0 +1,7 @@
+import { atom } from 'recoil';
+import { PublicFeatureFlag } from '~/generated/graphql';
+
+export const labPublicFeatureFlagsState = atom<PublicFeatureFlag[]>({
+  key: 'labPublicFeatureFlagsState',
+  default: [],
+});
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenu.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenu.tsx
index 66b152f4665b..1e521199b908 100644
--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenu.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenu.tsx
@@ -1,23 +1,20 @@
 import { CommandGroup } from '@/command-menu/components/CommandGroup';
 import { CommandMenuDefaultSelectionEffect } from '@/command-menu/components/CommandMenuDefaultSelectionEffect';
 import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';
-import { CommandMenuTopBar } from '@/command-menu/components/CommandMenuTopBar';
 import { COMMAND_MENU_SEARCH_BAR_HEIGHT } from '@/command-menu/constants/CommandMenuSearchBarHeight';
 import { COMMAND_MENU_SEARCH_BAR_PADDING } from '@/command-menu/constants/CommandMenuSearchBarPadding';
-import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
-import { useCommandMenuHotKeys } from '@/command-menu/hooks/useCommandMenuHotKeys';
+import { useCommandMenuOnItemClick } from '@/command-menu/hooks/useCommandMenuOnItemClick';
 import { useMatchingCommandMenuCommands } from '@/command-menu/hooks/useMatchingCommandMenuCommands';
 import { commandMenuSearchState } from '@/command-menu/states/commandMenuSearchState';
 import { Command } from '@/command-menu/types/Command';
 import { SelectableItem } from '@/ui/layout/selectable-list/components/SelectableItem';
 import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
 import { AppHotkeyScope } from '@/ui/utilities/hotkey/types/AppHotkeyScope';
-import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
 import styled from '@emotion/styled';
-import { useRef } from 'react';
-import { useRecoilState } from 'recoil';
+import { useLingui } from '@lingui/react/macro';
+import { useRecoilValue } from 'recoil';
 import { isDefined } from 'twenty-ui';
 
 const MOBILE_NAVIGATION_BAR_HEIGHT = 64;
@@ -27,21 +24,6 @@ type CommandGroupConfig = {
   items?: Command[];
 };
 
-const StyledCommandMenu = styled.div`
-  background: ${({ theme }) => theme.background.secondary};
-  border-left: 1px solid ${({ theme }) => theme.border.color.medium};
-  box-shadow: ${({ theme }) => theme.boxShadow.strong};
-  font-family: ${({ theme }) => theme.font.family};
-  height: 100%;
-  overflow: hidden;
-  padding: 0;
-  position: fixed;
-  right: 0%;
-  top: 0%;
-  width: ${() => (useIsMobile() ? '100%' : '500px')};
-  z-index: 1000;
-`;
-
 const StyledList = styled.div`
   background: ${({ theme }) => theme.background.secondary};
   overscroll-behavior: contain;
@@ -75,23 +57,13 @@ const StyledEmpty = styled.div`
 `;
 
 export const CommandMenu = () => {
-  const { onItemClick, closeCommandMenu } = useCommandMenu();
-  const commandMenuRef = useRef<HTMLDivElement>(null);
+  const { t } = useLingui();
 
-  const [commandMenuSearch, setCommandMenuSearch] = useRecoilState(
-    commandMenuSearchState,
-  );
+  const { onItemClick } = useCommandMenuOnItemClick();
 
-  const isMobile = useIsMobile();
+  const commandMenuSearch = useRecoilValue(commandMenuSearchState);
 
-  useCommandMenuHotKeys();
-
-  useListenClickOutside({
-    refs: [commandMenuRef],
-    callback: closeCommandMenu,
-    listenerId: 'COMMAND_MENU_LISTENER_ID',
-    hotkeyScope: AppHotkeyScope.CommandMenuOpen,
-  });
+  const isMobile = useIsMobile();
 
   const {
     isNoResults,
@@ -130,51 +102,51 @@ export const CommandMenu = () => {
 
   const commandGroups: CommandGroupConfig[] = [
     {
-      heading: 'Copilot',
+      heading: t`Copilot`,
       items: copilotCommands,
     },
     {
-      heading: 'Record Selection',
+      heading: t`Record Selection`,
       items: matchingStandardActionRecordSelectionCommands,
     },
     {
-      heading: 'Workflow Record Selection',
+      heading: t`Workflow Record Selection`,
       items: matchingWorkflowRunRecordSelectionCommands,
     },
     {
-      heading: 'View',
+      heading: t`View`,
       items: matchingStandardActionGlobalCommands,
     },
     {
-      heading: 'Workflows',
+      heading: t`Workflows`,
       items: matchingWorkflowRunGlobalCommands,
     },
     {
-      heading: 'Navigate',
+      heading: t`Navigate`,
       items: matchingNavigateCommand,
     },
     {
-      heading: 'People',
+      heading: t`People`,
       items: peopleCommands,
     },
     {
-      heading: 'Companies',
+      heading: t`Companies`,
       items: companyCommands,
     },
     {
-      heading: 'Opportunities',
+      heading: t`Opportunities`,
       items: opportunityCommands,
     },
     {
-      heading: 'Notes',
+      heading: t`Notes`,
       items: noteCommands,
     },
     {
-      heading: 'Tasks',
+      heading: t`Tasks`,
       items: tasksCommands,
     },
     {
-      heading: 'Custom Objects',
+      heading: t`Custom Objects`,
       items: customObjectCommands,
     },
   ];
@@ -184,74 +156,66 @@ export const CommandMenu = () => {
       <CommandMenuDefaultSelectionEffect
         selectableItemIds={selectableItemIds}
       />
-      <StyledCommandMenu ref={commandMenuRef} className="command-menu">
-        <CommandMenuTopBar
-          commandMenuSearch={commandMenuSearch}
-          setCommandMenuSearch={setCommandMenuSearch}
-        />
-        <StyledList>
-          <ScrollWrapper
-            contextProviderName="commandMenu"
-            componentInstanceId={`scroll-wrapper-command-menu`}
-          >
-            <StyledInnerList isMobile={isMobile}>
-              <SelectableList
-                selectableListId="command-menu-list"
-                selectableItemIdArray={selectableItemIds}
-                hotkeyScope={AppHotkeyScope.CommandMenu}
-                onEnter={(itemId) => {
-                  const command = selectableItems.find(
-                    (item) => item.id === itemId,
-                  );
-
-                  if (isDefined(command)) {
-                    const {
-                      to,
-                      onCommandClick,
-                      shouldCloseCommandMenuOnClick,
-                    } = command;
 
-                    onItemClick({
-                      shouldCloseCommandMenuOnClick,
-                      onClick: onCommandClick,
-                      to,
-                    });
-                  }
-                }}
-              >
-                {isNoResults && !isLoading && (
-                  <StyledEmpty>No results found</StyledEmpty>
-                )}
-                {commandGroups.map(({ heading, items }) =>
-                  items?.length ? (
-                    <CommandGroup heading={heading} key={heading}>
-                      {items.map((item) => {
-                        return (
-                          <SelectableItem itemId={item.id} key={item.id}>
-                            <CommandMenuItem
-                              key={item.id}
-                              id={item.id}
-                              Icon={item.Icon}
-                              label={item.label}
-                              to={item.to}
-                              onClick={item.onCommandClick}
-                              firstHotKey={item.firstHotKey}
-                              secondHotKey={item.secondHotKey}
-                              shouldCloseCommandMenuOnClick={
-                                item.shouldCloseCommandMenuOnClick
-                              }
-                            />
-                          </SelectableItem>
-                        );
-                      })}
-                    </CommandGroup>
-                  ) : null,
-                )}
-              </SelectableList>
-            </StyledInnerList>
-          </ScrollWrapper>
-        </StyledList>
-      </StyledCommandMenu>
+      <StyledList>
+        <ScrollWrapper
+          contextProviderName="commandMenu"
+          componentInstanceId={`scroll-wrapper-command-menu`}
+        >
+          <StyledInnerList isMobile={isMobile}>
+            <SelectableList
+              selectableListId="command-menu-list"
+              selectableItemIdArray={selectableItemIds}
+              hotkeyScope={AppHotkeyScope.CommandMenu}
+              onEnter={(itemId) => {
+                const command = selectableItems.find(
+                  (item) => item.id === itemId,
+                );
+
+                if (isDefined(command)) {
+                  const { to, onCommandClick, shouldCloseCommandMenuOnClick } =
+                    command;
+
+                  onItemClick({
+                    shouldCloseCommandMenuOnClick,
+                    onClick: onCommandClick,
+                    to,
+                  });
+                }
+              }}
+            >
+              {isNoResults && !isLoading && (
+                <StyledEmpty>No results found</StyledEmpty>
+              )}
+              {commandGroups.map(({ heading, items }) =>
+                items?.length ? (
+                  <CommandGroup heading={heading} key={heading}>
+                    {items.map((item) => {
+                      return (
+                        <SelectableItem itemId={item.id} key={item.id}>
+                          <CommandMenuItem
+                            key={item.id}
+                            id={item.id}
+                            Icon={item.Icon}
+                            label={item.label}
+                            to={item.to}
+                            onClick={item.onCommandClick}
+                            firstHotKey={item.firstHotKey}
+                            secondHotKey={item.secondHotKey}
+                            shouldCloseCommandMenuOnClick={
+                              item.shouldCloseCommandMenuOnClick
+                            }
+                          />
+                        </SelectableItem>
+                      );
+                    })}
+                  </CommandGroup>
+                ) : null,
+              )}
+            </SelectableList>
+          </StyledInnerList>
+        </ScrollWrapper>
+      </StyledList>
     </>
   );
 };
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuContainer.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuContainer.tsx
index fe3802cd00e4..694637ed7b40 100644
--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuContainer.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuContainer.tsx
@@ -3,55 +3,113 @@ import { RecordAgnosticActionsSetterEffect } from '@/action-menu/actions/record-
 import { ActionMenuConfirmationModals } from '@/action-menu/components/ActionMenuConfirmationModals';
 import { ActionMenuContext } from '@/action-menu/contexts/ActionMenuContext';
 import { ActionMenuComponentInstanceContext } from '@/action-menu/states/contexts/ActionMenuComponentInstanceContext';
-import { CommandMenu } from '@/command-menu/components/CommandMenu';
+import { COMMAND_MENU_ANIMATION_VARIANTS } from '@/command-menu/constants/CommandMenuAnimationVariants';
 import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
+import { useCommandMenuHotKeys } from '@/command-menu/hooks/useCommandMenuHotKeys';
 import { isCommandMenuOpenedState } from '@/command-menu/states/isCommandMenuOpenedState';
+import { CommandMenuAnimationVariant } from '@/command-menu/types/CommandMenuAnimationVariant';
 import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
-import { useKeyboardShortcutMenu } from '@/keyboard-shortcut-menu/hooks/useKeyboardShortcutMenu';
-import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
+import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';
 import { AppHotkeyScope } from '@/ui/utilities/hotkey/types/AppHotkeyScope';
+import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
+import { workflowReactFlowRefState } from '@/workflow/workflow-diagram/states/workflowReactFlowRefState';
 import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+import { useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+import { motion } from 'framer-motion';
+import { useRef } from 'react';
 import { useRecoilValue } from 'recoil';
+import { useIsMobile } from 'twenty-ui';
 import { FeatureFlagKey } from '~/generated/graphql';
 
-export const CommandMenuContainer = () => {
-  const { toggleCommandMenu } = useCommandMenu();
-  const { closeKeyboardShortcutMenu } = useKeyboardShortcutMenu();
+const StyledCommandMenu = styled(motion.div)`
+  background: ${({ theme }) => theme.background.secondary};
+  border-left: 1px solid ${({ theme }) => theme.border.color.medium};
+  box-shadow: ${({ theme }) => theme.boxShadow.strong};
+  font-family: ${({ theme }) => theme.font.family};
+  height: 100%;
+  overflow: hidden;
+  padding: 0;
+  position: fixed;
+  right: 0%;
+  top: 0%;
+  z-index: 30;
+  display: flex;
+  flex-direction: column;
+`;
+
+export const CommandMenuContainer = ({
+  children,
+}: {
+  children: React.ReactNode;
+}) => {
+  const { toggleCommandMenu, closeCommandMenu } = useCommandMenu();
 
   const isWorkflowEnabled = useIsFeatureEnabled(
     FeatureFlagKey.IsWorkflowEnabled,
   );
   const isCommandMenuOpened = useRecoilValue(isCommandMenuOpenedState);
 
-  useScopedHotkeys(
-    'ctrl+k,meta+k',
-    () => {
-      closeKeyboardShortcutMenu();
-      toggleCommandMenu();
-    },
-    AppHotkeyScope.CommandMenu,
-    [toggleCommandMenu],
-  );
+  const commandMenuRef = useRef<HTMLDivElement>(null);
+
+  const workflowReactFlowRef = useRecoilValue(workflowReactFlowRefState);
+
+  useCommandMenuHotKeys();
+
+  useListenClickOutside({
+    refs: [
+      commandMenuRef,
+      ...(workflowReactFlowRef ? [workflowReactFlowRef] : []),
+    ],
+    callback: closeCommandMenu,
+    listenerId: 'COMMAND_MENU_LISTENER_ID',
+    hotkeyScope: AppHotkeyScope.CommandMenuOpen,
+  });
+
+  const isMobile = useIsMobile();
+
+  const targetVariantForAnimation: CommandMenuAnimationVariant = isMobile
+    ? 'fullScreen'
+    : 'normal';
+
+  const theme = useTheme();
 
   return (
-    <ContextStoreComponentInstanceContext.Provider
+    <RecordFiltersComponentInstanceContext.Provider
       value={{ instanceId: 'command-menu' }}
     >
-      <ActionMenuComponentInstanceContext.Provider
+      <ContextStoreComponentInstanceContext.Provider
         value={{ instanceId: 'command-menu' }}
       >
-        <ActionMenuContext.Provider
-          value={{
-            isInRightDrawer: false,
-            onActionExecutedCallback: toggleCommandMenu,
-          }}
+        <ActionMenuComponentInstanceContext.Provider
+          value={{ instanceId: 'command-menu' }}
         >
-          <RecordActionMenuEntriesSetter />
-          {isWorkflowEnabled && <RecordAgnosticActionsSetterEffect />}
-          <ActionMenuConfirmationModals />
-          {isCommandMenuOpened && <CommandMenu />}
-        </ActionMenuContext.Provider>
-      </ActionMenuComponentInstanceContext.Provider>
-    </ContextStoreComponentInstanceContext.Provider>
+          <ActionMenuContext.Provider
+            value={{
+              isInRightDrawer: false,
+              onActionExecutedCallback: toggleCommandMenu,
+            }}
+          >
+            <RecordActionMenuEntriesSetter />
+            {isWorkflowEnabled && <RecordAgnosticActionsSetterEffect />}
+            <ActionMenuConfirmationModals />
+            {isCommandMenuOpened && (
+              <StyledCommandMenu
+                data-testid="command-menu"
+                ref={commandMenuRef}
+                className="command-menu"
+                animate={targetVariantForAnimation}
+                initial="closed"
+                exit="closed"
+                variants={COMMAND_MENU_ANIMATION_VARIANTS}
+                transition={{ duration: theme.animation.duration.normal }}
+              >
+                {children}
+              </StyledCommandMenu>
+            )}
+          </ActionMenuContext.Provider>
+        </ActionMenuComponentInstanceContext.Provider>
+      </ContextStoreComponentInstanceContext.Provider>
+    </RecordFiltersComponentInstanceContext.Provider>
   );
 };
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuContextChip.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuContextChip.tsx
new file mode 100644
index 000000000000..119ed77ec432
--- /dev/null
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuContextChip.tsx
@@ -0,0 +1,63 @@
+import styled from '@emotion/styled';
+
+const StyledChip = styled.div`
+  align-items: center;
+  background: ${({ theme }) => theme.background.transparent.light};
+  border: 1px solid ${({ theme }) => theme.border.color.medium};
+  border-radius: ${({ theme }) => theme.border.radius.md};
+  box-sizing: border-box;
+  display: flex;
+  gap: ${({ theme }) => theme.spacing(1)};
+  height: ${({ theme }) => theme.spacing(8)};
+  padding: 0 ${({ theme }) => theme.spacing(2)};
+  font-size: ${({ theme }) => theme.font.size.sm};
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+  line-height: ${({ theme }) => theme.text.lineHeight.lg};
+  color: ${({ theme }) => theme.font.color.primary};
+`;
+
+const StyledIconsContainer = styled.div`
+  display: flex;
+`;
+
+const StyledIconWrapper = styled.div<{ withIconBackground?: boolean }>`
+  background: ${({ theme, withIconBackground }) =>
+    withIconBackground ? theme.background.primary : 'unset'};
+  border-radius: ${({ theme }) => theme.border.radius.sm};
+  padding: ${({ theme }) => theme.spacing(0.5)};
+  border: 1px solid
+    ${({ theme, withIconBackground }) =>
+      withIconBackground ? theme.border.color.medium : 'transparent'};
+  &:not(:first-of-type) {
+    margin-left: -${({ theme }) => theme.spacing(1)};
+  }
+  display: flex;
+  align-items: center;
+  justify-content: center;
+`;
+
+export const CommandMenuContextChip = ({
+  Icons,
+  text,
+  withIconBackground,
+}: {
+  Icons: React.ReactNode[];
+  text?: string;
+  withIconBackground?: boolean;
+}) => {
+  return (
+    <StyledChip>
+      <StyledIconsContainer>
+        {Icons.map((Icon, index) => (
+          <StyledIconWrapper
+            key={index}
+            withIconBackground={withIconBackground}
+          >
+            {Icon}
+          </StyledIconWrapper>
+        ))}
+      </StyledIconsContainer>
+      <span>{text}</span>
+    </StyledChip>
+  );
+};
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuContextRecordChip.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuContextRecordChip.tsx
index 0335346d73c7..75f22319a358 100644
--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuContextRecordChip.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuContextRecordChip.tsx
@@ -1,30 +1,10 @@
+import { CommandMenuContextChip } from '@/command-menu/components/CommandMenuContextChip';
 import { CommandMenuContextRecordChipAvatars } from '@/command-menu/components/CommandMenuContextRecordChipAvatars';
 import { useFindManyRecordsSelectedInContextStore } from '@/context-store/hooks/useFindManyRecordsSelectedInContextStore';
 import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById';
 import { getObjectRecordIdentifier } from '@/object-metadata/utils/getObjectRecordIdentifier';
-import styled from '@emotion/styled';
 import { capitalize } from 'twenty-shared';
 
-const StyledChip = styled.div`
-  align-items: center;
-  background: ${({ theme }) => theme.background.transparent.light};
-  border: 1px solid ${({ theme }) => theme.border.color.medium};
-  border-radius: ${({ theme }) => theme.border.radius.md};
-  box-sizing: border-box;
-  display: flex;
-  gap: ${({ theme }) => theme.spacing(1)};
-  height: ${({ theme }) => theme.spacing(8)};
-  padding: 0 ${({ theme }) => theme.spacing(2)};
-  font-size: ${({ theme }) => theme.font.size.sm};
-  font-weight: ${({ theme }) => theme.font.weight.medium};
-  line-height: ${({ theme }) => theme.text.lineHeight.lg};
-  color: ${({ theme }) => theme.font.color.primary};
-`;
-
-const StyledAvatarContainer = styled.div`
-  display: flex;
-`;
-
 export const CommandMenuContextRecordChip = ({
   objectMetadataItemId,
 }: {
@@ -43,21 +23,25 @@ export const CommandMenuContextRecordChip = ({
     return null;
   }
 
+  const Avatars = records.map((record) => (
+    <CommandMenuContextRecordChipAvatars
+      objectMetadataItem={objectMetadataItem}
+      key={record.id}
+      record={record}
+    />
+  ));
+
+  const text =
+    totalCount === 1
+      ? getObjectRecordIdentifier({ objectMetadataItem, record: records[0] })
+          .name
+      : `${totalCount} ${capitalize(objectMetadataItem.namePlural)}`;
+
   return (
-    <StyledChip>
-      <StyledAvatarContainer>
-        {records.map((record) => (
-          <CommandMenuContextRecordChipAvatars
-            objectMetadataItem={objectMetadataItem}
-            key={record.id}
-            record={record}
-          />
-        ))}
-      </StyledAvatarContainer>
-      {totalCount === 1
-        ? getObjectRecordIdentifier({ objectMetadataItem, record: records[0] })
-            .name
-        : `${totalCount} ${capitalize(objectMetadataItem.namePlural)}`}
-    </StyledChip>
+    <CommandMenuContextChip
+      text={text}
+      Icons={Avatars}
+      withIconBackground={true}
+    />
   );
 };
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuContextRecordChipAvatars.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuContextRecordChipAvatars.tsx
index a83ab135a057..51792b4cc41d 100644
--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuContextRecordChipAvatars.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuContextRecordChipAvatars.tsx
@@ -3,22 +3,8 @@ import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { useRecordChipData } from '@/object-record/hooks/useRecordChipData';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { useTheme } from '@emotion/react';
-import styled from '@emotion/styled';
 import { Avatar } from 'twenty-ui';
 
-const StyledAvatarWrapper = styled.div`
-  background-color: ${({ theme }) => theme.background.primary};
-  border-radius: ${({ theme }) => theme.border.radius.sm};
-  padding: ${({ theme }) => theme.spacing(0.5)};
-  border: 1px solid ${({ theme }) => theme.border.color.medium};
-  &:not(:first-of-type) {
-    margin-left: -${({ theme }) => theme.spacing(1)};
-  }
-  display: flex;
-  align-items: center;
-  justify-content: center;
-`;
-
 export const CommandMenuContextRecordChipAvatars = ({
   objectMetadataItem,
   record,
@@ -38,7 +24,7 @@ export const CommandMenuContextRecordChipAvatars = ({
   const theme = useTheme();
 
   return (
-    <StyledAvatarWrapper>
+    <>
       {Icon ? (
         <Icon color={IconColor} size={theme.icon.size.sm} />
       ) : (
@@ -50,6 +36,6 @@ export const CommandMenuContextRecordChipAvatars = ({
           size="sm"
         />
       )}
-    </StyledAvatarWrapper>
+    </>
   );
 };
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx
index c772da280070..3907ccb47926 100644
--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItem.tsx
@@ -2,10 +2,9 @@ import { isNonEmptyString } from '@sniptt/guards';
 import { useRecoilValue } from 'recoil';
 import { IconArrowUpRight, IconComponent, MenuItemCommand } from 'twenty-ui';
 
+import { useCommandMenuOnItemClick } from '@/command-menu/hooks/useCommandMenuOnItemClick';
 import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
 
-import { useCommandMenu } from '../hooks/useCommandMenu';
-
 export type CommandMenuItemProps = {
   label: string;
   to?: string;
@@ -27,7 +26,7 @@ export const CommandMenuItem = ({
   secondHotKey,
   shouldCloseCommandMenuOnClick,
 }: CommandMenuItemProps) => {
-  const { onItemClick } = useCommandMenu();
+  const { onItemClick } = useCommandMenuOnItemClick();
 
   if (isNonEmptyString(to) && !Icon) {
     Icon = IconArrowUpRight;
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuPages.ts b/packages/twenty-front/src/modules/command-menu/components/CommandMenuPages.ts
new file mode 100644
index 000000000000..7959680de275
--- /dev/null
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuPages.ts
@@ -0,0 +1,11 @@
+export enum CommandMenuPages {
+  Root = 'root',
+  ViewRecord = 'view-record',
+  ViewEmailThread = 'view-email-thread',
+  ViewCalendarEvent = 'view-calendar-event',
+  Copilot = 'copilot',
+  WorkflowStepSelectTriggerType = 'workflow-step-select-trigger-type',
+  WorkflowStepSelectAction = 'workflow-step-select-action',
+  WorkflowStepView = 'workflow-step-view',
+  WorkflowStepEdit = 'workflow-step-edit',
+}
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuRouter.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuRouter.tsx
new file mode 100644
index 000000000000..d5aee4267f07
--- /dev/null
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuRouter.tsx
@@ -0,0 +1,31 @@
+import { CommandMenuContainer } from '@/command-menu/components/CommandMenuContainer';
+import { CommandMenuTopBar } from '@/command-menu/components/CommandMenuTopBar';
+import { COMMAND_MENU_PAGES_CONFIG } from '@/command-menu/constants/CommandMenuPagesConfig';
+import { commandMenuPageState } from '@/command-menu/states/commandMenuPageState';
+import styled from '@emotion/styled';
+import { useRecoilValue } from 'recoil';
+import { isDefined } from 'twenty-ui';
+
+const StyledCommandMenuContent = styled.div`
+  flex: 1;
+  overflow-y: auto;
+`;
+
+export const CommandMenuRouter = () => {
+  const commandMenuPage = useRecoilValue(commandMenuPageState);
+
+  const commandMenuPageComponent = isDefined(commandMenuPage) ? (
+    COMMAND_MENU_PAGES_CONFIG.get(commandMenuPage)
+  ) : (
+    <></>
+  );
+
+  return (
+    <CommandMenuContainer>
+      <CommandMenuTopBar />
+      <StyledCommandMenuContent>
+        {commandMenuPageComponent}
+      </StyledCommandMenuContent>
+    </CommandMenuContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuTopBar.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuTopBar.tsx
index 4bb2bc9040fe..2d61d13a3366 100644
--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuTopBar.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuTopBar.tsx
@@ -1,10 +1,17 @@
+import { CommandMenuContextChip } from '@/command-menu/components/CommandMenuContextChip';
 import { CommandMenuContextRecordChip } from '@/command-menu/components/CommandMenuContextRecordChip';
+import { CommandMenuPages } from '@/command-menu/components/CommandMenuPages';
 import { COMMAND_MENU_SEARCH_BAR_HEIGHT } from '@/command-menu/constants/CommandMenuSearchBarHeight';
 import { COMMAND_MENU_SEARCH_BAR_PADDING } from '@/command-menu/constants/CommandMenuSearchBarPadding';
 import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
+import { commandMenuPageState } from '@/command-menu/states/commandMenuPageState';
+import { commandMenuPageInfoState } from '@/command-menu/states/commandMenuPageTitle';
+import { commandMenuSearchState } from '@/command-menu/states/commandMenuSearchState';
 import { contextStoreCurrentObjectMetadataIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataIdComponentState';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { useRecoilState, useRecoilValue } from 'recoil';
 import { IconX, LightIconButton, isDefined, useIsMobile } from 'twenty-ui';
 
 const StyledInputContainer = styled.div`
@@ -15,6 +22,7 @@ const StyledInputContainer = styled.div`
   border-radius: 0;
 
   display: flex;
+  justify-content: space-between;
   font-size: ${({ theme }) => theme.font.size.lg};
   height: ${COMMAND_MENU_SEARCH_BAR_HEIGHT}px;
   margin: 0;
@@ -23,6 +31,7 @@ const StyledInputContainer = styled.div`
 
   padding: 0 ${({ theme }) => theme.spacing(COMMAND_MENU_SEARCH_BAR_PADDING)};
   gap: ${({ theme }) => theme.spacing(1)};
+  flex-shrink: 0;
 `;
 
 const StyledInput = styled.input`
@@ -43,6 +52,13 @@ const StyledInput = styled.input`
   }
 `;
 
+const StyledContentContainer = styled.div`
+  align-items: center;
+  display: flex;
+  flex: 1;
+  gap: ${({ theme }) => theme.spacing(1)};
+`;
+
 const StyledCloseButtonContainer = styled.div`
   align-items: center;
   display: flex;
@@ -50,15 +66,11 @@ const StyledCloseButtonContainer = styled.div`
   justify-content: center;
 `;
 
-type CommandMenuTopBarProps = {
-  commandMenuSearch: string;
-  setCommandMenuSearch: (search: string) => void;
-};
+export const CommandMenuTopBar = () => {
+  const [commandMenuSearch, setCommandMenuSearch] = useRecoilState(
+    commandMenuSearchState,
+  );
 
-export const CommandMenuTopBar = ({
-  commandMenuSearch,
-  setCommandMenuSearch,
-}: CommandMenuTopBarProps) => {
   const handleSearchChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     setCommandMenuSearch(event.target.value);
   };
@@ -71,19 +83,36 @@ export const CommandMenuTopBar = ({
     contextStoreCurrentObjectMetadataIdComponentState,
   );
 
+  const commandMenuPage = useRecoilValue(commandMenuPageState);
+
+  const { title, Icon } = useRecoilValue(commandMenuPageInfoState);
+
+  const theme = useTheme();
+
   return (
     <StyledInputContainer>
-      {isDefined(contextStoreCurrentObjectMetadataId) && (
-        <CommandMenuContextRecordChip
-          objectMetadataItemId={contextStoreCurrentObjectMetadataId}
-        />
-      )}
-      <StyledInput
-        autoFocus
-        value={commandMenuSearch}
-        placeholder="Type anything"
-        onChange={handleSearchChange}
-      />
+      <StyledContentContainer>
+        {isDefined(contextStoreCurrentObjectMetadataId) && (
+          <CommandMenuContextRecordChip
+            objectMetadataItemId={contextStoreCurrentObjectMetadataId}
+          />
+        )}
+        {isDefined(Icon) && (
+          <CommandMenuContextChip
+            Icons={[<Icon size={theme.icon.size.sm} />]}
+            text={title}
+          />
+        )}
+
+        {commandMenuPage === CommandMenuPages.Root && (
+          <StyledInput
+            autoFocus
+            value={commandMenuSearch}
+            placeholder="Type anything"
+            onChange={handleSearchChange}
+          />
+        )}
+      </StyledContentContainer>
       {!isMobile && (
         <StyledCloseButtonContainer>
           <LightIconButton
diff --git a/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx
index fb0c8bf1385d..b7e2dcd684df 100644
--- a/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx
@@ -16,8 +16,11 @@ import {
 import { sleep } from '~/utils/sleep';
 
 import { ActionMenuComponentInstanceContext } from '@/action-menu/states/contexts/ActionMenuComponentInstanceContext';
+import { CommandMenuRouter } from '@/command-menu/components/CommandMenuRouter';
 import { isCommandMenuOpenedState } from '@/command-menu/states/isCommandMenuOpenedState';
 import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
+import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';
+import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { JestContextStoreSetter } from '~/testing/jest/JestContextStoreSetter';
 import { CommandMenu } from '../CommandMenu';
 
@@ -27,23 +30,27 @@ const openTimeout = 50;
 
 const ContextStoreDecorator: Decorator = (Story) => {
   return (
-    <ContextStoreComponentInstanceContext.Provider
+    <RecordFiltersComponentInstanceContext.Provider
       value={{ instanceId: 'command-menu' }}
     >
-      <ActionMenuComponentInstanceContext.Provider
+      <ContextStoreComponentInstanceContext.Provider
         value={{ instanceId: 'command-menu' }}
       >
-        <JestContextStoreSetter contextStoreCurrentObjectMetadataNameSingular="company">
-          <Story />
-        </JestContextStoreSetter>
-      </ActionMenuComponentInstanceContext.Provider>
-    </ContextStoreComponentInstanceContext.Provider>
+        <ActionMenuComponentInstanceContext.Provider
+          value={{ instanceId: 'command-menu' }}
+        >
+          <JestContextStoreSetter contextStoreCurrentObjectMetadataNameSingular="company">
+            <Story />
+          </JestContextStoreSetter>
+        </ActionMenuComponentInstanceContext.Provider>
+      </ContextStoreComponentInstanceContext.Provider>
+    </RecordFiltersComponentInstanceContext.Provider>
   );
 };
 
 const meta: Meta<typeof CommandMenu> = {
   title: 'Modules/CommandMenu/CommandMenu',
-  component: CommandMenu,
+  component: CommandMenuRouter,
   decorators: [
     (Story) => {
       const setCurrentWorkspace = useSetRecoilState(currentWorkspaceState);
@@ -64,6 +71,7 @@ const meta: Meta<typeof CommandMenu> = {
     ObjectMetadataItemsDecorator,
     SnackBarDecorator,
     ComponentWithRouterDecorator,
+    I18nFrontDecorator,
   ],
   parameters: {
     msw: graphqlMocks,
diff --git a/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenuContextChip.stories.tsx b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenuContextChip.stories.tsx
new file mode 100644
index 000000000000..efcee93e3d42
--- /dev/null
+++ b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenuContextChip.stories.tsx
@@ -0,0 +1,53 @@
+import { Meta, StoryObj } from '@storybook/react';
+
+import {
+  ComponentDecorator,
+  IconBuildingSkyscraper,
+  IconUser,
+} from 'twenty-ui';
+import { CommandMenuContextChip } from '../CommandMenuContextChip';
+
+const meta: Meta<typeof CommandMenuContextChip> = {
+  title: 'Modules/CommandMenu/CommandMenuContextChip',
+  component: CommandMenuContextChip,
+  decorators: [ComponentDecorator],
+};
+
+export default meta;
+type Story = StoryObj<typeof CommandMenuContextChip>;
+
+export const SingleIcon: Story = {
+  args: {
+    Icons: [<IconUser size={16} />],
+    text: 'Person',
+  },
+};
+
+export const MultipleIcons: Story = {
+  args: {
+    Icons: [<IconUser size={16} />, <IconBuildingSkyscraper size={16} />],
+    text: 'Person & Company',
+  },
+};
+
+export const WithIconBackground: Story = {
+  args: {
+    Icons: [<IconUser size={16} />],
+    text: 'Person',
+    withIconBackground: true,
+  },
+};
+
+export const MultipleIconsWithIconBackground: Story = {
+  args: {
+    Icons: [<IconUser size={16} />, <IconBuildingSkyscraper size={16} />],
+    text: 'Person & Company',
+    withIconBackground: true,
+  },
+};
+
+export const IconsOnly: Story = {
+  args: {
+    Icons: [<IconUser size={16} />, <IconBuildingSkyscraper size={16} />],
+  },
+};
diff --git a/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenuContextRecordChip.stories.tsx b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenuContextRecordChip.stories.tsx
new file mode 100644
index 000000000000..2a02b9190d2b
--- /dev/null
+++ b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenuContextRecordChip.stories.tsx
@@ -0,0 +1,261 @@
+import { gql } from '@apollo/client';
+import { Decorator, Meta, StoryObj } from '@storybook/react';
+
+import { CommandMenuContextRecordChip } from '@/command-menu/components/CommandMenuContextRecordChip';
+import { PreComputedChipGeneratorsContext } from '@/object-metadata/contexts/PreComputedChipGeneratorsContext';
+import { RecordChipData } from '@/object-record/record-field/types/RecordChipData';
+import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { ComponentDecorator } from 'twenty-ui';
+import { getJestMetadataAndApolloMocksAndActionMenuWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksAndContextStoreWrapper';
+import { getCompaniesMock } from '~/testing/mock-data/companies';
+import { generatedMockObjectMetadataItems } from '~/testing/mock-data/generatedMockObjectMetadataItems';
+
+const FIND_MANY_COMPANIES = gql`
+  query FindManyCompanies(
+    $filter: CompanyFilterInput
+    $orderBy: [CompanyOrderByInput]
+    $lastCursor: String
+    $limit: Int
+  ) {
+    companies(
+      filter: $filter
+      orderBy: $orderBy
+      first: $limit
+      after: $lastCursor
+    ) {
+      edges {
+        node {
+          __typename
+          accountOwnerId
+          address {
+            addressStreet1
+            addressStreet2
+            addressCity
+            addressState
+            addressCountry
+            addressPostcode
+            addressLat
+            addressLng
+          }
+          annualRecurringRevenue {
+            amountMicros
+            currencyCode
+          }
+          createdAt
+          createdBy {
+            source
+            workspaceMemberId
+            name
+          }
+          deletedAt
+          domainName {
+            primaryLinkUrl
+            primaryLinkLabel
+            secondaryLinks
+          }
+          employees
+          id
+          idealCustomerProfile
+          introVideo {
+            primaryLinkUrl
+            primaryLinkLabel
+            secondaryLinks
+          }
+          linkedinLink {
+            primaryLinkUrl
+            primaryLinkLabel
+            secondaryLinks
+          }
+          name
+          position
+          tagline
+          updatedAt
+          visaSponsorship
+          workPolicy
+          xLink {
+            primaryLinkUrl
+            primaryLinkLabel
+            secondaryLinks
+          }
+        }
+        cursor
+      }
+      pageInfo {
+        hasNextPage
+        hasPreviousPage
+        startCursor
+        endCursor
+      }
+      totalCount
+    }
+  }
+`;
+
+const companyMockObjectMetadataItem = generatedMockObjectMetadataItems.find(
+  (item) => item.nameSingular === 'company',
+);
+
+const companiesMock = getCompaniesMock();
+
+const companyMock = companiesMock[0];
+
+const chipGeneratorPerObjectPerField: Record<
+  string,
+  Record<string, (record: ObjectRecord) => RecordChipData>
+> = {
+  company: {
+    name: (record: ObjectRecord): RecordChipData => ({
+      recordId: record.id,
+      name: record.name as string,
+      avatarUrl: '',
+      avatarType: 'rounded',
+      isLabelIdentifier: true,
+      objectNameSingular: 'company',
+    }),
+  },
+};
+
+const identifierChipGeneratorPerObject: Record<
+  string,
+  (record: ObjectRecord) => RecordChipData
+> = {
+  company: chipGeneratorPerObjectPerField.company.name,
+};
+
+const ChipGeneratorsDecorator: Decorator = (Story) => (
+  <PreComputedChipGeneratorsContext.Provider
+    value={{
+      chipGeneratorPerObjectPerField,
+      identifierChipGeneratorPerObject,
+    }}
+  >
+    <Story />
+  </PreComputedChipGeneratorsContext.Provider>
+);
+
+const createContextStoreWrapper = ({
+  companies,
+  componentInstanceId,
+}: {
+  companies: typeof companiesMock;
+  componentInstanceId: string;
+}) => {
+  return getJestMetadataAndApolloMocksAndActionMenuWrapper({
+    apolloMocks: [
+      {
+        request: {
+          query: FIND_MANY_COMPANIES,
+          variables: {
+            filter: {
+              id: { in: companies.map((company) => company.id) },
+              deletedAt: { is: 'NOT_NULL' },
+            },
+            orderBy: [{ position: 'AscNullsFirst' }],
+            limit: 3,
+          },
+        },
+        result: {
+          data: {
+            companies: {
+              edges: companies.slice(0, 3).map((company, index) => ({
+                node: company,
+                cursor: `cursor-${index + 1}`,
+              })),
+              pageInfo: {
+                hasNextPage: companies.length > 3,
+                hasPreviousPage: false,
+                startCursor: 'cursor-1',
+                endCursor:
+                  companies.length > 0
+                    ? `cursor-${Math.min(companies.length, 3)}`
+                    : null,
+              },
+              totalCount: companies.length,
+            },
+          },
+        },
+      },
+    ],
+    componentInstanceId,
+    contextStoreCurrentObjectMetadataNameSingular:
+      companyMockObjectMetadataItem?.nameSingular,
+    contextStoreTargetedRecordsRule: {
+      mode: 'selection',
+      selectedRecordIds: companies.map((company) => company.id),
+    },
+    contextStoreNumberOfSelectedRecords: companies.length,
+    onInitializeRecoilSnapshot: (snapshot) => {
+      for (const company of companies) {
+        snapshot.set(recordStoreFamilyState(company.id), company);
+      }
+    },
+  });
+};
+
+const ContextStoreDecorator: Decorator = (Story) => {
+  const ContextStoreWrapper = createContextStoreWrapper({
+    companies: [companyMock],
+    componentInstanceId: '1',
+  });
+
+  return (
+    <ContextStoreWrapper>
+      <Story />
+    </ContextStoreWrapper>
+  );
+};
+
+const meta: Meta<typeof CommandMenuContextRecordChip> = {
+  title: 'Modules/CommandMenu/CommandMenuContextRecordChip',
+  component: CommandMenuContextRecordChip,
+  decorators: [
+    ContextStoreDecorator,
+    ChipGeneratorsDecorator,
+    ComponentDecorator,
+  ],
+  args: {
+    objectMetadataItemId: companyMockObjectMetadataItem?.id,
+  },
+};
+
+export default meta;
+type Story = StoryObj<typeof CommandMenuContextRecordChip>;
+
+export const Default: Story = {};
+
+export const WithTwoCompanies: Story = {
+  decorators: [
+    (Story) => {
+      const twoCompaniesMock = companiesMock.slice(0, 2);
+      const TwoCompaniesWrapper = createContextStoreWrapper({
+        companies: twoCompaniesMock,
+        componentInstanceId: '2',
+      });
+
+      return (
+        <TwoCompaniesWrapper>
+          <Story />
+        </TwoCompaniesWrapper>
+      );
+    },
+  ],
+};
+
+export const WithTenCompanies: Story = {
+  decorators: [
+    (Story) => {
+      const tenCompaniesMock = companiesMock.slice(0, 10);
+      const TenCompaniesWrapper = createContextStoreWrapper({
+        companies: tenCompaniesMock,
+        componentInstanceId: '3',
+      });
+
+      return (
+        <TenCompaniesWrapper>
+          <Story />
+        </TenCompaniesWrapper>
+      );
+    },
+  ],
+};
diff --git a/packages/twenty-front/src/modules/command-menu/constants/CommandMenuAnimationVariants.ts b/packages/twenty-front/src/modules/command-menu/constants/CommandMenuAnimationVariants.ts
new file mode 100644
index 000000000000..77e6da68ee9c
--- /dev/null
+++ b/packages/twenty-front/src/modules/command-menu/constants/CommandMenuAnimationVariants.ts
@@ -0,0 +1,25 @@
+import { THEME_COMMON } from 'twenty-ui';
+
+export const COMMAND_MENU_ANIMATION_VARIANTS = {
+  fullScreen: {
+    x: '0%',
+    width: '100%',
+    height: '100%',
+    bottom: '0',
+    top: '0',
+  },
+  normal: {
+    x: '0%',
+    width: THEME_COMMON.rightDrawerWidth,
+    height: '100%',
+    bottom: '0',
+    top: '0',
+  },
+  closed: {
+    x: '100%',
+    width: THEME_COMMON.rightDrawerWidth,
+    height: '100%',
+    bottom: '0',
+    top: 'auto',
+  },
+};
diff --git a/packages/twenty-front/src/modules/command-menu/constants/CommandMenuNavigateCommands.ts b/packages/twenty-front/src/modules/command-menu/constants/CommandMenuNavigateCommands.ts
index 6089cdcb75f2..93ca1f9df2f5 100644
--- a/packages/twenty-front/src/modules/command-menu/constants/CommandMenuNavigateCommands.ts
+++ b/packages/twenty-front/src/modules/command-menu/constants/CommandMenuNavigateCommands.ts
@@ -6,12 +6,19 @@ import {
   IconUser,
 } from 'twenty-ui';
 
+import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';
+import { AppPath } from '@/types/AppPath';
+import { SettingsPath } from '@/types/SettingsPath';
+import { getAppPath } from '~/utils/navigation/getAppPath';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 import { Command, CommandType } from '../types/Command';
 
 export const COMMAND_MENU_NAVIGATE_COMMANDS: { [key: string]: Command } = {
   people: {
     id: 'go-to-people',
-    to: '/objects/people',
+    to: getAppPath(AppPath.RecordIndexPage, {
+      objectNamePlural: CoreObjectNamePlural.Person,
+    }),
     label: 'Go to People',
     type: CommandType.Navigate,
     firstHotKey: 'G',
@@ -21,7 +28,9 @@ export const COMMAND_MENU_NAVIGATE_COMMANDS: { [key: string]: Command } = {
   },
   companies: {
     id: 'go-to-companies',
-    to: '/objects/companies',
+    to: getAppPath(AppPath.RecordIndexPage, {
+      objectNamePlural: CoreObjectNamePlural.Company,
+    }),
     label: 'Go to Companies',
     type: CommandType.Navigate,
     firstHotKey: 'G',
@@ -31,7 +40,9 @@ export const COMMAND_MENU_NAVIGATE_COMMANDS: { [key: string]: Command } = {
   },
   opportunities: {
     id: 'go-to-activities',
-    to: '/objects/opportunities',
+    to: getAppPath(AppPath.RecordIndexPage, {
+      objectNamePlural: CoreObjectNamePlural.Opportunity,
+    }),
     label: 'Go to Opportunities',
     type: CommandType.Navigate,
     firstHotKey: 'G',
@@ -41,7 +52,7 @@ export const COMMAND_MENU_NAVIGATE_COMMANDS: { [key: string]: Command } = {
   },
   settings: {
     id: 'go-to-settings',
-    to: '/settings/profile',
+    to: getSettingsPath(SettingsPath.ProfilePage),
     label: 'Go to Settings',
     type: CommandType.Navigate,
     firstHotKey: 'G',
@@ -51,7 +62,9 @@ export const COMMAND_MENU_NAVIGATE_COMMANDS: { [key: string]: Command } = {
   },
   tasks: {
     id: 'go-to-tasks',
-    to: '/objects/tasks',
+    to: getAppPath(AppPath.RecordIndexPage, {
+      objectNamePlural: CoreObjectNamePlural.Task,
+    }),
     label: 'Go to Tasks',
     type: CommandType.Navigate,
     firstHotKey: 'G',
diff --git a/packages/twenty-front/src/modules/command-menu/constants/CommandMenuPagesConfig.tsx b/packages/twenty-front/src/modules/command-menu/constants/CommandMenuPagesConfig.tsx
new file mode 100644
index 000000000000..dbb14d854bbd
--- /dev/null
+++ b/packages/twenty-front/src/modules/command-menu/constants/CommandMenuPagesConfig.tsx
@@ -0,0 +1,31 @@
+import { RightDrawerCalendarEvent } from '@/activities/calendar/right-drawer/components/RightDrawerCalendarEvent';
+import { RightDrawerAIChat } from '@/activities/copilot/right-drawer/components/RightDrawerAIChat';
+import { RightDrawerEmailThread } from '@/activities/emails/right-drawer/components/RightDrawerEmailThread';
+import { CommandMenu } from '@/command-menu/components/CommandMenu';
+import { CommandMenuPages } from '@/command-menu/components/CommandMenuPages';
+import { RightDrawerRecord } from '@/object-record/record-right-drawer/components/RightDrawerRecord';
+import { RightDrawerWorkflowEditStep } from '@/workflow/workflow-steps/components/RightDrawerWorkflowEditStep';
+import { RightDrawerWorkflowViewStep } from '@/workflow/workflow-steps/components/RightDrawerWorkflowViewStep';
+import { RightDrawerWorkflowSelectAction } from '@/workflow/workflow-steps/workflow-actions/components/RightDrawerWorkflowSelectAction';
+import { RightDrawerWorkflowSelectTriggerType } from '@/workflow/workflow-trigger/components/RightDrawerWorkflowSelectTriggerType';
+
+export const COMMAND_MENU_PAGES_CONFIG = new Map<
+  CommandMenuPages,
+  React.ReactNode
+>([
+  [CommandMenuPages.Root, <CommandMenu />],
+  [CommandMenuPages.ViewRecord, <RightDrawerRecord />],
+  [CommandMenuPages.ViewEmailThread, <RightDrawerEmailThread />],
+  [CommandMenuPages.ViewCalendarEvent, <RightDrawerCalendarEvent />],
+  [CommandMenuPages.Copilot, <RightDrawerAIChat />],
+  [
+    CommandMenuPages.WorkflowStepSelectTriggerType,
+    <RightDrawerWorkflowSelectTriggerType />,
+  ],
+  [
+    CommandMenuPages.WorkflowStepSelectAction,
+    <RightDrawerWorkflowSelectAction />,
+  ],
+  [CommandMenuPages.WorkflowStepEdit, <RightDrawerWorkflowEditStep />],
+  [CommandMenuPages.WorkflowStepView, <RightDrawerWorkflowViewStep />],
+]);
diff --git a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useCommandMenu.test.tsx b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useCommandMenu.test.tsx
index 2ae691d15c49..a5c88a6cb508 100644
--- a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useCommandMenu.test.tsx
+++ b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useCommandMenu.test.tsx
@@ -1,5 +1,5 @@
 import { renderHook } from '@testing-library/react';
-import { act } from 'react-dom/test-utils';
+import { act } from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import { RecoilRoot, useRecoilValue } from 'recoil';
 
@@ -69,20 +69,4 @@ describe('useCommandMenu', () => {
 
     expect(result.current.isCommandMenuOpened).toBe(false);
   });
-
-  it('onItemClick', () => {
-    const { result } = renderHooks();
-    const onClickMock = jest.fn();
-
-    act(() => {
-      result.current.commandMenu.onItemClick({
-        shouldCloseCommandMenuOnClick: true,
-        onClick: onClickMock,
-        to: '/test',
-      });
-    });
-
-    expect(result.current.isCommandMenuOpened).toBe(true);
-    expect(onClickMock).toHaveBeenCalledTimes(1);
-  });
 });
diff --git a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useCommandMenuOnItemClick.test.tsx b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useCommandMenuOnItemClick.test.tsx
new file mode 100644
index 000000000000..a5a82dca6698
--- /dev/null
+++ b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useCommandMenuOnItemClick.test.tsx
@@ -0,0 +1,54 @@
+import { isCommandMenuOpenedState } from '@/command-menu/states/isCommandMenuOpenedState';
+import { renderHook } from '@testing-library/react';
+import { act } from 'react';
+import { MemoryRouter } from 'react-router-dom';
+import { RecoilRoot, useRecoilValue } from 'recoil';
+import { useCommandMenuOnItemClick } from '../useCommandMenuOnItemClick';
+
+const Wrapper = ({ children }: { children: React.ReactNode }) => (
+  <RecoilRoot>
+    <MemoryRouter
+      initialEntries={['/one', '/two', { pathname: '/three' }]}
+      initialIndex={1}
+    >
+      {children}
+    </MemoryRouter>
+  </RecoilRoot>
+);
+
+const renderHooks = () => {
+  const { result } = renderHook(
+    () => {
+      const { onItemClick } = useCommandMenuOnItemClick();
+
+      const isCommandMenuOpened = useRecoilValue(isCommandMenuOpenedState);
+
+      return {
+        onItemClick,
+        isCommandMenuOpened,
+      };
+    },
+    {
+      wrapper: Wrapper,
+    },
+  );
+  return { result };
+};
+
+describe('useCommandMenuOnItemClick', () => {
+  it('onItemClick', () => {
+    const { result } = renderHooks();
+    const onClickMock = jest.fn();
+
+    act(() => {
+      result.current.onItemClick({
+        shouldCloseCommandMenuOnClick: true,
+        onClick: onClickMock,
+        to: '/test',
+      });
+    });
+
+    expect(result.current.isCommandMenuOpened).toBe(true);
+    expect(onClickMock).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts
index 3b32e5a6e1c8..a37a2b66a68c 100644
--- a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts
+++ b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts
@@ -1,7 +1,4 @@
-import { isNonEmptyString } from '@sniptt/guards';
-import { useCallback } from 'react';
-import { useNavigate } from 'react-router-dom';
-import { useRecoilCallback, useRecoilValue, useSetRecoilState } from 'recoil';
+import { useRecoilCallback, useRecoilValue } from 'recoil';
 
 import { commandMenuSearchState } from '@/command-menu/states/commandMenuSearchState';
 import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
@@ -10,6 +7,9 @@ import { AppHotkeyScope } from '@/ui/utilities/hotkey/types/AppHotkeyScope';
 import { isDefined } from '~/utils/isDefined';
 
 import { actionMenuEntriesComponentState } from '@/action-menu/states/actionMenuEntriesComponentState';
+import { CommandMenuPages } from '@/command-menu/components/CommandMenuPages';
+import { commandMenuPageState } from '@/command-menu/states/commandMenuPageState';
+import { commandMenuPageInfoState } from '@/command-menu/states/commandMenuPageTitle';
 import { contextStoreCurrentObjectMetadataIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataIdComponentState';
 import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState';
 import { contextStoreCurrentViewTypeComponentState } from '@/context-store/states/contextStoreCurrentViewTypeComponentState';
@@ -17,11 +17,12 @@ import { contextStoreFiltersComponentState } from '@/context-store/states/contex
 import { contextStoreNumberOfSelectedRecordsComponentState } from '@/context-store/states/contextStoreNumberOfSelectedRecordsComponentState';
 import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
 import { mainContextStoreComponentInstanceIdState } from '@/context-store/states/mainContextStoreComponentInstanceId';
+import { viewableRecordIdState } from '@/object-record/record-right-drawer/states/viewableRecordIdState';
+import { viewableRecordNameSingularState } from '@/object-record/record-right-drawer/states/viewableRecordNameSingularState';
+import { emitRightDrawerCloseEvent } from '@/ui/layout/right-drawer/utils/emitRightDrawerCloseEvent';
 import { isCommandMenuOpenedState } from '../states/isCommandMenuOpenedState';
 
 export const useCommandMenu = () => {
-  const navigate = useNavigate();
-  const setIsCommandMenuOpened = useSetRecoilState(isCommandMenuOpenedState);
   const { resetSelectedItem } = useSelectableList('command-menu-list');
   const {
     setHotkeyScopeAndMemorizePreviousScope,
@@ -142,13 +143,12 @@ export const useCommandMenu = () => {
           actionMenuEntries,
         );
 
-        setIsCommandMenuOpened(true);
+        set(isCommandMenuOpenedState, true);
         setHotkeyScopeAndMemorizePreviousScope(AppHotkeyScope.CommandMenuOpen);
       },
     [
       mainContextStoreComponentInstanceId,
       setHotkeyScopeAndMemorizePreviousScope,
-      setIsCommandMenuOpened,
     ],
   );
 
@@ -159,65 +159,73 @@ export const useCommandMenu = () => {
           .getLoadable(isCommandMenuOpenedState)
           .getValue();
 
-        set(
-          contextStoreCurrentObjectMetadataIdComponentState.atomFamily({
-            instanceId: 'command-menu',
-          }),
-          null,
-        );
+        if (isCommandMenuOpened) {
+          set(
+            contextStoreCurrentObjectMetadataIdComponentState.atomFamily({
+              instanceId: 'command-menu',
+            }),
+            null,
+          );
 
-        set(
-          contextStoreTargetedRecordsRuleComponentState.atomFamily({
-            instanceId: 'command-menu',
-          }),
-          {
-            mode: 'selection',
-            selectedRecordIds: [],
-          },
-        );
+          set(
+            contextStoreTargetedRecordsRuleComponentState.atomFamily({
+              instanceId: 'command-menu',
+            }),
+            {
+              mode: 'selection',
+              selectedRecordIds: [],
+            },
+          );
 
-        set(
-          contextStoreNumberOfSelectedRecordsComponentState.atomFamily({
-            instanceId: 'command-menu',
-          }),
-          0,
-        );
+          set(
+            contextStoreNumberOfSelectedRecordsComponentState.atomFamily({
+              instanceId: 'command-menu',
+            }),
+            0,
+          );
 
-        set(
-          contextStoreFiltersComponentState.atomFamily({
-            instanceId: 'command-menu',
-          }),
-          [],
-        );
+          set(
+            contextStoreFiltersComponentState.atomFamily({
+              instanceId: 'command-menu',
+            }),
+            [],
+          );
 
-        set(
-          contextStoreCurrentViewIdComponentState.atomFamily({
-            instanceId: 'command-menu',
-          }),
-          null,
-        );
+          set(
+            contextStoreCurrentViewIdComponentState.atomFamily({
+              instanceId: 'command-menu',
+            }),
+            null,
+          );
 
-        set(
-          contextStoreCurrentViewTypeComponentState.atomFamily({
-            instanceId: 'command-menu',
-          }),
-          null,
-        );
+          set(
+            contextStoreCurrentViewTypeComponentState.atomFamily({
+              instanceId: 'command-menu',
+            }),
+            null,
+          );
 
-        set(
-          actionMenuEntriesComponentState.atomFamily({
-            instanceId: 'command-menu',
-          }),
-          new Map(),
-        );
+          set(
+            actionMenuEntriesComponentState.atomFamily({
+              instanceId: 'command-menu',
+            }),
+            new Map(),
+          );
 
-        if (isCommandMenuOpened) {
-          setIsCommandMenuOpened(false);
+          set(viewableRecordIdState, null);
+          set(commandMenuPageState, CommandMenuPages.Root);
+          set(commandMenuPageInfoState, {
+            title: undefined,
+            Icon: undefined,
+          });
+          set(isCommandMenuOpenedState, false);
           resetSelectedItem();
           goBackToPreviousHotkeyScope();
+
+          emitRightDrawerCloseEvent();
         }
       },
-    [goBackToPreviousHotkeyScope, resetSelectedItem, setIsCommandMenuOpened],
+    [goBackToPreviousHotkeyScope, resetSelectedItem],
   );
 
   const toggleCommandMenu = useRecoilCallback(
@@ -238,39 +246,56 @@ export const useCommandMenu = () => {
     [closeCommandMenu, openCommandMenu],
   );
 
-  const onItemClick = useCallback(
-    ({
-      shouldCloseCommandMenuOnClick,
-      onClick,
-      to,
-    }: {
-      shouldCloseCommandMenuOnClick?: boolean;
-      onClick?: () => void;
-      to?: string;
-    }) => {
-      if (
-        isDefined(shouldCloseCommandMenuOnClick) &&
-        shouldCloseCommandMenuOnClick
-      ) {
-        toggleCommandMenu();
-      }
-
-      if (isDefined(onClick)) {
-        onClick();
-        return;
-      }
-      if (isNonEmptyString(to)) {
-        navigate(to);
-        return;
-      }
+  const openRecordInCommandMenu = useRecoilCallback(
+    ({ set }) => {
+      return (recordId: string, objectNameSingular: string) => {
+        openCommandMenu();
+        set(commandMenuPageState, CommandMenuPages.ViewRecord);
+        set(viewableRecordNameSingularState, objectNameSingular);
+        set(viewableRecordIdState, recordId);
+      };
     },
-    [navigate, toggleCommandMenu],
+    [openCommandMenu],
   );
 
+  const setGlobalCommandMenuContext = useRecoilCallback(({ set }) => {
+    return () => {
+      set(
+        contextStoreTargetedRecordsRuleComponentState.atomFamily({
+          instanceId: 'command-menu',
+        }),
+        {
+          mode: 'selection',
+          selectedRecordIds: [],
+        },
+      );
+
+      set(
+        contextStoreNumberOfSelectedRecordsComponentState.atomFamily({
+          instanceId: 'command-menu',
+        }),
+        0,
+      );
+
+      set(
+        contextStoreCurrentViewTypeComponentState.atomFamily({
+          instanceId: 'command-menu',
+        }),
+        null,
+      );
+
+      set(commandMenuPageInfoState, {
+        title: undefined,
+        Icon: undefined,
+      });
+    };
+  }, []);
+
   return {
     openCommandMenu,
     closeCommandMenu,
+    openRecordInCommandMenu,
     toggleCommandMenu,
-    onItemClick,
+    resetCommandMenuContext: setGlobalCommandMenuContext,
   };
 };
diff --git a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuCommands.tsx b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuCommands.tsx
index 6504bb5c256d..bc081c252d54 100644
--- a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuCommands.tsx
+++ b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuCommands.tsx
@@ -176,7 +176,7 @@ export const useCommandMenuCommands = () => {
 
   const peopleCommands = useMemo(
     () =>
-      people?.map(({ id, name: { firstName, lastName } }) => ({
+      people?.map(({ id, name: { firstName, lastName }, avatarUrl }) => ({
         id,
         label: `${firstName} ${lastName}`,
         to: `object/person/${id}`,
@@ -184,7 +184,7 @@ export const useCommandMenuCommands = () => {
         Icon: () => (
           <Avatar
             type="rounded"
-            avatarUrl={null}
+            avatarUrl={avatarUrl}
             placeholderColorSeed={id}
             placeholder={`${firstName} ${lastName}`}
           />
@@ -283,7 +283,7 @@ export const useCommandMenuCommands = () => {
           Icon: () => (
             <Avatar
               type="rounded"
-              avatarUrl={null}
+              avatarUrl={objectRecord.record.avatarUrl}
               placeholderColorSeed={objectRecord.record.id}
               placeholder={objectRecord.recordIdentifier.name ?? ''}
             />
diff --git a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts
index f905b29ceec6..ccc39f699870 100644
--- a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts
+++ b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuHotKeys.ts
@@ -1,27 +1,32 @@
+import { CommandMenuPages } from '@/command-menu/components/CommandMenuPages';
 import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
+import { commandMenuPageState } from '@/command-menu/states/commandMenuPageState';
 import { commandMenuSearchState } from '@/command-menu/states/commandMenuSearchState';
-import { contextStoreNumberOfSelectedRecordsComponentState } from '@/context-store/states/contextStoreNumberOfSelectedRecordsComponentState';
-import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
+import { useKeyboardShortcutMenu } from '@/keyboard-shortcut-menu/hooks/useKeyboardShortcutMenu';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { AppHotkeyScope } from '@/ui/utilities/hotkey/types/AppHotkeyScope';
-import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 import { isNonEmptyString } from '@sniptt/guards';
 import { useRecoilValue } from 'recoil';
 import { Key } from 'ts-key-enum';
 
 export const useCommandMenuHotKeys = () => {
-  const { closeCommandMenu } = useCommandMenu();
+  const { closeCommandMenu, toggleCommandMenu, resetCommandMenuContext } =
+    useCommandMenu();
 
   const commandMenuSearch = useRecoilValue(commandMenuSearchState);
 
-  const setContextStoreTargetedRecordsRule = useSetRecoilComponentStateV2(
-    contextStoreTargetedRecordsRuleComponentState,
-    'command-menu',
-  );
+  const { closeKeyboardShortcutMenu } = useKeyboardShortcutMenu();
+
+  const commandMenuPage = useRecoilValue(commandMenuPageState);
 
-  const setContextStoreNumberOfSelectedRecords = useSetRecoilComponentStateV2(
-    contextStoreNumberOfSelectedRecordsComponentState,
-    'command-menu',
+  useScopedHotkeys(
+    'ctrl+k,meta+k',
+    () => {
+      closeKeyboardShortcutMenu();
+      toggleCommandMenu();
+    },
+    AppHotkeyScope.CommandMenu,
+    [toggleCommandMenu],
   );
 
   useScopedHotkeys(
@@ -36,13 +41,11 @@ export const useCommandMenuHotKeys = () => {
   useScopedHotkeys(
     [Key.Backspace, Key.Delete],
     () => {
-      if (!isNonEmptyString(commandMenuSearch)) {
-        setContextStoreTargetedRecordsRule({
-          mode: 'selection',
-          selectedRecordIds: [],
-        });
-
-        setContextStoreNumberOfSelectedRecords(0);
+      if (
+        commandMenuPage === CommandMenuPages.Root &&
+        !isNonEmptyString(commandMenuSearch)
+      ) {
+        resetCommandMenuContext();
       }
     },
     AppHotkeyScope.CommandMenuOpen,
diff --git a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuOnItemClick.ts b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuOnItemClick.ts
new file mode 100644
index 000000000000..c656e82eb113
--- /dev/null
+++ b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenuOnItemClick.ts
@@ -0,0 +1,41 @@
+import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
+import { isNonEmptyString } from '@sniptt/guards';
+import { useCallback } from 'react';
+import { useNavigate } from 'react-router-dom';
+import { isDefined } from 'twenty-ui';
+
+export const useCommandMenuOnItemClick = () => {
+  const { toggleCommandMenu } = useCommandMenu();
+  const navigate = useNavigate();
+
+  const onItemClick = useCallback(
+    ({
+      shouldCloseCommandMenuOnClick,
+      onClick,
+      to,
+    }: {
+      shouldCloseCommandMenuOnClick?: boolean;
+      onClick?: () => void;
+      to?: string;
+    }) => {
+      if (
+        isDefined(shouldCloseCommandMenuOnClick) &&
+        shouldCloseCommandMenuOnClick
+      ) {
+        toggleCommandMenu();
+      }
+
+      if (isDefined(onClick)) {
+        onClick();
+        return;
+      }
+      if (isNonEmptyString(to)) {
+        navigate(to);
+        return;
+      }
+    },
+    [navigate, toggleCommandMenu],
+  );
+
+  return { onItemClick };
+};
diff --git a/packages/twenty-front/src/modules/command-menu/states/commandMenuPageState.ts b/packages/twenty-front/src/modules/command-menu/states/commandMenuPageState.ts
new file mode 100644
index 000000000000..d5a41917d217
--- /dev/null
+++ b/packages/twenty-front/src/modules/command-menu/states/commandMenuPageState.ts
@@ -0,0 +1,7 @@
+import { CommandMenuPages } from '@/command-menu/components/CommandMenuPages';
+import { createState } from '@ui/utilities/state/utils/createState';
+
+export const commandMenuPageState = createState<CommandMenuPages>({
+  key: 'command-menu/commandMenuPageState',
+  defaultValue: CommandMenuPages.Root,
+});
diff --git a/packages/twenty-front/src/modules/command-menu/states/commandMenuPageTitle.ts b/packages/twenty-front/src/modules/command-menu/states/commandMenuPageTitle.ts
new file mode 100644
index 000000000000..986421873a13
--- /dev/null
+++ b/packages/twenty-front/src/modules/command-menu/states/commandMenuPageTitle.ts
@@ -0,0 +1,10 @@
+import { createState } from '@ui/utilities/state/utils/createState';
+import { IconComponent } from 'twenty-ui';
+
+export const commandMenuPageInfoState = createState<{
+  title: string | undefined;
+  Icon: IconComponent | undefined;
+}>({
+  key: 'command-menu/commandMenuPageInfoState',
+  defaultValue: { title: undefined, Icon: undefined },
+});
diff --git a/packages/twenty-front/src/modules/command-menu/types/CommandMenuAnimationVariant.ts b/packages/twenty-front/src/modules/command-menu/types/CommandMenuAnimationVariant.ts
new file mode 100644
index 000000000000..e5c8ebee873f
--- /dev/null
+++ b/packages/twenty-front/src/modules/command-menu/types/CommandMenuAnimationVariant.ts
@@ -0,0 +1,4 @@
+import { COMMAND_MENU_ANIMATION_VARIANTS } from '@/command-menu/constants/CommandMenuAnimationVariants';
+
+export type CommandMenuAnimationVariant =
+  keyof typeof COMMAND_MENU_ANIMATION_VARIANTS;
diff --git a/packages/twenty-front/src/modules/context-store/components/ContextStoreViewIdEffect.tsx b/packages/twenty-front/src/modules/context-store/components/ContextStoreViewIdEffect.tsx
new file mode 100644
index 000000000000..d4f7efc662a4
--- /dev/null
+++ b/packages/twenty-front/src/modules/context-store/components/ContextStoreViewIdEffect.tsx
@@ -0,0 +1,104 @@
+import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState';
+import { useLastVisitedObjectMetadataItem } from '@/navigation/hooks/useLastVisitedObjectMetadataItem';
+import { useLastVisitedView } from '@/navigation/hooks/useLastVisitedView';
+import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
+import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData';
+import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
+import { useViewFromQueryParams } from '@/views/hooks/internal/useViewFromQueryParams';
+import { View } from '@/views/types/View';
+import { isUndefined } from '@sniptt/guards';
+import { useEffect } from 'react';
+import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
+import { isDefined } from '~/utils/isDefined';
+
+export const ContextStoreViewIdEffect = ({
+  objectNamePlural,
+}: {
+  objectNamePlural: string;
+}) => {
+  const { viewIdQueryParam } = useViewFromQueryParams();
+
+  const { records: viewsOnCurrentObject } = usePrefetchedData<View>(
+    PrefetchKey.AllViews,
+  );
+
+  const { findObjectMetadataItemByNamePlural } =
+    useFilteredObjectMetadataItems();
+  const objectMetadataItemId =
+    findObjectMetadataItemByNamePlural(objectNamePlural);
+  const { getLastVisitedViewIdFromObjectNamePlural, setLastVisitedView } =
+    useLastVisitedView();
+  const { lastVisitedObjectMetadataItemId, setLastVisitedObjectMetadataItem } =
+    useLastVisitedObjectMetadataItem();
+
+  const lastVisitedViewId =
+    getLastVisitedViewIdFromObjectNamePlural(objectNamePlural);
+  const isLastVisitedObjectMetadataItemDifferent = !isDeeplyEqual(
+    objectMetadataItemId?.id,
+    lastVisitedObjectMetadataItemId,
+  );
+  const setContextStoreCurrentViewId = useSetRecoilComponentStateV2(
+    contextStoreCurrentViewIdComponentState,
+    objectNamePlural,
+  );
+
+  useEffect(() => {
+    const indexView = viewsOnCurrentObject.find((view) => view.key === 'INDEX');
+
+    if (isUndefined(viewIdQueryParam) && isDefined(lastVisitedViewId)) {
+      if (isLastVisitedObjectMetadataItemDifferent) {
+        setLastVisitedObjectMetadataItem(objectNamePlural);
+        setLastVisitedView({
+          objectNamePlural,
+          viewId: lastVisitedViewId,
+        });
+      }
+      setContextStoreCurrentViewId(lastVisitedViewId);
+      return;
+    }
+
+    if (isDefined(viewIdQueryParam)) {
+      if (isLastVisitedObjectMetadataItemDifferent) {
+        setLastVisitedObjectMetadataItem(objectNamePlural);
+      }
+      if (!isDeeplyEqual(viewIdQueryParam, lastVisitedViewId)) {
+        setLastVisitedView({
+          objectNamePlural,
+          viewId: viewIdQueryParam,
+        });
+      }
+      setContextStoreCurrentViewId(viewIdQueryParam);
+      return;
+    }
+
+    if (isDefined(indexView)) {
+      if (isLastVisitedObjectMetadataItemDifferent) {
+        setLastVisitedObjectMetadataItem(objectNamePlural);
+      }
+      if (!isDeeplyEqual(indexView.id, lastVisitedViewId)) {
+        setLastVisitedView({
+          objectNamePlural,
+          viewId: indexView.id,
+        });
+      }
+      setContextStoreCurrentViewId(indexView.id);
+      return;
+    }
+
+    return () => {
+      setContextStoreCurrentViewId(null);
+    };
+  }, [
+    isLastVisitedObjectMetadataItemDifferent,
+    lastVisitedViewId,
+    objectNamePlural,
+    setContextStoreCurrentViewId,
+    setLastVisitedObjectMetadataItem,
+    setLastVisitedView,
+    viewIdQueryParam,
+    viewsOnCurrentObject,
+  ]);
+
+  return <></>;
+};
diff --git a/packages/twenty-front/src/modules/context-store/states/contextStoreFiltersComponentState.ts b/packages/twenty-front/src/modules/context-store/states/contextStoreFiltersComponentState.ts
index 97e628deb4a0..8c0225df63c2 100644
--- a/packages/twenty-front/src/modules/context-store/states/contextStoreFiltersComponentState.ts
+++ b/packages/twenty-front/src/modules/context-store/states/contextStoreFiltersComponentState.ts
@@ -1,9 +1,9 @@
 import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 
 export const contextStoreFiltersComponentState = createComponentStateV2<
-  Filter[]
+  RecordFilter[]
 >({
   key: 'contextStoreFiltersComponentState',
   defaultValue: [],
diff --git a/packages/twenty-front/src/modules/context-store/utils/__tests__/computeContextStoreFilters.test.ts b/packages/twenty-front/src/modules/context-store/utils/__tests__/computeContextStoreFilters.test.ts
index af1fe415130e..65f0ed0245d2 100644
--- a/packages/twenty-front/src/modules/context-store/utils/__tests__/computeContextStoreFilters.test.ts
+++ b/packages/twenty-front/src/modules/context-store/utils/__tests__/computeContextStoreFilters.test.ts
@@ -1,7 +1,7 @@
 import { ContextStoreTargetedRecordsRule } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
 import { computeContextStoreFilters } from '@/context-store/utils/computeContextStoreFilters';
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
-import { FilterValueDependencies } from '@/object-record/record-filter/types/FilterValueDependencies';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+import { RecordFilterValueDependencies } from '@/object-record/record-filter/types/RecordFilterValueDependencies';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 import { expect } from '@storybook/test';
 import { generatedMockObjectMetadataItems } from '~/testing/mock-data/generatedMockObjectMetadataItems';
@@ -11,7 +11,7 @@ describe('computeContextStoreFilters', () => {
     (item) => item.nameSingular === 'person',
   )!;
 
-  const mockFilterValueDependencies: FilterValueDependencies = {
+  const mockFilterValueDependencies: RecordFilterValueDependencies = {
     currentWorkspaceMemberId: '32219445-f587-4c40-b2b1-6d3205ed96da',
   };
 
@@ -42,7 +42,7 @@ describe('computeContextStoreFilters', () => {
       excludedRecordIds: ['1', '2', '3'],
     };
 
-    const contextStoreFilters: Filter[] = [
+    const contextStoreFilters: RecordFilter[] = [
       {
         id: 'name-filter',
         variant: 'default',
diff --git a/packages/twenty-front/src/modules/context-store/utils/computeContextStoreFilters.ts b/packages/twenty-front/src/modules/context-store/utils/computeContextStoreFilters.ts
index 91ede0aab9a9..a86b7905f5b8 100644
--- a/packages/twenty-front/src/modules/context-store/utils/computeContextStoreFilters.ts
+++ b/packages/twenty-front/src/modules/context-store/utils/computeContextStoreFilters.ts
@@ -1,16 +1,16 @@
 import { ContextStoreTargetedRecordsRule } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { RecordGqlOperationFilter } from '@/object-record/graphql/types/RecordGqlOperationFilter';
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
-import { FilterValueDependencies } from '@/object-record/record-filter/types/FilterValueDependencies';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+import { RecordFilterValueDependencies } from '@/object-record/record-filter/types/RecordFilterValueDependencies';
 import { computeViewRecordGqlOperationFilter } from '@/object-record/record-filter/utils/computeViewRecordGqlOperationFilter';
 import { makeAndFilterVariables } from '@/object-record/utils/makeAndFilterVariables';
 
 export const computeContextStoreFilters = (
   contextStoreTargetedRecordsRule: ContextStoreTargetedRecordsRule,
-  contextStoreFilters: Filter[],
+  contextStoreFilters: RecordFilter[],
   objectMetadataItem: ObjectMetadataItem,
-  filterValueDependencies: FilterValueDependencies,
+  filterValueDependencies: RecordFilterValueDependencies,
 ) => {
   let queryFilter: RecordGqlOperationFilter | undefined;
 
diff --git a/packages/twenty-front/src/modules/domain-manager/hooks/useBuildWorkspaceUrl.ts b/packages/twenty-front/src/modules/domain-manager/hooks/useBuildWorkspaceUrl.ts
index ae0c66a08112..606ae42b4cbc 100644
--- a/packages/twenty-front/src/modules/domain-manager/hooks/useBuildWorkspaceUrl.ts
+++ b/packages/twenty-front/src/modules/domain-manager/hooks/useBuildWorkspaceUrl.ts
@@ -1,18 +1,18 @@
-import { isDefined } from '~/utils/isDefined';
 import { domainConfigurationState } from '@/domain-manager/states/domainConfigurationState';
 import { useRecoilValue } from 'recoil';
+import { isDefined } from '~/utils/isDefined';
 
 export const useBuildWorkspaceUrl = () => {
   const domainConfiguration = useRecoilValue(domainConfigurationState);
 
   const buildWorkspaceUrl = (
-    subdomain?: string,
+    subdomain: string,
     pathname?: string,
     searchParams?: Record<string, string>,
   ) => {
     const url = new URL(window.location.href);
 
-    if (isDefined(subdomain) && subdomain.length !== 0) {
+    if (subdomain.length !== 0) {
       url.hostname = `${subdomain}.${domainConfiguration.frontDomain}`;
     }
 
diff --git a/packages/twenty-front/src/modules/domain-manager/hooks/useRedirectToWorkspaceDomain.ts b/packages/twenty-front/src/modules/domain-manager/hooks/useRedirectToWorkspaceDomain.ts
index 091dd8d3d77b..07f881156ec2 100644
--- a/packages/twenty-front/src/modules/domain-manager/hooks/useRedirectToWorkspaceDomain.ts
+++ b/packages/twenty-front/src/modules/domain-manager/hooks/useRedirectToWorkspaceDomain.ts
@@ -1,7 +1,7 @@
 import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';
-import { useRecoilValue } from 'recoil';
 import { useBuildWorkspaceUrl } from '@/domain-manager/hooks/useBuildWorkspaceUrl';
 import { useRedirect } from '@/domain-manager/hooks/useRedirect';
+import { useRecoilValue } from 'recoil';
 
 export const useRedirectToWorkspaceDomain = () => {
   const isMultiWorkspaceEnabled = useRecoilValue(isMultiWorkspaceEnabledState);
diff --git a/packages/twenty-front/src/modules/favorites/components/FavoritesFolders.tsx b/packages/twenty-front/src/modules/favorites/components/FavoritesFolders.tsx
index 3fd41f5ef300..fb7c53603154 100644
--- a/packages/twenty-front/src/modules/favorites/components/FavoritesFolders.tsx
+++ b/packages/twenty-front/src/modules/favorites/components/FavoritesFolders.tsx
@@ -3,6 +3,7 @@ import { FavoriteFolderHotkeyScope } from '@/favorites/constants/FavoriteFolderR
 import { useCreateFavoriteFolder } from '@/favorites/hooks/useCreateFavoriteFolder';
 import { useFavoritesByFolder } from '@/favorites/hooks/useFavoritesByFolder';
 import { isFavoriteFolderCreatingState } from '@/favorites/states/isFavoriteFolderCreatingState';
+import { NavigationDrawerAnimatedCollapseWrapper } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper';
 import { NavigationDrawerInput } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerInput';
 import { useState } from 'react';
 import { useRecoilState } from 'recoil';
@@ -62,15 +63,19 @@ export const FavoriteFolders = ({
   return (
     <>
       {isFavoriteFolderCreating && (
-        <NavigationDrawerInput
-          Icon={IconFolder}
-          value={newFolderName}
-          onChange={handleFavoriteFolderNameChange}
-          onSubmit={handleSubmitFavoriteFolderCreation}
-          onCancel={handleCancelFavoriteFolderCreation}
-          onClickOutside={handleClickOutside}
-          hotkeyScope={FavoriteFolderHotkeyScope.FavoriteFolderNavigationInput}
-        />
+        <NavigationDrawerAnimatedCollapseWrapper>
+          <NavigationDrawerInput
+            Icon={IconFolder}
+            value={newFolderName}
+            onChange={handleFavoriteFolderNameChange}
+            onSubmit={handleSubmitFavoriteFolderCreation}
+            onCancel={handleCancelFavoriteFolderCreation}
+            onClickOutside={handleClickOutside}
+            hotkeyScope={
+              FavoriteFolderHotkeyScope.FavoriteFolderNavigationInput
+            }
+          />
+        </NavigationDrawerAnimatedCollapseWrapper>
       )}
       {favoritesByFolder.map((folder) => (
         <CurrentWorkspaceMemberFavorites
diff --git a/packages/twenty-front/src/modules/favorites/components/PageFavoriteButton.tsx b/packages/twenty-front/src/modules/favorites/components/PageFavoriteButton.tsx
index 3ab95cd67e83..100abe308da9 100644
--- a/packages/twenty-front/src/modules/favorites/components/PageFavoriteButton.tsx
+++ b/packages/twenty-front/src/modules/favorites/components/PageFavoriteButton.tsx
@@ -13,13 +13,13 @@ export const PageFavoriteButton = ({
 }: PageFavoriteButtonProps) => {
   const title = isFavorite ? 'Remove from favorites' : 'Add to favorites';
 
-  const isPageHeaderV2Enabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsPageHeaderV2Enabled,
+  const isCommandMenuV2Enabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsCommandMenuV2Enabled,
   );
 
   return (
     <>
-      {isPageHeaderV2Enabled ? (
+      {isCommandMenuV2Enabled ? (
         <Button
           Icon={isFavorite ? IconHeartOff : IconHeart}
           dataTestId="favorite-button"
diff --git a/packages/twenty-front/src/modules/favorites/components/PageFavoriteFolderDropdown.tsx b/packages/twenty-front/src/modules/favorites/components/PageFavoriteFolderDropdown.tsx
index 1c5df65d5df5..d147ccfdfaf8 100644
--- a/packages/twenty-front/src/modules/favorites/components/PageFavoriteFolderDropdown.tsx
+++ b/packages/twenty-front/src/modules/favorites/components/PageFavoriteFolderDropdown.tsx
@@ -42,9 +42,7 @@ export const PageFavoriteFoldersDropdown = ({
               />
             </>
           }
-          dropdownHotkeyScope={{
-            scope: dropdownId,
-          }}
+          dropdownHotkeyScope={{ scope: dropdownId }}
         />
       </DropdownScope>
     </FavoriteFolderPickerComponentInstanceContext>
diff --git a/packages/twenty-front/src/modules/favorites/hooks/useDeleteFavoriteFolder.ts b/packages/twenty-front/src/modules/favorites/hooks/useDeleteFavoriteFolder.ts
index 4c0925ca622a..c10adccb88f3 100644
--- a/packages/twenty-front/src/modules/favorites/hooks/useDeleteFavoriteFolder.ts
+++ b/packages/twenty-front/src/modules/favorites/hooks/useDeleteFavoriteFolder.ts
@@ -4,7 +4,7 @@ import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSi
 import { useReadFindManyRecordsQueryInCache } from '@/object-record/cache/hooks/useReadFindManyRecordsQueryInCache';
 import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
 import { PREFETCH_CONFIG } from '@/prefetch/constants/PrefetchConfig';
-import { usePrefetchRunQuery } from '@/prefetch/hooks/internal/usePrefetchRunQuery';
+import { useUpsertRecordsInCacheForPrefetchKey } from '@/prefetch/hooks/internal/useUpsertRecordsInCacheForPrefetchKey';
 import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
 
 export const useDeleteFavoriteFolder = () => {
@@ -12,9 +12,10 @@ export const useDeleteFavoriteFolder = () => {
     objectNameSingular: CoreObjectNameSingular.FavoriteFolder,
   });
 
-  const { upsertRecordsInCache } = usePrefetchRunQuery<Favorite>({
-    prefetchKey: PrefetchKey.AllFavorites,
-  });
+  const { upsertRecordsInCache } =
+    useUpsertRecordsInCacheForPrefetchKey<Favorite>({
+      prefetchKey: PrefetchKey.AllFavorites,
+    });
 
   const { objectMetadataItem } = useObjectMetadataItem({
     objectNameSingular:
diff --git a/packages/twenty-front/src/modules/favorites/hooks/useFavorites.ts b/packages/twenty-front/src/modules/favorites/hooks/useFavorites.ts
index 8563ad2b957d..e528ee5e8dc0 100644
--- a/packages/twenty-front/src/modules/favorites/hooks/useFavorites.ts
+++ b/packages/twenty-front/src/modules/favorites/hooks/useFavorites.ts
@@ -26,7 +26,7 @@ export const useFavorites = () => {
     () =>
       favoriteObjectMetadataItem.fields.filter(
         (fieldMetadataItem) =>
-          fieldMetadataItem.type === FieldMetadataType.Relation &&
+          fieldMetadataItem.type === FieldMetadataType.RELATION &&
           fieldMetadataItem.name !== 'workspaceMember' &&
           fieldMetadataItem.name !== 'favoriteFolder',
       ),
diff --git a/packages/twenty-front/src/modules/favorites/hooks/useFavoritesMetadata.ts b/packages/twenty-front/src/modules/favorites/hooks/useFavoritesMetadata.ts
index d074640c4017..04780f975295 100644
--- a/packages/twenty-front/src/modules/favorites/hooks/useFavoritesMetadata.ts
+++ b/packages/twenty-front/src/modules/favorites/hooks/useFavoritesMetadata.ts
@@ -21,7 +21,7 @@ export const useFavoritesMetadata = () => {
 
   const favoriteRelationFields = favoriteObjectMetadataItem.fields.filter(
     (fieldMetadataItem) =>
-      fieldMetadataItem.type === FieldMetadataType.Relation &&
+      fieldMetadataItem.type === FieldMetadataType.RELATION &&
       fieldMetadataItem.name !== 'workspaceMember' &&
       fieldMetadataItem.name !== 'favoriteFolder',
   );
diff --git a/packages/twenty-front/src/modules/favorites/hooks/usePrefetchedFavoritesData.ts b/packages/twenty-front/src/modules/favorites/hooks/usePrefetchedFavoritesData.ts
index 7eae9cf3a95c..ece3d2bdf3f3 100644
--- a/packages/twenty-front/src/modules/favorites/hooks/usePrefetchedFavoritesData.ts
+++ b/packages/twenty-front/src/modules/favorites/hooks/usePrefetchedFavoritesData.ts
@@ -1,6 +1,6 @@
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { Favorite } from '@/favorites/types/Favorite';
-import { usePrefetchRunQuery } from '@/prefetch/hooks/internal/usePrefetchRunQuery';
+import { useUpsertRecordsInCacheForPrefetchKey } from '@/prefetch/hooks/internal/useUpsertRecordsInCacheForPrefetchKey';
 import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData';
 import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
 import { useRecoilValue } from 'recoil';
@@ -33,7 +33,7 @@ export const usePrefetchedFavoritesData = (): PrefetchedFavoritesData => {
   );
 
   const { upsertRecordsInCache: upsertFavorites } =
-    usePrefetchRunQuery<Favorite>({
+    useUpsertRecordsInCacheForPrefetchKey<Favorite>({
       prefetchKey: PrefetchKey.AllFavorites,
     });
 
diff --git a/packages/twenty-front/src/modules/favorites/hooks/usePrefetchedFavoritesFoldersData.ts b/packages/twenty-front/src/modules/favorites/hooks/usePrefetchedFavoritesFoldersData.ts
index b794dc2ec494..32972ed05697 100644
--- a/packages/twenty-front/src/modules/favorites/hooks/usePrefetchedFavoritesFoldersData.ts
+++ b/packages/twenty-front/src/modules/favorites/hooks/usePrefetchedFavoritesFoldersData.ts
@@ -1,6 +1,6 @@
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { FavoriteFolder } from '@/favorites/types/FavoriteFolder';
-import { usePrefetchRunQuery } from '@/prefetch/hooks/internal/usePrefetchRunQuery';
+import { useUpsertRecordsInCacheForPrefetchKey } from '@/prefetch/hooks/internal/useUpsertRecordsInCacheForPrefetchKey';
 import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData';
 import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
 import { useRecoilValue } from 'recoil';
@@ -26,7 +26,7 @@ export const usePrefetchedFavoritesFoldersData =
     );
 
     const { upsertRecordsInCache: upsertFavoriteFolders } =
-      usePrefetchRunQuery<FavoriteFolder>({
+      useUpsertRecordsInCacheForPrefetchKey<FavoriteFolder>({
         prefetchKey: PrefetchKey.AllFavoritesFolders,
       });
 
diff --git a/packages/twenty-front/src/modules/favorites/hooks/useWorkspaceFavorites.ts b/packages/twenty-front/src/modules/favorites/hooks/useWorkspaceFavorites.ts
index c6de1d26f7e9..7ba499b04e82 100644
--- a/packages/twenty-front/src/modules/favorites/hooks/useWorkspaceFavorites.ts
+++ b/packages/twenty-front/src/modules/favorites/hooks/useWorkspaceFavorites.ts
@@ -26,7 +26,7 @@ export const useWorkspaceFavorites = () => {
     () =>
       favoriteObjectMetadataItem.fields.filter(
         (fieldMetadataItem) =>
-          fieldMetadataItem.type === FieldMetadataType.Relation &&
+          fieldMetadataItem.type === FieldMetadataType.RELATION &&
           fieldMetadataItem.name !== 'workspaceMember' &&
           fieldMetadataItem.name !== 'favoriteFolder',
       ),
diff --git a/packages/twenty-front/src/modules/favorites/utils/__tests__/isLocationMatchingFavorite.test.ts b/packages/twenty-front/src/modules/favorites/utils/__tests__/isLocationMatchingFavorite.test.ts
index 83ce5a6d7f9a..a5e958decc41 100644
--- a/packages/twenty-front/src/modules/favorites/utils/__tests__/isLocationMatchingFavorite.test.ts
+++ b/packages/twenty-front/src/modules/favorites/utils/__tests__/isLocationMatchingFavorite.test.ts
@@ -3,7 +3,7 @@ import { isLocationMatchingFavorite } from '../isLocationMatchingFavorite';
 describe('isLocationMatchingFavorite', () => {
   it('should return true if favorite link matches current path', () => {
     const currentPath = '/app/objects/people';
-    const currentViewPath = '/app/objects/people?view=123';
+    const currentViewPath = '/app/objects/people?viewId=123';
     const favorite = {
       objectNameSingular: 'object',
       link: '/app/objects/people',
@@ -16,7 +16,7 @@ describe('isLocationMatchingFavorite', () => {
 
   it('should return true if favorite link matches current view path', () => {
     const currentPath = '/app/object/company/12';
-    const currentViewPath = '/app/object/company/12?view=123';
+    const currentViewPath = '/app/object/company/12?viewId=123';
     const favorite = {
       objectNameSingular: 'company',
       link: '/app/object/company/12',
@@ -29,7 +29,7 @@ describe('isLocationMatchingFavorite', () => {
 
   it('should return false if favorite link does not match current path', () => {
     const currentPath = '/app/objects/people';
-    const currentViewPath = '/app/objects/people?view=123';
+    const currentViewPath = '/app/objects/people?viewId=123';
     const favorite = {
       objectNameSingular: 'object',
       link: '/app/objects/company',
@@ -42,10 +42,10 @@ describe('isLocationMatchingFavorite', () => {
 
   it('should return false if favorite link does not match current view path', () => {
     const currentPath = '/app/objects/companies';
-    const currentViewPath = '/app/objects/companies?view=123';
+    const currentViewPath = '/app/objects/companies?viewId=123';
     const favorite = {
       objectNameSingular: 'view',
-      link: '/app/objects/companies/view=246',
+      link: '/app/objects/companies?viewId=246',
     };
 
     expect(
diff --git a/packages/twenty-front/src/modules/favorites/utils/sortFavorites.ts b/packages/twenty-front/src/modules/favorites/utils/sortFavorites.ts
index c4814a0d7d25..59e79004dea4 100644
--- a/packages/twenty-front/src/modules/favorites/utils/sortFavorites.ts
+++ b/packages/twenty-front/src/modules/favorites/utils/sortFavorites.ts
@@ -3,8 +3,10 @@ import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { ObjectRecordIdentifier } from '@/object-record/types/ObjectRecordIdentifier';
+import { AppPath } from '@/types/AppPath';
 import { View } from '@/views/types/View';
 import { isDefined } from 'twenty-ui';
+import { getAppPath } from '~/utils/navigation/getAppPath';
 import { getObjectMetadataLabelPluralFromViewId } from './getObjectMetadataLabelPluralFromViewId';
 
 export type ProcessedFavorite = Favorite & {
@@ -40,7 +42,11 @@ export const sortFavorites = (
           avatarType: 'icon',
           avatarUrl: '',
           labelIdentifier: view?.name,
-          link: `/objects/${labelPlural.toLocaleLowerCase()}${favorite.viewId ? `?view=${favorite.viewId}` : ''}`,
+          link: getAppPath(
+            AppPath.RecordIndexPage,
+            { objectNamePlural: labelPlural.toLowerCase() },
+            favorite.viewId ? { viewId: favorite.viewId } : undefined,
+          ),
           workspaceMemberId: favorite.workspaceMemberId,
           favoriteFolderId: favorite.favoriteFolderId,
           objectNameSingular: 'view',
diff --git a/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx b/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx
index 2c951b2e0b4c..2cb79486a29f 100644
--- a/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx
+++ b/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx
@@ -17,12 +17,14 @@ export const InformationBanner = ({
   buttonTitle,
   buttonIcon,
   buttonOnClick,
+  isButtonDisabled = false,
 }: {
   message: string;
   variant?: BannerVariant;
   buttonTitle?: string;
   buttonIcon?: IconComponent;
   buttonOnClick?: () => void;
+  isButtonDisabled?: boolean;
 }) => {
   return (
     <StyledBanner variant={variant}>
@@ -35,6 +37,7 @@ export const InformationBanner = ({
           size="small"
           inverted
           onClick={buttonOnClick}
+          disabled={isButtonDisabled}
         />
       )}
     </StyledBanner>
diff --git a/packages/twenty-front/src/modules/information-banner/components/InformationBannerWrapper.tsx b/packages/twenty-front/src/modules/information-banner/components/InformationBannerWrapper.tsx
index 0ebacf1a909d..9ceb953e22e7 100644
--- a/packages/twenty-front/src/modules/information-banner/components/InformationBannerWrapper.tsx
+++ b/packages/twenty-front/src/modules/information-banner/components/InformationBannerWrapper.tsx
@@ -1,6 +1,13 @@
+import { InformationBannerBillingSubscriptionPaused } from '@/information-banner/components/billing/InformationBannerBillingSubscriptionPaused';
+import { InformationBannerFailPaymentInfo } from '@/information-banner/components/billing/InformationBannerFailPaymentInfo';
+import { InformationBannerNoBillingSubscription } from '@/information-banner/components/billing/InformationBannerNoBillingSubscription';
 import { InformationBannerReconnectAccountEmailAliases } from '@/information-banner/components/reconnect-account/InformationBannerReconnectAccountEmailAliases';
 import { InformationBannerReconnectAccountInsufficientPermissions } from '@/information-banner/components/reconnect-account/InformationBannerReconnectAccountInsufficientPermissions';
+import { useIsWorkspaceActivationStatusSuspended } from '@/workspace/hooks/useIsWorkspaceActivationStatusSuspended';
+import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
 import styled from '@emotion/styled';
+import { isDefined } from 'twenty-ui';
+import { SubscriptionStatus } from '~/generated-metadata/graphql';
 
 const StyledInformationBannerWrapper = styled.div`
   height: 40px;
@@ -12,10 +19,30 @@ const StyledInformationBannerWrapper = styled.div`
 `;
 
 export const InformationBannerWrapper = () => {
+  const subscriptionStatus = useSubscriptionStatus();
+  const isWorkspaceSuspended = useIsWorkspaceActivationStatusSuspended();
+
+  const displayBillingSubscriptionPausedBanner =
+    isWorkspaceSuspended && subscriptionStatus === SubscriptionStatus.Paused;
+
+  const displayBillingSubscriptionCanceledBanner =
+    isWorkspaceSuspended && !isDefined(subscriptionStatus);
+
+  const displayFailPaymentInfoBanner =
+    subscriptionStatus === SubscriptionStatus.PastDue ||
+    subscriptionStatus === SubscriptionStatus.Unpaid;
+
   return (
     <StyledInformationBannerWrapper>
       <InformationBannerReconnectAccountInsufficientPermissions />
       <InformationBannerReconnectAccountEmailAliases />
+      {displayBillingSubscriptionPausedBanner && (
+        <InformationBannerBillingSubscriptionPaused />
+      )}
+      {displayBillingSubscriptionCanceledBanner && (
+        <InformationBannerNoBillingSubscription />
+      )}
+      {displayFailPaymentInfoBanner && <InformationBannerFailPaymentInfo />}
     </StyledInformationBannerWrapper>
   );
 };
diff --git a/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerBillingSubscriptionPaused.tsx b/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerBillingSubscriptionPaused.tsx
new file mode 100644
index 000000000000..c180f31236d6
--- /dev/null
+++ b/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerBillingSubscriptionPaused.tsx
@@ -0,0 +1,32 @@
+import { useRedirect } from '@/domain-manager/hooks/useRedirect';
+import { InformationBanner } from '@/information-banner/components/InformationBanner';
+import { SettingsPath } from '@/types/SettingsPath';
+import { isDefined } from 'twenty-ui';
+import { useBillingPortalSessionQuery } from '~/generated/graphql';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
+
+export const InformationBannerBillingSubscriptionPaused = () => {
+  const { redirect } = useRedirect();
+
+  const { data, loading } = useBillingPortalSessionQuery({
+    variables: {
+      returnUrlPath: getSettingsPath(SettingsPath.Billing),
+    },
+  });
+
+  const openBillingPortal = () => {
+    if (isDefined(data) && isDefined(data.billingPortalSession.url)) {
+      redirect(data.billingPortalSession.url);
+    }
+  };
+
+  return (
+    <InformationBanner
+      variant="danger"
+      message={'Trial expired. Please update your billing details'}
+      buttonTitle="Update"
+      buttonOnClick={() => openBillingPortal()}
+      isButtonDisabled={loading || !isDefined(data)}
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerFailPaymentInfo.tsx b/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerFailPaymentInfo.tsx
new file mode 100644
index 000000000000..b1cc81abd1c6
--- /dev/null
+++ b/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerFailPaymentInfo.tsx
@@ -0,0 +1,32 @@
+import { InformationBanner } from '@/information-banner/components/InformationBanner';
+import { SettingsPath } from '@/types/SettingsPath';
+import { isDefined } from 'twenty-ui';
+import { useBillingPortalSessionQuery } from '~/generated/graphql';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
+import { useRedirect } from '@/domain-manager/hooks/useRedirect';
+
+export const InformationBannerFailPaymentInfo = () => {
+  const { redirect } = useRedirect();
+
+  const { data, loading } = useBillingPortalSessionQuery({
+    variables: {
+      returnUrlPath: getSettingsPath(SettingsPath.Billing),
+    },
+  });
+
+  const openBillingPortal = () => {
+    if (isDefined(data) && isDefined(data.billingPortalSession.url)) {
+      redirect(data.billingPortalSession.url);
+    }
+  };
+
+  return (
+    <InformationBanner
+      variant="danger"
+      message={'Last payment failed. Please update your billing details.'}
+      buttonTitle="Update"
+      buttonOnClick={() => openBillingPortal()}
+      isButtonDisabled={loading || !isDefined(data)}
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerNoBillingSubscription.tsx b/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerNoBillingSubscription.tsx
new file mode 100644
index 000000000000..eefaa20a0895
--- /dev/null
+++ b/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerNoBillingSubscription.tsx
@@ -0,0 +1,21 @@
+import { BILLING_CHECKOUT_SESSION_DEFAULT_VALUE } from '@/billing/constants/BillingCheckoutSessionDefaultValue';
+import { useHandleCheckoutSession } from '@/billing/hooks/useHandleCheckoutSession';
+import { InformationBanner } from '@/information-banner/components/InformationBanner';
+
+export const InformationBannerNoBillingSubscription = () => {
+  const { handleCheckoutSession, isSubmitting } = useHandleCheckoutSession({
+    recurringInterval: BILLING_CHECKOUT_SESSION_DEFAULT_VALUE.interval,
+    plan: BILLING_CHECKOUT_SESSION_DEFAULT_VALUE.plan,
+    requirePaymentMethod: true,
+  });
+
+  return (
+    <InformationBanner
+      variant="danger"
+      message={`Your workspace does not have an active subscription`}
+      buttonTitle="Subscribe"
+      buttonOnClick={() => handleCheckoutSession()}
+      isButtonDisabled={isSubmitting}
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/keyboard-shortcut-menu/constants/KeyboardShortcutsGeneral.ts b/packages/twenty-front/src/modules/keyboard-shortcut-menu/constants/KeyboardShortcutsGeneral.ts
index 2697d33fe6df..93a72a89153d 100644
--- a/packages/twenty-front/src/modules/keyboard-shortcut-menu/constants/KeyboardShortcutsGeneral.ts
+++ b/packages/twenty-front/src/modules/keyboard-shortcut-menu/constants/KeyboardShortcutsGeneral.ts
@@ -1,10 +1,11 @@
+import { getOsControlSymbol } from 'twenty-ui';
 import { Shortcut, ShortcutType } from '../types/Shortcut';
 
 export const KEYBOARD_SHORTCUTS_GENERAL: Shortcut[] = [
   {
     label: 'Open search',
     type: ShortcutType.General,
-    firstHotKey: '⌘',
+    firstHotKey: getOsControlSymbol(),
     secondHotKey: 'K',
     areSimultaneous: false,
   },
diff --git a/packages/twenty-front/src/modules/localization/utils/getDateFormatFromWorkspaceDateFormat.ts b/packages/twenty-front/src/modules/localization/utils/getDateFormatFromWorkspaceDateFormat.ts
index 09293fbb8ec8..c72b6157aa89 100644
--- a/packages/twenty-front/src/modules/localization/utils/getDateFormatFromWorkspaceDateFormat.ts
+++ b/packages/twenty-front/src/modules/localization/utils/getDateFormatFromWorkspaceDateFormat.ts
@@ -6,13 +6,13 @@ export const getDateFormatFromWorkspaceDateFormat = (
   workspaceDateFormat: WorkspaceMemberDateFormatEnum,
 ) => {
   switch (workspaceDateFormat) {
-    case WorkspaceMemberDateFormatEnum.System:
+    case WorkspaceMemberDateFormatEnum.SYSTEM:
       return DateFormat[detectDateFormat()];
-    case WorkspaceMemberDateFormatEnum.MonthFirst:
+    case WorkspaceMemberDateFormatEnum.MONTH_FIRST:
       return DateFormat.MONTH_FIRST;
-    case WorkspaceMemberDateFormatEnum.DayFirst:
+    case WorkspaceMemberDateFormatEnum.DAY_FIRST:
       return DateFormat.DAY_FIRST;
-    case WorkspaceMemberDateFormatEnum.YearFirst:
+    case WorkspaceMemberDateFormatEnum.YEAR_FIRST:
       return DateFormat.YEAR_FIRST;
     default:
       return DateFormat.MONTH_FIRST;
diff --git a/packages/twenty-front/src/modules/localization/utils/getTimeFormatFromWorkspaceTimeFormat.ts b/packages/twenty-front/src/modules/localization/utils/getTimeFormatFromWorkspaceTimeFormat.ts
index 7519d0cb4068..8193f0bd990e 100644
--- a/packages/twenty-front/src/modules/localization/utils/getTimeFormatFromWorkspaceTimeFormat.ts
+++ b/packages/twenty-front/src/modules/localization/utils/getTimeFormatFromWorkspaceTimeFormat.ts
@@ -6,11 +6,11 @@ export const getTimeFormatFromWorkspaceTimeFormat = (
   workspaceTimeFormat: WorkspaceMemberTimeFormatEnum,
 ) => {
   switch (workspaceTimeFormat) {
-    case WorkspaceMemberTimeFormatEnum.System:
+    case WorkspaceMemberTimeFormatEnum.SYSTEM:
       return TimeFormat[detectTimeFormat()];
-    case WorkspaceMemberTimeFormatEnum.Hour_24:
+    case WorkspaceMemberTimeFormatEnum.HOUR_24:
       return TimeFormat.HOUR_24;
-    case WorkspaceMemberTimeFormatEnum.Hour_12:
+    case WorkspaceMemberTimeFormatEnum.HOUR_12:
       return TimeFormat.HOUR_12;
     default:
       return TimeFormat.HOUR_24;
diff --git a/packages/twenty-front/src/modules/localization/utils/getWorkspaceDateFormatFromDateFormat.ts b/packages/twenty-front/src/modules/localization/utils/getWorkspaceDateFormatFromDateFormat.ts
index 251a575824f5..4f319267ca98 100644
--- a/packages/twenty-front/src/modules/localization/utils/getWorkspaceDateFormatFromDateFormat.ts
+++ b/packages/twenty-front/src/modules/localization/utils/getWorkspaceDateFormatFromDateFormat.ts
@@ -6,14 +6,14 @@ export const getWorkspaceDateFormatFromDateFormat = (
 ) => {
   switch (dateFormat) {
     case DateFormat.SYSTEM:
-      return WorkspaceMemberDateFormatEnum.System;
+      return WorkspaceMemberDateFormatEnum.SYSTEM;
     case DateFormat.MONTH_FIRST:
-      return WorkspaceMemberDateFormatEnum.MonthFirst;
+      return WorkspaceMemberDateFormatEnum.MONTH_FIRST;
     case DateFormat.DAY_FIRST:
-      return WorkspaceMemberDateFormatEnum.DayFirst;
+      return WorkspaceMemberDateFormatEnum.DAY_FIRST;
     case DateFormat.YEAR_FIRST:
-      return WorkspaceMemberDateFormatEnum.YearFirst;
+      return WorkspaceMemberDateFormatEnum.YEAR_FIRST;
     default:
-      return WorkspaceMemberDateFormatEnum.MonthFirst;
+      return WorkspaceMemberDateFormatEnum.MONTH_FIRST;
   }
 };
diff --git a/packages/twenty-front/src/modules/localization/utils/getWorkspaceTimeFormatFromTimeFormat.ts b/packages/twenty-front/src/modules/localization/utils/getWorkspaceTimeFormatFromTimeFormat.ts
index 58a563f96177..8655ae605a4d 100644
--- a/packages/twenty-front/src/modules/localization/utils/getWorkspaceTimeFormatFromTimeFormat.ts
+++ b/packages/twenty-front/src/modules/localization/utils/getWorkspaceTimeFormatFromTimeFormat.ts
@@ -6,12 +6,12 @@ export const getWorkspaceTimeFormatFromTimeFormat = (
 ) => {
   switch (timeFormat) {
     case TimeFormat.SYSTEM:
-      return WorkspaceMemberTimeFormatEnum.System;
+      return WorkspaceMemberTimeFormatEnum.SYSTEM;
     case TimeFormat.HOUR_24:
-      return WorkspaceMemberTimeFormatEnum.Hour_24;
+      return WorkspaceMemberTimeFormatEnum.HOUR_24;
     case TimeFormat.HOUR_12:
-      return WorkspaceMemberTimeFormatEnum.Hour_12;
+      return WorkspaceMemberTimeFormatEnum.HOUR_12;
     default:
-      return WorkspaceMemberTimeFormatEnum.Hour_24;
+      return WorkspaceMemberTimeFormatEnum.HOUR_24;
   }
 };
diff --git a/packages/twenty-front/src/modules/navigation/components/AppNavigationDrawer.tsx b/packages/twenty-front/src/modules/navigation/components/AppNavigationDrawer.tsx
index 5f4cbf135269..ead756bc1a49 100644
--- a/packages/twenty-front/src/modules/navigation/components/AppNavigationDrawer.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/AppNavigationDrawer.tsx
@@ -12,6 +12,7 @@ import { isAdvancedModeEnabledState } from '@/ui/navigation/navigation-drawer/st
 import { useIsSettingsDrawer } from '@/navigation/hooks/useIsSettingsDrawer';
 
 import { MainNavigationDrawerItems } from '@/navigation/components/MainNavigationDrawerItems';
+import { useLingui } from '@lingui/react/macro';
 import { AdvancedSettingsToggle } from 'twenty-ui';
 
 export type AppNavigationDrawerProps = {
@@ -28,9 +29,11 @@ export const AppNavigationDrawer = ({
     isAdvancedModeEnabledState,
   );
 
+  const { t } = useLingui();
+
   const drawerProps: NavigationDrawerProps = isSettingsDrawer
     ? {
-        title: 'Exit Settings',
+        title: t`Exit Settings`,
         children: <SettingsNavigationDrawerItems />,
         footer: (
           <AdvancedSettingsToggle
diff --git a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerItems.tsx b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerItems.tsx
index e42e647a034c..1783347c89bd 100644
--- a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerItems.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerItems.tsx
@@ -1,12 +1,13 @@
 import { useLocation } from 'react-router-dom';
 import { useRecoilState, useSetRecoilState } from 'recoil';
-import { IconSearch, IconSettings } from 'twenty-ui';
+import { IconSearch, IconSettings, getOsControlSymbol } from 'twenty-ui';
 
 import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
 import { CurrentWorkspaceMemberFavoritesFolders } from '@/favorites/components/CurrentWorkspaceMemberFavoritesFolders';
 import { WorkspaceFavorites } from '@/favorites/components/WorkspaceFavorites';
 import { NavigationDrawerOpenedSection } from '@/object-metadata/components/NavigationDrawerOpenedSection';
 import { RemoteNavigationDrawerSection } from '@/object-metadata/components/RemoteNavigationDrawerSection';
+import { SettingsPath } from '@/types/SettingsPath';
 import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
 import { NavigationDrawerSection } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSection';
 import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';
@@ -15,6 +16,8 @@ import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMe
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
 import styled from '@emotion/styled';
+import { useLingui } from '@lingui/react/macro';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 const StyledMainSection = styled(NavigationDrawerSection)`
   min-height: fit-content;
@@ -37,19 +40,21 @@ export const MainNavigationDrawerItems = () => {
     navigationDrawerExpandedMemorizedState,
   );
 
+  const { t } = useLingui();
+
   return (
     <>
       {!isMobile && (
         <StyledMainSection>
           <NavigationDrawerItem
-            label="Search"
+            label={t`Search`}
             Icon={IconSearch}
             onClick={toggleCommandMenu}
-            keyboard={['⌘', 'K']}
+            keyboard={[getOsControlSymbol(), 'K']}
           />
           <NavigationDrawerItem
-            label="Settings"
-            to={'/settings/profile'}
+            label={t`Settings`}
+            to={getSettingsPath(SettingsPath.ProfilePage)}
             onClick={() => {
               setNavigationDrawerExpandedMemorized(isNavigationDrawerExpanded);
               setIsNavigationDrawerExpanded(true);
diff --git a/packages/twenty-front/src/modules/navigation/components/__stories__/AppNavigationDrawer.stories.tsx b/packages/twenty-front/src/modules/navigation/components/__stories__/AppNavigationDrawer.stories.tsx
index b7db0bd26385..493009761a81 100644
--- a/packages/twenty-front/src/modules/navigation/components/__stories__/AppNavigationDrawer.stories.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/__stories__/AppNavigationDrawer.stories.tsx
@@ -11,6 +11,7 @@ import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
 
 import { AppPath } from '@/types/AppPath';
 import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';
+import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import {
   AppNavigationDrawer,
   AppNavigationDrawerProps,
@@ -54,6 +55,7 @@ const meta: Meta<StoryArgs> = {
   decorators: [
     IconsProviderDecorator,
     ObjectMetadataItemsDecorator,
+    I18nFrontDecorator,
     (Story, { args }) => (
       <MemoryRouter initialEntries={[args.routePath]}>
         <Story />
@@ -76,6 +78,6 @@ export const Main: Story = {};
 export const Settings: Story = {
   args: {
     mobileNavigationDrawer: 'settings',
-    routePath: '/settings/appearance',
+    routePath: '/settings/experience',
   },
 };
diff --git a/packages/twenty-front/src/modules/navigation/hooks/__tests__/useDefaultHomePagePath.test.ts b/packages/twenty-front/src/modules/navigation/hooks/__tests__/useDefaultHomePagePath.test.ts
index a7fb3b4e51ed..31a7172dfa9e 100644
--- a/packages/twenty-front/src/modules/navigation/hooks/__tests__/useDefaultHomePagePath.test.ts
+++ b/packages/twenty-front/src/modules/navigation/hooks/__tests__/useDefaultHomePagePath.test.ts
@@ -70,7 +70,7 @@ describe('useDefaultHomePagePath', () => {
     setupMockPrefetchedData('viewId');
     const { result } = renderHooks(true);
     expect(result.current.defaultHomePagePath).toEqual(
-      '/objects/companies?view=viewId',
+      '/objects/companies?viewId=viewId',
     );
   });
 });
diff --git a/packages/twenty-front/src/modules/navigation/hooks/useDefaultHomePagePath.ts b/packages/twenty-front/src/modules/navigation/hooks/useDefaultHomePagePath.ts
index 8f3afb3e193b..cb3168ab83b1 100644
--- a/packages/twenty-front/src/modules/navigation/hooks/useDefaultHomePagePath.ts
+++ b/packages/twenty-front/src/modules/navigation/hooks/useDefaultHomePagePath.ts
@@ -9,6 +9,7 @@ import { View } from '@/views/types/View';
 import { useCallback, useMemo } from 'react';
 import { useRecoilValue } from 'recoil';
 import { isDefined } from '~/utils/isDefined';
+import { getAppPath } from '~/utils/navigation/getAppPath';
 
 export const useDefaultHomePagePath = () => {
   const currentUser = useRecoilValue(currentUserState);
@@ -79,11 +80,13 @@ export const useDefaultHomePagePath = () => {
     }
 
     const namePlural = defaultObjectPathInfo.objectMetadataItem?.namePlural;
-    const viewParam = defaultObjectPathInfo.view
-      ? `?view=${defaultObjectPathInfo.view.id}`
-      : '';
+    const viewId = defaultObjectPathInfo.view?.id;
 
-    return `/objects/${namePlural}${viewParam}`;
+    return getAppPath(
+      AppPath.RecordIndexPage,
+      { objectNamePlural: namePlural },
+      viewId ? { viewId } : undefined,
+    );
   }, [currentUser, defaultObjectPathInfo]);
 
   return { defaultHomePagePath };
diff --git a/packages/twenty-front/src/modules/navigation/hooks/useLastVisitedObjectMetadataItem.ts b/packages/twenty-front/src/modules/navigation/hooks/useLastVisitedObjectMetadataItem.ts
index f03d0be3cd54..fca96e2cb395 100644
--- a/packages/twenty-front/src/modules/navigation/hooks/useLastVisitedObjectMetadataItem.ts
+++ b/packages/twenty-front/src/modules/navigation/hooks/useLastVisitedObjectMetadataItem.ts
@@ -1,11 +1,13 @@
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { lastVisitedObjectMetadataItemIdStateSelector } from '@/navigation/states/selectors/lastVisitedObjectMetadataItemIdStateSelector';
 import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
+import { AppPath } from '@/types/AppPath';
 import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
 import { extractComponentState } from '@/ui/utilities/state/component-state/utils/extractComponentState';
 import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
 import { isDefined } from 'twenty-ui';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
+import { getAppPath } from '~/utils/navigation/getAppPath';
 
 export const useLastVisitedObjectMetadataItem = () => {
   const currentWorkspace = useRecoilValue(currentWorkspaceState);
@@ -44,7 +46,9 @@ export const useLastVisitedObjectMetadataItem = () => {
     if (isDeactivateDefault) {
       setLastVisitedObjectMetadataItemId(newFallbackObjectMetadataItem.id);
       setNavigationMemorizedUrl(
-        `/objects/${newFallbackObjectMetadataItem.namePlural}`,
+        getAppPath(AppPath.RecordIndexPage, {
+          objectNamePlural: newFallbackObjectMetadataItem.namePlural,
+        }),
       );
     }
   };
diff --git a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerItemForObjectMetadataItem.tsx b/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerItemForObjectMetadataItem.tsx
index 8ebd71f36572..29692d18eff2 100644
--- a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerItemForObjectMetadataItem.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerItemForObjectMetadataItem.tsx
@@ -2,6 +2,7 @@ import { useLastVisitedView } from '@/navigation/hooks/useLastVisitedView';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData';
 import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
+import { AppPath } from '@/types/AppPath';
 import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
 import { NavigationDrawerItemsCollapsableContainer } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItemsCollapsableContainer';
 import { NavigationDrawerSubItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSubItem';
@@ -10,6 +11,7 @@ import { View } from '@/views/types/View';
 import { getObjectMetadataItemViews } from '@/views/utils/getObjectMetadataItemViews';
 import { useLocation } from 'react-router-dom';
 import { AnimatedExpandableContainer, useIcons } from 'twenty-ui';
+import { getAppPath } from '~/utils/navigation/getAppPath';
 
 export type NavigationDrawerItemForObjectMetadataItemProps = {
   objectMetadataItem: ObjectMetadataItem;
@@ -35,13 +37,23 @@ export const NavigationDrawerItemForObjectMetadataItem = ({
 
   const viewId = lastVisitedViewId ?? objectMetadataViews[0]?.id;
 
-  const navigationPath = `/objects/${objectMetadataItem.namePlural}${
-    viewId ? `?view=${viewId}` : ''
-  }`;
+  const navigationPath = getAppPath(
+    AppPath.RecordIndexPage,
+    { objectNamePlural: objectMetadataItem.namePlural },
+    viewId ? { viewId } : undefined,
+  );
 
   const isActive =
-    currentPath === `/objects/${objectMetadataItem.namePlural}` ||
-    currentPath.includes(`object/${objectMetadataItem.nameSingular}/`);
+    currentPath ===
+      getAppPath(AppPath.RecordIndexPage, {
+        objectNamePlural: objectMetadataItem.namePlural,
+      }) ||
+    currentPath.includes(
+      getAppPath(AppPath.RecordShowPage, {
+        objectNameSingular: objectMetadataItem.nameSingular,
+        objectRecordId: '',
+      }) + '/',
+    );
 
   const shouldSubItemsBeDisplayed = isActive && objectMetadataViews.length > 1;
 
@@ -76,7 +88,11 @@ export const NavigationDrawerItemForObjectMetadataItem = ({
         {sortedObjectMetadataViews.map((view, index) => (
           <NavigationDrawerSubItem
             label={view.name}
-            to={`/objects/${objectMetadataItem.namePlural}?view=${view.id}`}
+            to={getAppPath(
+              AppPath.RecordIndexPage,
+              { objectNamePlural: objectMetadataItem.namePlural },
+              { viewId: view.id },
+            )}
             active={viewId === view.id}
             subItemState={getNavigationSubItemLeftAdornment({
               index,
diff --git a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems.tsx b/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems.tsx
index ecd8af8a3dd4..4665483f8fa8 100644
--- a/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems.tsx
@@ -4,7 +4,6 @@ import { NavigationDrawerAnimatedCollapseWrapper } from '@/ui/navigation/navigat
 import { NavigationDrawerSection } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSection';
 import { NavigationDrawerSectionTitle } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle';
 import { useNavigationSection } from '@/ui/navigation/navigation-drawer/hooks/useNavigationSection';
-import styled from '@emotion/styled';
 import { useRecoilValue } from 'recoil';
 
 const ORDERED_STANDARD_OBJECTS = [
@@ -15,15 +14,6 @@ const ORDERED_STANDARD_OBJECTS = [
   'note',
 ];
 
-const StyledObjectsMetaDataItemsWrapper = styled.div`
-  display: flex;
-  flex-direction: column;
-  gap: ${({ theme }) => theme.betweenSiblingsGap};
-  width: 100%;
-  flex: 1;
-  overflow-y: auto;
-`;
-
 export const NavigationDrawerSectionForObjectMetadataItems = ({
   sectionTitle,
   isRemote,
@@ -77,15 +67,13 @@ export const NavigationDrawerSectionForObjectMetadataItems = ({
             onClick={() => toggleNavigationSection()}
           />
         </NavigationDrawerAnimatedCollapseWrapper>
-        <StyledObjectsMetaDataItemsWrapper>
-          {isNavigationSectionOpen &&
-            objectMetadataItemsForNavigationItems.map((objectMetadataItem) => (
-              <NavigationDrawerItemForObjectMetadataItem
-                key={`navigation-drawer-item-${objectMetadataItem.id}`}
-                objectMetadataItem={objectMetadataItem}
-              />
-            ))}
-        </StyledObjectsMetaDataItemsWrapper>
+        {isNavigationSectionOpen &&
+          objectMetadataItemsForNavigationItems.map((objectMetadataItem) => (
+            <NavigationDrawerItemForObjectMetadataItem
+              key={`navigation-drawer-item-${objectMetadataItem.id}`}
+              objectMetadataItem={objectMetadataItem}
+            />
+          ))}
       </NavigationDrawerSection>
     )
   );
diff --git a/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsLoadEffect.tsx b/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsLoadEffect.tsx
index f078aa59b6ec..275d21433a34 100644
--- a/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsLoadEffect.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataItemsLoadEffect.tsx
@@ -5,7 +5,7 @@ import { currentUserState } from '@/auth/states/currentUserState';
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { useLoadMockedObjectMetadataItems } from '@/object-metadata/hooks/useLoadMockedObjectMetadataItems';
 import { useRefreshObjectMetadataItems } from '@/object-metadata/hooks/useRefreshObjectMetadataItem';
-import { WorkspaceActivationStatus } from '~/generated/graphql';
+import { isWorkspaceActiveOrSuspended } from 'twenty-shared';
 import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 export const ObjectMetadataItemsLoadEffect = () => {
@@ -18,7 +18,7 @@ export const ObjectMetadataItemsLoadEffect = () => {
   useEffect(() => {
     if (
       isUndefinedOrNull(currentUser) ||
-      currentWorkspace?.activationStatus !== WorkspaceActivationStatus.Active
+      !isWorkspaceActiveOrSuspended(currentWorkspace)
     ) {
       loadMockedObjectMetadataItems();
     } else {
@@ -26,7 +26,7 @@ export const ObjectMetadataItemsLoadEffect = () => {
     }
   }, [
     currentUser,
-    currentWorkspace?.activationStatus,
+    currentWorkspace,
     loadMockedObjectMetadataItems,
     refreshObjectMetadataItems,
   ]);
diff --git a/packages/twenty-front/src/modules/object-metadata/constants/LabelIdentifierFieldMetadataTypes.ts b/packages/twenty-front/src/modules/object-metadata/constants/LabelIdentifierFieldMetadataTypes.ts
index fe25319198b2..49e3d2984bf9 100644
--- a/packages/twenty-front/src/modules/object-metadata/constants/LabelIdentifierFieldMetadataTypes.ts
+++ b/packages/twenty-front/src/modules/object-metadata/constants/LabelIdentifierFieldMetadataTypes.ts
@@ -1,6 +1,6 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 export const LABEL_IDENTIFIER_FIELD_METADATA_TYPES = [
-  FieldMetadataType.Number,
-  FieldMetadataType.Text,
+  FieldMetadataType.NUMBER,
+  FieldMetadataType.TEXT,
 ];
diff --git a/packages/twenty-front/src/modules/object-metadata/constants/SortableFieldMetadataTypes.ts b/packages/twenty-front/src/modules/object-metadata/constants/SortableFieldMetadataTypes.ts
index f3599783cf7e..fc8cf76d6cb3 100644
--- a/packages/twenty-front/src/modules/object-metadata/constants/SortableFieldMetadataTypes.ts
+++ b/packages/twenty-front/src/modules/object-metadata/constants/SortableFieldMetadataTypes.ts
@@ -1,17 +1,17 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 export const SORTABLE_FIELD_METADATA_TYPES = [
-  FieldMetadataType.DateTime,
-  FieldMetadataType.Date,
-  FieldMetadataType.Number,
-  FieldMetadataType.Text,
-  FieldMetadataType.Boolean,
-  FieldMetadataType.Select,
-  FieldMetadataType.Emails,
-  FieldMetadataType.FullName,
-  FieldMetadataType.Rating,
-  FieldMetadataType.Currency,
-  FieldMetadataType.Actor,
-  FieldMetadataType.Links,
-  FieldMetadataType.Phones,
+  FieldMetadataType.DATE_TIME,
+  FieldMetadataType.DATE,
+  FieldMetadataType.NUMBER,
+  FieldMetadataType.TEXT,
+  FieldMetadataType.BOOLEAN,
+  FieldMetadataType.SELECT,
+  FieldMetadataType.EMAILS,
+  FieldMetadataType.FULL_NAME,
+  FieldMetadataType.RATING,
+  FieldMetadataType.CURRENCY,
+  FieldMetadataType.ACTOR,
+  FieldMetadataType.LINKS,
+  FieldMetadataType.PHONES,
 ];
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useCreateOneObjectMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useCreateOneObjectMetadataItem.ts
index ce4d5cfbe41b..170d396b969a 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useCreateOneObjectMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useCreateOneObjectMetadataItem.ts
@@ -81,6 +81,6 @@ export const responseData = {
   isActive: true,
   createdAt: '',
   updatedAt: '',
-  labelIdentifierFieldMetadataId: '',
+  labelIdentifierFieldMetadataId: '20202020-72ba-4e11-a36d-e17b544541e1',
   imageIdentifierFieldMetadataId: '',
 };
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useDeleteOneObjectMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useDeleteOneObjectMetadataItem.ts
index e7be9105bf9f..a580e6e4f6de 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useDeleteOneObjectMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useDeleteOneObjectMetadataItem.ts
@@ -36,6 +36,6 @@ export const responseData = {
   isActive: true,
   createdAt: '',
   updatedAt: '',
-  labelIdentifierFieldMetadataId: '',
+  labelIdentifierFieldMetadataId: '20202020-72ba-4e11-a36d-e17b544541e1',
   imageIdentifierFieldMetadataId: '',
 };
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFieldMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFieldMetadataItem.ts
index f7fbf1efa9bb..d630617d5a06 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFieldMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFieldMetadataItem.ts
@@ -160,6 +160,10 @@ export const queries = {
           status
           interval
         }
+        billingSubscriptions {
+          id
+          status
+        }
         workspaceMembersCount
       }
       workspaces {
@@ -239,7 +243,7 @@ const defaultResponseData = {
 const fieldRelationResponseData = {
   ...defaultResponseData,
   id: FIELD_RELATION_METADATA_ID,
-  type: FieldMetadataType.Relation,
+  type: FieldMetadataType.RELATION,
 };
 
 export const responseData = {
@@ -300,6 +304,8 @@ export const responseData = {
         currentBillingSubscription: null,
         workspaceMembersCount: 1,
       },
+      currentBillingSubscription: null,
+      billingSubscriptions: [],
       workspaces: [],
       userVars: null,
     },
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFilteredObjectMetadataItems.ts b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFilteredObjectMetadataItems.ts
index a2419898a788..8e5ba1ea35fa 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFilteredObjectMetadataItems.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFilteredObjectMetadataItems.ts
@@ -50,6 +50,6 @@ export const responseData = {
   isActive: true,
   createdAt: '',
   updatedAt: '',
-  labelIdentifierFieldMetadataId: '',
+  labelIdentifierFieldMetadataId: '20202020-72ba-4e11-a36d-e17b544541e1',
   imageIdentifierFieldMetadataId: '',
 };
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useColumnDefinitionsFromFieldMetadata.test.ts b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useColumnDefinitionsFromFieldMetadata.test.ts
index 5d33445801d9..f7c3aeafb6ca 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useColumnDefinitionsFromFieldMetadata.test.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useColumnDefinitionsFromFieldMetadata.test.ts
@@ -4,7 +4,11 @@ import { Nullable } from 'twenty-ui';
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { useColumnDefinitionsFromFieldMetadata } from '@/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { WorkspaceActivationStatus } from '~/generated/graphql';
+import {
+  SubscriptionInterval,
+  SubscriptionStatus,
+  WorkspaceActivationStatus,
+} from '~/generated/graphql';
 import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';
 import { generatedMockObjectMetadataItems } from '~/testing/mock-data/generatedMockObjectMetadataItems';
 
@@ -16,13 +20,24 @@ const Wrapper = getJestMetadataAndApolloMocksWrapper({
       featureFlags: [],
       allowImpersonation: false,
       subdomain: 'test',
-      activationStatus: WorkspaceActivationStatus.Active,
+      activationStatus: WorkspaceActivationStatus.ACTIVE,
       hasValidEntrepriseKey: false,
       metadataVersion: 1,
       isPublicInviteLinkEnabled: false,
       isGoogleAuthEnabled: true,
       isMicrosoftAuthEnabled: false,
       isPasswordAuthEnabled: true,
+      currentBillingSubscription: {
+        id: '1',
+        interval: SubscriptionInterval.Month,
+        status: SubscriptionStatus.Active,
+      },
+      billingSubscriptions: [
+        {
+          id: '1',
+          status: SubscriptionStatus.Active,
+        },
+      ],
     });
   },
 });
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useCreateOneRelationMetadataItem.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useCreateOneRelationMetadataItem.test.tsx
index f0c721b6e732..81bd9aea3f1c 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useCreateOneRelationMetadataItem.test.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useCreateOneRelationMetadataItem.test.tsx
@@ -56,7 +56,7 @@ describe('useCreateOneRelationMetadataItem', () => {
 
     await act(async () => {
       const res = await result.current.createOneRelationMetadataItem({
-        relationType: RelationDefinitionType.OneToOne,
+        relationType: RelationDefinitionType.ONE_TO_ONE,
         field: {
           label: 'label',
           name: 'name',
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFieldMetadataItem.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFieldMetadataItem.test.tsx
index af6f199fcb34..dff377a32f69 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFieldMetadataItem.test.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFieldMetadataItem.test.tsx
@@ -26,7 +26,7 @@ const fieldMetadataItem: FieldMetadataItem = {
   createdAt: '',
   label: 'label',
   name: 'name',
-  type: FieldMetadataType.Text,
+  type: FieldMetadataType.TEXT,
   updatedAt: '',
   isLabelSyncedWithName: true,
 };
@@ -36,12 +36,12 @@ const fieldRelationMetadataItem: FieldMetadataItem = {
   createdAt: '',
   label: 'label',
   name: 'name',
-  type: FieldMetadataType.Relation,
+  type: FieldMetadataType.RELATION,
   updatedAt: '',
   isLabelSyncedWithName: true,
   relationDefinition: {
     relationId: RELATION_METADATA_ID,
-    direction: RelationDefinitionType.OneToMany,
+    direction: RelationDefinitionType.ONE_TO_MANY,
     sourceFieldMetadata: {
       id: 'e5903d91-9b10-4f3e-b761-35c36e93b7c1',
       name: 'sourceField',
@@ -204,7 +204,7 @@ describe('useFieldMetadataItem', () => {
       const res = await result.current.createMetadataField({
         label: 'fieldLabel',
         objectMetadataId,
-        type: FieldMetadataType.Text,
+        type: FieldMetadataType.TEXT,
         name: 'fieldName',
         isLabelSyncedWithName: true,
       });
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useDeleteOneFieldMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useDeleteOneFieldMetadataItem.ts
index 20985212a668..82a7e16c73e0 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useDeleteOneFieldMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useDeleteOneFieldMetadataItem.ts
@@ -1,13 +1,15 @@
-import { useMutation } from '@apollo/client';
+import { useApolloClient, useMutation } from '@apollo/client';
 
 import {
   DeleteOneFieldMetadataItemMutation,
   DeleteOneFieldMetadataItemMutationVariables,
 } from '~/generated-metadata/graphql';
 
-import { DELETE_ONE_FIELD_METADATA_ITEM } from '../graphql/mutations';
-
 import { useRefreshObjectMetadataItems } from '@/object-metadata/hooks/useRefreshObjectMetadataItem';
+import { recordIndexKanbanAggregateOperationState } from '@/object-record/record-index/states/recordIndexKanbanAggregateOperationState';
+import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
+import { useRecoilState } from 'recoil';
+import { DELETE_ONE_FIELD_METADATA_ITEM } from '../graphql/mutations';
 import { useApolloMetadataClient } from './useApolloMetadataClient';
 
 export const useDeleteOneFieldMetadataItem = () => {
@@ -23,6 +25,27 @@ export const useDeleteOneFieldMetadataItem = () => {
   const { refreshObjectMetadataItems } =
     useRefreshObjectMetadataItems('network-only');
 
+  const [
+    recordIndexKanbanAggregateOperation,
+    setRecordIndexKanbanAggregateOperation,
+  ] = useRecoilState(recordIndexKanbanAggregateOperationState);
+
+  const apolloClient = useApolloClient();
+
+  const resetRecordIndexKanbanAggregateOperation = async (
+    idToDelete: DeleteOneFieldMetadataItemMutationVariables['idToDelete'],
+  ) => {
+    if (recordIndexKanbanAggregateOperation?.fieldMetadataId === idToDelete) {
+      setRecordIndexKanbanAggregateOperation({
+        operation: AGGREGATE_OPERATIONS.count,
+        fieldMetadataId: null,
+      });
+    }
+    await apolloClient.refetchQueries({
+      include: ['FindManyViews'],
+    });
+  };
+
   const deleteOneFieldMetadataItem = async (
     idToDelete: DeleteOneFieldMetadataItemMutationVariables['idToDelete'],
   ) => {
@@ -32,6 +55,8 @@ export const useDeleteOneFieldMetadataItem = () => {
       },
     });
 
+    await resetRecordIndexKanbanAggregateOperation(idToDelete);
+
     await refreshObjectMetadataItems();
 
     return result;
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useFieldMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useFieldMetadataItem.ts
index 79d1555b1ab0..d4dec514847c 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useFieldMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useFieldMetadataItem.ts
@@ -63,7 +63,7 @@ export const useFieldMetadataItem = () => {
     });
 
   const deleteMetadataField = (metadataField: FieldMetadataItem) => {
-    return metadataField.type === FieldMetadataType.Relation
+    return metadataField.type === FieldMetadataType.RELATION
       ? deleteOneRelationMetadataItem(
           metadataField.relationDefinition?.relationId,
         )
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useGetRelationMetadata.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useGetRelationMetadata.ts
index 448bac6ef8ac..26587072be79 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useGetRelationMetadata.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useGetRelationMetadata.ts
@@ -16,7 +16,7 @@ export const useGetRelationMetadata = () =>
           'type' | 'relationDefinition'
         >;
       }) => {
-        if (fieldMetadataItem.type !== FieldMetadataType.Relation) return null;
+        if (fieldMetadataItem.type !== FieldMetadataType.RELATION) return null;
 
         const relationDefinition = fieldMetadataItem.relationDefinition;
 
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useObjectNamePluralFromSingular.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useObjectNamePluralFromSingular.ts
index 88ac0baab21d..c407749ab641 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useObjectNamePluralFromSingular.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useObjectNamePluralFromSingular.ts
@@ -2,7 +2,7 @@ import { useRecoilValue } from 'recoil';
 
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { objectMetadataItemFamilySelector } from '@/object-metadata/states/objectMetadataItemFamilySelector';
-import { WorkspaceActivationStatus } from '~/generated/graphql';
+import { isWorkspaceActiveOrSuspended } from 'twenty-shared';
 import { generatedMockObjectMetadataItems } from '~/testing/mock-data/generatedMockObjectMetadataItems';
 import { isDefined } from '~/utils/isDefined';
 
@@ -20,7 +20,7 @@ export const useObjectNamePluralFromSingular = ({
     }),
   );
 
-  if (currentWorkspace?.activationStatus !== WorkspaceActivationStatus.Active) {
+  if (!isWorkspaceActiveOrSuspended(currentWorkspace)) {
     objectMetadataItem =
       generatedMockObjectMetadataItems.find(
         (objectMetadataItem) =>
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useObjectNameSingularFromPlural.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useObjectNameSingularFromPlural.ts
index 2e5127d8fcd9..ce387eb99bb3 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useObjectNameSingularFromPlural.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useObjectNameSingularFromPlural.ts
@@ -2,7 +2,7 @@ import { useRecoilValue } from 'recoil';
 
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { objectMetadataItemFamilySelector } from '@/object-metadata/states/objectMetadataItemFamilySelector';
-import { WorkspaceActivationStatus } from '~/generated/graphql';
+import { isWorkspaceActiveOrSuspended } from 'twenty-shared';
 import { generatedMockObjectMetadataItems } from '~/testing/mock-data/generatedMockObjectMetadataItems';
 import { isDefined } from '~/utils/isDefined';
 
@@ -20,7 +20,7 @@ export const useObjectNameSingularFromPlural = ({
     }),
   );
 
-  if (currentWorkspace?.activationStatus !== WorkspaceActivationStatus.Active) {
+  if (!isWorkspaceActiveOrSuspended(currentWorkspace)) {
     objectMetadataItem =
       generatedMockObjectMetadataItems.find(
         (objectMetadataItem) =>
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useRefreshObjectMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useRefreshObjectMetadataItem.ts
index f1e9eec68e45..e959e627ab0b 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useRefreshObjectMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useRefreshObjectMetadataItem.ts
@@ -2,10 +2,16 @@ import { FIND_MANY_OBJECT_METADATA_ITEMS } from '@/object-metadata/graphql/queri
 import { useApolloMetadataClient } from '@/object-metadata/hooks/useApolloMetadataClient';
 import { isAppWaitingForFreshObjectMetadataState } from '@/object-metadata/states/isAppWaitingForFreshObjectMetadataState';
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { isWorkflowSubObjectMetadata } from '@/object-metadata/utils/isWorkflowSubObjectMetadata';
 import { mapPaginatedObjectMetadataItemsToObjectMetadataItems } from '@/object-metadata/utils/mapPaginatedObjectMetadataItemsToObjectMetadataItems';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 import { useRecoilCallback } from 'recoil';
-import { ObjectMetadataItemsQuery } from '~/generated-metadata/graphql';
+import {
+  FeatureFlagKey,
+  ObjectMetadataItemsQuery,
+} from '~/generated-metadata/graphql';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
 
 type FetchPolicy = 'network-only' | 'cache-first';
@@ -14,6 +20,9 @@ export const useRefreshObjectMetadataItems = (
   fetchPolicy: FetchPolicy = 'cache-first',
 ) => {
   const client = useApolloMetadataClient();
+  const isWorkflowEnabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsWorkflowEnabled,
+  );
 
   const refreshObjectMetadataItems = async () => {
     const result = await client.query<ObjectMetadataItemsQuery>({
@@ -27,7 +36,15 @@ export const useRefreshObjectMetadataItems = (
         pagedObjectMetadataItems: result.data,
       });
 
-    replaceObjectMetadataItemIfDifferent(objectMetadataItems);
+    const filteredObjectMetadataItems = objectMetadataItems.filter((object) => {
+      return (
+        isWorkflowEnabled ||
+        (object.nameSingular !== CoreObjectNameSingular.Workflow &&
+          !isWorkflowSubObjectMetadata(object.nameSingular))
+      );
+    });
+
+    replaceObjectMetadataItemIfDifferent(filteredObjectMetadataItems);
   };
 
   const replaceObjectMetadataItemIfDifferent = useRecoilCallback(
diff --git a/packages/twenty-front/src/modules/object-metadata/types/ObjectMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/types/ObjectMetadataItem.ts
index 61c0fc495fea..09c23eeb8aa2 100644
--- a/packages/twenty-front/src/modules/object-metadata/types/ObjectMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/types/ObjectMetadataItem.ts
@@ -5,9 +5,14 @@ import { FieldMetadataItem } from './FieldMetadataItem';
 
 export type ObjectMetadataItem = Omit<
   GeneratedObject,
-  '__typename' | 'fields' | 'dataSourceId' | 'indexMetadatas'
+  | '__typename'
+  | 'fields'
+  | 'dataSourceId'
+  | 'indexMetadatas'
+  | 'labelIdentifierFieldMetadataId'
 > & {
   __typename?: string;
   fields: FieldMetadataItem[];
+  labelIdentifierFieldMetadataId: string;
   indexMetadatas: IndexMetadataItem[];
 };
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/formatFieldMetadataItemInput.test.ts b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/formatFieldMetadataItemInput.test.ts
index 21430d721202..fb38ec467804 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/formatFieldMetadataItemInput.test.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/formatFieldMetadataItemInput.test.ts
@@ -26,7 +26,7 @@ describe('formatFieldMetadataItemInput', () => {
       label: 'Example Label',
       name: 'exampleLabel',
       icon: 'example-icon',
-      type: FieldMetadataType.Select,
+      type: FieldMetadataType.SELECT,
       description: 'Example description',
       options,
       isLabelSyncedWithName: true,
@@ -52,7 +52,7 @@ describe('formatFieldMetadataItemInput', () => {
       label: 'Example Label',
       name: 'exampleLabel',
       icon: 'example-icon',
-      type: FieldMetadataType.Select,
+      type: FieldMetadataType.SELECT,
       description: 'Example description',
       isLabelSyncedWithName: true,
     };
@@ -94,7 +94,7 @@ describe('formatFieldMetadataItemInput', () => {
       label: 'Example Label',
       name: 'exampleLabel',
       icon: 'example-icon',
-      type: FieldMetadataType.MultiSelect,
+      type: FieldMetadataType.MULTI_SELECT,
       description: 'Example description',
       options,
       isLabelSyncedWithName: true,
@@ -120,7 +120,7 @@ describe('formatFieldMetadataItemInput', () => {
       label: 'Example Label',
       name: 'exampleLabel',
       icon: 'example-icon',
-      type: FieldMetadataType.MultiSelect,
+      type: FieldMetadataType.MULTI_SELECT,
       description: 'Example description',
       isLabelSyncedWithName: true,
     };
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/isLabelIdentifierField.test.ts b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/isLabelIdentifierField.test.ts
index 85ad1f0eb429..6cd5dd8c1119 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/isLabelIdentifierField.test.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/isLabelIdentifierField.test.ts
@@ -1,11 +1,23 @@
 import { isLabelIdentifierField } from '@/object-metadata/utils/isLabelIdentifierField';
 
 describe('isLabelIdentifierField', () => {
-  it('should work as expected', () => {
+  it('should not find unknown labelIdentifier', () => {
     const res = isLabelIdentifierField({
       fieldMetadataItem: { id: 'fieldId', name: 'fieldName' },
-      objectMetadataItem: {},
+      objectMetadataItem: {
+        labelIdentifierFieldMetadataId: 'unknown',
+      },
     });
     expect(res).toBe(false);
   });
+
+  it('should find known labelIdentifier', () => {
+    const res = isLabelIdentifierField({
+      fieldMetadataItem: { id: 'fieldId', name: 'fieldName' },
+      objectMetadataItem: {
+        labelIdentifierFieldMetadataId: 'fieldId',
+      },
+    });
+    expect(res).toBe(true);
+  });
 });
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/shouldFieldBeQueried.test.ts b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/shouldFieldBeQueried.test.ts
index 23135d32d2a9..f59d9409cd51 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/shouldFieldBeQueried.test.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/shouldFieldBeQueried.test.ts
@@ -5,14 +5,14 @@ describe('shouldFieldBeQueried', () => {
   describe('if recordGqlFields is absent, we query all except relations', () => {
     it('should be queried if the field is not a relation', () => {
       const res = shouldFieldBeQueried({
-        field: { name: 'fieldName', type: FieldMetadataType.Boolean },
+        field: { name: 'fieldName', type: FieldMetadataType.BOOLEAN },
       });
       expect(res).toBe(true);
     });
 
     it('should not be queried if the field is a relation', () => {
       const res = shouldFieldBeQueried({
-        field: { name: 'fieldName', type: FieldMetadataType.Relation },
+        field: { name: 'fieldName', type: FieldMetadataType.RELATION },
       });
       expect(res).toBe(false);
     });
@@ -22,7 +22,7 @@ describe('shouldFieldBeQueried', () => {
     it('should be queried if true', () => {
       const res = shouldFieldBeQueried({
         recordGqlFields: { fieldName: true },
-        field: { name: 'fieldName', type: FieldMetadataType.Relation },
+        field: { name: 'fieldName', type: FieldMetadataType.RELATION },
       });
       expect(res).toBe(true);
     });
@@ -30,7 +30,7 @@ describe('shouldFieldBeQueried', () => {
     it('should be queried if object', () => {
       const res = shouldFieldBeQueried({
         recordGqlFields: { fieldName: { subFieldName: false } },
-        field: { name: 'fieldName', type: FieldMetadataType.Relation },
+        field: { name: 'fieldName', type: FieldMetadataType.RELATION },
       });
       expect(res).toBe(true);
     });
@@ -38,7 +38,7 @@ describe('shouldFieldBeQueried', () => {
     it('should not be queried if false', () => {
       const res = shouldFieldBeQueried({
         recordGqlFields: { fieldName: false },
-        field: { name: 'fieldName', type: FieldMetadataType.Relation },
+        field: { name: 'fieldName', type: FieldMetadataType.RELATION },
       });
       expect(res).toBe(false);
     });
@@ -46,7 +46,7 @@ describe('shouldFieldBeQueried', () => {
     it('should not be queried if absent', () => {
       const res = shouldFieldBeQueried({
         recordGqlFields: { otherFieldName: false },
-        field: { name: 'fieldName', type: FieldMetadataType.Relation },
+        field: { name: 'fieldName', type: FieldMetadataType.RELATION },
       });
       expect(res).toBe(false);
     });
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts b/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts
index 92ea3e0d6be7..b817bdf537f9 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts
@@ -1,4 +1,4 @@
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
 import {
   FieldMetadataType,
   RelationDefinitionType,
@@ -12,51 +12,51 @@ export const formatFieldMetadataItemsAsFilterDefinitions = ({
 }: {
   fields: Array<ObjectMetadataItem['fields'][0]>;
   isJsonFilterEnabled: boolean;
-}): FilterDefinition[] => {
+}): RecordFilterDefinition[] => {
   return fields.reduce((acc, field) => {
     if (
-      field.type === FieldMetadataType.Relation &&
+      field.type === FieldMetadataType.RELATION &&
       field.relationDefinition?.direction !==
-        RelationDefinitionType.ManyToOne &&
-      field.relationDefinition?.direction !== RelationDefinitionType.OneToOne
+        RelationDefinitionType.MANY_TO_ONE &&
+      field.relationDefinition?.direction !== RelationDefinitionType.ONE_TO_ONE
     ) {
       return acc;
     }
 
     if (
       ![
-        FieldMetadataType.Boolean,
-        FieldMetadataType.DateTime,
-        FieldMetadataType.Date,
-        FieldMetadataType.Text,
-        FieldMetadataType.Emails,
-        FieldMetadataType.Number,
-        FieldMetadataType.Links,
-        FieldMetadataType.FullName,
-        FieldMetadataType.Address,
-        FieldMetadataType.Relation,
-        FieldMetadataType.Select,
-        FieldMetadataType.MultiSelect,
-        FieldMetadataType.Currency,
-        FieldMetadataType.Rating,
-        FieldMetadataType.Actor,
-        FieldMetadataType.Phones,
-        FieldMetadataType.Array,
-        ...(isJsonFilterEnabled ? [FieldMetadataType.RawJson] : []),
+        FieldMetadataType.BOOLEAN,
+        FieldMetadataType.DATE_TIME,
+        FieldMetadataType.DATE,
+        FieldMetadataType.TEXT,
+        FieldMetadataType.EMAILS,
+        FieldMetadataType.NUMBER,
+        FieldMetadataType.LINKS,
+        FieldMetadataType.FULL_NAME,
+        FieldMetadataType.ADDRESS,
+        FieldMetadataType.RELATION,
+        FieldMetadataType.SELECT,
+        FieldMetadataType.MULTI_SELECT,
+        FieldMetadataType.CURRENCY,
+        FieldMetadataType.RATING,
+        FieldMetadataType.ACTOR,
+        FieldMetadataType.PHONES,
+        FieldMetadataType.ARRAY,
+        ...(isJsonFilterEnabled ? [FieldMetadataType.RAW_JSON] : []),
       ].includes(field.type)
     ) {
       return acc;
     }
 
     return [...acc, formatFieldMetadataItemAsFilterDefinition({ field })];
-  }, [] as FilterDefinition[]);
+  }, [] as RecordFilterDefinition[]);
 };
 
 export const formatFieldMetadataItemAsFilterDefinition = ({
   field,
 }: {
   field: ObjectMetadataItem['fields'][0];
-}): FilterDefinition => ({
+}): RecordFilterDefinition => ({
   fieldMetadataId: field.id,
   label: field.label,
   iconName: field.icon ?? 'Icon123',
@@ -69,39 +69,39 @@ export const formatFieldMetadataItemAsFilterDefinition = ({
 
 export const getFilterTypeFromFieldType = (fieldType: FieldMetadataType) => {
   switch (fieldType) {
-    case FieldMetadataType.DateTime:
+    case FieldMetadataType.DATE_TIME:
       return 'DATE_TIME';
-    case FieldMetadataType.Date:
+    case FieldMetadataType.DATE:
       return 'DATE';
-    case FieldMetadataType.Links:
+    case FieldMetadataType.LINKS:
       return 'LINKS';
-    case FieldMetadataType.FullName:
+    case FieldMetadataType.FULL_NAME:
       return 'FULL_NAME';
-    case FieldMetadataType.Number:
+    case FieldMetadataType.NUMBER:
       return 'NUMBER';
-    case FieldMetadataType.Currency:
+    case FieldMetadataType.CURRENCY:
       return 'CURRENCY';
-    case FieldMetadataType.Emails:
+    case FieldMetadataType.EMAILS:
       return 'EMAILS';
-    case FieldMetadataType.Phones:
+    case FieldMetadataType.PHONES:
       return 'PHONES';
-    case FieldMetadataType.Relation:
+    case FieldMetadataType.RELATION:
       return 'RELATION';
-    case FieldMetadataType.Select:
+    case FieldMetadataType.SELECT:
       return 'SELECT';
-    case FieldMetadataType.MultiSelect:
+    case FieldMetadataType.MULTI_SELECT:
       return 'MULTI_SELECT';
-    case FieldMetadataType.Address:
+    case FieldMetadataType.ADDRESS:
       return 'ADDRESS';
-    case FieldMetadataType.Rating:
+    case FieldMetadataType.RATING:
       return 'RATING';
-    case FieldMetadataType.Actor:
+    case FieldMetadataType.ACTOR:
       return 'ACTOR';
-    case FieldMetadataType.Array:
+    case FieldMetadataType.ARRAY:
       return 'ARRAY';
-    case FieldMetadataType.RawJson:
+    case FieldMetadataType.RAW_JSON:
       return 'RAW_JSON';
-    case FieldMetadataType.Boolean:
+    case FieldMetadataType.BOOLEAN:
       return 'BOOLEAN';
     default:
       return 'TEXT';
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/formatRelationMetadataInput.ts b/packages/twenty-front/src/modules/object-metadata/utils/formatRelationMetadataInput.ts
index 974a82d377f4..febc5ecd7854 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/formatRelationMetadataInput.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/formatRelationMetadataInput.ts
@@ -25,7 +25,7 @@ export const formatRelationMetadataInput = (
   // => Transform into ONE_TO_MANY and invert "from" and "to" data.
   const isManyToOne = input.relationType === 'MANY_TO_ONE';
   const relationType = isManyToOne
-    ? RelationDefinitionType.OneToMany
+    ? RelationDefinitionType.ONE_TO_MANY
     : (input.relationType as RelationDefinitionType);
   const { field: fromField, objectMetadataId: fromObjectMetadataId } =
     isManyToOne ? input.connect : input;
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getLabelIdentifierFieldValue.ts b/packages/twenty-front/src/modules/object-metadata/utils/getLabelIdentifierFieldValue.ts
index 001cf4ecb06b..368cd41f3736 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/getLabelIdentifierFieldValue.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getLabelIdentifierFieldValue.ts
@@ -11,7 +11,7 @@ export const getLabelIdentifierFieldValue = (
 ): string => {
   if (
     objectNameSingular === CoreObjectNameSingular.WorkspaceMember ||
-    labelIdentifierFieldMetadataItem?.type === FieldMetadataType.FullName
+    labelIdentifierFieldMetadataItem?.type === FieldMetadataType.FULL_NAME
   ) {
     return `${record.name?.firstName ?? ''} ${record.name?.lastName ?? ''}`;
   }
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getOrderByForFieldMetadataType.ts b/packages/twenty-front/src/modules/object-metadata/utils/getOrderByForFieldMetadataType.ts
index 4bb814db1571..f715e05f396c 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/getOrderByForFieldMetadataType.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getOrderByForFieldMetadataType.ts
@@ -14,7 +14,7 @@ export const getOrderByForFieldMetadataType = (
   direction: OrderBy | null | undefined,
 ): RecordGqlOperationOrderBy => {
   switch (field.type) {
-    case FieldMetadataType.FullName:
+    case FieldMetadataType.FULL_NAME:
       return [
         {
           [field.name]: {
@@ -23,7 +23,7 @@ export const getOrderByForFieldMetadataType = (
           },
         },
       ];
-    case FieldMetadataType.Currency:
+    case FieldMetadataType.CURRENCY:
       return [
         {
           [field.name]: {
@@ -31,7 +31,7 @@ export const getOrderByForFieldMetadataType = (
           },
         },
       ];
-    case FieldMetadataType.Actor:
+    case FieldMetadataType.ACTOR:
       return [
         {
           [field.name]: {
@@ -39,7 +39,7 @@ export const getOrderByForFieldMetadataType = (
           },
         },
       ];
-    case FieldMetadataType.Links:
+    case FieldMetadataType.LINKS:
       return [
         {
           [field.name]: {
@@ -47,7 +47,7 @@ export const getOrderByForFieldMetadataType = (
           } satisfies { [key in keyof FieldLinksValue]?: OrderBy },
         },
       ];
-    case FieldMetadataType.Emails:
+    case FieldMetadataType.EMAILS:
       return [
         {
           [field.name]: {
@@ -55,7 +55,7 @@ export const getOrderByForFieldMetadataType = (
           } satisfies { [key in keyof FieldEmailsValue]?: OrderBy },
         },
       ];
-    case FieldMetadataType.Phones:
+    case FieldMetadataType.PHONES:
       return [
         {
           [field.name]: {
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts b/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts
index 4cd8dbcbb009..187ffe9c9b02 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts
@@ -24,19 +24,19 @@ export const mapFieldMetadataToGraphQLQuery = ({
   const fieldType = field.type;
 
   const fieldIsSimpleValue = [
-    FieldMetadataType.Uuid,
-    FieldMetadataType.Text,
-    FieldMetadataType.DateTime,
-    FieldMetadataType.Date,
-    FieldMetadataType.Number,
-    FieldMetadataType.Boolean,
-    FieldMetadataType.Rating,
-    FieldMetadataType.Select,
-    FieldMetadataType.MultiSelect,
-    FieldMetadataType.Position,
-    FieldMetadataType.RawJson,
-    FieldMetadataType.RichText,
-    FieldMetadataType.Array,
+    FieldMetadataType.UUID,
+    FieldMetadataType.TEXT,
+    FieldMetadataType.DATE_TIME,
+    FieldMetadataType.DATE,
+    FieldMetadataType.NUMBER,
+    FieldMetadataType.BOOLEAN,
+    FieldMetadataType.RATING,
+    FieldMetadataType.SELECT,
+    FieldMetadataType.MULTI_SELECT,
+    FieldMetadataType.POSITION,
+    FieldMetadataType.RAW_JSON,
+    FieldMetadataType.RICH_TEXT,
+    FieldMetadataType.ARRAY,
   ].includes(fieldType);
 
   if (fieldIsSimpleValue) {
@@ -44,8 +44,8 @@ export const mapFieldMetadataToGraphQLQuery = ({
   }
 
   if (
-    fieldType === FieldMetadataType.Relation &&
-    field.relationDefinition?.direction === RelationDefinitionType.ManyToOne
+    fieldType === FieldMetadataType.RELATION &&
+    field.relationDefinition?.direction === RelationDefinitionType.MANY_TO_ONE
   ) {
     const relationMetadataItem = objectMetadataItems.find(
       (objectMetadataItem) =>
@@ -68,8 +68,8 @@ ${mapObjectMetadataToGraphQLQuery({
   }
 
   if (
-    fieldType === FieldMetadataType.Relation &&
-    field.relationDefinition?.direction === RelationDefinitionType.OneToMany
+    fieldType === FieldMetadataType.RELATION &&
+    field.relationDefinition?.direction === RelationDefinitionType.ONE_TO_MANY
   ) {
     const relationMetadataItem = objectMetadataItems.find(
       (objectMetadataItem) =>
@@ -95,7 +95,7 @@ ${mapObjectMetadataToGraphQLQuery({
 }`;
   }
 
-  if (fieldType === FieldMetadataType.Links) {
+  if (fieldType === FieldMetadataType.LINKS) {
     return `${field.name}
 {
   primaryLinkUrl
@@ -104,7 +104,7 @@ ${mapObjectMetadataToGraphQLQuery({
 }`;
   }
 
-  if (fieldType === FieldMetadataType.Currency) {
+  if (fieldType === FieldMetadataType.CURRENCY) {
     return `${field.name}
 {
   amountMicros
@@ -113,7 +113,7 @@ ${mapObjectMetadataToGraphQLQuery({
     `;
   }
 
-  if (fieldType === FieldMetadataType.FullName) {
+  if (fieldType === FieldMetadataType.FULL_NAME) {
     return `${field.name}
 {
   firstName
@@ -121,7 +121,7 @@ ${mapObjectMetadataToGraphQLQuery({
 }`;
   }
 
-  if (fieldType === FieldMetadataType.Address) {
+  if (fieldType === FieldMetadataType.ADDRESS) {
     return `${field.name}
 {
   addressStreet1
@@ -135,7 +135,7 @@ ${mapObjectMetadataToGraphQLQuery({
 }`;
   }
 
-  if (fieldType === FieldMetadataType.Actor) {
+  if (fieldType === FieldMetadataType.ACTOR) {
     return `${field.name}
 {
     source
@@ -144,7 +144,7 @@ ${mapObjectMetadataToGraphQLQuery({
 }`;
   }
 
-  if (fieldType === FieldMetadataType.Emails) {
+  if (fieldType === FieldMetadataType.EMAILS) {
     return `${field.name}
 {
   primaryEmail
@@ -152,7 +152,7 @@ ${mapObjectMetadataToGraphQLQuery({
 }`;
   }
 
-  if (fieldType === FieldMetadataType.Phones) {
+  if (fieldType === FieldMetadataType.PHONES) {
     return `${field.name}
     {
       primaryPhoneNumber
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/mapPaginatedObjectMetadataItemsToObjectMetadataItems.ts b/packages/twenty-front/src/modules/object-metadata/utils/mapPaginatedObjectMetadataItemsToObjectMetadataItems.ts
index 0ab2a8229854..50c6d003131e 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/mapPaginatedObjectMetadataItemsToObjectMetadataItems.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/mapPaginatedObjectMetadataItemsToObjectMetadataItems.ts
@@ -1,5 +1,5 @@
+import { objectMetadataItemSchema } from '@/object-metadata/validation-schemas/objectMetadataItemSchema';
 import { ObjectMetadataItemsQuery } from '~/generated-metadata/graphql';
-
 import { ObjectMetadataItem } from '../types/ObjectMetadataItem';
 
 export const mapPaginatedObjectMetadataItemsToObjectMetadataItems = ({
@@ -8,16 +8,24 @@ export const mapPaginatedObjectMetadataItemsToObjectMetadataItems = ({
   pagedObjectMetadataItems: ObjectMetadataItemsQuery | undefined;
 }) => {
   const formattedObjects: ObjectMetadataItem[] =
-    pagedObjectMetadataItems?.objects.edges.map((object) => ({
-      ...object.node,
-      fields: object.node.fields.edges.map((field) => field.node),
-      indexMetadatas: object.node.indexMetadatas?.edges.map((index) => ({
-        ...index.node,
-        indexFieldMetadatas: index.node.indexFieldMetadatas?.edges.map(
-          (indexField) => indexField.node,
-        ),
-      })),
-    })) ?? [];
+    pagedObjectMetadataItems?.objects.edges.map((object) => {
+      const labelIdentifierFieldMetadataId =
+        objectMetadataItemSchema.shape.labelIdentifierFieldMetadataId.parse(
+          object.node.labelIdentifierFieldMetadataId,
+        );
+
+      return {
+        ...object.node,
+        fields: object.node.fields.edges.map((field) => field.node),
+        labelIdentifierFieldMetadataId,
+        indexMetadatas: object.node.indexMetadatas?.edges.map((index) => ({
+          ...index.node,
+          indexFieldMetadatas: index.node.indexFieldMetadatas?.edges.map(
+            (indexField) => indexField.node,
+          ),
+        })),
+      };
+    }) ?? [];
 
   return formattedObjects;
 };
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/shouldFieldBeQueried.ts b/packages/twenty-front/src/modules/object-metadata/utils/shouldFieldBeQueried.ts
index 1d2d6b0cf168..6c2d25556b2a 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/shouldFieldBeQueried.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/shouldFieldBeQueried.ts
@@ -16,7 +16,7 @@ export const shouldFieldBeQueried = ({
 }): any => {
   if (
     isUndefinedOrNull(recordGqlFields) &&
-    field.type !== FieldMetadataType.Relation
+    field.type !== FieldMetadataType.RELATION
   ) {
     return true;
   }
diff --git a/packages/twenty-front/src/modules/object-metadata/validation-schemas/__tests__/objectMetadataItemSchema.test.ts b/packages/twenty-front/src/modules/object-metadata/validation-schemas/__tests__/objectMetadataItemSchema.test.ts
index 64e513214f1c..8697d279a995 100644
--- a/packages/twenty-front/src/modules/object-metadata/validation-schemas/__tests__/objectMetadataItemSchema.test.ts
+++ b/packages/twenty-front/src/modules/object-metadata/validation-schemas/__tests__/objectMetadataItemSchema.test.ts
@@ -1,3 +1,4 @@
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { generatedMockObjectMetadataItems } from '~/testing/mock-data/generatedMockObjectMetadataItems';
 import { objectMetadataItemSchema } from '../objectMetadataItemSchema';
 
@@ -15,16 +16,37 @@ describe('objectMetadataItemSchema', () => {
     expect(result).toEqual(validObjectMetadataItem);
   });
 
+  it('fails for an invalid object metadata item that has null labelIdentifier', () => {
+    // Given
+    const validObjectMetadataItem = generatedMockObjectMetadataItems.find(
+      (item) => item.nameSingular === 'company',
+    );
+    expect(validObjectMetadataItem).not.toBeUndefined();
+    if (validObjectMetadataItem === undefined)
+      throw new Error('Should never occurs');
+
+    // When
+    const result = objectMetadataItemSchema.safeParse({
+      ...validObjectMetadataItem,
+      labelIdentifierFieldMetadataId: null,
+    });
+
+    // Then
+    expect(result.success).toEqual(false);
+  });
+
   it('fails for an invalid object metadata item', () => {
     // Given
-    const invalidObjectMetadataItem = {
+    const invalidObjectMetadataItem: Partial<
+      Record<keyof ObjectMetadataItem, unknown>
+    > = {
       createdAt: 'invalid date',
-      dataSourceId: 'invalid uuid',
       fields: 'not an array',
       icon: 'invalid icon',
       isActive: 'not a boolean',
       isCustom: 'not a boolean',
       isSystem: 'not a boolean',
+      labelIdentifierFieldMetadataId: 'not a uuid',
       labelPlural: 123,
       labelSingular: 123,
       namePlural: 'notCamelCase',
@@ -41,4 +63,22 @@ describe('objectMetadataItemSchema', () => {
     // Then
     expect(result.success).toBe(false);
   });
+
+  it('should fail to parse empty string as LabelIdentifier', () => {
+    const emptyString = '';
+    const result =
+      objectMetadataItemSchema.shape.labelIdentifierFieldMetadataId.safeParse(
+        emptyString,
+      );
+    expect(result.success).toBe(false);
+  });
+
+  it('should succeed to parse valid uuid as LabelIdentifier', () => {
+    const validUuid = '20202020-ae24-4871-b445-10cc8872cb10';
+    const result =
+      objectMetadataItemSchema.shape.labelIdentifierFieldMetadataId.safeParse(
+        validUuid,
+      );
+    expect(result.success).toBe(true);
+  });
 });
diff --git a/packages/twenty-front/src/modules/object-metadata/validation-schemas/objectMetadataItemSchema.ts b/packages/twenty-front/src/modules/object-metadata/validation-schemas/objectMetadataItemSchema.ts
index 1c40e625864d..84ed6083cc7e 100644
--- a/packages/twenty-front/src/modules/object-metadata/validation-schemas/objectMetadataItemSchema.ts
+++ b/packages/twenty-front/src/modules/object-metadata/validation-schemas/objectMetadataItemSchema.ts
@@ -20,7 +20,7 @@ export const objectMetadataItemSchema = z.object({
   isCustom: z.boolean(),
   isRemote: z.boolean(),
   isSystem: z.boolean(),
-  labelIdentifierFieldMetadataId: z.string().uuid().nullable(),
+  labelIdentifierFieldMetadataId: z.string().uuid(),
   labelPlural: metadataLabelSchema(),
   labelSingular: metadataLabelSchema(),
   namePlural: camelCaseStringSchema,
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsx
index 9dc5afd2fee6..abd71f5ac2fe 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterAddFilterRuleSelect.tsx
@@ -1,6 +1,6 @@
 import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById';
 import { useUpsertCombinedViewFilterGroup } from '@/object-record/advanced-filter/hooks/useUpsertCombinedViewFilterGroup';
-import { getOperandsForFilterDefinition } from '@/object-record/object-filter-dropdown/utils/getOperandsForFilterType';
+import { getRecordFilterOperandsForRecordFilterDefinition } from '@/object-record/record-filter/utils/getRecordFilterOperandsForRecordFilterDefinition';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
@@ -81,7 +81,9 @@ export const AdvancedFilterAddFilterRuleSelect = ({
     upsertCombinedViewFilter({
       id: v4(),
       fieldMetadataId: defaultFilterDefinition.fieldMetadataId,
-      operand: getOperandsForFilterDefinition(defaultFilterDefinition)[0],
+      operand: getRecordFilterOperandsForRecordFilterDefinition(
+        defaultFilterDefinition,
+      )[0],
       definition: defaultFilterDefinition,
       value: '',
       displayValue: '',
@@ -112,7 +114,9 @@ export const AdvancedFilterAddFilterRuleSelect = ({
     upsertCombinedViewFilter({
       id: v4(),
       fieldMetadataId: defaultFilterDefinition.fieldMetadataId,
-      operand: getOperandsForFilterDefinition(defaultFilterDefinition)[0],
+      operand: getRecordFilterOperandsForRecordFilterDefinition(
+        defaultFilterDefinition,
+      )[0],
       definition: defaultFilterDefinition,
       value: '',
       displayValue: '',
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterViewFilter.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterViewFilter.tsx
index 481bbc8d4fcb..1bf7e3bf80cc 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterViewFilter.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterViewFilter.tsx
@@ -2,7 +2,7 @@ import { AdvancedFilterViewFilterFieldSelect } from '@/object-record/advanced-fi
 import { AdvancedFilterViewFilterOperandSelect } from '@/object-record/advanced-filter/components/AdvancedFilterViewFilterOperandSelect';
 import { AdvancedFilterViewFilterValueInput } from '@/object-record/advanced-filter/components/AdvancedFilterViewFilterValueInput';
 import { useCurrentViewFilter } from '@/object-record/advanced-filter/hooks/useCurrentViewFilter';
-import { ObjectFilterDropdownScope } from '@/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope';
+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
 import { configurableViewFilterOperands } from '@/object-record/object-filter-dropdown/utils/configurableViewFilterOperands';
 import styled from '@emotion/styled';
 
@@ -32,7 +32,9 @@ export const AdvancedFilterViewFilter = ({
   }
 
   return (
-    <ObjectFilterDropdownScope filterScopeId={filter.id}>
+    <ObjectFilterDropdownComponentInstanceContext.Provider
+      value={{ instanceId: filter.id }}
+    >
       <StyledRow>
         <AdvancedFilterViewFilterFieldSelect viewFilterId={filter.id} />
         <AdvancedFilterViewFilterOperandSelect viewFilterId={filter.id} />
@@ -42,6 +44,6 @@ export const AdvancedFilterViewFilter = ({
           )}
         </StyledValueDropdownContainer>
       </StyledRow>
-    </ObjectFilterDropdownScope>
+    </ObjectFilterDropdownComponentInstanceContext.Provider>
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterViewFilterFieldSelect.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterViewFilterFieldSelect.tsx
index ad679c293517..290aa037d4b1 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterViewFilterFieldSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterViewFilterFieldSelect.tsx
@@ -2,11 +2,13 @@ import { useAdvancedFilterDropdown } from '@/object-record/advanced-filter/hooks
 import { useCurrentViewFilter } from '@/object-record/advanced-filter/hooks/useCurrentViewFilter';
 import { ObjectFilterDropdownFilterSelect } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelect';
 import { ObjectFilterDropdownFilterSelectCompositeFieldSubMenu } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectCompositeFieldSubMenu';
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { advancedFilterViewFilterGroupIdComponentState } from '@/object-record/object-filter-dropdown/states/advancedFilterViewFilterGroupIdComponentState';
+import { advancedFilterViewFilterIdComponentState } from '@/object-record/object-filter-dropdown/states/advancedFilterViewFilterIdComponentState';
 import { objectFilterDropdownIsSelectingCompositeFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState';
 import { SelectControl } from '@/ui/input/components/SelectControl';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 import { ADVANCED_FILTER_DROPDOWN_ID } from '@/views/constants/AdvancedFilterDropdownId';
 import styled from '@emotion/styled';
 
@@ -27,8 +29,13 @@ export const AdvancedFilterViewFilterFieldSelect = ({
 
   const selectedFieldLabel = filter?.definition.label ?? '';
 
-  const { setAdvancedFilterViewFilterGroupId, setAdvancedFilterViewFilterId } =
-    useFilterDropdown();
+  const setAdvancedFilterViewFilterId = useSetRecoilComponentStateV2(
+    advancedFilterViewFilterIdComponentState,
+  );
+
+  const setAdvancedFilterViewFilterGroupId = useSetRecoilComponentStateV2(
+    advancedFilterViewFilterGroupIdComponentState,
+  );
 
   const [objectFilterDropdownIsSelectingCompositeField] =
     useRecoilComponentStateV2(
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterViewFilterOperandSelect.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterViewFilterOperandSelect.tsx
index fe97ec335950..eda1fe1c1a41 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterViewFilterOperandSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterViewFilterOperandSelect.tsx
@@ -1,7 +1,7 @@
 import { useCurrentViewFilter } from '@/object-record/advanced-filter/hooks/useCurrentViewFilter';
 import { getInitialFilterValue } from '@/object-record/object-filter-dropdown/utils/getInitialFilterValue';
 import { getOperandLabel } from '@/object-record/object-filter-dropdown/utils/getOperandLabel';
-import { getOperandsForFilterDefinition } from '@/object-record/object-filter-dropdown/utils/getOperandsForFilterType';
+import { getRecordFilterOperandsForRecordFilterDefinition } from '@/object-record/record-filter/utils/getRecordFilterOperandsForRecordFilterDefinition';
 import { SelectControl } from '@/ui/input/components/SelectControl';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -56,7 +56,7 @@ export const AdvancedFilterViewFilterOperandSelect = ({
   };
 
   const operandsForFilterType = isDefined(filter?.definition)
-    ? getOperandsForFilterDefinition(filter.definition)
+    ? getRecordFilterOperandsForRecordFilterDefinition(filter.definition)
     : [];
 
   if (isDisabled === true) {
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterViewFilterValueInput.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterViewFilterValueInput.tsx
index 7ad454afa55c..e401914186b1 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterViewFilterValueInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/components/AdvancedFilterViewFilterValueInput.tsx
@@ -1,9 +1,12 @@
 import { useCurrentViewFilter } from '@/object-record/advanced-filter/hooks/useCurrentViewFilter';
 import { ObjectFilterDropdownFilterInput } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterInput';
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
+import { selectedFilterComponentState } from '@/object-record/object-filter-dropdown/states/selectedFilterComponentState';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
 import { SelectControl } from '@/ui/input/components/SelectControl';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 import { ADVANCED_FILTER_DROPDOWN_ID } from '@/views/constants/AdvancedFilterDropdownId';
 
 type AdvancedFilterViewFilterValueInputProps = {
@@ -19,11 +22,17 @@ export const AdvancedFilterViewFilterValueInput = ({
 
   const isDisabled = !filter?.fieldMetadataId || !filter.operand;
 
-  const {
-    setFilterDefinitionUsedInDropdown,
-    setSelectedOperandInDropdown,
-    setSelectedFilter,
-  } = useFilterDropdown();
+  const setFilterDefinitionUsedInDropdown = useSetRecoilComponentStateV2(
+    filterDefinitionUsedInDropdownComponentState,
+  );
+
+  const setSelectedOperandInDropdown = useSetRecoilComponentStateV2(
+    selectedOperandInDropdownComponentState,
+  );
+
+  const setSelectedFilter = useSetRecoilComponentStateV2(
+    selectedFilterComponentState,
+  );
 
   if (isDisabled) {
     return (
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordNodeFromRecord.ts b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordNodeFromRecord.ts
index 21db7bcf49f4..66c58312b14c 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/getRecordNodeFromRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/getRecordNodeFromRecord.ts
@@ -60,9 +60,9 @@ export const getRecordNodeFromRecord = <T extends ObjectRecord>({
         }
 
         if (
-          field.type === FieldMetadataType.Relation &&
+          field.type === FieldMetadataType.RELATION &&
           field.relationDefinition?.direction ===
-            RelationDefinitionType.OneToMany
+            RelationDefinitionType.ONE_TO_MANY
         ) {
           const oneToManyObjectMetadataItem = objectMetadataItems.find(
             (item) =>
@@ -93,7 +93,7 @@ export const getRecordNodeFromRecord = <T extends ObjectRecord>({
         }
 
         switch (field.type) {
-          case FieldMetadataType.Relation: {
+          case FieldMetadataType.RELATION: {
             if (
               isUndefined(
                 field.relationDefinition?.targetObjectMetadata.nameSingular,
@@ -131,10 +131,10 @@ export const getRecordNodeFromRecord = <T extends ObjectRecord>({
               },
             ];
           }
-          case FieldMetadataType.Links:
-          case FieldMetadataType.Address:
-          case FieldMetadataType.FullName:
-          case FieldMetadataType.Currency: {
+          case FieldMetadataType.LINKS:
+          case FieldMetadataType.ADDRESS:
+          case FieldMetadataType.FULL_NAME:
+          case FieldMetadataType.CURRENCY: {
             return [
               fieldName,
               {
diff --git a/packages/twenty-front/src/modules/object-record/constants/FieldsNotOverwrittenAtDraft.ts b/packages/twenty-front/src/modules/object-record/constants/FieldsNotOverwrittenAtDraft.ts
index 86397c9afb25..99607f21d7bb 100644
--- a/packages/twenty-front/src/modules/object-record/constants/FieldsNotOverwrittenAtDraft.ts
+++ b/packages/twenty-front/src/modules/object-record/constants/FieldsNotOverwrittenAtDraft.ts
@@ -1,7 +1,7 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 export const FIELD_NOT_OVERWRITTEN_AT_DRAFT = [
-  FieldMetadataType.Address,
-  FieldMetadataType.Phones,
-  FieldMetadataType.Links,
+  FieldMetadataType.ADDRESS,
+  FieldMetadataType.PHONES,
+  FieldMetadataType.LINKS,
 ];
diff --git a/packages/twenty-front/src/modules/object-record/graphql/types/RecordGqlFieldsAggregate.ts b/packages/twenty-front/src/modules/object-record/graphql/types/RecordGqlFieldsAggregate.ts
index 990a73181d4d..71f36ee4d8a1 100644
--- a/packages/twenty-front/src/modules/object-record/graphql/types/RecordGqlFieldsAggregate.ts
+++ b/packages/twenty-front/src/modules/object-record/graphql/types/RecordGqlFieldsAggregate.ts
@@ -1,3 +1,6 @@
-import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
+import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
 
-export type RecordGqlFieldsAggregate = Record<string, AGGREGATE_OPERATIONS[]>;
+export type RecordGqlFieldsAggregate = Record<
+  string,
+  ExtendedAggregateOperations[]
+>;
diff --git a/packages/twenty-front/src/modules/object-record/graphql/types/RecordGqlOperationFilter.ts b/packages/twenty-front/src/modules/object-record/graphql/types/RecordGqlOperationFilter.ts
index 1d4fb29bc991..c973e687c55b 100644
--- a/packages/twenty-front/src/modules/object-record/graphql/types/RecordGqlOperationFilter.ts
+++ b/packages/twenty-front/src/modules/object-record/graphql/types/RecordGqlOperationFilter.ts
@@ -103,7 +103,6 @@ export type EmailsFilter = {
 
 export type PhonesFilter = {
   primaryPhoneNumber?: StringFilter;
-  primaryPhoneCountryCode?: StringFilter;
 };
 
 export type SelectFilter = {
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useAggregateRecordsQuery.test.tsx b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useAggregateRecordsQuery.test.tsx
index 6157455bf3cf..7b94218aa0a1 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useAggregateRecordsQuery.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useAggregateRecordsQuery.test.tsx
@@ -17,25 +17,26 @@ const mockObjectMetadataItem: ObjectMetadataItem = {
   labelSingular: 'Company',
   labelPlural: 'Companies',
   isCustom: false,
+  labelIdentifierFieldMetadataId: '20202020-dd4a-4ea4-bb7b-1c7300491b65',
   isActive: true,
   createdAt: new Date().toISOString(),
   updatedAt: new Date().toISOString(),
   fields: [
     {
-      id: 'field-1',
+      id: '20202020-fed9-4ce5-9502-02a8efaf46e1',
       name: 'amount',
       label: 'Amount',
-      type: FieldMetadataType.Number,
+      type: FieldMetadataType.NUMBER,
       isCustom: false,
       isActive: true,
       createdAt: new Date().toISOString(),
       updatedAt: new Date().toISOString(),
     } as FieldMetadataItem,
     {
-      id: 'field-2',
+      id: '20202020-dd4a-4ea4-bb7b-1c7300491b65',
       name: 'name',
       label: 'Name',
-      type: FieldMetadataType.Text,
+      type: FieldMetadataType.TEXT,
       isCustom: false,
       isActive: true,
       createdAt: new Date().toISOString(),
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useRefetchAggregateQueries.test.tsx b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useRefetchAggregateQueries.test.tsx
index c8b65a08a8fb..9b54ad301350 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useRefetchAggregateQueries.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useRefetchAggregateQueries.test.tsx
@@ -1,6 +1,5 @@
 import { useRefetchAggregateQueries } from '@/object-record/hooks/useRefetchAggregateQueries';
 import { getAggregateQueryName } from '@/object-record/utils/getAggregateQueryName';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 import { useApolloClient } from '@apollo/client';
 import { renderHook } from '@testing-library/react';
 
@@ -8,16 +7,6 @@ jest.mock('@apollo/client', () => ({
   useApolloClient: jest.fn(),
 }));
 
-jest.mock('@/workspace/hooks/useIsFeatureEnabled', () => ({
-  useIsFeatureEnabled: jest.fn(),
-}));
-
-jest.mock('~/generated/graphql', () => ({
-  FeatureFlagKey: {
-    IsAggregateQueryEnabled: 'IsAggregateQueryEnabled',
-  },
-}));
-
 describe('useRefetchAggregateQueries', () => {
   const mockRefetchQueries = jest.fn();
   const mockApolloClient = {
@@ -29,9 +18,8 @@ describe('useRefetchAggregateQueries', () => {
     (useApolloClient as jest.Mock).mockReturnValue(mockApolloClient);
   });
 
-  it('should refetch queries when feature flag is enabled', async () => {
+  it('should refetch queries', async () => {
     // Arrange
-    (useIsFeatureEnabled as jest.Mock).mockReturnValue(true);
     const objectMetadataNamePlural = 'opportunities';
     const expectedQueryName = getAggregateQueryName(objectMetadataNamePlural);
 
@@ -48,24 +36,8 @@ describe('useRefetchAggregateQueries', () => {
     });
   });
 
-  it('should not refetch queries when feature flag is disabled', async () => {
-    // Arrange
-    (useIsFeatureEnabled as jest.Mock).mockReturnValue(false);
-    const objectMetadataNamePlural = 'opportunities';
-
-    // Act
-    const { result } = renderHook(() =>
-      useRefetchAggregateQueries({ objectMetadataNamePlural }),
-    );
-    await result.current.refetchAggregateQueries();
-
-    // Assert
-    expect(mockRefetchQueries).not.toHaveBeenCalled();
-  });
-
   it('should handle errors during refetch', async () => {
     // Arrange
-    (useIsFeatureEnabled as jest.Mock).mockReturnValue(true);
     const error = new Error('Refetch failed');
     mockRefetchQueries.mockRejectedValue(error);
     const objectMetadataNamePlural = 'opportunities';
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useAggregateRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useAggregateRecords.ts
index 2a3b6357897a..19262db753c2 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useAggregateRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useAggregateRecords.ts
@@ -5,13 +5,13 @@ import { RecordGqlFieldsAggregate } from '@/object-record/graphql/types/RecordGq
 import { RecordGqlOperationFilter } from '@/object-record/graphql/types/RecordGqlOperationFilter';
 import { RecordGqlOperationFindManyResult } from '@/object-record/graphql/types/RecordGqlOperationFindManyResult';
 import { useAggregateRecordsQuery } from '@/object-record/hooks/useAggregateRecordsQuery';
-import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
+import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
 import isEmpty from 'lodash.isempty';
 import { isDefined } from 'twenty-ui';
 
 export type AggregateRecordsData = {
   [fieldName: string]: {
-    [operation in AGGREGATE_OPERATIONS]?: string | number | undefined;
+    [operation in ExtendedAggregateOperations]?: string | number | undefined;
   };
 };
 
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useAggregateRecordsQuery.ts b/packages/twenty-front/src/modules/object-record/hooks/useAggregateRecordsQuery.ts
index ea87546fe88b..3333ae2817ba 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useAggregateRecordsQuery.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useAggregateRecordsQuery.ts
@@ -1,7 +1,7 @@
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { RecordGqlFields } from '@/object-record/graphql/types/RecordGqlFields';
 import { RecordGqlFieldsAggregate } from '@/object-record/graphql/types/RecordGqlFieldsAggregate';
-import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
+import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
 import { generateAggregateQuery } from '@/object-record/utils/generateAggregateQuery';
 import { getAvailableAggregationsFromObjectFields } from '@/object-record/utils/getAvailableAggregationsFromObjectFields';
 import { useMemo } from 'react';
@@ -10,7 +10,7 @@ import { isDefined } from 'twenty-ui';
 export type GqlFieldToFieldMap = {
   [gqlField: string]: [
     fieldName: string,
-    aggregateOperation: AGGREGATE_OPERATIONS,
+    aggregateOperation: ExtendedAggregateOperations,
   ];
 };
 
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useRefetchAggregateQueries.ts b/packages/twenty-front/src/modules/object-record/hooks/useRefetchAggregateQueries.ts
index 019a52735c21..8176af7a7056 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useRefetchAggregateQueries.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useRefetchAggregateQueries.ts
@@ -1,7 +1,5 @@
 import { getAggregateQueryName } from '@/object-record/utils/getAggregateQueryName';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 import { useApolloClient } from '@apollo/client';
-import { FeatureFlagKey } from '~/generated/graphql';
 
 export const useRefetchAggregateQueries = ({
   objectMetadataNamePlural,
@@ -9,17 +7,13 @@ export const useRefetchAggregateQueries = ({
   objectMetadataNamePlural: string;
 }) => {
   const apolloClient = useApolloClient();
-  const isAggregateQueryEnabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsAggregateQueryEnabled,
-  );
+
   const refetchAggregateQueries = async () => {
-    if (isAggregateQueryEnabled) {
-      const queryName = getAggregateQueryName(objectMetadataNamePlural);
+    const queryName = getAggregateQueryName(objectMetadataNamePlural);
 
-      await apolloClient.refetchQueries({
-        include: [queryName],
-      });
-    }
+    await apolloClient.refetchQueries({
+      include: [queryName],
+    });
   };
 
   return {
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/AddObjectFilterFromDetailsButton.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/AddObjectFilterFromDetailsButton.tsx
index 21d407471462..739ab783d1cb 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/AddObjectFilterFromDetailsButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/AddObjectFilterFromDetailsButton.tsx
@@ -1,9 +1,9 @@
 import { IconPlus, LightButton } from 'twenty-ui';
 
 import { OBJECT_FILTER_DROPDOWN_ID } from '@/object-record/object-filter-dropdown/constants/ObjectFilterDropdownId';
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 
+import { useResetFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useResetFilterDropdown';
 type AddObjectFilterFromDetailsButtonProps = {
   filterDropdownId?: string;
 };
@@ -13,12 +13,10 @@ export const AddObjectFilterFromDetailsButton = ({
 }: AddObjectFilterFromDetailsButtonProps) => {
   const { toggleDropdown } = useDropdown(OBJECT_FILTER_DROPDOWN_ID);
 
-  const { resetFilter } = useFilterDropdown({
-    filterDropdownId: filterDropdownId,
-  });
+  const { resetFilterDropdown } = useResetFilterDropdown(filterDropdownId);
 
   const handleClick = () => {
-    resetFilter();
+    resetFilterDropdown();
     toggleDropdown();
   };
 
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/AdvancedFilterButton.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/AdvancedFilterButton.tsx
index 542aed2e14db..d7e2d8444523 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/AdvancedFilterButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/AdvancedFilterButton.tsx
@@ -1,7 +1,7 @@
 import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById';
 import { useUpsertCombinedViewFilterGroup } from '@/object-record/advanced-filter/hooks/useUpsertCombinedViewFilterGroup';
 import { OBJECT_FILTER_DROPDOWN_ID } from '@/object-record/object-filter-dropdown/constants/ObjectFilterDropdownId';
-import { getOperandsForFilterDefinition } from '@/object-record/object-filter-dropdown/utils/getOperandsForFilterType';
+import { getRecordFilterOperandsForRecordFilterDefinition } from '@/object-record/record-filter/utils/getRecordFilterOperandsForRecordFilterDefinition';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { ADVANCED_FILTER_DROPDOWN_ID } from '@/views/constants/AdvancedFilterDropdownId';
@@ -102,7 +102,9 @@ export const AdvancedFilterButton = () => {
       upsertCombinedViewFilter({
         id: v4(),
         fieldMetadataId: defaultFilterDefinition.fieldMetadataId,
-        operand: getOperandsForFilterDefinition(defaultFilterDefinition)[0],
+        operand: getRecordFilterOperandsForRecordFilterDefinition(
+          defaultFilterDefinition,
+        )[0],
         definition: defaultFilterDefinition,
         value: '',
         displayValue: '',
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/GenericEntityFilterChip.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/GenericEntityFilterChip.tsx
index 2815490a20cb..447608e8ffbc 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/GenericEntityFilterChip.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/GenericEntityFilterChip.tsx
@@ -1,9 +1,9 @@
 import { AvatarChip, IconComponent } from 'twenty-ui';
 
-import { Filter } from '../types/Filter';
+import { RecordFilter } from '../../record-filter/types/RecordFilter';
 
 type GenericEntityFilterChipProps = {
-  filter: Filter;
+  filter: RecordFilter;
   Icon?: IconComponent;
 };
 
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersButton.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersButton.tsx
index 066cc9fb343f..41c04e37261f 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersButton.tsx
@@ -1,24 +1,24 @@
 import { OBJECT_FILTER_DROPDOWN_ID } from '@/object-record/object-filter-dropdown/constants/ObjectFilterDropdownId';
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { useResetFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useResetFilterDropdown';
 import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 
 export const MultipleFiltersButton = () => {
-  const { resetFilter } = useFilterDropdown();
+  const { resetFilterDropdown } = useResetFilterDropdown();
 
-  const { isDropdownOpen, toggleDropdown } = useDropdown(
+  const { toggleDropdown, isDropdownOpen } = useDropdown(
     OBJECT_FILTER_DROPDOWN_ID,
   );
 
   const handleClick = () => {
     toggleDropdown();
-    resetFilter();
+    resetFilterDropdown();
   };
 
   return (
     <StyledHeaderDropdownButton
-      isUnfolded={isDropdownOpen}
       onClick={handleClick}
+      isUnfolded={isDropdownOpen}
     >
       Filter
     </StyledHeaderDropdownButton>
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownButton.tsx
index 0ba1d9146069..2ed3ece59c6d 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownButton.tsx
@@ -1,5 +1,5 @@
 import { OBJECT_FILTER_DROPDOWN_ID } from '@/object-record/object-filter-dropdown/constants/ObjectFilterDropdownId';
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { useResetFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useResetFilterDropdown';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
 import { useCallback } from 'react';
@@ -14,11 +14,11 @@ type MultipleFiltersDropdownButtonProps = {
 export const MultipleFiltersDropdownButton = ({
   hotkeyScope,
 }: MultipleFiltersDropdownButtonProps) => {
-  const { resetFilter } = useFilterDropdown();
+  const { resetFilterDropdown } = useResetFilterDropdown();
 
   const handleDropdownClose = useCallback(() => {
-    resetFilter();
-  }, [resetFilter]);
+    resetFilterDropdown();
+  }, [resetFilterDropdown]);
 
   return (
     <Dropdown
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownContent.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownContent.tsx
index 43f9e4faf4f3..08c3d8b06f01 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownContent.tsx
@@ -1,11 +1,10 @@
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
-
 import { ObjectFilterDropdownFilterSelectCompositeFieldSubMenu } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectCompositeFieldSubMenu';
 import { ObjectFilterOperandSelectAndInput } from '@/object-record/object-filter-dropdown/components/ObjectFilterOperandSelectAndInput';
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
 import { objectFilterDropdownFilterIsSelectedComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownFilterIsSelectedComponentState';
 import { objectFilterDropdownIsSelectingCompositeFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState';
 import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2';
-import { useRecoilValue } from 'recoil';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { MultipleFiltersDropdownFilterOnFilterChangedEffect } from './MultipleFiltersDropdownFilterOnFilterChangedEffect';
 import { ObjectFilterDropdownFilterSelect } from './ObjectFilterDropdownFilterSelect';
 
@@ -16,9 +15,10 @@ type MultipleFiltersDropdownContentProps = {
 export const MultipleFiltersDropdownContent = ({
   filterDropdownId,
 }: MultipleFiltersDropdownContentProps) => {
-  const { filterDefinitionUsedInDropdownState } = useFilterDropdown({
+  const filterDefinitionUsedInDropdown = useRecoilComponentValueV2(
+    filterDefinitionUsedInDropdownComponentState,
     filterDropdownId,
-  });
+  );
 
   const [objectFilterDropdownIsSelectingCompositeField] =
     useRecoilComponentStateV2(
@@ -31,10 +31,6 @@ export const MultipleFiltersDropdownContent = ({
     filterDropdownId,
   );
 
-  const filterDefinitionUsedInDropdown = useRecoilValue(
-    filterDefinitionUsedInDropdownState,
-  );
-
   const shouldShowCompositeSelectionSubMenu =
     objectFilterDropdownIsSelectingCompositeField;
 
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownBooleanSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownBooleanSelect.tsx
index 9a550ea9d556..6c7ac92433ed 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownBooleanSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownBooleanSelect.tsx
@@ -1,15 +1,18 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { useEffect, useState } from 'react';
-import { useRecoilValue } from 'recoil';
 import { v4 } from 'uuid';
 
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
+import { selectedFilterComponentState } from '@/object-record/object-filter-dropdown/states/selectedFilterComponentState';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
+import { useApplyRecordFilter } from '@/object-record/record-filter/hooks/useApplyRecordFilter';
 import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
 import { BooleanDisplay } from '@/ui/field/display/components/BooleanDisplay';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { IconCheck } from 'twenty-ui';
 import { isDefined } from '~/utils/isDefined';
 
@@ -36,22 +39,21 @@ export const ObjectFilterDropdownBooleanSelect = () => {
   const theme = useTheme();
   const options = [true, false];
 
-  const {
-    filterDefinitionUsedInDropdownState,
-    selectedOperandInDropdownState,
-    selectedFilterState,
-    selectFilter,
-  } = useFilterDropdown();
-
-  const { closeDropdown } = useDropdown();
+  const filterDefinitionUsedInDropdown = useRecoilComponentValueV2(
+    filterDefinitionUsedInDropdownComponentState,
+  );
 
-  const filterDefinitionUsedInDropdown = useRecoilValue(
-    filterDefinitionUsedInDropdownState,
+  const selectedOperandInDropdown = useRecoilComponentValueV2(
+    selectedOperandInDropdownComponentState,
   );
-  const selectedOperandInDropdown = useRecoilValue(
-    selectedOperandInDropdownState,
+
+  const selectedFilter = useRecoilComponentValueV2(
+    selectedFilterComponentState,
   );
-  const selectedFilter = useRecoilValue(selectedFilterState);
+
+  const { applyRecordFilter } = useApplyRecordFilter();
+
+  const { closeDropdown } = useDropdown();
 
   const [selectedValue, setSelectedValue] = useState<boolean | undefined>(
     selectedFilter?.value === 'true',
@@ -69,7 +71,7 @@ export const ObjectFilterDropdownBooleanSelect = () => {
       return;
     }
 
-    selectFilter({
+    applyRecordFilter({
       id: selectedFilter?.id ?? v4(),
       definition: filterDefinitionUsedInDropdown,
       operand: selectedOperandInDropdown,
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton.tsx
index 895adf219502..74f37a680620 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton.tsx
@@ -1,4 +1,3 @@
-import { ObjectFilterDropdownScope } from '@/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
 
 import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
@@ -33,13 +32,11 @@ export const ObjectFilterDropdownButton = ({
     <ObjectFilterDropdownComponentInstanceContext.Provider
       value={{ instanceId: filterDropdownId }}
     >
-      <ObjectFilterDropdownScope filterScopeId={filterDropdownId}>
-        {hasOnlyOneEntityFilter ? (
-          <SingleEntityObjectFilterDropdownButton hotkeyScope={hotkeyScope} />
-        ) : (
-          <MultipleFiltersDropdownButton hotkeyScope={hotkeyScope} />
-        )}
-      </ObjectFilterDropdownScope>
+      {hasOnlyOneEntityFilter ? (
+        <SingleEntityObjectFilterDropdownButton hotkeyScope={hotkeyScope} />
+      ) : (
+        <MultipleFiltersDropdownButton hotkeyScope={hotkeyScope} />
+      )}
     </ObjectFilterDropdownComponentInstanceContext.Provider>
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateInput.tsx
index 6a90b16f0ce3..3fdec73c59aa 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateInput.tsx
@@ -1,10 +1,12 @@
-import { useRecoilValue } from 'recoil';
 import { v4 } from 'uuid';
 
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
+import { selectedFilterComponentState } from '@/object-record/object-filter-dropdown/states/selectedFilterComponentState';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
 import { getRelativeDateDisplayValue } from '@/object-record/object-filter-dropdown/utils/getRelativeDateDisplayValue';
-import { InternalDatePicker } from '@/ui/input/components/internal/date/components/InternalDatePicker';
+import { useApplyRecordFilter } from '@/object-record/record-filter/hooks/useApplyRecordFilter';
+import { DateTimePicker } from '@/ui/input/components/internal/date/components/InternalDatePicker';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 import { computeVariableDateViewFilterValue } from '@/views/view-filter-value/utils/computeVariableDateViewFilterValue';
 import {
@@ -17,24 +19,19 @@ import { isDefined } from 'twenty-ui';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 export const ObjectFilterDropdownDateInput = () => {
-  const {
-    filterDefinitionUsedInDropdownState,
-    selectedOperandInDropdownState,
-    selectedFilterState,
-    selectFilter,
-  } = useFilterDropdown();
-
-  const filterDefinitionUsedInDropdown = useRecoilValue(
-    filterDefinitionUsedInDropdownState,
+  const filterDefinitionUsedInDropdown = useRecoilComponentValueV2(
+    filterDefinitionUsedInDropdownComponentState,
   );
-  const selectedOperandInDropdown = useRecoilValue(
-    selectedOperandInDropdownState,
+
+  const selectedOperandInDropdown = useRecoilComponentValueV2(
+    selectedOperandInDropdownComponentState,
+  );
+
+  const selectedFilter = useRecoilComponentValueV2(
+    selectedFilterComponentState,
   );
 
-  const selectedFilter = useRecoilValue(selectedFilterState) as
-    | (Filter & { definition: { type: 'DATE' | 'DATE_TIME' } })
-    | null
-    | undefined;
+  const { applyRecordFilter } = useApplyRecordFilter();
 
   const initialFilterValue = selectedFilter
     ? resolveDateViewFilterValue(selectedFilter)
@@ -44,14 +41,14 @@ export const ObjectFilterDropdownDateInput = () => {
   );
 
   const isDateTimeInput =
-    filterDefinitionUsedInDropdown?.type === FieldMetadataType.DateTime;
+    filterDefinitionUsedInDropdown?.type === FieldMetadataType.DATE_TIME;
 
   const handleAbsoluteDateChange = (newDate: Date | null) => {
     setInternalDate(newDate);
 
     if (!filterDefinitionUsedInDropdown || !selectedOperandInDropdown) return;
 
-    selectFilter?.({
+    applyRecordFilter({
       id: selectedFilter?.id ? selectedFilter.id : v4(),
       fieldMetadataId: filterDefinitionUsedInDropdown.fieldMetadataId,
       value: newDate?.toISOString() ?? '',
@@ -83,7 +80,7 @@ export const ObjectFilterDropdownDateInput = () => {
         )
       : '';
 
-    selectFilter?.({
+    applyRecordFilter({
       id: selectedFilter?.id ? selectedFilter.id : v4(),
       fieldMetadataId: filterDefinitionUsedInDropdown.fieldMetadataId,
       value,
@@ -107,14 +104,14 @@ export const ObjectFilterDropdownDateInput = () => {
       : undefined;
 
   return (
-    <InternalDatePicker
+    <DateTimePicker
       relativeDate={relativeDate}
       highlightedDateRange={relativeDate}
       isRelative={isRelativeOperand}
       date={internalDate}
       onChange={handleAbsoluteDateChange}
       onRelativeDateChange={handleRelativeDateChange}
-      onMouseSelect={handleAbsoluteDateChange}
+      onClose={handleAbsoluteDateChange}
       isDateTimeInput={isDateTimeInput}
     />
   );
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterInput.tsx
index 7664504bba44..6d792baa8ebc 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterInput.tsx
@@ -1,5 +1,3 @@
-import { useRecoilValue } from 'recoil';
-
 import { ObjectFilterDropdownDateInput } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateInput';
 import { ObjectFilterDropdownNumberInput } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownNumberInput';
 import { ObjectFilterDropdownOptionSelect } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect';
@@ -8,7 +6,6 @@ import { ObjectFilterDropdownRecordSelect } from '@/object-record/object-filter-
 import { ObjectFilterDropdownSearchInput } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownSearchInput';
 import { ObjectFilterDropdownSourceSelect } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownSourceSelect';
 import { ObjectFilterDropdownTextSearchInput } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownTextSearchInput';
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
 import { isActorSourceCompositeFilter } from '@/object-record/object-filter-dropdown/utils/isActorSourceCompositeFilter';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
@@ -18,6 +15,9 @@ import { ObjectFilterDropdownBooleanSelect } from '@/object-record/object-filter
 import { DATE_FILTER_TYPES } from '@/object-record/object-filter-dropdown/constants/DateFilterTypes';
 import { NUMBER_FILTER_TYPES } from '@/object-record/object-filter-dropdown/constants/NumberFilterTypes';
 import { TEXT_FILTER_TYPES } from '@/object-record/object-filter-dropdown/constants/TextFilterTypes';
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 
 type ObjectFilterDropdownFilterInputProps = {
   filterDropdownId?: string;
@@ -26,17 +26,13 @@ type ObjectFilterDropdownFilterInputProps = {
 export const ObjectFilterDropdownFilterInput = ({
   filterDropdownId,
 }: ObjectFilterDropdownFilterInputProps) => {
-  const {
-    filterDefinitionUsedInDropdownState,
-    selectedOperandInDropdownState,
-  } = useFilterDropdown({ filterDropdownId });
-
-  const filterDefinitionUsedInDropdown = useRecoilValue(
-    filterDefinitionUsedInDropdownState,
+  const filterDefinitionUsedInDropdown = useRecoilComponentValueV2(
+    filterDefinitionUsedInDropdownComponentState,
+    filterDropdownId,
   );
-
-  const selectedOperandInDropdown = useRecoilValue(
-    selectedOperandInDropdownState,
+  const selectedOperandInDropdown = useRecoilComponentValueV2(
+    selectedOperandInDropdownComponentState,
+    filterDropdownId,
   );
 
   const isConfigurable =
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelect.tsx
index 0e465e57220e..e865ef082964 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelect.tsx
@@ -6,9 +6,9 @@ import { useAdvancedFilterDropdown } from '@/object-record/advanced-filter/hooks
 import { AdvancedFilterButton } from '@/object-record/object-filter-dropdown/components/AdvancedFilterButton';
 import { ObjectFilterDropdownFilterSelectMenuItem } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem';
 import { OBJECT_FILTER_DROPDOWN_ID } from '@/object-record/object-filter-dropdown/constants/ObjectFilterDropdownId';
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
-import { useSelectFilter } from '@/object-record/object-filter-dropdown/hooks/useSelectFilter';
-import { FiltersHotkeyScope } from '@/object-record/object-filter-dropdown/types/FiltersHotkeyScope';
+import { useSelectFilterDefinitionUsedInDropdown } from '@/object-record/object-filter-dropdown/hooks/useSelectFilterDefinitionUsedInDropdown';
+import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState';
+
 import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
 import { hiddenTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/hiddenTableColumnsComponentSelector';
 import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector';
@@ -17,13 +17,15 @@ import { SelectableItem } from '@/ui/layout/selectable-list/components/Selectabl
 import { SelectableList } from '@/ui/layout/selectable-list/components/SelectableList';
 import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
 import { availableFilterDefinitionsComponentState } from '@/views/states/availableFilterDefinitionsComponentState';
 import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
-import { useRecoilValue } from 'recoil';
 import { isDefined } from 'twenty-ui';
 import { FeatureFlagKey } from '~/generated/graphql';
 
+import { advancedFilterViewFilterIdComponentState } from '@/object-record/object-filter-dropdown/states/advancedFilterViewFilterIdComponentState';
+import { FiltersHotkeyScope } from '@/object-record/object-filter-dropdown/types/FiltersHotkeyScope';
 export const StyledInput = styled.input`
   background: transparent;
   border: none;
@@ -59,22 +61,20 @@ export const ObjectFilterDropdownFilterSelect = ({
 }: ObjectFilterDropdownFilterSelectProps) => {
   const { recordIndexId } = useRecordIndexContextOrThrow();
 
-  const {
-    setObjectFilterDropdownSearchInput,
-    objectFilterDropdownSearchInputState,
-    advancedFilterViewFilterIdState,
-  } = useFilterDropdown();
+  const setObjectFilterDropdownSearchInput = useSetRecoilComponentStateV2(
+    objectFilterDropdownSearchInputComponentState,
+  );
 
-  const advancedFilterViewFilterId = useRecoilValue(
-    advancedFilterViewFilterIdState,
+  const advancedFilterViewFilterId = useRecoilComponentValueV2(
+    advancedFilterViewFilterIdComponentState,
   );
 
-  const { closeAdvancedFilterDropdown } = useAdvancedFilterDropdown(
-    advancedFilterViewFilterId,
+  const objectFilterDropdownSearchInput = useRecoilComponentValueV2(
+    objectFilterDropdownSearchInputComponentState,
   );
 
-  const objectFilterDropdownSearchInput = useRecoilValue(
-    objectFilterDropdownSearchInputState,
+  const { closeAdvancedFilterDropdown } = useAdvancedFilterDropdown(
+    advancedFilterViewFilterId,
   );
 
   const availableFilterDefinitions = useRecoilComponentValueV2(
@@ -121,7 +121,8 @@ export const ObjectFilterDropdownFilterSelect = ({
     (item) => item.fieldMetadataId,
   );
 
-  const { selectFilter } = useSelectFilter();
+  const { selectFilterDefinitionUsedInDropdown } =
+    useSelectFilterDefinitionUsedInDropdown();
 
   const { resetSelectedItem } = useSelectableList(OBJECT_FILTER_DROPDOWN_ID);
 
@@ -135,7 +136,11 @@ export const ObjectFilterDropdownFilterSelect = ({
     }
 
     resetSelectedItem();
-    selectFilter({ filterDefinition: selectedFilterDefinition });
+
+    selectFilterDefinitionUsedInDropdown({
+      filterDefinition: selectedFilterDefinition,
+    });
+
     closeAdvancedFilterDropdown();
   };
 
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectCompositeFieldSubMenu.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectCompositeFieldSubMenu.tsx
index c364bb90eb6a..5f1fa512dbfd 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectCompositeFieldSubMenu.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectCompositeFieldSubMenu.tsx
@@ -1,20 +1,26 @@
 import { useAdvancedFilterDropdown } from '@/object-record/advanced-filter/hooks/useAdvancedFilterDropdown';
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { advancedFilterViewFilterGroupIdComponentState } from '@/object-record/object-filter-dropdown/states/advancedFilterViewFilterGroupIdComponentState';
+import { advancedFilterViewFilterIdComponentState } from '@/object-record/object-filter-dropdown/states/advancedFilterViewFilterIdComponentState';
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
 import { objectFilterDropdownFilterIsSelectedComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownFilterIsSelectedComponentState';
 import { objectFilterDropdownFirstLevelFilterDefinitionComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownFirstLevelFilterDefinitionComponentState';
 import { objectFilterDropdownIsSelectingCompositeFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState';
+import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState';
 import { objectFilterDropdownSubMenuFieldTypeComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSubMenuFieldTypeComponentState';
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
 import { getCompositeSubFieldLabel } from '@/object-record/object-filter-dropdown/utils/getCompositeSubFieldLabel';
 import { getFilterableFieldTypeLabel } from '@/object-record/object-filter-dropdown/utils/getFilterableFieldTypeLabel';
 import { getInitialFilterValue } from '@/object-record/object-filter-dropdown/utils/getInitialFilterValue';
-import { getOperandsForFilterDefinition } from '@/object-record/object-filter-dropdown/utils/getOperandsForFilterType';
+import { useApplyRecordFilter } from '@/object-record/record-filter/hooks/useApplyRecordFilter';
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
+import { getRecordFilterOperandsForRecordFilterDefinition } from '@/object-record/record-filter/utils/getRecordFilterOperandsForRecordFilterDefinition';
 import { SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/SettingsCompositeFieldTypeConfigs';
 import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 import { useState } from 'react';
-import { useRecoilValue } from 'recoil';
 import {
   IconApps,
   IconChevronLeft,
@@ -51,27 +57,33 @@ export const ObjectFilterDropdownFilterSelectCompositeFieldSubMenu = () => {
     objectFilterDropdownSubMenuFieldTypeComponentState,
   );
 
-  const {
-    setFilterDefinitionUsedInDropdown,
-    setSelectedOperandInDropdown,
-    setObjectFilterDropdownSearchInput,
-    selectFilter,
-    advancedFilterViewFilterIdState,
-    advancedFilterViewFilterGroupIdState,
-  } = useFilterDropdown();
-
-  const advancedFilterViewFilterId = useRecoilValue(
-    advancedFilterViewFilterIdState,
+  const setFilterDefinitionUsedInDropdown = useSetRecoilComponentStateV2(
+    filterDefinitionUsedInDropdownComponentState,
   );
-  const advancedFilterViewFilterGroupId = useRecoilValue(
-    advancedFilterViewFilterGroupIdState,
+
+  const setSelectedOperandInDropdown = useSetRecoilComponentStateV2(
+    selectedOperandInDropdownComponentState,
+  );
+
+  const setObjectFilterDropdownSearchInput = useSetRecoilComponentStateV2(
+    objectFilterDropdownSearchInputComponentState,
+  );
+
+  const advancedFilterViewFilterId = useRecoilComponentValueV2(
+    advancedFilterViewFilterIdComponentState,
   );
 
+  const advancedFilterViewFilterGroupId = useRecoilComponentValueV2(
+    advancedFilterViewFilterGroupIdComponentState,
+  );
+
+  const { applyRecordFilter } = useApplyRecordFilter();
+
   const { closeAdvancedFilterDropdown } = useAdvancedFilterDropdown(
     advancedFilterViewFilterId,
   );
 
-  const handleSelectFilter = (definition: FilterDefinition | null) => {
+  const handleSelectFilter = (definition: RecordFilterDefinition | null) => {
     if (definition !== null) {
       if (
         isDefined(advancedFilterViewFilterId) &&
@@ -79,12 +91,14 @@ export const ObjectFilterDropdownFilterSelectCompositeFieldSubMenu = () => {
       ) {
         closeAdvancedFilterDropdown();
 
-        const operand = getOperandsForFilterDefinition(definition)[0];
+        const operand =
+          getRecordFilterOperandsForRecordFilterDefinition(definition)[0];
         const { value, displayValue } = getInitialFilterValue(
           definition.type,
           operand,
         );
-        selectFilter({
+
+        applyRecordFilter({
           id: advancedFilterViewFilterId,
           fieldMetadataId: definition.fieldMetadataId,
           value,
@@ -98,7 +112,7 @@ export const ObjectFilterDropdownFilterSelectCompositeFieldSubMenu = () => {
       setFilterDefinitionUsedInDropdown(definition);
 
       setSelectedOperandInDropdown(
-        getOperandsForFilterDefinition(definition)[0],
+        getRecordFilterOperandsForRecordFilterDefinition(definition)[0],
       );
 
       setObjectFilterDropdownSearchInput('');
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx
index 84f9addb447f..6e5ef654df46 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelectMenuItem.tsx
@@ -1,31 +1,35 @@
 import { useAdvancedFilterDropdown } from '@/object-record/advanced-filter/hooks/useAdvancedFilterDropdown';
 import { OBJECT_FILTER_DROPDOWN_ID } from '@/object-record/object-filter-dropdown/constants/ObjectFilterDropdownId';
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
-import { useSelectFilter } from '@/object-record/object-filter-dropdown/hooks/useSelectFilter';
+import { useSelectFilterDefinitionUsedInDropdown } from '@/object-record/object-filter-dropdown/hooks/useSelectFilterDefinitionUsedInDropdown';
+import { advancedFilterViewFilterIdComponentState } from '@/object-record/object-filter-dropdown/states/advancedFilterViewFilterIdComponentState';
 import { objectFilterDropdownFilterIsSelectedComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownFilterIsSelectedComponentState';
 import { objectFilterDropdownFirstLevelFilterDefinitionComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownFirstLevelFilterDefinitionComponentState';
 import { objectFilterDropdownIsSelectingCompositeFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState';
 import { objectFilterDropdownSubMenuFieldTypeComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSubMenuFieldTypeComponentState';
-import { CompositeFilterableFieldType } from '@/object-record/object-filter-dropdown/types/CompositeFilterableFieldType';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
+import { CompositeFilterableFieldType } from '@/object-record/record-filter/types/CompositeFilterableFieldType';
 
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
-import { getOperandsForFilterDefinition } from '@/object-record/object-filter-dropdown/utils/getOperandsForFilterType';
 import { isCompositeField } from '@/object-record/object-filter-dropdown/utils/isCompositeField';
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
+import { getRecordFilterOperandsForRecordFilterDefinition } from '@/object-record/record-filter/utils/getRecordFilterOperandsForRecordFilterDefinition';
 import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
 import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
 import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 import { useRecoilValue } from 'recoil';
 import { MenuItemSelect, useIcons } from 'twenty-ui';
 
 export type ObjectFilterDropdownFilterSelectMenuItemProps = {
-  filterDefinition: FilterDefinition;
+  filterDefinition: RecordFilterDefinition;
 };
 
 export const ObjectFilterDropdownFilterSelectMenuItem = ({
   filterDefinition,
 }: ObjectFilterDropdownFilterSelectMenuItemProps) => {
-  const { selectFilter } = useSelectFilter();
+  const { selectFilterDefinitionUsedInDropdown } =
+    useSelectFilterDefinitionUsedInDropdown();
 
   const [, setObjectFilterDropdownFirstLevelFilterDefinition] =
     useRecoilComponentStateV2(
@@ -55,28 +59,28 @@ export const ObjectFilterDropdownFilterSelectMenuItem = ({
 
   const isACompositeField = isCompositeField(filterDefinition.type);
 
-  const {
-    setFilterDefinitionUsedInDropdown,
-    setSelectedOperandInDropdown,
-    setObjectFilterDropdownSearchInput,
-    advancedFilterViewFilterIdState,
-  } = useFilterDropdown();
-
-  const setHotkeyScope = useSetHotkeyScope();
+  const setSelectedOperandInDropdown = useSetRecoilComponentStateV2(
+    selectedOperandInDropdownComponentState,
+  );
 
-  const advancedFilterViewFilterId = useRecoilValue(
-    advancedFilterViewFilterIdState,
+  const advancedFilterViewFilterId = useRecoilComponentValueV2(
+    advancedFilterViewFilterIdComponentState,
   );
 
+  const setHotkeyScope = useSetHotkeyScope();
+
   const { closeAdvancedFilterDropdown } = useAdvancedFilterDropdown(
     advancedFilterViewFilterId,
   );
 
-  const handleSelectFilter = (availableFilterDefinition: FilterDefinition) => {
+  const handleSelectFilterDefinition = (
+    availableFilterDefinition: RecordFilterDefinition,
+  ) => {
     closeAdvancedFilterDropdown();
-    selectFilter({ filterDefinition: availableFilterDefinition });
 
-    setFilterDefinitionUsedInDropdown(availableFilterDefinition);
+    selectFilterDefinitionUsedInDropdown({
+      filterDefinition: availableFilterDefinition,
+    });
 
     if (
       availableFilterDefinition.type === 'RELATION' ||
@@ -86,11 +90,11 @@ export const ObjectFilterDropdownFilterSelectMenuItem = ({
     }
 
     setSelectedOperandInDropdown(
-      getOperandsForFilterDefinition(availableFilterDefinition)[0],
+      getRecordFilterOperandsForRecordFilterDefinition(
+        availableFilterDefinition,
+      )[0],
     );
 
-    setObjectFilterDropdownSearchInput('');
-
     setObjectFilterDropdownFilterIsSelected(true);
   };
 
@@ -107,7 +111,7 @@ export const ObjectFilterDropdownFilterSelectMenuItem = ({
       setObjectFilterDropdownFirstLevelFilterDefinition(filterDefinition);
       setObjectFilterDropdownIsSelectingCompositeField(true);
     } else {
-      handleSelectFilter(filterDefinition);
+      handleSelectFilterDefinition(filterDefinition);
     }
   };
 
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownNumberInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownNumberInput.tsx
index 38246cf53df9..58f1bfc4cfed 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownNumberInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownNumberInput.tsx
@@ -1,27 +1,29 @@
 import { ChangeEvent, useCallback, useState } from 'react';
-import { useRecoilValue } from 'recoil';
 import { v4 } from 'uuid';
 
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
+import { selectedFilterComponentState } from '@/object-record/object-filter-dropdown/states/selectedFilterComponentState';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
+import { useApplyRecordFilter } from '@/object-record/record-filter/hooks/useApplyRecordFilter';
 import { DropdownMenuInput } from '@/ui/layout/dropdown/components/DropdownMenuInput';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 
 export const ObjectFilterDropdownNumberInput = () => {
-  const {
-    selectedOperandInDropdownState,
-    filterDefinitionUsedInDropdownState,
-    selectedFilterState,
-    selectFilter,
-  } = useFilterDropdown();
-  const [hasFocused, setHasFocused] = useState(false);
+  const selectedOperandInDropdown = useRecoilComponentValueV2(
+    selectedOperandInDropdownComponentState,
+  );
 
-  const filterDefinitionUsedInDropdown = useRecoilValue(
-    filterDefinitionUsedInDropdownState,
+  const filterDefinitionUsedInDropdown = useRecoilComponentValueV2(
+    filterDefinitionUsedInDropdownComponentState,
   );
-  const selectedOperandInDropdown = useRecoilValue(
-    selectedOperandInDropdownState,
+
+  const selectedFilter = useRecoilComponentValueV2(
+    selectedFilterComponentState,
   );
 
-  const selectedFilter = useRecoilValue(selectedFilterState);
+  const { applyRecordFilter } = useApplyRecordFilter();
+
+  const [hasFocused, setHasFocused] = useState(false);
 
   const [inputValue, setInputValue] = useState(
     () => selectedFilter?.value || '',
@@ -48,8 +50,10 @@ export const ObjectFilterDropdownNumberInput = () => {
         placeholder={filterDefinitionUsedInDropdown.label}
         onChange={(event: ChangeEvent<HTMLInputElement>) => {
           const newValue = event.target.value;
+
           setInputValue(newValue);
-          selectFilter?.({
+
+          applyRecordFilter({
             id: selectedFilter?.id ? selectedFilter.id : v4(),
             fieldMetadataId: filterDefinitionUsedInDropdown.fieldMetadataId,
             value: newValue,
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandDropdown.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandDropdown.tsx
index 840d87ab91ef..8a7c27e95107 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandDropdown.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandDropdown.tsx
@@ -1,12 +1,13 @@
-import { useRecoilValue } from 'recoil';
 import { IconChevronDown } from 'twenty-ui';
 
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
 import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
 
 import { ObjectFilterDropdownOperandSelect } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandSelect';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
+
 import { FiltersHotkeyScope } from '@/object-record/object-filter-dropdown/types/FiltersHotkeyScope';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { getOperandLabel } from '../utils/getOperandLabel';
@@ -20,10 +21,8 @@ export const ObjectFilterDropdownOperandDropdown = ({
 }: {
   filterDropdownId?: string;
 }) => {
-  const { selectedOperandInDropdownState } = useFilterDropdown();
-
-  const selectedOperandInDropdown = useRecoilValue(
-    selectedOperandInDropdownState,
+  const selectedOperandInDropdown = useRecoilComponentValueV2(
+    selectedOperandInDropdownComponentState,
   );
 
   const theme = useTheme();
@@ -45,9 +44,7 @@ export const ObjectFilterDropdownOperandDropdown = ({
       dropdownHotkeyScope={{
         scope: FiltersHotkeyScope.ObjectFilterDropdownOperandDropdown,
       }}
-      dropdownOffset={{
-        x: parseInt(theme.spacing(2), 10),
-      }}
+      dropdownOffset={{ x: parseInt(theme.spacing(2), 10) }}
     />
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandSelect.tsx
index 3dfd6d6203ee..8a29a12a96f5 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandSelect.tsx
@@ -1,16 +1,20 @@
-import { useRecoilValue } from 'recoil';
 import { v4 } from 'uuid';
 
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
+import { selectedFilterComponentState } from '@/object-record/object-filter-dropdown/states/selectedFilterComponentState';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
 import { getInitialFilterValue } from '@/object-record/object-filter-dropdown/utils/getInitialFilterValue';
+import { useApplyRecordFilter } from '@/object-record/record-filter/hooks/useApplyRecordFilter';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 import styled from '@emotion/styled';
 import { MenuItem } from 'twenty-ui';
 import { isDefined } from '~/utils/isDefined';
+import { getRecordFilterOperandsForRecordFilterDefinition } from '../../record-filter/utils/getRecordFilterOperandsForRecordFilterDefinition';
 import { getOperandLabel } from '../utils/getOperandLabel';
-import { getOperandsForFilterDefinition } from '../utils/getOperandsForFilterType';
 
 const StyledDropdownMenuItemsContainer = styled(DropdownMenuItemsContainer)`
   background-color: ${({ theme }) => theme.background.primary};
@@ -18,23 +22,26 @@ const StyledDropdownMenuItemsContainer = styled(DropdownMenuItemsContainer)`
 `;
 
 export const ObjectFilterDropdownOperandSelect = () => {
-  const {
-    filterDefinitionUsedInDropdownState,
-    setSelectedOperandInDropdown,
-    selectedFilterState,
-    selectFilter,
-  } = useFilterDropdown();
+  const filterDefinitionUsedInDropdown = useRecoilComponentValueV2(
+    filterDefinitionUsedInDropdownComponentState,
+  );
 
-  const { closeDropdown } = useDropdown();
+  const setSelectedOperandInDropdown = useSetRecoilComponentStateV2(
+    selectedOperandInDropdownComponentState,
+  );
 
-  const filterDefinitionUsedInDropdown = useRecoilValue(
-    filterDefinitionUsedInDropdownState,
+  const selectedFilter = useRecoilComponentValueV2(
+    selectedFilterComponentState,
   );
 
-  const selectedFilter = useRecoilValue(selectedFilterState);
+  const { applyRecordFilter } = useApplyRecordFilter();
+
+  const { closeDropdown } = useDropdown();
 
   const operandsForFilterType = isDefined(filterDefinitionUsedInDropdown)
-    ? getOperandsForFilterDefinition(filterDefinitionUsedInDropdown)
+    ? getRecordFilterOperandsForRecordFilterDefinition(
+        filterDefinitionUsedInDropdown,
+      )
     : [];
 
   const handleOperandChange = (newOperand: ViewFilterOperand) => {
@@ -49,7 +56,7 @@ export const ObjectFilterDropdownOperandSelect = () => {
     setSelectedOperandInDropdown(newOperand);
 
     if (isValuelessOperand && isDefined(filterDefinitionUsedInDropdown)) {
-      selectFilter?.({
+      applyRecordFilter({
         id: v4(),
         fieldMetadataId: filterDefinitionUsedInDropdown?.fieldMetadataId ?? '',
         displayValue: '',
@@ -71,7 +78,7 @@ export const ObjectFilterDropdownOperandSelect = () => {
         selectedFilter.displayValue,
       );
 
-      selectFilter?.({
+      applyRecordFilter({
         id: selectedFilter.id ? selectedFilter.id : v4(),
         fieldMetadataId: selectedFilter.fieldMetadataId,
         displayValue,
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx
index c409cdf00636..cc888c61d21c 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx
@@ -4,7 +4,6 @@ import { Key } from 'ts-key-enum';
 import { v4 } from 'uuid';
 
 import { FieldMetadataItemOption } from '@/object-metadata/types/FieldMetadataItem';
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
 import { useOptionsForSelect } from '@/object-record/object-filter-dropdown/hooks/useOptionsForSelect';
 import { MULTI_OBJECT_RECORD_SELECT_SELECTABLE_LIST_ID } from '@/object-record/relation-picker/constants/MultiObjectRecordSelectSelectableListId';
 import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
@@ -14,7 +13,14 @@ import { SelectableList } from '@/ui/layout/selectable-list/components/Selectabl
 import { useSelectableListStates } from '@/ui/layout/selectable-list/hooks/internal/useSelectableListStates';
 import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
 
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
+import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState';
+import { objectFilterDropdownSelectedOptionValuesComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedOptionValuesComponentState';
+import { selectedFilterComponentState } from '@/object-record/object-filter-dropdown/states/selectedFilterComponentState';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
+import { useApplyRecordFilter } from '@/object-record/record-filter/hooks/useApplyRecordFilter';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { MenuItem, MenuItemMultiSelect } from 'twenty-ui';
 import { isDefined } from '~/utils/isDefined';
 
@@ -26,14 +32,27 @@ type SelectOptionForFilter = FieldMetadataItemOption & {
 };
 
 export const ObjectFilterDropdownOptionSelect = () => {
-  const {
-    filterDefinitionUsedInDropdownState,
-    objectFilterDropdownSearchInputState,
-    selectedOperandInDropdownState,
-    objectFilterDropdownSelectedOptionValuesState,
-    selectedFilterState,
-    selectFilter,
-  } = useFilterDropdown();
+  const filterDefinitionUsedInDropdown = useRecoilComponentValueV2(
+    filterDefinitionUsedInDropdownComponentState,
+  );
+
+  const objectFilterDropdownSelectedOptionValues = useRecoilComponentValueV2(
+    objectFilterDropdownSelectedOptionValuesComponentState,
+  );
+
+  const selectedFilter = useRecoilComponentValueV2(
+    selectedFilterComponentState,
+  );
+
+  const objectFilterDropdownSearchInput = useRecoilComponentValueV2(
+    objectFilterDropdownSearchInputComponentState,
+  );
+
+  const selectedOperandInDropdown = useRecoilComponentValueV2(
+    selectedOperandInDropdownComponentState,
+  );
+
+  const { applyRecordFilter } = useApplyRecordFilter();
 
   const { closeDropdown } = useDropdown();
 
@@ -46,20 +65,6 @@ export const ObjectFilterDropdownOptionSelect = () => {
   );
 
   const selectedItemId = useRecoilValue(selectedItemIdState);
-  const filterDefinitionUsedInDropdown = useRecoilValue(
-    filterDefinitionUsedInDropdownState,
-  );
-  const selectedOperandInDropdown = useRecoilValue(
-    selectedOperandInDropdownState,
-  );
-  const objectFilterDropdownSearchInput = useRecoilValue(
-    objectFilterDropdownSearchInputState,
-  );
-  const objectFilterDropdownSelectedOptionValues = useRecoilValue(
-    objectFilterDropdownSelectedOptionValuesState,
-  );
-
-  const selectedFilter = useRecoilValue(selectedFilterState);
 
   const fieldMetaDataId = filterDefinitionUsedInDropdown?.fieldMetadataId ?? '';
 
@@ -128,7 +133,7 @@ export const ObjectFilterDropdownOptionSelect = () => {
           ? JSON.stringify(selectedOptions.map((option) => option.value))
           : EMPTY_FILTER_VALUE;
 
-      selectFilter({
+      applyRecordFilter({
         id: selectedFilter?.id ? selectedFilter.id : v4(),
         definition: filterDefinitionUsedInDropdown,
         operand: selectedOperandInDropdown,
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRatingInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRatingInput.tsx
index 95af2de52e4b..0a71e6cc9509 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRatingInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRatingInput.tsx
@@ -1,12 +1,15 @@
-import { useRecoilValue } from 'recoil';
 import { v4 } from 'uuid';
 
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
 import { RATING_VALUES } from '@/object-record/record-field/meta-types/constants/RatingValues';
 import { FieldRatingValue } from '@/object-record/record-field/types/FieldMetadata';
+import { useApplyRecordFilter } from '@/object-record/record-filter/hooks/useApplyRecordFilter';
 import { RatingInput } from '@/ui/field/input/components/RatingInput';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 
+import { selectedFilterComponentState } from '@/object-record/object-filter-dropdown/states/selectedFilterComponentState';
 const convertFieldRatingValueToNumber = (
   rating: Exclude<FieldRatingValue, null>,
 ): string => {
@@ -30,21 +33,19 @@ export const convertRatingToRatingValue = (rating: number) => {
 };
 
 export const ObjectFilterDropdownRatingInput = () => {
-  const {
-    selectedOperandInDropdownState,
-    filterDefinitionUsedInDropdownState,
-    selectedFilterState,
-    selectFilter,
-  } = useFilterDropdown();
+  const selectedOperandInDropdown = useRecoilComponentValueV2(
+    selectedOperandInDropdownComponentState,
+  );
 
-  const filterDefinitionUsedInDropdown = useRecoilValue(
-    filterDefinitionUsedInDropdownState,
+  const filterDefinitionUsedInDropdown = useRecoilComponentValueV2(
+    filterDefinitionUsedInDropdownComponentState,
   );
-  const selectedOperandInDropdown = useRecoilValue(
-    selectedOperandInDropdownState,
+
+  const selectedFilter = useRecoilComponentValueV2(
+    selectedFilterComponentState,
   );
 
-  const selectedFilter = useRecoilValue(selectedFilterState);
+  const { applyRecordFilter } = useApplyRecordFilter();
 
   return (
     filterDefinitionUsedInDropdown &&
@@ -57,7 +58,7 @@ export const ObjectFilterDropdownRatingInput = () => {
               return;
             }
 
-            selectFilter?.({
+            applyRecordFilter?.({
               id: selectedFilter?.id ? selectedFilter.id : v4(),
               fieldMetadataId: filterDefinitionUsedInDropdown.fieldMetadataId,
               value: convertFieldRatingValueToNumber(newValue),
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordRemoveFilterMenuItem.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordRemoveFilterMenuItem.tsx
index 7251fab80788..dafbabe7634e 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordRemoveFilterMenuItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordRemoveFilterMenuItem.tsx
@@ -1,16 +1,16 @@
 import { IconFilterOff, MenuItem } from 'twenty-ui';
 
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { useEmptyRecordFilter } from '@/object-record/object-filter-dropdown/hooks/useEmptyRecordFilter';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 
 export const ObjectFilterDropdownRecordRemoveFilterMenuItem = () => {
-  const { emptyFilterButKeepDefinition } = useFilterDropdown();
+  const { emptyRecordFilter } = useEmptyRecordFilter();
 
   const { closeDropdown } = useDropdown();
 
   const handleRemoveFilter = () => {
-    emptyFilterButKeepDefinition();
+    emptyRecordFilter();
     closeDropdown();
   };
 
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx
index 1bfb234f5935..d8cdad553944 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx
@@ -1,19 +1,25 @@
 import { useState } from 'react';
-import { useRecoilValue } from 'recoil';
 import { v4 } from 'uuid';
 
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectFilterDropdownRecordPinnedItems } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordPinnedItems';
 import { CURRENT_WORKSPACE_MEMBER_SELECTABLE_ITEM_ID } from '@/object-record/object-filter-dropdown/constants/CurrentWorkspaceMemberSelectableItemId';
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
+import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState';
+import { objectFilterDropdownSelectedRecordIdsComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsComponentState';
+import { selectedFilterComponentState } from '@/object-record/object-filter-dropdown/states/selectedFilterComponentState';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
+import { useApplyRecordFilter } from '@/object-record/record-filter/hooks/useApplyRecordFilter';
 import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
 import { MultipleSelectDropdown } from '@/object-record/select/components/MultipleSelectDropdown';
 import { useRecordsForSelect } from '@/object-record/select/hooks/useRecordsForSelect';
 import { SelectableItem } from '@/object-record/select/types/SelectableItem';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
 import { RelationFilterValue } from '@/views/view-filter-value/types/RelationFilterValue';
-import { relationFilterValueSchema } from '@/views/view-filter-value/validation-schemas/relationFilterValueSchema';
+import { jsonRelationFilterValueSchema } from '@/views/view-filter-value/validation-schemas/jsonRelationFilterValueSchema';
+import { simpleRelationFilterValueSchema } from '@/views/view-filter-value/validation-schemas/simpleRelationFilterValueSchema';
 import { IconUserCircle } from 'twenty-ui';
 import { isDefined } from '~/utils/isDefined';
 
@@ -31,38 +37,39 @@ type ObjectFilterDropdownRecordSelectProps = {
 export const ObjectFilterDropdownRecordSelect = ({
   viewComponentId,
 }: ObjectFilterDropdownRecordSelectProps) => {
-  const {
-    filterDefinitionUsedInDropdownState,
-    objectFilterDropdownSearchInputState,
-    selectedOperandInDropdownState,
-    selectedFilterState,
-    objectFilterDropdownSelectedRecordIdsState,
-    selectFilter,
-  } = useFilterDropdown();
-
-  const { currentViewWithCombinedFiltersAndSorts } =
-    useGetCurrentView(viewComponentId);
+  const filterDefinitionUsedInDropdown = useRecoilComponentValueV2(
+    filterDefinitionUsedInDropdownComponentState,
+  );
 
-  const filterDefinitionUsedInDropdown = useRecoilValue(
-    filterDefinitionUsedInDropdownState,
+  const selectedOperandInDropdown = useRecoilComponentValueV2(
+    selectedOperandInDropdownComponentState,
   );
-  const objectFilterDropdownSearchInput = useRecoilValue(
-    objectFilterDropdownSearchInputState,
+
+  const selectedFilter = useRecoilComponentValueV2(
+    selectedFilterComponentState,
   );
-  const selectedOperandInDropdown = useRecoilValue(
-    selectedOperandInDropdownState,
+
+  const objectFilterDropdownSearchInput = useRecoilComponentValueV2(
+    objectFilterDropdownSearchInputComponentState,
   );
-  const objectFilterDropdownSelectedRecordIds = useRecoilValue(
-    objectFilterDropdownSelectedRecordIdsState,
+
+  const objectFilterDropdownSelectedRecordIds = useRecoilComponentValueV2(
+    objectFilterDropdownSelectedRecordIdsComponentState,
   );
-  const [fieldId] = useState(v4());
 
-  const selectedFilter = useRecoilValue(selectedFilterState);
+  const { applyRecordFilter } = useApplyRecordFilter(viewComponentId);
+
+  const { currentViewWithCombinedFiltersAndSorts } =
+    useGetCurrentView(viewComponentId);
+
+  const [fieldId] = useState(v4());
 
-  const { isCurrentWorkspaceMemberSelected } = relationFilterValueSchema
+  const { isCurrentWorkspaceMemberSelected } = jsonRelationFilterValueSchema
     .catch({
       isCurrentWorkspaceMemberSelected: false,
-      selectedRecordIds: [],
+      selectedRecordIds: simpleRelationFilterValueSchema.parse(
+        selectedFilter?.value,
+      ),
     })
     .parse(selectedFilter?.value);
 
@@ -187,7 +194,7 @@ export const ObjectFilterDropdownRecordSelect = ({
 
       const filterId = viewFilter?.id ?? fieldId;
 
-      selectFilter({
+      applyRecordFilter({
         id: selectedFilter?.id ? selectedFilter.id : filterId,
         definition: filterDefinitionUsedInDropdown,
         operand: selectedOperandInDropdown,
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSearchInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSearchInput.tsx
index 757dca89bd33..6f0c8b19ad2c 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSearchInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSearchInput.tsx
@@ -1,28 +1,31 @@
 import { ChangeEvent, useCallback, useState } from 'react';
-import { useRecoilValue } from 'recoil';
 
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
+import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
 import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 
 export const ObjectFilterDropdownSearchInput = () => {
-  const {
-    filterDefinitionUsedInDropdownState,
-    selectedOperandInDropdownState,
-    objectFilterDropdownSearchInputState,
-    setObjectFilterDropdownSearchInput,
-  } = useFilterDropdown();
-  const [hasFocused, setHasFocused] = useState(false);
+  const filterDefinitionUsedInDropdown = useRecoilComponentValueV2(
+    filterDefinitionUsedInDropdownComponentState,
+  );
 
-  const filterDefinitionUsedInDropdown = useRecoilValue(
-    filterDefinitionUsedInDropdownState,
+  const selectedOperandInDropdown = useRecoilComponentValueV2(
+    selectedOperandInDropdownComponentState,
   );
-  const selectedOperandInDropdown = useRecoilValue(
-    selectedOperandInDropdownState,
+
+  const objectFilterDropdownSearchInput = useRecoilComponentValueV2(
+    objectFilterDropdownSearchInputComponentState,
   );
-  const objectFilterDropdownSearchInput = useRecoilValue(
-    objectFilterDropdownSearchInputState,
+
+  const setObjectFilterDropdownSearchInput = useSetRecoilComponentStateV2(
+    objectFilterDropdownSearchInputComponentState,
   );
 
+  const [hasFocused, setHasFocused] = useState(false);
+
   const handleInputRef = useCallback(
     (node: HTMLInputElement | null) => {
       if (Boolean(node) && !hasFocused) {
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSourceSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSourceSelect.tsx
index cb46def5c76e..5639d82ea1f9 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSourceSelect.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSourceSelect.tsx
@@ -1,12 +1,20 @@
 import { useState } from 'react';
-import { useRecoilValue } from 'recoil';
 import { v4 } from 'uuid';
 
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { useEmptyRecordFilter } from '@/object-record/object-filter-dropdown/hooks/useEmptyRecordFilter';
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
+import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState';
+import { objectFilterDropdownSelectedRecordIdsComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsComponentState';
+import { selectedFilterComponentState } from '@/object-record/object-filter-dropdown/states/selectedFilterComponentState';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
 import { getActorSourceMultiSelectOptions } from '@/object-record/object-filter-dropdown/utils/getActorSourceMultiSelectOptions';
+import { useApplyRecordFilter } from '@/object-record/record-filter/hooks/useApplyRecordFilter';
+import { useRemoveRecordFilter } from '@/object-record/record-filter/hooks/useRemoveRecordFilter';
 import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
 import { MultipleSelectDropdown } from '@/object-record/select/components/MultipleSelectDropdown';
 import { SelectableItem } from '@/object-record/select/types/SelectableItem';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 import { useDeleteCombinedViewFilters } from '@/views/hooks/useDeleteCombinedViewFilters';
 import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
@@ -22,16 +30,31 @@ type ObjectFilterDropdownSourceSelectProps = {
 export const ObjectFilterDropdownSourceSelect = ({
   viewComponentId,
 }: ObjectFilterDropdownSourceSelectProps) => {
-  const {
-    filterDefinitionUsedInDropdownState,
-    objectFilterDropdownSearchInputState,
-    selectedOperandInDropdownState,
-    selectedFilterState,
-    setObjectFilterDropdownSelectedRecordIds,
-    objectFilterDropdownSelectedRecordIdsState,
-    selectFilter,
-    emptyFilterButKeepDefinition,
-  } = useFilterDropdown();
+  const objectFilterDropdownSearchInput = useRecoilComponentValueV2(
+    objectFilterDropdownSearchInputComponentState,
+  );
+
+  const setObjectFilterDropdownSelectedRecordIds = useSetRecoilComponentStateV2(
+    objectFilterDropdownSelectedRecordIdsComponentState,
+  );
+
+  const objectFilterDropdownSelectedRecordIds = useRecoilComponentValueV2(
+    objectFilterDropdownSelectedRecordIdsComponentState,
+  );
+
+  const selectedFilter = useRecoilComponentValueV2(
+    selectedFilterComponentState,
+  );
+
+  const selectedOperandInDropdown = useRecoilComponentValueV2(
+    selectedOperandInDropdownComponentState,
+  );
+
+  const filterDefinitionUsedInDropdown = useRecoilComponentValueV2(
+    filterDefinitionUsedInDropdownComponentState,
+  );
+
+  const { applyRecordFilter } = useApplyRecordFilter(viewComponentId);
 
   const { deleteCombinedViewFilter } =
     useDeleteCombinedViewFilters(viewComponentId);
@@ -39,22 +62,9 @@ export const ObjectFilterDropdownSourceSelect = ({
   const { currentViewWithCombinedFiltersAndSorts } =
     useGetCurrentView(viewComponentId);
 
-  const filterDefinitionUsedInDropdown = useRecoilValue(
-    filterDefinitionUsedInDropdownState,
-  );
-  const objectFilterDropdownSearchInput = useRecoilValue(
-    objectFilterDropdownSearchInputState,
-  );
-  const selectedOperandInDropdown = useRecoilValue(
-    selectedOperandInDropdownState,
-  );
-  const objectFilterDropdownSelectedRecordIds = useRecoilValue(
-    objectFilterDropdownSelectedRecordIdsState,
-  );
+  // TODO: this should be removed as it is not consistent across re-renders
   const [fieldId] = useState(v4());
 
-  const selectedFilter = useRecoilValue(selectedFilterState);
-
   const sourceTypes = getActorSourceMultiSelectOptions(
     objectFilterDropdownSelectedRecordIds,
   );
@@ -63,6 +73,10 @@ export const ObjectFilterDropdownSourceSelect = ({
     objectFilterDropdownSelectedRecordIds.includes(option.id),
   );
 
+  const { emptyRecordFilter } = useEmptyRecordFilter();
+
+  const { removeRecordFilter } = useRemoveRecordFilter();
+
   const handleMultipleItemSelectChange = (
     itemToSelect: SelectableItem,
     newSelectedValue: boolean,
@@ -73,8 +87,13 @@ export const ObjectFilterDropdownSourceSelect = ({
           (id) => id !== itemToSelect.id,
         );
 
+    if (!filterDefinitionUsedInDropdown) {
+      throw new Error('Filter definition used in dropdown should be defined');
+    }
+
     if (newSelectedItemIds.length === 0) {
-      emptyFilterButKeepDefinition();
+      emptyRecordFilter();
+      removeRecordFilter(filterDefinitionUsedInDropdown.fieldMetadataId);
       deleteCombinedViewFilter(fieldId);
       return;
     }
@@ -108,7 +127,7 @@ export const ObjectFilterDropdownSourceSelect = ({
 
       const filterId = viewFilter?.id ?? fieldId;
 
-      selectFilter({
+      applyRecordFilter({
         id: selectedFilter?.id ? selectedFilter.id : filterId,
         definition: filterDefinitionUsedInDropdown,
         operand: selectedOperandInDropdown || ViewFilterOperand.Is,
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownTextSearchInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownTextSearchInput.tsx
index b6508323bbe0..b3977d230257 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownTextSearchInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownTextSearchInput.tsx
@@ -1,33 +1,40 @@
 import { ChangeEvent, useCallback, useState } from 'react';
-import { useRecoilValue } from 'recoil';
 import { v4 } from 'uuid';
 
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
+import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState';
+import { selectedFilterComponentState } from '@/object-record/object-filter-dropdown/states/selectedFilterComponentState';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
+import { useApplyRecordFilter } from '@/object-record/record-filter/hooks/useApplyRecordFilter';
 import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 
 export const ObjectFilterDropdownTextSearchInput = () => {
-  const {
-    filterDefinitionUsedInDropdownState,
-    selectedOperandInDropdownState,
-    objectFilterDropdownSearchInputState,
-    setObjectFilterDropdownSearchInput,
-    selectedFilterState,
-    selectFilter,
-  } = useFilterDropdown();
-
   const [filterId] = useState(v4());
   const [hasFocused, setHasFocused] = useState(false);
 
-  const filterDefinitionUsedInDropdown = useRecoilValue(
-    filterDefinitionUsedInDropdownState,
+  const filterDefinitionUsedInDropdown = useRecoilComponentValueV2(
+    filterDefinitionUsedInDropdownComponentState,
+  );
+
+  const selectedOperandInDropdown = useRecoilComponentValueV2(
+    selectedOperandInDropdownComponentState,
+  );
+
+  const objectFilterDropdownSearchInput = useRecoilComponentValueV2(
+    objectFilterDropdownSearchInputComponentState,
   );
-  const selectedOperandInDropdown = useRecoilValue(
-    selectedOperandInDropdownState,
+
+  const selectedFilter = useRecoilComponentValueV2(
+    selectedFilterComponentState,
   );
-  const objectFilterDropdownSearchInput = useRecoilValue(
-    objectFilterDropdownSearchInputState,
+
+  const setObjectFilterDropdownSearchInput = useSetRecoilComponentStateV2(
+    objectFilterDropdownSearchInputComponentState,
   );
-  const selectedFilter = useRecoilValue(selectedFilterState);
+
+  const { applyRecordFilter } = useApplyRecordFilter();
 
   const handleInputRef = useCallback(
     (node: HTMLInputElement | null) => {
@@ -51,7 +58,7 @@ export const ObjectFilterDropdownTextSearchInput = () => {
         onChange={(event: ChangeEvent<HTMLInputElement>) => {
           setObjectFilterDropdownSearchInput(event.target.value);
 
-          selectFilter?.({
+          applyRecordFilter({
             id: selectedFilter?.id ?? filterId,
             fieldMetadataId: filterDefinitionUsedInDropdown.fieldMetadataId,
             value: event.target.value,
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/SingleEntityObjectFilterDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/SingleEntityObjectFilterDropdownButton.tsx
index 571645a5c81e..1108d5a1d90a 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/SingleEntityObjectFilterDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/SingleEntityObjectFilterDropdownButton.tsx
@@ -1,19 +1,21 @@
 import { useTheme } from '@emotion/react';
 import React from 'react';
-import { useRecoilValue } from 'recoil';
 import { IconChevronDown } from 'twenty-ui';
 
 import { ObjectFilterDropdownRecordRemoveFilterMenuItem } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordRemoveFilterMenuItem';
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
 import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
+import { selectedFilterComponentState } from '@/object-record/object-filter-dropdown/states/selectedFilterComponentState';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 import { availableFilterDefinitionsComponentState } from '@/views/states/availableFilterDefinitionsComponentState';
-import { getOperandsForFilterDefinition } from '../utils/getOperandsForFilterType';
+import { getRecordFilterOperandsForRecordFilterDefinition } from '../../record-filter/utils/getRecordFilterOperandsForRecordFilterDefinition';
 import { GenericEntityFilterChip } from './GenericEntityFilterChip';
 import { ObjectFilterDropdownRecordSelect } from './ObjectFilterDropdownRecordSelect';
 import { ObjectFilterDropdownSearchInput } from './ObjectFilterDropdownSearchInput';
@@ -25,22 +27,27 @@ export const SingleEntityObjectFilterDropdownButton = ({
 }: {
   hotkeyScope: HotkeyScope;
 }) => {
-  const {
-    selectedFilterState,
-    setFilterDefinitionUsedInDropdown,
-    setSelectedOperandInDropdown,
-  } = useFilterDropdown();
+  const selectedFilter = useRecoilComponentValueV2(
+    selectedFilterComponentState,
+  );
+
+  const setFilterDefinitionUsedInDropdown = useSetRecoilComponentStateV2(
+    filterDefinitionUsedInDropdownComponentState,
+  );
+
+  const setSelectedOperandInDropdown = useSetRecoilComponentStateV2(
+    selectedOperandInDropdownComponentState,
+  );
 
   const availableFilterDefinitions = useRecoilComponentValueV2(
     availableFilterDefinitionsComponentState,
   );
-  const selectedFilter = useRecoilValue(selectedFilterState);
 
   const availableFilterDefinition = availableFilterDefinitions[0];
 
   React.useEffect(() => {
     setFilterDefinitionUsedInDropdown(availableFilterDefinition);
-    const defaultOperand = getOperandsForFilterDefinition(
+    const defaultOperand = getRecordFilterOperandsForRecordFilterDefinition(
       availableFilterDefinition,
     )[0];
     setSelectedOperandInDropdown(defaultOperand);
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/__stories__/MultipleFiltersDropdownButton.stories.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/__stories__/MultipleFiltersDropdownButton.stories.tsx
index ea06072c09be..7120a230f3cf 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/__stories__/MultipleFiltersDropdownButton.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/__stories__/MultipleFiltersDropdownButton.stories.tsx
@@ -4,8 +4,8 @@ import { TaskGroups } from '@/activities/tasks/components/TaskGroups';
 import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { MultipleFiltersDropdownButton } from '@/object-record/object-filter-dropdown/components/MultipleFiltersDropdownButton';
-import { ObjectFilterDropdownScope } from '@/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope';
 import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
+import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';
 import { RecordIndexContextProvider } from '@/object-record/record-index/contexts/RecordIndexContext';
 import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';
 import { tableColumnsComponentState } from '@/object-record/record-table/states/tableColumnsComponentState';
@@ -49,7 +49,7 @@ const meta: Meta<typeof MultipleFiltersDropdownButton> = {
           fieldMetadataId: '1',
           iconName: 'IconUser',
           label: 'Text',
-          type: FieldMetadataType.Text,
+          type: FieldMetadataType.TEXT,
           isVisible: true,
           metadata: {
             fieldName: 'text',
@@ -59,7 +59,7 @@ const meta: Meta<typeof MultipleFiltersDropdownButton> = {
           fieldMetadataId: '3',
           iconName: 'IconNumber',
           label: 'Number',
-          type: FieldMetadataType.Number,
+          type: FieldMetadataType.NUMBER,
           isVisible: true,
           metadata: {
             fieldName: 'number',
@@ -69,7 +69,7 @@ const meta: Meta<typeof MultipleFiltersDropdownButton> = {
           fieldMetadataId: '4',
           iconName: 'IconCalendar',
           label: 'Date',
-          type: FieldMetadataType.DateTime,
+          type: FieldMetadataType.DATE_TIME,
           isVisible: true,
           metadata: {
             fieldName: 'date',
@@ -82,19 +82,19 @@ const meta: Meta<typeof MultipleFiltersDropdownButton> = {
           fieldMetadataId: '1',
           iconName: 'IconUser',
           label: 'Text',
-          type: FieldMetadataType.Text,
+          type: FieldMetadataType.TEXT,
         },
         {
           fieldMetadataId: '3',
           iconName: 'IconNumber',
           label: 'Number',
-          type: FieldMetadataType.Number,
+          type: FieldMetadataType.NUMBER,
         },
         {
           fieldMetadataId: '3',
           iconName: 'IconCalendar',
           label: 'Date',
-          type: FieldMetadataType.DateTime,
+          type: FieldMetadataType.DATE_TIME,
         },
       ]);
       return (
@@ -108,19 +108,21 @@ const meta: Meta<typeof MultipleFiltersDropdownButton> = {
             recordIndexId: instanceId,
           }}
         >
-          <ObjectFilterDropdownComponentInstanceContext.Provider
+          <RecordFiltersComponentInstanceContext.Provider
             value={{ instanceId }}
           >
-            <RecordTableComponentInstanceContext.Provider
-              value={{ instanceId: instanceId, onColumnsChange: () => {} }}
+            <ObjectFilterDropdownComponentInstanceContext.Provider
+              value={{ instanceId }}
             >
-              <ViewComponentInstanceContext.Provider value={{ instanceId }}>
-                <ObjectFilterDropdownScope filterScopeId={instanceId}>
+              <RecordTableComponentInstanceContext.Provider
+                value={{ instanceId: instanceId, onColumnsChange: () => {} }}
+              >
+                <ViewComponentInstanceContext.Provider value={{ instanceId }}>
                   <Story />
-                </ObjectFilterDropdownScope>
-              </ViewComponentInstanceContext.Provider>
-            </RecordTableComponentInstanceContext.Provider>
-          </ObjectFilterDropdownComponentInstanceContext.Provider>
+                </ViewComponentInstanceContext.Provider>
+              </RecordTableComponentInstanceContext.Provider>
+            </ObjectFilterDropdownComponentInstanceContext.Provider>
+          </RecordFiltersComponentInstanceContext.Provider>
         </RecordIndexContextProvider>
       );
     },
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/constants/NumberFilterTypes.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/constants/NumberFilterTypes.ts
index 5f36ae347fd8..c17732c2dd94 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/constants/NumberFilterTypes.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/constants/NumberFilterTypes.ts
@@ -1 +1 @@
-export const NUMBER_FILTER_TYPES = ['NUMBER', 'CURRENCY'];
+export const NUMBER_FILTER_TYPES = ['NUMBER', 'CURRENCY', 'PHONES'];
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/constants/TextFilterTypes.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/constants/TextFilterTypes.ts
index 9ff7456c42f4..0c702e01cf0a 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/constants/TextFilterTypes.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/constants/TextFilterTypes.ts
@@ -2,7 +2,6 @@ export const TEXT_FILTER_TYPES = [
   'TEXT',
   'EMAIL',
   'EMAILS',
-  'PHONE',
   'FULL_NAME',
   'LINK',
   'LINKS',
@@ -10,5 +9,4 @@ export const TEXT_FILTER_TYPES = [
   'ACTOR',
   'ARRAY',
   'RAW_JSON',
-  'PHONES',
 ];
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/__tests__/useFilterDropdown.test.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/__tests__/useFilterDropdown.test.tsx
deleted file mode 100644
index 2d77ce2b840a..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/__tests__/useFilterDropdown.test.tsx
+++ /dev/null
@@ -1,337 +0,0 @@
-import { expect } from '@storybook/test';
-import { act, renderHook, waitFor } from '@testing-library/react';
-import { RecoilRoot, useRecoilState } from 'recoil';
-
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
-import { useFilterDropdownStates } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdownStates';
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
-import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2';
-import { availableFilterDefinitionsComponentState } from '@/views/states/availableFilterDefinitionsComponentState';
-import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext';
-import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
-import { MockedProvider } from '@apollo/client/testing';
-import { JestObjectMetadataItemSetter } from '~/testing/jest/JestObjectMetadataItemSetter';
-
-const filterDropdownId = 'filterDropdownId';
-const renderHookConfig = {
-  wrapper: ({ children }: any) => (
-    <RecoilRoot>
-      <MockedProvider mocks={[]} addTypename={false}>
-        <JestObjectMetadataItemSetter>
-          <ViewComponentInstanceContext.Provider value={{ instanceId: 'test' }}>
-            {children}
-          </ViewComponentInstanceContext.Provider>
-        </JestObjectMetadataItemSetter>
-      </MockedProvider>
-    </RecoilRoot>
-  ),
-};
-
-const filterDefinitions: FilterDefinition[] = [
-  {
-    fieldMetadataId: 'id',
-    label: 'definition label',
-    iconName: 'icon',
-    type: 'TEXT',
-  },
-];
-
-const mockFilter: Filter = {
-  id: 'id',
-  definition: filterDefinitions[0],
-  displayValue: '',
-  fieldMetadataId: '',
-  operand: ViewFilterOperand.Is,
-  value: '',
-};
-
-describe('useFilterDropdown', () => {
-  it('should set availableFilterDefinitions', async () => {
-    const { result } = renderHook(() => {
-      useFilterDropdown({ filterDropdownId });
-
-      const [availableFilterDefinitions, setAvailableFilterDefinitions] =
-        useRecoilComponentStateV2(
-          availableFilterDefinitionsComponentState,
-          filterDropdownId,
-        );
-
-      return { availableFilterDefinitions, setAvailableFilterDefinitions };
-    }, renderHookConfig);
-
-    expect(result.current.availableFilterDefinitions).toEqual([]);
-
-    act(() => {
-      result.current.setAvailableFilterDefinitions(filterDefinitions);
-    });
-
-    await waitFor(() => {
-      expect(result.current.availableFilterDefinitions).toEqual(
-        filterDefinitions,
-      );
-    });
-  });
-
-  it('should set onFilterSelect', async () => {
-    const { result } = renderHook(() => {
-      useFilterDropdown({ filterDropdownId });
-      const { onFilterSelectState } = useFilterDropdownStates(filterDropdownId);
-
-      const [onFilterSelect, setOnFilterSelect] =
-        useRecoilState(onFilterSelectState);
-      return { onFilterSelect, setOnFilterSelect };
-    }, renderHookConfig);
-
-    expect(result.current.onFilterSelect).toBeUndefined();
-
-    act(() => {
-      result.current.setOnFilterSelect(
-        (_currVal?: Filter | null) => (_filter: Filter | null) => {},
-      );
-    });
-    await waitFor(() => {
-      expect(typeof result.current.onFilterSelect).toBe('function');
-    });
-  });
-
-  it('should set selectedOperandInDropdown', async () => {
-    const { result } = renderHook(() => {
-      useFilterDropdown({ filterDropdownId });
-      const { selectedOperandInDropdownState } =
-        useFilterDropdownStates(filterDropdownId);
-
-      const [selectedOperandInDropdown, setSelectedOperandInDropdown] =
-        useRecoilState(selectedOperandInDropdownState);
-      return { selectedOperandInDropdown, setSelectedOperandInDropdown };
-    }, renderHookConfig);
-
-    const mockOperand = ViewFilterOperand.Contains;
-
-    expect(result.current.selectedOperandInDropdown).toBeNull();
-
-    act(() => {
-      result.current.setSelectedOperandInDropdown(mockOperand);
-    });
-
-    expect(result.current.selectedOperandInDropdown).toBe(mockOperand);
-  });
-
-  it('should set selectedFilter', async () => {
-    const { result } = renderHook(() => {
-      useFilterDropdown({ filterDropdownId });
-      const { selectedFilterState } = useFilterDropdownStates(filterDropdownId);
-
-      const [selectedFilter, setSelectedFilter] =
-        useRecoilState(selectedFilterState);
-      return { selectedFilter, setSelectedFilter };
-    }, renderHookConfig);
-
-    expect(result.current.selectedFilter).toBeUndefined();
-
-    act(() => {
-      result.current.setSelectedFilter(mockFilter);
-    });
-
-    await waitFor(() => {
-      expect(result.current.selectedFilter).toBe(mockFilter);
-    });
-  });
-
-  it('should set filterDefinitionUsedInDropdown', async () => {
-    const { result } = renderHook(() => {
-      useFilterDropdown({ filterDropdownId });
-      const { filterDefinitionUsedInDropdownState } =
-        useFilterDropdownStates(filterDropdownId);
-
-      const [
-        filterDefinitionUsedInDropdown,
-        setFilterDefinitionUsedInDropdown,
-      ] = useRecoilState(filterDefinitionUsedInDropdownState);
-      return {
-        filterDefinitionUsedInDropdown,
-        setFilterDefinitionUsedInDropdown,
-      };
-    }, renderHookConfig);
-
-    expect(result.current.filterDefinitionUsedInDropdown).toBeNull();
-
-    act(() => {
-      result.current.setFilterDefinitionUsedInDropdown(filterDefinitions[0]);
-    });
-
-    await waitFor(() => {
-      expect(result.current.filterDefinitionUsedInDropdown).toBe(
-        filterDefinitions[0],
-      );
-    });
-  });
-
-  it('should set objectFilterDropdownSearchInput', async () => {
-    const mockResult = 'value';
-    const { result } = renderHook(() => {
-      useFilterDropdown({ filterDropdownId });
-      const { objectFilterDropdownSearchInputState } =
-        useFilterDropdownStates(filterDropdownId);
-
-      const [
-        objectFilterDropdownSearchInput,
-        setObjectFilterDropdownSearchInput,
-      ] = useRecoilState(objectFilterDropdownSearchInputState);
-      return {
-        objectFilterDropdownSearchInput,
-        setObjectFilterDropdownSearchInput,
-      };
-    }, renderHookConfig);
-
-    expect(result.current.objectFilterDropdownSearchInput).toBe('');
-
-    act(() => {
-      result.current.setObjectFilterDropdownSearchInput(mockResult);
-    });
-
-    await waitFor(() => {
-      expect(result.current.objectFilterDropdownSearchInput).toBe(mockResult);
-    });
-  });
-
-  it('should set objectFilterDropdownSelectedRecordId', async () => {
-    const mockResult = ['value'];
-    const { result } = renderHook(() => {
-      useFilterDropdown({ filterDropdownId });
-      const { objectFilterDropdownSelectedRecordIdsState } =
-        useFilterDropdownStates(filterDropdownId);
-
-      const [
-        objectFilterDropdownSelectedRecordIds,
-        setObjectFilterDropdownSelectedRecordIds,
-      ] = useRecoilState(objectFilterDropdownSelectedRecordIdsState);
-      return {
-        objectFilterDropdownSelectedRecordIds,
-        setObjectFilterDropdownSelectedRecordIds,
-      };
-    }, renderHookConfig);
-
-    expect(
-      JSON.stringify(result.current.objectFilterDropdownSelectedRecordIds),
-    ).toBe(JSON.stringify([]));
-
-    act(() => {
-      result.current.setObjectFilterDropdownSelectedRecordIds(mockResult);
-    });
-
-    await waitFor(() => {
-      expect(result.current.objectFilterDropdownSelectedRecordIds).toBe(
-        mockResult,
-      );
-    });
-  });
-
-  it('should set objectFilterDropdownSelectedRecordIds', async () => {
-    const mockResult = ['id-0', 'id-1', 'id-2'];
-    const { result } = renderHook(() => {
-      useFilterDropdown({ filterDropdownId });
-      const { objectFilterDropdownSelectedRecordIdsState } =
-        useFilterDropdownStates(filterDropdownId);
-
-      const [
-        objectFilterDropdownSelectedRecordIds,
-        setObjectFilterDropdownSelectedRecordIds,
-      ] = useRecoilState(objectFilterDropdownSelectedRecordIdsState);
-      return {
-        objectFilterDropdownSelectedRecordIds,
-        setObjectFilterDropdownSelectedRecordIds,
-      };
-    }, renderHookConfig);
-
-    expect(result.current.objectFilterDropdownSelectedRecordIds).toHaveLength(
-      0,
-    );
-
-    act(() => {
-      result.current.setObjectFilterDropdownSelectedRecordIds(mockResult);
-    });
-
-    await waitFor(() => {
-      expect(
-        result.current.objectFilterDropdownSelectedRecordIds,
-      ).toStrictEqual(mockResult);
-    });
-  });
-
-  it('should reset filter', async () => {
-    const { result } = renderHook(() => {
-      const { resetFilter, selectFilter } = useFilterDropdown({
-        filterDropdownId,
-      });
-
-      const { selectedFilterState } = useFilterDropdownStates(filterDropdownId);
-
-      const [selectedFilter, setSelectedFilter] =
-        useRecoilState(selectedFilterState);
-      return { selectedFilter, setSelectedFilter, selectFilter, resetFilter };
-    }, renderHookConfig);
-
-    act(() => {
-      result.current.selectFilter(mockFilter);
-    });
-
-    await waitFor(() => {
-      expect(result.current.selectedFilter).toStrictEqual(mockFilter);
-    });
-
-    act(() => {
-      result.current.resetFilter();
-    });
-
-    await waitFor(() => {
-      expect(result.current.selectedFilter).toBeUndefined();
-    });
-  });
-
-  it('should call onFilterSelect when a filter option is set', async () => {
-    const { result } = renderHook(() => {
-      const { selectFilter } = useFilterDropdown({ filterDropdownId });
-      const { onFilterSelectState } = useFilterDropdownStates(filterDropdownId);
-
-      const [onFilterSelect, setOnFilterSelect] =
-        useRecoilState(onFilterSelectState);
-      return { onFilterSelect, setOnFilterSelect, selectFilter };
-    }, renderHookConfig);
-    const onFilterSelectMock = jest.fn();
-
-    expect(result.current.onFilterSelect).toBeUndefined();
-
-    act(() => {
-      result.current.setOnFilterSelect(onFilterSelectMock);
-      result.current.selectFilter(mockFilter);
-    });
-
-    await waitFor(() => {
-      expect(onFilterSelectMock).toBeDefined();
-      expect(onFilterSelectMock).toHaveBeenCalled();
-    });
-  });
-
-  it('should handle scopeId undefined on initial values', () => {
-    global.console.error = jest.fn();
-
-    const renderFunction = () => {
-      renderHook(() => useFilterDropdown(), renderHookConfig);
-    };
-
-    expect(renderFunction).toThrow(Error);
-    expect(renderFunction).toThrow(
-      'Scope id is not provided and cannot be found in context.',
-    );
-  });
-
-  it('should scopeId have been defined on initial values', () => {
-    const { result } = renderHook(
-      () => useFilterDropdown({ filterDropdownId }),
-      renderHookConfig,
-    );
-
-    expect(result.current.scopeId).toBeDefined();
-  });
-});
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useEmptyRecordFilter.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useEmptyRecordFilter.ts
new file mode 100644
index 000000000000..93e70009c1af
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useEmptyRecordFilter.ts
@@ -0,0 +1,42 @@
+import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState';
+import { objectFilterDropdownSelectedRecordIdsComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsComponentState';
+import { selectedFilterComponentState } from '@/object-record/object-filter-dropdown/states/selectedFilterComponentState';
+import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2';
+import { useRecoilCallback } from 'recoil';
+
+export const useEmptyRecordFilter = (componentInstanceId?: string) => {
+  const objectFilterDropdownSearchInputCallbackState =
+    useRecoilComponentCallbackStateV2(
+      objectFilterDropdownSearchInputComponentState,
+      componentInstanceId,
+    );
+
+  const objectFilterDropdownSelectedRecordIdsCallbackState =
+    useRecoilComponentCallbackStateV2(
+      objectFilterDropdownSelectedRecordIdsComponentState,
+      componentInstanceId,
+    );
+
+  const selectedFilterCallbackState = useRecoilComponentCallbackStateV2(
+    selectedFilterComponentState,
+    componentInstanceId,
+  );
+
+  const emptyRecordFilter = useRecoilCallback(
+    ({ set }) =>
+      () => {
+        set(objectFilterDropdownSearchInputCallbackState, '');
+        set(objectFilterDropdownSelectedRecordIdsCallbackState, []);
+        set(selectedFilterCallbackState, undefined);
+      },
+    [
+      objectFilterDropdownSearchInputCallbackState,
+      objectFilterDropdownSelectedRecordIdsCallbackState,
+      selectedFilterCallbackState,
+    ],
+  );
+
+  return {
+    emptyRecordFilter,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdown.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdown.ts
deleted file mode 100644
index e492f5eb24a8..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdown.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-import { useRecoilCallback, useSetRecoilState } from 'recoil';
-
-import { useFilterDropdownStates } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdownStates';
-import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
-import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotValue';
-
-import { objectFilterDropdownFilterIsSelectedComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownFilterIsSelectedComponentState';
-import { objectFilterDropdownIsSelectingCompositeFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState';
-import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2';
-import { useUpsertCombinedViewFilters } from '@/views/hooks/useUpsertCombinedViewFilters';
-import { isDefined } from 'twenty-ui';
-import { ObjectFilterDropdownScopeInternalContext } from '../scopes/scope-internal-context/ObjectFilterDropdownScopeInternalContext';
-import { Filter } from '../types/Filter';
-
-type UseFilterDropdownProps = {
-  filterDropdownId?: string;
-  advancedFilterViewFilterId?: string;
-};
-
-export const useFilterDropdown = (props?: UseFilterDropdownProps) => {
-  const scopeId = useAvailableScopeIdOrThrow(
-    ObjectFilterDropdownScopeInternalContext,
-    props?.filterDropdownId,
-  );
-
-  const {
-    filterDefinitionUsedInDropdownState,
-    objectFilterDropdownSearchInputState,
-    objectFilterDropdownSelectedRecordIdsState,
-    objectFilterDropdownSelectedOptionValuesState,
-    selectedFilterState,
-    selectedOperandInDropdownState,
-    onFilterSelectState,
-    advancedFilterViewFilterGroupIdState,
-    advancedFilterViewFilterIdState,
-  } = useFilterDropdownStates(scopeId);
-
-  const { upsertCombinedViewFilter } = useUpsertCombinedViewFilters();
-
-  const selectFilter = useRecoilCallback(
-    ({ set, snapshot }) =>
-      (filter: Filter | null) => {
-        set(selectedFilterState, filter);
-        const onFilterSelect = getSnapshotValue(snapshot, onFilterSelectState);
-
-        if (isDefined(filter)) {
-          upsertCombinedViewFilter(filter);
-        }
-
-        onFilterSelect?.(filter);
-      },
-    [selectedFilterState, onFilterSelectState, upsertCombinedViewFilter],
-  );
-
-  const emptyFilterButKeepDefinition = useRecoilCallback(
-    ({ set }) =>
-      () => {
-        set(objectFilterDropdownSearchInputState, '');
-        set(objectFilterDropdownSelectedRecordIdsState, []);
-        set(selectedFilterState, undefined);
-      },
-    [
-      objectFilterDropdownSearchInputState,
-      objectFilterDropdownSelectedRecordIdsState,
-      selectedFilterState,
-    ],
-  );
-
-  const setObjectFilterDropdownFilterIsSelectedCallbackState =
-    useRecoilComponentCallbackStateV2(
-      objectFilterDropdownFilterIsSelectedComponentState,
-      props?.filterDropdownId,
-    );
-
-  const setObjectFilterDropdownIsSelectingCompositeFieldCallbackState =
-    useRecoilComponentCallbackStateV2(
-      objectFilterDropdownIsSelectingCompositeFieldComponentState,
-      props?.filterDropdownId,
-    );
-
-  const resetFilter = useRecoilCallback(
-    ({ set }) =>
-      () => {
-        set(objectFilterDropdownSearchInputState, '');
-        set(objectFilterDropdownSelectedRecordIdsState, []);
-        set(selectedFilterState, undefined);
-        set(filterDefinitionUsedInDropdownState, null);
-        set(selectedOperandInDropdownState, null);
-        set(setObjectFilterDropdownFilterIsSelectedCallbackState, false);
-        set(
-          setObjectFilterDropdownIsSelectingCompositeFieldCallbackState,
-          false,
-        );
-      },
-    [
-      filterDefinitionUsedInDropdownState,
-      objectFilterDropdownSearchInputState,
-      objectFilterDropdownSelectedRecordIdsState,
-      selectedFilterState,
-      selectedOperandInDropdownState,
-      setObjectFilterDropdownFilterIsSelectedCallbackState,
-      setObjectFilterDropdownIsSelectingCompositeFieldCallbackState,
-    ],
-  );
-
-  const setSelectedFilter = useSetRecoilState(selectedFilterState);
-  const setSelectedOperandInDropdown = useSetRecoilState(
-    selectedOperandInDropdownState,
-  );
-  const setFilterDefinitionUsedInDropdown = useSetRecoilState(
-    filterDefinitionUsedInDropdownState,
-  );
-  const setObjectFilterDropdownSearchInput = useSetRecoilState(
-    objectFilterDropdownSearchInputState,
-  );
-  const setObjectFilterDropdownSelectedRecordIds = useSetRecoilState(
-    objectFilterDropdownSelectedRecordIdsState,
-  );
-  const setObjectFilterDropdownSelectedOptionValues = useSetRecoilState(
-    objectFilterDropdownSelectedOptionValuesState,
-  );
-
-  const setOnFilterSelect = useSetRecoilState(onFilterSelectState);
-  const setAdvancedFilterViewFilterGroupId = useSetRecoilState(
-    advancedFilterViewFilterGroupIdState,
-  );
-  const setAdvancedFilterViewFilterId = useSetRecoilState(
-    advancedFilterViewFilterIdState,
-  );
-
-  return {
-    scopeId,
-    selectFilter,
-    resetFilter,
-    setSelectedFilter,
-    setSelectedOperandInDropdown,
-    setFilterDefinitionUsedInDropdown,
-    setObjectFilterDropdownSearchInput,
-    setObjectFilterDropdownSelectedRecordIds,
-    setObjectFilterDropdownSelectedOptionValues,
-    setOnFilterSelect,
-    setAdvancedFilterViewFilterGroupId,
-    setAdvancedFilterViewFilterId,
-    emptyFilterButKeepDefinition,
-    filterDefinitionUsedInDropdownState,
-    objectFilterDropdownSearchInputState,
-    objectFilterDropdownSelectedRecordIdsState,
-    objectFilterDropdownSelectedOptionValuesState,
-    selectedFilterState,
-    selectedOperandInDropdownState,
-    onFilterSelectState,
-    advancedFilterViewFilterGroupIdState,
-    advancedFilterViewFilterIdState,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdownStates.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdownStates.ts
deleted file mode 100644
index 9068c113edd4..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdownStates.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { advancedFilterViewFilterGroupIdComponentState } from '@/object-record/object-filter-dropdown/states/advancedFilterViewFilterGroupIdComponentState';
-import { advancedFilterViewFilterIdComponentState } from '@/object-record/object-filter-dropdown/states/advancedFilterViewFilterIdComponentState';
-import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
-import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState';
-import { objectFilterDropdownSelectedOptionValuesComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedOptionValuesComponentState';
-import { objectFilterDropdownSelectedRecordIdsComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsComponentState';
-import { onFilterSelectComponentState } from '@/object-record/object-filter-dropdown/states/onFilterSelectComponentState';
-import { selectedFilterComponentState } from '@/object-record/object-filter-dropdown/states/selectedFilterComponentState';
-import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
-import { extractComponentState } from '@/ui/utilities/state/component-state/utils/extractComponentState';
-
-export const useFilterDropdownStates = (scopeId: string) => {
-  const filterDefinitionUsedInDropdownState = extractComponentState(
-    filterDefinitionUsedInDropdownComponentState,
-    scopeId,
-  );
-
-  const objectFilterDropdownSearchInputState = extractComponentState(
-    objectFilterDropdownSearchInputComponentState,
-    scopeId,
-  );
-
-  const objectFilterDropdownSelectedRecordIdsState = extractComponentState(
-    objectFilterDropdownSelectedRecordIdsComponentState,
-    scopeId,
-  );
-
-  const objectFilterDropdownSelectedOptionValuesState = extractComponentState(
-    objectFilterDropdownSelectedOptionValuesComponentState,
-    scopeId,
-  );
-
-  const selectedFilterState = extractComponentState(
-    selectedFilterComponentState,
-    scopeId,
-  );
-
-  const selectedOperandInDropdownState = extractComponentState(
-    selectedOperandInDropdownComponentState,
-    scopeId,
-  );
-
-  const onFilterSelectState = extractComponentState(
-    onFilterSelectComponentState,
-    scopeId,
-  );
-
-  const advancedFilterViewFilterGroupIdState = extractComponentState(
-    advancedFilterViewFilterGroupIdComponentState,
-    scopeId,
-  );
-
-  const advancedFilterViewFilterIdState = extractComponentState(
-    advancedFilterViewFilterIdComponentState,
-    scopeId,
-  );
-
-  return {
-    filterDefinitionUsedInDropdownState,
-    objectFilterDropdownSearchInputState,
-    objectFilterDropdownSelectedRecordIdsState,
-    objectFilterDropdownSelectedOptionValuesState,
-    selectedFilterState,
-    selectedOperandInDropdownState,
-    onFilterSelectState,
-    advancedFilterViewFilterGroupIdState,
-    advancedFilterViewFilterIdState,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useResetFilterDropdown.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useResetFilterDropdown.ts
new file mode 100644
index 000000000000..2f7b6cdf5477
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useResetFilterDropdown.ts
@@ -0,0 +1,78 @@
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
+import { objectFilterDropdownFilterIsSelectedComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownFilterIsSelectedComponentState';
+import { objectFilterDropdownIsSelectingCompositeFieldComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownIsSelectingCompositeFieldComponentState';
+import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState';
+import { objectFilterDropdownSelectedRecordIdsComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsComponentState';
+import { selectedFilterComponentState } from '@/object-record/object-filter-dropdown/states/selectedFilterComponentState';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
+import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2';
+import { useRecoilCallback } from 'recoil';
+
+export const useResetFilterDropdown = (componentInstanceId?: string) => {
+  const objectFilterDropdownSearchInputCallbackState =
+    useRecoilComponentCallbackStateV2(
+      objectFilterDropdownSearchInputComponentState,
+      componentInstanceId,
+    );
+
+  const objectFilterDropdownSelectedRecordIdsCallbackState =
+    useRecoilComponentCallbackStateV2(
+      objectFilterDropdownSelectedRecordIdsComponentState,
+      componentInstanceId,
+    );
+
+  const selectedFilterCallbackState = useRecoilComponentCallbackStateV2(
+    selectedFilterComponentState,
+    componentInstanceId,
+  );
+
+  const filterDefinitionUsedInDropdownCallbackState =
+    useRecoilComponentCallbackStateV2(
+      filterDefinitionUsedInDropdownComponentState,
+      componentInstanceId,
+    );
+
+  const selectedOperandInDropdownCallbackState =
+    useRecoilComponentCallbackStateV2(
+      selectedOperandInDropdownComponentState,
+      componentInstanceId,
+    );
+
+  const objectFilterDropdownFilterIsSelectedCallbackState =
+    useRecoilComponentCallbackStateV2(
+      objectFilterDropdownFilterIsSelectedComponentState,
+      componentInstanceId,
+    );
+
+  const objectFilterDropdownIsSelectingCompositeFieldCallbackState =
+    useRecoilComponentCallbackStateV2(
+      objectFilterDropdownIsSelectingCompositeFieldComponentState,
+      componentInstanceId,
+    );
+
+  const resetFilterDropdown = useRecoilCallback(
+    ({ set }) =>
+      () => {
+        set(objectFilterDropdownSearchInputCallbackState, '');
+        set(objectFilterDropdownSelectedRecordIdsCallbackState, []);
+        set(selectedFilterCallbackState, undefined);
+        set(filterDefinitionUsedInDropdownCallbackState, null);
+        set(selectedOperandInDropdownCallbackState, null);
+        set(objectFilterDropdownFilterIsSelectedCallbackState, false);
+        set(objectFilterDropdownIsSelectingCompositeFieldCallbackState, false);
+      },
+    [
+      filterDefinitionUsedInDropdownCallbackState,
+      objectFilterDropdownSearchInputCallbackState,
+      objectFilterDropdownSelectedRecordIdsCallbackState,
+      selectedFilterCallbackState,
+      selectedOperandInDropdownCallbackState,
+      objectFilterDropdownFilterIsSelectedCallbackState,
+      objectFilterDropdownIsSelectingCompositeFieldCallbackState,
+    ],
+  );
+
+  return {
+    resetFilterDropdown,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useSelectFilter.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useSelectFilter.ts
deleted file mode 100644
index af287141ea32..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useSelectFilter.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
-import { getInitialFilterValue } from '@/object-record/object-filter-dropdown/utils/getInitialFilterValue';
-import { getOperandsForFilterDefinition } from '@/object-record/object-filter-dropdown/utils/getOperandsForFilterType';
-import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
-import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
-import { useRecoilValue } from 'recoil';
-import { isDefined } from 'twenty-ui';
-import { v4 } from 'uuid';
-
-type SelectFilterParams = {
-  filterDefinition: FilterDefinition;
-};
-
-export const useSelectFilter = () => {
-  const {
-    setFilterDefinitionUsedInDropdown,
-    setSelectedOperandInDropdown,
-    setObjectFilterDropdownSearchInput,
-    selectFilter: filterDropdownSelectFilter,
-    advancedFilterViewFilterGroupIdState,
-    advancedFilterViewFilterIdState,
-  } = useFilterDropdown();
-
-  const advancedFilterViewFilterId = useRecoilValue(
-    advancedFilterViewFilterIdState,
-  );
-  const advancedFilterViewFilterGroupId = useRecoilValue(
-    advancedFilterViewFilterGroupIdState,
-  );
-
-  const setHotkeyScope = useSetHotkeyScope();
-
-  const selectFilter = ({ filterDefinition }: SelectFilterParams) => {
-    setFilterDefinitionUsedInDropdown(filterDefinition);
-
-    if (
-      filterDefinition.type === 'RELATION' ||
-      filterDefinition.type === 'SELECT'
-    ) {
-      setHotkeyScope(RelationPickerHotkeyScope.RelationPicker);
-    }
-
-    setSelectedOperandInDropdown(
-      getOperandsForFilterDefinition(filterDefinition)[0],
-    );
-
-    const { value, displayValue } = getInitialFilterValue(
-      filterDefinition.type,
-      getOperandsForFilterDefinition(filterDefinition)[0],
-    );
-
-    const isAdvancedFilter = isDefined(advancedFilterViewFilterId);
-
-    if (isAdvancedFilter || value !== '') {
-      filterDropdownSelectFilter({
-        id: advancedFilterViewFilterId ?? v4(),
-        fieldMetadataId: filterDefinition.fieldMetadataId,
-        displayValue,
-        operand: getOperandsForFilterDefinition(filterDefinition)[0],
-        value,
-        definition: filterDefinition,
-        viewFilterGroupId: advancedFilterViewFilterGroupId,
-      });
-    }
-
-    setObjectFilterDropdownSearchInput('');
-  };
-
-  return {
-    selectFilter,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useSelectFilterDefinitionUsedInDropdown.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useSelectFilterDefinitionUsedInDropdown.ts
new file mode 100644
index 000000000000..dd076baf4553
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useSelectFilterDefinitionUsedInDropdown.ts
@@ -0,0 +1,95 @@
+import { advancedFilterViewFilterGroupIdComponentState } from '@/object-record/object-filter-dropdown/states/advancedFilterViewFilterGroupIdComponentState';
+import { advancedFilterViewFilterIdComponentState } from '@/object-record/object-filter-dropdown/states/advancedFilterViewFilterIdComponentState';
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
+import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
+import { getInitialFilterValue } from '@/object-record/object-filter-dropdown/utils/getInitialFilterValue';
+import { useApplyRecordFilter } from '@/object-record/record-filter/hooks/useApplyRecordFilter';
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
+import { getRecordFilterOperandsForRecordFilterDefinition } from '@/object-record/record-filter/utils/getRecordFilterOperandsForRecordFilterDefinition';
+import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
+import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
+import { isDefined } from 'twenty-ui';
+import { v4 } from 'uuid';
+
+type SelectFilterParams = {
+  filterDefinition: RecordFilterDefinition;
+};
+
+export const useSelectFilterDefinitionUsedInDropdown = (
+  componentInstanceId?: string,
+) => {
+  const setFilterDefinitionUsedInDropdown = useSetRecoilComponentStateV2(
+    filterDefinitionUsedInDropdownComponentState,
+    componentInstanceId,
+  );
+
+  const setSelectedOperandInDropdown = useSetRecoilComponentStateV2(
+    selectedOperandInDropdownComponentState,
+    componentInstanceId,
+  );
+
+  const setObjectFilterDropdownSearchInput = useSetRecoilComponentStateV2(
+    objectFilterDropdownSearchInputComponentState,
+    componentInstanceId,
+  );
+
+  const advancedFilterViewFilterGroupId = useRecoilComponentValueV2(
+    advancedFilterViewFilterGroupIdComponentState,
+    componentInstanceId,
+  );
+
+  const advancedFilterViewFilterId = useRecoilComponentValueV2(
+    advancedFilterViewFilterIdComponentState,
+    componentInstanceId,
+  );
+
+  const setHotkeyScope = useSetHotkeyScope();
+
+  const { applyRecordFilter } = useApplyRecordFilter(componentInstanceId);
+
+  const selectFilterDefinitionUsedInDropdown = ({
+    filterDefinition,
+  }: SelectFilterParams) => {
+    setFilterDefinitionUsedInDropdown(filterDefinition);
+
+    if (
+      filterDefinition.type === 'RELATION' ||
+      filterDefinition.type === 'SELECT'
+    ) {
+      setHotkeyScope(RelationPickerHotkeyScope.RelationPicker);
+    }
+
+    setSelectedOperandInDropdown(
+      getRecordFilterOperandsForRecordFilterDefinition(filterDefinition)[0],
+    );
+
+    const { value, displayValue } = getInitialFilterValue(
+      filterDefinition.type,
+      getRecordFilterOperandsForRecordFilterDefinition(filterDefinition)[0],
+    );
+
+    const isAdvancedFilter = isDefined(advancedFilterViewFilterId);
+
+    if (isAdvancedFilter || value !== '') {
+      applyRecordFilter({
+        id: advancedFilterViewFilterId ?? v4(),
+        fieldMetadataId: filterDefinition.fieldMetadataId,
+        displayValue,
+        operand:
+          getRecordFilterOperandsForRecordFilterDefinition(filterDefinition)[0],
+        value,
+        definition: filterDefinition,
+        viewFilterGroupId: advancedFilterViewFilterGroupId,
+      });
+    }
+
+    setObjectFilterDropdownSearchInput('');
+  };
+
+  return {
+    selectFilterDefinitionUsedInDropdown,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useSetFilterDefinitionUsedInDropdownInScope.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useSetFilterDefinitionUsedInDropdownInScope.ts
deleted file mode 100644
index 85a515c6d15c..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useSetFilterDefinitionUsedInDropdownInScope.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { useRecoilCallback } from 'recoil';
-import { filterDefinitionUsedInDropdownComponentState } from '../states/filterDefinitionUsedInDropdownComponentState';
-import { FilterDefinition } from '../types/FilterDefinition';
-import { extractComponentState } from '@/ui/utilities/state/component-state/utils/extractComponentState';
-
-export const useSetFilterDefinitionUsedInDropdownInScope = () => {
-  const setFilterDefinitionUsedInDropdownInScope = useRecoilCallback(
-    ({ set }) =>
-      (scopeId: string, filterDefinition: FilterDefinition | null) => {
-        const filterDefinitionUsedInDropdownState = extractComponentState(
-          filterDefinitionUsedInDropdownComponentState,
-          scopeId,
-        );
-        set(filterDefinitionUsedInDropdownState, filterDefinition);
-      },
-    [],
-  );
-
-  return {
-    setFilterDefinitionUsedInDropdownInScope,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope.tsx
deleted file mode 100644
index f7950d494804..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { ReactNode } from 'react';
-
-import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
-import { ObjectFilterDropdownScopeInternalContext } from './scope-internal-context/ObjectFilterDropdownScopeInternalContext';
-
-type ObjectFilterDropdownScopeProps = {
-  children: ReactNode;
-  filterScopeId: string;
-};
-
-export const ObjectFilterDropdownScope = ({
-  children,
-  filterScopeId,
-}: ObjectFilterDropdownScopeProps) => {
-  return (
-    <ObjectFilterDropdownComponentInstanceContext.Provider
-      value={{ instanceId: filterScopeId }}
-    >
-      <ObjectFilterDropdownScopeInternalContext.Provider
-        value={{ scopeId: filterScopeId }}
-      >
-        {children}
-      </ObjectFilterDropdownScopeInternalContext.Provider>
-    </ObjectFilterDropdownComponentInstanceContext.Provider>
-  );
-};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/scopes/scope-internal-context/ObjectFilterDropdownScopeInternalContext.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/scopes/scope-internal-context/ObjectFilterDropdownScopeInternalContext.ts
deleted file mode 100644
index be81417c1ca9..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/scopes/scope-internal-context/ObjectFilterDropdownScopeInternalContext.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createScopeInternalContext } from '@/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext';
-import { RecoilComponentStateKey } from '@/ui/utilities/state/component-state/types/RecoilComponentStateKey';
-
-type ObjectFilterDropdownScopeInternalContextProps = RecoilComponentStateKey;
-
-export const ObjectFilterDropdownScopeInternalContext =
-  createScopeInternalContext<ObjectFilterDropdownScopeInternalContextProps>();
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/advancedFilterViewFilterGroupIdComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/advancedFilterViewFilterGroupIdComponentState.ts
index b2c1dad91cf0..64d8238bcc2e 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/advancedFilterViewFilterGroupIdComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/advancedFilterViewFilterGroupIdComponentState.ts
@@ -1,7 +1,9 @@
-import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 
 export const advancedFilterViewFilterGroupIdComponentState =
-  createComponentState<string | undefined>({
+  createComponentStateV2<string | undefined>({
     key: 'advancedFilterViewFilterGroupIdComponentState',
     defaultValue: undefined,
+    componentInstanceContext: ObjectFilterDropdownComponentInstanceContext,
   });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/advancedFilterViewFilterIdComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/advancedFilterViewFilterIdComponentState.ts
index 59053b825af0..cc3e3678ddc0 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/advancedFilterViewFilterIdComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/advancedFilterViewFilterIdComponentState.ts
@@ -1,8 +1,10 @@
-import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 
-export const advancedFilterViewFilterIdComponentState = createComponentState<
+export const advancedFilterViewFilterIdComponentState = createComponentStateV2<
   string | undefined
 >({
   key: 'advancedFilterViewFilterIdComponentState',
   defaultValue: undefined,
+  componentInstanceContext: ObjectFilterDropdownComponentInstanceContext,
 });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/availableFilterDefinitionsComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/availableFilterDefinitionsComponentState.ts
index 9a3f649ea491..ddc529f0002a 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/availableFilterDefinitionsComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/availableFilterDefinitionsComponentState.ts
@@ -1,9 +1,12 @@
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
-import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
 
-export const availableFilterDefinitionsComponentState = createComponentState<
-  FilterDefinition[]
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
+
+export const availableFilterDefinitionsComponentState = createComponentStateV2<
+  RecordFilterDefinition[]
 >({
   key: 'availableFilterDefinitionsComponentState',
   defaultValue: [],
+  componentInstanceContext: ObjectFilterDropdownComponentInstanceContext,
 });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState.ts
index c7fd89f92902..adcda1f210b1 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState.ts
@@ -1,9 +1,10 @@
-import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
-
-import { FilterDefinition } from '../types/FilterDefinition';
+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 
 export const filterDefinitionUsedInDropdownComponentState =
-  createComponentState<FilterDefinition | null>({
+  createComponentStateV2<RecordFilterDefinition | null>({
     key: 'filterDefinitionUsedInDropdownComponentState',
     defaultValue: null,
+    componentInstanceContext: ObjectFilterDropdownComponentInstanceContext,
   });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedComponentState.ts
index 389c6d30f928..eacaa84cc05c 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedComponentState.ts
@@ -1,7 +1,9 @@
-import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 
 export const isObjectFilterDropdownOperandSelectUnfoldedComponentState =
-  createComponentState<boolean>({
+  createComponentStateV2<boolean>({
     key: 'isObjectFilterDropdownOperandSelectUnfoldedComponentState',
     defaultValue: false,
+    componentInstanceContext: ObjectFilterDropdownComponentInstanceContext,
   });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedComponentState.ts
index cfd6dea10c8f..ac62700b8d99 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedComponentState.ts
@@ -1,7 +1,9 @@
-import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 
 export const isObjectFilterDropdownUnfoldedComponentState =
-  createComponentState<boolean>({
-    key: 'isObjectFilterDropdownUnfoldedScopedState',
+  createComponentStateV2<boolean>({
+    key: 'isObjectFilterDropdownUnfoldedComponentState',
     defaultValue: false,
+    componentInstanceContext: ObjectFilterDropdownComponentInstanceContext,
   });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownFirstLevelFilterDefinitionComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownFirstLevelFilterDefinitionComponentState.ts
index b686bb1bbd03..2e74b221b6a5 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownFirstLevelFilterDefinitionComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownFirstLevelFilterDefinitionComponentState.ts
@@ -1,9 +1,9 @@
 import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
 import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 
 export const objectFilterDropdownFirstLevelFilterDefinitionComponentState =
-  createComponentStateV2<FilterDefinition | null>({
+  createComponentStateV2<RecordFilterDefinition | null>({
     key: 'objectFilterDropdownFirstLevelFilterDefinitionComponentState',
     defaultValue: null,
     componentInstanceContext: ObjectFilterDropdownComponentInstanceContext,
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState.ts
index 8addf2fb6cc6..47ed066c2f7b 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState.ts
@@ -1,7 +1,9 @@
-import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 
 export const objectFilterDropdownSearchInputComponentState =
-  createComponentState<string>({
+  createComponentStateV2<string>({
     key: 'objectFilterDropdownSearchInputComponentState',
     defaultValue: '',
+    componentInstanceContext: ObjectFilterDropdownComponentInstanceContext,
   });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedOptionValuesComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedOptionValuesComponentState.ts
index feef87220c1e..da1b563a6a59 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedOptionValuesComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedOptionValuesComponentState.ts
@@ -1,7 +1,9 @@
-import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 
 export const objectFilterDropdownSelectedOptionValuesComponentState =
-  createComponentState<string[]>({
+  createComponentStateV2<string[]>({
     key: 'objectFilterDropdownSelectedOptionValuesComponentState',
     defaultValue: [],
+    componentInstanceContext: ObjectFilterDropdownComponentInstanceContext,
   });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsComponentState.ts
index de23b3b0daa5..b579beec63bd 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsComponentState.ts
@@ -1,7 +1,9 @@
-import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 
 export const objectFilterDropdownSelectedRecordIdsComponentState =
-  createComponentState<string[]>({
+  createComponentStateV2<string[]>({
     key: 'objectFilterDropdownSelectedRecordIdsComponentState',
     defaultValue: [],
+    componentInstanceContext: ObjectFilterDropdownComponentInstanceContext,
   });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSubMenuFieldTypeComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSubMenuFieldTypeComponentState.ts
index f00347b30ea6..4bf9c12f4f21 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSubMenuFieldTypeComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSubMenuFieldTypeComponentState.ts
@@ -1,5 +1,5 @@
 import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
-import { CompositeFilterableFieldType } from '@/object-record/object-filter-dropdown/types/CompositeFilterableFieldType';
+import { CompositeFilterableFieldType } from '@/object-record/record-filter/types/CompositeFilterableFieldType';
 import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 
 export const objectFilterDropdownSubMenuFieldTypeComponentState =
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/onFilterSelectComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/onFilterSelectComponentState.ts
index b73c2cbe962f..9511acc13349 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/onFilterSelectComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/onFilterSelectComponentState.ts
@@ -1,10 +1,11 @@
-import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
+import { RecordFilter } from '../../record-filter/types/RecordFilter';
 
-import { Filter } from '../types/Filter';
-
-export const onFilterSelectComponentState = createComponentState<
-  ((filter: Filter | null) => void) | undefined
+export const onFilterSelectComponentState = createComponentStateV2<
+  ((filter: RecordFilter | null) => void) | undefined
 >({
   key: 'onFilterSelectComponentState',
   defaultValue: undefined,
+  componentInstanceContext: ObjectFilterDropdownComponentInstanceContext,
 });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedFilterComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedFilterComponentState.ts
index 7b4183c74841..f1d207d45606 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedFilterComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedFilterComponentState.ts
@@ -1,10 +1,11 @@
-import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
+import { RecordFilter } from '../../record-filter/types/RecordFilter';
 
-import { Filter } from '../types/Filter';
-
-export const selectedFilterComponentState = createComponentState<
-  Filter | undefined | null
+export const selectedFilterComponentState = createComponentStateV2<
+  RecordFilter | undefined | null
 >({
   key: 'selectedFilterComponentState',
   defaultValue: undefined,
+  componentInstanceContext: ObjectFilterDropdownComponentInstanceContext,
 });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState.ts
index eef8fe552a96..7ed790b5155b 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState.ts
@@ -1,8 +1,10 @@
-import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 
 export const selectedOperandInDropdownComponentState =
-  createComponentState<ViewFilterOperand | null>({
+  createComponentStateV2<ViewFilterOperand | null>({
     key: 'selectedOperandInDropdownComponentState',
     defaultValue: null,
+    componentInstanceContext: ObjectFilterDropdownComponentInstanceContext,
   });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterDefinitionByEntity.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterDefinitionByEntity.ts
deleted file mode 100644
index 4723227eb015..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterDefinitionByEntity.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { FilterDefinition } from './FilterDefinition';
-
-export type FilterDefinitionByEntity<T> = FilterDefinition & {
-  fieldMetadataId: keyof T;
-};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterDraft.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterDraft.ts
deleted file mode 100644
index d107b21d7b72..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterDraft.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
-
-export type FilterDraft = Partial<Filter> &
-  Omit<Filter, 'fieldMetadataId' | 'operand' | 'definition'>;
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterOperand.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterOperand.ts
deleted file mode 100644
index d05acc2e00cf..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterOperand.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ViewFilterOperand as FilterOperand } from '@/views/types/ViewFilterOperand';
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/__tests__/getOperandsForFilterType.test.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/__tests__/getOperandsForFilterType.test.ts
index 023a229edeca..b4f8b4597638 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/__tests__/getOperandsForFilterType.test.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/__tests__/getOperandsForFilterType.test.ts
@@ -1,36 +1,35 @@
-import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
-
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
-import { FilterableFieldType } from '@/object-record/object-filter-dropdown/types/FilterableFieldType';
-import { getOperandsForFilterDefinition } from '../getOperandsForFilterType';
+import { FilterableFieldType } from '@/object-record/record-filter/types/FilterableFieldType';
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
+import { RecordFilterOperand } from '@/object-record/record-filter/types/RecordFilterOperand';
+import { getRecordFilterOperandsForRecordFilterDefinition } from '../../../record-filter/utils/getRecordFilterOperandsForRecordFilterDefinition';
 
 describe('getOperandsForFilterType', () => {
   const emptyOperands = [
-    ViewFilterOperand.IsEmpty,
-    ViewFilterOperand.IsNotEmpty,
+    RecordFilterOperand.IsEmpty,
+    RecordFilterOperand.IsNotEmpty,
   ];
 
   const containsOperands = [
-    ViewFilterOperand.Contains,
-    ViewFilterOperand.DoesNotContain,
+    RecordFilterOperand.Contains,
+    RecordFilterOperand.DoesNotContain,
   ];
 
   const numberOperands = [
-    ViewFilterOperand.GreaterThan,
-    ViewFilterOperand.LessThan,
+    RecordFilterOperand.GreaterThan,
+    RecordFilterOperand.LessThan,
   ];
 
   const dateOperands = [
-    ViewFilterOperand.Is,
-    ViewFilterOperand.IsRelative,
-    ViewFilterOperand.IsInPast,
-    ViewFilterOperand.IsInFuture,
-    ViewFilterOperand.IsToday,
-    ViewFilterOperand.IsBefore,
-    ViewFilterOperand.IsAfter,
+    RecordFilterOperand.Is,
+    RecordFilterOperand.IsRelative,
+    RecordFilterOperand.IsInPast,
+    RecordFilterOperand.IsInFuture,
+    RecordFilterOperand.IsToday,
+    RecordFilterOperand.IsBefore,
+    RecordFilterOperand.IsAfter,
   ];
 
-  const relationOperand = [ViewFilterOperand.Is, ViewFilterOperand.IsNot];
+  const relationOperand = [RecordFilterOperand.Is, RecordFilterOperand.IsNot];
 
   const testCases = [
     ['TEXT', [...containsOperands, ...emptyOperands]],
@@ -50,9 +49,9 @@ describe('getOperandsForFilterType', () => {
 
   testCases.forEach(([filterType, expectedOperands]) => {
     it(`should return correct operands for FilterType.${filterType}`, () => {
-      const result = getOperandsForFilterDefinition({
+      const result = getRecordFilterOperandsForRecordFilterDefinition({
         type: filterType as FilterableFieldType,
-      } as FilterDefinition);
+      } as RecordFilterDefinition);
       expect(result).toEqual(expectedOperands);
     });
   });
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getFilterableFieldTypeLabel.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getFilterableFieldTypeLabel.ts
index 69f9334e0cf2..ab73d2be5260 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getFilterableFieldTypeLabel.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getFilterableFieldTypeLabel.ts
@@ -1,4 +1,4 @@
-import { FilterableFieldType } from '@/object-record/object-filter-dropdown/types/FilterableFieldType';
+import { FilterableFieldType } from '@/object-record/record-filter/types/FilterableFieldType';
 import { SETTINGS_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/SettingsFieldTypeConfigs';
 
 export const getFilterableFieldTypeLabel = (
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getInitialFilterValue.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getInitialFilterValue.ts
index 12c9ecb74d7d..95f689b217de 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getInitialFilterValue.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getInitialFilterValue.ts
@@ -1,21 +1,21 @@
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
-import { FilterableFieldType } from '@/object-record/object-filter-dropdown/types/FilterableFieldType';
-import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
+import { FilterableFieldType } from '@/object-record/record-filter/types/FilterableFieldType';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+import { RecordFilterOperand } from '@/object-record/record-filter/types/RecordFilterOperand';
 import { z } from 'zod';
 
 export const getInitialFilterValue = (
   newType: FilterableFieldType,
-  newOperand: ViewFilterOperand,
+  newOperand: RecordFilterOperand,
   oldValue?: string,
   oldDisplayValue?: string,
-): Pick<Filter, 'value' | 'displayValue'> | Record<string, never> => {
+): Pick<RecordFilter, 'value' | 'displayValue'> | Record<string, never> => {
   switch (newType) {
     case 'DATE':
     case 'DATE_TIME': {
       const activeDatePickerOperands = [
-        ViewFilterOperand.IsBefore,
-        ViewFilterOperand.Is,
-        ViewFilterOperand.IsAfter,
+        RecordFilterOperand.IsBefore,
+        RecordFilterOperand.Is,
+        RecordFilterOperand.IsAfter,
       ];
 
       if (activeDatePickerOperands.includes(newOperand)) {
@@ -29,7 +29,7 @@ export const getInitialFilterValue = (
         return { value, displayValue };
       }
 
-      if (newOperand === ViewFilterOperand.IsRelative) {
+      if (newOperand === RecordFilterOperand.IsRelative) {
         return { value: '', displayValue: '' };
       }
       break;
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getOperandsForFilterType.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getOperandsForFilterType.ts
deleted file mode 100644
index 5ddd7a374996..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getOperandsForFilterType.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
-import { isActorSourceCompositeFilter } from '@/object-record/object-filter-dropdown/utils/isActorSourceCompositeFilter';
-import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
-
-export const getOperandsForFilterDefinition = (
-  filterDefinition: Pick<FilterDefinition, 'type' | 'compositeFieldName'>,
-): ViewFilterOperand[] => {
-  const emptyOperands = [
-    ViewFilterOperand.IsEmpty,
-    ViewFilterOperand.IsNotEmpty,
-  ];
-
-  const relationOperands = [ViewFilterOperand.Is, ViewFilterOperand.IsNot];
-
-  switch (filterDefinition.type) {
-    case 'TEXT':
-    case 'EMAILS':
-    case 'FULL_NAME':
-    case 'ADDRESS':
-    case 'LINKS':
-    case 'PHONES':
-      return [
-        ViewFilterOperand.Contains,
-        ViewFilterOperand.DoesNotContain,
-        ...emptyOperands,
-      ];
-    case 'CURRENCY':
-    case 'NUMBER':
-      return [
-        ViewFilterOperand.GreaterThan,
-        ViewFilterOperand.LessThan,
-        ...emptyOperands,
-      ];
-    case 'RAW_JSON':
-      return [
-        ViewFilterOperand.Contains,
-        ViewFilterOperand.DoesNotContain,
-        ...emptyOperands,
-      ];
-    case 'DATE_TIME':
-    case 'DATE':
-      return [
-        ViewFilterOperand.Is,
-        ViewFilterOperand.IsRelative,
-        ViewFilterOperand.IsInPast,
-        ViewFilterOperand.IsInFuture,
-        ViewFilterOperand.IsToday,
-        ViewFilterOperand.IsBefore,
-        ViewFilterOperand.IsAfter,
-        ...emptyOperands,
-      ];
-    case 'RATING':
-      return [
-        ViewFilterOperand.Is,
-        ViewFilterOperand.GreaterThan,
-        ViewFilterOperand.LessThan,
-        ...emptyOperands,
-      ];
-    case 'RELATION':
-      return [...relationOperands, ...emptyOperands];
-    case 'MULTI_SELECT':
-      return [
-        ViewFilterOperand.Contains,
-        ViewFilterOperand.DoesNotContain,
-        ...emptyOperands,
-      ];
-    case 'SELECT':
-      return [ViewFilterOperand.Is, ViewFilterOperand.IsNot, ...emptyOperands];
-    case 'ACTOR': {
-      if (isActorSourceCompositeFilter(filterDefinition)) {
-        return [
-          ViewFilterOperand.Is,
-          ViewFilterOperand.IsNot,
-          ...emptyOperands,
-        ];
-      }
-
-      return [
-        ViewFilterOperand.Contains,
-        ViewFilterOperand.DoesNotContain,
-        ...emptyOperands,
-      ];
-    }
-    case 'ARRAY':
-      return [
-        ViewFilterOperand.Contains,
-        ViewFilterOperand.DoesNotContain,
-        ...emptyOperands,
-      ];
-    case 'BOOLEAN':
-      return [ViewFilterOperand.Is];
-    default:
-      return [];
-  }
-};
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getSubMenuOptions.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getSubMenuOptions.ts
index 0c3bfb1fb097..80b56f6c5581 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getSubMenuOptions.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getSubMenuOptions.ts
@@ -1,4 +1,4 @@
-import { FilterableFieldType } from '@/object-record/object-filter-dropdown/types/FilterableFieldType';
+import { FilterableFieldType } from '@/object-record/record-filter/types/FilterableFieldType';
 
 export const getSubMenuOptions = (subMenu: FilterableFieldType | null) => {
   switch (subMenu) {
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/isActorSourceCompositeFilter.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/isActorSourceCompositeFilter.ts
index e7296376e748..bb6658fec55c 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/isActorSourceCompositeFilter.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/isActorSourceCompositeFilter.ts
@@ -1,8 +1,8 @@
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
 import { FieldActorValue } from '@/object-record/record-field/types/FieldMetadata';
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
 
 export const isActorSourceCompositeFilter = (
-  filterDefinition: Pick<FilterDefinition, 'compositeFieldName'>,
+  filterDefinition: Pick<RecordFilterDefinition, 'compositeFieldName'>,
 ) => {
   return (
     filterDefinition.compositeFieldName ===
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdown.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdown.tsx
index 06d39bf6adef..970a74ddb706 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdown.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdown.tsx
@@ -9,6 +9,7 @@ import { ObjectOptionsContentId } from '@/object-record/object-options-dropdown/
 import { TableOptionsHotkeyScope } from '@/object-record/record-table/types/TableOptionsHotkeyScope';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton';
+import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { ViewType } from '@/views/types/ViewType';
 
 type ObjectOptionsDropdownProps = {
@@ -25,6 +26,8 @@ export const ObjectOptionsDropdown = ({
   const { currentContentId, handleContentChange, handleResetContent } =
     useCurrentContentId<ObjectOptionsContentId>();
 
+  const { isDropdownOpen } = useDropdown(OBJECT_OPTIONS_DROPDOWN_ID);
+
   return (
     <Dropdown
       dropdownId={OBJECT_OPTIONS_DROPDOWN_ID}
@@ -32,7 +35,9 @@ export const ObjectOptionsDropdown = ({
       dropdownMenuWidth={DROPDOWN_WIDTH}
       dropdownOffset={{ y: DROPDOWN_OFFSET_Y }}
       clickableComponent={
-        <StyledHeaderDropdownButton>Options</StyledHeaderDropdownButton>
+        <StyledHeaderDropdownButton isUnfolded={isDropdownOpen}>
+          Options
+        </StyledHeaderDropdownButton>
       }
       onClose={handleResetContent}
       dropdownComponents={
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenFieldsContent.tsx
index e7d32d123a4c..d47380a497a5 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenFieldsContent.tsx
@@ -12,7 +12,6 @@ import { useObjectNamePluralFromSingular } from '@/object-metadata/hooks/useObje
 import { useObjectOptionsForBoard } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsForBoard';
 import { useObjectOptionsForTable } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsForTable';
 import { useOptionsDropdown } from '@/object-record/object-options-dropdown/hooks/useOptionsDropdown';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -20,6 +19,7 @@ import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownM
 import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
 import { ViewFieldsVisibilityDropdownSection } from '@/views/components/ViewFieldsVisibilityDropdownSection';
 import { ViewType } from '@/views/types/ViewType';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const ObjectOptionsDropdownHiddenFieldsContent = () => {
   const {
@@ -34,7 +34,7 @@ export const ObjectOptionsDropdownHiddenFieldsContent = () => {
     objectNameSingular: objectMetadataItem.nameSingular,
   });
 
-  const settingsUrl = getSettingsPagePath(SettingsPath.ObjectDetail, {
+  const settingsUrl = getSettingsPath(SettingsPath.ObjectDetail, {
     objectNamePlural,
   });
 
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx
index d535f92e76ec..ba55065befd7 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx
@@ -13,7 +13,6 @@ import { RecordGroupsVisibilityDropdownSection } from '@/object-record/record-gr
 import { useRecordGroupVisibility } from '@/object-record/record-group/hooks/useRecordGroupVisibility';
 import { recordGroupFieldMetadataComponentState } from '@/object-record/record-group/states/recordGroupFieldMetadataComponentState';
 import { hiddenRecordGroupIdsComponentSelector } from '@/object-record/record-group/states/selectors/hiddenRecordGroupIdsComponentSelector';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -22,6 +21,7 @@ import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMe
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { useLocation } from 'react-router-dom';
 import { useSetRecoilState } from 'recoil';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const ObjectOptionsDropdownHiddenRecordGroupsContent = () => {
   const {
@@ -51,13 +51,10 @@ export const ObjectOptionsDropdownHiddenRecordGroupsContent = () => {
       viewType,
     });
 
-  const viewGroupSettingsUrl = getSettingsPagePath(
-    SettingsPath.ObjectFieldEdit,
-    {
-      objectNamePlural,
-      fieldName: recordGroupFieldMetadata?.name ?? '',
-    },
-  );
+  const viewGroupSettingsUrl = getSettingsPath(SettingsPath.ObjectFieldEdit, {
+    objectNamePlural,
+    fieldName: recordGroupFieldMetadata?.name ?? '',
+  });
 
   const location = useLocation();
   const setNavigationMemorizedUrl = useSetRecoilState(
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuContent.tsx
index 2c9f5a5264b4..3bcd47afa325 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuContent.tsx
@@ -1,5 +1,6 @@
 import { Key } from 'ts-key-enum';
 import {
+  AppTooltip,
   IconFileExport,
   IconFileImport,
   IconLayout,
@@ -30,8 +31,6 @@ import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
 import { ViewType } from '@/views/types/ViewType';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
-import { FeatureFlagKey } from '~/generated/graphql';
 import { isDefined } from '~/utils/isDefined';
 
 export const ObjectOptionsDropdownMenuContent = () => {
@@ -43,10 +42,6 @@ export const ObjectOptionsDropdownMenuContent = () => {
     closeDropdown,
   } = useOptionsDropdown();
 
-  const isViewGroupEnabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsViewGroupsEnabled,
-  );
-
   const { getIcon } = useIcons();
   const { currentViewWithCombinedFiltersAndSorts: currentView } =
     useGetCurrentView();
@@ -61,6 +56,10 @@ export const ObjectOptionsDropdownMenuContent = () => {
     recordGroupFieldMetadataComponentState,
   );
 
+  const isGroupByEnabled =
+    (isDefined(currentView?.viewGroups) && currentView.viewGroups.length > 0) ||
+    currentView?.key !== 'INDEX';
+
   useScopedHotkeys(
     [Key.Escape],
     () => {
@@ -121,20 +120,34 @@ export const ObjectOptionsDropdownMenuContent = () => {
           contextualText={`${visibleBoardFields.length} shown`}
           hasSubMenu
         />
-        {(viewType === ViewType.Kanban || isViewGroupEnabled) &&
-          currentView?.key !== 'INDEX' && (
-            <MenuItem
-              onClick={() =>
-                isDefined(recordGroupFieldMetadata)
-                  ? onContentChange('recordGroups')
-                  : onContentChange('recordGroupFields')
-              }
-              LeftIcon={IconLayoutList}
-              text="Group by"
-              contextualText={recordGroupFieldMetadata?.label}
-              hasSubMenu
-            />
-          )}
+
+        <div id="group-by-menu-item">
+          <MenuItem
+            onClick={() =>
+              isDefined(recordGroupFieldMetadata)
+                ? onContentChange('recordGroups')
+                : onContentChange('recordGroupFields')
+            }
+            LeftIcon={IconLayoutList}
+            text="Group by"
+            contextualText={
+              !isGroupByEnabled
+                ? 'Not available on Default View'
+                : recordGroupFieldMetadata?.label
+            }
+            hasSubMenu
+            disabled={!isGroupByEnabled}
+          />
+        </div>
+        {!isGroupByEnabled && (
+          <AppTooltip
+            anchorSelect={`#group-by-menu-item`}
+            content="Not available on Default View"
+            noArrow
+            place="bottom"
+            width="100%"
+          />
+        )}
       </DropdownMenuItemsContainer>
       <DropdownMenuSeparator />
       <DropdownMenuItemsContainer>
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx
index 66eff4c465d5..7b8d45ab50a1 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupFieldsContent.tsx
@@ -17,22 +17,24 @@ import { useSearchRecordGroupField } from '@/object-record/object-options-dropdo
 import { recordGroupFieldMetadataComponentState } from '@/object-record/record-group/states/recordGroupFieldMetadataComponentState';
 import { hiddenRecordGroupIdsComponentSelector } from '@/object-record/record-group/states/selectors/hiddenRecordGroupIdsComponentSelector';
 import { useHandleRecordGroupField } from '@/object-record/record-index/hooks/useHandleRecordGroupField';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
 import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { ViewType } from '@/views/types/ViewType';
 import { useLocation } from 'react-router-dom';
 import { useSetRecoilState } from 'recoil';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { isDefined } from '~/utils/isDefined';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const ObjectOptionsDropdownRecordGroupFieldsContent = () => {
   const { getIcon } = useIcons();
 
   const {
+    viewType,
     currentContentId,
     recordIndexId,
     objectMetadataItem,
@@ -66,13 +68,13 @@ export const ObjectOptionsDropdownRecordGroupFieldsContent = () => {
     viewBarComponentId: recordIndexId,
   });
 
-  const newSelectFieldSettingsUrl = getSettingsPagePath(
+  const newSelectFieldSettingsUrl = getSettingsPath(
     SettingsPath.ObjectNewFieldConfigure,
     {
       objectNamePlural,
     },
     {
-      fieldType: FieldMetadataType.Select,
+      fieldType: FieldMetadataType.SELECT,
     },
   );
 
@@ -121,11 +123,13 @@ export const ObjectOptionsDropdownRecordGroupFieldsContent = () => {
         onChange={(event) => setRecordGroupFieldSearchInput(event.target.value)}
       />
       <DropdownMenuItemsContainer>
-        <MenuItemSelect
-          text="None"
-          selected={!isDefined(recordGroupFieldMetadata)}
-          onClick={handleResetRecordGroupField}
-        />
+        {viewType === ViewType.Table && (
+          <MenuItemSelect
+            text="None"
+            selected={!isDefined(recordGroupFieldMetadata)}
+            onClick={handleResetRecordGroupField}
+          />
+        )}
         {filteredRecordGroupFieldMetadataItems.map((fieldMetadataItem) => (
           <MenuItemSelect
             key={fieldMetadataItem.id}
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx
index 749fd79b6692..e1fab350f276 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownRecordGroupsContent.tsx
@@ -26,14 +26,8 @@ import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownM
 import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
-import { FeatureFlagKey } from '~/generated/graphql';
 
 export const ObjectOptionsDropdownRecordGroupsContent = () => {
-  const isViewGroupEnabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsViewGroupsEnabled,
-  );
-
   const {
     viewType,
     currentContentId,
@@ -98,7 +92,7 @@ export const ObjectOptionsDropdownRecordGroupsContent = () => {
         Group by
       </DropdownMenuHeader>
       <DropdownMenuItemsContainer>
-        {isViewGroupEnabled && currentView?.key !== 'INDEX' && (
+        {currentView?.key !== 'INDEX' && (
           <>
             <MenuItem
               onClick={() => onContentChange('recordGroupFields')}
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/__stories__/ObjectOptionsDropdownContent.stories.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/__stories__/ObjectOptionsDropdownContent.stories.tsx
index ce819f7496e6..bb06fb6617fc 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/__stories__/ObjectOptionsDropdownContent.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/__stories__/ObjectOptionsDropdownContent.stories.tsx
@@ -7,6 +7,7 @@ import { ObjectOptionsDropdownContent } from '@/object-record/object-options-dro
 import { OBJECT_OPTIONS_DROPDOWN_ID } from '@/object-record/object-options-dropdown/constants/ObjectOptionsDropdownId';
 import { ObjectOptionsDropdownContext } from '@/object-record/object-options-dropdown/states/contexts/ObjectOptionsDropdownContext';
 import { ObjectOptionsContentId } from '@/object-record/object-options-dropdown/types/ObjectOptionsContentId';
+import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';
 import { RecordIndexContextProvider } from '@/object-record/record-index/contexts/RecordIndexContext';
 import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';
 import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
@@ -37,22 +38,26 @@ const meta: Meta<typeof ObjectOptionsDropdownContent> = {
       }, [setObjectMetadataItems]);
 
       return (
-        <RecordTableComponentInstanceContext.Provider
-          value={{ instanceId, onColumnsChange: () => {} }}
+        <RecordFiltersComponentInstanceContext.Provider
+          value={{ instanceId: 'object-options-dropdown' }}
         >
-          <ViewComponentInstanceContext.Provider value={{ instanceId }}>
-            <ContextStoreComponentInstanceContext.Provider
-              value={{ instanceId }}
-            >
-              <MemoryRouter
-                initialEntries={['/one', '/two', { pathname: '/three' }]}
-                initialIndex={1}
+          <RecordTableComponentInstanceContext.Provider
+            value={{ instanceId, onColumnsChange: () => {} }}
+          >
+            <ViewComponentInstanceContext.Provider value={{ instanceId }}>
+              <ContextStoreComponentInstanceContext.Provider
+                value={{ instanceId }}
               >
-                <Story />
-              </MemoryRouter>
-            </ContextStoreComponentInstanceContext.Provider>
-          </ViewComponentInstanceContext.Provider>
-        </RecordTableComponentInstanceContext.Provider>
+                <MemoryRouter
+                  initialEntries={['/one', '/two', { pathname: '/three' }]}
+                  initialIndex={1}
+                >
+                  <Story />
+                </MemoryRouter>
+              </ContextStoreComponentInstanceContext.Provider>
+            </ViewComponentInstanceContext.Provider>
+          </RecordTableComponentInstanceContext.Provider>
+        </RecordFiltersComponentInstanceContext.Provider>
       );
     },
     ObjectMetadataItemsDecorator,
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/__tests__/useExportProcessRecordsForCSV.test.ts b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/__tests__/useExportProcessRecordsForCSV.test.ts
index 4b243a928398..fd88ff368210 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/__tests__/useExportProcessRecordsForCSV.test.ts
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/__tests__/useExportProcessRecordsForCSV.test.ts
@@ -7,8 +7,8 @@ jest.mock('@/object-metadata/hooks/useObjectMetadataItem', () => ({
   useObjectMetadataItem: jest.fn(() => ({
     objectMetadataItem: {
       fields: [
-        { type: FieldMetadataType.Currency, name: 'price' },
-        { type: FieldMetadataType.Text, name: 'name' },
+        { type: FieldMetadataType.CURRENCY, name: 'price' },
+        { type: FieldMetadataType.TEXT, name: 'name' },
       ],
     },
   })),
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/__tests__/useSearchRecordGroupField.test.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/__tests__/useSearchRecordGroupField.test.tsx
index cf2ffba00fa2..5b9fa8650a2e 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/__tests__/useSearchRecordGroupField.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/__tests__/useSearchRecordGroupField.test.tsx
@@ -26,9 +26,9 @@ describe('useSearchRecordGroupField', () => {
     const mockContextValue = {
       objectMetadataItem: {
         fields: [
-          { type: FieldMetadataType.Select, label: 'First' },
-          { type: FieldMetadataType.Select, label: 'Second' },
-          { type: FieldMetadataType.Text, label: 'Third' },
+          { type: FieldMetadataType.SELECT, label: 'First' },
+          { type: FieldMetadataType.SELECT, label: 'Second' },
+          { type: FieldMetadataType.TEXT, label: 'Third' },
         ],
       },
     };
@@ -40,7 +40,7 @@ describe('useSearchRecordGroupField', () => {
     });
 
     expect(result.current.filteredRecordGroupFieldMetadataItems).toEqual([
-      { type: FieldMetadataType.Select, label: 'First' },
+      { type: FieldMetadataType.SELECT, label: 'First' },
     ]);
   });
 
@@ -48,9 +48,9 @@ describe('useSearchRecordGroupField', () => {
     const mockContextValue = {
       objectMetadataItem: {
         fields: [
-          { type: FieldMetadataType.Select, label: 'First' },
-          { type: FieldMetadataType.Select, label: 'Second' },
-          { type: FieldMetadataType.Text, label: 'Third' },
+          { type: FieldMetadataType.SELECT, label: 'First' },
+          { type: FieldMetadataType.SELECT, label: 'Second' },
+          { type: FieldMetadataType.TEXT, label: 'Third' },
         ],
       },
     };
@@ -58,8 +58,8 @@ describe('useSearchRecordGroupField', () => {
     const { result } = renderWithContext(mockContextValue);
 
     expect(result.current.filteredRecordGroupFieldMetadataItems).toEqual([
-      { type: FieldMetadataType.Select, label: 'First' },
-      { type: FieldMetadataType.Select, label: 'Second' },
+      { type: FieldMetadataType.SELECT, label: 'First' },
+      { type: FieldMetadataType.SELECT, label: 'Second' },
     ]);
   });
 });
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useExportProcessRecordsForCSV.ts b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useExportProcessRecordsForCSV.ts
index a39708433e44..4e930fc4fbaf 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useExportProcessRecordsForCSV.ts
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useExportProcessRecordsForCSV.ts
@@ -19,7 +19,7 @@ export const useExportProcessRecordsForCSV = (objectNameSingular: string) => {
           }
 
           switch (field.type) {
-            case FieldMetadataType.Currency:
+            case FieldMetadataType.CURRENCY:
               return {
                 ...processedRecord,
                 [field.name]: {
@@ -29,7 +29,7 @@ export const useExportProcessRecordsForCSV = (objectNameSingular: string) => {
                   currencyCode: record[field.name].currencyCode,
                 } satisfies FieldCurrencyValue,
               };
-            case FieldMetadataType.RawJson:
+            case FieldMetadataType.RAW_JSON:
               return {
                 ...processedRecord,
                 [field.name]: JSON.stringify(record[field.name]),
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useSearchRecordGroupField.ts b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useSearchRecordGroupField.ts
index 633acc0bb34e..bd6ed6b77ad2 100644
--- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useSearchRecordGroupField.ts
+++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/hooks/useSearchRecordGroupField.ts
@@ -16,7 +16,7 @@ export const useSearchRecordGroupField = () => {
 
     return objectMetadataItem.fields.filter(
       (field) =>
-        field.type === FieldMetadataType.Select &&
+        field.type === FieldMetadataType.SELECT &&
         field.label.toLocaleLowerCase().includes(searchInputLowerCase),
     );
   }, [objectMetadataItem.fields, recordGroupFieldSearchInput]);
diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/states/recordDeleteProgressState.ts b/packages/twenty-front/src/modules/object-record/object-options-dropdown/states/recordDeleteProgressState.ts
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
index 014905a5e63c..54b4a76a47ca 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
@@ -1,10 +1,16 @@
 import styled from '@emotion/styled';
-import { useRecoilValue } from 'recoil';
 import { IconChevronDown, MenuItem, useIcons } from 'twenty-ui';
 
 import { OBJECT_SORT_DROPDOWN_ID } from '@/object-record/object-sort-dropdown/constants/ObjectSortDropdownId';
-import { useObjectSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useObjectSortDropdown';
-import { ObjectSortDropdownScope } from '@/object-record/object-sort-dropdown/scopes/ObjectSortDropdownScope';
+import { useCloseSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useCloseSortDropdown';
+import { useResetRecordSortDropdownSearchInput } from '@/object-record/object-sort-dropdown/hooks/useResetRecordSortDropdownSearchInput';
+import { useResetSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useResetSortDropdown';
+import { useToggleSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useToggleSortDropdown';
+import { isSortDirectionMenuUnfoldedComponentState } from '@/object-record/object-sort-dropdown/states/isSortDirectionMenuUnfoldedState';
+import { objectSortDropdownSearchInputComponentState } from '@/object-record/object-sort-dropdown/states/objectSortDropdownSearchInputComponentState';
+import { onSortSelectComponentState } from '@/object-record/object-sort-dropdown/states/onSortSelectScopedState';
+import { selectedSortDirectionComponentState } from '@/object-record/object-sort-dropdown/states/selectedSortDirectionState';
+import { SortDefinition } from '@/object-record/object-sort-dropdown/types/SortDefinition';
 import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
 import { hiddenTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/hiddenTableColumnsComponentSelector';
 import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector';
@@ -15,8 +21,11 @@ import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownM
 import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
+import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
-import { SORT_DIRECTIONS } from '../types/SortDirection';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
+import { availableSortDefinitionsComponentState } from '@/views/states/availableSortDefinitionsComponentState';
+import { SORT_DIRECTIONS, SortDirection } from '../types/SortDirection';
 
 export const StyledInput = styled.input`
   background: transparent;
@@ -54,43 +63,35 @@ const StyledSelectedSortDirectionContainer = styled.div`
 `;
 
 export type ObjectSortDropdownButtonProps = {
-  sortDropdownId: string;
   hotkeyScope: HotkeyScope;
 };
 
 export const ObjectSortDropdownButton = ({
-  sortDropdownId,
   hotkeyScope,
 }: ObjectSortDropdownButtonProps) => {
-  const {
-    isSortDirectionMenuUnfolded,
-    setIsSortDirectionMenuUnfolded,
-    selectedSortDirection,
-    setSelectedSortDirection,
-    toggleSortDropdown,
-    resetState,
-    availableSortDefinitions,
-    handleAddSort,
-    objectSortDropdownSearchInputState,
-    setObjectSortDropdownSearchInput,
-    resetSearchInput,
-  } = useObjectSortDropdown();
+  const { toggleSortDropdown } = useToggleSortDropdown();
 
-  const { recordIndexId } = useRecordIndexContextOrThrow();
+  const { resetRecordSortDropdownSearchInput } =
+    useResetRecordSortDropdownSearchInput();
 
-  const { isDropdownOpen } = useDropdown(OBJECT_SORT_DROPDOWN_ID);
+  const setObjectSortDropdownSearchInput = useSetRecoilComponentStateV2(
+    objectSortDropdownSearchInputComponentState,
+  );
 
-  const handleButtonClick = () => {
-    toggleSortDropdown();
-  };
+  const isSortDirectionMenuUnfolded = useRecoilComponentValueV2(
+    isSortDirectionMenuUnfoldedComponentState,
+  );
 
-  const handleDropdownButtonClose = () => {
-    resetSearchInput();
-    resetState();
-  };
+  const { resetSortDropdown } = useResetSortDropdown();
 
-  const objectSortDropdownSearchInput = useRecoilValue(
-    objectSortDropdownSearchInputState,
+  const { recordIndexId } = useRecordIndexContextOrThrow();
+
+  const objectSortDropdownSearchInput = useRecoilComponentValueV2(
+    objectSortDropdownSearchInputComponentState,
+  );
+
+  const availableSortDefinitions = useRecoilComponentValueV2(
+    availableSortDefinitionsComponentState,
   );
 
   const { getIcon } = useIcons();
@@ -134,89 +135,113 @@ export const ObjectSortDropdownButton = ({
     visibleColumnsSortDefinitions.length > 0 &&
     hiddenColumnsSortDefinitions.length > 0;
 
+  const handleButtonClick = () => {
+    toggleSortDropdown();
+  };
+
+  const handleDropdownButtonClose = () => {
+    resetRecordSortDropdownSearchInput();
+    resetSortDropdown();
+  };
+
+  const { closeSortDropdown } = useCloseSortDropdown();
+
+  const onSortSelect = useRecoilComponentValueV2(onSortSelectComponentState);
+
+  const handleAddSort = (sortDefinition: SortDefinition) => {
+    setObjectSortDropdownSearchInput('');
+    closeSortDropdown();
+    onSortSelect?.({
+      fieldMetadataId: sortDefinition.fieldMetadataId,
+      direction: selectedSortDirection,
+      definition: sortDefinition,
+    });
+  };
+
+  const [selectedSortDirection, setSelectedSortDirection] =
+    useRecoilComponentStateV2(selectedSortDirectionComponentState);
+
+  const setIsSortDirectionMenuUnfolded = useSetRecoilComponentStateV2(
+    isSortDirectionMenuUnfoldedComponentState,
+  );
+
+  const handleSortDirectionClick = (sortDirection: SortDirection) => {
+    setSelectedSortDirection(sortDirection);
+    setIsSortDirectionMenuUnfolded(false);
+  };
+
+  const { isDropdownOpen } = useDropdown(OBJECT_SORT_DROPDOWN_ID);
+
   return (
-    <ObjectSortDropdownScope sortScopeId={sortDropdownId}>
-      <Dropdown
-        dropdownId={OBJECT_SORT_DROPDOWN_ID}
-        dropdownHotkeyScope={hotkeyScope}
-        dropdownOffset={{ y: 8 }}
-        clickableComponent={
-          <StyledHeaderDropdownButton
-            isUnfolded={isDropdownOpen}
-            onClick={handleButtonClick}
-          >
-            Sort
-          </StyledHeaderDropdownButton>
-        }
-        dropdownComponents={
-          <>
-            {isSortDirectionMenuUnfolded && (
-              <StyledSelectedSortDirectionContainer>
-                <DropdownMenuItemsContainer>
-                  {SORT_DIRECTIONS.map((sortOrder, index) => (
-                    <MenuItem
-                      key={index}
-                      onClick={() => {
-                        setSelectedSortDirection(sortOrder);
-                        setIsSortDirectionMenuUnfolded(false);
-                      }}
-                      text={sortOrder === 'asc' ? 'Ascending' : 'Descending'}
-                    />
-                  ))}
-                </DropdownMenuItemsContainer>
-              </StyledSelectedSortDirectionContainer>
-            )}
-            <DropdownMenuHeader
-              EndIcon={IconChevronDown}
-              onClick={() =>
-                setIsSortDirectionMenuUnfolded(!isSortDirectionMenuUnfolded)
-              }
-            >
-              {selectedSortDirection === 'asc' ? 'Ascending' : 'Descending'}
-            </DropdownMenuHeader>
-            <StyledInput
-              autoFocus
-              value={objectSortDropdownSearchInput}
-              placeholder="Search fields"
-              onChange={(event) =>
-                setObjectSortDropdownSearchInput(event.target.value)
-              }
-            />
-            <DropdownMenuItemsContainer>
-              {visibleColumnsSortDefinitions.map(
-                (visibleSortDefinition, index) => (
+    <Dropdown
+      dropdownId={OBJECT_SORT_DROPDOWN_ID}
+      dropdownHotkeyScope={hotkeyScope}
+      dropdownOffset={{ y: 8 }}
+      clickableComponent={
+        <StyledHeaderDropdownButton
+          onClick={handleButtonClick}
+          isUnfolded={isDropdownOpen}
+        >
+          Sort
+        </StyledHeaderDropdownButton>
+      }
+      dropdownComponents={
+        <>
+          {isSortDirectionMenuUnfolded && (
+            <StyledSelectedSortDirectionContainer>
+              <DropdownMenuItemsContainer>
+                {SORT_DIRECTIONS.map((sortDirection, index) => (
                   <MenuItem
-                    testId={`visible-select-sort-${index}`}
                     key={index}
-                    onClick={() => {
-                      setObjectSortDropdownSearchInput('');
-                      handleAddSort(visibleSortDefinition);
-                    }}
-                    LeftIcon={getIcon(visibleSortDefinition.iconName)}
-                    text={visibleSortDefinition.label}
+                    onClick={() => handleSortDirectionClick(sortDirection)}
+                    text={sortDirection === 'asc' ? 'Ascending' : 'Descending'}
                   />
-                ),
-              )}
-              {shoudShowSeparator && <DropdownMenuSeparator />}
-              {hiddenColumnsSortDefinitions.map(
-                (hiddenSortDefinition, index) => (
-                  <MenuItem
-                    testId={`hidden-select-sort-${index}`}
-                    key={index}
-                    onClick={() => {
-                      setObjectSortDropdownSearchInput('');
-                      handleAddSort(hiddenSortDefinition);
-                    }}
-                    LeftIcon={getIcon(hiddenSortDefinition.iconName)}
-                    text={hiddenSortDefinition.label}
-                  />
-                ),
-              )}
-            </DropdownMenuItemsContainer>
-          </>
-        }
-        onClose={handleDropdownButtonClose}
-      />
-    </ObjectSortDropdownScope>
+                ))}
+              </DropdownMenuItemsContainer>
+            </StyledSelectedSortDirectionContainer>
+          )}
+          <DropdownMenuHeader
+            EndIcon={IconChevronDown}
+            onClick={() =>
+              setIsSortDirectionMenuUnfolded(!isSortDirectionMenuUnfolded)
+            }
+          >
+            {selectedSortDirection === 'asc' ? 'Ascending' : 'Descending'}
+          </DropdownMenuHeader>
+          <StyledInput
+            autoFocus
+            value={objectSortDropdownSearchInput}
+            placeholder="Search fields"
+            onChange={(event) =>
+              setObjectSortDropdownSearchInput(event.target.value)
+            }
+          />
+          <DropdownMenuItemsContainer>
+            {visibleColumnsSortDefinitions.map(
+              (visibleSortDefinition, index) => (
+                <MenuItem
+                  testId={`visible-select-sort-${index}`}
+                  key={index}
+                  onClick={() => handleAddSort(visibleSortDefinition)}
+                  LeftIcon={getIcon(visibleSortDefinition.iconName)}
+                  text={visibleSortDefinition.label}
+                />
+              ),
+            )}
+            {shoudShowSeparator && <DropdownMenuSeparator />}
+            {hiddenColumnsSortDefinitions.map((hiddenSortDefinition, index) => (
+              <MenuItem
+                testId={`hidden-select-sort-${index}`}
+                key={index}
+                onClick={() => handleAddSort(hiddenSortDefinition)}
+                LeftIcon={getIcon(hiddenSortDefinition.iconName)}
+                text={hiddenSortDefinition.label}
+              />
+            ))}
+          </DropdownMenuItemsContainer>
+        </>
+      }
+      onClose={handleDropdownButtonClose}
+    />
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/constants/ObjectSortDropdownId.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/constants/ObjectSortDropdownId.ts
index 18e7cdb32164..5cc1f9c8fc65 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/constants/ObjectSortDropdownId.ts
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/constants/ObjectSortDropdownId.ts
@@ -1,5 +1 @@
-/* eslint-disable @nx/workspace-max-consts-per-file */
-const OBJECT_SORT_DROPDOWN_ID = 'sort-dropdown';
-const VIEW_SORT_DROPDOWN_ID = 'view-sort';
-
-export { OBJECT_SORT_DROPDOWN_ID, VIEW_SORT_DROPDOWN_ID };
+export const OBJECT_SORT_DROPDOWN_ID = 'sort-dropdown';
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/constants/ViewSortDropdownId.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/constants/ViewSortDropdownId.ts
new file mode 100644
index 000000000000..783ea772ec26
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/constants/ViewSortDropdownId.ts
@@ -0,0 +1 @@
+export const VIEW_SORT_DROPDOWN_ID = 'view-sort';
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/__tests__/useSortDropdown.test.tsx b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/__tests__/useSortDropdown.test.tsx
deleted file mode 100644
index 64de66d8950a..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/__tests__/useSortDropdown.test.tsx
+++ /dev/null
@@ -1,136 +0,0 @@
-import { expect } from '@storybook/test';
-import { act, renderHook, waitFor } from '@testing-library/react';
-import { RecoilRoot, useRecoilState } from 'recoil';
-
-import { useSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useSortDropdown';
-import { useSortDropdownStates } from '@/object-record/object-sort-dropdown/hooks/useSortDropdownStates';
-import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
-import { SortDefinition } from '@/object-record/object-sort-dropdown/types/SortDefinition';
-import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentStateV2';
-import { availableSortDefinitionsComponentState } from '@/views/states/availableSortDefinitionsComponentState';
-
-const Wrapper = ({ children }: { children: React.ReactNode }) => (
-  <RecoilRoot>{children}</RecoilRoot>
-);
-
-const sortDropdownId = 'sortDropdownId';
-const renderHookConfig = {
-  wrapper: Wrapper,
-};
-
-const sortDefinitions: SortDefinition[] = [
-  { fieldMetadataId: 'id', label: 'definition label', iconName: 'icon' },
-];
-
-describe('useSortDropdown', () => {
-  it('should set availableSortDefinitions', async () => {
-    const { result } = renderHook(() => {
-      useSortDropdown({ sortDropdownId });
-
-      // TODO: verify this instance id works
-      const [availableSortDefinitions, setAvailableSortDefinitions] =
-        useRecoilComponentStateV2(
-          availableSortDefinitionsComponentState,
-          sortDropdownId,
-        );
-
-      return {
-        availableSortDefinitions,
-        setAvailableSortDefinitions,
-      };
-    }, renderHookConfig);
-    expect(result.current.availableSortDefinitions).toEqual([]);
-    act(() => {
-      result.current.setAvailableSortDefinitions(sortDefinitions);
-    });
-
-    await waitFor(() => {
-      expect(result.current.availableSortDefinitions).toEqual(sortDefinitions);
-    });
-  });
-
-  it('should set isSortSelected', async () => {
-    const { result } = renderHook(() => {
-      useSortDropdown({ sortDropdownId });
-      const { isSortSelectedState } = useSortDropdownStates(sortDropdownId);
-
-      const [isSortSelected, setIsSortSelected] =
-        useRecoilState(isSortSelectedState);
-
-      return {
-        isSortSelected,
-        setIsSortSelected,
-      };
-    }, renderHookConfig);
-
-    expect(result.current.isSortSelected).toBe(false);
-
-    act(() => {
-      result.current.setIsSortSelected(true);
-    });
-
-    await waitFor(() => {
-      expect(result.current.isSortSelected).toBe(true);
-    });
-  });
-
-  it('should set onSortSelect', async () => {
-    const OnSortSelectFunction = () => {};
-    const mockOnSortSelect = jest.fn(() => OnSortSelectFunction);
-    const { result } = renderHook(() => {
-      useSortDropdown({ sortDropdownId });
-      const { onSortSelectState } = useSortDropdownStates(sortDropdownId);
-
-      const [onSortSelect, setOnSortSelect] = useRecoilState(onSortSelectState);
-
-      return {
-        onSortSelect,
-        setOnSortSelect,
-      };
-    }, renderHookConfig);
-
-    expect(result.current.onSortSelect).toBeUndefined();
-
-    act(() => {
-      result.current.setOnSortSelect(mockOnSortSelect);
-    });
-
-    await waitFor(() => {
-      expect(result.current.onSortSelect).toBe(OnSortSelectFunction);
-    });
-  });
-
-  it('should call onSortSelect when a sort option is selected', async () => {
-    const mockOnSortSelect = jest.fn(() => jest.fn());
-    const sort: Sort = {
-      fieldMetadataId: 'id',
-      direction: 'asc',
-      definition: sortDefinitions[0],
-    };
-
-    const { result } = renderHook(() => {
-      useSortDropdown({ sortDropdownId });
-      const { onSortSelectState } = useSortDropdownStates(sortDropdownId);
-
-      const [onSortSelect, setOnSortSelect] = useRecoilState(onSortSelectState);
-
-      return {
-        onSortSelect,
-        setOnSortSelect,
-      };
-    }, renderHookConfig);
-
-    act(() => {
-      result.current.setOnSortSelect(mockOnSortSelect);
-      result.current.onSortSelect?.(sort);
-    });
-
-    act(() => {
-      result.current.onSortSelect?.(sort);
-    });
-
-    await waitFor(() => {
-      expect(mockOnSortSelect.mock.results[0].value).toHaveBeenCalledWith(sort);
-    });
-  });
-});
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useCloseSortDropdown.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useCloseSortDropdown.ts
new file mode 100644
index 000000000000..d7ab6e7cd1c8
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useCloseSortDropdown.ts
@@ -0,0 +1,18 @@
+import { OBJECT_SORT_DROPDOWN_ID } from '@/object-record/object-sort-dropdown/constants/ObjectSortDropdownId';
+import { useResetSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useResetSortDropdown';
+import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
+
+export const useCloseSortDropdown = () => {
+  const { resetSortDropdown } = useResetSortDropdown();
+
+  const { closeDropdown } = useDropdown(OBJECT_SORT_DROPDOWN_ID);
+
+  const closeSortDropdown = () => {
+    closeDropdown();
+    resetSortDropdown();
+  };
+
+  return {
+    closeSortDropdown,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useObjectSortDropdown.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useObjectSortDropdown.ts
deleted file mode 100644
index 2cbe44c58a2a..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useObjectSortDropdown.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { useCallback } from 'react';
-import { useRecoilState, useRecoilValue } from 'recoil';
-
-import { useSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useSortDropdown';
-import isSortDirectionMenuUnfoldedState from '@/object-record/object-sort-dropdown/states/isSortDirectionMenuUnfoldedState';
-import selectedSortDirectionState from '@/object-record/object-sort-dropdown/states/selectedSortDirectionState';
-import { SortDefinition } from '@/object-record/object-sort-dropdown/types/SortDefinition';
-import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
-
-import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
-import { availableSortDefinitionsComponentState } from '@/views/states/availableSortDefinitionsComponentState';
-import {
-  OBJECT_SORT_DROPDOWN_ID,
-  VIEW_SORT_DROPDOWN_ID,
-} from '../constants/ObjectSortDropdownId';
-
-// TODO: merge this with useSortDropdown
-export const useObjectSortDropdown = () => {
-  const [isSortDirectionMenuUnfolded, setIsSortDirectionMenuUnfolded] =
-    useRecoilState(isSortDirectionMenuUnfoldedState);
-
-  const [selectedSortDirection, setSelectedSortDirection] = useRecoilState(
-    selectedSortDirectionState,
-  );
-
-  const resetState = useCallback(() => {
-    setIsSortDirectionMenuUnfolded(false);
-    setSelectedSortDirection('asc');
-  }, [setIsSortDirectionMenuUnfolded, setSelectedSortDirection]);
-
-  const { toggleDropdown, closeDropdown } = useDropdown(
-    OBJECT_SORT_DROPDOWN_ID,
-  );
-
-  const toggleSortDropdown = () => {
-    toggleDropdown();
-    resetState();
-  };
-
-  const closeSortDropdown = () => {
-    closeDropdown();
-    resetState();
-  };
-
-  const {
-    onSortSelectState,
-    isSortSelectedState,
-    objectSortDropdownSearchInputState,
-    setObjectSortDropdownSearchInput,
-    resetSearchInput,
-  } = useSortDropdown({
-    sortDropdownId: VIEW_SORT_DROPDOWN_ID,
-  });
-
-  const isSortSelected = useRecoilValue(isSortSelectedState);
-
-  const availableSortDefinitions = useRecoilComponentValueV2(
-    availableSortDefinitionsComponentState,
-    VIEW_SORT_DROPDOWN_ID,
-  );
-  const onSortSelect = useRecoilValue(onSortSelectState);
-
-  const handleAddSort = (selectedSortDefinition: SortDefinition) => {
-    closeSortDropdown();
-    onSortSelect?.({
-      fieldMetadataId: selectedSortDefinition.fieldMetadataId,
-      direction: selectedSortDirection,
-      definition: selectedSortDefinition,
-    });
-  };
-
-  return {
-    isSortDirectionMenuUnfolded,
-    setIsSortDirectionMenuUnfolded,
-    selectedSortDirection,
-    setSelectedSortDirection,
-    toggleSortDropdown,
-    resetState,
-    isSortSelected,
-    objectSortDropdownSearchInputState,
-    setObjectSortDropdownSearchInput,
-    resetSearchInput,
-    availableSortDefinitions,
-    handleAddSort,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useResetRecordSortDropdownSearchInput.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useResetRecordSortDropdownSearchInput.ts
new file mode 100644
index 000000000000..4abb3d6bee08
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useResetRecordSortDropdownSearchInput.ts
@@ -0,0 +1,22 @@
+import { objectSortDropdownSearchInputComponentState } from '@/object-record/object-sort-dropdown/states/objectSortDropdownSearchInputComponentState';
+import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2';
+import { useRecoilCallback } from 'recoil';
+
+export const useResetRecordSortDropdownSearchInput = () => {
+  const objectSortDropdownSearchInputCallbackState =
+    useRecoilComponentCallbackStateV2(
+      objectSortDropdownSearchInputComponentState,
+    );
+
+  const resetRecordSortDropdownSearchInput = useRecoilCallback(
+    ({ set }) =>
+      () => {
+        set(objectSortDropdownSearchInputCallbackState, '');
+      },
+    [objectSortDropdownSearchInputCallbackState],
+  );
+
+  return {
+    resetRecordSortDropdownSearchInput,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useResetSortDropdown.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useResetSortDropdown.ts
new file mode 100644
index 000000000000..85a70bcd6088
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useResetSortDropdown.ts
@@ -0,0 +1,22 @@
+import { isSortDirectionMenuUnfoldedComponentState } from '@/object-record/object-sort-dropdown/states/isSortDirectionMenuUnfoldedState';
+import { selectedSortDirectionComponentState } from '@/object-record/object-sort-dropdown/states/selectedSortDirectionState';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
+
+export const useResetSortDropdown = () => {
+  const setIsSortDirectionMenuUnfolded = useSetRecoilComponentStateV2(
+    isSortDirectionMenuUnfoldedComponentState,
+  );
+
+  const setSelectedSortDirection = useSetRecoilComponentStateV2(
+    selectedSortDirectionComponentState,
+  );
+
+  const resetSortDropdown = () => {
+    setIsSortDirectionMenuUnfolded(false);
+    setSelectedSortDirection('asc');
+  };
+
+  return {
+    resetSortDropdown,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdown.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdown.ts
deleted file mode 100644
index 3a857e28ca10..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdown.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { useRecoilCallback, useSetRecoilState } from 'recoil';
-
-import { useSortDropdownStates } from '@/object-record/object-sort-dropdown/hooks/useSortDropdownStates';
-import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
-
-import { ObjectSortDropdownScopeInternalContext } from '../scopes/scope-internal-context/ObjectSortDropdownScopeInternalContext';
-
-type UseSortProps = {
-  sortDropdownId?: string;
-};
-
-export const useSortDropdown = (props?: UseSortProps) => {
-  const scopeId = useAvailableScopeIdOrThrow(
-    ObjectSortDropdownScopeInternalContext,
-    props?.sortDropdownId,
-  );
-
-  const {
-    isSortSelectedState,
-    onSortSelectState,
-    objectSortDropdownSearchInputState,
-  } = useSortDropdownStates(scopeId);
-
-  const setObjectSortDropdownSearchInput = useSetRecoilState(
-    objectSortDropdownSearchInputState,
-  );
-
-  const resetSearchInput = useRecoilCallback(
-    ({ set }) =>
-      () => {
-        set(objectSortDropdownSearchInputState, '');
-      },
-    [objectSortDropdownSearchInputState],
-  );
-
-  return {
-    scopeId,
-    isSortSelectedState,
-    onSortSelectState,
-    objectSortDropdownSearchInputState,
-    setObjectSortDropdownSearchInput,
-    resetSearchInput,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdownStates.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdownStates.ts
index 40eb5623e677..355e020602ce 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdownStates.ts
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdownStates.ts
@@ -1,23 +1,20 @@
 import { isSortSelectedComponentState } from '@/object-record/object-sort-dropdown/states/isSortSelectedScopedState';
 import { objectSortDropdownSearchInputComponentState } from '@/object-record/object-sort-dropdown/states/objectSortDropdownSearchInputComponentState';
 import { onSortSelectComponentState } from '@/object-record/object-sort-dropdown/states/onSortSelectScopedState';
-import { extractComponentState } from '@/ui/utilities/state/component-state/utils/extractComponentState';
 
 export const useSortDropdownStates = (scopeId: string) => {
-  const isSortSelectedState = extractComponentState(
-    isSortSelectedComponentState,
-    scopeId,
-  );
+  const isSortSelectedState = isSortSelectedComponentState.atomFamily({
+    instanceId: scopeId,
+  });
 
-  const onSortSelectState = extractComponentState(
-    onSortSelectComponentState,
-    scopeId,
-  );
+  const onSortSelectState = onSortSelectComponentState.atomFamily({
+    instanceId: scopeId,
+  });
 
-  const objectSortDropdownSearchInputState = extractComponentState(
-    objectSortDropdownSearchInputComponentState,
-    scopeId,
-  );
+  const objectSortDropdownSearchInputState =
+    objectSortDropdownSearchInputComponentState.atomFamily({
+      instanceId: scopeId,
+    });
 
   return {
     isSortSelectedState,
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useToggleSortDropdown.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useToggleSortDropdown.ts
new file mode 100644
index 000000000000..b0fdfbc98ce3
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/hooks/useToggleSortDropdown.ts
@@ -0,0 +1,18 @@
+import { OBJECT_SORT_DROPDOWN_ID } from '@/object-record/object-sort-dropdown/constants/ObjectSortDropdownId';
+import { useResetSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useResetSortDropdown';
+import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
+
+export const useToggleSortDropdown = () => {
+  const { toggleDropdown } = useDropdown(OBJECT_SORT_DROPDOWN_ID);
+
+  const { resetSortDropdown } = useResetSortDropdown();
+
+  const toggleSortDropdown = () => {
+    toggleDropdown();
+    resetSortDropdown();
+  };
+
+  return {
+    toggleSortDropdown,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/scopes/ObjectSortDropdownScope.tsx b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/scopes/ObjectSortDropdownScope.tsx
deleted file mode 100644
index e30512817931..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/scopes/ObjectSortDropdownScope.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ReactNode } from 'react';
-
-import { ObjectSortDropdownScopeInternalContext } from './scope-internal-context/ObjectSortDropdownScopeInternalContext';
-
-type ObjectSortDropdownScopeProps = {
-  children: ReactNode;
-  sortScopeId: string;
-};
-
-export const ObjectSortDropdownScope = ({
-  children,
-  sortScopeId,
-}: ObjectSortDropdownScopeProps) => {
-  return (
-    <ObjectSortDropdownScopeInternalContext.Provider
-      value={{ scopeId: sortScopeId }}
-    >
-      {children}
-    </ObjectSortDropdownScopeInternalContext.Provider>
-  );
-};
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/scopes/scope-internal-context/ObjectSortDropdownScopeInternalContext.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/scopes/scope-internal-context/ObjectSortDropdownScopeInternalContext.ts
deleted file mode 100644
index 35a7798bc54e..000000000000
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/scopes/scope-internal-context/ObjectSortDropdownScopeInternalContext.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { createScopeInternalContext } from '@/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext';
-import { RecoilComponentStateKey } from '@/ui/utilities/state/component-state/types/RecoilComponentStateKey';
-
-import { Sort } from '../../types/Sort';
-
-type ObjectSortDropdownScopeInternalContextProps = RecoilComponentStateKey & {
-  onSortSelect?: (sort: Sort) => void;
-};
-
-export const ObjectSortDropdownScopeInternalContext =
-  createScopeInternalContext<ObjectSortDropdownScopeInternalContextProps>();
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/availableSortDefinitionsComponentState.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/availableSortDefinitionsComponentState.ts
index db559fa52f6b..d1f536ce3a9f 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/availableSortDefinitionsComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/availableSortDefinitionsComponentState.ts
@@ -1,10 +1,11 @@
-import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
-
+import { ObjectSortDropdownComponentInstanceContext } from '@/object-record/object-sort-dropdown/states/context/ObjectSortDropdownComponentInstanceContext';
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 import { SortDefinition } from '../types/SortDefinition';
 
-export const availableSortDefinitionsComponentState = createComponentState<
+export const availableSortDefinitionsComponentState = createComponentStateV2<
   SortDefinition[]
 >({
   key: 'availableSortDefinitionsComponentState',
   defaultValue: [],
+  componentInstanceContext: ObjectSortDropdownComponentInstanceContext,
 });
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/context/ObjectSortDropdownComponentInstanceContext.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/context/ObjectSortDropdownComponentInstanceContext.ts
new file mode 100644
index 000000000000..1b3cf394085f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/context/ObjectSortDropdownComponentInstanceContext.ts
@@ -0,0 +1,4 @@
+import { createComponentInstanceContext } from '@/ui/utilities/state/component-state/utils/createComponentInstanceContext';
+
+export const ObjectSortDropdownComponentInstanceContext =
+  createComponentInstanceContext();
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/isSortDirectionMenuUnfoldedState.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/isSortDirectionMenuUnfoldedState.ts
index ebf779b94a37..4a50ee6124f5 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/isSortDirectionMenuUnfoldedState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/isSortDirectionMenuUnfoldedState.ts
@@ -1,8 +1,9 @@
-import { atom } from 'recoil';
+import { ObjectSortDropdownComponentInstanceContext } from '@/object-record/object-sort-dropdown/states/context/ObjectSortDropdownComponentInstanceContext';
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 
-const isSortDirectionMenuUnfoldedState = atom({
-  key: 'isSortDirectionMenuUnfoldedState',
-  default: false,
-});
-
-export default isSortDirectionMenuUnfoldedState;
+export const isSortDirectionMenuUnfoldedComponentState =
+  createComponentStateV2<boolean>({
+    key: 'isSortDirectionMenuUnfoldedComponentState',
+    defaultValue: false,
+    componentInstanceContext: ObjectSortDropdownComponentInstanceContext,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/isSortSelectedScopedState.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/isSortSelectedScopedState.ts
index 180a2f017221..c6de8253223e 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/isSortSelectedScopedState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/isSortSelectedScopedState.ts
@@ -1,6 +1,8 @@
-import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+import { ObjectSortDropdownComponentInstanceContext } from '@/object-record/object-sort-dropdown/states/context/ObjectSortDropdownComponentInstanceContext';
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 
-export const isSortSelectedComponentState = createComponentState<boolean>({
+export const isSortSelectedComponentState = createComponentStateV2<boolean>({
   key: 'isSortSelectedComponentState',
   defaultValue: false,
+  componentInstanceContext: ObjectSortDropdownComponentInstanceContext,
 });
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/objectSortDropdownSearchInputComponentState.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/objectSortDropdownSearchInputComponentState.ts
index 2161619389a1..5185dbf2d35b 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/objectSortDropdownSearchInputComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/objectSortDropdownSearchInputComponentState.ts
@@ -1,7 +1,9 @@
-import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
+import { ObjectSortDropdownComponentInstanceContext } from '@/object-record/object-sort-dropdown/states/context/ObjectSortDropdownComponentInstanceContext';
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 
 export const objectSortDropdownSearchInputComponentState =
-  createComponentState<string>({
+  createComponentStateV2<string>({
     key: 'objectSortDropdownSearchInputComponentState',
     defaultValue: '',
+    componentInstanceContext: ObjectSortDropdownComponentInstanceContext,
   });
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/onSortSelectScopedState.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/onSortSelectScopedState.ts
index 8b6ca0a8cb35..7c844e0b2c2f 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/onSortSelectScopedState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/onSortSelectScopedState.ts
@@ -1,10 +1,11 @@
-import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
-
+import { ObjectSortDropdownComponentInstanceContext } from '@/object-record/object-sort-dropdown/states/context/ObjectSortDropdownComponentInstanceContext';
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 import { Sort } from '../types/Sort';
 
-export const onSortSelectComponentState = createComponentState<
+export const onSortSelectComponentState = createComponentStateV2<
   ((sort: Sort) => void) | undefined
 >({
   key: 'onSortSelectComponentState',
   defaultValue: undefined,
+  componentInstanceContext: ObjectSortDropdownComponentInstanceContext,
 });
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/selectedSortDirectionState.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/selectedSortDirectionState.ts
index 327f9691752d..f15f911715a8 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/selectedSortDirectionState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/states/selectedSortDirectionState.ts
@@ -1,10 +1,10 @@
-import { atom } from 'recoil';
-
+import { ObjectSortDropdownComponentInstanceContext } from '@/object-record/object-sort-dropdown/states/context/ObjectSortDropdownComponentInstanceContext';
 import { SortDirection } from '@/object-record/object-sort-dropdown/types/SortDirection';
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 
-const selectedSortDirectionState = atom<SortDirection>({
-  key: 'selectedSortDirectionState',
-  default: 'asc',
-});
-
-export default selectedSortDirectionState;
+export const selectedSortDirectionComponentState =
+  createComponentStateV2<SortDirection>({
+    key: 'selectedSortDirectionComponentState',
+    defaultValue: 'asc',
+    componentInstanceContext: ObjectSortDropdownComponentInstanceContext,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/__tests__/turnSortsIntoOrderBy.test.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/__tests__/turnSortsIntoOrderBy.test.ts
index 6d3d8b92e904..4b0b58c2ee83 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/__tests__/turnSortsIntoOrderBy.test.ts
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/__tests__/turnSortsIntoOrderBy.test.ts
@@ -18,6 +18,7 @@ const objectMetadataItem: ObjectMetadataItem = {
   updatedAt: '2021-01-01',
   nameSingular: 'object1',
   namePlural: 'object1s',
+  labelIdentifierFieldMetadataId: '20202020-72ba-4e11-a36d-e17b544541e1',
   icon: 'icon',
   isActive: true,
   isSystem: false,
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx
index d43a59e6091a..71b6764f330e 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCard.tsx
@@ -2,48 +2,29 @@ import { useActionMenu } from '@/action-menu/hooks/useActionMenu';
 import { recordIndexActionMenuDropdownPositionComponentState } from '@/action-menu/states/recordIndexActionMenuDropdownPositionComponentState';
 import { getActionMenuDropdownIdFromActionMenuId } from '@/action-menu/utils/getActionMenuDropdownIdFromActionMenuId';
 import { getActionMenuIdFromRecordIndexId } from '@/action-menu/utils/getActionMenuIdFromRecordIndexId';
-import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
-import { useRecordBoardSelection } from '@/object-record/record-board/hooks/useRecordBoardSelection';
 import { RecordBoardCardContext } from '@/object-record/record-board/record-board-card/contexts/RecordBoardCardContext';
 import { RecordBoardScopeInternalContext } from '@/object-record/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext';
 import { isRecordBoardCardSelectedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState';
 import { isRecordBoardCompactModeActiveComponentState } from '@/object-record/record-board/states/isRecordBoardCompactModeActiveComponentState';
 import { recordBoardVisibleFieldDefinitionsComponentSelector } from '@/object-record/record-board/states/selectors/recordBoardVisibleFieldDefinitionsComponentSelector';
-import {
-  FieldContext,
-  RecordUpdateHook,
-  RecordUpdateHookParams,
-} from '@/object-record/record-field/contexts/FieldContext';
-import { getFieldButtonIcon } from '@/object-record/record-field/utils/getFieldButtonIcon';
-import { RecordIdentifierChip } from '@/object-record/record-index/components/RecordIndexRecordChip';
+
 import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
-import { RecordInlineCell } from '@/object-record/record-inline-cell/components/RecordInlineCell';
-import { RecordInlineCellEditMode } from '@/object-record/record-inline-cell/components/RecordInlineCellEditMode';
-import { InlineCellHotkeyScope } from '@/object-record/record-inline-cell/types/InlineCellHotkeyScope';
 import { RecordValueSetterEffect } from '@/object-record/record-store/components/RecordValueSetterEffect';
-import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
-import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { TextInput } from '@/ui/input/components/TextInput';
 import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
 import { RecordBoardScrollWrapperContext } from '@/ui/utilities/scroll/contexts/ScrollWrapperContexts';
 import { useRecoilComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyStateV2';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { extractComponentState } from '@/ui/utilities/state/component-state/utils/extractComponentState';
 import styled from '@emotion/styled';
-import { ReactNode, useContext, useState } from 'react';
+import { useContext, useState } from 'react';
 import { InView, useInView } from 'react-intersection-observer';
-import { useRecoilValue, useSetRecoilState } from 'recoil';
-import {
-  AnimatedEaseInOut,
-  AvatarChipVariant,
-  Checkbox,
-  CheckboxVariant,
-  IconEye,
-  IconEyeOff,
-  LightIconButton,
-} from 'twenty-ui';
+import { useSetRecoilState } from 'recoil';
+import { AnimatedEaseInOut } from 'twenty-ui';
 import { useDebouncedCallback } from 'use-debounce';
-import { useAddNewCard } from '../../record-board-column/hooks/useAddNewCard';
+import { RecordBoardCardBody } from '@/object-record/record-board/record-board-card/components/RecordBoardCardBody';
+import { RecordBoardCardHeader } from '@/object-record/record-board/record-board-card/components/RecordBoardCardHeader';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
+import { AppPath } from '@/types/AppPath';
 
 const StyledBoardCard = styled.div<{ selected: boolean }>`
   background-color: ${({ theme, selected }) =>
@@ -81,76 +62,11 @@ const StyledBoardCard = styled.div<{ selected: boolean }>`
   }
 `;
 
-const StyledTextInput = styled(TextInput)`
-  border-radius: ${({ theme }) => theme.border.radius.sm};
-  width: ${({ theme }) => theme.spacing(53)};
-`;
-
 const StyledBoardCardWrapper = styled.div`
   padding-bottom: ${({ theme }) => theme.spacing(2)};
   width: 100%;
 `;
 
-export const StyledBoardCardHeader = styled.div<{
-  showCompactView: boolean;
-}>`
-  align-items: center;
-  display: flex;
-  flex-direction: row;
-  font-weight: ${({ theme }) => theme.font.weight.medium};
-  height: 24px;
-  padding-bottom: ${({ theme, showCompactView }) =>
-    theme.spacing(showCompactView ? 2 : 1)};
-  padding-left: ${({ theme }) => theme.spacing(2)};
-  padding-right: ${({ theme }) => theme.spacing(2)};
-  padding-top: ${({ theme }) => theme.spacing(2)};
-  transition: padding ease-in-out 160ms;
-
-  img {
-    height: ${({ theme }) => theme.icon.size.md}px;
-    object-fit: cover;
-    width: ${({ theme }) => theme.icon.size.md}px;
-  }
-`;
-
-export const StyledBoardCardBody = styled.div`
-  display: flex;
-  flex-direction: column;
-  gap: ${({ theme }) => theme.spacing(0.5)};
-  padding-bottom: ${({ theme }) => theme.spacing(2)};
-  padding-left: ${({ theme }) => theme.spacing(2.5)};
-  padding-right: ${({ theme }) => theme.spacing(2)};
-  span {
-    align-items: center;
-    display: flex;
-    flex-direction: row;
-    svg {
-      color: ${({ theme }) => theme.font.color.tertiary};
-      margin-right: ${({ theme }) => theme.spacing(2)};
-    }
-  }
-`;
-
-const StyledCheckboxContainer = styled.div`
-  display: flex;
-  flex: 1;
-  justify-content: end;
-`;
-
-const StyledFieldContainer = styled.div`
-  display: flex;
-  flex-direction: row;
-  width: fit-content;
-  max-width: 100%;
-`;
-
-const StyledCompactIconContainer = styled.div`
-  align-items: center;
-  display: flex;
-  justify-content: center;
-  margin-left: ${({ theme }) => theme.spacing(1)};
-`;
-
 export const RecordBoardCard = ({
   isCreating = false,
   onCreateSuccess,
@@ -160,14 +76,9 @@ export const RecordBoardCard = ({
   onCreateSuccess?: () => void;
   position?: 'first' | 'last';
 }) => {
-  const { recordId } = useContext(RecordBoardCardContext);
-
-  const [newLabelValue, setNewLabelValue] = useState('');
+  const navigate = useNavigateApp();
 
-  const { handleBlur, handleInputEnter } = useAddNewCard();
-
-  const { updateOneRecord, objectMetadataItem } =
-    useContext(RecordBoardContext);
+  const { recordId } = useContext(RecordBoardCardContext);
 
   const visibleFieldDefinitions = useRecoilComponentValueV2(
     recordBoardVisibleFieldDefinitionsComponentSelector,
@@ -185,16 +96,12 @@ export const RecordBoardCard = ({
       recordId,
     );
 
-  const record = useRecoilValue(recordStoreFamilyState(recordId));
-  const { indexIdentifierUrl } = useRecordIndexContextOrThrow();
+  const { objectNameSingular } = useRecordIndexContextOrThrow();
 
   const recordBoardId = useAvailableScopeIdOrThrow(
     RecordBoardScopeInternalContext,
   );
 
-  const { checkIfLastUnselectAndCloseDropdown } =
-    useRecordBoardSelection(recordBoardId);
-
   const actionMenuId = getActionMenuIdFromRecordIndexId(recordBoardId);
 
   const actionMenuDropdownId =
@@ -221,42 +128,19 @@ export const RecordBoardCard = ({
 
   const handleCardClick = () => {
     if (!isCreating) {
-      setIsCurrentCardSelected(!isCurrentCardSelected);
-      checkIfLastUnselectAndCloseDropdown();
+      navigate(AppPath.RecordShowPage, {
+        objectNameSingular,
+        objectRecordId: recordId,
+      });
     }
   };
 
-  const PreventSelectOnClickContainer = ({
-    children,
-  }: {
-    children: ReactNode;
-  }) => (
-    <StyledFieldContainer
-      onClick={(e) => {
-        e.stopPropagation();
-      }}
-    >
-      {children}
-    </StyledFieldContainer>
-  );
-
   const onMouseLeaveBoard = useDebouncedCallback(() => {
     if (isCompactModeActive && isCardExpanded) {
       setIsCardExpanded(false);
     }
   }, 800);
 
-  const useUpdateOneRecordHook: RecordUpdateHook = () => {
-    const updateEntity = ({ variables }: RecordUpdateHookParams) => {
-      updateOneRecord?.({
-        idToUpdate: variables.where.id as string,
-        updateOneRecordInput: variables.updateOneRecordInput,
-      });
-    };
-
-    return [updateEntity, { loading: false }];
-  };
-
   const scrollWrapperRef = useContext(RecordBoardScrollWrapperContext);
 
   const { ref: cardRef } = useInView({
@@ -285,110 +169,23 @@ export const RecordBoardCard = ({
           onMouseLeave={onMouseLeaveBoard}
           onClick={handleCardClick}
         >
-          <StyledBoardCardHeader showCompactView={isCompactModeActive}>
-            {isCreating && position !== undefined ? (
-              <RecordInlineCellEditMode>
-                <StyledTextInput
-                  autoFocus
-                  value={newLabelValue}
-                  onInputEnter={() =>
-                    handleInputEnter(
-                      labelIdentifierField?.label ?? '',
-                      newLabelValue,
-                      position,
-                      onCreateSuccess,
-                    )
-                  }
-                  onBlur={() =>
-                    handleBlur(
-                      labelIdentifierField?.label ?? '',
-                      newLabelValue,
-                      position,
-                      onCreateSuccess,
-                    )
-                  }
-                  onChange={(text: string) => setNewLabelValue(text)}
-                  placeholder={labelIdentifierField?.label}
-                />
-              </RecordInlineCellEditMode>
-            ) : (
-              <RecordIdentifierChip
-                objectNameSingular={objectMetadataItem.nameSingular}
-                record={record as ObjectRecord}
-                variant={AvatarChipVariant.Transparent}
-                maxWidth={150}
-                to={indexIdentifierUrl(recordId)}
-              />
-            )}
-
-            {!isCreating && (
-              <>
-                {isCompactModeActive && (
-                  <StyledCompactIconContainer className="compact-icon-container">
-                    <LightIconButton
-                      Icon={isCardExpanded ? IconEyeOff : IconEye}
-                      accent="tertiary"
-                      onClick={(e) => {
-                        e.stopPropagation();
-                        setIsCardExpanded((prev) => !prev);
-                      }}
-                    />
-                  </StyledCompactIconContainer>
-                )}
-
-                <StyledCheckboxContainer className="checkbox-container">
-                  <Checkbox
-                    hoverable
-                    checked={isCurrentCardSelected}
-                    onChange={() =>
-                      setIsCurrentCardSelected(!isCurrentCardSelected)
-                    }
-                    variant={CheckboxVariant.Secondary}
-                  />
-                </StyledCheckboxContainer>
-              </>
-            )}
-          </StyledBoardCardHeader>
-
+          {labelIdentifierField && (
+            <RecordBoardCardHeader
+              identifierFieldDefinition={labelIdentifierField}
+              isCreating={isCreating}
+              onCreateSuccess={onCreateSuccess}
+              position={position}
+              isCardExpanded={isCardExpanded}
+              setIsCardExpanded={setIsCardExpanded}
+            />
+          )}
           <AnimatedEaseInOut
             isOpen={isCardExpanded || !isCompactModeActive}
             initial={false}
           >
-            <StyledBoardCardBody>
-              {visibleFieldDefinitionsFiltered.map((fieldDefinition) => (
-                <PreventSelectOnClickContainer
-                  key={fieldDefinition.fieldMetadataId}
-                >
-                  <FieldContext.Provider
-                    value={{
-                      recordId: isCreating ? '' : recordId,
-                      maxWidth: 156,
-                      recoilScopeId:
-                        (isCreating ? 'new' : recordId) +
-                        fieldDefinition.fieldMetadataId,
-                      isLabelIdentifier: false,
-                      fieldDefinition: {
-                        disableTooltip: false,
-                        fieldMetadataId: fieldDefinition.fieldMetadataId,
-                        label: fieldDefinition.label,
-                        iconName: fieldDefinition.iconName,
-                        type: fieldDefinition.type,
-                        metadata: fieldDefinition.metadata,
-                        defaultValue: fieldDefinition.defaultValue,
-                        editButtonIcon: getFieldButtonIcon({
-                          metadata: fieldDefinition.metadata,
-                          type: fieldDefinition.type,
-                        }),
-                      },
-                      useUpdateRecord: useUpdateOneRecordHook,
-                      hotkeyScope: InlineCellHotkeyScope.InlineCell,
-                    }}
-                  >
-                    <RecordInlineCell />
-                  </FieldContext.Provider>
-                </PreventSelectOnClickContainer>
-              ))}
-            </StyledBoardCardBody>
+            <RecordBoardCardBody
+              fieldDefinitions={visibleFieldDefinitionsFiltered}
+            />
           </AnimatedEaseInOut>
         </StyledBoardCard>
       </InView>
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardBody.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardBody.tsx
new file mode 100644
index 000000000000..afaa43ef7822
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardBody.tsx
@@ -0,0 +1,71 @@
+import { RecordBoardFieldDefinition } from '@/object-record/record-board/types/RecordBoardFieldDefinition';
+import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
+import {
+  FieldContext,
+  RecordUpdateHook,
+  RecordUpdateHookParams,
+} from '@/object-record/record-field/contexts/FieldContext';
+import { getFieldButtonIcon } from '@/object-record/record-field/utils/getFieldButtonIcon';
+import { InlineCellHotkeyScope } from '@/object-record/record-inline-cell/types/InlineCellHotkeyScope';
+import { RecordInlineCell } from '@/object-record/record-inline-cell/components/RecordInlineCell';
+import { StopPropagationContainer } from '@/object-record/record-board/record-board-card/components/StopPropagationContainer';
+import { useContext } from 'react';
+import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
+import { RecordBoardCardBodyContainer } from '@/object-record/record-board/record-board-card/components/RecordBoardCardBodyContainer';
+import { RecordBoardCardContext } from '@/object-record/record-board/record-board-card/contexts/RecordBoardCardContext';
+
+export const RecordBoardCardBody = ({
+  fieldDefinitions,
+}: {
+  fieldDefinitions: RecordBoardFieldDefinition<FieldMetadata>[];
+}) => {
+  const { recordId } = useContext(RecordBoardCardContext);
+
+  const { updateOneRecord } = useContext(RecordBoardContext);
+
+  const useUpdateOneRecordHook: RecordUpdateHook = () => {
+    const updateEntity = ({ variables }: RecordUpdateHookParams) => {
+      updateOneRecord?.({
+        idToUpdate: variables.where.id as string,
+        updateOneRecordInput: variables.updateOneRecordInput,
+      });
+    };
+
+    return [updateEntity, { loading: false }];
+  };
+
+  return (
+    <RecordBoardCardBodyContainer>
+      {fieldDefinitions.map((fieldDefinition) => (
+        <StopPropagationContainer key={fieldDefinition.fieldMetadataId}>
+          <FieldContext.Provider
+            value={{
+              recordId,
+              maxWidth: 156,
+              recoilScopeId:
+                (recordId || 'new') + fieldDefinition.fieldMetadataId,
+              isLabelIdentifier: false,
+              fieldDefinition: {
+                disableTooltip: false,
+                fieldMetadataId: fieldDefinition.fieldMetadataId,
+                label: fieldDefinition.label,
+                iconName: fieldDefinition.iconName,
+                type: fieldDefinition.type,
+                metadata: fieldDefinition.metadata,
+                defaultValue: fieldDefinition.defaultValue,
+                editButtonIcon: getFieldButtonIcon({
+                  metadata: fieldDefinition.metadata,
+                  type: fieldDefinition.type,
+                }),
+              },
+              useUpdateRecord: useUpdateOneRecordHook,
+              hotkeyScope: InlineCellHotkeyScope.InlineCell,
+            }}
+          >
+            <RecordInlineCell />
+          </FieldContext.Provider>
+        </StopPropagationContainer>
+      ))}
+    </RecordBoardCardBodyContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardBodyContainer.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardBodyContainer.tsx
new file mode 100644
index 000000000000..4398235fa215
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardBodyContainer.tsx
@@ -0,0 +1,21 @@
+import styled from '@emotion/styled';
+
+const StyledBoardCardBody = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: ${({ theme }) => theme.spacing(0.5)};
+  padding-bottom: ${({ theme }) => theme.spacing(2)};
+  padding-left: ${({ theme }) => theme.spacing(2.5)};
+  padding-right: ${({ theme }) => theme.spacing(2)};
+  span {
+    align-items: center;
+    display: flex;
+    flex-direction: row;
+    svg {
+      color: ${({ theme }) => theme.font.color.tertiary};
+      margin-right: ${({ theme }) => theme.spacing(2)};
+    }
+  }
+`;
+
+export { StyledBoardCardBody as RecordBoardCardBodyContainer };
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx
new file mode 100644
index 000000000000..f0bef8819de7
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeader.tsx
@@ -0,0 +1,218 @@
+import {
+  AvatarChipVariant,
+  Checkbox,
+  CheckboxVariant,
+  LightIconButton,
+  IconEye,
+  IconEyeOff,
+} from 'twenty-ui';
+import { RecordBoardCardHeaderContainer } from '@/object-record/record-board/record-board-card/components/RecordBoardCardHeaderContainer';
+import { RecordInlineCellEditMode } from '@/object-record/record-inline-cell/components/RecordInlineCellEditMode';
+import styled from '@emotion/styled';
+import { TextInput } from '@/ui/input/components/TextInput';
+import { Dispatch, SetStateAction, useContext, useState } from 'react';
+import { useAddNewCard } from '@/object-record/record-board/record-board-column/hooks/useAddNewCard';
+import { RecordBoardFieldDefinition } from '@/object-record/record-board/types/RecordBoardFieldDefinition';
+import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
+import {
+  FieldContext,
+  RecordUpdateHook,
+  RecordUpdateHookParams,
+} from '@/object-record/record-field/contexts/FieldContext';
+import { ObjectRecord } from '@/object-record/types/ObjectRecord';
+import { getFieldButtonIcon } from '@/object-record/record-field/utils/getFieldButtonIcon';
+import { InlineCellHotkeyScope } from '@/object-record/record-inline-cell/types/InlineCellHotkeyScope';
+import { RecordInlineCell } from '@/object-record/record-inline-cell/components/RecordInlineCell';
+import { useRecoilValue } from 'recoil';
+import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
+import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
+import { RecordBoardCardContext } from '@/object-record/record-board/record-board-card/contexts/RecordBoardCardContext';
+import { RecordIdentifierChip } from '@/object-record/record-index/components/RecordIndexRecordChip';
+import { useRecoilComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyStateV2';
+import { isRecordBoardCardSelectedComponentFamilyState } from '@/object-record/record-board/states/isRecordBoardCardSelectedComponentFamilyState';
+import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
+import { RecordBoardScopeInternalContext } from '@/object-record/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext';
+import { useRecordBoardSelection } from '@/object-record/record-board/hooks/useRecordBoardSelection';
+import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { isRecordBoardCompactModeActiveComponentState } from '@/object-record/record-board/states/isRecordBoardCompactModeActiveComponentState';
+import { StopPropagationContainer } from '@/object-record/record-board/record-board-card/components/StopPropagationContainer';
+
+const StyledTextInput = styled(TextInput)`
+  border-radius: ${({ theme }) => theme.border.radius.sm};
+  width: ${({ theme }) => theme.spacing(53)};
+`;
+
+const StyledCompactIconContainer = styled.div`
+  align-items: center;
+  display: flex;
+  justify-content: center;
+  margin-left: ${({ theme }) => theme.spacing(1)};
+`;
+
+const StyledCheckboxContainer = styled.div`
+  margin-left: auto;
+`;
+
+type RecordBoardCardHeaderProps = {
+  isCreating?: boolean;
+  onCreateSuccess?: () => void;
+  position?: 'first' | 'last';
+  identifierFieldDefinition: RecordBoardFieldDefinition<FieldMetadata>;
+  isCardExpanded?: boolean;
+  setIsCardExpanded?: Dispatch<SetStateAction<boolean>>;
+};
+
+export const RecordBoardCardHeader = ({
+  isCreating = false,
+  onCreateSuccess,
+  position,
+  identifierFieldDefinition,
+  isCardExpanded,
+  setIsCardExpanded,
+}: RecordBoardCardHeaderProps) => {
+  const [newLabelValue, setNewLabelValue] = useState('');
+
+  const { handleBlur, handleInputEnter } = useAddNewCard();
+
+  const { recordId } = useContext(RecordBoardCardContext);
+
+  const { indexIdentifierUrl } = useRecordIndexContextOrThrow();
+
+  const record = useRecoilValue(recordStoreFamilyState(recordId));
+
+  const { updateOneRecord, objectMetadataItem } =
+    useContext(RecordBoardContext);
+
+  const recordBoardId = useAvailableScopeIdOrThrow(
+    RecordBoardScopeInternalContext,
+  );
+
+  const showCompactView = useRecoilComponentValueV2(
+    isRecordBoardCompactModeActiveComponentState,
+  );
+
+  const isIdentifierEmpty =
+    (record?.[identifierFieldDefinition.metadata.fieldName] || '').trim() ===
+    '';
+
+  const { checkIfLastUnselectAndCloseDropdown } =
+    useRecordBoardSelection(recordBoardId);
+
+  const [isCurrentCardSelected, setIsCurrentCardSelected] =
+    useRecoilComponentFamilyStateV2(
+      isRecordBoardCardSelectedComponentFamilyState,
+      recordId,
+    );
+
+  const useUpdateOneRecordHook: RecordUpdateHook = () => {
+    const updateEntity = ({ variables }: RecordUpdateHookParams) => {
+      updateOneRecord?.({
+        idToUpdate: variables.where.id as string,
+        updateOneRecordInput: variables.updateOneRecordInput,
+      });
+    };
+
+    return [updateEntity, { loading: false }];
+  };
+
+  return (
+    <RecordBoardCardHeaderContainer showCompactView={showCompactView}>
+      <StopPropagationContainer>
+        {isCreating && position !== undefined ? (
+          <RecordInlineCellEditMode>
+            <StyledTextInput
+              autoFocus
+              value={newLabelValue}
+              onInputEnter={() =>
+                handleInputEnter(
+                  identifierFieldDefinition.label ?? '',
+                  newLabelValue,
+                  position,
+                  onCreateSuccess,
+                )
+              }
+              onBlur={() =>
+                handleBlur(
+                  identifierFieldDefinition.label ?? '',
+                  newLabelValue,
+                  position,
+                  onCreateSuccess,
+                )
+              }
+              onChange={(text: string) => setNewLabelValue(text)}
+              placeholder={identifierFieldDefinition.label}
+            />
+          </RecordInlineCellEditMode>
+        ) : isIdentifierEmpty ? (
+          <FieldContext.Provider
+            value={{
+              recordId: (record as ObjectRecord).id,
+              maxWidth: 156,
+              recoilScopeId:
+                (isCreating ? 'new' : recordId) +
+                identifierFieldDefinition.fieldMetadataId,
+              isLabelIdentifier: true,
+              fieldDefinition: {
+                disableTooltip: false,
+                fieldMetadataId: identifierFieldDefinition.fieldMetadataId,
+                label: `Set ${identifierFieldDefinition.label}`,
+                iconName: identifierFieldDefinition.iconName,
+                type: identifierFieldDefinition.type,
+                metadata: identifierFieldDefinition.metadata,
+                defaultValue: identifierFieldDefinition.defaultValue,
+                editButtonIcon: getFieldButtonIcon({
+                  metadata: identifierFieldDefinition.metadata,
+                  type: identifierFieldDefinition.type,
+                }),
+              },
+              useUpdateRecord: useUpdateOneRecordHook,
+              hotkeyScope: InlineCellHotkeyScope.InlineCell,
+            }}
+          >
+            <RecordInlineCell />
+          </FieldContext.Provider>
+        ) : (
+          <RecordIdentifierChip
+            objectNameSingular={objectMetadataItem.nameSingular}
+            record={record as ObjectRecord}
+            variant={AvatarChipVariant.Transparent}
+            maxWidth={150}
+            to={indexIdentifierUrl(recordId)}
+          />
+        )}
+      </StopPropagationContainer>
+
+      {!isCreating && (
+        <>
+          {showCompactView && (
+            <StyledCompactIconContainer className="compact-icon-container">
+              <StopPropagationContainer>
+                <LightIconButton
+                  Icon={isCardExpanded ? IconEyeOff : IconEye}
+                  accent="tertiary"
+                  onClick={() => {
+                    setIsCardExpanded?.((prev) => !prev);
+                  }}
+                />
+              </StopPropagationContainer>
+            </StyledCompactIconContainer>
+          )}
+          <StyledCheckboxContainer className="checkbox-container">
+            <StopPropagationContainer>
+              <Checkbox
+                hoverable
+                checked={isCurrentCardSelected}
+                onChange={() => {
+                  setIsCurrentCardSelected(!isCurrentCardSelected);
+                  checkIfLastUnselectAndCloseDropdown();
+                }}
+                variant={CheckboxVariant.Secondary}
+              />
+            </StopPropagationContainer>
+          </StyledCheckboxContainer>
+        </>
+      )}
+    </RecordBoardCardHeaderContainer>
+  );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeaderContainer.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeaderContainer.tsx
new file mode 100644
index 000000000000..9082707d2200
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardHeaderContainer.tsx
@@ -0,0 +1,26 @@
+import styled from '@emotion/styled';
+
+const StyledBoardCardHeader = styled.div<{
+  showCompactView: boolean;
+}>`
+  align-items: center;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+  height: 24px;
+  padding-bottom: ${({ theme, showCompactView }) =>
+    theme.spacing(showCompactView ? 2 : 1)};
+  padding-left: ${({ theme }) => theme.spacing(2)};
+  padding-right: ${({ theme }) => theme.spacing(2)};
+  padding-top: ${({ theme }) => theme.spacing(2)};
+  transition: padding ease-in-out 160ms;
+
+  img {
+    height: ${({ theme }) => theme.icon.size.md}px;
+    object-fit: cover;
+    width: ${({ theme }) => theme.icon.size.md}px;
+  }
+`;
+
+export { StyledBoardCardHeader as RecordBoardCardHeaderContainer };
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/StopPropagationContainer.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/StopPropagationContainer.tsx
new file mode 100644
index 000000000000..417c522e66d6
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/StopPropagationContainer.tsx
@@ -0,0 +1,23 @@
+import { ReactNode } from 'react';
+import styled from '@emotion/styled';
+
+const StyledFieldContainer = styled.div`
+  display: flex;
+  flex-direction: row;
+  width: fit-content;
+  max-width: 100%;
+`;
+
+export const StopPropagationContainer = ({
+  children,
+}: {
+  children: ReactNode;
+}) => (
+  <StyledFieldContainer
+    onClick={(e) => {
+      e.stopPropagation();
+    }}
+  >
+    {children}
+  </StyledFieldContainer>
+);
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumn.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumn.tsx
index c76d85c2f976..2bde694252b3 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumn.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumn.tsx
@@ -44,7 +44,6 @@ export const RecordBoardColumn = ({
     <RecordBoardColumnContext.Provider
       value={{
         columnDefinition: recordGroupDefinition,
-        recordCount: recordIdsByGroup.length,
         columnId: recordBoardColumnId,
         recordIds: recordIdsByGroup,
       }}
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnCardContainerSkeletonLoader.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnCardContainerSkeletonLoader.tsx
index afaf8e9d78f4..0dc98e222359 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnCardContainerSkeletonLoader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnCardContainerSkeletonLoader.tsx
@@ -3,11 +3,8 @@ import styled from '@emotion/styled';
 import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
 
 import { SKELETON_LOADER_HEIGHT_SIZES } from '@/activities/components/SkeletonLoader';
-import {
-  StyledBoardCardBody,
-  StyledBoardCardHeader,
-} from '@/object-record/record-board/record-board-card/components/RecordBoardCard';
-
+import { RecordBoardCardBodyContainer } from '@/object-record/record-board/record-board-card/components/RecordBoardCardBodyContainer';
+import { RecordBoardCardHeaderContainer } from '@/object-record/record-board/record-board-card/components/RecordBoardCardHeaderContainer';
 const StyledSkeletonIconAndText = styled.div`
   display: flex;
   gap: ${({ theme }) => theme.spacing(1)};
@@ -42,18 +39,18 @@ export const RecordBoardColumnCardContainerSkeletonLoader = ({
       highlightColor={theme.background.transparent.lighter}
       borderRadius={4}
     >
-      <StyledBoardCardHeader showCompactView={isCompactModeActive}>
+      <RecordBoardCardHeaderContainer showCompactView={isCompactModeActive}>
         <StyledSkeletonTitle>
           <Skeleton
             width={titleSkeletonWidth}
             height={SKELETON_LOADER_HEIGHT_SIZES.standard.s}
           />
         </StyledSkeletonTitle>
-      </StyledBoardCardHeader>
+      </RecordBoardCardHeaderContainer>
       <StyledSeparator />
       {!isCompactModeActive &&
         skeletonItems.map(({ id }) => (
-          <StyledBoardCardBody key={id}>
+          <RecordBoardCardBodyContainer key={id}>
             <StyledSkeletonIconAndText>
               <Skeleton
                 width={16}
@@ -64,7 +61,7 @@ export const RecordBoardColumnCardContainerSkeletonLoader = ({
                 height={SKELETON_LOADER_HEIGHT_SIZES.standard.s}
               />
             </StyledSkeletonIconAndText>
-          </StyledBoardCardBody>
+          </RecordBoardCardBodyContainer>
         ))}
     </SkeletonTheme>
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx
index 10f9fd4d47ad..22321dc5b82b 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx
@@ -12,9 +12,7 @@ import { useIsOpportunitiesCompanyFieldDisabled } from '@/object-record/record-b
 import { RecordBoardColumnHotkeyScope } from '@/object-record/record-board/types/BoardColumnHotkeyScope';
 import { RecordGroupDefinitionType } from '@/object-record/record-group/types/RecordGroupDefinition';
 import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 import { IconDotsVertical, IconPlus, LightIconButton, Tag } from 'twenty-ui';
-import { FeatureFlagKey } from '~/generated/graphql';
 
 const StyledHeader = styled.div`
   align-items: center;
@@ -30,6 +28,7 @@ const StyledHeaderActions = styled.div`
   display: flex;
   margin-left: auto;
 `;
+
 const StyledHeaderContainer = styled.div`
   background: ${({ theme }) => theme.background.primary};
   display: flex;
@@ -40,16 +39,7 @@ const StyledLeftContainer = styled.div`
   align-items: center;
   display: flex;
   gap: ${({ theme }) => theme.spacing(1)};
-`;
-
-const StyledRecordCountChildren = styled.div`
-  align-items: center;
-  color: ${({ theme }) => theme.font.color.tertiary};
-  display: flex;
-  height: 24px;
-  justify-content: center;
-  line-height: ${({ theme }) => theme.text.lineHeight.lg};
-  width: 22px;
+  overflow: hidden;
 `;
 
 const StyledRightContainer = styled.div`
@@ -69,6 +59,10 @@ const StyledColumn = styled.div`
   position: relative;
 `;
 
+const StyledTag = styled(Tag)`
+  flex-shrink: 0;
+`;
+
 export const RecordBoardColumnHeader = () => {
   const { columnDefinition } = useContext(RecordBoardColumnContext);
   const [isBoardColumnMenuOpen, setIsBoardColumnMenuOpen] = useState(false);
@@ -103,10 +97,6 @@ export const RecordBoardColumnHeader = () => {
     columnDefinition.id ?? '',
   );
 
-  const isAggregateQueryEnabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsAggregateQueryEnabled,
-  );
-
   const { isOpportunitiesCompanyFieldDisabled } =
     useIsOpportunitiesCompanyFieldDisabled();
 
@@ -122,7 +112,7 @@ export const RecordBoardColumnHeader = () => {
       >
         <StyledHeaderContainer>
           <StyledLeftContainer>
-            <Tag
+            <StyledTag
               onClick={handleBoardColumnMenuOpen}
               variant={
                 columnDefinition.type === RecordGroupDefinitionType.Value
@@ -141,18 +131,12 @@ export const RecordBoardColumnHeader = () => {
                   : 'medium'
               }
             />
-            {isAggregateQueryEnabled ? (
-              <RecordBoardColumnHeaderAggregateDropdown
-                aggregateValue={aggregateValue}
-                dropdownId={`record-board-column-aggregate-dropdown-${columnDefinition.id}`}
-                objectMetadataItem={objectMetadataItem}
-                aggregateLabel={aggregateLabel}
-              />
-            ) : (
-              <StyledRecordCountChildren>
-                {aggregateValue}
-              </StyledRecordCountChildren>
-            )}
+            <RecordBoardColumnHeaderAggregateDropdown
+              aggregateValue={aggregateValue}
+              dropdownId={`record-board-column-aggregate-dropdown-${columnDefinition.id}`}
+              objectMetadataItem={objectMetadataItem}
+              aggregateLabel={aggregateLabel}
+            />
           </StyledLeftContainer>
           <StyledRightContainer>
             {isHeaderHovered && (
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdown.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdown.tsx
index 197f6343309d..f384739a62b1 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdown.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdown.tsx
@@ -9,6 +9,7 @@ import { RecordBoardColumnHeaderAggregateDropdownContext } from '@/object-record
 import { RecordBoardColumnHotkeyScope } from '@/object-record/record-board/types/BoardColumnHotkeyScope';
 import { RecordBoardColumnHeaderAggregateContentId } from '@/object-record/record-board/types/RecordBoardColumnHeaderAggregateContentId';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import styled from '@emotion/styled';
 
 type RecordBoardColumnHeaderAggregateDropdownProps = {
   aggregateValue?: string | number;
@@ -17,6 +18,10 @@ type RecordBoardColumnHeaderAggregateDropdownProps = {
   dropdownId: string;
 };
 
+const StyledContainer = styled.div`
+  overflow: hidden;
+`;
+
 export const RecordBoardColumnHeaderAggregateDropdown = ({
   objectMetadataItem,
   aggregateValue,
@@ -34,36 +39,38 @@ export const RecordBoardColumnHeaderAggregateDropdown = ({
     <RecordBoardColumnHeaderAggregateDropdownComponentInstanceContext.Provider
       value={{ instanceId: dropdownId }}
     >
-      <Dropdown
-        onClose={handleResetContent}
-        dropdownId={dropdownId}
-        dropdownHotkeyScope={{
-          scope: RecordBoardColumnHotkeyScope.ColumnHeader,
-        }}
-        dropdownMenuWidth={DROPDOWN_WIDTH}
-        dropdownOffset={{ y: DROPDOWN_OFFSET_Y }}
-        clickableComponent={
-          <RecordBoardColumnHeaderAggregateDropdownButton
-            dropdownId={dropdownId}
-            value={aggregateValue}
-            tooltip={aggregateLabel}
-          />
-        }
-        dropdownComponents={
-          <RecordBoardColumnHeaderAggregateDropdownContext.Provider
-            value={{
-              currentContentId,
-              onContentChange: handleContentChange,
-              resetContent: handleResetContent,
-              previousContentId,
-              objectMetadataItem: objectMetadataItem,
-              dropdownId: dropdownId,
-            }}
-          >
-            <AggregateDropdownContent />
-          </RecordBoardColumnHeaderAggregateDropdownContext.Provider>
-        }
-      />
+      <StyledContainer>
+        <Dropdown
+          onClose={handleResetContent}
+          dropdownId={dropdownId}
+          dropdownHotkeyScope={{
+            scope: RecordBoardColumnHotkeyScope.ColumnHeader,
+          }}
+          dropdownMenuWidth={DROPDOWN_WIDTH}
+          dropdownOffset={{ y: DROPDOWN_OFFSET_Y }}
+          clickableComponent={
+            <RecordBoardColumnHeaderAggregateDropdownButton
+              dropdownId={dropdownId}
+              value={aggregateValue}
+              tooltip={aggregateLabel}
+            />
+          }
+          dropdownComponents={
+            <RecordBoardColumnHeaderAggregateDropdownContext.Provider
+              value={{
+                currentContentId,
+                onContentChange: handleContentChange,
+                resetContent: handleResetContent,
+                previousContentId,
+                objectMetadataItem: objectMetadataItem,
+                dropdownId: dropdownId,
+              }}
+            >
+              <AggregateDropdownContent />
+            </RecordBoardColumnHeaderAggregateDropdownContext.Provider>
+          }
+        />
+      </StyledContainer>
     </RecordBoardColumnHeaderAggregateDropdownComponentInstanceContext.Provider>
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownButton.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownButton.tsx
index e1a8fdcf8469..35a3188aed5e 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownButton.tsx
@@ -3,7 +3,11 @@ import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import styled from '@emotion/styled';
 import { AppTooltip, Tag, TooltipDelay } from 'twenty-ui';
 
-const StyledButton = styled(StyledHeaderDropdownButton)`
+const StyledTag = styled(Tag)`
+  width: 100%;
+`;
+
+const StyledHeader = styled(StyledHeaderDropdownButton)`
   padding: 0;
 `;
 
@@ -17,10 +21,11 @@ export const RecordBoardColumnHeaderAggregateDropdownButton = ({
   tooltip?: string;
 }) => {
   const { isDropdownOpen } = useDropdown(dropdownId);
+
   return (
-    <div id={dropdownId}>
-      <StyledButton>
-        <Tag
+    <StyledHeader id={dropdownId} isUnfolded={isDropdownOpen}>
+      <>
+        <StyledTag
           text={value ? value.toString() : '-'}
           color={'transparent'}
           weight={'regular'}
@@ -35,7 +40,7 @@ export const RecordBoardColumnHeaderAggregateDropdownButton = ({
             delay={TooltipDelay.mediumDelay}
           />
         )}
-      </StyledButton>
-    </div>
+      </>
+    </StyledHeader>
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownContent.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownContent.tsx
index c461f846dcda..dc7aa88449a8 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownContent.tsx
@@ -3,9 +3,10 @@ import { RecordBoardColumnHeaderAggregateDropdownContext } from '@/object-record
 import { RecordBoardColumnHeaderAggregateDropdownFieldsContent } from '@/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownFieldsContent';
 import { RecordBoardColumnHeaderAggregateDropdownMenuContent } from '@/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownMenuContent';
 import { RecordBoardColumnHeaderAggregateDropdownOptionsContent } from '@/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownOptionsContent';
+import { DATE_AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/DateAggregateOperations';
 import { COUNT_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/countAggregateOperationOptions';
 import { NON_STANDARD_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/nonStandardAggregateOperationsOptions';
-import { PERCENT_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/percentAggregateOperationOption';
+import { PERCENT_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/percentAggregateOperationOptions';
 import { AvailableFieldsForAggregateOperation } from '@/object-record/types/AvailableFieldsForAggregateOperation';
 import { getAvailableFieldsIdsForAggregationFromObjectFields } from '@/object-record/utils/getAvailableFieldsIdsForAggregationFromObjectFields';
 
@@ -41,15 +42,31 @@ export const AggregateDropdownContent = () => {
         />
       );
     }
+    case 'datesAggregateOperationOptions': {
+      const datesAvailableAggregations: AvailableFieldsForAggregateOperation =
+        getAvailableFieldsIdsForAggregationFromObjectFields(
+          objectMetadataItem.fields,
+          [
+            DATE_AGGREGATE_OPERATIONS.earliest,
+            DATE_AGGREGATE_OPERATIONS.latest,
+          ],
+        );
+      return (
+        <RecordBoardColumnHeaderAggregateDropdownOptionsContent
+          availableAggregations={datesAvailableAggregations}
+          title="Dates"
+        />
+      );
+    }
     case 'moreAggregateOperationOptions': {
-      const availableAggregations: AvailableFieldsForAggregateOperation =
+      const availableAggregationsWithoutDates: AvailableFieldsForAggregateOperation =
         getAvailableFieldsIdsForAggregationFromObjectFields(
           objectMetadataItem.fields,
           NON_STANDARD_AGGREGATE_OPERATION_OPTIONS,
         );
       return (
         <RecordBoardColumnHeaderAggregateDropdownOptionsContent
-          availableAggregations={availableAggregations}
+          availableAggregations={availableAggregationsWithoutDates}
           title="More options"
         />
       );
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownFieldsContent.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownFieldsContent.tsx
index def721618b83..2f4843e685d9 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownFieldsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownFieldsContent.tsx
@@ -4,7 +4,6 @@ import { aggregateOperationComponentState } from '@/object-record/record-board/r
 import { availableFieldIdsForAggregateOperationComponentState } from '@/object-record/record-board/record-board-column/states/availableFieldIdsForAggregateOperationComponentState';
 import { getAggregateOperationLabel } from '@/object-record/record-board/record-board-column/utils/getAggregateOperationLabel';
 import { recordIndexKanbanAggregateOperationState } from '@/object-record/record-index/states/recordIndexKanbanAggregateOperationState';
-import { convertExtendedAggregateOperationToAggregateOperation } from '@/object-record/utils/convertExtendedAggregateOperationToAggregateOperation';
 import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
@@ -47,9 +46,6 @@ export const RecordBoardColumnHeaderAggregateDropdownFieldsContent = () => {
   );
 
   if (!isDefined(aggregateOperation)) return <></>;
-
-  const convertedAggregateOperation =
-    convertExtendedAggregateOperationToAggregateOperation(aggregateOperation);
   return (
     <>
       <DropdownMenuHeader
@@ -75,7 +71,7 @@ export const RecordBoardColumnHeaderAggregateDropdownFieldsContent = () => {
               onClick={() => {
                 updateViewAggregate({
                   kanbanAggregateOperationFieldMetadataId: fieldId,
-                  kanbanAggregateOperation: convertedAggregateOperation,
+                  kanbanAggregateOperation: aggregateOperation,
                 });
                 closeDropdown();
               }}
@@ -85,7 +81,7 @@ export const RecordBoardColumnHeaderAggregateDropdownFieldsContent = () => {
                 recordIndexKanbanAggregateOperation?.fieldMetadataId ===
                   fieldId &&
                 recordIndexKanbanAggregateOperation?.operation ===
-                  convertedAggregateOperation
+                  aggregateOperation
                   ? IconCheck
                   : undefined
               }
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownMenuContent.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownMenuContent.tsx
index 558282439130..e2eda18d7738 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownMenuContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownMenuContent.tsx
@@ -42,6 +42,13 @@ export const RecordBoardColumnHeaderAggregateDropdownMenuContent = () => {
           text={'Percent'}
           hasSubMenu
         />
+        <MenuItem
+          onClick={() => {
+            onContentChange('datesAggregateOperationOptions');
+          }}
+          text={'Dates'}
+          hasSubMenu
+        />
         <MenuItem
           onClick={() => {
             onContentChange('moreAggregateOperationOptions');
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownOptionsContent.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownOptionsContent.tsx
index 1affb3a38e4d..33768f1d1f51 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownOptionsContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdownOptionsContent.tsx
@@ -7,6 +7,7 @@ import { RecordBoardColumnHeaderAggregateDropdownMenuItem } from '@/object-recor
 import { aggregateOperationComponentState } from '@/object-record/record-board/record-board-column/states/aggregateOperationComponentState';
 import { availableFieldIdsForAggregateOperationComponentState } from '@/object-record/record-board/record-board-column/states/availableFieldIdsForAggregateOperationComponentState';
 import { getAggregateOperationLabel } from '@/object-record/record-board/record-board-column/utils/getAggregateOperationLabel';
+import { recordIndexKanbanAggregateOperationState } from '@/object-record/record-index/states/recordIndexKanbanAggregateOperationState';
 import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
 import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
 import { TableOptionsHotkeyScope } from '@/object-record/record-table/types/TableOptionsHotkeyScope';
@@ -17,8 +18,9 @@ import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 import { useUpdateViewAggregate } from '@/views/hooks/useUpdateViewAggregate';
 import isEmpty from 'lodash.isempty';
+import { useRecoilValue } from 'recoil';
 import { Key } from 'ts-key-enum';
-import { IconChevronLeft } from 'twenty-ui';
+import { IconCheck, IconChevronLeft } from 'twenty-ui';
 
 export const RecordBoardColumnHeaderAggregateDropdownOptionsContent = ({
   availableAggregations,
@@ -50,6 +52,10 @@ export const RecordBoardColumnHeaderAggregateDropdownOptionsContent = ({
 
   const { updateViewAggregate } = useUpdateViewAggregate();
 
+  const recordIndexKanbanAggregateOperation = useRecoilValue(
+    recordIndexKanbanAggregateOperationState,
+  );
+
   return (
     <>
       <DropdownMenuHeader StartIcon={IconChevronLeft} onClick={resetContent}>
@@ -95,6 +101,14 @@ export const RecordBoardColumnHeaderAggregateDropdownOptionsContent = ({
                     ? false
                     : true
                 }
+                RightIcon={
+                  availableAggregationOperation ===
+                    AGGREGATE_OPERATIONS.count &&
+                  recordIndexKanbanAggregateOperation?.operation ===
+                    AGGREGATE_OPERATIONS.count
+                    ? IconCheck
+                    : undefined
+                }
               />
             ),
           )}
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderWrapper.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderWrapper.tsx
index c6873baa3340..f156395f32d4 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderWrapper.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderWrapper.tsx
@@ -32,7 +32,6 @@ export const RecordBoardColumnHeaderWrapper = ({
       value={{
         columnId,
         columnDefinition: recordGroupDefinition,
-        recordCount: recordIdsByGroup.length,
         recordIds: recordIdsByGroup,
       }}
     >
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/contexts/RecordBoardColumnContext.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/contexts/RecordBoardColumnContext.ts
index 1d000084f3b5..4140e0cf18ed 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/contexts/RecordBoardColumnContext.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/contexts/RecordBoardColumnContext.ts
@@ -4,7 +4,6 @@ import { RecordGroupDefinition } from '@/object-record/record-group/types/Record
 
 type RecordBoardColumnContextProps = {
   columnDefinition: RecordGroupDefinition;
-  recordCount: number;
   columnId: string;
   recordIds: string[];
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/hooks/useAddNewCard.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/hooks/useAddNewCard.ts
index e54da6b03a75..29bef2b126f6 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/hooks/useAddNewCard.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/hooks/useAddNewCard.ts
@@ -93,7 +93,7 @@ export const useAddNewCard = () => {
           throw new Error('Label identifier field not found');
         }
 
-        if (labelIdentifierField.type === FieldMetadataType.FullName) {
+        if (labelIdentifierField.type === FieldMetadataType.FULL_NAME) {
           computedLabelIdentifierValue = {
             firstName: labelValue,
             lastName: '',
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/hooks/useAggregateRecordsForRecordBoardColumn.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/hooks/useAggregateRecordsForRecordBoardColumn.ts
index cdc7248a8e85..7c4d89988fd4 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/hooks/useAggregateRecordsForRecordBoardColumn.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/hooks/useAggregateRecordsForRecordBoardColumn.ts
@@ -1,36 +1,14 @@
-import { useAggregateRecords } from '@/object-record/hooks/useAggregateRecords';
 import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
 import { RecordBoardColumnContext } from '@/object-record/record-board/record-board-column/contexts/RecordBoardColumnContext';
-import { buildRecordGqlFieldsAggregateForRecordBoard } from '@/object-record/record-board/record-board-column/utils/buildRecordGqlFieldsAggregateForRecordBoard';
-import { computeAggregateValueAndLabel } from '@/object-record/record-board/record-board-column/utils/computeAggregateValueAndLabel';
-import { useFilterValueDependencies } from '@/object-record/record-filter/hooks/useFilterValueDependencies';
-import { computeViewRecordGqlOperationFilter } from '@/object-record/record-filter/utils/computeViewRecordGqlOperationFilter';
-import { recordIndexFiltersState } from '@/object-record/record-index/states/recordIndexFiltersState';
-import { recordIndexKanbanAggregateOperationState } from '@/object-record/record-index/states/recordIndexKanbanAggregateOperationState';
 import { recordIndexKanbanFieldMetadataIdState } from '@/object-record/record-index/states/recordIndexKanbanFieldMetadataIdState';
-import { recordIndexViewFilterGroupsState } from '@/object-record/record-index/states/recordIndexViewFilterGroupsState';
-import { UserContext } from '@/users/contexts/UserContext';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+import { useAggregateRecordsForHeader } from '@/object-record/record-table/hooks/useAggregateRecordsForHeader';
 import { useContext } from 'react';
 import { useRecoilValue } from 'recoil';
-import { FeatureFlagKey } from '~/generated/graphql';
 import { isDefined } from '~/utils/isDefined';
 
 export const useAggregateRecordsForRecordBoardColumn = () => {
-  const isAggregateQueryEnabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsAggregateQueryEnabled,
-  );
-
-  const { columnDefinition, recordCount } = useContext(
-    RecordBoardColumnContext,
-  );
-
+  const { columnDefinition } = useContext(RecordBoardColumnContext);
   const { objectMetadataItem } = useContext(RecordBoardContext);
-
-  const recordIndexKanbanAggregateOperation = useRecoilValue(
-    recordIndexKanbanAggregateOperationState,
-  );
-
   const recordIndexKanbanFieldMetadataId = useRecoilValue(
     recordIndexKanbanFieldMetadataIdState,
   );
@@ -45,57 +23,16 @@ export const useAggregateRecordsForRecordBoardColumn = () => {
     );
   }
 
-  const recordGqlFieldsAggregate = buildRecordGqlFieldsAggregateForRecordBoard({
-    objectMetadataItem: objectMetadataItem,
-    recordIndexKanbanAggregateOperation: recordIndexKanbanAggregateOperation,
-    kanbanFieldName: kanbanFieldName,
-  });
-
-  const recordIndexViewFilterGroups = useRecoilValue(
-    recordIndexViewFilterGroupsState,
-  );
-
-  const recordIndexFilters = useRecoilValue(recordIndexFiltersState);
-
-  const { filterValueDependencies } = useFilterValueDependencies();
-
-  const requestFilters = computeViewRecordGqlOperationFilter(
-    filterValueDependencies,
-    recordIndexFilters,
-    objectMetadataItem.fields,
-    recordIndexViewFilterGroups,
-  );
-
-  const filter = {
-    ...requestFilters,
+  const additionalFilters = {
     [kanbanFieldName]:
       columnDefinition.value === null
         ? { is: 'NULL' }
         : { eq: columnDefinition.value },
   };
 
-  const { data } = useAggregateRecords({
-    objectNameSingular: objectMetadataItem.nameSingular,
-    recordGqlFieldsAggregate,
-    filter,
-    skip: !isAggregateQueryEnabled,
-  });
-
-  const { dateFormat, timeFormat, timeZone } = useContext(UserContext);
-
-  const { value, labelWithFieldName } = computeAggregateValueAndLabel({
-    data,
+  return useAggregateRecordsForHeader({
     objectMetadataItem,
-    fieldMetadataId: recordIndexKanbanAggregateOperation?.fieldMetadataId,
-    aggregateOperation: recordIndexKanbanAggregateOperation?.operation,
+    additionalFilters,
     fallbackFieldName: kanbanFieldName,
-    dateFormat,
-    timeFormat,
-    timeZone,
   });
-
-  return {
-    aggregateValue: isAggregateQueryEnabled ? value : recordCount,
-    aggregateLabel: isDefined(value) ? labelWithFieldName : undefined,
-  };
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/__tests__/buildRecordGqlFieldsAggregateForRecordBoard.test.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/__tests__/buildRecordGqlFieldsAggregateForView.test.ts
similarity index 76%
rename from packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/__tests__/buildRecordGqlFieldsAggregateForRecordBoard.test.ts
rename to packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/__tests__/buildRecordGqlFieldsAggregateForView.test.ts
index 2afbf90e04a2..e79eb3a3a96a 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/__tests__/buildRecordGqlFieldsAggregateForRecordBoard.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/__tests__/buildRecordGqlFieldsAggregateForView.test.ts
@@ -1,14 +1,13 @@
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { buildRecordGqlFieldsAggregateForRecordBoard } from '@/object-record/record-board/record-board-column/utils/buildRecordGqlFieldsAggregateForRecordBoard';
+import { buildRecordGqlFieldsAggregateForView } from '@/object-record/record-board/record-board-column/utils/buildRecordGqlFieldsAggregateForView';
 import { KanbanAggregateOperation } from '@/object-record/record-index/states/recordIndexKanbanAggregateOperationState';
 import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 const MOCK_FIELD_ID = '7d2d7b5e-7b3e-4b4a-8b0a-7b3e4b4a8b0a';
-const MOCK_KANBAN_FIELD = 'stage';
 
-describe('buildRecordGqlFieldsAggregateForRecordBoard', () => {
+describe('buildRecordGqlFieldsAggregateForView', () => {
   const mockObjectMetadata: ObjectMetadataItem = {
     id: '123',
     nameSingular: 'opportunity',
@@ -19,24 +18,24 @@ describe('buildRecordGqlFieldsAggregateForRecordBoard', () => {
     isActive: true,
     isSystem: false,
     isRemote: false,
-    labelIdentifierFieldMetadataId: null,
+    labelIdentifierFieldMetadataId: '06b33746-5293-4d07-9f7f-ebf5ad396064',
     imageIdentifierFieldMetadataId: null,
     isLabelSyncedWithName: true,
     fields: [
       {
         id: MOCK_FIELD_ID,
         name: 'amount',
-        type: FieldMetadataType.Number,
+        type: FieldMetadataType.NUMBER,
       } as FieldMetadataItem,
       {
         id: '06b33746-5293-4d07-9f7f-ebf5ad396064',
         name: 'name',
-        type: FieldMetadataType.Text,
+        type: FieldMetadataType.TEXT,
       } as FieldMetadataItem,
       {
         id: 'e46b9ba4-144b-4d10-a092-03a7521c8aa0',
         name: 'createdAt',
-        type: FieldMetadataType.DateTime,
+        type: FieldMetadataType.DATE_TIME,
       } as FieldMetadataItem,
     ],
     indexMetadatas: [],
@@ -50,10 +49,9 @@ describe('buildRecordGqlFieldsAggregateForRecordBoard', () => {
       operation: AGGREGATE_OPERATIONS.sum,
     };
 
-    const result = buildRecordGqlFieldsAggregateForRecordBoard({
+    const result = buildRecordGqlFieldsAggregateForView({
       objectMetadataItem: mockObjectMetadata,
       recordIndexKanbanAggregateOperation: kanbanAggregateOperation,
-      kanbanFieldName: MOCK_KANBAN_FIELD,
     });
 
     expect(result).toEqual({
@@ -67,14 +65,13 @@ describe('buildRecordGqlFieldsAggregateForRecordBoard', () => {
       operation: AGGREGATE_OPERATIONS.count,
     };
 
-    const result = buildRecordGqlFieldsAggregateForRecordBoard({
+    const result = buildRecordGqlFieldsAggregateForView({
       objectMetadataItem: mockObjectMetadata,
       recordIndexKanbanAggregateOperation: operation,
-      kanbanFieldName: MOCK_KANBAN_FIELD,
     });
 
     expect(result).toEqual({
-      [MOCK_KANBAN_FIELD]: [AGGREGATE_OPERATIONS.count],
+      id: [AGGREGATE_OPERATIONS.count],
     });
   });
 
@@ -85,10 +82,9 @@ describe('buildRecordGqlFieldsAggregateForRecordBoard', () => {
     };
 
     expect(() =>
-      buildRecordGqlFieldsAggregateForRecordBoard({
+      buildRecordGqlFieldsAggregateForView({
         objectMetadataItem: mockObjectMetadata,
         recordIndexKanbanAggregateOperation: operation,
-        kanbanFieldName: MOCK_KANBAN_FIELD,
       }),
     ).toThrow(
       `No field found to compute aggregate operation ${AGGREGATE_OPERATIONS.sum} on object ${mockObjectMetadata.nameSingular}`,
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/__tests__/computeAggregateValueAndLabel.test.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/__tests__/computeAggregateValueAndLabel.test.ts
index 1b588ab70296..7a48508d3db3 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/__tests__/computeAggregateValueAndLabel.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/__tests__/computeAggregateValueAndLabel.test.ts
@@ -5,10 +5,10 @@ import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { AggregateRecordsData } from '@/object-record/hooks/useAggregateRecords';
 import { computeAggregateValueAndLabel } from '@/object-record/record-board/record-board-column/utils/computeAggregateValueAndLabel';
 import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
+import { DATE_AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/DateAggregateOperations';
 import { FieldMetadataType } from '~/generated/graphql';
 
 const MOCK_FIELD_ID = '7d2d7b5e-7b3e-4b4a-8b0a-7b3e4b4a8b0a';
-const MOCK_KANBAN_FIELD_NAME = 'stage';
 
 describe('computeAggregateValueAndLabel', () => {
   const mockObjectMetadata: ObjectMetadataItem = {
@@ -18,7 +18,7 @@ describe('computeAggregateValueAndLabel', () => {
         id: MOCK_FIELD_ID,
         name: 'amount',
         label: 'amount',
-        type: FieldMetadataType.Currency,
+        type: FieldMetadataType.CURRENCY,
       } as FieldMetadataItem,
     ],
   } as ObjectMetadataItem;
@@ -35,7 +35,6 @@ describe('computeAggregateValueAndLabel', () => {
       objectMetadataItem: mockObjectMetadata,
       fieldMetadataId: MOCK_FIELD_ID,
       aggregateOperation: AGGREGATE_OPERATIONS.sum,
-      fallbackFieldName: MOCK_KANBAN_FIELD_NAME,
       ...defaultParams,
     });
 
@@ -54,7 +53,6 @@ describe('computeAggregateValueAndLabel', () => {
       objectMetadataItem: mockObjectMetadata,
       fieldMetadataId: MOCK_FIELD_ID,
       aggregateOperation: AGGREGATE_OPERATIONS.sum,
-      fallbackFieldName: MOCK_KANBAN_FIELD_NAME,
       ...defaultParams,
     });
 
@@ -73,7 +71,7 @@ describe('computeAggregateValueAndLabel', () => {
           id: MOCK_FIELD_ID,
           name: 'percentage',
           label: 'percentage',
-          type: FieldMetadataType.Number,
+          type: FieldMetadataType.NUMBER,
           settings: {
             type: 'percentage',
           },
@@ -92,7 +90,6 @@ describe('computeAggregateValueAndLabel', () => {
       objectMetadataItem: mockObjectMetadataWithPercentageField,
       fieldMetadataId: MOCK_FIELD_ID,
       aggregateOperation: AGGREGATE_OPERATIONS.avg,
-      fallbackFieldName: MOCK_KANBAN_FIELD_NAME,
       ...defaultParams,
     });
 
@@ -111,7 +108,7 @@ describe('computeAggregateValueAndLabel', () => {
           id: MOCK_FIELD_ID,
           name: 'decimals',
           label: 'decimals',
-          type: FieldMetadataType.Number,
+          type: FieldMetadataType.NUMBER,
           settings: {
             decimals: 2,
           },
@@ -130,7 +127,6 @@ describe('computeAggregateValueAndLabel', () => {
       objectMetadataItem: mockObjectMetadataWithDecimalsField,
       fieldMetadataId: MOCK_FIELD_ID,
       aggregateOperation: AGGREGATE_OPERATIONS.sum,
-      fallbackFieldName: MOCK_KANBAN_FIELD_NAME,
       ...defaultParams,
     });
 
@@ -149,28 +145,27 @@ describe('computeAggregateValueAndLabel', () => {
           id: MOCK_FIELD_ID,
           name: 'createdAt',
           label: 'Created At',
-          type: FieldMetadataType.DateTime,
+          type: FieldMetadataType.DATE_TIME,
         } as FieldMetadataItem,
       ],
     } as ObjectMetadataItem;
 
-    const mockData = {
+    const mockFormattedData = {
       createdAt: {
-        [AGGREGATE_OPERATIONS.min]: '2023-01-01T12:00:00Z',
+        [DATE_AGGREGATE_OPERATIONS.earliest]: '2023-01-01T12:00:00Z',
       },
     } as AggregateRecordsData;
 
     const result = computeAggregateValueAndLabel({
-      data: mockData,
+      data: mockFormattedData,
       objectMetadataItem: mockObjectMetadataWithDatetimeField,
       fieldMetadataId: MOCK_FIELD_ID,
-      aggregateOperation: AGGREGATE_OPERATIONS.min,
-      fallbackFieldName: MOCK_KANBAN_FIELD_NAME,
+      aggregateOperation: DATE_AGGREGATE_OPERATIONS.earliest,
       ...defaultParams,
     });
 
     expect(result).toEqual({
-      label: 'Earliest date',
+      label: 'Earliest',
       labelWithFieldName: 'Earliest date of Created At',
       value: '1 Jan, 2023 12:00',
     });
@@ -184,36 +179,35 @@ describe('computeAggregateValueAndLabel', () => {
           id: MOCK_FIELD_ID,
           name: 'updatedAt',
           label: 'Updated At',
-          type: FieldMetadataType.DateTime,
+          type: FieldMetadataType.DATE_TIME,
         } as FieldMetadataItem,
       ],
     } as ObjectMetadataItem;
 
-    const mockData = {
+    const mockFormattedData = {
       updatedAt: {
-        [AGGREGATE_OPERATIONS.max]: '2023-12-31T23:59:59Z',
+        [DATE_AGGREGATE_OPERATIONS.latest]: '2023-12-31T23:59:59Z',
       },
     } as AggregateRecordsData;
 
     const result = computeAggregateValueAndLabel({
-      data: mockData,
+      data: mockFormattedData,
       objectMetadataItem: mockObjectMetadataWithDatetimeField,
       fieldMetadataId: MOCK_FIELD_ID,
-      aggregateOperation: AGGREGATE_OPERATIONS.max,
-      fallbackFieldName: MOCK_KANBAN_FIELD_NAME,
+      aggregateOperation: DATE_AGGREGATE_OPERATIONS.latest,
       ...defaultParams,
     });
 
     expect(result).toEqual({
       value: '31 Dec, 2023 23:59',
-      label: 'Latest date',
+      label: 'Latest',
       labelWithFieldName: 'Latest date of Updated At',
     });
   });
 
   it('should default to count when field not found', () => {
     const mockData = {
-      [MOCK_KANBAN_FIELD_NAME]: {
+      id: {
         [AGGREGATE_OPERATIONS.count]: 42,
       },
     } as AggregateRecordsData;
@@ -221,7 +215,6 @@ describe('computeAggregateValueAndLabel', () => {
     const result = computeAggregateValueAndLabel({
       data: mockData,
       objectMetadataItem: mockObjectMetadata,
-      fallbackFieldName: MOCK_KANBAN_FIELD_NAME,
       ...defaultParams,
     });
 
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/__tests__/getAggregateOperationLabel.test.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/__tests__/getAggregateOperationLabel.test.ts
index 0893212f6422..a5ab5c92b001 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/__tests__/getAggregateOperationLabel.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/__tests__/getAggregateOperationLabel.test.ts
@@ -1,5 +1,6 @@
 import { getAggregateOperationLabel } from '@/object-record/record-board/record-board-column/utils/getAggregateOperationLabel';
 import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
+import { DATE_AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/DateAggregateOperations';
 import { expect } from '@storybook/test';
 
 describe('getAggregateOperationLabel', () => {
@@ -9,8 +10,12 @@ describe('getAggregateOperationLabel', () => {
     expect(getAggregateOperationLabel(AGGREGATE_OPERATIONS.avg)).toBe(
       'Average',
     );
-    expect(getAggregateOperationLabel('EARLIEST')).toBe('Earliest date');
-    expect(getAggregateOperationLabel('LATEST')).toBe('Latest date');
+    expect(getAggregateOperationLabel(DATE_AGGREGATE_OPERATIONS.earliest)).toBe(
+      'Earliest date',
+    );
+    expect(getAggregateOperationLabel(DATE_AGGREGATE_OPERATIONS.latest)).toBe(
+      'Latest date',
+    );
     expect(getAggregateOperationLabel(AGGREGATE_OPERATIONS.sum)).toBe('Sum');
     expect(getAggregateOperationLabel(AGGREGATE_OPERATIONS.count)).toBe(
       'Count all',
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/buildRecordGqlFieldsAggregateForRecordBoard.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/buildRecordGqlFieldsAggregateForView.ts
similarity index 87%
rename from packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/buildRecordGqlFieldsAggregateForRecordBoard.ts
rename to packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/buildRecordGqlFieldsAggregateForView.ts
index 7a3f44a04b77..ad27e0355cab 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/buildRecordGqlFieldsAggregateForRecordBoard.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/buildRecordGqlFieldsAggregateForView.ts
@@ -2,16 +2,15 @@ import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { RecordGqlFieldsAggregate } from '@/object-record/graphql/types/RecordGqlFieldsAggregate';
 import { KanbanAggregateOperation } from '@/object-record/record-index/states/recordIndexKanbanAggregateOperationState';
 import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
+import { FIELD_FOR_TOTAL_COUNT_AGGREGATE_OPERATION } from 'twenty-shared';
 import { isDefined } from '~/utils/isDefined';
 
-export const buildRecordGqlFieldsAggregateForRecordBoard = ({
+export const buildRecordGqlFieldsAggregateForView = ({
   objectMetadataItem,
   recordIndexKanbanAggregateOperation,
-  kanbanFieldName,
 }: {
   objectMetadataItem: ObjectMetadataItem;
   recordIndexKanbanAggregateOperation: KanbanAggregateOperation;
-  kanbanFieldName: string;
 }): RecordGqlFieldsAggregate => {
   let recordGqlFieldsAggregate = {};
 
@@ -31,7 +30,9 @@ export const buildRecordGqlFieldsAggregateForRecordBoard = ({
       );
     } else {
       recordGqlFieldsAggregate = {
-        [kanbanFieldName]: [AGGREGATE_OPERATIONS.count],
+        [FIELD_FOR_TOTAL_COUNT_AGGREGATE_OPERATION]: [
+          AGGREGATE_OPERATIONS.count,
+        ],
       };
     }
   } else {
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/computeAggregateValueAndLabel.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/computeAggregateValueAndLabel.ts
index d50e74f33fa3..1fcadf4d8088 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/computeAggregateValueAndLabel.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/computeAggregateValueAndLabel.ts
@@ -3,23 +3,25 @@ import { TimeFormat } from '@/localization/constants/TimeFormat';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { AggregateRecordsData } from '@/object-record/hooks/useAggregateRecords';
 import { getAggregateOperationLabel } from '@/object-record/record-board/record-board-column/utils/getAggregateOperationLabel';
+import { getAggregateOperationShortLabel } from '@/object-record/record-board/record-board-column/utils/getAggregateOperationShortLabel';
 import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
 import { COUNT_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/countAggregateOperationOptions';
-import { PERCENT_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/percentAggregateOperationOption';
-import { convertAggregateOperationToExtendedAggregateOperation } from '@/object-record/utils/convertAggregateOperationToExtendedAggregateOperation';
+import { PERCENT_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/percentAggregateOperationOptions';
+import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
 import isEmpty from 'lodash.isempty';
+import { FIELD_FOR_TOTAL_COUNT_AGGREGATE_OPERATION } from 'twenty-shared';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { formatAmount } from '~/utils/format/formatAmount';
 import { formatNumber } from '~/utils/format/number';
 import { isDefined } from '~/utils/isDefined';
 import { formatDateString } from '~/utils/string/formatDateString';
+import { formatDateTimeString } from '~/utils/string/formatDateTimeString';
 
 export const computeAggregateValueAndLabel = ({
   data,
   objectMetadataItem,
   fieldMetadataId,
   aggregateOperation,
-  fallbackFieldName,
   dateFormat,
   timeFormat,
   timeZone,
@@ -27,8 +29,7 @@ export const computeAggregateValueAndLabel = ({
   data: AggregateRecordsData;
   objectMetadataItem: ObjectMetadataItem;
   fieldMetadataId?: string | null;
-  aggregateOperation?: AGGREGATE_OPERATIONS | null;
-  fallbackFieldName?: string;
+  aggregateOperation?: ExtendedAggregateOperations | null;
   dateFormat: DateFormat;
   timeFormat: TimeFormat;
   timeZone: string;
@@ -41,11 +42,11 @@ export const computeAggregateValueAndLabel = ({
   );
 
   if (!isDefined(field)) {
-    if (!fallbackFieldName) {
-      throw new Error('Missing fallback field name');
-    }
     return {
-      value: data?.[fallbackFieldName]?.[AGGREGATE_OPERATIONS.count],
+      value:
+        data?.[FIELD_FOR_TOTAL_COUNT_AGGREGATE_OPERATION]?.[
+          AGGREGATE_OPERATIONS.count
+        ],
       label: `${getAggregateOperationLabel(AGGREGATE_OPERATIONS.count)}`,
       labelWithFieldName: `${getAggregateOperationLabel(AGGREGATE_OPERATIONS.count)}`,
     };
@@ -61,21 +62,29 @@ export const computeAggregateValueAndLabel = ({
 
   const displayAsRelativeDate = field?.settings?.displayAsRelativeDate;
 
-  if (COUNT_AGGREGATE_OPERATION_OPTIONS.includes(aggregateOperation)) {
+  if (
+    COUNT_AGGREGATE_OPERATION_OPTIONS.includes(
+      aggregateOperation as AGGREGATE_OPERATIONS,
+    )
+  ) {
     value = aggregateValue;
   } else if (!isDefined(aggregateValue)) {
     value = '-';
-  } else if (PERCENT_AGGREGATE_OPERATION_OPTIONS.includes(aggregateOperation)) {
+  } else if (
+    PERCENT_AGGREGATE_OPERATION_OPTIONS.includes(
+      aggregateOperation as AGGREGATE_OPERATIONS,
+    )
+  ) {
     value = `${formatNumber(Number(aggregateValue) * 100)}%`;
   } else {
     switch (field.type) {
-      case FieldMetadataType.Currency: {
+      case FieldMetadataType.CURRENCY: {
         value = Number(aggregateValue);
         value = formatAmount(value / 1_000_000);
         break;
       }
 
-      case FieldMetadataType.Number: {
+      case FieldMetadataType.NUMBER: {
         value = Number(aggregateValue);
         const { decimals, type } = field.settings ?? {};
         value =
@@ -85,9 +94,9 @@ export const computeAggregateValueAndLabel = ({
         break;
       }
 
-      case FieldMetadataType.DateTime: {
+      case FieldMetadataType.DATE_TIME: {
         value = aggregateValue as string;
-        value = formatDateString({
+        value = formatDateTimeString({
           value,
           displayAsRelativeDate,
           timeZone,
@@ -96,18 +105,24 @@ export const computeAggregateValueAndLabel = ({
         });
         break;
       }
+
+      case FieldMetadataType.DATE: {
+        value = aggregateValue as string;
+        value = formatDateString({
+          value,
+          displayAsRelativeDate,
+          timeZone,
+          dateFormat,
+        });
+        break;
+      }
     }
   }
-  const convertedAggregateOperation =
-    convertAggregateOperationToExtendedAggregateOperation(
-      aggregateOperation,
-      field.type,
-    );
-  const label = getAggregateOperationLabel(convertedAggregateOperation);
+  const label = getAggregateOperationShortLabel(aggregateOperation);
   const labelWithFieldName =
     aggregateOperation === AGGREGATE_OPERATIONS.count
       ? `${getAggregateOperationLabel(AGGREGATE_OPERATIONS.count)}`
-      : `${getAggregateOperationLabel(convertedAggregateOperation)} of ${field.label}`;
+      : `${getAggregateOperationLabel(aggregateOperation)} of ${field.label}`;
 
   return {
     value,
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/getAggregateOperationLabel.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/getAggregateOperationLabel.ts
index 74f492e86fdc..aa1cc8ba3609 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/getAggregateOperationLabel.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/getAggregateOperationLabel.ts
@@ -1,4 +1,5 @@
 import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
+import { DATE_AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/DateAggregateOperations';
 import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
 
 export const getAggregateOperationLabel = (
@@ -25,9 +26,9 @@ export const getAggregateOperationLabel = (
       return 'Percent empty';
     case AGGREGATE_OPERATIONS.percentageNotEmpty:
       return 'Percent not empty';
-    case 'EARLIEST':
+    case DATE_AGGREGATE_OPERATIONS.earliest:
       return 'Earliest date';
-    case 'LATEST':
+    case DATE_AGGREGATE_OPERATIONS.latest:
       return 'Latest date';
     default:
       throw new Error(`Unknown aggregate operation: ${operation}`);
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/getAggregateOperationShortLabel.ts b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/getAggregateOperationShortLabel.ts
new file mode 100644
index 000000000000..9405acfe940f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/utils/getAggregateOperationShortLabel.ts
@@ -0,0 +1,34 @@
+import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
+import { DATE_AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/DateAggregateOperations';
+import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
+
+export const getAggregateOperationShortLabel = (
+  operation: ExtendedAggregateOperations,
+) => {
+  switch (operation) {
+    case AGGREGATE_OPERATIONS.min:
+      return 'Min';
+    case AGGREGATE_OPERATIONS.max:
+      return 'Max';
+    case AGGREGATE_OPERATIONS.avg:
+      return 'Average';
+    case AGGREGATE_OPERATIONS.sum:
+      return 'Sum';
+    case AGGREGATE_OPERATIONS.count:
+      return 'All';
+    case AGGREGATE_OPERATIONS.countEmpty:
+    case AGGREGATE_OPERATIONS.percentageEmpty:
+      return 'Empty';
+    case AGGREGATE_OPERATIONS.countNotEmpty:
+    case AGGREGATE_OPERATIONS.percentageNotEmpty:
+      return 'Not empty';
+    case AGGREGATE_OPERATIONS.countUniqueValues:
+      return 'Unique';
+    case DATE_AGGREGATE_OPERATIONS.earliest:
+      return 'Earliest';
+    case DATE_AGGREGATE_OPERATIONS.latest:
+      return 'Latest';
+    default:
+      throw new Error(`Unknown aggregate operation: ${operation}`);
+  }
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-board/types/RecordBoardColumnHeaderAggregateContentId.ts b/packages/twenty-front/src/modules/object-record/record-board/types/RecordBoardColumnHeaderAggregateContentId.ts
index 0de0a4ba4279..d342eade6812 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/types/RecordBoardColumnHeaderAggregateContentId.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/types/RecordBoardColumnHeaderAggregateContentId.ts
@@ -3,4 +3,5 @@ export type RecordBoardColumnHeaderAggregateContentId =
   | 'aggregateFields'
   | 'countAggregateOperationsOptions'
   | 'percentAggregateOperationsOptions'
+  | 'datesAggregateOperationOptions'
   | 'moreAggregateOperationOptions';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/__mocks__/fieldDefinitions.ts b/packages/twenty-front/src/modules/object-record/record-field/__mocks__/fieldDefinitions.ts
index 03e81bf66f68..7559a5790885 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/__mocks__/fieldDefinitions.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/__mocks__/fieldDefinitions.ts
@@ -1,11 +1,11 @@
 import { formatFieldMetadataItemAsFieldDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition';
 import { FieldDefinition } from '@/object-record/record-field/types/FieldDefinition';
 import {
-  FieldActorMetadata,
-  FieldFullNameMetadata,
-  FieldRatingMetadata,
-  FieldSelectMetadata,
-  FieldTextMetadata,
+    FieldActorMetadata,
+    FieldFullNameMetadata,
+    FieldRatingMetadata,
+    FieldSelectMetadata,
+    FieldTextMetadata,
 } from '@/object-record/record-field/types/FieldMetadata';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { generatedMockObjectMetadataItems } from '~/testing/mock-data/generatedMockObjectMetadataItems';
@@ -17,7 +17,7 @@ export const textfieldDefinition: FieldDefinition<FieldTextMetadata> = {
   label: 'User Name',
   iconName: 'User',
   defaultValue: '',
-  type: FieldMetadataType.Text,
+  type: FieldMetadataType.TEXT,
   metadata: { placeHolder: 'John Doe', fieldName: 'userName' },
 };
 
@@ -44,7 +44,7 @@ export const selectFieldDefinition: FieldDefinition<FieldSelectMetadata> = {
   fieldMetadataId,
   label: 'Account Owner',
   iconName: 'iconName',
-  type: FieldMetadataType.Select,
+  type: FieldMetadataType.SELECT,
   defaultValue: null,
   metadata: {
     fieldName: 'accountOwner',
@@ -57,7 +57,7 @@ export const fullNameFieldDefinition: FieldDefinition<FieldFullNameMetadata> = {
   fieldMetadataId,
   label: 'Display Name',
   iconName: 'profile',
-  type: FieldMetadataType.FullName,
+  type: FieldMetadataType.FULL_NAME,
   defaultValue: { firstName: '', lastName: '' },
   metadata: {
     fieldName: 'displayName',
@@ -77,7 +77,7 @@ export const ratingFieldDefinition: FieldDefinition<FieldRatingMetadata> = {
   fieldMetadataId,
   label: 'Rating',
   iconName: 'iconName',
-  type: FieldMetadataType.Rating,
+  type: FieldMetadataType.RATING,
   defaultValue: null,
   metadata: {
     fieldName: 'rating',
@@ -104,7 +104,7 @@ export const actorFieldDefinition: FieldDefinition<FieldActorMetadata> = {
   fieldMetadataId,
   label: 'Created By',
   iconName: 'restart',
-  type: FieldMetadataType.Actor,
+  type: FieldMetadataType.ACTOR,
   defaultValue: { source: 'MANUAL', name: '' },
   metadata: {
     fieldName: 'actor',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/components/FormFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/components/FormFieldInput.tsx
index da67d9c74b4a..75fd09a47c93 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/components/FormFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/components/FormFieldInput.tsx
@@ -1,5 +1,6 @@
 import { FormAddressFieldInput } from '@/object-record/record-field/form-types/components/FormAddressFieldInput';
 import { FormBooleanFieldInput } from '@/object-record/record-field/form-types/components/FormBooleanFieldInput';
+import { FormCurrencyFieldInput } from '@/object-record/record-field/form-types/components/FormCurrencyFieldInput';
 import { FormDateFieldInput } from '@/object-record/record-field/form-types/components/FormDateFieldInput';
 import { FormDateTimeFieldInput } from '@/object-record/record-field/form-types/components/FormDateTimeFieldInput';
 import { FormEmailsFieldInput } from '@/object-record/record-field/form-types/components/FormEmailsFieldInput';
@@ -12,7 +13,6 @@ import { FormRawJsonFieldInput } from '@/object-record/record-field/form-types/c
 import { FormSelectFieldInput } from '@/object-record/record-field/form-types/components/FormSelectFieldInput';
 import { FormTextFieldInput } from '@/object-record/record-field/form-types/components/FormTextFieldInput';
 import { FormUuidFieldInput } from '@/object-record/record-field/form-types/components/FormUuidFieldInput';
-import { FormCurrencyFieldInput } from '@/object-record/record-field/form-types/components/FormCurrencyFieldInput';
 import { VariablePickerComponent } from '@/object-record/record-field/form-types/types/VariablePickerComponent';
 import { FieldDefinition } from '@/object-record/record-field/types/FieldDefinition';
 import {
@@ -27,6 +27,7 @@ import {
 } from '@/object-record/record-field/types/FieldMetadata';
 import { isFieldAddress } from '@/object-record/record-field/types/guards/isFieldAddress';
 import { isFieldBoolean } from '@/object-record/record-field/types/guards/isFieldBoolean';
+import { isFieldCurrency } from '@/object-record/record-field/types/guards/isFieldCurrency';
 import { isFieldDate } from '@/object-record/record-field/types/guards/isFieldDate';
 import { isFieldDateTime } from '@/object-record/record-field/types/guards/isFieldDateTime';
 import { isFieldEmails } from '@/object-record/record-field/types/guards/isFieldEmails';
@@ -39,7 +40,6 @@ import { isFieldRawJson } from '@/object-record/record-field/types/guards/isFiel
 import { isFieldSelect } from '@/object-record/record-field/types/guards/isFieldSelect';
 import { isFieldText } from '@/object-record/record-field/types/guards/isFieldText';
 import { isFieldUuid } from '@/object-record/record-field/types/guards/isFieldUuid';
-import { isFieldCurrency } from '@/object-record/record-field/types/guards/isFieldCurrency';
 import { JsonValue } from 'type-fest';
 
 type FormFieldInputProps = {
@@ -47,6 +47,7 @@ type FormFieldInputProps = {
   defaultValue: JsonValue;
   onPersist: (value: JsonValue) => void;
   VariablePicker?: VariablePickerComponent;
+  readonly?: boolean;
 };
 
 export const FormFieldInput = ({
@@ -54,6 +55,7 @@ export const FormFieldInput = ({
   defaultValue,
   onPersist,
   VariablePicker,
+  readonly,
 }: FormFieldInputProps) => {
   return isFieldNumber(field) ? (
     <FormNumberFieldInput
@@ -62,6 +64,7 @@ export const FormFieldInput = ({
       onPersist={onPersist}
       placeholder={field.label}
       VariablePicker={VariablePicker}
+      readonly={readonly}
     />
   ) : isFieldBoolean(field) ? (
     <FormBooleanFieldInput
@@ -69,6 +72,7 @@ export const FormFieldInput = ({
       defaultValue={defaultValue as string | boolean | undefined}
       onPersist={onPersist}
       VariablePicker={VariablePicker}
+      readonly={readonly}
     />
   ) : isFieldText(field) ? (
     <FormTextFieldInput
@@ -77,6 +81,7 @@ export const FormFieldInput = ({
       onPersist={onPersist}
       placeholder={field.label}
       VariablePicker={VariablePicker}
+      readonly={readonly}
     />
   ) : isFieldSelect(field) ? (
     <FormSelectFieldInput
@@ -86,6 +91,8 @@ export const FormFieldInput = ({
       VariablePicker={VariablePicker}
       options={field.metadata.options}
       clearLabel={field.label}
+      readonly={readonly}
+      placeholder={field.label}
     />
   ) : isFieldFullName(field) ? (
     <FormFullNameFieldInput
@@ -93,6 +100,7 @@ export const FormFieldInput = ({
       defaultValue={defaultValue as FieldFullNameValue | undefined}
       onPersist={onPersist}
       VariablePicker={VariablePicker}
+      readonly={readonly}
     />
   ) : isFieldAddress(field) ? (
     <FormAddressFieldInput
@@ -100,6 +108,7 @@ export const FormFieldInput = ({
       defaultValue={defaultValue as FieldAddressValue | undefined}
       onPersist={onPersist}
       VariablePicker={VariablePicker}
+      readonly={readonly}
     />
   ) : isFieldLinks(field) ? (
     <FormLinksFieldInput
@@ -107,6 +116,7 @@ export const FormFieldInput = ({
       defaultValue={defaultValue as FieldLinksValue | undefined}
       onPersist={onPersist}
       VariablePicker={VariablePicker}
+      readonly={readonly}
     />
   ) : isFieldEmails(field) ? (
     <FormEmailsFieldInput
@@ -114,6 +124,7 @@ export const FormFieldInput = ({
       defaultValue={defaultValue as FieldEmailsValue | undefined}
       onPersist={onPersist}
       VariablePicker={VariablePicker}
+      readonly={readonly}
     />
   ) : isFieldPhones(field) ? (
     <FormPhoneFieldInput
@@ -121,6 +132,7 @@ export const FormFieldInput = ({
       defaultValue={defaultValue as FieldPhonesValue | undefined}
       onPersist={onPersist}
       VariablePicker={VariablePicker}
+      readonly={readonly}
     />
   ) : isFieldDate(field) ? (
     <FormDateFieldInput
@@ -128,6 +140,7 @@ export const FormFieldInput = ({
       defaultValue={defaultValue as string | undefined}
       onPersist={onPersist}
       VariablePicker={VariablePicker}
+      readonly={readonly}
     />
   ) : isFieldDateTime(field) ? (
     <FormDateTimeFieldInput
@@ -135,6 +148,7 @@ export const FormFieldInput = ({
       defaultValue={defaultValue as string | undefined}
       onPersist={onPersist}
       VariablePicker={VariablePicker}
+      readonly={readonly}
     />
   ) : isFieldMultiSelect(field) ? (
     <FormMultiSelectFieldInput
@@ -143,6 +157,8 @@ export const FormFieldInput = ({
       onPersist={onPersist}
       VariablePicker={VariablePicker}
       options={field.metadata.options}
+      readonly={readonly}
+      placeholder={field.label}
     />
   ) : isFieldRawJson(field) ? (
     <FormRawJsonFieldInput
@@ -151,6 +167,7 @@ export const FormFieldInput = ({
       onPersist={onPersist}
       placeholder={field.label}
       VariablePicker={VariablePicker}
+      readonly={readonly}
     />
   ) : isFieldUuid(field) ? (
     <FormUuidFieldInput
@@ -159,6 +176,7 @@ export const FormFieldInput = ({
       onPersist={onPersist}
       placeholder={field.label}
       VariablePicker={VariablePicker}
+      readonly={readonly}
     />
   ) : isFieldCurrency(field) ? (
     <FormCurrencyFieldInput
@@ -166,6 +184,7 @@ export const FormFieldInput = ({
       defaultValue={defaultValue as FormFieldCurrencyValue | null}
       onPersist={onPersist}
       VariablePicker={VariablePicker}
+      readonly={readonly}
     />
   ) : null;
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormBooleanFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormBooleanFieldInput.tsx
index bde8b0115aea..3d170772d98c 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormBooleanFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormBooleanFieldInput.tsx
@@ -85,7 +85,7 @@ export const FormBooleanFieldInput = ({
 
       <FormFieldInputRowContainer>
         <FormFieldInputInputContainer
-          hasRightElement={isDefined(VariablePicker)}
+          hasRightElement={isDefined(VariablePicker) && !readonly}
         >
           {draftValue.type === 'static' ? (
             <StyledBooleanInputContainer>
@@ -98,12 +98,12 @@ export const FormBooleanFieldInput = ({
           ) : (
             <VariableChip
               rawVariableName={draftValue.value}
-              onRemove={handleUnlinkVariable}
+              onRemove={readonly ? undefined : handleUnlinkVariable}
             />
           )}
         </FormFieldInputInputContainer>
 
-        {VariablePicker ? (
+        {VariablePicker && !readonly ? (
           <VariablePicker
             inputId={inputId}
             onVariableSelect={handleVariableTagInsert}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormCountryCodeSelectInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormCountryCodeSelectInput.tsx
index f225d0785467..ca3c8f7248c7 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormCountryCodeSelectInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormCountryCodeSelectInput.tsx
@@ -5,6 +5,9 @@ import { FormSelectFieldInput } from '@/object-record/record-field/form-types/co
 import { VariablePickerComponent } from '@/object-record/record-field/form-types/types/VariablePickerComponent';
 import { SelectOption } from '@/spreadsheet-import/types';
 import { useCountries } from '@/ui/input/components/internal/hooks/useCountries';
+import { CountryCode } from 'libphonenumber-js';
+
+export type FormCountryCodeSelectInputUpdatedValue = CountryCode | '';
 
 export const FormCountryCodeSelectInput = ({
   selectedCountryCode,
@@ -13,7 +16,7 @@ export const FormCountryCodeSelectInput = ({
   VariablePicker,
 }: {
   selectedCountryCode: string;
-  onPersist: (countryCode: string) => void;
+  onPersist: (countryCode: FormCountryCodeSelectInputUpdatedValue) => void;
   readonly?: boolean;
   VariablePicker?: VariablePickerComponent;
 }) => {
@@ -47,7 +50,7 @@ export const FormCountryCodeSelectInput = ({
     if (countryCode === null) {
       onPersist('');
     } else {
-      onPersist(countryCode);
+      onPersist(countryCode as CountryCode);
     }
   };
 
@@ -57,7 +60,9 @@ export const FormCountryCodeSelectInput = ({
       onPersist={onChange}
       options={options}
       defaultValue={selectedCountryCode}
+      readonly={readonly}
       VariablePicker={VariablePicker}
+      preventDisplayPadding
     />
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormCountrySelectInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormCountrySelectInput.tsx
index 866ac1da2368..bd6673c02033 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormCountrySelectInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormCountrySelectInput.tsx
@@ -57,7 +57,10 @@ export const FormCountrySelectInput = ({
       onPersist={onChange}
       options={options}
       defaultValue={selectedCountryName}
+      readonly={readonly}
       VariablePicker={VariablePicker}
+      placeholder="Select a country"
+      preventDisplayPadding
     />
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormCurrencyFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormCurrencyFieldInput.tsx
index ccd93ff6d03b..c236726119a2 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormCurrencyFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormCurrencyFieldInput.tsx
@@ -1,19 +1,20 @@
-import { useMemo } from 'react';
-import { CurrencyCode } from '@/object-record/record-field/types/CurrencyCode';
-import { FormFieldCurrencyValue } from '@/object-record/record-field/types/FieldMetadata';
-import { VariablePickerComponent } from '@/object-record/record-field/form-types/types/VariablePickerComponent';
 import { FormFieldInputContainer } from '@/object-record/record-field/form-types/components/FormFieldInputContainer';
-import { InputLabel } from '@/ui/input/components/InputLabel';
 import { FormNestedFieldInputContainer } from '@/object-record/record-field/form-types/components/FormNestedFieldInputContainer';
 import { FormNumberFieldInput } from '@/object-record/record-field/form-types/components/FormNumberFieldInput';
 import { FormSelectFieldInput } from '@/object-record/record-field/form-types/components/FormSelectFieldInput';
+import { VariablePickerComponent } from '@/object-record/record-field/form-types/types/VariablePickerComponent';
+import { CurrencyCode } from '@/object-record/record-field/types/CurrencyCode';
+import { FormFieldCurrencyValue } from '@/object-record/record-field/types/FieldMetadata';
 import { SETTINGS_FIELD_CURRENCY_CODES } from '@/settings/data-model/constants/SettingsFieldCurrencyCodes';
+import { InputLabel } from '@/ui/input/components/InputLabel';
+import { useMemo } from 'react';
 
 type FormCurrencyFieldInputProps = {
   label?: string;
   defaultValue?: FormFieldCurrencyValue | null;
   onPersist: (value: FormFieldCurrencyValue) => void;
   VariablePicker?: VariablePickerComponent;
+  readonly?: boolean;
 };
 
 export const FormCurrencyFieldInput = ({
@@ -21,6 +22,7 @@ export const FormCurrencyFieldInput = ({
   defaultValue,
   onPersist,
   VariablePicker,
+  readonly,
 }: FormCurrencyFieldInputProps) => {
   const currencies = useMemo(() => {
     return Object.entries(SETTINGS_FIELD_CURRENCY_CODES).map(
@@ -59,6 +61,9 @@ export const FormCurrencyFieldInput = ({
           options={currencies}
           clearLabel={'Currency Code'}
           VariablePicker={VariablePicker}
+          readonly={readonly}
+          placeholder="Select a currency"
+          preventDisplayPadding
         />
         <FormNumberFieldInput
           label="Amount Micros"
@@ -66,6 +71,7 @@ export const FormCurrencyFieldInput = ({
           onPersist={handleAmountMicrosChange}
           VariablePicker={VariablePicker}
           placeholder="Set 3210000 for 3.21$"
+          readonly={readonly}
         />
       </FormNestedFieldInputContainer>
     </FormFieldInputContainer>
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormDateFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormDateFieldInput.tsx
index 4f63ffbc6e3d..2e411bacf076 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormDateFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormDateFieldInput.tsx
@@ -6,6 +6,7 @@ type FormDateFieldInputProps = {
   defaultValue: string | undefined;
   onPersist: (value: string | null) => void;
   VariablePicker?: VariablePickerComponent;
+  readonly?: boolean;
 };
 
 export const FormDateFieldInput = ({
@@ -13,6 +14,7 @@ export const FormDateFieldInput = ({
   defaultValue,
   onPersist,
   VariablePicker,
+  readonly,
 }: FormDateFieldInputProps) => {
   return (
     <FormDateTimeFieldInput
@@ -21,6 +23,7 @@ export const FormDateFieldInput = ({
       defaultValue={defaultValue}
       onPersist={onPersist}
       VariablePicker={VariablePicker}
+      readonly={readonly}
     />
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormDateTimeFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormDateTimeFieldInput.tsx
index 62b61ebe7c7b..9fd25f7f5830 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormDateTimeFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormDateTimeFieldInput.tsx
@@ -5,7 +5,7 @@ import { VariableChip } from '@/object-record/record-field/form-types/components
 import { VariablePickerComponent } from '@/object-record/record-field/form-types/types/VariablePickerComponent';
 import { InputLabel } from '@/ui/input/components/InputLabel';
 import {
-  InternalDatePicker,
+  DateTimePicker,
   MONTH_AND_YEAR_DROPDOWN_ID,
   MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID,
   MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID,
@@ -46,6 +46,10 @@ const StyledDateInputAbsoluteContainer = styled.div`
 const StyledDateInput = styled.input<{ hasError?: boolean }>`
   ${TEXT_INPUT_STYLE}
 
+  &:disabled {
+    color: ${({ theme }) => theme.font.color.tertiary};
+  }
+
   ${({ hasError, theme }) =>
     hasError &&
     css`
@@ -76,6 +80,7 @@ type FormDateTimeFieldInputProps = {
   defaultValue: string | undefined;
   onPersist: (value: string | null) => void;
   VariablePicker?: VariablePickerComponent;
+  readonly?: boolean;
 };
 
 export const FormDateTimeFieldInput = ({
@@ -84,6 +89,7 @@ export const FormDateTimeFieldInput = ({
   defaultValue,
   onPersist,
   VariablePicker,
+  readonly,
 }: FormDateTimeFieldInputProps) => {
   const { timeZone } = useContext(UserContext);
 
@@ -327,7 +333,7 @@ export const FormDateTimeFieldInput = ({
       <FormFieldInputRowContainer>
         <StyledInputContainer
           ref={datePickerWrapperRef}
-          hasRightElement={isDefined(VariablePicker)}
+          hasRightElement={isDefined(VariablePicker) && !readonly}
         >
           {draftValue.type === 'static' ? (
             <>
@@ -338,17 +344,18 @@ export const FormDateTimeFieldInput = ({
                 onFocus={handleInputFocus}
                 onChange={handleInputChange}
                 onKeyDown={handleInputKeydown}
+                disabled={readonly}
               />
 
               {draftValue.mode === 'edit' ? (
                 <StyledDateInputContainer>
                   <StyledDateInputAbsoluteContainer>
                     <OverlayContainer>
-                      <InternalDatePicker
+                      <DateTimePicker
                         date={pickerDate ?? new Date()}
                         isDateTimeInput={false}
                         onChange={handlePickerChange}
-                        onMouseSelect={handlePickerMouseSelect}
+                        onClose={handlePickerMouseSelect}
                         onEnter={handlePickerEnter}
                         onEscape={handlePickerEscape}
                         onClear={handlePickerClear}
@@ -362,12 +369,12 @@ export const FormDateTimeFieldInput = ({
           ) : (
             <VariableChip
               rawVariableName={draftValue.value}
-              onRemove={handleUnlinkVariable}
+              onRemove={readonly ? undefined : handleUnlinkVariable}
             />
           )}
         </StyledInputContainer>
 
-        {VariablePicker ? (
+        {VariablePicker && !readonly ? (
           <VariablePicker
             inputId={inputId}
             onVariableSelect={handleVariableTagInsert}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormMultiSelectFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormMultiSelectFieldInput.tsx
index 1a9a9cd4b949..ac9c54c2f965 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormMultiSelectFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormMultiSelectFieldInput.tsx
@@ -14,8 +14,9 @@ import { InputLabel } from '@/ui/input/components/InputLabel';
 import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
 import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
 import { isStandaloneVariableString } from '@/workflow/utils/isStandaloneVariableString';
+import { useTheme } from '@emotion/react';
 import { useId, useState } from 'react';
-import { VisibilityHidden } from 'twenty-ui';
+import { IconChevronDown, VisibilityHidden } from 'twenty-ui';
 import { isDefined } from '~/utils/isDefined';
 
 type FormMultiSelectFieldInputProps = {
@@ -24,17 +25,22 @@ type FormMultiSelectFieldInputProps = {
   options: SelectOption[];
   onPersist: (value: FieldMultiSelectValue | string) => void;
   VariablePicker?: VariablePickerComponent;
+  readonly?: boolean;
+  placeholder?: string;
 };
 
-const StyledDisplayModeContainer = styled.button`
-  width: 100%;
+const StyledDisplayModeReadonlyContainer = styled.div`
   align-items: center;
-  display: flex;
-  cursor: pointer;
-  border: none;
   background: transparent;
+  border: none;
+  display: flex;
   font-family: inherit;
   padding-inline: ${({ theme }) => theme.spacing(2)};
+  width: 100%;
+`;
+
+const StyledDisplayModeContainer = styled(StyledDisplayModeReadonlyContainer)`
+  cursor: pointer;
 
   &:hover,
   &[data-open='true'] {
@@ -48,14 +54,23 @@ const StyledSelectInputContainer = styled.div`
   top: ${({ theme }) => theme.spacing(8)};
 `;
 
+const StyledPlaceholder = styled.div`
+  color: ${({ theme }) => theme.font.color.light};
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+  width: 100%;
+`;
+
 export const FormMultiSelectFieldInput = ({
   label,
   defaultValue,
   options,
   onPersist,
   VariablePicker,
+  readonly,
+  placeholder,
 }: FormMultiSelectFieldInputProps) => {
   const inputId = useId();
+  const theme = useTheme();
 
   const hotkeyScope = MULTI_OBJECT_RECORD_SELECT_SELECTABLE_LIST_ID;
 
@@ -158,32 +173,57 @@ export const FormMultiSelectFieldInput = ({
         )
       : undefined;
 
+  const placeholderText = placeholder ?? label;
+
   return (
     <FormFieldInputContainer>
       {label ? <InputLabel>{label}</InputLabel> : null}
 
       <FormFieldInputRowContainer>
         <FormFieldInputInputContainer
-          hasRightElement={isDefined(VariablePicker)}
+          hasRightElement={isDefined(VariablePicker) && !readonly}
         >
           {draftValue.type === 'static' ? (
-            <StyledDisplayModeContainer
-              data-open={draftValue.editingMode === 'edit'}
-              onClick={handleDisplayModeClick}
-            >
-              <VisibilityHidden>Edit</VisibilityHidden>
-
-              {isDefined(selectedOptions) ? (
-                <MultiSelectDisplay
-                  values={selectedNames}
-                  options={selectedOptions}
+            readonly ? (
+              <StyledDisplayModeReadonlyContainer>
+                {isDefined(selectedOptions) && selectedOptions.length > 0 ? (
+                  <MultiSelectDisplay
+                    values={selectedNames}
+                    options={selectedOptions}
+                  />
+                ) : (
+                  <StyledPlaceholder />
+                )}
+                <IconChevronDown
+                  size={theme.icon.size.md}
+                  color={theme.font.color.light}
+                />
+              </StyledDisplayModeReadonlyContainer>
+            ) : (
+              <StyledDisplayModeContainer
+                data-open={draftValue.editingMode === 'edit'}
+                onClick={handleDisplayModeClick}
+              >
+                <VisibilityHidden>Edit</VisibilityHidden>
+
+                {isDefined(selectedOptions) && selectedOptions.length > 0 ? (
+                  <MultiSelectDisplay
+                    values={selectedNames}
+                    options={selectedOptions}
+                  />
+                ) : (
+                  <StyledPlaceholder>{placeholderText}</StyledPlaceholder>
+                )}
+                <IconChevronDown
+                  size={theme.icon.size.md}
+                  color={theme.font.color.tertiary}
                 />
-              ) : null}
-            </StyledDisplayModeContainer>
+              </StyledDisplayModeContainer>
+            )
           ) : (
             <VariableChip
               rawVariableName={draftValue.value}
-              onRemove={handleUnlinkVariable}
+              onRemove={readonly ? undefined : handleUnlinkVariable}
             />
           )}
         </FormFieldInputInputContainer>
@@ -202,7 +242,7 @@ export const FormMultiSelectFieldInput = ({
             )}
         </StyledSelectInputContainer>
 
-        {VariablePicker && (
+        {VariablePicker && !readonly && (
           <VariablePicker
             inputId={inputId}
             onVariableSelect={handleVariableTagInsert}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormNumberFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormNumberFieldInput.tsx
index 55be9d9c3763..a641c214dd63 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormNumberFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormNumberFieldInput.tsx
@@ -26,6 +26,7 @@ type FormNumberFieldInputProps = {
   onPersist: (value: number | null | string) => void;
   VariablePicker?: VariablePickerComponent;
   hint?: string;
+  readonly?: boolean;
 };
 
 export const FormNumberFieldInput = ({
@@ -35,6 +36,7 @@ export const FormNumberFieldInput = ({
   onPersist,
   VariablePicker,
   hint,
+  readonly,
 }: FormNumberFieldInputProps) => {
   const inputId = useId();
 
@@ -102,7 +104,7 @@ export const FormNumberFieldInput = ({
 
       <FormFieldInputRowContainer>
         <FormFieldInputInputContainer
-          hasRightElement={isDefined(VariablePicker)}
+          hasRightElement={isDefined(VariablePicker) && !readonly}
         >
           {draftValue.type === 'static' ? (
             <StyledInput
@@ -112,16 +114,17 @@ export const FormNumberFieldInput = ({
               copyButton={false}
               hotkeyScope="record-create"
               onChange={handleChange}
+              disabled={readonly}
             />
           ) : (
             <VariableChip
               rawVariableName={draftValue.value}
-              onRemove={handleUnlinkVariable}
+              onRemove={readonly ? undefined : handleUnlinkVariable}
             />
           )}
         </FormFieldInputInputContainer>
 
-        {VariablePicker ? (
+        {VariablePicker && !readonly ? (
           <VariablePicker
             inputId={inputId}
             onVariableSelect={handleVariableTagInsert}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormPhoneFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormPhoneFieldInput.tsx
index f51b01260124..86f34a2f3535 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormPhoneFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormPhoneFieldInput.tsx
@@ -1,11 +1,14 @@
-import { FormCountryCodeSelectInput } from '@/object-record/record-field/form-types/components/FormCountryCodeSelectInput';
+import {
+  FormCountryCodeSelectInput,
+  FormCountryCodeSelectInputUpdatedValue,
+} from '@/object-record/record-field/form-types/components/FormCountryCodeSelectInput';
 import { FormFieldInputContainer } from '@/object-record/record-field/form-types/components/FormFieldInputContainer';
 import { FormNestedFieldInputContainer } from '@/object-record/record-field/form-types/components/FormNestedFieldInputContainer';
 import { FormNumberFieldInput } from '@/object-record/record-field/form-types/components/FormNumberFieldInput';
 import { VariablePickerComponent } from '@/object-record/record-field/form-types/types/VariablePickerComponent';
 import { FieldPhonesValue } from '@/object-record/record-field/types/FieldMetadata';
 import { InputLabel } from '@/ui/input/components/InputLabel';
-import { CountryCode, getCountryCallingCode } from 'libphonenumber-js';
+import { getCountryCallingCode } from 'libphonenumber-js';
 
 type FormPhoneFieldInputProps = {
   label?: string;
@@ -22,8 +25,15 @@ export const FormPhoneFieldInput = ({
   readonly,
   VariablePicker,
 }: FormPhoneFieldInputProps) => {
-  const handleCountryChange = (newCountry: string) => {
-    const newCallingCode = getCountryCallingCode(newCountry as CountryCode);
+  const handleCountryChange = (
+    newCountry: FormCountryCodeSelectInputUpdatedValue,
+  ) => {
+    let newCallingCode;
+    if (newCountry === '') {
+      newCallingCode = '';
+    } else {
+      newCallingCode = getCountryCallingCode(newCountry);
+    }
 
     onPersist({
       primaryPhoneCountryCode: newCountry,
@@ -57,6 +67,7 @@ export const FormPhoneFieldInput = ({
           VariablePicker={VariablePicker}
           placeholder="Enter phone number"
           hint="Without calling code"
+          readonly={readonly}
         />
       </FormNestedFieldInputContainer>
     </FormFieldInputContainer>
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormRawJsonFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormRawJsonFieldInput.tsx
index 851b7c5615a3..e5d944f7b814 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormRawJsonFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormRawJsonFieldInput.tsx
@@ -66,19 +66,19 @@ export const FormRawJsonFieldInput = ({
 
       <FormFieldInputRowContainer multiline>
         <FormFieldInputInputContainer
-          hasRightElement={isDefined(VariablePicker)}
+          hasRightElement={isDefined(VariablePicker) && !readonly}
           multiline
         >
           <TextVariableEditor editor={editor} multiline readonly={readonly} />
         </FormFieldInputInputContainer>
 
-        {VariablePicker ? (
+        {VariablePicker && !readonly && (
           <VariablePicker
             inputId={inputId}
             multiline
             onVariableSelect={handleVariableTagInsert}
           />
-        ) : null}
+        )}
       </FormFieldInputRowContainer>
     </FormFieldInputContainer>
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormSelectFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormSelectFieldInput.tsx
index 353fe487c02a..c302478a8653 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormSelectFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormSelectFieldInput.tsx
@@ -14,10 +14,11 @@ import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectab
 import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { isStandaloneVariableString } from '@/workflow/utils/isStandaloneVariableString';
+import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { useId, useState } from 'react';
 import { Key } from 'ts-key-enum';
-import { isDefined, VisibilityHidden } from 'twenty-ui';
+import { IconChevronDown, isDefined, VisibilityHidden } from 'twenty-ui';
 
 type FormSelectFieldInputProps = {
   label?: string;
@@ -26,17 +27,23 @@ type FormSelectFieldInputProps = {
   VariablePicker?: VariablePickerComponent;
   options: SelectOption[];
   clearLabel?: string;
+  readonly?: boolean;
+  preventDisplayPadding?: boolean;
+  placeholder?: string;
 };
 
-const StyledDisplayModeContainer = styled.button`
-  width: 100%;
+const StyledDisplayModeReadonlyContainer = styled.div`
   align-items: center;
-  display: flex;
-  cursor: pointer;
-  border: none;
   background: transparent;
+  border: none;
+  display: flex;
   font-family: inherit;
   padding-inline: ${({ theme }) => theme.spacing(2)};
+  width: 100%;
+`;
+
+const StyledDisplayModeContainer = styled(StyledDisplayModeReadonlyContainer)`
+  cursor: pointer;
 
   &:hover,
   &[data-open='true'] {
@@ -44,12 +51,23 @@ const StyledDisplayModeContainer = styled.button`
   }
 `;
 
+const StyledPlaceholder = styled.div`
+  color: ${({ theme }) => theme.font.color.light};
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+  width: 100%;
+`;
+
 const StyledSelectInputContainer = styled.div`
   position: absolute;
   z-index: 1;
   top: ${({ theme }) => theme.spacing(8)};
 `;
 
+const StyledSelectDisplayContainer = styled.div`
+  display: flex;
+  width: 100%;
+`;
+
 export const FormSelectFieldInput = ({
   label,
   defaultValue,
@@ -57,10 +75,14 @@ export const FormSelectFieldInput = ({
   VariablePicker,
   options,
   clearLabel,
+  readonly,
+  preventDisplayPadding,
+  placeholder,
 }: FormSelectFieldInputProps) => {
   const inputId = useId();
 
   const hotkeyScope = InlineCellHotkeyScope.InlineCell;
+  const theme = useTheme();
 
   const {
     setHotkeyScopeAndMemorizePreviousScope,
@@ -204,16 +226,37 @@ export const FormSelectFieldInput = ({
     ...filteredOptions.map((option) => option.value),
   ];
 
+  const placeholderText = placeholder ?? label;
+
   return (
     <FormFieldInputContainer>
       {label ? <InputLabel>{label}</InputLabel> : null}
 
       <FormFieldInputRowContainer>
         <FormFieldInputInputContainer
-          hasRightElement={isDefined(VariablePicker)}
+          hasRightElement={isDefined(VariablePicker) && !readonly}
         >
           {draftValue.type === 'static' ? (
-            <>
+            readonly ? (
+              <StyledDisplayModeReadonlyContainer>
+                {isDefined(selectedOption) ? (
+                  <StyledSelectDisplayContainer>
+                    <SelectDisplay
+                      color={selectedOption.color ?? 'transparent'}
+                      label={selectedOption.label}
+                      Icon={selectedOption.icon ?? undefined}
+                      preventPadding={preventDisplayPadding}
+                    />
+                  </StyledSelectDisplayContainer>
+                ) : (
+                  <StyledPlaceholder />
+                )}
+                <IconChevronDown
+                  size={theme.icon.size.md}
+                  color={theme.font.color.light}
+                />
+              </StyledDisplayModeReadonlyContainer>
+            ) : (
               <StyledDisplayModeContainer
                 data-open={draftValue.editingMode === 'edit'}
                 onClick={handleDisplayModeClick}
@@ -221,24 +264,33 @@ export const FormSelectFieldInput = ({
                 <VisibilityHidden>Edit</VisibilityHidden>
 
                 {isDefined(selectedOption) ? (
-                  <SelectDisplay
-                    color={selectedOption.color ?? 'transparent'}
-                    label={selectedOption.label}
-                    Icon={selectedOption.icon ?? undefined}
-                    isUsedInForm
-                  />
-                ) : null}
+                  <StyledSelectDisplayContainer>
+                    <SelectDisplay
+                      color={selectedOption.color ?? 'transparent'}
+                      label={selectedOption.label}
+                      Icon={selectedOption.icon ?? undefined}
+                      preventPadding={preventDisplayPadding}
+                    />
+                  </StyledSelectDisplayContainer>
+                ) : (
+                  <StyledPlaceholder>{placeholderText}</StyledPlaceholder>
+                )}
+                <IconChevronDown
+                  size={theme.icon.size.md}
+                  color={theme.font.color.tertiary}
+                />
               </StyledDisplayModeContainer>
-            </>
+            )
           ) : (
             <VariableChip
               rawVariableName={draftValue.value}
-              onRemove={handleUnlinkVariable}
+              onRemove={readonly ? undefined : handleUnlinkVariable}
             />
           )}
         </FormFieldInputInputContainer>
         <StyledSelectInputContainer>
-          {draftValue.type === 'static' &&
+          {!readonly &&
+            draftValue.type === 'static' &&
             draftValue.editingMode === 'edit' && (
               <OverlayContainer>
                 <SelectInput
@@ -258,7 +310,7 @@ export const FormSelectFieldInput = ({
             )}
         </StyledSelectInputContainer>
 
-        {VariablePicker && (
+        {VariablePicker && !readonly && (
           <VariablePicker
             inputId={inputId}
             onVariableSelect={handleVariableTagInsert}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormTextFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormTextFieldInput.tsx
index 945fde07c8aa..7194948b9ed7 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormTextFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormTextFieldInput.tsx
@@ -63,7 +63,7 @@ export const FormTextFieldInput = ({
 
       <FormFieldInputRowContainer multiline={multiline}>
         <FormFieldInputInputContainer
-          hasRightElement={isDefined(VariablePicker)}
+          hasRightElement={isDefined(VariablePicker) && !readonly}
           multiline={multiline}
         >
           <TextVariableEditor
@@ -73,7 +73,7 @@ export const FormTextFieldInput = ({
           />
         </FormFieldInputInputContainer>
 
-        {VariablePicker ? (
+        {VariablePicker && !readonly ? (
           <VariablePicker
             inputId={inputId}
             multiline={multiline}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormUuidFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormUuidFieldInput.tsx
index 04f52fbc3ac7..5088c47c419a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormUuidFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/FormUuidFieldInput.tsx
@@ -28,6 +28,7 @@ export const FormUuidFieldInput = ({
   defaultValue,
   placeholder,
   onPersist,
+  readonly,
   VariablePicker,
 }: FormUuidFieldInputProps) => {
   const inputId = useId();
@@ -94,7 +95,7 @@ export const FormUuidFieldInput = ({
 
       <FormFieldInputRowContainer>
         <FormFieldInputInputContainer
-          hasRightElement={isDefined(VariablePicker)}
+          hasRightElement={isDefined(VariablePicker) && !readonly}
         >
           {draftValue.type === 'static' ? (
             <StyledInput
@@ -103,17 +104,18 @@ export const FormUuidFieldInput = ({
               value={draftValue.value}
               copyButton={false}
               hotkeyScope="record-create"
+              disabled={readonly}
               onChange={handleChange}
             />
           ) : (
             <VariableChip
               rawVariableName={draftValue.value}
-              onRemove={handleUnlinkVariable}
+              onRemove={readonly ? undefined : handleUnlinkVariable}
             />
           )}
         </FormFieldInputInputContainer>
 
-        {VariablePicker ? (
+        {VariablePicker && !readonly ? (
           <VariablePicker
             inputId={inputId}
             onVariableSelect={handleVariableTagInsert}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/VariableChip.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/VariableChip.tsx
index 17720e69fa99..cafe3b47fbea 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/VariableChip.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/VariableChip.tsx
@@ -1,27 +1,86 @@
-import { SortOrFilterChip } from '@/views/components/SortOrFilterChip';
 import { extractVariableLabel } from '@/workflow/workflow-variables/utils/extractVariableLabel';
 import styled from '@emotion/styled';
 
+import { css, useTheme } from '@emotion/react';
+import { IconX, isDefined } from 'twenty-ui';
+
 export const StyledContainer = styled.div`
   align-items: center;
   display: flex;
 `;
 
+const StyledChip = styled.div<{ deletable: boolean }>`
+  align-items: center;
+  background-color: ${({ theme }) => theme.accent.quaternary};
+  border: 1px solid ${({ theme }) => theme.accent.tertiary};
+  border-radius: 4px;
+  color: ${({ theme }) => theme.color.blue};
+  height: 26px;
+  box-sizing: border-box;
+  cursor: pointer;
+  display: flex;
+  flex-direction: row;
+  flex-shrink: 0;
+  column-gap: ${({ theme }) => theme.spacing(1)};
+  font-size: ${({ theme }) => theme.font.size.sm};
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+  padding: ${({ theme }) => theme.spacing(0.5)};
+  padding-left: ${({ theme }) => theme.spacing(1)};
+  margin-left: ${({ theme }) => theme.spacing(2)};
+  user-select: none;
+  white-space: nowrap;
+
+  ${({ theme, deletable }) =>
+    !deletable &&
+    css`
+      padding-right: ${theme.spacing(1)};
+    `}
+`;
+
+const StyledDelete = styled.button`
+  box-sizing: border-box;
+  height: 20px;
+  width: 20px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  cursor: pointer;
+  font-size: ${({ theme }) => theme.font.size.sm};
+  user-select: none;
+  padding: 0;
+  margin: 0;
+  background: none;
+  border: none;
+  color: inherit;
+
+  &:hover {
+    background-color: ${({ theme }) => theme.accent.secondary};
+    border-radius: ${({ theme }) => theme.border.radius.sm};
+  }
+`;
+
 type VariableChipProps = {
   rawVariableName: string;
-  onRemove: () => void;
+  onRemove?: () => void;
 };
 
 export const VariableChip = ({
   rawVariableName,
   onRemove,
 }: VariableChipProps) => {
+  const theme = useTheme();
+
   return (
     <StyledContainer>
-      <SortOrFilterChip
-        labelValue={extractVariableLabel(rawVariableName)}
-        onRemove={onRemove}
-      />
+      <StyledChip deletable={isDefined(onRemove)}>
+        {extractVariableLabel(rawVariableName)}
+
+        {onRemove ? (
+          <StyledDelete onClick={onRemove}>
+            <IconX size={theme.icon.size.sm} stroke={theme.icon.stroke.sm} />
+          </StyledDelete>
+        ) : null}
+      </StyledChip>
     </StyledContainer>
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormAddressFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormAddressFieldInput.stories.tsx
index e11292d9076e..97e3ddf24afb 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormAddressFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormAddressFieldInput.stories.tsx
@@ -1,5 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
-import { within } from '@storybook/test';
+import { expect, fn, userEvent, within } from '@storybook/test';
 import { FormAddressFieldInput } from '../FormAddressFieldInput';
 
 const meta: Meta<typeof FormAddressFieldInput> = {
@@ -21,7 +21,7 @@ export const Default: Story = {
       addressStreet2: 'Apt 123',
       addressCity: 'Springfield',
       addressState: 'IL',
-      addressCountry: 'US',
+      addressCountry: 'United States',
       addressPostcode: '12345',
       addressLat: 39.781721,
       addressLng: -89.650148,
@@ -35,3 +35,85 @@ export const Default: Story = {
     await canvas.findByText('Post Code');
   },
 };
+
+export const WithVariables: Story = {
+  args: {
+    label: 'Address',
+    defaultValue: {
+      addressStreet1: '{{a.street1}}',
+      addressStreet2: '{{a.street2}}',
+      addressCity: '{{a.city}}',
+      addressState: '{{a.state}}',
+      addressCountry: '{{a.country}}',
+      addressPostcode: '{{a.postcode}}',
+      addressLat: 39.781721,
+      addressLng: -89.650148,
+    },
+    VariablePicker: () => <div>VariablePicker</div>,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const street1Variable = await canvas.findByText('street1');
+    const street2Variable = await canvas.findByText('street2');
+    const cityVariable = await canvas.findByText('city');
+    const stateVariable = await canvas.findByText('state');
+    const countryVariable = await canvas.findByText('country');
+    const postcodeVariable = await canvas.findByText('postcode');
+
+    expect(street1Variable).toBeVisible();
+    expect(street2Variable).toBeVisible();
+    expect(cityVariable).toBeVisible();
+    expect(stateVariable).toBeVisible();
+    expect(countryVariable).toBeVisible();
+    expect(postcodeVariable).toBeVisible();
+
+    const variablePickers = await canvas.findAllByText('VariablePicker');
+    expect(variablePickers).toHaveLength(6);
+  },
+};
+
+export const Disabled: Story = {
+  args: {
+    label: 'Address',
+    readonly: true,
+    defaultValue: {
+      addressStreet1: '123 Main St',
+      addressStreet2: 'Apt 123',
+      addressCity: 'Springfield',
+      addressState: 'IL',
+      addressCountry: 'United States',
+      addressPostcode: '12345',
+      addressLat: 39.781721,
+      addressLng: -89.650148,
+    },
+    onPersist: fn(),
+    VariablePicker: () => <div>VariablePicker</div>,
+  },
+  play: async ({ canvasElement, args }) => {
+    const canvas = within(canvasElement);
+
+    const street1Input = await canvas.findByText('123 Main St');
+    const street2Input = await canvas.findByText('Apt 123');
+    const cityInput = await canvas.findByText('Springfield');
+    const stateInput = await canvas.findByText('IL');
+    const postcodeInput = await canvas.findByText('12345');
+    const countrySelect = await canvas.findByText('United States');
+
+    await userEvent.type(street1Input, 'XXX');
+    await userEvent.type(street2Input, 'YYY');
+    await userEvent.type(cityInput, 'ZZZ');
+    await userEvent.type(stateInput, 'ZZ');
+    await userEvent.type(postcodeInput, '1234');
+
+    await userEvent.click(countrySelect);
+
+    const searchInputInModal = canvas.queryByPlaceholderText('Search');
+    expect(searchInputInModal).not.toBeInTheDocument();
+
+    expect(args.onPersist).not.toHaveBeenCalled();
+
+    const variablePickers = canvas.queryAllByText('VariablePicker');
+    expect(variablePickers).toHaveLength(0);
+  },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormBooleanFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormBooleanFieldInput.stories.tsx
index 8ae79ea624c7..2fabf085478a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormBooleanFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormBooleanFieldInput.stories.tsx
@@ -1,5 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
-import { within } from '@storybook/test';
+import { expect, userEvent, within } from '@storybook/test';
 import { FormBooleanFieldInput } from '../FormBooleanFieldInput';
 
 const meta: Meta<typeof FormBooleanFieldInput> = {
@@ -54,3 +54,37 @@ export const FalseByDefault: Story = {
     await canvas.findByText('False');
   },
 };
+
+export const WithVariablePicker: Story = {
+  args: {
+    VariablePicker: () => <div>VariablePicker</div>,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const variablePicker = await canvas.findByText('VariablePicker');
+
+    expect(variablePicker).toBeVisible();
+  },
+};
+
+export const Disabled: Story = {
+  args: {
+    readonly: true,
+    defaultValue: false,
+    VariablePicker: () => <div>VariablePicker</div>,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const toggle = await canvas.findByText('False');
+    expect(toggle).toBeVisible();
+
+    await userEvent.click(toggle);
+
+    expect(toggle).toHaveTextContent('False');
+
+    const variablePicker = canvas.queryByText('VariablePicker');
+    expect(variablePicker).not.toBeInTheDocument();
+  },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormCurrencyFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormCurrencyFieldInput.stories.tsx
index d139f5aa0e24..d0962dc37816 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormCurrencyFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormCurrencyFieldInput.stories.tsx
@@ -1,8 +1,8 @@
-import { FormCurrencyFieldInput } from '../FormCurrencyFieldInput';
-import { Meta, StoryObj } from '@storybook/react';
-import { FieldCurrencyValue } from '@/object-record/record-field/types/FieldMetadata';
 import { CurrencyCode } from '@/object-record/record-field/types/CurrencyCode';
-import { within } from '@storybook/test';
+import { FieldCurrencyValue } from '@/object-record/record-field/types/FieldMetadata';
+import { Meta, StoryObj } from '@storybook/react';
+import { expect, within } from '@storybook/test';
+import { FormCurrencyFieldInput } from '../FormCurrencyFieldInput';
 
 const meta: Meta<typeof FormCurrencyFieldInput> = {
   title: 'UI/Data/Field/Form/Input/FormCurrencyFieldInput',
@@ -31,3 +31,57 @@ export const Default: Story = {
     await canvas.findByText('Amount Micros');
   },
 };
+
+export const WithVariable: Story = {
+  args: {
+    label: 'Salary',
+    defaultValue: {
+      currencyCode: CurrencyCode.USD,
+      amountMicros: '{{a.b.c}}',
+    },
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const currency = await canvas.findByText(/USD/);
+    expect(currency).toBeVisible();
+
+    const amountVariable = await canvas.findByText('c');
+    expect(amountVariable).toBeVisible();
+  },
+};
+
+export const WithVariablePicker: Story = {
+  args: {
+    VariablePicker: () => <div>VariablePicker</div>,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const variablePickers = await canvas.findAllByText('VariablePicker');
+
+    expect(variablePickers).toHaveLength(2);
+  },
+};
+
+export const Disabled: Story = {
+  args: {
+    label: 'Salary',
+    defaultValue: defaultSalaryValue,
+    VariablePicker: () => <div>VariablePicker</div>,
+    readonly: true,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const currency = await canvas.findByText(/USD/);
+    expect(currency).toBeVisible();
+
+    const amountInput = await canvas.findByDisplayValue('44000000');
+    expect(amountInput).toBeVisible();
+    expect(amountInput).toBeDisabled();
+
+    const variablePickers = canvas.queryAllByText('VariablePicker');
+    expect(variablePickers).toHaveLength(0);
+  },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormDateFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormDateFieldInput.stories.tsx
index bd61db22e1d8..d952e3a7c63a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormDateFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormDateFieldInput.stories.tsx
@@ -1,9 +1,9 @@
 import { MAX_DATE } from '@/ui/input/components/internal/date/constants/MaxDate';
 import { MIN_DATE } from '@/ui/input/components/internal/date/constants/MinDate';
 import { parseDateToString } from '@/ui/input/components/internal/date/utils/parseDateToString';
-import { expect } from '@storybook/jest';
 import { Meta, StoryObj } from '@storybook/react';
 import {
+  expect,
   fn,
   userEvent,
   waitFor,
@@ -323,7 +323,9 @@ export const SwitchesToStandaloneVariable: Story = {
     const variableTag = await canvas.findByText('test');
     expect(variableTag).toBeVisible();
 
-    const removeVariableButton = canvas.getByTestId(/^remove-icon/);
+    const removeVariableButton = canvasElement.querySelector(
+      'button .tabler-icon-x',
+    );
 
     await Promise.all([
       userEvent.click(removeVariableButton),
@@ -372,3 +374,44 @@ export const ClickingOutsideDoesNotResetInputState: Story = {
     expect(input).toHaveDisplayValue(defaultValueAsDisplayString.slice(0, -2));
   },
 };
+
+export const Disabled: Story = {
+  args: {
+    label: 'Created At',
+    defaultValue: `${currentYear}-12-09T13:20:19.631Z`,
+    onPersist: fn(),
+    readonly: true,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const input = await canvas.findByDisplayValue('12/09/' + currentYear);
+    expect(input).toBeDisabled();
+  },
+};
+
+export const DisabledWithVariable: Story = {
+  args: {
+    label: 'Created At',
+    defaultValue: `{{a.b.c}}`,
+    onPersist: fn(),
+    readonly: true,
+    VariablePicker: ({ onVariableSelect }) => {
+      return (
+        <button
+          onClick={() => {
+            onVariableSelect('{{test}}');
+          }}
+        >
+          Add variable
+        </button>
+      );
+    },
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const variableChip = await canvas.findByText('c');
+    expect(variableChip).toBeVisible();
+  },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormDateTimeFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormDateTimeFieldInput.stories.tsx
index ad8c7e67774f..73f8f2925347 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormDateTimeFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormDateTimeFieldInput.stories.tsx
@@ -352,7 +352,9 @@ export const SwitchesToStandaloneVariable: Story = {
     const variableTag = await canvas.findByText('test');
     expect(variableTag).toBeVisible();
 
-    const removeVariableButton = canvas.getByTestId(/^remove-icon/);
+    const removeVariableButton = canvasElement.querySelector(
+      'button .tabler-icon-x',
+    );
 
     await Promise.all([
       userEvent.click(removeVariableButton),
@@ -401,3 +403,46 @@ export const ClickingOutsideDoesNotResetInputState: Story = {
     expect(input).toHaveDisplayValue(defaultValueAsDisplayString.slice(0, -2));
   },
 };
+
+export const Disabled: Story = {
+  args: {
+    label: 'Created At',
+    defaultValue: `${currentYear}-12-09T13:20:19.631Z`,
+    onPersist: fn(),
+    readonly: true,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const input = await canvas.findByDisplayValue(
+      new RegExp(`12/09/${currentYear} \\d{2}:20`),
+    );
+    expect(input).toBeDisabled();
+  },
+};
+
+export const DisabledWithVariable: Story = {
+  args: {
+    label: 'Created At',
+    defaultValue: `{{a.b.c}}`,
+    onPersist: fn(),
+    readonly: true,
+    VariablePicker: ({ onVariableSelect }) => {
+      return (
+        <button
+          onClick={() => {
+            onVariableSelect('{{test}}');
+          }}
+        >
+          Add variable
+        </button>
+      );
+    },
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const variableChip = await canvas.findByText('c');
+    expect(variableChip).toBeVisible();
+  },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormEmailsFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormEmailsFieldInput.stories.tsx
index dbf2ef332731..249e269e47a5 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormEmailsFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormEmailsFieldInput.stories.tsx
@@ -1,5 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
-import { within } from '@storybook/test';
+import { expect, fn, userEvent, within } from '@storybook/test';
 import { FormEmailsFieldInput } from '../FormEmailsFieldInput';
 
 const meta: Meta<typeof FormEmailsFieldInput> = {
@@ -29,3 +29,54 @@ export const Default: Story = {
     await canvas.findByText('tim@twenty.com');
   },
 };
+
+export const WithVariable: Story = {
+  args: {
+    label: 'Emails',
+    defaultValue: {
+      primaryEmail: '{{a.b.c}}',
+      additionalEmails: [],
+    },
+    VariablePicker: () => <div>VariablePicker</div>,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const primaryEmailVariable = await canvas.findByText('c');
+    expect(primaryEmailVariable).toBeVisible();
+
+    const variablePicker = await canvas.findByText('VariablePicker');
+    expect(variablePicker).toBeVisible();
+  },
+};
+
+export const Disabled: Story = {
+  args: {
+    label: 'Emails',
+    defaultValue: {
+      primaryEmail: 'tim@twenty.com',
+      additionalEmails: [],
+    },
+    onPersist: fn(),
+    VariablePicker: () => <div>VariablePicker</div>,
+    readonly: true,
+  },
+  play: async ({ canvasElement, args }) => {
+    const canvas = within(canvasElement);
+
+    const editor = canvasElement.querySelector('.ProseMirror > p');
+    expect(editor).toBeVisible();
+
+    const defaultValue = await canvas.findByText('tim@twenty.com');
+    expect(defaultValue).toBeVisible();
+
+    await userEvent.type(editor, 'hello@gmail.com');
+
+    expect(args.onPersist).not.toHaveBeenCalled();
+    expect(canvas.queryByText('hello@gmail.com')).not.toBeInTheDocument();
+    expect(defaultValue).toBeVisible();
+
+    const variablePicker = canvas.queryByText('VariablePicker');
+    expect(variablePicker).not.toBeInTheDocument();
+  },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormFullNameFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormFullNameFieldInput.stories.tsx
index 62def51e57e6..8ff853e79952 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormFullNameFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormFullNameFieldInput.stories.tsx
@@ -1,5 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
-import { within } from '@storybook/test';
+import { expect, fn, userEvent, within } from '@storybook/test';
 import { FormFullNameFieldInput } from '../FormFullNameFieldInput';
 
 const meta: Meta<typeof FormFullNameFieldInput> = {
@@ -29,3 +29,53 @@ export const Default: Story = {
     await canvas.findByText('Last Name');
   },
 };
+
+export const WithVariable: Story = {
+  args: {
+    label: 'Name',
+    defaultValue: {
+      firstName: '{{a.firstName}}',
+      lastName: '{{a.lastName}}',
+    },
+    VariablePicker: () => <div>VariablePicker</div>,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const firstNameVariable = await canvas.findByText('firstName');
+    expect(firstNameVariable).toBeVisible();
+
+    const lastNameVariable = await canvas.findByText('lastName');
+    expect(lastNameVariable).toBeVisible();
+
+    const variablePickers = await canvas.findAllByText('VariablePicker');
+    expect(variablePickers).toHaveLength(2);
+  },
+};
+
+export const Disabled: Story = {
+  args: {
+    label: 'Name',
+    readonly: true,
+    defaultValue: {
+      firstName: 'John',
+      lastName: 'Doe',
+    },
+    VariablePicker: () => <div>VariablePicker</div>,
+    onPersist: fn(),
+  },
+  play: async ({ canvasElement, args }) => {
+    const canvas = within(canvasElement);
+
+    const firstNameVariable = await canvas.findByText('John');
+    const lastNameVariable = await canvas.findByText('Doe');
+
+    await userEvent.type(firstNameVariable, 'Jane');
+    await userEvent.type(lastNameVariable, 'Smith');
+
+    expect(args.onPersist).not.toHaveBeenCalled();
+
+    const variablePickers = canvas.queryAllByText('VariablePicker');
+    expect(variablePickers).toHaveLength(0);
+  },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormLinksFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormLinksFieldInput.stories.tsx
index 8dccf506ca9e..7428297b098b 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormLinksFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormLinksFieldInput.stories.tsx
@@ -1,5 +1,6 @@
+import { expect } from '@storybook/jest';
 import { Meta, StoryObj } from '@storybook/react';
-import { within } from '@storybook/test';
+import { fn, userEvent, within } from '@storybook/test';
 import { FormLinksFieldInput } from '../FormLinksFieldInput';
 
 const meta: Meta<typeof FormLinksFieldInput> = {
@@ -29,3 +30,57 @@ export const Default: Story = {
     await canvas.findByText('Google');
   },
 };
+
+export const WithVariables: Story = {
+  args: {
+    label: 'Domain Name',
+    defaultValue: {
+      primaryLinkLabel: '{{a.label}}',
+      primaryLinkUrl: '{{a.url}}',
+    },
+    VariablePicker: () => <div>VariablePicker</div>,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const primaryLinkLabelVariable = await canvas.findByText('label');
+    expect(primaryLinkLabelVariable).toBeVisible();
+
+    const primaryLinkUrlVariable = await canvas.findByText('url');
+    expect(primaryLinkUrlVariable).toBeVisible();
+
+    const variablePickers = await canvas.findAllByText('VariablePicker');
+    expect(variablePickers).toHaveLength(2);
+
+    for (const variablePicker of variablePickers) {
+      expect(variablePicker).toBeVisible();
+    }
+  },
+};
+
+export const Disabled: Story = {
+  args: {
+    label: 'Number field...',
+    readonly: true,
+    onPersist: fn(),
+    VariablePicker: () => <div>VariablePicker</div>,
+    defaultValue: {
+      primaryLinkLabel: 'Google',
+      primaryLinkUrl: 'https://www.google.com',
+    },
+  },
+  play: async ({ canvasElement, args }) => {
+    const canvas = within(canvasElement);
+
+    const labelInput = await canvas.findByText('Google');
+    const linkInput = await canvas.findByText('https://www.google.com');
+
+    await userEvent.type(labelInput, 'Yahoo');
+    await userEvent.type(linkInput, 'https://www.yahoo.com');
+
+    expect(args.onPersist).not.toHaveBeenCalled();
+
+    const variablePickers = canvas.queryAllByText('VariablePicker');
+    expect(variablePickers).toHaveLength(0);
+  },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormMultiSelectFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormMultiSelectFieldInput.stories.tsx
index 2b4df71f518d..6f85915689d5 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormMultiSelectFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormMultiSelectFieldInput.stories.tsx
@@ -1,5 +1,6 @@
+import { expect } from '@storybook/jest';
 import { Meta, StoryObj } from '@storybook/react';
-import { within } from '@storybook/test';
+import { fn, userEvent, within } from '@storybook/test';
 import { FormMultiSelectFieldInput } from '../FormMultiSelectFieldInput';
 
 const meta: Meta<typeof FormMultiSelectFieldInput> = {
@@ -48,3 +49,87 @@ export const Default: Story = {
     await canvas.findByText('Work Policy 2');
   },
 };
+
+export const WithVariablePicker: Story = {
+  args: {
+    label: 'Work Policy',
+    defaultValue: ['WORK_POLICY_1', 'WORK_POLICY_2'],
+    options: [
+      {
+        label: 'Work Policy 1',
+        value: 'WORK_POLICY_1',
+        color: 'blue',
+      },
+    ],
+    onPersist: fn(),
+    VariablePicker: () => <div>VariablePicker</div>,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const firstChip = await canvas.findByText('Work Policy 1');
+    expect(firstChip).toBeVisible();
+  },
+};
+
+export const Disabled: Story = {
+  args: {
+    label: 'Work Policy',
+    defaultValue: ['WORK_POLICY_1', 'WORK_POLICY_2'],
+    options: [
+      {
+        label: 'Work Policy 1',
+        value: 'WORK_POLICY_1',
+        color: 'blue',
+      },
+      {
+        label: 'Work Policy 2',
+        value: 'WORK_POLICY_2',
+        color: 'green',
+      },
+      {
+        label: 'Work Policy 3',
+        value: 'WORK_POLICY_3',
+        color: 'red',
+      },
+      {
+        label: 'Work Policy 4',
+        value: 'WORK_POLICY_4',
+        color: 'yellow',
+      },
+    ],
+    onPersist: fn(),
+    readonly: true,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const firstChip = await canvas.findByText('Work Policy 1');
+    expect(firstChip).toBeVisible();
+
+    await userEvent.click(firstChip);
+
+    const searchInputInModal = canvas.queryByPlaceholderText('Search');
+    expect(searchInputInModal).not.toBeInTheDocument();
+  },
+};
+
+export const DisabledWithVariable: Story = {
+  args: {
+    label: 'Created At',
+    defaultValue: `{{a.b.c}}`,
+    onPersist: fn(),
+    readonly: true,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const variableChip = await canvas.findByText('c');
+    expect(variableChip).toBeVisible();
+
+    await userEvent.click(variableChip);
+
+    const searchInputInModal = canvas.queryByPlaceholderText('Search');
+    expect(searchInputInModal).not.toBeInTheDocument();
+  },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormNumberFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormNumberFieldInput.stories.tsx
index 86fd52adcf32..268f901af6f0 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormNumberFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormNumberFieldInput.stories.tsx
@@ -1,3 +1,4 @@
+import { expect } from '@storybook/jest';
 import { Meta, StoryObj } from '@storybook/react';
 import { within } from '@storybook/test';
 import { FormNumberFieldInput } from '../FormNumberFieldInput';
@@ -36,3 +37,36 @@ export const WithLabel: Story = {
     await canvas.findByPlaceholderText('Number field...');
   },
 };
+
+export const WithVariablePicker: Story = {
+  args: {
+    placeholder: 'Number field...',
+    VariablePicker: () => <div>VariablePicker</div>,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const variablePicker = await canvas.findByText('VariablePicker');
+
+    expect(variablePicker).toBeVisible();
+  },
+};
+
+export const Disabled: Story = {
+  args: {
+    placeholder: 'Number field...',
+    readonly: true,
+    VariablePicker: () => <div>VariablePicker</div>,
+    defaultValue: 123,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const input = await canvas.findByDisplayValue('123');
+
+    expect(input).toBeDisabled();
+
+    const variablePicker = canvas.queryByText('VariablePicker');
+    expect(variablePicker).not.toBeInTheDocument();
+  },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormPhoneFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormPhoneFieldInput.stories.tsx
index eec784fa0bce..601dfa47cfc1 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormPhoneFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormPhoneFieldInput.stories.tsx
@@ -1,5 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
-import { within } from '@storybook/test';
+import { expect, fn, userEvent, waitFor, within } from '@storybook/test';
 
 import { FieldPhonesValue } from '@/object-record/record-field/types/FieldMetadata';
 import { FormPhoneFieldInput } from '../FormPhoneFieldInput';
@@ -32,3 +32,128 @@ export const Default: Story = {
     await canvas.findByText('Phone');
   },
 };
+
+export const SelectCountryCode: Story = {
+  args: {
+    label: 'Phone',
+    onPersist: fn(),
+  },
+  play: async ({ canvasElement, args }) => {
+    const canvas = within(canvasElement);
+
+    const defaultEmptyOption = await canvas.findByText('No country');
+    expect(defaultEmptyOption).toBeVisible();
+
+    await userEvent.click(defaultEmptyOption);
+
+    const searchInput = await canvas.findByPlaceholderText('Search');
+    expect(searchInput).toBeVisible();
+
+    await userEvent.type(searchInput, 'France');
+
+    const franceOption = await canvas.findByText(/France/);
+
+    await userEvent.click(franceOption);
+
+    await waitFor(() => {
+      expect(args.onPersist).toHaveBeenCalledWith({
+        primaryPhoneNumber: '',
+        primaryPhoneCountryCode: 'FR',
+        primaryPhoneCallingCode: '33',
+      });
+    });
+
+    expect(args.onPersist).toHaveBeenCalledTimes(1);
+  },
+};
+
+export const SelectEmptyCountryCode: Story = {
+  args: {
+    label: 'Phone',
+    onPersist: fn(),
+    defaultValue: {
+      primaryPhoneNumber: '',
+      primaryPhoneCountryCode: 'FR',
+      primaryPhoneCallingCode: '33',
+    },
+  },
+  play: async ({ canvasElement, args }) => {
+    const canvas = within(canvasElement);
+
+    const defaultSelectedOption = await canvas.findByText(/France/);
+    expect(defaultSelectedOption).toBeVisible();
+
+    await userEvent.click(defaultSelectedOption);
+
+    const searchInput = await canvas.findByPlaceholderText('Search');
+    expect(searchInput).toBeVisible();
+
+    const emptyOption = await canvas.findByText('No country');
+
+    await userEvent.click(emptyOption);
+
+    await waitFor(() => {
+      expect(args.onPersist).toHaveBeenCalledWith({
+        primaryPhoneNumber: '',
+        primaryPhoneCountryCode: '',
+        primaryPhoneCallingCode: '',
+      });
+    });
+
+    expect(args.onPersist).toHaveBeenCalledTimes(1);
+  },
+};
+
+export const WithVariables: Story = {
+  args: {
+    label: 'Enter phone...',
+    defaultValue: {
+      primaryPhoneCountryCode: '{{a.countryCode}}',
+      primaryPhoneNumber: '{{a.phoneNumber}}',
+    },
+    VariablePicker: () => <div>VariablePicker</div>,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const countryCodeVariable = await canvas.findByText('countryCode');
+    expect(countryCodeVariable).toBeVisible();
+
+    const phoneNumberVariable = await canvas.findByText('phoneNumber');
+    expect(phoneNumberVariable).toBeVisible();
+
+    const variablePickers = await canvas.findAllByText('VariablePicker');
+
+    expect(variablePickers).toHaveLength(2);
+
+    for (const variablePicker of variablePickers) {
+      expect(variablePicker).toBeVisible();
+    }
+  },
+};
+
+export const Disabled: Story = {
+  args: {
+    label: 'Enter phone...',
+    readonly: true,
+    VariablePicker: () => <div>VariablePicker</div>,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const countryInput = await canvas.findByText('No country');
+    expect(countryInput).toBeVisible();
+
+    await userEvent.click(countryInput);
+
+    const searchInputInModal = canvas.queryByPlaceholderText('Search');
+    expect(searchInputInModal).not.toBeInTheDocument();
+
+    const phoneNumberInput =
+      await canvas.findByPlaceholderText('Enter phone number');
+    expect(phoneNumberInput).toBeDisabled();
+
+    const variablePickers = canvas.queryAllByText('VariablePicker');
+    expect(variablePickers).toHaveLength(0);
+  },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormRawJsonFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormRawJsonFieldInput.stories.tsx
index aac0d2b69996..48fad9f9a2f4 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormRawJsonFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormRawJsonFieldInput.stories.tsx
@@ -32,8 +32,21 @@ export const Readonly: Story = {
     placeholder: 'Enter valid json',
     readonly: true,
     onPersist: fn(),
+    VariablePicker: ({ onVariableSelect }) => {
+      return (
+        <button
+          onClick={() => {
+            onVariableSelect('{{test}}');
+          }}
+        >
+          Add variable
+        </button>
+      );
+    },
   },
   play: async ({ canvasElement, args }) => {
+    const canvas = within(canvasElement);
+
     const editor = canvasElement.querySelector('.ProseMirror > p');
     expect(editor).toBeVisible();
 
@@ -46,6 +59,9 @@ export const Readonly: Story = {
     });
 
     expect(args.onPersist).not.toHaveBeenCalled();
+
+    const addVariableButton = canvas.queryByText('Add variable');
+    expect(addVariableButton).not.toBeInTheDocument();
   },
 };
 
@@ -87,6 +103,7 @@ export const DisplayDefaultValueWithVariablesProperly: Story = {
   args: {
     placeholder: 'Enter valid json',
     defaultValue: '{ "a": { "b" :  {{var.test}} } }',
+    onPersist: fn(),
   },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
@@ -120,6 +137,7 @@ export const InsertVariableInTheMiddleOnTextInput: Story = {
         </button>
       );
     },
+    onPersist: fn(),
   },
   play: async ({ canvasElement, args }) => {
     const canvas = within(canvasElement);
@@ -161,6 +179,7 @@ export const CanUseVariableAsObjectProperty: Story = {
         </button>
       );
     },
+    onPersist: fn(),
   },
   play: async ({ canvasElement, args }) => {
     const canvas = within(canvasElement);
@@ -188,6 +207,7 @@ export const ClearField: Story = {
   args: {
     placeholder: 'Enter valid json',
     defaultValue: '{ "a": 2 }',
+    onPersist: fn(),
   },
   play: async ({ canvasElement, args }) => {
     const defaultValueStringLength = args.defaultValue!.length;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormSelectFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormSelectFieldInput.stories.tsx
new file mode 100644
index 000000000000..93241b0d3234
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormSelectFieldInput.stories.tsx
@@ -0,0 +1,157 @@
+import { expect } from '@storybook/jest';
+import { Meta, StoryObj } from '@storybook/react';
+import { fn, userEvent, within } from '@storybook/test';
+import { FormSelectFieldInput } from '../FormSelectFieldInput';
+
+const meta: Meta<typeof FormSelectFieldInput> = {
+  title: 'UI/Data/Field/Form/Input/FormSelectFieldInput',
+  component: FormSelectFieldInput,
+  args: {},
+  argTypes: {},
+};
+
+export default meta;
+
+type Story = StoryObj<typeof FormSelectFieldInput>;
+
+export const Default: Story = {
+  args: {
+    label: 'Work Policy',
+    defaultValue: 'WORK_POLICY_1',
+    options: [
+      {
+        label: 'Work Policy 1',
+        value: 'WORK_POLICY_1',
+        color: 'blue',
+      },
+      {
+        label: 'Work Policy 2',
+        value: 'WORK_POLICY_2',
+        color: 'green',
+      },
+      {
+        label: 'Work Policy 3',
+        value: 'WORK_POLICY_3',
+        color: 'red',
+      },
+      {
+        label: 'Work Policy 4',
+        value: 'WORK_POLICY_4',
+        color: 'yellow',
+      },
+    ],
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const selectedOption = await canvas.findByText('Work Policy');
+
+    expect(selectedOption).toBeVisible();
+  },
+};
+
+export const WithVariablePicker: Story = {
+  args: {
+    label: 'Work Policy',
+    defaultValue: 'WORK_POLICY_1',
+    options: [
+      {
+        label: 'Work Policy 1',
+        value: 'WORK_POLICY_1',
+        color: 'blue',
+      },
+    ],
+    onPersist: fn(),
+    VariablePicker: () => <div>VariablePicker</div>,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const firstChip = await canvas.findByText('Work Policy 1');
+    expect(firstChip).toBeVisible();
+  },
+};
+
+export const Disabled: Story = {
+  args: {
+    label: 'Work Policy',
+    defaultValue: 'WORK_POLICY_1',
+    options: [
+      {
+        label: 'Work Policy 1',
+        value: 'WORK_POLICY_1',
+        color: 'blue',
+      },
+      {
+        label: 'Work Policy 2',
+        value: 'WORK_POLICY_2',
+        color: 'green',
+      },
+      {
+        label: 'Work Policy 3',
+        value: 'WORK_POLICY_3',
+        color: 'red',
+      },
+      {
+        label: 'Work Policy 4',
+        value: 'WORK_POLICY_4',
+        color: 'yellow',
+      },
+    ],
+    onPersist: fn(),
+    readonly: true,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const firstChip = await canvas.findByText('Work Policy 1');
+    expect(firstChip).toBeVisible();
+
+    await userEvent.click(firstChip);
+
+    const searchInputInModal = canvas.queryByPlaceholderText('Search');
+    expect(searchInputInModal).not.toBeInTheDocument();
+  },
+};
+
+export const DisabledWithVariable: Story = {
+  args: {
+    label: 'Created At',
+    defaultValue: `{{a.b.c}}`,
+    options: [
+      {
+        label: 'Work Policy 1',
+        value: 'WORK_POLICY_1',
+        color: 'blue',
+      },
+      {
+        label: 'Work Policy 2',
+        value: 'WORK_POLICY_2',
+        color: 'green',
+      },
+      {
+        label: 'Work Policy 3',
+        value: 'WORK_POLICY_3',
+        color: 'red',
+      },
+      {
+        label: 'Work Policy 4',
+        value: 'WORK_POLICY_4',
+        color: 'yellow',
+      },
+    ],
+    onPersist: fn(),
+    readonly: true,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const variableChip = await canvas.findByText('c');
+    expect(variableChip).toBeVisible();
+
+    await userEvent.click(variableChip);
+
+    const searchInputInModal = canvas.queryByPlaceholderText('Search');
+    expect(searchInputInModal).not.toBeInTheDocument();
+  },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormTextFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormTextFieldInput.stories.tsx
index ec0aada4ca35..3348085a844a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormTextFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormTextFieldInput.stories.tsx
@@ -1,5 +1,5 @@
 import { Meta, StoryObj } from '@storybook/react';
-import { within } from '@storybook/test';
+import { expect, fn, userEvent, within } from '@storybook/test';
 import { FormTextFieldInput } from '../FormTextFieldInput';
 
 const meta: Meta<typeof FormTextFieldInput> = {
@@ -43,3 +43,47 @@ export const Multiline: Story = {
     await canvas.findByText(/^Text$/);
   },
 };
+
+export const WithVariablePicker: Story = {
+  args: {
+    label: 'Text',
+    placeholder: 'Text field...',
+    VariablePicker: () => <div>VariablePicker</div>,
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const variablePicker = await canvas.findByText('VariablePicker');
+
+    expect(variablePicker).toBeVisible();
+  },
+};
+
+export const Disabled: Story = {
+  args: {
+    label: 'Text',
+    placeholder: 'Text field...',
+    defaultValue: 'Text field',
+    readonly: true,
+    VariablePicker: () => <div>VariablePicker</div>,
+    onPersist: fn(),
+  },
+  play: async ({ canvasElement, args }) => {
+    const canvas = within(canvasElement);
+
+    const variablePicker = canvas.queryByText('VariablePicker');
+    expect(variablePicker).not.toBeInTheDocument();
+
+    const editor = canvasElement.querySelector('.ProseMirror > p');
+    expect(editor).toBeVisible();
+
+    const defaultValue = await canvas.findByText('Text field');
+    expect(defaultValue).toBeVisible();
+
+    await userEvent.type(editor, 'Hello');
+
+    expect(args.onPersist).not.toHaveBeenCalled();
+    expect(canvas.queryByText('Hello')).not.toBeInTheDocument();
+    expect(defaultValue).toBeVisible();
+  },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormUuidFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormUuidFieldInput.stories.tsx
index d4bb1f219c35..3c65bfc04878 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormUuidFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/form-types/components/__stories__/FormUuidFieldInput.stories.tsx
@@ -194,7 +194,9 @@ export const ReplaceStaticValueWithVariable: Story = {
       }),
     ]);
 
-    const removeVariableButton = await canvas.findByTestId(/^remove-icon/);
+    const removeVariableButton = canvasElement.querySelector(
+      'button .tabler-icon-x',
+    );
 
     await Promise.all([
       userEvent.click(removeVariableButton),
@@ -210,3 +212,33 @@ export const ReplaceStaticValueWithVariable: Story = {
     ]);
   },
 };
+
+export const Disabled: Story = {
+  args: {
+    label: 'UUID field',
+    placeholder: 'Enter UUID',
+    readonly: true,
+    VariablePicker: ({ onVariableSelect }) => {
+      return (
+        <button
+          onClick={() => {
+            onVariableSelect('{{test}}');
+          }}
+        >
+          Add variable
+        </button>
+      );
+    },
+  },
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    const input = await canvas.findByPlaceholderText('Enter UUID');
+
+    expect(input).toBeDisabled();
+
+    const variablePicker = canvas.queryByText('Add variable');
+
+    expect(variablePicker).not.toBeInTheDocument();
+  },
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/ActorFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/ActorFieldDisplay.tsx
index 129d0ebdbef7..46b4ace836c8 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/ActorFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/ActorFieldDisplay.tsx
@@ -1,3 +1,4 @@
+import { useIsFieldEmpty } from '@/object-record/record-field/hooks/useIsFieldEmpty';
 import { useActorFieldDisplay } from '@/object-record/record-field/meta-types/hooks/useActorFieldDisplay';
 import { ActorDisplay } from '@/ui/field/display/components/ActorDisplay';
 import { isNonEmptyString } from '@sniptt/guards';
@@ -14,12 +15,14 @@ export const ActorFieldDisplay = () => {
         .filter(isNonEmptyString)
         .join(' ');
 
-  return (
+  const displayActorField = !useIsFieldEmpty();
+
+  return displayActorField ? (
     <ActorDisplay
       name={name}
       source={fieldValue.source}
       avatarUrl={fieldValue.workspaceMember?.avatarUrl}
       workspaceMemberId={fieldValue.workspaceMemberId}
     />
-  );
+  ) : null;
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/perf/relationFromManyFieldDisplayMock.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/perf/relationFromManyFieldDisplayMock.ts
index c10931caa64f..082e81e40633 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/perf/relationFromManyFieldDisplayMock.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/perf/relationFromManyFieldDisplayMock.ts
@@ -211,7 +211,7 @@ export const relationFromManyFieldDisplayMock = {
       objectMetadataNameSingular: 'person',
       options: null,
     },
-    type: FieldMetadataType.Relation,
+    type: FieldMetadataType.RELATION,
     iconName: 'IconUsers',
     defaultValue: null,
     editButtonIcon: {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useAddressField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useAddressField.ts
index 6421620ea72d..501285e61078 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useAddressField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useAddressField.ts
@@ -16,7 +16,7 @@ export const useAddressField = () => {
   const { recordId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
   assertFieldMetadata(
-    FieldMetadataType.Address,
+    FieldMetadataType.ADDRESS,
     isFieldAddress,
     fieldDefinition,
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useArrayField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useArrayField.ts
index 7178d7affeef..3f6493ac5b41 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useArrayField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useArrayField.ts
@@ -12,7 +12,7 @@ import { FieldMetadataType } from '~/generated-metadata/graphql';
 export const useArrayField = () => {
   const { recordId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
-  assertFieldMetadata(FieldMetadataType.Array, isFieldArray, fieldDefinition);
+  assertFieldMetadata(FieldMetadataType.ARRAY, isFieldArray, fieldDefinition);
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useBooleanField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useBooleanField.ts
index 563688a85de0..1ea30af8b52c 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useBooleanField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useBooleanField.ts
@@ -12,7 +12,7 @@ export const useBooleanField = () => {
   const { recordId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
   assertFieldMetadata(
-    FieldMetadataType.Boolean,
+    FieldMetadataType.BOOLEAN,
     isFieldBoolean,
     fieldDefinition,
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useCurrencyField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useCurrencyField.ts
index 7d6da2aae1ca..89dc171d9be8 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useCurrencyField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useCurrencyField.ts
@@ -17,7 +17,7 @@ export const useCurrencyField = () => {
   const { recordId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
   assertFieldMetadata(
-    FieldMetadataType.Currency,
+    FieldMetadataType.CURRENCY,
     isFieldCurrency,
     fieldDefinition,
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useDateField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useDateField.ts
index 0de3668ecf2b..959ca7090cbe 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useDateField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useDateField.ts
@@ -14,7 +14,7 @@ export const useDateField = () => {
   const { recordId, fieldDefinition, hotkeyScope, clearable } =
     useContext(FieldContext);
 
-  assertFieldMetadata(FieldMetadataType.Date, isFieldDate, fieldDefinition);
+  assertFieldMetadata(FieldMetadataType.DATE, isFieldDate, fieldDefinition);
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useDateTimeField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useDateTimeField.ts
index 1eaa509c1600..74121c6b33ec 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useDateTimeField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useDateTimeField.ts
@@ -15,7 +15,7 @@ export const useDateTimeField = () => {
     useContext(FieldContext);
 
   assertFieldMetadata(
-    FieldMetadataType.DateTime,
+    FieldMetadataType.DATE_TIME,
     isFieldDateTime,
     fieldDefinition,
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useEmailsField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useEmailsField.ts
index ff723f0048ac..44efe44943ab 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useEmailsField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useEmailsField.ts
@@ -15,7 +15,7 @@ import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
 export const useEmailsField = () => {
   const { recordId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
-  assertFieldMetadata(FieldMetadataType.Emails, isFieldEmails, fieldDefinition);
+  assertFieldMetadata(FieldMetadataType.EMAILS, isFieldEmails, fieldDefinition);
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useFullNameField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useFullNameField.ts
index 2c19c725843b..69199b9289aa 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useFullNameField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useFullNameField.ts
@@ -16,7 +16,7 @@ export const useFullNameField = () => {
   const { recordId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
   assertFieldMetadata(
-    FieldMetadataType.FullName,
+    FieldMetadataType.FULL_NAME,
     isFieldFullName,
     fieldDefinition,
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useJsonField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useJsonField.ts
index 8da0e7962296..418aca40b257 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useJsonField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useJsonField.ts
@@ -16,7 +16,7 @@ export const useJsonField = () => {
     useContext(FieldContext);
 
   assertFieldMetadata(
-    FieldMetadataType.RawJson,
+    FieldMetadataType.RAW_JSON,
     isFieldRawJson,
     fieldDefinition,
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useLinksField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useLinksField.ts
index f2314a191538..0a5a3bd7989a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useLinksField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useLinksField.ts
@@ -15,7 +15,7 @@ import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
 export const useLinksField = () => {
   const { recordId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
-  assertFieldMetadata(FieldMetadataType.Links, isFieldLinks, fieldDefinition);
+  assertFieldMetadata(FieldMetadataType.LINKS, isFieldLinks, fieldDefinition);
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useMultiSelectField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useMultiSelectField.ts
index 20c8dfb9f374..09cf34c559bd 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useMultiSelectField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useMultiSelectField.ts
@@ -15,7 +15,7 @@ export const useMultiSelectField = () => {
   const { recordId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
   assertFieldMetadata(
-    FieldMetadataType.MultiSelect,
+    FieldMetadataType.MULTI_SELECT,
     isFieldMultiSelect,
     fieldDefinition,
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useNumberField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useNumberField.ts
index 996b77a14716..6d081e45df8c 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useNumberField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useNumberField.ts
@@ -20,7 +20,7 @@ import { isFieldNumber } from '../../types/guards/isFieldNumber';
 export const useNumberField = () => {
   const { recordId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
-  assertFieldMetadata(FieldMetadataType.Number, isFieldNumber, fieldDefinition);
+  assertFieldMetadata(FieldMetadataType.NUMBER, isFieldNumber, fieldDefinition);
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useNumberFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useNumberFieldDisplay.ts
index 07bf63fee638..90e89c5a9e7a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useNumberFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useNumberFieldDisplay.ts
@@ -10,7 +10,7 @@ import { isFieldNumber } from '../../types/guards/isFieldNumber';
 export const useNumberFieldDisplay = () => {
   const { recordId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
-  assertFieldMetadata(FieldMetadataType.Number, isFieldNumber, fieldDefinition);
+  assertFieldMetadata(FieldMetadataType.NUMBER, isFieldNumber, fieldDefinition);
 
   const fieldName = fieldDefinition.metadata.fieldName;
   const fieldValue = useRecordFieldValue<number | null>(recordId, fieldName);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/usePhonesField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/usePhonesField.ts
index 109f1e5fb41b..65153947b50f 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/usePhonesField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/usePhonesField.ts
@@ -15,7 +15,7 @@ import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
 export const usePhonesField = () => {
   const { recordId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
-  assertFieldMetadata(FieldMetadataType.Phones, isFieldPhones, fieldDefinition);
+  assertFieldMetadata(FieldMetadataType.PHONES, isFieldPhones, fieldDefinition);
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRatingField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRatingField.ts
index c0413eb3085e..0aecf8cd73e1 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRatingField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRatingField.ts
@@ -12,7 +12,7 @@ import { isFieldRating } from '../../types/guards/isFieldRating';
 export const useRatingField = () => {
   const { recordId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
-  assertFieldMetadata(FieldMetadataType.Rating, isFieldRating, fieldDefinition);
+  assertFieldMetadata(FieldMetadataType.RATING, isFieldRating, fieldDefinition);
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationField.ts
index f3b40a23b817..a7e847f272e1 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationField.ts
@@ -19,7 +19,7 @@ export const useRelationField = <
   const button = useGetButtonIcon();
 
   assertFieldMetadata(
-    FieldMetadataType.Relation,
+    FieldMetadataType.RELATION,
     isFieldRelation,
     fieldDefinition,
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationFromManyFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationFromManyFieldDisplay.ts
index aec21e44b0d3..5a59705878e3 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationFromManyFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationFromManyFieldDisplay.ts
@@ -25,7 +25,7 @@ export const useRelationFromManyFieldDisplay = () => {
   }
 
   assertFieldMetadata(
-    FieldMetadataType.Relation,
+    FieldMetadataType.RELATION,
     isFieldRelation,
     fieldDefinition,
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationToOneFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationToOneFieldDisplay.ts
index ff380aff3e81..7267b67016d4 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationToOneFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRelationToOneFieldDisplay.ts
@@ -25,7 +25,7 @@ export const useRelationToOneFieldDisplay = () => {
   }
 
   assertFieldMetadata(
-    FieldMetadataType.Relation,
+    FieldMetadataType.RELATION,
     isFieldRelation,
     fieldDefinition,
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRichTextField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRichTextField.ts
index cad7bc3bb53c..bd705340cb96 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRichTextField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRichTextField.ts
@@ -19,7 +19,7 @@ export const useRichTextField = () => {
     useContext(FieldContext);
 
   assertFieldMetadata(
-    FieldMetadataType.RichText,
+    FieldMetadataType.RICH_TEXT,
     isFieldRichText,
     fieldDefinition,
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRichTextFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRichTextFieldDisplay.ts
index bc933a92b949..e820981bc81a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRichTextFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useRichTextFieldDisplay.ts
@@ -14,7 +14,7 @@ export const useRichTextFieldDisplay = () => {
   const { recordId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
   assertFieldMetadata(
-    FieldMetadataType.RichText,
+    FieldMetadataType.RICH_TEXT,
     isFieldRichText,
     fieldDefinition,
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useSelectField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useSelectField.ts
index e1307281fd7a..95bd0219e90e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useSelectField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useSelectField.ts
@@ -15,7 +15,7 @@ import { isFieldSelectValue } from '../../types/guards/isFieldSelectValue';
 export const useSelectField = () => {
   const { recordId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
-  assertFieldMetadata(FieldMetadataType.Select, isFieldSelect, fieldDefinition);
+  assertFieldMetadata(FieldMetadataType.SELECT, isFieldSelect, fieldDefinition);
 
   const { fieldName } = fieldDefinition.metadata;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useTextField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useTextField.ts
index e6af872b0af6..f193945b2a2a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useTextField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useTextField.ts
@@ -15,7 +15,7 @@ export const useTextField = () => {
   const { recordId, fieldDefinition, hotkeyScope, maxWidth } =
     useContext(FieldContext);
 
-  assertFieldMetadata(FieldMetadataType.Text, isFieldText, fieldDefinition);
+  assertFieldMetadata(FieldMetadataType.TEXT, isFieldText, fieldDefinition);
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useUuidField.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useUuidField.ts
index 3e338275b34d..6fdc5a667094 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useUuidField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/hooks/useUuidField.ts
@@ -13,7 +13,7 @@ import { isFieldTextValue } from '../../types/guards/isFieldTextValue';
 export const useUuidField = () => {
   const { recordId, fieldDefinition, hotkeyScope } = useContext(FieldContext);
 
-  assertFieldMetadata(FieldMetadataType.Uuid, isFieldUuid, fieldDefinition);
+  assertFieldMetadata(FieldMetadataType.UUID, isFieldUuid, fieldDefinition);
 
   const fieldName = fieldDefinition.metadata.fieldName;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/ArrayFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/ArrayFieldInput.tsx
index 7b324d758c1b..fd86604ab058 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/ArrayFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/ArrayFieldInput.tsx
@@ -29,7 +29,7 @@ export const ArrayFieldInput = ({
       onCancel={onCancel}
       onClickOutside={onClickOutside}
       placeholder="Enter value"
-      fieldMetadataType={FieldMetadataType.Array}
+      fieldMetadataType={FieldMetadataType.ARRAY}
       renderItem={({ value, index, handleEdit, handleDelete }) => (
         <ArrayFieldMenuItem
           key={index}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/DateFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/DateFieldInput.tsx
index e97287d8dba4..888f59aed437 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/DateFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/DateFieldInput.tsx
@@ -32,9 +32,13 @@ export const DateFieldInput = ({
     if (!isDefined(newDate)) {
       persistField(null);
     } else {
-      const newDateISO = newDate?.toISOString();
+      const newDateWithoutTime = `${newDate?.getFullYear()}-${(
+        newDate?.getMonth() + 1
+      )
+        .toString()
+        .padStart(2, '0')}-${newDate?.getDate().toString().padStart(2, '0')}`;
 
-      persistField(newDateISO);
+      persistField(newDateWithoutTime);
     }
   };
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/EmailsFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/EmailsFieldInput.tsx
index 661c6305701c..7c2754da1a01 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/EmailsFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/EmailsFieldInput.tsx
@@ -51,7 +51,7 @@ export const EmailsFieldInput = ({
       onCancel={onCancel}
       onClickOutside={onClickOutside}
       placeholder="Email"
-      fieldMetadataType={FieldMetadataType.Emails}
+      fieldMetadataType={FieldMetadataType.EMAILS}
       validateInput={validateInput}
       renderItem={({
         value: email,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/LinksFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/LinksFieldInput.tsx
index 055ee5fba4d6..84810afb741a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/LinksFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/LinksFieldInput.tsx
@@ -55,7 +55,7 @@ export const LinksFieldInput = ({
       onCancel={onCancel}
       onClickOutside={onClickOutside}
       placeholder="URL"
-      fieldMetadataType={FieldMetadataType.Links}
+      fieldMetadataType={FieldMetadataType.LINKS}
       validateInput={(input) => ({
         isValid: absoluteUrlSchema.safeParse(input).success,
         errorMessage: '',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiItemBaseInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiItemBaseInput.tsx
index cc4678d2c6b2..4663b3989431 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiItemBaseInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiItemBaseInput.tsx
@@ -9,12 +9,17 @@ import { useCombinedRefs } from '~/hooks/useCombinedRefs';
 const StyledInput = styled.input<{
   withRightComponent?: boolean;
   hasError?: boolean;
+  hasItem: boolean;
 }>`
   ${TEXT_INPUT_STYLE}
 
-  background-color: ${({ theme }) => theme.background.transparent.lighter};
-  border-radius: 4px;
-  border: 1px solid ${({ theme }) => theme.border.color.medium};
+  ${({ hasItem, theme }) =>
+    hasItem &&
+    css`
+      background-color: ${theme.background.transparent.lighter};
+      border-radius: 4px;
+      border: 1px solid ${theme.border.color.medium};
+    `}
 
   box-sizing: border-box;
   font-weight: ${({ theme }) => theme.font.weight.medium};
@@ -70,6 +75,7 @@ export type MultiItemBaseInputProps = HTMLInputProps & {
   }) => React.ReactNode;
   error?: string | null;
   hasError?: boolean;
+  hasItem: boolean;
 };
 
 export const MultiItemBaseInput = forwardRef<
@@ -93,6 +99,7 @@ export const MultiItemBaseInput = forwardRef<
       renderInput,
       error = '',
       hasError = false,
+      hasItem,
     },
     ref,
   ) => {
@@ -129,6 +136,7 @@ export const MultiItemBaseInput = forwardRef<
               onChange={onChange}
               ref={combinedRef}
               withRightComponent={!!rightComponent}
+              hasItem={hasItem}
             />
           )}
           {!!rightComponent && (
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiItemFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiItemFieldInput.tsx
index 224936435346..b1155570b76a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiItemFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiItemFieldInput.tsx
@@ -95,19 +95,19 @@ export const MultiItemFieldInput = <T,>({
   const handleEditButtonClick = (index: number) => {
     let item;
     switch (fieldMetadataType) {
-      case FieldMetadataType.Links:
+      case FieldMetadataType.LINKS:
         item = items[index] as { label: string; url: string };
         setInputValue(item.url || '');
         break;
-      case FieldMetadataType.Phones:
+      case FieldMetadataType.PHONES:
         item = items[index] as PhoneRecord;
         setInputValue(item.callingCode + item.number);
         break;
-      case FieldMetadataType.Emails:
+      case FieldMetadataType.EMAILS:
         item = items[index] as string;
         setInputValue(item);
         break;
-      case FieldMetadataType.Array:
+      case FieldMetadataType.ARRAY:
         item = items[index] as string;
         setInputValue(item);
         break;
@@ -199,6 +199,7 @@ export const MultiItemFieldInput = <T,>({
             )
           }
           onEnter={handleSubmitInput}
+          hasItem={!!items.length}
           rightComponent={
             items.length ? (
               <LightIconButton
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/PhonesFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/PhonesFieldInput.tsx
index d372b5edccd6..de10a6416e21 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/PhonesFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/PhonesFieldInput.tsx
@@ -10,16 +10,23 @@ import { MultiItemFieldInput } from './MultiItemFieldInput';
 
 import { createPhonesFromFieldValue } from '@/object-record/record-field/meta-types/input/utils/phonesUtils';
 import { PhoneCountryPickerDropdownButton } from '@/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownButton';
+import { css } from '@emotion/react';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { stripSimpleQuotesFromString } from '~/utils/string/stripSimpleQuotesFromString';
 
 export const DEFAULT_PHONE_CALLING_CODE = '1';
 
-const StyledCustomPhoneInputContainer = styled.div`
-  background-color: ${({ theme }) => theme.background.transparent.lighter};
-  border-radius: 4px;
-  border: 1px solid ${({ theme }) => theme.border.color.medium};
-  height: 30px;
+const StyledCustomPhoneInputContainer = styled.div<{
+  hasItem: boolean;
+}>`
+  ${({ hasItem, theme }) =>
+    hasItem &&
+    css`
+      background-color: ${theme.background.transparent.lighter};
+      border-radius: 4px;
+      border: 1px solid ${theme.border.color.medium};
+      height: 30px;
+    `}
 `;
 
 const StyledCustomPhoneInput = styled(ReactPhoneNumberInput)`
@@ -95,7 +102,7 @@ export const PhonesFieldInput = ({
       onClickOutside={onClickOutside}
       onCancel={onCancel}
       placeholder="Phone"
-      fieldMetadataType={FieldMetadataType.Phones}
+      fieldMetadataType={FieldMetadataType.PHONES}
       formatInput={(input) => {
         const phone = parsePhoneNumber(input);
         if (phone !== undefined) {
@@ -130,7 +137,7 @@ export const PhonesFieldInput = ({
       )}
       renderInput={({ value, onChange, autoFocus, placeholder }) => {
         return (
-          <StyledCustomPhoneInputContainer>
+          <StyledCustomPhoneInputContainer hasItem={!!phones.length}>
             <StyledCustomPhoneInput
               autoFocus={autoFocus}
               placeholder={placeholder}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/AddressFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/AddressFieldInput.stories.tsx
index 2cda4b62cb05..486e2f43688f 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/AddressFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/AddressFieldInput.stories.tsx
@@ -53,7 +53,7 @@ const AddressInputWithContext = ({
         fieldDefinition={{
           fieldMetadataId: 'text',
           label: 'Address',
-          type: FieldMetadataType.Address,
+          type: FieldMetadataType.ADDRESS,
           iconName: 'IconTag',
           metadata: {
             fieldName: 'Address',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx
index 764dca8fa480..e60797ee8507 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx
@@ -45,7 +45,7 @@ const BooleanFieldInputWithContext = ({
         fieldMetadataId: 'boolean',
         label: 'Boolean',
         iconName: 'Icon123',
-        type: FieldMetadataType.Boolean,
+        type: FieldMetadataType.BOOLEAN,
         metadata: {
           fieldName: 'Boolean',
           objectMetadataNameSingular: 'person',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/DateTimeFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/DateTimeFieldInput.stories.tsx
index c2155357971c..c1f5369bc2f4 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/DateTimeFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/DateTimeFieldInput.stories.tsx
@@ -6,12 +6,12 @@ import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope
 import { FieldMetadataType } from '~/generated/graphql';
 
 import { FieldContextProvider } from '@/object-record/record-field/meta-types/components/FieldContextProvider';
+import { StorybookFieldInputDropdownFocusIdSetterEffect } from '~/testing/components/StorybookFieldInputDropdownFocusIdSetterEffect';
 import { useDateTimeField } from '../../../hooks/useDateTimeField';
 import {
   DateTimeFieldInput,
   DateTimeFieldInputProps,
 } from '../DateTimeFieldInput';
-
 const formattedDate = new Date(2022, 0, 1, 2, 0, 0);
 
 const DateFieldValueSetterEffect = ({ value }: { value: Date }) => {
@@ -72,7 +72,7 @@ const DateFieldInputWithContext = ({
           fieldMetadataId: 'date',
           defaultValue: null,
           label: 'Date',
-          type: FieldMetadataType.DateTime,
+          type: FieldMetadataType.DATE_TIME,
           iconName: 'IconCalendarEvent',
           metadata: {
             fieldName: 'Date',
@@ -81,6 +81,7 @@ const DateFieldInputWithContext = ({
         }}
         recordId={recordId}
       >
+        <StorybookFieldInputDropdownFocusIdSetterEffect />
         <DateFieldValueSetterEffect value={value} />
         <DateFieldValueGater
           onEscape={onEscape}
@@ -98,7 +99,7 @@ const enterJestFn = fn();
 const clickOutsideJestFn = fn();
 
 const meta: Meta = {
-  title: 'UI/Data/Field/Input/DateFieldInput',
+  title: 'UI/Data/Field/Input/DateTimeFieldInput',
   component: DateFieldInputWithContext,
   args: {
     value: formattedDate,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx
index e0b8e85bd5ca..7775b63d981d 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx
@@ -7,6 +7,7 @@ import { FieldMetadataType } from '~/generated/graphql';
 import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
 
 import { FieldContextProvider } from '@/object-record/record-field/meta-types/components/FieldContextProvider';
+import { StorybookFieldInputDropdownFocusIdSetterEffect } from '~/testing/components/StorybookFieldInputDropdownFocusIdSetterEffect';
 import { useNumberField } from '../../../hooks/useNumberField';
 import { NumberFieldInput, NumberFieldInputProps } from '../NumberFieldInput';
 
@@ -47,7 +48,7 @@ const NumberFieldInputWithContext = ({
           fieldMetadataId: 'number',
           label: 'Number',
           iconName: 'Icon123',
-          type: FieldMetadataType.Number,
+          type: FieldMetadataType.NUMBER,
           metadata: {
             fieldName: 'number',
             placeHolder: 'Enter number',
@@ -56,6 +57,7 @@ const NumberFieldInputWithContext = ({
         }}
         recordId={recordId}
       >
+        <StorybookFieldInputDropdownFocusIdSetterEffect />
         <NumberFieldValueSetterEffect value={value} />
         <NumberFieldInput
           onEnter={onEnter}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RatingFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RatingFieldInput.stories.tsx
index dddbfbfc84d9..bb5a14c6032a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RatingFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RatingFieldInput.stories.tsx
@@ -46,7 +46,7 @@ const RatingFieldInputWithContext = ({
       fieldDefinition={{
         fieldMetadataId: 'rating',
         label: 'Rating',
-        type: FieldMetadataType.Rating,
+        type: FieldMetadataType.RATING,
         iconName: 'Icon123',
         metadata: {
           fieldName: 'Rating',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RelationManyFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RelationManyFieldInput.stories.tsx
index 9c33267d4045..5ee3d46818a4 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RelationManyFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RelationManyFieldInput.stories.tsx
@@ -46,7 +46,7 @@ const RelationManyFieldInputWithContext = () => {
         fieldDefinition={{
           fieldMetadataId: 'relation',
           label: 'People',
-          type: FieldMetadataType.Relation,
+          type: FieldMetadataType.RELATION,
           iconName: 'IconLink',
           metadata: {
             fieldName: 'people',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RelationToOneFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RelationToOneFieldInput.stories.tsx
index 34692439b101..fcff54e68cb2 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RelationToOneFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RelationToOneFieldInput.stories.tsx
@@ -61,7 +61,7 @@ const RelationToOneFieldInputWithContext = ({
         fieldDefinition={{
           fieldMetadataId: 'relation',
           label: 'Relation',
-          type: FieldMetadataType.Relation,
+          type: FieldMetadataType.RELATION,
           iconName: 'IconLink',
           metadata: {
             fieldName: 'Relation',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx
index ec17c5ff92a3..c6ec557432a5 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx
@@ -6,6 +6,7 @@ import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope
 import { FieldMetadataType } from '~/generated/graphql';
 import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
 
+import { StorybookFieldInputDropdownFocusIdSetterEffect } from '~/testing/components/StorybookFieldInputDropdownFocusIdSetterEffect';
 import { FieldContextProvider } from '../../../components/FieldContextProvider';
 import { useTextField } from '../../../hooks/useTextField';
 import { TextFieldInput, TextFieldInputProps } from '../TextFieldInput';
@@ -46,7 +47,7 @@ const TextFieldInputWithContext = ({
         fieldDefinition={{
           fieldMetadataId: 'text',
           label: 'Text',
-          type: FieldMetadataType.Text,
+          type: FieldMetadataType.TEXT,
           iconName: 'IconTag',
           metadata: {
             fieldName: 'Text',
@@ -56,6 +57,7 @@ const TextFieldInputWithContext = ({
         }}
         recordId={recordId}
       >
+        <StorybookFieldInputDropdownFocusIdSetterEffect />
         <TextFieldValueSetterEffect value={value} />
         <TextFieldInput
           onEnter={onEnter}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/hooks/useRegisterInputEvents.ts b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/hooks/useRegisterInputEvents.ts
index 519d5d77ceb8..ec4d6eb9947b 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/hooks/useRegisterInputEvents.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/hooks/useRegisterInputEvents.ts
@@ -1,7 +1,12 @@
 import { Key } from 'ts-key-enum';
 
+import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
+import { getDropdownFocusIdForRecordField } from '@/object-record/utils/getDropdownFocusIdForRecordField';
+import { activeDropdownFocusIdState } from '@/ui/layout/dropdown/states/activeDropdownFocusIdState';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
+import { useContext } from 'react';
+import { useRecoilValue } from 'recoil';
 import { isDefined } from '~/utils/isDefined';
 
 export const useRegisterInputEvents = <T>({
@@ -25,9 +30,32 @@ export const useRegisterInputEvents = <T>({
   onClickOutside?: (event: MouseEvent | TouchEvent, inputValue: T) => void;
   hotkeyScope: string;
 }) => {
+  const activeDropdownFocusId = useRecoilValue(activeDropdownFocusIdState);
+
+  const { recordId, fieldDefinition } = useContext(FieldContext);
+
   useListenClickOutside({
     refs: [inputRef, copyRef].filter(isDefined),
     callback: (event) => {
+      const fieldDropdownFocusIdTableCell = getDropdownFocusIdForRecordField(
+        recordId,
+        fieldDefinition.fieldMetadataId,
+        'table-cell',
+      );
+
+      const fieldDropdownFocusIdInlineCell = getDropdownFocusIdForRecordField(
+        recordId,
+        fieldDefinition.fieldMetadataId,
+        'inline-cell',
+      );
+
+      if (
+        activeDropdownFocusId !== fieldDropdownFocusIdTableCell &&
+        activeDropdownFocusId !== fieldDropdownFocusIdInlineCell
+      ) {
+        return;
+      }
+
       onClickOutside?.(event, inputValue);
     },
     enabled: isDefined(onClickOutside),
diff --git a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/hooks/useUpdateRelationFromManyFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/hooks/useUpdateRelationFromManyFieldInput.tsx
index 7c6bf95cf0c9..1c0f99ac8815 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/hooks/useUpdateRelationFromManyFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/meta-types/input/hooks/useUpdateRelationFromManyFieldInput.tsx
@@ -17,7 +17,7 @@ export const useUpdateRelationFromManyFieldInput = ({
   const { recordId, fieldDefinition } = useContext(FieldContext);
 
   assertFieldMetadata(
-    FieldMetadataType.Relation,
+    FieldMetadataType.RELATION,
     isFieldRelation,
     fieldDefinition,
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-field/scopes/RecordFieldInputScope.tsx b/packages/twenty-front/src/modules/object-record/record-field/scopes/RecordFieldInputScope.tsx
index ce2fcfc9f2ec..bd4f3fce4181 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/scopes/RecordFieldInputScope.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/scopes/RecordFieldInputScope.tsx
@@ -13,9 +13,7 @@ export const RecordFieldInputScope = ({
 }: RecordFieldInputScopeProps) => {
   return (
     <RecordFieldInputScopeInternalContext.Provider
-      value={{
-        scopeId: recordFieldInputScopeId,
-      }}
+      value={{ scopeId: recordFieldInputScopeId }}
     >
       {children}
     </RecordFieldInputScopeInternalContext.Provider>
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldActor.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldActor.ts
index c6a8995073c5..083bfee95ce4 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldActor.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldActor.ts
@@ -6,4 +6,4 @@ import { FieldActorMetadata, FieldMetadata } from '../FieldMetadata';
 export const isFieldActor = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldActorMetadata> =>
-  field.type === FieldMetadataType.Actor;
+  field.type === FieldMetadataType.ACTOR;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldAddress.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldAddress.ts
index 6197aa19f335..e825d8da005b 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldAddress.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldAddress.ts
@@ -6,4 +6,4 @@ import { FieldAddressMetadata, FieldMetadata } from '../FieldMetadata';
 export const isFieldAddress = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldAddressMetadata> =>
-  field.type === FieldMetadataType.Address;
+  field.type === FieldMetadataType.ADDRESS;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldArray.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldArray.ts
index c179d2514052..8d963bbbe50c 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldArray.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldArray.ts
@@ -6,4 +6,4 @@ import { FieldArrayMetadata, FieldMetadata } from '../FieldMetadata';
 export const isFieldArray = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldArrayMetadata> =>
-  field.type === FieldMetadataType.Array;
+  field.type === FieldMetadataType.ARRAY;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldBoolean.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldBoolean.ts
index 4c56293e1466..ec3f224193a7 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldBoolean.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldBoolean.ts
@@ -6,4 +6,4 @@ import { FieldBooleanMetadata, FieldMetadata } from '../FieldMetadata';
 export const isFieldBoolean = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldBooleanMetadata> =>
-  field.type === FieldMetadataType.Boolean;
+  field.type === FieldMetadataType.BOOLEAN;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldCurrency.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldCurrency.ts
index 2b9d16a763e7..4fa2e5f13b3a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldCurrency.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldCurrency.ts
@@ -6,4 +6,4 @@ import { FieldCurrencyMetadata, FieldMetadata } from '../FieldMetadata';
 export const isFieldCurrency = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldCurrencyMetadata> =>
-  field.type === FieldMetadataType.Currency;
+  field.type === FieldMetadataType.CURRENCY;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldDateTime.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldDateTime.ts
index 060424f6d15d..564afed30884 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldDateTime.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldDateTime.ts
@@ -6,4 +6,4 @@ import { FieldDateTimeMetadata, FieldMetadata } from '../FieldMetadata';
 export const isFieldDateTime = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldDateTimeMetadata> =>
-  field.type === FieldMetadataType.DateTime;
+  field.type === FieldMetadataType.DATE_TIME;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldDisplayedAsPhone.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldDisplayedAsPhone.ts
index dcc3fbba77c6..ac568b69e4a7 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldDisplayedAsPhone.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldDisplayedAsPhone.ts
@@ -10,5 +10,5 @@ export const isFieldDisplayedAsPhone = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type' | 'metadata'>,
 ): field is FieldDefinition<FieldTextMetadata> =>
   field.metadata.objectMetadataNameSingular === CoreObjectNameSingular.Person &&
-  field.type === FieldMetadataType.Text &&
+  field.type === FieldMetadataType.TEXT &&
   field.metadata.fieldName === 'phone';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldEmails.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldEmails.ts
index 434586c2bf8d..96c4ea1d11d2 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldEmails.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldEmails.ts
@@ -6,4 +6,4 @@ import { FieldEmailsMetadata, FieldMetadata } from '../FieldMetadata';
 export const isFieldEmails = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldEmailsMetadata> =>
-  field.type === FieldMetadataType.Emails;
+  field.type === FieldMetadataType.EMAILS;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldFullName.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldFullName.ts
index 0fc6bc0f15e9..829cf99b6cb3 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldFullName.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldFullName.ts
@@ -6,4 +6,4 @@ import { FieldFullNameMetadata, FieldMetadata } from '../FieldMetadata';
 export const isFieldFullName = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldFullNameMetadata> =>
-  field.type === FieldMetadataType.FullName;
+  field.type === FieldMetadataType.FULL_NAME;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldLinks.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldLinks.ts
index 22a50f529b57..7dd854de2c8f 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldLinks.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldLinks.ts
@@ -6,4 +6,4 @@ import { FieldLinksMetadata, FieldMetadata } from '../FieldMetadata';
 export const isFieldLinks = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldLinksMetadata> =>
-  field.type === FieldMetadataType.Links;
+  field.type === FieldMetadataType.LINKS;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldMultiSelect.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldMultiSelect.ts
index 5427fca94baa..ba08a785fd0b 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldMultiSelect.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldMultiSelect.ts
@@ -8,4 +8,4 @@ import { FieldMetadataType } from '~/generated-metadata/graphql';
 export const isFieldMultiSelect = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldMultiSelectMetadata> =>
-  field.type === FieldMetadataType.MultiSelect;
+  field.type === FieldMetadataType.MULTI_SELECT;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldNumber.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldNumber.ts
index e5a9bcc63d02..8a60266745a8 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldNumber.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldNumber.ts
@@ -6,4 +6,4 @@ import { FieldMetadata, FieldNumberMetadata } from '../FieldMetadata';
 export const isFieldNumber = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldNumberMetadata> =>
-  field.type === FieldMetadataType.Number;
+  field.type === FieldMetadataType.NUMBER;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldPhones.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldPhones.ts
index 156adfe6340c..12c1ca62cbae 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldPhones.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldPhones.ts
@@ -6,4 +6,4 @@ import { FieldMetadata, FieldPhonesMetadata } from '../FieldMetadata';
 export const isFieldPhones = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldPhonesMetadata> =>
-  field.type === FieldMetadataType.Phones;
+  field.type === FieldMetadataType.PHONES;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldPosition.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldPosition.ts
index b94970d692d0..4bfe6feacaf6 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldPosition.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldPosition.ts
@@ -6,4 +6,4 @@ import { FieldMetadata, FieldPositionMetadata } from '../FieldMetadata';
 export const isFieldPosition = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldPositionMetadata> =>
-  field.type === FieldMetadataType.Position;
+  field.type === FieldMetadataType.POSITION;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRating.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRating.ts
index 543945983aea..90c629bbf99f 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRating.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRating.ts
@@ -6,4 +6,4 @@ import { FieldMetadata, FieldRatingMetadata } from '../FieldMetadata';
 export const isFieldRating = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldRatingMetadata> =>
-  field.type === FieldMetadataType.Rating;
+  field.type === FieldMetadataType.RATING;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRawJson.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRawJson.ts
index 18700f181d60..4dde0554d167 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRawJson.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRawJson.ts
@@ -6,4 +6,4 @@ import { FieldMetadata, FieldRawJsonMetadata } from '../FieldMetadata';
 export const isFieldRawJson = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldRawJsonMetadata> =>
-  field.type === FieldMetadataType.RawJson;
+  field.type === FieldMetadataType.RAW_JSON;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRelation.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRelation.ts
index 68bc5fd6832b..3af794f1aafa 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRelation.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRelation.ts
@@ -6,4 +6,4 @@ import { FieldMetadata, FieldRelationMetadata } from '../FieldMetadata';
 export const isFieldRelation = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldRelationMetadata> =>
-  field.type === FieldMetadataType.Relation;
+  field.type === FieldMetadataType.RELATION;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRelationFromManyObjects.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRelationFromManyObjects.ts
index e325df622c5a..57468bba4467 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRelationFromManyObjects.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRelationFromManyObjects.ts
@@ -8,4 +8,4 @@ export const isFieldRelationFromManyObjects = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type' | 'metadata'>,
 ): field is FieldDefinition<FieldMetadata> =>
   isFieldRelation(field) &&
-  field.metadata.relationType === RelationDefinitionType.OneToMany;
+  field.metadata.relationType === RelationDefinitionType.ONE_TO_MANY;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRelationToOneObject.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRelationToOneObject.ts
index 12b9958ade93..b79a7eba63a0 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRelationToOneObject.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRelationToOneObject.ts
@@ -8,4 +8,4 @@ export const isFieldRelationToOneObject = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type' | 'metadata'>,
 ): field is FieldDefinition<FieldMetadata> =>
   isFieldRelation(field) &&
-  field.metadata.relationType === RelationDefinitionType.ManyToOne;
+  field.metadata.relationType === RelationDefinitionType.MANY_TO_ONE;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRichText.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRichText.ts
index 2b4c5908286c..05187ef656f9 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRichText.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRichText.ts
@@ -6,4 +6,4 @@ import { FieldMetadata, FieldRichTextMetadata } from '../FieldMetadata';
 export const isFieldRichText = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldRichTextMetadata> =>
-  field.type === FieldMetadataType.RichText;
+  field.type === FieldMetadataType.RICH_TEXT;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldSelect.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldSelect.ts
index 0528512e5c86..470e52fe1732 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldSelect.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldSelect.ts
@@ -6,4 +6,4 @@ import { FieldMetadata, FieldSelectMetadata } from '../FieldMetadata';
 export const isFieldSelect = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldSelectMetadata> =>
-  field.type === FieldMetadataType.Select;
+  field.type === FieldMetadataType.SELECT;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldText.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldText.ts
index 028a9b49bbd3..7f56d941f5f4 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldText.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldText.ts
@@ -6,4 +6,4 @@ import { FieldMetadata, FieldTextMetadata } from '../FieldMetadata';
 export const isFieldText = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldTextMetadata> =>
-  field.type === FieldMetadataType.Text;
+  field.type === FieldMetadataType.TEXT;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldTsVectorValue.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldTsVectorValue.ts
index 107db30a8fbd..456cd31178db 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldTsVectorValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldTsVectorValue.ts
@@ -7,4 +7,4 @@ import { FieldMetadataType } from '~/generated-metadata/graphql';
 export const isFieldTsVector = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldTsVectorMetadata> =>
-  field.type === FieldMetadataType.TsVector;
+  field.type === FieldMetadataType.TS_VECTOR;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldUuid.ts b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldUuid.ts
index 45b6ebc2a089..cba505405c13 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldUuid.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldUuid.ts
@@ -6,4 +6,4 @@ import { FieldMetadata, FieldUuidMetadata } from '../FieldMetadata';
 export const isFieldUuid = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
 ): field is FieldDefinition<FieldUuidMetadata> =>
-  field.type === FieldMetadataType.Uuid;
+  field.type === FieldMetadataType.UUID;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/utils/__tests__/isFieldValueEmpty.test.ts b/packages/twenty-front/src/modules/object-record/record-field/utils/__tests__/isFieldValueEmpty.test.ts
index db247716ab9a..41171d50e02e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/utils/__tests__/isFieldValueEmpty.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/utils/__tests__/isFieldValueEmpty.test.ts
@@ -76,7 +76,7 @@ describe('isFieldValueEmpty', () => {
       fieldMetadataId,
       label: 'Annual Income',
       iconName: 'cashCow',
-      type: FieldMetadataType.Currency,
+      type: FieldMetadataType.CURRENCY,
       metadata: {
         fieldName: 'annualIncome',
         placeHolder: '100000',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/utils/__tests__/isFieldValueReadOnly.test.ts b/packages/twenty-front/src/modules/object-record/record-field/utils/__tests__/isFieldValueReadOnly.test.ts
index a5dff94f7a97..9744b3b8f510 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/utils/__tests__/isFieldValueReadOnly.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/utils/__tests__/isFieldValueReadOnly.test.ts
@@ -81,25 +81,25 @@ describe('isFieldValueReadOnly', () => {
     expect(result).toBe(true);
   });
 
-  it('should return true if fieldType is FieldMetadataType.Actor', () => {
+  it('should return true if fieldType is FieldMetadataType.ACTOR', () => {
     const result = isFieldValueReadOnly({
-      fieldType: FieldMetadataType.Actor,
+      fieldType: FieldMetadataType.ACTOR,
     });
 
     expect(result).toBe(true);
   });
 
-  it('should return true if fieldType is FieldMetadataType.RichText', () => {
+  it('should return true if fieldType is FieldMetadataType.RICH_TEXT', () => {
     const result = isFieldValueReadOnly({
-      fieldType: FieldMetadataType.RichText,
+      fieldType: FieldMetadataType.RICH_TEXT,
     });
 
     expect(result).toBe(true);
   });
 
-  it('should return false if fieldType is not FieldMetadataType.Actor or FieldMetadataType.RichText', () => {
+  it('should return false if fieldType is not FieldMetadataType.ACTOR or FieldMetadataType.RICH_TEXT', () => {
     const result = isFieldValueReadOnly({
-      fieldType: FieldMetadataType.Text,
+      fieldType: FieldMetadataType.TEXT,
     });
 
     expect(result).toBe(false);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/utils/isFieldValueReadOnly.ts b/packages/twenty-front/src/modules/object-record/record-field/utils/isFieldValueReadOnly.ts
index e3e59574d385..703be51be367 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/utils/isFieldValueReadOnly.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/utils/isFieldValueReadOnly.ts
@@ -36,6 +36,10 @@ export const isFieldValueReadOnly = ({
     return true;
   }
 
+  if (objectNameSingular === CoreObjectNameSingular.CalendarEvent) {
+    return true;
+  }
+
   if (
     objectNameSingular === CoreObjectNameSingular.Workflow &&
     fieldName !== 'name'
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useRemoveRecordFilter.test.tsx b/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useRemoveRecordFilter.test.tsx
new file mode 100644
index 000000000000..9c8d1f0217fc
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useRemoveRecordFilter.test.tsx
@@ -0,0 +1,117 @@
+import { renderHook } from '@testing-library/react';
+import { act } from 'react-dom/test-utils';
+
+import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
+import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';
+import { useRemoveRecordFilter } from '../useRemoveRecordFilter';
+import { useUpsertRecordFilter } from '../useUpsertRecordFilter';
+
+const Wrapper = getJestMetadataAndApolloMocksWrapper({
+  apolloMocks: [],
+});
+
+describe('useRemoveRecordFilter', () => {
+  it('should remove an existing filter', () => {
+    const { result } = renderHook(
+      () => {
+        const currentRecordFilters = useRecoilComponentValueV2(
+          currentRecordFiltersComponentState,
+        );
+
+        const { upsertRecordFilter } = useUpsertRecordFilter();
+        const { removeRecordFilter } = useRemoveRecordFilter();
+
+        return {
+          upsertRecordFilter,
+          removeRecordFilter,
+          currentRecordFilters,
+        };
+      },
+      {
+        wrapper: Wrapper,
+      },
+    );
+
+    const filter: RecordFilter = {
+      id: 'filter-1',
+      fieldMetadataId: 'field-1',
+      value: 'test-value',
+      operand: ViewFilterOperand.Contains,
+      displayValue: 'test-value',
+      definition: {
+        type: 'TEXT',
+        fieldMetadataId: 'field-1',
+        label: 'Test Field',
+        iconName: 'IconText',
+      },
+    };
+
+    // First add a filter
+    act(() => {
+      result.current.upsertRecordFilter(filter);
+    });
+
+    expect(result.current.currentRecordFilters).toHaveLength(1);
+    expect(result.current.currentRecordFilters[0]).toEqual(filter);
+
+    // Then remove it
+    act(() => {
+      result.current.removeRecordFilter(filter.fieldMetadataId);
+    });
+
+    expect(result.current.currentRecordFilters).toHaveLength(0);
+  });
+
+  it('should not modify filters when trying to remove a non-existent filter', () => {
+    const { result } = renderHook(
+      () => {
+        const currentRecordFilters = useRecoilComponentValueV2(
+          currentRecordFiltersComponentState,
+        );
+        const { upsertRecordFilter } = useUpsertRecordFilter();
+        const { removeRecordFilter } = useRemoveRecordFilter();
+        return {
+          upsertRecordFilter,
+          removeRecordFilter,
+          currentRecordFilters,
+        };
+      },
+      {
+        wrapper: Wrapper,
+      },
+    );
+
+    const filter: RecordFilter = {
+      id: 'filter-1',
+      fieldMetadataId: 'field-1',
+      value: 'test-value',
+      operand: ViewFilterOperand.Contains,
+      displayValue: 'test-value',
+      definition: {
+        type: 'TEXT',
+        fieldMetadataId: 'field-1',
+        label: 'Test Field',
+        iconName: 'IconText',
+      },
+    };
+
+    // Add a filter
+    act(() => {
+      result.current.upsertRecordFilter(filter);
+    });
+
+    expect(result.current.currentRecordFilters).toHaveLength(1);
+
+    // Try to remove a non-existent filter
+    act(() => {
+      result.current.removeRecordFilter('non-existent-field');
+    });
+
+    // Filter list should remain unchanged
+    expect(result.current.currentRecordFilters).toHaveLength(1);
+    expect(result.current.currentRecordFilters[0]).toEqual(filter);
+  });
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useUpsertRecordFilter.test.tsx b/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useUpsertRecordFilter.test.tsx
new file mode 100644
index 000000000000..3b25ff2f0745
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useUpsertRecordFilter.test.tsx
@@ -0,0 +1,112 @@
+import { renderHook } from '@testing-library/react';
+import { act } from 'react-dom/test-utils';
+
+import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
+import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';
+import { useUpsertRecordFilter } from '../useUpsertRecordFilter';
+
+const Wrapper = getJestMetadataAndApolloMocksWrapper({
+  apolloMocks: [],
+});
+
+describe('useUpsertRecordFilter', () => {
+  it('should add a new filter when fieldMetadataId does not exist', () => {
+    const { result } = renderHook(
+      () => {
+        const currentRecordFilters = useRecoilComponentValueV2(
+          currentRecordFiltersComponentState,
+        );
+
+        const { upsertRecordFilter } = useUpsertRecordFilter();
+
+        return { upsertRecordFilter, currentRecordFilters };
+      },
+      {
+        wrapper: Wrapper,
+      },
+    );
+
+    const newFilter: RecordFilter = {
+      id: 'filter-1',
+      fieldMetadataId: 'field-1',
+      value: 'test-value',
+      operand: ViewFilterOperand.Contains,
+      displayValue: 'test-value',
+      definition: {
+        type: 'TEXT',
+        fieldMetadataId: 'field-1',
+        label: 'Test Field',
+        iconName: 'IconText',
+      },
+    };
+
+    act(() => {
+      result.current.upsertRecordFilter(newFilter);
+    });
+
+    expect(result.current.currentRecordFilters).toHaveLength(1);
+    expect(result.current.currentRecordFilters[0]).toEqual(newFilter);
+  });
+
+  it('should update an existing filter when fieldMetadataId exists', () => {
+    const { result } = renderHook(
+      () => {
+        const currentRecordFilters = useRecoilComponentValueV2(
+          currentRecordFiltersComponentState,
+        );
+
+        const { upsertRecordFilter } = useUpsertRecordFilter();
+
+        return { upsertRecordFilter, currentRecordFilters };
+      },
+      {
+        wrapper: Wrapper,
+      },
+    );
+
+    const initialFilter: RecordFilter = {
+      id: 'filter-1',
+      fieldMetadataId: 'field-1',
+      value: 'initial-value',
+      operand: ViewFilterOperand.Contains,
+      displayValue: 'initial-value',
+      definition: {
+        type: 'TEXT',
+        fieldMetadataId: 'field-1',
+        label: 'Test Field',
+        iconName: 'IconText',
+      },
+    };
+
+    const updatedFilter: RecordFilter = {
+      id: 'filter-1',
+      fieldMetadataId: 'field-1',
+      value: 'updated-value',
+      operand: ViewFilterOperand.Contains,
+      displayValue: 'updated-value',
+      definition: {
+        type: 'TEXT',
+        fieldMetadataId: 'field-1',
+        label: 'Test Field',
+        iconName: 'IconText',
+      },
+    };
+
+    act(() => {
+      result.current.upsertRecordFilter(initialFilter);
+    });
+
+    expect(result.current.currentRecordFilters).toHaveLength(1);
+    expect(result.current.currentRecordFilters[0]).toEqual(initialFilter);
+
+    act(() => {
+      result.current.upsertRecordFilter(updatedFilter);
+    });
+
+    expect(result.current.currentRecordFilters).toHaveLength(1);
+    expect(result.current.currentRecordFilters[0]).toEqual(updatedFilter);
+  });
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/hooks/useApplyRecordFilter.ts b/packages/twenty-front/src/modules/object-record/record-filter/hooks/useApplyRecordFilter.ts
new file mode 100644
index 000000000000..ba82b14c57be
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter/hooks/useApplyRecordFilter.ts
@@ -0,0 +1,34 @@
+import { selectedFilterComponentState } from '@/object-record/object-filter-dropdown/states/selectedFilterComponentState';
+import { useUpsertRecordFilter } from '@/object-record/record-filter/hooks/useUpsertRecordFilter';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2';
+import { useUpsertCombinedViewFilters } from '@/views/hooks/useUpsertCombinedViewFilters';
+import { useRecoilCallback } from 'recoil';
+import { isDefined } from 'twenty-ui';
+
+export const useApplyRecordFilter = (componentInstanceId?: string) => {
+  const { upsertCombinedViewFilter } = useUpsertCombinedViewFilters();
+  const selectedFilterCallbackState = useRecoilComponentCallbackStateV2(
+    selectedFilterComponentState,
+    componentInstanceId,
+  );
+
+  const { upsertRecordFilter } = useUpsertRecordFilter();
+
+  const applyRecordFilter = useRecoilCallback(
+    ({ set }) =>
+      (filter: RecordFilter | null) => {
+        set(selectedFilterCallbackState, filter);
+
+        if (isDefined(filter)) {
+          upsertCombinedViewFilter(filter);
+          upsertRecordFilter(filter);
+        }
+      },
+    [selectedFilterCallbackState, upsertCombinedViewFilter, upsertRecordFilter],
+  );
+
+  return {
+    applyRecordFilter,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/hooks/useFilterValueDependencies.ts b/packages/twenty-front/src/modules/object-record/record-filter/hooks/useFilterValueDependencies.ts
index e1f423041792..cc1b8c6bdcd0 100644
--- a/packages/twenty-front/src/modules/object-record/record-filter/hooks/useFilterValueDependencies.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/hooks/useFilterValueDependencies.ts
@@ -1,9 +1,9 @@
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
-import { FilterValueDependencies } from '@/object-record/record-filter/types/FilterValueDependencies';
+import { RecordFilterValueDependencies } from '@/object-record/record-filter/types/RecordFilterValueDependencies';
 import { useRecoilValue } from 'recoil';
 
 export const useFilterValueDependencies = (): {
-  filterValueDependencies: FilterValueDependencies;
+  filterValueDependencies: RecordFilterValueDependencies;
 } => {
   const { id: currentWorkspaceMemberId } =
     useRecoilValue(currentWorkspaceMemberState) ?? {};
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/hooks/useRemoveRecordFilter.ts b/packages/twenty-front/src/modules/object-record/record-filter/hooks/useRemoveRecordFilter.ts
new file mode 100644
index 000000000000..a41f5b3f87cd
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter/hooks/useRemoveRecordFilter.ts
@@ -0,0 +1,46 @@
+import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
+import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2';
+import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue';
+import { useRecoilCallback } from 'recoil';
+
+export const useRemoveRecordFilter = () => {
+  const currentRecordFiltersCallbackState = useRecoilComponentCallbackStateV2(
+    currentRecordFiltersComponentState,
+  );
+
+  const removeRecordFilter = useRecoilCallback(
+    ({ set, snapshot }) =>
+      (fieldMetadataId: string) => {
+        const currentRecordFilters = getSnapshotValue(
+          snapshot,
+          currentRecordFiltersCallbackState,
+        );
+
+        const foundRecordFilterInCurrentRecordFilters =
+          currentRecordFilters.some(
+            (existingFilter) =>
+              existingFilter.fieldMetadataId === fieldMetadataId,
+          );
+
+        if (foundRecordFilterInCurrentRecordFilters) {
+          set(currentRecordFiltersCallbackState, (currentRecordFilters) => {
+            const newCurrentRecordFilters = [...currentRecordFilters];
+
+            const indexOfFilterToRemove = newCurrentRecordFilters.findIndex(
+              (existingFilter) =>
+                existingFilter.fieldMetadataId === fieldMetadataId,
+            );
+
+            newCurrentRecordFilters.splice(indexOfFilterToRemove, 1);
+
+            return newCurrentRecordFilters;
+          });
+        }
+      },
+    [currentRecordFiltersCallbackState],
+  );
+
+  return {
+    removeRecordFilter,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/hooks/useUpsertRecordFilter.ts b/packages/twenty-front/src/modules/object-record/record-filter/hooks/useUpsertRecordFilter.ts
new file mode 100644
index 000000000000..3e7291f577c5
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter/hooks/useUpsertRecordFilter.ts
@@ -0,0 +1,54 @@
+import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2';
+import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue';
+import { useRecoilCallback } from 'recoil';
+
+export const useUpsertRecordFilter = () => {
+  const currentRecordFiltersCallbackState = useRecoilComponentCallbackStateV2(
+    currentRecordFiltersComponentState,
+  );
+
+  const upsertRecordFilter = useRecoilCallback(
+    ({ set, snapshot }) =>
+      (filter: RecordFilter) => {
+        const currentRecordFilters = getSnapshotValue(
+          snapshot,
+          currentRecordFiltersCallbackState,
+        );
+
+        const foundRecordFilterInCurrentRecordFilters =
+          currentRecordFilters.some(
+            (existingFilter) =>
+              existingFilter.fieldMetadataId === filter.fieldMetadataId,
+          );
+
+        if (!foundRecordFilterInCurrentRecordFilters) {
+          set(currentRecordFiltersCallbackState, [
+            ...currentRecordFilters,
+            filter,
+          ]);
+        } else {
+          set(currentRecordFiltersCallbackState, (currentRecordFilters) => {
+            const newCurrentRecordFilters = [...currentRecordFilters];
+
+            const indexOfFilterToUpdate = newCurrentRecordFilters.findIndex(
+              (existingFilter) =>
+                existingFilter.fieldMetadataId === filter.fieldMetadataId,
+            );
+
+            newCurrentRecordFilters[indexOfFilterToUpdate] = {
+              ...filter,
+            };
+
+            return newCurrentRecordFilters;
+          });
+        }
+      },
+    [currentRecordFiltersCallbackState],
+  );
+
+  return {
+    upsertRecordFilter,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext.ts b/packages/twenty-front/src/modules/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext.ts
new file mode 100644
index 000000000000..e8a6200d6a14
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext.ts
@@ -0,0 +1,4 @@
+import { createComponentInstanceContext } from '@/ui/utilities/state/component-state/utils/createComponentInstanceContext';
+
+export const RecordFiltersComponentInstanceContext =
+  createComponentInstanceContext();
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/states/currentRecordFiltersComponentState.ts b/packages/twenty-front/src/modules/object-record/record-filter/states/currentRecordFiltersComponentState.ts
new file mode 100644
index 000000000000..a2b6d80595b3
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter/states/currentRecordFiltersComponentState.ts
@@ -0,0 +1,11 @@
+import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
+import { RecordFilter } from '../../record-filter/types/RecordFilter';
+
+export const currentRecordFiltersComponentState = createComponentStateV2<
+  RecordFilter[]
+>({
+  key: 'currentRecordFiltersComponentState',
+  defaultValue: [],
+  componentInstanceContext: RecordFiltersComponentInstanceContext,
+});
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/CompositeFilterableFieldType.ts b/packages/twenty-front/src/modules/object-record/record-filter/types/CompositeFilterableFieldType.ts
similarity index 62%
rename from packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/CompositeFilterableFieldType.ts
rename to packages/twenty-front/src/modules/object-record/record-filter/types/CompositeFilterableFieldType.ts
index 0bdf399feb6b..805742a30367 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/CompositeFilterableFieldType.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/types/CompositeFilterableFieldType.ts
@@ -1,4 +1,4 @@
-import { FilterableFieldType } from '@/object-record/object-filter-dropdown/types/FilterableFieldType';
+import { FilterableFieldType } from '@/object-record/record-filter/types/FilterableFieldType';
 import { CompositeFieldType } from '@/settings/data-model/types/CompositeFieldType';
 
 export type CompositeFilterableFieldType = FilterableFieldType &
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/types/FilterValueDependencies.ts b/packages/twenty-front/src/modules/object-record/record-filter/types/FilterValueDependencies.ts
deleted file mode 100644
index 0014490eb946..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-filter/types/FilterValueDependencies.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface FilterValueDependencies {
-  currentWorkspaceMemberId?: string;
-}
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterableFieldType.ts b/packages/twenty-front/src/modules/object-record/record-filter/types/FilterableFieldType.ts
similarity index 100%
rename from packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterableFieldType.ts
rename to packages/twenty-front/src/modules/object-record/record-filter/types/FilterableFieldType.ts
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/Filter.ts b/packages/twenty-front/src/modules/object-record/record-filter/types/RecordFilter.ts
similarity index 65%
rename from packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/Filter.ts
rename to packages/twenty-front/src/modules/object-record/record-filter/types/RecordFilter.ts
index 077fc1435974..b993ea318b42 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/Filter.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/types/RecordFilter.ts
@@ -1,7 +1,7 @@
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
-import { FilterDefinition } from './FilterDefinition';
 
-export type Filter = {
+export type RecordFilter = {
   id: string;
   variant?: 'default' | 'danger';
   fieldMetadataId: string;
@@ -11,5 +11,5 @@ export type Filter = {
   displayAvatarUrl?: string;
   operand: ViewFilterOperand;
   positionInViewFilterGroup?: number | null;
-  definition: FilterDefinition;
+  definition: RecordFilterDefinition;
 };
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterDefinition.ts b/packages/twenty-front/src/modules/object-record/record-filter/types/RecordFilterDefinition.ts
similarity index 90%
rename from packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterDefinition.ts
rename to packages/twenty-front/src/modules/object-record/record-filter/types/RecordFilterDefinition.ts
index b516bbeced7f..d549f1038b78 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/types/FilterDefinition.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/types/RecordFilterDefinition.ts
@@ -2,7 +2,7 @@ import { IconComponent } from 'twenty-ui';
 
 import { FilterableFieldType } from './FilterableFieldType';
 
-export type FilterDefinition = {
+export type RecordFilterDefinition = {
   fieldMetadataId: string;
   label: string;
   iconName: string;
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/types/RecordFilterDraft.ts b/packages/twenty-front/src/modules/object-record/record-filter/types/RecordFilterDraft.ts
new file mode 100644
index 000000000000..9f8df42584ed
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter/types/RecordFilterDraft.ts
@@ -0,0 +1,4 @@
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+
+export type FilterDraft = Partial<RecordFilter> &
+  Omit<RecordFilter, 'fieldMetadataId' | 'operand' | 'definition'>;
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/types/RecordFilterOperand.ts b/packages/twenty-front/src/modules/object-record/record-filter/types/RecordFilterOperand.ts
new file mode 100644
index 000000000000..110cb74f589e
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter/types/RecordFilterOperand.ts
@@ -0,0 +1 @@
+export { ViewFilterOperand as RecordFilterOperand } from '@/views/types/ViewFilterOperand';
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/types/RecordFilterValueDependencies.ts b/packages/twenty-front/src/modules/object-record/record-filter/types/RecordFilterValueDependencies.ts
new file mode 100644
index 000000000000..d7a59fdbd1c5
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter/types/RecordFilterValueDependencies.ts
@@ -0,0 +1,3 @@
+export interface RecordFilterValueDependencies {
+  currentWorkspaceMemberId?: string;
+}
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/computeViewRecordGqlOperationFilter.test.ts b/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/computeViewRecordGqlOperationFilter.test.ts
index 694107ae3c12..e4b7b4985d54 100644
--- a/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/computeViewRecordGqlOperationFilter.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/computeViewRecordGqlOperationFilter.test.ts
@@ -1,5 +1,5 @@
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
-import { FilterValueDependencies } from '@/object-record/record-filter/types/FilterValueDependencies';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+import { RecordFilterValueDependencies } from '@/object-record/record-filter/types/RecordFilterValueDependencies';
 import { computeViewRecordGqlOperationFilter } from '@/object-record/record-filter/utils/computeViewRecordGqlOperationFilter';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 import { getCompaniesMock } from '~/testing/mock-data/companies';
@@ -15,7 +15,7 @@ const personMockObjectMetadataItem = generatedMockObjectMetadataItems.find(
   (item) => item.nameSingular === 'person',
 )!;
 
-const mockFilterValueDependencies: FilterValueDependencies = {
+const mockFilterValueDependencies: RecordFilterValueDependencies = {
   currentWorkspaceMemberId: '32219445-f587-4c40-b2b1-6d3205ed96da',
 };
 
@@ -28,7 +28,7 @@ describe('computeViewRecordGqlOperationFilter', () => {
         (field) => field.name === 'name',
       );
 
-    const nameFilter: Filter = {
+    const nameFilter: RecordFilter = {
       id: 'company-name-filter',
       value: companiesMock[0].name,
       fieldMetadataId: companyMockNameFieldMetadataId?.id,
@@ -67,7 +67,7 @@ describe('computeViewRecordGqlOperationFilter', () => {
         (field) => field.name === 'employees',
       );
 
-    const nameFilter: Filter = {
+    const nameFilter: RecordFilter = {
       id: 'company-name-filter',
       value: companiesMock[0].name,
       fieldMetadataId: companyMockNameFieldMetadataId?.id,
@@ -81,7 +81,7 @@ describe('computeViewRecordGqlOperationFilter', () => {
       },
     };
 
-    const employeesFilter: Filter = {
+    const employeesFilter: RecordFilter = {
       id: 'company-employees-filter',
       value: '1000',
       fieldMetadataId: companyMockEmployeesFieldMetadataId?.id,
@@ -126,7 +126,7 @@ describe('should work as expected for the different field types', () => {
         (field) => field.name === 'address',
       );
 
-    const addressFilterContains: Filter = {
+    const addressFilterContains: RecordFilter = {
       id: 'company-address-filter-contains',
       value: '123 Main St',
       fieldMetadataId: companyMockAddressFieldMetadataId?.id,
@@ -140,7 +140,7 @@ describe('should work as expected for the different field types', () => {
       },
     };
 
-    const addressFilterDoesNotContain: Filter = {
+    const addressFilterDoesNotContain: RecordFilter = {
       id: 'company-address-filter-does-not-contain',
       value: '123 Main St',
       fieldMetadataId: companyMockAddressFieldMetadataId?.id,
@@ -154,7 +154,7 @@ describe('should work as expected for the different field types', () => {
       },
     };
 
-    const addressFilterIsEmpty: Filter = {
+    const addressFilterIsEmpty: RecordFilter = {
       id: 'company-address-filter-is-empty',
       value: '',
       fieldMetadataId: companyMockAddressFieldMetadataId?.id,
@@ -168,7 +168,7 @@ describe('should work as expected for the different field types', () => {
       },
     };
 
-    const addressFilterIsNotEmpty: Filter = {
+    const addressFilterIsNotEmpty: RecordFilter = {
       id: 'company-address-filter-is-not-empty',
       value: '',
       fieldMetadataId: companyMockAddressFieldMetadataId?.id,
@@ -509,7 +509,7 @@ describe('should work as expected for the different field types', () => {
         (field) => field.name === 'phones',
       );
 
-    const phonesFilterContains: Filter = {
+    const phonesFilterContains: RecordFilter = {
       id: 'person-phones-filter-contains',
       value: '1234567890',
       fieldMetadataId: personMockPhonesFieldMetadataId?.id,
@@ -523,7 +523,7 @@ describe('should work as expected for the different field types', () => {
       },
     };
 
-    const phonesFilterDoesNotContain: Filter = {
+    const phonesFilterDoesNotContain: RecordFilter = {
       id: 'person-phones-filter-does-not-contain',
       value: '1234567890',
       fieldMetadataId: personMockPhonesFieldMetadataId?.id,
@@ -537,7 +537,7 @@ describe('should work as expected for the different field types', () => {
       },
     };
 
-    const phonesFilterIsEmpty: Filter = {
+    const phonesFilterIsEmpty: RecordFilter = {
       id: 'person-phones-filter-is-empty',
       value: '',
       fieldMetadataId: personMockPhonesFieldMetadataId?.id,
@@ -551,7 +551,7 @@ describe('should work as expected for the different field types', () => {
       },
     };
 
-    const phonesFilterIsNotEmpty: Filter = {
+    const phonesFilterIsNotEmpty: RecordFilter = {
       id: 'person-phones-filter-is-not-empty',
       value: '',
       fieldMetadataId: personMockPhonesFieldMetadataId?.id,
@@ -588,13 +588,6 @@ describe('should work as expected for the different field types', () => {
                 },
               },
             },
-            {
-              phones: {
-                primaryPhoneCountryCode: {
-                  ilike: '%1234567890%',
-                },
-              },
-            },
           ],
         },
         {
@@ -608,15 +601,6 @@ describe('should work as expected for the different field types', () => {
                 },
               },
             },
-            {
-              not: {
-                phones: {
-                  primaryPhoneCountryCode: {
-                    ilike: '%1234567890%',
-                  },
-                },
-              },
-            },
           ],
         },
         {
@@ -639,24 +623,6 @@ describe('should work as expected for the different field types', () => {
                 },
               ],
             },
-            {
-              or: [
-                {
-                  phones: {
-                    primaryPhoneCountryCode: {
-                      is: 'NULL',
-                    },
-                  },
-                },
-                {
-                  phones: {
-                    primaryPhoneCountryCode: {
-                      ilike: '',
-                    },
-                  },
-                },
-              ],
-            },
           ],
         },
         {
@@ -680,24 +646,6 @@ describe('should work as expected for the different field types', () => {
                   },
                 ],
               },
-              {
-                or: [
-                  {
-                    phones: {
-                      primaryPhoneCountryCode: {
-                        is: 'NULL',
-                      },
-                    },
-                  },
-                  {
-                    phones: {
-                      primaryPhoneCountryCode: {
-                        ilike: '',
-                      },
-                    },
-                  },
-                ],
-              },
             ],
           },
         },
@@ -711,7 +659,7 @@ describe('should work as expected for the different field types', () => {
         (field) => field.name === 'emails',
       );
 
-    const emailsFilterContains: Filter = {
+    const emailsFilterContains: RecordFilter = {
       id: 'person-emails-filter-contains',
       value: 'test@test.com',
       fieldMetadataId: personMockEmailFieldMetadataId?.id,
@@ -725,7 +673,7 @@ describe('should work as expected for the different field types', () => {
       },
     };
 
-    const emailsFilterDoesNotContain: Filter = {
+    const emailsFilterDoesNotContain: RecordFilter = {
       id: 'person-emails-filter-does-not-contain',
       value: 'test@test.com',
       fieldMetadataId: personMockEmailFieldMetadataId?.id,
@@ -739,7 +687,7 @@ describe('should work as expected for the different field types', () => {
       },
     };
 
-    const emailsFilterIsEmpty: Filter = {
+    const emailsFilterIsEmpty: RecordFilter = {
       id: 'person-emails-filter-is-empty',
       value: '',
       fieldMetadataId: personMockEmailFieldMetadataId?.id,
@@ -753,7 +701,7 @@ describe('should work as expected for the different field types', () => {
       },
     };
 
-    const emailsFilterIsNotEmpty: Filter = {
+    const emailsFilterIsNotEmpty: RecordFilter = {
       id: 'person-emails-filter-is-not-empty',
       value: '',
       fieldMetadataId: personMockEmailFieldMetadataId?.id,
@@ -853,7 +801,7 @@ describe('should work as expected for the different field types', () => {
         (field) => field.name === 'createdAt',
       );
 
-    const dateFilterIsAfter: Filter = {
+    const dateFilterIsAfter: RecordFilter = {
       id: 'company-date-filter-is-after',
       value: '2024-09-17T20:46:58.922Z',
       fieldMetadataId: companyMockDateFieldMetadataId?.id,
@@ -867,7 +815,7 @@ describe('should work as expected for the different field types', () => {
       },
     };
 
-    const dateFilterIsBefore: Filter = {
+    const dateFilterIsBefore: RecordFilter = {
       id: 'company-date-filter-is-before',
       value: '2024-09-17T20:46:58.922Z',
       fieldMetadataId: companyMockDateFieldMetadataId?.id,
@@ -881,7 +829,7 @@ describe('should work as expected for the different field types', () => {
       },
     };
 
-    const dateFilterIs: Filter = {
+    const dateFilterIs: RecordFilter = {
       id: 'company-date-filter-is',
       value: '2024-09-17T20:46:58.922Z',
       fieldMetadataId: companyMockDateFieldMetadataId?.id,
@@ -895,7 +843,7 @@ describe('should work as expected for the different field types', () => {
       },
     };
 
-    const dateFilterIsEmpty: Filter = {
+    const dateFilterIsEmpty: RecordFilter = {
       id: 'company-date-filter-is-empty',
       value: '',
       fieldMetadataId: companyMockDateFieldMetadataId?.id,
@@ -909,7 +857,7 @@ describe('should work as expected for the different field types', () => {
       },
     };
 
-    const dateFilterIsNotEmpty: Filter = {
+    const dateFilterIsNotEmpty: RecordFilter = {
       id: 'company-date-filter-is-not-empty',
       value: '',
       fieldMetadataId: companyMockDateFieldMetadataId?.id,
@@ -984,7 +932,7 @@ describe('should work as expected for the different field types', () => {
         (field) => field.name === 'employees',
       );
 
-    const employeesFilterIsGreaterThan: Filter = {
+    const employeesFilterIsGreaterThan: RecordFilter = {
       id: 'company-employees-filter-is-greater-than',
       value: '1000',
       fieldMetadataId: companyMockEmployeesFieldMetadataId?.id,
@@ -998,7 +946,7 @@ describe('should work as expected for the different field types', () => {
       },
     };
 
-    const employeesFilterIsLessThan: Filter = {
+    const employeesFilterIsLessThan: RecordFilter = {
       id: 'company-employees-filter-is-less-than',
       value: '1000',
       fieldMetadataId: companyMockEmployeesFieldMetadataId?.id,
@@ -1012,7 +960,7 @@ describe('should work as expected for the different field types', () => {
       },
     };
 
-    const employeesFilterIsEmpty: Filter = {
+    const employeesFilterIsEmpty: RecordFilter = {
       id: 'company-employees-filter-is-empty',
       value: '',
       fieldMetadataId: companyMockEmployeesFieldMetadataId?.id,
@@ -1026,7 +974,7 @@ describe('should work as expected for the different field types', () => {
       },
     };
 
-    const employeesFilterIsNotEmpty: Filter = {
+    const employeesFilterIsNotEmpty: RecordFilter = {
       id: 'company-employees-filter-is-not-empty',
       value: '',
       fieldMetadataId: companyMockEmployeesFieldMetadataId?.id,
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/isMatchingArrayFilter.test.ts b/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/isMatchingArrayFilter.test.ts
new file mode 100644
index 000000000000..6dde97f7bc59
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/isMatchingArrayFilter.test.ts
@@ -0,0 +1,128 @@
+import { isMatchingArrayFilter } from '../isMatchingArrayFilter';
+
+describe('isMatchingArrayFilter', () => {
+  describe('is filter', () => {
+    it('should return true when checking for NULL and value is null', () => {
+      expect(
+        isMatchingArrayFilter({
+          arrayFilter: { is: 'NULL' },
+          value: null,
+        }),
+      ).toBe(true);
+    });
+
+    it('should return false when checking for NULL and value is not null', () => {
+      expect(
+        isMatchingArrayFilter({
+          arrayFilter: { is: 'NULL' },
+          value: ['test'],
+        }),
+      ).toBe(false);
+    });
+
+    it('should return true when checking for NOT_NULL and value is not null', () => {
+      expect(
+        isMatchingArrayFilter({
+          arrayFilter: { is: 'NOT_NULL' },
+          value: ['test'],
+        }),
+      ).toBe(true);
+    });
+
+    it('should return false when checking for NOT_NULL and value is null', () => {
+      expect(
+        isMatchingArrayFilter({
+          arrayFilter: { is: 'NOT_NULL' },
+          value: null,
+        }),
+      ).toBe(false);
+    });
+  });
+
+  describe('isEmptyArray filter', () => {
+    it('should return true when array is empty and checking for empty array', () => {
+      expect(
+        isMatchingArrayFilter({
+          arrayFilter: { isEmptyArray: true },
+          value: [],
+        }),
+      ).toBe(true);
+    });
+
+    it('should return false when array is not empty and checking for empty array', () => {
+      expect(
+        isMatchingArrayFilter({
+          arrayFilter: { isEmptyArray: true },
+          value: ['test'],
+        }),
+      ).toBe(false);
+    });
+
+    it('should return false when value is null and checking for empty array', () => {
+      expect(
+        isMatchingArrayFilter({
+          arrayFilter: { isEmptyArray: true },
+          value: null,
+        }),
+      ).toBe(false);
+    });
+  });
+
+  describe('containsIlike filter', () => {
+    it('should return true when array contains item matching case-insensitive search', () => {
+      expect(
+        isMatchingArrayFilter({
+          arrayFilter: { containsIlike: 'TEST' },
+          value: ['test item'],
+        }),
+      ).toBe(true);
+    });
+
+    it('should return false when array does not contain item matching search', () => {
+      expect(
+        isMatchingArrayFilter({
+          arrayFilter: { containsIlike: 'missing' },
+          value: ['test item'],
+        }),
+      ).toBe(false);
+    });
+
+    it('should return false when value is null and using containsIlike', () => {
+      expect(
+        isMatchingArrayFilter({
+          arrayFilter: { containsIlike: 'test' },
+          value: null,
+        }),
+      ).toBe(false);
+    });
+
+    it('should match partial strings case-insensitively', () => {
+      expect(
+        isMatchingArrayFilter({
+          arrayFilter: { containsIlike: 'TE' },
+          value: ['Test Item', 'Another Item'],
+        }),
+      ).toBe(true);
+    });
+  });
+
+  describe('error handling', () => {
+    it('should throw error for invalid filter', () => {
+      expect(() =>
+        isMatchingArrayFilter({
+          arrayFilter: {},
+          value: [],
+        }),
+      ).toThrow('Unexpected value for array filter');
+    });
+
+    it('should throw error for unknown filter type', () => {
+      expect(() =>
+        isMatchingArrayFilter({
+          arrayFilter: { unknownFilter: 'test' } as any,
+          value: [],
+        }),
+      ).toThrow('Unexpected value for array filter');
+    });
+  });
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/utils/computeViewRecordGqlOperationFilter.ts b/packages/twenty-front/src/modules/object-record/record-filter/utils/computeViewRecordGqlOperationFilter.ts
index c806dd3fe41d..6a96749f8dca 100644
--- a/packages/twenty-front/src/modules/object-record/record-filter/utils/computeViewRecordGqlOperationFilter.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/utils/computeViewRecordGqlOperationFilter.ts
@@ -10,6 +10,7 @@ import {
   EmailsFilter,
   FloatFilter,
   MultiSelectFilter,
+  PhonesFilter,
   RatingFilter,
   RawJsonFilter,
   RecordGqlOperationFilter,
@@ -17,7 +18,6 @@ import {
   SelectFilter,
   StringFilter,
 } from '@/object-record/graphql/types/RecordGqlOperationFilter';
-import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 import { Field } from '~/generated/graphql';
 import { generateILikeFiltersForCompositeFields } from '~/utils/array/generateILikeFiltersForCompositeFields';
 import { isDefined } from '~/utils/isDefined';
@@ -27,20 +27,22 @@ import {
   convertLessThanRatingToArrayOfRatingValues,
   convertRatingToRatingValue,
 } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownRatingInput';
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
-import { FilterValueDependencies } from '@/object-record/record-filter/types/FilterValueDependencies';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+import { RecordFilterOperand } from '@/object-record/record-filter/types/RecordFilterOperand';
+import { RecordFilterValueDependencies } from '@/object-record/record-filter/types/RecordFilterValueDependencies';
 import { getEmptyRecordGqlOperationFilter } from '@/object-record/record-filter/utils/getEmptyRecordGqlOperationFilter';
 import { ViewFilterGroup } from '@/views/types/ViewFilterGroup';
 import { ViewFilterGroupLogicalOperator } from '@/views/types/ViewFilterGroupLogicalOperator';
 import { resolveDateViewFilterValue } from '@/views/view-filter-value/utils/resolveDateViewFilterValue';
 import { resolveSelectViewFilterValue } from '@/views/view-filter-value/utils/resolveSelectViewFilterValue';
-import { relationFilterValueSchema } from '@/views/view-filter-value/validation-schemas/relationFilterValueSchema';
+import { jsonRelationFilterValueSchema } from '@/views/view-filter-value/validation-schemas/jsonRelationFilterValueSchema';
+import { simpleRelationFilterValueSchema } from '@/views/view-filter-value/validation-schemas/simpleRelationFilterValueSchema';
 import { endOfDay, roundToNearestMinutes, startOfDay } from 'date-fns';
 import { z } from 'zod';
 
 const computeFilterRecordGqlOperationFilter = (
-  filterValueDependencies: FilterValueDependencies,
-  filter: Filter,
+  filterValueDependencies: RecordFilterValueDependencies,
+  filter: RecordFilter,
   fields: Pick<Field, 'id' | 'name'>[],
 ): RecordGqlOperationFilter | undefined => {
   const correspondingField = fields.find(
@@ -52,11 +54,11 @@ const computeFilterRecordGqlOperationFilter = (
   const isCompositeFieldFiter = isNonEmptyString(compositeFieldName);
 
   const isEmptyOperand = [
-    ViewFilterOperand.IsEmpty,
-    ViewFilterOperand.IsNotEmpty,
-    ViewFilterOperand.IsInPast,
-    ViewFilterOperand.IsInFuture,
-    ViewFilterOperand.IsToday,
+    RecordFilterOperand.IsEmpty,
+    RecordFilterOperand.IsNotEmpty,
+    RecordFilterOperand.IsInPast,
+    RecordFilterOperand.IsInFuture,
+    RecordFilterOperand.IsToday,
   ].includes(filter.operand);
 
   if (!correspondingField) {
@@ -72,13 +74,13 @@ const computeFilterRecordGqlOperationFilter = (
   switch (filter.definition.type) {
     case 'TEXT':
       switch (filter.operand) {
-        case ViewFilterOperand.Contains:
+        case RecordFilterOperand.Contains:
           return {
             [correspondingField.name]: {
               ilike: `%${filter.value}%`,
             } as StringFilter,
           };
-        case ViewFilterOperand.DoesNotContain:
+        case RecordFilterOperand.DoesNotContain:
           return {
             not: {
               [correspondingField.name]: {
@@ -86,8 +88,8 @@ const computeFilterRecordGqlOperationFilter = (
               } as StringFilter,
             },
           };
-        case ViewFilterOperand.IsEmpty:
-        case ViewFilterOperand.IsNotEmpty:
+        case RecordFilterOperand.IsEmpty:
+        case RecordFilterOperand.IsNotEmpty:
           return getEmptyRecordGqlOperationFilter(
             filter.operand,
             correspondingField,
@@ -100,13 +102,13 @@ const computeFilterRecordGqlOperationFilter = (
       }
     case 'RAW_JSON':
       switch (filter.operand) {
-        case ViewFilterOperand.Contains:
+        case RecordFilterOperand.Contains:
           return {
             [correspondingField.name]: {
               like: `%${filter.value}%`,
             } as RawJsonFilter,
           };
-        case ViewFilterOperand.DoesNotContain:
+        case RecordFilterOperand.DoesNotContain:
           return {
             not: {
               [correspondingField.name]: {
@@ -114,8 +116,8 @@ const computeFilterRecordGqlOperationFilter = (
               } as RawJsonFilter,
             },
           };
-        case ViewFilterOperand.IsEmpty:
-        case ViewFilterOperand.IsNotEmpty:
+        case RecordFilterOperand.IsEmpty:
+        case RecordFilterOperand.IsNotEmpty:
           return getEmptyRecordGqlOperationFilter(
             filter.operand,
             correspondingField,
@@ -134,36 +136,36 @@ const computeFilterRecordGqlOperationFilter = (
         resolvedFilterValue instanceof Date ? resolvedFilterValue : now;
 
       switch (filter.operand) {
-        case ViewFilterOperand.IsAfter: {
+        case RecordFilterOperand.IsAfter: {
           return {
             [correspondingField.name]: {
               gt: date.toISOString(),
             } as DateFilter,
           };
         }
-        case ViewFilterOperand.IsBefore: {
+        case RecordFilterOperand.IsBefore: {
           return {
             [correspondingField.name]: {
               lt: date.toISOString(),
             } as DateFilter,
           };
         }
-        case ViewFilterOperand.IsEmpty:
-        case ViewFilterOperand.IsNotEmpty: {
+        case RecordFilterOperand.IsEmpty:
+        case RecordFilterOperand.IsNotEmpty: {
           return getEmptyRecordGqlOperationFilter(
             filter.operand,
             correspondingField,
             filter.definition,
           );
         }
-        case ViewFilterOperand.IsRelative: {
+        case RecordFilterOperand.IsRelative: {
           const dateRange = z
             .object({ start: z.date(), end: z.date() })
             .safeParse(resolvedFilterValue).data;
 
           const defaultDateRange = resolveDateViewFilterValue({
             value: 'PAST_1_DAY',
-            operand: ViewFilterOperand.IsRelative,
+            operand: RecordFilterOperand.IsRelative,
           });
 
           if (!defaultDateRange) {
@@ -187,7 +189,7 @@ const computeFilterRecordGqlOperationFilter = (
             ],
           };
         }
-        case ViewFilterOperand.Is: {
+        case RecordFilterOperand.Is: {
           const isValid = resolvedFilterValue instanceof Date;
           const date = isValid ? resolvedFilterValue : now;
 
@@ -206,19 +208,19 @@ const computeFilterRecordGqlOperationFilter = (
             ],
           };
         }
-        case ViewFilterOperand.IsInPast:
+        case RecordFilterOperand.IsInPast:
           return {
             [correspondingField.name]: {
               lte: now.toISOString(),
             } as DateFilter,
           };
-        case ViewFilterOperand.IsInFuture:
+        case RecordFilterOperand.IsInFuture:
           return {
             [correspondingField.name]: {
               gte: now.toISOString(),
             } as DateFilter,
           };
-        case ViewFilterOperand.IsToday: {
+        case RecordFilterOperand.IsToday: {
           return {
             and: [
               {
@@ -242,13 +244,13 @@ const computeFilterRecordGqlOperationFilter = (
     }
     case 'RATING':
       switch (filter.operand) {
-        case ViewFilterOperand.Is:
+        case RecordFilterOperand.Is:
           return {
             [correspondingField.name]: {
               eq: convertRatingToRatingValue(parseFloat(filter.value)),
             } as RatingFilter,
           };
-        case ViewFilterOperand.GreaterThan:
+        case RecordFilterOperand.GreaterThan:
           return {
             [correspondingField.name]: {
               in: convertGreaterThanRatingToArrayOfRatingValues(
@@ -256,7 +258,7 @@ const computeFilterRecordGqlOperationFilter = (
               ),
             } as RatingFilter,
           };
-        case ViewFilterOperand.LessThan:
+        case RecordFilterOperand.LessThan:
           return {
             [correspondingField.name]: {
               in: convertLessThanRatingToArrayOfRatingValues(
@@ -264,8 +266,8 @@ const computeFilterRecordGqlOperationFilter = (
               ),
             } as RatingFilter,
           };
-        case ViewFilterOperand.IsEmpty:
-        case ViewFilterOperand.IsNotEmpty:
+        case RecordFilterOperand.IsEmpty:
+        case RecordFilterOperand.IsNotEmpty:
           return getEmptyRecordGqlOperationFilter(
             filter.operand,
             correspondingField,
@@ -278,20 +280,20 @@ const computeFilterRecordGqlOperationFilter = (
       }
     case 'NUMBER':
       switch (filter.operand) {
-        case ViewFilterOperand.GreaterThan:
+        case RecordFilterOperand.GreaterThan:
           return {
             [correspondingField.name]: {
               gte: parseFloat(filter.value),
             } as FloatFilter,
           };
-        case ViewFilterOperand.LessThan:
+        case RecordFilterOperand.LessThan:
           return {
             [correspondingField.name]: {
               lte: parseFloat(filter.value),
             } as FloatFilter,
           };
-        case ViewFilterOperand.IsEmpty:
-        case ViewFilterOperand.IsNotEmpty:
+        case RecordFilterOperand.IsEmpty:
+        case RecordFilterOperand.IsNotEmpty:
           return getEmptyRecordGqlOperationFilter(
             filter.operand,
             correspondingField,
@@ -305,7 +307,14 @@ const computeFilterRecordGqlOperationFilter = (
     case 'RELATION': {
       if (!isEmptyOperand) {
         const { isCurrentWorkspaceMemberSelected, selectedRecordIds } =
-          relationFilterValueSchema.parse(filter.value);
+          jsonRelationFilterValueSchema
+            .catch({
+              isCurrentWorkspaceMemberSelected: false,
+              selectedRecordIds: simpleRelationFilterValueSchema.parse(
+                filter.value,
+              ),
+            })
+            .parse(filter.value);
 
         const recordIds = isCurrentWorkspaceMemberSelected
           ? [
@@ -316,13 +325,13 @@ const computeFilterRecordGqlOperationFilter = (
 
         if (recordIds.length === 0) return;
         switch (filter.operand) {
-          case ViewFilterOperand.Is:
+          case RecordFilterOperand.Is:
             return {
               [correspondingField.name + 'Id']: {
                 in: recordIds,
               } as RelationFilter,
             };
-          case ViewFilterOperand.IsNot: {
+          case RecordFilterOperand.IsNot: {
             if (recordIds.length === 0) return;
             return {
               or: [
@@ -348,8 +357,8 @@ const computeFilterRecordGqlOperationFilter = (
         }
       } else {
         switch (filter.operand) {
-          case ViewFilterOperand.IsEmpty:
-          case ViewFilterOperand.IsNotEmpty:
+          case RecordFilterOperand.IsEmpty:
+          case RecordFilterOperand.IsNotEmpty:
             return getEmptyRecordGqlOperationFilter(
               filter.operand,
               correspondingField,
@@ -364,20 +373,20 @@ const computeFilterRecordGqlOperationFilter = (
     }
     case 'CURRENCY':
       switch (filter.operand) {
-        case ViewFilterOperand.GreaterThan:
+        case RecordFilterOperand.GreaterThan:
           return {
             [correspondingField.name]: {
               amountMicros: { gte: parseFloat(filter.value) * 1000000 },
             } as CurrencyFilter,
           };
-        case ViewFilterOperand.LessThan:
+        case RecordFilterOperand.LessThan:
           return {
             [correspondingField.name]: {
               amountMicros: { lte: parseFloat(filter.value) * 1000000 },
             } as CurrencyFilter,
           };
-        case ViewFilterOperand.IsEmpty:
-        case ViewFilterOperand.IsNotEmpty:
+        case RecordFilterOperand.IsEmpty:
+        case RecordFilterOperand.IsNotEmpty:
           return getEmptyRecordGqlOperationFilter(
             filter.operand,
             correspondingField,
@@ -396,7 +405,7 @@ const computeFilterRecordGqlOperationFilter = (
       );
 
       switch (filter.operand) {
-        case ViewFilterOperand.Contains:
+        case RecordFilterOperand.Contains:
           if (!isCompositeFieldFiter) {
             return {
               or: linksFilters,
@@ -410,7 +419,7 @@ const computeFilterRecordGqlOperationFilter = (
               },
             };
           }
-        case ViewFilterOperand.DoesNotContain:
+        case RecordFilterOperand.DoesNotContain:
           if (!isCompositeFieldFiter) {
             return {
               and: linksFilters.map((filter) => {
@@ -430,8 +439,8 @@ const computeFilterRecordGqlOperationFilter = (
               },
             };
           }
-        case ViewFilterOperand.IsEmpty:
-        case ViewFilterOperand.IsNotEmpty:
+        case RecordFilterOperand.IsEmpty:
+        case RecordFilterOperand.IsNotEmpty:
           return getEmptyRecordGqlOperationFilter(
             filter.operand,
             correspondingField,
@@ -450,7 +459,7 @@ const computeFilterRecordGqlOperationFilter = (
         ['firstName', 'lastName'],
       );
       switch (filter.operand) {
-        case ViewFilterOperand.Contains:
+        case RecordFilterOperand.Contains:
           if (!isCompositeFieldFiter) {
             return {
               or: fullNameFilters,
@@ -464,7 +473,7 @@ const computeFilterRecordGqlOperationFilter = (
               },
             };
           }
-        case ViewFilterOperand.DoesNotContain:
+        case RecordFilterOperand.DoesNotContain:
           if (!isCompositeFieldFiter) {
             return {
               and: fullNameFilters.map((filter) => {
@@ -484,8 +493,8 @@ const computeFilterRecordGqlOperationFilter = (
               },
             };
           }
-        case ViewFilterOperand.IsEmpty:
-        case ViewFilterOperand.IsNotEmpty:
+        case RecordFilterOperand.IsEmpty:
+        case RecordFilterOperand.IsNotEmpty:
           return getEmptyRecordGqlOperationFilter(
             filter.operand,
             correspondingField,
@@ -499,7 +508,7 @@ const computeFilterRecordGqlOperationFilter = (
     }
     case 'ADDRESS':
       switch (filter.operand) {
-        case ViewFilterOperand.Contains:
+        case RecordFilterOperand.Contains:
           if (!isCompositeFieldFiter) {
             return {
               or: [
@@ -556,7 +565,7 @@ const computeFilterRecordGqlOperationFilter = (
               },
             };
           }
-        case ViewFilterOperand.DoesNotContain:
+        case RecordFilterOperand.DoesNotContain:
           if (!isCompositeFieldFiter) {
             return {
               and: [
@@ -600,8 +609,8 @@ const computeFilterRecordGqlOperationFilter = (
               },
             };
           }
-        case ViewFilterOperand.IsEmpty:
-        case ViewFilterOperand.IsNotEmpty:
+        case RecordFilterOperand.IsEmpty:
+        case RecordFilterOperand.IsNotEmpty:
           return getEmptyRecordGqlOperationFilter(
             filter.operand,
             correspondingField,
@@ -626,13 +635,13 @@ const computeFilterRecordGqlOperationFilter = (
       if (options.length === 0) return;
 
       switch (filter.operand) {
-        case ViewFilterOperand.Contains:
+        case RecordFilterOperand.Contains:
           return {
             [correspondingField.name]: {
               containsAny: options,
             } as MultiSelectFilter,
           };
-        case ViewFilterOperand.DoesNotContain:
+        case RecordFilterOperand.DoesNotContain:
           return {
             or: [
               {
@@ -673,13 +682,13 @@ const computeFilterRecordGqlOperationFilter = (
       if (options.length === 0) return;
 
       switch (filter.operand) {
-        case ViewFilterOperand.Is:
+        case RecordFilterOperand.Is:
           return {
             [correspondingField.name]: {
               in: options,
             } as SelectFilter,
           };
-        case ViewFilterOperand.IsNot:
+        case RecordFilterOperand.IsNot:
           return {
             not: {
               [correspondingField.name]: {
@@ -695,13 +704,13 @@ const computeFilterRecordGqlOperationFilter = (
     }
     case 'ARRAY': {
       switch (filter.operand) {
-        case ViewFilterOperand.Contains:
+        case RecordFilterOperand.Contains:
           return {
             [correspondingField.name]: {
               containsIlike: `%${filter.value}%`,
             } as ArrayFilter,
           };
-        case ViewFilterOperand.DoesNotContain:
+        case RecordFilterOperand.DoesNotContain:
           return {
             not: {
               [correspondingField.name]: {
@@ -709,8 +718,8 @@ const computeFilterRecordGqlOperationFilter = (
               } as ArrayFilter,
             },
           };
-        case ViewFilterOperand.IsEmpty:
-        case ViewFilterOperand.IsNotEmpty:
+        case RecordFilterOperand.IsEmpty:
+        case RecordFilterOperand.IsNotEmpty:
           return getEmptyRecordGqlOperationFilter(
             filter.operand,
             correspondingField,
@@ -725,7 +734,7 @@ const computeFilterRecordGqlOperationFilter = (
     // TODO: fix this with a new composite field in ViewFilter entity
     case 'ACTOR': {
       switch (filter.operand) {
-        case ViewFilterOperand.Is: {
+        case RecordFilterOperand.Is: {
           const parsedRecordIds = JSON.parse(filter.value) as string[];
 
           return {
@@ -736,7 +745,7 @@ const computeFilterRecordGqlOperationFilter = (
             },
           };
         }
-        case ViewFilterOperand.IsNot: {
+        case RecordFilterOperand.IsNot: {
           const parsedRecordIds = JSON.parse(filter.value) as string[];
 
           if (parsedRecordIds.length === 0) return;
@@ -751,7 +760,7 @@ const computeFilterRecordGqlOperationFilter = (
             },
           };
         }
-        case ViewFilterOperand.Contains:
+        case RecordFilterOperand.Contains:
           return {
             or: [
               {
@@ -763,7 +772,7 @@ const computeFilterRecordGqlOperationFilter = (
               },
             ],
           };
-        case ViewFilterOperand.DoesNotContain:
+        case RecordFilterOperand.DoesNotContain:
           return {
             and: [
               {
@@ -777,8 +786,8 @@ const computeFilterRecordGqlOperationFilter = (
               },
             ],
           };
-        case ViewFilterOperand.IsEmpty:
-        case ViewFilterOperand.IsNotEmpty:
+        case RecordFilterOperand.IsEmpty:
+        case RecordFilterOperand.IsNotEmpty:
           return getEmptyRecordGqlOperationFilter(
             filter.operand,
             correspondingField,
@@ -792,7 +801,7 @@ const computeFilterRecordGqlOperationFilter = (
     }
     case 'EMAILS':
       switch (filter.operand) {
-        case ViewFilterOperand.Contains:
+        case RecordFilterOperand.Contains:
           return {
             or: [
               {
@@ -804,7 +813,7 @@ const computeFilterRecordGqlOperationFilter = (
               },
             ],
           };
-        case ViewFilterOperand.DoesNotContain:
+        case RecordFilterOperand.DoesNotContain:
           return {
             and: [
               {
@@ -818,8 +827,8 @@ const computeFilterRecordGqlOperationFilter = (
               },
             ],
           };
-        case ViewFilterOperand.IsEmpty:
-        case ViewFilterOperand.IsNotEmpty:
+        case RecordFilterOperand.IsEmpty:
+        case RecordFilterOperand.IsNotEmpty:
           return getEmptyRecordGqlOperationFilter(
             filter.operand,
             correspondingField,
@@ -831,26 +840,37 @@ const computeFilterRecordGqlOperationFilter = (
           );
       }
     case 'PHONES': {
-      const phonesFilters = generateILikeFiltersForCompositeFields(
-        filter.value,
-        correspondingField.name,
-        ['primaryPhoneNumber', 'primaryPhoneCountryCode'],
-      );
+      const filterValue = filter.value.replace(/[^0-9]/g, '');
+
       switch (filter.operand) {
-        case ViewFilterOperand.Contains:
+        case RecordFilterOperand.Contains:
           return {
-            or: phonesFilters,
+            or: [
+              {
+                [correspondingField.name]: {
+                  primaryPhoneNumber: {
+                    ilike: `%${filterValue}%`,
+                  },
+                } as PhonesFilter,
+              },
+            ],
           };
-        case ViewFilterOperand.DoesNotContain:
+        case RecordFilterOperand.DoesNotContain:
           return {
-            and: phonesFilters.map((filter) => {
-              return {
-                not: filter,
-              };
-            }),
+            and: [
+              {
+                not: {
+                  [correspondingField.name]: {
+                    primaryPhoneNumber: {
+                      ilike: `%${filterValue}%`,
+                    },
+                  } as PhonesFilter,
+                },
+              },
+            ],
           };
-        case ViewFilterOperand.IsEmpty:
-        case ViewFilterOperand.IsNotEmpty:
+        case RecordFilterOperand.IsEmpty:
+        case RecordFilterOperand.IsNotEmpty:
           return getEmptyRecordGqlOperationFilter(
             filter.operand,
             correspondingField,
@@ -875,8 +895,8 @@ const computeFilterRecordGqlOperationFilter = (
 };
 
 const computeViewFilterGroupRecordGqlOperationFilter = (
-  filterValueDependencies: FilterValueDependencies,
-  filters: Filter[],
+  filterValueDependencies: RecordFilterValueDependencies,
+  filters: RecordFilter[],
   fields: Pick<Field, 'id' | 'name'>[],
   viewFilterGroups: ViewFilterGroup[],
   currentViewFilterGroupId?: string,
@@ -946,8 +966,8 @@ const computeViewFilterGroupRecordGqlOperationFilter = (
 };
 
 export const computeViewRecordGqlOperationFilter = (
-  filterValueDependencies: FilterValueDependencies,
-  filters: Filter[],
+  filterValueDependencies: RecordFilterValueDependencies,
+  filters: RecordFilter[],
   fields: Pick<Field, 'id' | 'name'>[],
   viewFilterGroups: ViewFilterGroup[],
 ): RecordGqlOperationFilter => {
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/utils/getEmptyRecordGqlOperationFilter.ts b/packages/twenty-front/src/modules/object-record/record-filter/utils/getEmptyRecordGqlOperationFilter.ts
index b2cce9468bc5..cabfc67d779f 100644
--- a/packages/twenty-front/src/modules/object-record/record-filter/utils/getEmptyRecordGqlOperationFilter.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/utils/getEmptyRecordGqlOperationFilter.ts
@@ -15,7 +15,7 @@ import {
   StringFilter,
   URLFilter,
 } from '@/object-record/graphql/types/RecordGqlOperationFilter';
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 import { isNonEmptyString } from '@sniptt/guards';
 import { Field } from '~/generated/graphql';
@@ -24,7 +24,7 @@ import { generateILikeFiltersForCompositeFields } from '~/utils/array/generateIL
 export const getEmptyRecordGqlOperationFilter = (
   operand: ViewFilterOperand,
   correspondingField: Pick<Field, 'id' | 'name'>,
-  definition: FilterDefinition,
+  definition: RecordFilterDefinition,
 ) => {
   let emptyRecordFilter: RecordGqlOperationFilter = {};
 
@@ -46,7 +46,7 @@ export const getEmptyRecordGqlOperationFilter = (
         const phonesFilter = generateILikeFiltersForCompositeFields(
           '',
           correspondingField.name,
-          ['primaryPhoneNumber', 'primaryPhoneCountryCode'],
+          ['primaryPhoneNumber'],
           true,
         );
 
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/utils/getRecordFilterOperandsForRecordFilterDefinition.ts b/packages/twenty-front/src/modules/object-record/record-filter/utils/getRecordFilterOperandsForRecordFilterDefinition.ts
new file mode 100644
index 000000000000..9effb7202880
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-filter/utils/getRecordFilterOperandsForRecordFilterDefinition.ts
@@ -0,0 +1,99 @@
+import { isActorSourceCompositeFilter } from '@/object-record/object-filter-dropdown/utils/isActorSourceCompositeFilter';
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
+import { ViewFilterOperand as RecordFilterOperand } from '@/views/types/ViewFilterOperand';
+
+export const getRecordFilterOperandsForRecordFilterDefinition = (
+  filterDefinition: Pick<RecordFilterDefinition, 'type' | 'compositeFieldName'>,
+): RecordFilterOperand[] => {
+  const emptyOperands = [
+    RecordFilterOperand.IsEmpty,
+    RecordFilterOperand.IsNotEmpty,
+  ];
+
+  const relationOperands = [RecordFilterOperand.Is, RecordFilterOperand.IsNot];
+
+  switch (filterDefinition.type) {
+    case 'TEXT':
+    case 'EMAILS':
+    case 'FULL_NAME':
+    case 'ADDRESS':
+    case 'LINKS':
+    case 'PHONES':
+      return [
+        RecordFilterOperand.Contains,
+        RecordFilterOperand.DoesNotContain,
+        ...emptyOperands,
+      ];
+    case 'CURRENCY':
+    case 'NUMBER':
+      return [
+        RecordFilterOperand.GreaterThan,
+        RecordFilterOperand.LessThan,
+        ...emptyOperands,
+      ];
+    case 'RAW_JSON':
+      return [
+        RecordFilterOperand.Contains,
+        RecordFilterOperand.DoesNotContain,
+        ...emptyOperands,
+      ];
+    case 'DATE_TIME':
+    case 'DATE':
+      return [
+        RecordFilterOperand.Is,
+        RecordFilterOperand.IsRelative,
+        RecordFilterOperand.IsInPast,
+        RecordFilterOperand.IsInFuture,
+        RecordFilterOperand.IsToday,
+        RecordFilterOperand.IsBefore,
+        RecordFilterOperand.IsAfter,
+        ...emptyOperands,
+      ];
+    case 'RATING':
+      return [
+        RecordFilterOperand.Is,
+        RecordFilterOperand.GreaterThan,
+        RecordFilterOperand.LessThan,
+        ...emptyOperands,
+      ];
+    case 'RELATION':
+      return [...relationOperands, ...emptyOperands];
+    case 'MULTI_SELECT':
+      return [
+        RecordFilterOperand.Contains,
+        RecordFilterOperand.DoesNotContain,
+        ...emptyOperands,
+      ];
+    case 'SELECT':
+      return [
+        RecordFilterOperand.Is,
+        RecordFilterOperand.IsNot,
+        ...emptyOperands,
+      ];
+    case 'ACTOR': {
+      if (isActorSourceCompositeFilter(filterDefinition)) {
+        return [
+          RecordFilterOperand.Is,
+          RecordFilterOperand.IsNot,
+          ...emptyOperands,
+        ];
+      }
+
+      return [
+        RecordFilterOperand.Contains,
+        RecordFilterOperand.DoesNotContain,
+        ...emptyOperands,
+      ];
+    }
+    case 'ARRAY':
+      return [
+        RecordFilterOperand.Contains,
+        RecordFilterOperand.DoesNotContain,
+        ...emptyOperands,
+      ];
+    case 'BOOLEAN':
+      return [RecordFilterOperand.Is];
+    default:
+      return [];
+  }
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/utils/isRecordMatchingFilter.ts b/packages/twenty-front/src/modules/object-record/record-filter/utils/isRecordMatchingFilter.ts
index 88b3780b8c7e..073846bd102b 100644
--- a/packages/twenty-front/src/modules/object-record/record-filter/utils/isRecordMatchingFilter.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/utils/isRecordMatchingFilter.ts
@@ -166,18 +166,18 @@ export const isRecordMatchingFilter = ({
     }
 
     switch (objectMetadataField.type) {
-      case FieldMetadataType.Rating:
+      case FieldMetadataType.RATING:
         return isMatchingRatingFilter({
           ratingFilter: filterValue as RatingFilter,
           value: record[filterKey],
         });
-      case FieldMetadataType.Text: {
+      case FieldMetadataType.TEXT: {
         return isMatchingStringFilter({
           stringFilter: filterValue as StringFilter,
           value: record[filterKey],
         });
       }
-      case FieldMetadataType.RichText: {
+      case FieldMetadataType.RICH_TEXT: {
         // TODO: Implement a better rich text filter once it becomes a composite field
         // See this issue for more context: https://github.com/twentyhq/twenty/issues/7613#issuecomment-2408944585
         // This should be tackled in Q4'24
@@ -186,29 +186,29 @@ export const isRecordMatchingFilter = ({
           value: record[filterKey],
         });
       }
-      case FieldMetadataType.Select:
+      case FieldMetadataType.SELECT:
         return isMatchingSelectFilter({
           selectFilter: filterValue as SelectFilter,
           value: record[filterKey],
         });
-      case FieldMetadataType.MultiSelect:
+      case FieldMetadataType.MULTI_SELECT:
         return isMatchingMultiSelectFilter({
           multiSelectFilter: filterValue as MultiSelectFilter,
           value: record[filterKey],
         });
-      case FieldMetadataType.Array: {
+      case FieldMetadataType.ARRAY: {
         return isMatchingArrayFilter({
           arrayFilter: filterValue as ArrayFilter,
           value: record[filterKey],
         });
       }
-      case FieldMetadataType.RawJson: {
+      case FieldMetadataType.RAW_JSON: {
         return isMatchingRawJsonFilter({
           rawJsonFilter: filterValue as RawJsonFilter,
           value: record[filterKey],
         });
       }
-      case FieldMetadataType.FullName: {
+      case FieldMetadataType.FULL_NAME: {
         const fullNameFilter = filterValue as FullNameFilter;
 
         return (
@@ -224,7 +224,7 @@ export const isRecordMatchingFilter = ({
             }))
         );
       }
-      case FieldMetadataType.Address: {
+      case FieldMetadataType.ADDRESS: {
         const addressFilter = filterValue as AddressFilter;
 
         const keys = [
@@ -248,7 +248,7 @@ export const isRecordMatchingFilter = ({
           });
         });
       }
-      case FieldMetadataType.Links: {
+      case FieldMetadataType.LINKS: {
         const linksFilter = filterValue as LinksFilter;
 
         const keys = ['primaryLinkLabel', 'primaryLinkUrl'] as const;
@@ -265,39 +265,39 @@ export const isRecordMatchingFilter = ({
           });
         });
       }
-      case FieldMetadataType.Date:
-      case FieldMetadataType.DateTime: {
+      case FieldMetadataType.DATE:
+      case FieldMetadataType.DATE_TIME: {
         return isMatchingDateFilter({
           dateFilter: filterValue as DateFilter,
           value: record[filterKey],
         });
       }
-      case FieldMetadataType.Number:
-      case FieldMetadataType.Numeric: {
+      case FieldMetadataType.NUMBER:
+      case FieldMetadataType.NUMERIC: {
         return isMatchingFloatFilter({
           floatFilter: filterValue as FloatFilter,
           value: record[filterKey],
         });
       }
-      case FieldMetadataType.Uuid: {
+      case FieldMetadataType.UUID: {
         return isMatchingUUIDFilter({
           uuidFilter: filterValue as UUIDFilter,
           value: record[filterKey],
         });
       }
-      case FieldMetadataType.Boolean: {
+      case FieldMetadataType.BOOLEAN: {
         return isMatchingBooleanFilter({
           booleanFilter: filterValue as BooleanFilter,
           value: record[filterKey],
         });
       }
-      case FieldMetadataType.Currency: {
+      case FieldMetadataType.CURRENCY: {
         return isMatchingCurrencyFilter({
           currencyFilter: filterValue as CurrencyFilter,
           value: record[filterKey].amountMicros,
         });
       }
-      case FieldMetadataType.Actor: {
+      case FieldMetadataType.ACTOR: {
         const actorFilter = filterValue as ActorFilter;
 
         return (
@@ -308,7 +308,7 @@ export const isRecordMatchingFilter = ({
           })
         );
       }
-      case FieldMetadataType.Emails: {
+      case FieldMetadataType.EMAILS: {
         const emailsFilter = filterValue as EmailsFilter;
 
         if (emailsFilter.primaryEmail === undefined) {
@@ -320,13 +320,10 @@ export const isRecordMatchingFilter = ({
           value: record[filterKey].primaryEmail,
         });
       }
-      case FieldMetadataType.Phones: {
+      case FieldMetadataType.PHONES: {
         const phonesFilter = filterValue as PhonesFilter;
 
-        const keys: (keyof PhonesFilter)[] = [
-          'primaryPhoneNumber',
-          'primaryPhoneCountryCode',
-        ];
+        const keys: (keyof PhonesFilter)[] = ['primaryPhoneNumber'];
 
         return keys.some((key) => {
           const value = phonesFilter[key];
@@ -340,7 +337,7 @@ export const isRecordMatchingFilter = ({
           });
         });
       }
-      case FieldMetadataType.Relation: {
+      case FieldMetadataType.RELATION: {
         throw new Error(
           `Not implemented yet, use UUID filter instead on the corredponding "${filterKey}Id" field`,
         );
diff --git a/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupActions.ts b/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupActions.ts
index 57fed7770fd2..9110c1cc775d 100644
--- a/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupActions.ts
+++ b/packages/twenty-front/src/modules/object-record/record-group/hooks/useRecordGroupActions.ts
@@ -4,13 +4,15 @@ import { useRecordGroupVisibility } from '@/object-record/record-group/hooks/use
 import { recordGroupFieldMetadataComponentState } from '@/object-record/record-group/states/recordGroupFieldMetadataComponentState';
 import { RecordGroupAction } from '@/object-record/record-group/types/RecordGroupActions';
 import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
+import { SettingsPath } from '@/types/SettingsPath';
 import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { ViewType } from '@/views/types/ViewType';
 import { useCallback, useContext, useMemo } from 'react';
-import { useLocation, useNavigate } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
 import { useSetRecoilState } from 'recoil';
 import { IconEyeOff, IconSettings, isDefined } from 'twenty-ui';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 
 type UseRecordGroupActionsParams = {
   viewType: ViewType;
@@ -19,7 +21,7 @@ type UseRecordGroupActionsParams = {
 export const useRecordGroupActions = ({
   viewType,
 }: UseRecordGroupActionsParams) => {
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
   const location = useLocation();
 
   const { objectNameSingular, recordIndexId } = useRecordIndexContextOrThrow();
@@ -53,9 +55,10 @@ export const useRecordGroupActions = ({
       throw new Error('recordGroupFieldMetadata is not a non-empty string');
     }
 
-    const settingsPath = `/settings/objects/${objectMetadataItem.namePlural}/${recordGroupFieldMetadata.name}`;
-
-    navigate(settingsPath);
+    navigate(SettingsPath.ObjectFieldEdit, {
+      objectNamePlural: objectMetadataItem.namePlural,
+      fieldName: recordGroupFieldMetadata.name,
+    });
   }, [
     setNavigationMemorizedUrl,
     location.pathname,
@@ -83,7 +86,10 @@ export const useRecordGroupActions = ({
           icon: IconEyeOff,
           position: 1,
           callback: () => {
-            handleRecordGroupVisibilityChange(recordGroupDefinition);
+            handleRecordGroupVisibilityChange({
+              ...recordGroupDefinition,
+              isVisible: false,
+            });
           },
         },
       ].filter(isDefined),
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainer.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainer.tsx
index 20abc2d6fa5f..0ebff1827a5a 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainer.tsx
@@ -1,5 +1,6 @@
 import styled from '@emotion/styled';
 import { useRecoilCallback, useRecoilState, useSetRecoilState } from 'recoil';
+import { isDefined } from '~/utils/isDefined';
 
 import { useColumnDefinitionsFromFieldMetadata } from '@/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata';
 import { ObjectOptionsDropdown } from '@/object-record/object-options-dropdown/components/ObjectOptionsDropdown';
@@ -7,7 +8,6 @@ import { RecordIndexBoardContainer } from '@/object-record/record-index/componen
 import { RecordIndexBoardDataLoader } from '@/object-record/record-index/components/RecordIndexBoardDataLoader';
 import { RecordIndexBoardDataLoaderEffect } from '@/object-record/record-index/components/RecordIndexBoardDataLoaderEffect';
 import { RecordIndexTableContainer } from '@/object-record/record-index/components/RecordIndexTableContainer';
-import { RecordIndexTableContainerEffect } from '@/object-record/record-index/components/RecordIndexTableContainerEffect';
 import { RecordIndexViewBarEffect } from '@/object-record/record-index/components/RecordIndexViewBarEffect';
 import { recordIndexFieldDefinitionsState } from '@/object-record/record-index/states/recordIndexFieldDefinitionsState';
 import { recordIndexFiltersState } from '@/object-record/record-index/states/recordIndexFiltersState';
@@ -28,9 +28,11 @@ import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/s
 import { ContextStoreViewType } from '@/context-store/types/ContextStoreViewType';
 import { useSetRecordGroup } from '@/object-record/record-group/hooks/useSetRecordGroup';
 import { RecordIndexFiltersToContextStoreEffect } from '@/object-record/record-index/components/RecordIndexFiltersToContextStoreEffect';
+import { RecordIndexTableContainerEffect } from '@/object-record/record-index/components/RecordIndexTableContainerEffect';
 import { recordIndexKanbanAggregateOperationState } from '@/object-record/record-index/states/recordIndexKanbanAggregateOperationState';
 import { recordIndexViewFilterGroupsState } from '@/object-record/record-index/states/recordIndexViewFilterGroupsState';
 import { viewFieldAggregateOperationState } from '@/object-record/record-table/record-table-footer/states/viewFieldAggregateOperationState';
+import { convertAggregateOperationToExtendedAggregateOperation } from '@/object-record/utils/convertAggregateOperationToExtendedAggregateOperation';
 import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 import { ViewBar } from '@/views/components/ViewBar';
 import { ViewField } from '@/views/types/ViewField';
@@ -125,6 +127,9 @@ export const RecordIndexContainer = () => {
         }
 
         for (const viewField of viewFields) {
+          const viewFieldMetadataType = objectMetadataItem.fields?.find(
+            (field) => field.id === viewField.fieldMetadataId,
+          )?.type;
           const aggregateOperationForViewField = snapshot
             .getLoadable(
               viewFieldAggregateOperationState({
@@ -133,17 +138,29 @@ export const RecordIndexContainer = () => {
             )
             .getValue();
 
-          if (aggregateOperationForViewField !== viewField.aggregateOperation) {
+          const convertedViewFieldAggregateOperation = isDefined(
+            viewField.aggregateOperation,
+          )
+            ? convertAggregateOperationToExtendedAggregateOperation(
+                viewField.aggregateOperation,
+                viewFieldMetadataType,
+              )
+            : viewField.aggregateOperation;
+
+          if (
+            aggregateOperationForViewField !==
+            convertedViewFieldAggregateOperation
+          ) {
             set(
               viewFieldAggregateOperationState({
                 viewFieldId: viewField.id,
               }),
-              viewField.aggregateOperation,
+              convertedViewFieldAggregateOperation,
             );
           }
         }
       },
-    [columnDefinitions, setTableColumns],
+    [columnDefinitions, objectMetadataItem.fields, setTableColumns],
   );
 
   const onViewGroupsChange = useCallback(
@@ -162,8 +179,8 @@ export const RecordIndexContainer = () => {
     contextStoreTargetedRecordsRuleComponentState,
   );
 
-  const isPageHeaderV2Enabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsPageHeaderV2Enabled,
+  const isCommandMenuV2Enabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsCommandMenuV2Enabled,
   );
 
   return (
@@ -220,8 +237,18 @@ export const RecordIndexContainer = () => {
                 setRecordIndexViewKanbanFieldMetadataIdState(
                   view.kanbanFieldMetadataId,
                 );
+                const kanbanAggregateOperationFieldMetadataType =
+                  objectMetadataItem.fields?.find(
+                    (field) =>
+                      field.id === view.kanbanAggregateOperationFieldMetadataId,
+                  )?.type;
                 setRecordIndexViewKanbanAggregateOperationState({
-                  operation: view.kanbanAggregateOperation,
+                  operation: isDefined(view.kanbanAggregateOperation)
+                    ? convertAggregateOperationToExtendedAggregateOperation(
+                        view.kanbanAggregateOperation,
+                        kanbanAggregateOperationFieldMetadataType,
+                      )
+                    : view.kanbanAggregateOperation,
                   fieldMetadataId: view.kanbanAggregateOperationFieldMetadataId,
                 });
                 setRecordIndexIsCompactModeActive(view.isCompact);
@@ -256,7 +283,7 @@ export const RecordIndexContainer = () => {
               <RecordIndexBoardDataLoaderEffect recordBoardId={recordIndexId} />
             </StyledContainerWithPadding>
           )}
-          {!isPageHeaderV2Enabled && (
+          {!isCommandMenuV2Enabled && (
             <RecordIndexActionMenu indexId={recordIndexId} />
           )}
         </RecordFieldValueSelectorContextProvider>
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageHeader.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageHeader.tsx
index 49fbf94c42c0..229f69b52b60 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageHeader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageHeader.tsx
@@ -36,8 +36,8 @@ export const RecordIndexPageHeader = () => {
     contextStoreNumberOfSelectedRecordsComponentState,
   );
 
-  const isPageHeaderV2Enabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsPageHeaderV2Enabled,
+  const isCommandMenuV2Enabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsCommandMenuV2Enabled,
   );
 
   const isObjectMetadataItemReadOnly =
@@ -45,8 +45,9 @@ export const RecordIndexPageHeader = () => {
     isObjectMetadataReadOnly(objectMetadataItem);
 
   const shouldDisplayAddButton =
-    (numberOfSelectedRecords === 0 || !isPageHeaderV2Enabled) &&
-    !isObjectMetadataItemReadOnly;
+    (numberOfSelectedRecords === 0 || !isCommandMenuV2Enabled) &&
+    !isObjectMetadataItemReadOnly &&
+    !isCommandMenuV2Enabled;
 
   const isTable = recordIndexViewType === ViewType.Table;
 
@@ -65,7 +66,7 @@ export const RecordIndexPageHeader = () => {
           <RecordIndexPageKanbanAddButton />
         ))}
 
-      {isPageHeaderV2Enabled && (
+      {isCommandMenuV2Enabled && (
         <>
           <RecordIndexActionMenu indexId={recordIndexId} />
           <PageHeaderOpenCommandMenuButton />
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageTableAddButtonNoGroup.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageTableAddButtonNoGroup.tsx
index b9d4fbe65ba1..66b8c3a5830f 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageTableAddButtonNoGroup.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageTableAddButtonNoGroup.tsx
@@ -4,9 +4,12 @@ import { PageAddButton } from '@/ui/layout/page/components/PageAddButton';
 import { PageHotkeysEffect } from '@/ui/layout/page/components/PageHotkeysEffect';
 
 export const RecordIndexPageTableAddButtonNoGroup = () => {
-  const { recordIndexId } = useRecordIndexContextOrThrow();
+  const { recordIndexId, objectMetadataItem } = useRecordIndexContextOrThrow();
 
-  const { createNewTableRecord } = useCreateNewTableRecord(recordIndexId);
+  const { createNewTableRecord } = useCreateNewTableRecord({
+    objectMetadataItem,
+    recordTableId: recordIndexId,
+  });
 
   const handleCreateNewTableRecord = () => {
     createNewTableRecord();
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainerEffect.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainerEffect.tsx
index f46be75a4174..040d6ae35a65 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainerEffect.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexTableContainerEffect.tsx
@@ -5,12 +5,14 @@ import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadata
 import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
 import { useHandleToggleColumnFilter } from '@/object-record/record-index/hooks/useHandleToggleColumnFilter';
 import { useHandleToggleColumnSort } from '@/object-record/record-index/hooks/useHandleToggleColumnSort';
+import { useSetRecordIndexEntityCount } from '@/object-record/record-index/hooks/useSetRecordIndexEntityCount';
 import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
 import { viewFieldAggregateOperationState } from '@/object-record/record-table/record-table-footer/states/viewFieldAggregateOperationState';
+import { convertAggregateOperationToExtendedAggregateOperation } from '@/object-record/utils/convertAggregateOperationToExtendedAggregateOperation';
 import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
-import { useSetRecordCountInCurrentView } from '@/views/hooks/useSetRecordCountInCurrentView';
 import { ViewField } from '@/views/types/ViewField';
 import { useRecoilCallback } from 'recoil';
+import { isDefined } from 'twenty-ui';
 
 export const RecordIndexTableContainerEffect = () => {
   const { recordIndexId, objectNameSingular } = useRecordIndexContextOrThrow();
@@ -33,8 +35,7 @@ export const RecordIndexTableContainerEffect = () => {
   const { columnDefinitions } =
     useColumnDefinitionsFromFieldMetadata(objectMetadataItem);
 
-  const { setRecordCountInCurrentView } =
-    useSetRecordCountInCurrentView(viewBarId);
+  const { setRecordIndexEntityCount } = useSetRecordIndexEntityCount(viewBarId);
 
   useEffect(() => {
     setAvailableTableColumns(columnDefinitions);
@@ -68,9 +69,10 @@ export const RecordIndexTableContainerEffect = () => {
 
   useEffect(() => {
     setOnEntityCountChange(
-      () => (entityCount: number) => setRecordCountInCurrentView(entityCount),
+      () => (entityCount: number, currentRecordGroupId?: string) =>
+        setRecordIndexEntityCount(entityCount, currentRecordGroupId),
     );
-  }, [setRecordCountInCurrentView, setOnEntityCountChange]);
+  }, [setRecordIndexEntityCount, setOnEntityCountChange]);
 
   const setViewFieldAggregateOperation = useRecoilCallback(
     ({ set, snapshot }) =>
@@ -83,16 +85,33 @@ export const RecordIndexTableContainerEffect = () => {
           )
           .getValue();
 
-        if (aggregateOperationForViewField !== viewField.aggregateOperation) {
+        const viewFieldMetadataType = columnDefinitions.find(
+          (columnDefinition) =>
+            columnDefinition.fieldMetadataId === viewField.fieldMetadataId,
+        )?.type;
+
+        const convertedViewFieldAggregateOperation = isDefined(
+          viewField.aggregateOperation,
+        )
+          ? convertAggregateOperationToExtendedAggregateOperation(
+              viewField.aggregateOperation,
+              viewFieldMetadataType,
+            )
+          : viewField.aggregateOperation;
+
+        if (
+          aggregateOperationForViewField !==
+          convertedViewFieldAggregateOperation
+        ) {
           set(
             viewFieldAggregateOperationState({
               viewFieldId: viewField.id,
             }),
-            viewField.aggregateOperation,
+            convertedViewFieldAggregateOperation,
           );
         }
       },
-    [],
+    [columnDefinitions],
   );
 
   useEffect(() => {
diff --git a/packages/twenty-front/src/modules/object-record/record-index/export/hooks/__tests__/useExportRecords.test.ts b/packages/twenty-front/src/modules/object-record/record-index/export/hooks/__tests__/useExportRecords.test.ts
index 2f1bf0e37802..790d35893109 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/export/hooks/__tests__/useExportRecords.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/export/hooks/__tests__/useExportRecords.test.ts
@@ -16,7 +16,7 @@ describe('generateCsv', () => {
         label: 'Relation',
         metadata: {
           fieldName: 'relation',
-          relationType: RelationDefinitionType.ManyToOne,
+          relationType: RelationDefinitionType.MANY_TO_ONE,
         },
       },
     ] as ColumnDefinition<FieldMetadata>[];
diff --git a/packages/twenty-front/src/modules/object-record/record-index/export/hooks/useExportProcessRecordsForCSV.ts b/packages/twenty-front/src/modules/object-record/record-index/export/hooks/useExportProcessRecordsForCSV.ts
index 491b96bb356b..2476ccc059cc 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/export/hooks/useExportProcessRecordsForCSV.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/export/hooks/useExportProcessRecordsForCSV.ts
@@ -13,7 +13,7 @@ export const useExportProcessRecordsForCSV = (objectNameSingular: string) => {
   const processRecordsForCSVExport = (records: ObjectRecord[]) => {
     return records.map((record) => {
       const currencyFields = objectMetadataItem.fields.filter(
-        (field) => field.type === FieldMetadataType.Currency,
+        (field) => field.type === FieldMetadataType.CURRENCY,
       );
 
       const processedRecord = {
diff --git a/packages/twenty-front/src/modules/object-record/record-index/export/hooks/useExportRecords.ts b/packages/twenty-front/src/modules/object-record/record-index/export/hooks/useExportRecords.ts
index 4094adb1d86a..247bdd14c24e 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/export/hooks/useExportRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/export/hooks/useExportRecords.ts
@@ -36,12 +36,12 @@ export const generateCsv: GenerateExport = ({
   const columnsToExport = columns.filter(
     (col) =>
       !('relationType' in col.metadata && col.metadata.relationType) ||
-      col.metadata.relationType === RelationDefinitionType.ManyToOne,
+      col.metadata.relationType === RelationDefinitionType.MANY_TO_ONE,
   );
 
   const objectIdColumn: ColumnDefinition<FieldMetadata> = {
     fieldMetadataId: '',
-    type: FieldMetadataType.Uuid,
+    type: FieldMetadataType.UUID,
     iconName: '',
     label: `Id`,
     metadata: {
diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useFindManyRecordIndexTableParams.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useFindManyRecordIndexTableParams.ts
index df15ba3715c5..4e69c157aba1 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useFindManyRecordIndexTableParams.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useFindManyRecordIndexTableParams.ts
@@ -1,10 +1,10 @@
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { turnSortsIntoOrderBy } from '@/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy';
 import { useFilterValueDependencies } from '@/object-record/record-filter/hooks/useFilterValueDependencies';
+import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
 import { computeViewRecordGqlOperationFilter } from '@/object-record/record-filter/utils/computeViewRecordGqlOperationFilter';
 import { useCurrentRecordGroupDefinition } from '@/object-record/record-group/hooks/useCurrentRecordGroupDefinition';
 import { useRecordGroupFilter } from '@/object-record/record-group/hooks/useRecordGroupFilter';
-import { tableFiltersComponentState } from '@/object-record/record-table/states/tableFiltersComponentState';
 import { tableSortsComponentState } from '@/object-record/record-table/states/tableSortsComponentState';
 import { tableViewFilterGroupsComponentState } from '@/object-record/record-table/states/tableViewFilterGroupsComponentState';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
@@ -27,20 +27,21 @@ export const useFindManyRecordIndexTableParams = (
     tableViewFilterGroupsComponentState,
     recordTableId,
   );
-  const tableFilters = useRecoilComponentValueV2(
-    tableFiltersComponentState,
-    recordTableId,
-  );
+
   const tableSorts = useRecoilComponentValueV2(
     tableSortsComponentState,
     recordTableId,
   );
 
+  const currentRecordFilters = useRecoilComponentValueV2(
+    currentRecordFiltersComponentState,
+  );
+
   const { filterValueDependencies } = useFilterValueDependencies();
 
   const stateFilter = computeViewRecordGqlOperationFilter(
     filterValueDependencies,
-    tableFilters,
+    currentRecordFilters,
     objectMetadataItem?.fields ?? [],
     tableViewFilterGroups,
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleIndexIdentifierClick.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleIndexIdentifierClick.ts
index cc9f154ba535..0cd17e877e1c 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleIndexIdentifierClick.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleIndexIdentifierClick.ts
@@ -1,7 +1,8 @@
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { buildShowPageURL } from '@/object-record/record-show/utils/buildShowPageURL';
+import { AppPath } from '@/types/AppPath';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { currentViewIdComponentState } from '@/views/states/currentViewIdComponentState';
+import { getAppPath } from '~/utils/navigation/getAppPath';
 
 export const useHandleIndexIdentifierClick = ({
   objectMetadataItem,
@@ -16,12 +17,16 @@ export const useHandleIndexIdentifierClick = ({
   );
 
   const indexIdentifierUrl = (recordId: string) => {
-    const showPageURL = buildShowPageURL(
-      objectMetadataItem.nameSingular,
-      recordId,
-      currentViewId,
+    return getAppPath(
+      AppPath.RecordShowPage,
+      {
+        objectNameSingular: objectMetadataItem.nameSingular,
+        objectRecordId: recordId,
+      },
+      {
+        viewId: currentViewId,
+      },
     );
-    return showPageURL;
   };
 
   return { indexIdentifierUrl };
diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleColumnFilter.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleColumnFilter.ts
index 1052a3852290..daa0bb001a61 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleColumnFilter.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleColumnFilter.ts
@@ -3,9 +3,11 @@ import { v4 } from 'uuid';
 
 import { useColumnDefinitionsFromFieldMetadata } from '@/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { useSetFilterDefinitionUsedInDropdownInScope } from '@/object-record/object-filter-dropdown/hooks/useSetFilterDefinitionUsedInDropdownInScope';
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
-import { getOperandsForFilterDefinition } from '@/object-record/object-filter-dropdown/utils/getOperandsForFilterType';
+import { useSelectFilterDefinitionUsedInDropdown } from '@/object-record/object-filter-dropdown/hooks/useSelectFilterDefinitionUsedInDropdown';
+
+import { useUpsertRecordFilter } from '@/object-record/record-filter/hooks/useUpsertRecordFilter';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
+import { getRecordFilterOperandsForRecordFilterDefinition } from '@/object-record/record-filter/utils/getRecordFilterOperandsForRecordFilterDefinition';
 import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { extractComponentState } from '@/ui/utilities/state/component-state/utils/extractComponentState';
@@ -32,6 +34,7 @@ export const useHandleToggleColumnFilter = ({
     useColumnDefinitionsFromFieldMetadata(objectMetadataItem);
 
   const { upsertCombinedViewFilter } = useUpsertCombinedViewFilters(viewBarId);
+  const { upsertRecordFilter } = useUpsertRecordFilter();
 
   const openDropdown = useRecoilCallback(({ set }) => {
     return (dropdownId: string) => {
@@ -50,8 +53,8 @@ export const useHandleToggleColumnFilter = ({
 
   const { currentViewWithCombinedFiltersAndSorts } = useGetCurrentView();
 
-  const { setFilterDefinitionUsedInDropdownInScope } =
-    useSetFilterDefinitionUsedInDropdownInScope();
+  const { selectFilterDefinitionUsedInDropdown } =
+    useSelectFilterDefinitionUsedInDropdown(viewBarId);
 
   const handleToggleColumnFilter = useCallback(
     async (fieldMetadataId: string) => {
@@ -79,11 +82,11 @@ export const useHandleToggleColumnFilter = ({
         }
 
         const availableOperandsForFilter =
-          getOperandsForFilterDefinition(filterDefinition);
+          getRecordFilterOperandsForRecordFilterDefinition(filterDefinition);
 
         const defaultOperand = availableOperandsForFilter[0];
 
-        const newFilter: Filter = {
+        const newFilter: RecordFilter = {
           id: newFilterId,
           fieldMetadataId,
           operand: defaultOperand,
@@ -92,12 +95,11 @@ export const useHandleToggleColumnFilter = ({
           value: '',
         };
 
+        upsertRecordFilter(newFilter);
+
         await upsertCombinedViewFilter(newFilter);
 
-        setFilterDefinitionUsedInDropdownInScope(
-          newFilter.id,
-          filterDefinition,
-        );
+        selectFilterDefinitionUsedInDropdown({ filterDefinition });
       }
 
       openDropdown(existingViewFilter?.id ?? newFilterId);
@@ -106,9 +108,10 @@ export const useHandleToggleColumnFilter = ({
       openDropdown,
       columnDefinitions,
       upsertCombinedViewFilter,
-      setFilterDefinitionUsedInDropdownInScope,
+      selectFilterDefinitionUsedInDropdown,
       currentViewWithCombinedFiltersAndSorts,
       availableFilterDefinitions,
+      upsertRecordFilter,
     ],
   );
 
diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleTrashColumnFilter.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleTrashColumnFilter.ts
index 157e06e14279..f3471ea3ae1a 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleTrashColumnFilter.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useHandleToggleTrashColumnFilter.ts
@@ -4,7 +4,8 @@ import { v4 } from 'uuid';
 import { useColumnDefinitionsFromFieldMetadata } from '@/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { getFilterTypeFromFieldType } from '@/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions';
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { useUpsertRecordFilter } from '@/object-record/record-filter/hooks/useUpsertRecordFilter';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { isSoftDeleteFilterActiveComponentState } from '@/object-record/record-table/states/isSoftDeleteFilterActiveComponentState';
 import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2';
 import { useUpsertCombinedViewFilters } from '@/views/hooks/useUpsertCombinedViewFilters';
@@ -36,6 +37,8 @@ export const useHandleToggleTrashColumnFilter = ({
       viewBarId,
     );
 
+  const { upsertRecordFilter } = useUpsertRecordFilter();
+
   const handleToggleTrashColumnFilter = useCallback(() => {
     const trashFieldMetadata = objectMetadataItem.fields.find(
       (field: { name: string }) => field.name === 'deletedAt',
@@ -54,7 +57,7 @@ export const useHandleToggleTrashColumnFilter = ({
       correspondingColumnDefinition?.type,
     );
 
-    const newFilter: Filter = {
+    const newFilter: RecordFilter = {
       id: v4(),
       variant: 'danger',
       fieldMetadataId: trashFieldMetadata.id,
@@ -69,8 +72,14 @@ export const useHandleToggleTrashColumnFilter = ({
       value: '',
     };
 
+    upsertRecordFilter(newFilter);
     upsertCombinedViewFilter(newFilter);
-  }, [columnDefinitions, objectMetadataItem, upsertCombinedViewFilter]);
+  }, [
+    columnDefinitions,
+    objectMetadataItem,
+    upsertCombinedViewFilter,
+    upsertRecordFilter,
+  ]);
 
   const toggleSoftDeleteFilterState = useRecoilCallback(
     ({ set }) =>
diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useLazyLoadRecordIndexTable.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useLazyLoadRecordIndexTable.ts
index 5b212528f036..d9bcdb7b489d 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useLazyLoadRecordIndexTable.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useLazyLoadRecordIndexTable.ts
@@ -7,7 +7,7 @@ import { useFindManyRecordIndexTableParams } from '@/object-record/record-index/
 import { useRecordTableRecordGqlFields } from '@/object-record/record-index/hooks/useRecordTableRecordGqlFields';
 import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
 import { SIGN_IN_BACKGROUND_MOCK_COMPANIES } from '@/sign-in-background-mock/constants/SignInBackgroundMockCompanies';
-import { WorkspaceActivationStatus } from '~/generated/graphql';
+import { isWorkspaceActiveOrSuspended } from 'twenty-shared';
 
 export const useLazyLoadRecordIndexTable = (objectNameSingular: string) => {
   const { objectMetadataItem } = useObjectMetadataItem({
@@ -44,10 +44,9 @@ export const useLazyLoadRecordIndexTable = (objectNameSingular: string) => {
 
   return {
     findManyRecords,
-    records:
-      currentWorkspace?.activationStatus === WorkspaceActivationStatus.Active
-        ? records
-        : SIGN_IN_BACKGROUND_MOCK_COMPANIES,
+    records: isWorkspaceActiveOrSuspended(currentWorkspace)
+      ? records
+      : SIGN_IN_BACKGROUND_MOCK_COMPANIES,
     totalCount: totalCount,
     loading,
     fetchMoreRecords,
diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexBoard.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexBoard.ts
deleted file mode 100644
index 9df7f7a2919f..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexBoard.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-import { useEffect } from 'react';
-import { useRecoilValue } from 'recoil';
-
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
-import { turnSortsIntoOrderBy } from '@/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy';
-import { useSetRecordBoardRecordIds } from '@/object-record/record-board/hooks/useSetRecordBoardRecordIds';
-import { isRecordBoardCompactModeActiveComponentState } from '@/object-record/record-board/states/isRecordBoardCompactModeActiveComponentState';
-import { recordBoardFieldDefinitionsComponentState } from '@/object-record/record-board/states/recordBoardFieldDefinitionsComponentState';
-import { useFilterValueDependencies } from '@/object-record/record-filter/hooks/useFilterValueDependencies';
-import { computeViewRecordGqlOperationFilter } from '@/object-record/record-filter/utils/computeViewRecordGqlOperationFilter';
-import { useRecordBoardRecordGqlFields } from '@/object-record/record-index/hooks/useRecordBoardRecordGqlFields';
-import { recordIndexFieldDefinitionsState } from '@/object-record/record-index/states/recordIndexFieldDefinitionsState';
-import { recordIndexFiltersState } from '@/object-record/record-index/states/recordIndexFiltersState';
-import { recordIndexIsCompactModeActiveState } from '@/object-record/record-index/states/recordIndexIsCompactModeActiveState';
-import { recordIndexSortsState } from '@/object-record/record-index/states/recordIndexSortsState';
-import { recordIndexViewFilterGroupsState } from '@/object-record/record-index/states/recordIndexViewFilterGroupsState';
-import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore';
-import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
-import { useSetRecordCountInCurrentView } from '@/views/hooks/useSetRecordCountInCurrentView';
-
-type UseLoadRecordIndexBoardProps = {
-  objectNameSingular: string;
-  viewBarId: string;
-  recordBoardId: string;
-};
-
-export const useLoadRecordIndexBoard = ({
-  objectNameSingular,
-  viewBarId,
-  recordBoardId,
-}: UseLoadRecordIndexBoardProps) => {
-  const { objectMetadataItem } = useObjectMetadataItem({
-    objectNameSingular,
-  });
-
-  const setRecordBoardFieldDefinitions = useSetRecoilComponentStateV2(
-    recordBoardFieldDefinitionsComponentState,
-    recordBoardId,
-  );
-
-  const { setRecordIds: setRecordIdsInBoard } =
-    useSetRecordBoardRecordIds(recordBoardId);
-
-  const { upsertRecords: upsertRecordsInStore } = useUpsertRecordsInStore();
-
-  const recordIndexFieldDefinitions = useRecoilValue(
-    recordIndexFieldDefinitionsState,
-  );
-  useEffect(() => {
-    setRecordBoardFieldDefinitions(recordIndexFieldDefinitions);
-  }, [recordIndexFieldDefinitions, setRecordBoardFieldDefinitions]);
-
-  const recordIndexViewFilterGroups = useRecoilValue(
-    recordIndexViewFilterGroupsState,
-  );
-
-  const recordIndexFilters = useRecoilValue(recordIndexFiltersState);
-  const recordIndexSorts = useRecoilValue(recordIndexSortsState);
-
-  const { filterValueDependencies } = useFilterValueDependencies();
-
-  const requestFilters = computeViewRecordGqlOperationFilter(
-    filterValueDependencies,
-    recordIndexFilters,
-    objectMetadataItem?.fields ?? [],
-    recordIndexViewFilterGroups,
-  );
-  const orderBy = turnSortsIntoOrderBy(objectMetadataItem, recordIndexSorts);
-
-  const recordIndexIsCompactModeActive = useRecoilValue(
-    recordIndexIsCompactModeActiveState,
-  );
-
-  const recordGqlFields = useRecordBoardRecordGqlFields({
-    objectMetadataItem,
-    recordBoardId,
-  });
-
-  const {
-    records,
-    totalCount,
-    loading,
-    fetchMoreRecords,
-    queryStateIdentifier,
-  } = useFindManyRecords({
-    objectNameSingular,
-    filter: requestFilters,
-    orderBy,
-    recordGqlFields,
-  });
-
-  const { setRecordCountInCurrentView } =
-    useSetRecordCountInCurrentView(viewBarId);
-
-  const setIsCompactModeActive = useSetRecoilComponentStateV2(
-    isRecordBoardCompactModeActiveComponentState,
-    recordBoardId,
-  );
-
-  useEffect(() => {
-    setRecordIdsInBoard(records);
-  }, [records, setRecordIdsInBoard]);
-
-  useEffect(() => {
-    upsertRecordsInStore(records);
-  }, [records, upsertRecordsInStore]);
-
-  useEffect(() => {
-    setRecordCountInCurrentView(totalCount);
-  }, [totalCount, setRecordCountInCurrentView]);
-
-  useEffect(() => {
-    setIsCompactModeActive(recordIndexIsCompactModeActive);
-  }, [recordIndexIsCompactModeActive, setIsCompactModeActive]);
-
-  return {
-    records,
-    loading,
-    fetchMoreRecords,
-    queryStateIdentifier,
-  };
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useSetRecordIndexEntityCount.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useSetRecordIndexEntityCount.ts
new file mode 100644
index 000000000000..2e589db7a4e9
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useSetRecordIndexEntityCount.ts
@@ -0,0 +1,38 @@
+import { recordIndexEntityCountByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexEntityCountByGroupComponentFamilyState';
+import { recordIndexEntityCountNoGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexEntityCountNoGroupComponentFamilyState';
+import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2';
+import { useRecoilCallback } from 'recoil';
+import { isDefined } from '~/utils/isDefined';
+
+export const useSetRecordIndexEntityCount = (viewBarComponentId?: string) => {
+  const recordIndexEntityCountNoGroupFamilyState =
+    useRecoilComponentCallbackStateV2(
+      recordIndexEntityCountNoGroupComponentFamilyState,
+      viewBarComponentId,
+    );
+
+  const recordIndexEntityCountByGroupFamilyState =
+    useRecoilComponentCallbackStateV2(
+      recordIndexEntityCountByGroupComponentFamilyState,
+      viewBarComponentId,
+    );
+
+  const setRecordIndexEntityCount = useRecoilCallback(
+    ({ set }) =>
+      (count: number, recordGroupId?: string) => {
+        if (isDefined(recordGroupId)) {
+          set(recordIndexEntityCountByGroupFamilyState(recordGroupId), count);
+        } else {
+          set(recordIndexEntityCountNoGroupFamilyState, count);
+        }
+      },
+    [
+      recordIndexEntityCountByGroupFamilyState,
+      recordIndexEntityCountNoGroupFamilyState,
+    ],
+  );
+
+  return {
+    setRecordIndexEntityCount,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexEntityCountByGroupComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexEntityCountByGroupComponentFamilyState.ts
new file mode 100644
index 000000000000..ebcb7079086f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexEntityCountByGroupComponentFamilyState.ts
@@ -0,0 +1,12 @@
+import { RecordGroupDefinition } from '@/object-record/record-group/types/RecordGroupDefinition';
+import { createComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentFamilyStateV2';
+import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext';
+
+export const recordIndexEntityCountByGroupComponentFamilyState =
+  createComponentFamilyStateV2<number | undefined, RecordGroupDefinition['id']>(
+    {
+      key: 'recordIndexEntityCountByGroupComponentFamilyState',
+      defaultValue: undefined,
+      componentInstanceContext: ViewComponentInstanceContext,
+    },
+  );
diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexEntityCountNoGroupComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexEntityCountNoGroupComponentFamilyState.ts
new file mode 100644
index 000000000000..911f7ae248d3
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexEntityCountNoGroupComponentFamilyState.ts
@@ -0,0 +1,9 @@
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
+import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext';
+
+export const recordIndexEntityCountNoGroupComponentFamilyState =
+  createComponentStateV2<number | undefined>({
+    key: 'recordIndexEntityCountNoGroupComponentFamilyState',
+    defaultValue: undefined,
+    componentInstanceContext: ViewComponentInstanceContext,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexFiltersState.ts b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexFiltersState.ts
index 6af604887568..b60300f83c9b 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexFiltersState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexFiltersState.ts
@@ -1,8 +1,8 @@
 import { createState } from '@ui/utilities/state/utils/createState';
 
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 
-export const recordIndexFiltersState = createState<Filter[]>({
+export const recordIndexFiltersState = createState<RecordFilter[]>({
   key: 'recordIndexFiltersState',
   defaultValue: [],
 });
diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexKanbanAggregateOperationState.ts b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexKanbanAggregateOperationState.ts
index 664a6755cb6e..c0ba9cf3c18f 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexKanbanAggregateOperationState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/states/recordIndexKanbanAggregateOperationState.ts
@@ -1,8 +1,8 @@
-import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
+import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
 import { createState } from '@ui/utilities/state/utils/createState';
 
 export type KanbanAggregateOperation = {
-  operation?: AGGREGATE_OPERATIONS | null;
+  operation?: ExtendedAggregateOperations | null;
   fieldMetadataId?: string | null;
 } | null;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-index/states/selectors/recordIndexEntityCountComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-index/states/selectors/recordIndexEntityCountComponentSelector.ts
new file mode 100644
index 000000000000..1c364c7ea9b5
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-index/states/selectors/recordIndexEntityCountComponentSelector.ts
@@ -0,0 +1,39 @@
+import { recordGroupIdsComponentState } from '@/object-record/record-group/states/recordGroupIdsComponentState';
+import { recordIndexEntityCountByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexEntityCountByGroupComponentFamilyState';
+import { recordIndexEntityCountNoGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexEntityCountNoGroupComponentFamilyState';
+import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2';
+import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext';
+
+export const recordIndexEntityCountComponentSelector =
+  createComponentSelectorV2<number | undefined>({
+    key: 'recordIndexEntityCountComponentSelector',
+    get:
+      ({ instanceId }) =>
+      ({ get }) => {
+        const recordGroupIds = get(
+          recordGroupIdsComponentState.atomFamily({
+            instanceId,
+          }),
+        );
+
+        if (recordGroupIds.length === 0) {
+          return get(
+            recordIndexEntityCountNoGroupComponentFamilyState.atomFamily({
+              instanceId,
+            }),
+          );
+        }
+
+        return recordGroupIds.reduce<number>((acc, recordGroupId) => {
+          const count = get(
+            recordIndexEntityCountByGroupComponentFamilyState.atomFamily({
+              instanceId,
+              familyKey: recordGroupId,
+            }),
+          );
+
+          return acc + (count ?? 0);
+        }, 0);
+      },
+    componentInstanceContext: ViewComponentInstanceContext,
+  });
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
index b93f1e73374d..bc0897065db5 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
@@ -86,7 +86,7 @@ export const RecordInlineCellContainer = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
 
   if (isFieldText(fieldDefinition)) {
-    assertFieldMetadata(FieldMetadataType.Text, isFieldText, fieldDefinition);
+    assertFieldMetadata(FieldMetadataType.TEXT, isFieldText, fieldDefinition);
   }
 
   const { setIsFocused } = useFieldFocus();
diff --git a/packages/twenty-front/src/modules/object-record/record-right-drawer/components/RightDrawerRecord.tsx b/packages/twenty-front/src/modules/object-record/record-right-drawer/components/RightDrawerRecord.tsx
index aae719251af0..0a8757ce6558 100644
--- a/packages/twenty-front/src/modules/object-record/record-right-drawer/components/RightDrawerRecord.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-right-drawer/components/RightDrawerRecord.tsx
@@ -2,6 +2,7 @@ import { useRecoilValue } from 'recoil';
 
 import { ActionMenuComponentInstanceContext } from '@/action-menu/states/contexts/ActionMenuComponentInstanceContext';
 import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
+import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';
 import { isNewViewableRecordLoadingState } from '@/object-record/record-right-drawer/states/isNewViewableRecordLoading';
 import { viewableRecordIdState } from '@/object-record/record-right-drawer/states/viewableRecordIdState';
 import { viewableRecordNameSingularState } from '@/object-record/record-right-drawer/states/viewableRecordNameSingularState';
@@ -12,12 +13,14 @@ import { RecordFieldValueSelectorContextProvider } from '@/object-record/record-
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 import styled from '@emotion/styled';
 
-const StyledRightDrawerRecord = styled.div`
-  height: ${({ theme }) =>
-    useIsMobile() ? `calc(100% - ${theme.spacing(16)})` : '100%'};
+const StyledRightDrawerRecord = styled.div<{ isMobile: boolean }>`
+  height: ${({ theme, isMobile }) =>
+    isMobile ? `calc(100% - ${theme.spacing(16)})` : '100%'};
 `;
 
 export const RightDrawerRecord = () => {
+  const isMobile = useIsMobile();
+
   const viewableRecordNameSingular = useRecoilValue(
     viewableRecordNameSingularState,
   );
@@ -40,29 +43,33 @@ export const RightDrawerRecord = () => {
   );
 
   return (
-    <ContextStoreComponentInstanceContext.Provider
-      value={{
-        instanceId: `record-show-${objectRecordId}`,
-      }}
+    <RecordFiltersComponentInstanceContext.Provider
+      value={{ instanceId: `record-show-${objectRecordId}` }}
     >
-      <ActionMenuComponentInstanceContext.Provider
-        value={{ instanceId: `record-show-${objectRecordId}` }}
+      <ContextStoreComponentInstanceContext.Provider
+        value={{
+          instanceId: `record-show-${objectRecordId}`,
+        }}
       >
-        <StyledRightDrawerRecord>
-          <RecordFieldValueSelectorContextProvider>
-            {!isNewViewableRecordLoading && (
-              <RecordValueSetterEffect recordId={objectRecordId} />
-            )}
-            <RecordShowContainer
-              objectNameSingular={objectNameSingular}
-              objectRecordId={objectRecordId}
-              loading={false}
-              isInRightDrawer={true}
-              isNewRightDrawerItemLoading={isNewViewableRecordLoading}
-            />
-          </RecordFieldValueSelectorContextProvider>
-        </StyledRightDrawerRecord>
-      </ActionMenuComponentInstanceContext.Provider>
-    </ContextStoreComponentInstanceContext.Provider>
+        <ActionMenuComponentInstanceContext.Provider
+          value={{ instanceId: `record-show-${objectRecordId}` }}
+        >
+          <StyledRightDrawerRecord isMobile={isMobile}>
+            <RecordFieldValueSelectorContextProvider>
+              {!isNewViewableRecordLoading && (
+                <RecordValueSetterEffect recordId={objectRecordId} />
+              )}
+              <RecordShowContainer
+                objectNameSingular={objectNameSingular}
+                objectRecordId={objectRecordId}
+                loading={false}
+                isInRightDrawer={true}
+                isNewRightDrawerItemLoading={isNewViewableRecordLoading}
+              />
+            </RecordFieldValueSelectorContextProvider>
+          </StyledRightDrawerRecord>
+        </ActionMenuComponentInstanceContext.Provider>
+      </ContextStoreComponentInstanceContext.Provider>
+    </RecordFiltersComponentInstanceContext.Provider>
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-show/components/FieldsCard.tsx b/packages/twenty-front/src/modules/object-record/record-show/components/FieldsCard.tsx
index 3dfc2550fc09..37f26cc00a15 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/components/FieldsCard.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/components/FieldsCard.tsx
@@ -62,7 +62,7 @@ export const FieldsCard = ({
         fieldMetadataItem.name !== 'deletedAt',
     ),
     (fieldMetadataItem) =>
-      fieldMetadataItem.type === FieldMetadataType.Relation
+      fieldMetadataItem.type === FieldMetadataType.RELATION
         ? 'relationFieldMetadataItems'
         : 'inlineFieldMetadataItems',
   );
diff --git a/packages/twenty-front/src/modules/object-record/components/RecordEditableName.tsx b/packages/twenty-front/src/modules/object-record/record-show/components/ObjectRecordShowPageBreadcrumb.tsx
similarity index 53%
rename from packages/twenty-front/src/modules/object-record/components/RecordEditableName.tsx
rename to packages/twenty-front/src/modules/object-record/record-show/components/ObjectRecordShowPageBreadcrumb.tsx
index e73521422a58..7813a097af48 100644
--- a/packages/twenty-front/src/modules/object-record/components/RecordEditableName.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/components/ObjectRecordShowPageBreadcrumb.tsx
@@ -1,50 +1,49 @@
+import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
 import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
-import { NavigationDrawerInput } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerInput';
-import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
+import { EditableBreadcrumbItem } from '@/ui/navigation/bread-crumb/components/EditableBreadcrumbItem';
 import styled from '@emotion/styled';
-import { useEffect, useState } from 'react';
 import { capitalize } from 'twenty-shared';
 
 const StyledEditableTitleContainer = styled.div`
-  align-items: flex-start;
+  align-items: center;
   display: flex;
   flex-direction: row;
+  overflow-x: hidden;
 `;
 
 const StyledEditableTitlePrefix = styled.div`
   color: ${({ theme }) => theme.font.color.tertiary};
-  line-height: 24px;
   display: flex;
+  flex: 1 0 auto;
   flex-direction: row;
-  padding: ${({ theme }) => theme.spacing(0.75)};
   gap: ${({ theme }) => theme.spacing(1)};
+  padding: ${({ theme }) => theme.spacing(0.75)};
 `;
 
-export const RecordEditableName = ({
+export const ObjectRecordShowPageBreadcrumb = ({
   objectNameSingular,
   objectRecordId,
   objectLabelPlural,
+  labelIdentifierFieldMetadataItem,
 }: {
   objectNameSingular: string;
   objectRecordId: string;
   objectLabelPlural: string;
+  labelIdentifierFieldMetadataItem?: FieldMetadataItem;
 }) => {
-  const [isRenaming, setIsRenaming] = useState(false);
   const { record, loading } = useFindOneRecord({
     objectNameSingular,
     objectRecordId,
     recordGqlFields: {
-      name: true,
+      [labelIdentifierFieldMetadataItem?.name ?? 'name']: true,
     },
   });
 
-  const [recordName, setRecordName] = useState(record?.name);
-
   const { updateOneRecord } = useUpdateOneRecord({
     objectNameSingular,
     recordGqlFields: {
-      name: true,
+      [labelIdentifierFieldMetadataItem?.name ?? 'name']: true,
     },
   });
 
@@ -55,18 +54,8 @@ export const RecordEditableName = ({
         name: value,
       },
     });
-    setIsRenaming(false);
   };
 
-  const handleCancel = () => {
-    setRecordName(record?.name);
-    setIsRenaming(false);
-  };
-
-  useEffect(() => {
-    setRecordName(record?.name);
-  }, [record?.name]);
-
   if (loading) {
     return null;
   }
@@ -77,24 +66,13 @@ export const RecordEditableName = ({
         {capitalize(objectLabelPlural)}
         <span>{' / '}</span>
       </StyledEditableTitlePrefix>
-      {isRenaming ? (
-        <NavigationDrawerInput
-          value={recordName}
-          onChange={setRecordName}
-          onSubmit={handleSubmit}
-          onCancel={handleCancel}
-          onClickOutside={handleCancel}
-          hotkeyScope="favorites-folder-input"
-        />
-      ) : (
-        <NavigationDrawerItem
-          label={recordName}
-          onClick={() => setIsRenaming(true)}
-          rightOptions={undefined}
-          className="navigation-drawer-item"
-          active
-        />
-      )}
+      <EditableBreadcrumbItem
+        defaultValue={record?.name ?? ''}
+        noValuePlaceholder={labelIdentifierFieldMetadataItem?.label ?? 'Name'}
+        placeholder={labelIdentifierFieldMetadataItem?.label ?? 'Name'}
+        onSubmit={handleSubmit}
+        hotkeyScope="editable-breadcrumb-item"
+      />
     </StyledEditableTitleContainer>
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-show/components/SummaryCard.tsx b/packages/twenty-front/src/modules/object-record/record-show/components/SummaryCard.tsx
index 44ae77c863a4..189e5147019f 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/components/SummaryCard.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/components/SummaryCard.tsx
@@ -77,7 +77,7 @@ export const SummaryCard = ({
             fieldDefinition: {
               type:
                 labelIdentifierFieldMetadataItem?.type ||
-                FieldMetadataType.Text,
+                FieldMetadataType.TEXT,
               iconName: '',
               fieldMetadataId: labelIdentifierFieldMetadataItem?.id ?? '',
               label: labelIdentifierFieldMetadataItem?.label || '',
diff --git a/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowContainerTabs.ts b/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowContainerTabs.ts
index d6a7ce756036..03b229bfa54a 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowContainerTabs.ts
+++ b/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowContainerTabs.ts
@@ -16,8 +16,8 @@ import {
   IconPrinter,
   IconSettings,
 } from 'twenty-ui';
-import { FeatureFlag, FieldMetadataType } from '~/generated-metadata/graphql';
-import { FeatureFlagKey } from '~/generated/graphql';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { FeatureFlag, FeatureFlagKey } from '~/generated/graphql';
 
 export const useRecordShowContainerTabs = (
   loading: boolean,
@@ -269,7 +269,7 @@ export const useRecordShowContainerTabs = (
           !hide.ifRelationsMissing.every((rel) =>
             objectMetadataItem.fields.some(
               (field) =>
-                field.type === FieldMetadataType.Relation &&
+                field.type === FieldMetadataType.RELATION &&
                 field.name === rel &&
                 field.isActive,
             ),
diff --git a/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPage.ts b/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPage.ts
index 15555fd4b69a..c6753a5728f5 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPage.ts
+++ b/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPage.ts
@@ -81,7 +81,7 @@ export const useRecordShowPage = (
   const labelIdentifierFieldValue =
     record?.[labelIdentifierFieldMetadataItem?.name ?? ''];
   const pageName =
-    labelIdentifierFieldMetadataItem?.type === FieldMetadataType.FullName
+    labelIdentifierFieldMetadataItem?.type === FieldMetadataType.FULL_NAME
       ? [
           labelIdentifierFieldValue?.firstName,
           labelIdentifierFieldValue?.lastName,
diff --git a/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPagePagination.ts b/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPagePagination.ts
index 23e1bf847d08..46285e38b2a0 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPagePagination.ts
+++ b/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPagePagination.ts
@@ -1,17 +1,17 @@
 import { isNonEmptyString } from '@sniptt/guards';
 import { useState } from 'react';
-import { useNavigate, useParams, useSearchParams } from 'react-router-dom';
+import { useParams, useSearchParams } from 'react-router-dom';
 import { useSetRecoilState } from 'recoil';
 
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { lastShowPageRecordIdState } from '@/object-record/record-field/states/lastShowPageRecordId';
 import { useRecordIdsFromFindManyCacheRootQuery } from '@/object-record/record-show/hooks/useRecordIdsFromFindManyCacheRootQuery';
-import { buildShowPageURL } from '@/object-record/record-show/utils/buildShowPageURL';
-import { buildIndexTablePageURL } from '@/object-record/record-table/utils/buildIndexTableURL';
+import { AppPath } from '@/types/AppPath';
 import { useQueryVariablesFromActiveFieldsOfViewOrDefaultView } from '@/views/hooks/useQueryVariablesFromActiveFieldsOfViewOrDefaultView';
 import { capitalize } from 'twenty-shared';
 import { isDefined } from 'twenty-ui';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
 
 export const useRecordShowPagePagination = (
   propsObjectNameSingular: string,
@@ -22,9 +22,9 @@ export const useRecordShowPagePagination = (
     objectRecordId: paramObjectRecordId,
   } = useParams();
 
-  const navigate = useNavigate();
+  const navigate = useNavigateApp();
   const [searchParams] = useSearchParams();
-  const viewIdQueryParam = searchParams.get('view');
+  const viewIdQueryParam = searchParams.get('viewId');
 
   const setLastShowPageRecordId = useSetRecoilState(lastShowPageRecordIdState);
 
@@ -130,22 +130,36 @@ export const useRecordShowPagePagination = (
     !isFirstRecord || (isFirstRecord && cacheIsAvailableForNavigation);
 
   const navigateToPreviousRecord = () => {
+    if (loading) {
+      return;
+    }
+
     if (isFirstRecord) {
       if (cacheIsAvailableForNavigation) {
         const lastRecordIdFromCache =
           recordIdsInCache[recordIdsInCache.length - 1];
 
         navigate(
-          buildShowPageURL(
+          AppPath.RecordShowPage,
+          {
             objectNameSingular,
-            lastRecordIdFromCache,
-            viewIdQueryParam,
-          ),
+            objectRecordId: lastRecordIdFromCache,
+          },
+          {
+            viewId: viewIdQueryParam,
+          },
         );
       }
     } else {
       navigate(
-        buildShowPageURL(objectNameSingular, recordBefore.id, viewIdQueryParam),
+        AppPath.RecordShowPage,
+        {
+          objectNameSingular,
+          objectRecordId: recordBefore.id,
+        },
+        {
+          viewId: viewIdQueryParam,
+        },
       );
     }
   };
@@ -154,34 +168,51 @@ export const useRecordShowPagePagination = (
     !isLastRecord || (isLastRecord && cacheIsAvailableForNavigation);
 
   const navigateToNextRecord = () => {
+    if (loading) {
+      return;
+    }
+
     if (isLastRecord) {
       if (cacheIsAvailableForNavigation) {
         const firstRecordIdFromCache = recordIdsInCache[0];
 
         navigate(
-          buildShowPageURL(
+          AppPath.RecordShowPage,
+          {
             objectNameSingular,
-            firstRecordIdFromCache,
-            viewIdQueryParam,
-          ),
+            objectRecordId: firstRecordIdFromCache,
+          },
+          {
+            viewId: viewIdQueryParam,
+          },
         );
       }
     } else {
       navigate(
-        buildShowPageURL(objectNameSingular, recordAfter.id, viewIdQueryParam),
+        AppPath.RecordShowPage,
+        {
+          objectNameSingular,
+          objectRecordId: recordAfter.id,
+        },
+        {
+          viewId: viewIdQueryParam,
+        },
       );
     }
   };
 
   const navigateToIndexView = () => {
-    const indexTableURL = buildIndexTablePageURL(
-      objectMetadataItem.namePlural,
-      viewIdQueryParam,
-    );
-
     setLastShowPageRecordId(objectRecordId);
 
-    navigate(indexTableURL);
+    navigate(
+      AppPath.RecordIndexPage,
+      {
+        objectNamePlural: objectMetadataItem.namePlural,
+      },
+      {
+        viewId: viewIdQueryParam,
+      },
+    );
   };
 
   const rankInView = recordIdsInCache.findIndex((id) => id === objectRecordId);
diff --git a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationRecordsListItem.tsx b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationRecordsListItem.tsx
index cba3ca9c1c66..69edb617e6a3 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationRecordsListItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationRecordsListItem.tsx
@@ -106,7 +106,7 @@ export const RecordDetailRelationRecordsListItem = ({
     relationType,
   } = fieldDefinition.metadata as FieldRelationMetadata;
 
-  const isToOneObject = relationType === RelationDefinitionType.ManyToOne;
+  const isToOneObject = relationType === RelationDefinitionType.MANY_TO_ONE;
   const { objectMetadataItem: relationObjectMetadataItem } =
     useObjectMetadataItem({
       objectNameSingular: relationObjectMetadataNameSingular,
diff --git a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx
index e3a315a4335e..9ad2d8794b1f 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx
@@ -1,5 +1,4 @@
 import styled from '@emotion/styled';
-import qs from 'qs';
 import { useCallback, useContext } from 'react';
 import { useRecoilValue } from 'recoil';
 import { IconForbid, IconPencil, IconPlus, LightIconButton } from 'twenty-ui';
@@ -26,6 +25,7 @@ import { RecordForSelect } from '@/object-record/relation-picker/types/RecordFor
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData';
 import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
+import { AppPath } from '@/types/AppPath';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope';
@@ -33,6 +33,7 @@ import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 import { View } from '@/views/types/View';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { getAppPath } from '~/utils/navigation/getAppPath';
 type RecordDetailRelationSectionProps = {
   loading: boolean;
 };
@@ -68,8 +69,8 @@ export const RecordDetailRelationSection = ({
   >(recordStoreFamilySelector({ recordId, fieldName }));
 
   // TODO: use new relation type
-  const isToOneObject = relationType === RelationDefinitionType.ManyToOne;
-  const isToManyObjects = relationType === RelationDefinitionType.OneToMany;
+  const isToOneObject = relationType === RelationDefinitionType.MANY_TO_ONE;
+  const isToManyObjects = relationType === RelationDefinitionType.ONE_TO_MANY;
 
   const relationRecords: ObjectRecord[] =
     fieldValue && isToOneObject
@@ -139,9 +140,13 @@ export const RecordDetailRelationSection = ({
     view: indexView?.id,
   };
 
-  const filterLinkHref = `/objects/${
-    relationObjectMetadataItem.namePlural
-  }?${qs.stringify(filterQueryParams)}`;
+  const filterLinkHref = getAppPath(
+    AppPath.RecordIndexPage,
+    {
+      objectNamePlural: relationObjectMetadataItem.namePlural,
+    },
+    filterQueryParams,
+  );
 
   const showContent = () => {
     return (
@@ -212,7 +217,10 @@ export const RecordDetailRelationSection = ({
                       <>
                         <RelationFromManyFieldInputMultiRecordsEffect />
                         <MultiRecordSelect
-                          onCreate={createNewRecordAndOpenRightDrawer}
+                          onCreate={() => {
+                            closeDropdown();
+                            createNewRecordAndOpenRightDrawer?.();
+                          }}
                           onChange={updateRelation}
                           onSubmit={closeDropdown}
                           dropdownPlacement={dropdownPlacement}
@@ -221,9 +229,7 @@ export const RecordDetailRelationSection = ({
                     )}
                   </RecordPickerComponentInstanceContext.Provider>
                 }
-                dropdownHotkeyScope={{
-                  scope: dropdownId,
-                }}
+                dropdownHotkeyScope={{ scope: dropdownId }}
               />
             </DropdownScope>
           )
diff --git a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/__stories__/RecordDetailRelationSection.stories.tsx b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/__stories__/RecordDetailRelationSection.stories.tsx
index 929d9db390a0..783f84ec97e9 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/__stories__/RecordDetailRelationSection.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/__stories__/RecordDetailRelationSection.stories.tsx
@@ -11,6 +11,7 @@ import { graphqlMocks } from '~/testing/graphqlMocks';
 import { getCompaniesMock } from '~/testing/mock-data/companies';
 import { getPeopleMock } from '~/testing/mock-data/people';
 
+import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { generatedMockObjectMetadataItems } from '~/testing/mock-data/generatedMockObjectMetadataItems';
 import { RecordDetailRelationSection } from '../RecordDetailRelationSection';
 
@@ -52,6 +53,7 @@ const meta: Meta<typeof RecordDetailRelationSection> = {
     ObjectMetadataItemsDecorator,
     SnackBarDecorator,
     MemoryRouterDecorator,
+    I18nFrontDecorator,
   ],
   parameters: {
     msw: graphqlMocks,
diff --git a/packages/twenty-front/src/modules/object-record/record-show/utils/buildShowPageURL.ts b/packages/twenty-front/src/modules/object-record/record-show/utils/buildShowPageURL.ts
deleted file mode 100644
index 93d7878c114c..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-show/utils/buildShowPageURL.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export const buildShowPageURL = (
-  objectNameSingular: string,
-  recordId: string,
-  viewId?: string | null | undefined,
-) => {
-  return `/object/${objectNameSingular}/${recordId}${
-    viewId ? `?view=${viewId}` : ''
-  }`;
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx
index 571510fcb2b6..a0787d1cec6c 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTable.tsx
@@ -3,6 +3,7 @@ import { isNonEmptyString } from '@sniptt/guards';
 
 import { hasRecordGroupsComponentSelector } from '@/object-record/record-group/states/selectors/hasRecordGroupsComponentSelector';
 import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';
+import { RecordTableStickyBottomEffect } from '@/object-record/record-table/components/RecordTableStickyBottomEffect';
 import { RecordTableStickyEffect } from '@/object-record/record-table/components/RecordTableStickyEffect';
 import { RECORD_TABLE_CLICK_OUTSIDE_LISTENER_ID } from '@/object-record/record-table/constants/RecordTableClickOutsideListenerId';
 import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
@@ -13,22 +14,23 @@ import { RecordTableNoRecordGroupBody } from '@/object-record/record-table/recor
 import { RecordTableNoRecordGroupBodyEffect } from '@/object-record/record-table/record-table-body/components/RecordTableNoRecordGroupBodyEffect';
 import { RecordTableRecordGroupBodyEffects } from '@/object-record/record-table/record-table-body/components/RecordTableRecordGroupBodyEffects';
 import { RecordTableRecordGroupsBody } from '@/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody';
-import { RecordTableAggregateFooter } from '@/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter';
 import { RecordTableHeader } from '@/object-record/record-table/record-table-header/components/RecordTableHeader';
 import { isRecordTableInitialLoadingComponentState } from '@/object-record/record-table/states/isRecordTableInitialLoadingComponentState';
 import { hasPendingRecordComponentSelector } from '@/object-record/record-table/states/selectors/hasPendingRecordComponentSelector';
 import { DragSelect } from '@/ui/utilities/drag-select/components/DragSelect';
 import { useClickOutsideListener } from '@/ui/utilities/pointer-event/hooks/useClickOutsideListener';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 import { useRef } from 'react';
-import { FeatureFlagKey } from '~/generated/graphql';
 
 const StyledTable = styled.table`
   border-radius: ${({ theme }) => theme.border.radius.sm};
   border-spacing: 0;
   table-layout: fixed;
   width: 100%;
+
+  .footer-sticky tr:nth-last-child(2) td {
+    border-bottom-color: ${({ theme }) => theme.background.transparent};
+  }
 `;
 
 export const RecordTable = () => {
@@ -36,10 +38,6 @@ export const RecordTable = () => {
 
   const tableBodyRef = useRef<HTMLTableElement>(null);
 
-  const isAggregateQueryEnabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsAggregateQueryEnabled,
-  );
-
   const { toggleClickOutsideListener } = useClickOutsideListener(
     RECORD_TABLE_CLICK_OUTSIDE_LISTENER_ID,
   );
@@ -97,12 +95,7 @@ export const RecordTable = () => {
               <RecordTableRecordGroupsBody />
             )}
             <RecordTableStickyEffect />
-            {isAggregateQueryEnabled &&
-              !hasRecordGroups &&
-              !isRecordTableInitialLoading &&
-              allRecordIds.length > 0 && (
-                <RecordTableAggregateFooter endOfTableSticky />
-              )}
+            <RecordTableStickyBottomEffect />
           </StyledTable>
           <DragSelect
             dragSelectable={tableBodyRef}
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupRows.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupRows.tsx
index beed4ae065d9..28a4f4ae2a8d 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupRows.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupRows.tsx
@@ -1,6 +1,8 @@
 import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';
 import { RecordTableBodyFetchMoreLoader } from '@/object-record/record-table/record-table-body/components/RecordTableBodyFetchMoreLoader';
+import { RecordTableAggregateFooter } from '@/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter';
 import { RecordTableRow } from '@/object-record/record-table/record-table-row/components/RecordTableRow';
+import { isRecordTableInitialLoadingComponentState } from '@/object-record/record-table/states/isRecordTableInitialLoadingComponentState';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 
 export const RecordTableNoRecordGroupRows = () => {
@@ -8,6 +10,10 @@ export const RecordTableNoRecordGroupRows = () => {
     recordIndexAllRecordIdsComponentSelector,
   );
 
+  const isRecordTableInitialLoading = useRecoilComponentValueV2(
+    isRecordTableInitialLoadingComponentState,
+  );
+
   return (
     <>
       {allRecordIds.map((recordId, rowIndex) => {
@@ -21,6 +27,9 @@ export const RecordTableNoRecordGroupRows = () => {
         );
       })}
       <RecordTableBodyFetchMoreLoader />
+      {!isRecordTableInitialLoading && allRecordIds.length > 0 && (
+        <RecordTableAggregateFooter />
+      )}
     </>
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsx
index a8907998bca2..77547999e72a 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableRecordGroupRows.tsx
@@ -1,6 +1,7 @@
 import { useCurrentRecordGroupId } from '@/object-record/record-group/hooks/useCurrentRecordGroupId';
 import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';
 import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';
+import { RecordTableAggregateFooter } from '@/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter';
 import { RecordTablePendingRecordGroupRow } from '@/object-record/record-table/record-table-row/components/RecordTablePendingRecordGroupRow';
 import { RecordTableRow } from '@/object-record/record-table/record-table-row/components/RecordTableRow';
 import { RecordTableRecordGroupSectionAddNew } from '@/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew';
@@ -59,6 +60,10 @@ export const RecordTableRecordGroupRows = () => {
       <RecordTablePendingRecordGroupRow />
       <RecordTableRecordGroupSectionAddNew />
       <RecordTableRecordGroupSectionLoadMore />
+      <RecordTableAggregateFooter
+        key={currentRecordGroupId}
+        currentRecordGroupId={currentRecordGroupId}
+      />
     </>
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableStickyBottomEffect.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableStickyBottomEffect.tsx
new file mode 100644
index 000000000000..7e259e825643
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableStickyBottomEffect.tsx
@@ -0,0 +1,30 @@
+import { useEffect } from 'react';
+
+import { scrollWrapperScrollBottomComponentState } from '@/ui/utilities/scroll/states/scrollWrappeScrollBottomComponentState';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+
+export const RecordTableStickyBottomEffect = () => {
+  const scrollBottom = useRecoilComponentValueV2(
+    scrollWrapperScrollBottomComponentState,
+  );
+
+  useEffect(() => {
+    if (scrollBottom > 1) {
+      document
+        .getElementById('record-table-body')
+        ?.classList.add('footer-sticky');
+      document
+        .getElementById('record-table-footer')
+        ?.classList.add('footer-sticky');
+    } else {
+      document
+        .getElementById('record-table-body')
+        ?.classList.remove('footer-sticky');
+      document
+        .getElementById('record-table-footer')
+        ?.classList.remove('footer-sticky');
+    }
+  }, [scrollBottom]);
+
+  return <></>;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/__stories__/perf/mock.ts b/packages/twenty-front/src/modules/object-record/record-table/components/__stories__/perf/mock.ts
index 7e828037b187..e0b9703c7d7c 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/__stories__/perf/mock.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/__stories__/perf/mock.ts
@@ -723,7 +723,7 @@ export const mockPerformance = {
       options: null,
     },
     iconName: 'IconBuildingSkyscraper',
-    type: FieldMetadataType.Relation,
+    type: FieldMetadataType.RELATION,
     position: 2,
     size: 150,
     isLabelIdentifier: false,
diff --git a/packages/twenty-front/src/modules/object-record/record-table/constants/DateAggregateOperations.ts b/packages/twenty-front/src/modules/object-record/record-table/constants/DateAggregateOperations.ts
new file mode 100644
index 000000000000..55d92a059c7d
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/constants/DateAggregateOperations.ts
@@ -0,0 +1,4 @@
+export enum DATE_AGGREGATE_OPERATIONS {
+  earliest = 'EARLIEST',
+  latest = 'LATEST',
+}
diff --git a/packages/twenty-front/src/modules/object-record/record-table/constants/FieldTypesAvailableForNonStandardAggregateOperation.ts b/packages/twenty-front/src/modules/object-record/record-table/constants/FieldTypesAvailableForNonStandardAggregateOperation.ts
index c6c413cfcef4..3ebadc8924cb 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/constants/FieldTypesAvailableForNonStandardAggregateOperation.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/constants/FieldTypesAvailableForNonStandardAggregateOperation.ts
@@ -1,23 +1,30 @@
 import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
+import { DATE_AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/DateAggregateOperations';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 export const FIELD_TYPES_AVAILABLE_FOR_NON_STANDARD_AGGREGATE_OPERATION = {
   [AGGREGATE_OPERATIONS.min]: [
-    FieldMetadataType.Number,
-    FieldMetadataType.Currency,
-    FieldMetadataType.DateTime,
+    FieldMetadataType.NUMBER,
+    FieldMetadataType.CURRENCY,
   ],
   [AGGREGATE_OPERATIONS.max]: [
-    FieldMetadataType.Number,
-    FieldMetadataType.Currency,
-    FieldMetadataType.DateTime,
+    FieldMetadataType.NUMBER,
+    FieldMetadataType.CURRENCY,
   ],
   [AGGREGATE_OPERATIONS.avg]: [
-    FieldMetadataType.Number,
-    FieldMetadataType.Currency,
+    FieldMetadataType.NUMBER,
+    FieldMetadataType.CURRENCY,
   ],
   [AGGREGATE_OPERATIONS.sum]: [
-    FieldMetadataType.Number,
-    FieldMetadataType.Currency,
+    FieldMetadataType.NUMBER,
+    FieldMetadataType.CURRENCY,
+  ],
+  [DATE_AGGREGATE_OPERATIONS.earliest]: [
+    FieldMetadataType.DATE_TIME,
+    FieldMetadataType.DATE,
+  ],
+  [DATE_AGGREGATE_OPERATIONS.latest]: [
+    FieldMetadataType.DATE_TIME,
+    FieldMetadataType.DATE,
   ],
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateNoGroupNoRecordAtAll.tsx b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateNoGroupNoRecordAtAll.tsx
index e48e9b1cee5f..540a45366ac5 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateNoGroupNoRecordAtAll.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateNoGroupNoRecordAtAll.tsx
@@ -8,7 +8,10 @@ import { useCreateNewTableRecord } from '@/object-record/record-table/hooks/useC
 export const RecordTableEmptyStateNoGroupNoRecordAtAll = () => {
   const { objectMetadataItem, recordTableId } = useRecordTableContextOrThrow();
 
-  const { createNewTableRecord } = useCreateNewTableRecord(recordTableId);
+  const { createNewTableRecord } = useCreateNewTableRecord({
+    objectMetadataItem,
+    recordTableId,
+  });
 
   const handleButtonClick = () => {
     createNewTableRecord();
diff --git a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateNoRecordFoundForFilter.tsx b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateNoRecordFoundForFilter.tsx
index 22bebeb4d7db..329ff8de58c9 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateNoRecordFoundForFilter.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateNoRecordFoundForFilter.tsx
@@ -8,7 +8,10 @@ import { useCreateNewTableRecord } from '@/object-record/record-table/hooks/useC
 export const RecordTableEmptyStateNoRecordFoundForFilter = () => {
   const { recordTableId, objectMetadataItem } = useRecordTableContextOrThrow();
 
-  const { createNewTableRecord } = useCreateNewTableRecord(recordTableId);
+  const { createNewTableRecord } = useCreateNewTableRecord({
+    objectMetadataItem,
+    recordTableId,
+  });
 
   const handleButtonClick = () => {
     createNewTableRecord();
diff --git a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateRemote.tsx b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateRemote.tsx
index 5bc98b1adfad..f8177e25ef40 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateRemote.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateRemote.tsx
@@ -2,13 +2,14 @@
 import { IconSettings } from 'twenty-ui';
 
 import { RecordTableEmptyStateDisplay } from '@/object-record/record-table/empty-state/components/RecordTableEmptyStateDisplay';
-import { useNavigate } from 'react-router-dom';
+import { SettingsPath } from '@/types/SettingsPath';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 
 export const RecordTableEmptyStateRemote = () => {
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
 
   const handleButtonClick = () => {
-    navigate('/settings/integrations');
+    navigate(SettingsPath.Integrations);
   };
 
   return (
diff --git a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateSoftDelete.tsx b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateSoftDelete.tsx
index fd05f3a28b1f..055c9a129ab7 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateSoftDelete.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/empty-state/components/RecordTableEmptyStateSoftDelete.tsx
@@ -1,6 +1,7 @@
 import { IconFilterOff } from 'twenty-ui';
 
 import { useObjectLabel } from '@/object-metadata/hooks/useObjectLabel';
+import { useRemoveRecordFilter } from '@/object-record/record-filter/hooks/useRemoveRecordFilter';
 import { useHandleToggleTrashColumnFilter } from '@/object-record/record-index/hooks/useHandleToggleTrashColumnFilter';
 import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
 import { RecordTableEmptyStateDisplay } from '@/object-record/record-table/empty-state/components/RecordTableEmptyStateDisplay';
@@ -25,14 +26,22 @@ export const RecordTableEmptyStateSoftDelete = () => {
     viewBarId: recordTableId,
   });
 
+  const { removeRecordFilter } = useRemoveRecordFilter();
+
   const handleButtonClick = async () => {
-    deleteCombinedViewFilter(
-      tableFilters.find(
-        (filter) =>
-          filter.definition.label === 'Deleted' &&
-          filter.operand === 'isNotEmpty',
-      )?.id ?? '',
+    const deletedFilter = tableFilters.find(
+      (filter) =>
+        filter.definition.label === 'Deleted' &&
+        filter.operand === 'isNotEmpty',
     );
+
+    if (!deletedFilter) {
+      throw new Error('Deleted filter not found');
+    }
+
+    removeRecordFilter(deletedFilter.fieldMetadataId);
+    deleteCombinedViewFilter(deletedFilter.id);
+
     toggleSoftDeleteFilterState(false);
   };
 
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRecordTableData.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRecordTableData.ts
index dc09fd20aa1c..3cac0bca295c 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRecordTableData.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useSetRecordTableData.ts
@@ -13,7 +13,10 @@ import { isDefined } from '~/utils/isDefined';
 
 type useSetRecordTableDataProps = {
   recordTableId?: string;
-  onEntityCountChange: (entityCount?: number) => void;
+  onEntityCountChange: (
+    entityCount?: number,
+    currentRecordGroupId?: string,
+  ) => void;
 };
 
 export const useSetRecordTableData = ({
@@ -93,7 +96,7 @@ export const useSetRecordTableData = ({
             set(recordIndexAllRecordIdsSelector, recordIds);
           }
 
-          onEntityCountChange(totalCount);
+          onEntityCountChange(totalCount, currentRecordGroupId);
         }
       },
     [
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/useAggregateRecordsForHeader.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/useAggregateRecordsForHeader.ts
new file mode 100644
index 000000000000..60a92cc4c7f2
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/useAggregateRecordsForHeader.ts
@@ -0,0 +1,71 @@
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { useAggregateRecords } from '@/object-record/hooks/useAggregateRecords';
+import { buildRecordGqlFieldsAggregateForView } from '@/object-record/record-board/record-board-column/utils/buildRecordGqlFieldsAggregateForView';
+import { computeAggregateValueAndLabel } from '@/object-record/record-board/record-board-column/utils/computeAggregateValueAndLabel';
+import { useFilterValueDependencies } from '@/object-record/record-filter/hooks/useFilterValueDependencies';
+import { computeViewRecordGqlOperationFilter } from '@/object-record/record-filter/utils/computeViewRecordGqlOperationFilter';
+import { recordIndexFiltersState } from '@/object-record/record-index/states/recordIndexFiltersState';
+import { recordIndexKanbanAggregateOperationState } from '@/object-record/record-index/states/recordIndexKanbanAggregateOperationState';
+import { recordIndexViewFilterGroupsState } from '@/object-record/record-index/states/recordIndexViewFilterGroupsState';
+import { UserContext } from '@/users/contexts/UserContext';
+import { useContext } from 'react';
+import { useRecoilValue } from 'recoil';
+import { isDefined } from '~/utils/isDefined';
+
+type UseAggregateRecordsProps = {
+  objectMetadataItem: ObjectMetadataItem;
+  additionalFilters?: Record<string, unknown>;
+  fallbackFieldName: string;
+};
+
+export const useAggregateRecordsForHeader = ({
+  objectMetadataItem,
+  additionalFilters = {},
+}: UseAggregateRecordsProps) => {
+  const recordIndexViewFilterGroups = useRecoilValue(
+    recordIndexViewFilterGroupsState,
+  );
+
+  const recordIndexFilters = useRecoilValue(recordIndexFiltersState);
+
+  const recordIndexKanbanAggregateOperation = useRecoilValue(
+    recordIndexKanbanAggregateOperationState,
+  );
+
+  const { filterValueDependencies } = useFilterValueDependencies();
+
+  const { dateFormat, timeFormat, timeZone } = useContext(UserContext);
+
+  const requestFilters = computeViewRecordGqlOperationFilter(
+    filterValueDependencies,
+    recordIndexFilters,
+    objectMetadataItem.fields,
+    recordIndexViewFilterGroups,
+  );
+
+  const recordGqlFieldsAggregate = buildRecordGqlFieldsAggregateForView({
+    objectMetadataItem,
+    recordIndexKanbanAggregateOperation,
+  });
+
+  const { data } = useAggregateRecords({
+    objectNameSingular: objectMetadataItem.nameSingular,
+    recordGqlFieldsAggregate,
+    filter: { ...requestFilters, ...additionalFilters },
+  });
+
+  const { value, labelWithFieldName } = computeAggregateValueAndLabel({
+    data,
+    objectMetadataItem,
+    fieldMetadataId: recordIndexKanbanAggregateOperation?.fieldMetadataId,
+    aggregateOperation: recordIndexKanbanAggregateOperation?.operation,
+    dateFormat,
+    timeFormat,
+    timeZone,
+  });
+
+  return {
+    aggregateValue: value,
+    aggregateLabel: isDefined(value) ? labelWithFieldName : undefined,
+  };
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/useCreateNewTableRecords.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/useCreateNewTableRecords.ts
index 8e3739fdcdf6..189385d736a9 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/useCreateNewTableRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/useCreateNewTableRecords.ts
@@ -1,20 +1,32 @@
-import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
+import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
 import { DEFAULT_CELL_SCOPE } from '@/object-record/record-table/record-table-cell/hooks/useOpenRecordTableCellV2';
 import { useSelectedTableCellEditMode } from '@/object-record/record-table/record-table-cell/hooks/useSelectedTableCellEditMode';
 import { recordTablePendingRecordIdByGroupComponentFamilyState } from '@/object-record/record-table/states/recordTablePendingRecordIdByGroupComponentFamilyState';
 import { recordTablePendingRecordIdComponentState } from '@/object-record/record-table/states/recordTablePendingRecordIdComponentState';
+import { isUpdatingRecordEditableNameState } from '@/object-record/states/isUpdatingRecordEditableName';
 import { getDropdownFocusIdForRecordField } from '@/object-record/utils/getDropdownFocusIdForRecordField';
+import { shouldRedirectToShowPageOnCreation } from '@/object-record/utils/shouldRedirectToShowPageOnCreation';
+import { AppPath } from '@/types/AppPath';
 import { useSetActiveDropdownFocusIdAndMemorizePrevious } from '@/ui/layout/dropdown/hooks/useSetFocusedDropdownIdAndMemorizePrevious';
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
 import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2';
 import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 import { useRecoilCallback } from 'recoil';
 import { v4 } from 'uuid';
+import { FeatureFlagKey } from '~/generated/graphql';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
 import { isDefined } from '~/utils/isDefined';
 
-export const useCreateNewTableRecord = (recordTableId: string) => {
-  const { objectMetadataItem } = useRecordIndexContextOrThrow();
-
+export const useCreateNewTableRecord = ({
+  objectMetadataItem,
+  recordTableId,
+}: {
+  objectMetadataItem: ObjectMetadataItem;
+  recordTableId: string;
+}) => {
   const { setSelectedTableCellEditMode } = useSelectedTableCellEditMode({
     scopeId: recordTableId,
   });
@@ -35,23 +47,80 @@ export const useCreateNewTableRecord = (recordTableId: string) => {
   const { setActiveDropdownFocusIdAndMemorizePrevious } =
     useSetActiveDropdownFocusIdAndMemorizePrevious();
 
-  const createNewTableRecord = () => {
-    const recordId = v4();
+  const { openRecordInCommandMenu } = useCommandMenu();
 
-    setPendingRecordId(recordId);
-    setSelectedTableCellEditMode(-1, 0);
-    setHotkeyScope(DEFAULT_CELL_SCOPE.scope, DEFAULT_CELL_SCOPE.customScopes);
+  const isCommandMenuV2Enabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsCommandMenuV2Enabled,
+  );
 
-    if (isDefined(objectMetadataItem.labelIdentifierFieldMetadataId)) {
-      setActiveDropdownFocusIdAndMemorizePrevious(
-        getDropdownFocusIdForRecordField(
-          recordId,
-          objectMetadataItem.labelIdentifierFieldMetadataId,
-          'table-cell',
-        ),
-      );
-    }
-  };
+  const { createOneRecord } = useCreateOneRecord({
+    objectNameSingular: objectMetadataItem.nameSingular,
+    shouldMatchRootQueryFilter: true,
+  });
+
+  const navigate = useNavigateApp();
+
+  const createNewTableRecord = useRecoilCallback(
+    ({ set }) =>
+      async () => {
+        const recordId = v4();
+
+        if (isCommandMenuV2Enabled) {
+          // TODO: Generalize this behaviour, there will be a view setting to specify
+          // if the new record should be displayed in the side panel or on the record page
+          if (
+            shouldRedirectToShowPageOnCreation(objectMetadataItem.nameSingular)
+          ) {
+            await createOneRecord({
+              id: recordId,
+              name: 'Untitled',
+            });
+
+            navigate(AppPath.RecordShowPage, {
+              objectNameSingular: objectMetadataItem.nameSingular,
+              objectRecordId: recordId,
+            });
+
+            set(isUpdatingRecordEditableNameState, true);
+            return;
+          }
+
+          await createOneRecord({ id: recordId });
+          openRecordInCommandMenu(recordId, objectMetadataItem.nameSingular);
+
+          return;
+        }
+
+        setPendingRecordId(recordId);
+        setSelectedTableCellEditMode(-1, 0);
+        setHotkeyScope(
+          DEFAULT_CELL_SCOPE.scope,
+          DEFAULT_CELL_SCOPE.customScopes,
+        );
+
+        if (isDefined(objectMetadataItem.labelIdentifierFieldMetadataId)) {
+          setActiveDropdownFocusIdAndMemorizePrevious(
+            getDropdownFocusIdForRecordField(
+              recordId,
+              objectMetadataItem.labelIdentifierFieldMetadataId,
+              'table-cell',
+            ),
+          );
+        }
+      },
+    [
+      createOneRecord,
+      isCommandMenuV2Enabled,
+      navigate,
+      objectMetadataItem.labelIdentifierFieldMetadataId,
+      objectMetadataItem.nameSingular,
+      openRecordInCommandMenu,
+      setActiveDropdownFocusIdAndMemorizePrevious,
+      setHotkeyScope,
+      setPendingRecordId,
+      setSelectedTableCellEditMode,
+    ],
+  );
 
   const createNewTableRecordInGroup = useRecoilCallback(
     ({ set }) =>
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTable.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTable.ts
index 9cd173f5d432..cd54668fd1d9 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTable.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/useRecordTable.ts
@@ -156,13 +156,13 @@ export const useRecordTable = (props?: useRecordTableProps) => {
 
   const onEntityCountChange = useRecoilCallback(
     ({ snapshot }) =>
-      (count?: number) => {
+      (count?: number, currentRecordGroupId?: string) => {
         const onEntityCountChange = getSnapshotValue(
           snapshot,
           onEntityCountChangeState,
         );
 
-        onEntityCountChange?.(count);
+        onEntityCountChange?.(count, currentRecordGroupId);
       },
     [onEntityCountChangeState],
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBody.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBody.tsx
index 7a6dbe2975e6..26b1fa747ba9 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBody.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBody.tsx
@@ -15,7 +15,8 @@ const StyledTbody = styled.tbody`
       z-index: 5;
       transition: 0.3s ease;
     }
-    td:nth-of-type(3) {
+    tr:not(:last-child) td:nth-of-type(3) {
+      // Last row is aggregate footer
       position: sticky;
       left: 43px;
       z-index: 5;
@@ -33,7 +34,7 @@ const StyledTbody = styled.tbody`
         }
       }
 
-      &::after {
+      &:not(.disable-shadow)::after {
         content: '';
         position: absolute;
         top: -1px;
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsx
index 2d7703d99c02..087019240b0c 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupsBody.tsx
@@ -6,19 +6,13 @@ import { RecordTableRecordGroupRows } from '@/object-record/record-table/compone
 import { RecordTableBodyDroppable } from '@/object-record/record-table/record-table-body/components/RecordTableBodyDroppable';
 import { RecordTableBodyLoading } from '@/object-record/record-table/record-table-body/components/RecordTableBodyLoading';
 import { RecordTableBodyRecordGroupDragDropContextProvider } from '@/object-record/record-table/record-table-body/components/RecordTableBodyRecordGroupDragDropContextProvider';
-import { RecordTableAggregateFooter } from '@/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter';
 import { RecordTableRecordGroupSection } from '@/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection';
 import { isRecordTableInitialLoadingComponentState } from '@/object-record/record-table/states/isRecordTableInitialLoadingComponentState';
 import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { ViewType } from '@/views/types/ViewType';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
-import { FeatureFlagKey } from '~/generated/graphql';
 
 export const RecordTableRecordGroupsBody = () => {
-  const isAggregateQueryEnabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsAggregateQueryEnabled,
-  );
   const allRecordIds = useRecoilComponentValueV2(
     recordIndexAllRecordIdsComponentSelector,
   );
@@ -49,12 +43,6 @@ export const RecordTableRecordGroupsBody = () => {
                 <RecordTableRecordGroupSection />
                 <RecordTableRecordGroupRows />
               </RecordTableBodyDroppable>
-              {isAggregateQueryEnabled && (
-                <RecordTableAggregateFooter
-                  key={recordGroupId}
-                  currentRecordGroupId={recordGroupId}
-                />
-              )}
             </RecordGroupContext.Provider>
           </RecordTableRecordGroupBodyContextProvider>
         ))}
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableTd.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableTd.tsx
index a5460f16d379..4f558161fdbf 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableTd.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableTd.tsx
@@ -3,10 +3,9 @@ import { styled } from '@linaria/react';
 import { ReactNode, useContext } from 'react';
 import { MOBILE_VIEWPORT, ThemeContext } from 'twenty-ui';
 
-import { isDefined } from '~/utils/isDefined';
+export const RECORD_TABLE_TD_WIDTH = '32px';
 
 const StyledTd = styled.td<{
-  zIndex?: number;
   backgroundColor: string;
   borderColor: string;
   isDragging?: boolean;
@@ -22,9 +21,8 @@ const StyledTd = styled.td<{
     ${({ borderColor, hasBottomBorder }) =>
       hasBottomBorder ? borderColor : 'transparent'};
   color: ${({ fontColor }) => fontColor};
-  border-right: 1px solid
-    ${({ borderColor, hasRightBorder }) =>
-      hasRightBorder ? borderColor : 'transparent'};
+  border-right: ${({ borderColor, hasRightBorder }) =>
+    hasRightBorder ? `1px solid ${borderColor}` : 'none'};
 
   padding: 0;
   transition: 0.3s ease;
@@ -32,7 +30,6 @@ const StyledTd = styled.td<{
   text-align: left;
 
   background: ${({ backgroundColor }) => backgroundColor};
-  z-index: ${({ zIndex }) => (isDefined(zIndex) ? zIndex : 'auto')};
   ${({ isDragging }) =>
     isDragging
       ? `
@@ -44,15 +41,14 @@ const StyledTd = styled.td<{
   ${({ freezeFirstColumns }) =>
     freezeFirstColumns
       ? `@media (max-width: ${MOBILE_VIEWPORT}px) {
-      width: 32px;
-      max-width: 32px;
+      width: ${RECORD_TABLE_TD_WIDTH};
+      max-width: ${RECORD_TABLE_TD_WIDTH};
     }`
       : ''}
 `;
 
 export const RecordTableTd = ({
   children,
-  zIndex,
   isSelected,
   isDragging,
   sticky,
@@ -66,7 +62,6 @@ export const RecordTableTd = ({
 }: {
   className?: string;
   children?: ReactNode;
-  zIndex?: number;
   isSelected?: boolean;
   isDragging?: boolean;
   sticky?: boolean;
@@ -89,7 +84,6 @@ export const RecordTableTd = ({
   return (
     <StyledTd
       isDragging={isDragging}
-      zIndex={zIndex}
       backgroundColor={tdBackgroundColor}
       borderColor={borderColor}
       fontColor={fontColor}
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__mocks__/cell.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__mocks__/cell.ts
index 02b952a84de1..408c40ca7901 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__mocks__/cell.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/__mocks__/cell.ts
@@ -26,7 +26,7 @@ export const recordTableCellContextValue: RecordTableCellContextValue = {
     fieldMetadataId: 'fieldMetadataId',
     label: 'label',
     iconName: 'iconName',
-    type: FieldMetadataType.Text,
+    type: FieldMetadataType.TEXT,
     metadata: {
       placeHolder: 'placeHolder',
       fieldName: 'fieldName',
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter.tsx
index 709643e013ed..db98a71f3e71 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter.tsx
@@ -1,46 +1,44 @@
 import styled from '@emotion/styled';
-import { MOBILE_VIEWPORT } from 'twenty-ui';
 
 import { RecordTableAggregateFooterCell } from '@/object-record/record-table/record-table-footer/components/RecordTableAggregateFooterCell';
 import { RecordTableColumnAggregateFooterCellContext } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterCellContext';
 import { FIRST_TH_WIDTH } from '@/object-record/record-table/record-table-header/components/RecordTableHeader';
 import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector';
+import { scrollWrapperInstanceComponentState } from '@/ui/utilities/scroll/states/scrollWrapperInstanceComponentState';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { isUndefined } from '@sniptt/guards';
+import { MOBILE_VIEWPORT } from 'twenty-ui';
 
-const StyledTableFoot = styled.thead<{ endOfTableSticky?: boolean }>`
-  cursor: pointer;
-
-  th:nth-of-type(1) {
-    width: ${FIRST_TH_WIDTH};
-    left: 0;
-    border-right-color: ${({ theme }) => theme.background.primary};
-  }
+const StyledTd = styled.td`
+  background-color: ${({ theme }) => theme.background.primary};
+`;
 
-  th:nth-of-type(2) {
-    border-right-color: ${({ theme }) => theme.background.primary};
-  }
+const StyledTableRow = styled.tr<{
+  hasHorizontalOverflow?: boolean;
+}>`
+  z-index: 5;
+  position: sticky;
+  border: none;
 
-  &.first-columns-sticky {
-    th:nth-of-type(1) {
-      position: sticky;
-      left: 0;
+  &.footer-sticky {
+    td {
+      border-top: ${({ theme }) => `1px solid ${theme.border.color.light}`};
       z-index: 5;
-      transition: 0.3s ease;
-    }
-
-    th:nth-of-type(2) {
       position: sticky;
-      left: 11px;
-      z-index: 5;
-      transition: 0.3s ease;
+      bottom: 0;
     }
-
-    th:nth-of-type(3) {
+  }
+  cursor: pointer;
+  td:nth-of-type(1) {
+    width: ${FIRST_TH_WIDTH};
+    left: 0;
+    border-top: none;
+  }
+  &.first-columns-sticky {
+    td:nth-of-type(2) {
       position: sticky;
-      left: 43px;
-      z-index: 5;
+      z-index: 10;
       transition: 0.3s ease;
-
       &::after {
         content: '';
         position: absolute;
@@ -51,60 +49,63 @@ const StyledTableFoot = styled.thead<{ endOfTableSticky?: boolean }>`
         box-shadow: ${({ theme }) => theme.boxShadow.light};
         clip-path: inset(0px -4px 0px 0px);
       }
-
       @media (max-width: ${MOBILE_VIEWPORT}px) {
         width: 34px;
         max-width: 34px;
       }
     }
   }
-
-  tr {
-    position: sticky;
-    z-index: 5;
-    background: ${({ theme }) => theme.background.primary};
-    ${({ endOfTableSticky }) =>
-      endOfTableSticky &&
+  background: ${({ theme }) => theme.background.primary};
+  ${({ hasHorizontalOverflow }) =>
+    `.footer-sticky {
+        bottom: ${hasHorizontalOverflow ? '10px' : '0'};
+        ${
+          hasHorizontalOverflow &&
+          `
+          &::after {
+            content: '';
+            position: absolute;
+            bottom: -10px;
+            left: 0;
+            right: 0;
+            height: 10px;
+            background: inherit;
+          }
+        }
       `
-        bottom: 10px;
-        &::after {
-          content: '';
-          position: absolute;
-          bottom: -10px;
-          left: 0;
-          right: 0;
-          height: 10px;
-          background: inherit;
         }
-      `}
-  }
-`;
-
-const StyledTh = styled.th`
-  background-color: ${({ theme }) => theme.background.primary};
+    `}
 `;
 
 export const RecordTableAggregateFooter = ({
   currentRecordGroupId,
-  endOfTableSticky,
 }: {
   currentRecordGroupId?: string;
-  endOfTableSticky?: boolean;
 }) => {
   const visibleTableColumns = useRecoilComponentValueV2(
     visibleTableColumnsComponentSelector,
   );
 
+  const overlayScrollbarsInstance = useRecoilComponentValueV2(
+    scrollWrapperInstanceComponentState,
+  );
+
+  const hasHorizontalOverflow = overlayScrollbarsInstance
+    ? overlayScrollbarsInstance.elements().scrollOffsetElement.scrollWidth >
+      overlayScrollbarsInstance.elements().scrollOffsetElement.clientWidth
+    : false;
+
   return (
-    <StyledTableFoot
+    <StyledTableRow
       id={`record-table-footer${currentRecordGroupId ? '-' + currentRecordGroupId : ''}`}
       data-select-disable
-      endOfTableSticky={endOfTableSticky}
+      hasHorizontalOverflow={
+        hasHorizontalOverflow && isUndefined(currentRecordGroupId)
+      }
     >
-      <tr>
-        <StyledTh />
-        <StyledTh />
-        {visibleTableColumns.map((column, index) => (
+      <StyledTd />
+      {visibleTableColumns.map((column, index) => {
+        return (
           <RecordTableColumnAggregateFooterCellContext.Provider
             key={`${column.fieldMetadataId}${currentRecordGroupId ? '-' + currentRecordGroupId : ''}`}
             value={{
@@ -117,8 +118,11 @@ export const RecordTableAggregateFooter = ({
               isFirstCell={index === 0}
             />
           </RecordTableColumnAggregateFooterCellContext.Provider>
-        ))}
-      </tr>
-    </StyledTableFoot>
+        );
+      })}
+      <td colSpan={visibleTableColumns.length - 1} />
+      <td />
+      <td />
+    </StyledTableRow>
   );
 };
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooterCell.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooterCell.tsx
index f6f66b4dce39..fcb32ab3dac5 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooterCell.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableAggregateFooterCell.tsx
@@ -9,8 +9,9 @@ import { mapArrayToObject } from '~/utils/array/mapArrayToObject';
 
 const COLUMN_MIN_WIDTH = 104;
 
-const StyledColumnFooterCell = styled.th<{
+const StyledColumnFooterCell = styled.td<{
   columnWidth: number;
+  isFirstCell?: boolean;
 }>`
   background-color: ${({ theme }) => theme.background.primary};
   color: ${({ theme }) => theme.font.color.tertiary};
@@ -34,6 +35,7 @@ const StyledColumnFooterCell = styled.th<{
     };
     `;
   }};
+  height: 32px;
 
   user-select: none;
   overflow: auto;
@@ -73,6 +75,8 @@ export const RecordTableAggregateFooterCell = ({
         tableColumnsByKey[fieldMetadataId].size + 24,
         COLUMN_MIN_WIDTH,
       )}
+      colSpan={isFirstCell ? 2 : undefined}
+      isFirstCell={isFirstCell}
     >
       <StyledColumnFootContainer>
         <RecordTableColumnFooterWithDropdown
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateDropdownSubmenuContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateDropdownSubmenuContent.tsx
index d394ba3a8378..cc713891a8fa 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateDropdownSubmenuContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateDropdownSubmenuContent.tsx
@@ -1,6 +1,6 @@
-import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
 import { RecordTableColumnAggregateFooterAggregateOperationMenuItems } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterAggregateOperationMenuItems';
 import { RecordTableColumnAggregateFooterDropdownContext } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterDropdownContext';
+import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
 import { TableOptionsHotkeyScope } from '@/object-record/record-table/types/TableOptionsHotkeyScope';
 import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -14,7 +14,7 @@ export const RecordTableColumnAggregateFooterDropdownSubmenuContent = ({
   aggregateOperations,
   title,
 }: {
-  aggregateOperations: AGGREGATE_OPERATIONS[];
+  aggregateOperations: ExtendedAggregateOperations[];
   title: string;
 }) => {
   const { dropdownId, resetContent } = useContext(
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterAggregateOperationMenuItems.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterAggregateOperationMenuItems.tsx
index 75f51312d633..6e852d10c6ab 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterAggregateOperationMenuItems.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterAggregateOperationMenuItems.tsx
@@ -1,8 +1,7 @@
 import { getAggregateOperationLabel } from '@/object-record/record-board/record-board-column/utils/getAggregateOperationLabel';
-import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
 import { RecordTableColumnAggregateFooterDropdownContext } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterDropdownContext';
 import { useViewFieldAggregateOperation } from '@/object-record/record-table/record-table-footer/hooks/useViewFieldAggregateOperation';
-import { convertAggregateOperationToExtendedAggregateOperation } from '@/object-record/utils/convertAggregateOperationToExtendedAggregateOperation';
+import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { ReactNode, useContext } from 'react';
 import { IconCheck, isDefined, MenuItem } from 'twenty-ui';
@@ -11,7 +10,7 @@ export const RecordTableColumnAggregateFooterAggregateOperationMenuItems = ({
   aggregateOperations,
   children,
 }: {
-  aggregateOperations: AGGREGATE_OPERATIONS[];
+  aggregateOperations: ExtendedAggregateOperations[];
   children?: ReactNode;
 }) => {
   const {
@@ -19,7 +18,7 @@ export const RecordTableColumnAggregateFooterAggregateOperationMenuItems = ({
     currentViewFieldAggregateOperation,
   } = useViewFieldAggregateOperation();
 
-  const { dropdownId, resetContent, fieldMetadataType } = useContext(
+  const { dropdownId, resetContent } = useContext(
     RecordTableColumnAggregateFooterDropdownContext,
   );
   const { closeDropdown } = useDropdown(dropdownId);
@@ -32,12 +31,7 @@ export const RecordTableColumnAggregateFooterAggregateOperationMenuItems = ({
             updateViewFieldAggregateOperation(operation);
             closeDropdown();
           }}
-          text={getAggregateOperationLabel(
-            convertAggregateOperationToExtendedAggregateOperation(
-              operation,
-              fieldMetadataType,
-            ),
-          )}
+          text={getAggregateOperationLabel(operation)}
           RightIcon={
             currentViewFieldAggregateOperation === operation
               ? IconCheck
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterDropdownContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterDropdownContent.tsx
index c362d11d51a8..e0f543e8d698 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterDropdownContent.tsx
@@ -1,9 +1,12 @@
 import { useDropdown } from '@/dropdown/hooks/useDropdown';
+import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
+import { DATE_AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/DateAggregateOperations';
 import { RecordTableColumnAggregateFooterDropdownSubmenuContent } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateDropdownSubmenuContent';
 import { RecordTableColumnAggregateFooterDropdownContext } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterDropdownContext';
 import { RecordTableColumnAggregateFooterMenuContent } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterMenuContent';
 import { COUNT_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/countAggregateOperationOptions';
-import { PERCENT_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/percentAggregateOperationOption';
+import { DATE_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/dateAggregateOperationOptions';
+import { PERCENT_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/percentAggregateOperationOptions';
 import { STANDARD_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/standardAggregateOperationOptions';
 import { getAvailableAggregateOperationsForFieldMetadataType } from '@/object-record/record-table/record-table-footer/utils/getAvailableAggregateOperationsForFieldMetadataType';
 
@@ -21,7 +24,9 @@ export const RecordTableColumnAggregateFooterDropdownContent = () => {
     case 'moreAggregateOperationOptions': {
       const aggregateOperations = availableAggregateOperations.filter(
         (aggregateOperation) =>
-          !STANDARD_AGGREGATE_OPERATION_OPTIONS.includes(aggregateOperation),
+          !STANDARD_AGGREGATE_OPERATION_OPTIONS.includes(
+            aggregateOperation as AGGREGATE_OPERATIONS,
+          ),
       );
 
       return (
@@ -34,7 +39,9 @@ export const RecordTableColumnAggregateFooterDropdownContent = () => {
     case 'countAggregateOperationsOptions': {
       const aggregateOperations = availableAggregateOperations.filter(
         (aggregateOperation) =>
-          COUNT_AGGREGATE_OPERATION_OPTIONS.includes(aggregateOperation),
+          COUNT_AGGREGATE_OPERATION_OPTIONS.includes(
+            aggregateOperation as AGGREGATE_OPERATIONS,
+          ),
       );
       return (
         <RecordTableColumnAggregateFooterDropdownSubmenuContent
@@ -46,7 +53,9 @@ export const RecordTableColumnAggregateFooterDropdownContent = () => {
     case 'percentAggregateOperationsOptions': {
       const aggregateOperations = availableAggregateOperations.filter(
         (aggregateOperation) =>
-          PERCENT_AGGREGATE_OPERATION_OPTIONS.includes(aggregateOperation),
+          PERCENT_AGGREGATE_OPERATION_OPTIONS.includes(
+            aggregateOperation as AGGREGATE_OPERATIONS,
+          ),
       );
       return (
         <RecordTableColumnAggregateFooterDropdownSubmenuContent
@@ -55,6 +64,20 @@ export const RecordTableColumnAggregateFooterDropdownContent = () => {
         />
       );
     }
+    case 'datesAggregateOperationsOptions': {
+      const aggregateOperations = availableAggregateOperations.filter(
+        (aggregateOperation) =>
+          DATE_AGGREGATE_OPERATION_OPTIONS.includes(
+            aggregateOperation as DATE_AGGREGATE_OPERATIONS,
+          ),
+      );
+      return (
+        <RecordTableColumnAggregateFooterDropdownSubmenuContent
+          aggregateOperations={aggregateOperations}
+          title="Dates"
+        />
+      );
+    }
     default:
       return <RecordTableColumnAggregateFooterMenuContent />;
   }
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterMenuContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterMenuContent.tsx
index a81e78288029..265347ca2996 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterMenuContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterMenuContent.tsx
@@ -1,6 +1,8 @@
+import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
 import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
 import { RecordTableColumnAggregateFooterDropdownContext } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterDropdownContext';
-import { STANDARD_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/standardAggregateOperationOptions';
+import { NON_STANDARD_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/nonStandardAggregateOperationsOptions';
+import { useViewFieldAggregateOperation } from '@/object-record/record-table/record-table-footer/hooks/useViewFieldAggregateOperation';
 import { getAvailableAggregateOperationsForFieldMetadataType } from '@/object-record/record-table/record-table-footer/utils/getAvailableAggregateOperationsForFieldMetadataType';
 import { TableOptionsHotkeyScope } from '@/object-record/record-table/types/TableOptionsHotkeyScope';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -8,13 +10,18 @@ import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { useContext, useMemo } from 'react';
 import { Key } from 'ts-key-enum';
-import { MenuItem } from 'twenty-ui';
+import { isFieldMetadataDateKind } from 'twenty-shared';
+import { IconCheck, isDefined, MenuItem } from 'twenty-ui';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 export const RecordTableColumnAggregateFooterMenuContent = () => {
-  const { fieldMetadataId, dropdownId, onContentChange } = useContext(
-    RecordTableColumnAggregateFooterDropdownContext,
-  );
+  const {
+    fieldMetadataId,
+    dropdownId,
+    onContentChange,
+    fieldMetadataType,
+    resetContent,
+  } = useContext(RecordTableColumnAggregateFooterDropdownContext);
   const { closeDropdown } = useDropdown(dropdownId);
   const { objectMetadataItem } = useRecordTableContextOrThrow();
 
@@ -36,15 +43,23 @@ export const RecordTableColumnAggregateFooterMenuContent = () => {
     [fieldMetadataId, objectMetadataItem.fields],
   );
 
+  const fieldIsDateKind = isFieldMetadataDateKind(fieldMetadataType);
+
   const nonStandardAvailableAggregateOperation =
-    availableAggregateOperation.filter(
-      (aggregateOperation) =>
-        !STANDARD_AGGREGATE_OPERATION_OPTIONS.includes(aggregateOperation),
+    availableAggregateOperation.filter((aggregateOperation) =>
+      NON_STANDARD_AGGREGATE_OPERATION_OPTIONS.includes(
+        aggregateOperation as AGGREGATE_OPERATIONS,
+      ),
     );
 
   const fieldIsRelation =
     objectMetadataItem.fields.find((field) => field.id === fieldMetadataId)
-      ?.type === FieldMetadataType.Relation;
+      ?.type === FieldMetadataType.RELATION;
+
+  const {
+    updateViewFieldAggregateOperation,
+    currentViewFieldAggregateOperation,
+  } = useViewFieldAggregateOperation();
 
   return (
     <>
@@ -65,6 +80,15 @@ export const RecordTableColumnAggregateFooterMenuContent = () => {
             hasSubMenu
           />
         )}
+        {fieldIsDateKind && (
+          <MenuItem
+            onClick={() => {
+              onContentChange('datesAggregateOperationsOptions');
+            }}
+            text={'Dates'}
+            hasSubMenu
+          />
+        )}
         {nonStandardAvailableAggregateOperation.length > 0 ? (
           <MenuItem
             onClick={() => {
@@ -74,6 +98,21 @@ export const RecordTableColumnAggregateFooterMenuContent = () => {
             hasSubMenu
           />
         ) : null}
+        <MenuItem
+          key={'none'}
+          onClick={() => {
+            updateViewFieldAggregateOperation(null);
+            resetContent();
+            closeDropdown();
+          }}
+          text={'None'}
+          RightIcon={
+            !isDefined(currentViewFieldAggregateOperation)
+              ? IconCheck
+              : undefined
+          }
+          aria-selected={!isDefined(currentViewFieldAggregateOperation)}
+        />
       </DropdownMenuItemsContainer>
     </>
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx
index e5f30bf309fa..df862c132275 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue.tsx
@@ -1,5 +1,6 @@
 import { useAggregateRecordsForRecordTableColumnFooter } from '@/object-record/record-table/record-table-footer/hooks/useAggregateRecordsForRecordTableColumnFooter';
 import styled from '@emotion/styled';
+import { Trans } from '@lingui/react/macro';
 import { isDefined, OverflowingTextWithTooltip } from 'twenty-ui';
 
 const StyledText = styled.span`
@@ -36,8 +37,9 @@ const StyledValueContainer = styled(StyledScrollableContainer)`
   padding: 0 8px;
 `;
 
-const StyledValue = styled(StyledScrollableContainer)`
-  color: ${({ theme }) => theme.color.gray60};
+const StyledValue = styled.div`
+  color: ${({ theme }) => theme.font.color.primary};
+  max-width: 100%;
 `;
 
 export const RecordTableColumnAggregateFooterValue = ({
@@ -66,7 +68,9 @@ export const RecordTableColumnAggregateFooterValue = ({
           )}
         </StyledValueContainer>
       ) : (
-        <StyledText id={sanitizedId}>Calculate</StyledText>
+        <StyledText id={sanitizedId}>
+          <Trans>Calculate</Trans>
+        </StyledText>
       )}
     </>
   );
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValueCell.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValueCell.tsx
index b6f91db7c606..f189f7afacd0 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValueCell.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValueCell.tsx
@@ -1,14 +1,17 @@
+import { hasRecordGroupsComponentSelector } from '@/object-record/record-group/states/selectors/hasRecordGroupsComponentSelector';
+import { RECORD_TABLE_TD_WIDTH } from '@/object-record/record-table/record-table-cell/components/RecordTableTd';
 import { RecordTableColumnAggregateFooterCellContext } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterCellContext';
 import { RecordTableColumnAggregateFooterValue } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterValue';
 import { hasAggregateOperationForViewFieldFamilySelector } from '@/object-record/record-table/record-table-footer/states/hasAggregateOperationForViewFieldFamilySelector';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { useContext, useState } from 'react';
 import { useRecoilValue } from 'recoil';
 import { IconChevronDown } from 'twenty-ui';
 
-const StyledCell = styled.div`
+const StyledCell = styled.div<{ isUnfolded: boolean; isFirstCell: boolean }>`
   align-items: center;
   display: flex;
   flex-direction: row;
@@ -16,11 +19,27 @@ const StyledCell = styled.div`
   font-weight: ${({ theme }) => theme.font.weight.medium};
 
   gap: ${({ theme }) => theme.spacing(1)};
-  height: ${({ theme }) => theme.spacing(7)};
+  height: ${({ theme }) => theme.spacing(8)};
   justify-content: space-between;
   min-width: ${({ theme }) => theme.spacing(7)};
   flex-grow: 1;
-  width: 100%;
+  max-width: 100%;
+
+  background: ${({ theme, isUnfolded }) =>
+    isUnfolded ? theme.background.transparent.light : theme.background.primary};
+
+  &:hover {
+    background: ${({ theme, isUnfolded }) =>
+      isUnfolded
+        ? theme.background.transparent.medium
+        : theme.background.transparent.light};
+  }
+
+  ${({ isFirstCell }) =>
+    isFirstCell &&
+    `
+    padding-left: ${RECORD_TABLE_TD_WIDTH};
+  `}
 `;
 
 const StyledIcon = styled(IconChevronDown)`
@@ -53,6 +72,10 @@ export const RecordTableColumnAggregateFooterValueCell = ({
     }),
   );
 
+  const hasRecordGroups = useRecoilComponentValueV2(
+    hasRecordGroupsComponentSelector,
+  );
+
   return (
     <div
       onMouseEnter={() => {
@@ -60,17 +83,19 @@ export const RecordTableColumnAggregateFooterValueCell = ({
       }}
       onMouseLeave={() => setIsHovered(false)}
     >
-      <StyledCell>
+      <StyledCell isUnfolded={isDropdownOpen} isFirstCell={isFirstCell}>
         {isHovered ||
         isDropdownOpen ||
         hasAggregateOperationForViewField ||
-        isFirstCell ? (
+        (isFirstCell && !hasRecordGroups) ? (
           <>
             <RecordTableColumnAggregateFooterValue
               fieldMetadataId={fieldMetadataId}
               dropdownId={dropdownId}
             />
-            <StyledIcon fontWeight={'light'} size={theme.icon.size.sm} />
+            {!hasAggregateOperationForViewField && (
+              <StyledIcon fontWeight={'light'} size={theme.icon.size.sm} />
+            )}
           </>
         ) : (
           <></>
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/constants/dateAggregateOperationOptions.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/constants/dateAggregateOperationOptions.tsx
new file mode 100644
index 000000000000..25de7a835077
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/constants/dateAggregateOperationOptions.tsx
@@ -0,0 +1,6 @@
+import { DATE_AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/DateAggregateOperations';
+
+export const DATE_AGGREGATE_OPERATION_OPTIONS = [
+  DATE_AGGREGATE_OPERATIONS.earliest,
+  DATE_AGGREGATE_OPERATIONS.latest,
+];
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/constants/percentAggregateOperationOption.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/constants/percentAggregateOperationOptions.tsx
similarity index 100%
rename from packages/twenty-front/src/modules/object-record/record-table/record-table-footer/constants/percentAggregateOperationOption.tsx
rename to packages/twenty-front/src/modules/object-record/record-table/record-table-footer/constants/percentAggregateOperationOptions.tsx
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/constants/standardAggregateOperationOptions.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/constants/standardAggregateOperationOptions.tsx
index 46b9bdbde384..7f16154d1ec7 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/constants/standardAggregateOperationOptions.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/constants/standardAggregateOperationOptions.tsx
@@ -1,5 +1,5 @@
 import { COUNT_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/countAggregateOperationOptions';
-import { PERCENT_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/percentAggregateOperationOption';
+import { PERCENT_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/percentAggregateOperationOptions';
 
 export const STANDARD_AGGREGATE_OPERATION_OPTIONS = [
   ...COUNT_AGGREGATE_OPERATION_OPTIONS,
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useAggregateRecordsForRecordTableColumnFooter.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useAggregateRecordsForRecordTableColumnFooter.tsx
index dc8d97e4d1cf..1949bfbda8ec 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useAggregateRecordsForRecordTableColumnFooter.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useAggregateRecordsForRecordTableColumnFooter.tsx
@@ -9,18 +9,13 @@ import { useRecordTableContextOrThrow } from '@/object-record/record-table/conte
 import { RecordTableColumnAggregateFooterCellContext } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterCellContext';
 import { viewFieldAggregateOperationState } from '@/object-record/record-table/record-table-footer/states/viewFieldAggregateOperationState';
 import { UserContext } from '@/users/contexts/UserContext';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 import { useContext } from 'react';
 import { useRecoilValue } from 'recoil';
-import { FeatureFlagKey } from '~/generated/graphql';
 import { isDefined } from '~/utils/isDefined';
 
 export const useAggregateRecordsForRecordTableColumnFooter = (
   fieldMetadataId: string,
 ) => {
-  const isAggregateQueryEnabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsAggregateQueryEnabled,
-  );
   const { objectMetadataItem } = useRecordTableContextOrThrow();
   const { recordGroupFilter } = useRecordGroupFilter(objectMetadataItem.fields);
 
@@ -61,8 +56,7 @@ export const useAggregateRecordsForRecordTableColumnFooter = (
     objectNameSingular: objectMetadataItem.nameSingular,
     recordGqlFieldsAggregate,
     filter: { ...requestFilters, ...recordGroupFilter },
-    skip:
-      !isAggregateQueryEnabled || !isDefined(aggregateOperationForViewField),
+    skip: !isDefined(aggregateOperationForViewField),
   });
 
   const { dateFormat, timeFormat, timeZone } = useContext(UserContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useViewFieldAggregateOperation.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useViewFieldAggregateOperation.tsx
index ebfaa1f52368..7cfa13862951 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useViewFieldAggregateOperation.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useViewFieldAggregateOperation.tsx
@@ -1,6 +1,7 @@
-import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
 import { RecordTableColumnAggregateFooterDropdownContext } from '@/object-record/record-table/record-table-footer/components/RecordTableColumnAggregateFooterDropdownContext';
 import { viewFieldAggregateOperationState } from '@/object-record/record-table/record-table-footer/states/viewFieldAggregateOperationState';
+import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
+import { convertExtendedAggregateOperationToAggregateOperation } from '@/object-record/utils/convertExtendedAggregateOperationToAggregateOperation';
 import { usePersistViewFieldRecords } from '@/views/hooks/internal/usePersistViewFieldRecords';
 import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
 import { useContext } from 'react';
@@ -18,13 +19,19 @@ export const useViewFieldAggregateOperation = () => {
     );
   const { updateViewFieldRecords } = usePersistViewFieldRecords();
   const updateViewFieldAggregateOperation = (
-    aggregateOperation: AGGREGATE_OPERATIONS | null,
+    aggregateOperation: ExtendedAggregateOperations | null,
   ) => {
     if (!currentViewField) {
       throw new Error('ViewField not found');
     }
     updateViewFieldRecords([
-      { ...currentViewField, aggregateOperation: aggregateOperation },
+      {
+        ...currentViewField,
+        aggregateOperation:
+          convertExtendedAggregateOperationToAggregateOperation(
+            aggregateOperation,
+          ),
+      },
     ]);
   };
 
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/states/viewFieldAggregateOperationState.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/states/viewFieldAggregateOperationState.ts
index babe48606201..8ab626e497d3 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/states/viewFieldAggregateOperationState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/states/viewFieldAggregateOperationState.ts
@@ -1,8 +1,8 @@
-import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
+import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
 import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
 
 export const viewFieldAggregateOperationState = createFamilyState<
-  AGGREGATE_OPERATIONS | null | undefined,
+  ExtendedAggregateOperations | null | undefined,
   { viewFieldId: string }
 >({
   key: 'viewFieldAggregateOperationState',
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/types/RecordTableFooterAggregateContentId.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/types/RecordTableFooterAggregateContentId.tsx
index 72e870622a9b..c8884ddd1a17 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/types/RecordTableFooterAggregateContentId.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/types/RecordTableFooterAggregateContentId.tsx
@@ -1,4 +1,5 @@
 export type RecordTableFooterAggregateContentId =
   | 'moreAggregateOperationOptions'
   | 'countAggregateOperationsOptions'
-  | 'percentAggregateOperationsOptions';
+  | 'percentAggregateOperationsOptions'
+  | 'datesAggregateOperationsOptions';
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/utils/getAvailableAggregateOperationsForFieldMetadataType.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/utils/getAvailableAggregateOperationsForFieldMetadataType.ts
index 9b44db4585ca..cf44d0de559a 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/utils/getAvailableAggregateOperationsForFieldMetadataType.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/utils/getAvailableAggregateOperationsForFieldMetadataType.ts
@@ -1,5 +1,6 @@
 import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
 import { FIELD_TYPES_AVAILABLE_FOR_NON_STANDARD_AGGREGATE_OPERATION } from '@/object-record/record-table/constants/FieldTypesAvailableForNonStandardAggregateOperation';
+import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
 import { AggregateOperationsOmittingStandardOperations } from '@/object-record/types/AggregateOperationsOmittingStandardOperations';
 import { isFieldTypeValidForAggregateOperation } from '@/object-record/utils/isFieldTypeValidForAggregateOperation';
 import { FieldMetadataType } from '~/generated/graphql';
@@ -10,11 +11,11 @@ export const getAvailableAggregateOperationsForFieldMetadataType = ({
 }: {
   fieldMetadataType?: FieldMetadataType;
 }) => {
-  if (fieldMetadataType === FieldMetadataType.Relation) {
+  if (fieldMetadataType === FieldMetadataType.RELATION) {
     return [AGGREGATE_OPERATIONS.count];
   }
 
-  const availableAggregateOperations = new Set<AGGREGATE_OPERATIONS>([
+  const availableAggregateOperations = new Set<ExtendedAggregateOperations>([
     AGGREGATE_OPERATIONS.count,
     AGGREGATE_OPERATIONS.countEmpty,
     AGGREGATE_OPERATIONS.countNotEmpty,
@@ -35,7 +36,9 @@ export const getAvailableAggregateOperationsForFieldMetadataType = ({
       ),
     )
     .forEach((operation) =>
-      availableAggregateOperations.add(operation as AGGREGATE_OPERATIONS),
+      availableAggregateOperations.add(
+        operation as ExtendedAggregateOperations,
+      ),
     );
 
   return Array.from(availableAggregateOperations);
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCell.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCell.tsx
index 0b83fb3fea98..7b53df9c4411 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCell.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderCell.tsx
@@ -201,7 +201,10 @@ export const RecordTableHeaderCell = ({
   const disableColumnResize =
     column.isLabelIdentifier && isMobile && !isRecordTableScrolledLeft;
 
-  const { createNewTableRecord } = useCreateNewTableRecord(recordTableId);
+  const { createNewTableRecord } = useCreateNewTableRecord({
+    objectMetadataItem,
+    recordTableId,
+  });
 
   const handlePlusButtonClick = () => {
     createNewTableRecord();
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx
index 9b364add0ff9..b9a1c6641a7e 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableHeaderPlusButtonContent.tsx
@@ -8,11 +8,13 @@ import { useRecordTableContextOrThrow } from '@/object-record/record-table/conte
 import { useTableColumns } from '@/object-record/record-table/hooks/useTableColumns';
 import { hiddenTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/hiddenTableColumnsComponentSelector';
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
+import { SettingsPath } from '@/types/SettingsPath';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const RecordTableHeaderPlusButtonContent = () => {
   const { objectMetadataItem } = useRecordTableContextOrThrow();
@@ -55,7 +57,9 @@ export const RecordTableHeaderPlusButtonContent = () => {
       <DropdownMenuItemsContainer scrollable={false}>
         <UndecoratedLink
           fullWidth
-          to={`/settings/objects/${objectMetadataItem.namePlural}`}
+          to={getSettingsPath(SettingsPath.Objects, {
+            objectNamePlural: objectMetadataItem.namePlural,
+          })}
           onClick={() => {
             setNavigationMemorizedUrl(location.pathname + location.search);
           }}
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableActionRow.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableActionRow.tsx
index 9808409ba5cc..f04d37b7917e 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableActionRow.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableActionRow.tsx
@@ -8,17 +8,26 @@ import { IconComponent } from 'twenty-ui';
 
 const StyledRecordTableDraggableTr = styled(RecordTableDraggableTr)`
   cursor: pointer;
+  transition: background-color ${({ theme }) => theme.animation.duration.fast}
+    ease-in-out;
+
+  &:hover {
+    background-color: ${({ theme }) => theme.background.transparent.light};
+  }
 `;
 
 const StyledIconContainer = styled(RecordTableTd)`
+  align-items: center;
+  background-color: transparent;
   border-right: none;
   color: ${({ theme }) => theme.font.color.secondary};
-  text-align: center;
-  vertical-align: middle;
-  padding-top: 3px;
+  display: flex;
+  height: 32px;
+  justify-content: center;
 `;
 
 const StyledRecordTableTdTextContainer = styled(RecordTableTd)`
+  background-color: transparent;
   border-right: none;
   height: 32px;
 `;
@@ -63,9 +72,13 @@ export const RecordTableActionRow = ({
     >
       <td aria-hidden />
       <StyledIconContainer>
-        <LeftIcon size={theme.icon.size.sm} color={theme.font.color.tertiary} />
+        <LeftIcon
+          stroke={theme.icon.stroke.sm}
+          size={theme.icon.size.sm}
+          color={theme.font.color.tertiary}
+        />
       </StyledIconContainer>
-      <StyledRecordTableTdTextContainer>
+      <StyledRecordTableTdTextContainer className="disable-shadow">
         <StyledText>{text}</StyledText>
       </StyledRecordTableTdTextContainer>
       <StyledEmptyTd colSpan={visibleTableColumns.length - 1} />
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableDraggableTr.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableDraggableTr.tsx
index 77830ac0031b..973bd11e932b 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableDraggableTr.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableDraggableTr.tsx
@@ -51,7 +51,7 @@ export const RecordTableDraggableTr = forwardRef<
               ...draggableProvided.draggableProps.style,
               background: draggableSnapshot.isDragging
                 ? theme.background.transparent.light
-                : 'none',
+                : undefined,
               borderColor: draggableSnapshot.isDragging
                 ? `${theme.border.color.medium}`
                 : 'transparent',
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection.tsx
index 8c38a68be747..1d192d69030a 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSection.tsx
@@ -1,19 +1,24 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-import { motion } from 'framer-motion';
 import { useCallback } from 'react';
-import { IconChevronDown, isDefined, Tag } from 'twenty-ui';
+import {
+  AnimatedLightIconButton,
+  IconChevronDown,
+  isDefined,
+  Tag,
+} from 'twenty-ui';
 
+import { RecordBoardColumnHeaderAggregateDropdown } from '@/object-record/record-board/record-board-column/components/RecordBoardColumnHeaderAggregateDropdown';
 import { useCurrentRecordGroupId } from '@/object-record/record-group/hooks/useCurrentRecordGroupId';
 import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/states/recordGroupDefinitionFamilyState';
 import { RecordGroupDefinitionType } from '@/object-record/record-group/types/RecordGroupDefinition';
-import { recordIndexRecordIdsByGroupComponentFamilyState } from '@/object-record/record-index/states/recordIndexRecordIdsByGroupComponentFamilyState';
+import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
 import { RecordTableTd } from '@/object-record/record-table/record-table-cell/components/RecordTableTd';
 import { RecordTableRecordGroupStickyEffect } from '@/object-record/record-table/record-table-section/components/RecordTableRecordGroupStickyEffect';
+import { useAggregateRecordsForRecordTableSection } from '@/object-record/record-table/record-table-section/hooks/useAggregateRecordsForRecordTableSection';
 import { isRecordGroupTableSectionToggledComponentState } from '@/object-record/record-table/record-table-section/states/isRecordGroupTableSectionToggledComponentState';
 import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector';
 import { useRecoilComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyStateV2';
-import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { useRecoilValue } from 'recoil';
 
@@ -28,22 +33,27 @@ const StyledChevronContainer = styled(RecordTableTd)`
   vertical-align: middle;
 `;
 
-const StyledTotalRow = styled.span`
-  color: ${({ theme }) => theme.font.color.tertiary};
-  margin-left: ${({ theme }) => theme.spacing(2)};
-  text-align: center;
-  vertical-align: middle;
+const StyledAnimatedLightIconButton = styled(AnimatedLightIconButton)`
+  display: block;
+  margin: auto;
 `;
 
 const StyledRecordGroupSection = styled(RecordTableTd)`
   border-right: none;
   height: 32px;
+  display: flex;
+  align-items: center;
+  gap: ${({ theme }) => theme.spacing(1)};
 `;
 
 const StyledEmptyTd = styled.td`
   border-bottom: 1px solid ${({ theme }) => theme.border.color.light};
 `;
 
+const StyledTag = styled(Tag)`
+  flex-shrink: 0;
+`;
+
 export const RecordTableRecordGroupSection = () => {
   const theme = useTheme();
 
@@ -53,10 +63,10 @@ export const RecordTableRecordGroupSection = () => {
     visibleTableColumnsComponentSelector,
   );
 
-  const recordIdsByGroup = useRecoilComponentFamilyValueV2(
-    recordIndexRecordIdsByGroupComponentFamilyState,
-    currentRecordGroupId,
-  );
+  const { objectMetadataItem } = useRecordTableContextOrThrow();
+
+  const { aggregateValue, aggregateLabel } =
+    useAggregateRecordsForRecordTableSection();
 
   const [
     isRecordGroupTableSectionToggled,
@@ -82,18 +92,16 @@ export const RecordTableRecordGroupSection = () => {
     <StyledTrContainer onClick={handleDropdownToggle}>
       <td aria-hidden />
       <StyledChevronContainer>
-        <motion.span
+        <StyledAnimatedLightIconButton
+          Icon={IconChevronDown}
+          size="small"
+          accent="secondary"
           animate={{ rotate: !isRecordGroupTableSectionToggled ? -90 : 0 }}
           transition={{ duration: theme.animation.duration.normal }}
-          style={{
-            display: 'inline-block',
-          }}
-        >
-          <IconChevronDown size={theme.icon.size.md} />
-        </motion.span>
+        />
       </StyledChevronContainer>
-      <StyledRecordGroupSection>
-        <Tag
+      <StyledRecordGroupSection className="disable-shadow">
+        <StyledTag
           variant={
             recordGroup.type !== RecordGroupDefinitionType.NoValue
               ? 'solid'
@@ -107,7 +115,12 @@ export const RecordTableRecordGroupSection = () => {
           text={recordGroup.title}
           weight="medium"
         />
-        <StyledTotalRow>{recordIdsByGroup.length}</StyledTotalRow>
+        <RecordBoardColumnHeaderAggregateDropdown
+          aggregateValue={aggregateValue}
+          dropdownId={`record-group-section-aggregate-dropdown-${currentRecordGroupId}`}
+          objectMetadataItem={objectMetadataItem}
+          aggregateLabel={aggregateLabel}
+        />
         <RecordTableRecordGroupStickyEffect />
       </StyledRecordGroupSection>
       <StyledEmptyTd colSpan={visibleColumns.length - 1} />
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew.tsx
index 929472098cc1..c765095b0dde 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew.tsx
@@ -7,7 +7,7 @@ import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/
 import { IconPlus } from 'twenty-ui';
 
 export const RecordTableRecordGroupSectionAddNew = () => {
-  const { recordTableId } = useRecordTableContextOrThrow();
+  const { recordTableId, objectMetadataItem } = useRecordTableContextOrThrow();
 
   const currentRecordGroupId = useCurrentRecordGroupId();
 
@@ -15,8 +15,10 @@ export const RecordTableRecordGroupSectionAddNew = () => {
     recordIndexAllRecordIdsComponentSelector,
   );
 
-  const { createNewTableRecordInGroup } =
-    useCreateNewTableRecord(recordTableId);
+  const { createNewTableRecordInGroup } = useCreateNewTableRecord({
+    objectMetadataItem,
+    recordTableId,
+  });
 
   const handleAddNewRecord = () => {
     createNewTableRecordInGroup(currentRecordGroupId);
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/hooks/useAggregateRecordsForRecordTableSection.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/hooks/useAggregateRecordsForRecordTableSection.tsx
new file mode 100644
index 000000000000..d8b20f046c56
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/hooks/useAggregateRecordsForRecordTableSection.tsx
@@ -0,0 +1,16 @@
+import { useRecordGroupFilter } from '@/object-record/record-group/hooks/useRecordGroupFilter';
+import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
+import { useAggregateRecordsForHeader } from '@/object-record/record-table/hooks/useAggregateRecordsForHeader';
+
+const DEFAULT_FIELD_NAME_FOR_COUNT = 'name';
+
+export const useAggregateRecordsForRecordTableSection = () => {
+  const { objectMetadataItem } = useRecordTableContextOrThrow();
+  const { recordGroupFilter } = useRecordGroupFilter(objectMetadataItem.fields);
+
+  return useAggregateRecordsForHeader({
+    objectMetadataItem,
+    additionalFilters: recordGroupFilter,
+    fallbackFieldName: DEFAULT_FIELD_NAME_FOR_COUNT,
+  });
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/onEntityCountChangeComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/onEntityCountChangeComponentState.ts
index b86124523603..ecdd0d022fcd 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/states/onEntityCountChangeComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/onEntityCountChangeComponentState.ts
@@ -2,7 +2,7 @@ import { RecordTableComponentInstanceContext } from '@/object-record/record-tabl
 import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 
 export const onEntityCountChangeComponentState = createComponentStateV2<
-  ((entityCount?: number) => void) | undefined
+  ((entityCount?: number, currentRecordGroupId?: string) => void) | undefined
 >({
   key: 'onEntityCountChangeComponentState',
   defaultValue: undefined,
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/tableFiltersComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/tableFiltersComponentState.ts
index cc3848d4d5d4..2f9a557bd3df 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/states/tableFiltersComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/tableFiltersComponentState.ts
@@ -1,8 +1,10 @@
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';
 import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 
-export const tableFiltersComponentState = createComponentStateV2<Filter[]>({
+export const tableFiltersComponentState = createComponentStateV2<
+  RecordFilter[]
+>({
   key: 'tableFiltersComponentState',
   defaultValue: [],
   componentInstanceContext: RecordTableComponentInstanceContext,
diff --git a/packages/twenty-front/src/modules/object-record/record-table/types/ExtendedAggregateOperations.ts b/packages/twenty-front/src/modules/object-record/record-table/types/ExtendedAggregateOperations.ts
index 18ba7e83f525..6f0373182c80 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/types/ExtendedAggregateOperations.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/types/ExtendedAggregateOperations.ts
@@ -1,6 +1,6 @@
 import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
+import { DATE_AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/DateAggregateOperations';
 
 export type ExtendedAggregateOperations =
   | AGGREGATE_OPERATIONS
-  | 'EARLIEST'
-  | 'LATEST';
+  | DATE_AGGREGATE_OPERATIONS;
diff --git a/packages/twenty-front/src/modules/object-record/record-table/utils/buildIndexTableURL.ts b/packages/twenty-front/src/modules/object-record/record-table/utils/buildIndexTableURL.ts
deleted file mode 100644
index 6610eb835dc7..000000000000
--- a/packages/twenty-front/src/modules/object-record/record-table/utils/buildIndexTableURL.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export const buildIndexTablePageURL = (
-  objectNamePlural: string,
-  viewId?: string | null | undefined,
-) => {
-  return `/objects/${objectNamePlural}${viewId ? `?view=${viewId}` : ''}`;
-};
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/components/SingleRecordSelectMenuItemsWithSearch.tsx b/packages/twenty-front/src/modules/object-record/relation-picker/components/SingleRecordSelectMenuItemsWithSearch.tsx
index a971eecff288..1b9e1c3787f3 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/components/SingleRecordSelectMenuItemsWithSearch.tsx
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/components/SingleRecordSelectMenuItemsWithSearch.tsx
@@ -92,7 +92,11 @@ export const SingleRecordSelectMenuItemsWithSearch = ({
           <DropdownMenuSeparator />
         </>
       )}
-      <DropdownMenuSearchInput onChange={handleSearchFilterChange} autoFocus />
+      <DropdownMenuSearchInput
+        onChange={handleSearchFilterChange}
+        autoFocus
+        role="combobox"
+      />
       {(dropdownPlacement?.includes('start') ||
         isUndefinedOrNull(dropdownPlacement)) && (
         <>
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/__tests__/useLimitPerMetadataItem.test.tsx b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/__tests__/useLimitPerMetadataItem.test.tsx
index 8596a3343b00..b28747d6cdbd 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/__tests__/useLimitPerMetadataItem.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/__tests__/useLimitPerMetadataItem.test.tsx
@@ -25,6 +25,7 @@ describe('useLimitPerMetadataItem', () => {
       labelSingular: 'labelSingular',
       namePlural: 'namePlural',
       nameSingular: 'nameSingular',
+      labelIdentifierFieldMetadataId: '20202020-72ba-4e11-a36d-e17b544541e1',
       updatedAt: 'updatedAt',
       isLabelSyncedWithName: false,
       fields: [],
diff --git a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useAddNewRecordAndOpenRightDrawer.ts b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useAddNewRecordAndOpenRightDrawer.ts
index 9eef7d7a2429..e1ee1ac3d2ed 100644
--- a/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useAddNewRecordAndOpenRightDrawer.ts
+++ b/packages/twenty-front/src/modules/object-record/relation-picker/hooks/useAddNewRecordAndOpenRightDrawer.ts
@@ -70,7 +70,7 @@ export const useAddNewRecordAndOpenRightDrawer = ({
           | { firstName: string | undefined; lastName: string | undefined };
         [key: string]: any;
       } =
-        labelIdentifierType === FieldMetadataType.FullName
+        labelIdentifierType === FieldMetadataType.FULL_NAME
           ? {
               id: newRecordId,
               name:
@@ -85,7 +85,7 @@ export const useAddNewRecordAndOpenRightDrawer = ({
 
       if (
         relationFieldMetadataItem?.relationDefinition?.direction ===
-        RelationDefinitionType.ManyToOne
+        RelationDefinitionType.MANY_TO_ONE
       ) {
         createRecordPayload[
           `${relationFieldMetadataItem?.relationDefinition?.sourceFieldMetadata.name}Id`
@@ -96,7 +96,7 @@ export const useAddNewRecordAndOpenRightDrawer = ({
 
       if (
         relationFieldMetadataItem?.relationDefinition?.direction ===
-        RelationDefinitionType.OneToMany
+        RelationDefinitionType.ONE_TO_MANY
       ) {
         await updateOneRecord({
           idToUpdate: recordId,
diff --git a/packages/twenty-front/src/modules/object-record/spreadsheet-import/constants/CompositeFieldImportLabels.ts b/packages/twenty-front/src/modules/object-record/spreadsheet-import/constants/CompositeFieldImportLabels.ts
index 030601f241bc..42b627d26b76 100644
--- a/packages/twenty-front/src/modules/object-record/spreadsheet-import/constants/CompositeFieldImportLabels.ts
+++ b/packages/twenty-front/src/modules/object-record/spreadsheet-import/constants/CompositeFieldImportLabels.ts
@@ -10,15 +10,15 @@ import { CompositeFieldLabels } from '@/object-record/spreadsheet-import/types/C
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 export const COMPOSITE_FIELD_IMPORT_LABELS = {
-  [FieldMetadataType.FullName]: {
+  [FieldMetadataType.FULL_NAME]: {
     firstNameLabel: 'First Name',
     lastNameLabel: 'Last Name',
   } satisfies CompositeFieldLabels<FieldFullNameValue>,
-  [FieldMetadataType.Currency]: {
+  [FieldMetadataType.CURRENCY]: {
     currencyCodeLabel: 'Currency Code',
     amountMicrosLabel: 'Amount',
   } satisfies CompositeFieldLabels<FieldCurrencyValue>,
-  [FieldMetadataType.Address]: {
+  [FieldMetadataType.ADDRESS]: {
     addressStreet1Label: 'Address 1',
     addressStreet2Label: 'Address 2',
     addressCityLabel: 'City',
@@ -28,18 +28,18 @@ export const COMPOSITE_FIELD_IMPORT_LABELS = {
     addressLatLabel: 'Latitude',
     addressLngLabel: 'Longitude',
   } satisfies CompositeFieldLabels<FieldAddressValue>,
-  [FieldMetadataType.Links]: {
+  [FieldMetadataType.LINKS]: {
     primaryLinkUrlLabel: 'Link URL',
     primaryLinkLabelLabel: 'Link Label',
   } satisfies Partial<CompositeFieldLabels<FieldLinksValue>>,
-  [FieldMetadataType.Emails]: {
+  [FieldMetadataType.EMAILS]: {
     primaryEmailLabel: 'Email',
   } satisfies Partial<CompositeFieldLabels<FieldEmailsValue>>,
-  [FieldMetadataType.Phones]: {
+  [FieldMetadataType.PHONES]: {
     primaryPhoneCountryCodeLabel: 'Phone country code',
     primaryPhoneNumberLabel: 'Phone number',
   } satisfies Partial<CompositeFieldLabels<FieldPhonesValue>>,
-  [FieldMetadataType.Actor]: {
+  [FieldMetadataType.ACTOR]: {
     sourceLabel: 'Source',
   },
 };
diff --git a/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useBuildAvailableFieldsForImport.ts b/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useBuildAvailableFieldsForImport.ts
index 5dfb80454f67..3916405a2c56 100644
--- a/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useBuildAvailableFieldsForImport.ts
+++ b/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useBuildAvailableFieldsForImport.ts
@@ -17,9 +17,9 @@ export const useBuildAvailableFieldsForImport = () => {
 
     // Todo: refactor this to avoid this else if syntax with duplicated code
     for (const fieldMetadataItem of fieldMetadataItems) {
-      if (fieldMetadataItem.type === FieldMetadataType.FullName) {
+      if (fieldMetadataItem.type === FieldMetadataType.FULL_NAME) {
         const { firstNameLabel, lastNameLabel } =
-          COMPOSITE_FIELD_IMPORT_LABELS[FieldMetadataType.FullName];
+          COMPOSITE_FIELD_IMPORT_LABELS[FieldMetadataType.FULL_NAME];
 
         availableFieldsForImport.push({
           icon: getIcon(fieldMetadataItem.icon),
@@ -46,7 +46,7 @@ export const useBuildAvailableFieldsForImport = () => {
             `${lastNameLabel} (${fieldMetadataItem.label})`,
           ),
         });
-      } else if (fieldMetadataItem.type === FieldMetadataType.Relation) {
+      } else if (fieldMetadataItem.type === FieldMetadataType.RELATION) {
         availableFieldsForImport.push({
           icon: getIcon(fieldMetadataItem.icon),
           label: fieldMetadataItem.label + ' (ID)',
@@ -59,9 +59,9 @@ export const useBuildAvailableFieldsForImport = () => {
             fieldMetadataItem.label + ' (ID)',
           ),
         });
-      } else if (fieldMetadataItem.type === FieldMetadataType.Currency) {
+      } else if (fieldMetadataItem.type === FieldMetadataType.CURRENCY) {
         const { currencyCodeLabel, amountMicrosLabel } =
-          COMPOSITE_FIELD_IMPORT_LABELS[FieldMetadataType.Currency];
+          COMPOSITE_FIELD_IMPORT_LABELS[FieldMetadataType.CURRENCY];
 
         availableFieldsForImport.push({
           icon: getIcon(fieldMetadataItem.icon),
@@ -84,13 +84,13 @@ export const useBuildAvailableFieldsForImport = () => {
             type: 'input',
           },
           fieldValidationDefinitions: getSpreadSheetFieldValidationDefinitions(
-            FieldMetadataType.Number,
+            FieldMetadataType.NUMBER,
             `${amountMicrosLabel} (${fieldMetadataItem.label})`,
           ),
         });
-      } else if (fieldMetadataItem.type === FieldMetadataType.Address) {
+      } else if (fieldMetadataItem.type === FieldMetadataType.ADDRESS) {
         Object.entries(
-          COMPOSITE_FIELD_IMPORT_LABELS[FieldMetadataType.Address],
+          COMPOSITE_FIELD_IMPORT_LABELS[FieldMetadataType.ADDRESS],
         ).forEach(([_, fieldLabel]) => {
           availableFieldsForImport.push({
             icon: getIcon(fieldMetadataItem.icon),
@@ -106,9 +106,9 @@ export const useBuildAvailableFieldsForImport = () => {
               ),
           });
         });
-      } else if (fieldMetadataItem.type === FieldMetadataType.Links) {
+      } else if (fieldMetadataItem.type === FieldMetadataType.LINKS) {
         Object.entries(
-          COMPOSITE_FIELD_IMPORT_LABELS[FieldMetadataType.Links],
+          COMPOSITE_FIELD_IMPORT_LABELS[FieldMetadataType.LINKS],
         ).forEach(([_, fieldLabel]) => {
           availableFieldsForImport.push({
             icon: getIcon(fieldMetadataItem.icon),
@@ -124,7 +124,7 @@ export const useBuildAvailableFieldsForImport = () => {
               ),
           });
         });
-      } else if (fieldMetadataItem.type === FieldMetadataType.Select) {
+      } else if (fieldMetadataItem.type === FieldMetadataType.SELECT) {
         availableFieldsForImport.push({
           icon: getIcon(fieldMetadataItem.icon),
           label: fieldMetadataItem.label,
@@ -143,7 +143,7 @@ export const useBuildAvailableFieldsForImport = () => {
             fieldMetadataItem.label + ' (ID)',
           ),
         });
-      } else if (fieldMetadataItem.type === FieldMetadataType.MultiSelect) {
+      } else if (fieldMetadataItem.type === FieldMetadataType.MULTI_SELECT) {
         availableFieldsForImport.push({
           icon: getIcon(fieldMetadataItem.icon),
           label: fieldMetadataItem.label,
@@ -162,7 +162,7 @@ export const useBuildAvailableFieldsForImport = () => {
             fieldMetadataItem.label + ' (ID)',
           ),
         });
-      } else if (fieldMetadataItem.type === FieldMetadataType.Boolean) {
+      } else if (fieldMetadataItem.type === FieldMetadataType.BOOLEAN) {
         availableFieldsForImport.push({
           icon: getIcon(fieldMetadataItem.icon),
           label: fieldMetadataItem.label,
@@ -175,9 +175,9 @@ export const useBuildAvailableFieldsForImport = () => {
             fieldMetadataItem.label,
           ),
         });
-      } else if (fieldMetadataItem.type === FieldMetadataType.Emails) {
+      } else if (fieldMetadataItem.type === FieldMetadataType.EMAILS) {
         Object.entries(
-          COMPOSITE_FIELD_IMPORT_LABELS[FieldMetadataType.Emails],
+          COMPOSITE_FIELD_IMPORT_LABELS[FieldMetadataType.EMAILS],
         ).forEach(([_, fieldLabel]) => {
           availableFieldsForImport.push({
             icon: getIcon(fieldMetadataItem.icon),
@@ -193,9 +193,9 @@ export const useBuildAvailableFieldsForImport = () => {
               ),
           });
         });
-      } else if (fieldMetadataItem.type === FieldMetadataType.Phones) {
+      } else if (fieldMetadataItem.type === FieldMetadataType.PHONES) {
         Object.entries(
-          COMPOSITE_FIELD_IMPORT_LABELS[FieldMetadataType.Phones],
+          COMPOSITE_FIELD_IMPORT_LABELS[FieldMetadataType.PHONES],
         ).forEach(([_, fieldLabel]) => {
           availableFieldsForImport.push({
             icon: getIcon(fieldMetadataItem.icon),
diff --git a/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useOpenObjectRecordsSpreadsheetImportDialog.ts b/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useOpenObjectRecordsSpreadsheetImportDialog.ts
index fe597279248e..ce138d7dd3a9 100644
--- a/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useOpenObjectRecordsSpreadsheetImportDialog.ts
+++ b/packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useOpenObjectRecordsSpreadsheetImportDialog.ts
@@ -39,9 +39,9 @@ export const useOpenObjectRecordsSpreadsheetImportDialog = (
           fieldMetadataItem.isActive &&
           (!fieldMetadataItem.isSystem || fieldMetadataItem.name === 'id') &&
           fieldMetadataItem.name !== 'createdAt' &&
-          (fieldMetadataItem.type !== FieldMetadataType.Relation ||
+          (fieldMetadataItem.type !== FieldMetadataType.RELATION ||
             fieldMetadataItem.relationDefinition?.direction ===
-              RelationDefinitionType.ManyToOne),
+              RelationDefinitionType.MANY_TO_ONE),
       )
       .sort((fieldMetadataItemA, fieldMetadataItemB) =>
         fieldMetadataItemA.name.localeCompare(fieldMetadataItemB.name),
diff --git a/packages/twenty-front/src/modules/object-record/spreadsheet-import/utils/buildRecordFromImportedStructuredRow.ts b/packages/twenty-front/src/modules/object-record/spreadsheet-import/utils/buildRecordFromImportedStructuredRow.ts
index 78bd4310f98b..e4d952b348a7 100644
--- a/packages/twenty-front/src/modules/object-record/spreadsheet-import/utils/buildRecordFromImportedStructuredRow.ts
+++ b/packages/twenty-front/src/modules/object-record/spreadsheet-import/utils/buildRecordFromImportedStructuredRow.ts
@@ -42,15 +42,15 @@ export const buildRecordFromImportedStructuredRow = (
     const importedFieldValue = importedStructuredRow[field.name];
 
     switch (field.type) {
-      case FieldMetadataType.Boolean:
+      case FieldMetadataType.BOOLEAN:
         recordToBuild[field.name] =
           importedFieldValue === 'true' || importedFieldValue === true;
         break;
-      case FieldMetadataType.Number:
-      case FieldMetadataType.Numeric:
+      case FieldMetadataType.NUMBER:
+      case FieldMetadataType.NUMERIC:
         recordToBuild[field.name] = Number(importedFieldValue);
         break;
-      case FieldMetadataType.Currency:
+      case FieldMetadataType.CURRENCY:
         if (
           isDefined(
             importedStructuredRow[`${amountMicrosLabel} (${field.name})`],
@@ -71,7 +71,7 @@ export const buildRecordFromImportedStructuredRow = (
           };
         }
         break;
-      case FieldMetadataType.Address: {
+      case FieldMetadataType.ADDRESS: {
         if (
           isDefined(
             importedStructuredRow[`${addressStreet1Label} (${field.name})`] ||
@@ -115,7 +115,7 @@ export const buildRecordFromImportedStructuredRow = (
         }
         break;
       }
-      case FieldMetadataType.Links: {
+      case FieldMetadataType.LINKS: {
         if (
           isDefined(
             importedStructuredRow[`${primaryLinkUrlLabel} (${field.name})`] ||
@@ -134,7 +134,7 @@ export const buildRecordFromImportedStructuredRow = (
         }
         break;
       }
-      case FieldMetadataType.Phones: {
+      case FieldMetadataType.PHONES: {
         if (
           isDefined(
             importedStructuredRow[
@@ -161,7 +161,7 @@ export const buildRecordFromImportedStructuredRow = (
         }
         break;
       }
-      case FieldMetadataType.Emails: {
+      case FieldMetadataType.EMAILS: {
         if (
           isDefined(
             importedStructuredRow[`${primaryEmailLabel} (${field.name})`],
@@ -176,7 +176,7 @@ export const buildRecordFromImportedStructuredRow = (
         }
         break;
       }
-      case FieldMetadataType.Relation:
+      case FieldMetadataType.RELATION:
         if (
           isDefined(importedFieldValue) &&
           (isNonEmptyString(importedFieldValue) || importedFieldValue !== false)
@@ -184,7 +184,7 @@ export const buildRecordFromImportedStructuredRow = (
           recordToBuild[field.name + 'Id'] = importedFieldValue;
         }
         break;
-      case FieldMetadataType.FullName:
+      case FieldMetadataType.FULL_NAME:
         if (
           isDefined(
             importedStructuredRow[`${firstNameLabel} (${field.name})`] ??
@@ -199,13 +199,13 @@ export const buildRecordFromImportedStructuredRow = (
           };
         }
         break;
-      case FieldMetadataType.Actor:
+      case FieldMetadataType.ACTOR:
         recordToBuild[field.name] = {
           source: 'IMPORT',
         };
         break;
-      case FieldMetadataType.Array:
-      case FieldMetadataType.MultiSelect: {
+      case FieldMetadataType.ARRAY:
+      case FieldMetadataType.MULTI_SELECT: {
         const stringArrayJSONSchema = z
           .preprocess((value) => {
             try {
@@ -223,7 +223,7 @@ export const buildRecordFromImportedStructuredRow = (
           stringArrayJSONSchema.parse(importedFieldValue);
         break;
       }
-      case FieldMetadataType.RawJson: {
+      case FieldMetadataType.RAW_JSON: {
         if (typeof importedFieldValue === 'string') {
           try {
             recordToBuild[field.name] = JSON.parse(importedFieldValue);
diff --git a/packages/twenty-front/src/modules/object-record/spreadsheet-import/utils/getSpreadSheetFieldValidationDefinitions.ts b/packages/twenty-front/src/modules/object-record/spreadsheet-import/utils/getSpreadSheetFieldValidationDefinitions.ts
index 3b63baabcd00..c07fcea288bb 100644
--- a/packages/twenty-front/src/modules/object-record/spreadsheet-import/utils/getSpreadSheetFieldValidationDefinitions.ts
+++ b/packages/twenty-front/src/modules/object-record/spreadsheet-import/utils/getSpreadSheetFieldValidationDefinitions.ts
@@ -8,7 +8,7 @@ export const getSpreadSheetFieldValidationDefinitions = (
   fieldName: string,
 ): FieldValidationDefinition[] => {
   switch (type) {
-    case FieldMetadataType.FullName:
+    case FieldMetadataType.FULL_NAME:
       return [
         {
           rule: 'object',
@@ -30,7 +30,7 @@ export const getSpreadSheetFieldValidationDefinitions = (
           level: 'error',
         },
       ];
-    case FieldMetadataType.Number:
+    case FieldMetadataType.NUMBER:
       return [
         {
           rule: 'function',
@@ -39,7 +39,7 @@ export const getSpreadSheetFieldValidationDefinitions = (
           level: 'error',
         },
       ];
-    case FieldMetadataType.Relation:
+    case FieldMetadataType.RELATION:
       return [
         {
           rule: 'function',
diff --git a/packages/twenty-front/src/modules/object-record/states/isUpdatingRecordEditableName.ts b/packages/twenty-front/src/modules/object-record/states/isUpdatingRecordEditableName.ts
new file mode 100644
index 000000000000..5829911a53c7
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/states/isUpdatingRecordEditableName.ts
@@ -0,0 +1,6 @@
+import { createState } from 'twenty-ui';
+
+export const isUpdatingRecordEditableNameState = createState<boolean>({
+  key: 'isUpdatingRecordEditableNameState',
+  defaultValue: false,
+});
diff --git a/packages/twenty-front/src/modules/object-record/utils/__tests__/generateAggregateQuery.test.ts b/packages/twenty-front/src/modules/object-record/utils/__tests__/generateAggregateQuery.test.ts
index 4ce449957125..7cf2c38f8f3f 100644
--- a/packages/twenty-front/src/modules/object-record/utils/__tests__/generateAggregateQuery.test.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/__tests__/generateAggregateQuery.test.ts
@@ -9,6 +9,7 @@ describe('generateAggregateQuery', () => {
       id: 'test-id',
       labelSingular: 'Company',
       labelPlural: 'Companies',
+      labelIdentifierFieldMetadataId: '20202020-72ba-4e11-a36d-e17b544541e1',
       isCustom: false,
       isActive: true,
       createdAt: new Date().toISOString(),
@@ -46,6 +47,7 @@ describe('generateAggregateQuery', () => {
       id: 'test-id',
       labelSingular: 'Person',
       labelPlural: 'People',
+      labelIdentifierFieldMetadataId: '20202020-72ba-4e11-a36d-e17b544541e1',
       isCustom: false,
       isActive: true,
       createdAt: new Date().toISOString(),
diff --git a/packages/twenty-front/src/modules/object-record/utils/__tests__/getAvailableFieldsIdsForAggregationFromObjectFields.test.ts b/packages/twenty-front/src/modules/object-record/utils/__tests__/getAvailableFieldsIdsForAggregationFromObjectFields.test.ts
index 01880c2a2907..130e83376aea 100644
--- a/packages/twenty-front/src/modules/object-record/utils/__tests__/getAvailableFieldsIdsForAggregationFromObjectFields.test.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/__tests__/getAvailableFieldsIdsForAggregationFromObjectFields.test.ts
@@ -2,7 +2,7 @@ import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
 import { COUNT_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/countAggregateOperationOptions';
 import { NON_STANDARD_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/nonStandardAggregateOperationsOptions';
-import { PERCENT_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/percentAggregateOperationOption';
+import { PERCENT_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/percentAggregateOperationOptions';
 import { getAvailableFieldsIdsForAggregationFromObjectFields } from '@/object-record/utils/getAvailableFieldsIdsForAggregationFromObjectFields';
 import { FieldMetadataType } from '~/generated/graphql';
 
@@ -11,9 +11,9 @@ const PRICE_FIELD_ID = '9d2d7b5e-7b3e-4b4a-8b0a-7b3e4b4a8b0b';
 const NAME_FIELD_ID = '5d2d7b5e-7b3e-4b4a-8b0a-7b3e4b4a8b0c';
 
 const FIELDS_MOCKS = [
-  { id: AMOUNT_FIELD_ID, type: FieldMetadataType.Number, name: 'amount' },
-  { id: PRICE_FIELD_ID, type: FieldMetadataType.Currency, name: 'price' },
-  { id: NAME_FIELD_ID, type: FieldMetadataType.Text, name: 'name' },
+  { id: AMOUNT_FIELD_ID, type: FieldMetadataType.NUMBER, name: 'amount' },
+  { id: PRICE_FIELD_ID, type: FieldMetadataType.CURRENCY, name: 'price' },
+  { id: NAME_FIELD_ID, type: FieldMetadataType.TEXT, name: 'name' },
 ];
 
 jest.mock(
diff --git a/packages/twenty-front/src/modules/object-record/utils/__tests__/initializeAvailableFieldsForAggregateOperationMap.test.ts b/packages/twenty-front/src/modules/object-record/utils/__tests__/initializeAvailableFieldsForAggregateOperationMap.test.ts
index 67e1e26ba30c..1f1bd9446a0e 100644
--- a/packages/twenty-front/src/modules/object-record/utils/__tests__/initializeAvailableFieldsForAggregateOperationMap.test.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/__tests__/initializeAvailableFieldsForAggregateOperationMap.test.ts
@@ -1,7 +1,7 @@
 import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
 import { FIELD_TYPES_AVAILABLE_FOR_NON_STANDARD_AGGREGATE_OPERATION } from '@/object-record/record-table/constants/FieldTypesAvailableForNonStandardAggregateOperation';
 import { COUNT_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/countAggregateOperationOptions';
-import { PERCENT_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/percentAggregateOperationOption';
+import { PERCENT_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/percentAggregateOperationOptions';
 import { AggregateOperationsOmittingStandardOperations } from '@/object-record/types/AggregateOperationsOmittingStandardOperations';
 import { initializeAvailableFieldsForAggregateOperationMap } from '@/object-record/utils/initializeAvailableFieldsForAggregateOperationMap';
 
diff --git a/packages/twenty-front/src/modules/object-record/utils/__tests__/isFieldTypeValidForAggregateOperation.test.ts b/packages/twenty-front/src/modules/object-record/utils/__tests__/isFieldTypeValidForAggregateOperation.test.ts
index 21718957241f..231102a91689 100644
--- a/packages/twenty-front/src/modules/object-record/utils/__tests__/isFieldTypeValidForAggregateOperation.test.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/__tests__/isFieldTypeValidForAggregateOperation.test.ts
@@ -7,14 +7,14 @@ describe('isFieldTypeValidForAggregateOperation', () => {
   it('should return true for valid field types and operations', () => {
     expect(
       isFieldTypeValidForAggregateOperation(
-        FieldMetadataType.Number,
+        FieldMetadataType.NUMBER,
         AGGREGATE_OPERATIONS.sum,
       ),
     ).toBe(true);
 
     expect(
       isFieldTypeValidForAggregateOperation(
-        FieldMetadataType.Currency,
+        FieldMetadataType.CURRENCY,
         AGGREGATE_OPERATIONS.min,
       ),
     ).toBe(true);
@@ -23,21 +23,21 @@ describe('isFieldTypeValidForAggregateOperation', () => {
   it('should return false for invalid field types', () => {
     expect(
       isFieldTypeValidForAggregateOperation(
-        FieldMetadataType.Text,
+        FieldMetadataType.TEXT,
         AGGREGATE_OPERATIONS.avg,
       ),
     ).toBe(false);
 
     expect(
       isFieldTypeValidForAggregateOperation(
-        FieldMetadataType.Boolean,
+        FieldMetadataType.BOOLEAN,
         AGGREGATE_OPERATIONS.max,
       ),
     ).toBe(false);
   });
 
   it('should handle all aggregate operations', () => {
-    const numericField = FieldMetadataType.Number;
+    const numericField = FieldMetadataType.NUMBER;
     const operations = [
       AGGREGATE_OPERATIONS.min,
       AGGREGATE_OPERATIONS.max,
diff --git a/packages/twenty-front/src/modules/object-record/utils/convertAggregateOperationToExtendedAggregateOperation.ts b/packages/twenty-front/src/modules/object-record/utils/convertAggregateOperationToExtendedAggregateOperation.ts
index 5df5d2cafbb6..11b6e77cad79 100644
--- a/packages/twenty-front/src/modules/object-record/utils/convertAggregateOperationToExtendedAggregateOperation.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/convertAggregateOperationToExtendedAggregateOperation.ts
@@ -1,17 +1,19 @@
 import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
+import { DATE_AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/DateAggregateOperations';
 import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
+import { isFieldMetadataDateKind } from 'twenty-shared';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 export const convertAggregateOperationToExtendedAggregateOperation = (
   aggregateOperation: AGGREGATE_OPERATIONS,
   fieldType?: FieldMetadataType,
 ): ExtendedAggregateOperations => {
-  if (fieldType === FieldMetadataType.DateTime) {
+  if (isFieldMetadataDateKind(fieldType) === true) {
     if (aggregateOperation === AGGREGATE_OPERATIONS.min) {
-      return 'EARLIEST';
+      return DATE_AGGREGATE_OPERATIONS.earliest;
     }
     if (aggregateOperation === AGGREGATE_OPERATIONS.max) {
-      return 'LATEST';
+      return DATE_AGGREGATE_OPERATIONS.latest;
     }
   }
   return aggregateOperation;
diff --git a/packages/twenty-front/src/modules/object-record/utils/convertExtendedAggregateOperationToAggregateOperation.ts b/packages/twenty-front/src/modules/object-record/utils/convertExtendedAggregateOperationToAggregateOperation.ts
index 2f1055f42a73..f492c5ebc9b3 100644
--- a/packages/twenty-front/src/modules/object-record/utils/convertExtendedAggregateOperationToAggregateOperation.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/convertExtendedAggregateOperationToAggregateOperation.ts
@@ -1,14 +1,15 @@
 import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
+import { DATE_AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/DateAggregateOperations';
 
 import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
 
 export const convertExtendedAggregateOperationToAggregateOperation = (
-  extendedAggregateOperation: ExtendedAggregateOperations,
+  extendedAggregateOperation: ExtendedAggregateOperations | null,
 ) => {
-  if (extendedAggregateOperation === 'EARLIEST') {
+  if (extendedAggregateOperation === DATE_AGGREGATE_OPERATIONS.earliest) {
     return AGGREGATE_OPERATIONS.min;
   }
-  if (extendedAggregateOperation === 'LATEST') {
+  if (extendedAggregateOperation === DATE_AGGREGATE_OPERATIONS.latest) {
     return AGGREGATE_OPERATIONS.max;
   }
   return extendedAggregateOperation;
diff --git a/packages/twenty-front/src/modules/object-record/utils/filterAvailableTableColumns.ts b/packages/twenty-front/src/modules/object-record/utils/filterAvailableTableColumns.ts
index 492a2b9a9a35..b33f183d8069 100644
--- a/packages/twenty-front/src/modules/object-record/utils/filterAvailableTableColumns.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/filterAvailableTableColumns.ts
@@ -10,7 +10,7 @@ export const filterAvailableTableColumns = (
   if (
     isFieldRelation(columnDefinition) &&
     columnDefinition.metadata?.relationType ===
-      RelationDefinitionType.ManyToMany
+      RelationDefinitionType.MANY_TO_MANY
   ) {
     return false;
   }
diff --git a/packages/twenty-front/src/modules/object-record/utils/generateEmptyFieldValue.ts b/packages/twenty-front/src/modules/object-record/utils/generateEmptyFieldValue.ts
index 7b1059b15eeb..38e375603c2d 100644
--- a/packages/twenty-front/src/modules/object-record/utils/generateEmptyFieldValue.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/generateEmptyFieldValue.ts
@@ -8,22 +8,22 @@ export const generateEmptyFieldValue = (
   fieldMetadataItem: Pick<FieldMetadataItem, 'type' | 'relationDefinition'>,
 ) => {
   switch (fieldMetadataItem.type) {
-    case FieldMetadataType.Text: {
+    case FieldMetadataType.TEXT: {
       return '';
     }
-    case FieldMetadataType.Emails: {
+    case FieldMetadataType.EMAILS: {
       return { primaryEmail: '', additionalEmails: null };
     }
-    case FieldMetadataType.Links: {
+    case FieldMetadataType.LINKS: {
       return { primaryLinkUrl: '', primaryLinkLabel: '', secondaryLinks: [] };
     }
-    case FieldMetadataType.FullName: {
+    case FieldMetadataType.FULL_NAME: {
       return {
         firstName: '',
         lastName: '',
       };
     }
-    case FieldMetadataType.Address: {
+    case FieldMetadataType.ADDRESS: {
       return {
         addressStreet1: '',
         addressStreet2: '',
@@ -35,63 +35,63 @@ export const generateEmptyFieldValue = (
         addressLng: null,
       };
     }
-    case FieldMetadataType.DateTime: {
+    case FieldMetadataType.DATE_TIME: {
       return null;
     }
-    case FieldMetadataType.Date: {
+    case FieldMetadataType.DATE: {
       return null;
     }
-    case FieldMetadataType.Number:
-    case FieldMetadataType.Rating:
-    case FieldMetadataType.Position:
-    case FieldMetadataType.Numeric: {
+    case FieldMetadataType.NUMBER:
+    case FieldMetadataType.RATING:
+    case FieldMetadataType.POSITION:
+    case FieldMetadataType.NUMERIC: {
       return null;
     }
-    case FieldMetadataType.Uuid: {
+    case FieldMetadataType.UUID: {
       return null;
     }
-    case FieldMetadataType.Boolean: {
+    case FieldMetadataType.BOOLEAN: {
       return true;
     }
-    case FieldMetadataType.Relation: {
+    case FieldMetadataType.RELATION: {
       if (
         fieldMetadataItem.relationDefinition?.direction ===
-        RelationDefinitionType.ManyToOne
+        RelationDefinitionType.MANY_TO_ONE
       ) {
         return null;
       }
 
       return [];
     }
-    case FieldMetadataType.Currency: {
+    case FieldMetadataType.CURRENCY: {
       return {
         amountMicros: null,
         currencyCode: null,
       };
     }
-    case FieldMetadataType.Select: {
+    case FieldMetadataType.SELECT: {
       return null;
     }
-    case FieldMetadataType.MultiSelect: {
+    case FieldMetadataType.MULTI_SELECT: {
       return null;
     }
-    case FieldMetadataType.Array: {
+    case FieldMetadataType.ARRAY: {
       return null;
     }
-    case FieldMetadataType.RawJson: {
+    case FieldMetadataType.RAW_JSON: {
       return null;
     }
-    case FieldMetadataType.RichText: {
+    case FieldMetadataType.RICH_TEXT: {
       return null;
     }
-    case FieldMetadataType.Actor: {
+    case FieldMetadataType.ACTOR: {
       return {
         source: 'MANUAL',
         workspaceMemberId: null,
         name: '',
       };
     }
-    case FieldMetadataType.Phones: {
+    case FieldMetadataType.PHONES: {
       return {
         primaryPhoneNumber: '',
         primaryPhoneCountryCode: '',
diff --git a/packages/twenty-front/src/modules/object-record/utils/getAvailableAggregationsFromObjectFields.ts b/packages/twenty-front/src/modules/object-record/utils/getAvailableAggregationsFromObjectFields.ts
index 541b63343021..ee50c8eb82f1 100644
--- a/packages/twenty-front/src/modules/object-record/utils/getAvailableAggregationsFromObjectFields.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/getAvailableAggregationsFromObjectFields.ts
@@ -1,10 +1,16 @@
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
-import { capitalize } from 'twenty-shared';
+import { DATE_AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/DateAggregateOperations';
+import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
+import {
+  capitalize,
+  FIELD_FOR_TOTAL_COUNT_AGGREGATE_OPERATION,
+  isFieldMetadataDateKind,
+} from 'twenty-shared';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 type NameForAggregation = {
-  [T in AGGREGATE_OPERATIONS]?: string;
+  [T in ExtendedAggregateOperations]?: string;
 };
 
 type Aggregations = {
@@ -14,59 +20,66 @@ type Aggregations = {
 export const getAvailableAggregationsFromObjectFields = (
   fields: FieldMetadataItem[],
 ): Aggregations => {
-  return fields.reduce<Record<string, NameForAggregation>>((acc, field) => {
-    if (field.isSystem === true) {
-      return acc;
-    }
+  return fields.reduce<Record<string, NameForAggregation>>(
+    (acc, field) => {
+      if (field.isSystem === true) {
+        return acc;
+      }
+
+      if (field.type === FieldMetadataType.RELATION) {
+        acc[field.name] = {
+          [AGGREGATE_OPERATIONS.count]: 'totalCount',
+        };
+        return acc;
+      }
 
-    if (field.type === FieldMetadataType.Relation) {
       acc[field.name] = {
+        [AGGREGATE_OPERATIONS.countUniqueValues]: `countUniqueValues${capitalize(field.name)}`,
+        [AGGREGATE_OPERATIONS.countEmpty]: `countEmpty${capitalize(field.name)}`,
+        [AGGREGATE_OPERATIONS.countNotEmpty]: `countNotEmpty${capitalize(field.name)}`,
+        [AGGREGATE_OPERATIONS.percentageEmpty]: `percentageEmpty${capitalize(field.name)}`,
+        [AGGREGATE_OPERATIONS.percentageNotEmpty]: `percentageNotEmpty${capitalize(field.name)}`,
         [AGGREGATE_OPERATIONS.count]: 'totalCount',
       };
-      return acc;
-    }
 
-    acc[field.name] = {
-      [AGGREGATE_OPERATIONS.countUniqueValues]: `countUniqueValues${capitalize(field.name)}`,
-      [AGGREGATE_OPERATIONS.countEmpty]: `countEmpty${capitalize(field.name)}`,
-      [AGGREGATE_OPERATIONS.countNotEmpty]: `countNotEmpty${capitalize(field.name)}`,
-      [AGGREGATE_OPERATIONS.percentageEmpty]: `percentageEmpty${capitalize(field.name)}`,
-      [AGGREGATE_OPERATIONS.percentageNotEmpty]: `percentageNotEmpty${capitalize(field.name)}`,
-      [AGGREGATE_OPERATIONS.count]: 'totalCount',
-    };
-
-    if (field.type === FieldMetadataType.Number) {
-      acc[field.name] = {
-        ...acc[field.name],
-        [AGGREGATE_OPERATIONS.min]: `min${capitalize(field.name)}`,
-        [AGGREGATE_OPERATIONS.max]: `max${capitalize(field.name)}`,
-        [AGGREGATE_OPERATIONS.avg]: `avg${capitalize(field.name)}`,
-        [AGGREGATE_OPERATIONS.sum]: `sum${capitalize(field.name)}`,
-      };
-    }
+      if (field.type === FieldMetadataType.NUMBER) {
+        acc[field.name] = {
+          ...acc[field.name],
+          [AGGREGATE_OPERATIONS.min]: `min${capitalize(field.name)}`,
+          [AGGREGATE_OPERATIONS.max]: `max${capitalize(field.name)}`,
+          [AGGREGATE_OPERATIONS.avg]: `avg${capitalize(field.name)}`,
+          [AGGREGATE_OPERATIONS.sum]: `sum${capitalize(field.name)}`,
+        };
+      }
 
-    if (field.type === FieldMetadataType.Currency) {
-      acc[field.name] = {
-        ...acc[field.name],
-        [AGGREGATE_OPERATIONS.min]: `min${capitalize(field.name)}AmountMicros`,
-        [AGGREGATE_OPERATIONS.max]: `max${capitalize(field.name)}AmountMicros`,
-        [AGGREGATE_OPERATIONS.avg]: `avg${capitalize(field.name)}AmountMicros`,
-        [AGGREGATE_OPERATIONS.sum]: `sum${capitalize(field.name)}AmountMicros`,
-      };
-    }
+      if (field.type === FieldMetadataType.CURRENCY) {
+        acc[field.name] = {
+          ...acc[field.name],
+          [AGGREGATE_OPERATIONS.min]: `min${capitalize(field.name)}AmountMicros`,
+          [AGGREGATE_OPERATIONS.max]: `max${capitalize(field.name)}AmountMicros`,
+          [AGGREGATE_OPERATIONS.avg]: `avg${capitalize(field.name)}AmountMicros`,
+          [AGGREGATE_OPERATIONS.sum]: `sum${capitalize(field.name)}AmountMicros`,
+        };
+      }
 
-    if (field.type === FieldMetadataType.DateTime) {
-      acc[field.name] = {
-        ...acc[field.name],
-        [AGGREGATE_OPERATIONS.min]: `min${capitalize(field.name)}`,
-        [AGGREGATE_OPERATIONS.max]: `max${capitalize(field.name)}`,
-      };
-    }
+      if (isFieldMetadataDateKind(field.type) === true) {
+        acc[field.name] = {
+          ...acc[field.name],
+          [DATE_AGGREGATE_OPERATIONS.earliest]: `min${capitalize(field.name)}`,
+          [DATE_AGGREGATE_OPERATIONS.latest]: `max${capitalize(field.name)}`,
+        };
+      }
 
-    if (acc[field.name] === undefined) {
-      acc[field.name] = {};
-    }
+      if (acc[field.name] === undefined) {
+        acc[field.name] = {};
+      }
 
-    return acc;
-  }, {});
+      return acc;
+    },
+    {
+      [FIELD_FOR_TOTAL_COUNT_AGGREGATE_OPERATION]: {
+        [AGGREGATE_OPERATIONS.count]: 'totalCount',
+      },
+    },
+  );
 };
diff --git a/packages/twenty-front/src/modules/object-record/utils/getAvailableFieldsIdsForAggregationFromObjectFields.ts b/packages/twenty-front/src/modules/object-record/utils/getAvailableFieldsIdsForAggregationFromObjectFields.ts
index f225986c58db..91b6891347bd 100644
--- a/packages/twenty-front/src/modules/object-record/utils/getAvailableFieldsIdsForAggregationFromObjectFields.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/getAvailableFieldsIdsForAggregationFromObjectFields.ts
@@ -1,15 +1,13 @@
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
-import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
 import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
 import { AvailableFieldsForAggregateOperation } from '@/object-record/types/AvailableFieldsForAggregateOperation';
-import { convertAggregateOperationToExtendedAggregateOperation } from '@/object-record/utils/convertAggregateOperationToExtendedAggregateOperation';
 import { getAvailableAggregationsFromObjectFields } from '@/object-record/utils/getAvailableAggregationsFromObjectFields';
 import { initializeAvailableFieldsForAggregateOperationMap } from '@/object-record/utils/initializeAvailableFieldsForAggregateOperationMap';
 import { isDefined } from '~/utils/isDefined';
 
 export const getAvailableFieldsIdsForAggregationFromObjectFields = (
   fields: FieldMetadataItem[],
-  targetAggregateOperations: AGGREGATE_OPERATIONS[],
+  targetAggregateOperations: ExtendedAggregateOperations[],
 ): AvailableFieldsForAggregateOperation => {
   const aggregationMap = initializeAvailableFieldsForAggregateOperationMap(
     targetAggregateOperations,
@@ -20,20 +18,12 @@ export const getAvailableFieldsIdsForAggregationFromObjectFields = (
   return fields.reduce((acc, field) => {
     if (isDefined(allAggregations[field.name])) {
       Object.keys(allAggregations[field.name]).forEach((aggregation) => {
-        if (
-          targetAggregateOperations.includes(
-            aggregation as AGGREGATE_OPERATIONS,
-          )
-        ) {
-          const convertedAggregateOperation: ExtendedAggregateOperations =
-            convertAggregateOperationToExtendedAggregateOperation(
-              aggregation as AGGREGATE_OPERATIONS,
-              field.type,
-            );
-          if (!isDefined(acc[convertedAggregateOperation])) {
-            acc[convertedAggregateOperation] = [];
+        const typedAggregation = aggregation as ExtendedAggregateOperations;
+        if (targetAggregateOperations.includes(typedAggregation)) {
+          if (!isDefined(acc[typedAggregation])) {
+            acc[typedAggregation] = [];
           }
-          (acc[convertedAggregateOperation] as string[]).push(field.id);
+          (acc[typedAggregation] as string[]).push(field.id);
         }
       });
     }
diff --git a/packages/twenty-front/src/modules/object-record/utils/getRecordChipGenerators.ts b/packages/twenty-front/src/modules/object-record/utils/getRecordChipGenerators.ts
index 46f145c45b84..650a4825dccd 100644
--- a/packages/twenty-front/src/modules/object-record/utils/getRecordChipGenerators.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/getRecordChipGenerators.ts
@@ -33,7 +33,7 @@ export const getRecordChipGenerators = (
         .filter(
           (fieldMetadataItem) =>
             labelIdentifierFieldMetadataItem?.id === fieldMetadataItem.id ||
-            fieldMetadataItem.type === FieldMetadataType.Relation ||
+            fieldMetadataItem.type === FieldMetadataType.RELATION ||
             isFieldIdentifierDisplay(
               fieldMetadataItem,
               isLabelIdentifierField({
diff --git a/packages/twenty-front/src/modules/object-record/utils/getRecordIndexIdFromObjectNamePlural.ts b/packages/twenty-front/src/modules/object-record/utils/getRecordIndexIdFromObjectNamePlural.ts
new file mode 100644
index 000000000000..4dd869f86b5f
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/utils/getRecordIndexIdFromObjectNamePlural.ts
@@ -0,0 +1,5 @@
+export const getRecordIndexIdFromObjectNamePlural = (
+  objectNamePlural: string,
+) => {
+  return objectNamePlural;
+};
diff --git a/packages/twenty-front/src/modules/object-record/utils/initializeAvailableFieldsForAggregateOperationMap.ts b/packages/twenty-front/src/modules/object-record/utils/initializeAvailableFieldsForAggregateOperationMap.ts
index 71f70a211691..86b1cd56db78 100644
--- a/packages/twenty-front/src/modules/object-record/utils/initializeAvailableFieldsForAggregateOperationMap.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/initializeAvailableFieldsForAggregateOperationMap.ts
@@ -1,14 +1,13 @@
-import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
+import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
 import { AvailableFieldsForAggregateOperation } from '@/object-record/types/AvailableFieldsForAggregateOperation';
-import { convertAggregateOperationToExtendedAggregateOperation } from '@/object-record/utils/convertAggregateOperationToExtendedAggregateOperation';
 
 export const initializeAvailableFieldsForAggregateOperationMap = (
-  aggregateOperations: AGGREGATE_OPERATIONS[],
+  aggregateOperations: ExtendedAggregateOperations[],
 ): AvailableFieldsForAggregateOperation => {
   return aggregateOperations.reduce(
     (acc, operation) => ({
       ...acc,
-      [convertAggregateOperationToExtendedAggregateOperation(operation)]: [],
+      [operation]: [],
     }),
     {},
   );
diff --git a/packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.ts b/packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.ts
index df03a87311ca..da65b36e19ed 100644
--- a/packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.ts
@@ -13,15 +13,15 @@ export const isFieldCellSupported = (
 ) => {
   if (
     [
-      FieldMetadataType.Uuid,
-      FieldMetadataType.Position,
-      FieldMetadataType.RichText,
+      FieldMetadataType.UUID,
+      FieldMetadataType.POSITION,
+      FieldMetadataType.RICH_TEXT,
     ].includes(fieldMetadataItem.type)
   ) {
     return false;
   }
 
-  if (fieldMetadataItem.type === FieldMetadataType.Relation) {
+  if (fieldMetadataItem.type === FieldMetadataType.RELATION) {
     const relationObjectMetadataItemId =
       fieldMetadataItem.relationDefinition?.targetObjectMetadata.id;
 
@@ -52,7 +52,7 @@ export const isFieldCellSupported = (
       !fieldMetadataItem.relationDefinition ||
       // TODO: Many to many relations are not supported yet.
       fieldMetadataItem.relationDefinition.direction ===
-        RelationDefinitionType.ManyToMany ||
+        RelationDefinitionType.MANY_TO_MANY ||
       !relationObjectMetadataItem ||
       !isObjectMetadataAvailableForRelation(relationObjectMetadataItem)
     ) {
diff --git a/packages/twenty-front/src/modules/object-record/utils/prefillRecord.ts b/packages/twenty-front/src/modules/object-record/utils/prefillRecord.ts
index e3128edcfc77..c27f5042f616 100644
--- a/packages/twenty-front/src/modules/object-record/utils/prefillRecord.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/prefillRecord.ts
@@ -19,9 +19,9 @@ export const prefillRecord = <T extends ObjectRecord>({
       .map((fieldMetadataItem) => {
         const inputValue = input[fieldMetadataItem.name];
         if (
-          fieldMetadataItem.type === FieldMetadataType.Relation &&
+          fieldMetadataItem.type === FieldMetadataType.RELATION &&
           fieldMetadataItem.relationDefinition?.direction ===
-            RelationDefinitionType.ManyToOne
+            RelationDefinitionType.MANY_TO_ONE
         ) {
           throwIfInputRelationDataIsInconsistent(input, fieldMetadataItem);
         }
diff --git a/packages/twenty-front/src/modules/object-record/utils/sanitizeRecordInput.ts b/packages/twenty-front/src/modules/object-record/utils/sanitizeRecordInput.ts
index 29fc0501325c..387657386cb6 100644
--- a/packages/twenty-front/src/modules/object-record/utils/sanitizeRecordInput.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/sanitizeRecordInput.ts
@@ -28,9 +28,9 @@ export const sanitizeRecordInput = ({
         }
 
         if (
-          fieldMetadataItem.type === FieldMetadataType.Relation &&
+          fieldMetadataItem.type === FieldMetadataType.RELATION &&
           fieldMetadataItem.relationDefinition?.direction ===
-            RelationDefinitionType.ManyToOne
+            RelationDefinitionType.MANY_TO_ONE
         ) {
           const relationIdFieldName = `${fieldMetadataItem.name}Id`;
           const relationIdFieldMetadataItem = objectMetadataItem.fields.find(
@@ -43,9 +43,9 @@ export const sanitizeRecordInput = ({
         }
 
         if (
-          fieldMetadataItem.type === FieldMetadataType.Relation &&
+          fieldMetadataItem.type === FieldMetadataType.RELATION &&
           fieldMetadataItem.relationDefinition?.direction ===
-            RelationDefinitionType.OneToMany
+            RelationDefinitionType.ONE_TO_MANY
         ) {
           return undefined;
         }
diff --git a/packages/twenty-front/src/modules/object-record/utils/shouldRedirectToShowPageOnCreation.ts b/packages/twenty-front/src/modules/object-record/utils/shouldRedirectToShowPageOnCreation.ts
new file mode 100644
index 000000000000..d9a98b5ff883
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/utils/shouldRedirectToShowPageOnCreation.ts
@@ -0,0 +1,11 @@
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+
+export const shouldRedirectToShowPageOnCreation = (
+  objectNameSingular: string,
+) => {
+  if (objectNameSingular === CoreObjectNameSingular.Workflow) {
+    return true;
+  }
+
+  return false;
+};
diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingSyncEmailsSettingsCard.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingSyncEmailsSettingsCard.tsx
index 2a01962fdfe1..b1be41995a88 100644
--- a/packages/twenty-front/src/modules/onboarding/components/OnboardingSyncEmailsSettingsCard.tsx
+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingSyncEmailsSettingsCard.tsx
@@ -9,7 +9,7 @@ type OnboardingSyncEmailsSettingsCardProps = {
 
 export const OnboardingSyncEmailsSettingsCard = ({
   onChange,
-  value = MessageChannelVisibility.ShareEverything,
+  value = MessageChannelVisibility.SHARE_EVERYTHING,
 }: OnboardingSyncEmailsSettingsCardProps) => (
   <SettingsAccountsRadioSettingsCard
     name="sync-emails-visiblity"
diff --git a/packages/twenty-front/src/modules/onboarding/components/onboardingSyncEmailsOptions.tsx b/packages/twenty-front/src/modules/onboarding/components/onboardingSyncEmailsOptions.tsx
index 121408787316..3a6f167f0ad4 100644
--- a/packages/twenty-front/src/modules/onboarding/components/onboardingSyncEmailsOptions.tsx
+++ b/packages/twenty-front/src/modules/onboarding/components/onboardingSyncEmailsOptions.tsx
@@ -12,7 +12,7 @@ export const onboardingSyncEmailsOptions = [
     title: 'Everything',
     description:
       'Your emails and events content will be shared with your team.',
-    value: MessageChannelVisibility.ShareEverything,
+    value: MessageChannelVisibility.SHARE_EVERYTHING,
     cardMedia: (
       <StyledCardMedia metadata="active" subject="active" body="active" />
     ),
@@ -21,7 +21,7 @@ export const onboardingSyncEmailsOptions = [
     title: 'Subject and metadata',
     description:
       'Your email subjects and meeting titles will be shared with your team.',
-    value: MessageChannelVisibility.Subject,
+    value: MessageChannelVisibility.SUBJECT,
     cardMedia: (
       <StyledCardMedia metadata="active" subject="active" body="inactive" />
     ),
@@ -30,7 +30,7 @@ export const onboardingSyncEmailsOptions = [
     title: 'Metadata',
     description:
       'Only the timestamp & participants will be shared with your team.',
-    value: MessageChannelVisibility.Metadata,
+    value: MessageChannelVisibility.METADATA,
     cardMedia: (
       <StyledCardMedia metadata="active" subject="inactive" body="inactive" />
     ),
diff --git a/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useSetNextOnboardingStatus.test.ts b/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useSetNextOnboardingStatus.test.ts
index af5b54423046..f515b5f59b12 100644
--- a/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useSetNextOnboardingStatus.test.ts
+++ b/packages/twenty-front/src/modules/onboarding/hooks/__tests__/useSetNextOnboardingStatus.test.ts
@@ -51,37 +51,37 @@ const renderHooks = (
 describe('useSetNextOnboardingStatus', () => {
   it('should set next onboarding status for ProfileCreation', () => {
     const nextOnboardingStatus = renderHooks(
-      OnboardingStatus.ProfileCreation,
+      OnboardingStatus.PROFILE_CREATION,
       false,
       true,
     );
-    expect(nextOnboardingStatus).toEqual(OnboardingStatus.SyncEmail);
+    expect(nextOnboardingStatus).toEqual(OnboardingStatus.SYNC_EMAIL);
   });
 
   it('should set next onboarding status for SyncEmail', () => {
     const nextOnboardingStatus = renderHooks(
-      OnboardingStatus.SyncEmail,
+      OnboardingStatus.SYNC_EMAIL,
       false,
       true,
     );
-    expect(nextOnboardingStatus).toEqual(OnboardingStatus.InviteTeam);
+    expect(nextOnboardingStatus).toEqual(OnboardingStatus.INVITE_TEAM);
   });
 
   it('should skip invite when more than 1 workspaceMember exist', () => {
     const nextOnboardingStatus = renderHooks(
-      OnboardingStatus.SyncEmail,
+      OnboardingStatus.SYNC_EMAIL,
       true,
       false,
     );
-    expect(nextOnboardingStatus).toEqual(OnboardingStatus.Completed);
+    expect(nextOnboardingStatus).toEqual(OnboardingStatus.COMPLETED);
   });
 
   it('should set next onboarding status for Completed', () => {
     const nextOnboardingStatus = renderHooks(
-      OnboardingStatus.InviteTeam,
+      OnboardingStatus.INVITE_TEAM,
       true,
       true,
     );
-    expect(nextOnboardingStatus).toEqual(OnboardingStatus.Completed);
+    expect(nextOnboardingStatus).toEqual(OnboardingStatus.COMPLETED);
   });
 });
diff --git a/packages/twenty-front/src/modules/onboarding/hooks/useSetNextOnboardingStatus.ts b/packages/twenty-front/src/modules/onboarding/hooks/useSetNextOnboardingStatus.ts
index abc0a2b31810..b2a252a3c3dd 100644
--- a/packages/twenty-front/src/modules/onboarding/hooks/useSetNextOnboardingStatus.ts
+++ b/packages/twenty-front/src/modules/onboarding/hooks/useSetNextOnboardingStatus.ts
@@ -12,16 +12,20 @@ const getNextOnboardingStatus = (
   currentUser: CurrentUser | null,
   currentWorkspace: CurrentWorkspace | null,
 ) => {
-  if (currentUser?.onboardingStatus === OnboardingStatus.ProfileCreation) {
-    return OnboardingStatus.SyncEmail;
+  if (currentUser?.onboardingStatus === OnboardingStatus.WORKSPACE_ACTIVATION) {
+    return OnboardingStatus.PROFILE_CREATION;
+  }
+
+  if (currentUser?.onboardingStatus === OnboardingStatus.PROFILE_CREATION) {
+    return OnboardingStatus.SYNC_EMAIL;
   }
   if (
-    currentUser?.onboardingStatus === OnboardingStatus.SyncEmail &&
+    currentUser?.onboardingStatus === OnboardingStatus.SYNC_EMAIL &&
     currentWorkspace?.workspaceMembersCount === 1
   ) {
-    return OnboardingStatus.InviteTeam;
+    return OnboardingStatus.INVITE_TEAM;
   }
-  return OnboardingStatus.Completed;
+  return OnboardingStatus.COMPLETED;
 };
 
 export const useSetNextOnboardingStatus = () => {
diff --git a/packages/twenty-front/src/modules/prefetch/components/PrefetchRunQueriesEffect.tsx b/packages/twenty-front/src/modules/prefetch/components/PrefetchRunQueriesEffect.tsx
index 2c9d4d581f2d..2a6481d292c6 100644
--- a/packages/twenty-front/src/modules/prefetch/components/PrefetchRunQueriesEffect.tsx
+++ b/packages/twenty-front/src/modules/prefetch/components/PrefetchRunQueriesEffect.tsx
@@ -7,25 +7,28 @@ import { FavoriteFolder } from '@/favorites/types/FavoriteFolder';
 import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
 import { useCombinedFindManyRecords } from '@/object-record/multiple-objects/hooks/useCombinedFindManyRecords';
 import { PREFETCH_CONFIG } from '@/prefetch/constants/PrefetchConfig';
-import { usePrefetchRunQuery } from '@/prefetch/hooks/internal/usePrefetchRunQuery';
+import { useUpsertRecordsInCacheForPrefetchKey } from '@/prefetch/hooks/internal/useUpsertRecordsInCacheForPrefetchKey';
 import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
 import { View } from '@/views/types/View';
+import { useIsWorkspaceActivationStatusSuspended } from '@/workspace/hooks/useIsWorkspaceActivationStatusSuspended';
 import { isDefined } from '~/utils/isDefined';
 
 export const PrefetchRunQueriesEffect = () => {
   const currentUser = useRecoilValue(currentUserState);
 
+  const isWorkspaceSuspended = useIsWorkspaceActivationStatusSuspended();
+
   const { upsertRecordsInCache: upsertViewsInCache } =
-    usePrefetchRunQuery<View>({
+    useUpsertRecordsInCacheForPrefetchKey<View>({
       prefetchKey: PrefetchKey.AllViews,
     });
 
   const { upsertRecordsInCache: upsertFavoritesInCache } =
-    usePrefetchRunQuery<Favorite>({
+    useUpsertRecordsInCacheForPrefetchKey<Favorite>({
       prefetchKey: PrefetchKey.AllFavorites,
     });
   const { upsertRecordsInCache: upsertFavoritesFoldersInCache } =
-    usePrefetchRunQuery<FavoriteFolder>({
+    useUpsertRecordsInCacheForPrefetchKey<FavoriteFolder>({
       prefetchKey: PrefetchKey.AllFavoritesFolders,
     });
   const { objectMetadataItems } = useObjectMetadataItems();
@@ -42,7 +45,7 @@ export const PrefetchRunQueriesEffect = () => {
 
   const { result } = useCombinedFindManyRecords({
     operationSignatures,
-    skip: !currentUser,
+    skip: !currentUser || isWorkspaceSuspended,
   });
 
   useEffect(() => {
diff --git a/packages/twenty-front/src/modules/prefetch/hooks/internal/usePrefetchRunQuery.ts b/packages/twenty-front/src/modules/prefetch/hooks/internal/useUpsertRecordsInCacheForPrefetchKey.ts
similarity index 94%
rename from packages/twenty-front/src/modules/prefetch/hooks/internal/usePrefetchRunQuery.ts
rename to packages/twenty-front/src/modules/prefetch/hooks/internal/useUpsertRecordsInCacheForPrefetchKey.ts
index a2b18f3ca139..2e1da0cb8967 100644
--- a/packages/twenty-front/src/modules/prefetch/hooks/internal/usePrefetchRunQuery.ts
+++ b/packages/twenty-front/src/modules/prefetch/hooks/internal/useUpsertRecordsInCacheForPrefetchKey.ts
@@ -11,7 +11,7 @@ export type UsePrefetchRunQuery = {
   prefetchKey: PrefetchKey;
 };
 
-export const usePrefetchRunQuery = <T extends ObjectRecord>({
+export const useUpsertRecordsInCacheForPrefetchKey = <T extends ObjectRecord>({
   prefetchKey,
 }: UsePrefetchRunQuery) => {
   const setPrefetchDataIsLoaded = useSetRecoilState(
@@ -45,7 +45,6 @@ export const usePrefetchRunQuery = <T extends ObjectRecord>({
 
   return {
     objectMetadataItem,
-    setPrefetchDataIsLoaded,
     upsertRecordsInCache,
   };
 };
diff --git a/packages/twenty-front/src/modules/prefetch/hooks/useIsPrefetchLoading.ts b/packages/twenty-front/src/modules/prefetch/hooks/useIsPrefetchLoading.ts
index 7df0fa8921e7..ceaab4bd61d0 100644
--- a/packages/twenty-front/src/modules/prefetch/hooks/useIsPrefetchLoading.ts
+++ b/packages/twenty-front/src/modules/prefetch/hooks/useIsPrefetchLoading.ts
@@ -1,8 +1,10 @@
 import { prefetchIsLoadedFamilyState } from '@/prefetch/states/prefetchIsLoadedFamilyState';
 import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
+import { useIsWorkspaceActivationStatusSuspended } from '@/workspace/hooks/useIsWorkspaceActivationStatusSuspended';
 import { useRecoilValue } from 'recoil';
 
 export const useIsPrefetchLoading = () => {
+  const isWorkspaceSuspended = useIsWorkspaceActivationStatusSuspended();
   const isFavoriteFoldersPrefetched = useRecoilValue(
     prefetchIsLoadedFamilyState(PrefetchKey.AllFavoritesFolders),
   );
@@ -15,8 +17,9 @@ export const useIsPrefetchLoading = () => {
   );
 
   return (
-    !areViewsPrefetched ||
-    !areFavoritesPrefetched ||
-    !isFavoriteFoldersPrefetched
+    !isWorkspaceSuspended &&
+    (!areViewsPrefetched ||
+      !areFavoritesPrefetched ||
+      !isFavoriteFoldersPrefetched)
   );
 };
diff --git a/packages/twenty-front/src/modules/serverless-functions/components/ServerlessFunctionExecutionResult.tsx b/packages/twenty-front/src/modules/serverless-functions/components/ServerlessFunctionExecutionResult.tsx
index 899cebeeed3f..40ab34052bd6 100644
--- a/packages/twenty-front/src/modules/serverless-functions/components/ServerlessFunctionExecutionResult.tsx
+++ b/packages/twenty-front/src/modules/serverless-functions/components/ServerlessFunctionExecutionResult.tsx
@@ -1,17 +1,17 @@
 import styled from '@emotion/styled';
 
+import { LightCopyIconButton } from '@/object-record/record-field/components/LightCopyIconButton';
+import {
+  DEFAULT_OUTPUT_VALUE,
+  ServerlessFunctionTestData,
+} from '@/workflow/states/serverlessFunctionTestDataFamilyState';
 import { useTheme } from '@emotion/react';
-import { ServerlessFunctionExecutionStatus } from '~/generated-metadata/graphql';
 import {
   CodeEditor,
   CoreEditorHeader,
   IconSquareRoundedCheck,
 } from 'twenty-ui';
-import { LightCopyIconButton } from '@/object-record/record-field/components/LightCopyIconButton';
-import {
-  DEFAULT_OUTPUT_VALUE,
-  ServerlessFunctionTestData,
-} from '@/workflow/states/serverlessFunctionTestDataFamilyState';
+import { ServerlessFunctionExecutionStatus } from '~/generated-metadata/graphql';
 
 const StyledContainer = styled.div`
   display: flex;
@@ -22,7 +22,7 @@ const StyledOutput = styled.div<{ status?: ServerlessFunctionExecutionStatus }>`
   align-items: center;
   gap: ${({ theme }) => theme.spacing(1)};
   color: ${({ theme, status }) =>
-    status === ServerlessFunctionExecutionStatus.Success
+    status === ServerlessFunctionExecutionStatus.SUCCESS
       ? theme.color.turquoise
       : theme.color.red};
   display: flex;
@@ -47,7 +47,7 @@ export const ServerlessFunctionExecutionResult = ({
       <StyledOutput status={serverlessFunctionTestData.output.status}>
         <IconSquareRoundedCheck size={theme.icon.size.md} />
         {serverlessFunctionTestData.output.status ===
-        ServerlessFunctionExecutionStatus.Success
+        ServerlessFunctionExecutionStatus.SUCCESS
           ? '200 OK'
           : '500 Error'}
         {' - '}
diff --git a/packages/twenty-front/src/modules/serverless-functions/hooks/useTestServerlessFunction.ts b/packages/twenty-front/src/modules/serverless-functions/hooks/useTestServerlessFunction.ts
index af5bd65db76c..5c40270c292f 100644
--- a/packages/twenty-front/src/modules/serverless-functions/hooks/useTestServerlessFunction.ts
+++ b/packages/twenty-front/src/modules/serverless-functions/hooks/useTestServerlessFunction.ts
@@ -3,10 +3,15 @@ import { useRecoilState } from 'recoil';
 import { serverlessFunctionTestDataFamilyState } from '@/workflow/states/serverlessFunctionTestDataFamilyState';
 import { isDefined } from 'twenty-ui';
 
-export const useTestServerlessFunction = (
-  serverlessFunctionId: string,
-  callback?: (testResult: object) => void,
-) => {
+export const useTestServerlessFunction = ({
+  serverlessFunctionId,
+  serverlessFunctionVersion = 'draft',
+  callback,
+}: {
+  serverlessFunctionId: string;
+  serverlessFunctionVersion?: string;
+  callback?: (testResult: object) => void;
+}) => {
   const { executeOneServerlessFunction } = useExecuteOneServerlessFunction();
   const [serverlessFunctionTestData, setServerlessFunctionTestData] =
     useRecoilState(serverlessFunctionTestDataFamilyState(serverlessFunctionId));
@@ -15,7 +20,7 @@ export const useTestServerlessFunction = (
     const result = await executeOneServerlessFunction({
       id: serverlessFunctionId,
       payload: serverlessFunctionTestData.input,
-      version: 'draft',
+      version: serverlessFunctionVersion,
     });
 
     if (isDefined(result?.data?.executeOneServerlessFunction?.data)) {
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx
index b082cfc08dd2..a700f7ad859b 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx
@@ -6,6 +6,7 @@ import { Key } from 'ts-key-enum';
 import { z } from 'zod';
 
 import { TextInput } from '@/ui/input/components/TextInput';
+import { useLingui } from '@lingui/react/macro';
 import { Button } from 'twenty-ui';
 import { isDomain } from '~/utils/is-domain';
 
@@ -24,28 +25,6 @@ type SettingsAccountsBlocklistInputProps = {
   blockedEmailOrDomainList: string[];
 };
 
-const validationSchema = (blockedEmailOrDomainList: string[]) =>
-  z
-    .object({
-      emailOrDomain: z
-        .string()
-        .trim()
-        .email('Invalid email or domain')
-        .or(
-          z
-            .string()
-            .refine(
-              (value) => value.startsWith('@') && isDomain(value.slice(1)),
-              'Invalid email or domain',
-            ),
-        )
-        .refine(
-          (value) => !blockedEmailOrDomainList.includes(value),
-          'Email or domain is already in blocklist',
-        ),
-    })
-    .required();
-
 type FormInput = {
   emailOrDomain: string;
 };
@@ -54,6 +33,30 @@ export const SettingsAccountsBlocklistInput = ({
   updateBlockedEmailList,
   blockedEmailOrDomainList,
 }: SettingsAccountsBlocklistInputProps) => {
+  const { t } = useLingui();
+
+  const validationSchema = (blockedEmailOrDomainList: string[]) =>
+    z
+      .object({
+        emailOrDomain: z
+          .string()
+          .trim()
+          .email(t`Invalid email or domain`)
+          .or(
+            z
+              .string()
+              .refine(
+                (value) => value.startsWith('@') && isDomain(value.slice(1)),
+                t`Invalid email or domain`,
+              ),
+          )
+          .refine(
+            (value) => !blockedEmailOrDomainList.includes(value),
+            t`Email or domain is already in blocklist`,
+          ),
+      })
+      .required();
+
   const { reset, handleSubmit, control, formState } = useForm<FormInput>({
     mode: 'onSubmit',
     resolver: zodResolver(validationSchema(blockedEmailOrDomainList)),
@@ -99,7 +102,7 @@ export const SettingsAccountsBlocklistInput = ({
             )}
           />
         </StyledLinkContainer>
-        <Button title="Add to blocklist" type="submit" />
+        <Button title={t`Add to blocklist`} type="submit" />
       </StyledContainer>
     </form>
   );
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx
index 259b3f87ae2b..4eb49a56652e 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistSection.tsx
@@ -9,8 +9,11 @@ import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { SettingsAccountsBlocklistInput } from '@/settings/accounts/components/SettingsAccountsBlocklistInput';
 import { SettingsAccountsBlocklistTable } from '@/settings/accounts/components/SettingsAccountsBlocklistTable';
+import { useLingui } from '@lingui/react/macro';
 
 export const SettingsAccountsBlocklistSection = () => {
+  const { t } = useLingui();
+
   const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
 
   const { records: blocklist } = useFindManyRecords<BlocklistItem>({
@@ -40,8 +43,8 @@ export const SettingsAccountsBlocklistSection = () => {
   return (
     <Section>
       <H2Title
-        title="Blocklist"
-        description="Exclude the following people and domains from my email sync"
+        title={t`Blocklist`}
+        description={t`Exclude the following people and domains from my email sync`}
       />
       <SettingsAccountsBlocklistInput
         blockedEmailOrDomainList={blocklist.map((item) => item.handle)}
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelsGeneral.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelsGeneral.tsx
index 4b1a873a198d..fa5a5c48c745 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelsGeneral.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarChannelsGeneral.tsx
@@ -58,7 +58,7 @@ export const SettingsAccountsCalendarChannelsGeneral = () => {
     isCanceled: false,
     location: '',
     title: 'Onboarding call',
-    visibility: CalendarChannelVisibility.ShareEverything,
+    visibility: CalendarChannelVisibility.SHARE_EVERYTHING,
   };
 
   return (
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarVisibilitySettingsCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarVisibilitySettingsCard.tsx
index 20344671bb85..41fd35f1bd63 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarVisibilitySettingsCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarVisibilitySettingsCard.tsx
@@ -17,20 +17,20 @@ const eventSettingsVisibilityOptions = [
   {
     title: 'Everything',
     description: 'The whole event details will be shared with your team.',
-    value: CalendarChannelVisibility.ShareEverything,
+    value: CalendarChannelVisibility.SHARE_EVERYTHING,
     cardMedia: <StyledCardMedia subject="active" body="active" />,
   },
   {
     title: 'Metadata',
     description: 'Only date & participants will be shared with your team.',
-    value: CalendarChannelVisibility.Metadata,
+    value: CalendarChannelVisibility.METADATA,
     cardMedia: <StyledCardMedia subject="active" body="inactive" />,
   },
 ];
 
 export const SettingsAccountsEventVisibilitySettingsCard = ({
   onChange,
-  value = CalendarChannelVisibility.ShareEverything,
+  value = CalendarChannelVisibility.SHARE_EVERYTHING,
 }: SettingsAccountsEventVisibilitySettingsCardProps) => (
   <SettingsAccountsRadioSettingsCard
     name="event-visibility"
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsListCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsListCard.tsx
index c1f9090ade2b..405cf68b9f13 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsListCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsListCard.tsx
@@ -1,16 +1,15 @@
-import { useNavigate } from 'react-router-dom';
 import { IconComponent, IconGoogle, IconMicrosoft } from 'twenty-ui';
 
 import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
 import { SettingsAccountsListEmptyStateCard } from '@/settings/accounts/components/SettingsAccountsListEmptyStateCard';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 
-import { SettingsAccountsConnectedAccountsRowRightContainer } from '@/settings/accounts/components/SettingsAccountsConnectedAccountsRowRightContainer';
-import { SettingsListCard } from '../../components/SettingsListCard';
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { SettingsAccountsConnectedAccountsRowRightContainer } from '@/settings/accounts/components/SettingsAccountsConnectedAccountsRowRightContainer';
 import { useRecoilValue } from 'recoil';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 import { isDefined } from '~/utils/isDefined';
+import { SettingsListCard } from '../../components/SettingsListCard';
 
 const ProviderIcons: { [k: string]: IconComponent } = {
   google: IconGoogle,
@@ -24,7 +23,7 @@ export const SettingsAccountsConnectedAccountsListCard = ({
   accounts: ConnectedAccount[];
   loading?: boolean;
 }) => {
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
   const currentWorkspace = useRecoilValue(currentWorkspaceState);
 
   if (!accounts.length) {
@@ -47,9 +46,7 @@ export const SettingsAccountsConnectedAccountsListCard = ({
       )}
       hasFooter={atLeastOneProviderAvailable}
       footerButtonLabel="Add account"
-      onFooterButtonClick={() =>
-        navigate(getSettingsPagePath(SettingsPath.NewAccount))
-      }
+      onFooterButtonClick={() => navigate(SettingsPath.NewAccount)}
     />
   );
 };
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx
index 19d24f1d71de..a3c7ea2841ee 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx
@@ -2,6 +2,7 @@ import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
 import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 import styled from '@emotion/styled';
+import { useLingui } from '@lingui/react/macro';
 import { useRecoilValue } from 'recoil';
 import {
   Button,
@@ -38,14 +39,16 @@ export const SettingsAccountsListEmptyStateCard = ({
     FeatureFlagKey.IsMicrosoftSyncEnabled,
   );
 
+  const { t } = useLingui();
+
   return (
     <Card>
-      <StyledHeader>{label || 'No connected account'}</StyledHeader>
+      <StyledHeader>{label || t`No connected account`}</StyledHeader>
       <StyledBody>
         {currentWorkspace?.isGoogleAuthEnabled && (
           <Button
             Icon={IconGoogle}
-            title="Connect with Google"
+            title={t`Connect with Google`}
             variant="secondary"
             onClick={() => triggerApisOAuth('google')}
           />
@@ -53,7 +56,7 @@ export const SettingsAccountsListEmptyStateCard = ({
         {isMicrosoftSyncEnabled && currentWorkspace?.isMicrosoftAuthEnabled && (
           <Button
             Icon={IconMicrosoft}
-            title="Connect with Microsoft"
+            title={t`Connect with Microsoft`}
             variant="secondary"
             onClick={() => triggerApisOAuth('microsoft')}
           />
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageVisibilityCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageVisibilityCard.tsx
index e0aa3172fd00..2a7c6e1da522 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageVisibilityCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageVisibilityCard.tsx
@@ -11,7 +11,7 @@ const inboxSettingsVisibilityOptions = [
   {
     title: 'Everything',
     description: 'Subject, body and attachments will be shared with your team.',
-    value: MessageChannelVisibility.ShareEverything,
+    value: MessageChannelVisibility.SHARE_EVERYTHING,
     cardMedia: (
       <SettingsAccountsVisibilityIcon
         metadata="active"
@@ -23,7 +23,7 @@ const inboxSettingsVisibilityOptions = [
   {
     title: 'Subject and metadata',
     description: 'Subject and metadata will be shared with your team.',
-    value: MessageChannelVisibility.Subject,
+    value: MessageChannelVisibility.SUBJECT,
     cardMedia: (
       <SettingsAccountsVisibilityIcon
         metadata="active"
@@ -35,7 +35,7 @@ const inboxSettingsVisibilityOptions = [
   {
     title: 'Metadata',
     description: 'Timestamp and participants will be shared with your team.',
-    value: MessageChannelVisibility.Metadata,
+    value: MessageChannelVisibility.METADATA,
     cardMedia: (
       <SettingsAccountsVisibilityIcon
         metadata="active"
@@ -48,7 +48,7 @@ const inboxSettingsVisibilityOptions = [
 
 export const SettingsAccountsMessageVisibilityCard = ({
   onChange,
-  value = MessageChannelVisibility.ShareEverything,
+  value = MessageChannelVisibility.SHARE_EVERYTHING,
 }: SettingsAccountsMessageVisibilityCardProps) => (
   <SettingsAccountsRadioSettingsCard
     name="message-visibility"
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
index 55bdd9393934..3192bd281d27 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
@@ -1,4 +1,3 @@
-import { useNavigate } from 'react-router-dom';
 import {
   IconCalendarEvent,
   IconDotsVertical,
@@ -13,9 +12,11 @@ import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useDestroyOneRecord } from '@/object-record/hooks/useDestroyOneRecord';
 import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
+import { SettingsPath } from '@/types/SettingsPath';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 
 type SettingsAccountsRowDropdownMenuProps = {
   account: ConnectedAccount;
@@ -26,7 +27,7 @@ export const SettingsAccountsRowDropdownMenu = ({
 }: SettingsAccountsRowDropdownMenuProps) => {
   const dropdownId = `settings-account-row-${account.id}`;
 
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
   const { closeDropdown } = useDropdown(dropdownId);
 
   const { destroyOneRecord } = useDestroyOneRecord({
@@ -49,7 +50,7 @@ export const SettingsAccountsRowDropdownMenu = ({
             LeftIcon={IconMail}
             text="Emails settings"
             onClick={() => {
-              navigate(`/settings/accounts/emails`);
+              navigate(SettingsPath.AccountsEmails);
               closeDropdown();
             }}
           />
@@ -57,7 +58,7 @@ export const SettingsAccountsRowDropdownMenu = ({
             LeftIcon={IconCalendarEvent}
             text="Calendar settings"
             onClick={() => {
-              navigate(`/settings/accounts/calendars`);
+              navigate(SettingsPath.AccountsCalendars);
               closeDropdown();
             }}
           />
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx
index d709d97fc969..bc666114f9f1 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsSettingsSection.tsx
@@ -9,9 +9,10 @@ import {
 } from 'twenty-ui';
 
 import { SettingsCard } from '@/settings/components/SettingsCard';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { useTheme } from '@emotion/react';
+import { useLingui } from '@lingui/react/macro';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 const StyledCardsContainer = styled.div`
   display: flex;
@@ -24,15 +25,16 @@ const StyledCardsContainer = styled.div`
 `;
 
 export const SettingsAccountsSettingsSection = () => {
+  const { t } = useLingui();
   const theme = useTheme();
   return (
     <Section>
       <H2Title
-        title="Settings"
-        description="Configure your emails and calendar settings."
+        title={t`Settings`}
+        description={t`Configure your emails and calendar settings.`}
       />
       <StyledCardsContainer>
-        <UndecoratedLink to={getSettingsPagePath(SettingsPath.AccountsEmails)}>
+        <UndecoratedLink to={getSettingsPath(SettingsPath.AccountsEmails)}>
           <SettingsCard
             Icon={
               <IconMailCog
@@ -40,13 +42,11 @@ export const SettingsAccountsSettingsSection = () => {
                 stroke={theme.icon.stroke.sm}
               />
             }
-            title="Emails"
-            description="Set email visibility, manage your blocklist and more."
+            title={t`Emails`}
+            description={t`Set email visibility, manage your blocklist and more.`}
           />
         </UndecoratedLink>
-        <UndecoratedLink
-          to={getSettingsPagePath(SettingsPath.AccountsCalendars)}
-        >
+        <UndecoratedLink to={getSettingsPath(SettingsPath.AccountsCalendars)}>
           <SettingsCard
             Icon={
               <IconCalendarEvent
@@ -54,8 +54,8 @@ export const SettingsAccountsSettingsSection = () => {
                 stroke={theme.icon.stroke.sm}
               />
             }
-            title="Calendar"
-            description="Configure and customize your calendar preferences."
+            title={t`Calendar`}
+            description={t`Configure and customize your calendar preferences.`}
           />
         </UndecoratedLink>
       </StyledCardsContainer>
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsNewAccountSection.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsNewAccountSection.tsx
index 3c75494d0f83..83992c86fc3d 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsNewAccountSection.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsNewAccountSection.tsx
@@ -1,15 +1,16 @@
 import { H2Title, Section } from 'twenty-ui';
 
 import { SettingsAccountsListEmptyStateCard } from '@/settings/accounts/components/SettingsAccountsListEmptyStateCard';
+import { t } from '@lingui/core/macro';
 
 export const SettingsNewAccountSection = () => {
   return (
     <Section>
       <H2Title
-        title="New account"
-        description="Connect a new account to your workspace"
+        title={t`New account`}
+        description={t`Connect a new account to your workspace`}
       />
-      <SettingsAccountsListEmptyStateCard label="Connect a Google account" />
+      <SettingsAccountsListEmptyStateCard label={t`Connect a Google account`} />
     </Section>
   );
 };
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsBlocklistInput.stories.tsx b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsBlocklistInput.stories.tsx
index 48a52896b524..cc4a3a5a6646 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsBlocklistInput.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsBlocklistInput.stories.tsx
@@ -3,6 +3,7 @@ import { expect, fn, userEvent, within } from '@storybook/test';
 import { ComponentDecorator } from 'twenty-ui';
 
 import { SettingsAccountsBlocklistInput } from '@/settings/accounts/components/SettingsAccountsBlocklistInput';
+import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 
 const updateBlockedEmailListJestFn = fn();
 
@@ -16,7 +17,7 @@ const ClearMocksDecorator: Decorator = (Story, context) => {
 const meta: Meta<typeof SettingsAccountsBlocklistInput> = {
   title: 'Modules/Settings/Accounts/Blocklist/SettingsAccountsBlocklistInput',
   component: SettingsAccountsBlocklistInput,
-  decorators: [ComponentDecorator, ClearMocksDecorator],
+  decorators: [ComponentDecorator, ClearMocksDecorator, I18nFrontDecorator],
   args: {
     updateBlockedEmailList: updateBlockedEmailListJestFn,
     blockedEmailOrDomainList: [],
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsBlocklistSection.stories.tsx b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsBlocklistSection.stories.tsx
index bc3f9cb721e1..27633a06618e 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsBlocklistSection.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsBlocklistSection.stories.tsx
@@ -3,11 +3,12 @@ import { ComponentDecorator } from 'twenty-ui';
 
 import { SettingsAccountsBlocklistInput } from '@/settings/accounts/components/SettingsAccountsBlocklistInput';
 import { SettingsAccountsBlocklistSection } from '@/settings/accounts/components/SettingsAccountsBlocklistSection';
+import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 
 const meta: Meta<typeof SettingsAccountsBlocklistSection> = {
   title: 'Modules/Settings/Accounts/Blocklist/SettingsAccountsBlocklistSection',
   component: SettingsAccountsBlocklistInput,
-  decorators: [ComponentDecorator],
+  decorators: [ComponentDecorator, I18nFrontDecorator],
 };
 
 export default meta;
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsCalendarChannelDetails.stories.tsx b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsCalendarChannelDetails.stories.tsx
index a4e9f5294e83..9109d0181883 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsCalendarChannelDetails.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsCalendarChannelDetails.stories.tsx
@@ -20,7 +20,7 @@ const meta: Meta<typeof SettingsAccountsCalendarChannelDetails> = {
       id: '20202020-ef5a-4822-9e08-ce6e6a4dcb6a',
       isContactAutoCreationEnabled: true,
       isSyncEnabled: true,
-      visibility: CalendarChannelVisibility.ShareEverything,
+      visibility: CalendarChannelVisibility.SHARE_EVERYTHING,
     },
   },
   argTypes: {
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsMessageChannelDetails.stories.tsx b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsMessageChannelDetails.stories.tsx
index a951150c94f3..6babbe320c98 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsMessageChannelDetails.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/__stories__/SettingsAccountsMessageChannelDetails.stories.tsx
@@ -23,7 +23,7 @@ const meta: Meta<typeof SettingsAccountsMessageChannelDetails> = {
       excludeNonProfessionalEmails: true,
       excludeGroupEmails: false,
       isSyncEnabled: true,
-      visibility: MessageChannelVisibility.ShareEverything,
+      visibility: MessageChannelVisibility.SHARE_EVERYTHING,
     },
   },
   argTypes: {
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminContent.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminContent.tsx
index 7dcdb1cf18b8..484932e73bd4 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminContent.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminContent.tsx
@@ -1,5 +1,7 @@
+import { canManageFeatureFlagsState } from '@/client-config/states/canManageFeatureFlagsState';
 import { SETTINGS_ADMIN_FEATURE_FLAGS_TAB_ID } from '@/settings/admin-panel/constants/SettingsAdminFeatureFlagsTabs';
 import { useFeatureFlagsManagement } from '@/settings/admin-panel/hooks/useFeatureFlagsManagement';
+import { useImpersonate } from '@/settings/admin-panel/hooks/useImpersonate';
 import { TextInput } from '@/ui/input/components/TextInput';
 import { TabList } from '@/ui/layout/tab/components/TabList';
 import { useTabList } from '@/ui/layout/tab/hooks/useTabList';
@@ -11,6 +13,7 @@ import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/consta
 import styled from '@emotion/styled';
 import { isNonEmptyString } from '@sniptt/guards';
 import { useState } from 'react';
+import { useRecoilValue } from 'recoil';
 import { getImageAbsoluteURI } from 'twenty-shared';
 import {
   Button,
@@ -24,7 +27,6 @@ import {
   Toggle,
 } from 'twenty-ui';
 import { REACT_APP_SERVER_BASE_URL } from '~/config';
-import { useImpersonate } from '@/settings/admin-panel/hooks/useImpersonate';
 
 const StyledLinkContainer = styled.div`
   margin-right: ${({ theme }) => theme.spacing(2)};
@@ -47,7 +49,7 @@ const StyledUserInfo = styled.div`
 `;
 
 const StyledTable = styled(Table)`
-  margin-top: ${({ theme }) => theme.spacing(0.5)};
+  margin-top: ${({ theme }) => theme.spacing(3)};
 `;
 
 const StyledTabListContainer = styled.div`
@@ -87,6 +89,8 @@ export const SettingsAdminContent = () => {
     error,
   } = useFeatureFlagsManagement();
 
+  const canManageFeatureFlags = useRecoilValue(canManageFeatureFlagsState);
+
   const handleSearch = async () => {
     setActiveTabId('');
 
@@ -151,37 +155,39 @@ export const SettingsAdminContent = () => {
           />
         )}
 
-        <StyledTable>
-          <TableRow
-            gridAutoColumns="1fr 100px"
-            mobileGridAutoColumns="1fr 80px"
-          >
-            <TableHeader>Feature Flag</TableHeader>
-            <TableHeader align="right">Status</TableHeader>
-          </TableRow>
-
-          {activeWorkspace.featureFlags.map((flag) => (
+        {canManageFeatureFlags && (
+          <StyledTable>
             <TableRow
               gridAutoColumns="1fr 100px"
               mobileGridAutoColumns="1fr 80px"
-              key={flag.key}
             >
-              <TableCell>{flag.key}</TableCell>
-              <TableCell align="right">
-                <Toggle
-                  value={flag.value}
-                  onChange={(newValue) =>
-                    handleFeatureFlagUpdate(
-                      activeWorkspace.id,
-                      flag.key,
-                      newValue,
-                    )
-                  }
-                />
-              </TableCell>
+              <TableHeader>Feature Flag</TableHeader>
+              <TableHeader align="right">Status</TableHeader>
             </TableRow>
-          ))}
-        </StyledTable>
+
+            {activeWorkspace.featureFlags.map((flag) => (
+              <TableRow
+                gridAutoColumns="1fr 100px"
+                mobileGridAutoColumns="1fr 80px"
+                key={flag.key}
+              >
+                <TableCell>{flag.key}</TableCell>
+                <TableCell align="right">
+                  <Toggle
+                    value={flag.value}
+                    onChange={(newValue) =>
+                      handleFeatureFlagUpdate(
+                        activeWorkspace.id,
+                        flag.key,
+                        newValue,
+                      )
+                    }
+                  />
+                </TableCell>
+              </TableRow>
+            ))}
+          </StyledTable>
+        )}
       </>
     );
   };
@@ -190,8 +196,16 @@ export const SettingsAdminContent = () => {
     <>
       <Section>
         <H2Title
-          title="Feature Flags & Impersonation"
-          description="Look up users and manage their workspace feature flags or impersonate it."
+          title={
+            canManageFeatureFlags
+              ? 'Feature Flags & Impersonation'
+              : 'User Impersonation'
+          }
+          description={
+            canManageFeatureFlags
+              ? 'Look up users and manage their workspace feature flags or impersonate them.'
+              : 'Look up users to impersonate them.'
+          }
         />
 
         <StyledContainer>
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/hooks/useFeatureFlagsManagement.ts b/packages/twenty-front/src/modules/settings/admin-panel/hooks/useFeatureFlagsManagement.ts
index 22ccd2b388e3..81378bf76914 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/hooks/useFeatureFlagsManagement.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/hooks/useFeatureFlagsManagement.ts
@@ -4,6 +4,7 @@ import { isDefined } from 'twenty-ui';
 import {
   useUpdateWorkspaceFeatureFlagMutation,
   useUserLookupAdminPanelMutation,
+  FeatureFlagKey,
 } from '~/generated/graphql';
 
 export const useFeatureFlagsManagement = () => {
@@ -42,7 +43,7 @@ export const useFeatureFlagsManagement = () => {
 
   const handleFeatureFlagUpdate = async (
     workspaceId: string,
-    featureFlag: string,
+    featureFlag: FeatureFlagKey,
     value: boolean,
   ) => {
     setError(null);
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/hooks/useImpersonate.ts b/packages/twenty-front/src/modules/settings/admin-panel/hooks/useImpersonate.ts
index 8c08f657d9b3..326bcfeeccd9 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/hooks/useImpersonate.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/hooks/useImpersonate.ts
@@ -1,15 +1,24 @@
 import { currentUserState } from '@/auth/states/currentUserState';
 import { AppPath } from '@/types/AppPath';
 import { useState } from 'react';
-import { useRecoilState } from 'recoil';
+import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
 import { useImpersonateMutation } from '~/generated/graphql';
 import { isDefined } from '~/utils/isDefined';
 import { useRedirectToWorkspaceDomain } from '@/domain-manager/hooks/useRedirectToWorkspaceDomain';
+import { useAuth } from '@/auth/hooks/useAuth';
+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { isAppWaitingForFreshObjectMetadataState } from '@/object-metadata/states/isAppWaitingForFreshObjectMetadataState';
 
 export const useImpersonate = () => {
   const [currentUser] = useRecoilState(currentUserState);
-  const [impersonate] = useImpersonateMutation();
+  const currentWorkspace = useRecoilValue(currentWorkspaceState);
+  const setIsAppWaitingForFreshObjectMetadata = useSetRecoilState(
+    isAppWaitingForFreshObjectMetadataState,
+  );
+
+  const { verify } = useAuth();
 
+  const [impersonate] = useImpersonateMutation();
   const { redirectToWorkspaceDomain } = useRedirectToWorkspaceDomain();
 
   const [isLoading, setIsLoading] = useState(false);
@@ -39,6 +48,13 @@ export const useImpersonate = () => {
 
       const { loginToken, workspace } = impersonateResult.data.impersonate;
 
+      if (workspace.id === currentWorkspace?.id) {
+        setIsAppWaitingForFreshObjectMetadata(true);
+        await verify(loginToken.token);
+        setIsAppWaitingForFreshObjectMetadata(false);
+        return;
+      }
+
       return redirectToWorkspaceDomain(workspace.subdomain, AppPath.Verify, {
         loginToken: loginToken.token,
       });
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/types/FeatureFlag.ts b/packages/twenty-front/src/modules/settings/admin-panel/types/FeatureFlag.ts
index 2c9ab89136fc..7d31cd20429c 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/types/FeatureFlag.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/types/FeatureFlag.ts
@@ -1,4 +1,6 @@
+import { FeatureFlagKey } from '~/generated/graphql';
+
 export type FeatureFlag = {
-  key: string;
+  key: FeatureFlagKey;
   value: boolean;
 };
diff --git a/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/CancelButton.tsx b/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/CancelButton.tsx
index 8226db8c6520..44bd09fc6cb1 100644
--- a/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/CancelButton.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/CancelButton.tsx
@@ -1,3 +1,4 @@
+import { useLingui } from '@lingui/react/macro';
 import { LightButton } from 'twenty-ui';
 
 type CancelButtonProps = {
@@ -9,9 +10,10 @@ export const CancelButton = ({
   onCancel,
   disabled = false,
 }: CancelButtonProps) => {
+  const { t } = useLingui();
   return (
     <LightButton
-      title="Cancel"
+      title={t`Cancel`}
       accent="tertiary"
       onClick={onCancel}
       disabled={disabled}
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItem.tsx b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItem.tsx
index 16835921f6da..8d31605a97b4 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItem.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItem.tsx
@@ -1,12 +1,12 @@
 import { useMatch, useResolvedPath } from 'react-router-dom';
 
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import {
   NavigationDrawerItem,
   NavigationDrawerItemProps,
 } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
 import { NavigationDrawerSubItemState } from '@/ui/navigation/navigation-drawer/types/NavigationDrawerSubItemState';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 type SettingsNavigationDrawerItemProps = Pick<
   NavigationDrawerItemProps,
@@ -26,7 +26,7 @@ export const SettingsNavigationDrawerItem = ({
   soon,
   subItemState,
 }: SettingsNavigationDrawerItemProps) => {
-  const href = getSettingsPagePath(path);
+  const href = getSettingsPath(path);
   const pathName = useResolvedPath(href).pathname;
 
   const isActive = !!useMatch({
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx
index ddc3dfdec1c0..5fd9d1a8bbf4 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItems.tsx
@@ -8,6 +8,7 @@ import {
   IconComponent,
   IconCurrencyDollar,
   IconDoorEnter,
+  IconFlask,
   IconFunction,
   IconHierarchy2,
   IconKey,
@@ -22,9 +23,9 @@ import {
 import { useAuth } from '@/auth/hooks/useAuth';
 import { currentUserState } from '@/auth/states/currentUserState';
 import { billingState } from '@/client-config/states/billingState';
+import { labPublicFeatureFlagsState } from '@/client-config/states/labPublicFeatureFlagsState';
 import { AdvancedSettingsWrapper } from '@/settings/components/AdvancedSettingsWrapper';
 import { SettingsNavigationDrawerItem } from '@/settings/components/SettingsNavigationDrawerItem';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import {
   NavigationDrawerItem,
@@ -35,8 +36,10 @@ import { NavigationDrawerSection } from '@/ui/navigation/navigation-drawer/compo
 import { NavigationDrawerSectionTitle } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle';
 import { getNavigationSubItemLeftAdornment } from '@/ui/navigation/navigation-drawer/utils/getNavigationSubItemLeftAdornment';
 import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+import { useLingui } from '@lingui/react/macro';
 import { matchPath, resolvePath, useLocation } from 'react-router-dom';
 import { FeatureFlagKey } from '~/generated/graphql';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 type SettingsNavigationItem = {
   label: string;
@@ -49,33 +52,35 @@ type SettingsNavigationItem = {
 export const SettingsNavigationDrawerItems = () => {
   const { signOut } = useAuth();
 
+  const { t } = useLingui();
+
   const billing = useRecoilValue(billingState);
-  const isFunctionSettingsEnabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsFunctionSettingsEnabled,
-  );
+
+  // We want to disable this serverless function setting menu but keep the code
+  // for now
+  const isFunctionSettingsEnabled = false;
+
   const isFreeAccessEnabled = useIsFeatureEnabled(
     FeatureFlagKey.IsFreeAccessEnabled,
   );
-  const isCRMMigrationEnabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsCrmMigrationEnabled,
-  );
   const isBillingPageEnabled =
     billing?.isBillingEnabled && !isFreeAccessEnabled;
 
   const currentUser = useRecoilValue(currentUserState);
   const isAdminPageEnabled = currentUser?.canImpersonate;
+  const labPublicFeatureFlags = useRecoilValue(labPublicFeatureFlagsState);
   // TODO: Refactor this part to only have arrays of navigation items
   const currentPathName = useLocation().pathname;
 
   const accountSubSettings: SettingsNavigationItem[] = [
     {
-      label: 'Emails',
+      label: t`Emails`,
       path: SettingsPath.AccountsEmails,
       Icon: IconMail,
       indentationLevel: 2,
     },
     {
-      label: 'Calendars',
+      label: t`Calendars`,
       path: SettingsPath.AccountsCalendars,
       Icon: IconCalendarEvent,
       indentationLevel: 2,
@@ -83,7 +88,7 @@ export const SettingsNavigationDrawerItems = () => {
   ];
 
   const selectedIndex = accountSubSettings.findIndex((accountSubSetting) => {
-    const href = getSettingsPagePath(accountSubSetting.path);
+    const href = getSettingsPath(accountSubSetting.path);
     const pathName = resolvePath(href).pathname;
 
     return matchPath(
@@ -98,20 +103,20 @@ export const SettingsNavigationDrawerItems = () => {
   return (
     <>
       <NavigationDrawerSection>
-        <NavigationDrawerSectionTitle label="User" />
+        <NavigationDrawerSectionTitle label={t`User`} />
         <SettingsNavigationDrawerItem
-          label="Profile"
+          label={t`Profile`}
           path={SettingsPath.ProfilePage}
           Icon={IconUserCircle}
         />
         <SettingsNavigationDrawerItem
-          label="Experience"
-          path={SettingsPath.Appearance}
+          label={t`Experience`}
+          path={SettingsPath.Experience}
           Icon={IconColorSwatch}
         />
         <NavigationDrawerItemGroup>
           <SettingsNavigationDrawerItem
-            label="Accounts"
+            label={t`Accounts`}
             path={SettingsPath.Accounts}
             Icon={IconAt}
             matchSubPages={false}
@@ -133,44 +138,37 @@ export const SettingsNavigationDrawerItems = () => {
         </NavigationDrawerItemGroup>
       </NavigationDrawerSection>
       <NavigationDrawerSection>
-        <NavigationDrawerSectionTitle label="Workspace" />
+        <NavigationDrawerSectionTitle label={t`Workspace`} />
         <SettingsNavigationDrawerItem
-          label="General"
+          label={t`General`}
           path={SettingsPath.Workspace}
           Icon={IconSettings}
         />
         <SettingsNavigationDrawerItem
-          label="Members"
+          label={t`Members`}
           path={SettingsPath.WorkspaceMembersPage}
           Icon={IconUsers}
         />
         {isBillingPageEnabled && (
           <SettingsNavigationDrawerItem
-            label="Billing"
+            label={t`Billing`}
             path={SettingsPath.Billing}
             Icon={IconCurrencyDollar}
           />
         )}
         <SettingsNavigationDrawerItem
-          label="Data model"
+          label={t`Data model`}
           path={SettingsPath.Objects}
           Icon={IconHierarchy2}
         />
         <SettingsNavigationDrawerItem
-          label="Integrations"
+          label={t`Integrations`}
           path={SettingsPath.Integrations}
           Icon={IconApps}
         />
-        {isCRMMigrationEnabled && (
-          <SettingsNavigationDrawerItem
-            label="CRM Migration"
-            path={SettingsPath.CRMMigration}
-            Icon={IconCode}
-          />
-        )}
         <AdvancedSettingsWrapper navigationDrawerItem={true}>
           <SettingsNavigationDrawerItem
-            label="Security"
+            label={t`Security`}
             path={SettingsPath.Security}
             Icon={IconKey}
           />
@@ -183,7 +181,7 @@ export const SettingsNavigationDrawerItems = () => {
         </AdvancedSettingsWrapper>
         <AdvancedSettingsWrapper navigationDrawerItem={true}>
           <SettingsNavigationDrawerItem
-            label="API & Webhooks"
+            label={t`API & Webhooks`}
             path={SettingsPath.Developers}
             Icon={IconCode}
           />
@@ -191,7 +189,7 @@ export const SettingsNavigationDrawerItems = () => {
         {isFunctionSettingsEnabled && (
           <AdvancedSettingsWrapper navigationDrawerItem={true}>
             <SettingsNavigationDrawerItem
-              label="Functions"
+              label={t`Functions`}
               path={SettingsPath.ServerlessFunctions}
               Icon={IconFunction}
             />
@@ -199,21 +197,28 @@ export const SettingsNavigationDrawerItems = () => {
         )}
       </NavigationDrawerSection>
       <NavigationDrawerSection>
-        <NavigationDrawerSectionTitle label="Other" />
+        <NavigationDrawerSectionTitle label={t`Other`} />
         {isAdminPageEnabled && (
           <SettingsNavigationDrawerItem
-            label="Server Admin Panel"
+            label={t`Server Admin Panel`}
             path={SettingsPath.AdminPanel}
             Icon={IconServer}
           />
         )}
+        {labPublicFeatureFlags?.length > 0 && (
+          <SettingsNavigationDrawerItem
+            label={t`Lab`}
+            path={SettingsPath.Lab}
+            Icon={IconFlask}
+          />
+        )}
         <SettingsNavigationDrawerItem
-          label="Releases"
+          label={t`Releases`}
           path={SettingsPath.Releases}
           Icon={IconRocket}
         />
         <NavigationDrawerItem
-          label="Logout"
+          label={t`Logout`}
           onClick={signOut}
           Icon={IconDoorEnter}
         />
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentToggle.tsx b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentToggle.tsx
index 235bd9b32fa5..c40cffb68433 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentToggle.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsOptions/SettingsOptionCardContentToggle.tsx
@@ -23,7 +23,11 @@ const StyledSettingsOptionCardToggleContent = styled(
   }
 `;
 
-const StyledSettingsOptionCardToggleButton = styled(Toggle)`
+const StyledSettingsOptionCardToggleButton = styled(Toggle)<{
+  toggleCentered?: boolean;
+}>`
+  align-self: ${({ toggleCentered }) =>
+    toggleCentered ? 'center' : 'flex-start'};
   margin-left: auto;
 `;
 
@@ -40,6 +44,7 @@ type SettingsOptionCardContentToggleProps = {
   divider?: boolean;
   disabled?: boolean;
   advancedMode?: boolean;
+  toggleCentered?: boolean;
   checked: boolean;
   onChange: (checked: boolean) => void;
 };
@@ -51,6 +56,7 @@ export const SettingsOptionCardContentToggle = ({
   divider,
   disabled = false,
   advancedMode = false,
+  toggleCentered = true,
   checked,
   onChange,
 }: SettingsOptionCardContentToggleProps) => {
@@ -83,6 +89,7 @@ export const SettingsOptionCardContentToggle = ({
           disabled={disabled}
           toggleSize="small"
           color={advancedMode ? theme.color.yellow : theme.color.blue}
+          toggleCentered={toggleCentered}
         />
       </StyledSettingsOptionCardToggleContent>
       {divider && <Separator />}
diff --git a/packages/twenty-front/src/modules/settings/components/__stories__/CancelButton.stories.tsx b/packages/twenty-front/src/modules/settings/components/__stories__/CancelButton.stories.tsx
index 7a67047d8d0d..ab61abe74c7a 100644
--- a/packages/twenty-front/src/modules/settings/components/__stories__/CancelButton.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/components/__stories__/CancelButton.stories.tsx
@@ -1,10 +1,12 @@
 import { Meta, StoryObj } from '@storybook/react';
 
+import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { CancelButton } from '../SaveAndCancelButtons/CancelButton';
 
 const meta: Meta<typeof CancelButton> = {
   title: 'Modules/Settings/CancelButton',
   component: CancelButton,
+  decorators: [I18nFrontDecorator],
 };
 
 export default meta;
diff --git a/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelNewFieldBreadcrumbDropDown.tsx b/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelNewFieldBreadcrumbDropDown.tsx
index 6f4a3ae15854..7efaa57eb7cc 100644
--- a/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelNewFieldBreadcrumbDropDown.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelNewFieldBreadcrumbDropDown.tsx
@@ -1,17 +1,14 @@
 import { SettingsFieldType } from '@/settings/data-model/types/SettingsFieldType';
+import { SettingsPath } from '@/types/SettingsPath';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-import {
-  useLocation,
-  useNavigate,
-  useParams,
-  useSearchParams,
-} from 'react-router-dom';
+import { useLocation, useParams, useSearchParams } from 'react-router-dom';
 import { Button, IconChevronDown, isDefined, MenuItem } from 'twenty-ui';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 
 const StyledContainer = styled.div`
   align-items: center;
@@ -66,7 +63,7 @@ const StyledButton = styled(Button)`
 export const SettingsDataModelNewFieldBreadcrumbDropDown = () => {
   const dropdownId = `settings-object-new-field-breadcrumb-dropdown`;
   const { closeDropdown } = useDropdown(dropdownId);
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
   const location = useLocation();
   const { objectNamePlural = '' } = useParams();
   const [searchParams] = useSearchParams();
@@ -78,11 +75,15 @@ export const SettingsDataModelNewFieldBreadcrumbDropDown = () => {
   const handleClick = (step: 'select' | 'configure') => {
     if (step === 'configure' && isDefined(fieldType)) {
       navigate(
-        `/settings/objects/${objectNamePlural}/new-field/configure?fieldType=${fieldType}`,
+        SettingsPath.ObjectNewFieldConfigure,
+        { objectNamePlural },
+        { fieldType },
       );
     } else {
       navigate(
-        `/settings/objects/${objectNamePlural}/new-field/select${fieldType ? `?fieldType=${fieldType}` : ''}`,
+        SettingsPath.ObjectNewFieldSelect,
+        { objectNamePlural },
+        fieldType ? { fieldType } : undefined,
       );
     }
     closeDropdown();
@@ -125,9 +126,7 @@ export const SettingsDataModelNewFieldBreadcrumbDropDown = () => {
             </DropdownMenuItemsContainer>
           </DropdownMenu>
         }
-        dropdownHotkeyScope={{
-          scope: dropdownId,
-        }}
+        dropdownHotkeyScope={{ scope: dropdownId }}
       />
     </StyledContainer>
   );
diff --git a/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx
index e79533afe8ee..f965bebdd644 100644
--- a/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx
@@ -2,6 +2,7 @@ import styled from '@emotion/styled';
 import { ReactNode } from 'react';
 
 import { StyledFormCardTitle } from '@/settings/data-model/fields/components/StyledFormCardTitle';
+import { Trans } from '@lingui/react/macro';
 import { Card, CardContent } from 'twenty-ui';
 
 type SettingsDataModelPreviewFormCardProps = {
@@ -25,7 +26,9 @@ export const SettingsDataModelPreviewFormCard = ({
 }: SettingsDataModelPreviewFormCardProps) => (
   <Card className={className} fullWidth rounded>
     <StyledPreviewContainer divider={!!form}>
-      <StyledFormCardTitle>Preview</StyledFormCardTitle>
+      <StyledFormCardTitle>
+        <Trans>Preview</Trans>
+      </StyledFormCardTitle>
       {preview}
     </StyledPreviewContainer>
     {!!form && <StyledFormContainer>{form}</StyledFormContainer>}
diff --git a/packages/twenty-front/src/modules/settings/data-model/constants/RelationTypes.ts b/packages/twenty-front/src/modules/settings/data-model/constants/RelationTypes.ts
index 179f60fe8979..0f7d84a6d0fe 100644
--- a/packages/twenty-front/src/modules/settings/data-model/constants/RelationTypes.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/constants/RelationTypes.ts
@@ -19,24 +19,24 @@ export const RELATION_TYPES: Record<
     isImageFlipped?: boolean;
   }
 > = {
-  [RelationDefinitionType.OneToMany]: {
+  [RelationDefinitionType.ONE_TO_MANY]: {
     label: 'Has many',
     Icon: IllustrationIconOneToMany,
     imageSrc: OneToManySvg,
   },
-  [RelationDefinitionType.OneToOne]: {
+  [RelationDefinitionType.ONE_TO_ONE]: {
     label: 'Has one',
     Icon: IllustrationIconOneToOne,
     imageSrc: OneToOneSvg,
   },
-  [RelationDefinitionType.ManyToOne]: {
+  [RelationDefinitionType.MANY_TO_ONE]: {
     label: 'Belongs to one',
     Icon: IllustrationIconOneToMany,
     imageSrc: OneToManySvg,
     isImageFlipped: true,
   },
   // Not supported yet
-  [RelationDefinitionType.ManyToMany]: {
+  [RelationDefinitionType.MANY_TO_MANY]: {
     label: 'Belongs to many',
     Icon: IllustrationIconManyToMany,
     imageSrc: OneToManySvg,
diff --git a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsCompositeFieldTypeConfigs.ts b/packages/twenty-front/src/modules/settings/data-model/constants/SettingsCompositeFieldTypeConfigs.ts
index c991341b716f..761550131491 100644
--- a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsCompositeFieldTypeConfigs.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/constants/SettingsCompositeFieldTypeConfigs.ts
@@ -34,7 +34,7 @@ type SettingsCompositeFieldTypeConfigArray = Record<
 >;
 
 export const SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS = {
-  [FieldMetadataType.Currency]: {
+  [FieldMetadataType.CURRENCY]: {
     label: 'Currency',
     Icon: IllustrationIconCurrency,
     subFields: ['amountMicros'],
@@ -49,7 +49,7 @@ export const SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS = {
     },
     category: 'Basic',
   } as const satisfies SettingsCompositeFieldTypeConfig<FieldCurrencyValue>,
-  [FieldMetadataType.Emails]: {
+  [FieldMetadataType.EMAILS]: {
     label: 'Emails',
     Icon: IllustrationIconMail,
     subFields: ['primaryEmail', 'additionalEmails'],
@@ -68,7 +68,7 @@ export const SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS = {
     },
     category: 'Basic',
   } as const satisfies SettingsCompositeFieldTypeConfig<FieldEmailsValue>,
-  [FieldMetadataType.Links]: {
+  [FieldMetadataType.LINKS]: {
     label: 'Links',
     Icon: IllustrationIconLink,
     exampleValue: {
@@ -85,7 +85,7 @@ export const SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS = {
       secondaryLinks: 'Secondary Links',
     },
   } as const satisfies SettingsCompositeFieldTypeConfig<FieldLinksValue>,
-  [FieldMetadataType.Phones]: {
+  [FieldMetadataType.PHONES]: {
     label: 'Phones',
     Icon: IllustrationIconPhone,
     exampleValue: {
@@ -110,7 +110,7 @@ export const SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS = {
     },
     category: 'Basic',
   } as const satisfies SettingsCompositeFieldTypeConfig<FieldPhonesValue>,
-  [FieldMetadataType.FullName]: {
+  [FieldMetadataType.FULL_NAME]: {
     label: 'Full Name',
     Icon: IllustrationIconUser,
     exampleValue: { firstName: 'John', lastName: 'Doe' },
@@ -122,7 +122,7 @@ export const SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS = {
       lastName: 'Last Name',
     },
   } as const satisfies SettingsCompositeFieldTypeConfig<FieldFullNameValue>,
-  [FieldMetadataType.Address]: {
+  [FieldMetadataType.ADDRESS]: {
     label: 'Address',
     Icon: IllustrationIconMap,
     subFields: [
@@ -165,7 +165,7 @@ export const SETTINGS_COMPOSITE_FIELD_TYPE_CONFIGS = {
     },
     category: 'Basic',
   } as const satisfies SettingsCompositeFieldTypeConfig<FieldAddressValue>,
-  [FieldMetadataType.Actor]: {
+  [FieldMetadataType.ACTOR]: {
     label: 'Actor',
     Icon: IllustrationIconSetting,
     category: 'Basic',
diff --git a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsNonCompositeFieldTypeConfigs.ts b/packages/twenty-front/src/modules/settings/data-model/constants/SettingsNonCompositeFieldTypeConfigs.ts
index a762b6f76dcb..8e38eab5bc1e 100644
--- a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsNonCompositeFieldTypeConfigs.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/constants/SettingsNonCompositeFieldTypeConfigs.ts
@@ -52,83 +52,83 @@ type SettingsNonCompositeFieldTypeConfigArray = Record<
 // TODO: can we derive this from backend definitions ?
 export const SETTINGS_NON_COMPOSITE_FIELD_TYPE_CONFIGS: SettingsNonCompositeFieldTypeConfigArray =
   {
-    [FieldMetadataType.Uuid]: {
+    [FieldMetadataType.UUID]: {
       label: 'Unique ID',
       Icon: IllustrationIconUid,
       exampleValue: '00000000-0000-0000-0000-000000000000',
       category: 'Advanced',
     } as const satisfies SettingsFieldTypeConfig<FieldUUidValue>,
-    [FieldMetadataType.Text]: {
+    [FieldMetadataType.TEXT]: {
       label: 'Text',
       Icon: IllustrationIconText,
       exampleValue:
         'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum magna enim, dapibus non enim in, lacinia faucibus nunc. Sed interdum ante sed felis facilisis, eget ultricies neque molestie. Mauris auctor, justo eu volutpat cursus, libero erat tempus nulla, non sodales lorem lacus a est.',
       category: 'Basic',
     } as const satisfies SettingsFieldTypeConfig<FieldTextValue>,
-    [FieldMetadataType.Numeric]: {
+    [FieldMetadataType.NUMERIC]: {
       label: 'Numeric',
       Icon: IllustrationIconNumbers,
       exampleValue: 2000,
       category: 'Basic',
     } as const satisfies SettingsFieldTypeConfig<FieldNumberValue>,
-    [FieldMetadataType.Number]: {
+    [FieldMetadataType.NUMBER]: {
       label: 'Number',
       Icon: IllustrationIconNumbers,
       exampleValue: 2000,
       category: 'Basic',
     } as const satisfies SettingsFieldTypeConfig<FieldNumberValue>,
-    [FieldMetadataType.Boolean]: {
+    [FieldMetadataType.BOOLEAN]: {
       label: 'True/False',
       Icon: IllustrationIconToggle,
       exampleValue: true,
       category: 'Basic',
     } as const satisfies SettingsFieldTypeConfig<FieldBooleanValue>,
-    [FieldMetadataType.DateTime]: {
+    [FieldMetadataType.DATE_TIME]: {
       label: 'Date and Time',
       Icon: IllustrationIconCalendarTime,
       exampleValue: DEFAULT_DATE_VALUE.toISOString(),
       category: 'Basic',
     } as const satisfies SettingsFieldTypeConfig<FieldDateTimeValue>,
-    [FieldMetadataType.Date]: {
+    [FieldMetadataType.DATE]: {
       label: 'Date',
       Icon: IllustrationIconCalendarEvent,
       exampleValue: DEFAULT_DATE_VALUE.toISOString(),
       category: 'Basic',
     } as const satisfies SettingsFieldTypeConfig<FieldDateValue>,
-    [FieldMetadataType.Select]: {
+    [FieldMetadataType.SELECT]: {
       label: 'Select',
       Icon: IllustrationIconTag,
       category: 'Basic',
     } as const satisfies SettingsFieldTypeConfig<FieldSelectValue>,
-    [FieldMetadataType.MultiSelect]: {
+    [FieldMetadataType.MULTI_SELECT]: {
       label: 'Multi-select',
       Icon: IllustrationIconTags,
       category: 'Basic',
     } as const satisfies SettingsFieldTypeConfig<FieldMultiSelectValue>,
-    [FieldMetadataType.Relation]: {
+    [FieldMetadataType.RELATION]: {
       label: 'Relation',
       Icon: IllustrationIconOneToMany,
       category: 'Relation',
     } as const satisfies SettingsFieldTypeConfig<FieldRelationValue<any>>,
-    [FieldMetadataType.Rating]: {
+    [FieldMetadataType.RATING]: {
       label: 'Rating',
       Icon: IllustrationIconStar,
       exampleValue: 'RATING_3',
       category: 'Basic',
     } as const satisfies SettingsFieldTypeConfig<FieldRatingValue>,
-    [FieldMetadataType.RawJson]: {
+    [FieldMetadataType.RAW_JSON]: {
       label: 'JSON',
       Icon: IllustrationIconJson,
       exampleValue: { key: 'value' },
       category: 'Advanced',
     } as const satisfies SettingsFieldTypeConfig<FieldJsonValue>,
-    [FieldMetadataType.RichText]: {
+    [FieldMetadataType.RICH_TEXT]: {
       label: 'Rich Text',
       Icon: IllustrationIconSetting,
       exampleValue: "{ key: 'value' }",
       category: 'Basic',
     } as const satisfies SettingsFieldTypeConfig<FieldRichTextValue>,
-    [FieldMetadataType.Array]: {
+    [FieldMetadataType.ARRAY]: {
       label: 'Array',
       Icon: IllustrationIconArray,
       category: 'Advanced',
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx
index 1af2f9fe9d0c..6385b0cda2f6 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx
@@ -11,6 +11,7 @@ import { getErrorMessageFromError } from '@/settings/data-model/fields/forms/uti
 import { IconPicker } from '@/ui/input/components/IconPicker';
 import { TextInput } from '@/ui/input/components/TextInput';
 import { useTheme } from '@emotion/react';
+import { useLingui } from '@lingui/react/macro';
 import {
   AppTooltip,
   Card,
@@ -91,6 +92,8 @@ export const SettingsDataModelFieldIconLabelForm = ({
 
   const theme = useTheme();
 
+  const { t } = useLingui();
+
   const isLabelSyncedWithName =
     watch('isLabelSyncedWithName') ??
     (isDefined(fieldMetadataItem)
@@ -99,8 +102,8 @@ export const SettingsDataModelFieldIconLabelForm = ({
   const label = watch('label');
 
   const apiNameTooltipText = isLabelSyncedWithName
-    ? 'Deactivate "Synchronize Objects Labels and API Names" to set a custom API name'
-    : 'Input must be in camel case and cannot start with a number';
+    ? t`Deactivate "Synchronize Objects Labels and API Names" to set a custom API name`
+    : t`Input must be in camel case and cannot start with a number`;
 
   const fillNameFromLabel = (label: string) => {
     isDefined(label) &&
@@ -131,7 +134,7 @@ export const SettingsDataModelFieldIconLabelForm = ({
           defaultValue={fieldMetadataItem?.label}
           render={({ field: { onChange, value } }) => (
             <TextInput
-              placeholder="Employees"
+              placeholder={t`Employees`}
               value={value}
               onChange={(value) => {
                 onChange(value);
@@ -160,8 +163,8 @@ export const SettingsDataModelFieldIconLabelForm = ({
                     render={({ field: { onChange, value } }) => (
                       <>
                         <TextInput
-                          label="API Name"
-                          placeholder="employees"
+                          label={t`API Name`}
+                          placeholder={t`employees`}
                           value={value}
                           onChange={onChange}
                           disabled={
@@ -205,8 +208,8 @@ export const SettingsDataModelFieldIconLabelForm = ({
                     <Card rounded>
                       <SettingsOptionCardContentToggle
                         Icon={IconRefresh}
-                        title="Synchronize Field Label and API Name"
-                        description="Should changing a field's label also change the API name?"
+                        title={t`Synchronize Field Label and API Name`}
+                        description={t`Should changing a field's label also change the API name?`}
                         checked={value ?? true}
                         disabled={
                           isDefined(fieldMetadataItem) &&
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx
index f475ce1b7682..6d9cff7833eb 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx
@@ -33,64 +33,64 @@ import {
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 const booleanFieldFormSchema = z
-  .object({ type: z.literal(FieldMetadataType.Boolean) })
+  .object({ type: z.literal(FieldMetadataType.BOOLEAN) })
   .merge(settingsDataModelFieldBooleanFormSchema);
 
 const currencyFieldFormSchema = z
-  .object({ type: z.literal(FieldMetadataType.Currency) })
+  .object({ type: z.literal(FieldMetadataType.CURRENCY) })
   .merge(settingsDataModelFieldCurrencyFormSchema);
 
 const dateFieldFormSchema = z
-  .object({ type: z.literal(FieldMetadataType.Date) })
+  .object({ type: z.literal(FieldMetadataType.DATE) })
   .merge(settingsDataModelFieldDateFormSchema);
 
 const dateTimeFieldFormSchema = z
-  .object({ type: z.literal(FieldMetadataType.DateTime) })
+  .object({ type: z.literal(FieldMetadataType.DATE_TIME) })
   .merge(settingsDataModelFieldDateFormSchema);
 
 const relationFieldFormSchema = z
-  .object({ type: z.literal(FieldMetadataType.Relation) })
+  .object({ type: z.literal(FieldMetadataType.RELATION) })
   .merge(settingsDataModelFieldRelationFormSchema);
 
 const selectFieldFormSchema = z
-  .object({ type: z.literal(FieldMetadataType.Select) })
+  .object({ type: z.literal(FieldMetadataType.SELECT) })
   .merge(settingsDataModelFieldSelectFormSchema);
 
 const multiSelectFieldFormSchema = z
-  .object({ type: z.literal(FieldMetadataType.MultiSelect) })
+  .object({ type: z.literal(FieldMetadataType.MULTI_SELECT) })
   .merge(settingsDataModelFieldMultiSelectFormSchema);
 
 const numberFieldFormSchema = z
-  .object({ type: z.literal(FieldMetadataType.Number) })
+  .object({ type: z.literal(FieldMetadataType.NUMBER) })
   .merge(settingsDataModelFieldNumberFormSchema);
 
 const textFieldFormSchema = z
-  .object({ type: z.literal(FieldMetadataType.Text) })
+  .object({ type: z.literal(FieldMetadataType.TEXT) })
   .merge(settingsDataModelFieldtextFormSchema);
 
 const addressFieldFormSchema = z
-  .object({ type: z.literal(FieldMetadataType.Address) })
+  .object({ type: z.literal(FieldMetadataType.ADDRESS) })
   .merge(settingsDataModelFieldAddressFormSchema);
 
 const phonesFieldFormSchema = z
-  .object({ type: z.literal(FieldMetadataType.Phones) })
+  .object({ type: z.literal(FieldMetadataType.PHONES) })
   .merge(settingsDataModelFieldPhonesFormSchema);
 
 const otherFieldsFormSchema = z.object({
   type: z.enum(
     Object.keys(
       omit(SETTINGS_FIELD_TYPE_CONFIGS, [
-        FieldMetadataType.Boolean,
-        FieldMetadataType.Currency,
-        FieldMetadataType.Relation,
-        FieldMetadataType.Select,
-        FieldMetadataType.MultiSelect,
-        FieldMetadataType.Date,
-        FieldMetadataType.DateTime,
-        FieldMetadataType.Number,
-        FieldMetadataType.Address,
-        FieldMetadataType.Phones,
-        FieldMetadataType.Text,
+        FieldMetadataType.BOOLEAN,
+        FieldMetadataType.CURRENCY,
+        FieldMetadataType.RELATION,
+        FieldMetadataType.SELECT,
+        FieldMetadataType.MULTI_SELECT,
+        FieldMetadataType.DATE,
+        FieldMetadataType.DATE_TIME,
+        FieldMetadataType.NUMBER,
+        FieldMetadataType.ADDRESS,
+        FieldMetadataType.PHONES,
+        FieldMetadataType.TEXT,
       ]),
     ) as [FieldMetadataType, ...FieldMetadataType[]],
   ),
@@ -127,23 +127,23 @@ const StyledFieldPreviewCard = styled(SettingsDataModelFieldPreviewCard)`
 `;
 
 const previewableTypes = [
-  FieldMetadataType.Array,
-  FieldMetadataType.Address,
-  FieldMetadataType.Boolean,
-  FieldMetadataType.Currency,
-  FieldMetadataType.Date,
-  FieldMetadataType.DateTime,
-  FieldMetadataType.Emails,
-  FieldMetadataType.FullName,
-  FieldMetadataType.Links,
-  FieldMetadataType.MultiSelect,
-  FieldMetadataType.Number,
-  FieldMetadataType.Phones,
-  FieldMetadataType.Rating,
-  FieldMetadataType.RawJson,
-  FieldMetadataType.Relation,
-  FieldMetadataType.Select,
-  FieldMetadataType.Text,
+  FieldMetadataType.ARRAY,
+  FieldMetadataType.ADDRESS,
+  FieldMetadataType.BOOLEAN,
+  FieldMetadataType.CURRENCY,
+  FieldMetadataType.DATE,
+  FieldMetadataType.DATE_TIME,
+  FieldMetadataType.EMAILS,
+  FieldMetadataType.FULL_NAME,
+  FieldMetadataType.LINKS,
+  FieldMetadataType.MULTI_SELECT,
+  FieldMetadataType.NUMBER,
+  FieldMetadataType.PHONES,
+  FieldMetadataType.RATING,
+  FieldMetadataType.RAW_JSON,
+  FieldMetadataType.RELATION,
+  FieldMetadataType.SELECT,
+  FieldMetadataType.TEXT,
 ];
 
 export const SettingsDataModelFieldSettingsFormCard = ({
@@ -154,7 +154,7 @@ export const SettingsDataModelFieldSettingsFormCard = ({
     return null;
   }
 
-  if (fieldMetadataItem.type === FieldMetadataType.Boolean) {
+  if (fieldMetadataItem.type === FieldMetadataType.BOOLEAN) {
     return (
       <SettingsDataModelFieldBooleanSettingsFormCard
         fieldMetadataItem={fieldMetadataItem}
@@ -163,7 +163,7 @@ export const SettingsDataModelFieldSettingsFormCard = ({
     );
   }
 
-  if (fieldMetadataItem.type === FieldMetadataType.Currency) {
+  if (fieldMetadataItem.type === FieldMetadataType.CURRENCY) {
     return (
       <SettingsDataModelFieldCurrencySettingsFormCard
         fieldMetadataItem={fieldMetadataItem}
@@ -173,8 +173,8 @@ export const SettingsDataModelFieldSettingsFormCard = ({
   }
 
   if (
-    fieldMetadataItem.type === FieldMetadataType.Date ||
-    fieldMetadataItem.type === FieldMetadataType.DateTime
+    fieldMetadataItem.type === FieldMetadataType.DATE ||
+    fieldMetadataItem.type === FieldMetadataType.DATE_TIME
   ) {
     return (
       <SettingsDataModelFieldDateSettingsFormCard
@@ -184,7 +184,7 @@ export const SettingsDataModelFieldSettingsFormCard = ({
     );
   }
 
-  if (fieldMetadataItem.type === FieldMetadataType.Relation) {
+  if (fieldMetadataItem.type === FieldMetadataType.RELATION) {
     return (
       <SettingsDataModelFieldRelationSettingsFormCard
         fieldMetadataItem={fieldMetadataItem}
@@ -193,7 +193,7 @@ export const SettingsDataModelFieldSettingsFormCard = ({
     );
   }
 
-  if (fieldMetadataItem.type === FieldMetadataType.Number) {
+  if (fieldMetadataItem.type === FieldMetadataType.NUMBER) {
     return (
       <SettingsDataModelFieldNumberSettingsFormCard
         fieldMetadataItem={fieldMetadataItem}
@@ -202,7 +202,7 @@ export const SettingsDataModelFieldSettingsFormCard = ({
     );
   }
 
-  if (fieldMetadataItem.type === FieldMetadataType.Text) {
+  if (fieldMetadataItem.type === FieldMetadataType.TEXT) {
     return (
       <SettingsDataModelFieldTextSettingsFormCard
         fieldMetadataItem={fieldMetadataItem}
@@ -211,7 +211,7 @@ export const SettingsDataModelFieldSettingsFormCard = ({
     );
   }
 
-  if (fieldMetadataItem.type === FieldMetadataType.Address) {
+  if (fieldMetadataItem.type === FieldMetadataType.ADDRESS) {
     return (
       <SettingsDataModelFieldAddressSettingsFormCard
         fieldMetadataItem={fieldMetadataItem}
@@ -220,7 +220,7 @@ export const SettingsDataModelFieldSettingsFormCard = ({
     );
   }
 
-  if (fieldMetadataItem.type === FieldMetadataType.Phones) {
+  if (fieldMetadataItem.type === FieldMetadataType.PHONES) {
     return (
       <SettingsDataModelFieldPhonesSettingsFormCard
         fieldMetadataItem={fieldMetadataItem}
@@ -230,8 +230,8 @@ export const SettingsDataModelFieldSettingsFormCard = ({
   }
 
   if (
-    fieldMetadataItem.type === FieldMetadataType.Select ||
-    fieldMetadataItem.type === FieldMetadataType.MultiSelect
+    fieldMetadataItem.type === FieldMetadataType.SELECT ||
+    fieldMetadataItem.type === FieldMetadataType.MULTI_SELECT
   ) {
     return (
       <SettingsDataModelFieldSelectSettingsFormCard
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx
index dd6387e0c157..a34c89dafeee 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx
@@ -8,6 +8,7 @@ import { useBooleanSettingsFormInitialValues } from '@/settings/data-model/field
 import { useCurrencySettingsFormInitialValues } from '@/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues';
 import { useSelectSettingsFormInitialValues } from '@/settings/data-model/fields/forms/select/hooks/useSelectSettingsFormInitialValues';
 import { SettingsFieldType } from '@/settings/data-model/types/SettingsFieldType';
+import { SettingsPath } from '@/types/SettingsPath';
 import { TextInput } from '@/ui/input/components/TextInput';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
@@ -17,6 +18,7 @@ import { Controller, useFormContext } from 'react-hook-form';
 import { H2Title, IconSearch, UndecoratedLink } from 'twenty-ui';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { SettingsDataModelFieldTypeFormValues } from '~/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldSelect';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 type SettingsObjectNewFieldSelectorProps = {
   className?: string;
@@ -83,14 +85,14 @@ export const SettingsObjectNewFieldSelector = ({
 
   const resetDefaultValueField = (nextValue: SettingsFieldType) => {
     switch (nextValue) {
-      case FieldMetadataType.Boolean:
+      case FieldMetadataType.BOOLEAN:
         resetBooleanDefaultValueField();
         break;
-      case FieldMetadataType.Currency:
+      case FieldMetadataType.CURRENCY:
         resetCurrencyDefaultValueField();
         break;
-      case FieldMetadataType.Select:
-      case FieldMetadataType.MultiSelect:
+      case FieldMetadataType.SELECT:
+      case FieldMetadataType.MULTI_SELECT:
         resetSelectDefaultValueField();
         break;
       default:
@@ -128,7 +130,11 @@ export const SettingsObjectNewFieldSelector = ({
                     .map(([key, config]) => (
                       <StyledCardContainer key={key}>
                         <UndecoratedLink
-                          to={`/settings/objects/${objectNamePlural}/new-field/configure?fieldType=${key}`}
+                          to={getSettingsPath(
+                            SettingsPath.ObjectNewFieldConfigure,
+                            { objectNamePlural },
+                            { fieldType: key },
+                          )}
                           fullWidth
                           onClick={() => {
                             setValue('type', key as SettingsFieldType);
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldIconLabelForm.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldIconLabelForm.stories.tsx
index 555db1bc92d1..f0c6cc65f9f7 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldIconLabelForm.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldIconLabelForm.stories.tsx
@@ -5,6 +5,7 @@ import { ComponentDecorator } from 'twenty-ui';
 import { FormProviderDecorator } from '~/testing/decorators/FormProviderDecorator';
 import { IconsProviderDecorator } from '~/testing/decorators/IconsProviderDecorator';
 
+import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { generatedMockObjectMetadataItems } from '~/testing/mock-data/generatedMockObjectMetadataItems';
 import { SettingsDataModelFieldIconLabelForm } from '../SettingsDataModelFieldIconLabelForm';
 
@@ -24,6 +25,7 @@ const meta: Meta<typeof SettingsDataModelFieldIconLabelForm> = {
     FormProviderDecorator,
     IconsProviderDecorator,
     ComponentDecorator,
+    I18nFrontDecorator,
   ],
 };
 
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx
index 09aaf60c282c..458f6378870c 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx
@@ -8,6 +8,7 @@ import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadat
 import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 
+import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { generatedMockObjectMetadataItems } from '~/testing/mock-data/generatedMockObjectMetadataItems';
 import { SettingsDataModelFieldSettingsFormCard } from '../SettingsDataModelFieldSettingsFormCard';
 
@@ -20,7 +21,7 @@ if (!mockedCompanyObjectMetadataItem) {
 }
 
 const fieldMetadataItem = mockedCompanyObjectMetadataItem.fields.find(
-  ({ type }) => type === FieldMetadataType.Text,
+  ({ type }) => type === FieldMetadataType.TEXT,
 )!;
 
 const meta: Meta<typeof SettingsDataModelFieldSettingsFormCard> = {
@@ -33,6 +34,7 @@ const meta: Meta<typeof SettingsDataModelFieldSettingsFormCard> = {
     ObjectMetadataItemsDecorator,
     SnackBarDecorator,
     FormProviderDecorator,
+    I18nFrontDecorator,
   ],
   args: {
     fieldMetadataItem,
@@ -62,7 +64,7 @@ export const WithSelectForm: Story = {
     fieldMetadataItem: {
       label: 'Industry',
       icon: 'IconBuildingFactory2',
-      type: FieldMetadataType.Select,
+      type: FieldMetadataType.SELECT,
     },
   },
 };
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx
index c3f109289247..a8ea361d63aa 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/date/components/SettingsDataModelFieldDateForm.tsx
@@ -4,6 +4,7 @@ import { z } from 'zod';
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsOptions/SettingsOptionCardContentToggle';
 import { useDateSettingsFormInitialValues } from '@/settings/data-model/fields/forms/date/hooks/useDateSettingsFormInitialValues';
+import { useLingui } from '@lingui/react/macro';
 import { IconSlash } from 'twenty-ui';
 
 export const settingsDataModelFieldDateFormSchema = z.object({
@@ -27,6 +28,8 @@ export const SettingsDataModelFieldDateForm = ({
   disabled,
   fieldMetadataItem,
 }: SettingsDataModelFieldDateFormProps) => {
+  const { t } = useLingui();
+
   const { control } = useFormContext<SettingsDataModelFieldDateFormValues>();
 
   const { initialDisplayAsRelativeDateValue } =
@@ -42,7 +45,7 @@ export const SettingsDataModelFieldDateForm = ({
       render={({ field: { onChange, value } }) => (
         <SettingsOptionCardContentToggle
           Icon={IconSlash}
-          title="Display as relative date"
+          title={t`Display as relative date`}
           checked={value ?? false}
           disabled={disabled}
           onChange={onChange}
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationForm.tsx
index 3906763714a1..d317e8ec8adb 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationForm.tsx
@@ -80,8 +80,8 @@ const StyledInputsContainer = styled.div`
 const RELATION_TYPE_OPTIONS = Object.entries(RELATION_TYPES)
   .filter(
     ([value]) =>
-      RelationDefinitionType.OneToOne !== value &&
-      RelationDefinitionType.ManyToMany !== value,
+      RelationDefinitionType.ONE_TO_ONE !== value &&
+      RelationDefinitionType.MANY_TO_MANY !== value,
   )
   .map(([value, { label, Icon }]) => ({
     label,
@@ -168,7 +168,7 @@ export const SettingsDataModelFieldRelationForm = ({
       </StyledSelectsContainer>
       <StyledInputsLabel>
         Field on{' '}
-        {selectedRelationType === RelationDefinitionType.ManyToOne
+        {selectedRelationType === RelationDefinitionType.MANY_TO_ONE
           ? selectedObjectMetadataItem?.labelSingular
           : selectedObjectMetadataItem?.labelPlural}
       </StyledInputsLabel>
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationSettingsFormCard.tsx
index f1802993bbfe..92fe2e887ed6 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationSettingsFormCard.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationSettingsFormCard.tsx
@@ -91,7 +91,7 @@ export const SettingsDataModelFieldRelationSettingsFormCard = ({
             relationObjectMetadataItem={relationObjectMetadataItem}
             pluralizeLabel={
               watchFormValue('relation.type') ===
-              RelationDefinitionType.ManyToOne
+              RelationDefinitionType.MANY_TO_ONE
             }
           />
           <StyledRelationImage
@@ -112,14 +112,14 @@ export const SettingsDataModelFieldRelationSettingsFormCard = ({
                   'relation.field.label',
                   initialRelationFieldMetadataItem.label,
                 ) || 'Field name',
-              type: FieldMetadataType.Relation,
+              type: FieldMetadataType.RELATION,
             }}
             shrink
             objectMetadataItem={relationObjectMetadataItem}
             relationObjectMetadataItem={objectMetadataItem}
             pluralizeLabel={
               watchFormValue('relation.type') !==
-              RelationDefinitionType.ManyToOne
+              RelationDefinitionType.MANY_TO_ONE
             }
           />
         </StyledPreviewContent>
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/hooks/useRelationSettingsFormInitialValues.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/hooks/useRelationSettingsFormInitialValues.ts
index 298c3ad6dc24..2027e5f8eedd 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/hooks/useRelationSettingsFormInitialValues.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/hooks/useRelationSettingsFormInitialValues.ts
@@ -40,7 +40,7 @@ export const useRelationSettingsFormInitialValues = ({
   );
 
   const initialRelationType =
-    relationTypeFromFieldMetadata ?? RelationDefinitionType.OneToMany;
+    relationTypeFromFieldMetadata ?? RelationDefinitionType.ONE_TO_MANY;
 
   return {
     disableFieldEdition:
@@ -49,8 +49,8 @@ export const useRelationSettingsFormInitialValues = ({
     initialRelationFieldMetadataItem: relationFieldMetadataItem ?? {
       icon: initialRelationObjectMetadataItem.icon ?? 'IconUsers',
       label: [
-        RelationDefinitionType.ManyToMany,
-        RelationDefinitionType.ManyToOne,
+        RelationDefinitionType.MANY_TO_MANY,
+        RelationDefinitionType.MANY_TO_ONE,
       ].includes(initialRelationType)
         ? initialRelationObjectMetadataItem.labelPlural
         : initialRelationObjectMetadataItem.labelSingular,
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx
index 5ea012ac0913..d007cb548d6c 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx
@@ -160,7 +160,7 @@ export const SettingsDataModelFieldSelectForm = ({
   ) => {
     if (isOptionDefaultValue(optionValue)) return;
 
-    if (fieldMetadataItem.type === FieldMetadataType.Select) {
+    if (fieldMetadataItem.type === FieldMetadataType.SELECT) {
       setFormValue('defaultValue', applySimpleQuotesToString(optionValue), {
         shouldDirty: true,
       });
@@ -170,7 +170,7 @@ export const SettingsDataModelFieldSelectForm = ({
     const previousDefaultValue = getValues('defaultValue');
 
     if (
-      fieldMetadataItem.type === FieldMetadataType.MultiSelect &&
+      fieldMetadataItem.type === FieldMetadataType.MULTI_SELECT &&
       (Array.isArray(previousDefaultValue) || previousDefaultValue === null)
     ) {
       setFormValue(
@@ -189,7 +189,7 @@ export const SettingsDataModelFieldSelectForm = ({
   ) => {
     if (!isOptionDefaultValue(optionValue)) return;
 
-    if (fieldMetadataItem.type === FieldMetadataType.Select) {
+    if (fieldMetadataItem.type === FieldMetadataType.SELECT) {
       setFormValue('defaultValue', null, { shouldDirty: true });
       return;
     }
@@ -197,7 +197,7 @@ export const SettingsDataModelFieldSelectForm = ({
     const previousDefaultValue = getValues('defaultValue');
 
     if (
-      fieldMetadataItem.type === FieldMetadataType.MultiSelect &&
+      fieldMetadataItem.type === FieldMetadataType.MULTI_SELECT &&
       (Array.isArray(previousDefaultValue) || previousDefaultValue === null)
     ) {
       const nextDefaultValue = previousDefaultValue?.filter(
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx
index c55fb4e0acdb..7bd6d9b318ff 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx
@@ -117,9 +117,7 @@ export const SettingsDataModelFieldSelectFormOptionRow = ({
       <Dropdown
         dropdownId={SELECT_COLOR_DROPDOWN_ID}
         dropdownPlacement="bottom-start"
-        dropdownHotkeyScope={{
-          scope: SELECT_COLOR_DROPDOWN_ID,
-        }}
+        dropdownHotkeyScope={{ scope: SELECT_COLOR_DROPDOWN_ID }}
         clickableComponent={<StyledColorSample colorName={option.color} />}
         dropdownComponents={
           <DropdownMenuItemsContainer>
@@ -160,9 +158,7 @@ export const SettingsDataModelFieldSelectFormOptionRow = ({
       <Dropdown
         dropdownId={SELECT_ACTIONS_DROPDOWN_ID}
         dropdownPlacement="right-start"
-        dropdownHotkeyScope={{
-          scope: SELECT_ACTIONS_DROPDOWN_ID,
-        }}
+        dropdownHotkeyScope={{ scope: SELECT_ACTIONS_DROPDOWN_ID }}
         clickableComponent={
           <StyledLightIconButton accent="tertiary" Icon={IconDotsVertical} />
         }
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx
index c0ec0b188514..40a9fafb4788 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx
@@ -142,9 +142,9 @@ export const SettingsDataModelFieldPreview = ({
             hotkeyScope: 'field-preview',
           }}
         >
-          {fieldMetadataItem.type === FieldMetadataType.Boolean ? (
+          {fieldMetadataItem.type === FieldMetadataType.BOOLEAN ? (
             <BooleanFieldInput readonly />
-          ) : fieldMetadataItem.type === FieldMetadataType.Rating ? (
+          ) : fieldMetadataItem.type === FieldMetadataType.RATING ? (
             <RatingFieldInput readonly />
           ) : (
             <FieldDisplay />
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/__stories__/SettingsDataModelFieldPreviewCard.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/__stories__/SettingsDataModelFieldPreviewCard.stories.tsx
index 6b0fb477eef2..8afc74a5c07c 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/__stories__/SettingsDataModelFieldPreviewCard.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/__stories__/SettingsDataModelFieldPreviewCard.stories.tsx
@@ -49,7 +49,7 @@ export const LabelIdentifier: Story = {
   args: {
     fieldMetadataItem: mockedPersonObjectMetadataItem?.fields.find(
       ({ name, type }) =>
-        name === 'name' && type === FieldMetadataType.FullName,
+        name === 'name' && type === FieldMetadataType.FULL_NAME,
     ),
   },
 };
@@ -57,7 +57,7 @@ export const LabelIdentifier: Story = {
 export const Text: Story = {
   args: {
     fieldMetadataItem: mockedPersonObjectMetadataItem?.fields.find(
-      ({ name, type }) => name === 'city' && type === FieldMetadataType.Text,
+      ({ name, type }) => name === 'city' && type === FieldMetadataType.TEXT,
     ),
   },
 };
@@ -66,7 +66,7 @@ export const Boolean: Story = {
   args: {
     fieldMetadataItem: mockedCompanyObjectMetadataItem?.fields.find(
       ({ name, type }) =>
-        name === 'idealCustomerProfile' && type === FieldMetadataType.Boolean,
+        name === 'idealCustomerProfile' && type === FieldMetadataType.BOOLEAN,
     ),
     objectMetadataItem: mockedCompanyObjectMetadataItem,
   },
@@ -77,7 +77,7 @@ export const Currency: Story = {
     fieldMetadataItem: mockedCompanyObjectMetadataItem?.fields.find(
       ({ name, type }) =>
         name === 'annualRecurringRevenue' &&
-        type === FieldMetadataType.Currency,
+        type === FieldMetadataType.CURRENCY,
     ),
     objectMetadataItem: mockedCompanyObjectMetadataItem,
   },
@@ -86,7 +86,7 @@ export const Currency: Story = {
 export const Date: Story = {
   args: {
     fieldMetadataItem: mockedCompanyObjectMetadataItem?.fields.find(
-      ({ type }) => type === FieldMetadataType.DateTime,
+      ({ type }) => type === FieldMetadataType.DATE_TIME,
     ),
     objectMetadataItem: mockedCompanyObjectMetadataItem,
   },
@@ -96,7 +96,7 @@ export const Links: Story = {
   args: {
     fieldMetadataItem: mockedCompanyObjectMetadataItem?.fields.find(
       ({ name, type }) =>
-        name === 'linkedinLink' && type === FieldMetadataType.Links,
+        name === 'linkedinLink' && type === FieldMetadataType.LINKS,
     ),
     objectMetadataItem: mockedCompanyObjectMetadataItem,
   },
@@ -105,7 +105,7 @@ export const Links: Story = {
 export const Number: Story = {
   args: {
     fieldMetadataItem: mockedCompanyObjectMetadataItem?.fields.find(
-      ({ type }) => type === FieldMetadataType.Number,
+      ({ type }) => type === FieldMetadataType.NUMBER,
     ),
     objectMetadataItem: mockedCompanyObjectMetadataItem,
   },
@@ -116,7 +116,7 @@ export const Rating: Story = {
     fieldMetadataItem: {
       icon: 'IconHandClick',
       label: 'Engagement',
-      type: FieldMetadataType.Rating,
+      type: FieldMetadataType.RATING,
     },
   },
 };
@@ -133,7 +133,7 @@ export const Relation: Story = {
 export const Select: Story = {
   args: {
     fieldMetadataItem: mockedOpportunityObjectMetadataItem?.fields.find(
-      ({ name, type }) => name === 'stage' && type === FieldMetadataType.Select,
+      ({ name, type }) => name === 'stage' && type === FieldMetadataType.SELECT,
     ),
     objectMetadataItem: mockedOpportunityObjectMetadataItem,
   },
@@ -146,7 +146,7 @@ export const MultiSelect: Story = {
       ...Select.args!.fieldMetadataItem!,
       defaultValue: null,
       label: 'Stages',
-      type: FieldMetadataType.MultiSelect,
+      type: FieldMetadataType.MULTI_SELECT,
     },
   },
 };
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/__tests__/useFieldPreviewValue.test.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/__tests__/useFieldPreviewValue.test.tsx
index c9c6b0d4367b..8a377259b4f0 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/__tests__/useFieldPreviewValue.test.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/__tests__/useFieldPreviewValue.test.tsx
@@ -30,7 +30,7 @@ describe('useFieldPreviewValue', () => {
     const fieldName = 'amount';
     const fieldMetadataItem = mockedOpportunityObjectMetadataItem?.fields.find(
       ({ name, type }) =>
-        name === fieldName && type === FieldMetadataType.Currency,
+        name === fieldName && type === FieldMetadataType.CURRENCY,
     );
     const skip = true;
 
@@ -53,7 +53,7 @@ describe('useFieldPreviewValue', () => {
     const fieldName = 'amount';
     const fieldMetadataItem = mockedOpportunityObjectMetadataItem?.fields.find(
       ({ name, type }) =>
-        name === fieldName && type === FieldMetadataType.Currency,
+        name === fieldName && type === FieldMetadataType.CURRENCY,
     );
 
     if (!fieldMetadataItem) {
@@ -77,7 +77,7 @@ describe('useFieldPreviewValue', () => {
     // Given
     const fieldMetadataItem = {
       name: 'people',
-      type: FieldMetadataType.Relation,
+      type: FieldMetadataType.RELATION,
     };
     const relationObjectMetadataItem = mockedPersonObjectMetadataItem;
 
@@ -107,7 +107,7 @@ describe('useFieldPreviewValue', () => {
     const fieldName = 'stage';
     const fieldMetadataItem = mockedOpportunityObjectMetadataItem?.fields.find(
       ({ name, type }) =>
-        name === fieldName && type === FieldMetadataType.Select,
+        name === fieldName && type === FieldMetadataType.SELECT,
     );
 
     if (!fieldMetadataItem) {
@@ -151,7 +151,7 @@ describe('useFieldPreviewValue', () => {
     ];
     const fieldMetadataItem = {
       name: 'industry',
-      type: FieldMetadataType.MultiSelect,
+      type: FieldMetadataType.MULTI_SELECT,
       options,
     };
 
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/useFieldPreviewValue.ts b/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/useFieldPreviewValue.ts
index 7339cb956195..a2f1d9358545 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/useFieldPreviewValue.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/useFieldPreviewValue.ts
@@ -28,28 +28,29 @@ export const useFieldPreviewValue = ({
     relationObjectMetadataItem: relationObjectMetadataItem ?? {
       fields: [],
       labelSingular: '',
+      labelIdentifierFieldMetadataId: '20202020-1000-4629-87e5-9a1fae1cc2fd',
       nameSingular: CoreObjectNameSingular.Company,
     },
     skip:
       skip ||
-      fieldMetadataItem.type !== FieldMetadataType.Relation ||
+      fieldMetadataItem.type !== FieldMetadataType.RELATION ||
       !relationObjectMetadataItem,
   });
 
   if (skip === true) return null;
 
   switch (fieldMetadataItem.type) {
-    case FieldMetadataType.Currency:
+    case FieldMetadataType.CURRENCY:
       return getCurrencyFieldPreviewValue({ fieldMetadataItem });
-    case FieldMetadataType.Relation:
+    case FieldMetadataType.RELATION:
       return relationFieldPreviewValue;
-    case FieldMetadataType.Select:
+    case FieldMetadataType.SELECT:
       return getSelectFieldPreviewValue({ fieldMetadataItem });
-    case FieldMetadataType.MultiSelect:
+    case FieldMetadataType.MULTI_SELECT:
       return getMultiSelectFieldPreviewValue({ fieldMetadataItem });
-    case FieldMetadataType.Address:
+    case FieldMetadataType.ADDRESS:
       return getAddressFieldPreviewValue({ fieldMetadataItem });
-    case FieldMetadataType.Phones:
+    case FieldMetadataType.PHONES:
       return getPhonesFieldPreviewValue({ fieldMetadataItem });
     default:
       return getFieldPreviewValue({ fieldMetadataItem });
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/usePreviewRecord.ts b/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/usePreviewRecord.ts
index d201dd84cc54..d48e88dfcaea 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/usePreviewRecord.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/usePreviewRecord.ts
@@ -48,7 +48,7 @@ export const usePreviewRecord = ({
   }
 
   const fieldPreviewValue =
-    labelIdentifierFieldMetadataItem.type === FieldMetadataType.Text
+    labelIdentifierFieldMetadataItem.type === FieldMetadataType.TEXT
       ? objectMetadataItem.labelSingular
       : getFieldPreviewValue({
           fieldMetadataItem: labelIdentifierFieldMetadataItem,
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getCurrencyFieldPreviewValue.test.ts b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getCurrencyFieldPreviewValue.test.ts
index 8eeda74fbb79..9e9e272c6014 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getCurrencyFieldPreviewValue.test.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getCurrencyFieldPreviewValue.test.ts
@@ -17,7 +17,7 @@ describe('getCurrencyFieldPreviewValue', () => {
   it('returns null if the field is not a Currency field', () => {
     // Given
     const fieldMetadataItem = mockedCompanyObjectMetadataItem?.fields.find(
-      ({ type }) => type !== FieldMetadataType.Currency,
+      ({ type }) => type !== FieldMetadataType.CURRENCY,
     );
 
     if (!fieldMetadataItem) {
@@ -34,7 +34,7 @@ describe('getCurrencyFieldPreviewValue', () => {
   const fieldName = 'amount';
   const fieldMetadataItem = mockedOpportunityObjectMetadataItem?.fields.find(
     ({ name, type }) =>
-      name === fieldName && type === FieldMetadataType.Currency,
+      name === fieldName && type === FieldMetadataType.CURRENCY,
   );
 
   if (!fieldMetadataItem) {
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getFieldPreviewValue.test.ts b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getFieldPreviewValue.test.ts
index c3a649dbad77..edb267685c1b 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getFieldPreviewValue.test.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getFieldPreviewValue.test.ts
@@ -47,7 +47,7 @@ describe('getFieldPreviewValue', () => {
     // Then
     expect(result).toBe(2000);
     expect(result).toBe(
-      getSettingsFieldTypeConfig(FieldMetadataType.Number).exampleValue,
+      getSettingsFieldTypeConfig(FieldMetadataType.NUMBER).exampleValue,
     );
   });
 
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getMultiSelectFieldPreviewValue.test.ts b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getMultiSelectFieldPreviewValue.test.ts
index 2737a829ee91..0c34a356c1a3 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getMultiSelectFieldPreviewValue.test.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getMultiSelectFieldPreviewValue.test.ts
@@ -15,7 +15,7 @@ describe('getMultiSelectFieldPreviewValue', () => {
   it('returns null if the field is not a Multi-Select field', () => {
     // Given
     const fieldMetadataItem = mockedCompanyObjectMetadataItem?.fields.find(
-      ({ type }) => type !== FieldMetadataType.MultiSelect,
+      ({ type }) => type !== FieldMetadataType.MULTI_SELECT,
     );
 
     if (!fieldMetadataItem) {
@@ -41,7 +41,7 @@ describe('getMultiSelectFieldPreviewValue', () => {
 
   const fieldMetadataItem = {
     ...selectFieldMetadataItem,
-    type: FieldMetadataType.MultiSelect,
+    type: FieldMetadataType.MULTI_SELECT,
   };
 
   it("returns the defaultValue as an option value if a valid defaultValue is found in the field's metadata", () => {
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getSelectFieldPreviewValue.test.ts b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getSelectFieldPreviewValue.test.ts
index 109feefb3ab1..5d185c869745 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getSelectFieldPreviewValue.test.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getSelectFieldPreviewValue.test.ts
@@ -16,7 +16,7 @@ describe('getSelectFieldPreviewValue', () => {
   it('returns null if the field is not a Select field', () => {
     // Given
     const fieldMetadataItem = mockedCompanyObjectMetadataItem?.fields.find(
-      ({ type }) => type !== FieldMetadataType.Select,
+      ({ type }) => type !== FieldMetadataType.SELECT,
     );
 
     if (!fieldMetadataItem) {
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getAddressFieldPreviewValue.ts b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getAddressFieldPreviewValue.ts
index 55a842fcda4f..ec238cb3b757 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getAddressFieldPreviewValue.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getAddressFieldPreviewValue.ts
@@ -12,10 +12,10 @@ export const getAddressFieldPreviewValue = ({
     'defaultValue' | 'options' | 'type'
   >;
 }): FieldAddressValue | null => {
-  if (fieldMetadataItem.type !== FieldMetadataType.Address) return null;
+  if (fieldMetadataItem.type !== FieldMetadataType.ADDRESS) return null;
 
   const addressFieldTypeConfig = getSettingsFieldTypeConfig(
-    FieldMetadataType.Address,
+    FieldMetadataType.ADDRESS,
   );
 
   const placeholderDefaultValue = addressFieldTypeConfig.exampleValue;
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getCurrencyFieldPreviewValue.ts b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getCurrencyFieldPreviewValue.ts
index 2fd5b32eae40..70d378044ff6 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getCurrencyFieldPreviewValue.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getCurrencyFieldPreviewValue.ts
@@ -14,10 +14,10 @@ export const getCurrencyFieldPreviewValue = ({
     'defaultValue' | 'options' | 'type'
   >;
 }): FieldCurrencyValue | null => {
-  if (fieldMetadataItem.type !== FieldMetadataType.Currency) return null;
+  if (fieldMetadataItem.type !== FieldMetadataType.CURRENCY) return null;
 
   const currencyFieldTypeConfig = getSettingsFieldTypeConfig(
-    FieldMetadataType.Currency,
+    FieldMetadataType.CURRENCY,
   );
 
   const placeholderDefaultValue = currencyFieldTypeConfig.exampleValue;
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getMultiSelectFieldPreviewValue.ts b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getMultiSelectFieldPreviewValue.ts
index acc68ad9f159..d6fb8cf5ae9d 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getMultiSelectFieldPreviewValue.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getMultiSelectFieldPreviewValue.ts
@@ -17,7 +17,7 @@ export const getMultiSelectFieldPreviewValue = ({
   >;
 }): FieldMultiSelectValue => {
   if (
-    fieldMetadataItem.type !== FieldMetadataType.MultiSelect ||
+    fieldMetadataItem.type !== FieldMetadataType.MULTI_SELECT ||
     !fieldMetadataItem.options?.length
   ) {
     return null;
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getPhonesFieldPreviewValue.ts b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getPhonesFieldPreviewValue.ts
index 8e8c7bc053ca..714ccb21fe36 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getPhonesFieldPreviewValue.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getPhonesFieldPreviewValue.ts
@@ -32,10 +32,10 @@ export const getPhonesFieldPreviewValue = ({
     'defaultValue' | 'options' | 'type'
   >;
 }): FieldPhonesValue | null => {
-  if (fieldMetadataItem.type !== FieldMetadataType.Phones) return null;
+  if (fieldMetadataItem.type !== FieldMetadataType.PHONES) return null;
 
   const phonesFieldTypeConfig = getSettingsFieldTypeConfig(
-    FieldMetadataType.Phones,
+    FieldMetadataType.PHONES,
   );
 
   const placeholderDefaultValue = phonesFieldTypeConfig.exampleValue;
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getSelectFieldPreviewValue.ts b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getSelectFieldPreviewValue.ts
index 40e3f85d0366..79fa857a162d 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getSelectFieldPreviewValue.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/getSelectFieldPreviewValue.ts
@@ -16,7 +16,7 @@ export const getSelectFieldPreviewValue = ({
   >;
 }): FieldSelectValue => {
   if (
-    fieldMetadataItem.type !== FieldMetadataType.Select ||
+    fieldMetadataItem.type !== FieldMetadataType.SELECT ||
     !fieldMetadataItem.options?.length
   ) {
     return null;
diff --git a/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewField.tsx b/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewField.tsx
index c93b25b8f1c5..68ac2bcb2195 100644
--- a/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewField.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewField.tsx
@@ -45,7 +45,7 @@ export const ObjectFieldRow = ({ field }: ObjectFieldRowProps) => {
       <Handle
         type={
           field.relationDefinition?.direction ===
-          RelationDefinitionType.OneToMany
+          RelationDefinitionType.ONE_TO_MANY
             ? 'source'
             : 'target'
         }
@@ -53,7 +53,7 @@ export const ObjectFieldRow = ({ field }: ObjectFieldRowProps) => {
         id={`${field.id}-right`}
         className={
           field.relationDefinition?.direction ===
-          RelationDefinitionType.OneToMany
+          RelationDefinitionType.ONE_TO_MANY
             ? 'right-handle source-handle'
             : 'right-handle target-handle'
         }
@@ -61,7 +61,7 @@ export const ObjectFieldRow = ({ field }: ObjectFieldRowProps) => {
       <Handle
         type={
           field.relationDefinition?.direction ===
-          RelationDefinitionType.OneToMany
+          RelationDefinitionType.ONE_TO_MANY
             ? 'source'
             : 'target'
         }
@@ -69,7 +69,7 @@ export const ObjectFieldRow = ({ field }: ObjectFieldRowProps) => {
         id={`${field.id}-left`}
         className={
           field.relationDefinition?.direction ===
-          RelationDefinitionType.OneToMany
+          RelationDefinitionType.ONE_TO_MANY
             ? 'left-handle source-handle'
             : 'left-handle target-handle'
         }
diff --git a/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewObject.tsx b/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewObject.tsx
index 5b45a9c7f0ed..e5ad9195ddf4 100644
--- a/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewObject.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewObject.tsx
@@ -13,8 +13,10 @@ import { capitalize } from 'twenty-shared';
 import { FieldMetadataType } from '~/generated/graphql';
 
 import { ObjectFieldRowWithoutRelation } from '@/settings/data-model/graph-overview/components/SettingsDataModelOverviewFieldWithoutRelation';
+import { SettingsPath } from '@/types/SettingsPath';
 import '@xyflow/react/dist/style.css';
 import { useState } from 'react';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 type SettingsDataModelOverviewObjectNode = Node<ObjectMetadataItem, 'object'>;
 type SettingsDataModelOverviewObjectProps =
@@ -112,7 +114,7 @@ export const SettingsDataModelOverviewObject = ({
   const fields = objectMetadataItem.fields.filter((x) => !x.isSystem);
 
   const countNonRelation = fields.filter(
-    (x) => x.type !== FieldMetadataType.Relation,
+    (x) => x.type !== FieldMetadataType.RELATION,
   ).length;
 
   const Icon = getIcon(objectMetadataItem.icon);
@@ -122,7 +124,9 @@ export const SettingsDataModelOverviewObject = ({
       <StyledHeader>
         <StyledObjectName onMouseEnter={() => {}} onMouseLeave={() => {}}>
           <StyledObjectLink
-            to={`/settings/objects/${objectMetadataItem.namePlural}`}
+            to={getSettingsPath(SettingsPath.Objects, {
+              objectNamePlural: objectMetadataItem.namePlural,
+            })}
           >
             {Icon && <Icon size={theme.icon.size.md} />}
             {capitalize(objectMetadataItem.namePlural)}
@@ -136,7 +140,7 @@ export const SettingsDataModelOverviewObject = ({
 
       <StyledInnerCard>
         {fields
-          .filter((x) => x.type === FieldMetadataType.Relation)
+          .filter((x) => x.type === FieldMetadataType.RELATION)
           .map((field) => (
             <StyledCardRow key={field.id}>
               <ObjectFieldRow field={field} />
@@ -156,7 +160,7 @@ export const SettingsDataModelOverviewObject = ({
             </StyledCardRowOther>
             {otherFieldsExpanded &&
               fields
-                .filter((x) => x.type !== FieldMetadataType.Relation)
+                .filter((x) => x.type !== FieldMetadataType.RELATION)
                 .map((field) => (
                   <StyledCardRow>
                     <ObjectFieldRowWithoutRelation field={field} />
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldActiveActionDropdown.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldActiveActionDropdown.tsx
index 765e25811b96..d168c859b6bd 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldActiveActionDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldActiveActionDropdown.tsx
@@ -80,9 +80,7 @@ export const SettingsObjectFieldActiveActionDropdown = ({
           )}
         </DropdownMenuItemsContainer>
       }
-      dropdownHotkeyScope={{
-        scope: dropdownId,
-      }}
+      dropdownHotkeyScope={{ scope: dropdownId }}
     />
   );
 };
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx
index f0efe47a8945..9401ec6c4daf 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx
@@ -12,6 +12,7 @@ import { SettingsObjectFieldActiveActionDropdown } from '@/settings/data-model/o
 import { SettingsObjectFieldInactiveActionDropdown } from '@/settings/data-model/object-details/components/SettingsObjectFieldDisabledActionDropdown';
 import { settingsObjectFieldsFamilyState } from '@/settings/data-model/object-details/states/settingsObjectFieldsFamilyState';
 import { isFieldTypeSupportedInSettings } from '@/settings/data-model/utils/isFieldTypeSupportedInSettings';
+import { SettingsPath } from '@/types/SettingsPath';
 import { TableCell } from '@/ui/layout/table/components/TableCell';
 import { TableRow } from '@/ui/layout/table/components/TableRow';
 import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
@@ -19,7 +20,6 @@ import { View } from '@/views/types/View';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { useMemo } from 'react';
-import { useNavigate } from 'react-router-dom';
 import { useRecoilState } from 'recoil';
 import {
   IconMinus,
@@ -30,7 +30,9 @@ import {
   useIcons,
 } from 'twenty-ui';
 import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 import { SettingsObjectDetailTableItem } from '~/pages/settings/data-model/types/SettingsObjectDetailTableItem';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 import { RELATION_TYPES } from '../../constants/RelationTypes';
 import { SettingsObjectFieldDataType } from './SettingsObjectFieldDataType';
 
@@ -72,7 +74,7 @@ export const SettingsObjectFieldItemTableRow = ({
 
   const variant = objectMetadataItem.isCustom ? 'identifier' : 'field-type';
 
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
 
   const [navigationMemorizedUrl, setNavigationMemorizedUrl] = useRecoilState(
     navigationMemorizedUrlState,
@@ -108,7 +110,10 @@ export const SettingsObjectFieldItemTableRow = ({
     !isLabelIdentifier &&
     LABEL_IDENTIFIER_FIELD_METADATA_TYPES.includes(fieldMetadataItem.type);
 
-  const linkToNavigate = `./${fieldMetadataItem.name}`;
+  const linkToNavigate = getSettingsPath(SettingsPath.ObjectFieldEdit, {
+    objectNamePlural: objectMetadataItem.namePlural,
+    fieldName: fieldMetadataItem.name,
+  });
 
   const {
     activateMetadataField,
@@ -212,7 +217,15 @@ export const SettingsObjectFieldItemTableRow = ({
 
   return (
     <StyledObjectFieldTableRow
-      onClick={mode === 'view' ? () => navigate(linkToNavigate) : undefined}
+      onClick={
+        mode === 'view'
+          ? () =>
+              navigate(SettingsPath.ObjectFieldEdit, {
+                objectNamePlural: objectMetadataItem.namePlural,
+                fieldName: fieldMetadataItem.name,
+              })
+          : undefined
+      }
     >
       <UndecoratedLink to={linkToNavigate}>
         <StyledNameTableCell>
@@ -234,8 +247,8 @@ export const SettingsObjectFieldItemTableRow = ({
         <SettingsObjectFieldDataType
           Icon={RelationIcon}
           label={
-            relationType === RelationDefinitionType.ManyToOne ||
-            relationType === RelationDefinitionType.OneToOne
+            relationType === RelationDefinitionType.MANY_TO_ONE ||
+            relationType === RelationDefinitionType.ONE_TO_ONE
               ? relationObjectMetadataItem?.labelSingular
               : relationObjectMetadataItem?.labelPlural
           }
@@ -244,7 +257,9 @@ export const SettingsObjectFieldItemTableRow = ({
           }
           to={
             isRelatedObjectLinkable
-              ? `/settings/objects/${relationObjectMetadataItem.namePlural}`
+              ? getSettingsPath(SettingsPath.Objects, {
+                  objectNamePlural: relationObjectMetadataItem.namePlural,
+                })
               : undefined
           }
           value={fieldType}
@@ -261,7 +276,12 @@ export const SettingsObjectFieldItemTableRow = ({
             <SettingsObjectFieldActiveActionDropdown
               isCustomField={fieldMetadataItem.isCustom === true}
               scopeKey={fieldMetadataItem.id}
-              onEdit={() => navigate(linkToNavigate)}
+              onEdit={() =>
+                navigate(SettingsPath.ObjectFieldEdit, {
+                  objectNamePlural: objectMetadataItem.namePlural,
+                  fieldName: fieldMetadataItem.name,
+                })
+              }
               onSetAsLabelIdentifier={
                 canBeSetAsLabelIdentifier
                   ? () => handleSetLabelIdentifierField(fieldMetadataItem)
@@ -286,7 +306,12 @@ export const SettingsObjectFieldItemTableRow = ({
           <SettingsObjectFieldInactiveActionDropdown
             isCustomField={fieldMetadataItem.isCustom === true}
             scopeKey={fieldMetadataItem.id}
-            onEdit={() => navigate(linkToNavigate)}
+            onEdit={() =>
+              navigate(SettingsPath.ObjectFieldEdit, {
+                objectNamePlural: objectMetadataItem.namePlural,
+                fieldName: fieldMetadataItem.name,
+              })
+            }
             onActivate={() =>
               activateMetadataField(fieldMetadataItem.id, objectMetadataItem.id)
             }
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx
index 4721ad21e6ad..4f27d94d3306 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx
@@ -2,6 +2,7 @@ import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { SettingsObjectFieldTable } from '~/pages/settings/data-model/SettingsObjectFieldTable';
 
 import styled from '@emotion/styled';
+import { useLingui } from '@lingui/react/macro';
 import { Button, H2Title, IconPlus, Section, UndecoratedLink } from 'twenty-ui';
 
 const StyledDiv = styled.div`
@@ -17,11 +18,14 @@ type ObjectFieldsProps = {
 export const ObjectFields = ({ objectMetadataItem }: ObjectFieldsProps) => {
   const shouldDisplayAddFieldButton = !objectMetadataItem.isRemote;
 
+  const { t } = useLingui();
+  const objectLabelSingular = objectMetadataItem.labelSingular;
+
   return (
     <Section>
       <H2Title
-        title="Fields"
-        description={`Customise the fields available in the ${objectMetadataItem.labelSingular} views and their display order in the ${objectMetadataItem.labelSingular} detail view and menus.`}
+        title={t`Fields`}
+        description={t`Customise the fields available in the ${objectLabelSingular} views.`}
       />
       <SettingsObjectFieldTable
         objectMetadataItem={objectMetadataItem}
@@ -32,7 +36,7 @@ export const ObjectFields = ({ objectMetadataItem }: ObjectFieldsProps) => {
           <UndecoratedLink to={'./new-field/select'}>
             <Button
               Icon={IconPlus}
-              title="Add Field"
+              title={t`Add Field`}
               size="small"
               variant="secondary"
             />
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx
index 9b656acdf244..0d919f23296c 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx
@@ -2,7 +2,6 @@
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { FormProvider, useForm } from 'react-hook-form';
-import { useNavigate } from 'react-router-dom';
 import { Button, H2Title, IconArchive, Section } from 'twenty-ui';
 import { z, ZodError } from 'zod';
 
@@ -18,17 +17,18 @@ import {
 import { settingsDataModelObjectIdentifiersFormSchema } from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm';
 import { SettingsDataModelObjectSettingsFormCard } from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard';
 import { settingsUpdateObjectInputSchema } from '@/settings/data-model/validation-schemas/settingsUpdateObjectInputSchema';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
+import { AppPath } from '@/types/AppPath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
 import styled from '@emotion/styled';
-import isEmpty from 'lodash.isempty';
 import pick from 'lodash.pick';
 import { useSetRecoilState } from 'recoil';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 import { updatedObjectNamePluralState } from '~/pages/settings/data-model/states/updatedObjectNamePluralState';
 import { computeMetadataNameFromLabel } from '~/pages/settings/data-model/utils/compute-metadata-name-from-label.utils';
+import { getAppPath } from '~/utils/navigation/getAppPath';
 
 const objectEditFormSchema = z
   .object({})
@@ -54,7 +54,7 @@ const StyledFormSection = styled(Section)`
 `;
 
 export const ObjectSettings = ({ objectMetadataItem }: ObjectSettingsProps) => {
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
   const { enqueueSnackBar } = useSnackBar();
   const setUpdatedObjectNamePlural = useSetRecoilState(
     updatedObjectNamePluralState,
@@ -65,12 +65,11 @@ export const ObjectSettings = ({ objectMetadataItem }: ObjectSettingsProps) => {
     useLastVisitedObjectMetadataItem();
   const { getLastVisitedViewIdFromObjectMetadataItemId } = useLastVisitedView();
 
-  const settingsObjectsPagePath = getSettingsPagePath(SettingsPath.Objects);
-
   const formConfig = useForm<SettingsDataModelObjectEditFormValues>({
     mode: 'onTouched',
     resolver: zodResolver(objectEditFormSchema),
   });
+  const { isDirty } = formConfig.formState;
 
   const setNavigationMemorizedUrl = useSetRecoilState(
     navigationMemorizedUrlState,
@@ -125,7 +124,7 @@ export const ObjectSettings = ({ objectMetadataItem }: ObjectSettingsProps) => {
   const handleSave = async (
     formValues: SettingsDataModelObjectEditFormValues,
   ) => {
-    if (isEmpty(formConfig.formState.dirtyFields) === true) {
+    if (!isDirty) {
       return;
     }
     try {
@@ -147,11 +146,17 @@ export const ObjectSettings = ({ objectMetadataItem }: ObjectSettingsProps) => {
           objectMetadataItem.id,
         );
         setNavigationMemorizedUrl(
-          `/objects/${objectNamePluralForRedirection}?view=${lastVisitedView}`,
+          getAppPath(
+            AppPath.RecordIndexPage,
+            { objectNamePlural: objectNamePluralForRedirection },
+            { viewId: lastVisitedView },
+          ),
         );
       }
 
-      navigate(`${settingsObjectsPagePath}/${objectNamePluralForRedirection}`);
+      navigate(SettingsPath.ObjectDetail, {
+        objectNamePlural: objectNamePluralForRedirection,
+      });
     } catch (error) {
       if (error instanceof ZodError) {
         enqueueSnackBar(error.issues[0].message, {
@@ -170,7 +175,7 @@ export const ObjectSettings = ({ objectMetadataItem }: ObjectSettingsProps) => {
       idToUpdate: objectMetadataItem.id,
       updatePayload: { isActive: false },
     });
-    navigate(settingsObjectsPagePath);
+    navigate(SettingsPath.Objects);
   };
 
   return (
@@ -197,6 +202,7 @@ export const ObjectSettings = ({ objectMetadataItem }: ObjectSettingsProps) => {
                 description="Choose the fields that will identify your records"
               />
               <SettingsDataModelObjectSettingsFormCard
+                onBlur={() => formConfig.handleSubmit(handleSave)()}
                 objectMetadataItem={objectMetadataItem}
               />
             </Section>
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectCoverImage.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectCoverImage.tsx
index 2dcb375d93fe..311cacfcfb3a 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectCoverImage.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectCoverImage.tsx
@@ -2,6 +2,7 @@ import styled from '@emotion/styled';
 import { Card, FloatingButton, IconEye } from 'twenty-ui';
 
 import { SettingsPath } from '@/types/SettingsPath';
+import { useLingui } from '@lingui/react/macro';
 import DarkCoverImage from '../../assets/cover-dark.png';
 import LightCoverImage from '../../assets/cover-light.png';
 
@@ -25,12 +26,13 @@ const StyledButtonContainer = styled.div`
   padding-top: ${({ theme }) => theme.spacing(5)};
 `;
 export const SettingsObjectCoverImage = () => {
+  const { t } = useLingui();
   return (
     <StyledCoverImageContainer>
       <StyledButtonContainer>
         <FloatingButton
           Icon={IconEye}
-          title="Visualize"
+          title={t`Visualize`}
           size="small"
           to={'/settings/' + SettingsPath.ObjectOverview}
         />
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx
index be75f8525c66..d5898847a3e3 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown.tsx
@@ -65,9 +65,7 @@ export const SettingsObjectInactiveMenuDropDown = ({
           )}
         </DropdownMenuItemsContainer>
       }
-      dropdownHotkeyScope={{
-        scope: dropdownId,
-      }}
+      dropdownHotkeyScope={{ scope: dropdownId }}
     />
   );
 };
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/components/__stories__/SettingsObjectInactiveMenuDropDown.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/components/__stories__/SettingsObjectInactiveMenuDropDown.stories.tsx
index 9ca74cfbda1b..bbde8a9f23f4 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/components/__stories__/SettingsObjectInactiveMenuDropDown.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/components/__stories__/SettingsObjectInactiveMenuDropDown.stories.tsx
@@ -38,7 +38,9 @@ export const Open: Story = {
   play: async () => {
     const canvas = within(document.body);
 
-    const dropdownButton = await canvas.getByRole('button');
+    const dropdownButton = await canvas.findByRole('button', {
+      name: 'Inactive Object Options',
+    });
 
     await userEvent.click(dropdownButton);
   },
@@ -48,7 +50,9 @@ export const WithActivate: Story = {
   play: async () => {
     const canvas = within(document.body);
 
-    const dropdownButton = await canvas.getByRole('button');
+    const dropdownButton = await canvas.findByRole('button', {
+      name: 'Inactive Object Options',
+    });
 
     await userEvent.click(dropdownButton);
 
@@ -69,7 +73,9 @@ export const WithDelete: Story = {
   play: async () => {
     const canvas = within(document.body);
 
-    const dropdownButton = await canvas.getByRole('button');
+    const dropdownButton = await canvas.findByRole('button', {
+      name: 'Inactive Object Options',
+    });
 
     await userEvent.click(dropdownButton);
 
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
index ce881e136a70..54233dc35224 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx
@@ -219,6 +219,7 @@ export const SettingsDataModelObjectAboutForm = ({
             value={value ?? undefined}
             onChange={(nextValue) => onChange(nextValue ?? null)}
             disabled={disableEdition}
+            onBlur={onBlur}
           />
         )}
       />
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm.tsx
index 29f5512e5b0c..bafa6d387186 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled';
 import { useMemo } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
-import { IconCircleOff, isDefined, useIcons } from 'twenty-ui';
+import { IconCircleOff, useIcons } from 'twenty-ui';
 import { z } from 'zod';
 
 import { LABEL_IDENTIFIER_FIELD_METADATA_TYPES } from '@/object-metadata/constants/LabelIdentifierFieldMetadataTypes';
@@ -19,11 +19,16 @@ export const settingsDataModelObjectIdentifiersFormSchema =
 export type SettingsDataModelObjectIdentifiersFormValues = z.infer<
   typeof settingsDataModelObjectIdentifiersFormSchema
 >;
-
+export type SettingsDataModelObjectIdentifiers =
+  keyof SettingsDataModelObjectIdentifiersFormValues;
 type SettingsDataModelObjectIdentifiersFormProps = {
   objectMetadataItem: ObjectMetadataItem;
-  defaultLabelIdentifierFieldMetadataId: string;
+  onBlur: () => void;
 };
+const LABEL_IDENTIFIER_FIELD_METADATA_ID: SettingsDataModelObjectIdentifiers =
+  'labelIdentifierFieldMetadataId';
+const IMAGE_IDENTIFIER_FIELD_METADATA_ID: SettingsDataModelObjectIdentifiers =
+  'imageIdentifierFieldMetadataId';
 
 const StyledContainer = styled.div`
   display: flex;
@@ -32,12 +37,11 @@ const StyledContainer = styled.div`
 
 export const SettingsDataModelObjectIdentifiersForm = ({
   objectMetadataItem,
-  defaultLabelIdentifierFieldMetadataId,
+  onBlur,
 }: SettingsDataModelObjectIdentifiersFormProps) => {
   const { control } =
     useFormContext<SettingsDataModelObjectIdentifiersFormValues>();
   const { getIcon } = useIcons();
-
   const labelIdentifierFieldOptions = useMemo(
     () =>
       getActiveFieldMetadataItems(objectMetadataItem)
@@ -65,41 +69,37 @@ export const SettingsDataModelObjectIdentifiersForm = ({
       {[
         {
           label: 'Record label',
-          fieldName: 'labelIdentifierFieldMetadataId' as const,
+          fieldName: LABEL_IDENTIFIER_FIELD_METADATA_ID,
           options: labelIdentifierFieldOptions,
+          defaultValue: objectMetadataItem.labelIdentifierFieldMetadataId,
         },
         {
           label: 'Record image',
-          fieldName: 'imageIdentifierFieldMetadataId' as const,
+          fieldName: IMAGE_IDENTIFIER_FIELD_METADATA_ID,
           options: imageIdentifierFieldOptions,
+          defaultValue: null,
         },
-      ].map(({ fieldName, label, options }) => (
+      ].map(({ fieldName, label, options, defaultValue }) => (
         <Controller
           key={fieldName}
           name={fieldName}
           control={control}
-          defaultValue={
-            fieldName === 'labelIdentifierFieldMetadataId'
-              ? isDefined(objectMetadataItem[fieldName])
-                ? objectMetadataItem[fieldName]
-                : defaultLabelIdentifierFieldMetadataId
-              : objectMetadataItem[fieldName]
-          }
-          render={({ field: { onBlur, onChange, value } }) => {
-            return (
-              <Select
-                label={label}
-                disabled={!objectMetadataItem.isCustom || !options.length}
-                fullWidth
-                dropdownId={`${fieldName}-select`}
-                emptyOption={emptyOption}
-                options={options}
-                value={value}
-                onChange={onChange}
-                onBlur={onBlur}
-              />
-            );
-          }}
+          defaultValue={defaultValue}
+          render={({ field: { onChange, value } }) => (
+            <Select
+              label={label}
+              disabled={!objectMetadataItem.isCustom || !options.length}
+              fullWidth
+              dropdownId={`${fieldName}-select`}
+              emptyOption={emptyOption}
+              options={options}
+              value={value}
+              onChange={(value) => {
+                onChange(value);
+                onBlur();
+              }}
+            />
+          )}
         />
       ))}
     </StyledContainer>
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx
index 228df4c447e8..822e257e7289 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx
@@ -1,20 +1,18 @@
 import styled from '@emotion/styled';
 import { useMemo } from 'react';
-import { useFormContext } from 'react-hook-form';
 
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { getLabelIdentifierFieldMetadataItem } from '@/object-metadata/utils/getLabelIdentifierFieldMetadataItem';
 import { SettingsDataModelCardTitle } from '@/settings/data-model/components/SettingsDataModelCardTitle';
 import { SettingsDataModelFieldPreviewCard } from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewCard';
 import { SettingsDataModelObjectSummary } from '@/settings/data-model/objects/components/SettingsDataModelObjectSummary';
-import {
-  SettingsDataModelObjectIdentifiersForm,
-  SettingsDataModelObjectIdentifiersFormValues,
-} from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm';
+import { SettingsDataModelObjectIdentifiersForm } from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectIdentifiersForm';
+import { Trans } from '@lingui/react/macro';
 import { Card, CardContent } from 'twenty-ui';
 
 type SettingsDataModelObjectSettingsFormCardProps = {
   objectMetadataItem: ObjectMetadataItem;
+  onBlur: () => void;
 };
 
 const StyledFieldPreviewCard = styled(SettingsDataModelFieldPreviewCard)`
@@ -37,27 +35,22 @@ const StyledObjectSummaryCardContent = styled(CardContent)`
 
 export const SettingsDataModelObjectSettingsFormCard = ({
   objectMetadataItem,
+  onBlur,
 }: SettingsDataModelObjectSettingsFormCardProps) => {
-  const { watch: watchFormValue } =
-    useFormContext<SettingsDataModelObjectIdentifiersFormValues>();
-
-  const labelIdentifierFieldMetadataIdFormValue = watchFormValue(
-    'labelIdentifierFieldMetadataId',
-  );
-
-  const labelIdentifierFieldMetadataItem = useMemo(
-    () =>
-      getLabelIdentifierFieldMetadataItem({
-        fields: objectMetadataItem.fields,
-        labelIdentifierFieldMetadataId: labelIdentifierFieldMetadataIdFormValue,
-      }),
-    [labelIdentifierFieldMetadataIdFormValue, objectMetadataItem],
-  );
+  const labelIdentifierFieldMetadataItem = useMemo(() => {
+    return getLabelIdentifierFieldMetadataItem({
+      fields: objectMetadataItem.fields,
+      labelIdentifierFieldMetadataId:
+        objectMetadataItem.labelIdentifierFieldMetadataId,
+    });
+  }, [objectMetadataItem]);
 
   return (
     <Card fullWidth>
       <StyledTopCardContent divider>
-        <SettingsDataModelCardTitle>Preview</SettingsDataModelCardTitle>
+        <SettingsDataModelCardTitle>
+          <Trans>Preview</Trans>
+        </SettingsDataModelCardTitle>
         {labelIdentifierFieldMetadataItem ? (
           <StyledFieldPreviewCard
             objectMetadataItem={objectMetadataItem}
@@ -77,9 +70,7 @@ export const SettingsDataModelObjectSettingsFormCard = ({
       <CardContent>
         <SettingsDataModelObjectIdentifiersForm
           objectMetadataItem={objectMetadataItem}
-          defaultLabelIdentifierFieldMetadataId={
-            labelIdentifierFieldMetadataItem?.id
-          }
+          onBlur={onBlur}
         />
       </CardContent>
     </Card>
diff --git a/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/isSelectOptionDefaultValue.test.ts b/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/isSelectOptionDefaultValue.test.ts
index f52268c3570f..87447322ff8c 100644
--- a/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/isSelectOptionDefaultValue.test.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/isSelectOptionDefaultValue.test.ts
@@ -9,7 +9,7 @@ describe('isSelectOptionDefaultValue', () => {
       const optionValue = 'OPTION_1';
       const fieldMetadataItem = {
         defaultValue: `'${optionValue}'`,
-        type: FieldMetadataType.Select,
+        type: FieldMetadataType.SELECT,
       };
 
       // When
@@ -24,7 +24,7 @@ describe('isSelectOptionDefaultValue', () => {
       const optionValue = 'OPTION_1';
       const fieldMetadataItem = {
         defaultValue: "'OPTION_2'",
-        type: FieldMetadataType.Select,
+        type: FieldMetadataType.SELECT,
       };
 
       // When
@@ -41,7 +41,7 @@ describe('isSelectOptionDefaultValue', () => {
       const optionValue = 'OPTION_1';
       const fieldMetadataItem = {
         defaultValue: ["'OPTION_1'", "'OPTION_2'"],
-        type: FieldMetadataType.MultiSelect,
+        type: FieldMetadataType.MULTI_SELECT,
       };
 
       // When
@@ -56,7 +56,7 @@ describe('isSelectOptionDefaultValue', () => {
       const optionValue = 'OPTION_1';
       const fieldMetadataItem = {
         defaultValue: ["'OPTION_2'", "'OPTION_3'"],
-        type: FieldMetadataType.MultiSelect,
+        type: FieldMetadataType.MULTI_SELECT,
       };
 
       // When
diff --git a/packages/twenty-front/src/modules/settings/data-model/utils/getFieldPreviewValueFromRecord.ts b/packages/twenty-front/src/modules/settings/data-model/utils/getFieldPreviewValueFromRecord.ts
index 0add3e527abe..cef345a49027 100644
--- a/packages/twenty-front/src/modules/settings/data-model/utils/getFieldPreviewValueFromRecord.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/utils/getFieldPreviewValueFromRecord.ts
@@ -13,7 +13,7 @@ export const getFieldPreviewValueFromRecord = ({
 
   // Relation fields (to many)
   if (
-    fieldMetadataItem.type === FieldMetadataType.Relation &&
+    fieldMetadataItem.type === FieldMetadataType.RELATION &&
     Array.isArray(recordFieldValue?.edges)
   ) {
     return recordFieldValue.edges[0]?.node;
diff --git a/packages/twenty-front/src/modules/settings/data-model/utils/isSelectOptionDefaultValue.ts b/packages/twenty-front/src/modules/settings/data-model/utils/isSelectOptionDefaultValue.ts
index c8b1dd029f62..09e4b13caebf 100644
--- a/packages/twenty-front/src/modules/settings/data-model/utils/isSelectOptionDefaultValue.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/utils/isSelectOptionDefaultValue.ts
@@ -6,14 +6,14 @@ export const isSelectOptionDefaultValue = (
   optionValue: string,
   fieldMetadataItem: Pick<FieldMetadataItem, 'defaultValue' | 'type'>,
 ): boolean => {
-  if (fieldMetadataItem.type === FieldMetadataType.Select) {
+  if (fieldMetadataItem.type === FieldMetadataType.SELECT) {
     return (
       applySimpleQuotesToString(optionValue) === fieldMetadataItem.defaultValue
     );
   }
 
   if (
-    fieldMetadataItem.type === FieldMetadataType.MultiSelect &&
+    fieldMetadataItem.type === FieldMetadataType.MULTI_SELECT &&
     Array.isArray(fieldMetadataItem.defaultValue)
   ) {
     return fieldMetadataItem.defaultValue.includes(
diff --git a/packages/twenty-front/src/modules/settings/developers/components/SettingsReadDocumentationButton.tsx b/packages/twenty-front/src/modules/settings/developers/components/SettingsReadDocumentationButton.tsx
index 04d47f6225ab..8fa1fe9243e8 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/SettingsReadDocumentationButton.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/SettingsReadDocumentationButton.tsx
@@ -1,9 +1,12 @@
+import { useLingui } from '@lingui/react/macro';
 import { Button, IconBook2 } from 'twenty-ui';
 
 export const SettingsReadDocumentationButton = () => {
+  const { t } = useLingui();
+
   return (
     <Button
-      title="Read documentation"
+      title={t`Read documentation`}
       variant="secondary"
       accent="default"
       size="small"
diff --git a/packages/twenty-front/src/modules/settings/developers/states/apiKeyTokenFamilyState.ts b/packages/twenty-front/src/modules/settings/developers/states/apiKeyTokenFamilyState.ts
new file mode 100644
index 000000000000..5fd5c1788745
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/developers/states/apiKeyTokenFamilyState.ts
@@ -0,0 +1,6 @@
+import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
+
+export const apiKeyTokenFamilyState = createFamilyState<string | null, string>({
+  key: 'apiKeyTokenState',
+  defaultValue: null,
+});
diff --git a/packages/twenty-front/src/modules/settings/developers/states/generatedApiKeyTokenState.ts b/packages/twenty-front/src/modules/settings/developers/states/generatedApiKeyTokenState.ts
deleted file mode 100644
index 0fc6a43a420f..000000000000
--- a/packages/twenty-front/src/modules/settings/developers/states/generatedApiKeyTokenState.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createState } from '@ui/utilities/state/utils/createState';
-
-export const apiKeyTokenState = createState<string | null>({
-  key: 'apiKeyTokenState',
-  defaultValue: null,
-});
diff --git a/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationRemoteTableSyncStatusToggle.tsx b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationRemoteTableSyncStatusToggle.tsx
index 88c9084cf86d..c4ed0b77bfdf 100644
--- a/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationRemoteTableSyncStatusToggle.tsx
+++ b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationRemoteTableSyncStatusToggle.tsx
@@ -23,7 +23,7 @@ export const SettingsIntegrationRemoteTableSyncStatusToggle = ({
 
   return (
     <Toggle
-      value={tableStatus === RemoteTableStatus.Synced}
+      value={tableStatus === RemoteTableStatus.SYNCED}
       disabled={isToggleLoading}
       onChange={onChange}
     />
diff --git a/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionShowContainer.tsx b/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionShowContainer.tsx
index 6cffad757e98..97d6f745ae20 100644
--- a/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionShowContainer.tsx
+++ b/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionShowContainer.tsx
@@ -2,15 +2,15 @@ import { useDeleteOneDatabaseConnection } from '@/databases/hooks/useDeleteOneDa
 import { SettingsIntegrationDatabaseConnectionSummaryCard } from '@/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionSummaryCard';
 import { SettingsIntegrationDatabaseTablesListCard } from '@/settings/integrations/database-connection/components/SettingsIntegrationDatabaseTablesListCard';
 import { useDatabaseConnection } from '@/settings/integrations/database-connection/hooks/useDatabaseConnection';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
 import { Section } from '@react-email/components';
-import { useNavigate } from 'react-router-dom';
 import { H2Title } from 'twenty-ui';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const SettingsIntegrationDatabaseConnectionShowContainer = () => {
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
   const { connection, integration, databaseKey, tables } =
     useDatabaseConnection({ fetchPolicy: 'network-only' });
 
@@ -23,10 +23,12 @@ export const SettingsIntegrationDatabaseConnectionShowContainer = () => {
   const deleteConnection = async () => {
     await deleteOneDatabaseConnection({ id: connection.id });
 
-    navigate(`${settingsIntegrationsPagePath}/${databaseKey}`);
+    navigate(SettingsPath.IntegrationDatabase, {
+      databaseKey,
+    });
   };
 
-  const settingsIntegrationsPagePath = getSettingsPagePath(
+  const settingsIntegrationsPagePath = getSettingsPath(
     SettingsPath.Integrations,
   );
 
diff --git a/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionSyncStatus.tsx b/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionSyncStatus.tsx
index aa8162ce8386..b4298fe511d1 100644
--- a/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionSyncStatus.tsx
+++ b/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionSyncStatus.tsx
@@ -25,7 +25,7 @@ export const SettingsIntegrationDatabaseConnectionSyncStatus = ({
   }
 
   const syncedTables = tables.filter(
-    (table) => table.status === RemoteTableStatus.Synced,
+    (table) => table.status === RemoteTableStatus.SYNCED,
   );
 
   const updatesAvailable = tables.some(
diff --git a/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionsListCard.tsx b/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionsListCard.tsx
index 1358615676d6..5f482b727b9e 100644
--- a/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionsListCard.tsx
+++ b/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionsListCard.tsx
@@ -1,11 +1,12 @@
 import styled from '@emotion/styled';
-import { useNavigate } from 'react-router-dom';
 import { IconChevronRight, LightIconButton } from 'twenty-ui';
 
 import { SettingsListCard } from '@/settings/components/SettingsListCard';
 import { SettingsIntegrationDatabaseConnectionSyncStatus } from '@/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionSyncStatus';
 import { SettingsIntegration } from '@/settings/integrations/types/SettingsIntegration';
+import { SettingsPath } from '@/types/SettingsPath';
 import { RemoteServer } from '~/generated-metadata/graphql';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 
 type SettingsIntegrationDatabaseConnectionsListCardProps = {
   integration: SettingsIntegration;
@@ -34,7 +35,7 @@ export const SettingsIntegrationDatabaseConnectionsListCard = ({
   integration,
   connections,
 }: SettingsIntegrationDatabaseConnectionsListCardProps) => {
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
 
   return (
     <SettingsListCard
@@ -52,11 +53,20 @@ export const SettingsIntegrationDatabaseConnectionsListCard = ({
           <LightIconButton Icon={IconChevronRight} accent="tertiary" />
         </StyledRowRightContainer>
       )}
-      onRowClick={(connection) => navigate(`./${connection.id}`)}
+      onRowClick={(connection) =>
+        navigate(SettingsPath.IntegrationDatabaseConnection, {
+          databaseKey: integration.from.key,
+          connectionId: connection.id,
+        })
+      }
       getItemLabel={(connection) => connection.label}
       hasFooter
       footerButtonLabel="Add connection"
-      onFooterButtonClick={() => navigate('./new')}
+      onFooterButtonClick={() =>
+        navigate(SettingsPath.IntegrationNewDatabaseConnection, {
+          databaseKey: integration.from.key,
+        })
+      }
     />
   );
 };
diff --git a/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseTablesListCard.tsx b/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseTablesListCard.tsx
index 6b8161cb720f..baa8deea68f4 100644
--- a/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseTablesListCard.tsx
+++ b/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationDatabaseTablesListCard.tsx
@@ -1,5 +1,5 @@
-import { useCallback } from 'react';
 import styled from '@emotion/styled';
+import { useCallback } from 'react';
 import { z } from 'zod';
 
 import { useSyncRemoteTable } from '@/databases/hooks/useSyncRemoteTable';
@@ -36,19 +36,19 @@ const StyledRowRightContainer = styled.div`
 const getDistantTableUpdatesText = (
   schemaPendingUpdates: DistantTableUpdate[],
 ) => {
-  if (schemaPendingUpdates.includes(DistantTableUpdate.TableDeleted)) {
+  if (schemaPendingUpdates.includes(DistantTableUpdate.TABLE_DELETED)) {
     return 'Table has been deleted';
   }
   if (
-    schemaPendingUpdates.includes(DistantTableUpdate.ColumnsAdded) &&
-    schemaPendingUpdates.includes(DistantTableUpdate.ColumnsDeleted)
+    schemaPendingUpdates.includes(DistantTableUpdate.COLUMNS_ADDED) &&
+    schemaPendingUpdates.includes(DistantTableUpdate.COLUMNS_DELETED)
   ) {
     return 'Columns have been added and other deleted';
   }
-  if (schemaPendingUpdates.includes(DistantTableUpdate.ColumnsAdded)) {
+  if (schemaPendingUpdates.includes(DistantTableUpdate.COLUMNS_ADDED)) {
     return 'Columns have been added';
   }
-  if (schemaPendingUpdates.includes(DistantTableUpdate.ColumnsDeleted)) {
+  if (schemaPendingUpdates.includes(DistantTableUpdate.COLUMNS_DELETED)) {
     return 'Columns have been deleted';
   }
   return null;
diff --git a/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationEditDatabaseConnectionContent.tsx b/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationEditDatabaseConnectionContent.tsx
index 3540cad1e8a2..8b488fed8484 100644
--- a/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationEditDatabaseConnectionContent.tsx
+++ b/packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationEditDatabaseConnectionContent.tsx
@@ -8,7 +8,6 @@ import {
   getFormDefaultValuesFromConnection,
 } from '@/settings/integrations/database-connection/utils/editDatabaseConnection';
 import { SettingsIntegration } from '@/settings/integrations/types/SettingsIntegration';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
@@ -17,7 +16,6 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { Section } from '@react-email/components';
 import pick from 'lodash.pick';
 import { FormProvider, useForm } from 'react-hook-form';
-import { useNavigate } from 'react-router-dom';
 import { H2Title, Info } from 'twenty-ui';
 import { z } from 'zod';
 import {
@@ -25,6 +23,8 @@ import {
   RemoteTable,
   RemoteTableStatus,
 } from '~/generated-metadata/graphql';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const SettingsIntegrationEditDatabaseConnectionContent = ({
   connection,
@@ -38,7 +38,7 @@ export const SettingsIntegrationEditDatabaseConnectionContent = ({
   tables: RemoteTable[];
 }) => {
   const { enqueueSnackBar } = useSnackBar();
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
 
   const editConnectionSchema = getEditionSchemaForForm(databaseKey);
   type SettingsIntegrationEditConnectionFormValues = z.infer<
@@ -56,12 +56,12 @@ export const SettingsIntegrationEditDatabaseConnectionContent = ({
 
   const { updateOneDatabaseConnection } = useUpdateOneDatabaseConnection();
 
-  const settingsIntegrationsPagePath = getSettingsPagePath(
+  const settingsIntegrationsPagePath = getSettingsPath(
     SettingsPath.Integrations,
   );
 
   const hasSyncedTables = tables?.some(
-    (table) => table?.status === RemoteTableStatus.Synced,
+    (table) => table?.status === RemoteTableStatus.SYNCED,
   );
 
   const { isDirty, isValid } = formConfig.formState;
@@ -82,9 +82,10 @@ export const SettingsIntegrationEditDatabaseConnectionContent = ({
         id: connection?.id ?? '',
       });
 
-      navigate(
-        `${settingsIntegrationsPagePath}/${databaseKey}/${connection?.id}`,
-      );
+      navigate(SettingsPath.IntegrationDatabaseConnection, {
+        databaseKey,
+        connectionId: connection?.id,
+      });
     } catch (error) {
       enqueueSnackBar((error as Error).message, {
         variant: SnackBarVariant.Error,
@@ -116,7 +117,9 @@ export const SettingsIntegrationEditDatabaseConnectionContent = ({
           <SaveAndCancelButtons
             isSaveDisabled={!canSave}
             onCancel={() =>
-              navigate(`${settingsIntegrationsPagePath}/${databaseKey}`)
+              navigate(SettingsPath.IntegrationDatabase, {
+                databaseKey,
+              })
             }
             onSave={handleSave}
           />
diff --git a/packages/twenty-front/src/modules/settings/integrations/database-connection/hooks/useDatabaseConnection.ts b/packages/twenty-front/src/modules/settings/integrations/database-connection/hooks/useDatabaseConnection.ts
index ec3c73df0d06..79ca63302e45 100644
--- a/packages/twenty-front/src/modules/settings/integrations/database-connection/hooks/useDatabaseConnection.ts
+++ b/packages/twenty-front/src/modules/settings/integrations/database-connection/hooks/useDatabaseConnection.ts
@@ -1,12 +1,13 @@
 import { WatchQueryFetchPolicy } from '@apollo/client';
 import { useEffect } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 
 import { useGetDatabaseConnection } from '@/databases/hooks/useGetDatabaseConnection';
 import { useGetDatabaseConnectionTables } from '@/databases/hooks/useGetDatabaseConnectionTables';
 import { useIsSettingsIntegrationEnabled } from '@/settings/integrations/hooks/useIsSettingsIntegrationEnabled';
 import { useSettingsIntegrationCategories } from '@/settings/integrations/hooks/useSettingsIntegrationCategories';
 import { AppPath } from '@/types/AppPath';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
 
 export const useDatabaseConnection = ({
   fetchPolicy,
@@ -14,7 +15,7 @@ export const useDatabaseConnection = ({
   fetchPolicy?: WatchQueryFetchPolicy;
 }) => {
   const { databaseKey = '', connectionId = '' } = useParams();
-  const navigate = useNavigate();
+  const navigateApp = useNavigateApp();
 
   const [integrationCategoryAll] = useSettingsIntegrationCategories();
   const integration = integrationCategoryAll.integrations.find(
@@ -34,12 +35,12 @@ export const useDatabaseConnection = ({
 
   useEffect(() => {
     if (!isIntegrationAvailable || (!loading && !connection)) {
-      navigate(AppPath.NotFound);
+      navigateApp(AppPath.NotFound);
     }
   }, [
     integration,
     databaseKey,
-    navigate,
+    navigateApp,
     isIntegrationAvailable,
     connection,
     loading,
diff --git a/packages/twenty-front/src/modules/settings/integrations/hooks/useIsSettingsIntegrationEnabled.ts b/packages/twenty-front/src/modules/settings/integrations/hooks/useIsSettingsIntegrationEnabled.ts
index 46a4dd4284f1..c45ad36d6422 100644
--- a/packages/twenty-front/src/modules/settings/integrations/hooks/useIsSettingsIntegrationEnabled.ts
+++ b/packages/twenty-front/src/modules/settings/integrations/hooks/useIsSettingsIntegrationEnabled.ts
@@ -6,7 +6,7 @@ const getFeatureKey = (databaseKey: string): FeatureFlagKey | null => {
     case 'airtable':
       return FeatureFlagKey.IsAirtableIntegrationEnabled;
     case 'postgresql':
-      return FeatureFlagKey.IsPostgreSqlIntegrationEnabled;
+      return FeatureFlagKey.IsPostgreSQLIntegrationEnabled;
     case 'stripe':
       return FeatureFlagKey.IsStripeIntegrationEnabled;
     default:
diff --git a/packages/twenty-front/src/modules/settings/integrations/hooks/useSettingsIntegrationCategories.ts b/packages/twenty-front/src/modules/settings/integrations/hooks/useSettingsIntegrationCategories.ts
index 5e068af2511f..e98beba7a748 100644
--- a/packages/twenty-front/src/modules/settings/integrations/hooks/useSettingsIntegrationCategories.ts
+++ b/packages/twenty-front/src/modules/settings/integrations/hooks/useSettingsIntegrationCategories.ts
@@ -17,7 +17,7 @@ export const useSettingsIntegrationCategories =
     )?.isActive;
 
     const isPostgresqlIntegrationEnabled = useIsFeatureEnabled(
-      FeatureFlagKey.IsPostgreSqlIntegrationEnabled,
+      FeatureFlagKey.IsPostgreSQLIntegrationEnabled,
     );
     const isPostgresqlIntegrationActive = !!MOCK_REMOTE_DATABASES.find(
       ({ name }) => name === 'postgresql',
diff --git a/packages/twenty-front/src/modules/settings/lab/components/SettingsLabContent.tsx b/packages/twenty-front/src/modules/settings/lab/components/SettingsLabContent.tsx
new file mode 100644
index 000000000000..23d1ade84a67
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/lab/components/SettingsLabContent.tsx
@@ -0,0 +1,84 @@
+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsOptions/SettingsOptionCardContentToggle';
+import { useLabPublicFeatureFlags } from '@/settings/lab/hooks/useLabPublicFeatureFlags';
+import styled from '@emotion/styled';
+import { useState } from 'react';
+import { useRecoilValue } from 'recoil';
+import { Card, MOBILE_VIEWPORT } from 'twenty-ui';
+import { FeatureFlagKey } from '~/generated/graphql';
+
+const StyledCardGrid = styled.div`
+  display: grid;
+  gap: ${({ theme }) => theme.spacing(4)};
+  grid-template-columns: 1fr;
+
+  & > *:not(:first-child) {
+    grid-column: span 1;
+  }
+
+  @media (min-width: ${MOBILE_VIEWPORT}px) {
+    grid-template-columns: repeat(2, 1fr);
+
+    & > *:first-child {
+      grid-column: 1 / -1;
+    }
+  }
+`;
+
+const StyledImage = styled.img<{ isFirstCard: boolean }>`
+  border-bottom: 1px solid ${({ theme }) => theme.border.color.medium};
+  height: ${({ isFirstCard }) => (isFirstCard ? '240px' : '120px')};
+  width: 100%;
+`;
+
+const StyledFallbackDiv = styled.div<{ isFirstCard: boolean }>`
+  background-color: ${({ theme }) => theme.background.tertiary};
+  border-bottom: 1px solid ${({ theme }) => theme.border.color.medium};
+  height: ${({ isFirstCard }) => (isFirstCard ? '240px' : '120px')};
+  width: 100%;
+`;
+
+export const SettingsLabContent = () => {
+  const currentWorkspace = useRecoilValue(currentWorkspaceState);
+  const { labPublicFeatureFlags, handleLabPublicFeatureFlagUpdate } =
+    useLabPublicFeatureFlags();
+  const [hasImageLoadingError, setHasImageLoadingError] = useState<
+    Record<string, boolean>
+  >({});
+
+  const handleToggle = async (key: FeatureFlagKey, value: boolean) => {
+    await handleLabPublicFeatureFlagUpdate(key, value);
+  };
+
+  const handleImageError = (key: string) => {
+    setHasImageLoadingError((prev) => ({ ...prev, [key]: true }));
+  };
+
+  return (
+    currentWorkspace?.id && (
+      <StyledCardGrid>
+        {labPublicFeatureFlags.map((flag, index) => (
+          <Card key={flag.key} rounded>
+            {flag.metadata.imagePath && !hasImageLoadingError[flag.key] ? (
+              <StyledImage
+                src={flag.metadata.imagePath}
+                alt={flag.metadata.label}
+                isFirstCard={index === 0}
+                onError={() => handleImageError(flag.key)}
+              />
+            ) : (
+              <StyledFallbackDiv isFirstCard={index === 0} />
+            )}
+            <SettingsOptionCardContentToggle
+              title={flag.metadata.label}
+              description={flag.metadata.description}
+              checked={flag.value}
+              onChange={(value) => handleToggle(flag.key, value)}
+              toggleCentered={false}
+            />
+          </Card>
+        ))}
+      </StyledCardGrid>
+    )
+  );
+};
diff --git a/packages/twenty-front/src/modules/settings/lab/graphql/mutations/updateLabPublicFeatureFlag.ts b/packages/twenty-front/src/modules/settings/lab/graphql/mutations/updateLabPublicFeatureFlag.ts
new file mode 100644
index 000000000000..622d6a0e019a
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/lab/graphql/mutations/updateLabPublicFeatureFlag.ts
@@ -0,0 +1,9 @@
+import { gql } from '@apollo/client';
+
+export const UPDATE_LAB_PUBLIC_FEATURE_FLAG = gql`
+  mutation UpdateLabPublicFeatureFlag(
+    $input: UpdateLabPublicFeatureFlagInput!
+  ) {
+    updateLabPublicFeatureFlag(input: $input)
+  }
+`;
diff --git a/packages/twenty-front/src/modules/settings/lab/hooks/useLabPublicFeatureFlags.ts b/packages/twenty-front/src/modules/settings/lab/hooks/useLabPublicFeatureFlags.ts
new file mode 100644
index 000000000000..635dd129e166
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/lab/hooks/useLabPublicFeatureFlags.ts
@@ -0,0 +1,66 @@
+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { labPublicFeatureFlagsState } from '@/client-config/states/labPublicFeatureFlagsState';
+import { useState } from 'react';
+import { useRecoilState, useRecoilValue } from 'recoil';
+import { isDefined } from 'twenty-ui';
+import {
+  FeatureFlagKey,
+  useUpdateLabPublicFeatureFlagMutation,
+} from '~/generated/graphql';
+
+export const useLabPublicFeatureFlags = () => {
+  const [error, setError] = useState<string | null>(null);
+  const [currentWorkspace, setCurrentWorkspace] = useRecoilState(
+    currentWorkspaceState,
+  );
+  const labPublicFeatureFlags = useRecoilValue(labPublicFeatureFlagsState);
+
+  const [updateLabPublicFeatureFlag] = useUpdateLabPublicFeatureFlagMutation();
+
+  const handleLabPublicFeatureFlagUpdate = async (
+    publicFeatureFlag: FeatureFlagKey,
+    value: boolean,
+  ) => {
+    if (!isDefined(currentWorkspace)) {
+      setError('No workspace selected');
+      return false;
+    }
+
+    setError(null);
+
+    const response = await updateLabPublicFeatureFlag({
+      variables: {
+        input: {
+          publicFeatureFlag,
+          value,
+        },
+      },
+      onError: (error) => {
+        setError(error.message);
+      },
+    });
+
+    if (isDefined(response.data)) {
+      setCurrentWorkspace({
+        ...currentWorkspace,
+        featureFlags: currentWorkspace.featureFlags?.map((flag) =>
+          flag.key === publicFeatureFlag ? { ...flag, value } : flag,
+        ),
+      });
+    }
+
+    return !!response.data;
+  };
+
+  return {
+    labPublicFeatureFlags: labPublicFeatureFlags.map((flag) => ({
+      ...flag,
+      value:
+        currentWorkspace?.featureFlags?.find(
+          (workspaceFlag) => workspaceFlag.key === flag.key,
+        )?.value ?? false,
+    })),
+    handleLabPublicFeatureFlagUpdate,
+    error,
+  };
+};
diff --git a/packages/twenty-front/src/modules/settings/profile/components/ChangePassword.tsx b/packages/twenty-front/src/modules/settings/profile/components/ChangePassword.tsx
index 9110cfb7b8d8..2f9a504c8735 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/ChangePassword.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/ChangePassword.tsx
@@ -4,9 +4,12 @@ import { Button, H2Title } from 'twenty-ui';
 import { currentUserState } from '@/auth/states/currentUserState';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { useLingui } from '@lingui/react/macro';
 import { useEmailPasswordResetLinkMutation } from '~/generated/graphql';
 
 export const ChangePassword = () => {
+  const { t } = useLingui();
+
   const { enqueueSnackBar } = useSnackBar();
 
   const currentUser = useRecoilValue(currentUserState);
@@ -15,7 +18,7 @@ export const ChangePassword = () => {
 
   const handlePasswordResetClick = async () => {
     if (!currentUser?.email) {
-      enqueueSnackBar('Invalid email', {
+      enqueueSnackBar(t`Invalid email`, {
         variant: SnackBarVariant.Error,
       });
       return;
@@ -28,11 +31,11 @@ export const ChangePassword = () => {
         },
       });
       if (data?.emailPasswordResetLink?.success === true) {
-        enqueueSnackBar('Password reset link has been sent to the email', {
+        enqueueSnackBar(t`Password reset link has been sent to the email`, {
           variant: SnackBarVariant.Success,
         });
       } else {
-        enqueueSnackBar('There was some issue', {
+        enqueueSnackBar(t`There was an issue`, {
           variant: SnackBarVariant.Error,
         });
       }
@@ -46,13 +49,13 @@ export const ChangePassword = () => {
   return (
     <>
       <H2Title
-        title="Change Password"
-        description="Receive an email containing password update link"
+        title={t`Change Password`}
+        description={t`Receive an email containing password update link`}
       />
       <Button
         onClick={handlePasswordResetClick}
         variant="secondary"
-        title="Change Password"
+        title={t`Change Password`}
       />
     </>
   );
diff --git a/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx b/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx
index f7e25c658e8c..8973c2a26715 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx
@@ -5,9 +5,11 @@ import { Button, H2Title } from 'twenty-ui';
 import { useAuth } from '@/auth/hooks/useAuth';
 import { currentUserState } from '@/auth/states/currentUserState';
 import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
+import { useLingui } from '@lingui/react/macro';
 import { useDeleteUserAccountMutation } from '~/generated/graphql';
 
 export const DeleteAccount = () => {
+  const { t } = useLingui();
   const [isDeleteAccountModalOpen, setIsDeleteAccountModalOpen] =
     useState(false);
 
@@ -24,15 +26,15 @@ export const DeleteAccount = () => {
   return (
     <>
       <H2Title
-        title="Danger zone"
-        description="Delete account and all the associated data"
+        title={t`Danger zone`}
+        description={t`Delete account and all the associated data`}
       />
 
       <Button
         accent="danger"
         onClick={() => setIsDeleteAccountModalOpen(true)}
         variant="secondary"
-        title="Delete account"
+        title={t`Delete account`}
       />
 
       <ConfirmationModal
@@ -40,7 +42,7 @@ export const DeleteAccount = () => {
         confirmationPlaceholder={userEmail ?? ''}
         isOpen={isDeleteAccountModalOpen}
         setIsOpen={setIsDeleteAccountModalOpen}
-        title="Account Deletion"
+        title={t`Account Deletion`}
         subtitle={
           <>
             This action cannot be undone. This will permanently delete your
@@ -48,7 +50,7 @@ export const DeleteAccount = () => {
           </>
         }
         onConfirmClick={deleteAccount}
-        deleteButtonText="Delete account"
+        deleteButtonText={t`Delete account`}
       />
     </>
   );
diff --git a/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx b/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx
index f94f1fed42bf..3636005962cf 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx
@@ -1,3 +1,4 @@
+import { Trans, useLingui } from '@lingui/react/macro';
 import { useState } from 'react';
 import { useRecoilValue } from 'recoil';
 import { Button, H2Title, IconTrash } from 'twenty-ui';
@@ -6,6 +7,7 @@ import { useAuth } from '@/auth/hooks/useAuth';
 import { currentUserState } from '@/auth/states/currentUserState';
 import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
 import { useDeleteCurrentWorkspaceMutation } from '~/generated/graphql';
+
 export const DeleteWorkspace = () => {
   const [isDeleteWorkSpaceModalOpen, setIsDeleteWorkSpaceModalOpen] =
     useState(false);
@@ -13,6 +15,7 @@ export const DeleteWorkspace = () => {
   const [deleteCurrentWorkspace] = useDeleteCurrentWorkspaceMutation();
   const currentUser = useRecoilValue(currentUserState);
   const userEmail = currentUser?.email;
+  const { t } = useLingui();
 
   const { signOut } = useAuth();
 
@@ -23,11 +26,14 @@ export const DeleteWorkspace = () => {
 
   return (
     <>
-      <H2Title title="Danger zone" description="Delete your whole workspace" />
+      <H2Title
+        title={t`Danger zone`}
+        description={t`Delete your whole workspace`}
+      />
       <Button
         accent="danger"
         variant="secondary"
-        title="Delete workspace"
+        title={t`Delete workspace`}
         Icon={IconTrash}
         onClick={() => setIsDeleteWorkSpaceModalOpen(true)}
       />
@@ -37,15 +43,15 @@ export const DeleteWorkspace = () => {
         confirmationValue={userEmail}
         isOpen={isDeleteWorkSpaceModalOpen}
         setIsOpen={setIsDeleteWorkSpaceModalOpen}
-        title="Workspace Deletion"
+        title={t`Workspace Deletion`}
         subtitle={
-          <>
+          <Trans>
             This action cannot be undone. This will permanently delete your
             entire workspace. <br /> Please type in your email to confirm.
-          </>
+          </Trans>
         }
         onConfirmClick={deleteWorkspace}
-        deleteButtonText="Delete workspace"
+        deleteButtonText={t`Delete workspace`}
       />
     </>
   );
diff --git a/packages/twenty-front/src/modules/settings/profile/components/ProfilePictureUploader.tsx b/packages/twenty-front/src/modules/settings/profile/components/ProfilePictureUploader.tsx
index 6d9bf03e00e2..cc29f7e58c5f 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/ProfilePictureUploader.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/ProfilePictureUploader.tsx
@@ -91,7 +91,7 @@ export const ProfilePictureUploader = () => {
       await updateOneRecord({
         idToUpdate: currentWorkspaceMember?.id,
         updateOneRecordInput: {
-          avatarUrl: null,
+          avatarUrl: '',
         },
       });
 
diff --git a/packages/twenty-front/src/modules/settings/security/components/SettingsSSOIdentitiesProvidersForm.tsx b/packages/twenty-front/src/modules/settings/security/components/SettingsSSOIdentitiesProvidersForm.tsx
index 55286c828ed8..c9fa7c68bd17 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SettingsSSOIdentitiesProvidersForm.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SettingsSSOIdentitiesProvidersForm.tsx
@@ -66,9 +66,9 @@ export const SettingsSSOIdentitiesProvidersForm = () => {
 
   const formByType = useMemo(() => {
     switch (selectedType) {
-      case IdentityProviderType.Oidc:
+      case IdentityProviderType.OIDC:
         return IdentitiesProvidersMap.OIDC.form;
-      case IdentityProviderType.Saml:
+      case IdentityProviderType.SAML:
         return IdentitiesProvidersMap.SAML.form;
       default:
         return null;
diff --git a/packages/twenty-front/src/modules/settings/security/components/SettingsSSOIdentitiesProvidersListCard.tsx b/packages/twenty-front/src/modules/settings/security/components/SettingsSSOIdentitiesProvidersListCard.tsx
index 13d748e851ee..32b4f97f6774 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SettingsSSOIdentitiesProvidersListCard.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SettingsSSOIdentitiesProvidersListCard.tsx
@@ -2,20 +2,21 @@
 
 import { Link } from 'react-router-dom';
 
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { SettingsCard } from '@/settings/components/SettingsCard';
 import { SettingsSSOIdentitiesProvidersListCardWrapper } from '@/settings/security/components/SettingsSSOIdentitiesProvidersListCardWrapper';
+import { SSOIdentitiesProvidersState } from '@/settings/security/states/SSOIdentitiesProvidersState';
+import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import isPropValid from '@emotion/is-prop-valid';
 import styled from '@emotion/styled';
-import { useRecoilValue, useRecoilState } from 'recoil';
+import { useLingui } from '@lingui/react/macro';
+import { useRecoilState, useRecoilValue } from 'recoil';
 import { IconKey } from 'twenty-ui';
 import { useListSsoIdentityProvidersByWorkspaceIdQuery } from '~/generated/graphql';
-import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
-import { SSOIdentitiesProvidersState } from '@/settings/security/states/SSOIdentitiesProvidersState';
-import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 const StyledLink = styled(Link, {
   shouldForwardProp: (prop) => isPropValid(prop) && prop !== 'isDisabled',
@@ -29,11 +30,14 @@ export const SettingsSSOIdentitiesProvidersListCard = () => {
 
   const currentWorkspace = useRecoilValue(currentWorkspaceState);
 
+  const { t } = useLingui();
+
   const [SSOIdentitiesProviders, setSSOIdentitiesProviders] = useRecoilState(
     SSOIdentitiesProvidersState,
   );
 
   const { loading } = useListSsoIdentityProvidersByWorkspaceIdQuery({
+    fetchPolicy: 'network-only',
     skip: currentWorkspace?.hasValidEntrepriseKey === false,
     onCompleted: (data) => {
       setSSOIdentitiesProviders(
@@ -49,11 +53,11 @@ export const SettingsSSOIdentitiesProvidersListCard = () => {
 
   return loading || !SSOIdentitiesProviders.length ? (
     <StyledLink
-      to={getSettingsPagePath(SettingsPath.NewSSOIdentityProvider)}
+      to={getSettingsPath(SettingsPath.NewSSOIdentityProvider)}
       isDisabled={currentWorkspace?.hasValidEntrepriseKey !== true}
     >
       <SettingsCard
-        title="Add SSO Identity Provider"
+        title={t`Add SSO Identity Provider`}
         disabled={currentWorkspace?.hasValidEntrepriseKey !== true}
         Icon={<IconKey />}
       />
diff --git a/packages/twenty-front/src/modules/settings/security/components/SettingsSSOIdentitiesProvidersListCardWrapper.tsx b/packages/twenty-front/src/modules/settings/security/components/SettingsSSOIdentitiesProvidersListCardWrapper.tsx
index 018a6fb92f10..5c2ee3ce8835 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SettingsSSOIdentitiesProvidersListCardWrapper.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SettingsSSOIdentitiesProvidersListCardWrapper.tsx
@@ -1,16 +1,15 @@
 /* @license Enterprise */
 
-import { guessSSOIdentityProviderIconByUrl } from '@/settings/security/utils/guessSSOIdentityProviderIconByUrl';
-import { SettingsSSOIdentityProviderRowRightContainer } from '@/settings/security/components/SettingsSSOIdentityProviderRowRightContainer';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
-import { SettingsPath } from '@/types/SettingsPath';
 import { SettingsListCard } from '@/settings/components/SettingsListCard';
-import { useNavigate } from 'react-router-dom';
+import { SettingsSSOIdentityProviderRowRightContainer } from '@/settings/security/components/SettingsSSOIdentityProviderRowRightContainer';
 import { SSOIdentitiesProvidersState } from '@/settings/security/states/SSOIdentitiesProvidersState';
+import { guessSSOIdentityProviderIconByUrl } from '@/settings/security/utils/guessSSOIdentityProviderIconByUrl';
+import { SettingsPath } from '@/types/SettingsPath';
 import { useRecoilValue } from 'recoil';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 
 export const SettingsSSOIdentitiesProvidersListCardWrapper = () => {
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
 
   const SSOIdentitiesProviders = useRecoilValue(SSOIdentitiesProvidersState);
 
@@ -28,9 +27,7 @@ export const SettingsSSOIdentitiesProvidersListCardWrapper = () => {
       )}
       hasFooter
       footerButtonLabel="Add SSO Identity Provider"
-      onFooterButtonClick={() =>
-        navigate(getSettingsPagePath(SettingsPath.NewSSOIdentityProvider))
-      }
+      onFooterButtonClick={() => navigate(SettingsPath.NewSSOIdentityProvider)}
     />
   );
 };
diff --git a/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityOptionsList.tsx b/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityOptionsList.tsx
index cdf6b4aac7ba..ceb45356dab0 100644
--- a/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityOptionsList.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/SettingsSecurityOptionsList.tsx
@@ -5,6 +5,7 @@ import { SSOIdentitiesProvidersState } from '@/settings/security/states/SSOIdent
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import styled from '@emotion/styled';
+import { useLingui } from '@lingui/react/macro';
 import { useRecoilState, useRecoilValue } from 'recoil';
 import { capitalize } from 'twenty-shared';
 import {
@@ -24,6 +25,8 @@ const StyledSettingsSecurityOptionsList = styled.div`
 `;
 
 export const SettingsSecurityOptionsList = () => {
+  const { t } = useLingui();
+
   const { enqueueSnackBar } = useSnackBar();
   const SSOIdentitiesProviders = useRecoilValue(SSOIdentitiesProvidersState);
   const authProviders = useRecoilValue(authProvidersState);
@@ -45,13 +48,13 @@ export const SettingsSecurityOptionsList = () => {
     authProvider: keyof Omit<AuthProviders, '__typename' | 'magicLink' | 'sso'>,
   ) => {
     if (!currentWorkspace?.id) {
-      throw new Error('User is not logged in');
+      throw new Error(t`User is not logged in`);
     }
 
     const key = `is${capitalize(authProvider)}AuthEnabled`;
 
     if (!isValidAuthProvider(key)) {
-      throw new Error('Invalid auth provider');
+      throw new Error(t`Invalid auth provider`);
     }
 
     const allAuthProvidersEnabled = [
@@ -67,7 +70,7 @@ export const SettingsSecurityOptionsList = () => {
         1
     ) {
       return enqueueSnackBar(
-        'At least one authentication method must be enabled',
+        t`At least one authentication method must be enabled`,
         {
           variant: SnackBarVariant.Error,
         },
@@ -100,7 +103,7 @@ export const SettingsSecurityOptionsList = () => {
   const handleChange = async (value: boolean) => {
     try {
       if (!currentWorkspace?.id) {
-        throw new Error('User is not logged in');
+        throw new Error(t`User is not logged in`);
       }
       await updateWorkspace({
         variables: {
@@ -129,7 +132,7 @@ export const SettingsSecurityOptionsList = () => {
               <SettingsOptionCardContentToggle
                 Icon={IconGoogle}
                 title="Google"
-                description="Allow logins through Google's single sign-on functionality."
+                description={t`Allow logins through Google's single sign-on functionality.`}
                 checked={currentWorkspace.isGoogleAuthEnabled}
                 advancedMode
                 divider
@@ -140,7 +143,7 @@ export const SettingsSecurityOptionsList = () => {
               <SettingsOptionCardContentToggle
                 Icon={IconMicrosoft}
                 title="Microsoft"
-                description="Allow logins through Microsoft's single sign-on functionality."
+                description={t`Allow logins through Microsoft's single sign-on functionality.`}
                 checked={currentWorkspace.isMicrosoftAuthEnabled}
                 advancedMode
                 divider
@@ -150,8 +153,8 @@ export const SettingsSecurityOptionsList = () => {
             {authProviders.password === true && (
               <SettingsOptionCardContentToggle
                 Icon={IconPassword}
-                title="Password"
-                description="Allow users to sign in with an email and password."
+                title={t`Password`}
+                description={t`Allow users to sign in with an email and password.`}
                 checked={currentWorkspace.isPasswordAuthEnabled}
                 advancedMode
                 onChange={() => toggleAuthMethod('password')}
@@ -161,8 +164,8 @@ export const SettingsSecurityOptionsList = () => {
           <Card rounded>
             <SettingsOptionCardContentToggle
               Icon={IconLink}
-              title="Invite by Link"
-              description="Allow the invitation of new users by sharing an invite link."
+              title={t`Invite by Link`}
+              description={t`Allow the invitation of new users by sharing an invite link.`}
               checked={currentWorkspace.isPublicInviteLinkEnabled}
               advancedMode
               onChange={() =>
diff --git a/packages/twenty-front/src/modules/settings/serverless-functions/components/SettingsServerlessFunctionsTable.tsx b/packages/twenty-front/src/modules/settings/serverless-functions/components/SettingsServerlessFunctionsTable.tsx
index 286a90faadca..c732b5edd363 100644
--- a/packages/twenty-front/src/modules/settings/serverless-functions/components/SettingsServerlessFunctionsTable.tsx
+++ b/packages/twenty-front/src/modules/settings/serverless-functions/components/SettingsServerlessFunctionsTable.tsx
@@ -2,7 +2,6 @@ import { SettingsPageContainer } from '@/settings/components/SettingsPageContain
 import { SettingsServerlessFunctionsFieldItemTableRow } from '@/settings/serverless-functions/components/SettingsServerlessFunctionsFieldItemTableRow';
 import { SettingsServerlessFunctionsTableEmpty } from '@/settings/serverless-functions/components/SettingsServerlessFunctionsTableEmpty';
 import { useGetManyServerlessFunctions } from '@/settings/serverless-functions/hooks/useGetManyServerlessFunctions';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { Table } from '@/ui/layout/table/components/Table';
 import { TableBody } from '@/ui/layout/table/components/TableBody';
@@ -10,6 +9,7 @@ import { TableHeader } from '@/ui/layout/table/components/TableHeader';
 import { TableRow } from '@/ui/layout/table/components/TableRow';
 import styled from '@emotion/styled';
 import { ServerlessFunction } from '~/generated-metadata/graphql';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 const StyledTableRow = styled(TableRow)`
   grid-template-columns: 312px 132px 68px;
@@ -38,7 +38,7 @@ export const SettingsServerlessFunctionsTable = () => {
                   <SettingsServerlessFunctionsFieldItemTableRow
                     key={serverlessFunction.id}
                     serverlessFunction={serverlessFunction}
-                    to={getSettingsPagePath(SettingsPath.ServerlessFunctions, {
+                    to={getSettingsPath(SettingsPath.ServerlessFunctions, {
                       id: serverlessFunction.id,
                     })}
                   />
diff --git a/packages/twenty-front/src/modules/settings/serverless-functions/components/SettingsServerlessFunctionsTableEmpty.tsx b/packages/twenty-front/src/modules/settings/serverless-functions/components/SettingsServerlessFunctionsTableEmpty.tsx
index a67d4d35820c..990cf04dd464 100644
--- a/packages/twenty-front/src/modules/settings/serverless-functions/components/SettingsServerlessFunctionsTableEmpty.tsx
+++ b/packages/twenty-front/src/modules/settings/serverless-functions/components/SettingsServerlessFunctionsTableEmpty.tsx
@@ -1,4 +1,3 @@
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import styled from '@emotion/styled';
 import {
@@ -11,6 +10,7 @@ import {
   EMPTY_PLACEHOLDER_TRANSITION_PROPS,
   IconPlus,
 } from 'twenty-ui';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 const StyledEmptyFunctionsContainer = styled.div`
   height: 60vh;
@@ -35,7 +35,7 @@ export const SettingsServerlessFunctionsTableEmpty = () => {
         <Button
           Icon={IconPlus}
           title="New function"
-          to={getSettingsPagePath(SettingsPath.NewServerlessFunction)}
+          to={getSettingsPath(SettingsPath.NewServerlessFunction)}
         />
       </AnimatedPlaceholderEmptyContainer>
     </StyledEmptyFunctionsContainer>
diff --git a/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionCodeEditorTab.tsx b/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionCodeEditorTab.tsx
index 52ea5d72a797..dd16897b238c 100644
--- a/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionCodeEditorTab.tsx
+++ b/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionCodeEditorTab.tsx
@@ -4,13 +4,11 @@ import {
 } from '@/settings/serverless-functions/components/SettingsServerlessFunctionCodeEditor';
 import { SETTINGS_SERVERLESS_FUNCTION_TAB_LIST_COMPONENT_ID } from '@/settings/serverless-functions/constants/SettingsServerlessFunctionTabListComponentId';
 import { SettingsServerlessFunctionHotkeyScope } from '@/settings/serverless-functions/types/SettingsServerlessFunctionHotKeyScope';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { TabList } from '@/ui/layout/tab/components/TabList';
 import { useTabList } from '@/ui/layout/tab/hooks/useTabList';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import styled from '@emotion/styled';
-import { useNavigate } from 'react-router-dom';
 import { Key } from 'ts-key-enum';
 import {
   Button,
@@ -22,6 +20,7 @@ import {
   Section,
 } from 'twenty-ui';
 import { useHotkeyScopeOnMount } from '~/hooks/useHotkeyScopeOnMount';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 
 const StyledTabList = styled(TabList)`
   border-bottom: none;
@@ -91,7 +90,7 @@ export const SettingsServerlessFunctionCodeEditorTab = ({
     />
   );
 
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
   useHotkeyScopeOnMount(
     SettingsServerlessFunctionHotkeyScope.ServerlessFunctionEditorTab,
   );
@@ -99,7 +98,7 @@ export const SettingsServerlessFunctionCodeEditorTab = ({
   useScopedHotkeys(
     [Key.Escape],
     () => {
-      navigate(getSettingsPagePath(SettingsPath.ServerlessFunctions));
+      navigate(SettingsPath.ServerlessFunctions);
     },
     SettingsServerlessFunctionHotkeyScope.ServerlessFunctionEditorTab,
   );
diff --git a/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionMonitoringTab.tsx b/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionMonitoringTab.tsx
index 9aa800298ea1..796134b49318 100644
--- a/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionMonitoringTab.tsx
+++ b/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionMonitoringTab.tsx
@@ -2,19 +2,18 @@ import { AnalyticsActivityGraph } from '@/analytics/components/AnalyticsActivity
 import { AnalyticsGraphEffect } from '@/analytics/components/AnalyticsGraphEffect';
 import { AnalyticsGraphDataInstanceContext } from '@/analytics/states/contexts/AnalyticsGraphDataInstanceContext';
 import { SettingsServerlessFunctionHotkeyScope } from '@/settings/serverless-functions/types/SettingsServerlessFunctionHotKeyScope';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
-import { useNavigate } from 'react-router-dom';
 import { Key } from 'ts-key-enum';
 import { useHotkeyScopeOnMount } from '~/hooks/useHotkeyScopeOnMount';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 
 export const SettingsServerlessFunctionMonitoringTab = ({
   serverlessFunctionId,
 }: {
   serverlessFunctionId: string;
 }) => {
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
 
   useHotkeyScopeOnMount(
     SettingsServerlessFunctionHotkeyScope.ServerlessFunctionSettingsTab,
@@ -23,7 +22,7 @@ export const SettingsServerlessFunctionMonitoringTab = ({
   useScopedHotkeys(
     [Key.Escape],
     () => {
-      navigate(getSettingsPagePath(SettingsPath.ServerlessFunctions));
+      navigate(SettingsPath.ServerlessFunctions);
     },
     SettingsServerlessFunctionHotkeyScope.ServerlessFunctionSettingsTab,
   );
diff --git a/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionSettingsTab.tsx b/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionSettingsTab.tsx
index efcf01eca165..d9fd865002a8 100644
--- a/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionSettingsTab.tsx
+++ b/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionSettingsTab.tsx
@@ -3,15 +3,14 @@ import { SettingsServerlessFunctionTabEnvironmentVariablesSection } from '@/sett
 import { useDeleteOneServerlessFunction } from '@/settings/serverless-functions/hooks/useDeleteOneServerlessFunction';
 import { ServerlessFunctionFormValues } from '@/settings/serverless-functions/hooks/useServerlessFunctionUpdateFormState';
 import { SettingsServerlessFunctionHotkeyScope } from '@/settings/serverless-functions/types/SettingsServerlessFunctionHotKeyScope';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { useState } from 'react';
-import { useNavigate } from 'react-router-dom';
 import { Key } from 'ts-key-enum';
 import { Button, H2Title, Section } from 'twenty-ui';
 import { useHotkeyScopeOnMount } from '~/hooks/useHotkeyScopeOnMount';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 
 export const SettingsServerlessFunctionSettingsTab = ({
   formValues,
@@ -24,14 +23,14 @@ export const SettingsServerlessFunctionSettingsTab = ({
   onChange: (key: string) => (value: string) => void;
   onCodeChange: (filePath: string, value: string) => void;
 }) => {
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
   const [isDeleteFunctionModalOpen, setIsDeleteFunctionModalOpen] =
     useState(false);
   const { deleteOneServerlessFunction } = useDeleteOneServerlessFunction();
 
   const deleteFunction = async () => {
     await deleteOneServerlessFunction({ id: serverlessFunctionId });
-    navigate('/settings/functions');
+    navigate(SettingsPath.ServerlessFunctions);
   };
 
   useHotkeyScopeOnMount(
@@ -49,7 +48,7 @@ export const SettingsServerlessFunctionSettingsTab = ({
   useScopedHotkeys(
     [Key.Escape],
     () => {
-      navigate(getSettingsPagePath(SettingsPath.ServerlessFunctions));
+      navigate(SettingsPath.ServerlessFunctions);
     },
     SettingsServerlessFunctionHotkeyScope.ServerlessFunctionSettingsTab,
   );
diff --git a/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionTabEnvironmentVariableTableRow.tsx b/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionTabEnvironmentVariableTableRow.tsx
index 390226fc27e2..a621e7b6310a 100644
--- a/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionTabEnvironmentVariableTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionTabEnvironmentVariableTableRow.tsx
@@ -128,9 +128,7 @@ export const SettingsServerlessFunctionTabEnvironmentVariableTableRow = ({
               />
             </DropdownMenuItemsContainer>
           }
-          dropdownHotkeyScope={{
-            scope: dropDownId,
-          }}
+          dropdownHotkeyScope={{ scope: dropDownId }}
         />
       </TableCell>
     </StyledTableRow>
diff --git a/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionTestTab.tsx b/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionTestTab.tsx
index 79077b496ee6..e9d600b49cd0 100644
--- a/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionTestTab.tsx
+++ b/packages/twenty-front/src/modules/settings/serverless-functions/components/tabs/SettingsServerlessFunctionTestTab.tsx
@@ -7,17 +7,16 @@ import {
   Section,
 } from 'twenty-ui';
 
+import { ServerlessFunctionExecutionResult } from '@/serverless-functions/components/ServerlessFunctionExecutionResult';
 import { SettingsServerlessFunctionHotkeyScope } from '@/settings/serverless-functions/types/SettingsServerlessFunctionHotKeyScope';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
+import { serverlessFunctionTestDataFamilyState } from '@/workflow/states/serverlessFunctionTestDataFamilyState';
 import styled from '@emotion/styled';
-import { useNavigate } from 'react-router-dom';
 import { useRecoilState } from 'recoil';
 import { Key } from 'ts-key-enum';
 import { useHotkeyScopeOnMount } from '~/hooks/useHotkeyScopeOnMount';
-import { ServerlessFunctionExecutionResult } from '@/serverless-functions/components/ServerlessFunctionExecutionResult';
-import { serverlessFunctionTestDataFamilyState } from '@/workflow/states/serverlessFunctionTestDataFamilyState';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 
 const StyledInputsContainer = styled.div`
   display: flex;
@@ -47,7 +46,7 @@ export const SettingsServerlessFunctionTestTab = ({
     }));
   };
 
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
   useHotkeyScopeOnMount(
     SettingsServerlessFunctionHotkeyScope.ServerlessFunctionTestTab,
   );
@@ -55,7 +54,7 @@ export const SettingsServerlessFunctionTestTab = ({
   useScopedHotkeys(
     [Key.Escape],
     () => {
-      navigate(getSettingsPagePath(SettingsPath.ServerlessFunctions));
+      navigate(SettingsPath.ServerlessFunctions);
     },
     SettingsServerlessFunctionHotkeyScope.ServerlessFunctionTestTab,
   );
diff --git a/packages/twenty-front/src/modules/settings/serverless-functions/graphql/fragments/serverlessFunctionFragment.ts b/packages/twenty-front/src/modules/settings/serverless-functions/graphql/fragments/serverlessFunctionFragment.ts
index a0b688badb3d..27a38cbdf4bb 100644
--- a/packages/twenty-front/src/modules/settings/serverless-functions/graphql/fragments/serverlessFunctionFragment.ts
+++ b/packages/twenty-front/src/modules/settings/serverless-functions/graphql/fragments/serverlessFunctionFragment.ts
@@ -6,6 +6,7 @@ export const SERVERLESS_FUNCTION_FRAGMENT = gql`
     name
     description
     runtime
+    timeoutSeconds
     syncStatus
     latestVersion
     latestVersionInputSchema
diff --git a/packages/twenty-front/src/modules/settings/serverless-functions/hooks/__tests__/useServerlessFunctionUpdateFormState.test.ts b/packages/twenty-front/src/modules/settings/serverless-functions/hooks/__tests__/useServerlessFunctionUpdateFormState.test.ts
index 36de554158df..fe403dee3aef 100644
--- a/packages/twenty-front/src/modules/settings/serverless-functions/hooks/__tests__/useServerlessFunctionUpdateFormState.test.ts
+++ b/packages/twenty-front/src/modules/settings/serverless-functions/hooks/__tests__/useServerlessFunctionUpdateFormState.test.ts
@@ -36,7 +36,7 @@ describe('useServerlessFunctionUpdateFormState', () => {
       },
     );
     const { result } = renderHook(
-      () => useServerlessFunctionUpdateFormState(serverlessFunctionId),
+      () => useServerlessFunctionUpdateFormState({ serverlessFunctionId }),
       {
         wrapper: RecoilRoot,
       },
diff --git a/packages/twenty-front/src/modules/settings/serverless-functions/hooks/useServerlessFunctionUpdateFormState.ts b/packages/twenty-front/src/modules/settings/serverless-functions/hooks/useServerlessFunctionUpdateFormState.ts
index 4ff119ab3293..dc84a7ec1d89 100644
--- a/packages/twenty-front/src/modules/settings/serverless-functions/hooks/useServerlessFunctionUpdateFormState.ts
+++ b/packages/twenty-front/src/modules/settings/serverless-functions/hooks/useServerlessFunctionUpdateFormState.ts
@@ -20,9 +20,13 @@ type SetServerlessFunctionFormValues = Dispatch<
   SetStateAction<ServerlessFunctionFormValues>
 >;
 
-export const useServerlessFunctionUpdateFormState = (
-  serverlessFunctionId: string,
-): {
+export const useServerlessFunctionUpdateFormState = ({
+  serverlessFunctionId,
+  serverlessFunctionVersion = 'draft',
+}: {
+  serverlessFunctionId: string;
+  serverlessFunctionVersion?: string;
+}): {
   formValues: ServerlessFunctionFormValues;
   setFormValues: SetServerlessFunctionFormValues;
   loading: boolean;
@@ -43,7 +47,7 @@ export const useServerlessFunctionUpdateFormState = (
 
   const { loading } = useGetOneServerlessFunctionSourceCode({
     id: serverlessFunctionId,
-    version: 'draft',
+    version: serverlessFunctionVersion,
     onCompleted: (data: FindOneServerlessFunctionSourceCodeQuery) => {
       const newState = {
         code: data?.getServerlessFunctionSourceCode || undefined,
diff --git a/packages/twenty-front/src/modules/settings/serverless-functions/hooks/useUpdateOneServerlessFunction.ts b/packages/twenty-front/src/modules/settings/serverless-functions/hooks/useUpdateOneServerlessFunction.ts
index ffc337d24af1..95218a9dc100 100644
--- a/packages/twenty-front/src/modules/settings/serverless-functions/hooks/useUpdateOneServerlessFunction.ts
+++ b/packages/twenty-front/src/modules/settings/serverless-functions/hooks/useUpdateOneServerlessFunction.ts
@@ -9,6 +9,8 @@ import {
 import { useEffect, useState } from 'react';
 import { FIND_ONE_SERVERLESS_FUNCTION } from '@/settings/serverless-functions/graphql/queries/findOneServerlessFunction';
 import { sleep } from '~/utils/sleep';
+import { getOperationName } from '@apollo/client/utilities';
+import { FIND_ONE_SERVERLESS_FUNCTION_SOURCE_CODE } from '@/settings/serverless-functions/graphql/queries/findOneServerlessFunctionSourceCode';
 
 export const useUpdateOneServerlessFunction = (
   serverlessFunctionId: string,
@@ -29,6 +31,9 @@ export const useUpdateOneServerlessFunction = (
       variables: {
         input: { ...input, id: serverlessFunctionId },
       },
+      refetchQueries: [
+        getOperationName(FIND_ONE_SERVERLESS_FUNCTION_SOURCE_CODE) ?? '',
+      ],
     });
     setIsReady(false);
     return result;
diff --git a/packages/twenty-front/src/modules/settings/utils/__tests__/getSettingsPagePath.test.ts b/packages/twenty-front/src/modules/settings/utils/__tests__/getSettingsPagePath.test.ts
deleted file mode 100644
index d27cd5ecc068..000000000000
--- a/packages/twenty-front/src/modules/settings/utils/__tests__/getSettingsPagePath.test.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
-import { SettingsPath } from '@/types/SettingsPath';
-
-describe('getSettingsPagePath', () => {
-  test('should compute page path', () => {
-    expect(getSettingsPagePath(SettingsPath.ServerlessFunctions)).toEqual(
-      '/settings/functions',
-    );
-  });
-  test('should compute page path with id', () => {
-    expect(
-      getSettingsPagePath(SettingsPath.ServerlessFunctions, { id: 'id' }),
-    ).toEqual('/settings/functions/id');
-  });
-});
diff --git a/packages/twenty-front/src/modules/settings/utils/getSettingsPagePath.ts b/packages/twenty-front/src/modules/settings/utils/getSettingsPagePath.ts
deleted file mode 100644
index 662c299abc16..000000000000
--- a/packages/twenty-front/src/modules/settings/utils/getSettingsPagePath.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { ExtractPathParams } from '@/types/ExtractPathParams';
-import { SettingsPath } from '@/types/SettingsPath';
-import { isDefined } from '~/utils/isDefined';
-
-type Params<V extends string> = {
-  [K in ExtractPathParams<V>]: string;
-} & {
-  id?: string;
-};
-
-export const getSettingsPagePath = <Path extends SettingsPath>(
-  path: Path,
-  params?: Params<Path>,
-  searchParams?: Record<string, string>,
-) => {
-  let resultPath = `/settings/${path}`;
-
-  if (isDefined(params)) {
-    resultPath = resultPath.replace(/:([a-zA-Z]+)/g, (_, key) => {
-      const value = params[key as keyof Params<Path>];
-
-      return value;
-    });
-  }
-
-  if (isDefined(params?.id)) {
-    resultPath = `${resultPath}/${params?.id}`;
-  }
-
-  if (isDefined(searchParams)) {
-    const searchParamsString = new URLSearchParams(searchParams).toString();
-
-    resultPath = `${resultPath}?${searchParamsString}`;
-  }
-
-  return resultPath;
-};
diff --git a/packages/twenty-front/src/modules/settings/workspace/components/NameField.tsx b/packages/twenty-front/src/modules/settings/workspace/components/NameField.tsx
index 31b5f31b3e79..9e4eae34233b 100644
--- a/packages/twenty-front/src/modules/settings/workspace/components/NameField.tsx
+++ b/packages/twenty-front/src/modules/settings/workspace/components/NameField.tsx
@@ -5,6 +5,7 @@ import { useDebouncedCallback } from 'use-debounce';
 
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { TextInput } from '@/ui/input/components/TextInput';
+import { useLingui } from '@lingui/react/macro';
 import isEmpty from 'lodash.isempty';
 import { useUpdateWorkspaceMutation } from '~/generated/graphql';
 import { isDefined } from '~/utils/isDefined';
@@ -28,6 +29,7 @@ export const NameField = ({
   autoSave = true,
   onNameUpdate,
 }: NameFieldProps) => {
+  const { t } = useLingui();
   const currentWorkspace = useRecoilValue(currentWorkspaceState);
   const setCurrentWorkspace = useSetRecoilState(currentWorkspaceState);
 
@@ -86,7 +88,7 @@ export const NameField = ({
   return (
     <StyledComboInputContainer>
       <TextInput
-        label="Name"
+        label={t`Name`}
         value={displayName}
         onChange={setDisplayName}
         placeholder="Apple"
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx b/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx
index 383b4093e6a2..eec4e1606b90 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInAppNavigationDrawerMock.tsx
@@ -2,13 +2,17 @@ import { SupportDropdown } from '@/support/components/SupportDropdown';
 import { NavigationDrawer } from '@/ui/navigation/navigation-drawer/components/NavigationDrawer';
 
 import { NavigationDrawerSectionForObjectMetadataItems } from '@/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems';
+import { SettingsPath } from '@/types/SettingsPath';
 import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
 import { NavigationDrawerSection } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSection';
 import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo';
 import { DEFAULT_WORKSPACE_NAME } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceName';
 import styled from '@emotion/styled';
+import { useLingui } from '@lingui/react/macro';
+import { getOsControlSymbol } from '@ui/utilities/device/getOsControlSymbol';
 import { IconSearch, IconSettings, useIsMobile } from 'twenty-ui';
 import { generatedMockObjectMetadataItems } from '~/testing/mock-data/generatedMockObjectMetadataItems';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 const StyledMainSection = styled(NavigationDrawerSection)`
   min-height: fit-content;
@@ -30,27 +34,28 @@ export const SignInAppNavigationDrawerMock = ({
   className,
 }: SignInAppNavigationDrawerMockProps) => {
   const isMobile = useIsMobile();
+  const { t } = useLingui();
 
   const children = (
     <>
       {!isMobile && (
         <StyledMainSection>
           <NavigationDrawerItem
-            label="Search"
+            label={t`Search`}
             Icon={IconSearch}
             onClick={() => {}}
-            keyboard={['⌘', 'K']}
+            keyboard={[getOsControlSymbol(), 'K']}
           />
           <NavigationDrawerItem
-            label="Settings"
-            to={'/settings/profile'}
+            label={t`Settings`}
+            to={getSettingsPath(SettingsPath.ProfilePage)}
             onClick={() => {}}
             Icon={IconSettings}
           />
         </StyledMainSection>
       )}
       <NavigationDrawerSectionForObjectMetadataItems
-        sectionTitle={'Workspace'}
+        sectionTitle={t`Workspace`}
         isRemote={false}
         objectMetadataItems={generatedMockObjectMetadataItems.filter((item) =>
           WORKSPACE_FAVORITES.includes(item.nameSingular),
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsx b/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsx
index 3a86e532850e..4c2a25958bab 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsx
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsx
@@ -3,6 +3,7 @@ import styled from '@emotion/styled';
 import { ActionMenuComponentInstanceContext } from '@/action-menu/states/contexts/ActionMenuComponentInstanceContext';
 import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';
 import { RecordIndexContextProvider } from '@/object-record/record-index/contexts/RecordIndexContext';
 import { RecordTableWithWrappers } from '@/object-record/record-table/components/RecordTableWithWrappers';
 import { SignInBackgroundMockContainerEffect } from '@/sign-in-background-mock/components/SignInBackgroundMockContainerEffect';
@@ -41,32 +42,36 @@ export const SignInBackgroundMockContainer = () => {
         <ViewComponentInstanceContext.Provider
           value={{ instanceId: recordIndexId }}
         >
-          <ContextStoreComponentInstanceContext.Provider
-            value={{
-              instanceId: recordIndexId,
-            }}
+          <RecordFiltersComponentInstanceContext.Provider
+            value={{ instanceId: recordIndexId }}
           >
-            <ActionMenuComponentInstanceContext.Provider
-              value={{ instanceId: recordIndexId }}
+            <ContextStoreComponentInstanceContext.Provider
+              value={{
+                instanceId: recordIndexId,
+              }}
             >
-              <ViewBar
-                viewBarId={viewBarId}
-                onCurrentViewChange={() => {}}
-                optionsDropdownButton={<></>}
-              />
-              <SignInBackgroundMockContainerEffect
-                objectNamePlural={objectNamePlural}
-                recordTableId={recordIndexId}
-                viewId={viewBarId}
-              />
-              <RecordTableWithWrappers
-                objectNameSingular={objectNameSingular}
-                recordTableId={recordIndexId}
-                viewBarId={viewBarId}
-                updateRecordMutation={() => {}}
-              />
-            </ActionMenuComponentInstanceContext.Provider>
-          </ContextStoreComponentInstanceContext.Provider>
+              <ActionMenuComponentInstanceContext.Provider
+                value={{ instanceId: recordIndexId }}
+              >
+                <ViewBar
+                  viewBarId={viewBarId}
+                  onCurrentViewChange={() => {}}
+                  optionsDropdownButton={<></>}
+                />
+                <SignInBackgroundMockContainerEffect
+                  objectNamePlural={objectNamePlural}
+                  recordTableId={recordIndexId}
+                  viewId={viewBarId}
+                />
+                <RecordTableWithWrappers
+                  objectNameSingular={objectNameSingular}
+                  recordTableId={recordIndexId}
+                  viewBarId={viewBarId}
+                  updateRecordMutation={() => {}}
+                />
+              </ActionMenuComponentInstanceContext.Provider>
+            </ContextStoreComponentInstanceContext.Provider>
+          </RecordFiltersComponentInstanceContext.Provider>
         </ViewComponentInstanceContext.Provider>
       </RecordIndexContextProvider>
     </StyledContainer>
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainerEffect.tsx b/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainerEffect.tsx
index 2bad3fa95ffc..04b9d9205e48 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainerEffect.tsx
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainerEffect.tsx
@@ -2,13 +2,13 @@ import { useEffect } from 'react';
 
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
+import { useSetRecordIndexEntityCount } from '@/object-record/record-index/hooks/useSetRecordIndexEntityCount';
 import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
 import { SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS } from '@/sign-in-background-mock/constants/SignInBackgroundMockColumnDefinitions';
 import { SIGN_IN_BACKGROUND_MOCK_FILTER_DEFINITIONS } from '@/sign-in-background-mock/constants/SignInBackgroundMockFilterDefinitions';
 import { SIGN_IN_BACKGROUND_MOCK_SORT_DEFINITIONS } from '@/sign-in-background-mock/constants/SignInBackgroundMockSortDefinitions';
 import { SIGN_IN_BACKGROUND_MOCK_VIEW_FIELDS } from '@/sign-in-background-mock/constants/SignInBackgroundMockViewFields';
 import { useInitViewBar } from '@/views/hooks/useInitViewBar';
-import { useSetRecordCountInCurrentView } from '@/views/hooks/useSetRecordCountInCurrentView';
 import { mapViewFieldsToColumnDefinitions } from '@/views/utils/mapViewFieldsToColumnDefinitions';
 
 type SignInBackgroundMockContainerEffectProps = {
@@ -42,8 +42,7 @@ export const SignInBackgroundMockContainerEffect = ({
     setViewObjectMetadataId,
   } = useInitViewBar(viewId);
 
-  const { setRecordCountInCurrentView } =
-    useSetRecordCountInCurrentView(viewId);
+  const { setRecordIndexEntityCount } = useSetRecordIndexEntityCount(viewId);
 
   useEffect(() => {
     setViewObjectMetadataId?.(objectMetadataItem.id);
@@ -72,9 +71,9 @@ export const SignInBackgroundMockContainerEffect = ({
 
   useEffect(() => {
     setOnEntityCountChange(
-      () => (entityCount: number) => setRecordCountInCurrentView(entityCount),
+      () => (entityCount: number) => setRecordIndexEntityCount(entityCount),
     );
-  }, [setRecordCountInCurrentView, setOnEntityCountChange]);
+  }, [setRecordIndexEntityCount, setOnEntityCountChange]);
 
   return <></>;
 };
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockColumnDefinitions.ts b/packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockColumnDefinitions.ts
index e1ebdec28b73..f5688fe13b35 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockColumnDefinitions.ts
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockColumnDefinitions.ts
@@ -13,7 +13,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       fieldMetadataId: '20202020-5e4e-4007-a630-8a2617914889',
       label: 'Domain Name',
       size: 100,
-      type: FieldMetadataType.Links,
+      type: FieldMetadataType.LINKS,
       metadata: {
         fieldName: 'domainName',
         placeHolder: 'Domain Name',
@@ -30,7 +30,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       fieldMetadataId: '20202020-7fbd-41ad-b64d-25a15ff62f04',
       label: 'Employees',
       size: 100,
-      type: FieldMetadataType.Number,
+      type: FieldMetadataType.NUMBER,
       metadata: {
         fieldName: 'employees',
         placeHolder: 'Employees',
@@ -47,7 +47,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       fieldMetadataId: 'REPLACE_ME',
       label: 'Name',
       size: 100,
-      type: FieldMetadataType.Text,
+      type: FieldMetadataType.TEXT,
       metadata: {
         fieldName: 'name',
         placeHolder: 'Name',
@@ -64,10 +64,10 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       fieldMetadataId: '20202020-e7c8-4771-8cc4-ce0e8c36a3c0',
       label: 'Favorites',
       size: 100,
-      type: FieldMetadataType.Relation,
+      type: FieldMetadataType.RELATION,
       metadata: {
         fieldName: 'favorites',
-        relationType: RelationDefinitionType.OneToMany,
+        relationType: RelationDefinitionType.ONE_TO_MANY,
         relationObjectMetadataNameSingular: '',
         relationObjectMetadataNamePlural: '',
         objectMetadataNameSingular: 'company',
@@ -81,7 +81,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       fieldMetadataId: '20202020-ad10-4117-a039-3f04b7a5f939',
       label: 'Address',
       size: 100,
-      type: FieldMetadataType.Address,
+      type: FieldMetadataType.ADDRESS,
       metadata: {
         fieldName: 'address',
         placeHolder: 'Address',
@@ -98,10 +98,10 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       fieldMetadataId: '20202020-0739-495d-8e70-c0807f6b2268',
       label: 'Account Owner',
       size: 100,
-      type: FieldMetadataType.Relation,
+      type: FieldMetadataType.RELATION,
       metadata: {
         fieldName: 'accountOwner',
-        relationType: RelationDefinitionType.ManyToOne,
+        relationType: RelationDefinitionType.MANY_TO_ONE,
         relationObjectMetadataNameSingular: 'workspaceMember',
         relationObjectMetadataNamePlural: 'workspaceMembers',
         objectMetadataNameSingular: 'company',
@@ -115,10 +115,10 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       fieldMetadataId: '20202020-68b4-4c8e-af19-738eba2a42a5',
       label: 'People',
       size: 100,
-      type: FieldMetadataType.Relation,
+      type: FieldMetadataType.RELATION,
       metadata: {
         fieldName: 'people',
-        relationType: RelationDefinitionType.OneToMany,
+        relationType: RelationDefinitionType.ONE_TO_MANY,
         relationObjectMetadataNameSingular: '',
         relationObjectMetadataNamePlural: '',
         objectMetadataNameSingular: 'company',
@@ -132,10 +132,10 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       fieldMetadataId: '20202020-61af-4ffd-b79b-baed6db8ad11',
       label: 'Attachments',
       size: 100,
-      type: FieldMetadataType.Relation,
+      type: FieldMetadataType.RELATION,
       metadata: {
         fieldName: 'attachments',
-        relationType: RelationDefinitionType.OneToMany,
+        relationType: RelationDefinitionType.ONE_TO_MANY,
         relationObjectMetadataNameSingular: '',
         relationObjectMetadataNamePlural: '',
         objectMetadataNameSingular: 'company',
@@ -149,7 +149,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       fieldMetadataId: '20202020-4dc2-47c9-bb15-6e6f19ba9e46',
       label: 'Creation date',
       size: 100,
-      type: FieldMetadataType.DateTime,
+      type: FieldMetadataType.DATE_TIME,
       metadata: {
         fieldName: 'createdAt',
         placeHolder: 'Creation date',
@@ -166,7 +166,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       fieldMetadataId: '20202020-9e9f-4235-98b2-c76f3e2d281e',
       label: 'ICP',
       size: 100,
-      type: FieldMetadataType.Boolean,
+      type: FieldMetadataType.BOOLEAN,
       metadata: {
         fieldName: 'idealCustomerProfile',
         placeHolder: 'ICP',
@@ -183,7 +183,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       fieldMetadataId: '20202020-a61d-4b78-b998-3fd88b4f73a1',
       label: 'Linkedin',
       size: 100,
-      type: FieldMetadataType.Links,
+      type: FieldMetadataType.LINKS,
       metadata: {
         fieldName: 'linkedinLink',
         placeHolder: 'Linkedin',
@@ -200,10 +200,10 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       fieldMetadataId: '20202020-e3fc-46ff-b552-3e757843f06e',
       label: 'Opportunities',
       size: 100,
-      type: FieldMetadataType.Relation,
+      type: FieldMetadataType.RELATION,
       metadata: {
         fieldName: 'opportunities',
-        relationType: RelationDefinitionType.OneToMany,
+        relationType: RelationDefinitionType.ONE_TO_MANY,
         relationObjectMetadataNameSingular: '',
         relationObjectMetadataNamePlural: '',
         objectMetadataNameSingular: 'company',
@@ -217,7 +217,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       fieldMetadataId: '20202020-46e3-479a-b8f4-77137c74daa6',
       label: 'X',
       size: 100,
-      type: FieldMetadataType.Links,
+      type: FieldMetadataType.LINKS,
       metadata: {
         fieldName: 'xLink',
         placeHolder: 'X',
@@ -234,10 +234,10 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       fieldMetadataId: '20202020-4a2e-4b41-8562-279963e8947e',
       label: 'Activities',
       size: 100,
-      type: FieldMetadataType.Relation,
+      type: FieldMetadataType.RELATION,
       metadata: {
         fieldName: 'activityTargets',
-        relationType: RelationDefinitionType.OneToMany,
+        relationType: RelationDefinitionType.ONE_TO_MANY,
         relationObjectMetadataNameSingular: '',
         relationObjectMetadataNamePlural: '',
         objectMetadataNameSingular: 'company',
@@ -251,7 +251,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       fieldMetadataId: '20202020-4a5a-466f-92d9-c3870d9502a9',
       label: 'ARR',
       size: 100,
-      type: FieldMetadataType.Currency,
+      type: FieldMetadataType.CURRENCY,
       metadata: {
         fieldName: 'annualRecurringRevenue',
         placeHolder: 'ARR',
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockFilterDefinitions.ts b/packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockFilterDefinitions.ts
index 92040bbb8aae..02f25c8b41f1 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockFilterDefinitions.ts
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockFilterDefinitions.ts
@@ -1,4 +1,4 @@
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
 
 export const SIGN_IN_BACKGROUND_MOCK_FILTER_DEFINITIONS = [
   {
@@ -57,4 +57,4 @@ export const SIGN_IN_BACKGROUND_MOCK_FILTER_DEFINITIONS = [
     iconName: 'IconMoneybag',
     type: 'CURRENCY',
   },
-] as FilterDefinition[];
+] as RecordFilterDefinition[];
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/__stories__/Upload.stories.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/__stories__/Upload.stories.tsx
index 0757b7e619d4..faccebc25266 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/__stories__/Upload.stories.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/__stories__/Upload.stories.tsx
@@ -29,9 +29,7 @@ export const Default = () => (
           onError={() => null}
           nextStep={() => null}
           setPreviousStepState={() => null}
-          currentStepState={{
-            type: SpreadsheetImportStepType.upload,
-          }}
+          currentStepState={{ type: SpreadsheetImportStepType.upload }}
         />
       </ModalWrapper>
     </ReactSpreadsheetImportContextProvider>
diff --git a/packages/twenty-front/src/modules/support/components/SupportDropdown.tsx b/packages/twenty-front/src/modules/support/components/SupportDropdown.tsx
index 53f127e9fa0d..c45833890f37 100644
--- a/packages/twenty-front/src/modules/support/components/SupportDropdown.tsx
+++ b/packages/twenty-front/src/modules/support/components/SupportDropdown.tsx
@@ -40,9 +40,7 @@ export const SupportDropdown = () => {
           />
         </DropdownMenuItemsContainer>
       }
-      dropdownHotkeyScope={{
-        scope: dropdownId,
-      }}
+      dropdownHotkeyScope={{ scope: dropdownId }}
     />
   );
 };
diff --git a/packages/twenty-front/src/modules/types/AppPath.ts b/packages/twenty-front/src/modules/types/AppPath.ts
index 8cafb18e75f6..598d9a17bab0 100644
--- a/packages/twenty-front/src/modules/types/AppPath.ts
+++ b/packages/twenty-front/src/modules/types/AppPath.ts
@@ -1,6 +1,7 @@
 export enum AppPath {
   // Not logged-in
   Verify = '/verify',
+  VerifyEmail = '/verify-email',
   SignInUp = '/welcome',
   Invite = '/invite/:workspaceInviteHash',
   ResetPassword = '/reset-password/:passwordResetToken',
diff --git a/packages/twenty-front/src/modules/types/SettingsPath.ts b/packages/twenty-front/src/modules/types/SettingsPath.ts
index dcb0a276aa20..412de5b45192 100644
--- a/packages/twenty-front/src/modules/types/SettingsPath.ts
+++ b/packages/twenty-front/src/modules/types/SettingsPath.ts
@@ -1,12 +1,10 @@
 export enum SettingsPath {
   ProfilePage = 'profile',
-  Appearance = 'appearance',
+  Experience = 'experience',
   Accounts = 'accounts',
   NewAccount = 'accounts/new',
   AccountsCalendars = 'accounts/calendars',
-  AccountsCalendarsSettings = 'accounts/calendars/:accountUuid',
   AccountsEmails = 'accounts/emails',
-  AccountsEmailsInboxSettings = 'accounts/emails/:accountUuid',
   Billing = 'billing',
   Objects = 'objects',
   ObjectOverview = 'objects/overview',
@@ -15,16 +13,15 @@ export enum SettingsPath {
   ObjectNewFieldConfigure = 'objects/:objectNamePlural/new-field/configure',
   ObjectFieldEdit = 'objects/:objectNamePlural/:fieldName',
   NewObject = 'objects/new',
+  ServerlessFunctions = 'functions',
   NewServerlessFunction = 'functions/new',
   ServerlessFunctionDetail = 'functions/:serverlessFunctionId',
   WorkspaceMembersPage = 'workspace-members',
   Workspace = 'workspace',
   Domain = 'domain',
-  CRMMigration = 'crm-migration',
   Developers = 'developers',
-  ServerlessFunctions = 'functions',
-  DevelopersNewApiKey = 'api-keys/new',
-  DevelopersApiKeyDetail = 'api-keys/:apiKeyId',
+  DevelopersNewApiKey = 'developers/api-keys/new',
+  DevelopersApiKeyDetail = 'developers/api-keys/:apiKeyId',
   Integrations = 'integrations',
   IntegrationDatabase = 'integrations/:databaseKey',
   IntegrationDatabaseConnection = 'integrations/:databaseKey/:connectionId',
@@ -33,9 +30,10 @@ export enum SettingsPath {
   Security = 'security',
   NewSSOIdentityProvider = 'security/sso/new',
   EditSSOIdentityProvider = 'security/sso/:identityProviderId',
-  DevelopersNewWebhook = 'webhooks/new',
-  DevelopersNewWebhookDetail = 'webhooks/:webhookId',
+  DevelopersNewWebhook = 'developers/webhooks/new',
+  DevelopersNewWebhookDetail = 'developers/webhooks/:webhookId',
   Releases = 'releases',
   AdminPanel = 'admin-panel',
   FeatureFlags = 'admin-panel/feature-flags',
+  Lab = 'lab',
 }
diff --git a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/scopes/DialogManagerScope.tsx b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/scopes/DialogManagerScope.tsx
index cc44570f5b5c..6d863c4e8a18 100644
--- a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/scopes/DialogManagerScope.tsx
+++ b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/scopes/DialogManagerScope.tsx
@@ -13,9 +13,7 @@ export const DialogManagerScope = ({
 }: DialogManagerScopeProps) => {
   return (
     <DialogManagerScopeInternalContext.Provider
-      value={{
-        scopeId: dialogManagerScopeId,
-      }}
+      value={{ scopeId: dialogManagerScopeId }}
     >
       {children}
     </DialogManagerScopeInternalContext.Provider>
diff --git a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx
index 1ebc61329855..376a597a820d 100644
--- a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx
+++ b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/SnackBar.tsx
@@ -1,5 +1,6 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { useLingui } from '@lingui/react/macro';
 import { isUndefined } from '@sniptt/guards';
 import { ComponentPropsWithoutRef, ReactNode, useMemo } from 'react';
 import {
@@ -35,6 +36,7 @@ export type SnackBarProps = Pick<ComponentPropsWithoutRef<'div'>, 'id'> & {
   onClose?: () => void;
   role?: 'alert' | 'status';
   variant?: SnackBarVariant;
+  dedupeKey?: string;
 };
 
 const StyledContainer = styled.div`
@@ -121,6 +123,7 @@ export const SnackBar = ({
   variant = SnackBarVariant.Default,
 }: SnackBarProps) => {
   const theme = useTheme();
+  const { t } = useLingui();
   const { animation: progressAnimation, value: progressValue } =
     useProgressAnimation({
       autoPlay: isUndefined(overrideProgressValue),
@@ -192,10 +195,10 @@ export const SnackBar = ({
         <StyledIcon>{icon}</StyledIcon>
         <StyledMessage>{message}</StyledMessage>
         <StyledActions>
-          {!!onCancel && <LightButton title="Cancel" onClick={onCancel} />}
+          {!!onCancel && <LightButton title={t`Cancel`} onClick={onCancel} />}
 
           {!!onClose && (
-            <LightIconButton title="Close" Icon={IconX} onClick={onClose} />
+            <LightIconButton title={t`Close`} Icon={IconX} onClick={onClose} />
           )}
         </StyledActions>
       </StyledHeader>
diff --git a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/__stories__/SnackBar.stories.tsx b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/__stories__/SnackBar.stories.tsx
index cb8f02b86589..e9650ca64a18 100644
--- a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/__stories__/SnackBar.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/__stories__/SnackBar.stories.tsx
@@ -8,6 +8,7 @@ import {
 } from '@ui/testing';
 import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
 
+import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { SnackBar, SnackBarVariant } from '../SnackBar';
 
 const meta: Meta<typeof SnackBar> = {
@@ -33,7 +34,7 @@ export default meta;
 type Story = StoryObj<typeof SnackBar>;
 
 export const Default: Story = {
-  decorators: [ComponentDecorator],
+  decorators: [ComponentDecorator, I18nFrontDecorator],
   parameters: {
     chromatic: { disableSnapshot: true },
   },
@@ -43,7 +44,7 @@ export const Catalog: CatalogStory<Story, typeof SnackBar> = {
   args: {
     onCancel: fn(),
   },
-  decorators: [CatalogDecorator],
+  decorators: [CatalogDecorator, I18nFrontDecorator],
   parameters: {
     catalog: {
       dimensions: [
diff --git a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/hooks/useSnackBar.ts b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/hooks/useSnackBar.ts
index d60a9d6b3957..04684c2acd05 100644
--- a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/hooks/useSnackBar.ts
+++ b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/hooks/useSnackBar.ts
@@ -1,6 +1,7 @@
 import { useCallback } from 'react';
 import { useRecoilCallback } from 'recoil';
 import { v4 as uuidv4 } from 'uuid';
+import { isDefined } from '~/utils/isDefined';
 
 import { SnackBarManagerScopeInternalContext } from '@/ui/feedback/snack-bar-manager/scopes/scope-internal-context/SnackBarManagerScopeInternalContext';
 import {
@@ -27,8 +28,17 @@ export const useSnackBar = () => {
 
   const setSnackBarQueue = useRecoilCallback(
     ({ set }) =>
-      (newValue) =>
+      (newValue: SnackBarOptions) =>
         set(snackBarInternalScopedState({ scopeId }), (prev) => {
+          if (
+            isDefined(newValue.dedupeKey) &&
+            prev.queue.some(
+              (snackBar) => snackBar.dedupeKey === newValue.dedupeKey,
+            )
+          ) {
+            return prev;
+          }
+
           if (prev.queue.length >= prev.maxQueue) {
             return {
               ...prev,
diff --git a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope.tsx b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope.tsx
index a2bb6a9e1e9a..caffabe2b2a0 100644
--- a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope.tsx
+++ b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope.tsx
@@ -13,9 +13,7 @@ export const SnackBarProviderScope = ({
 }: SnackBarProviderScopeProps) => {
   return (
     <SnackBarManagerScopeInternalContext.Provider
-      value={{
-        scopeId: snackBarManagerScopeId,
-      }}
+      value={{ scopeId: snackBarManagerScopeId }}
     >
       {children}
     </SnackBarManagerScopeInternalContext.Provider>
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/DateDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/DateDisplay.tsx
index 767671d62482..55f4998f5ffb 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/DateDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/DateDisplay.tsx
@@ -1,7 +1,6 @@
-import { formatDateISOStringToDate } from '@/localization/utils/formatDateISOStringToDate';
-import { formatDateISOStringToRelativeDate } from '@/localization/utils/formatDateISOStringToRelativeDate';
 import { UserContext } from '@/users/contexts/UserContext';
 import { useContext } from 'react';
+import { formatDateString } from '~/utils/string/formatDateString';
 import { EllipsisDisplay } from './EllipsisDisplay';
 
 type DateDisplayProps = {
@@ -15,11 +14,12 @@ export const DateDisplay = ({
 }: DateDisplayProps) => {
   const { dateFormat, timeZone } = useContext(UserContext);
 
-  const formattedDate = value
-    ? displayAsRelativeDate
-      ? formatDateISOStringToRelativeDate(value, true)
-      : formatDateISOStringToDate(value, timeZone, dateFormat)
-    : '';
+  const formattedDate = formatDateString({
+    value,
+    timeZone,
+    dateFormat,
+    displayAsRelativeDate,
+  });
 
   return <EllipsisDisplay>{formattedDate}</EllipsisDisplay>;
 };
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/DateTimeDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/DateTimeDisplay.tsx
index fc0139e76ed1..097f9180e95d 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/DateTimeDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/DateTimeDisplay.tsx
@@ -1,6 +1,6 @@
 import { UserContext } from '@/users/contexts/UserContext';
 import { useContext } from 'react';
-import { formatDateString } from '~/utils/string/formatDateString';
+import { formatDateTimeString } from '~/utils/string/formatDateTimeString';
 import { EllipsisDisplay } from './EllipsisDisplay';
 
 type DateTimeDisplayProps = {
@@ -14,7 +14,7 @@ export const DateTimeDisplay = ({
 }: DateTimeDisplayProps) => {
   const { dateFormat, timeFormat, timeZone } = useContext(UserContext);
 
-  const formattedDate = formatDateString({
+  const formattedDate = formatDateTimeString({
     value,
     displayAsRelativeDate,
     timeZone,
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/SelectDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/SelectDisplay.tsx
index eb0a87219154..73820255af4d 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/SelectDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/SelectDisplay.tsx
@@ -4,14 +4,14 @@ type SelectDisplayProps = {
   color: ThemeColor | 'transparent';
   label: string;
   Icon?: IconComponent;
-  isUsedInForm?: boolean;
+  preventPadding?: boolean;
 };
 
 export const SelectDisplay = ({
   color,
   label,
   Icon,
-  isUsedInForm,
+  preventPadding,
 }: SelectDisplayProps) => {
   return (
     <Tag
@@ -19,7 +19,7 @@ export const SelectDisplay = ({
       color={color}
       text={label}
       Icon={Icon}
-      preventPadding={isUsedInForm}
+      preventPadding={preventPadding}
     />
   );
 };
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/BooleanInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/BooleanInput.tsx
index 30d33eecd64e..8da3b5672574 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/BooleanInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/BooleanInput.tsx
@@ -1,15 +1,18 @@
-import { useEffect, useState } from 'react';
 import styled from '@emotion/styled';
+import { useEffect, useState } from 'react';
 
 import { BooleanDisplay } from '@/ui/field/display/components/BooleanDisplay';
 
-const StyledEditableBooleanFieldContainer = styled.div`
+const StyledEditableBooleanFieldContainer = styled.div<{ readonly?: boolean }>`
   align-items: center;
   cursor: ${({ onClick }) => (onClick ? 'pointer' : 'default')};
   display: flex;
 
   height: 100%;
   width: 100%;
+
+  color: ${({ theme, readonly }) =>
+    readonly ? theme.font.color.tertiary : theme.font.color.primary};
 `;
 
 type BooleanInputProps = {
@@ -39,6 +42,7 @@ export const BooleanInput = ({
   return (
     <StyledEditableBooleanFieldContainer
       onClick={readonly ? undefined : handleClick}
+      readonly={readonly}
       data-testid={testId}
     >
       <BooleanDisplay value={internalValue} />
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx
index 5f5b6f79cbfc..84759a3cc6a1 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx
@@ -3,7 +3,7 @@ import { Nullable } from 'twenty-ui';
 
 import { useRegisterInputEvents } from '@/object-record/record-field/meta-types/input/hooks/useRegisterInputEvents';
 import {
-  InternalDatePicker,
+  DateTimePicker,
   MONTH_AND_YEAR_DROPDOWN_ID,
   MONTH_AND_YEAR_DROPDOWN_MONTH_SELECT_ID,
   MONTH_AND_YEAR_DROPDOWN_YEAR_SELECT_ID,
@@ -54,7 +54,7 @@ export const DateInput = ({
     onClear?.();
   };
 
-  const handleMouseSelect = (newDate: Date | null) => {
+  const handleClose = (newDate: Date | null) => {
     setInternalValue(newDate);
     onSubmit?.(newDate);
   };
@@ -104,16 +104,16 @@ export const DateInput = ({
 
   return (
     <div ref={wrapperRef}>
-      <InternalDatePicker
+      <DateTimePicker
         date={internalValue ?? new Date()}
         onChange={handleChange}
-        onMouseSelect={handleMouseSelect}
+        onClose={handleClose}
         clearable={clearable ? clearable : false}
-        isDateTimeInput={isDateTimeInput}
         onEnter={onEnter}
         onEscape={onEscape}
         onClear={handleClear}
         hideHeaderInput={hideHeaderInput}
+        isDateTimeInput={isDateTimeInput}
       />
     </div>
   );
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx
index 9699765b25b8..a71064ada8fd 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx
@@ -9,6 +9,10 @@ export const StyledTextInput = styled.input`
   margin: 0;
   ${TEXT_INPUT_STYLE}
   width: 100%;
+
+  &:disabled {
+    color: ${({ theme }) => theme.font.color.tertiary};
+  }
 `;
 
 type TextInputProps = {
@@ -25,6 +29,7 @@ type TextInputProps = {
   onChange?: (newText: string) => void;
   copyButton?: boolean;
   shouldTrim?: boolean;
+  disabled?: boolean;
 };
 
 const getValue = (value: string, shouldTrim: boolean) => {
@@ -49,6 +54,7 @@ export const TextInput = ({
   onChange,
   copyButton = true,
   shouldTrim = true,
+  disabled,
 }: TextInputProps) => {
   const [internalText, setInternalText] = useState(value);
 
@@ -85,6 +91,7 @@ export const TextInput = ({
         onChange={handleChange}
         autoFocus={autoFocus}
         value={internalText}
+        disabled={disabled}
       />
       {copyButton && (
         <div ref={copyRef}>
diff --git a/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsx b/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsx
index e6cae6c5587a..034dca35ef74 100644
--- a/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsx
@@ -1,5 +1,7 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { Trans, useLingui } from '@lingui/react/macro';
+
 import { isNonEmptyString } from '@sniptt/guards';
 import React from 'react';
 import { getImageAbsoluteURI } from 'twenty-shared';
@@ -105,6 +107,7 @@ export const ImageInput = ({
   disabled = false,
   className,
 }: ImageInputProps) => {
+  const { t } = useLingui();
   const theme = useTheme();
   const hiddenFileInput = React.useRef<HTMLInputElement>(null);
   const onUploadButtonClick = () => {
@@ -151,7 +154,7 @@ export const ImageInput = ({
               Icon={IconX}
               onClick={onAbort}
               variant="secondary"
-              title="Abort"
+              title={t`Abort`}
               disabled={!pictureURI || disabled}
             />
           ) : (
@@ -159,7 +162,7 @@ export const ImageInput = ({
               Icon={IconUpload}
               onClick={onUploadButtonClick}
               variant="secondary"
-              title="Upload"
+              title={t`Upload`}
               disabled={disabled}
             />
           )}
@@ -167,12 +170,12 @@ export const ImageInput = ({
             Icon={IconTrash}
             onClick={onRemove}
             variant="secondary"
-            title="Remove"
+            title={t`Remove`}
             disabled={!pictureURI || disabled}
           />
         </StyledButtonContainer>
         <StyledText>
-          We support your best PNGs, JPEGs and GIFs portraits under 10MB
+          <Trans>We support your square PNGs, JPEGs and GIFs under 10MB</Trans>
         </StyledText>
         {errorMessage && <StyledErrorText>{errorMessage}</StyledErrorText>}
       </StyledContent>
diff --git a/packages/twenty-front/src/modules/ui/input/components/TextInputV2.tsx b/packages/twenty-front/src/modules/ui/input/components/TextInputV2.tsx
index d770d8a1b004..f3a371084947 100644
--- a/packages/twenty-front/src/modules/ui/input/components/TextInputV2.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/TextInputV2.tsx
@@ -1,3 +1,4 @@
+import { InputLabel } from '@/ui/input/components/InputLabel';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import {
@@ -10,28 +11,37 @@ import {
   useRef,
   useState,
 } from 'react';
-import { IconComponent, IconEye, IconEyeOff, RGBA } from 'twenty-ui';
+import {
+  ComputeNodeDimensions,
+  IconComponent,
+  IconEye,
+  IconEyeOff,
+  RGBA,
+} from 'twenty-ui';
 import { useCombinedRefs } from '~/hooks/useCombinedRefs';
 import { turnIntoEmptyStringIfWhitespacesOnly } from '~/utils/string/turnIntoEmptyStringIfWhitespacesOnly';
-import { InputLabel } from './InputLabel';
 
 const StyledContainer = styled.div<
   Pick<TextInputV2ComponentProps, 'fullWidth'>
 >`
+  box-sizing: border-box;
   display: inline-flex;
   flex-direction: column;
   width: ${({ fullWidth }) => (fullWidth ? `100%` : 'auto')};
 `;
 
 const StyledInputContainer = styled.div`
+  background-color: inherit;
   display: flex;
   flex-direction: row;
-  width: 100%;
   position: relative;
 `;
 
 const StyledInput = styled.input<
-  Pick<TextInputV2ComponentProps, 'fullWidth' | 'LeftIcon' | 'error'>
+  Pick<
+    TextInputV2ComponentProps,
+    'LeftIcon' | 'error' | 'sizeVariant' | 'width'
+  >
 >`
   background-color: ${({ theme }) => theme.background.transparent.lighter};
   border: 1px solid
@@ -44,12 +54,14 @@ const StyledInput = styled.input<
   flex-grow: 1;
   font-family: ${({ theme }) => theme.font.family};
   font-weight: ${({ theme }) => theme.font.weight.regular};
-  height: 32px;
+  height: ${({ sizeVariant }) => (sizeVariant === 'sm' ? '20px' : '32px')};
   outline: none;
-  padding: ${({ theme }) => theme.spacing(2)};
+  padding: ${({ theme, sizeVariant }) =>
+    sizeVariant === 'sm' ? `${theme.spacing(2)} 0` : theme.spacing(2)};
   padding-left: ${({ theme, LeftIcon }) =>
-    LeftIcon ? `calc(${theme.spacing(4)} + 16px)` : theme.spacing(2)};
-  width: 100%;
+    LeftIcon ? `px` : theme.spacing(2)};
+  width: ${({ theme, width }) =>
+    width ? `calc(${width}px + ${theme.spacing(5)})` : '100%'};
 
   &::placeholder,
   &::-webkit-input-placeholder {
@@ -111,6 +123,8 @@ const StyledTrailingIcon = styled.div`
 
 const INPUT_TYPE_PASSWORD = 'password';
 
+export type TextInputV2Size = 'sm' | 'md';
+
 export type TextInputV2ComponentProps = Omit<
   InputHTMLAttributes<HTMLInputElement>,
   'onChange' | 'onKeyDown'
@@ -123,11 +137,15 @@ export type TextInputV2ComponentProps = Omit<
   noErrorHelper?: boolean;
   RightIcon?: IconComponent;
   LeftIcon?: IconComponent;
+  autoGrow?: boolean;
   onKeyDown?: (event: React.KeyboardEvent<HTMLInputElement>) => void;
   onBlur?: FocusEventHandler<HTMLInputElement>;
   dataTestId?: string;
+  sizeVariant?: TextInputV2Size;
 };
 
+type TextInputV2WithAutoGrowWrapperProps = TextInputV2ComponentProps;
+
 const TextInputV2Component = (
   {
     className,
@@ -138,6 +156,7 @@ const TextInputV2Component = (
     onBlur,
     onKeyDown,
     fullWidth,
+    width,
     error,
     noErrorHelper = false,
     required,
@@ -150,6 +169,7 @@ const TextInputV2Component = (
     LeftIcon,
     autoComplete,
     maxLength,
+    sizeVariant = 'md',
     dataTestId,
   }: TextInputV2ComponentProps,
   // eslint-disable-next-line @nx/workspace-component-props-naming
@@ -183,8 +203,10 @@ const TextInputV2Component = (
             </StyledTrailingIcon>
           </StyledLeftIconContainer>
         )}
+
         <StyledInput
           id={inputId}
+          width={width}
           data-testid={dataTestId}
           autoComplete={autoComplete || 'off'}
           ref={combinedRef}
@@ -207,8 +229,10 @@ const TextInputV2Component = (
             LeftIcon,
             maxLength,
             error,
+            sizeVariant,
           }}
         />
+
         <StyledTrailingIconContainer {...{ error }}>
           {!error && type === INPUT_TYPE_PASSWORD && (
             <StyledTrailingIcon
@@ -236,4 +260,22 @@ const TextInputV2Component = (
   );
 };
 
-export const TextInputV2 = forwardRef(TextInputV2Component);
+const TextInputV2WithAutoGrowWrapper = (
+  props: TextInputV2WithAutoGrowWrapperProps,
+) => (
+  <>
+    {props.autoGrow ? (
+      <ComputeNodeDimensions node={props.value || props.placeholder}>
+        {(nodeDimensions) => (
+          // eslint-disable-next-line
+          <TextInputV2Component {...props} width={nodeDimensions?.width} />
+        )}
+      </ComputeNodeDimensions>
+    ) : (
+      // eslint-disable-next-line
+      <TextInputV2Component {...props} />
+    )}
+  </>
+);
+
+export const TextInputV2 = forwardRef(TextInputV2WithAutoGrowWrapper);
diff --git a/packages/twenty-front/src/modules/ui/input/components/__stories__/ImageInput.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/__stories__/ImageInput.stories.tsx
index ffe7f48be1ef..46e9c3248e47 100644
--- a/packages/twenty-front/src/modules/ui/input/components/__stories__/ImageInput.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/__stories__/ImageInput.stories.tsx
@@ -1,6 +1,7 @@
 import { Meta, StoryObj } from '@storybook/react';
 import { ComponentDecorator } from 'twenty-ui';
 
+import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { workspaceLogoUrl } from '~/testing/mock-data/users';
 
 import { ImageInput } from '../ImageInput';
@@ -8,7 +9,7 @@ import { ImageInput } from '../ImageInput';
 const meta: Meta<typeof ImageInput> = {
   title: 'UI/Input/ImageInput/ImageInput',
   component: ImageInput,
-  decorators: [ComponentDecorator],
+  decorators: [ComponentDecorator, I18nFrontDecorator],
 };
 
 export default meta;
diff --git a/packages/twenty-front/src/modules/ui/input/components/__stories__/TextInputV2.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/__stories__/TextInputV2.stories.tsx
index 8cd86abc20a2..e9ffe6d6d609 100644
--- a/packages/twenty-front/src/modules/ui/input/components/__stories__/TextInputV2.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/__stories__/TextInputV2.stories.tsx
@@ -1,5 +1,5 @@
-import { useState } from 'react';
 import { Meta, StoryObj } from '@storybook/react';
+import { useState } from 'react';
 import { ComponentDecorator } from 'twenty-ui';
 
 import {
@@ -40,3 +40,19 @@ export const Filled: Story = {
 export const Disabled: Story = {
   args: { disabled: true, value: 'Tim' },
 };
+
+export const AutoGrow: Story = {
+  args: { autoGrow: true, value: 'Tim' },
+};
+
+export const AutoGrowWithPlaceholder: Story = {
+  args: { autoGrow: true, placeholder: 'Tim' },
+};
+
+export const Small: Story = {
+  args: { sizeVariant: 'sm', value: 'Tim' },
+};
+
+export const AutoGrowSmall: Story = {
+  args: { autoGrow: true, sizeVariant: 'sm', value: 'Tim' },
+};
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownSelect.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownSelect.tsx
index 18891ea4b40b..14031684e3c8 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownSelect.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/currency/components/CurrencyPickerDropdownSelect.tsx
@@ -37,6 +37,7 @@ export const CurrencyPickerDropdownSelect = ({
         value={searchFilter}
         onChange={(event) => setSearchFilter(event.target.value)}
         autoFocus
+        role="combobox"
       />
       <DropdownMenuSeparator />
       <DropdownMenuItemsContainer hasMaxHeight>
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/InternalDatePicker.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/InternalDatePicker.tsx
index 69876727b65c..d54d8a976a2c 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/InternalDatePicker.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/InternalDatePicker.tsx
@@ -270,7 +270,7 @@ const StyledButton = styled(MenuItemLeftContent)`
   justify-content: start;
 `;
 
-type InternalDatePickerProps = {
+type DateTimePickerProps = {
   isRelative?: boolean;
   hideHeaderInput?: boolean;
   date: Date | null;
@@ -283,7 +283,7 @@ type InternalDatePickerProps = {
     start: Date;
     end: Date;
   };
-  onMouseSelect?: (date: Date | null) => void;
+  onClose?: (date: Date | null) => void;
   onChange?: (date: Date | null) => void;
   onRelativeDateChange?: (
     relativeDate: {
@@ -300,10 +300,10 @@ type InternalDatePickerProps = {
   onClear?: () => void;
 };
 
-export const InternalDatePicker = ({
+export const DateTimePicker = ({
   date,
   onChange,
-  onMouseSelect,
+  onClose,
   clearable = true,
   isDateTimeInput,
   onClear,
@@ -312,7 +312,7 @@ export const InternalDatePicker = ({
   onRelativeDateChange,
   highlightedDateRange,
   hideHeaderInput,
-}: InternalDatePickerProps) => {
+}: DateTimePickerProps) => {
   const internalDate = date ?? new Date();
 
   const { timeZone } = useContext(UserContext);
@@ -336,9 +336,9 @@ export const InternalDatePicker = ({
     closeDropdown();
   };
 
-  const handleMouseSelect = (newDate: Date) => {
+  const handleClose = (newDate: Date) => {
     closeDropdowns();
-    onMouseSelect?.(newDate);
+    onClose?.(newDate);
   };
 
   const handleChangeMonth = (month: number) => {
@@ -396,7 +396,7 @@ export const InternalDatePicker = ({
       })
       .toJSDate();
 
-    handleMouseSelect?.(dateParsed);
+    handleClose?.(dateParsed);
   };
 
   const dateWithoutTime = DateTime.fromJSDate(internalDate)
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/InternalDatePicker.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/InternalDatePicker.stories.tsx
index 74d54be0faa1..3bed3754339c 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/InternalDatePicker.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/InternalDatePicker.stories.tsx
@@ -4,11 +4,11 @@ import { expect, userEvent, within } from '@storybook/test';
 import { ComponentDecorator } from 'twenty-ui';
 
 import { isDefined } from '~/utils/isDefined';
-import { InternalDatePicker } from '../InternalDatePicker';
+import { DateTimePicker } from '../InternalDatePicker';
 
-const meta: Meta<typeof InternalDatePicker> = {
+const meta: Meta<typeof DateTimePicker> = {
   title: 'UI/Input/Internal/InternalDatePicker',
-  component: InternalDatePicker,
+  component: DateTimePicker,
   decorators: [ComponentDecorator],
   argTypes: {
     date: { control: 'date' },
@@ -17,7 +17,7 @@ const meta: Meta<typeof InternalDatePicker> = {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     const [, updateArgs] = useArgs();
     return (
-      <InternalDatePicker
+      <DateTimePicker
         date={isDefined(date) ? new Date(date) : new Date()}
         onChange={(newDate) => updateArgs({ date: newDate })}
       />
@@ -27,7 +27,7 @@ const meta: Meta<typeof InternalDatePicker> = {
 };
 
 export default meta;
-type Story = StoryObj<typeof InternalDatePicker>;
+type Story = StoryObj<typeof DateTimePicker>;
 
 export const Default: Story = {};
 
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownButton.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownButton.tsx
index 7a1c62681962..8d8aba0b45a6 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/phone/components/PhoneCountryPickerDropdownButton.tsx
@@ -27,7 +27,7 @@ const StyledDropdownButtonContainer = styled.div<StyledDropdownButtonProps>`
   cursor: pointer;
   display: flex;
 
-  height: 30px;
+  height: 32px;
 
   padding-left: ${({ theme }) => theme.spacing(2)};
   padding-right: ${({ theme }) => theme.spacing(1)};
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx
index 230d4152b62d..355ba9de77da 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx
@@ -1,34 +1,32 @@
+import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
+import { DropdownOnToggleEffect } from '@/ui/layout/dropdown/components/DropdownOnToggleEffect';
+import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponeInstanceContext';
 import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope';
+import { dropdownHotkeyComponentState } from '@/ui/layout/dropdown/states/dropdownHotkeyComponentState';
+import { dropdownMaxHeightComponentStateV2 } from '@/ui/layout/dropdown/states/dropdownMaxHeightComponentStateV2';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
 import { getScopeIdFromComponentId } from '@/ui/utilities/recoil-scope/utils/getScopeIdFromComponentId';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
+import styled from '@emotion/styled';
 import {
+  Placement,
   autoUpdate,
   flip,
   offset,
-  Placement,
   size,
   useFloating,
 } from '@floating-ui/react';
 import { MouseEvent, ReactNode } from 'react';
-import { Keys } from 'react-hotkeys-hook';
-
-import { useDropdown } from '../hooks/useDropdown';
-
-import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
-import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/DropdownComponeInstanceContext';
-import { dropdownHotkeyComponentState } from '@/ui/layout/dropdown/states/dropdownHotkeyComponentState';
-import { dropdownMaxHeightComponentStateV2 } from '@/ui/layout/dropdown/states/dropdownMaxHeightComponentStateV2';
-import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
-import styled from '@emotion/styled';
 import { flushSync } from 'react-dom';
+import { Keys } from 'react-hotkeys-hook';
 import { useRecoilCallback } from 'recoil';
 import { isDefined } from 'twenty-ui';
 import { sleep } from '~/utils/sleep';
-import { DropdownOnToggleEffect } from './DropdownOnToggleEffect';
+import { useDropdown } from '../hooks/useDropdown';
 
 const StyledDropdownFallbackAnchor = styled.div`
   left: 0;
-  position: absolute;
+  position: fixed;
   top: 0;
 `;
 
@@ -136,6 +134,10 @@ export const Dropdown = ({
             <div
               ref={refs.setReference}
               onClick={handleClickableComponentClick}
+              aria-controls={`${dropdownId}-options`}
+              aria-expanded={isDropdownOpen}
+              aria-haspopup={true}
+              role="button"
             >
               {clickableComponent}
             </div>
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownContent.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownContent.tsx
index 3c2d2ea0ae0a..acbae17556e2 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownContent.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownContent.tsx
@@ -122,6 +122,8 @@ export const DropdownContent = ({
         <StyledDropdownContentContainer
           ref={floatingUiRefs.setFloating}
           style={dropdownMenuStyles}
+          role="listbox"
+          id={`${dropdownId}-options`}
         >
           <OverlayContainer>
             <DropdownMenu
@@ -138,9 +140,12 @@ export const DropdownContent = ({
           <StyledDropdownContentContainer
             ref={floatingUiRefs.setFloating}
             style={dropdownMenuStyles}
+            role="listbox"
+            id={`${dropdownId}-options`}
           >
             <OverlayContainer>
               <DropdownMenu
+                id={dropdownId}
                 className={className}
                 width={dropdownMenuWidth ?? dropdownWidth}
                 data-select-disable
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader.tsx
index 02ed2027b82b..901b47aad800 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuHeader.tsx
@@ -1,7 +1,7 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { ComponentProps, MouseEvent } from 'react';
-import { IconComponent, LightIconButton } from 'twenty-ui';
+import { IconComponent, isDefined, LightIconButton } from 'twenty-ui';
 
 const StyledHeader = styled.li`
   align-items: center;
@@ -41,6 +41,26 @@ const StyledEndIcon = styled.div`
 const StyledChildrenWrapper = styled.span`
   overflow: hidden;
   padding: 0 ${({ theme }) => theme.spacing(1)};
+  white-space: nowrap;
+  text-overflow: ellipsis;
+`;
+
+const StyledNonClickableStartIcon = styled.div`
+  align-items: center;
+  background: transparent;
+  border: none;
+
+  display: flex;
+  flex-direction: row;
+
+  font-family: ${({ theme }) => theme.font.family};
+  font-weight: ${({ theme }) => theme.font.weight.regular};
+  gap: ${({ theme }) => theme.spacing(1)};
+  justify-content: center;
+
+  white-space: nowrap;
+  height: 24px;
+  width: 24px;
 `;
 
 type DropdownMenuHeaderProps = ComponentProps<'li'> & {
@@ -76,13 +96,22 @@ export const DropdownMenuHeader = ({
       )}
       {StartIcon && (
         <StyledHeader data-testid={testId} className={className}>
-          <LightIconButton
-            testId="dropdown-menu-header-end-icon"
-            Icon={StartIcon}
-            accent="tertiary"
-            size="small"
-            onClick={onClick}
-          />
+          {isDefined(onClick) ? (
+            <LightIconButton
+              testId="dropdown-menu-header-end-icon"
+              Icon={StartIcon}
+              accent="tertiary"
+              size="small"
+              onClick={onClick}
+            />
+          ) : (
+            <StyledNonClickableStartIcon>
+              <StartIcon
+                size={theme.icon.size.sm}
+                color={theme.font.color.tertiary}
+              />
+            </StyledNonClickableStartIcon>
+          )}
           <StyledChildrenWrapper>{children}</StyledChildrenWrapper>
         </StyledHeader>
       )}
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuItemsContainer.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuItemsContainer.tsx
index edcfd5e75e60..4de0530e88cf 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuItemsContainer.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuItemsContainer.tsx
@@ -51,6 +51,7 @@ export const DropdownMenuItemsContainer = ({
     <StyledDropdownMenuItemsExternalContainer
       hasMaxHeight={hasMaxHeight}
       className={className}
+      role="listbox"
     >
       {hasMaxHeight ? (
         <StyledScrollWrapper
@@ -76,6 +77,7 @@ export const DropdownMenuItemsContainer = ({
       <StyledDropdownMenuItemsExternalContainer
         hasMaxHeight={hasMaxHeight}
         className={className}
+        role="listbox"
       >
         <StyledDropdownMenuItemsInternalContainer>
           {children}
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/StyledHeaderDropdownButton.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/StyledHeaderDropdownButton.tsx
index ba6658ff52fd..7ac30a349ea7 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/StyledHeaderDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/StyledHeaderDropdownButton.tsx
@@ -8,8 +8,6 @@ type StyledDropdownButtonProps = {
 export const StyledHeaderDropdownButton = styled.button<StyledDropdownButtonProps>`
   font-family: inherit;
   align-items: center;
-  background: ${({ theme, isUnfolded }) =>
-    isUnfolded ? theme.background.transparent.light : theme.background.primary};
   border: none;
   border-radius: ${({ theme }) => theme.border.radius.sm};
   color: ${({ isActive, theme }) =>
@@ -23,6 +21,9 @@ export const StyledHeaderDropdownButton = styled.button<StyledDropdownButtonProp
   padding-right: ${({ theme }) => theme.spacing(2)};
   user-select: none;
 
+  background: ${({ theme, isUnfolded }) =>
+    isUnfolded ? theme.background.transparent.light : theme.background.primary};
+
   &:hover {
     background: ${({ theme, isUnfolded }) =>
       isUnfolded
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenu.stories.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenu.stories.tsx
index 142608390b89..a654d10aad96 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenu.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenu.stories.tsx
@@ -82,22 +82,24 @@ export const Empty: Story = {
   play: async () => {
     const canvas = within(document.body);
 
-    const button = await canvas.findByRole('button');
-    userEvent.click(button);
+    const buttons = await canvas.findAllByRole('button', {
+      name: 'Open Dropdown',
+    });
+    userEvent.click(buttons[0]);
 
     await waitFor(async () => {
       const fakeMenu = await canvas.findByTestId('dropdown-content');
       expect(fakeMenu).toBeInTheDocument();
     });
 
-    userEvent.click(button);
+    userEvent.click(buttons[0]);
 
     await waitFor(async () => {
       const fakeMenu = canvas.queryByTestId('dropdown-content');
       expect(fakeMenu).not.toBeInTheDocument();
     });
 
-    userEvent.click(button);
+    userEvent.click(buttons[0]);
     await waitFor(async () => {
       const fakeMenu = await canvas.findByTestId('dropdown-content');
       expect(fakeMenu).toBeInTheDocument();
@@ -205,8 +207,8 @@ const FakeCheckableMenuItemList = ({ hasAvatar }: { hasAvatar?: boolean }) => {
 const playInteraction: PlayFunction<any, any> = async () => {
   const canvas = within(document.body);
 
-  const button = await canvas.findByRole('button');
-  userEvent.click(button);
+  const buttons = await canvas.findAllByRole('button');
+  userEvent.click(buttons[0]);
 
   await waitFor(async () => {
     expect(canvas.getByText('Company A')).toBeInTheDocument();
@@ -257,15 +259,15 @@ export const SearchWithLoadingMenu: Story = {
   play: async () => {
     const canvas = within(document.body);
 
-    const button = await canvas.findByRole('button');
+    const buttons = await canvas.findAllByRole('button');
 
     await waitFor(() => {
-      userEvent.click(button);
+      userEvent.click(buttons[0]);
       expect(canvas.getByDisplayValue('query')).toBeInTheDocument();
     });
 
     await waitFor(() => {
-      userEvent.click(button);
+      userEvent.click(buttons[0]);
       expect(canvas.queryByDisplayValue('query')).not.toBeInTheDocument();
     });
   },
diff --git a/packages/twenty-front/src/modules/ui/layout/hooks/__tests__/useShowAuthModal.test.tsx b/packages/twenty-front/src/modules/ui/layout/hooks/__tests__/useShowAuthModal.test.tsx
index dc7d8477f93c..565141864655 100644
--- a/packages/twenty-front/src/modules/ui/layout/hooks/__tests__/useShowAuthModal.test.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/hooks/__tests__/useShowAuthModal.test.tsx
@@ -56,225 +56,236 @@ const getResult = (isDefaultLayoutAuthModalVisible = true) =>
 
 // prettier-ignore
 const testCases = [
-  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: false },
-  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: false },
+  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
   { loc: AppPath.Verify, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: false },
-  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: false },
-  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: false },
-  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: false },
-  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: false },
-  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
-
-  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
-  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: true },
-  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: true },
-  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: true },
+  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: false },
+  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: false },
+  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: false },
+  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: false },
+  { loc: AppPath.Verify, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+
+  { loc: AppPath.VerifyEmail, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.VerifyEmail, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: true },
+  { loc: AppPath.VerifyEmail, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: true },
+  { loc: AppPath.VerifyEmail, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: true },
+  { loc: AppPath.VerifyEmail, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
+  { loc: AppPath.VerifyEmail, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.VerifyEmail, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.VerifyEmail, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.VerifyEmail, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.VerifyEmail, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: true },
+
+  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: true },
+  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: true },
+  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: true },
   { loc: AppPath.SignInUp, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
-  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
-  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
-  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
-  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
-  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: true },
-
-  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
-  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: true },
-  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: true },
-  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: true },
+  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.SignInUp, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: true },
+
+  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: true },
+  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: true },
+  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: true },
   { loc: AppPath.Invite, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
-  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
-  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
-  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
-  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
-  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: true },
-
-  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
-  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: true },
-  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: true },
-  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: true },
+  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.Invite, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: true },
+
+  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: true },
+  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: true },
+  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: true },
   { loc: AppPath.ResetPassword, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
-  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
-  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
-  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
-  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
-  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: true },
-
-  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
-  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.ResetPassword, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: true },
+
+  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
   { loc: AppPath.CreateWorkspace, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
-  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
-  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
-  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
-  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
-  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
-
-  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
-  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.CreateWorkspace, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+
+  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
   { loc: AppPath.CreateProfile, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
-  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
-  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
-  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
-  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
-  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
-
-  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
-  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.CreateProfile, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+
+  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
   { loc: AppPath.SyncEmails, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
-  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
-  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
-  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
-  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
-  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
-
-  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
-  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.SyncEmails, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+
+  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
   { loc: AppPath.InviteTeam, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
-  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
-  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
-  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
-  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
-  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
-
-  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
-  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: true },
-  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.InviteTeam, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+
+  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: true },
+  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
   { loc: AppPath.PlanRequired, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
-  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
-  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
-  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
-  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
-  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
-
-  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
-  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.PlanRequired, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+
+  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
   { loc: AppPath.PlanRequiredSuccess, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
-  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
-  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
-  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
-  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
-  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
-
-  { loc: AppPath.Index, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
-  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.PlanRequiredSuccess, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+
+  { loc: AppPath.Index, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
   { loc: AppPath.Index, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
-  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
-  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
-  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
-  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
-  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
-
-  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
-  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.Index, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+
+  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
   { loc: AppPath.TasksPage, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
-  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
-  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
-  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
-  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
-  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
-
-  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
-  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.TasksPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+
+  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
   { loc: AppPath.OpportunitiesPage, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
-  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
-  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
-  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
-  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
-  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
-
-  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
-  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.OpportunitiesPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+
+  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
   { loc: AppPath.RecordIndexPage, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
-  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
-  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
-  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
-  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
-  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
-
-  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
-  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.RecordIndexPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+
+  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
   { loc: AppPath.RecordShowPage, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
-  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
-  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
-  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
-  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
-  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
-
-  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
-  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.RecordShowPage, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+
+  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
   { loc: AppPath.SettingsCatchAll, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
-  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
-  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
-  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
-  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
-  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
-
-  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
-  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.SettingsCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+
+  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
   { loc: AppPath.DevelopersCatchAll, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
-  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
-  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
-  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
-  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
-  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
-
-  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
-  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.DevelopersCatchAll, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+
+  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
   { loc: AppPath.Authorize, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
-  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
-  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
-  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
-  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
-  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
-
-  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
-  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.Authorize, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+
+  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
   { loc: AppPath.NotFoundWildcard, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
-  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
-  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
-  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
-  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
-  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
-
-  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PlanRequired, res: true },
-  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.Completed, res: false },
-  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.NotFoundWildcard, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+
+  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: undefined, onboardingStatus: OnboardingStatus.PLAN_REQUIRED, res: true },
+  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Canceled, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Unpaid, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
+  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.PastDue, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
   { loc: AppPath.NotFound, isLogged: false, subscriptionStatus: undefined, onboardingStatus: undefined, res: true },
-  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WorkspaceActivation, res: true },
-  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.ProfileCreation, res: true },
-  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SyncEmail, res: true },
-  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.InviteTeam, res: true },
-  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.Completed, res: false },
+  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.WORKSPACE_ACTIVATION, res: true },
+  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.PROFILE_CREATION, res: true },
+  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.SYNC_EMAIL, res: true },
+  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.INVITE_TEAM, res: true },
+  { loc: AppPath.NotFound, isLogged: true, subscriptionStatus: SubscriptionStatus.Active, onboardingStatus: OnboardingStatus.COMPLETED, res: false },
 ];
 
 describe('useShowAuthModal', () => {
@@ -295,7 +306,7 @@ describe('useShowAuthModal', () => {
 
   describe('test with token validation loading', () => {
     it(`with appPath ${AppPath.Invite} and isDefaultLayoutAuthModalVisible=false`, () => {
-      setupMockOnboardingStatus(OnboardingStatus.Completed);
+      setupMockOnboardingStatus(OnboardingStatus.COMPLETED);
       setupMockSubscriptionStatus(SubscriptionStatus.Active);
       setupMockIsMatchingLocation(AppPath.Invite);
       setupMockIsLogged(true);
@@ -303,7 +314,7 @@ describe('useShowAuthModal', () => {
       expect(result.current).toBeFalsy();
     });
     it(`with appPath ${AppPath.ResetPassword} and isDefaultLayoutAuthModalVisible=false`, () => {
-      setupMockOnboardingStatus(OnboardingStatus.Completed);
+      setupMockOnboardingStatus(OnboardingStatus.COMPLETED);
       setupMockSubscriptionStatus(SubscriptionStatus.Active);
       setupMockIsMatchingLocation(AppPath.ResetPassword);
       setupMockIsLogged(true);
diff --git a/packages/twenty-front/src/modules/ui/layout/hooks/useShowAuthModal.ts b/packages/twenty-front/src/modules/ui/layout/hooks/useShowAuthModal.ts
index a12dbf59059b..cdfa22e76b80 100644
--- a/packages/twenty-front/src/modules/ui/layout/hooks/useShowAuthModal.ts
+++ b/packages/twenty-front/src/modules/ui/layout/hooks/useShowAuthModal.ts
@@ -28,6 +28,7 @@ export const useShowAuthModal = () => {
     if (
       isMatchingLocation(AppPath.Invite) ||
       isMatchingLocation(AppPath.ResetPassword) ||
+      isMatchingLocation(AppPath.VerifyEmail) ||
       isMatchingLocation(AppPath.SignInUp)
     ) {
       return isDefaultLayoutAuthModalVisible;
@@ -35,18 +36,18 @@ export const useShowAuthModal = () => {
 
     if (
       !isLoggedIn ||
-      onboardingStatus === OnboardingStatus.PlanRequired ||
-      onboardingStatus === OnboardingStatus.ProfileCreation ||
-      onboardingStatus === OnboardingStatus.WorkspaceActivation ||
-      onboardingStatus === OnboardingStatus.SyncEmail ||
-      onboardingStatus === OnboardingStatus.InviteTeam
+      onboardingStatus === OnboardingStatus.PLAN_REQUIRED ||
+      onboardingStatus === OnboardingStatus.PROFILE_CREATION ||
+      onboardingStatus === OnboardingStatus.WORKSPACE_ACTIVATION ||
+      onboardingStatus === OnboardingStatus.SYNC_EMAIL ||
+      onboardingStatus === OnboardingStatus.INVITE_TEAM
     ) {
       return true;
     }
 
     if (isMatchingLocation(AppPath.PlanRequired)) {
       return (
-        (onboardingStatus === OnboardingStatus.Completed &&
+        (onboardingStatus === OnboardingStatus.COMPLETED &&
           !isDefined(subscriptionStatus)) ||
         subscriptionStatus === SubscriptionStatus.Canceled
       );
diff --git a/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx b/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx
index 9481a9c91477..f866de7ed52a 100644
--- a/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx
@@ -15,6 +15,7 @@ import { useDebouncedCallback } from 'use-debounce';
 import { TextInput } from '@/ui/input/components/TextInput';
 
 import { Modal, ModalVariants } from '@/ui/layout/modal/components/Modal';
+import { useLingui } from '@lingui/react/macro';
 
 export type ConfirmationModalProps = {
   isOpen: boolean;
@@ -69,13 +70,14 @@ export const ConfirmationModal = ({
   subtitle,
   setIsOpen,
   onConfirmClick,
-  deleteButtonText = 'Delete',
+  deleteButtonText = `Delete`,
   confirmationValue,
   confirmationPlaceholder,
   confirmButtonAccent = 'danger',
   AdditionalButtons,
   modalVariant = 'primary',
 }: ConfirmationModalProps) => {
+  const { t } = useLingui();
   const [inputConfirmationValue, setInputConfirmationValue] =
     useState<string>('');
   const [isValidValue, setIsValidValue] = useState(!confirmationValue);
@@ -146,7 +148,7 @@ export const ConfirmationModal = ({
                 setIsOpen(false);
               }}
               variant="secondary"
-              title="Cancel"
+              title={t`Cancel`}
               fullWidth
             />
 
diff --git a/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/ConfirmModal.stories.tsx b/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/ConfirmationModal.stories.tsx
similarity index 85%
rename from packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/ConfirmModal.stories.tsx
rename to packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/ConfirmationModal.stories.tsx
index e563f0f0a9b0..004a9f19c1ce 100644
--- a/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/ConfirmModal.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/ConfirmationModal.stories.tsx
@@ -1,12 +1,13 @@
 import { Meta, StoryObj } from '@storybook/react';
 import { ComponentDecorator } from 'twenty-ui';
 
+import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { ConfirmationModal } from '../ConfirmationModal';
 
 const meta: Meta<typeof ConfirmationModal> = {
   title: 'UI/Layout/Modal/ConfirmationModal',
   component: ConfirmationModal,
-  decorators: [ComponentDecorator],
+  decorators: [ComponentDecorator, I18nFrontDecorator],
 };
 export default meta;
 
diff --git a/packages/twenty-front/src/modules/ui/layout/page-header/components/PageHeaderOpenCommandMenuButton.tsx b/packages/twenty-front/src/modules/ui/layout/page-header/components/PageHeaderOpenCommandMenuButton.tsx
index e3bf30cf949f..01cfbe3c27e0 100644
--- a/packages/twenty-front/src/modules/ui/layout/page-header/components/PageHeaderOpenCommandMenuButton.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/page-header/components/PageHeaderOpenCommandMenuButton.tsx
@@ -1,4 +1,10 @@
-import { Button, IconButton, IconDotsVertical, useIsMobile } from 'twenty-ui';
+import {
+  Button,
+  IconButton,
+  IconDotsVertical,
+  getOsControlSymbol,
+  useIsMobile,
+} from 'twenty-ui';
 
 import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
 import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
@@ -7,22 +13,22 @@ import { FeatureFlagKey } from '~/generated/graphql';
 export const PageHeaderOpenCommandMenuButton = () => {
   const { openCommandMenu } = useCommandMenu();
 
-  const isPageHeaderV2Enabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsPageHeaderV2Enabled,
+  const isCommandMenuV2Enabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsCommandMenuV2Enabled,
   );
 
   const isMobile = useIsMobile();
 
   return (
     <>
-      {isPageHeaderV2Enabled ? (
+      {isCommandMenuV2Enabled ? (
         <Button
           Icon={IconDotsVertical}
           dataTestId="page-header-open-command-menu-button"
           size={isMobile ? 'medium' : 'small'}
           variant="secondary"
           accent="default"
-          shortcut={isMobile ? '' : '⌘K'}
+          hotkeys={[getOsControlSymbol(), 'K']}
           ariaLabel="Open command menu"
           onClick={openCommandMenu}
         />
diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx
index d39531099976..0941e4044be2 100644
--- a/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx
@@ -1,5 +1,5 @@
 import { AuthModal } from '@/auth/components/AuthModal';
-import { CommandMenuContainer } from '@/command-menu/components/CommandMenuContainer';
+import { CommandMenuRouter } from '@/command-menu/components/CommandMenuRouter';
 import { AppErrorBoundary } from '@/error-handler/components/AppErrorBoundary';
 import { KeyboardShortcutMenu } from '@/keyboard-shortcut-menu/components/KeyboardShortcutMenu';
 import { AppNavigationDrawer } from '@/navigation/components/AppNavigationDrawer';
@@ -82,7 +82,7 @@ export const DefaultLayout = () => {
       <StyledLayout>
         {!showAuthModal && (
           <>
-            <CommandMenuContainer />
+            <CommandMenuRouter />
             <KeyboardShortcutMenu />
           </>
         )}
@@ -98,9 +98,7 @@ export const DefaultLayout = () => {
                   2
                 : 0,
           }}
-          transition={{
-            duration: theme.animation.duration.normal,
-          }}
+          transition={{ duration: theme.animation.duration.normal }}
         >
           {showAuthModal ? (
             <StyledAppNavigationDrawerMock />
diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/PageAddButton.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/PageAddButton.tsx
index efa68b4fe3e7..b9307bd09cce 100644
--- a/packages/twenty-front/src/modules/ui/layout/page/components/PageAddButton.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/page/components/PageAddButton.tsx
@@ -7,14 +7,14 @@ type PageAddButtonProps = {
 };
 
 export const PageAddButton = ({ onClick }: PageAddButtonProps) => {
-  const isPageHeaderV2Enabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsPageHeaderV2Enabled,
+  const isCommandMenuV2Enabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsCommandMenuV2Enabled,
   );
   const isMobile = useIsMobile();
 
   return (
     <>
-      {isPageHeaderV2Enabled ? (
+      {isCommandMenuV2Enabled ? (
         <Button
           Icon={IconPlus}
           dataTestId="add-button"
diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/PageHeader.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/PageHeader.tsx
index f057376aa228..d2acad3e8411 100644
--- a/packages/twenty-front/src/modules/ui/layout/page/components/PageHeader.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/page/components/PageHeader.tsx
@@ -34,9 +34,9 @@ const StyledTopBarContainer = styled.div`
   padding: ${({ theme }) => theme.spacing(2)};
   padding-left: 0;
   padding-right: ${({ theme }) => theme.spacing(3)};
+  gap: ${({ theme }) => theme.spacing(2)};
 
   @media (max-width: ${MOBILE_VIEWPORT}px) {
-    width: 100%;
     box-sizing: border-box;
     padding: ${({ theme }) => theme.spacing(3)};
   }
@@ -48,7 +48,7 @@ const StyledLeftContainer = styled.div`
   flex-direction: row;
   gap: ${({ theme }) => theme.spacing(1)};
   padding-left: ${({ theme }) => theme.spacing(1)};
-  width: 100%;
+  overflow-x: hidden;
 
   @media (max-width: ${MOBILE_VIEWPORT}px) {
     padding-left: ${({ theme }) => theme.spacing(1)};
@@ -60,21 +60,19 @@ const StyledTitleContainer = styled.div`
   font-size: ${({ theme }) => theme.font.size.md};
   font-weight: ${({ theme }) => theme.font.weight.medium};
   margin-left: ${({ theme }) => theme.spacing(1)};
-  width: 100%;
 `;
 
 const StyledTopBarIconStyledTitleContainer = styled.div`
   align-items: center;
   display: flex;
-  flex: 1 0 auto;
   gap: ${({ theme }) => theme.spacing(1)};
   flex-direction: row;
-  width: 100%;
 `;
 
 const StyledPageActionContainer = styled.div`
   display: inline-flex;
   gap: ${({ theme }) => theme.spacing(2)};
+  flex: 1 0 1;
 `;
 
 const StyledTopBarButtonContainer = styled.div`
@@ -82,6 +80,13 @@ const StyledTopBarButtonContainer = styled.div`
   margin-right: ${({ theme }) => theme.spacing(1)};
 `;
 
+const StyledIconContainer = styled.div`
+  flex: 1 0 1;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+`;
+
 type PageHeaderProps = {
   title?: ReactNode;
   hasClosePageButton?: boolean;
@@ -111,8 +116,8 @@ export const PageHeader = ({
     isNavigationDrawerExpandedState,
   );
 
-  const isPageHeaderV2Enabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsPageHeaderV2Enabled,
+  const isCommandMenuV2Enabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsCommandMenuV2Enabled,
   );
 
   return (
@@ -133,7 +138,7 @@ export const PageHeader = ({
         )}
 
         <StyledTopBarIconStyledTitleContainer>
-          {!isPageHeaderV2Enabled && hasPaginationButtons && (
+          {!isCommandMenuV2Enabled && hasPaginationButtons && (
             <>
               <IconButton
                 Icon={IconChevronUp}
@@ -149,7 +154,9 @@ export const PageHeader = ({
               />
             </>
           )}
-          {Icon && <Icon size={theme.icon.size.md} />}
+          <StyledIconContainer>
+            {Icon && <Icon size={theme.icon.size.md} />}
+          </StyledIconContainer>
           {title && (
             <StyledTitleContainer data-testid="top-bar-title">
               {typeof title === 'string' ? (
diff --git a/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawer.tsx b/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawer.tsx
index dc662aa44768..2012d5ba9904 100644
--- a/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawer.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/right-drawer/components/RightDrawer.tsx
@@ -83,9 +83,7 @@ export const RightDrawer = () => {
       isRightDrawerMinimized={isRightDrawerMinimized}
       animate={targetVariantForAnimation}
       variants={RIGHT_DRAWER_ANIMATION_VARIANTS}
-      transition={{
-        duration: theme.animation.duration.normal,
-      }}
+      transition={{ duration: theme.animation.duration.normal }}
       onAnimationComplete={handleAnimationComplete}
     >
       <StyledRightDrawer>
diff --git a/packages/twenty-front/src/modules/ui/layout/right-drawer/hooks/useRightDrawer.ts b/packages/twenty-front/src/modules/ui/layout/right-drawer/hooks/useRightDrawer.ts
index c7a96152805e..ebcc3efe2567 100644
--- a/packages/twenty-front/src/modules/ui/layout/right-drawer/hooks/useRightDrawer.ts
+++ b/packages/twenty-front/src/modules/ui/layout/right-drawer/hooks/useRightDrawer.ts
@@ -3,10 +3,17 @@ import { useRecoilCallback, useRecoilValue } from 'recoil';
 import { isRightDrawerMinimizedState } from '@/ui/layout/right-drawer/states/isRightDrawerMinimizedState';
 import { rightDrawerCloseEventState } from '@/ui/layout/right-drawer/states/rightDrawerCloseEventsState';
 
+import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
+import { commandMenuPageState } from '@/command-menu/states/commandMenuPageState';
+import { commandMenuPageInfoState } from '@/command-menu/states/commandMenuPageTitle';
+import { emitRightDrawerCloseEvent } from '@/ui/layout/right-drawer/utils/emitRightDrawerCloseEvent';
+import { mapRightDrawerPageToCommandMenuPage } from '@/ui/layout/right-drawer/utils/mapRightDrawerPageToCommandMenuPage';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+import { IconComponent } from 'twenty-ui';
+import { FeatureFlagKey } from '~/generated/graphql';
 import { isRightDrawerOpenState } from '../states/isRightDrawerOpenState';
 import { rightDrawerPageState } from '../states/rightDrawerPageState';
 import { RightDrawerPages } from '../types/RightDrawerPages';
-import { emitRightDrawerCloseEvent } from '@/ui/layout/right-drawer/utils/emitRightDrawerCloseEvent';
 
 export const useRightDrawer = () => {
   const isRightDrawerOpen = useRecoilValue(isRightDrawerOpenState);
@@ -14,14 +21,39 @@ export const useRightDrawer = () => {
 
   const rightDrawerPage = useRecoilValue(rightDrawerPageState);
 
+  const isCommandMenuV2Enabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsCommandMenuV2Enabled,
+  );
+
+  const { openCommandMenu } = useCommandMenu();
+
   const openRightDrawer = useRecoilCallback(
     ({ set }) =>
-      (rightDrawerPage: RightDrawerPages) => {
+      (
+        rightDrawerPage: RightDrawerPages,
+        commandMenuPageInfo?: {
+          title?: string;
+          Icon?: IconComponent;
+        },
+      ) => {
+        if (isCommandMenuV2Enabled) {
+          const commandMenuPage =
+            mapRightDrawerPageToCommandMenuPage(rightDrawerPage);
+
+          set(commandMenuPageState, commandMenuPage);
+          set(commandMenuPageInfoState, {
+            title: commandMenuPageInfo?.title,
+            Icon: commandMenuPageInfo?.Icon,
+          });
+          openCommandMenu();
+          return;
+        }
+
         set(rightDrawerPageState, rightDrawerPage);
         set(isRightDrawerOpenState, true);
         set(isRightDrawerMinimizedState, false);
       },
-    [],
+    [isCommandMenuV2Enabled, openCommandMenu],
   );
 
   const closeRightDrawer = useRecoilCallback(
diff --git a/packages/twenty-front/src/modules/ui/layout/right-drawer/utils/mapRightDrawerPageToCommandMenuPage.ts b/packages/twenty-front/src/modules/ui/layout/right-drawer/utils/mapRightDrawerPageToCommandMenuPage.ts
new file mode 100644
index 000000000000..c5e56420c2e3
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/right-drawer/utils/mapRightDrawerPageToCommandMenuPage.ts
@@ -0,0 +1,27 @@
+import { CommandMenuPages } from '@/command-menu/components/CommandMenuPages';
+import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages';
+
+export const mapRightDrawerPageToCommandMenuPage = (
+  rightDrawerPage: RightDrawerPages,
+) => {
+  switch (rightDrawerPage) {
+    case RightDrawerPages.ViewRecord:
+      return CommandMenuPages.ViewRecord;
+    case RightDrawerPages.ViewEmailThread:
+      return CommandMenuPages.ViewEmailThread;
+    case RightDrawerPages.ViewCalendarEvent:
+      return CommandMenuPages.ViewCalendarEvent;
+    case RightDrawerPages.Copilot:
+      return CommandMenuPages.Copilot;
+    case RightDrawerPages.WorkflowStepSelectTriggerType:
+      return CommandMenuPages.WorkflowStepSelectTriggerType;
+    case RightDrawerPages.WorkflowStepSelectAction:
+      return CommandMenuPages.WorkflowStepSelectAction;
+    case RightDrawerPages.WorkflowStepView:
+      return CommandMenuPages.WorkflowStepView;
+    case RightDrawerPages.WorkflowStepEdit:
+      return CommandMenuPages.WorkflowStepEdit;
+    default:
+      return CommandMenuPages.Root;
+  }
+};
diff --git a/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/useSelectableList.ts b/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/useSelectableList.ts
index e48ac7babde3..41a85a10a13d 100644
--- a/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/useSelectableList.ts
+++ b/packages/twenty-front/src/modules/ui/layout/selectable-list/hooks/useSelectableList.ts
@@ -34,13 +34,18 @@ export const useSelectableList = (selectableListId?: string) => {
   );
 
   const setSelectedItemId = useRecoilCallback(
-    ({ set }) =>
+    ({ set, snapshot }) =>
       (itemId: string) => {
-        resetSelectedItem();
+        const selectedItemId = getSnapshotValue(snapshot, selectedItemIdState);
+
+        if (isDefined(selectedItemId)) {
+          set(isSelectedItemIdSelector(selectedItemId), false);
+        }
+
         set(selectedItemIdState, itemId);
         set(isSelectedItemIdSelector(itemId), true);
       },
-    [resetSelectedItem, selectedItemIdState, isSelectedItemIdSelector],
+    [selectedItemIdState, isSelectedItemIdSelector],
   );
 
   return {
diff --git a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageAddButton.tsx b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageAddButton.tsx
index 3a14b90b3926..b0ddd31b8c6a 100644
--- a/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageAddButton.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/show-page/components/ShowPageAddButton.tsx
@@ -53,8 +53,8 @@ export const ShowPageAddButton = ({
     closeDropdown();
   };
 
-  const isPageHeaderV2Enabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsPageHeaderV2Enabled,
+  const isCommandMenuV2Enabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsCommandMenuV2Enabled,
   );
 
   if (
@@ -72,7 +72,7 @@ export const ShowPageAddButton = ({
       <Dropdown
         dropdownId={SHOW_PAGE_ADD_BUTTON_DROPDOWN_ID}
         clickableComponent={
-          isPageHeaderV2Enabled ? (
+          isCommandMenuV2Enabled ? (
             <Button
               Icon={IconPlus}
               dataTestId="add-button"
@@ -108,9 +108,7 @@ export const ShowPageAddButton = ({
             />
           </DropdownMenuItemsContainer>
         }
-        dropdownHotkeyScope={{
-          scope: PageHotkeyScope.ShowPage,
-        }}
+        dropdownHotkeyScope={{ scope: PageHotkeyScope.ShowPage }}
       />
     </StyledContainer>
   );
diff --git a/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/EditableBreadcrumbItem.tsx b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/EditableBreadcrumbItem.tsx
new file mode 100644
index 000000000000..b3956a044822
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/EditableBreadcrumbItem.tsx
@@ -0,0 +1,120 @@
+import { isUpdatingRecordEditableNameState } from '@/object-record/states/isUpdatingRecordEditableName';
+import { TextInputV2 } from '@/ui/input/components/TextInputV2';
+import { useOpenEditableBreadCrumbItem } from '@/ui/navigation/bread-crumb/hooks/useOpenEditableBreadCrumbItem';
+import { EditableBreadcrumbItemHotkeyScope } from '@/ui/navigation/bread-crumb/types/EditableBreadcrumbItemHotkeyScope';
+import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
+import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
+import styled from '@emotion/styled';
+import { useRef, useState } from 'react';
+import { useRecoilState } from 'recoil';
+import { Key } from 'ts-key-enum';
+import { isDefined } from 'twenty-ui';
+import { useHotkeyScopeOnMount } from '~/hooks/useHotkeyScopeOnMount';
+
+type EditableBreadcrumbItemProps = {
+  className?: string;
+  defaultValue: string;
+  noValuePlaceholder?: string;
+  placeholder: string;
+  onSubmit: (value: string) => void;
+  hotkeyScope: string;
+};
+
+const StyledButton = styled('button')`
+  align-items: center;
+  background: inherit;
+  border: none;
+  border-radius: ${({ theme }) => theme.border.radius.sm};
+  box-sizing: content-box;
+  color: ${({ theme }) => theme.font.color.primary};
+  cursor: pointer;
+  display: flex;
+  font-family: ${({ theme }) => theme.font.family};
+  font-size: ${({ theme }) => theme.font.size.md};
+  height: 20px;
+  overflow: hidden;
+  text-decoration: none;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+
+  :hover {
+    background: ${({ theme }) => theme.background.transparent.light};
+  }
+`;
+
+export const EditableBreadcrumbItem = ({
+  className,
+  defaultValue,
+  noValuePlaceholder,
+  placeholder,
+  onSubmit,
+}: EditableBreadcrumbItemProps) => {
+  const inputRef = useRef<HTMLInputElement>(null);
+  const buttonRef = useRef<HTMLButtonElement>(null);
+
+  const [isUpdatingRecordEditableName, setIsUpdatingRecordEditableName] =
+    useRecoilState(isUpdatingRecordEditableNameState);
+
+  // TODO: remove this and set the hokey scopes synchronously on page change inside the useNavigateApp hook
+  useHotkeyScopeOnMount(
+    EditableBreadcrumbItemHotkeyScope.EditableBreadcrumbItem,
+  );
+
+  useScopedHotkeys(
+    [Key.Escape],
+    () => {
+      setIsUpdatingRecordEditableName(false);
+    },
+    EditableBreadcrumbItemHotkeyScope.EditableBreadcrumbItem,
+  );
+
+  useScopedHotkeys(
+    [Key.Enter],
+    () => {
+      onSubmit(value);
+      setIsUpdatingRecordEditableName(false);
+    },
+    EditableBreadcrumbItemHotkeyScope.EditableBreadcrumbItem,
+  );
+
+  const clickOutsideRefs: Array<React.RefObject<HTMLElement>> = [
+    inputRef,
+    buttonRef,
+  ];
+
+  useListenClickOutside({
+    refs: clickOutsideRefs,
+    callback: () => {
+      setIsUpdatingRecordEditableName(false);
+    },
+    listenerId: 'editable-breadcrumb-item',
+  });
+
+  const handleFocus = (event: React.FocusEvent<HTMLInputElement>) => {
+    if (isDefined(value)) {
+      event.target.select();
+    }
+  };
+
+  const [value, setValue] = useState<string>(defaultValue);
+
+  const { openEditableBreadCrumbItem } = useOpenEditableBreadCrumbItem();
+
+  return isUpdatingRecordEditableName ? (
+    <TextInputV2
+      className={className}
+      autoGrow
+      sizeVariant="sm"
+      ref={inputRef}
+      value={value}
+      onChange={setValue}
+      placeholder={placeholder}
+      onFocus={handleFocus}
+      autoFocus
+    />
+  ) : (
+    <StyledButton ref={buttonRef} onClick={openEditableBreadCrumbItem}>
+      {value || noValuePlaceholder}
+    </StyledButton>
+  );
+};
diff --git a/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/__stories__/EditableBreadcrumbItem.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/__stories__/EditableBreadcrumbItem.stories.tsx
new file mode 100644
index 000000000000..2a1ec4f9eea1
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/__stories__/EditableBreadcrumbItem.stories.tsx
@@ -0,0 +1,68 @@
+import { expect, jest } from '@storybook/jest';
+import { Meta, StoryObj } from '@storybook/react';
+import { RecoilRoot } from 'recoil';
+
+import { EditableBreadcrumbItemHotkeyScope } from '@/ui/navigation/bread-crumb/types/EditableBreadcrumbItemHotkeyScope';
+
+import { findByText, userEvent } from '@storybook/test';
+import { ComponentDecorator } from 'twenty-ui';
+import { EditableBreadcrumbItem } from '../EditableBreadcrumbItem';
+
+const onSubmit = jest.fn();
+
+const meta: Meta<typeof EditableBreadcrumbItem> = {
+  title: 'UI/Navigation/BreadCrumb/EditableBreadcrumbItem',
+  component: EditableBreadcrumbItem,
+  decorators: [
+    (Story) => (
+      <RecoilRoot>
+        <Story />
+      </RecoilRoot>
+    ),
+    ComponentDecorator,
+  ],
+  args: {
+    defaultValue: 'Company Name',
+    placeholder: 'Enter name',
+    hotkeyScope: EditableBreadcrumbItemHotkeyScope.EditableBreadcrumbItem,
+    onSubmit,
+  },
+};
+
+export default meta;
+type Story = StoryObj<typeof EditableBreadcrumbItem>;
+
+export const Default: Story = {
+  args: {},
+  play: async ({ canvasElement }) => {
+    const button = await findByText(canvasElement, 'Company Name');
+    expect(button).toBeInTheDocument();
+  },
+};
+
+export const Editing: Story = {
+  args: {},
+  play: async ({ canvasElement }) => {
+    const button = canvasElement.querySelector('button');
+    await userEvent.click(button);
+
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
+    await userEvent.keyboard('New Name');
+    await userEvent.keyboard('{Enter}');
+
+    expect(onSubmit).toHaveBeenCalledWith('New Name');
+  },
+};
+
+export const WithNoValue: Story = {
+  args: {
+    defaultValue: '',
+    noValuePlaceholder: 'Untitled',
+  },
+  play: async ({ canvasElement }) => {
+    const button = await findByText(canvasElement, 'Untitled');
+
+    expect(button).toBeInTheDocument();
+  },
+};
diff --git a/packages/twenty-front/src/modules/ui/navigation/bread-crumb/hooks/useOpenEditableBreadCrumbItem.ts b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/hooks/useOpenEditableBreadCrumbItem.ts
new file mode 100644
index 000000000000..e42dca770188
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/hooks/useOpenEditableBreadCrumbItem.ts
@@ -0,0 +1,19 @@
+import { isUpdatingRecordEditableNameState } from '@/object-record/states/isUpdatingRecordEditableName';
+import { EditableBreadcrumbItemHotkeyScope } from '@/ui/navigation/bread-crumb/types/EditableBreadcrumbItemHotkeyScope';
+import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
+import { useSetRecoilState } from 'recoil';
+
+export const useOpenEditableBreadCrumbItem = () => {
+  const setIsUpdatingRecordEditableName = useSetRecoilState(
+    isUpdatingRecordEditableNameState,
+  );
+
+  const setHotkeyScope = useSetHotkeyScope();
+
+  const openEditableBreadCrumbItem = () => {
+    setIsUpdatingRecordEditableName(true);
+    setHotkeyScope(EditableBreadcrumbItemHotkeyScope.EditableBreadcrumbItem);
+  };
+
+  return { openEditableBreadCrumbItem };
+};
diff --git a/packages/twenty-front/src/modules/ui/navigation/bread-crumb/types/EditableBreadcrumbItemHotkeyScope.ts b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/types/EditableBreadcrumbItemHotkeyScope.ts
new file mode 100644
index 000000000000..0bc4d86dd9c5
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/types/EditableBreadcrumbItemHotkeyScope.ts
@@ -0,0 +1,3 @@
+export enum EditableBreadcrumbItemHotkeyScope {
+  EditableBreadcrumbItem = 'editable-breadcrumb-item',
+}
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdownButton.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdownButton.tsx
index 7d7f718f5679..f02f6341a156 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdownButton.tsx
@@ -3,16 +3,13 @@ import { Workspaces } from '@/auth/states/workspaces';
 import { useBuildWorkspaceUrl } from '@/domain-manager/hooks/useBuildWorkspaceUrl';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
-import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { NavigationDrawerAnimatedCollapseWrapper } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper';
 import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo';
 import { MULTI_WORKSPACE_DROPDOWN_ID } from '@/ui/navigation/navigation-drawer/constants/MulitWorkspaceDropdownId';
-import { useWorkspaceSwitching } from '@/ui/navigation/navigation-drawer/hooks/useWorkspaceSwitching';
 import { NavigationDrawerHotKeyScope } from '@/ui/navigation/navigation-drawer/types/NavigationDrawerHotKeyScope';
 import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-import { useState } from 'react';
 import { useRecoilState, useRecoilValue } from 'recoil';
 import {
   Avatar,
@@ -20,6 +17,7 @@ import {
   MenuItemSelectAvatar,
   UndecoratedLink,
 } from 'twenty-ui';
+import { useRedirectToWorkspaceDomain } from '@/domain-manager/hooks/useRedirectToWorkspaceDomain';
 
 const StyledContainer = styled.div<{ isNavigationDrawerExpanded: boolean }>`
   align-items: center;
@@ -45,6 +43,7 @@ const StyledContainer = styled.div<{ isNavigationDrawerExpanded: boolean }>`
 const StyledLabel = styled.div`
   align-items: center;
   display: flex;
+  font-weight: ${({ theme }) => theme.font.weight.medium};
 `;
 
 const StyledIconChevronDown = styled(IconChevronDown)<{ disabled?: boolean }>`
@@ -55,7 +54,7 @@ const StyledIconChevronDown = styled(IconChevronDown)<{ disabled?: boolean }>`
 `;
 
 type MultiWorkspaceDropdownButtonProps = {
-  workspaces: Workspaces[];
+  workspaces: Workspaces;
 };
 
 export const MultiWorkspaceDropdownButton = ({
@@ -63,19 +62,12 @@ export const MultiWorkspaceDropdownButton = ({
 }: MultiWorkspaceDropdownButtonProps) => {
   const theme = useTheme();
   const currentWorkspace = useRecoilValue(currentWorkspaceState);
+  const { redirectToWorkspaceDomain } = useRedirectToWorkspaceDomain();
 
-  const [isMultiWorkspaceDropdownOpen, setToggleMultiWorkspaceDropdown] =
-    useState(false);
-
-  const { switchWorkspace } = useWorkspaceSwitching();
   const { buildWorkspaceUrl } = useBuildWorkspaceUrl();
 
-  const { closeDropdown } = useDropdown(MULTI_WORKSPACE_DROPDOWN_ID);
-
-  const handleChange = async (workspaceId: string) => {
-    setToggleMultiWorkspaceDropdown(!isMultiWorkspaceDropdownOpen);
-    closeDropdown();
-    await switchWorkspace(workspaceId);
+  const handleChange = async (workspace: Workspaces[0]) => {
+    redirectToWorkspaceDomain(workspace.subdomain);
   };
   const [isNavigationDrawerExpanded] = useRecoilState(
     isNavigationDrawerExpandedState,
@@ -115,7 +107,7 @@ export const MultiWorkspaceDropdownButton = ({
               to={buildWorkspaceUrl(workspace.subdomain)}
               onClick={(event) => {
                 event?.preventDefault();
-                handleChange(workspace.id);
+                handleChange(workspace);
               }}
             >
               <MenuItemSelectAvatar
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx
index 6572b66cf662..811c3efd0f12 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx
@@ -101,9 +101,7 @@ export const NavigationDrawer = ({
       className={className}
       initial={false}
       animate={navigationDrawerAnimate}
-      transition={{
-        duration: theme.animation.duration.normal,
-      }}
+      transition={{ duration: theme.animation.duration.normal }}
       isSettings={isSettingsDrawer}
     >
       <StyledContainer
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper.tsx
index 732da1418997..b2effdb47d53 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper.tsx
@@ -43,9 +43,7 @@ export const NavigationDrawerAnimatedCollapseWrapper = ({
     <StyledAnimatedContainer
       initial={false}
       animate={animate}
-      transition={{
-        duration: theme.animation.duration.normal,
-      }}
+      transition={{ duration: theme.animation.duration.normal }}
     >
       {children}
     </StyledAnimatedContainer>
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsx
index ec0c5bcfe061..5dc94d7b1898 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerBackButton.tsx
@@ -6,6 +6,7 @@ import { IconX, UndecoratedLink } from 'twenty-ui';
 import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';
 import { navigationDrawerExpandedMemorizedState } from '@/ui/navigation/states/navigationDrawerExpandedMemorizedState';
 import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
+import { useIsWorkspaceActivationStatusSuspended } from '@/workspace/hooks/useIsWorkspaceActivationStatusSuspended';
 
 type NavigationDrawerBackButtonProps = {
   title: string;
@@ -51,6 +52,11 @@ export const NavigationDrawerBackButton = ({
     navigationDrawerExpandedMemorizedState,
   );
 
+  const isWorkspaceSuspended = useIsWorkspaceActivationStatusSuspended();
+  if (isWorkspaceSuspended) {
+    return <StyledContainer />;
+  }
+
   return (
     <StyledContainer>
       <UndecoratedLink
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx
index 5934d54780af..eed449b0fc8b 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx
@@ -57,11 +57,11 @@ export const NavigationDrawerHeader = ({
     isNavigationDrawerExpandedState,
   );
 
+  const isMultiWorkspace = isMultiWorkspaceEnabled && workspaces.length > 1;
+
   return (
     <StyledContainer>
-      {isMultiWorkspaceEnabled &&
-      workspaces !== null &&
-      workspaces.length > 1 ? (
+      {isMultiWorkspace ? (
         <MultiWorkspaceDropdownButton workspaces={workspaces} />
       ) : (
         <StyledSingleWorkspaceContainer>
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerInput.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerInput.tsx
index 28bdad67b5bf..0266bb39b017 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerInput.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerInput.tsx
@@ -1,23 +1,16 @@
-import { NavigationDrawerAnimatedCollapseWrapper } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper';
-import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';
+import { TextInputV2 } from '@/ui/input/components/TextInputV2';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
-import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-import { ChangeEvent, FocusEvent, useRef } from 'react';
-import { useRecoilState } from 'recoil';
+import { FocusEvent, useRef } from 'react';
 import { Key } from 'ts-key-enum';
-import {
-  IconComponent,
-  isDefined,
-  TablerIconsProps,
-  TEXT_INPUT_STYLE,
-} from 'twenty-ui';
+import { IconComponent, TablerIconsProps, isDefined } from 'twenty-ui';
 import { useHotkeyScopeOnMount } from '~/hooks/useHotkeyScopeOnMount';
 
 type NavigationDrawerInputProps = {
   className?: string;
   Icon?: IconComponent | ((props: TablerIconsProps) => JSX.Element);
+  placeholder?: string;
   value: string;
   onChange: (value: string) => void;
   onSubmit: (value: string) => void;
@@ -26,38 +19,13 @@ type NavigationDrawerInputProps = {
   hotkeyScope: string;
 };
 
-const StyledItem = styled.div<{ isNavigationDrawerExpanded: boolean }>`
-  align-items: center;
-  background-color: ${({ theme }) => theme.background.primary};
-  border: 1px solid ${({ theme }) => theme.color.blue};
-  border-radius: ${({ theme }) => theme.border.radius.sm};
-  box-sizing: content-box;
-  color: ${({ theme }) => theme.font.color.primary};
-  display: flex;
-  font-family: ${({ theme }) => theme.font.family};
-  font-size: ${({ theme }) => theme.font.size.md};
-  height: calc(${({ theme }) => theme.spacing(5)} - 2px);
-  padding: ${({ theme }) => theme.spacing(1)};
-  text-decoration: none;
-  user-select: none;
-`;
-
-const StyledItemElementsContainer = styled.span`
-  align-items: center;
-  gap: ${({ theme }) => theme.spacing(2)};
-  display: flex;
-  width: 100%;
-`;
-
-const StyledTextInput = styled.input`
-  ${TEXT_INPUT_STYLE}
-  margin: 0;
-  width: 100%;
-  padding: 0;
+const StyledInput = styled(TextInputV2)`
+  background-color: white;
 `;
 
 export const NavigationDrawerInput = ({
   className,
+  placeholder,
   Icon,
   value,
   onChange,
@@ -66,10 +34,6 @@ export const NavigationDrawerInput = ({
   onClickOutside,
   hotkeyScope,
 }: NavigationDrawerInputProps) => {
-  const theme = useTheme();
-  const [isNavigationDrawerExpanded] = useRecoilState(
-    isNavigationDrawerExpandedState,
-  );
   const inputRef = useRef<HTMLInputElement>(null);
 
   useHotkeyScopeOnMount(hotkeyScope);
@@ -99,10 +63,6 @@ export const NavigationDrawerInput = ({
     listenerId: 'navigation-drawer-input',
   });
 
-  const handleChange = (event: ChangeEvent<HTMLInputElement>) => {
-    onChange(event.target.value);
-  };
-
   const handleFocus = (event: FocusEvent<HTMLInputElement>) => {
     if (isDefined(value)) {
       event.target.select();
@@ -110,31 +70,16 @@ export const NavigationDrawerInput = ({
   };
 
   return (
-    <StyledItem
+    <StyledInput
       className={className}
-      isNavigationDrawerExpanded={isNavigationDrawerExpanded}
-    >
-      <StyledItemElementsContainer>
-        {Icon && (
-          <Icon
-            style={{
-              minWidth: theme.icon.size.md,
-            }}
-            size={theme.icon.size.md}
-            stroke={theme.icon.stroke.md}
-            color="currentColor"
-          />
-        )}
-        <NavigationDrawerAnimatedCollapseWrapper>
-          <StyledTextInput
-            ref={inputRef}
-            value={value}
-            onChange={handleChange}
-            onFocus={handleFocus}
-            autoFocus
-          />
-        </NavigationDrawerAnimatedCollapseWrapper>
-      </StyledItemElementsContainer>
-    </StyledItem>
+      LeftIcon={Icon}
+      ref={inputRef}
+      value={value}
+      onChange={onChange}
+      placeholder={placeholder}
+      onFocus={handleFocus}
+      fullWidth
+      autoFocus
+    />
   );
 };
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItemInput.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItemInput.tsx
deleted file mode 100644
index 3e920f251692..000000000000
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItemInput.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { TextInput } from '@/ui/input/components/TextInput';
-
-export const NavigationDrawerItemInput = () => {
-  return <TextInput />;
-};
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSection.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSection.tsx
index 4e3711716a6c..c805d7b76cde 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSection.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSection.tsx
@@ -2,9 +2,6 @@ import styled from '@emotion/styled';
 import { useIsMobile } from 'twenty-ui';
 
 const StyledSection = styled.div`
-  display: flex;
-  flex-direction: column;
-  gap: ${({ theme }) => theme.betweenSiblingsGap};
   width: 100%;
   margin-bottom: ${({ theme }) => theme.spacing(3)};
   flex-shrink: 1;
@@ -13,6 +10,9 @@ const StyledSection = styled.div`
 const StyledSectionInnerContainerMinusScrollPadding = styled.div<{
   isMobile: boolean;
 }>`
+  display: flex;
+  flex-direction: column;
+  gap: ${({ theme }) => theme.betweenSiblingsGap};
   width: calc(
     100% - ${({ isMobile, theme }) => (isMobile ? 0 : theme.spacing(2))}
   );
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx
index 84d17d5daaf6..89548a923d21 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx
@@ -19,11 +19,11 @@ import {
   IconUser,
   IconUserCircle,
   IconUsers,
+  getOsControlSymbol,
 } from 'twenty-ui';
 
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
 import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
@@ -35,6 +35,7 @@ import { mockedWorkspaceMemberData } from '~/testing/mock-data/users';
 
 import { CurrentWorkspaceMemberFavoritesFolders } from '@/favorites/components/CurrentWorkspaceMemberFavoritesFolders';
 import { NavigationDrawerSubItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSubItem';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 import jsonPage from '../../../../../../../package.json';
 import { NavigationDrawer } from '../NavigationDrawer';
 import { NavigationDrawerItem } from '../NavigationDrawerItem';
@@ -88,7 +89,7 @@ export const Default: Story = {
           <NavigationDrawerItem
             label="Search"
             Icon={IconSearch}
-            keyboard={['⌘', 'K']}
+            keyboard={[`${getOsControlSymbol()}`, 'K']}
           />
           <NavigationDrawerItem
             label="Settings"
@@ -135,30 +136,30 @@ export const Settings: Story = {
           <NavigationDrawerSectionTitle label="User" />
           <NavigationDrawerItem
             label="Profile"
-            to={getSettingsPagePath(SettingsPath.ProfilePage)}
+            to={getSettingsPath(SettingsPath.ProfilePage)}
             Icon={IconUserCircle}
             active
           />
           <NavigationDrawerItem
             label="Appearance"
-            to={getSettingsPagePath(SettingsPath.Appearance)}
+            to={getSettingsPath(SettingsPath.Experience)}
             Icon={IconColorSwatch}
           />
           <NavigationDrawerItemGroup>
             <NavigationDrawerItem
               label="Accounts"
-              to={getSettingsPagePath(SettingsPath.Accounts)}
+              to={getSettingsPath(SettingsPath.Accounts)}
               Icon={IconAt}
             />
             <NavigationDrawerSubItem
               label="Emails"
-              to={getSettingsPagePath(SettingsPath.AccountsEmails)}
+              to={getSettingsPath(SettingsPath.AccountsEmails)}
               Icon={IconMail}
               subItemState="intermediate-before-selected"
             />
             <NavigationDrawerSubItem
               label="Calendar"
-              to={getSettingsPagePath(SettingsPath.AccountsCalendars)}
+              to={getSettingsPath(SettingsPath.AccountsCalendars)}
               Icon={IconCalendarEvent}
               subItemState="last-selected"
             />
@@ -169,12 +170,12 @@ export const Settings: Story = {
           <NavigationDrawerSectionTitle label="Workspace" />
           <NavigationDrawerItem
             label="General"
-            to={getSettingsPagePath(SettingsPath.Workspace)}
+            to={getSettingsPath(SettingsPath.Workspace)}
             Icon={IconSettings}
           />
           <NavigationDrawerItem
             label="Members"
-            to={getSettingsPagePath(SettingsPath.WorkspaceMembersPage)}
+            to={getSettingsPath(SettingsPath.WorkspaceMembersPage)}
             Icon={IconUsers}
           />
         </NavigationDrawerSection>
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerItem.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerItem.stories.tsx
index 81a0ffe4660b..5a73598450c3 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerItem.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerItem.stories.tsx
@@ -5,6 +5,7 @@ import { CatalogDecorator, CatalogStory, IconSearch } from 'twenty-ui';
 import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
 import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
 
+import { getOsControlSymbol } from '@ui/utilities/device/getOsControlSymbol';
 import { NavigationDrawerItem } from '../NavigationDrawerItem';
 
 const StyledContainer = styled.div`
@@ -188,7 +189,7 @@ export const Catalog: CatalogStory<Story, typeof NavigationDrawerItem> = {
               : adornmentName === 'Count'
                 ? { count: 3 }
                 : adornmentName === 'Keyboard Keys'
-                  ? { keyboard: ['⌘', 'K'] }
+                  ? { keyboard: [getOsControlSymbol(), 'K'] }
                   : {},
         },
       ],
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/useWorkspaceSwitching.ts b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/useWorkspaceSwitching.ts
deleted file mode 100644
index 3066cde0ca26..000000000000
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/useWorkspaceSwitching.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { useRecoilValue } from 'recoil';
-
-import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
-
-import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';
-import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
-import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
-import { useSwitchWorkspaceMutation } from '~/generated/graphql';
-import { isDefined } from '~/utils/isDefined';
-import { useRedirectToDefaultDomain } from '@/domain-manager/hooks/useRedirectToDefaultDomain';
-import { useRedirectToWorkspaceDomain } from '@/domain-manager/hooks/useRedirectToWorkspaceDomain';
-
-export const useWorkspaceSwitching = () => {
-  const [switchWorkspaceMutation] = useSwitchWorkspaceMutation();
-  const currentWorkspace = useRecoilValue(currentWorkspaceState);
-  const isMultiWorkspaceEnabled = useRecoilValue(isMultiWorkspaceEnabledState);
-  const { enqueueSnackBar } = useSnackBar();
-  const { redirectToDefaultDomain } = useRedirectToDefaultDomain();
-  const { redirectToWorkspaceDomain } = useRedirectToWorkspaceDomain();
-
-  const switchWorkspace = async (workspaceId: string) => {
-    if (currentWorkspace?.id === workspaceId) return;
-
-    if (!isMultiWorkspaceEnabled) {
-      return enqueueSnackBar(
-        'Switching workspace is not available in single workspace mode',
-        {
-          variant: SnackBarVariant.Error,
-        },
-      );
-    }
-
-    const { data, errors } = await switchWorkspaceMutation({
-      variables: {
-        workspaceId,
-      },
-    });
-
-    if (isDefined(errors) || !isDefined(data?.switchWorkspace.subdomain)) {
-      return redirectToDefaultDomain();
-    }
-
-    redirectToWorkspaceDomain(data.switchWorkspace.subdomain);
-  };
-
-  return { switchWorkspace };
-};
diff --git a/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/useListenClickOutside.ts b/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/useListenClickOutside.ts
index a57d6ef92e6e..60c45d49eda2 100644
--- a/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/useListenClickOutside.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/useListenClickOutside.ts
@@ -4,6 +4,8 @@ import { useRecoilCallback } from 'recoil';
 import { internalHotkeysEnabledScopesState } from '@/ui/utilities/hotkey/states/internal/internalHotkeysEnabledScopesState';
 import { useClickOustideListenerStates } from '@/ui/utilities/pointer-event/hooks/useClickOustideListenerStates';
 
+const CLICK_OUTSIDE_DEBUG_MODE = false;
+
 export enum ClickOutsideMode {
   comparePixels = 'comparePixels',
   compareHTMLRef = 'compareHTMLRef',
@@ -60,52 +62,60 @@ export const useListenClickOutside = <T extends Element>({
           return;
         }
 
-        if (mode === ClickOutsideMode.compareHTMLRef) {
-          const clickedOnAtLeastOneRef = refs
-            .filter((ref) => !!ref.current)
-            .some((ref) => ref.current?.contains(event.target as Node));
-
-          set(
-            getClickOutsideListenerIsMouseDownInsideState,
-            clickedOnAtLeastOneRef,
-          );
-        }
-
-        if (mode === ClickOutsideMode.comparePixels) {
-          const clickedOnAtLeastOneRef = refs
-            .filter((ref) => !!ref.current)
-            .some((ref) => {
-              if (!ref.current) {
-                return false;
-              }
-
-              const { x, y, width, height } =
-                ref.current.getBoundingClientRect();
-
-              const clientX =
-                'clientX' in event
-                  ? event.clientX
-                  : event.changedTouches[0].clientX;
-              const clientY =
-                'clientY' in event
-                  ? event.clientY
-                  : event.changedTouches[0].clientY;
+        switch (mode) {
+          case ClickOutsideMode.compareHTMLRef: {
+            const clickedOnAtLeastOneRef = refs
+              .filter((ref) => !!ref.current)
+              .some((ref) => ref.current?.contains(event.target as Node));
+
+            set(
+              getClickOutsideListenerIsMouseDownInsideState,
+              clickedOnAtLeastOneRef,
+            );
+            break;
+          }
 
-              if (
-                clientX < x ||
-                clientX > x + width ||
-                clientY < y ||
-                clientY > y + height
-              ) {
-                return false;
-              }
-              return true;
-            });
+          case ClickOutsideMode.comparePixels: {
+            const clickedOnAtLeastOneRef = refs
+              .filter((ref) => !!ref.current)
+              .some((ref) => {
+                if (!ref.current) {
+                  return false;
+                }
+
+                const { x, y, width, height } =
+                  ref.current.getBoundingClientRect();
+
+                const clientX =
+                  'clientX' in event
+                    ? event.clientX
+                    : event.changedTouches[0].clientX;
+                const clientY =
+                  'clientY' in event
+                    ? event.clientY
+                    : event.changedTouches[0].clientY;
+
+                if (
+                  clientX < x ||
+                  clientX > x + width ||
+                  clientY < y ||
+                  clientY > y + height
+                ) {
+                  return false;
+                }
+                return true;
+              });
+
+            set(
+              getClickOutsideListenerIsMouseDownInsideState,
+              clickedOnAtLeastOneRef,
+            );
+            break;
+          }
 
-          set(
-            getClickOutsideListenerIsMouseDownInsideState,
-            clickedOnAtLeastOneRef,
-          );
+          default: {
+            break;
+          }
         }
       },
     [
@@ -171,13 +181,30 @@ export const useListenClickOutside = <T extends Element>({
             .filter((ref) => !!ref.current)
             .some((ref) => ref.current?.contains(event.target as Node));
 
-          if (
+          const shouldTrigger =
             isListening &&
             hasMouseDownHappened &&
             !clickedOnAtLeastOneRef &&
             !isMouseDownInside &&
-            !isClickedOnExcluded
-          ) {
+            !isClickedOnExcluded;
+
+          if (CLICK_OUTSIDE_DEBUG_MODE) {
+            // eslint-disable-next-line no-console
+            console.log('click outside compare refs', {
+              listenerId,
+              shouldTrigger,
+              isListening,
+              hasMouseDownHappened,
+              clickedOnAtLeastOneRef,
+              isMouseDownInside,
+              isClickedOnExcluded,
+              hotkeyScope,
+              enabled,
+              event,
+            });
+          }
+
+          if (shouldTrigger) {
             callback(event);
           }
         }
@@ -213,12 +240,28 @@ export const useListenClickOutside = <T extends Element>({
               return true;
             });
 
-          if (
+          const shouldTrigger =
             !clickedOnAtLeastOneRef &&
             !isMouseDownInside &&
             isListening &&
-            hasMouseDownHappened
-          ) {
+            hasMouseDownHappened;
+
+          if (CLICK_OUTSIDE_DEBUG_MODE) {
+            // eslint-disable-next-line no-console
+            console.log('click outside compare pixel', {
+              listenerId,
+              shouldTrigger,
+              clickedOnAtLeastOneRef,
+              isMouseDownInside,
+              isListening,
+              hasMouseDownHappened,
+              hotkeyScope,
+              enabled,
+              event,
+            });
+          }
+
+          if (shouldTrigger) {
             callback(event);
           }
         }
@@ -233,6 +276,7 @@ export const useListenClickOutside = <T extends Element>({
       refs,
       excludeClassNames,
       callback,
+      listenerId,
     ],
   );
 
diff --git a/packages/twenty-front/src/modules/ui/utilities/scroll/components/ScrollWrapper.tsx b/packages/twenty-front/src/modules/ui/utilities/scroll/components/ScrollWrapper.tsx
index bdc131a28645..0e7af457fe1a 100644
--- a/packages/twenty-front/src/modules/ui/utilities/scroll/components/ScrollWrapper.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/scroll/components/ScrollWrapper.tsx
@@ -9,6 +9,7 @@ import {
 } from '@/ui/utilities/scroll/contexts/ScrollWrapperContexts';
 
 import { ScrollWrapperComponentInstanceContext } from '@/ui/utilities/scroll/states/contexts/ScrollWrapperComponentInstanceContext';
+import { scrollWrapperScrollBottomComponentState } from '@/ui/utilities/scroll/states/scrollWrappeScrollBottomComponentState';
 import { scrollWrapperInstanceComponentState } from '@/ui/utilities/scroll/states/scrollWrapperInstanceComponentState';
 import { scrollWrapperScrollLeftComponentState } from '@/ui/utilities/scroll/states/scrollWrapperScrollLeftComponentState';
 import { scrollWrapperScrollTopComponentState } from '@/ui/utilities/scroll/states/scrollWrapperScrollTopComponentState';
@@ -106,10 +107,18 @@ export const ScrollWrapper = ({
     componentInstanceId,
   );
 
+  const setScrollBottom = useSetRecoilComponentStateV2(
+    scrollWrapperScrollBottomComponentState,
+    componentInstanceId,
+  );
+
   const handleScroll = (overlayScroll: OverlayScrollbars) => {
     const target = overlayScroll.elements().scrollOffsetElement;
     setScrollTop(target.scrollTop);
     setScrollLeft(target.scrollLeft);
+    setScrollBottom(
+      target.scrollHeight - target.clientHeight - target.scrollTop,
+    );
   };
 
   const setOverlayScrollbars = useSetRecoilComponentStateV2(
@@ -129,6 +138,23 @@ export const ScrollWrapper = ({
       },
     },
     events: {
+      updated: (osInstance) => {
+        const {
+          scrollOffsetElement: target,
+          scrollbarVertical,
+          scrollbarHorizontal,
+        } = osInstance.elements();
+
+        if (scrollbarVertical !== null) {
+          scrollbarVertical.track.dataset.selectDisable = 'true';
+        }
+        if (scrollbarHorizontal !== null) {
+          scrollbarHorizontal.track.dataset.selectDisable = 'true';
+        }
+        setScrollBottom(
+          target.scrollHeight - target.clientHeight - target.scrollTop,
+        );
+      },
       scroll: (osInstance) => {
         const { scrollOffsetElement: target, scrollbarVertical } =
           osInstance.elements();
diff --git a/packages/twenty-front/src/modules/ui/utilities/scroll/states/scrollWrappeScrollBottomComponentState.ts b/packages/twenty-front/src/modules/ui/utilities/scroll/states/scrollWrappeScrollBottomComponentState.ts
new file mode 100644
index 000000000000..07b1cb9a0de9
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/utilities/scroll/states/scrollWrappeScrollBottomComponentState.ts
@@ -0,0 +1,9 @@
+import { ScrollWrapperComponentInstanceContext } from '@/ui/utilities/scroll/states/contexts/ScrollWrapperComponentInstanceContext';
+import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
+
+export const scrollWrapperScrollBottomComponentState =
+  createComponentStateV2<number>({
+    key: 'scrollWrapperScrollBottomComponentState',
+    defaultValue: 0,
+    componentInstanceContext: ScrollWrapperComponentInstanceContext,
+  });
diff --git a/packages/twenty-front/src/modules/users/components/UserProviderEffect.tsx b/packages/twenty-front/src/modules/users/components/UserProviderEffect.tsx
index 89ac4e26d07b..9fe65415bd7d 100644
--- a/packages/twenty-front/src/modules/users/components/UserProviderEffect.tsx
+++ b/packages/twenty-front/src/modules/users/components/UserProviderEffect.tsx
@@ -18,6 +18,7 @@ import { getTimeFormatFromWorkspaceTimeFormat } from '@/localization/utils/getTi
 import { ColorScheme } from '@/workspace-member/types/WorkspaceMember';
 import { WorkspaceMember } from '~/generated-metadata/graphql';
 import { useGetCurrentUserQuery } from '~/generated/graphql';
+import { dynamicActivate } from '~/utils/i18n/dynamicActivate';
 import { isDefined } from '~/utils/isDefined';
 
 export const UserProviderEffect = () => {
@@ -91,6 +92,8 @@ export const UserProviderEffect = () => {
           ? getTimeFormatFromWorkspaceTimeFormat(workspaceMember.timeFormat)
           : TimeFormat[detectTimeFormat()],
       });
+
+      dynamicActivate(workspaceMember.locale ?? 'en');
     }
 
     if (isDefined(workspaceMembers)) {
diff --git a/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts b/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts
index 6ec4788d23e2..008d9dc35ebb 100644
--- a/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts
+++ b/packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts
@@ -50,6 +50,10 @@ export const USER_QUERY_FRAGMENT = gql`
         status
         interval
       }
+      billingSubscriptions {
+        id
+        status
+      }
       workspaceMembersCount
     }
     workspaces {
diff --git a/packages/twenty-front/src/modules/views/components/EditableFilterChip.tsx b/packages/twenty-front/src/modules/views/components/EditableFilterChip.tsx
index 48324f5a5c01..09ff2ef4e27a 100644
--- a/packages/twenty-front/src/modules/views/components/EditableFilterChip.tsx
+++ b/packages/twenty-front/src/modules/views/components/EditableFilterChip.tsx
@@ -1,11 +1,11 @@
 import { useIcons } from 'twenty-ui';
 
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
 import { getOperandLabelShort } from '@/object-record/object-filter-dropdown/utils/getOperandLabel';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { SortOrFilterChip } from '@/views/components/SortOrFilterChip';
 
 type EditableFilterChipProps = {
-  viewFilter: Filter;
+  viewFilter: RecordFilter;
   onRemove: () => void;
 };
 
diff --git a/packages/twenty-front/src/modules/views/components/EditableFilterDropdownButton.tsx b/packages/twenty-front/src/modules/views/components/EditableFilterDropdownButton.tsx
index 7424ce73b4dc..de1211f3e006 100644
--- a/packages/twenty-front/src/modules/views/components/EditableFilterDropdownButton.tsx
+++ b/packages/twenty-front/src/modules/views/components/EditableFilterDropdownButton.tsx
@@ -1,23 +1,26 @@
 import { useCallback, useEffect } from 'react';
 
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
-import { FilterOperand } from '@/object-record/object-filter-dropdown/types/FilterOperand';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { EditableFilterChip } from '@/views/components/EditableFilterChip';
-import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 
 import { ObjectFilterOperandSelectAndInput } from '@/object-record/object-filter-dropdown/components/ObjectFilterOperandSelectAndInput';
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
+import { selectedFilterComponentState } from '@/object-record/object-filter-dropdown/states/selectedFilterComponentState';
+import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
+import { useRemoveRecordFilter } from '@/object-record/record-filter/hooks/useRemoveRecordFilter';
+import { RecordFilterOperand } from '@/object-record/record-filter/types/RecordFilterOperand';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 import { useDeleteCombinedViewFilters } from '@/views/hooks/useDeleteCombinedViewFilters';
 import { availableFilterDefinitionsComponentState } from '@/views/states/availableFilterDefinitionsComponentState';
 import { isDefined } from '~/utils/isDefined';
 
 type EditableFilterDropdownButtonProps = {
   viewFilterDropdownId: string;
-  viewFilter: Filter;
+  viewFilter: RecordFilter;
   hotkeyScope: HotkeyScope;
 };
 
@@ -26,13 +29,20 @@ export const EditableFilterDropdownButton = ({
   viewFilter,
   hotkeyScope,
 }: EditableFilterDropdownButtonProps) => {
-  const {
-    setFilterDefinitionUsedInDropdown,
-    setSelectedOperandInDropdown,
-    setSelectedFilter,
-  } = useFilterDropdown({
-    filterDropdownId: viewFilterDropdownId,
-  });
+  const setFilterDefinitionUsedInDropdown = useSetRecoilComponentStateV2(
+    filterDefinitionUsedInDropdownComponentState,
+    viewFilterDropdownId,
+  );
+
+  const setSelectedOperandInDropdown = useSetRecoilComponentStateV2(
+    selectedOperandInDropdownComponentState,
+    viewFilterDropdownId,
+  );
+
+  const setSelectedFilter = useSetRecoilComponentStateV2(
+    selectedFilterComponentState,
+    viewFilterDropdownId,
+  );
 
   // TODO: verify this instance id works
   const availableFilterDefinitions = useRecoilComponentValueV2(
@@ -64,27 +74,31 @@ export const EditableFilterDropdownButton = ({
     viewFilterDropdownId,
   ]);
 
+  const { removeRecordFilter } = useRemoveRecordFilter();
+
   const handleRemove = () => {
     closeDropdown();
 
     deleteCombinedViewFilter(viewFilter.id);
+    removeRecordFilter(viewFilter.fieldMetadataId);
   };
 
   const handleDropdownClickOutside = useCallback(() => {
-    const { id: fieldId, value, operand } = viewFilter;
+    const { id: fieldId, value, operand, fieldMetadataId } = viewFilter;
     if (
       !value &&
       ![
-        FilterOperand.IsEmpty,
-        FilterOperand.IsNotEmpty,
-        ViewFilterOperand.IsInPast,
-        ViewFilterOperand.IsInFuture,
-        ViewFilterOperand.IsToday,
+        RecordFilterOperand.IsEmpty,
+        RecordFilterOperand.IsNotEmpty,
+        RecordFilterOperand.IsInPast,
+        RecordFilterOperand.IsInFuture,
+        RecordFilterOperand.IsToday,
       ].includes(operand)
     ) {
+      removeRecordFilter(fieldMetadataId);
       deleteCombinedViewFilter(fieldId);
     }
-  }, [viewFilter, deleteCombinedViewFilter]);
+  }, [viewFilter, deleteCombinedViewFilter, removeRecordFilter]);
 
   return (
     <Dropdown
diff --git a/packages/twenty-front/src/modules/views/components/QueryParamsFiltersEffect.tsx b/packages/twenty-front/src/modules/views/components/QueryParamsFiltersEffect.tsx
index f811df0ddf6b..11aca3c3f42c 100644
--- a/packages/twenty-front/src/modules/views/components/QueryParamsFiltersEffect.tsx
+++ b/packages/twenty-front/src/modules/views/components/QueryParamsFiltersEffect.tsx
@@ -3,6 +3,7 @@ import { useEffect } from 'react';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { useSetRecoilComponentFamilyStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentFamilyStateV2';
 import { useViewFromQueryParams } from '@/views/hooks/internal/useViewFromQueryParams';
+import { useApplyViewFiltersToCurrentRecordFilters } from '@/views/hooks/useApplyViewFiltersToCurrentRecordFilters';
 import { useResetUnsavedViewStates } from '@/views/hooks/useResetUnsavedViewStates';
 import { currentViewIdComponentState } from '@/views/states/currentViewIdComponentState';
 import { unsavedToUpsertViewFiltersComponentFamilyState } from '@/views/states/unsavedToUpsertViewFiltersComponentFamilyState';
@@ -20,6 +21,9 @@ export const QueryParamsFiltersEffect = () => {
 
   const { resetUnsavedViewStates } = useResetUnsavedViewStates();
 
+  const { applyViewFiltersToCurrentRecordFilters } =
+    useApplyViewFiltersToCurrentRecordFilters();
+
   useEffect(() => {
     if (!hasFiltersQueryParams) {
       return;
@@ -27,10 +31,12 @@ export const QueryParamsFiltersEffect = () => {
 
     getFiltersFromQueryParams().then((filtersFromParams) => {
       if (Array.isArray(filtersFromParams)) {
+        applyViewFiltersToCurrentRecordFilters(filtersFromParams);
         setUnsavedViewFilter(filtersFromParams);
       }
     });
   }, [
+    applyViewFiltersToCurrentRecordFilters,
     getFiltersFromQueryParams,
     hasFiltersQueryParams,
     resetUnsavedViewStates,
diff --git a/packages/twenty-front/src/modules/views/components/VariantFilterChip.tsx b/packages/twenty-front/src/modules/views/components/VariantFilterChip.tsx
index 79834cb7d3c4..71f4fe02dbd3 100644
--- a/packages/twenty-front/src/modules/views/components/VariantFilterChip.tsx
+++ b/packages/twenty-front/src/modules/views/components/VariantFilterChip.tsx
@@ -1,14 +1,15 @@
 import { useIcons } from 'twenty-ui';
 
 import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { useRemoveRecordFilter } from '@/object-record/record-filter/hooks/useRemoveRecordFilter';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { useHandleToggleTrashColumnFilter } from '@/object-record/record-index/hooks/useHandleToggleTrashColumnFilter';
 import { SortOrFilterChip } from '@/views/components/SortOrFilterChip';
 import { useDeleteCombinedViewFilters } from '@/views/hooks/useDeleteCombinedViewFilters';
 import { useParams } from 'react-router-dom';
 
 type VariantFilterChipProps = {
-  viewFilter: Filter;
+  viewFilter: RecordFilter;
   viewBarId: string;
 };
 
@@ -29,10 +30,14 @@ export const VariantFilterChip = ({
     viewBarId,
   });
 
+  const { removeRecordFilter } = useRemoveRecordFilter();
+
   const { getIcon } = useIcons();
 
   const handleRemoveClick = () => {
     deleteCombinedViewFilter(viewFilter.id);
+    removeRecordFilter(viewFilter.fieldMetadataId);
+
     if (
       viewFilter.definition.label === 'Deleted' &&
       viewFilter.operand === 'isNotEmpty'
diff --git a/packages/twenty-front/src/modules/views/components/ViewBar.tsx b/packages/twenty-front/src/modules/views/components/ViewBar.tsx
index 41a0224469ec..73f84fdb77df 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBar.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBar.tsx
@@ -2,8 +2,8 @@ import { ReactNode } from 'react';
 import { useParams } from 'react-router-dom';
 
 import { ObjectFilterDropdownButton } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton';
-import { FiltersHotkeyScope } from '@/object-record/object-filter-dropdown/types/FiltersHotkeyScope';
 import { ObjectSortDropdownButton } from '@/object-record/object-sort-dropdown/components/ObjectSortDropdownButton';
+
 import { useIsPrefetchLoading } from '@/prefetch/hooks/useIsPrefetchLoading';
 import { TopBar } from '@/ui/layout/top-bar/components/TopBar';
 import { QueryParamsFiltersEffect } from '@/views/components/QueryParamsFiltersEffect';
@@ -18,6 +18,10 @@ import { ViewPickerDropdown } from '@/views/view-picker/components/ViewPickerDro
 
 import { ViewsHotkeyScope } from '../types/ViewsHotkeyScope';
 
+import { FiltersHotkeyScope } from '@/object-record/object-filter-dropdown/types/FiltersHotkeyScope';
+import { VIEW_SORT_DROPDOWN_ID } from '@/object-record/object-sort-dropdown/constants/ViewSortDropdownId';
+import { ObjectSortDropdownComponentInstanceContext } from '@/object-record/object-sort-dropdown/states/context/ObjectSortDropdownComponentInstanceContext';
+import { ViewBarRecordFilterEffect } from '@/views/components/ViewBarRecordFilterEffect';
 import { ViewEventContext } from '@/views/events/contexts/ViewEventContext';
 import { UpdateViewButtonGroup } from './UpdateViewButtonGroup';
 import { ViewBarDetails } from './ViewBarDetails';
@@ -38,7 +42,6 @@ export const ViewBar = ({
   const { objectNamePlural } = useParams();
 
   const filterDropdownId = 'view-filter';
-  const sortDropdownId = 'view-sort';
 
   const loading = useIsPrefetchLoading();
 
@@ -47,52 +50,56 @@ export const ViewBar = ({
   }
 
   return (
-    <ViewEventContext.Provider value={{ onCurrentViewChange }}>
-      <ViewBarEffect viewBarId={viewBarId} />
-      <ViewBarFilterEffect filterDropdownId={filterDropdownId} />
-      <ViewBarSortEffect sortDropdownId={sortDropdownId} />
-      <QueryParamsFiltersEffect />
-      <QueryParamsViewIdEffect />
+    <ObjectSortDropdownComponentInstanceContext.Provider
+      value={{ instanceId: VIEW_SORT_DROPDOWN_ID }}
+    >
+      <ViewEventContext.Provider value={{ onCurrentViewChange }}>
+        <ViewBarRecordFilterEffect />
+        <ViewBarEffect viewBarId={viewBarId} />
+        <ViewBarFilterEffect filterDropdownId={filterDropdownId} />
+        <ViewBarSortEffect />
+        <QueryParamsFiltersEffect />
+        <QueryParamsViewIdEffect />
 
-      <ViewBarPageTitle viewBarId={viewBarId} />
-      <TopBar
-        className={className}
-        leftComponent={
-          loading ? <ViewBarSkeletonLoader /> : <ViewPickerDropdown />
-        }
-        rightComponent={
-          <>
-            <ObjectFilterDropdownButton
-              filterDropdownId={filterDropdownId}
-              hotkeyScope={{
-                scope: FiltersHotkeyScope.ObjectFilterDropdownButton,
-              }}
-            />
-            <ObjectSortDropdownButton
-              sortDropdownId={sortDropdownId}
-              hotkeyScope={{
-                scope: FiltersHotkeyScope.ObjectSortDropdownButton,
-              }}
-            />
-            {optionsDropdownButton}
-          </>
-        }
-        bottomComponent={
-          <ViewBarDetails
-            filterDropdownId={filterDropdownId}
-            hasFilterButton
-            viewBarId={viewBarId}
-            objectNamePlural={objectNamePlural}
-            rightComponent={
-              <UpdateViewButtonGroup
+        <ViewBarPageTitle viewBarId={viewBarId} />
+        <TopBar
+          className={className}
+          leftComponent={
+            loading ? <ViewBarSkeletonLoader /> : <ViewPickerDropdown />
+          }
+          rightComponent={
+            <>
+              <ObjectFilterDropdownButton
+                filterDropdownId={filterDropdownId}
                 hotkeyScope={{
-                  scope: ViewsHotkeyScope.UpdateViewButtonDropdown,
+                  scope: FiltersHotkeyScope.ObjectFilterDropdownButton,
                 }}
               />
-            }
-          />
-        }
-      />
-    </ViewEventContext.Provider>
+              <ObjectSortDropdownButton
+                hotkeyScope={{
+                  scope: FiltersHotkeyScope.ObjectSortDropdownButton,
+                }}
+              />
+              {optionsDropdownButton}
+            </>
+          }
+          bottomComponent={
+            <ViewBarDetails
+              filterDropdownId={filterDropdownId}
+              hasFilterButton
+              viewBarId={viewBarId}
+              objectNamePlural={objectNamePlural}
+              rightComponent={
+                <UpdateViewButtonGroup
+                  hotkeyScope={{
+                    scope: ViewsHotkeyScope.UpdateViewButtonDropdown,
+                  }}
+                />
+              }
+            />
+          }
+        />
+      </ViewEventContext.Provider>
+    </ObjectSortDropdownComponentInstanceContext.Provider>
   );
 };
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx b/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx
index e605e3936915..d81bacc00d20 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx
@@ -3,8 +3,8 @@ import { ReactNode, useMemo } from 'react';
 
 import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
 import { AddObjectFilterFromDetailsButton } from '@/object-record/object-filter-dropdown/components/AddObjectFilterFromDetailsButton';
-import { ObjectFilterDropdownScope } from '@/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope';
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { useHandleToggleTrashColumnFilter } from '@/object-record/record-index/hooks/useHandleToggleTrashColumnFilter';
 import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope';
 import { useRecoilComponentFamilyValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentFamilyValueV2';
@@ -14,6 +14,8 @@ import { EditableFilterDropdownButton } from '@/views/components/EditableFilterD
 import { EditableSortChip } from '@/views/components/EditableSortChip';
 import { ViewBarFilterEffect } from '@/views/components/ViewBarFilterEffect';
 import { useViewFromQueryParams } from '@/views/hooks/internal/useViewFromQueryParams';
+
+import { useApplyCurrentViewFiltersToCurrentRecordFilters } from '@/views/hooks/useApplyCurrentViewFiltersToCurrentRecordFilters';
 import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
 import { useResetUnsavedViewStates } from '@/views/hooks/useResetUnsavedViewStates';
 import { availableFilterDefinitionsComponentState } from '@/views/states/availableFilterDefinitionsComponentState';
@@ -167,9 +169,13 @@ export const ViewBarDetails = ({
     };
   }, [currentViewWithCombinedFiltersAndSorts]);
 
+  const { applyCurrentViewFiltersToCurrentRecordFilters } =
+    useApplyCurrentViewFiltersToCurrentRecordFilters();
+
   const handleCancelClick = () => {
     if (isDefined(viewId)) {
       resetUnsavedViewStates(viewId);
+      applyCurrentViewFiltersToCurrentRecordFilters();
       toggleSoftDeleteFilterState(false);
     }
   };
@@ -199,7 +205,7 @@ export const ViewBarDetails = ({
               // Why key defition is already present in the Filter type and added on the fly here with mapViewFiltersToFilters ?
               // Also as filter is spread into viewFilter, definition is present
               // FixMe: Ugly hack to make it work
-              viewFilter={viewFilter as unknown as Filter}
+              viewFilter={viewFilter as unknown as RecordFilter}
               viewBarId={viewBarId}
             />
           ))}
@@ -226,9 +232,9 @@ export const ViewBarDetails = ({
             defaultViewFilters,
             availableFilterDefinitions,
           ).map((viewFilter) => (
-            <ObjectFilterDropdownScope
+            <ObjectFilterDropdownComponentInstanceContext.Provider
               key={viewFilter.id}
-              filterScopeId={viewFilter.id}
+              value={{ instanceId: viewFilter.id }}
             >
               <DropdownScope dropdownScopeId={viewFilter.id}>
                 <ViewBarFilterEffect filterDropdownId={viewFilter.id} />
@@ -240,7 +246,7 @@ export const ViewBarDetails = ({
                   viewFilterDropdownId={viewFilter.id}
                 />
               </DropdownScope>
-            </ObjectFilterDropdownScope>
+            </ObjectFilterDropdownComponentInstanceContext.Provider>
           ))}
         </StyledChipcontainer>
         {hasFilterButton && (
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterEffect.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterEffect.tsx
index 7d8817adf247..61f69af4961c 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterEffect.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterEffect.tsx
@@ -1,16 +1,16 @@
 import { isNonEmptyString } from '@sniptt/guards';
 import { useEffect } from 'react';
-import { useRecoilValue } from 'recoil';
 
-import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 
+import { filterDefinitionUsedInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownComponentState';
+import { objectFilterDropdownSelectedOptionValuesComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedOptionValuesComponentState';
+import { objectFilterDropdownSelectedRecordIdsComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsComponentState';
 import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
-import { useUpsertCombinedViewFilters } from '@/views/hooks/useUpsertCombinedViewFilters';
 import { availableFilterDefinitionsComponentState } from '@/views/states/availableFilterDefinitionsComponentState';
-import { relationFilterValueSchema } from '@/views/view-filter-value/validation-schemas/relationFilterValueSchema';
+import { jsonRelationFilterValueSchema } from '@/views/view-filter-value/validation-schemas/jsonRelationFilterValueSchema';
+import { simpleRelationFilterValueSchema } from '@/views/view-filter-value/validation-schemas/simpleRelationFilterValueSchema';
 import { isDefined } from '~/utils/isDefined';
 
 type ViewBarFilterEffectProps = {
@@ -20,25 +20,28 @@ type ViewBarFilterEffectProps = {
 export const ViewBarFilterEffect = ({
   filterDropdownId,
 }: ViewBarFilterEffectProps) => {
-  const { upsertCombinedViewFilter } = useUpsertCombinedViewFilters();
-
   const { currentViewWithCombinedFiltersAndSorts } = useGetCurrentView();
 
   const availableFilterDefinitions = useRecoilComponentValueV2(
     availableFilterDefinitionsComponentState,
   );
 
-  const {
-    setOnFilterSelect,
-    filterDefinitionUsedInDropdownState,
-    setObjectFilterDropdownSelectedRecordIds,
-    setObjectFilterDropdownSelectedOptionValues,
-  } = useFilterDropdown({ filterDropdownId });
+  const filterDefinitionUsedInDropdown = useRecoilComponentValueV2(
+    filterDefinitionUsedInDropdownComponentState,
+    filterDropdownId,
+  );
 
-  const filterDefinitionUsedInDropdown = useRecoilValue(
-    filterDefinitionUsedInDropdownState,
+  const setObjectFilterDropdownSelectedRecordIds = useSetRecoilComponentStateV2(
+    objectFilterDropdownSelectedRecordIdsComponentState,
+    filterDropdownId,
   );
 
+  const setObjectFilterDropdownSelectedOptionValues =
+    useSetRecoilComponentStateV2(
+      objectFilterDropdownSelectedOptionValuesComponentState,
+      filterDropdownId,
+    );
+
   // TODO: verify this instance id works
   const setAvailableFilterDefinitions = useSetRecoilComponentStateV2(
     availableFilterDefinitionsComponentState,
@@ -49,17 +52,7 @@ export const ViewBarFilterEffect = ({
     if (isDefined(availableFilterDefinitions)) {
       setAvailableFilterDefinitions(availableFilterDefinitions);
     }
-    setOnFilterSelect(() => (filter: Filter | null) => {
-      if (isDefined(filter)) {
-        upsertCombinedViewFilter(filter);
-      }
-    });
-  }, [
-    availableFilterDefinitions,
-    setAvailableFilterDefinitions,
-    setOnFilterSelect,
-    upsertCombinedViewFilter,
-  ]);
+  }, [availableFilterDefinitions, setAvailableFilterDefinitions]);
 
   useEffect(() => {
     if (filterDefinitionUsedInDropdown?.type === 'RELATION') {
@@ -70,10 +63,12 @@ export const ViewBarFilterEffect = ({
             filterDefinitionUsedInDropdown?.fieldMetadataId,
         );
 
-      const { selectedRecordIds } = relationFilterValueSchema
+      const { selectedRecordIds } = jsonRelationFilterValueSchema
         .catch({
           isCurrentWorkspaceMemberSelected: false,
-          selectedRecordIds: [],
+          selectedRecordIds: simpleRelationFilterValueSchema.parse(
+            viewFilterUsedInDropdown?.value,
+          ),
         })
         .parse(viewFilterUsedInDropdown?.value);
 
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarRecordFilterEffect.tsx b/packages/twenty-front/src/modules/views/components/ViewBarRecordFilterEffect.tsx
new file mode 100644
index 000000000000..e5b781432075
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/components/ViewBarRecordFilterEffect.tsx
@@ -0,0 +1,50 @@
+import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
+import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData';
+import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
+import { availableFilterDefinitionsComponentState } from '@/views/states/availableFilterDefinitionsComponentState';
+import { currentViewIdComponentState } from '@/views/states/currentViewIdComponentState';
+import { View } from '@/views/types/View';
+import { mapViewFiltersToFilters } from '@/views/utils/mapViewFiltersToFilters';
+import { useEffect } from 'react';
+import { isDefined } from 'twenty-ui';
+
+export const ViewBarRecordFilterEffect = () => {
+  const { records: views, isDataPrefetched } = usePrefetchedData<View>(
+    PrefetchKey.AllViews,
+  );
+
+  const currentViewId = useRecoilComponentValueV2(currentViewIdComponentState);
+
+  const setCurrentRecordFilters = useSetRecoilComponentStateV2(
+    currentRecordFiltersComponentState,
+  );
+
+  const availableFilterDefinitions = useRecoilComponentValueV2(
+    availableFilterDefinitionsComponentState,
+  );
+
+  useEffect(() => {
+    if (isDataPrefetched) {
+      const currentView = views.find((view) => view.id === currentViewId);
+
+      if (isDefined(currentView)) {
+        setCurrentRecordFilters(
+          mapViewFiltersToFilters(
+            currentView.viewFilters,
+            availableFilterDefinitions,
+          ),
+        );
+      }
+    }
+  }, [
+    isDataPrefetched,
+    views,
+    availableFilterDefinitions,
+    currentViewId,
+    setCurrentRecordFilters,
+  ]);
+
+  return null;
+};
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarSortEffect.tsx b/packages/twenty-front/src/modules/views/components/ViewBarSortEffect.tsx
index 78d00fbf9332..c45dc2ddded7 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarSortEffect.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarSortEffect.tsx
@@ -1,7 +1,6 @@
 import { useEffect } from 'react';
-import { useSetRecoilState } from 'recoil';
 
-import { useSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useSortDropdown';
+import { onSortSelectComponentState } from '@/object-record/object-sort-dropdown/states/onSortSelectScopedState';
 import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
@@ -9,13 +8,7 @@ import { useUpsertCombinedViewSorts } from '@/views/hooks/useUpsertCombinedViewS
 import { availableSortDefinitionsComponentState } from '@/views/states/availableSortDefinitionsComponentState';
 import { isDefined } from '~/utils/isDefined';
 
-type ViewBarSortEffectProps = {
-  sortDropdownId: string;
-};
-
-export const ViewBarSortEffect = ({
-  sortDropdownId,
-}: ViewBarSortEffectProps) => {
+export const ViewBarSortEffect = () => {
   const { upsertCombinedViewSort } = useUpsertCombinedViewSorts();
 
   // TDOO: verify this instance id works
@@ -23,17 +16,13 @@ export const ViewBarSortEffect = ({
     availableSortDefinitionsComponentState,
   );
 
-  const { onSortSelectState } = useSortDropdown({
-    sortDropdownId,
-  });
+  const setOnSortSelect = useSetRecoilComponentStateV2(
+    onSortSelectComponentState,
+  );
 
   // TDOO: verify this instance id works
   const setAvailableSortDefinitionsInSortDropdown =
-    useSetRecoilComponentStateV2(
-      availableSortDefinitionsComponentState,
-      sortDropdownId,
-    );
-  const setOnSortSelect = useSetRecoilState(onSortSelectState);
+    useSetRecoilComponentStateV2(availableSortDefinitionsComponentState);
 
   useEffect(() => {
     if (isDefined(availableSortDefinitions)) {
diff --git a/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyCurrentViewFiltersToCurrentRecordFilters.test.tsx b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyCurrentViewFiltersToCurrentRecordFilters.test.tsx
new file mode 100644
index 000000000000..07f8074cc17e
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyCurrentViewFiltersToCurrentRecordFilters.test.tsx
@@ -0,0 +1,198 @@
+import { act, renderHook } from '@testing-library/react';
+
+import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
+import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { availableFilterDefinitionsComponentState } from '@/views/states/availableFilterDefinitionsComponentState';
+import { currentViewIdComponentState } from '@/views/states/currentViewIdComponentState';
+import { ViewFilter } from '@/views/types/ViewFilter';
+import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
+import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';
+import { useApplyCurrentViewFiltersToCurrentRecordFilters } from '../useApplyCurrentViewFiltersToCurrentRecordFilters';
+
+jest.mock('@/prefetch/hooks/usePrefetchedData');
+
+describe('useApplyCurrentViewFiltersToCurrentRecordFilters', () => {
+  const mockFilterDefinition: RecordFilterDefinition = {
+    fieldMetadataId: 'field-1',
+    label: 'Test Field',
+    type: 'TEXT',
+    iconName: 'IconText',
+  };
+
+  const mockViewFilter: ViewFilter = {
+    __typename: 'ViewFilter',
+    id: 'filter-1',
+    fieldMetadataId: 'field-1',
+    operand: ViewFilterOperand.Contains,
+    value: 'test',
+    displayValue: 'test',
+    viewFilterGroupId: 'group-1',
+    positionInViewFilterGroup: 0,
+    definition: mockFilterDefinition,
+  };
+
+  const mockView = {
+    id: 'view-1',
+    name: 'Test View',
+    objectMetadataId: 'object-1',
+    viewFilters: [mockViewFilter],
+  };
+
+  beforeEach(() => {
+    (usePrefetchedData as jest.Mock).mockReturnValue({
+      records: [mockView],
+    });
+  });
+
+  it('should apply filters from current view', () => {
+    const { result } = renderHook(
+      () => {
+        const { applyCurrentViewFiltersToCurrentRecordFilters } =
+          useApplyCurrentViewFiltersToCurrentRecordFilters();
+
+        const currentFilters = useRecoilComponentValueV2(
+          currentRecordFiltersComponentState,
+        );
+
+        return {
+          applyCurrentViewFiltersToCurrentRecordFilters,
+          currentFilters,
+        };
+      },
+      {
+        wrapper: getJestMetadataAndApolloMocksWrapper({
+          onInitializeRecoilSnapshot: (snapshot) => {
+            snapshot.set(
+              currentViewIdComponentState.atomFamily({
+                instanceId: 'instanceId',
+              }),
+              mockView.id,
+            );
+            snapshot.set(
+              availableFilterDefinitionsComponentState.atomFamily({
+                instanceId: 'instanceId',
+              }),
+              [mockFilterDefinition],
+            );
+          },
+        }),
+      },
+    );
+
+    act(() => {
+      result.current.applyCurrentViewFiltersToCurrentRecordFilters();
+    });
+
+    expect(result.current.currentFilters).toEqual([
+      {
+        id: mockViewFilter.id,
+        fieldMetadataId: mockViewFilter.fieldMetadataId,
+        value: mockViewFilter.value,
+        displayValue: mockViewFilter.displayValue,
+        operand: mockViewFilter.operand,
+        viewFilterGroupId: mockViewFilter.viewFilterGroupId,
+        positionInViewFilterGroup: mockViewFilter.positionInViewFilterGroup,
+        definition: mockFilterDefinition,
+      },
+    ]);
+  });
+
+  it('should not apply filters when current view is not found', () => {
+    (usePrefetchedData as jest.Mock).mockReturnValue({
+      records: [],
+    });
+
+    const { result } = renderHook(
+      () => {
+        const { applyCurrentViewFiltersToCurrentRecordFilters } =
+          useApplyCurrentViewFiltersToCurrentRecordFilters();
+
+        const currentFilters = useRecoilComponentValueV2(
+          currentRecordFiltersComponentState,
+        );
+
+        return {
+          applyCurrentViewFiltersToCurrentRecordFilters,
+          currentFilters,
+        };
+      },
+      {
+        wrapper: getJestMetadataAndApolloMocksWrapper({
+          onInitializeRecoilSnapshot: (snapshot) => {
+            snapshot.set(
+              currentViewIdComponentState.atomFamily({
+                instanceId: 'instanceId',
+              }),
+              mockView.id,
+            );
+            snapshot.set(
+              availableFilterDefinitionsComponentState.atomFamily({
+                instanceId: 'instanceId',
+              }),
+              [mockFilterDefinition],
+            );
+          },
+        }),
+      },
+    );
+
+    act(() => {
+      result.current.applyCurrentViewFiltersToCurrentRecordFilters();
+    });
+
+    expect(result.current.currentFilters).toEqual([]);
+  });
+
+  it('should handle view with empty filters', () => {
+    const viewWithNoFilters = {
+      ...mockView,
+      viewFilters: [],
+    };
+
+    (usePrefetchedData as jest.Mock).mockReturnValue({
+      records: [viewWithNoFilters],
+    });
+
+    const { result } = renderHook(
+      () => {
+        const { applyCurrentViewFiltersToCurrentRecordFilters } =
+          useApplyCurrentViewFiltersToCurrentRecordFilters();
+
+        const currentFilters = useRecoilComponentValueV2(
+          currentRecordFiltersComponentState,
+        );
+
+        return {
+          applyCurrentViewFiltersToCurrentRecordFilters,
+          currentFilters,
+        };
+      },
+      {
+        wrapper: getJestMetadataAndApolloMocksWrapper({
+          onInitializeRecoilSnapshot: (snapshot) => {
+            snapshot.set(
+              currentViewIdComponentState.atomFamily({
+                instanceId: 'instanceId',
+              }),
+              mockView.id,
+            );
+            snapshot.set(
+              availableFilterDefinitionsComponentState.atomFamily({
+                instanceId: 'instanceId',
+              }),
+              [mockFilterDefinition],
+            );
+          },
+        }),
+      },
+    );
+
+    act(() => {
+      result.current.applyCurrentViewFiltersToCurrentRecordFilters();
+    });
+
+    expect(result.current.currentFilters).toEqual([]);
+  });
+});
diff --git a/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyViewFiltersToCurrentRecordFilters.test.tsx b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyViewFiltersToCurrentRecordFilters.test.tsx
new file mode 100644
index 000000000000..d4b74ac83e50
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyViewFiltersToCurrentRecordFilters.test.tsx
@@ -0,0 +1,108 @@
+import { act, renderHook } from '@testing-library/react';
+
+import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { availableFilterDefinitionsComponentState } from '@/views/states/availableFilterDefinitionsComponentState';
+import { ViewFilter } from '@/views/types/ViewFilter';
+import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
+import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';
+import { useApplyViewFiltersToCurrentRecordFilters } from '../useApplyViewFiltersToCurrentRecordFilters';
+
+describe('useApplyViewFiltersToCurrentRecordFilters', () => {
+  const mockAvailableFilterDefinition: RecordFilterDefinition = {
+    fieldMetadataId: 'field-1',
+    label: 'Test Field',
+    type: 'TEXT',
+    iconName: 'IconText',
+  };
+
+  const mockViewFilter: ViewFilter = {
+    __typename: 'ViewFilter',
+    id: 'filter-1',
+    fieldMetadataId: 'field-1',
+    operand: ViewFilterOperand.Contains,
+    value: 'test',
+    displayValue: 'test',
+    viewFilterGroupId: 'group-1',
+    positionInViewFilterGroup: 0,
+    definition: mockAvailableFilterDefinition,
+  };
+
+  it('should apply view filters to current record filters', () => {
+    const { result } = renderHook(
+      () => {
+        const { applyViewFiltersToCurrentRecordFilters } =
+          useApplyViewFiltersToCurrentRecordFilters();
+
+        const currentFilters = useRecoilComponentValueV2(
+          currentRecordFiltersComponentState,
+        );
+
+        return { applyViewFiltersToCurrentRecordFilters, currentFilters };
+      },
+      {
+        wrapper: getJestMetadataAndApolloMocksWrapper({
+          onInitializeRecoilSnapshot: (snapshot) => {
+            snapshot.set(
+              availableFilterDefinitionsComponentState.atomFamily({
+                instanceId: 'instanceId',
+              }),
+              [mockAvailableFilterDefinition],
+            );
+          },
+        }),
+      },
+    );
+
+    act(() => {
+      result.current.applyViewFiltersToCurrentRecordFilters([mockViewFilter]);
+    });
+
+    expect(result.current.currentFilters).toEqual([
+      {
+        id: mockViewFilter.id,
+        fieldMetadataId: mockViewFilter.fieldMetadataId,
+        value: mockViewFilter.value,
+        displayValue: mockViewFilter.displayValue,
+        operand: mockViewFilter.operand,
+        viewFilterGroupId: mockViewFilter.viewFilterGroupId,
+        positionInViewFilterGroup: mockViewFilter.positionInViewFilterGroup,
+        definition: mockAvailableFilterDefinition,
+      },
+    ]);
+  });
+
+  it('should handle empty view filters array', () => {
+    const { result } = renderHook(
+      () => {
+        const { applyViewFiltersToCurrentRecordFilters } =
+          useApplyViewFiltersToCurrentRecordFilters();
+
+        const currentFilters = useRecoilComponentValueV2(
+          currentRecordFiltersComponentState,
+        );
+
+        return { applyViewFiltersToCurrentRecordFilters, currentFilters };
+      },
+      {
+        wrapper: getJestMetadataAndApolloMocksWrapper({
+          onInitializeRecoilSnapshot: (snapshot) => {
+            snapshot.set(
+              availableFilterDefinitionsComponentState.atomFamily({
+                instanceId: 'instanceId',
+              }),
+              [mockAvailableFilterDefinition],
+            );
+          },
+        }),
+      },
+    );
+
+    act(() => {
+      result.current.applyViewFiltersToCurrentRecordFilters([]);
+    });
+
+    expect(result.current.currentFilters).toEqual([]);
+  });
+});
diff --git a/packages/twenty-front/src/modules/views/hooks/internal/useViewFromQueryParams.ts b/packages/twenty-front/src/modules/views/hooks/internal/useViewFromQueryParams.ts
index 4169e4ba12b7..983e3c602c36 100644
--- a/packages/twenty-front/src/modules/views/hooks/internal/useViewFromQueryParams.ts
+++ b/packages/twenty-front/src/modules/views/hooks/internal/useViewFromQueryParams.ts
@@ -16,12 +16,12 @@ import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { generateFindManyRecordsQuery } from '@/object-record/utils/generateFindManyRecordsQuery';
 import { ViewFilter } from '@/views/types/ViewFilter';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
-import { relationFilterValueSchemaObject } from '@/views/view-filter-value/validation-schemas/relationFilterValueSchema';
+import { relationFilterValueSchemaObject } from '@/views/view-filter-value/validation-schemas/jsonRelationFilterValueSchema';
 import { isDefined } from '~/utils/isDefined';
 import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 const filterQueryParamsSchema = z.object({
-  view: z.string().optional(),
+  viewId: z.string().optional(),
   filter: z
     .record(
       z.record(
@@ -59,7 +59,7 @@ export const useViewFromQueryParams = () => {
   const viewIdQueryParam = useMemo(
     () =>
       queryParamsValidation.success
-        ? queryParamsValidation.data.view
+        ? queryParamsValidation.data.viewId
         : undefined,
     [queryParamsValidation],
   );
@@ -112,12 +112,18 @@ export const useViewFromQueryParams = () => {
                         .getValue()
                     : null;
 
+                const satisfiesRelationFilterSchema =
+                  relationFilterValueSchemaObject.safeParse(
+                    filterValueFromURL,
+                  )?.success;
+
                 const relationRecordNames = [];
 
                 if (
                   isNonEmptyString(relationObjectMetadataNamePlural) &&
                   isDefined(relationObjectMetadataItem) &&
-                  Array.isArray(filterValueFromURL)
+                  (Array.isArray(filterValueFromURL) ||
+                    satisfiesRelationFilterSchema)
                 ) {
                   const queryResult = await apolloClient.query<
                     Record<string, { edges: { node: ObjectRecord }[] }>
@@ -127,7 +133,17 @@ export const useViewFromQueryParams = () => {
                       objectMetadataItems,
                     }),
                     variables: {
-                      filter: { id: { in: filterValueFromURL } },
+                      filter: {
+                        id: {
+                          in: satisfiesRelationFilterSchema
+                            ? (
+                                filterValueFromURL as {
+                                  selectedRecordIds: string[];
+                                }
+                              )?.selectedRecordIds
+                            : filterValueFromURL,
+                        },
+                      },
                     },
                   });
 
diff --git a/packages/twenty-front/src/modules/views/hooks/useApplyCurrentViewFiltersToCurrentRecordFilters.ts b/packages/twenty-front/src/modules/views/hooks/useApplyCurrentViewFiltersToCurrentRecordFilters.ts
new file mode 100644
index 000000000000..1bbb5e3660e9
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/hooks/useApplyCurrentViewFiltersToCurrentRecordFilters.ts
@@ -0,0 +1,42 @@
+import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
+import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData';
+import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
+import { availableFilterDefinitionsComponentState } from '@/views/states/availableFilterDefinitionsComponentState';
+import { currentViewIdComponentState } from '@/views/states/currentViewIdComponentState';
+import { View } from '@/views/types/View';
+import { mapViewFiltersToFilters } from '@/views/utils/mapViewFiltersToFilters';
+
+import { isDefined } from 'twenty-ui';
+
+export const useApplyCurrentViewFiltersToCurrentRecordFilters = () => {
+  const { records: views } = usePrefetchedData<View>(PrefetchKey.AllViews);
+
+  const currentViewId = useRecoilComponentValueV2(currentViewIdComponentState);
+
+  const setCurrentRecordFilters = useSetRecoilComponentStateV2(
+    currentRecordFiltersComponentState,
+  );
+
+  const availableFilterDefinitions = useRecoilComponentValueV2(
+    availableFilterDefinitionsComponentState,
+  );
+
+  const applyCurrentViewFiltersToCurrentRecordFilters = () => {
+    const currentView = views.find((view) => view.id === currentViewId);
+
+    if (isDefined(currentView)) {
+      setCurrentRecordFilters(
+        mapViewFiltersToFilters(
+          currentView.viewFilters,
+          availableFilterDefinitions,
+        ),
+      );
+    }
+  };
+
+  return {
+    applyCurrentViewFiltersToCurrentRecordFilters,
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/hooks/useApplyViewFiltersToCurrentRecordFilters.ts b/packages/twenty-front/src/modules/views/hooks/useApplyViewFiltersToCurrentRecordFilters.ts
new file mode 100644
index 000000000000..ceba489a8361
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/hooks/useApplyViewFiltersToCurrentRecordFilters.ts
@@ -0,0 +1,31 @@
+import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
+import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
+import { availableFilterDefinitionsComponentState } from '@/views/states/availableFilterDefinitionsComponentState';
+import { ViewFilter } from '@/views/types/ViewFilter';
+import { mapViewFiltersToFilters } from '@/views/utils/mapViewFiltersToFilters';
+
+export const useApplyViewFiltersToCurrentRecordFilters = () => {
+  const setCurrentRecordFilters = useSetRecoilComponentStateV2(
+    currentRecordFiltersComponentState,
+  );
+
+  const availableFilterDefinitions = useRecoilComponentValueV2(
+    availableFilterDefinitionsComponentState,
+  );
+
+  const applyViewFiltersToCurrentRecordFilters = (
+    viewFilters: ViewFilter[],
+  ) => {
+    const recordFiltersToApply = mapViewFiltersToFilters(
+      viewFilters,
+      availableFilterDefinitions,
+    );
+
+    setCurrentRecordFilters(recordFiltersToApply);
+  };
+
+  return {
+    applyViewFiltersToCurrentRecordFilters,
+  };
+};
diff --git a/packages/twenty-front/src/modules/views/hooks/useSetRecordCountInCurrentView.ts b/packages/twenty-front/src/modules/views/hooks/useSetRecordCountInCurrentView.ts
deleted file mode 100644
index 778fa6906c6f..000000000000
--- a/packages/twenty-front/src/modules/views/hooks/useSetRecordCountInCurrentView.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
-import { entityCountInCurrentViewComponentState } from '@/views/states/entityCountInCurrentViewComponentState';
-
-export const useSetRecordCountInCurrentView = (viewBarComponentId?: string) => {
-  const setEntityCountInCurrentView = useSetRecoilComponentStateV2(
-    entityCountInCurrentViewComponentState,
-    viewBarComponentId,
-  );
-
-  return {
-    setRecordCountInCurrentView: setEntityCountInCurrentView,
-  };
-};
diff --git a/packages/twenty-front/src/modules/views/hooks/useSetViewInUrl.ts b/packages/twenty-front/src/modules/views/hooks/useSetViewInUrl.ts
index 01e0397ffd6d..a9bd6d9a251b 100644
--- a/packages/twenty-front/src/modules/views/hooks/useSetViewInUrl.ts
+++ b/packages/twenty-front/src/modules/views/hooks/useSetViewInUrl.ts
@@ -6,7 +6,7 @@ export const useSetViewInUrl = () => {
   const setViewInUrl = (viewId: string) => {
     setSearchParams(() => {
       const searchParams = new URLSearchParams();
-      searchParams.set('view', viewId);
+      searchParams.set('viewId', viewId);
       return searchParams;
     });
   };
diff --git a/packages/twenty-front/src/modules/views/hooks/useUpdateViewAggregate.ts b/packages/twenty-front/src/modules/views/hooks/useUpdateViewAggregate.ts
index 0dface682345..c9924120a260 100644
--- a/packages/twenty-front/src/modules/views/hooks/useUpdateViewAggregate.ts
+++ b/packages/twenty-front/src/modules/views/hooks/useUpdateViewAggregate.ts
@@ -1,4 +1,5 @@
-import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
+import { ExtendedAggregateOperations } from '@/object-record/record-table/types/ExtendedAggregateOperations';
+import { convertExtendedAggregateOperationToAggregateOperation } from '@/object-record/utils/convertExtendedAggregateOperationToAggregateOperation';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { useUpdateView } from '@/views/hooks/useUpdateView';
 import { currentViewIdComponentState } from '@/views/states/currentViewIdComponentState';
@@ -13,13 +14,18 @@ export const useUpdateViewAggregate = () => {
       kanbanAggregateOperation,
     }: {
       kanbanAggregateOperationFieldMetadataId: string | null;
-      kanbanAggregateOperation: AGGREGATE_OPERATIONS | null;
-    }) =>
+      kanbanAggregateOperation: ExtendedAggregateOperations | null;
+    }) => {
+      const convertedKanbanAggregateOperation =
+        convertExtendedAggregateOperationToAggregateOperation(
+          kanbanAggregateOperation,
+        );
       updateView({
         id: currentViewId,
         kanbanAggregateOperationFieldMetadataId,
-        kanbanAggregateOperation,
-      }),
+        kanbanAggregateOperation: convertedKanbanAggregateOperation,
+      });
+    },
     [currentViewId, updateView],
   );
 
diff --git a/packages/twenty-front/src/modules/views/hooks/useUpsertCombinedViewFilters.ts b/packages/twenty-front/src/modules/views/hooks/useUpsertCombinedViewFilters.ts
index bc4667e5841c..2417f29c6ef8 100644
--- a/packages/twenty-front/src/modules/views/hooks/useUpsertCombinedViewFilters.ts
+++ b/packages/twenty-front/src/modules/views/hooks/useUpsertCombinedViewFilters.ts
@@ -1,6 +1,6 @@
 import { useRecoilCallback } from 'recoil';
 
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { getSnapshotValue } from '@/ui/utilities/recoil-scope/utils/getSnapshotValue';
 import { useRecoilComponentCallbackStateV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackStateV2';
 import { useGetViewFromCache } from '@/views/hooks/useGetViewFromCache';
@@ -33,7 +33,7 @@ export const useUpsertCombinedViewFilters = (viewBarComponentId?: string) => {
 
   const upsertCombinedViewFilter = useRecoilCallback(
     ({ snapshot, set }) =>
-      async (upsertedFilter: Filter) => {
+      async (upsertedFilter: RecordFilter) => {
         const currentViewId = getSnapshotValue(
           snapshot,
           currentViewIdCallbackState,
diff --git a/packages/twenty-front/src/modules/views/states/availableFilterDefinitionsComponentState.ts b/packages/twenty-front/src/modules/views/states/availableFilterDefinitionsComponentState.ts
index 8259d19a6ec9..3f534d2b038a 100644
--- a/packages/twenty-front/src/modules/views/states/availableFilterDefinitionsComponentState.ts
+++ b/packages/twenty-front/src/modules/views/states/availableFilterDefinitionsComponentState.ts
@@ -1,9 +1,9 @@
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
 import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
 import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext';
 
 export const availableFilterDefinitionsComponentState = createComponentStateV2<
-  FilterDefinition[]
+  RecordFilterDefinition[]
 >({
   key: 'availableFilterDefinitionsComponentState',
   defaultValue: [],
diff --git a/packages/twenty-front/src/modules/views/states/entityCountInCurrentViewComponentState.ts b/packages/twenty-front/src/modules/views/states/entityCountInCurrentViewComponentState.ts
deleted file mode 100644
index f189084828ac..000000000000
--- a/packages/twenty-front/src/modules/views/states/entityCountInCurrentViewComponentState.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { createComponentStateV2 } from '@/ui/utilities/state/component-state/utils/createComponentStateV2';
-import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext';
-
-export const entityCountInCurrentViewComponentState = createComponentStateV2<
-  number | undefined
->({
-  key: 'entityCountInCurrentViewComponentState',
-  defaultValue: undefined,
-  componentInstanceContext: ViewComponentInstanceContext,
-});
diff --git a/packages/twenty-front/src/modules/views/types/ViewFilter.ts b/packages/twenty-front/src/modules/views/types/ViewFilter.ts
index a44cab7aee67..07688c88bd12 100644
--- a/packages/twenty-front/src/modules/views/types/ViewFilter.ts
+++ b/packages/twenty-front/src/modules/views/types/ViewFilter.ts
@@ -1,4 +1,4 @@
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
 import { ViewFilterOperand } from './ViewFilterOperand';
 
 export type ViewFilter = {
@@ -14,5 +14,5 @@ export type ViewFilter = {
   viewId?: string;
   viewFilterGroupId?: string;
   positionInViewFilterGroup?: number | null;
-  definition?: FilterDefinition;
+  definition?: RecordFilterDefinition;
 };
diff --git a/packages/twenty-front/src/modules/views/utils/__tests__/mapBoardFieldDefinitionsToViewFields.test.ts b/packages/twenty-front/src/modules/views/utils/__tests__/mapBoardFieldDefinitionsToViewFields.test.ts
index ce5160b1bffb..bca759b20109 100644
--- a/packages/twenty-front/src/modules/views/utils/__tests__/mapBoardFieldDefinitionsToViewFields.test.ts
+++ b/packages/twenty-front/src/modules/views/utils/__tests__/mapBoardFieldDefinitionsToViewFields.test.ts
@@ -10,7 +10,7 @@ describe('mapBoardFieldDefinitionsToViewFields', () => {
         fieldMetadataId: 'fieldMetadataId',
         label: 'label',
         iconName: 'iconName',
-        type: FieldMetadataType.Boolean,
+        type: FieldMetadataType.BOOLEAN,
         metadata: {
           objectMetadataNameSingular: 'objectMetadataNameSingular',
           fieldName: 'fieldName',
@@ -23,7 +23,7 @@ describe('mapBoardFieldDefinitionsToViewFields', () => {
         fieldMetadataId: 'fieldMetadataId1',
         label: 'label1',
         iconName: 'iconName1',
-        type: FieldMetadataType.Number,
+        type: FieldMetadataType.NUMBER,
         metadata: {
           objectMetadataNameSingular: 'objectMetadataNameSingular1',
           fieldName: 'fieldName1',
diff --git a/packages/twenty-front/src/modules/views/utils/__tests__/viewMapFunctions.test.ts b/packages/twenty-front/src/modules/views/utils/__tests__/viewMapFunctions.test.ts
index c191b799d550..dfa4efab8e7f 100644
--- a/packages/twenty-front/src/modules/views/utils/__tests__/viewMapFunctions.test.ts
+++ b/packages/twenty-front/src/modules/views/utils/__tests__/viewMapFunctions.test.ts
@@ -1,6 +1,6 @@
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
 import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
 import { ViewField } from '@/views/types/ViewField';
 import { ViewFilter } from '@/views/types/ViewFilter';
@@ -54,7 +54,7 @@ describe('mapViewFiltersToFilters', () => {
         operand: ViewFilterOperand.Is,
       },
     ];
-    const expectedFilters: Filter[] = [
+    const expectedFilters: RecordFilter[] = [
       {
         id: 'id',
         fieldMetadataId: '05731f68-6e7a-4903-8374-c0b6a9063482',
@@ -94,7 +94,7 @@ describe('mapViewFieldsToColumnDefinitions', () => {
           metadata: { fieldName: 'fieldName 1' },
           infoTooltipContent: 'infoTooltipContent 1',
           iconName: 'iconName 1',
-          type: FieldMetadataType.Text,
+          type: FieldMetadataType.TEXT,
           position: 1,
           size: 1,
           isVisible: false,
@@ -114,7 +114,7 @@ describe('mapViewFieldsToColumnDefinitions', () => {
           metadata: { fieldName: 'fieldName 2' },
           infoTooltipContent: 'infoTooltipContent 2',
           iconName: 'iconName 2',
-          type: FieldMetadataType.Text,
+          type: FieldMetadataType.TEXT,
           position: 2,
           size: 1,
           isVisible: false,
@@ -134,7 +134,7 @@ describe('mapViewFieldsToColumnDefinitions', () => {
           metadata: { fieldName: 'fieldName 3' },
           infoTooltipContent: 'infoTooltipContent 3',
           iconName: 'iconName 3',
-          type: FieldMetadataType.Text,
+          type: FieldMetadataType.TEXT,
           position: 3,
           size: 1,
           isVisible: false,
@@ -151,7 +151,7 @@ describe('mapViewFieldsToColumnDefinitions', () => {
         metadata: { fieldName: 'fieldName 1' },
         infoTooltipContent: 'infoTooltipContent 1',
         iconName: 'iconName 1',
-        type: FieldMetadataType.Text,
+        type: FieldMetadataType.TEXT,
         size: 1,
       },
       {
@@ -161,7 +161,7 @@ describe('mapViewFieldsToColumnDefinitions', () => {
         metadata: { fieldName: 'fieldName 3' },
         infoTooltipContent: 'infoTooltipContent 3',
         iconName: 'iconName 3',
-        type: FieldMetadataType.Text,
+        type: FieldMetadataType.TEXT,
         size: 3,
       },
     ];
@@ -173,7 +173,7 @@ describe('mapViewFieldsToColumnDefinitions', () => {
         metadata: { fieldName: 'fieldName 1' },
         infoTooltipContent: 'infoTooltipContent 1',
         iconName: 'iconName 1',
-        type: FieldMetadataType.Text,
+        type: FieldMetadataType.TEXT,
         size: 1,
         position: 1,
         isVisible: false,
@@ -185,7 +185,7 @@ describe('mapViewFieldsToColumnDefinitions', () => {
         metadata: { fieldName: 'fieldName 3' },
         infoTooltipContent: 'infoTooltipContent 3',
         iconName: 'iconName 3',
-        type: FieldMetadataType.Text,
+        type: FieldMetadataType.TEXT,
         size: 3,
         position: 3,
         isVisible: true,
diff --git a/packages/twenty-front/src/modules/views/utils/getQueryVariablesFromView.ts b/packages/twenty-front/src/modules/views/utils/getQueryVariablesFromView.ts
index 75eb01302fd2..2f3773df95d2 100644
--- a/packages/twenty-front/src/modules/views/utils/getQueryVariablesFromView.ts
+++ b/packages/twenty-front/src/modules/views/utils/getQueryVariablesFromView.ts
@@ -3,7 +3,8 @@ import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { formatFieldMetadataItemsAsFilterDefinitions } from '@/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions';
 import { formatFieldMetadataItemsAsSortDefinitions } from '@/object-metadata/utils/formatFieldMetadataItemsAsSortDefinitions';
 import { turnSortsIntoOrderBy } from '@/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy';
-import { FilterValueDependencies } from '@/object-record/record-filter/types/FilterValueDependencies';
+import { RecordFilterValueDependencies } from '@/object-record/record-filter/types/RecordFilterValueDependencies';
+
 import { computeViewRecordGqlOperationFilter } from '@/object-record/record-filter/utils/computeViewRecordGqlOperationFilter';
 import { View } from '@/views/types/View';
 import { mapViewFiltersToFilters } from '@/views/utils/mapViewFiltersToFilters';
@@ -21,7 +22,7 @@ export const getQueryVariablesFromView = ({
   fieldMetadataItems: FieldMetadataItem[];
   objectMetadataItem: ObjectMetadataItem;
   isJsonFilterEnabled: boolean;
-  filterValueDependencies: FilterValueDependencies;
+  filterValueDependencies: RecordFilterValueDependencies;
 }) => {
   if (!isDefined(view)) {
     return {
diff --git a/packages/twenty-front/src/modules/views/utils/mapViewFiltersToFilters.ts b/packages/twenty-front/src/modules/views/utils/mapViewFiltersToFilters.ts
index 2551637a0223..feff9e41d64c 100644
--- a/packages/twenty-front/src/modules/views/utils/mapViewFiltersToFilters.ts
+++ b/packages/twenty-front/src/modules/views/utils/mapViewFiltersToFilters.ts
@@ -1,13 +1,13 @@
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
-import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { isDefined } from '~/utils/isDefined';
 
+import { RecordFilterDefinition } from '@/object-record/record-filter/types/RecordFilterDefinition';
 import { ViewFilter } from '../types/ViewFilter';
 
 export const mapViewFiltersToFilters = (
   viewFilters: ViewFilter[],
-  availableFilterDefinitions: FilterDefinition[],
-): Filter[] => {
+  availableFilterDefinitions: RecordFilterDefinition[],
+): RecordFilter[] => {
   return viewFilters
     .map((viewFilter) => {
       const availableFilterDefinition = availableFilterDefinitions.find(
diff --git a/packages/twenty-front/src/modules/views/utils/mapViewGroupsToRecordGroupDefinitions.ts b/packages/twenty-front/src/modules/views/utils/mapViewGroupsToRecordGroupDefinitions.ts
index 6a08a970ff66..4bd759ba5e60 100644
--- a/packages/twenty-front/src/modules/views/utils/mapViewGroupsToRecordGroupDefinitions.ts
+++ b/packages/twenty-front/src/modules/views/utils/mapViewGroupsToRecordGroupDefinitions.ts
@@ -22,7 +22,7 @@ export const mapViewGroupsToRecordGroupDefinitions = ({
   const fieldMetadataId = viewGroups?.[0]?.fieldMetadataId;
   const selectFieldMetadataItem = objectMetadataItem.fields.find(
     (field) =>
-      field.id === fieldMetadataId && field.type === FieldMetadataType.Select,
+      field.id === fieldMetadataId && field.type === FieldMetadataType.SELECT,
   );
 
   if (!selectFieldMetadataItem) {
diff --git a/packages/twenty-front/src/modules/views/utils/shouldReplaceFilter.ts b/packages/twenty-front/src/modules/views/utils/shouldReplaceFilter.ts
index ac183045153e..2e4d0f1c8dc4 100644
--- a/packages/twenty-front/src/modules/views/utils/shouldReplaceFilter.ts
+++ b/packages/twenty-front/src/modules/views/utils/shouldReplaceFilter.ts
@@ -1,9 +1,9 @@
-import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
+import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { isDefined } from 'twenty-ui';
 
 export const shouldReplaceFilter = (
-  oldFilter: Pick<Filter, 'id' | 'fieldMetadataId' | 'viewFilterGroupId'>,
-  newFilter: Pick<Filter, 'id' | 'fieldMetadataId' | 'viewFilterGroupId'>,
+  oldFilter: Pick<RecordFilter, 'id' | 'fieldMetadataId' | 'viewFilterGroupId'>,
+  newFilter: Pick<RecordFilter, 'id' | 'fieldMetadataId' | 'viewFilterGroupId'>,
 ) => {
   const isNewFilterAdvancedFilter = isDefined(newFilter.viewFilterGroupId);
 
diff --git a/packages/twenty-front/src/modules/views/view-filter-value/types/RelationFilterValue.ts b/packages/twenty-front/src/modules/views/view-filter-value/types/RelationFilterValue.ts
index 321fa8a93432..165abd67bd40 100644
--- a/packages/twenty-front/src/modules/views/view-filter-value/types/RelationFilterValue.ts
+++ b/packages/twenty-front/src/modules/views/view-filter-value/types/RelationFilterValue.ts
@@ -1,4 +1,4 @@
-import { relationFilterValueSchema } from '@/views/view-filter-value/validation-schemas/relationFilterValueSchema';
+import { jsonRelationFilterValueSchema } from '@/views/view-filter-value/validation-schemas/jsonRelationFilterValueSchema';
 import { z } from 'zod';
 
-export type RelationFilterValue = z.infer<typeof relationFilterValueSchema>;
+export type RelationFilterValue = z.infer<typeof jsonRelationFilterValueSchema>;
diff --git a/packages/twenty-front/src/modules/views/view-filter-value/validation-schemas/relationFilterValueSchema.ts b/packages/twenty-front/src/modules/views/view-filter-value/validation-schemas/jsonRelationFilterValueSchema.ts
similarity index 91%
rename from packages/twenty-front/src/modules/views/view-filter-value/validation-schemas/relationFilterValueSchema.ts
rename to packages/twenty-front/src/modules/views/view-filter-value/validation-schemas/jsonRelationFilterValueSchema.ts
index afbe46718ddc..b47023bc11cb 100644
--- a/packages/twenty-front/src/modules/views/view-filter-value/validation-schemas/relationFilterValueSchema.ts
+++ b/packages/twenty-front/src/modules/views/view-filter-value/validation-schemas/jsonRelationFilterValueSchema.ts
@@ -5,7 +5,7 @@ export const relationFilterValueSchemaObject = z.object({
   selectedRecordIds: z.array(z.string()),
 });
 
-export const relationFilterValueSchema = z
+export const jsonRelationFilterValueSchema = z
   .string()
   .transform((value, ctx) => {
     try {
diff --git a/packages/twenty-front/src/modules/views/view-filter-value/validation-schemas/simpleRelationFilterValueSchema.ts b/packages/twenty-front/src/modules/views/view-filter-value/validation-schemas/simpleRelationFilterValueSchema.ts
new file mode 100644
index 000000000000..93a2ec8670e7
--- /dev/null
+++ b/packages/twenty-front/src/modules/views/view-filter-value/validation-schemas/simpleRelationFilterValueSchema.ts
@@ -0,0 +1,11 @@
+import { z } from 'zod';
+
+export const simpleRelationFilterValueSchema = z
+  .preprocess((value) => {
+    try {
+      return typeof value === 'string' ? JSON.parse(value) : [];
+    } catch {
+      return [];
+    }
+  }, z.array(z.string().uuid()))
+  .catch([]);
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx
index 371a2c6aec52..59709a48f14d 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx
@@ -7,12 +7,12 @@ import {
   useIcons,
 } from 'twenty-ui';
 
+import { recordIndexEntityCountComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexEntityCountComponentSelector';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { StyledDropdownButtonContainer } from '@/ui/layout/dropdown/components/StyledDropdownButtonContainer';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
-import { entityCountInCurrentViewComponentState } from '@/views/states/entityCountInCurrentViewComponentState';
 import { ViewsHotkeyScope } from '@/views/types/ViewsHotkeyScope';
 import { ViewPickerContentCreateMode } from '@/views/view-picker/components/ViewPickerContentCreateMode';
 import { ViewPickerContentEditMode } from '@/views/view-picker/components/ViewPickerContentEditMode';
@@ -55,8 +55,8 @@ export const ViewPickerDropdown = () => {
 
   const { updateViewFromCurrentState } = useUpdateViewFromCurrentState();
 
-  const entityCountInCurrentView = useRecoilComponentValueV2(
-    entityCountInCurrentViewComponentState,
+  const entityCount = useRecoilComponentValueV2(
+    recordIndexEntityCountComponentSelector,
   );
 
   const { isDropdownOpen: isViewsListDropdownOpen } = useDropdown(
@@ -94,9 +94,7 @@ export const ViewPickerDropdown = () => {
             {currentViewWithCombinedFiltersAndSorts?.name ?? 'All'}
           </StyledViewName>
           <StyledDropdownLabelAdornments>
-            {isDefined(entityCountInCurrentView) && (
-              <>· {entityCountInCurrentView} </>
-            )}
+            {isDefined(entityCount) && <>· {entityCount} </>}
             <IconChevronDown size={theme.icon.size.sm} />
           </StyledDropdownLabelAdornments>
         </StyledDropdownButtonContainer>
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
index aae3dc2d7113..0d6155d2e3c8 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
@@ -11,7 +11,6 @@ import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-sta
 import { useChangeView } from '@/views/hooks/useChangeView';
 import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
 import { useUpdateView } from '@/views/hooks/useUpdateView';
-import { View } from '@/views/types/View';
 import { ViewPickerOptionDropdown } from '@/views/view-picker/components/ViewPickerOptionDropdown';
 import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';
 import { viewPickerReferenceViewIdComponentState } from '@/views/view-picker/states/viewPickerReferenceViewIdComponentState';
@@ -85,7 +84,7 @@ export const ViewPickerListContent = () => {
                 isDragDisabled={viewsOnCurrentObject.length === 1}
                 itemComponent={
                   <ViewPickerOptionDropdown
-                    view={view as View}
+                    view={{ ...view, __typename: 'View' }}
                     handleViewSelect={handleViewSelect}
                     isIndexView={isIndexView}
                     onEdit={handleEditViewButtonClick}
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx
index 9cd3fdab1267..1827f2a2d721 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx
@@ -20,7 +20,7 @@ import {
 
 type ViewPickerOptionDropdownProps = {
   isIndexView: boolean;
-  view: View;
+  view: Pick<View, 'id' | 'name' | 'icon' | '__typename'>;
   onEdit: (event: React.MouseEvent<HTMLElement>, viewId: string) => void;
   handleViewSelect: (viewId: string) => void;
 };
diff --git a/packages/twenty-front/src/modules/views/view-picker/hooks/useGetAvailableFieldsForKanban.ts b/packages/twenty-front/src/modules/views/view-picker/hooks/useGetAvailableFieldsForKanban.ts
index 1c49e053986d..c5ab5bb2e668 100644
--- a/packages/twenty-front/src/modules/views/view-picker/hooks/useGetAvailableFieldsForKanban.ts
+++ b/packages/twenty-front/src/modules/views/view-picker/hooks/useGetAvailableFieldsForKanban.ts
@@ -1,12 +1,14 @@
 import { useCallback } from 'react';
-import { useLocation, useNavigate } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
 import { useRecoilValue, useSetRecoilState } from 'recoil';
 
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { SettingsPath } from '@/types/SettingsPath';
 import { navigationMemorizedUrlState } from '@/ui/navigation/states/navigationMemorizedUrlState';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { viewObjectMetadataIdComponentState } from '@/views/states/viewObjectMetadataIdComponentState';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 import { isDefined } from '~/utils/isDefined';
 
 export const useGetAvailableFieldsForKanban = () => {
@@ -25,22 +27,26 @@ export const useGetAvailableFieldsForKanban = () => {
 
   const availableFieldsForKanban =
     objectMetadataItem?.fields.filter(
-      (field) => field.type === FieldMetadataType.Select,
+      (field) => field.type === FieldMetadataType.SELECT,
     ) ?? [];
 
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
 
   const navigateToSelectSettings = useCallback(() => {
     setNavigationMemorizedUrl(location.pathname + location.search);
 
     if (isDefined(objectMetadataItem?.namePlural)) {
       navigate(
-        `/settings/objects/${
-          objectMetadataItem.namePlural
-        }/new-field/configure?fieldType=${FieldMetadataType.Select}`,
+        SettingsPath.ObjectNewFieldConfigure,
+        {
+          objectNamePlural: objectMetadataItem.namePlural,
+        },
+        {
+          fieldType: FieldMetadataType.SELECT,
+        },
       );
     } else {
-      navigate(`/settings/objects`);
+      navigate(SettingsPath.Objects);
     }
   }, [
     setNavigationMemorizedUrl,
diff --git a/packages/twenty-front/src/modules/workflow/components/OverrideWorkflowDraftConfirmationModal.tsx b/packages/twenty-front/src/modules/workflow/components/OverrideWorkflowDraftConfirmationModal.tsx
index 24a2f719840f..ac9c828b5157 100644
--- a/packages/twenty-front/src/modules/workflow/components/OverrideWorkflowDraftConfirmationModal.tsx
+++ b/packages/twenty-front/src/modules/workflow/components/OverrideWorkflowDraftConfirmationModal.tsx
@@ -1,13 +1,14 @@
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { buildShowPageURL } from '@/object-record/record-show/utils/buildShowPageURL';
+import { AppPath } from '@/types/AppPath';
 import {
   ConfirmationModal,
   StyledCenteredButton,
 } from '@/ui/layout/modal/components/ConfirmationModal';
 import { useCreateDraftFromWorkflowVersion } from '@/workflow/hooks/useCreateDraftFromWorkflowVersion';
 import { openOverrideWorkflowDraftConfirmationModalState } from '@/workflow/states/openOverrideWorkflowDraftConfirmationModalState';
-import { useNavigate } from 'react-router-dom';
 import { useRecoilState } from 'recoil';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
+import { getAppPath } from '~/utils/navigation/getAppPath';
 
 export const OverrideWorkflowDraftConfirmationModal = ({
   workflowId,
@@ -24,7 +25,7 @@ export const OverrideWorkflowDraftConfirmationModal = ({
   const { createDraftFromWorkflowVersion } =
     useCreateDraftFromWorkflowVersion();
 
-  const navigate = useNavigate();
+  const navigate = useNavigateApp();
 
   const handleOverrideDraft = async () => {
     await createDraftFromWorkflowVersion({
@@ -32,7 +33,10 @@ export const OverrideWorkflowDraftConfirmationModal = ({
       workflowVersionIdToCopy,
     });
 
-    navigate(buildShowPageURL(CoreObjectNameSingular.Workflow, workflowId));
+    navigate(AppPath.RecordShowPage, {
+      objectNameSingular: CoreObjectNameSingular.Workflow,
+      objectRecordId: workflowId,
+    });
   };
 
   return (
@@ -46,7 +50,10 @@ export const OverrideWorkflowDraftConfirmationModal = ({
         deleteButtonText={'Override Draft'}
         AdditionalButtons={
           <StyledCenteredButton
-            to={buildShowPageURL(CoreObjectNameSingular.Workflow, workflowId)}
+            to={getAppPath(AppPath.RecordShowPage, {
+              objectNameSingular: CoreObjectNameSingular.Workflow,
+              objectRecordId: workflowId,
+            })}
             onClick={() => {
               setOpenOverrideWorkflowDraftConfirmationModal(false);
             }}
diff --git a/packages/twenty-front/src/modules/workflow/components/RecordShowPageWorkflowVersionHeader.tsx b/packages/twenty-front/src/modules/workflow/components/RecordShowPageWorkflowVersionHeader.tsx
index e8ab90fc1df7..e0506ef8d105 100644
--- a/packages/twenty-front/src/modules/workflow/components/RecordShowPageWorkflowVersionHeader.tsx
+++ b/packages/twenty-front/src/modules/workflow/components/RecordShowPageWorkflowVersionHeader.tsx
@@ -1,7 +1,7 @@
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
-import { buildShowPageURL } from '@/object-record/record-show/utils/buildShowPageURL';
+import { AppPath } from '@/types/AppPath';
 import { OverrideWorkflowDraftConfirmationModal } from '@/workflow/components/OverrideWorkflowDraftConfirmationModal';
 import { useActivateWorkflowVersion } from '@/workflow/hooks/useActivateWorkflowVersion';
 import { useCreateDraftFromWorkflowVersion } from '@/workflow/hooks/useCreateDraftFromWorkflowVersion';
@@ -9,7 +9,6 @@ import { useDeactivateWorkflowVersion } from '@/workflow/hooks/useDeactivateWork
 import { useWorkflowVersion } from '@/workflow/hooks/useWorkflowVersion';
 import { openOverrideWorkflowDraftConfirmationModalState } from '@/workflow/states/openOverrideWorkflowDraftConfirmationModalState';
 import { Workflow, WorkflowVersion } from '@/workflow/types/Workflow';
-import { useNavigate } from 'react-router-dom';
 import { useSetRecoilState } from 'recoil';
 import {
   Button,
@@ -18,6 +17,7 @@ import {
   IconPower,
   isDefined,
 } from 'twenty-ui';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
 
 export const RecordShowPageWorkflowVersionHeader = ({
   workflowVersionId,
@@ -81,7 +81,7 @@ export const RecordShowPageWorkflowVersionHeader = ({
     openOverrideWorkflowDraftConfirmationModalState,
   );
 
-  const navigate = useNavigate();
+  const navigate = useNavigateApp();
 
   return (
     <>
@@ -100,12 +100,10 @@ export const RecordShowPageWorkflowVersionHeader = ({
                 workflowVersionIdToCopy: workflowVersion.id,
               });
 
-              navigate(
-                buildShowPageURL(
-                  CoreObjectNameSingular.Workflow,
-                  workflowVersion.workflow.id,
-                ),
-              );
+              navigate(AppPath.RecordShowPage, {
+                objectNameSingular: CoreObjectNameSingular.Workflow,
+                objectRecordId: workflowVersion.workflow.id,
+              });
             }
           }}
         />
diff --git a/packages/twenty-front/src/modules/workflow/graphql/mutations/overrideWorkflowDraftVersion.ts b/packages/twenty-front/src/modules/workflow/graphql/mutations/createDraftFromWorkflowVersion.ts
similarity index 54%
rename from packages/twenty-front/src/modules/workflow/graphql/mutations/overrideWorkflowDraftVersion.ts
rename to packages/twenty-front/src/modules/workflow/graphql/mutations/createDraftFromWorkflowVersion.ts
index 10f5e4464721..3c64c0c49092 100644
--- a/packages/twenty-front/src/modules/workflow/graphql/mutations/overrideWorkflowDraftVersion.ts
+++ b/packages/twenty-front/src/modules/workflow/graphql/mutations/createDraftFromWorkflowVersion.ts
@@ -1,9 +1,11 @@
 import { gql } from '@apollo/client';
 
-export const OVERRIDE_WORKFLOW_DRAFT_VERSION = gql`
+export const CREATE_DRAFT_FROM_WORKFLOW_VERSION = gql`
   mutation CreateDraftFromWorkflowVersion(
     $input: CreateDraftFromWorkflowVersionInput!
   ) {
-    createDraftFromWorkflowVersion(input: $input)
+    createDraftFromWorkflowVersion(input: $input) {
+      id
+    }
   }
 `;
diff --git a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useComputeStepOutputSchema.test.ts b/packages/twenty-front/src/modules/workflow/hooks/__tests__/useComputeStepOutputSchema.test.ts
index 28fe62ad3143..c13f4c1b847c 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useComputeStepOutputSchema.test.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/__tests__/useComputeStepOutputSchema.test.ts
@@ -6,10 +6,7 @@ import { useComputeStepOutputSchema } from '../useComputeStepOutputSchema';
 jest.mock('@apollo/client', () => ({
   ...jest.requireActual('@apollo/client'),
   useMutation: jest.fn(),
-}));
-
-jest.mock('@/object-metadata/hooks/useApolloMetadataClient', () => ({
-  useApolloMetadataClient: () => ({}),
+  useApolloClient: () => ({}),
 }));
 
 describe('useComputeStepOutputSchema', () => {
diff --git a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useCreateNewWorkflowVersion.test.ts b/packages/twenty-front/src/modules/workflow/hooks/__tests__/useCreateNewWorkflowVersion.test.ts
deleted file mode 100644
index cdf59bf359c8..000000000000
--- a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useCreateNewWorkflowVersion.test.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
-import { WorkflowVersion } from '@/workflow/types/Workflow';
-import { renderHook } from '@testing-library/react';
-import { useCreateNewWorkflowVersion } from '../useCreateNewWorkflowVersion';
-
-jest.mock('@/object-record/hooks/useCreateOneRecord', () => ({
-  useCreateOneRecord: jest.fn(),
-}));
-
-describe('useCreateNewWorkflowVersion', () => {
-  it('should create workflow version', async () => {
-    const mockCreateOneRecord = jest.fn();
-    (useCreateOneRecord as jest.Mock).mockImplementation(() => ({
-      createOneRecord: mockCreateOneRecord,
-    }));
-
-    const workflowVersionData = {
-      workflowId: '123',
-      name: 'Test Version',
-      status: 'draft',
-      trigger: { type: 'manual' },
-      steps: [],
-    };
-
-    const { result } = renderHook(() => useCreateNewWorkflowVersion());
-    await result.current.createNewWorkflowVersion(
-      workflowVersionData as unknown as WorkflowVersion,
-    );
-
-    expect(useCreateOneRecord).toHaveBeenCalledWith({
-      objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
-    });
-    expect(mockCreateOneRecord).toHaveBeenCalledWith(workflowVersionData);
-  });
-});
diff --git a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useGetUpdatableWorkflowVersion.test.ts b/packages/twenty-front/src/modules/workflow/hooks/__tests__/useGetUpdatableWorkflowVersion.test.ts
index 295de8110b32..5d808743b75b 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useGetUpdatableWorkflowVersion.test.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/__tests__/useGetUpdatableWorkflowVersion.test.ts
@@ -2,21 +2,11 @@ import { renderHook } from '@testing-library/react';
 import { useGetUpdatableWorkflowVersion } from '@/workflow/hooks/useGetUpdatableWorkflowVersion';
 import { WorkflowWithCurrentVersion } from '@/workflow/types/Workflow';
 
-const mockCreateNewWorkflowVersion = jest.fn().mockResolvedValue({
-  id: '457',
-  name: 'toto',
-  createdAt: '2024-07-03T20:03:35.064Z',
-  updatedAt: '2024-07-03T20:03:35.064Z',
-  workflowId: '123',
-  __typename: 'WorkflowVersion',
-  status: 'DRAFT',
-  steps: [],
-  trigger: null,
-});
+const mockCreateDraftFromWorkflowVersion = jest.fn().mockResolvedValue('457');
 
-jest.mock('@/workflow/hooks/useCreateNewWorkflowVersion', () => ({
-  useCreateNewWorkflowVersion: () => ({
-    createNewWorkflowVersion: mockCreateNewWorkflowVersion,
+jest.mock('@/workflow/hooks/useCreateDraftFromWorkflowVersion', () => ({
+  useCreateDraftFromWorkflowVersion: () => ({
+    createDraftFromWorkflowVersion: mockCreateDraftFromWorkflowVersion,
   }),
 }));
 
@@ -44,19 +34,19 @@ describe('useGetUpdatableWorkflowVersion', () => {
 
   it('should not create workflow version if draft version exists', async () => {
     const { result } = renderHook(() => useGetUpdatableWorkflowVersion());
-    const workflowVersion = await result.current.getUpdatableWorkflowVersion(
+    const workflowVersionId = await result.current.getUpdatableWorkflowVersion(
       mockWorkflow('DRAFT'),
     );
-    expect(mockCreateNewWorkflowVersion).not.toHaveBeenCalled();
-    expect(workflowVersion.id === '456');
+    expect(mockCreateDraftFromWorkflowVersion).not.toHaveBeenCalled();
+    expect(workflowVersionId).toEqual('456');
   });
 
   it('should create workflow version if no draft version exists', async () => {
     const { result } = renderHook(() => useGetUpdatableWorkflowVersion());
-    const workflowVersion = await result.current.getUpdatableWorkflowVersion(
+    const workflowVersionId = await result.current.getUpdatableWorkflowVersion(
       mockWorkflow('ACTIVE'),
     );
-    expect(mockCreateNewWorkflowVersion).toHaveBeenCalled();
-    expect(workflowVersion.id === '457');
+    expect(mockCreateDraftFromWorkflowVersion).toHaveBeenCalled();
+    expect(workflowVersionId).toEqual('457');
   });
 });
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useActivateWorkflowVersion.ts b/packages/twenty-front/src/modules/workflow/hooks/useActivateWorkflowVersion.ts
index 5797c9707399..ab22094437d0 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/useActivateWorkflowVersion.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/useActivateWorkflowVersion.ts
@@ -1,6 +1,6 @@
-import { useApolloMetadataClient } from '@/object-metadata/hooks/useApolloMetadataClient';
 import { useApolloClient, useMutation } from '@apollo/client';
 
+import { triggerUpdateRecordOptimisticEffect } from '@/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffect';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { modifyRecordFromCache } from '@/object-record/cache/utils/modifyRecordFromCache';
@@ -12,13 +12,12 @@ import {
 } from '~/generated/graphql';
 
 export const useActivateWorkflowVersion = () => {
-  const apolloMetadataClient = useApolloMetadataClient();
   const apolloClient = useApolloClient();
   const [mutate] = useMutation<
     ActivateWorkflowVersionMutation,
     ActivateWorkflowVersionMutationVariables
   >(ACTIVATE_WORKFLOW_VERSION, {
-    client: apolloMetadataClient,
+    client: apolloClient,
   });
 
   const { objectMetadataItem: objectMetadataItemWorkflowVersion } =
@@ -56,7 +55,12 @@ export const useActivateWorkflowVersion = () => {
             item.workflowId === workflowId,
         );
 
-        for (const workflowVersion of allWorkflowVersions) {
+        const previousActiveWorkflowVersions = allWorkflowVersions.filter(
+          (version) =>
+            version.status === 'ACTIVE' && version.id !== workflowVersionId,
+        );
+
+        for (const workflowVersion of previousActiveWorkflowVersions) {
           apolloClient.cache.modify({
             id: apolloClient.cache.identify(workflowVersion),
             fields: {
@@ -68,6 +72,17 @@ export const useActivateWorkflowVersion = () => {
               },
             },
           });
+
+          triggerUpdateRecordOptimisticEffect({
+            cache: apolloClient.cache,
+            objectMetadataItem: objectMetadataItemWorkflowVersion,
+            currentRecord: workflowVersion,
+            updatedRecord: {
+              ...workflowVersion,
+              status: 'ARCHIVED',
+            },
+            objectMetadataItems: [objectMetadataItemWorkflowVersion],
+          });
         }
       },
     });
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useComputeStepOutputSchema.ts b/packages/twenty-front/src/modules/workflow/hooks/useComputeStepOutputSchema.ts
index d79f9646d8f5..e632b5ad3f2d 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/useComputeStepOutputSchema.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/useComputeStepOutputSchema.ts
@@ -1,6 +1,5 @@
-import { useApolloMetadataClient } from '@/object-metadata/hooks/useApolloMetadataClient';
 import { COMPUTE_STEP_OUTPUT_SCHEMA } from '@/workflow/graphql/mutations/computeStepOutputSchema';
-import { useMutation } from '@apollo/client';
+import { useApolloClient, useMutation } from '@apollo/client';
 import {
   ComputeStepOutputSchemaInput,
   ComputeStepOutputSchemaMutation,
@@ -8,12 +7,12 @@ import {
 } from '~/generated/graphql';
 
 export const useComputeStepOutputSchema = () => {
-  const apolloMetadataClient = useApolloMetadataClient();
+  const apolloClient = useApolloClient();
   const [mutate] = useMutation<
     ComputeStepOutputSchemaMutation,
     ComputeStepOutputSchemaMutationVariables
   >(COMPUTE_STEP_OUTPUT_SCHEMA, {
-    client: apolloMetadataClient,
+    client: apolloClient,
   });
 
   const computeStepOutputSchema = async (
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useCreateDraftFromWorkflowVersion.ts b/packages/twenty-front/src/modules/workflow/hooks/useCreateDraftFromWorkflowVersion.ts
index 96d480e11870..97cab36a6531 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/useCreateDraftFromWorkflowVersion.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/useCreateDraftFromWorkflowVersion.ts
@@ -1,3 +1,5 @@
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useFindManyRecordsQuery } from '@/object-record/hooks/useFindManyRecordsQuery';
 import { useApolloClient } from '@apollo/client';
 import {
   CreateDraftFromWorkflowVersionInput,
@@ -11,10 +13,35 @@ export const useCreateDraftFromWorkflowVersion = () => {
     client: apolloClient,
   });
 
+  const { findManyRecordsQuery: findManyWorkflowsQuery } =
+    useFindManyRecordsQuery({
+      objectNameSingular: CoreObjectNameSingular.Workflow,
+      recordGqlFields: {
+        id: true,
+        name: true,
+        statuses: true,
+        lastPublishedVersionId: true,
+        versions: true,
+      },
+    });
+
   const createDraftFromWorkflowVersion = async (
     input: CreateDraftFromWorkflowVersionInput,
   ) => {
-    await mutate({ variables: { input } });
+    const result = await mutate({
+      variables: { input },
+      awaitRefetchQueries: true,
+      refetchQueries: [
+        {
+          query: findManyWorkflowsQuery,
+          variables: {
+            id: input.workflowId,
+          },
+        },
+      ],
+    });
+
+    return result?.data?.createDraftFromWorkflowVersion.id;
   };
 
   return {
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useCreateNewWorkflowVersion.ts b/packages/twenty-front/src/modules/workflow/hooks/useCreateNewWorkflowVersion.ts
deleted file mode 100644
index c09614a1358a..000000000000
--- a/packages/twenty-front/src/modules/workflow/hooks/useCreateNewWorkflowVersion.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
-import { WorkflowVersion } from '@/workflow/types/Workflow';
-
-export const useCreateNewWorkflowVersion = () => {
-  const { createOneRecord: createOneWorkflowVersion } =
-    useCreateOneRecord<WorkflowVersion>({
-      objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
-    });
-
-  const createNewWorkflowVersion = async (
-    workflowVersionData: Pick<
-      WorkflowVersion,
-      'workflowId' | 'name' | 'status' | 'trigger' | 'steps'
-    >,
-  ) => {
-    return await createOneWorkflowVersion(workflowVersionData);
-  };
-
-  return {
-    createNewWorkflowVersion,
-  };
-};
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useDeactivateWorkflowVersion.ts b/packages/twenty-front/src/modules/workflow/hooks/useDeactivateWorkflowVersion.ts
index 83257c86ff24..7a03426a00ac 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/useDeactivateWorkflowVersion.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/useDeactivateWorkflowVersion.ts
@@ -1,4 +1,3 @@
-import { useApolloMetadataClient } from '@/object-metadata/hooks/useApolloMetadataClient';
 import { useApolloClient, useMutation } from '@apollo/client';
 
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
@@ -6,18 +5,17 @@ import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSi
 import { modifyRecordFromCache } from '@/object-record/cache/utils/modifyRecordFromCache';
 import { DEACTIVATE_WORKFLOW_VERSION } from '@/workflow/graphql/mutations/deactivateWorkflowVersion';
 import {
-  ActivateWorkflowVersionMutation,
-  ActivateWorkflowVersionMutationVariables,
+  DeactivateWorkflowVersionMutation,
+  DeactivateWorkflowVersionMutationVariables,
 } from '~/generated/graphql';
 
 export const useDeactivateWorkflowVersion = () => {
-  const apolloMetadataClient = useApolloMetadataClient();
   const apolloClient = useApolloClient();
   const [mutate] = useMutation<
-    ActivateWorkflowVersionMutation,
-    ActivateWorkflowVersionMutationVariables
+    DeactivateWorkflowVersionMutation,
+    DeactivateWorkflowVersionMutationVariables
   >(DEACTIVATE_WORKFLOW_VERSION, {
-    client: apolloMetadataClient,
+    client: apolloClient,
   });
 
   const { objectMetadataItem: objectMetadataItemWorkflowVersion } =
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useGetUpdatableWorkflowVersion.ts b/packages/twenty-front/src/modules/workflow/hooks/useGetUpdatableWorkflowVersion.ts
index f2a0c59e18e8..69c101df17c2 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/useGetUpdatableWorkflowVersion.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/useGetUpdatableWorkflowVersion.ts
@@ -1,21 +1,18 @@
 import { WorkflowWithCurrentVersion } from '@/workflow/types/Workflow';
-import { useCreateNewWorkflowVersion } from '@/workflow/hooks/useCreateNewWorkflowVersion';
+import { useCreateDraftFromWorkflowVersion } from '@/workflow/hooks/useCreateDraftFromWorkflowVersion';
 
 export const useGetUpdatableWorkflowVersion = () => {
-  const { createNewWorkflowVersion } = useCreateNewWorkflowVersion();
+  const { createDraftFromWorkflowVersion } =
+    useCreateDraftFromWorkflowVersion();
   const getUpdatableWorkflowVersion = async (
     workflow: WorkflowWithCurrentVersion,
   ) => {
     if (workflow.currentVersion.status === 'DRAFT') {
-      return workflow.currentVersion;
+      return workflow.currentVersion.id;
     }
-
-    return await createNewWorkflowVersion({
+    return await createDraftFromWorkflowVersion({
       workflowId: workflow.id,
-      name: `v${workflow.versions.length + 1}`,
-      status: 'DRAFT',
-      trigger: workflow.currentVersion.trigger,
-      steps: workflow.currentVersion.steps,
+      workflowVersionIdToCopy: workflow.currentVersion.id,
     });
   };
 
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowVersion.tsx b/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowVersion.tsx
index 88019182a262..c14ddc30b705 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowVersion.tsx
+++ b/packages/twenty-front/src/modules/workflow/hooks/useRunWorkflowVersion.tsx
@@ -1,8 +1,7 @@
-import { useApolloMetadataClient } from '@/object-metadata/hooks/useApolloMetadataClient';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { RUN_WORKFLOW_VERSION } from '@/workflow/graphql/mutations/runWorkflowVersion';
-import { useMutation } from '@apollo/client';
+import { useApolloClient, useMutation } from '@apollo/client';
 import { useTheme } from '@emotion/react';
 import { capitalize } from 'twenty-shared';
 import { IconSettingsAutomation } from 'twenty-ui';
@@ -12,12 +11,12 @@ import {
 } from '~/generated/graphql';
 
 export const useRunWorkflowVersion = () => {
-  const apolloMetadataClient = useApolloMetadataClient();
+  const apolloClient = useApolloClient();
   const [mutate] = useMutation<
     RunWorkflowVersionMutation,
     RunWorkflowVersionMutationVariables
   >(RUN_WORKFLOW_VERSION, {
-    client: apolloMetadataClient,
+    client: apolloClient,
   });
 
   const { enqueueSnackBar } = useSnackBar();
diff --git a/packages/twenty-front/src/modules/workflow/states/serverlessFunctionTestDataFamilyState.ts b/packages/twenty-front/src/modules/workflow/states/serverlessFunctionTestDataFamilyState.ts
index 19ad1740931c..4f297fa74bef 100644
--- a/packages/twenty-front/src/modules/workflow/states/serverlessFunctionTestDataFamilyState.ts
+++ b/packages/twenty-front/src/modules/workflow/states/serverlessFunctionTestDataFamilyState.ts
@@ -1,5 +1,5 @@
-import { ServerlessFunctionExecutionStatus } from '~/generated-metadata/graphql';
 import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
+import { ServerlessFunctionExecutionStatus } from '~/generated-metadata/graphql';
 
 export type ServerlessFunctionTestData = {
   input: { [field: string]: any };
@@ -13,8 +13,7 @@ export type ServerlessFunctionTestData = {
   height: number;
 };
 
-export const DEFAULT_OUTPUT_VALUE =
-  'Enter an input above then press "run Function"';
+export const DEFAULT_OUTPUT_VALUE = 'Enter an input above then press "Test"';
 
 export const serverlessFunctionTestDataFamilyState = createFamilyState<
   ServerlessFunctionTestData,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramBaseStepNode.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramBaseStepNode.tsx
index 2b4658712f97..51bb310b6c3f 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramBaseStepNode.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramBaseStepNode.tsx
@@ -1,3 +1,8 @@
+import { NODE_BORDER_WIDTH } from '@/workflow/workflow-diagram/constants/NodeBorderWidth';
+import { NODE_HANDLE_HEIGHT_PX } from '@/workflow/workflow-diagram/constants/NodeHandleHeightPx';
+import { NODE_HANDLE_WIDTH_PX } from '@/workflow/workflow-diagram/constants/NodeHandleWidthPx';
+import { NODE_ICON_LEFT_MARGIN } from '@/workflow/workflow-diagram/constants/NodeIconLeftMargin';
+import { NODE_ICON_WIDTH } from '@/workflow/workflow-diagram/constants/NodeIconWidth';
 import { WorkflowDiagramStepNodeData } from '@/workflow/workflow-diagram/types/WorkflowDiagram';
 import styled from '@emotion/styled';
 import { Handle, Position } from '@xyflow/react';
@@ -11,8 +16,7 @@ const StyledStepNodeContainer = styled.div`
   display: flex;
   flex-direction: column;
 
-  padding-bottom: 12px;
-  padding-top: 6px;
+  padding-block: ${({ theme }) => theme.spacing(3)};
 `;
 
 const StyledStepNodeType = styled.div`
@@ -21,7 +25,7 @@ const StyledStepNodeType = styled.div`
     ${({ theme }) => theme.border.radius.sm} 0 0;
 
   color: ${({ theme }) => theme.font.color.light};
-  font-size: ${({ theme }) => theme.font.size.md};
+  font-size: 9px;
   font-weight: ${({ theme }) => theme.font.weight.semiBold};
 
   margin-left: ${({ theme }) => theme.spacing(2)};
@@ -38,9 +42,8 @@ const StyledStepNodeType = styled.div`
 
 const StyledStepNodeInnerContainer = styled.div<{ variant?: Variant }>`
   background-color: ${({ theme }) => theme.background.secondary};
-  border: 1px solid ${({ theme }) => theme.border.color.medium};
-  border-style: ${({ variant }) =>
-    variant === 'placeholder' ? 'dashed' : null};
+  border: ${NODE_BORDER_WIDTH}px solid
+    ${({ theme }) => theme.border.color.medium};
   border-radius: ${({ theme }) => theme.border.radius.md};
   display: flex;
   gap: ${({ theme }) => theme.spacing(2)};
@@ -48,7 +51,7 @@ const StyledStepNodeInnerContainer = styled.div<{ variant?: Variant }>`
 
   position: relative;
   box-shadow: ${({ variant, theme }) =>
-    variant === 'placeholder' ? 'none' : theme.boxShadow.superHeavy};
+    variant === 'placeholder' ? 'none' : theme.boxShadow.strong};
 
   .selectable.selected &,
   .selectable:focus &,
@@ -61,9 +64,9 @@ const StyledStepNodeInnerContainer = styled.div<{ variant?: Variant }>`
 const StyledStepNodeLabel = styled.div<{ variant?: Variant }>`
   align-items: center;
   display: flex;
-  font-size: ${({ theme }) => theme.font.size.lg};
+  font-size: 13px;
   font-weight: ${({ theme }) => theme.font.weight.medium};
-  column-gap: ${({ theme }) => theme.spacing(3)};
+  column-gap: ${({ theme }) => theme.spacing(2)};
   color: ${({ variant, theme }) =>
     variant === 'placeholder'
       ? theme.font.color.extraLight
@@ -71,11 +74,19 @@ const StyledStepNodeLabel = styled.div<{ variant?: Variant }>`
   max-width: 200px;
 `;
 
-const StyledSourceHandle = styled(Handle)`
-  background-color: ${({ theme }) => theme.color.gray50};
+export const StyledHandle = styled(Handle)`
+  background-color: ${({ theme }) => theme.grayScale.gray25};
+  border: none;
+  width: ${NODE_HANDLE_WIDTH_PX}px;
+  height: ${NODE_HANDLE_HEIGHT_PX}px;
 `;
 
-export const StyledTargetHandle = styled(Handle)`
+const StyledSourceHandle = styled(StyledHandle)`
+  left: ${NODE_ICON_WIDTH + NODE_ICON_LEFT_MARGIN + NODE_BORDER_WIDTH}px;
+`;
+
+const StyledTargetHandle = styled(StyledSourceHandle)`
+  left: ${NODE_ICON_WIDTH + NODE_ICON_LEFT_MARGIN + NODE_BORDER_WIDTH}px;
   visibility: hidden;
 `;
 
@@ -83,7 +94,7 @@ const StyledRightFloatingElementContainer = styled.div`
   display: flex;
   align-items: center;
   position: absolute;
-  right: ${({ theme }) => theme.spacing(-3)};
+  right: ${({ theme }) => theme.spacing(-4)};
   bottom: 0;
   top: 0;
   transform: translateX(100%);
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsx
index 576fa288c41b..6007f2268b5d 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasBase.tsx
@@ -1,13 +1,12 @@
+import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
 import { useListenRightDrawerClose } from '@/ui/layout/right-drawer/hooks/useListenRightDrawerClose';
-import { isRightDrawerMinimizedState } from '@/ui/layout/right-drawer/states/isRightDrawerMinimizedState';
-import { isRightDrawerOpenState } from '@/ui/layout/right-drawer/states/isRightDrawerOpenState';
-import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 import { WorkflowVersionStatus } from '@/workflow/types/Workflow';
+import { WorkflowDiagramCustomMarkers } from '@/workflow/workflow-diagram/components/WorkflowDiagramCustomMarkers';
 import { WorkflowVersionStatusTag } from '@/workflow/workflow-diagram/components/WorkflowVersionStatusTag';
+import { useRightDrawerState } from '@/workflow/workflow-diagram/hooks/useRightDrawerState';
 import { workflowDiagramState } from '@/workflow/workflow-diagram/states/workflowDiagramState';
 import { workflowReactFlowRefState } from '@/workflow/workflow-diagram/states/workflowReactFlowRefState';
 import {
-  WorkflowDiagram,
   WorkflowDiagramEdge,
   WorkflowDiagramNode,
   WorkflowDiagramNodeType,
@@ -16,21 +15,21 @@ import { getOrganizedDiagram } from '@/workflow/workflow-diagram/utils/getOrgani
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import {
-  applyEdgeChanges,
-  applyNodeChanges,
   Background,
   EdgeChange,
   FitViewOptions,
-  getNodesBounds,
   NodeChange,
   NodeProps,
   ReactFlow,
+  applyEdgeChanges,
+  applyNodeChanges,
+  getNodesBounds,
   useReactFlow,
 } from '@xyflow/react';
 import '@xyflow/react/dist/style.css';
 import React, { useEffect, useMemo, useRef } from 'react';
 import { useRecoilValue, useSetRecoilState } from 'recoil';
-import { isDefined, THEME_COMMON } from 'twenty-ui';
+import { THEME_COMMON, isDefined } from 'twenty-ui';
 
 const StyledResetReactflowStyles = styled.div`
   height: 100%;
@@ -48,6 +47,20 @@ const StyledResetReactflowStyles = styled.div`
     white-space: nowrap;
   }
 
+  .react-flow__handle {
+    min-height: 0;
+    min-width: 0;
+  }
+  .react-flow__handle-top {
+    transform: translate(-50%, -50%);
+  }
+  .react-flow__handle-bottom {
+    transform: translate(-50%, 100%);
+  }
+  .react-flow__handle.connectionindicator {
+    cursor: pointer;
+  }
+
   --xy-node-border-radius: none;
   --xy-node-border: none;
   --xy-node-background-color: none;
@@ -68,12 +81,10 @@ const defaultFitViewOptions = {
 } satisfies FitViewOptions;
 
 export const WorkflowDiagramCanvasBase = ({
-  diagram,
   status,
   nodeTypes,
   children,
 }: {
-  diagram: WorkflowDiagram;
   status: WorkflowVersionStatus;
   nodeTypes: Partial<
     Record<
@@ -95,22 +106,17 @@ export const WorkflowDiagramCanvasBase = ({
     workflowReactFlowRefState,
   );
 
+  const workflowDiagram = useRecoilValue(workflowDiagramState);
+
   const { nodes, edges } = useMemo(
-    () => getOrganizedDiagram(diagram),
-    [diagram],
+    () =>
+      isDefined(workflowDiagram)
+        ? getOrganizedDiagram(workflowDiagram)
+        : { nodes: [], edges: [] },
+    [workflowDiagram],
   );
 
-  const isRightDrawerOpen = useRecoilValue(isRightDrawerOpenState);
-  const isRightDrawerMinimized = useRecoilValue(isRightDrawerMinimizedState);
-  const isMobile = useIsMobile();
-
-  const rightDrawerState = !isRightDrawerOpen
-    ? 'closed'
-    : isRightDrawerMinimized
-      ? 'minimized'
-      : isMobile
-        ? 'fullScreen'
-        : 'normal';
+  const { rightDrawerState } = useRightDrawerState();
 
   const rightDrawerWidth = Number(
     THEME_COMMON.rightDrawerWidth.replace('px', ''),
@@ -187,8 +193,12 @@ export const WorkflowDiagramCanvasBase = ({
     );
   }, [reactflow, rightDrawerState, rightDrawerWidth]);
 
+  const { closeCommandMenu } = useCommandMenu();
+
   return (
     <StyledResetReactflowStyles ref={containerRef}>
+      <WorkflowDiagramCustomMarkers />
+
       <ReactFlow
         ref={(node) => {
           if (isDefined(node)) {
@@ -220,6 +230,8 @@ export const WorkflowDiagramCanvasBase = ({
         nodesFocusable={false}
         edgesFocusable={false}
         nodesDraggable={false}
+        onPaneClick={closeCommandMenu}
+        nodesConnectable={false}
         paneClickDistance={10} // Fix small unwanted user dragging does not select node
       >
         <Background color={theme.border.color.medium} size={2} />
@@ -227,7 +239,7 @@ export const WorkflowDiagramCanvasBase = ({
         {children}
       </ReactFlow>
 
-      <StyledStatusTagContainer>
+      <StyledStatusTagContainer data-testid="workflow-visualizer-status">
         <WorkflowVersionStatusTag versionStatus={status} />
       </StyledStatusTagContainer>
     </StyledResetReactflowStyles>
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditable.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditable.tsx
index e14ad6879fc6..e9dee1613946 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditable.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditable.tsx
@@ -4,29 +4,24 @@ import { WorkflowDiagramCanvasEditableEffect } from '@/workflow/workflow-diagram
 import { WorkflowDiagramCreateStepNode } from '@/workflow/workflow-diagram/components/WorkflowDiagramCreateStepNode';
 import { WorkflowDiagramEmptyTrigger } from '@/workflow/workflow-diagram/components/WorkflowDiagramEmptyTrigger';
 import { WorkflowDiagramStepNodeEditable } from '@/workflow/workflow-diagram/components/WorkflowDiagramStepNodeEditable';
-import { WorkflowDiagram } from '@/workflow/workflow-diagram/types/WorkflowDiagram';
 import { ReactFlowProvider } from '@xyflow/react';
 
 export const WorkflowDiagramCanvasEditable = ({
-  diagram,
   workflowWithCurrentVersion,
 }: {
-  diagram: WorkflowDiagram;
   workflowWithCurrentVersion: WorkflowWithCurrentVersion;
 }) => {
   return (
     <ReactFlowProvider>
       <WorkflowDiagramCanvasBase
-        diagram={diagram}
         status={workflowWithCurrentVersion.currentVersion.status}
         nodeTypes={{
           default: WorkflowDiagramStepNodeEditable,
           'create-step': WorkflowDiagramCreateStepNode,
           'empty-trigger': WorkflowDiagramEmptyTrigger,
         }}
-      >
-        <WorkflowDiagramCanvasEditableEffect />
-      </WorkflowDiagramCanvasBase>
+      />
+      <WorkflowDiagramCanvasEditableEffect />
     </ReactFlowProvider>
   );
 };
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditableEffect.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditableEffect.tsx
index c8b8c4dc8f3b..ebb581ad5834 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditableEffect.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditableEffect.tsx
@@ -1,3 +1,4 @@
+import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
 import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer';
 import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope';
 import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages';
@@ -7,16 +8,22 @@ import { EMPTY_TRIGGER_STEP_ID } from '@/workflow/workflow-diagram/constants/Emp
 import { useStartNodeCreation } from '@/workflow/workflow-diagram/hooks/useStartNodeCreation';
 import { useTriggerNodeSelection } from '@/workflow/workflow-diagram/hooks/useTriggerNodeSelection';
 import { workflowSelectedNodeState } from '@/workflow/workflow-diagram/states/workflowSelectedNodeState';
-import { WorkflowDiagramNode } from '@/workflow/workflow-diagram/types/WorkflowDiagram';
+import {
+  WorkflowDiagramNode,
+  WorkflowDiagramStepNodeData,
+} from '@/workflow/workflow-diagram/types/WorkflowDiagram';
+import { getWorkflowNodeIcon } from '@/workflow/workflow-diagram/utils/getWorkflowNodeIcon';
 import { OnSelectionChangeParams, useOnSelectionChange } from '@xyflow/react';
 import { useCallback } from 'react';
 import { useSetRecoilState } from 'recoil';
-import { isDefined } from 'twenty-ui';
+import { IconBolt, isDefined } from 'twenty-ui';
 
 export const WorkflowDiagramCanvasEditableEffect = () => {
   const { startNodeCreation } = useStartNodeCreation();
 
   const { openRightDrawer, closeRightDrawer } = useRightDrawer();
+  const { closeCommandMenu } = useCommandMenu();
+
   const setHotkeyScope = useSetHotkeyScope();
 
   const setWorkflowSelectedNode = useSetRecoilState(workflowSelectedNodeState);
@@ -28,13 +35,16 @@ export const WorkflowDiagramCanvasEditableEffect = () => {
 
       if (isClosingStep) {
         closeRightDrawer();
-
+        closeCommandMenu();
         return;
       }
 
       const isEmptyTriggerNode = selectedNode.type === EMPTY_TRIGGER_STEP_ID;
       if (isEmptyTriggerNode) {
-        openRightDrawer(RightDrawerPages.WorkflowStepSelectTriggerType);
+        openRightDrawer(RightDrawerPages.WorkflowStepSelectTriggerType, {
+          title: 'Trigger Type',
+          Icon: IconBolt,
+        });
 
         return;
       }
@@ -50,15 +60,21 @@ export const WorkflowDiagramCanvasEditableEffect = () => {
         return;
       }
 
+      const selectedNodeData = selectedNode.data as WorkflowDiagramStepNodeData;
+
       setWorkflowSelectedNode(selectedNode.id);
       setHotkeyScope(RightDrawerHotkeyScope.RightDrawer, { goto: false });
-      openRightDrawer(RightDrawerPages.WorkflowStepEdit);
+      openRightDrawer(RightDrawerPages.WorkflowStepEdit, {
+        title: selectedNodeData.name,
+        Icon: getWorkflowNodeIcon(selectedNodeData),
+      });
     },
     [
+      setWorkflowSelectedNode,
       setHotkeyScope,
-      closeRightDrawer,
       openRightDrawer,
-      setWorkflowSelectedNode,
+      closeRightDrawer,
+      closeCommandMenu,
       startNodeCreation,
     ],
   );
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasReadonly.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasReadonly.tsx
index 8a7b42902337..c48388e9c06d 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasReadonly.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasReadonly.tsx
@@ -3,28 +3,23 @@ import { WorkflowDiagramCanvasBase } from '@/workflow/workflow-diagram/component
 import { WorkflowDiagramCanvasReadonlyEffect } from '@/workflow/workflow-diagram/components/WorkflowDiagramCanvasReadonlyEffect';
 import { WorkflowDiagramEmptyTrigger } from '@/workflow/workflow-diagram/components/WorkflowDiagramEmptyTrigger';
 import { WorkflowDiagramStepNodeReadonly } from '@/workflow/workflow-diagram/components/WorkflowDiagramStepNodeReadonly';
-import { WorkflowDiagram } from '@/workflow/workflow-diagram/types/WorkflowDiagram';
 import { ReactFlowProvider } from '@xyflow/react';
 
 export const WorkflowDiagramCanvasReadonly = ({
-  diagram,
   workflowVersion,
 }: {
-  diagram: WorkflowDiagram;
   workflowVersion: WorkflowVersion;
 }) => {
   return (
     <ReactFlowProvider>
       <WorkflowDiagramCanvasBase
-        diagram={diagram}
         status={workflowVersion.status}
         nodeTypes={{
           default: WorkflowDiagramStepNodeReadonly,
           'empty-trigger': WorkflowDiagramEmptyTrigger,
         }}
-      >
-        <WorkflowDiagramCanvasReadonlyEffect />
-      </WorkflowDiagramCanvasBase>
+      />
+      <WorkflowDiagramCanvasReadonlyEffect />
     </ReactFlowProvider>
   );
 };
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasReadonlyEffect.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasReadonlyEffect.tsx
index f14acd87f54a..0f2a11c30d00 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasReadonlyEffect.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCanvasReadonlyEffect.tsx
@@ -1,10 +1,15 @@
+import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
 import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer';
 import { RightDrawerHotkeyScope } from '@/ui/layout/right-drawer/types/RightDrawerHotkeyScope';
 import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages';
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
 import { useTriggerNodeSelection } from '@/workflow/workflow-diagram/hooks/useTriggerNodeSelection';
 import { workflowSelectedNodeState } from '@/workflow/workflow-diagram/states/workflowSelectedNodeState';
-import { WorkflowDiagramNode } from '@/workflow/workflow-diagram/types/WorkflowDiagram';
+import {
+  WorkflowDiagramNode,
+  WorkflowDiagramStepNodeData,
+} from '@/workflow/workflow-diagram/types/WorkflowDiagram';
+import { getWorkflowNodeIcon } from '@/workflow/workflow-diagram/utils/getWorkflowNodeIcon';
 import { OnSelectionChangeParams, useOnSelectionChange } from '@xyflow/react';
 import { useCallback } from 'react';
 import { useSetRecoilState } from 'recoil';
@@ -14,6 +19,7 @@ export const WorkflowDiagramCanvasReadonlyEffect = () => {
   const { openRightDrawer, closeRightDrawer } = useRightDrawer();
   const setWorkflowSelectedNode = useSetRecoilState(workflowSelectedNodeState);
   const setHotkeyScope = useSetHotkeyScope();
+  const { closeCommandMenu } = useCommandMenu();
 
   const handleSelectionChange = useCallback(
     ({ nodes }: OnSelectionChangeParams) => {
@@ -22,19 +28,25 @@ export const WorkflowDiagramCanvasReadonlyEffect = () => {
 
       if (isClosingStep) {
         closeRightDrawer();
-
+        closeCommandMenu();
         return;
       }
 
       setWorkflowSelectedNode(selectedNode.id);
       setHotkeyScope(RightDrawerHotkeyScope.RightDrawer, { goto: false });
-      openRightDrawer(RightDrawerPages.WorkflowStepView);
+
+      const selectedNodeData = selectedNode.data as WorkflowDiagramStepNodeData;
+      openRightDrawer(RightDrawerPages.WorkflowStepView, {
+        title: selectedNodeData.name,
+        Icon: getWorkflowNodeIcon(selectedNodeData),
+      });
     },
     [
-      closeRightDrawer,
-      openRightDrawer,
       setWorkflowSelectedNode,
       setHotkeyScope,
+      openRightDrawer,
+      closeRightDrawer,
+      closeCommandMenu,
     ],
   );
 
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCreateStepNode.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCreateStepNode.tsx
index 98b93c689ada..170d1dfd49a6 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCreateStepNode.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCreateStepNode.tsx
@@ -1,17 +1,28 @@
+import { StyledHandle } from '@/workflow/workflow-diagram/components/WorkflowDiagramBaseStepNode';
+import { NODE_BORDER_WIDTH } from '@/workflow/workflow-diagram/constants/NodeBorderWidth';
+import { NODE_ICON_LEFT_MARGIN } from '@/workflow/workflow-diagram/constants/NodeIconLeftMargin';
+import { NODE_ICON_WIDTH } from '@/workflow/workflow-diagram/constants/NodeIconWidth';
 import styled from '@emotion/styled';
-import { Handle, Position } from '@xyflow/react';
+import { Position } from '@xyflow/react';
 import { IconButton, IconPlus } from 'twenty-ui';
 
-export const StyledTargetHandle = styled(Handle)`
+const StyledContainer = styled.div`
+  padding-top: ${({ theme }) => theme.spacing(3)};
+  transform: translateX(-50%);
+  position: relative;
+  left: ${NODE_ICON_WIDTH + NODE_ICON_LEFT_MARGIN + NODE_BORDER_WIDTH}px;
+`;
+
+const StyledTargetHandle = styled(StyledHandle)`
   visibility: hidden;
 `;
 
 export const WorkflowDiagramCreateStepNode = () => {
   return (
-    <>
+    <StyledContainer>
       <StyledTargetHandle type="target" position={Position.Top} />
 
-      <IconButton Icon={IconPlus} size="medium" />
-    </>
+      <IconButton Icon={IconPlus} size="medium" ariaLabel="Add a step" />
+    </StyledContainer>
   );
 };
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCustomMarkers.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCustomMarkers.tsx
new file mode 100644
index 000000000000..127b25c2c89b
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramCustomMarkers.tsx
@@ -0,0 +1,25 @@
+import { EDGE_ROUNDED_ARROW_MARKER_ID } from '@/workflow/workflow-diagram/constants/EdgeRoundedArrowMarkerId';
+import { useTheme } from '@emotion/react';
+
+export const WorkflowDiagramCustomMarkers = () => {
+  const theme = useTheme();
+
+  return (
+    <svg style={{ position: 'absolute', top: 0, left: 0 }}>
+      <defs>
+        <marker
+          id={EDGE_ROUNDED_ARROW_MARKER_ID}
+          markerHeight={5}
+          markerWidth={6}
+          refX={3}
+          refY={2.5}
+        >
+          <path
+            d="M0.31094 1.1168C0.178029 0.917434 0.320947 0.650391 0.560555 0.650391H5.43945C5.67905 0.650391 5.82197 0.917434 5.68906 1.1168L3.62404 4.21433C3.32717 4.65963 2.67283 4.65963 2.37596 4.21433L0.31094 1.1168Z"
+            fill={theme.grayScale.gray25}
+          />
+        </marker>
+      </defs>
+    </svg>
+  );
+};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramEffect.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramEffect.tsx
index 2ce093d09a3a..bfee6650ce2b 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramEffect.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramEffect.tsx
@@ -47,13 +47,10 @@ export const WorkflowDiagramEffect = ({
         if (isDefined(lastCreatedStepId)) {
           mergedWorkflowDiagram.nodes = mergedWorkflowDiagram.nodes.map(
             (node) => {
-              if (node.id === lastCreatedStepId) {
-                return {
-                  ...node,
-                  selected: true,
-                };
-              }
-              return node;
+              return {
+                ...node,
+                selected: node.id === lastCreatedStepId,
+              };
             },
           );
 
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramEmptyTrigger.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramEmptyTrigger.tsx
index 0f59db3dcdd0..c5efa221c3af 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramEmptyTrigger.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramEmptyTrigger.tsx
@@ -22,7 +22,10 @@ export const WorkflowDiagramEmptyTrigger = () => {
       variant="placeholder"
       Icon={
         <StyledStepNodeLabelIconContainer>
-          <IconPlaylistAdd size={16} color={theme.font.color.tertiary} />
+          <IconPlaylistAdd
+            size={theme.icon.size.md}
+            color={theme.font.color.tertiary}
+          />
         </StyledStepNodeLabelIconContainer>
       }
     />
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramStepNodeBase.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramStepNodeBase.tsx
index 50f9e65eb927..69230cc14129 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramStepNodeBase.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramStepNodeBase.tsx
@@ -1,15 +1,9 @@
 import { assertUnreachable } from '@/workflow/utils/assertUnreachable';
 import { WorkflowDiagramBaseStepNode } from '@/workflow/workflow-diagram/components/WorkflowDiagramBaseStepNode';
 import { WorkflowDiagramStepNodeData } from '@/workflow/workflow-diagram/types/WorkflowDiagram';
+import { getWorkflowNodeIcon } from '@/workflow/workflow-diagram/utils/getWorkflowNodeIcon';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-import {
-  IconAddressBook,
-  IconCode,
-  IconHandMove,
-  IconMail,
-  IconPlaylistAdd,
-} from 'twenty-ui';
 
 const StyledStepNodeLabelIconContainer = styled.div`
   align-items: center;
@@ -29,6 +23,8 @@ export const WorkflowDiagramStepNodeBase = ({
 }) => {
   const theme = useTheme();
 
+  const Icon = getWorkflowNodeIcon(data);
+
   const renderStepIcon = () => {
     switch (data.nodeType) {
       case 'trigger': {
@@ -36,8 +32,8 @@ export const WorkflowDiagramStepNodeBase = ({
           case 'DATABASE_EVENT': {
             return (
               <StyledStepNodeLabelIconContainer>
-                <IconPlaylistAdd
-                  size={theme.icon.size.lg}
+                <Icon
+                  size={theme.icon.size.md}
                   color={theme.font.color.tertiary}
                 />
               </StyledStepNodeLabelIconContainer>
@@ -46,8 +42,8 @@ export const WorkflowDiagramStepNodeBase = ({
           case 'MANUAL': {
             return (
               <StyledStepNodeLabelIconContainer>
-                <IconHandMove
-                  size={theme.icon.size.lg}
+                <Icon
+                  size={theme.icon.size.md}
                   color={theme.font.color.tertiary}
                 />
               </StyledStepNodeLabelIconContainer>
@@ -62,9 +58,10 @@ export const WorkflowDiagramStepNodeBase = ({
           case 'CODE': {
             return (
               <StyledStepNodeLabelIconContainer>
-                <IconCode
-                  size={theme.icon.size.lg}
+                <Icon
+                  size={theme.icon.size.md}
                   color={theme.color.orange}
+                  stroke={theme.icon.stroke.sm}
                 />
               </StyledStepNodeLabelIconContainer>
             );
@@ -72,7 +69,7 @@ export const WorkflowDiagramStepNodeBase = ({
           case 'SEND_EMAIL': {
             return (
               <StyledStepNodeLabelIconContainer>
-                <IconMail size={theme.icon.size.lg} color={theme.color.blue} />
+                <Icon size={theme.icon.size.md} color={theme.color.blue} />
               </StyledStepNodeLabelIconContainer>
             );
           }
@@ -81,8 +78,8 @@ export const WorkflowDiagramStepNodeBase = ({
           case 'DELETE_RECORD': {
             return (
               <StyledStepNodeLabelIconContainer>
-                <IconAddressBook
-                  size={theme.icon.size.lg}
+                <Icon
+                  size={theme.icon.size.md}
                   color={theme.font.color.tertiary}
                   stroke={theme.icon.stroke.sm}
                 />
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramStepNodeEditable.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramStepNodeEditable.tsx
index 845bb6217bf5..a3d2f5572987 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramStepNodeEditable.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramStepNodeEditable.tsx
@@ -1,11 +1,10 @@
 import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
 import { workflowIdState } from '@/workflow/states/workflowIdState';
 import { assertWorkflowWithCurrentVersionIsDefined } from '@/workflow/utils/assertWorkflowWithCurrentVersionIsDefined';
-import { WorkflowDiagramStepNodeBase } from '@/workflow/workflow-diagram/components/WorkflowDiagramStepNodeBase';
+import { WorkflowDiagramStepNodeEditableContent } from '@/workflow/workflow-diagram/components/WorkflowDiagramStepNodeEditableContent';
 import { WorkflowDiagramStepNodeData } from '@/workflow/workflow-diagram/types/WorkflowDiagram';
 import { useDeleteStep } from '@/workflow/workflow-steps/hooks/useDeleteStep';
 import { useRecoilValue } from 'recoil';
-import { FloatingIconButton, IconTrash } from 'twenty-ui';
 
 export const WorkflowDiagramStepNodeEditable = ({
   id,
@@ -26,19 +25,12 @@ export const WorkflowDiagramStepNodeEditable = ({
   });
 
   return (
-    <WorkflowDiagramStepNodeBase
+    <WorkflowDiagramStepNodeEditableContent
       data={data}
-      RightFloatingElement={
-        selected ? (
-          <FloatingIconButton
-            size="medium"
-            Icon={IconTrash}
-            onClick={() => {
-              deleteStep(id);
-            }}
-          />
-        ) : undefined
-      }
+      selected={selected ?? false}
+      onDelete={() => {
+        deleteStep(id);
+      }}
     />
   );
 };
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramStepNodeEditableContent.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramStepNodeEditableContent.tsx
new file mode 100644
index 000000000000..18398886367e
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowDiagramStepNodeEditableContent.tsx
@@ -0,0 +1,28 @@
+import { WorkflowDiagramStepNodeBase } from '@/workflow/workflow-diagram/components/WorkflowDiagramStepNodeBase';
+import { WorkflowDiagramStepNodeData } from '@/workflow/workflow-diagram/types/WorkflowDiagram';
+import { FloatingIconButton, IconTrash } from 'twenty-ui';
+
+export const WorkflowDiagramStepNodeEditableContent = ({
+  data,
+  selected,
+  onDelete,
+}: {
+  data: WorkflowDiagramStepNodeData;
+  selected: boolean;
+  onDelete: () => void;
+}) => {
+  return (
+    <WorkflowDiagramStepNodeBase
+      data={data}
+      RightFloatingElement={
+        selected ? (
+          <FloatingIconButton
+            size="medium"
+            Icon={IconTrash}
+            onClick={onDelete}
+          />
+        ) : undefined
+      }
+    />
+  );
+};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowVersionVisualizer.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowVersionVisualizer.tsx
index 16070202ceae..e34bf67390e4 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowVersionVisualizer.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowVersionVisualizer.tsx
@@ -1,8 +1,6 @@
 import { useWorkflowVersion } from '@/workflow/hooks/useWorkflowVersion';
 import { WorkflowDiagramCanvasReadonly } from '@/workflow/workflow-diagram/components/WorkflowDiagramCanvasReadonly';
-import { workflowDiagramState } from '@/workflow/workflow-diagram/states/workflowDiagramState';
 import '@xyflow/react/dist/style.css';
-import { useRecoilValue } from 'recoil';
 import { isDefined } from 'twenty-ui';
 
 export const WorkflowVersionVisualizer = ({
@@ -12,12 +10,7 @@ export const WorkflowVersionVisualizer = ({
 }) => {
   const workflowVersion = useWorkflowVersion(workflowVersionId);
 
-  const workflowDiagram = useRecoilValue(workflowDiagramState);
-
-  return isDefined(workflowDiagram) && isDefined(workflowVersion) ? (
-    <WorkflowDiagramCanvasReadonly
-      diagram={workflowDiagram}
-      workflowVersion={workflowVersion}
-    />
+  return isDefined(workflowVersion) ? (
+    <WorkflowDiagramCanvasReadonly workflowVersion={workflowVersion} />
   ) : null;
 };
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowVisualizer.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowVisualizer.tsx
index e72356160998..b717fb4b2756 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowVisualizer.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/WorkflowVisualizer.tsx
@@ -2,9 +2,7 @@ import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableE
 import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
 import { WorkflowDiagramCanvasEditable } from '@/workflow/workflow-diagram/components/WorkflowDiagramCanvasEditable';
 import { WorkflowDiagramEffect } from '@/workflow/workflow-diagram/components/WorkflowDiagramEffect';
-import { workflowDiagramState } from '@/workflow/workflow-diagram/states/workflowDiagramState';
 import '@xyflow/react/dist/style.css';
-import { useRecoilValue } from 'recoil';
 import { isDefined } from 'twenty-ui';
 
 export const WorkflowVisualizer = ({
@@ -15,7 +13,6 @@ export const WorkflowVisualizer = ({
   const workflowId = targetableObject.id;
 
   const workflowWithCurrentVersion = useWorkflowWithCurrentVersion(workflowId);
-  const workflowDiagram = useRecoilValue(workflowDiagramState);
 
   return (
     <>
@@ -23,9 +20,8 @@ export const WorkflowVisualizer = ({
         workflowWithCurrentVersion={workflowWithCurrentVersion}
       />
 
-      {isDefined(workflowDiagram) && isDefined(workflowWithCurrentVersion) ? (
+      {isDefined(workflowWithCurrentVersion) ? (
         <WorkflowDiagramCanvasEditable
-          diagram={workflowDiagram}
           workflowWithCurrentVersion={workflowWithCurrentVersion}
         />
       ) : null}
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramCreateStepNode.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramCreateStepNode.stories.tsx
new file mode 100644
index 000000000000..1c029d6ec91b
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramCreateStepNode.stories.tsx
@@ -0,0 +1,42 @@
+import { Meta, StoryObj } from '@storybook/react';
+
+import { ReactFlowProvider } from '@xyflow/react';
+import '@xyflow/react/dist/style.css';
+import { ComponentDecorator } from 'twenty-ui';
+import { WorkflowDiagramCreateStepNode } from '../WorkflowDiagramCreateStepNode';
+
+const meta: Meta<typeof WorkflowDiagramCreateStepNode> = {
+  title: 'Modules/Workflow/WorkflowDiagramCreateStepNode',
+  component: WorkflowDiagramCreateStepNode,
+  decorators: [
+    ComponentDecorator,
+    (Story) => (
+      <ReactFlowProvider>
+        <Story />
+      </ReactFlowProvider>
+    ),
+  ],
+};
+
+export default meta;
+type Story = StoryObj<typeof WorkflowDiagramCreateStepNode>;
+
+export const Default: Story = {
+  decorators: [
+    (Story) => (
+      <div style={{ position: 'relative' }}>
+        <Story />
+      </div>
+    ),
+  ],
+};
+
+export const Selected: Story = {
+  decorators: [
+    (Story) => (
+      <div className="selectable selected" style={{ position: 'relative' }}>
+        <Story />
+      </div>
+    ),
+  ],
+};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramEmptyTrigger.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramEmptyTrigger.stories.tsx
new file mode 100644
index 000000000000..e7b5aac82f3e
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramEmptyTrigger.stories.tsx
@@ -0,0 +1,43 @@
+import { Meta, StoryObj } from '@storybook/react';
+import { ComponentDecorator } from 'twenty-ui';
+
+import { ReactFlowProvider } from '@xyflow/react';
+import '@xyflow/react/dist/style.css';
+import { WorkflowDiagramEmptyTrigger } from '../WorkflowDiagramEmptyTrigger';
+
+const meta: Meta<typeof WorkflowDiagramEmptyTrigger> = {
+  title: 'Modules/Workflow/WorkflowDiagramEmptyTrigger',
+  component: WorkflowDiagramEmptyTrigger,
+};
+
+export default meta;
+type Story = StoryObj<typeof WorkflowDiagramEmptyTrigger>;
+
+export const Default: Story = {
+  decorators: [
+    (Story) => (
+      <ReactFlowProvider>
+        <div style={{ position: 'relative' }}>
+          <Story />
+        </div>
+      </ReactFlowProvider>
+    ),
+    ComponentDecorator,
+  ],
+};
+
+export const Selected: Story = {
+  decorators: [
+    (Story) => (
+      <div className="selectable selected" style={{ position: 'relative' }}>
+        <Story />
+      </div>
+    ),
+    (Story) => (
+      <ReactFlowProvider>
+        <Story />
+      </ReactFlowProvider>
+    ),
+    ComponentDecorator,
+  ],
+};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramStepNodeEditableContent.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramStepNodeEditableContent.stories.tsx
new file mode 100644
index 000000000000..45e979ea4475
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramStepNodeEditableContent.stories.tsx
@@ -0,0 +1,150 @@
+import { Meta, StoryObj } from '@storybook/react';
+
+import { WorkflowDiagramStepNodeData } from '@/workflow/workflow-diagram/types/WorkflowDiagram';
+import { fn } from '@storybook/test';
+import { ReactFlowProvider } from '@xyflow/react';
+import '@xyflow/react/dist/style.css';
+import { CatalogDecorator, CatalogStory } from 'twenty-ui';
+import { graphqlMocks } from '~/testing/graphqlMocks';
+import { WorkflowDiagramStepNodeEditableContent } from '../WorkflowDiagramStepNodeEditableContent';
+
+const meta: Meta<typeof WorkflowDiagramStepNodeEditableContent> = {
+  title: 'Modules/Workflow/WorkflowDiagramStepNodeEditableContent',
+  component: WorkflowDiagramStepNodeEditableContent,
+};
+
+export default meta;
+
+type Story = StoryObj<typeof WorkflowDiagramStepNodeEditableContent>;
+
+export const All: CatalogStory<
+  Story,
+  typeof WorkflowDiagramStepNodeEditableContent
+> = {
+  args: {
+    onDelete: fn(),
+    selected: false,
+  },
+  parameters: {
+    msw: graphqlMocks,
+    catalog: {
+      options: {
+        elementContainer: {
+          width: 250,
+          style: { position: 'relative' },
+        },
+      },
+      dimensions: [
+        {
+          name: 'step type',
+          values: [
+            {
+              nodeType: 'trigger',
+              triggerType: 'DATABASE_EVENT',
+              name: 'Record is Created',
+            },
+            { nodeType: 'trigger', triggerType: 'MANUAL', name: 'Manual' },
+            {
+              nodeType: 'action',
+              actionType: 'CREATE_RECORD',
+              name: 'Create Record',
+            },
+            {
+              nodeType: 'action',
+              actionType: 'UPDATE_RECORD',
+              name: 'Update Record',
+            },
+            {
+              nodeType: 'action',
+              actionType: 'DELETE_RECORD',
+              name: 'Delete Record',
+            },
+            {
+              nodeType: 'action',
+              actionType: 'SEND_EMAIL',
+              name: 'Send Email',
+            },
+            { nodeType: 'action', actionType: 'CODE', name: 'Code' },
+          ] satisfies WorkflowDiagramStepNodeData[],
+          props: (data: WorkflowDiagramStepNodeData) => ({ data }),
+        },
+      ],
+    },
+  },
+  decorators: [
+    CatalogDecorator,
+    (Story) => {
+      return (
+        <ReactFlowProvider>
+          <Story />
+        </ReactFlowProvider>
+      );
+    },
+  ],
+};
+export const AllSelected: CatalogStory<
+  Story,
+  typeof WorkflowDiagramStepNodeEditableContent
+> = {
+  args: {
+    onDelete: fn(),
+    selected: true,
+  },
+  parameters: {
+    msw: graphqlMocks,
+    catalog: {
+      options: {
+        elementContainer: {
+          width: 250,
+          style: { position: 'relative' },
+          className: 'selectable selected',
+        },
+      },
+      dimensions: [
+        {
+          name: 'step type',
+          values: [
+            {
+              nodeType: 'trigger',
+              triggerType: 'DATABASE_EVENT',
+              name: 'Record is Created',
+            },
+            { nodeType: 'trigger', triggerType: 'MANUAL', name: 'Manual' },
+            {
+              nodeType: 'action',
+              actionType: 'CREATE_RECORD',
+              name: 'Create Record',
+            },
+            {
+              nodeType: 'action',
+              actionType: 'UPDATE_RECORD',
+              name: 'Update Record',
+            },
+            {
+              nodeType: 'action',
+              actionType: 'DELETE_RECORD',
+              name: 'Delete Record',
+            },
+            {
+              nodeType: 'action',
+              actionType: 'SEND_EMAIL',
+              name: 'Send Email',
+            },
+            { nodeType: 'action', actionType: 'CODE', name: 'Code' },
+          ] satisfies WorkflowDiagramStepNodeData[],
+          props: (data: WorkflowDiagramStepNodeData) => ({ data }),
+        },
+      ],
+    },
+  },
+  decorators: [
+    CatalogDecorator,
+    (Story) => {
+      return (
+        <ReactFlowProvider>
+          <Story />
+        </ReactFlowProvider>
+      );
+    },
+  ],
+};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/EdgeRoundedArrowMarkerId.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/EdgeRoundedArrowMarkerId.ts
new file mode 100644
index 000000000000..9f2a061ee88d
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/EdgeRoundedArrowMarkerId.ts
@@ -0,0 +1 @@
+export const EDGE_ROUNDED_ARROW_MARKER_ID = 'arrow-rounded';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/NodeBorderWidth.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/NodeBorderWidth.ts
new file mode 100644
index 000000000000..da353c77b018
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/NodeBorderWidth.ts
@@ -0,0 +1 @@
+export const NODE_BORDER_WIDTH = 1;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/NodeHandleHeightPx.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/NodeHandleHeightPx.ts
new file mode 100644
index 000000000000..3a0b4349ec30
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/NodeHandleHeightPx.ts
@@ -0,0 +1,3 @@
+import { NODE_HANDLE_WIDTH_PX } from './NodeHandleWidthPx';
+
+export const NODE_HANDLE_HEIGHT_PX = NODE_HANDLE_WIDTH_PX;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/NodeHandleWidthPx.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/NodeHandleWidthPx.ts
new file mode 100644
index 000000000000..81ce92f81ad6
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/NodeHandleWidthPx.ts
@@ -0,0 +1 @@
+export const NODE_HANDLE_WIDTH_PX = 4;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/NodeIconLeftMargin.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/NodeIconLeftMargin.ts
new file mode 100644
index 000000000000..4f719adfbfd7
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/NodeIconLeftMargin.ts
@@ -0,0 +1,5 @@
+import { THEME_COMMON } from 'twenty-ui';
+
+export const NODE_ICON_LEFT_MARGIN = Number(
+  THEME_COMMON.spacing(2).replace('px', ''),
+);
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/NodeIconWidth.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/NodeIconWidth.ts
new file mode 100644
index 000000000000..49e17655def3
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/NodeIconWidth.ts
@@ -0,0 +1,5 @@
+import { THEME_COMMON } from 'twenty-ui';
+
+export const NODE_ICON_WIDTH = Number(
+  THEME_COMMON.spacing(6).replace('px', ''),
+);
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/WorkflowVisualizerEdgeDefaultConfiguration.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/WorkflowVisualizerEdgeDefaultConfiguration.ts
new file mode 100644
index 000000000000..6ab64cc442ce
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/constants/WorkflowVisualizerEdgeDefaultConfiguration.ts
@@ -0,0 +1,12 @@
+import { EDGE_ROUNDED_ARROW_MARKER_ID } from '@/workflow/workflow-diagram/constants/EdgeRoundedArrowMarkerId';
+import { WorkflowDiagramEdge } from '@/workflow/workflow-diagram/types/WorkflowDiagram';
+import { THEME_COMMON } from 'twenty-ui';
+
+export const WORKFLOW_VISUALIZER_EDGE_DEFAULT_CONFIGURATION = {
+  markerEnd: EDGE_ROUNDED_ARROW_MARKER_ID,
+  style: {
+    stroke: THEME_COMMON.grayScale.gray25,
+  },
+  deletable: false,
+  selectable: false,
+} satisfies Partial<WorkflowDiagramEdge>;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/useRightDrawerState.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/useRightDrawerState.ts
new file mode 100644
index 000000000000..dbf0e3187c27
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/useRightDrawerState.ts
@@ -0,0 +1,43 @@
+import { isCommandMenuOpenedState } from '@/command-menu/states/isCommandMenuOpenedState';
+import { CommandMenuAnimationVariant } from '@/command-menu/types/CommandMenuAnimationVariant';
+import { isRightDrawerMinimizedState } from '@/ui/layout/right-drawer/states/isRightDrawerMinimizedState';
+import { isRightDrawerOpenState } from '@/ui/layout/right-drawer/states/isRightDrawerOpenState';
+import { RightDrawerAnimationVariant } from '@/ui/layout/right-drawer/types/RightDrawerAnimationVariant';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+import { useRecoilValue } from 'recoil';
+import { useIsMobile } from 'twenty-ui';
+import { FeatureFlagKey } from '~/generated/graphql';
+
+export const useRightDrawerState = (): {
+  rightDrawerState: RightDrawerAnimationVariant | CommandMenuAnimationVariant;
+} => {
+  const isRightDrawerOpen = useRecoilValue(isRightDrawerOpenState);
+  const isRightDrawerMinimized = useRecoilValue(isRightDrawerMinimizedState);
+  const isMobile = useIsMobile();
+
+  const isCommandMenuV2Enabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsCommandMenuV2Enabled,
+  );
+
+  const isCommandMenuOpened = useRecoilValue(isCommandMenuOpenedState);
+
+  if (isMobile) {
+    return {
+      rightDrawerState: 'fullScreen',
+    };
+  }
+
+  if (isCommandMenuV2Enabled) {
+    return {
+      rightDrawerState: isCommandMenuOpened ? 'normal' : 'closed',
+    };
+  }
+
+  return {
+    rightDrawerState: !isRightDrawerOpen
+      ? 'closed'
+      : isRightDrawerMinimized
+        ? 'minimized'
+        : 'normal',
+  };
+};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/useStartNodeCreation.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/useStartNodeCreation.ts
index d3d15919216e..f33c2b13f089 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/useStartNodeCreation.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/hooks/useStartNodeCreation.ts
@@ -5,6 +5,7 @@ import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope
 import { workflowCreateStepFromParentStepIdState } from '@/workflow/workflow-steps/states/workflowCreateStepFromParentStepIdState';
 import { useCallback } from 'react';
 import { useSetRecoilState } from 'recoil';
+import { IconSettingsAutomation } from 'twenty-ui';
 
 export const useStartNodeCreation = () => {
   const { openRightDrawer } = useRightDrawer();
@@ -22,7 +23,10 @@ export const useStartNodeCreation = () => {
       setWorkflowCreateStepFromParentStepId(parentNodeId);
 
       setHotkeyScope(RightDrawerHotkeyScope.RightDrawer, { goto: false });
-      openRightDrawer(RightDrawerPages.WorkflowStepSelectAction);
+      openRightDrawer(RightDrawerPages.WorkflowStepSelectAction, {
+        title: 'Select Action',
+        Icon: IconSettingsAutomation,
+      });
     },
     [openRightDrawer, setWorkflowCreateStepFromParentStepId, setHotkeyScope],
   );
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/addCreateStepNodes.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/addCreateStepNodes.ts
index ca9d1150539f..c2de38c5288a 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/addCreateStepNodes.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/addCreateStepNodes.ts
@@ -1,9 +1,9 @@
+import { WORKFLOW_VISUALIZER_EDGE_DEFAULT_CONFIGURATION } from '@/workflow/workflow-diagram/constants/WorkflowVisualizerEdgeDefaultConfiguration';
 import {
   WorkflowDiagram,
   WorkflowDiagramEdge,
   WorkflowDiagramNode,
 } from '@/workflow/workflow-diagram/types/WorkflowDiagram';
-import { MarkerType } from '@xyflow/react';
 import { v4 } from 'uuid';
 
 export const addCreateStepNodes = ({ nodes, edges }: WorkflowDiagram) => {
@@ -30,13 +30,10 @@ export const addCreateStepNodes = ({ nodes, edges }: WorkflowDiagram) => {
     updatedNodes.push(newCreateStepNode);
 
     updatedEdges.push({
+      ...WORKFLOW_VISUALIZER_EDGE_DEFAULT_CONFIGURATION,
       id: v4(),
       source: node.id,
       target: newCreateStepNode.id,
-      markerEnd: {
-        type: MarkerType.ArrowClosed,
-      },
-      deletable: false,
     });
   }
 
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/generateWorkflowDiagram.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/generateWorkflowDiagram.ts
index 3c84483d50a5..60d821f49230 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/generateWorkflowDiagram.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/generateWorkflowDiagram.ts
@@ -1,15 +1,15 @@
 import { WorkflowStep, WorkflowTrigger } from '@/workflow/types/Workflow';
 import { assertUnreachable } from '@/workflow/utils/assertUnreachable';
 import { splitWorkflowTriggerEventName } from '@/workflow/utils/splitWorkflowTriggerEventName';
+import { WORKFLOW_VISUALIZER_EDGE_DEFAULT_CONFIGURATION } from '@/workflow/workflow-diagram/constants/WorkflowVisualizerEdgeDefaultConfiguration';
 import {
   WorkflowDiagram,
   WorkflowDiagramEdge,
   WorkflowDiagramNode,
 } from '@/workflow/workflow-diagram/types/WorkflowDiagram';
+import { DATABASE_TRIGGER_EVENTS } from '@/workflow/workflow-trigger/constants/DatabaseTriggerEvents';
 
 import { TRIGGER_STEP_ID } from '@/workflow/workflow-trigger/constants/TriggerStepId';
-import { MarkerType } from '@xyflow/react';
-import { capitalize } from 'twenty-shared';
 import { isDefined } from 'twenty-ui';
 import { v4 } from 'uuid';
 
@@ -23,7 +23,6 @@ export const generateWorkflowDiagram = ({
   const nodes: Array<WorkflowDiagramNode> = [];
   const edges: Array<WorkflowDiagramEdge> = [];
 
-  // Helper function to generate nodes and edges recursively
   const processNode = (
     step: WorkflowStep,
     parentNodeId: string,
@@ -45,22 +44,16 @@ export const generateWorkflowDiagram = ({
       },
     });
 
-    // Create an edge from the parent node to this node
     edges.push({
+      ...WORKFLOW_VISUALIZER_EDGE_DEFAULT_CONFIGURATION,
       id: v4(),
       source: parentNodeId,
       target: nodeId,
-      markerEnd: {
-        type: MarkerType.ArrowClosed,
-      },
-      deletable: false,
-      selectable: false,
     });
 
     return nodeId;
   };
 
-  // Start with the trigger node
   const triggerNodeId = TRIGGER_STEP_ID;
 
   if (isDefined(trigger)) {
@@ -77,7 +70,10 @@ export const generateWorkflowDiagram = ({
           trigger.settings.eventName,
         );
 
-        triggerLabel = `${capitalize(triggerEvent.objectType)} is ${capitalize(triggerEvent.event)}`;
+        triggerLabel =
+          DATABASE_TRIGGER_EVENTS.find(
+            (event) => event.value === triggerEvent.event,
+          )?.label ?? '';
 
         break;
       }
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getOrganizedDiagram.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getOrganizedDiagram.ts
index 81bb621335f2..1813bdaea917 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getOrganizedDiagram.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getOrganizedDiagram.ts
@@ -7,11 +7,15 @@ export const getOrganizedDiagram = (
   const graph = new Dagre.graphlib.Graph().setDefaultEdgeLabel(() => ({}));
   graph.setGraph({ rankdir: 'TB' });
 
+  const biggestNodeWidth = diagram.nodes.reduce(
+    (acc, node) => Math.max(acc, node.measured?.width ?? 0),
+    0,
+  );
+
   diagram.edges.forEach((edge) => graph.setEdge(edge.source, edge.target));
   diagram.nodes.forEach((node) =>
     graph.setNode(node.id, {
-      ...node,
-      width: node.measured?.width ?? 0,
+      width: biggestNodeWidth,
       height: node.measured?.height ?? 0,
     }),
   );
@@ -21,10 +25,11 @@ export const getOrganizedDiagram = (
   return {
     nodes: diagram.nodes.map((node) => {
       const position = graph.node(node.id);
+
       // We are shifting the dagre node position (anchor=center center) to the top left
       // so it matches the React Flow node anchor point (top left).
-      const x = position.x - (node.measured?.width ?? 0) / 2;
-      const y = position.y - (node.measured?.height ?? 0) / 2;
+      const x = position.x - position.width / 2;
+      const y = position.y - position.height / 2;
 
       return { ...node, position: { x, y } };
     }),
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getWorkflowNodeIcon.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getWorkflowNodeIcon.ts
new file mode 100644
index 000000000000..feefe37ae514
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/getWorkflowNodeIcon.ts
@@ -0,0 +1,56 @@
+import {
+  WorkflowActionType,
+  WorkflowTriggerType,
+} from '@/workflow/types/Workflow';
+import { assertUnreachable } from '@/workflow/utils/assertUnreachable';
+import {
+  IconAddressBook,
+  IconCode,
+  IconHandMove,
+  IconMail,
+  IconPlaylistAdd,
+} from 'twenty-ui';
+
+export const getWorkflowNodeIcon = (
+  data:
+    | {
+        nodeType: 'trigger';
+        triggerType: WorkflowTriggerType;
+      }
+    | {
+        nodeType: 'action';
+        actionType: WorkflowActionType;
+      },
+) => {
+  switch (data.nodeType) {
+    case 'trigger': {
+      switch (data.triggerType) {
+        case 'DATABASE_EVENT': {
+          return IconPlaylistAdd;
+        }
+        case 'MANUAL': {
+          return IconHandMove;
+        }
+      }
+
+      return assertUnreachable(data.triggerType);
+    }
+    case 'action': {
+      switch (data.actionType) {
+        case 'CODE': {
+          return IconCode;
+        }
+        case 'SEND_EMAIL': {
+          return IconMail;
+        }
+        case 'CREATE_RECORD':
+        case 'UPDATE_RECORD':
+        case 'DELETE_RECORD': {
+          return IconAddressBook;
+        }
+      }
+
+      return assertUnreachable(data.actionType);
+    }
+  }
+};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepDetail.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepDetail.tsx
index aa67fdf6ed9a..e01860ffb000 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepDetail.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepDetail.tsx
@@ -90,6 +90,7 @@ export const WorkflowStepDetail = ({
           return (
             <Suspense fallback={<RightDrawerSkeletonLoader />}>
               <WorkflowEditActionFormServerlessFunction
+                key={stepId}
                 action={stepDefinition.definition}
                 actionOptions={props}
               />
@@ -99,6 +100,7 @@ export const WorkflowStepDetail = ({
         case 'SEND_EMAIL': {
           return (
             <WorkflowEditActionFormSendEmail
+              key={stepId}
               action={stepDefinition.definition}
               actionOptions={props}
             />
@@ -107,6 +109,7 @@ export const WorkflowStepDetail = ({
         case 'CREATE_RECORD': {
           return (
             <WorkflowEditActionFormCreateRecord
+              key={stepId}
               action={stepDefinition.definition}
               actionOptions={props}
             />
@@ -116,6 +119,7 @@ export const WorkflowStepDetail = ({
         case 'UPDATE_RECORD': {
           return (
             <WorkflowEditActionFormUpdateRecord
+              key={stepId}
               action={stepDefinition.definition}
               actionOptions={props}
             />
@@ -125,6 +129,7 @@ export const WorkflowStepDetail = ({
         case 'DELETE_RECORD': {
           return (
             <WorkflowEditActionFormDeleteRecord
+              key={stepId}
               action={stepDefinition.definition}
               actionOptions={props}
             />
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepHeader.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepHeader.tsx
index c5fcba10a700..d0db052fdd05 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepHeader.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepHeader.tsx
@@ -1,9 +1,9 @@
 import { TextInput } from '@/ui/field/input/components/TextInput';
+import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-import React, { useState } from 'react';
+import { useState } from 'react';
+import { IconComponent } from 'twenty-ui';
 import { useDebouncedCallback } from 'use-debounce';
-import { IconComponent } from 'packages/twenty-ui';
-import { useTheme } from '@emotion/react';
 
 const StyledHeader = styled.div`
   background-color: ${({ theme }) => theme.background.secondary};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useCreateStep.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useCreateStep.test.ts
index fde2dc6c479b..751f657998df 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useCreateStep.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useCreateStep.test.ts
@@ -3,9 +3,9 @@ import { renderHook } from '@testing-library/react';
 import { useCreateStep } from '../useCreateStep';
 
 const mockOpenRightDrawer = jest.fn();
-const mockCreateNewWorkflowVersion = jest.fn();
+const mockCreateDraftFromWorkflowVersion = jest.fn().mockResolvedValue('457');
 const mockCreateWorkflowVersionStep = jest.fn().mockResolvedValue({
-  data: { createWorkflowVersionStep: { id: '1' } },
+  data: { createWorkflowVersionStep: { id: '1', type: 'CODE' } },
 });
 
 jest.mock('recoil', () => ({
@@ -29,9 +29,9 @@ jest.mock(
   }),
 );
 
-jest.mock('@/workflow/hooks/useCreateNewWorkflowVersion', () => ({
-  useCreateNewWorkflowVersion: () => ({
-    createNewWorkflowVersion: mockCreateNewWorkflowVersion,
+jest.mock('@/workflow/hooks/useCreateDraftFromWorkflowVersion', () => ({
+  useCreateDraftFromWorkflowVersion: () => ({
+    createDraftFromWorkflowVersion: mockCreateDraftFromWorkflowVersion,
   }),
 }));
 
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useDeleteStep.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useDeleteStep.test.ts
index fc26dad3ed5a..90aa98275fa7 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useDeleteStep.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useDeleteStep.test.ts
@@ -1,11 +1,12 @@
 import { WorkflowWithCurrentVersion } from '@/workflow/types/Workflow';
 import { useDeleteStep } from '@/workflow/workflow-steps/hooks/useDeleteStep';
 import { renderHook } from '@testing-library/react';
+import { RecoilRoot } from 'recoil';
 
 const mockCloseRightDrawer = jest.fn();
-const mockCreateNewWorkflowVersion = jest.fn();
 const mockDeleteWorkflowVersionStep = jest.fn();
 const updateOneRecordMock = jest.fn();
+const mockCreateDraftFromWorkflowVersion = jest.fn().mockResolvedValue('457');
 
 jest.mock('@/object-record/hooks/useUpdateOneRecord', () => ({
   useUpdateOneRecord: () => ({
@@ -13,12 +14,6 @@ jest.mock('@/object-record/hooks/useUpdateOneRecord', () => ({
   }),
 }));
 
-jest.mock('recoil', () => ({
-  useRecoilValue: () => 'parent-step-id',
-  useSetRecoilState: () => jest.fn(),
-  atom: (params: any) => params,
-}));
-
 jest.mock('@/ui/layout/right-drawer/hooks/useRightDrawer', () => ({
   useRightDrawer: () => ({
     closeRightDrawer: mockCloseRightDrawer,
@@ -31,9 +26,9 @@ jest.mock('@/workflow/hooks/useDeleteWorkflowVersionStep', () => ({
   }),
 }));
 
-jest.mock('@/workflow/hooks/useCreateNewWorkflowVersion', () => ({
-  useCreateNewWorkflowVersion: () => ({
-    createNewWorkflowVersion: mockCreateNewWorkflowVersion,
+jest.mock('@/workflow/hooks/useCreateDraftFromWorkflowVersion', () => ({
+  useCreateDraftFromWorkflowVersion: () => ({
+    createDraftFromWorkflowVersion: mockCreateDraftFromWorkflowVersion,
   }),
 }));
 
@@ -50,10 +45,12 @@ describe('useDeleteStep', () => {
   };
 
   it('should delete step in draft version', async () => {
-    const { result } = renderHook(() =>
-      useDeleteStep({
-        workflow: mockWorkflow as unknown as WorkflowWithCurrentVersion,
-      }),
+    const { result } = renderHook(
+      () =>
+        useDeleteStep({
+          workflow: mockWorkflow as unknown as WorkflowWithCurrentVersion,
+        }),
+      { wrapper: RecoilRoot },
     );
     await result.current.deleteStep('1');
 
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateStep.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateStep.test.ts
index 4c4cd220233c..3ae9c9b747c3 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateStep.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateStep.test.ts
@@ -2,8 +2,8 @@ import { WorkflowWithCurrentVersion } from '@/workflow/types/Workflow';
 import { useUpdateStep } from '@/workflow/workflow-steps/hooks/useUpdateStep';
 import { renderHook } from '@testing-library/react';
 
-const mockCreateNewWorkflowVersion = jest.fn();
 const mockUpdateWorkflowVersionStep = jest.fn();
+const mockCreateDraftFromWorkflowVersion = jest.fn().mockResolvedValue('457');
 
 jest.mock('recoil', () => ({
   useRecoilValue: () => 'parent-step-id',
@@ -20,9 +20,9 @@ jest.mock(
   }),
 );
 
-jest.mock('@/workflow/hooks/useCreateNewWorkflowVersion', () => ({
-  useCreateNewWorkflowVersion: () => ({
-    createNewWorkflowVersion: mockCreateNewWorkflowVersion,
+jest.mock('@/workflow/hooks/useCreateDraftFromWorkflowVersion', () => ({
+  useCreateDraftFromWorkflowVersion: () => ({
+    createDraftFromWorkflowVersion: mockCreateDraftFromWorkflowVersion,
   }),
 }));
 
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateStep.ts
index 330b89e111ce..8d782dff8936 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateStep.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useCreateStep.ts
@@ -7,6 +7,7 @@ import {
   WorkflowWithCurrentVersion,
 } from '@/workflow/types/Workflow';
 import { workflowSelectedNodeState } from '@/workflow/workflow-diagram/states/workflowSelectedNodeState';
+import { getWorkflowNodeIcon } from '@/workflow/workflow-diagram/utils/getWorkflowNodeIcon';
 import { useCreateWorkflowVersionStep } from '@/workflow/workflow-steps/hooks/useCreateWorkflowVersionStep';
 import { workflowCreateStepFromParentStepIdState } from '@/workflow/workflow-steps/states/workflowCreateStepFromParentStepIdState';
 import { useRecoilValue, useSetRecoilState } from 'recoil';
@@ -17,7 +18,6 @@ export const useCreateStep = ({
 }: {
   workflow: WorkflowWithCurrentVersion;
 }) => {
-  const { openRightDrawer } = useRightDrawer();
   const { createWorkflowVersionStep } = useCreateWorkflowVersionStep();
   const setWorkflowSelectedNode = useSetRecoilState(workflowSelectedNodeState);
   const setWorkflowLastCreatedStepId = useSetRecoilState(
@@ -30,16 +30,18 @@ export const useCreateStep = ({
 
   const { getUpdatableWorkflowVersion } = useGetUpdatableWorkflowVersion();
 
+  const { openRightDrawer } = useRightDrawer();
+
   const createStep = async (newStepType: WorkflowStepType) => {
     if (!isDefined(workflowCreateStepFromParentStepId)) {
       throw new Error('Select a step to create a new step from first.');
     }
 
-    const workflowVersion = await getUpdatableWorkflowVersion(workflow);
+    const workflowVersionId = await getUpdatableWorkflowVersion(workflow);
 
     const createdStep = (
       await createWorkflowVersionStep({
-        workflowVersionId: workflowVersion.id,
+        workflowVersionId,
         stepType: newStepType,
       })
     )?.data?.createWorkflowVersionStep;
@@ -50,7 +52,14 @@ export const useCreateStep = ({
 
     setWorkflowSelectedNode(createdStep.id);
     setWorkflowLastCreatedStepId(createdStep.id);
-    openRightDrawer(RightDrawerPages.WorkflowStepEdit);
+
+    openRightDrawer(RightDrawerPages.WorkflowStepEdit, {
+      title: createdStep.name,
+      Icon: getWorkflowNodeIcon({
+        nodeType: 'action',
+        actionType: createdStep.type as WorkflowStepType,
+      }),
+    });
   };
 
   return {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDeleteStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDeleteStep.ts
index 12a03540b961..bb5008497b7f 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDeleteStep.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useDeleteStep.ts
@@ -1,3 +1,4 @@
+import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
 import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer';
@@ -22,13 +23,15 @@ export const useDeleteStep = ({
 
   const { getUpdatableWorkflowVersion } = useGetUpdatableWorkflowVersion();
   const { closeRightDrawer } = useRightDrawer();
+  const { closeCommandMenu } = useCommandMenu();
 
   const deleteStep = async (stepId: string) => {
     closeRightDrawer();
-    const workflowVersion = await getUpdatableWorkflowVersion(workflow);
+    closeCommandMenu();
+    const workflowVersionId = await getUpdatableWorkflowVersion(workflow);
     if (stepId === TRIGGER_STEP_ID) {
       await updateOneWorkflowVersion({
-        idToUpdate: workflow.currentVersion.id,
+        idToUpdate: workflowVersionId,
         updateOneRecordInput: {
           trigger: null,
         },
@@ -36,7 +39,7 @@ export const useDeleteStep = ({
       return;
     }
     await deleteWorkflowVersionStep({
-      workflowVersionId: workflowVersion.id,
+      workflowVersionId,
       stepId,
     });
   };
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateStep.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateStep.ts
index e38e334aeaf9..b24d7e24622e 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateStep.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useUpdateStep.ts
@@ -19,9 +19,10 @@ export const useUpdateStep = ({
       throw new Error('Can not update an undefined workflow version.');
     }
 
-    const workflowVersion = await getUpdatableWorkflowVersion(workflow);
+    const workflowVersionId = await getUpdatableWorkflowVersion(workflow);
+
     await updateWorkflowVersionStep({
-      workflowVersionId: workflowVersion.id,
+      workflowVersionId,
       step: updatedStep,
     });
   };
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/RightDrawerWorkflowSelectActionContent.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/RightDrawerWorkflowSelectActionContent.tsx
index 9c0b5bcef871..dbebcbc5b0a7 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/RightDrawerWorkflowSelectActionContent.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/RightDrawerWorkflowSelectActionContent.tsx
@@ -1,6 +1,7 @@
 import { WorkflowWithCurrentVersion } from '@/workflow/types/Workflow';
 import { useCreateStep } from '@/workflow/workflow-steps/hooks/useCreateStep';
-import { ACTIONS } from '@/workflow/workflow-steps/workflow-actions/constants/Actions';
+import { OTHER_ACTIONS } from '@/workflow/workflow-steps/workflow-actions/constants/OtherActions';
+import { RECORD_ACTIONS } from '@/workflow/workflow-steps/workflow-actions/constants/RecordActions';
 import styled from '@emotion/styled';
 import { MenuItem } from 'twenty-ui';
 
@@ -14,6 +15,16 @@ const StyledActionListContainer = styled.div`
   padding-inline: ${({ theme }) => theme.spacing(2)};
 `;
 
+const StyledSectionTitle = styled.span`
+  color: ${({ theme }) => theme.font.color.tertiary};
+  font-size: ${({ theme }) => theme.font.size.sm};
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+  padding-top: ${({ theme }) => theme.spacing(2)};
+  padding-bottom: ${({ theme }) => theme.spacing(1)};
+  padding-left: ${({ theme }) => theme.spacing(1)};
+  padding-right: ${({ theme }) => theme.spacing(1)};
+`;
+
 export const RightDrawerWorkflowSelectActionContent = ({
   workflow,
 }: {
@@ -25,14 +36,22 @@ export const RightDrawerWorkflowSelectActionContent = ({
 
   return (
     <StyledActionListContainer>
-      {ACTIONS.map((action) => (
+      <StyledSectionTitle>Records</StyledSectionTitle>
+      {RECORD_ACTIONS.map((action) => (
+        <MenuItem
+          key={action.type}
+          LeftIcon={action.icon}
+          text={action.label}
+          onClick={() => createStep(action.type)}
+        />
+      ))}
+      <StyledSectionTitle>Other</StyledSectionTitle>
+      {OTHER_ACTIONS.map((action) => (
         <MenuItem
           key={action.type}
           LeftIcon={action.icon}
           text={action.label}
-          onClick={() => {
-            return createStep(action.type);
-          }}
+          onClick={() => createStep(action.type)}
         />
       ))}
     </StyledActionListContainer>
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormCreateRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormCreateRecord.tsx
index 032f97ef5d10..f8296041ce53 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormCreateRecord.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormCreateRecord.tsx
@@ -94,7 +94,7 @@ export const WorkflowEditActionFormCreateRecord = ({
   const inlineFieldMetadataItems = objectMetadataItem.fields
     .filter(
       (fieldMetadataItem) =>
-        fieldMetadataItem.type !== FieldMetadataType.Relation &&
+        fieldMetadataItem.type !== FieldMetadataType.RELATION &&
         !fieldMetadataItem.isSystem &&
         fieldMetadataItem.isActive,
     )
@@ -215,6 +215,7 @@ export const WorkflowEditActionFormCreateRecord = ({
                 handleFieldChange(field.metadata.fieldName, value);
               }}
               VariablePicker={WorkflowVariablePicker}
+              readonly={isFormDisabled}
             />
           );
         })}
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormServerlessFunction.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormServerlessFunction.tsx
index fb76b0fc610b..173bfc957156 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormServerlessFunction.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormServerlessFunction.tsx
@@ -23,6 +23,7 @@ import { serverlessFunctionTestDataFamilyState } from '@/workflow/states/serverl
 import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowStepBody';
 import { WorkflowEditActionFormServerlessFunctionFields } from '@/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormServerlessFunctionFields';
 import { WORKFLOW_SERVERLESS_FUNCTION_TAB_LIST_COMPONENT_ID } from '@/workflow/workflow-steps/workflow-actions/constants/WorkflowServerlessFunctionTabListComponentId';
+import { getWrongExportedFunctionMarkers } from '@/workflow/workflow-steps/workflow-actions/utils/getWrongExportedFunctionMarkers';
 import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
@@ -76,6 +77,8 @@ export const WorkflowEditActionFormServerlessFunction = ({
   actionOptions,
 }: WorkflowEditActionFormServerlessFunctionProps) => {
   const serverlessFunctionId = action.settings.input.serverlessFunctionId;
+  const serverlessFunctionVersion =
+    action.settings.input.serverlessFunctionVersion;
   const theme = useTheme();
   const tabListId = `${WORKFLOW_SERVERLESS_FUNCTION_TAB_LIST_COMPONENT_ID}_${serverlessFunctionId}`;
   const { activeTabId, setActiveTabId } = useTabList(tabListId);
@@ -98,7 +101,10 @@ export const WorkflowEditActionFormServerlessFunction = ({
     );
 
   const { formValues, setFormValues, loading } =
-    useServerlessFunctionUpdateFormState(serverlessFunctionId);
+    useServerlessFunctionUpdateFormState({
+      serverlessFunctionId,
+      serverlessFunctionVersion,
+    });
 
   const updateOutputSchemaFromTestResult = async (testResult: object) => {
     if (actionOptions.readonly === true) {
@@ -111,10 +117,11 @@ export const WorkflowEditActionFormServerlessFunction = ({
     });
   };
 
-  const { testServerlessFunction } = useTestServerlessFunction(
+  const { testServerlessFunction } = useTestServerlessFunction({
     serverlessFunctionId,
-    updateOutputSchemaFromTestResult,
-  );
+    serverlessFunctionVersion,
+    callback: updateOutputSchemaFromTestResult,
+  });
 
   const handleSave = useDebouncedCallback(async () => {
     await updateOneServerlessFunction({
@@ -171,7 +178,7 @@ export const WorkflowEditActionFormServerlessFunction = ({
               isLeaf: true,
               icon: 'IconVariable',
               tab: 'test',
-              label: 'Generate Function Input',
+              label: 'Generate Function Output',
             },
             _outputSchemaType: 'LINK',
           },
@@ -299,6 +306,7 @@ export const WorkflowEditActionFormServerlessFunction = ({
                   language={'typescript'}
                   onChange={handleCodeChange}
                   onMount={handleEditorDidMount}
+                  setMarkers={getWrongExportedFunctionMarkers}
                   options={{
                     readOnly: actionOptions.readonly,
                     domReadOnly: actionOptions.readonly,
@@ -312,7 +320,6 @@ export const WorkflowEditActionFormServerlessFunction = ({
               <WorkflowEditActionFormServerlessFunctionFields
                 functionInput={serverlessFunctionTestData.input}
                 onInputChange={handleTestInputChange}
-                readonly={actionOptions.readonly}
               />
               <StyledCodeEditorContainer>
                 <InputLabel>Result</InputLabel>
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormUpdateRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormUpdateRecord.tsx
index 49c494d8058a..d1e73680387b 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormUpdateRecord.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionFormUpdateRecord.tsx
@@ -41,16 +41,16 @@ type UpdateRecordFormData = {
 };
 
 const AVAILABLE_FIELD_METADATA_TYPES = [
-  FieldMetadataType.Text,
-  FieldMetadataType.Number,
-  FieldMetadataType.Date,
-  FieldMetadataType.Boolean,
-  FieldMetadataType.Select,
-  FieldMetadataType.MultiSelect,
-  FieldMetadataType.Emails,
-  FieldMetadataType.Links,
-  FieldMetadataType.FullName,
-  FieldMetadataType.Address,
+  FieldMetadataType.TEXT,
+  FieldMetadataType.NUMBER,
+  FieldMetadataType.DATE,
+  FieldMetadataType.BOOLEAN,
+  FieldMetadataType.SELECT,
+  FieldMetadataType.MULTI_SELECT,
+  FieldMetadataType.EMAILS,
+  FieldMetadataType.LINKS,
+  FieldMetadataType.FULL_NAME,
+  FieldMetadataType.ADDRESS,
 ];
 
 export const WorkflowEditActionFormUpdateRecord = ({
@@ -222,6 +222,7 @@ export const WorkflowEditActionFormUpdateRecord = ({
           onPersist={(fieldsToUpdate) =>
             handleFieldChange('fieldsToUpdate', fieldsToUpdate)
           }
+          placeholder="Select fields to update"
         />
 
         <HorizontalSeparator noMargin />
@@ -248,6 +249,7 @@ export const WorkflowEditActionFormUpdateRecord = ({
                 handleFieldChange(fieldDefinition.metadata.fieldName, value);
               }}
               VariablePicker={WorkflowVariablePicker}
+              readonly={isFormDisabled}
             />
           );
         })}
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowSingleRecordPicker.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowSingleRecordPicker.tsx
index c049db474706..bc9d2d5c3e60 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowSingleRecordPicker.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowSingleRecordPicker.tsx
@@ -179,9 +179,7 @@ export const WorkflowSingleRecordPicker = ({
                   />
                 </RecordPickerComponentInstanceContext.Provider>
               }
-              dropdownHotkeyScope={{
-                scope: dropdownId,
-              }}
+              dropdownHotkeyScope={{ scope: dropdownId }}
             />
           </DropdownScope>
         </StyledFormSelectContainer>
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/constants/Actions.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/constants/Actions.ts
deleted file mode 100644
index 2302af4959bd..000000000000
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/constants/Actions.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { WorkflowStepType } from '@/workflow/types/Workflow';
-import {
-  IconAddressBook,
-  IconComponent,
-  IconSettingsAutomation,
-} from 'twenty-ui';
-
-export const ACTIONS: Array<{
-  label: string;
-  type: WorkflowStepType;
-  icon: IconComponent;
-}> = [
-  {
-    label: 'Serverless Function',
-    type: 'CODE',
-    icon: IconSettingsAutomation,
-  },
-  {
-    label: 'Send Email',
-    type: 'SEND_EMAIL',
-    icon: IconSettingsAutomation,
-  },
-  {
-    label: 'Create Record',
-    type: 'CREATE_RECORD',
-    icon: IconAddressBook,
-  },
-  {
-    label: 'Update Record',
-    type: 'UPDATE_RECORD',
-    icon: IconAddressBook,
-  },
-  {
-    label: 'Delete Record',
-    type: 'DELETE_RECORD',
-    icon: IconAddressBook,
-  },
-];
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/constants/OtherActions.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/constants/OtherActions.ts
new file mode 100644
index 000000000000..8b0c92999816
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/constants/OtherActions.ts
@@ -0,0 +1,19 @@
+import { WorkflowStepType } from '@/workflow/types/Workflow';
+import { IconCode, IconComponent, IconSend } from 'twenty-ui';
+
+export const OTHER_ACTIONS: Array<{
+  label: string;
+  type: WorkflowStepType;
+  icon: IconComponent;
+}> = [
+  {
+    label: 'Send Email',
+    type: 'SEND_EMAIL',
+    icon: IconSend,
+  },
+  {
+    label: 'Code',
+    type: 'CODE',
+    icon: IconCode,
+  },
+];
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/constants/RecordActions.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/constants/RecordActions.ts
new file mode 100644
index 000000000000..7e85c7d64327
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/constants/RecordActions.ts
@@ -0,0 +1,24 @@
+import { WorkflowStepType } from '@/workflow/types/Workflow';
+import { IconComponent, IconPlus, IconRefreshDot, IconTrash } from 'twenty-ui';
+
+export const RECORD_ACTIONS: Array<{
+  label: string;
+  type: WorkflowStepType;
+  icon: IconComponent;
+}> = [
+  {
+    label: 'Create Record',
+    type: 'CREATE_RECORD',
+    icon: IconPlus,
+  },
+  {
+    label: 'Update Record',
+    type: 'UPDATE_RECORD',
+    icon: IconRefreshDot,
+  },
+  {
+    label: 'Delete Record',
+    type: 'DELETE_RECORD',
+    icon: IconTrash,
+  },
+];
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/__tests__/getWrongExportedFunctionMarkers.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/__tests__/getWrongExportedFunctionMarkers.test.ts
new file mode 100644
index 000000000000..a93a4b725438
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/__tests__/getWrongExportedFunctionMarkers.test.ts
@@ -0,0 +1,30 @@
+import { getWrongExportedFunctionMarkers } from '@/workflow/workflow-steps/workflow-actions/utils/getWrongExportedFunctionMarkers';
+
+describe('getWrongExportedFunctionMarkers', () => {
+  it('should return marker when no exported function', () => {
+    const value = 'const main = async () => {}';
+    const result = getWrongExportedFunctionMarkers(value);
+    expect(result.length).toEqual(1);
+    expect(result[0].message).toEqual(
+      'An exported "main" arrow function is required.',
+    );
+  });
+
+  it('should return marker when no wrong exported function', () => {
+    const value = 'export const wrongMain = async () => {}';
+    const result = getWrongExportedFunctionMarkers(value);
+    expect(result.length).toEqual(1);
+  });
+
+  it('should return no marker when valid exported function', () => {
+    const value = 'export const main = async () => {}';
+    const result = getWrongExportedFunctionMarkers(value);
+    expect(result.length).toEqual(0);
+  });
+
+  it('should return handle multiple spaces', () => {
+    const value = 'export   const   main  = async () => {}';
+    const result = getWrongExportedFunctionMarkers(value);
+    expect(result.length).toEqual(0);
+  });
+});
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/getWrongExportedFunctionMarkers.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/getWrongExportedFunctionMarkers.ts
new file mode 100644
index 000000000000..525914104fe2
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/getWrongExportedFunctionMarkers.ts
@@ -0,0 +1,60 @@
+import { isDefined } from 'twenty-ui';
+
+const getSubstringCoordinate = (
+  text: string,
+  substring: string,
+): { line: number; column: number } | null => {
+  const lines = text.split('\n');
+
+  for (let lineIndex = 0; lineIndex < lines.length; lineIndex++) {
+    const columnIndex = lines[lineIndex].indexOf(substring);
+    if (columnIndex !== -1) {
+      return {
+        line: lineIndex + 1, // 1-based line number
+        column: columnIndex + 1, // 1-based column number
+      };
+    }
+  }
+
+  return null;
+};
+
+export const getWrongExportedFunctionMarkers = (value: string) => {
+  const validRegex = /export\s+const\s+main\s*=/g;
+  const invalidRegex = /export\s+const\s+\S*/g;
+  const exportRegex = /export\s+const/g;
+  const validMatch = value.match(validRegex);
+  const invalidMatch = value.match(invalidRegex);
+  const exportMatch = value.match(exportRegex);
+  const markers = [];
+
+  if (!validMatch && !!invalidMatch) {
+    const coordinates = getSubstringCoordinate(value, invalidMatch[0]);
+    if (isDefined(coordinates)) {
+      const endColumn = invalidMatch[0].length + coordinates.column;
+      markers.push({
+        severity: 8, //MarkerSeverity.Error,
+        message: 'Exported arrow function should be named "main"',
+        code: 'export const main',
+        startLineNumber: coordinates.line,
+        startColumn: coordinates.column,
+        endLineNumber: 1,
+        endColumn,
+      });
+    }
+  }
+
+  if (!exportMatch) {
+    markers.push({
+      severity: 8, //MarkerSeverity.Error,
+      message: 'An exported "main" arrow function is required.',
+      code: 'export const main',
+      startLineNumber: 1,
+      startColumn: 1,
+      endLineNumber: 1,
+      endColumn: 1,
+    });
+  }
+
+  return markers;
+};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/RightDrawerWorkflowSelectTriggerTypeContent.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/RightDrawerWorkflowSelectTriggerTypeContent.tsx
index bf8cf359fa58..66cf209072cc 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/RightDrawerWorkflowSelectTriggerTypeContent.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/RightDrawerWorkflowSelectTriggerTypeContent.tsx
@@ -3,8 +3,9 @@ import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer';
 import { RightDrawerPages } from '@/ui/layout/right-drawer/types/RightDrawerPages';
 import { WorkflowWithCurrentVersion } from '@/workflow/types/Workflow';
 import { workflowSelectedNodeState } from '@/workflow/workflow-diagram/states/workflowSelectedNodeState';
+import { DATABASE_TRIGGER_TYPES } from '@/workflow/workflow-trigger/constants/DatabaseTriggerTypes';
+import { OTHER_TRIGGER_TYPES } from '@/workflow/workflow-trigger/constants/OtherTriggerTypes';
 import { TRIGGER_STEP_ID } from '@/workflow/workflow-trigger/constants/TriggerStepId';
-import { TRIGGER_TYPES } from '@/workflow/workflow-trigger/constants/TriggerTypes';
 import { useUpdateWorkflowVersionTrigger } from '@/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger';
 import { getTriggerDefaultDefinition } from '@/workflow/workflow-trigger/utils/getTriggerDefaultDefinition';
 import styled from '@emotion/styled';
@@ -21,6 +22,16 @@ const StyledActionListContainer = styled.div`
   padding-inline: ${({ theme }) => theme.spacing(2)};
 `;
 
+const StyledSectionTitle = styled.span`
+  color: ${({ theme }) => theme.font.color.tertiary};
+  font-size: ${({ theme }) => theme.font.size.sm};
+  font-weight: ${({ theme }) => theme.font.weight.medium};
+  padding-top: ${({ theme }) => theme.spacing(2)};
+  padding-bottom: ${({ theme }) => theme.spacing(1)};
+  padding-left: ${({ theme }) => theme.spacing(1)};
+  padding-right: ${({ theme }) => theme.spacing(1)};
+`;
+
 export const RightDrawerWorkflowSelectTriggerTypeContent = ({
   workflow,
 }: {
@@ -35,14 +46,40 @@ export const RightDrawerWorkflowSelectTriggerTypeContent = ({
 
   return (
     <StyledActionListContainer>
-      {TRIGGER_TYPES.map((action) => (
+      <StyledSectionTitle>Data</StyledSectionTitle>
+      {DATABASE_TRIGGER_TYPES.map((action) => (
+        <MenuItem
+          key={action.name}
+          LeftIcon={action.icon}
+          text={action.name}
+          onClick={async () => {
+            await updateTrigger(
+              getTriggerDefaultDefinition({
+                name: action.name,
+                type: action.type,
+                activeObjectMetadataItems,
+              }),
+            );
+
+            setWorkflowSelectedNode(TRIGGER_STEP_ID);
+
+            openRightDrawer(RightDrawerPages.WorkflowStepEdit, {
+              title: action.name,
+              Icon: action.icon,
+            });
+          }}
+        />
+      ))}
+      <StyledSectionTitle>Others</StyledSectionTitle>
+      {OTHER_TRIGGER_TYPES.map((action) => (
         <MenuItem
-          key={action.type}
+          key={action.name}
           LeftIcon={action.icon}
           text={action.name}
           onClick={async () => {
             await updateTrigger(
               getTriggerDefaultDefinition({
+                name: action.name,
                 type: action.type,
                 activeObjectMetadataItems,
               }),
@@ -50,7 +87,10 @@ export const RightDrawerWorkflowSelectTriggerTypeContent = ({
 
             setWorkflowSelectedNode(TRIGGER_STEP_ID);
 
-            openRightDrawer(RightDrawerPages.WorkflowStepEdit);
+            openRightDrawer(RightDrawerPages.WorkflowStepEdit, {
+              title: action.name,
+              Icon: action.icon,
+            });
           }}
         />
       ))}
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx
index 873c5ab2e745..cac249cd64dc 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx
@@ -4,7 +4,7 @@ import { WorkflowDatabaseEventTrigger } from '@/workflow/types/Workflow';
 import { splitWorkflowTriggerEventName } from '@/workflow/utils/splitWorkflowTriggerEventName';
 import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowStepBody';
 import { WorkflowStepHeader } from '@/workflow/workflow-steps/components/WorkflowStepHeader';
-import { OBJECT_EVENT_TRIGGERS } from '@/workflow/workflow-trigger/constants/ObjectEventTriggers';
+import { DATABASE_TRIGGER_EVENTS } from '@/workflow/workflow-trigger/constants/DatabaseTriggerEvents';
 import { useTheme } from '@emotion/react';
 import { IconPlaylistAdd, isDefined } from 'twenty-ui';
 
@@ -29,35 +29,30 @@ export const WorkflowEditTriggerDatabaseEventForm = ({
 
   const { activeObjectMetadataItems } = useFilteredObjectMetadataItems();
 
-  const triggerEvent = isDefined(trigger)
-    ? splitWorkflowTriggerEventName(trigger.settings.eventName)
-    : undefined;
+  const triggerEvent = splitWorkflowTriggerEventName(
+    trigger.settings.eventName,
+  );
 
   const availableMetadata: Array<SelectOption<string>> =
     activeObjectMetadataItems.map((item) => ({
       label: item.labelPlural,
       value: item.nameSingular,
     }));
-  const recordTypeMetadata = isDefined(triggerEvent)
-    ? activeObjectMetadataItems.find(
-        (item) => item.nameSingular === triggerEvent.objectType,
-      )
-    : undefined;
 
   const selectedEvent = isDefined(triggerEvent)
-    ? OBJECT_EVENT_TRIGGERS.find(
+    ? DATABASE_TRIGGER_EVENTS.find(
         (availableEvent) => availableEvent.value === triggerEvent.event,
       )
     : undefined;
 
   const headerTitle = isDefined(trigger.name)
     ? trigger.name
-    : isDefined(recordTypeMetadata) && isDefined(selectedEvent)
-      ? `When a ${recordTypeMetadata.labelSingular} is ${selectedEvent.label}`
+    : isDefined(selectedEvent)
+      ? selectedEvent.label
       : '-';
 
   const headerType = isDefined(selectedEvent)
-    ? `Trigger · Record is ${selectedEvent.label}`
+    ? `Trigger · ${selectedEvent.label}`
     : '-';
 
   return (
@@ -92,57 +87,13 @@ export const WorkflowEditTriggerDatabaseEventForm = ({
               return;
             }
 
-            triggerOptions.onTriggerUpdate(
-              isDefined(trigger) && isDefined(triggerEvent)
-                ? {
-                    ...trigger,
-                    settings: {
-                      ...trigger.settings,
-                      eventName: `${updatedRecordType}.${triggerEvent.event}`,
-                    },
-                  }
-                : {
-                    name: headerTitle,
-                    type: 'DATABASE_EVENT',
-                    settings: {
-                      eventName: `${updatedRecordType}.${OBJECT_EVENT_TRIGGERS[0].value}`,
-                      outputSchema: {},
-                    },
-                  },
-            );
-          }}
-        />
-        <Select
-          dropdownId="workflow-edit-trigger-event-type"
-          label="Event type"
-          fullWidth
-          value={triggerEvent?.event}
-          emptyOption={{ label: 'Select an option', value: '' }}
-          options={OBJECT_EVENT_TRIGGERS}
-          disabled={triggerOptions.readonly}
-          onChange={(updatedEvent) => {
-            if (triggerOptions.readonly === true) {
-              return;
-            }
-
-            triggerOptions.onTriggerUpdate(
-              isDefined(trigger) && isDefined(triggerEvent)
-                ? {
-                    ...trigger,
-                    settings: {
-                      ...trigger.settings,
-                      eventName: `${triggerEvent.objectType}.${updatedEvent}`,
-                    },
-                  }
-                : {
-                    name: headerTitle,
-                    type: 'DATABASE_EVENT',
-                    settings: {
-                      eventName: `${availableMetadata?.[0].value}.${updatedEvent}`,
-                      outputSchema: {},
-                    },
-                  },
-            );
+            triggerOptions.onTriggerUpdate({
+              ...trigger,
+              settings: {
+                ...trigger.settings,
+                eventName: `${updatedRecordType}.${triggerEvent.event}`,
+              },
+            });
           }}
         />
       </WorkflowStepBody>
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/DatabaseTriggerEvents.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/DatabaseTriggerEvents.ts
new file mode 100644
index 000000000000..4403889e5d44
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/DatabaseTriggerEvents.ts
@@ -0,0 +1,18 @@
+import { SelectOption } from '@/ui/input/components/Select';
+
+import { DatabaseTriggerName } from '@/workflow/workflow-trigger/constants/DatabaseTriggerName';
+
+export const DATABASE_TRIGGER_EVENTS: Array<SelectOption<string>> = [
+  {
+    label: DatabaseTriggerName.RECORD_IS_CREATED,
+    value: 'created',
+  },
+  {
+    label: DatabaseTriggerName.RECORD_IS_UPDATED,
+    value: 'updated',
+  },
+  {
+    label: DatabaseTriggerName.RECORD_IS_DELETED,
+    value: 'deleted',
+  },
+];
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/DatabaseTriggerName.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/DatabaseTriggerName.ts
new file mode 100644
index 000000000000..0aea82a7583e
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/DatabaseTriggerName.ts
@@ -0,0 +1,5 @@
+export enum DatabaseTriggerName {
+  RECORD_IS_CREATED = 'Record is Created',
+  RECORD_IS_UPDATED = 'Record is Updated',
+  RECORD_IS_DELETED = 'Record is Deleted',
+}
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/DatabaseTriggerTypes.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/DatabaseTriggerTypes.ts
new file mode 100644
index 000000000000..9b255c2da564
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/DatabaseTriggerTypes.ts
@@ -0,0 +1,25 @@
+import { WorkflowTriggerType } from '@/workflow/types/Workflow';
+import { DatabaseTriggerName } from '@/workflow/workflow-trigger/constants/DatabaseTriggerName';
+import { IconComponent, IconPlus, IconRefreshDot, IconTrash } from 'twenty-ui';
+
+export const DATABASE_TRIGGER_TYPES: Array<{
+  name: DatabaseTriggerName;
+  type: WorkflowTriggerType;
+  icon: IconComponent;
+}> = [
+  {
+    name: DatabaseTriggerName.RECORD_IS_CREATED,
+    type: 'DATABASE_EVENT',
+    icon: IconPlus,
+  },
+  {
+    name: DatabaseTriggerName.RECORD_IS_UPDATED,
+    type: 'DATABASE_EVENT',
+    icon: IconRefreshDot,
+  },
+  {
+    name: DatabaseTriggerName.RECORD_IS_DELETED,
+    type: 'DATABASE_EVENT',
+    icon: IconTrash,
+  },
+];
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/ObjectEventTriggers.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/ObjectEventTriggers.ts
deleted file mode 100644
index bd204f7c8fd5..000000000000
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/ObjectEventTriggers.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { SelectOption } from '@/ui/input/components/Select';
-
-export const OBJECT_EVENT_TRIGGERS: Array<SelectOption<string>> = [
-  {
-    label: 'Created',
-    value: 'created',
-  },
-  {
-    label: 'Updated',
-    value: 'updated',
-  },
-  {
-    label: 'Deleted',
-    value: 'deleted',
-  },
-];
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/OtherTriggerTypes.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/OtherTriggerTypes.ts
new file mode 100644
index 000000000000..0e1eed42e5ac
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/OtherTriggerTypes.ts
@@ -0,0 +1,14 @@
+import { WorkflowTriggerType } from '@/workflow/types/Workflow';
+import { IconClick, IconComponent } from 'twenty-ui';
+
+export const OTHER_TRIGGER_TYPES: Array<{
+  name: string;
+  type: WorkflowTriggerType;
+  icon: IconComponent;
+}> = [
+  {
+    name: 'Launch manually',
+    type: 'MANUAL',
+    icon: IconClick,
+  },
+];
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/TriggerTypes.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/TriggerTypes.ts
deleted file mode 100644
index 2360703fbfe3..000000000000
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/constants/TriggerTypes.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { WorkflowTriggerType } from '@/workflow/types/Workflow';
-import { IconComponent, IconSettingsAutomation } from 'twenty-ui';
-
-export const TRIGGER_TYPES: Array<{
-  name: string;
-  type: WorkflowTriggerType;
-  icon: IconComponent;
-}> = [
-  {
-    name: 'Database Event',
-    type: 'DATABASE_EVENT',
-    icon: IconSettingsAutomation,
-  },
-  {
-    name: 'Manual Trigger',
-    type: 'MANUAL',
-    icon: IconSettingsAutomation,
-  },
-];
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger.ts
index f6cf98abfed5..783bad350b5a 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/hooks/useUpdateWorkflowVersionTrigger.ts
@@ -28,7 +28,7 @@ export const useUpdateWorkflowVersionTrigger = ({
       throw new Error('Can not update an undefined workflow version.');
     }
 
-    const workflowVersion = await getUpdatableWorkflowVersion(workflow);
+    const workflowVersionId = await getUpdatableWorkflowVersion(workflow);
 
     const outputSchema = (
       await computeStepOutputSchema({
@@ -42,7 +42,7 @@ export const useUpdateWorkflowVersionTrigger = ({
     };
 
     await updateOneWorkflowVersion({
-      idToUpdate: workflowVersion.id,
+      idToUpdate: workflowVersionId,
       updateOneRecordInput: {
         trigger: updatedTrigger,
       },
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getTriggerDefaultDefinition.test.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getTriggerDefaultDefinition.test.ts
index 8e9244acf906..72459de1b16e 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getTriggerDefaultDefinition.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getTriggerDefaultDefinition.test.ts
@@ -1,50 +1,105 @@
+import { DatabaseTriggerName } from '@/workflow/workflow-trigger/constants/DatabaseTriggerName';
 import { generatedMockObjectMetadataItems } from '~/testing/mock-data/generatedMockObjectMetadataItems';
 import { getTriggerDefaultDefinition } from '../getTriggerDefaultDefinition';
 
-it('throws if the activeObjectMetadataItems list is empty', () => {
-  expect(() => {
-    getTriggerDefaultDefinition({
+describe('getTriggerDefaultDefinition', () => {
+  it('throws if the activeObjectMetadataItems list is empty', () => {
+    expect(() => {
+      getTriggerDefaultDefinition({
+        name: DatabaseTriggerName.RECORD_IS_CREATED,
+        type: 'DATABASE_EVENT',
+        activeObjectMetadataItems: [],
+      });
+    }).toThrow();
+  });
+
+  it('returns a valid configuration for DATABASE_EVENT trigger type creation', () => {
+    expect(
+      getTriggerDefaultDefinition({
+        name: DatabaseTriggerName.RECORD_IS_CREATED,
+        type: 'DATABASE_EVENT',
+        activeObjectMetadataItems: generatedMockObjectMetadataItems,
+      }),
+    ).toStrictEqual({
       type: 'DATABASE_EVENT',
-      activeObjectMetadataItems: [],
+      settings: {
+        eventName: `${generatedMockObjectMetadataItems[0].nameSingular}.created`,
+        outputSchema: {},
+      },
     });
-  }).toThrow();
-});
+  });
 
-it('returns a valid configuration for DATABASE_EVENT trigger type', () => {
-  expect(
-    getTriggerDefaultDefinition({
+  it('returns a valid configuration for DATABASE_EVENT trigger type update', () => {
+    expect(
+      getTriggerDefaultDefinition({
+        name: DatabaseTriggerName.RECORD_IS_UPDATED,
+        type: 'DATABASE_EVENT',
+        activeObjectMetadataItems: generatedMockObjectMetadataItems,
+      }),
+    ).toStrictEqual({
       type: 'DATABASE_EVENT',
-      activeObjectMetadataItems: generatedMockObjectMetadataItems,
-    }),
-  ).toStrictEqual({
-    type: 'DATABASE_EVENT',
-    settings: {
-      eventName: `${generatedMockObjectMetadataItems[0].nameSingular}.created`,
-      outputSchema: {},
-    },
+      settings: {
+        eventName: `${generatedMockObjectMetadataItems[0].nameSingular}.updated`,
+        outputSchema: {},
+      },
+    });
   });
-});
 
-it('returns a valid configuration for MANUAL trigger type', () => {
-  expect(
-    getTriggerDefaultDefinition({
-      type: 'MANUAL',
-      activeObjectMetadataItems: generatedMockObjectMetadataItems,
-    }),
-  ).toStrictEqual({
-    type: 'MANUAL',
-    settings: {
-      objectType: generatedMockObjectMetadataItems[0].nameSingular,
-      outputSchema: {},
-    },
+  it('returns a valid configuration for DATABASE_EVENT trigger type deletion', () => {
+    expect(
+      getTriggerDefaultDefinition({
+        name: DatabaseTriggerName.RECORD_IS_DELETED,
+        type: 'DATABASE_EVENT',
+        activeObjectMetadataItems: generatedMockObjectMetadataItems,
+      }),
+    ).toStrictEqual({
+      type: 'DATABASE_EVENT',
+      settings: {
+        eventName: `${generatedMockObjectMetadataItems[0].nameSingular}.deleted`,
+        outputSchema: {},
+      },
+    });
   });
-});
 
-it('throws when providing an unknown trigger type', () => {
-  expect(() => {
-    getTriggerDefaultDefinition({
-      type: 'unknown' as any,
-      activeObjectMetadataItems: generatedMockObjectMetadataItems,
+  it('returns a valid configuration for DATABASE_EVENT trigger type creation', () => {
+    expect(
+      getTriggerDefaultDefinition({
+        name: DatabaseTriggerName.RECORD_IS_CREATED,
+        type: 'DATABASE_EVENT',
+        activeObjectMetadataItems: generatedMockObjectMetadataItems,
+      }),
+    ).toStrictEqual({
+      type: 'DATABASE_EVENT',
+      settings: {
+        eventName: `${generatedMockObjectMetadataItems[0].nameSingular}.created`,
+        outputSchema: {},
+      },
     });
-  }).toThrow('Unknown type: unknown');
+  });
+
+  it('returns a valid configuration for MANUAL trigger type', () => {
+    expect(
+      getTriggerDefaultDefinition({
+        name: 'Launch manually',
+        type: 'MANUAL',
+        activeObjectMetadataItems: generatedMockObjectMetadataItems,
+      }),
+    ).toStrictEqual({
+      type: 'MANUAL',
+      settings: {
+        objectType: generatedMockObjectMetadataItems[0].nameSingular,
+        outputSchema: {},
+      },
+    });
+  });
+
+  it('throws when providing an unknown trigger type', () => {
+    expect(() => {
+      getTriggerDefaultDefinition({
+        name: DatabaseTriggerName.RECORD_IS_CREATED,
+        type: 'unknown' as any,
+        activeObjectMetadataItems: generatedMockObjectMetadataItems,
+      });
+    }).toThrow('Unknown type: unknown');
+  });
 });
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/getTriggerDefaultDefinition.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/getTriggerDefaultDefinition.ts
index 091ee91f2cf1..04f341145ffa 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/getTriggerDefaultDefinition.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/getTriggerDefaultDefinition.ts
@@ -4,13 +4,15 @@ import {
   WorkflowTriggerType,
 } from '@/workflow/types/Workflow';
 import { assertUnreachable } from '@/workflow/utils/assertUnreachable';
-import { OBJECT_EVENT_TRIGGERS } from '@/workflow/workflow-trigger/constants/ObjectEventTriggers';
+import { DATABASE_TRIGGER_EVENTS } from '@/workflow/workflow-trigger/constants/DatabaseTriggerEvents';
 import { getManualTriggerDefaultSettings } from '@/workflow/workflow-trigger/utils/getManualTriggerDefaultSettings';
 
 export const getTriggerDefaultDefinition = ({
+  name,
   type,
   activeObjectMetadataItems,
 }: {
+  name: string;
   type: WorkflowTriggerType;
   activeObjectMetadataItems: ObjectMetadataItem[];
 }): WorkflowTrigger => {
@@ -25,7 +27,11 @@ export const getTriggerDefaultDefinition = ({
       return {
         type,
         settings: {
-          eventName: `${activeObjectMetadataItems[0].nameSingular}.${OBJECT_EVENT_TRIGGERS[0].value}`,
+          eventName: `${activeObjectMetadataItems[0].nameSingular}.${
+            DATABASE_TRIGGER_EVENTS.find(
+              (availableEvent) => availableEvent.label === name,
+            )?.value
+          }`,
           outputSchema: {},
         },
       };
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownFieldItems.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownFieldItems.tsx
index 289863a80a64..23397bfd1bac 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownFieldItems.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownFieldItems.tsx
@@ -132,9 +132,7 @@ export const WorkflowVariablesDropdownFieldItems = ({
       <DropdownMenuHeader
         StartIcon={IconChevronLeft}
         onClick={goBack}
-        style={{
-          position: 'fixed',
-        }}
+        style={{ position: 'fixed' }}
       >
         <OverflowingTextWithTooltip text={headerLabel} />
       </DropdownMenuHeader>
@@ -145,15 +143,18 @@ export const WorkflowVariablesDropdownFieldItems = ({
       />
       <DropdownMenuSeparator />
       <DropdownMenuItemsContainer>
-        {filteredOptions.map(([key, value]) => (
+        {filteredOptions.map(([key, subStep]) => (
           <MenuItemSelect
             key={key}
             selected={false}
             hovered={false}
             onClick={() => handleSelectField(key)}
-            text={value.label || key}
-            hasSubMenu={!value.isLeaf}
-            LeftIcon={value.icon ? getIcon(value.icon) : undefined}
+            text={subStep.label || key}
+            hasSubMenu={!subStep.isLeaf}
+            LeftIcon={subStep.icon ? getIcon(subStep.icon) : undefined}
+            contextualText={
+              subStep.isLeaf ? subStep?.value?.toString() : undefined
+            }
           />
         ))}
       </DropdownMenuItemsContainer>
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/utils/__tests__/getTriggerStepName.test.ts b/packages/twenty-front/src/modules/workflow/workflow-variables/utils/__tests__/getTriggerStepName.test.ts
index f5cfa268054f..377d182f48a1 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/utils/__tests__/getTriggerStepName.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/utils/__tests__/getTriggerStepName.test.ts
@@ -10,7 +10,7 @@ it('returns the expected name for a DATABASE_EVENT trigger', () => {
         outputSchema: {},
       },
     }),
-  ).toBe('Company is Created');
+  ).toBe('Record is Created');
 });
 
 it('returns the expected name for a MANUAL trigger without a defined objectType', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/utils/getTriggerStepName.ts b/packages/twenty-front/src/modules/workflow/workflow-variables/utils/getTriggerStepName.ts
index 5c5faa1e4efa..00fb841b792c 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/utils/getTriggerStepName.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/utils/getTriggerStepName.ts
@@ -3,6 +3,7 @@ import {
   WorkflowTrigger,
 } from '@/workflow/types/Workflow';
 import { assertUnreachable } from '@/workflow/utils/assertUnreachable';
+import { DATABASE_TRIGGER_EVENTS } from '@/workflow/workflow-trigger/constants/DatabaseTriggerEvents';
 import { capitalize } from 'twenty-shared';
 import { isDefined } from 'twenty-ui';
 
@@ -24,7 +25,9 @@ export const getTriggerStepName = (trigger: WorkflowTrigger): string => {
 const getDatabaseEventTriggerStepName = (
   trigger: WorkflowDatabaseEventTrigger,
 ): string => {
-  const [object, action] = trigger.settings.eventName.split('.');
+  const [, action] = trigger.settings.eventName.split('.');
 
-  return `${capitalize(object)} is ${capitalize(action)}`;
+  return (
+    DATABASE_TRIGGER_EVENTS.find((event) => event.value === action)?.label ?? ''
+  );
 };
diff --git a/packages/twenty-front/src/modules/workspace-member/graphql/mutations/addUserToWorkspace.ts b/packages/twenty-front/src/modules/workspace-member/graphql/mutations/addUserToWorkspace.ts
deleted file mode 100644
index a57f07931df4..000000000000
--- a/packages/twenty-front/src/modules/workspace-member/graphql/mutations/addUserToWorkspace.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const ADD_USER_TO_WORKSPACE = gql`
-  mutation AddUserToWorkspace($inviteHash: String!) {
-    addUserToWorkspace(inviteHash: $inviteHash) {
-      id
-    }
-  }
-`;
diff --git a/packages/twenty-front/src/modules/workspace-member/graphql/mutations/addUserToWorkspaceByInviteToken.ts b/packages/twenty-front/src/modules/workspace-member/graphql/mutations/addUserToWorkspaceByInviteToken.ts
deleted file mode 100644
index 4850c10596e4..000000000000
--- a/packages/twenty-front/src/modules/workspace-member/graphql/mutations/addUserToWorkspaceByInviteToken.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const ADD_USER_TO_WORKSPACE_BY_INVITE_TOKEN = gql`
-  mutation AddUserToWorkspaceByInviteToken($inviteToken: String!) {
-    addUserToWorkspaceByInviteToken(inviteToken: $inviteToken) {
-      id
-    }
-  }
-`;
diff --git a/packages/twenty-front/src/modules/workspace/graphql/queries/getWorkspaceFromInviteHash.ts b/packages/twenty-front/src/modules/workspace/graphql/queries/getWorkspaceFromInviteHash.ts
index b18a9d2c690a..5b7925f6334a 100644
--- a/packages/twenty-front/src/modules/workspace/graphql/queries/getWorkspaceFromInviteHash.ts
+++ b/packages/twenty-front/src/modules/workspace/graphql/queries/getWorkspaceFromInviteHash.ts
@@ -7,6 +7,7 @@ export const GET_WORKSPACE_FROM_INVITE_HASH = gql`
       displayName
       logo
       allowImpersonation
+      subdomain
     }
   }
 `;
diff --git a/packages/twenty-front/src/modules/workspace/hooks/__tests__/useSubscriptionStatus.test.ts b/packages/twenty-front/src/modules/workspace/hooks/__tests__/useSubscriptionStatus.test.ts
index d7840ca27241..821f2fa7b4fe 100644
--- a/packages/twenty-front/src/modules/workspace/hooks/__tests__/useSubscriptionStatus.test.ts
+++ b/packages/twenty-front/src/modules/workspace/hooks/__tests__/useSubscriptionStatus.test.ts
@@ -16,7 +16,7 @@ import {
 const currentWorkspace = {
   id: '1',
   currentBillingSubscription: { status: SubscriptionStatus.Incomplete },
-  activationStatus: WorkspaceActivationStatus.Active,
+  activationStatus: WorkspaceActivationStatus.ACTIVE,
   allowImpersonation: true,
 } as CurrentWorkspace;
 
diff --git a/packages/twenty-front/src/modules/workspace/hooks/useIsWorkspaceActivationStatusSuspended.ts b/packages/twenty-front/src/modules/workspace/hooks/useIsWorkspaceActivationStatusSuspended.ts
new file mode 100644
index 000000000000..9e52e90a87e8
--- /dev/null
+++ b/packages/twenty-front/src/modules/workspace/hooks/useIsWorkspaceActivationStatusSuspended.ts
@@ -0,0 +1,11 @@
+import { useRecoilValue } from 'recoil';
+
+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { WorkspaceActivationStatus } from '~/generated/graphql';
+
+export const useIsWorkspaceActivationStatusSuspended = (): boolean => {
+  const currentWorkspace = useRecoilValue(currentWorkspaceState);
+  return (
+    currentWorkspace?.activationStatus === WorkspaceActivationStatus.SUSPENDED
+  );
+};
diff --git a/packages/twenty-front/src/pages/auth/Authorize.tsx b/packages/twenty-front/src/pages/auth/Authorize.tsx
index 407b609c1690..c88677308ce7 100644
--- a/packages/twenty-front/src/pages/auth/Authorize.tsx
+++ b/packages/twenty-front/src/pages/auth/Authorize.tsx
@@ -1,12 +1,14 @@
 import { AppPath } from '@/types/AppPath';
 import styled from '@emotion/styled';
 import { useEffect, useState } from 'react';
-import { useNavigate, useSearchParams } from 'react-router-dom';
+import { useSearchParams } from 'react-router-dom';
 
+import { useRedirect } from '@/domain-manager/hooks/useRedirect';
+import { useLingui } from '@lingui/react/macro';
 import { MainButton, UndecoratedLink } from 'twenty-ui';
 import { useAuthorizeAppMutation } from '~/generated/graphql';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
 import { isDefined } from '~/utils/isDefined';
-import { useRedirect } from '@/domain-manager/hooks/useRedirect';
 
 type App = { id: string; name: string; logo: string };
 
@@ -54,7 +56,8 @@ const StyledButtonContainer = styled.div`
   width: 100%;
 `;
 export const Authorize = () => {
-  const navigate = useNavigate();
+  const { t } = useLingui();
+  const navigate = useNavigateApp();
   const [searchParam] = useSearchParams();
   const { redirect } = useRedirect();
   //TODO: Replace with db call for registered third party apps
@@ -118,9 +121,13 @@ export const Authorize = () => {
         <StyledText>{app?.name} wants to access your account</StyledText>
         <StyledButtonContainer>
           <UndecoratedLink to={AppPath.Index}>
-            <MainButton title="Cancel" variant="secondary" fullWidth />
+            <MainButton title={t`Cancel`} variant="secondary" fullWidth />
           </UndecoratedLink>
-          <MainButton title="Authorize" onClick={handleAuthorize} fullWidth />
+          <MainButton
+            title={t`Authorize`}
+            onClick={handleAuthorize}
+            fullWidth
+          />
         </StyledButtonContainer>
       </StyledCardWrapper>
     </StyledContainer>
diff --git a/packages/twenty-front/src/pages/auth/Invite.tsx b/packages/twenty-front/src/pages/auth/Invite.tsx
index b0a9ce14ebdc..86a449b96c12 100644
--- a/packages/twenty-front/src/pages/auth/Invite.tsx
+++ b/packages/twenty-front/src/pages/auth/Invite.tsx
@@ -1,104 +1,27 @@
 import { Logo } from '@/auth/components/Logo';
 import { Title } from '@/auth/components/Title';
-import { FooterNote } from '@/auth/sign-in-up/components/FooterNote';
 import { SignInUpWorkspaceScopeForm } from '@/auth/sign-in-up/components/SignInUpWorkspaceScopeForm';
-import { useSignInUpForm } from '@/auth/sign-in-up/hooks/useSignInUpForm';
 import { useWorkspaceFromInviteHash } from '@/auth/sign-in-up/hooks/useWorkspaceFromInviteHash';
-import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
-import { useWorkspaceSwitching } from '@/ui/navigation/navigation-drawer/hooks/useWorkspaceSwitching';
-import styled from '@emotion/styled';
 import { useMemo } from 'react';
-import { useSearchParams } from 'react-router-dom';
-import { useRecoilValue } from 'recoil';
-import { AnimatedEaseIn, Loader, MainButton } from 'twenty-ui';
-import {
-  useAddUserToWorkspaceByInviteTokenMutation,
-  useAddUserToWorkspaceMutation,
-} from '~/generated/graphql';
-import { isDefined } from '~/utils/isDefined';
-import { currentUserState } from '@/auth/states/currentUserState';
-import { SignInUpWorkspaceScopeFormEffect } from '@/auth/sign-in-up/components/SignInUpWorkspaceScopeFormEffect';
+import { AnimatedEaseIn } from 'twenty-ui';
 
-const StyledContentContainer = styled.div`
-  margin-bottom: ${({ theme }) => theme.spacing(8)};
-  margin-top: ${({ theme }) => theme.spacing(4)};
-`;
+import { SignInUpWorkspaceScopeFormEffect } from '@/auth/sign-in-up/components/SignInUpWorkspaceScopeFormEffect';
 
 export const Invite = () => {
-  const { workspace: workspaceFromInviteHash, workspaceInviteHash } =
-    useWorkspaceFromInviteHash();
-
-  const { form } = useSignInUpForm();
-  const currentWorkspace = useRecoilValue(currentWorkspaceState);
-  const currentUser = useRecoilValue(currentUserState);
-  const [addUserToWorkspace] = useAddUserToWorkspaceMutation();
-  const [addUserToWorkspaceByInviteToken] =
-    useAddUserToWorkspaceByInviteTokenMutation();
-  const { switchWorkspace } = useWorkspaceSwitching();
-  const [searchParams] = useSearchParams();
-  const workspaceInviteToken = searchParams.get('inviteToken');
+  const { workspace: workspaceFromInviteHash } = useWorkspaceFromInviteHash();
 
   const title = useMemo(() => {
     return `Join ${workspaceFromInviteHash?.displayName ?? ''} team`;
   }, [workspaceFromInviteHash?.displayName]);
 
-  const handleUserJoinWorkspace = async () => {
-    if (isDefined(workspaceInviteToken) && isDefined(workspaceFromInviteHash)) {
-      await addUserToWorkspaceByInviteToken({
-        variables: {
-          inviteToken: workspaceInviteToken,
-        },
-      });
-    } else if (
-      isDefined(workspaceInviteHash) &&
-      isDefined(workspaceFromInviteHash)
-    ) {
-      await addUserToWorkspace({
-        variables: {
-          inviteHash: workspaceInviteHash,
-        },
-      });
-    } else {
-      return;
-    }
-
-    await switchWorkspace(workspaceFromInviteHash.id);
-  };
-
-  if (
-    !isDefined(workspaceFromInviteHash) ||
-    (isDefined(workspaceFromInviteHash) &&
-      isDefined(currentWorkspace) &&
-      workspaceFromInviteHash.id === currentWorkspace.id)
-  ) {
-    return <></>;
-  }
-
   return (
     <>
       <AnimatedEaseIn>
         <Logo secondaryLogo={workspaceFromInviteHash?.logo} />
       </AnimatedEaseIn>
       <Title animate>{title}</Title>
-      {isDefined(currentUser) ? (
-        <>
-          <StyledContentContainer>
-            <MainButton
-              title="Continue"
-              type="submit"
-              onClick={handleUserJoinWorkspace}
-              Icon={() => form.formState.isSubmitting && <Loader />}
-              fullWidth
-            />
-          </StyledContentContainer>
-          <FooterNote />
-        </>
-      ) : (
-        <>
-          <SignInUpWorkspaceScopeFormEffect />
-          <SignInUpWorkspaceScopeForm />
-        </>
-      )}
+      <SignInUpWorkspaceScopeFormEffect />
+      <SignInUpWorkspaceScopeForm />
     </>
   );
 };
diff --git a/packages/twenty-front/src/pages/auth/PasswordReset.tsx b/packages/twenty-front/src/pages/auth/PasswordReset.tsx
index 3b896d30688e..27c67e49502b 100644
--- a/packages/twenty-front/src/pages/auth/PasswordReset.tsx
+++ b/packages/twenty-front/src/pages/auth/PasswordReset.tsx
@@ -3,6 +3,7 @@ import { Logo } from '@/auth/components/Logo';
 import { Title } from '@/auth/components/Title';
 import { useAuth } from '@/auth/hooks/useAuth';
 import { useIsLogged } from '@/auth/hooks/useIsLogged';
+import { workspacePublicDataState } from '@/auth/states/workspacePublicDataState';
 import { PASSWORD_REGEX } from '@/auth/utils/passwordRegex';
 import { useReadCaptchaToken } from '@/captcha/hooks/useReadCaptchaToken';
 import { AppPath } from '@/types/AppPath';
@@ -13,21 +14,22 @@ import { isDefaultLayoutAuthModalVisibleState } from '@/ui/layout/states/isDefau
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { zodResolver } from '@hookform/resolvers/zod';
+import { Trans, useLingui } from '@lingui/react/macro';
 import { isNonEmptyString } from '@sniptt/guards';
 import { motion } from 'framer-motion';
 import { useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
-import { useNavigate, useParams } from 'react-router-dom';
-import { useSetRecoilState, useRecoilValue } from 'recoil';
+import { useParams } from 'react-router-dom';
+import { useRecoilValue, useSetRecoilState } from 'recoil';
 import { AnimatedEaseIn, MainButton } from 'twenty-ui';
 import { z } from 'zod';
 import {
   useUpdatePasswordViaResetTokenMutation,
   useValidatePasswordResetTokenQuery,
 } from '~/generated/graphql';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
 import { logError } from '~/utils/logError';
-import { workspacePublicDataState } from '@/auth/states/workspacePublicDataState';
 
 const validationSchema = z
   .object({
@@ -70,11 +72,12 @@ const StyledInputContainer = styled.div`
 `;
 
 export const PasswordReset = () => {
+  const { t } = useLingui();
   const { enqueueSnackBar } = useSnackBar();
 
   const workspacePublicData = useRecoilValue(workspacePublicDataState);
 
-  const navigate = useNavigate();
+  const navigate = useNavigateApp();
 
   const [email, setEmail] = useState('');
   const [isTokenValid, setIsTokenValid] = useState(false);
@@ -170,7 +173,9 @@ export const PasswordReset = () => {
         <AnimatedEaseIn>
           <Logo secondaryLogo={workspacePublicData?.logo} />
         </AnimatedEaseIn>
-        <Title animate>Reset Password</Title>
+        <Title animate>
+          <Trans>Reset Password</Trans>
+        </Title>
         <StyledContentContainer>
           {!email ? (
             <SkeletonTheme
@@ -180,9 +185,7 @@ export const PasswordReset = () => {
               <Skeleton
                 height={SKELETON_LOADER_HEIGHT_SIZES.standard.m}
                 count={2}
-                style={{
-                  marginBottom: theme.spacing(2),
-                }}
+                style={{ marginBottom: theme.spacing(2) }}
               />
             </SkeletonTheme>
           ) : (
@@ -200,7 +203,7 @@ export const PasswordReset = () => {
                   <TextInputV2
                     autoFocus
                     value={email}
-                    placeholder="Email"
+                    placeholder={t`Email`}
                     fullWidth
                     disabled
                   />
@@ -227,7 +230,7 @@ export const PasswordReset = () => {
                         autoFocus
                         value={value}
                         type="password"
-                        placeholder="New Password"
+                        placeholder={t`New Password`}
                         onBlur={onBlur}
                         onChange={onChange}
                         error={error?.message}
@@ -240,7 +243,7 @@ export const PasswordReset = () => {
 
               <MainButton
                 variant="secondary"
-                title="Change Password"
+                title={t`Change Password`}
                 type="submit"
                 fullWidth
                 disabled={isUpdatingPassword}
diff --git a/packages/twenty-front/src/pages/auth/SignInUp.tsx b/packages/twenty-front/src/pages/auth/SignInUp.tsx
index 2c8a1f6b843c..ce52288ea937 100644
--- a/packages/twenty-front/src/pages/auth/SignInUp.tsx
+++ b/packages/twenty-front/src/pages/auth/SignInUp.tsx
@@ -1,12 +1,12 @@
-import { useRecoilValue } from 'recoil';
-
 import { useSignInUp } from '@/auth/sign-in-up/hooks/useSignInUp';
 import { useSignInUpForm } from '@/auth/sign-in-up/hooks/useSignInUpForm';
 import { SignInUpStep } from '@/auth/states/signInUpStepState';
 import { workspacePublicDataState } from '@/auth/states/workspacePublicDataState';
+import { useRecoilValue } from 'recoil';
 
 import { Logo } from '@/auth/components/Logo';
 import { Title } from '@/auth/components/Title';
+import { EmailVerificationSent } from '@/auth/sign-in-up/components/EmailVerificationSent';
 import { FooterNote } from '@/auth/sign-in-up/components/FooterNote';
 import { SignInUpGlobalScopeForm } from '@/auth/sign-in-up/components/SignInUpGlobalScopeForm';
 import { SignInUpSSOIdentityProviderSelection } from '@/auth/sign-in-up/components/SignInUpSSOIdentityProviderSelection';
@@ -21,6 +21,37 @@ import { useMemo } from 'react';
 import { AnimatedEaseIn } from 'twenty-ui';
 import { isDefined } from '~/utils/isDefined';
 
+import { useSearchParams } from 'react-router-dom';
+import { PublicWorkspaceDataOutput } from '~/generated-metadata/graphql';
+
+const StandardContent = ({
+  workspacePublicData,
+  signInUpForm,
+  signInUpStep,
+}: {
+  workspacePublicData: PublicWorkspaceDataOutput | null;
+  signInUpForm: JSX.Element | null;
+  signInUpStep: SignInUpStep;
+}) => {
+  return (
+    <>
+      <AnimatedEaseIn>
+        <Logo secondaryLogo={workspacePublicData?.logo} />
+      </AnimatedEaseIn>
+      <Title animate>
+        Welcome to{' '}
+        {!isDefined(workspacePublicData?.displayName)
+          ? DEFAULT_WORKSPACE_NAME
+          : workspacePublicData?.displayName === ''
+            ? 'Your Workspace'
+            : workspacePublicData?.displayName}
+      </Title>
+      {signInUpForm}
+      {signInUpStep !== SignInUpStep.Password && <FooterNote />}
+    </>
+  );
+};
+
 export const SignInUp = () => {
   const { form } = useSignInUpForm();
   const { signInUpStep } = useSignInUp(form);
@@ -31,6 +62,8 @@ export const SignInUp = () => {
   const { loading } = useGetPublicWorkspaceDataBySubdomain();
   const isMultiWorkspaceEnabled = useRecoilValue(isMultiWorkspaceEnabledState);
 
+  const [searchParams] = useSearchParams();
+
   const signInUpForm = useMemo(() => {
     if (loading) return null;
 
@@ -68,16 +101,15 @@ export const SignInUp = () => {
     workspacePublicData,
   ]);
 
+  if (signInUpStep === SignInUpStep.EmailVerification) {
+    return <EmailVerificationSent email={searchParams.get('email')} />;
+  }
+
   return (
-    <>
-      <AnimatedEaseIn>
-        <Logo secondaryLogo={workspacePublicData?.logo} />
-      </AnimatedEaseIn>
-      <Title animate>
-        {`Welcome to ${workspacePublicData?.displayName ?? DEFAULT_WORKSPACE_NAME}`}
-      </Title>
-      {signInUpForm}
-      {signInUpStep !== SignInUpStep.Password && <FooterNote />}
-    </>
+    <StandardContent
+      workspacePublicData={workspacePublicData}
+      signInUpForm={signInUpForm}
+      signInUpStep={signInUpStep}
+    />
   );
 };
diff --git a/packages/twenty-front/src/pages/auth/__stories__/PasswordReset.stories.tsx b/packages/twenty-front/src/pages/auth/__stories__/PasswordReset.stories.tsx
index 79bf50e0a327..f212763615a2 100644
--- a/packages/twenty-front/src/pages/auth/__stories__/PasswordReset.stories.tsx
+++ b/packages/twenty-front/src/pages/auth/__stories__/PasswordReset.stories.tsx
@@ -17,7 +17,7 @@ import { graphqlMocks } from '~/testing/graphqlMocks';
 import { mockedOnboardingUserData } from '~/testing/mock-data/users';
 
 const mockedOnboardingUsersData = mockedOnboardingUserData(
-  OnboardingStatus.Completed,
+  OnboardingStatus.COMPLETED,
 );
 
 const meta: Meta<PageDecoratorArgs> = {
diff --git a/packages/twenty-front/src/pages/not-found/NotFound.tsx b/packages/twenty-front/src/pages/not-found/NotFound.tsx
index 2d44a51e7cd5..217f41d0dc46 100644
--- a/packages/twenty-front/src/pages/not-found/NotFound.tsx
+++ b/packages/twenty-front/src/pages/not-found/NotFound.tsx
@@ -1,5 +1,6 @@
 import { SignInBackgroundMockPage } from '@/sign-in-background-mock/components/SignInBackgroundMockPage';
 import { AppPath } from '@/types/AppPath';
+import { Trans, useLingui } from '@lingui/react/macro';
 
 import { PageTitle } from '@/ui/utilities/page-title/components/PageTitle';
 import styled from '@emotion/styled';
@@ -33,24 +34,28 @@ const StyledButtonContainer = styled.div`
 `;
 
 export const NotFound = () => {
+  const { t } = useLingui();
+
   return (
     <>
-      <PageTitle title="Page Not Found | Twenty" />
+      <PageTitle title={t`Page Not Found` + ' | Twenty'} />
       <StyledBackDrop>
         <AnimatedPlaceholderErrorContainer>
           <AnimatedPlaceholder type="error404" />
           <AnimatedPlaceholderEmptyTextContainer>
             <AnimatedPlaceholderErrorTitle>
-              Off the beaten path
+              <Trans>Off the beaten path</Trans>
             </AnimatedPlaceholderErrorTitle>
             <AnimatedPlaceholderErrorSubTitle>
-              The page you're seeking is either gone or never was. Let's get you
-              back on track
+              <Trans>
+                The page you're seeking is either gone or never was. Let's get
+                you back on track
+              </Trans>
             </AnimatedPlaceholderErrorSubTitle>
           </AnimatedPlaceholderEmptyTextContainer>
           <StyledButtonContainer>
             <UndecoratedLink to={AppPath.Index}>
-              <MainButton title="Back to content" fullWidth />
+              <MainButton title={t`Back to content`} fullWidth />
             </UndecoratedLink>
           </StyledButtonContainer>
         </AnimatedPlaceholderErrorContainer>
diff --git a/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx b/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx
index 90ac129d37f0..36bb2df80f15 100644
--- a/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx
+++ b/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx
@@ -4,10 +4,12 @@ import { useParams } from 'react-router-dom';
 import { ActionMenuComponentInstanceContext } from '@/action-menu/states/contexts/ActionMenuComponentInstanceContext';
 import { getActionMenuIdFromRecordIndexId } from '@/action-menu/utils/getActionMenuIdFromRecordIndexId';
 import { MainContextStoreComponentInstanceIdSetterEffect } from '@/context-store/components/MainContextStoreComponentInstanceIdSetterEffect';
+import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState';
 import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
 import { lastShowPageRecordIdState } from '@/object-record/record-field/states/lastShowPageRecordId';
+import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';
 import { RecordIndexContainer } from '@/object-record/record-index/components/RecordIndexContainer';
 import { RecordIndexContainerContextStoreNumberOfSelectedRecordsEffect } from '@/object-record/record-index/components/RecordIndexContainerContextStoreNumberOfSelectedRecordsEffect';
 import { RecordIndexContainerContextStoreObjectMetadataEffect } from '@/object-record/record-index/components/RecordIndexContainerContextStoreObjectMetadataEffect';
@@ -17,9 +19,11 @@ import { useHandleIndexIdentifierClick } from '@/object-record/record-index/hook
 import { PageBody } from '@/ui/layout/page/components/PageBody';
 import { PageContainer } from '@/ui/layout/page/components/PageContainer';
 import { PageTitle } from '@/ui/utilities/page-title/components/PageTitle';
+import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext';
 import { useRecoilCallback } from 'recoil';
 import { capitalize } from 'twenty-shared';
+import { isDefined } from 'twenty-ui';
 
 const StyledIndexContainer = styled.div`
   display: flex;
@@ -30,7 +34,12 @@ const StyledIndexContainer = styled.div`
 export const RecordIndexPage = () => {
   const objectNamePlural = useParams().objectNamePlural ?? '';
 
-  const recordIndexId = objectNamePlural ?? '';
+  const contextStoreCurrentViewId = useRecoilComponentValueV2(
+    contextStoreCurrentViewIdComponentState,
+    objectNamePlural,
+  );
+
+  const recordIndexId = `${objectNamePlural}-${contextStoreCurrentViewId}`;
 
   const { objectNameSingular } = useObjectNameSingularFromPlural({
     objectNamePlural,
@@ -54,6 +63,10 @@ export const RecordIndexPage = () => {
     [],
   );
 
+  if (!isDefined(contextStoreCurrentViewId)) {
+    return;
+  }
+
   return (
     <PageContainer>
       <RecordIndexContextProvider
@@ -69,29 +82,32 @@ export const RecordIndexPage = () => {
         <ViewComponentInstanceContext.Provider
           value={{ instanceId: recordIndexId }}
         >
-          <ContextStoreComponentInstanceContext.Provider
-            value={{
-              instanceId: getActionMenuIdFromRecordIndexId(recordIndexId),
-            }}
+          <RecordFiltersComponentInstanceContext.Provider
+            value={{ instanceId: recordIndexId }}
           >
-            <ActionMenuComponentInstanceContext.Provider
+            <ContextStoreComponentInstanceContext.Provider
               value={{
                 instanceId: getActionMenuIdFromRecordIndexId(recordIndexId),
               }}
             >
-              <PageTitle title={`${capitalize(objectNamePlural)}`} />
-              <RecordIndexPageHeader />
-              <PageBody>
-                <StyledIndexContainer>
-                  <RecordIndexContainerContextStoreObjectMetadataEffect />
-                  <RecordIndexContainerContextStoreNumberOfSelectedRecordsEffect />
-                  <MainContextStoreComponentInstanceIdSetterEffect />
-
-                  <RecordIndexContainer />
-                </StyledIndexContainer>
-              </PageBody>
-            </ActionMenuComponentInstanceContext.Provider>
-          </ContextStoreComponentInstanceContext.Provider>
+              <ActionMenuComponentInstanceContext.Provider
+                value={{
+                  instanceId: getActionMenuIdFromRecordIndexId(recordIndexId),
+                }}
+              >
+                <PageTitle title={`${capitalize(objectNamePlural)}`} />
+                <RecordIndexPageHeader />
+                <PageBody>
+                  <StyledIndexContainer>
+                    <RecordIndexContainerContextStoreObjectMetadataEffect />
+                    <RecordIndexContainerContextStoreNumberOfSelectedRecordsEffect />
+                    <MainContextStoreComponentInstanceIdSetterEffect />
+                    <RecordIndexContainer />
+                  </StyledIndexContainer>
+                </PageBody>
+              </ActionMenuComponentInstanceContext.Provider>
+            </ContextStoreComponentInstanceContext.Provider>
+          </RecordFiltersComponentInstanceContext.Provider>
         </ViewComponentInstanceContext.Provider>
       </RecordIndexContextProvider>
     </PageContainer>
diff --git a/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx b/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx
index 3ff6a6637b94..e0f62e4bb8c4 100644
--- a/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx
+++ b/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx
@@ -5,6 +5,7 @@ import { ActionMenuComponentInstanceContext } from '@/action-menu/states/context
 import { TimelineActivityContext } from '@/activities/timeline-activities/contexts/TimelineActivityContext';
 import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';
 import { RecordShowContainer } from '@/object-record/record-show/components/RecordShowContainer';
 import { useRecordShowPage } from '@/object-record/record-show/hooks/useRecordShowPage';
 import { RecordValueSetterEffect } from '@/object-record/record-store/components/RecordValueSetterEffect';
@@ -40,72 +41,74 @@ export const RecordShowPage = () => {
     parameters.objectRecordId ?? '',
   );
 
-  const isPageHeaderV2Enabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsPageHeaderV2Enabled,
+  const isCommandMenuV2Enabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsCommandMenuV2Enabled,
   );
 
   return (
     <RecordFieldValueSelectorContextProvider>
-      <ContextStoreComponentInstanceContext.Provider
-        value={{
-          instanceId: `record-show-${objectRecordId}`,
-        }}
+      <RecordFiltersComponentInstanceContext.Provider
+        value={{ instanceId: `record-show-${objectRecordId}` }}
       >
-        <ActionMenuComponentInstanceContext.Provider
+        <ContextStoreComponentInstanceContext.Provider
           value={{ instanceId: `record-show-${objectRecordId}` }}
         >
-          <RecordValueSetterEffect recordId={objectRecordId} />
-          <PageContainer>
-            <PageTitle title={pageTitle} />
-            <RecordShowPageHeader
-              objectNameSingular={objectNameSingular}
-              objectRecordId={objectRecordId}
-              headerIcon={headerIcon}
-            >
-              <>
-                {!isPageHeaderV2Enabled &&
-                  objectNameSingular === CoreObjectNameSingular.Workflow && (
-                    <RecordShowPageWorkflowHeader workflowId={objectRecordId} />
-                  )}
-                {!isPageHeaderV2Enabled &&
-                  objectNameSingular ===
-                    CoreObjectNameSingular.WorkflowVersion && (
-                    <RecordShowPageWorkflowVersionHeader
-                      workflowVersionId={objectRecordId}
+          <ActionMenuComponentInstanceContext.Provider
+            value={{ instanceId: `record-show-${objectRecordId}` }}
+          >
+            <RecordValueSetterEffect recordId={objectRecordId} />
+            <PageContainer>
+              <PageTitle title={pageTitle} />
+              <RecordShowPageHeader
+                objectNameSingular={objectNameSingular}
+                objectRecordId={objectRecordId}
+                headerIcon={headerIcon}
+              >
+                <>
+                  {!isCommandMenuV2Enabled &&
+                    objectNameSingular === CoreObjectNameSingular.Workflow && (
+                      <RecordShowPageWorkflowHeader
+                        workflowId={objectRecordId}
+                      />
+                    )}
+                  {!isCommandMenuV2Enabled &&
+                    objectNameSingular ===
+                      CoreObjectNameSingular.WorkflowVersion && (
+                      <RecordShowPageWorkflowVersionHeader
+                        workflowVersionId={objectRecordId}
+                      />
+                    )}
+                  {(isCommandMenuV2Enabled ||
+                    (objectNameSingular !== CoreObjectNameSingular.Workflow &&
+                      objectNameSingular !==
+                        CoreObjectNameSingular.WorkflowVersion)) && (
+                    <RecordShowActionMenu
+                      {...{
+                        isFavorite,
+                        record,
+                        handleFavoriteButtonClick,
+                        objectMetadataItem,
+                        objectNameSingular,
+                      }}
                     />
                   )}
-                {(isPageHeaderV2Enabled ||
-                  (objectNameSingular !== CoreObjectNameSingular.Workflow &&
-                    objectNameSingular !==
-                      CoreObjectNameSingular.WorkflowVersion)) && (
-                  <RecordShowActionMenu
-                    {...{
-                      isFavorite,
-                      record,
-                      handleFavoriteButtonClick,
-                      objectMetadataItem,
-                      objectNameSingular,
-                    }}
+                </>
+              </RecordShowPageHeader>
+              <PageBody>
+                <TimelineActivityContext.Provider
+                  value={{ labelIdentifierValue: pageName }}
+                >
+                  <RecordShowContainer
+                    objectNameSingular={objectNameSingular}
+                    objectRecordId={objectRecordId}
+                    loading={loading}
                   />
-                )}
-              </>
-            </RecordShowPageHeader>
-            <PageBody>
-              <TimelineActivityContext.Provider
-                value={{
-                  labelIdentifierValue: pageName,
-                }}
-              >
-                <RecordShowContainer
-                  objectNameSingular={objectNameSingular}
-                  objectRecordId={objectRecordId}
-                  loading={loading}
-                />
-              </TimelineActivityContext.Provider>
-            </PageBody>
-          </PageContainer>
-        </ActionMenuComponentInstanceContext.Provider>
-      </ContextStoreComponentInstanceContext.Provider>
+                </TimelineActivityContext.Provider>
+              </PageBody>
+            </PageContainer>
+          </ActionMenuComponentInstanceContext.Provider>
+        </ContextStoreComponentInstanceContext.Provider>
+      </RecordFiltersComponentInstanceContext.Provider>
     </RecordFieldValueSelectorContextProvider>
   );
 };
diff --git a/packages/twenty-front/src/pages/object-record/RecordShowPageHeader.tsx b/packages/twenty-front/src/pages/object-record/RecordShowPageHeader.tsx
index ecaf938f9c37..37549ebc4013 100644
--- a/packages/twenty-front/src/pages/object-record/RecordShowPageHeader.tsx
+++ b/packages/twenty-front/src/pages/object-record/RecordShowPageHeader.tsx
@@ -1,5 +1,6 @@
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { RecordEditableName } from '@/object-record/components/RecordEditableName';
+import { getObjectMetadataIdentifierFields } from '@/object-metadata/utils/getObjectMetadataIdentifierFields';
+import { ObjectRecordShowPageBreadcrumb } from '@/object-record/record-show/components/ObjectRecordShowPageBreadcrumb';
 import { useRecordShowContainerTabs } from '@/object-record/record-show/hooks/useRecordShowContainerTabs';
 import { useRecordShowPage } from '@/object-record/record-show/hooks/useRecordShowPage';
 import { useRecordShowPagePagination } from '@/object-record/record-show/hooks/useRecordShowPagePagination';
@@ -34,14 +35,18 @@ export const RecordShowPageHeader = ({
 
   const hasEditableName = layout.hideSummaryAndFields === true;
 
+  const { labelIdentifierFieldMetadataItem } =
+    getObjectMetadataIdentifierFields({ objectMetadataItem });
+
   return (
     <PageHeader
       title={
         hasEditableName ? (
-          <RecordEditableName
+          <ObjectRecordShowPageBreadcrumb
             objectNameSingular={objectNameSingular}
             objectRecordId={objectRecordId}
             objectLabelPlural={objectMetadataItem.labelPlural}
+            labelIdentifierFieldMetadataItem={labelIdentifierFieldMetadataItem}
           />
         ) : (
           viewName
diff --git a/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsx b/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsx
index 493a8dfaec95..e168b5e1b084 100644
--- a/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsx
+++ b/packages/twenty-front/src/pages/onboarding/ChooseYourPlan.tsx
@@ -3,50 +3,64 @@ import { Title } from '@/auth/components/Title';
 import { useAuth } from '@/auth/hooks/useAuth';
 import { billingCheckoutSessionState } from '@/auth/states/billingCheckoutSessionState';
 import { SubscriptionBenefit } from '@/billing/components/SubscriptionBenefit';
-import { SubscriptionCard } from '@/billing/components/SubscriptionCard';
+import { SubscriptionPrice } from '@/billing/components/SubscriptionPrice';
+import { TrialCard } from '@/billing/components/TrialCard';
+import { useHandleCheckoutSession } from '@/billing/hooks/useHandleCheckoutSession';
 import { billingState } from '@/client-config/states/billingState';
-import { AppPath } from '@/types/AppPath';
-import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
-import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import styled from '@emotion/styled';
-import { isNonEmptyString, isNumber } from '@sniptt/guards';
-import { useState } from 'react';
+import { Trans, useLingui } from '@lingui/react/macro';
 import { useRecoilState, useRecoilValue } from 'recoil';
 import {
   ActionLink,
   CAL_LINK,
   CardPicker,
+  isDefined,
   Loader,
   MainButton,
 } from 'twenty-ui';
-import {
-  ProductPriceEntity,
-  SubscriptionInterval,
-  useCheckoutSessionMutation,
-  useGetProductPricesQuery,
-} from '~/generated/graphql';
-import { isDefined } from '~/utils/isDefined';
-
-const StyledChoosePlanContainer = styled.div`
+import { SubscriptionInterval } from '~/generated-metadata/graphql';
+import { useGetProductPricesQuery } from '~/generated/graphql';
+
+const StyledSubscriptionContainer = styled.div<{
+  withLongerMarginBottom: boolean;
+}>`
+  background-color: ${({ theme }) => theme.background.secondary};
+  border: 1px solid ${({ theme }) => theme.border.color.medium};
+  border-radius: ${({ theme }) => theme.border.radius.md};
+
   display: flex;
-  flex-direction: row;
-  width: 100%;
+  flex-direction: column;
   margin: ${({ theme }) => theme.spacing(8)} 0
-    ${({ theme }) => theme.spacing(2)};
-  gap: ${({ theme }) => theme.spacing(2)};
+    ${({ theme, withLongerMarginBottom }) =>
+      theme.spacing(withLongerMarginBottom ? 8 : 2)};
+  width: 100%;
+`;
+
+const StyledSubscriptionPriceContainer = styled.div`
+  align-items: center;
+  border-bottom: 1px solid ${({ theme }) => theme.border.color.light};
+  display: flex;
+  flex-direction: column;
+  margin: ${({ theme }) => theme.spacing(4)} ${({ theme }) => theme.spacing(3)}
+    0 ${({ theme }) => theme.spacing(4)};
+  padding-bottom: ${({ theme }) => theme.spacing(3)};
 `;
 
 const StyledBenefitsContainer = styled.div`
-  background-color: ${({ theme }) => theme.background.secondary};
-  border: 1px solid ${({ theme }) => theme.border.color.medium};
-  border-radius: ${({ theme }) => theme.border.radius.md};
   box-sizing: border-box;
   display: flex;
   flex-direction: column;
   width: 100%;
   gap: 16px;
   padding: ${({ theme }) => theme.spacing(4)} ${({ theme }) => theme.spacing(3)};
+`;
+
+const StyledChooseTrialContainer = styled.div`
+  display: flex;
+  flex-direction: row;
+  width: 100%;
   margin-bottom: ${({ theme }) => theme.spacing(8)};
+  gap: ${({ theme }) => theme.spacing(2)};
 `;
 
 const StyledLinkGroup = styled.div`
@@ -65,64 +79,56 @@ const StyledLinkGroup = styled.div`
   }
 `;
 
-const benefits = [
-  'Full access',
-  'Unlimited contacts',
-  'Email integration',
-  'Custom objects',
-  'API & Webhooks',
-  'Frequent updates',
-  'And much more',
-];
-
 export const ChooseYourPlan = () => {
   const billing = useRecoilValue(billingState);
+  const { t } = useLingui();
 
-  const [isSubmitting, setIsSubmitting] = useState(false);
-
-  const { enqueueSnackBar } = useSnackBar();
+  const benefits = [
+    t`Full access`,
+    t`Unlimited contacts`,
+    t`Email integration`,
+    t`Custom objects`,
+    t`API & Webhooks`,
+    t`1 000 workflow node executions`,
+  ];
 
   const { data: prices } = useGetProductPricesQuery({
     variables: { product: 'base-plan' },
   });
 
+  const price = prices?.getProductPrices?.productPrices.find(
+    (productPrice) =>
+      productPrice.recurringInterval === SubscriptionInterval.Month,
+  );
+
+  const hasWithoutCreditCardTrialPeriod = billing?.trialPeriods.some(
+    (trialPeriod) =>
+      !trialPeriod.isCreditCardRequired && trialPeriod.duration !== 0,
+  );
+  const withCreditCardTrialPeriod = billing?.trialPeriods.find(
+    (trialPeriod) => trialPeriod.isCreditCardRequired,
+  );
+
   const [billingCheckoutSession, setBillingCheckoutSession] = useRecoilState(
     billingCheckoutSessionState,
   );
 
-  const [checkoutSession] = useCheckoutSessionMutation();
-
-  const handleCheckoutSession = async () => {
-    setIsSubmitting(true);
-    const { data } = await checkoutSession({
-      variables: {
-        recurringInterval: billingCheckoutSession.interval,
-        successUrlPath: AppPath.PlanRequiredSuccess,
-        plan: billingCheckoutSession.plan,
-        requirePaymentMethod: billingCheckoutSession.requirePaymentMethod,
-      },
-    });
-    setIsSubmitting(false);
-    if (!data?.checkoutSession.url) {
-      enqueueSnackBar(
-        'Checkout session error. Please retry or contact Twenty team',
-        {
-          variant: SnackBarVariant.Error,
-        },
-      );
-      return;
-    }
-    window.location.replace(data.checkoutSession.url);
-  };
+  const { handleCheckoutSession, isSubmitting } = useHandleCheckoutSession({
+    recurringInterval: billingCheckoutSession.interval,
+    plan: billingCheckoutSession.plan,
+    requirePaymentMethod: billingCheckoutSession.requirePaymentMethod,
+  });
 
-  const handleIntervalChange = (type?: SubscriptionInterval) => {
+  const handleTrialPeriodChange = (withCreditCard: boolean) => {
     return () => {
-      if (isNonEmptyString(type) && billingCheckoutSession.interval !== type) {
+      if (
+        isDefined(price) &&
+        billingCheckoutSession.requirePaymentMethod !== withCreditCard
+      ) {
         setBillingCheckoutSession({
           plan: billingCheckoutSession.plan,
-          interval: type,
-          requirePaymentMethod: billingCheckoutSession.requirePaymentMethod,
-          skipPlanPage: false,
+          interval: price.recurringInterval,
+          requirePaymentMethod: withCreditCard,
         });
       }
     };
@@ -130,77 +136,78 @@ export const ChooseYourPlan = () => {
 
   const { signOut } = useAuth();
 
-  const computeInfo = (
-    price: ProductPriceEntity,
-    prices: ProductPriceEntity[],
-  ): string => {
-    if (price.recurringInterval !== SubscriptionInterval.Year) {
-      return 'Cancel anytime';
-    }
-    const monthPrice = prices.filter(
-      (price) => price.recurringInterval === SubscriptionInterval.Month,
-    )?.[0];
-    if (
-      isDefined(monthPrice) &&
-      isNumber(monthPrice.unitAmount) &&
-      monthPrice.unitAmount > 0 &&
-      isNumber(price.unitAmount) &&
-      price.unitAmount > 0
-    ) {
-      return `Save $${(12 * monthPrice.unitAmount - price.unitAmount) / 100}`;
-    }
-    return 'Cancel anytime';
-  };
-
-  if (billingCheckoutSession.skipPlanPage && !isSubmitting) {
-    handleCheckoutSession();
-  }
-
-  if (billingCheckoutSession.skipPlanPage || isSubmitting) {
-    return <Loader />;
-  }
+  const withCreditCardTrialPeriodDuration = withCreditCardTrialPeriod?.duration;
 
   return (
-    prices?.getProductPrices?.productPrices && (
+    isDefined(price) &&
+    isDefined(billing) && (
       <>
-        <Title noMarginTop>Choose your Plan</Title>
-        <SubTitle>
-          Enjoy a {billing?.billingFreeTrialDurationInDays}-day free trial
-        </SubTitle>
-        <StyledChoosePlanContainer>
-          {prices.getProductPrices.productPrices.map((price, index) => (
-            <CardPicker
-              checked={
-                price.recurringInterval === billingCheckoutSession.interval
-              }
-              handleChange={handleIntervalChange(price.recurringInterval)}
-              key={index}
-            >
-              <SubscriptionCard
-                type={price.recurringInterval}
-                price={price.unitAmount / 100}
-                info={computeInfo(price, prices.getProductPrices.productPrices)}
-              />
-            </CardPicker>
-          ))}
-        </StyledChoosePlanContainer>
-        <StyledBenefitsContainer>
-          {benefits.map((benefit, index) => (
-            <SubscriptionBenefit key={index}>{benefit}</SubscriptionBenefit>
-          ))}
-        </StyledBenefitsContainer>
+        <Title noMarginTop>
+          {hasWithoutCreditCardTrialPeriod
+            ? t`Choose your Trial`
+            : t`Get your subscription`}
+        </Title>
+        {hasWithoutCreditCardTrialPeriod ? (
+          <SubTitle>
+            <Trans>Cancel anytime</Trans>
+          </SubTitle>
+        ) : (
+          withCreditCardTrialPeriod && (
+            <SubTitle>
+              {t`Enjoy a ${withCreditCardTrialPeriodDuration}-days free trial`}
+            </SubTitle>
+          )
+        )}
+        <StyledSubscriptionContainer
+          withLongerMarginBottom={!hasWithoutCreditCardTrialPeriod}
+        >
+          <StyledSubscriptionPriceContainer>
+            <SubscriptionPrice
+              type={price.recurringInterval}
+              price={price.unitAmount / 100}
+            />
+          </StyledSubscriptionPriceContainer>
+          <StyledBenefitsContainer>
+            {benefits.map((benefit) => (
+              <SubscriptionBenefit key={benefit}>{benefit}</SubscriptionBenefit>
+            ))}
+          </StyledBenefitsContainer>
+        </StyledSubscriptionContainer>
+        {hasWithoutCreditCardTrialPeriod && (
+          <StyledChooseTrialContainer>
+            {billing.trialPeriods.map((trialPeriod) => (
+              <CardPicker
+                checked={
+                  billingCheckoutSession.requirePaymentMethod ===
+                  trialPeriod.isCreditCardRequired
+                }
+                handleChange={handleTrialPeriodChange(
+                  trialPeriod.isCreditCardRequired,
+                )}
+                key={trialPeriod.duration}
+              >
+                <TrialCard
+                  duration={trialPeriod.duration}
+                  withCreditCard={trialPeriod.isCreditCardRequired}
+                />
+              </CardPicker>
+            ))}
+          </StyledChooseTrialContainer>
+        )}
         <MainButton
-          title="Continue"
+          title={t`Continue`}
           onClick={handleCheckoutSession}
           width={200}
           Icon={() => isSubmitting && <Loader />}
           disabled={isSubmitting}
         />
         <StyledLinkGroup>
-          <ActionLink onClick={signOut}>Log out</ActionLink>
+          <ActionLink onClick={signOut}>
+            <Trans>Log out</Trans>
+          </ActionLink>
           <span />
           <ActionLink href={CAL_LINK} target="_blank" rel="noreferrer">
-            Book a Call
+            <Trans>Book a Call</Trans>
           </ActionLink>
         </StyledLinkGroup>
       </>
diff --git a/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx b/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx
index ebb0fbc1bd28..08c3b337842e 100644
--- a/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx
+++ b/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx
@@ -142,7 +142,7 @@ export const CreateProfile = () => {
     PageHotkeyScope.CreateProfile,
   );
 
-  if (onboardingStatus !== OnboardingStatus.ProfileCreation) {
+  if (onboardingStatus !== OnboardingStatus.PROFILE_CREATION) {
     return null;
   }
 
diff --git a/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx b/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx
index c0572160fac3..c881250e88c1 100644
--- a/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx
+++ b/packages/twenty-front/src/pages/onboarding/CreateWorkspace.tsx
@@ -8,7 +8,9 @@ import { z } from 'zod';
 
 import { SubTitle } from '@/auth/components/SubTitle';
 import { Title } from '@/auth/components/Title';
+import { useAuth } from '@/auth/hooks/useAuth';
 import { useOnboardingStatus } from '@/onboarding/hooks/useOnboardingStatus';
+import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboardingStatus';
 import { WorkspaceLogoUploader } from '@/settings/workspace/components/WorkspaceLogoUploader';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
@@ -18,7 +20,6 @@ import {
   useActivateWorkspaceMutation,
 } from '~/generated/graphql';
 import { isDefined } from '~/utils/isDefined';
-import { useAuth } from '@/auth/hooks/useAuth';
 
 const StyledContentContainer = styled.div`
   width: 100%;
@@ -44,6 +45,7 @@ type Form = z.infer<typeof validationSchema>;
 export const CreateWorkspace = () => {
   const { enqueueSnackBar } = useSnackBar();
   const onboardingStatus = useOnboardingStatus();
+  const setNextOnboardingStatus = useSetNextOnboardingStatus();
 
   const { loadCurrentUser } = useAuth();
   const [activateWorkspace] = useActivateWorkspaceMutation();
@@ -76,13 +78,19 @@ export const CreateWorkspace = () => {
           throw result.errors ?? new Error('Unknown error');
         }
         await loadCurrentUser();
+        setNextOnboardingStatus();
       } catch (error: any) {
         enqueueSnackBar(error?.message, {
           variant: SnackBarVariant.Error,
         });
       }
     },
-    [activateWorkspace, enqueueSnackBar, loadCurrentUser],
+    [
+      activateWorkspace,
+      enqueueSnackBar,
+      loadCurrentUser,
+      setNextOnboardingStatus,
+    ],
   );
 
   const handleKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
@@ -92,7 +100,7 @@ export const CreateWorkspace = () => {
     }
   };
 
-  if (onboardingStatus !== OnboardingStatus.WorkspaceActivation) {
+  if (onboardingStatus !== OnboardingStatus.WORKSPACE_ACTIVATION) {
     return null;
   }
 
diff --git a/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx b/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx
index c55be7111631..947984526e35 100644
--- a/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx
+++ b/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx
@@ -11,6 +11,7 @@ import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { zodResolver } from '@hookform/resolvers/zod';
+import { Trans, useLingui } from '@lingui/react/macro';
 import { useCallback } from 'react';
 import {
   Controller,
@@ -22,7 +23,6 @@ import { useRecoilValue } from 'recoil';
 import { Key } from 'ts-key-enum';
 import {
   ActionLink,
-  AnimatedTranslation,
   IconCopy,
   LightButton,
   MainButton,
@@ -68,6 +68,7 @@ const validationSchema = z.object({
 type FormInput = z.infer<typeof validationSchema>;
 
 export const InviteTeam = () => {
+  const { t } = useLingui();
   const theme = useTheme();
   const { enqueueSnackBar } = useSnackBar();
   const { sendInvitation } = useCreateWorkspaceInvitation();
@@ -123,7 +124,7 @@ export const InviteTeam = () => {
     if (isDefined(currentWorkspace?.inviteHash)) {
       const inviteLink = `${window.location.origin}/invite/${currentWorkspace?.inviteHash}`;
       navigator.clipboard.writeText(inviteLink);
-      enqueueSnackBar('Link copied to clipboard', {
+      enqueueSnackBar(t`Link copied to clipboard`, {
         variant: SnackBarVariant.Success,
         icon: <IconCopy size={theme.icon.size.md} />,
         duration: 2000,
@@ -148,13 +149,13 @@ export const InviteTeam = () => {
         throw result.errors;
       }
       if (emails.length > 0) {
-        enqueueSnackBar('Invite link sent to email addresses', {
+        enqueueSnackBar(t`Invite link sent to email addresses`, {
           variant: SnackBarVariant.Success,
           duration: 2000,
         });
       }
     },
-    [enqueueSnackBar, sendInvitation, setNextOnboardingStatus],
+    [enqueueSnackBar, sendInvitation, setNextOnboardingStatus, t],
   );
 
   const handleSkip = async () => {
@@ -170,18 +171,20 @@ export const InviteTeam = () => {
     [handleSubmit],
   );
 
-  if (currentUser?.onboardingStatus !== OnboardingStatus.InviteTeam) {
+  if (currentUser?.onboardingStatus !== OnboardingStatus.INVITE_TEAM) {
     return <></>;
   }
 
   return (
     <>
-      <Title noMarginTop>Invite your team</Title>
+      <Title>
+        <Trans>Invite your team</Trans>
+      </Title>
       <SubTitle>
-        Get the most out of your workspace by inviting your team.
+        <Trans>Get the most out of your workspace by inviting your team.</Trans>
       </SubTitle>
       <StyledAnimatedContainer>
-        {fields.map((_field, index) => (
+        {fields.map((field, index) => (
           <Controller
             key={index}
             name={`emails.${index}.email`}
@@ -190,28 +193,28 @@ export const InviteTeam = () => {
               field: { onChange, onBlur, value },
               fieldState: { error },
             }) => (
-              <AnimatedTranslation>
-                <TextInputV2
-                  autoFocus={index === 0}
-                  type="email"
-                  value={value}
-                  placeholder={getPlaceholder(index)}
-                  onBlur={onBlur}
-                  error={error?.message}
-                  onChange={onChange}
-                  noErrorHelper
-                  fullWidth
-                />
-              </AnimatedTranslation>
+              <TextInputV2
+                autoFocus={index === 0}
+                type="email"
+                value={value}
+                placeholder={getPlaceholder(index)}
+                onBlur={onBlur}
+                error={error?.message}
+                onChange={onChange}
+                noErrorHelper
+                fullWidth
+              />
             )}
           />
         ))}
         {isDefined(currentWorkspace?.inviteHash) && (
           <>
-            <SeparatorLineText>Or</SeparatorLineText>
+            <SeparatorLineText>
+              <Trans>or</Trans>
+            </SeparatorLineText>
             <StyledActionLinkContainer>
               <LightButton
-                title="Copy invitation link"
+                title={t`Copy invitation link`}
                 accent="tertiary"
                 onClick={copyInviteLink}
                 Icon={IconCopy}
@@ -222,14 +225,16 @@ export const InviteTeam = () => {
       </StyledAnimatedContainer>
       <StyledButtonContainer>
         <MainButton
-          title="Finish"
+          title={t`Continue`}
           disabled={!isValid || isSubmitting}
           onClick={handleSubmit(onSubmit)}
           fullWidth
         />
       </StyledButtonContainer>
       <StyledActionSkipLinkContainer>
-        <ActionLink onClick={handleSkip}>Skip</ActionLink>
+        <ActionLink onClick={handleSkip}>
+          <Trans>Skip</Trans>
+        </ActionLink>
       </StyledActionSkipLinkContainer>
     </>
   );
diff --git a/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx b/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx
index d4c51f4a2762..5cf3759f6048 100644
--- a/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx
+++ b/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx
@@ -1,19 +1,25 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
-import { useRecoilValue } from 'recoil';
+import { useSetRecoilState } from 'recoil';
 import {
   AnimatedEaseIn,
   IconCheck,
+  isDefined,
   MainButton,
   RGBA,
-  UndecoratedLink,
 } from 'twenty-ui';
 
 import { SubTitle } from '@/auth/components/SubTitle';
 import { Title } from '@/auth/components/Title';
 import { currentUserState } from '@/auth/states/currentUserState';
+import { useOnboardingStatus } from '@/onboarding/hooks/useOnboardingStatus';
 import { AppPath } from '@/types/AppPath';
-import { OnboardingStatus } from '~/generated/graphql';
+import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
+import {
+  OnboardingStatus,
+  useGetCurrentUserLazyQuery,
+} from '~/generated/graphql';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
 
 const StyledCheckContainer = styled.div`
   align-items: center;
@@ -34,11 +40,38 @@ const StyledButtonContainer = styled.div`
 
 export const PaymentSuccess = () => {
   const theme = useTheme();
-  const currentUser = useRecoilValue(currentUserState);
+  const navigate = useNavigateApp();
+  const subscriptionStatus = useSubscriptionStatus();
+  const onboardingStatus = useOnboardingStatus();
+  const [getCurrentUser] = useGetCurrentUserLazyQuery();
+  const setCurrentUser = useSetRecoilState(currentUserState);
   const color =
     theme.name === 'light' ? theme.grayScale.gray90 : theme.grayScale.gray10;
 
-  if (currentUser?.onboardingStatus === OnboardingStatus.Completed) {
+  const navigateWithSubscriptionCheck = async () => {
+    if (isDefined(subscriptionStatus)) {
+      navigate(AppPath.CreateWorkspace);
+      return;
+    }
+
+    const result = await getCurrentUser({ fetchPolicy: 'network-only' });
+    const currentUser = result.data?.currentUser;
+    const refreshedSubscriptionStatus =
+      currentUser?.currentWorkspace?.currentBillingSubscription?.status;
+
+    if (isDefined(currentUser) && isDefined(refreshedSubscriptionStatus)) {
+      setCurrentUser(currentUser);
+      navigate(AppPath.CreateWorkspace);
+      return;
+    }
+
+    throw new Error(
+      "We're waiting for a confirmation from our payment provider (Stripe).\n" +
+        'Please try again in a few seconds, sorry.',
+    );
+  };
+
+  if (onboardingStatus === OnboardingStatus.COMPLETED) {
     return <></>;
   }
 
@@ -52,9 +85,11 @@ export const PaymentSuccess = () => {
       <Title>All set!</Title>
       <SubTitle>Your account has been activated.</SubTitle>
       <StyledButtonContainer>
-        <UndecoratedLink to={AppPath.CreateWorkspace}>
-          <MainButton title="Start" width={200} />
-        </UndecoratedLink>
+        <MainButton
+          title="Start"
+          width={200}
+          onClick={navigateWithSubscriptionCheck}
+        />
       </StyledButtonContainer>
     </>
   );
diff --git a/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx b/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx
index e8945edb7424..00bd3010e604 100644
--- a/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx
+++ b/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx
@@ -42,16 +42,16 @@ export const SyncEmails = () => {
   const setNextOnboardingStatus = useSetNextOnboardingStatus();
   const currentUser = useRecoilValue(currentUserState);
   const [visibility, setVisibility] = useState<MessageChannelVisibility>(
-    MessageChannelVisibility.ShareEverything,
+    MessageChannelVisibility.SHARE_EVERYTHING,
   );
   const [skipSyncEmailOnboardingStatusMutation] =
     useSkipSyncEmailOnboardingStepMutation();
 
   const handleButtonClick = async () => {
     const calendarChannelVisibility =
-      visibility === MessageChannelVisibility.ShareEverything
-        ? CalendarChannelVisibility.ShareEverything
-        : CalendarChannelVisibility.Metadata;
+      visibility === MessageChannelVisibility.SHARE_EVERYTHING
+        ? CalendarChannelVisibility.SHARE_EVERYTHING
+        : CalendarChannelVisibility.METADATA;
 
     await triggerApisOAuth('google', {
       redirectLocation: AppPath.Index,
@@ -74,7 +74,7 @@ export const SyncEmails = () => {
     [continueWithoutSync],
   );
 
-  if (currentUser?.onboardingStatus !== OnboardingStatus.SyncEmail) {
+  if (currentUser?.onboardingStatus !== OnboardingStatus.SYNC_EMAIL) {
     return <></>;
   }
 
diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlan.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlan.stories.tsx
index 952a6e501c12..83b7298ddccf 100644
--- a/packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlan.stories.tsx
+++ b/packages/twenty-front/src/pages/onboarding/__stories__/ChooseYourPlan.stories.tsx
@@ -26,7 +26,7 @@ const meta: Meta<PageDecoratorArgs> = {
           return HttpResponse.json({
             data: {
               currentUser: mockedOnboardingUserData(
-                OnboardingStatus.PlanRequired,
+                OnboardingStatus.PLAN_REQUIRED,
               ),
             },
           });
@@ -40,14 +40,14 @@ const meta: Meta<PageDecoratorArgs> = {
                   {
                     __typename: 'ProductPriceEntity',
                     created: 1699860608,
-                    recurringInterval: 'month',
+                    recurringInterval: 'Month',
                     stripePriceId: 'monthly8usd',
                     unitAmount: 900,
                   },
                   {
                     __typename: 'ProductPriceEntity',
                     created: 1701874964,
-                    recurringInterval: 'year',
+                    recurringInterval: 'Year',
                     stripePriceId: 'priceId',
                     unitAmount: 9000,
                   },
@@ -56,7 +56,7 @@ const meta: Meta<PageDecoratorArgs> = {
             },
           });
         }),
-        graphqlMocks.handlers,
+        ...graphqlMocks.handlers,
       ],
     },
   },
@@ -70,7 +70,7 @@ export const Default: Story = {
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
 
-    await canvas.findByText('Choose your Plan', undefined, {
+    await canvas.findByText('Choose your Trial', undefined, {
       timeout: 3000,
     });
   },
diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/CreateProfile.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/CreateProfile.stories.tsx
index 40afb528481b..e230f2f5057a 100644
--- a/packages/twenty-front/src/pages/onboarding/__stories__/CreateProfile.stories.tsx
+++ b/packages/twenty-front/src/pages/onboarding/__stories__/CreateProfile.stories.tsx
@@ -26,7 +26,7 @@ const meta: Meta<PageDecoratorArgs> = {
           return HttpResponse.json({
             data: {
               currentUser: mockedOnboardingUserData(
-                OnboardingStatus.ProfileCreation,
+                OnboardingStatus.PROFILE_CREATION,
               ),
             },
           });
diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/CreateWorkspace.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/CreateWorkspace.stories.tsx
index 1ac668210bcf..e3fccc94f52c 100644
--- a/packages/twenty-front/src/pages/onboarding/__stories__/CreateWorkspace.stories.tsx
+++ b/packages/twenty-front/src/pages/onboarding/__stories__/CreateWorkspace.stories.tsx
@@ -26,7 +26,7 @@ const meta: Meta<PageDecoratorArgs> = {
           return HttpResponse.json({
             data: {
               currentUser: mockedOnboardingUserData(
-                OnboardingStatus.WorkspaceActivation,
+                OnboardingStatus.WORKSPACE_ACTIVATION,
               ),
             },
           });
diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/InviteTeam.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/InviteTeam.stories.tsx
index a09846e279de..291026607fb9 100644
--- a/packages/twenty-front/src/pages/onboarding/__stories__/InviteTeam.stories.tsx
+++ b/packages/twenty-front/src/pages/onboarding/__stories__/InviteTeam.stories.tsx
@@ -26,7 +26,7 @@ const meta: Meta<PageDecoratorArgs> = {
           return HttpResponse.json({
             data: {
               currentUser: mockedOnboardingUserData(
-                OnboardingStatus.InviteTeam,
+                OnboardingStatus.INVITE_TEAM,
               ),
             },
           });
diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/PaymentSuccess.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/PaymentSuccess.stories.tsx
index 22ed0e994711..2e78276c13cd 100644
--- a/packages/twenty-front/src/pages/onboarding/__stories__/PaymentSuccess.stories.tsx
+++ b/packages/twenty-front/src/pages/onboarding/__stories__/PaymentSuccess.stories.tsx
@@ -26,7 +26,7 @@ const meta: Meta<PageDecoratorArgs> = {
           return HttpResponse.json({
             data: {
               currentUser: mockedOnboardingUserData(
-                OnboardingStatus.WorkspaceActivation,
+                OnboardingStatus.WORKSPACE_ACTIVATION,
               ),
             },
           });
diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsx
index 213ad3fa5475..4e07013160be 100644
--- a/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsx
+++ b/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsx
@@ -25,7 +25,9 @@ const meta: Meta<PageDecoratorArgs> = {
         graphql.query(getOperationName(GET_CURRENT_USER) ?? '', () => {
           return HttpResponse.json({
             data: {
-              currentUser: mockedOnboardingUserData(OnboardingStatus.SyncEmail),
+              currentUser: mockedOnboardingUserData(
+                OnboardingStatus.SYNC_EMAIL,
+              ),
             },
           });
         }),
diff --git a/packages/twenty-front/src/pages/settings/Releases.tsx b/packages/twenty-front/src/pages/settings/Releases.tsx
index 182ef9bef28a..a5f0c5378c9d 100644
--- a/packages/twenty-front/src/pages/settings/Releases.tsx
+++ b/packages/twenty-front/src/pages/settings/Releases.tsx
@@ -1,4 +1,5 @@
 import styled from '@emotion/styled';
+import { Trans, useLingui } from '@lingui/react/macro';
 import React, { useEffect, useState } from 'react';
 import rehypeStringify from 'rehype-stringify';
 import remarkParse from 'remark-parse';
@@ -7,10 +8,10 @@ import { unified } from 'unified';
 import { visit } from 'unist-util-visit';
 
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
 import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 type ReleaseNote = {
   slug: string;
@@ -79,6 +80,7 @@ const StyledReleaseDate = styled.span`
 `;
 
 export const Releases = () => {
+  const { t } = useLingui();
   const [releases, setReleases] = useState<ReleaseNote[]>([]);
 
   useEffect(() => {
@@ -106,15 +108,13 @@ export const Releases = () => {
 
   return (
     <SubMenuTopBarContainer
-      title="Releases"
+      title={t`Releases`}
       links={[
         {
-          children: 'Others',
-          href: getSettingsPagePath(SettingsPath.Releases),
-        },
-        {
-          children: 'Releases',
+          children: <Trans>Workspace</Trans>,
+          href: getSettingsPath(SettingsPath.Workspace),
         },
+        { children: <Trans>Releases</Trans> },
       ]}
     >
       <SettingsPageContainer>
diff --git a/packages/twenty-front/src/pages/settings/SettingsBilling.tsx b/packages/twenty-front/src/pages/settings/SettingsBilling.tsx
index 49547472334b..bdc719ac1b7f 100644
--- a/packages/twenty-front/src/pages/settings/SettingsBilling.tsx
+++ b/packages/twenty-front/src/pages/settings/SettingsBilling.tsx
@@ -1,3 +1,4 @@
+import { Trans, useLingui } from '@lingui/react/macro';
 import { useState } from 'react';
 import { useRecoilValue, useSetRecoilState } from 'recoil';
 import {
@@ -6,16 +7,12 @@ import {
   IconCalendarEvent,
   IconCircleX,
   IconCreditCard,
-  Info,
   Section,
 } from 'twenty-ui';
 
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { SettingsBillingCoverImage } from '@/billing/components/SettingsBillingCoverImage';
-import { useOnboardingStatus } from '@/onboarding/hooks/useOnboardingStatus';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
-import { AppPath } from '@/types/AppPath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
@@ -23,13 +20,14 @@ import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModa
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
 import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
 import {
-  OnboardingStatus,
   SubscriptionInterval,
   SubscriptionStatus,
   useBillingPortalSessionQuery,
   useUpdateBillingSubscriptionMutation,
 } from '~/generated/graphql';
 import { isDefined } from '~/utils/isDefined';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
+import { useRedirect } from '@/domain-manager/hooks/useRedirect';
 
 type SwitchInfo = {
   newInterval: SubscriptionInterval;
@@ -38,30 +36,41 @@ type SwitchInfo = {
   impact: string;
 };
 
-const MONTHLY_SWITCH_INFO: SwitchInfo = {
-  newInterval: SubscriptionInterval.Year,
-  to: 'to yearly',
-  from: 'from monthly to yearly',
-  impact: 'You will be charged immediately for the full year.',
-};
+export const SettingsBilling = () => {
+  const { t } = useLingui();
 
-const YEARLY_SWITCH_INFO: SwitchInfo = {
-  newInterval: SubscriptionInterval.Month,
-  to: 'to monthly',
-  from: 'from yearly to monthly',
-  impact: 'Your credit balance will be used to pay the monthly bills.',
-};
+  const { redirect } = useRedirect();
 
-const SWITCH_INFOS = {
-  year: YEARLY_SWITCH_INFO,
-  month: MONTHLY_SWITCH_INFO,
-};
+  const MONTHLY_SWITCH_INFO: SwitchInfo = {
+    newInterval: SubscriptionInterval.Year,
+    to: t`to yearly`,
+    from: t`from monthly to yearly`,
+    impact: t`You will be charged immediately for the full year.`,
+  };
+
+  const YEARLY_SWITCH_INFO: SwitchInfo = {
+    newInterval: SubscriptionInterval.Month,
+    to: t`to monthly`,
+    from: t`from yearly to monthly`,
+    impact: t`Your credit balance will be used to pay the monthly bills.`,
+  };
+
+  const SWITCH_INFOS = {
+    year: YEARLY_SWITCH_INFO,
+    month: MONTHLY_SWITCH_INFO,
+  };
 
-export const SettingsBilling = () => {
   const { enqueueSnackBar } = useSnackBar();
-  const onboardingStatus = useOnboardingStatus();
-  const subscriptionStatus = useSubscriptionStatus();
+
   const currentWorkspace = useRecoilValue(currentWorkspaceState);
+  const subscriptions = currentWorkspace?.billingSubscriptions;
+  const hasSubscriptions = (subscriptions?.length ?? 0) > 0;
+
+  const subscriptionStatus = useSubscriptionStatus();
+  const hasNotCanceledCurrentSubscription =
+    isDefined(subscriptionStatus) &&
+    subscriptionStatus !== SubscriptionStatus.Canceled;
+
   const setCurrentWorkspace = useSetRecoilState(currentWorkspaceState);
   const switchingInfo =
     currentWorkspace?.currentBillingSubscription?.interval ===
@@ -75,32 +84,15 @@ export const SettingsBilling = () => {
     variables: {
       returnUrlPath: '/settings/billing',
     },
+    skip: !hasSubscriptions,
   });
 
   const billingPortalButtonDisabled =
     loading || !isDefined(data) || !isDefined(data.billingPortalSession.url);
 
-  const switchIntervalButtonDisabled =
-    onboardingStatus !== OnboardingStatus.Completed;
-
-  const cancelPlanButtonDisabled =
-    billingPortalButtonDisabled ||
-    onboardingStatus !== OnboardingStatus.Completed;
-
-  const displayPaymentFailInfo =
-    subscriptionStatus === SubscriptionStatus.PastDue ||
-    subscriptionStatus === SubscriptionStatus.Unpaid;
-
-  const displaySubscriptionCanceledInfo =
-    subscriptionStatus === SubscriptionStatus.Canceled;
-
-  const displaySubscribeInfo =
-    onboardingStatus === OnboardingStatus.Completed &&
-    !isDefined(subscriptionStatus);
-
   const openBillingPortal = () => {
     if (isDefined(data) && isDefined(data.billingPortalSession.url)) {
-      window.location.replace(data.billingPortalSession.url);
+      redirect(data.billingPortalSession.url);
     }
   };
 
@@ -108,6 +100,10 @@ export const SettingsBilling = () => {
     setIsSwitchingIntervalModalOpen(true);
   };
 
+  const from = switchingInfo.from;
+  const to = switchingInfo.to;
+  const impact = switchingInfo.impact;
+
   const switchInterval = async () => {
     try {
       await updateBillingSubscription();
@@ -121,112 +117,80 @@ export const SettingsBilling = () => {
         };
         setCurrentWorkspace(newCurrentWorkspace);
       }
-      enqueueSnackBar(`Subscription has been switched ${switchingInfo.to}`, {
+      enqueueSnackBar(t`Subscription has been switched ${to}`, {
         variant: SnackBarVariant.Success,
       });
     } catch (error: any) {
-      enqueueSnackBar(
-        `Error while switching subscription ${switchingInfo.to}.`,
-        {
-          variant: SnackBarVariant.Error,
-        },
-      );
+      enqueueSnackBar(t`Error while switching subscription ${to}.`, {
+        variant: SnackBarVariant.Error,
+      });
     }
   };
 
   return (
     <SubMenuTopBarContainer
-      title="Billing"
+      title={t`Billing`}
       links={[
         {
-          children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
+          children: <Trans>Workspace</Trans>,
+          href: getSettingsPath(SettingsPath.Workspace),
         },
-        { children: 'Billing' },
+        { children: <Trans>Billing</Trans> },
       ]}
     >
       <SettingsPageContainer>
         <SettingsBillingCoverImage />
-        {displayPaymentFailInfo && (
-          <Info
-            text={'Last payment failed. Please update your billing details.'}
-            buttonTitle={'Update'}
-            accent={'danger'}
+        <Section>
+          <H2Title
+            title={t`Manage your subscription`}
+            description={t`Edit payment method, see your invoices and more`}
+          />
+          <Button
+            Icon={IconCreditCard}
+            title={t`View billing details`}
+            variant="secondary"
             onClick={openBillingPortal}
+            disabled={billingPortalButtonDisabled}
           />
-        )}
-        {displaySubscriptionCanceledInfo && (
-          <Info
-            text={'Subscription canceled. Please start a new one'}
-            buttonTitle={'Subscribe'}
-            accent={'danger'}
-            to={AppPath.PlanRequired}
+        </Section>
+        <Section>
+          <H2Title
+            title={t`Edit billing interval`}
+            description={t`Switch ${from}`}
           />
-        )}
-        {displaySubscribeInfo ? (
-          <Info
-            text={'Your workspace does not have an active subscription'}
-            buttonTitle={'Subscribe'}
-            accent={'danger'}
-            to={AppPath.PlanRequired}
+          <Button
+            Icon={IconCalendarEvent}
+            title={t`Switch ${to}`}
+            variant="secondary"
+            onClick={openSwitchingIntervalModal}
+            disabled={!hasNotCanceledCurrentSubscription}
+          />
+        </Section>
+        <Section>
+          <H2Title
+            title={t`Cancel your subscription`}
+            description={t`Your workspace will be disabled`}
+          />
+          <Button
+            Icon={IconCircleX}
+            title={t`Cancel Plan`}
+            variant="secondary"
+            accent="danger"
+            onClick={openBillingPortal}
+            disabled={!hasNotCanceledCurrentSubscription}
           />
-        ) : (
-          <>
-            <Section>
-              <H2Title
-                title="Manage your subscription"
-                description="Edit payment method, see your invoices and more"
-              />
-              <Button
-                Icon={IconCreditCard}
-                title="View billing details"
-                variant="secondary"
-                onClick={openBillingPortal}
-                disabled={billingPortalButtonDisabled}
-              />
-            </Section>
-            <Section>
-              <H2Title
-                title="Edit billing interval"
-                description={`Switch ${switchingInfo.from}`}
-              />
-              <Button
-                Icon={IconCalendarEvent}
-                title={`Switch ${switchingInfo.to}`}
-                variant="secondary"
-                onClick={openSwitchingIntervalModal}
-                disabled={switchIntervalButtonDisabled}
-              />
-            </Section>
-            <Section>
-              <H2Title
-                title="Cancel your subscription"
-                description="Your workspace will be disabled"
-              />
-              <Button
-                Icon={IconCircleX}
-                title="Cancel Plan"
-                variant="secondary"
-                accent="danger"
-                onClick={openBillingPortal}
-                disabled={cancelPlanButtonDisabled}
-              />
-            </Section>
-          </>
-        )}
+        </Section>
       </SettingsPageContainer>
       <ConfirmationModal
         isOpen={isSwitchingIntervalModalOpen}
         setIsOpen={setIsSwitchingIntervalModalOpen}
-        title={`Switch billing ${switchingInfo.to}`}
+        title={t`Switch billing ${to}`}
         subtitle={
-          <>
-            {`Are you sure that you want to change your billing interval? 
-            ${switchingInfo.impact}`}
-          </>
+          t`Are you sure that you want to change your billing interval?` +
+          ` ${impact}`
         }
         onConfirmClick={switchInterval}
-        deleteButtonText={`Change ${switchingInfo.to}`}
+        deleteButtonText={t`Change ${to}`}
         confirmButtonAccent={'blue'}
       />
     </SubMenuTopBarContainer>
diff --git a/packages/twenty-front/src/pages/settings/SettingsProfile.tsx b/packages/twenty-front/src/pages/settings/SettingsProfile.tsx
index f3df4c489ae8..da48ea855767 100644
--- a/packages/twenty-front/src/pages/settings/SettingsProfile.tsx
+++ b/packages/twenty-front/src/pages/settings/SettingsProfile.tsx
@@ -1,3 +1,4 @@
+import { Trans, useLingui } from '@lingui/react/macro';
 import { H2Title, Section } from 'twenty-ui';
 
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
@@ -6,43 +7,50 @@ import { DeleteAccount } from '@/settings/profile/components/DeleteAccount';
 import { EmailField } from '@/settings/profile/components/EmailField';
 import { NameFields } from '@/settings/profile/components/NameFields';
 import { ProfilePictureUploader } from '@/settings/profile/components/ProfilePictureUploader';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
-export const SettingsProfile = () => (
-  <SubMenuTopBarContainer
-    title="Profile"
-    links={[
-      {
-        children: 'User',
-        href: getSettingsPagePath(SettingsPath.ProfilePage),
-      },
-      { children: 'Profile' },
-    ]}
-  >
-    <SettingsPageContainer>
-      <Section>
-        <H2Title title="Picture" />
-        <ProfilePictureUploader />
-      </Section>
-      <Section>
-        <H2Title title="Name" description="Your name as it will be displayed" />
-        <NameFields />
-      </Section>
-      <Section>
-        <H2Title
-          title="Email"
-          description="The email associated to your account"
-        />
-        <EmailField />
-      </Section>
-      <Section>
-        <ChangePassword />
-      </Section>
-      <Section>
-        <DeleteAccount />
-      </Section>
-    </SettingsPageContainer>
-  </SubMenuTopBarContainer>
-);
+export const SettingsProfile = () => {
+  const { t } = useLingui();
+
+  return (
+    <SubMenuTopBarContainer
+      title={t`Profile`}
+      links={[
+        {
+          children: <Trans>User</Trans>,
+          href: getSettingsPath(SettingsPath.ProfilePage),
+        },
+        { children: <Trans>Profile</Trans> },
+      ]}
+    >
+      <SettingsPageContainer>
+        <Section>
+          <H2Title title={t`Picture`} />
+          <ProfilePictureUploader />
+        </Section>
+        <Section>
+          <H2Title
+            title={t`Name`}
+            description={t`Your name as it will be displayed`}
+          />
+          <NameFields />
+        </Section>
+        <Section>
+          <H2Title
+            title={t`Email`}
+            description={t`The email associated to your account`}
+          />
+          <EmailField />
+        </Section>
+        <Section>
+          <ChangePassword />
+        </Section>
+        <Section>
+          <DeleteAccount />
+        </Section>
+      </SettingsPageContainer>
+    </SubMenuTopBarContainer>
+  );
+};
diff --git a/packages/twenty-front/src/pages/settings/SettingsWorkspace.tsx b/packages/twenty-front/src/pages/settings/SettingsWorkspace.tsx
index 854a7fa5a1c0..807a5de0b9b3 100644
--- a/packages/twenty-front/src/pages/settings/SettingsWorkspace.tsx
+++ b/packages/twenty-front/src/pages/settings/SettingsWorkspace.tsx
@@ -1,62 +1,68 @@
+import { useLingui } from '@lingui/react/macro';
+import { useRecoilValue } from 'recoil';
 import {
   GithubVersionLink,
   H2Title,
-  Section,
   IconWorld,
+  Section,
   UndecoratedLink,
 } from 'twenty-ui';
-import { useRecoilValue } from 'recoil';
 
+import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';
+import { SettingsCard } from '@/settings/components/SettingsCard';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { DeleteWorkspace } from '@/settings/profile/components/DeleteWorkspace';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { NameField } from '@/settings/workspace/components/NameField';
 import { ToggleImpersonate } from '@/settings/workspace/components/ToggleImpersonate';
 import { WorkspaceLogoUploader } from '@/settings/workspace/components/WorkspaceLogoUploader';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 import packageJson from '../../../package.json';
-import { SettingsCard } from '@/settings/components/SettingsCard';
-import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';
 
 export const SettingsWorkspace = () => {
   const isMultiWorkspaceEnabled = useRecoilValue(isMultiWorkspaceEnabledState);
+  const { t } = useLingui();
+
   return (
     <SubMenuTopBarContainer
-      title="General"
+      title={t`General`}
       links={[
         {
-          children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
+          children: t`Workspace`,
+          href: getSettingsPath(SettingsPath.Workspace),
         },
-        { children: 'General' },
+        { children: t`General` },
       ]}
     >
       <SettingsPageContainer>
         <Section>
-          <H2Title title="Picture" />
+          <H2Title title={t`Picture`} />
           <WorkspaceLogoUploader />
         </Section>
         <Section>
-          <H2Title title="Name" description="Name of your workspace" />
+          <H2Title title={t`Name`} description={t`Name of your workspace`} />
           <NameField />
         </Section>
         {isMultiWorkspaceEnabled && (
           <>
             <Section>
               <H2Title
-                title="Domain"
-                description="Edit your subdomain name or set a custom domain."
+                title={t`Domain`}
+                description={t`Edit your subdomain name or set a custom domain.`}
               />
-              <UndecoratedLink to={getSettingsPagePath(SettingsPath.Domain)}>
-                <SettingsCard title="Customize Domain" Icon={<IconWorld />} />
+              <UndecoratedLink to={getSettingsPath(SettingsPath.Domain)}>
+                <SettingsCard
+                  title={t`Customize Domain`}
+                  Icon={<IconWorld />}
+                />
               </UndecoratedLink>
             </Section>
             <Section>
               <H2Title
-                title="Support"
+                title={t`Support`}
                 adornment={<ToggleImpersonate />}
-                description="Grant Twenty support temporary access to your workspace so we can troubleshoot problems or recover content on your behalf. You can revoke access at any time."
+                description={t`Grant Twenty support temporary access to your workspace so we can troubleshoot problems or recover content on your behalf. You can revoke access at any time.`}
               />
             </Section>
           </>
diff --git a/packages/twenty-front/src/pages/settings/SettingsWorkspaceMembers.tsx b/packages/twenty-front/src/pages/settings/SettingsWorkspaceMembers.tsx
index 214e0e8c2b7c..629723f6b11e 100644
--- a/packages/twenty-front/src/pages/settings/SettingsWorkspaceMembers.tsx
+++ b/packages/twenty-front/src/pages/settings/SettingsWorkspaceMembers.tsx
@@ -1,5 +1,6 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { Trans, useLingui } from '@lingui/react/macro';
 import { isNonEmptyArray } from '@sniptt/guards';
 import { useState } from 'react';
 import { useRecoilValue, useSetRecoilState } from 'recoil';
@@ -22,7 +23,6 @@ import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSi
 import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
@@ -36,6 +36,7 @@ import { WorkspaceInviteTeam } from '@/workspace/components/WorkspaceInviteTeam'
 import { formatDistanceToNow } from 'date-fns';
 import { useGetWorkspaceInvitationsQuery } from '~/generated/graphql';
 import { isDefined } from '~/utils/isDefined';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 import { TableCell } from '../../modules/ui/layout/table/components/TableCell';
 import { TableRow } from '../../modules/ui/layout/table/components/TableRow';
 import { useDeleteWorkspaceInvitation } from '../../modules/workspace-invitation/hooks/useDeleteWorkspaceInvitation';
@@ -70,6 +71,7 @@ const StyledTextContainerWithEllipsis = styled.div`
 `;
 
 export const SettingsWorkspaceMembers = () => {
+  const { t } = useLingui();
   const { enqueueSnackBar } = useSnackBar();
   const theme = useTheme();
   const [isConfirmationModalOpen, setIsConfirmationModalOpen] = useState(false);
@@ -138,13 +140,13 @@ export const SettingsWorkspaceMembers = () => {
 
   return (
     <SubMenuTopBarContainer
-      title="Members"
+      title={t`Members`}
       links={[
         {
-          children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
+          children: <Trans>Workspace</Trans>,
+          href: getSettingsPath(SettingsPath.Workspace),
         },
-        { children: 'Members' },
+        { children: <Trans>Members</Trans> },
       ]}
     >
       <SettingsPageContainer>
@@ -152,8 +154,8 @@ export const SettingsWorkspaceMembers = () => {
           currentWorkspace?.isPublicInviteLinkEnabled && (
             <Section>
               <H2Title
-                title="Invite by link"
-                description="Share this link to invite users to join your workspace"
+                title={t`Invite by link`}
+                description={t`Share this link to invite users to join your workspace`}
               />
               <WorkspaceInviteLink
                 inviteLink={`${window.location.origin}/invite/${currentWorkspace?.inviteHash}`}
@@ -162,8 +164,8 @@ export const SettingsWorkspaceMembers = () => {
           )}
         <Section>
           <H2Title
-            title="Manage Members"
-            description="Manage the members of your space here"
+            title={t`Manage Members`}
+            description={t`Manage the members of your space here`}
           />
           <Table>
             <StyledTableHeaderRow>
@@ -171,8 +173,12 @@ export const SettingsWorkspaceMembers = () => {
                 gridAutoColumns="150px 1fr 1fr"
                 mobileGridAutoColumns="100px 1fr 1fr"
               >
-                <TableHeader>Name</TableHeader>
-                <TableHeader>Email</TableHeader>
+                <TableHeader>
+                  <Trans>Name</Trans>
+                </TableHeader>
+                <TableHeader>
+                  <Trans>Email</Trans>
+                </TableHeader>
                 <TableHeader align={'right'}></TableHeader>
               </TableRow>
             </StyledTableHeaderRow>
@@ -235,8 +241,8 @@ export const SettingsWorkspaceMembers = () => {
         </Section>
         <Section>
           <H2Title
-            title="Invite by email"
-            description="Send an invite email to your team"
+            title={t`Invite by email`}
+            description={t`Send an invite email to your team`}
           />
           <WorkspaceInviteTeam />
           {isNonEmptyArray(workspaceInvitations) && (
@@ -246,8 +252,12 @@ export const SettingsWorkspaceMembers = () => {
                   gridAutoColumns="150px 1fr 1fr"
                   mobileGridAutoColumns="100px 1fr 1fr"
                 >
-                  <TableHeader>Email</TableHeader>
-                  <TableHeader align={'right'}>Expires in</TableHeader>
+                  <TableHeader>
+                    <Trans>Email</Trans>
+                  </TableHeader>
+                  <TableHeader align={'right'}>
+                    <Trans>Expires in</Trans>
+                  </TableHeader>
                   <TableHeader></TableHeader>
                 </TableRow>
               </StyledTableHeaderRow>
@@ -308,18 +318,18 @@ export const SettingsWorkspaceMembers = () => {
       <ConfirmationModal
         isOpen={isConfirmationModalOpen}
         setIsOpen={setIsConfirmationModalOpen}
-        title="Account Deletion"
+        title={t`Account Deletion`}
         subtitle={
-          <>
+          <Trans>
             This action cannot be undone. This will permanently delete this user
-            and remove them from all their assignements.
-          </>
+            and remove them from all their assignments.
+          </Trans>
         }
         onConfirmClick={() =>
           workspaceMemberToDelete &&
           handleRemoveWorkspaceMember(workspaceMemberToDelete)
         }
-        deleteButtonText="Delete account"
+        deleteButtonText={t`Delete account`}
       />
     </SubMenuTopBarContainer>
   );
diff --git a/packages/twenty-front/src/pages/settings/__stories__/SettingsBilling.stories.tsx b/packages/twenty-front/src/pages/settings/__stories__/SettingsBilling.stories.tsx
index 478423bd94fd..521a691035b5 100644
--- a/packages/twenty-front/src/pages/settings/__stories__/SettingsBilling.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/__stories__/SettingsBilling.stories.tsx
@@ -1,7 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
 import { within } from '@storybook/test';
 
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import {
   PageDecorator,
@@ -10,13 +9,14 @@ import {
 import { graphqlMocks } from '~/testing/graphqlMocks';
 import { sleep } from '~/utils/sleep';
 
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 import { SettingsBilling } from '../SettingsBilling';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/SettingsBilling',
   component: SettingsBilling,
   decorators: [PageDecorator],
-  args: { routePath: getSettingsPagePath(SettingsPath.Billing) },
+  args: { routePath: getSettingsPath(SettingsPath.Billing) },
   parameters: {
     msw: graphqlMocks,
   },
diff --git a/packages/twenty-front/src/pages/settings/__stories__/SettingsAppearance.stories.tsx b/packages/twenty-front/src/pages/settings/__stories__/SettingsExperience.stories.tsx
similarity index 86%
rename from packages/twenty-front/src/pages/settings/__stories__/SettingsAppearance.stories.tsx
rename to packages/twenty-front/src/pages/settings/__stories__/SettingsExperience.stories.tsx
index 2e2880015992..aed56b2d1271 100644
--- a/packages/twenty-front/src/pages/settings/__stories__/SettingsAppearance.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/__stories__/SettingsExperience.stories.tsx
@@ -7,15 +7,15 @@ import {
 import { graphqlMocks } from '~/testing/graphqlMocks';
 
 import { userEvent, within } from '@storybook/test';
-import { SettingsAppearance } from '../profile/appearance/components/SettingsAppearance';
+import { SettingsExperience } from '../profile/appearance/components/SettingsExperience';
 
 Date.now = () => new Date('2022-06-13T12:33:37.000Z').getTime();
 
 const meta: Meta<PageDecoratorArgs> = {
-  title: 'Pages/Settings/SettingsAppearance',
-  component: SettingsAppearance,
+  title: 'Pages/Settings/SettingsExperience',
+  component: SettingsExperience,
   decorators: [PageDecorator],
-  args: { routePath: '/settings/appearance' },
+  args: { routePath: '/settings/experience' },
   parameters: {
     msw: graphqlMocks,
     date: new Date(2021, 1, 1),
@@ -24,13 +24,13 @@ const meta: Meta<PageDecoratorArgs> = {
 
 export default meta;
 
-export type Story = StoryObj<typeof SettingsAppearance>;
+export type Story = StoryObj<typeof SettingsExperience>;
 
 export const Default: Story = {
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
 
-    await canvas.findByText('Appearance', undefined, {
+    await canvas.findAllByText('Experience', undefined, {
       timeout: 3000,
     });
 
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx
index 65ec8c7d75a0..6a59175ec6d8 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx
@@ -12,11 +12,13 @@ import { SettingsAccountsBlocklistSection } from '@/settings/accounts/components
 import { SettingsAccountsConnectedAccountsListCard } from '@/settings/accounts/components/SettingsAccountsConnectedAccountsListCard';
 import { SettingsAccountsSettingsSection } from '@/settings/accounts/components/SettingsAccountsSettingsSection';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
+import { useLingui } from '@lingui/react/macro';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const SettingsAccounts = () => {
+  const { t } = useLingui();
   const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
 
   const { objectMetadataItem } = useObjectMetadataItem({
@@ -24,7 +26,7 @@ export const SettingsAccounts = () => {
   });
 
   const { records: accounts, loading } = useFindManyRecords<ConnectedAccount>({
-    objectNameSingular: 'connectedAccount',
+    objectNameSingular: CoreObjectNameSingular.ConnectedAccount,
     filter: {
       accountOwnerId: {
         eq: currentWorkspaceMember?.id,
@@ -35,13 +37,13 @@ export const SettingsAccounts = () => {
 
   return (
     <SubMenuTopBarContainer
-      title="Account"
+      title={t`Account`}
       links={[
         {
-          children: 'User',
-          href: getSettingsPagePath(SettingsPath.ProfilePage),
+          children: t`User`,
+          href: getSettingsPath(SettingsPath.ProfilePage),
         },
-        { children: 'Account' },
+        { children: t`Account` },
       ]}
     >
       <SettingsPageContainer>
@@ -51,8 +53,8 @@ export const SettingsAccounts = () => {
           <>
             <Section>
               <H2Title
-                title="Connected accounts"
-                description="Manage your internet accounts."
+                title={t`Connected accounts`}
+                description={t`Manage your internet accounts.`}
               />
               <SettingsAccountsConnectedAccountsListCard
                 accounts={accounts}
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx
index 248b82a19b2f..af46f35b648f 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx
@@ -1,24 +1,27 @@
 import { SettingsAccountsCalendarChannelsContainer } from '@/settings/accounts/components/SettingsAccountsCalendarChannelsContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
+import { Trans, useLingui } from '@lingui/react/macro';
 import { Section } from 'twenty-ui';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const SettingsAccountsCalendars = () => {
+  const { t } = useLingui();
+
   return (
     <SubMenuTopBarContainer
-      title="Calendars"
+      title={t`Calendars`}
       links={[
         {
-          children: 'User',
-          href: getSettingsPagePath(SettingsPath.ProfilePage),
+          children: <Trans>User</Trans>,
+          href: getSettingsPath(SettingsPath.ProfilePage),
         },
         {
-          children: 'Accounts',
-          href: getSettingsPagePath(SettingsPath.Accounts),
+          children: <Trans>Accounts</Trans>,
+          href: getSettingsPath(SettingsPath.Accounts),
         },
-        { children: 'Calendars' },
+        { children: <Trans>Calendars</Trans> },
       ]}
     >
       <SettingsPageContainer>
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx
index 549f4cf4d3f0..20b375ad689d 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx
@@ -1,9 +1,9 @@
 import { SettingsAccountsMessageChannelsContainer } from '@/settings/accounts/components/SettingsAccountsMessageChannelsContainer';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
 import { Section } from 'twenty-ui';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const SettingsAccountsEmails = () => (
   <SubMenuTopBarContainer
@@ -11,11 +11,11 @@ export const SettingsAccountsEmails = () => (
     links={[
       {
         children: 'User',
-        href: getSettingsPagePath(SettingsPath.ProfilePage),
+        href: getSettingsPath(SettingsPath.ProfilePage),
       },
       {
         children: 'Accounts',
-        href: getSettingsPagePath(SettingsPath.Accounts),
+        href: getSettingsPath(SettingsPath.Accounts),
       },
       { children: 'Emails' },
     ]}
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsNewAccount.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsNewAccount.tsx
index d46f4b99c7c7..f76818905c1a 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsNewAccount.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsNewAccount.tsx
@@ -1,8 +1,8 @@
 import { SettingsNewAccountSection } from '@/settings/accounts/components/SettingsNewAccountSection';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const SettingsNewAccount = () => {
   return (
@@ -11,11 +11,11 @@ export const SettingsNewAccount = () => {
       links={[
         {
           children: 'User',
-          href: getSettingsPagePath(SettingsPath.ProfilePage),
+          href: getSettingsPath(SettingsPath.ProfilePage),
         },
         {
           children: 'Accounts',
-          href: getSettingsPagePath(SettingsPath.Accounts),
+          href: getSettingsPath(SettingsPath.Accounts),
         },
         { children: `New` },
       ]}
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdmin.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdmin.tsx
index ccab11f0efb4..71de7b30f631 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdmin.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdmin.tsx
@@ -1,8 +1,8 @@
+import { SettingsAdminContent } from '@/settings/admin-panel/components/SettingsAdminContent';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
-import { SettingsAdminContent } from '@/settings/admin-panel/components/SettingsAdminContent';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const SettingsAdmin = () => {
   return (
@@ -11,7 +11,7 @@ export const SettingsAdmin = () => {
       links={[
         {
           children: 'Other',
-          href: getSettingsPagePath(SettingsPath.AdminPanel),
+          href: getSettingsPath(SettingsPath.AdminPanel),
         },
         { children: 'Server Admin Panel' },
       ]}
diff --git a/packages/twenty-front/src/pages/settings/crm-migration/SettingsCRMMigration.tsx b/packages/twenty-front/src/pages/settings/crm-migration/SettingsCRMMigration.tsx
deleted file mode 100644
index 095809906ede..000000000000
--- a/packages/twenty-front/src/pages/settings/crm-migration/SettingsCRMMigration.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-// @ts-expect-error external library has a typing issue
-import { RevertConnect } from '@revertdotdev/revert-react';
-
-import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
-import { SettingsHeaderContainer } from '@/settings/components/SettingsHeaderContainer';
-import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { SettingsReadDocumentationButton } from '@/settings/developers/components/SettingsReadDocumentationButton';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
-import { SettingsPath } from '@/types/SettingsPath';
-import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
-import { useRecoilValue } from 'recoil';
-import { Section } from 'twenty-ui';
-
-const REVERT_PUBLIC_KEY = 'pk_live_a87fee8c-28c7-494f-99a3-996ff89f9918';
-
-export const SettingsCRMMigration = () => {
-  const currentWorkspace = useRecoilValue(currentWorkspaceState);
-  return (
-    <SubMenuTopBarContainer
-      title="Migrate"
-      links={[
-        {
-          children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
-        },
-        { children: 'Migrate' },
-      ]}
-      actionButton={<SettingsReadDocumentationButton />}
-    >
-      <SettingsPageContainer>
-        <SettingsHeaderContainer></SettingsHeaderContainer>
-        <Section>
-          <RevertConnect
-            config={{
-              revertToken: REVERT_PUBLIC_KEY,
-              tenantId: currentWorkspace?.id,
-            }}
-          />
-        </Section>
-      </SettingsPageContainer>
-    </SubMenuTopBarContainer>
-  );
-};
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx
index ab9fdb73707d..cf017f854699 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsNewObject.tsx
@@ -1,6 +1,5 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { FormProvider, useForm } from 'react-hook-form';
-import { useNavigate } from 'react-router-dom';
 import { H2Title, Section } from 'twenty-ui';
 import { z } from 'zod';
 
@@ -12,25 +11,26 @@ import {
   settingsDataModelObjectAboutFormSchema,
 } from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm';
 import { settingsCreateObjectInputSchema } from '@/settings/data-model/validation-schemas/settingsCreateObjectInputSchema';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
+import { useLingui } from '@lingui/react/macro';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 const newObjectFormSchema = settingsDataModelObjectAboutFormSchema;
 
 type SettingsDataModelNewObjectFormValues = z.infer<typeof newObjectFormSchema>;
 
 export const SettingsNewObject = () => {
-  const navigate = useNavigate();
+  const { t } = useLingui();
+  const navigate = useNavigateSettings();
   const { enqueueSnackBar } = useSnackBar();
 
   const { createOneObjectMetadataItem, findManyRecordsCache } =
     useCreateOneObjectMetadataItem();
 
-  const settingsObjectsPagePath = getSettingsPagePath(SettingsPath.Objects);
-
   const formConfig = useForm<SettingsDataModelNewObjectFormValues>({
     mode: 'onTouched',
     resolver: zodResolver(newObjectFormSchema),
@@ -48,9 +48,10 @@ export const SettingsNewObject = () => {
       );
 
       navigate(
+        response ? SettingsPath.ObjectDetail : SettingsPath.Objects,
         response
-          ? `${settingsObjectsPagePath}/${response.createOneObject.namePlural}`
-          : settingsObjectsPagePath,
+          ? { objectNamePlural: response.createOneObject.namePlural }
+          : undefined,
       );
 
       await findManyRecordsCache();
@@ -65,23 +66,23 @@ export const SettingsNewObject = () => {
     // eslint-disable-next-line react/jsx-props-no-spreading
     <FormProvider {...formConfig}>
       <SubMenuTopBarContainer
-        title="New Object"
+        title={t`New Object`}
         links={[
           {
-            children: 'Workspace',
-            href: getSettingsPagePath(SettingsPath.Workspace),
+            children: t`Workspace`,
+            href: getSettingsPath(SettingsPath.Workspace),
           },
           {
-            children: 'Objects',
-            href: settingsObjectsPagePath,
+            children: t`Objects`,
+            href: getSettingsPath(SettingsPath.Objects),
           },
-          { children: 'New' },
+          { children: t`New` },
         ]}
         actionButton={
           <SaveAndCancelButtons
             isSaveDisabled={!canSave}
             isCancelDisabled={isSubmitting}
-            onCancel={() => navigate(settingsObjectsPagePath)}
+            onCancel={() => navigate(SettingsPath.Objects)}
             onSave={formConfig.handleSubmit(handleSave)}
           />
         }
@@ -89,8 +90,8 @@ export const SettingsNewObject = () => {
         <SettingsPageContainer>
           <Section>
             <H2Title
-              title="About"
-              description="Name in both singular (e.g., 'Invoice') and plural (e.g., 'Invoices') forms."
+              title={t`About`}
+              description={t`Define the name and description of your object`}
             />
             <SettingsDataModelObjectAboutForm />
           </Section>
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsx
index 6fc45d30cf9d..9ec238de3f5d 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsx
@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 
 import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
@@ -8,7 +8,6 @@ import { ObjectIndexes } from '@/settings/data-model/object-details/components/t
 import { ObjectSettings } from '@/settings/data-model/object-details/components/tabs/ObjectSettings';
 import { SettingsDataModelObjectTypeTag } from '@/settings/data-model/objects/components/SettingsDataModelObjectTypeTag';
 import { getObjectTypeLabel } from '@/settings/data-model/utils/getObjectTypeLabel';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { AppPath } from '@/types/AppPath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
@@ -31,8 +30,10 @@ import {
   isDefined,
 } from 'twenty-ui';
 import { FeatureFlagKey } from '~/generated/graphql';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
 import { SETTINGS_OBJECT_DETAIL_TABS } from '~/pages/settings/data-model/constants/SettingsObjectDetailTabs';
 import { updatedObjectNamePluralState } from '~/pages/settings/data-model/states/updatedObjectNamePluralState';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 const StyledContentContainer = styled.div`
   flex: 1;
@@ -51,7 +52,7 @@ const StyledTitleContainer = styled.div`
 `;
 
 export const SettingsObjectDetailPage = () => {
-  const navigate = useNavigate();
+  const navigateApp = useNavigateApp();
 
   const { objectNamePlural = '' } = useParams();
   const { findActiveObjectMetadataItemByNamePlural } =
@@ -76,10 +77,10 @@ export const SettingsObjectDetailPage = () => {
   useEffect(() => {
     if (objectNamePlural === updatedObjectNamePlural)
       setUpdatedObjectNamePlural('');
-    if (!isDefined(objectMetadataItem)) navigate(AppPath.NotFound);
+    if (!isDefined(objectMetadataItem)) navigateApp(AppPath.NotFound);
   }, [
     objectMetadataItem,
-    navigate,
+    navigateApp,
     objectNamePlural,
     updatedObjectNamePlural,
     setUpdatedObjectNamePlural,
@@ -142,9 +143,9 @@ export const SettingsObjectDetailPage = () => {
         links={[
           {
             children: 'Workspace',
-            href: getSettingsPagePath(SettingsPath.Workspace),
+            href: getSettingsPath(SettingsPath.Workspace),
           },
-          { children: 'Objects', href: '/settings/objects' },
+          { children: 'Objects', href: getSettingsPath(SettingsPath.Objects) },
           {
             children: objectMetadataItem.labelPlural,
           },
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
index 02963bbf57cb..7ada32c61d21 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
@@ -3,7 +3,7 @@ import omit from 'lodash.omit';
 import pick from 'lodash.pick';
 import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 import {
   Button,
   H2Title,
@@ -28,14 +28,17 @@ import { SettingsDataModelFieldIconLabelForm } from '@/settings/data-model/field
 import { SettingsDataModelFieldSettingsFormCard } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard';
 import { settingsFieldFormSchema } from '@/settings/data-model/fields/forms/validation-schemas/settingsFieldFormSchema';
 import { SettingsFieldType } from '@/settings/data-model/types/SettingsFieldType';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { AppPath } from '@/types/AppPath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
+import { useLingui } from '@lingui/react/macro';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 import { isDefined } from '~/utils/isDefined';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 //TODO: fix this type
 type SettingsDataModelFieldEditFormValues = z.infer<
@@ -44,7 +47,10 @@ type SettingsDataModelFieldEditFormValues = z.infer<
   any;
 
 export const SettingsObjectFieldEdit = () => {
-  const navigate = useNavigate();
+  const navigateSettings = useNavigateSettings();
+  const navigateApp = useNavigateApp();
+  const { t } = useLingui();
+
   const { enqueueSnackBar } = useSnackBar();
 
   const { objectNamePlural = '', fieldName = '' } = useParams();
@@ -78,9 +84,9 @@ export const SettingsObjectFieldEdit = () => {
 
   useEffect(() => {
     if (!objectMetadataItem || !fieldMetadataItem) {
-      navigate(AppPath.NotFound);
+      navigateApp(AppPath.NotFound);
     }
-  }, [navigate, objectMetadataItem, fieldMetadataItem]);
+  }, [navigateApp, objectMetadataItem, fieldMetadataItem]);
 
   const { isDirty, isValid, isSubmitting } = formConfig.formState;
   const canSave = isDirty && isValid && !isSubmitting;
@@ -101,7 +107,7 @@ export const SettingsObjectFieldEdit = () => {
 
     try {
       if (
-        formValues.type === FieldMetadataType.Relation &&
+        formValues.type === FieldMetadataType.RELATION &&
         'relation' in formValues &&
         'relation' in dirtyFields
       ) {
@@ -127,7 +133,9 @@ export const SettingsObjectFieldEdit = () => {
           Object.keys(otherDirtyFields),
         );
 
-        navigate(`/settings/objects/${objectNamePlural}`);
+        navigateSettings(SettingsPath.ObjectDetail, {
+          objectNamePlural,
+        });
 
         await updateOneFieldMetadataItem({
           objectMetadataId: objectMetadataItem.id,
@@ -144,12 +152,16 @@ export const SettingsObjectFieldEdit = () => {
 
   const handleDeactivate = async () => {
     await deactivateMetadataField(fieldMetadataItem.id, objectMetadataItem.id);
-    navigate(`/settings/objects/${objectNamePlural}`);
+    navigateSettings(SettingsPath.ObjectDetail, {
+      objectNamePlural,
+    });
   };
 
   const handleActivate = async () => {
     await activateMetadataField(fieldMetadataItem.id, objectMetadataItem.id);
-    navigate(`/settings/objects/${objectNamePlural}`);
+    navigateSettings(SettingsPath.ObjectDetail, {
+      objectNamePlural,
+    });
   };
 
   return (
@@ -160,16 +172,18 @@ export const SettingsObjectFieldEdit = () => {
           title={fieldMetadataItem?.label}
           links={[
             {
-              children: 'Workspace',
-              href: getSettingsPagePath(SettingsPath.Workspace),
+              children: t`Workspace`,
+              href: getSettingsPath(SettingsPath.Workspace),
             },
             {
-              children: 'Objects',
-              href: '/settings/objects',
+              children: t`Objects`,
+              href: getSettingsPath(SettingsPath.Objects),
             },
             {
               children: objectMetadataItem.labelPlural,
-              href: `/settings/objects/${objectNamePlural}`,
+              href: getSettingsPath(SettingsPath.ObjectDetail, {
+                objectNamePlural,
+              }),
             },
             {
               children: fieldMetadataItem.label,
@@ -179,7 +193,11 @@ export const SettingsObjectFieldEdit = () => {
             <SaveAndCancelButtons
               isSaveDisabled={!canSave}
               isCancelDisabled={isSubmitting}
-              onCancel={() => navigate(`/settings/objects/${objectNamePlural}`)}
+              onCancel={() =>
+                navigateSettings(SettingsPath.ObjectDetail, {
+                  objectNamePlural,
+                })
+              }
               onSave={formConfig.handleSubmit(handleSave)}
             />
           }
@@ -187,28 +205,28 @@ export const SettingsObjectFieldEdit = () => {
           <SettingsPageContainer>
             <Section>
               <H2Title
-                title="Icon and Name"
-                description="The name and icon of this field"
+                title={t`Icon and Name`}
+                description={t`The name and icon of this field`}
               />
               <SettingsDataModelFieldIconLabelForm
                 disabled={!fieldMetadataItem.isCustom}
                 fieldMetadataItem={fieldMetadataItem}
                 maxLength={FIELD_NAME_MAXIMUM_LENGTH}
                 canToggleSyncLabelWithName={
-                  fieldMetadataItem.type !== FieldMetadataType.Relation
+                  fieldMetadataItem.type !== FieldMetadataType.RELATION
                 }
               />
             </Section>
             <Section>
               {fieldMetadataItem.isUnique ? (
                 <H2Title
-                  title="Values"
-                  description="The values of this field must be unique"
+                  title={t`Values`}
+                  description={t`The values of this field must be unique`}
                 />
               ) : (
                 <H2Title
-                  title="Values"
-                  description="The values of this field"
+                  title={t`Values`}
+                  description={t`The values of this field`}
                 />
               )}
               <SettingsDataModelFieldSettingsFormCard
@@ -218,8 +236,8 @@ export const SettingsObjectFieldEdit = () => {
             </Section>
             <Section>
               <H2Title
-                title="Description"
-                description="The description of this field"
+                title={t`Description`}
+                description={t`The description of this field`}
               />
               <SettingsDataModelFieldDescriptionForm
                 disabled={!fieldMetadataItem.isCustom}
@@ -229,15 +247,17 @@ export const SettingsObjectFieldEdit = () => {
             {!isLabelIdentifier && (
               <Section>
                 <H2Title
-                  title="Danger zone"
-                  description="Deactivate this field"
+                  title={t`Danger zone`}
+                  description={t`Deactivate this field`}
                 />
                 <Button
                   Icon={
                     fieldMetadataItem.isActive ? IconArchive : IconArchiveOff
                   }
                   variant="secondary"
-                  title={fieldMetadataItem.isActive ? 'Deactivate' : 'Activate'}
+                  title={
+                    fieldMetadataItem.isActive ? t`Deactivate` : t`Activate`
+                  }
                   size="small"
                   onClick={
                     fieldMetadataItem.isActive
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldTable.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldTable.tsx
index 534ebc6ee5fd..0d8f19472708 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldTable.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldTable.tsx
@@ -12,6 +12,7 @@ import { TableSection } from '@/ui/layout/table/components/TableSection';
 import { useSortedArray } from '@/ui/layout/table/hooks/useSortedArray';
 import { TableMetadata } from '@/ui/layout/table/types/TableMetadata';
 import styled from '@emotion/styled';
+import { useLingui } from '@lingui/react/macro';
 import { isNonEmptyArray } from '@sniptt/guards';
 import { useEffect, useMemo, useState } from 'react';
 import { useRecoilState } from 'recoil';
@@ -19,63 +20,65 @@ import { IconSearch } from 'twenty-ui';
 import { useMapFieldMetadataItemToSettingsObjectDetailTableItem } from '~/pages/settings/data-model/hooks/useMapFieldMetadataItemToSettingsObjectDetailTableItem';
 import { SettingsObjectDetailTableItem } from '~/pages/settings/data-model/types/SettingsObjectDetailTableItem';
 
-const SETTINGS_OBJECT_DETAIL_TABLE_METADATA_STANDARD: TableMetadata<SettingsObjectDetailTableItem> =
-  {
-    tableId: 'settingsObjectDetail',
-    fields: [
-      {
-        fieldLabel: 'Name',
-        fieldName: 'label',
-        fieldType: 'string',
-        align: 'left',
-      },
-      {
-        fieldLabel: 'Field type',
-        fieldName: 'fieldType',
-        fieldType: 'string',
-        align: 'left',
-      },
-      {
-        fieldLabel: 'Data type',
-        fieldName: 'dataType',
-        fieldType: 'string',
-        align: 'left',
-      },
-    ],
-    initialSort: {
+const GET_SETTINGS_OBJECT_DETAIL_TABLE_METADATA_STANDARD = (
+  t: (literals: TemplateStringsArray) => string,
+): TableMetadata<SettingsObjectDetailTableItem> => ({
+  tableId: 'settingsObjectDetail',
+  fields: [
+    {
+      fieldLabel: t`Name`,
       fieldName: 'label',
-      orderBy: 'AscNullsLast',
+      fieldType: 'string',
+      align: 'left',
     },
-  };
-
-const SETTINGS_OBJECT_DETAIL_TABLE_METADATA_CUSTOM: TableMetadata<SettingsObjectDetailTableItem> =
-  {
-    tableId: 'settingsObjectDetail',
-    fields: [
-      {
-        fieldLabel: 'Name',
-        fieldName: 'label',
-        fieldType: 'string',
-        align: 'left',
-      },
-      {
-        fieldLabel: 'Identifier',
-        fieldName: 'identifierType',
-        fieldType: 'string',
-        align: 'left',
-      },
-      {
-        fieldLabel: 'Data type',
-        fieldName: 'dataType',
-        fieldType: 'string',
-        align: 'left',
-      },
-    ],
-    initialSort: {
+    {
+      fieldLabel: t`Field type`,
+      fieldName: 'fieldType',
+      fieldType: 'string',
+      align: 'left',
+    },
+    {
+      fieldLabel: t`Data type`,
+      fieldName: 'dataType',
+      fieldType: 'string',
+      align: 'left',
+    },
+  ],
+  initialSort: {
+    fieldName: 'label',
+    orderBy: 'AscNullsLast',
+  },
+});
+
+const GET_SETTINGS_OBJECT_DETAIL_TABLE_METADATA_CUSTOM = (
+  t: (literals: TemplateStringsArray) => string,
+): TableMetadata<SettingsObjectDetailTableItem> => ({
+  tableId: 'settingsObjectDetail',
+  fields: [
+    {
+      fieldLabel: t`Name`,
       fieldName: 'label',
-      orderBy: 'AscNullsLast',
+      fieldType: 'string',
+      align: 'left',
+    },
+    {
+      fieldLabel: t`Identifier`,
+      fieldName: 'identifierType',
+      fieldType: 'string',
+      align: 'left',
+    },
+    {
+      fieldLabel: t`Data type`,
+      fieldName: 'dataType',
+      fieldType: 'string',
+      align: 'left',
     },
-  };
+  ],
+  initialSort: {
+    fieldName: 'label',
+    orderBy: 'AscNullsLast',
+  },
+});
 
 const StyledSearchInput = styled(TextInput)`
   padding-bottom: ${({ theme }) => theme.spacing(2)};
@@ -91,11 +94,12 @@ export const SettingsObjectFieldTable = ({
   objectMetadataItem,
   mode,
 }: SettingsObjectFieldTableProps) => {
+  const { t } = useLingui();
   const [searchTerm, setSearchTerm] = useState('');
 
   const tableMetadata = objectMetadataItem.isCustom
-    ? SETTINGS_OBJECT_DETAIL_TABLE_METADATA_CUSTOM
-    : SETTINGS_OBJECT_DETAIL_TABLE_METADATA_STANDARD;
+    ? GET_SETTINGS_OBJECT_DETAIL_TABLE_METADATA_CUSTOM(t)
+    : GET_SETTINGS_OBJECT_DETAIL_TABLE_METADATA_STANDARD(t);
 
   const { mapFieldMetadataItemToSettingsObjectDetailTableItem } =
     useMapFieldMetadataItemToSettingsObjectDetailTableItem(objectMetadataItem);
@@ -176,7 +180,7 @@ export const SettingsObjectFieldTable = ({
     <>
       <StyledSearchInput
         LeftIcon={IconSearch}
-        placeholder="Search a field..."
+        placeholder={t`Search a field...`}
         value={searchTerm}
         onChange={setSearchTerm}
       />
@@ -194,7 +198,7 @@ export const SettingsObjectFieldTable = ({
           <TableHeader></TableHeader>
         </StyledObjectFieldTableRow>
         {isNonEmptyArray(filteredActiveItems) && (
-          <TableSection title="Active">
+          <TableSection title={t`Active`}>
             {filteredActiveItems.map((objectSettingsDetailItem) => (
               <SettingsObjectFieldItemTableRow
                 key={objectSettingsDetailItem.fieldMetadataItem.id}
@@ -208,7 +212,7 @@ export const SettingsObjectFieldTable = ({
         {isNonEmptyArray(filteredDisabledItems) && (
           <TableSection
             isInitiallyExpanded={mode === 'new-field' ? true : false}
-            title="Inactive"
+            title={t`Inactive`}
           >
             {filteredDisabledItems.map((objectSettingsDetailItem) => (
               <SettingsObjectFieldItemTableRow
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectIndexTable.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectIndexTable.tsx
index f0e449ddb0d1..12b7c4461abe 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectIndexTable.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectIndexTable.tsx
@@ -1,5 +1,4 @@
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-
 import { settingsObjectIndexesFamilyState } from '@/settings/data-model/object-details/states/settingsObjectIndexesFamilyState';
 import { TextInput } from '@/ui/input/components/TextInput';
 import { SortableTableHeader } from '@/ui/layout/table/components/SortableTableHeader';
@@ -10,6 +9,7 @@ import { TableRow } from '@/ui/layout/table/components/TableRow';
 import { useSortedArray } from '@/ui/layout/table/hooks/useSortedArray';
 import { TableMetadata } from '@/ui/layout/table/types/TableMetadata';
 import styled from '@emotion/styled';
+import { useLingui } from '@lingui/react/macro';
 import { isNonEmptyArray } from '@sniptt/guards';
 import { useEffect, useMemo, useState } from 'react';
 import { useRecoilState } from 'recoil';
@@ -20,12 +20,26 @@ export const StyledObjectIndexTableRow = styled(TableRow)`
   grid-template-columns: 350px 70px 80px;
 `;
 
-const SETTINGS_OBJECT_DETAIL_TABLE_METADATA_STANDARD: TableMetadata<SettingsObjectIndexesTableItem> =
-  {
+const StyledSearchInput = styled(TextInput)`
+  padding-bottom: ${({ theme }) => theme.spacing(2)};
+  width: 100%;
+`;
+
+export type SettingsObjectIndexTableProps = {
+  objectMetadataItem: ObjectMetadataItem;
+};
+
+export const SettingsObjectIndexTable = ({
+  objectMetadataItem,
+}: SettingsObjectIndexTableProps) => {
+  const { t } = useLingui();
+  const [searchTerm, setSearchTerm] = useState('');
+
+  const tableMetadata: TableMetadata<SettingsObjectIndexesTableItem> = {
     tableId: 'settingsObjectIndexs',
     fields: [
       {
-        fieldLabel: 'Fields',
+        fieldLabel: t`Fields`,
         fieldName: 'indexFields',
         fieldType: 'string',
         align: 'left',
@@ -38,7 +52,7 @@ const SETTINGS_OBJECT_DETAIL_TABLE_METADATA_STANDARD: TableMetadata<SettingsObje
         align: 'left',
       },
       {
-        fieldLabel: 'Type',
+        fieldLabel: t`Type`,
         fieldName: 'indexType',
         fieldType: 'string',
         align: 'right',
@@ -50,19 +64,6 @@ const SETTINGS_OBJECT_DETAIL_TABLE_METADATA_STANDARD: TableMetadata<SettingsObje
     },
   };
 
-const StyledSearchInput = styled(TextInput)`
-  padding-bottom: ${({ theme }) => theme.spacing(2)};
-  width: 100%;
-`;
-export type SettingsObjectIndexTableProps = {
-  objectMetadataItem: ObjectMetadataItem;
-};
-
-export const SettingsObjectIndexTable = ({
-  objectMetadataItem,
-}: SettingsObjectIndexTableProps) => {
-  const [searchTerm, setSearchTerm] = useState('');
-
   const [settingsObjectIndexes, setSettingsObjectIndexes] = useRecoilState(
     settingsObjectIndexesFamilyState({
       objectMetadataItemId: objectMetadataItem.id,
@@ -95,7 +96,7 @@ export const SettingsObjectIndexTable = ({
 
   const sortedActiveObjectSettingsDetailItems = useSortedArray(
     objectSettingsDetailItems,
-    SETTINGS_OBJECT_DETAIL_TABLE_METADATA_STANDARD,
+    tableMetadata,
   );
 
   const filteredActiveItems = useMemo(
@@ -112,22 +113,20 @@ export const SettingsObjectIndexTable = ({
     <>
       <StyledSearchInput
         LeftIcon={IconSearch}
-        placeholder="Search an index..."
+        placeholder={t`Search an index...`}
         value={searchTerm}
         onChange={setSearchTerm}
       />
       <Table>
         <StyledObjectIndexTableRow>
-          {SETTINGS_OBJECT_DETAIL_TABLE_METADATA_STANDARD.fields.map((item) => (
+          {tableMetadata.fields.map((item) => (
             <SortableTableHeader
               key={item.fieldName}
               fieldName={item.fieldName}
               label={item.fieldLabel}
               Icon={item.FieldIcon}
-              tableId={SETTINGS_OBJECT_DETAIL_TABLE_METADATA_STANDARD.tableId}
-              initialSort={
-                SETTINGS_OBJECT_DETAIL_TABLE_METADATA_STANDARD.initialSort
-              }
+              tableId={tableMetadata.tableId}
+              initialSort={tableMetadata.initialSort}
             />
           ))}
           <TableHeader></TableHeader>
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx
index 6a99e189c705..b64c49f1189d 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx
@@ -14,6 +14,7 @@ import { SettingsDataModelFieldSettingsFormCard } from '@/settings/data-model/fi
 import { settingsFieldFormSchema } from '@/settings/data-model/fields/forms/validation-schemas/settingsFieldFormSchema';
 import { SettingsFieldType } from '@/settings/data-model/types/SettingsFieldType';
 import { AppPath } from '@/types/AppPath';
+import { SettingsPath } from '@/types/SettingsPath';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
@@ -21,16 +22,20 @@ import { View } from '@/views/types/View';
 import { ViewType } from '@/views/types/ViewType';
 import { useApolloClient } from '@apollo/client';
 import { zodResolver } from '@hookform/resolvers/zod';
+import { useLingui } from '@lingui/react/macro';
 import pick from 'lodash.pick';
 import { useEffect, useState } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
-import { useNavigate, useParams, useSearchParams } from 'react-router-dom';
+import { useParams, useSearchParams } from 'react-router-dom';
 import { H2Title, Section } from 'twenty-ui';
 import { z } from 'zod';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 import { DEFAULT_ICONS_BY_FIELD_TYPE } from '~/pages/settings/data-model/constants/DefaultIconsByFieldType';
 import { computeMetadataNameFromLabel } from '~/pages/settings/data-model/utils/compute-metadata-name-from-label.utils';
 import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 type SettingsDataModelNewFieldFormValues = z.infer<
   ReturnType<typeof settingsFieldFormSchema>
@@ -40,12 +45,16 @@ type SettingsDataModelNewFieldFormValues = z.infer<
 const DEFAULT_ICON_FOR_NEW_FIELD = 'IconUsers';
 
 export const SettingsObjectNewFieldConfigure = () => {
-  const navigate = useNavigate();
+  const { t } = useLingui();
+
+  const navigateApp = useNavigateApp();
+  const navigate = useNavigateSettings();
+
   const { objectNamePlural = '' } = useParams();
   const [searchParams] = useSearchParams();
   const fieldType =
     (searchParams.get('fieldType') as SettingsFieldType) ||
-    FieldMetadataType.Text;
+    FieldMetadataType.TEXT;
   const { enqueueSnackBar } = useSnackBar();
 
   const { findActiveObjectMetadataItemByNamePlural } =
@@ -115,9 +124,9 @@ export const SettingsObjectNewFieldConfigure = () => {
 
   useEffect(() => {
     if (!activeObjectMetadataItem) {
-      navigate(AppPath.NotFound);
+      navigateApp(AppPath.NotFound);
     }
-  }, [activeObjectMetadataItem, navigate]);
+  }, [activeObjectMetadataItem, navigateApp]);
 
   if (!activeObjectMetadataItem) return null;
 
@@ -129,7 +138,7 @@ export const SettingsObjectNewFieldConfigure = () => {
   ) => {
     try {
       if (
-        formValues.type === FieldMetadataType.Relation &&
+        formValues.type === FieldMetadataType.RELATION &&
         'relation' in formValues
       ) {
         const { relation: relationFormValues, ...fieldFormValues } = formValues;
@@ -163,7 +172,9 @@ export const SettingsObjectNewFieldConfigure = () => {
         });
       }
 
-      navigate(`/settings/objects/${objectNamePlural}`);
+      navigate(SettingsPath.ObjectDetail, {
+        objectNamePlural,
+      });
 
       // TODO: fix optimistic update logic
       // Forcing a refetch for now but it's not ideal
@@ -184,13 +195,21 @@ export const SettingsObjectNewFieldConfigure = () => {
         {...formConfig}
       >
         <SubMenuTopBarContainer
-          title="2. Configure field"
+          title={t`2. Configure field`}
           links={[
-            { children: 'Workspace', href: '/settings/workspace' },
-            { children: 'Objects', href: '/settings/objects' },
+            {
+              children: t`Workspace`,
+              href: getSettingsPath(SettingsPath.Workspace),
+            },
+            {
+              children: t`Objects`,
+              href: getSettingsPath(SettingsPath.Objects),
+            },
             {
               children: activeObjectMetadataItem.labelPlural,
-              href: `/settings/objects/${objectNamePlural}`,
+              href: getSettingsPath(SettingsPath.ObjectDetail, {
+                objectNamePlural,
+              }),
             },
 
             { children: <SettingsDataModelNewFieldBreadcrumbDropDown /> },
@@ -201,7 +220,13 @@ export const SettingsObjectNewFieldConfigure = () => {
               isCancelDisabled={isSubmitting}
               onCancel={() =>
                 navigate(
-                  `/settings/objects/${objectNamePlural}/new-field/select?fieldType=${fieldType}`,
+                  SettingsPath.ObjectNewFieldSelect,
+                  {
+                    objectNamePlural,
+                  },
+                  {
+                    fieldType,
+                  },
                 )
               }
               onSave={formConfig.handleSubmit(handleSave)}
@@ -211,18 +236,21 @@ export const SettingsObjectNewFieldConfigure = () => {
           <SettingsPageContainer>
             <Section>
               <H2Title
-                title="Icon and Name"
-                description="The name and icon of this field"
+                title={t`Icon and Name`}
+                description={t`The name and icon of this field`}
               />
               <SettingsDataModelFieldIconLabelForm
                 maxLength={FIELD_NAME_MAXIMUM_LENGTH}
                 canToggleSyncLabelWithName={
-                  fieldType !== FieldMetadataType.Relation
+                  fieldType !== FieldMetadataType.RELATION
                 }
               />
             </Section>
             <Section>
-              <H2Title title="Values" description="The values of this field" />
+              <H2Title
+                title={t`Values`}
+                description={t`The values of this field`}
+              />
               <SettingsDataModelFieldSettingsFormCard
                 fieldMetadataItem={{
                   icon: formConfig.watch('icon'),
@@ -235,8 +263,8 @@ export const SettingsObjectNewFieldConfigure = () => {
             </Section>
             <Section>
               <H2Title
-                title="Description"
-                description="The description of this field"
+                title={t`Description`}
+                description={t`The description of this field`}
               />
               <SettingsDataModelFieldDescriptionForm />
             </Section>
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldSelect.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldSelect.tsx
index 74db76b0f60a..141eaf412acf 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldSelect.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldSelect.tsx
@@ -6,14 +6,17 @@ import { SETTINGS_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/Set
 import { SettingsObjectNewFieldSelector } from '@/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector';
 import { SettingsFieldType } from '@/settings/data-model/types/SettingsFieldType';
 import { AppPath } from '@/types/AppPath';
+import { SettingsPath } from '@/types/SettingsPath';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 import { isDefined } from 'twenty-ui';
 import { z } from 'zod';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const settingsDataModelFieldTypeFormSchema = z.object({
   type: z.enum(
@@ -29,7 +32,7 @@ export type SettingsDataModelFieldTypeFormValues = z.infer<
 >;
 
 export const SettingsObjectNewFieldSelect = () => {
-  const navigate = useNavigate();
+  const navigate = useNavigateApp();
   const { objectNamePlural = '' } = useParams();
   const { findActiveObjectMetadataItemByNamePlural } =
     useFilteredObjectMetadataItems();
@@ -38,14 +41,14 @@ export const SettingsObjectNewFieldSelect = () => {
   const formMethods = useForm({
     resolver: zodResolver(settingsDataModelFieldTypeFormSchema),
     defaultValues: {
-      type: FieldMetadataType.Text,
+      type: FieldMetadataType.TEXT,
     },
   });
   const excludedFieldTypes: SettingsFieldType[] = (
     [
-      FieldMetadataType.Numeric,
-      FieldMetadataType.RichText,
-      FieldMetadataType.Actor,
+      FieldMetadataType.NUMERIC,
+      FieldMetadataType.RICH_TEXT,
+      FieldMetadataType.ACTOR,
     ] as const
   ).filter(isDefined);
 
@@ -69,7 +72,9 @@ export const SettingsObjectNewFieldSelect = () => {
             { children: 'Objects', href: '/settings/objects' },
             {
               children: activeObjectMetadataItem.labelPlural,
-              href: `/settings/objects/${objectNamePlural}`,
+              href: getSettingsPath(SettingsPath.ObjectDetail, {
+                objectNamePlural,
+              }),
             },
             { children: <SettingsDataModelNewFieldBreadcrumbDropDown /> },
           ]}
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectOverview.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectOverview.tsx
index b20227bb6396..dd1df96b603b 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectOverview.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectOverview.tsx
@@ -1,9 +1,9 @@
 import { ReactFlowProvider } from '@xyflow/react';
 
 import { SettingsDataModelOverview } from '@/settings/data-model/graph-overview/components/SettingsDataModelOverview';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const SettingsObjectOverview = () => {
   return (
@@ -11,7 +11,7 @@ export const SettingsObjectOverview = () => {
       links={[
         {
           children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
+          href: getSettingsPath(SettingsPath.Workspace),
         },
         { children: 'Objects', href: '/settings/objects' },
         {
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx
index d3ae24525a2e..b27fce3ff73e 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx
@@ -10,7 +10,6 @@ import {
 import { SettingsObjectCoverImage } from '@/settings/data-model/objects/components/SettingsObjectCoverImage';
 import { SettingsObjectInactiveMenuDropDown } from '@/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown';
 import { getObjectTypeLabel } from '@/settings/data-model/utils/getObjectTypeLabel';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { TextInput } from '@/ui/input/components/TextInput';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
@@ -21,6 +20,7 @@ import { TableSection } from '@/ui/layout/table/components/TableSection';
 import { useSortedArray } from '@/ui/layout/table/hooks/useSortedArray';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
+import { Trans, useLingui } from '@lingui/react/macro';
 import { isNonEmptyArray } from '@sniptt/guards';
 import { useMemo, useState } from 'react';
 import {
@@ -32,17 +32,21 @@ import {
   Section,
   UndecoratedLink,
 } from 'twenty-ui';
-import { SETTINGS_OBJECT_TABLE_METADATA } from '~/pages/settings/data-model/constants/SettingsObjectTableMetadata';
+import { GET_SETTINGS_OBJECT_TABLE_METADATA } from '~/pages/settings/data-model/constants/SettingsObjectTableMetadata';
 import { SettingsObjectTableItem } from '~/pages/settings/data-model/types/SettingsObjectTableItem';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 const StyledIconChevronRight = styled(IconChevronRight)`
   color: ${({ theme }) => theme.font.color.tertiary};
 `;
+
 const StyledSearchInput = styled(TextInput)`
   padding-bottom: ${({ theme }) => theme.spacing(2)};
   width: 100%;
 `;
+
 export const SettingsObjects = () => {
+  const { t } = useLingui();
   const theme = useTheme();
   const [searchTerm, setSearchTerm] = useState('');
   const { deleteOneObjectMetadataItem } = useDeleteOneObjectMetadataItem();
@@ -100,15 +104,21 @@ export const SettingsObjects = () => {
     [inactiveObjectMetadataItems, totalCountByObjectMetadataItemNamePlural],
   );
 
+  const tableMetadata = useMemo(
+    () => GET_SETTINGS_OBJECT_TABLE_METADATA(t),
+    [t],
+  );
+
   const sortedActiveObjectSettingsItems = useSortedArray(
     activeObjectSettingsArray,
-    SETTINGS_OBJECT_TABLE_METADATA,
+    tableMetadata,
   );
 
   const sortedInactiveObjectSettingsItems = useSortedArray(
     inactiveObjectSettingsArray,
-    SETTINGS_OBJECT_TABLE_METADATA,
+    tableMetadata,
   );
+
   const filteredActiveObjectSettingsItems = useMemo(
     () =>
       sortedActiveObjectSettingsItems.filter(
@@ -128,14 +138,15 @@ export const SettingsObjects = () => {
       ),
     [sortedInactiveObjectSettingsItems, searchTerm],
   );
+
   return (
     <SubMenuTopBarContainer
-      title="Data model"
+      title={t`Data model`}
       actionButton={
-        <UndecoratedLink to={getSettingsPagePath(SettingsPath.NewObject)}>
+        <UndecoratedLink to={getSettingsPath(SettingsPath.NewObject)}>
           <Button
             Icon={IconPlus}
-            title="Add object"
+            title={t`Add object`}
             accent="blue"
             size="small"
           />
@@ -143,45 +154,43 @@ export const SettingsObjects = () => {
       }
       links={[
         {
-          children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
-        },
-        {
-          children: 'Objects',
+          children: <Trans>Workspace</Trans>,
+          href: getSettingsPath(SettingsPath.Workspace),
         },
+        { children: <Trans>Objects</Trans> },
       ]}
     >
       <SettingsPageContainer>
         <>
           <SettingsObjectCoverImage />
           <Section>
-            <H2Title title="Existing objects" />
+            <H2Title title={t`Existing objects`} />
 
             <StyledSearchInput
               LeftIcon={IconSearch}
-              placeholder="Search an object..."
+              placeholder={t`Search for an object...`}
               value={searchTerm}
               onChange={setSearchTerm}
             />
 
             <Table>
               <StyledObjectTableRow>
-                {SETTINGS_OBJECT_TABLE_METADATA.fields.map(
+                {tableMetadata.fields.map(
                   (settingsObjectsTableMetadataField) => (
                     <SortableTableHeader
                       key={settingsObjectsTableMetadataField.fieldName}
                       fieldName={settingsObjectsTableMetadataField.fieldName}
                       label={settingsObjectsTableMetadataField.fieldLabel}
-                      tableId={SETTINGS_OBJECT_TABLE_METADATA.tableId}
+                      tableId={tableMetadata.tableId}
                       align={settingsObjectsTableMetadataField.align}
-                      initialSort={SETTINGS_OBJECT_TABLE_METADATA.initialSort}
+                      initialSort={tableMetadata.initialSort}
                     />
                   ),
                 )}
                 <TableHeader></TableHeader>
               </StyledObjectTableRow>
               {isNonEmptyArray(sortedActiveObjectSettingsItems) && (
-                <TableSection title="Active">
+                <TableSection title={t`Active`}>
                   {filteredActiveObjectSettingsItems.map(
                     (objectSettingsItem) => (
                       <SettingsObjectMetadataItemTableRow
@@ -196,16 +205,17 @@ export const SettingsObjects = () => {
                             stroke={theme.icon.stroke.sm}
                           />
                         }
-                        link={`/settings/objects/${
-                          objectSettingsItem.objectMetadataItem.namePlural
-                        }`}
+                        link={getSettingsPath(SettingsPath.ObjectDetail, {
+                          objectNamePlural:
+                            objectSettingsItem.objectMetadataItem.namePlural,
+                        })}
                       />
                     ),
                   )}
                 </TableSection>
               )}
               {isNonEmptyArray(inactiveObjectMetadataItems) && (
-                <TableSection title="Inactive">
+                <TableSection title={t`Inactive`}>
                   {filteredInactiveObjectSettingsItems.map(
                     (objectSettingsItem) => (
                       <SettingsObjectMetadataItemTableRow
diff --git a/packages/twenty-front/src/pages/settings/data-model/constants/DefaultIconsByFieldType.ts b/packages/twenty-front/src/pages/settings/data-model/constants/DefaultIconsByFieldType.ts
index 3b8f482b17fa..1e060907f095 100644
--- a/packages/twenty-front/src/pages/settings/data-model/constants/DefaultIconsByFieldType.ts
+++ b/packages/twenty-front/src/pages/settings/data-model/constants/DefaultIconsByFieldType.ts
@@ -1,27 +1,27 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 export const DEFAULT_ICONS_BY_FIELD_TYPE: Record<FieldMetadataType, string> = {
-  [FieldMetadataType.Address]: 'IconMap',
-  [FieldMetadataType.Boolean]: 'IconToggleLeft',
-  [FieldMetadataType.Currency]: 'IconMoneybag',
-  [FieldMetadataType.Date]: 'IconCalendarEvent',
-  [FieldMetadataType.DateTime]: 'IconCalendarClock',
-  [FieldMetadataType.FullName]: 'IconUserCircle',
-  [FieldMetadataType.MultiSelect]: 'IconTags',
-  [FieldMetadataType.Number]: 'IconNumber9',
-  [FieldMetadataType.Rating]: 'IconStar',
-  [FieldMetadataType.RawJson]: 'IconBraces',
-  [FieldMetadataType.Relation]: 'IconRelationOneToMany',
-  [FieldMetadataType.Select]: 'IconTag',
-  [FieldMetadataType.Text]: 'IconTypography',
-  [FieldMetadataType.Uuid]: 'IconId',
-  [FieldMetadataType.Array]: 'IconBracketsContain',
-  [FieldMetadataType.Emails]: 'IconMail',
-  [FieldMetadataType.Links]: 'IconWorld',
-  [FieldMetadataType.Phones]: 'IconPhone',
-  [FieldMetadataType.Actor]: 'IconUsers',
-  [FieldMetadataType.Numeric]: 'IconUsers',
-  [FieldMetadataType.Position]: 'IconUsers',
-  [FieldMetadataType.RichText]: 'IconUsers',
-  [FieldMetadataType.TsVector]: 'IconUsers',
+  [FieldMetadataType.ADDRESS]: 'IconMap',
+  [FieldMetadataType.BOOLEAN]: 'IconToggleLeft',
+  [FieldMetadataType.CURRENCY]: 'IconMoneybag',
+  [FieldMetadataType.DATE]: 'IconCalendarEvent',
+  [FieldMetadataType.DATE_TIME]: 'IconCalendarClock',
+  [FieldMetadataType.FULL_NAME]: 'IconUserCircle',
+  [FieldMetadataType.MULTI_SELECT]: 'IconTags',
+  [FieldMetadataType.NUMBER]: 'IconNumber9',
+  [FieldMetadataType.RATING]: 'IconStar',
+  [FieldMetadataType.RAW_JSON]: 'IconBraces',
+  [FieldMetadataType.RELATION]: 'IconRelationOneToMany',
+  [FieldMetadataType.SELECT]: 'IconTag',
+  [FieldMetadataType.TEXT]: 'IconTypography',
+  [FieldMetadataType.UUID]: 'IconId',
+  [FieldMetadataType.ARRAY]: 'IconBracketsContain',
+  [FieldMetadataType.EMAILS]: 'IconMail',
+  [FieldMetadataType.LINKS]: 'IconWorld',
+  [FieldMetadataType.PHONES]: 'IconPhone',
+  [FieldMetadataType.ACTOR]: 'IconUsers',
+  [FieldMetadataType.NUMERIC]: 'IconUsers',
+  [FieldMetadataType.POSITION]: 'IconUsers',
+  [FieldMetadataType.RICH_TEXT]: 'IconUsers',
+  [FieldMetadataType.TS_VECTOR]: 'IconUsers',
 };
diff --git a/packages/twenty-front/src/pages/settings/data-model/constants/SettingsObjectTableMetadata.ts b/packages/twenty-front/src/pages/settings/data-model/constants/SettingsObjectTableMetadata.ts
index 7ad50ba37834..1ca6aaa18c22 100644
--- a/packages/twenty-front/src/pages/settings/data-model/constants/SettingsObjectTableMetadata.ts
+++ b/packages/twenty-front/src/pages/settings/data-model/constants/SettingsObjectTableMetadata.ts
@@ -1,37 +1,43 @@
 import { TableMetadata } from '@/ui/layout/table/types/TableMetadata';
 import { SettingsObjectTableItem } from '~/pages/settings/data-model/types/SettingsObjectTableItem';
 
-export const SETTINGS_OBJECT_TABLE_METADATA: TableMetadata<SettingsObjectTableItem> =
-  {
-    tableId: 'settingsObject',
-    fields: [
-      {
-        fieldLabel: 'Name',
-        fieldName: 'labelPlural',
-        fieldType: 'string',
-        align: 'left',
-      },
-      {
-        fieldLabel: 'Type',
-        fieldName: 'objectTypeLabel',
-        fieldType: 'string',
-        align: 'left',
-      },
-      {
-        fieldLabel: 'Fields',
-        fieldName: 'fieldsCount',
-        fieldType: 'number',
-        align: 'right',
-      },
-      {
-        fieldLabel: 'Instances',
-        fieldName: 'totalObjectCount',
-        fieldType: 'number',
-        align: 'right',
-      },
-    ],
-    initialSort: {
+type GET_SETTINGS_OBJECT_TABLE_METADATAProps = {
+  (descriptor: { id: string }): string;
+  (literals: TemplateStringsArray, ...placeholders: any[]): string;
+};
+
+export const GET_SETTINGS_OBJECT_TABLE_METADATA = (
+  t: GET_SETTINGS_OBJECT_TABLE_METADATAProps,
+): TableMetadata<SettingsObjectTableItem> => ({
+  tableId: 'settingsObject',
+  fields: [
+    {
+      fieldLabel: t({ id: 'Name' }),
       fieldName: 'labelPlural',
-      orderBy: 'AscNullsLast',
+      fieldType: 'string',
+      align: 'left',
+    },
+    {
+      fieldLabel: t({ id: 'Type' }),
+      fieldName: 'objectTypeLabel',
+      fieldType: 'string',
+      align: 'left',
+    },
+    {
+      fieldLabel: t({ id: 'Fields' }),
+      fieldName: 'fieldsCount',
+      fieldType: 'number',
+      align: 'right',
+    },
+    {
+      fieldLabel: t({ id: 'Instances' }),
+      fieldName: 'totalObjectCount',
+      fieldType: 'number',
+      align: 'right',
     },
-  };
+  ],
+  initialSort: {
+    fieldName: 'labelPlural',
+    orderBy: 'AscNullsLast',
+  },
+});
diff --git a/packages/twenty-front/src/pages/settings/developers/SettingsDevelopers.tsx b/packages/twenty-front/src/pages/settings/developers/SettingsDevelopers.tsx
index 9bda68bc3513..78bcfa295c08 100644
--- a/packages/twenty-front/src/pages/settings/developers/SettingsDevelopers.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/SettingsDevelopers.tsx
@@ -2,12 +2,13 @@ import { SettingsPageContainer } from '@/settings/components/SettingsPageContain
 import { SettingsApiKeysTable } from '@/settings/developers/components/SettingsApiKeysTable';
 import { SettingsReadDocumentationButton } from '@/settings/developers/components/SettingsReadDocumentationButton';
 import { SettingsWebhooksTable } from '@/settings/developers/components/SettingsWebhooksTable';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 import styled from '@emotion/styled';
+import { Trans, useLingui } from '@lingui/react/macro';
 import { Button, H2Title, IconPlus, MOBILE_VIEWPORT, Section } from 'twenty-ui';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 const StyledButtonContainer = styled.div`
   display: flex;
@@ -27,49 +28,51 @@ const StyledContainer = styled.div<{ isMobile: boolean }>`
 
 export const SettingsDevelopers = () => {
   const isMobile = useIsMobile();
+  const { t } = useLingui();
+
   return (
     <SubMenuTopBarContainer
-      title="Developers"
+      title={t`Developers`}
       actionButton={<SettingsReadDocumentationButton />}
       links={[
         {
-          children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
+          children: <Trans>Workspace</Trans>,
+          href: getSettingsPath(SettingsPath.Workspace),
         },
-        { children: 'Developers' },
+        { children: <Trans>Developers</Trans> },
       ]}
     >
       <SettingsPageContainer>
         <StyledContainer isMobile={isMobile}>
           <Section>
             <H2Title
-              title="API keys"
-              description="Active APIs keys created by you or your team."
+              title={t`API keys`}
+              description={t`Active API keys created by you or your team.`}
             />
             <SettingsApiKeysTable />
             <StyledButtonContainer>
               <Button
                 Icon={IconPlus}
-                title="Create API key"
+                title={t`Create API key`}
                 size="small"
                 variant="secondary"
-                to={'/settings/developers/api-keys/new'}
+                to={getSettingsPath(SettingsPath.DevelopersNewApiKey)}
               />
             </StyledButtonContainer>
           </Section>
           <Section>
             <H2Title
-              title="Webhooks"
-              description="Establish Webhook endpoints for notifications on asynchronous events."
+              title={t`Webhooks`}
+              description={t`Establish Webhook endpoints for notifications on asynchronous events.`}
             />
             <SettingsWebhooksTable />
             <StyledButtonContainer>
               <Button
                 Icon={IconPlus}
-                title="Create Webhook"
+                title={t`Create Webhook`}
                 size="small"
                 variant="secondary"
-                to={'/settings/developers/webhooks/new'}
+                to={getSettingsPath(SettingsPath.DevelopersNewWebhook)}
               />
             </StyledButtonContainer>
           </Section>
diff --git a/packages/twenty-front/src/pages/settings/developers/__stories__/api-keys/SettingsDevelopersApiKeysNew.stories.tsx b/packages/twenty-front/src/pages/settings/developers/__stories__/api-keys/SettingsDevelopersApiKeysNew.stories.tsx
index 9b13c2679043..28bfd6dbba6d 100644
--- a/packages/twenty-front/src/pages/settings/developers/__stories__/api-keys/SettingsDevelopersApiKeysNew.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/__stories__/api-keys/SettingsDevelopersApiKeysNew.stories.tsx
@@ -1,3 +1,4 @@
+import { SettingsPath } from '@/types/SettingsPath';
 import { Meta, StoryObj } from '@storybook/react';
 import { userEvent, within } from '@storybook/test';
 
@@ -7,12 +8,13 @@ import {
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/Developers/ApiKeys/SettingsDevelopersApiKeysNew',
   component: SettingsDevelopersApiKeysNew,
   decorators: [PageDecorator],
-  args: { routePath: '/settings/developers/api-keys/new' },
+  args: { routePath: getSettingsPath(SettingsPath.DevelopersNewApiKey) },
   parameters: {
     msw: graphqlMocks,
   },
diff --git a/packages/twenty-front/src/pages/settings/developers/__stories__/webhooks/SettingsDevelopersWebhooksDetail.stories.tsx b/packages/twenty-front/src/pages/settings/developers/__stories__/webhooks/SettingsDevelopersWebhooksDetail.stories.tsx
index 77627403b5cb..4d36fc14d05e 100644
--- a/packages/twenty-front/src/pages/settings/developers/__stories__/webhooks/SettingsDevelopersWebhooksDetail.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/__stories__/webhooks/SettingsDevelopersWebhooksDetail.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
 import { within } from '@storybook/test';
-import { graphql, HttpResponse } from 'msw';
+import { HttpResponse, graphql } from 'msw';
 
 import { SettingsDevelopersWebhooksDetail } from '~/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail';
 import {
@@ -50,6 +50,8 @@ export const Default: Story = {
     const canvas = within(canvasElement);
     await canvas.findByText(
       'We will send POST requests to this endpoint for every new event',
+      undefined,
+      { timeout: 10000 },
     );
     await canvas.findByText('Delete this integration');
   },
diff --git a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
index e68dabb7bb38..f4b6c8e542ad 100644
--- a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
@@ -2,8 +2,8 @@ import styled from '@emotion/styled';
 import { isNonEmptyString } from '@sniptt/guards';
 import { DateTime } from 'luxon';
 import { useState } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
-import { useRecoilState } from 'recoil';
+import { useParams } from 'react-router-dom';
+import { useRecoilCallback, useRecoilValue } from 'recoil';
 import { Button, H2Title, IconRepeat, IconTrash, Section } from 'twenty-ui';
 
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
@@ -13,18 +13,20 @@ import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { ApiKeyInput } from '@/settings/developers/components/ApiKeyInput';
 import { ApiKeyNameInput } from '@/settings/developers/components/ApiKeyNameInput';
-import { apiKeyTokenState } from '@/settings/developers/states/generatedApiKeyTokenState';
+import { apiKeyTokenFamilyState } from '@/settings/developers/states/apiKeyTokenFamilyState';
 import { ApiKey } from '@/settings/developers/types/api-key/ApiKey';
 import { computeNewExpirationDate } from '@/settings/developers/utils/computeNewExpirationDate';
 import { formatExpiration } from '@/settings/developers/utils/formatExpiration';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { TextInput } from '@/ui/input/components/TextInput';
 import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
+import { Trans, useLingui } from '@lingui/react/macro';
 import { useGenerateApiKeyTokenMutation } from '~/generated/graphql';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 const StyledInfo = styled.span`
   color: ${({ theme }) => theme.font.color.light};
@@ -41,16 +43,26 @@ const StyledInputContainer = styled.div`
 `;
 
 export const SettingsDevelopersApiKeyDetail = () => {
+  const { t } = useLingui();
   const { enqueueSnackBar } = useSnackBar();
   const [isRegenerateKeyModalOpen, setIsRegenerateKeyModalOpen] =
     useState(false);
   const [isDeleteApiKeyModalOpen, setIsDeleteApiKeyModalOpen] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
 
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
   const { apiKeyId = '' } = useParams();
 
-  const [apiKeyToken, setApiKeyToken] = useRecoilState(apiKeyTokenState);
+  const apiKeyToken = useRecoilValue(apiKeyTokenFamilyState(apiKeyId));
+
+  const setApiKeyTokenCallback = useRecoilCallback(
+    ({ set }) =>
+      (apiKeyId: string, token: string) => {
+        set(apiKeyTokenFamilyState(apiKeyId), token);
+      },
+    [],
+  );
+
   const [generateOneApiKeyToken] = useGenerateApiKeyTokenMutation();
   const { createOneRecord: createOneApiKey } = useCreateOneRecord<ApiKey>({
     objectNameSingular: CoreObjectNameSingular.ApiKey,
@@ -68,7 +80,6 @@ export const SettingsDevelopersApiKeyDetail = () => {
       setApiKeyName(record.name);
     },
   });
-  const developerPath = getSettingsPagePath(SettingsPath.Developers);
 
   const deleteIntegration = async (redirect = true) => {
     setIsLoading(true);
@@ -79,10 +90,10 @@ export const SettingsDevelopersApiKeyDetail = () => {
         updateOneRecordInput: { revokedAt: DateTime.now().toString() },
       });
       if (redirect) {
-        navigate(developerPath);
+        navigate(SettingsPath.Developers);
       }
     } catch (err) {
-      enqueueSnackBar(`Error deleting api key: ${err}`, {
+      enqueueSnackBar(t`Error deleting api key: ${err}`, {
         variant: SnackBarVariant.Error,
       });
     } finally {
@@ -114,6 +125,7 @@ export const SettingsDevelopersApiKeyDetail = () => {
       token: tokenData.data?.generateApiKeyToken.token,
     };
   };
+
   const regenerateApiKey = async () => {
     setIsLoading(true);
     try {
@@ -126,12 +138,14 @@ export const SettingsDevelopersApiKeyDetail = () => {
         await deleteIntegration(false);
 
         if (isNonEmptyString(apiKey?.token)) {
-          setApiKeyToken(apiKey.token);
-          navigate(`/settings/developers/api-keys/${apiKey.id}`);
+          setApiKeyTokenCallback(apiKey.id, apiKey.token);
+          navigate(SettingsPath.DevelopersApiKeyDetail, {
+            apiKeyId: apiKey.id,
+          });
         }
       }
     } catch (err) {
-      enqueueSnackBar(`Error regenerating api key: ${err}`, {
+      enqueueSnackBar(t`Error regenerating api key: ${err}`, {
         variant: SnackBarVariant.Error,
       });
     } finally {
@@ -139,6 +153,8 @@ export const SettingsDevelopersApiKeyDetail = () => {
     }
   };
 
+  const confirmationValue = t`yes`;
+
   return (
     <>
       {apiKeyData?.name && (
@@ -146,11 +162,14 @@ export const SettingsDevelopersApiKeyDetail = () => {
           title={apiKeyData?.name}
           links={[
             {
-              children: 'Workspace',
-              href: getSettingsPagePath(SettingsPath.Workspace),
+              children: t`Workspace`,
+              href: getSettingsPath(SettingsPath.Workspace),
+            },
+            {
+              children: t`Developers`,
+              href: getSettingsPath(SettingsPath.Developers),
             },
-            { children: 'Developers', href: developerPath },
-            { children: `${apiKeyName} API Key` },
+            { children: t`${apiKeyName} API Key` },
           ]}
         >
           <SettingsPageContainer>
@@ -158,23 +177,20 @@ export const SettingsDevelopersApiKeyDetail = () => {
               {apiKeyToken ? (
                 <>
                   <H2Title
-                    title="API Key"
-                    description="Copy this key as it will only be visible this one time"
+                    title={t`API Key`}
+                    description={t`Copy this key as it will not be visible again`}
                   />
                   <ApiKeyInput apiKey={apiKeyToken} />
-                  <StyledInfo>
-                    {formatExpiration(apiKeyData?.expiresAt || '', true, false)}
-                  </StyledInfo>
                 </>
               ) : (
                 <>
                   <H2Title
-                    title="API Key"
-                    description="Regenerate an API key"
+                    title={t`API Key`}
+                    description={t`Regenerate an API key`}
                   />
                   <StyledInputContainer>
                     <Button
-                      title="Regenerate Key"
+                      title={t`Regenerate Key`}
                       Icon={IconRepeat}
                       onClick={() => setIsRegenerateKeyModalOpen(true)}
                     />
@@ -190,7 +206,7 @@ export const SettingsDevelopersApiKeyDetail = () => {
               )}
             </Section>
             <Section>
-              <H2Title title="Name" description="Name of your API key" />
+              <H2Title title={t`Name`} description={t`Name of your API key`} />
               <ApiKeyNameInput
                 apiKeyName={apiKeyName}
                 apiKeyId={apiKeyData?.id}
@@ -200,11 +216,11 @@ export const SettingsDevelopersApiKeyDetail = () => {
             </Section>
             <Section>
               <H2Title
-                title="Expiration"
-                description="When the key will be disabled"
+                title={t`Expiration`}
+                description={t`When the key will be disabled`}
               />
               <TextInput
-                placeholder="E.g. backoffice integration"
+                placeholder={t`E.g. backoffice integration`}
                 value={formatExpiration(
                   apiKeyData?.expiresAt || '',
                   true,
@@ -216,13 +232,13 @@ export const SettingsDevelopersApiKeyDetail = () => {
             </Section>
             <Section>
               <H2Title
-                title="Danger zone"
-                description="Delete this integration"
+                title={t`Danger zone`}
+                description={t`Delete this integration`}
               />
               <Button
                 accent="danger"
                 variant="secondary"
-                title="Delete"
+                title={t`Delete`}
                 Icon={IconTrash}
                 onClick={() => setIsDeleteApiKeyModalOpen(true)}
               />
@@ -231,36 +247,37 @@ export const SettingsDevelopersApiKeyDetail = () => {
         </SubMenuTopBarContainer>
       )}
       <ConfirmationModal
-        confirmationPlaceholder="yes"
-        confirmationValue="yes"
+        confirmationPlaceholder={confirmationValue}
+        confirmationValue={confirmationValue}
         isOpen={isDeleteApiKeyModalOpen}
         setIsOpen={setIsDeleteApiKeyModalOpen}
-        title="Delete API key"
+        title={t`Delete API key`}
         subtitle={
-          <>
-            Please type "yes" to confirm you want to delete this API Key. Be
-            aware that any script using this key will stop working.
-          </>
+          <Trans>
+            Please type {`"${confirmationValue}"`} to confirm you want to delete
+            this API Key. Be aware that any script using this key will stop
+            working.
+          </Trans>
         }
         onConfirmClick={deleteIntegration}
         deleteButtonText="Delete"
         loading={isLoading}
       />
       <ConfirmationModal
-        confirmationPlaceholder="yes"
-        confirmationValue="yes"
+        confirmationPlaceholder={confirmationValue}
+        confirmationValue={confirmationValue}
         isOpen={isRegenerateKeyModalOpen}
         setIsOpen={setIsRegenerateKeyModalOpen}
-        title="Regenerate an API key"
+        title={t`Regenerate an API key`}
         subtitle={
-          <>
+          <Trans>
             If you’ve lost this key, you can regenerate it, but be aware that
-            any script using this key will need to be updated. Please type "yes"
-            to confirm.
-          </>
+            any script using this key will need to be updated. Please type
+            {`"${confirmationValue}"`} to confirm.
+          </Trans>
         }
         onConfirmClick={regenerateApiKey}
-        deleteButtonText="Regenerate key"
+        deleteButtonText={t`Regenerate key`}
         loading={isLoading}
       />
     </>
diff --git a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx
index 3e2463da25db..b9de4a5ca301 100644
--- a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx
@@ -1,6 +1,5 @@
 import { DateTime } from 'luxon';
 import { useState } from 'react';
-import { useNavigate } from 'react-router-dom';
 import { H2Title, Section } from 'twenty-ui';
 
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
@@ -8,22 +7,24 @@ import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { EXPIRATION_DATES } from '@/settings/developers/constants/ExpirationDates';
-import { apiKeyTokenState } from '@/settings/developers/states/generatedApiKeyTokenState';
+import { apiKeyTokenFamilyState } from '@/settings/developers/states/apiKeyTokenFamilyState';
 import { ApiKey } from '@/settings/developers/types/api-key/ApiKey';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { Select } from '@/ui/input/components/Select';
 import { TextInput } from '@/ui/input/components/TextInput';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
-import { useSetRecoilState } from 'recoil';
+import { useLingui } from '@lingui/react/macro';
+import { useRecoilCallback } from 'recoil';
 import { Key } from 'ts-key-enum';
 import { useGenerateApiKeyTokenMutation } from '~/generated/graphql';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 import { isDefined } from '~/utils/isDefined';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const SettingsDevelopersApiKeysNew = () => {
+  const { t } = useLingui();
   const [generateOneApiKeyToken] = useGenerateApiKeyTokenMutation();
-  const navigate = useNavigate();
-  const setApiKeyToken = useSetRecoilState(apiKeyTokenState);
+  const navigateSettings = useNavigateSettings();
   const [formValues, setFormValues] = useState<{
     name: string;
     expirationDate: number | null;
@@ -36,6 +37,14 @@ export const SettingsDevelopersApiKeysNew = () => {
     objectNameSingular: CoreObjectNameSingular.ApiKey,
   });
 
+  const setApiKeyTokenCallback = useRecoilCallback(
+    ({ set }) =>
+      (apiKeyId: string, token: string) => {
+        set(apiKeyTokenFamilyState(apiKeyId), token);
+      },
+    [],
+  );
+
   const handleSave = async () => {
     const expiresAt = DateTime.now()
       .plus({ days: formValues.expirationDate ?? 30 })
@@ -56,31 +65,37 @@ export const SettingsDevelopersApiKeysNew = () => {
         expiresAt: expiresAt,
       },
     });
+
     if (isDefined(tokenData.data?.generateApiKeyToken)) {
-      setApiKeyToken(tokenData.data.generateApiKeyToken.token);
-      navigate(`/settings/developers/api-keys/${newApiKey.id}`);
+      setApiKeyTokenCallback(
+        newApiKey.id,
+        tokenData.data.generateApiKeyToken.token,
+      );
+      navigateSettings(SettingsPath.DevelopersApiKeyDetail, {
+        apiKeyId: newApiKey.id,
+      });
     }
   };
   const canSave = !!formValues.name && createOneApiKey;
   return (
     <SubMenuTopBarContainer
-      title="New key"
+      title={t`New key`}
       links={[
         {
-          children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
+          children: t`Workspace`,
+          href: getSettingsPath(SettingsPath.Workspace),
         },
         {
-          children: 'Developers',
-          href: getSettingsPagePath(SettingsPath.Developers),
+          children: t`Developers`,
+          href: getSettingsPath(SettingsPath.Developers),
         },
-        { children: 'New Key' },
+        { children: t`New Key` },
       ]}
       actionButton={
         <SaveAndCancelButtons
           isSaveDisabled={!canSave}
           onCancel={() => {
-            navigate('/settings/developers');
+            navigateSettings(SettingsPath.Developers);
           }}
           onSave={handleSave}
         />
@@ -88,9 +103,9 @@ export const SettingsDevelopersApiKeysNew = () => {
     >
       <SettingsPageContainer>
         <Section>
-          <H2Title title="Name" description="Name of your API key" />
+          <H2Title title={t`Name`} description={t`Name of your API key`} />
           <TextInput
-            placeholder="E.g. backoffice integration"
+            placeholder={t`E.g. backoffice integration`}
             value={formValues.name}
             onKeyDown={(e) => {
               if (e.key === Key.Enter) {
@@ -108,8 +123,8 @@ export const SettingsDevelopersApiKeysNew = () => {
         </Section>
         <Section>
           <H2Title
-            title="Expiration Date"
-            description="When the API key will expire."
+            title={t`Expiration Date`}
+            description={t`When the API key will expire.`}
           />
           <Select
             dropdownId="object-field-type-select"
diff --git a/packages/twenty-front/src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx b/packages/twenty-front/src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx
index 111a0bd439d6..cc5a4286b57a 100644
--- a/packages/twenty-front/src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail.tsx
@@ -1,7 +1,7 @@
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 import styled from '@emotion/styled';
 import { useMemo, useState } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 import {
   Button,
   H2Title,
@@ -28,7 +28,6 @@ import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { Webhook } from '@/settings/developers/types/webhook/Webhook';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { Select, SelectOption } from '@/ui/input/components/Select';
 import { TextArea } from '@/ui/input/components/TextArea';
@@ -36,10 +35,13 @@ import { TextInput } from '@/ui/input/components/TextInput';
 import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
 import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+import { Trans, useLingui } from '@lingui/react/macro';
 import { useRecoilValue } from 'recoil';
 import { FeatureFlagKey } from '~/generated/graphql';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 import { WEBHOOK_EMPTY_OPERATION } from '~/pages/settings/developers/webhooks/constants/WebhookEmptyOperation';
 import { WebhookOperationType } from '~/pages/settings/developers/webhooks/types/WebhookOperationsType';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 const OBJECT_DROPDOWN_WIDTH = 340;
 const ACTION_DROPDOWN_WIDTH = 140;
@@ -63,10 +65,12 @@ const StyledPlaceholder = styled.div`
 `;
 
 export const SettingsDevelopersWebhooksDetail = () => {
+  const { t } = useLingui();
+
   const { objectMetadataItems } = useObjectMetadataItems();
   const isAnalyticsEnabled = useRecoilValue(isAnalyticsEnabledState);
   const isMobile = useIsMobile();
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
   const { webhookId = '' } = useParams();
 
   const [isDeleteWebhookModalOpen, setIsDeleteWebhookModalOpen] =
@@ -108,11 +112,9 @@ export const SettingsDevelopersWebhooksDetail = () => {
     objectNameSingular: CoreObjectNameSingular.Webhook,
   });
 
-  const developerPath = getSettingsPagePath(SettingsPath.Developers);
-
   const deleteWebhook = () => {
     deleteOneWebhook(webhookId);
-    navigate(developerPath);
+    navigate(SettingsPath.Developers);
   };
 
   const isAnalyticsV2Enabled = useIsFeatureEnabled(
@@ -163,7 +165,7 @@ export const SettingsDevelopersWebhooksDetail = () => {
         secret: secret,
       },
     });
-    navigate(developerPath);
+    navigate(SettingsPath.Developers);
   };
 
   const addEmptyOperationIfNecessary = (
@@ -204,22 +206,27 @@ export const SettingsDevelopersWebhooksDetail = () => {
     return <></>;
   }
 
+  const confirmationText = t`yes`;
+
   return (
     <SubMenuTopBarContainer
       title={webhookData.targetUrl}
       links={[
         {
-          children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
+          children: t`Workspace`,
+          href: getSettingsPath(SettingsPath.Workspace),
+        },
+        {
+          children: t`Developers`,
+          href: getSettingsPath(SettingsPath.Developers),
         },
-        { children: 'Developers', href: developerPath },
-        { children: 'Webhook' },
+        { children: t`Webhook` },
       ]}
       actionButton={
         <SaveAndCancelButtons
           isSaveDisabled={!isDirty}
           onCancel={() => {
-            navigate(developerPath);
+            navigate(SettingsPath.Developers);
           }}
           onSave={handleSave}
         />
@@ -228,20 +235,23 @@ export const SettingsDevelopersWebhooksDetail = () => {
       <SettingsPageContainer>
         <Section>
           <H2Title
-            title="Endpoint URL"
-            description="We will send POST requests to this endpoint for every new event"
+            title={t`Endpoint URL`}
+            description={t`We will send POST requests to this endpoint for every new event`}
           />
           <TextInput
-            placeholder="URL"
+            placeholder={t`URL`}
             value={webhookData.targetUrl}
             disabled
             fullWidth
           />
         </Section>
         <Section>
-          <H2Title title="Description" description="An optional description" />
+          <H2Title
+            title={t`Description`}
+            description={t`An optional description`}
+          />
           <TextArea
-            placeholder="Write a description"
+            placeholder={t`Write a description`}
             minRows={4}
             value={description}
             onChange={(description) => {
@@ -252,8 +262,8 @@ export const SettingsDevelopersWebhooksDetail = () => {
         </Section>
         <Section>
           <H2Title
-            title="Filters"
-            description="Select the events you wish to send to this endpoint"
+            title={t`Filters`}
+            description={t`Select the events you wish to send to this endpoint`}
           />
           {operations.map((operation, index) => (
             <StyledFilterRow isMobile={isMobile} key={index}>
@@ -268,7 +278,7 @@ export const SettingsDevelopersWebhooksDetail = () => {
                 options={fieldTypeOptions}
                 emptyOption={{
                   value: null,
-                  label: 'Choose an object',
+                  label: t`Choose an object`,
                   Icon: IconBox,
                 }}
               />
@@ -327,25 +337,31 @@ export const SettingsDevelopersWebhooksDetail = () => {
           </AnalyticsGraphDataInstanceContext.Provider>
         )}
         <Section>
-          <H2Title title="Danger zone" description="Delete this integration" />
+          <H2Title
+            title={t`Danger zone`}
+            description={t`Delete this integration`}
+          />
           <Button
             accent="danger"
             variant="secondary"
-            title="Delete"
+            title={t`Delete`}
             Icon={IconTrash}
             onClick={() => setIsDeleteWebhookModalOpen(true)}
           />
           <ConfirmationModal
-            confirmationPlaceholder="yes"
-            confirmationValue="yes"
+            confirmationPlaceholder={confirmationText}
+            confirmationValue={confirmationText}
             isOpen={isDeleteWebhookModalOpen}
             setIsOpen={setIsDeleteWebhookModalOpen}
-            title="Delete webhook"
+            title={t`Delete webhook`}
             subtitle={
-              <>Please type "yes" to confirm you want to delete this webhook.</>
+              <Trans>
+                Please type {confirmationText} to confirm you want to delete
+                this webhook.
+              </Trans>
             }
             onConfirmClick={deleteWebhook}
-            deleteButtonText="Delete webhook"
+            deleteButtonText={t`Delete webhook`}
           />
         </Section>
       </SettingsPageContainer>
diff --git a/packages/twenty-front/src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx b/packages/twenty-front/src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx
index 2a75e05d7b79..8c70d3648e85 100644
--- a/packages/twenty-front/src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/webhooks/components/SettingsDevelopersWebhooksNew.tsx
@@ -1,5 +1,4 @@
 import { useState } from 'react';
-import { useNavigate } from 'react-router-dom';
 import { H2Title, isDefined, Section } from 'twenty-ui';
 
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
@@ -7,14 +6,18 @@ import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { Webhook } from '@/settings/developers/types/webhook/Webhook';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { TextInput } from '@/ui/input/components/TextInput';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
+import { useLingui } from '@lingui/react/macro';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 import { isValidUrl } from '~/utils/url/isValidUrl';
 
 export const SettingsDevelopersWebhooksNew = () => {
-  const navigate = useNavigate();
+  const { t } = useLingui();
+  const navigate = useNavigateSettings();
+
   const [formValues, setFormValues] = useState<{
     targetUrl: string;
     operations: string[];
@@ -40,7 +43,9 @@ export const SettingsDevelopersWebhooksNew = () => {
     if (!newWebhook) {
       return;
     }
-    navigate(`/settings/developers/webhooks/${newWebhook.id}`);
+    navigate(SettingsPath.DevelopersNewWebhookDetail, {
+      webhookId: newWebhook.id,
+    });
   };
 
   const canSave =
@@ -66,20 +71,20 @@ export const SettingsDevelopersWebhooksNew = () => {
       title="New Webhook"
       links={[
         {
-          children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
+          children: t`Workspace`,
+          href: getSettingsPath(SettingsPath.Workspace),
         },
         {
-          children: 'Developers',
-          href: getSettingsPagePath(SettingsPath.Developers),
+          children: t`Developers`,
+          href: getSettingsPath(SettingsPath.Developers),
         },
-        { children: 'New Webhook' },
+        { children: t`New Webhook` },
       ]}
       actionButton={
         <SaveAndCancelButtons
           isSaveDisabled={!canSave}
           onCancel={() => {
-            navigate(getSettingsPagePath(SettingsPath.Developers));
+            navigate(SettingsPath.Developers);
           }}
           onSave={handleSave}
         />
@@ -88,13 +93,13 @@ export const SettingsDevelopersWebhooksNew = () => {
       <SettingsPageContainer>
         <Section>
           <H2Title
-            title="Endpoint URL"
-            description="We will send POST requests to this endpoint for every new event"
+            title={t`Endpoint URL`}
+            description={t`We will send POST requests to this endpoint for every new event`}
           />
           <TextInput
-            placeholder="URL"
+            placeholder={t`URL`}
             value={formValues.targetUrl}
-            error={!isTargetUrlValid ? 'Please enter a valid URL' : undefined}
+            error={!isTargetUrlValid ? t`Please enter a valid URL` : undefined}
             onKeyDown={handleKeyDown}
             onChange={handleChange}
             fullWidth
diff --git a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabase.tsx b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabase.tsx
index 6baad9a974fd..338a33862599 100644
--- a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabase.tsx
+++ b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationDatabase.tsx
@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 import { H2Title, Section } from 'twenty-ui';
 
 import { useGetDatabaseConnections } from '@/databases/hooks/useGetDatabaseConnections';
@@ -8,14 +8,15 @@ import { SettingsIntegrationPreview } from '@/settings/integrations/components/S
 import { SettingsIntegrationDatabaseConnectionsListCard } from '@/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionsListCard';
 import { useIsSettingsIntegrationEnabled } from '@/settings/integrations/hooks/useIsSettingsIntegrationEnabled';
 import { useSettingsIntegrationCategories } from '@/settings/integrations/hooks/useSettingsIntegrationCategories';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { AppPath } from '@/types/AppPath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const SettingsIntegrationDatabase = () => {
   const { databaseKey = '' } = useParams();
-  const navigate = useNavigate();
+  const navigateApp = useNavigateApp();
 
   const [integrationCategoryAll] = useSettingsIntegrationCategories();
   const integration = integrationCategoryAll.integrations.find(
@@ -28,9 +29,9 @@ export const SettingsIntegrationDatabase = () => {
 
   useEffect(() => {
     if (!isIntegrationAvailable) {
-      navigate(AppPath.NotFound);
+      navigateApp(AppPath.NotFound);
     }
-  }, [integration, databaseKey, navigate, isIntegrationAvailable]);
+  }, [integration, databaseKey, navigateApp, isIntegrationAvailable]);
 
   const { connections } = useGetDatabaseConnections({
     databaseKey,
@@ -45,11 +46,11 @@ export const SettingsIntegrationDatabase = () => {
       links={[
         {
           children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
+          href: getSettingsPath(SettingsPath.Workspace),
         },
         {
           children: 'Integrations',
-          href: getSettingsPagePath(SettingsPath.Integrations),
+          href: getSettingsPath(SettingsPath.Integrations),
         },
         { children: integration.text },
       ]}
diff --git a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationEditDatabaseConnection.tsx b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationEditDatabaseConnection.tsx
index 10c57a8bcb4f..3045d339d0d3 100644
--- a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationEditDatabaseConnection.tsx
+++ b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationEditDatabaseConnection.tsx
@@ -1,8 +1,8 @@
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { SettingsIntegrationEditDatabaseConnectionContainer } from '@/settings/integrations/database-connection/components/SettingsIntegrationEditDatabaseConnectionContainer';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const SettingsIntegrationEditDatabaseConnection = () => {
   return (
@@ -11,11 +11,11 @@ export const SettingsIntegrationEditDatabaseConnection = () => {
       links={[
         {
           children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
+          href: getSettingsPath(SettingsPath.Workspace),
         },
         {
           children: 'Integrations',
-          href: getSettingsPagePath(SettingsPath.Integrations),
+          href: getSettingsPath(SettingsPath.Integrations),
         },
         { children: 'Edit connection' },
       ]}
diff --git a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationNewDatabaseConnection.tsx b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationNewDatabaseConnection.tsx
index 4352c234b082..b7af51b40f68 100644
--- a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationNewDatabaseConnection.tsx
+++ b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationNewDatabaseConnection.tsx
@@ -1,7 +1,7 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 import { z } from 'zod';
 
 import { useCreateOneDatabaseConnection } from '@/databases/hooks/useCreateOneDatabaseConnection';
@@ -15,7 +15,6 @@ import {
 } from '@/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionForm';
 import { useIsSettingsIntegrationEnabled } from '@/settings/integrations/hooks/useIsSettingsIntegrationEnabled';
 import { useSettingsIntegrationCategories } from '@/settings/integrations/hooks/useSettingsIntegrationCategories';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { AppPath } from '@/types/AppPath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
@@ -23,6 +22,9 @@ import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
 import { H2Title, Section } from 'twenty-ui';
 import { CreateRemoteServerInput } from '~/generated-metadata/graphql';
+import { useNavigateApp } from '~/hooks/useNavigateApp';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 const createRemoteServerInputPostgresSchema =
   settingsIntegrationPostgreSQLConnectionFormSchema.transform<CreateRemoteServerInput>(
@@ -67,7 +69,8 @@ type SettingsIntegrationNewConnectionFormValues =
 
 export const SettingsIntegrationNewDatabaseConnection = () => {
   const { databaseKey = '' } = useParams();
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
+  const navigateApp = useNavigateApp();
 
   const [integrationCategoryAll] = useSettingsIntegrationCategories();
   const integration = integrationCategoryAll.integrations.find(
@@ -83,9 +86,9 @@ export const SettingsIntegrationNewDatabaseConnection = () => {
 
   useEffect(() => {
     if (!isIntegrationAvailable) {
-      navigate(AppPath.NotFound);
+      navigateApp(AppPath.NotFound);
     }
-  }, [integration, databaseKey, navigate, isIntegrationAvailable]);
+  }, [integration, databaseKey, navigateApp, isIntegrationAvailable]);
 
   const newConnectionSchema =
     databaseKey === 'postgresql'
@@ -99,7 +102,7 @@ export const SettingsIntegrationNewDatabaseConnection = () => {
 
   if (!isIntegrationAvailable) return null;
 
-  const settingsIntegrationsPagePath = getSettingsPagePath(
+  const settingsIntegrationsPagePath = getSettingsPath(
     SettingsPath.Integrations,
   );
 
@@ -118,9 +121,14 @@ export const SettingsIntegrationNewDatabaseConnection = () => {
 
       const connectionId = createdConnection.data?.createOneRemoteServer.id;
 
-      navigate(
-        `${settingsIntegrationsPagePath}/${databaseKey}/${connectionId}`,
-      );
+      if (!connectionId) {
+        throw new Error('Failed to create connection');
+      }
+
+      navigate(SettingsPath.IntegrationDatabaseConnection, {
+        databaseKey,
+        connectionId,
+      });
     } catch (error) {
       enqueueSnackBar((error as Error).message, {
         variant: SnackBarVariant.Error,
@@ -134,7 +142,7 @@ export const SettingsIntegrationNewDatabaseConnection = () => {
       links={[
         {
           children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
+          href: getSettingsPath(SettingsPath.Workspace),
         },
         {
           children: 'Integrations',
@@ -150,7 +158,9 @@ export const SettingsIntegrationNewDatabaseConnection = () => {
         <SaveAndCancelButtons
           isSaveDisabled={!canSave}
           onCancel={() =>
-            navigate(`${settingsIntegrationsPagePath}/${databaseKey}`)
+            navigate(SettingsPath.IntegrationDatabase, {
+              databaseKey,
+            })
           }
           onSave={handleSave}
         />
diff --git a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationShowDatabaseConnection.tsx b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationShowDatabaseConnection.tsx
index 2d2000d536c3..4b3cdaa9af12 100644
--- a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationShowDatabaseConnection.tsx
+++ b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrationShowDatabaseConnection.tsx
@@ -1,8 +1,8 @@
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { SettingsIntegrationDatabaseConnectionShowContainer } from '@/settings/integrations/database-connection/components/SettingsIntegrationDatabaseConnectionShowContainer';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const SettingsIntegrationShowDatabaseConnection = () => {
   return (
@@ -11,11 +11,11 @@ export const SettingsIntegrationShowDatabaseConnection = () => {
       links={[
         {
           children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
+          href: getSettingsPath(SettingsPath.Workspace),
         },
         {
           children: 'Integrations',
-          href: getSettingsPagePath(SettingsPath.Integrations),
+          href: getSettingsPath(SettingsPath.Integrations),
         },
         { children: 'Database Connection' },
       ]}
diff --git a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrations.tsx b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrations.tsx
index de44d7346c59..ff77a4aaf6b3 100644
--- a/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrations.tsx
+++ b/packages/twenty-front/src/pages/settings/integrations/SettingsIntegrations.tsx
@@ -1,22 +1,24 @@
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { SettingsIntegrationGroup } from '@/settings/integrations/components/SettingsIntegrationGroup';
 import { useSettingsIntegrationCategories } from '@/settings/integrations/hooks/useSettingsIntegrationCategories';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
+import { Trans, useLingui } from '@lingui/react/macro';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const SettingsIntegrations = () => {
+  const { t } = useLingui();
   const integrationCategories = useSettingsIntegrationCategories();
 
   return (
     <SubMenuTopBarContainer
-      title="Integrations"
+      title={t`Integrations`}
       links={[
         {
-          children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
+          children: <Trans>Workspace</Trans>,
+          href: getSettingsPath(SettingsPath.Workspace),
         },
-        { children: 'Integrations' },
+        { children: <Trans>Integrations</Trans> },
       ]}
     >
       <SettingsPageContainer>
diff --git a/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationDatabase.stories.tsx b/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationDatabase.stories.tsx
index fc7cecd82dee..235f03355238 100644
--- a/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationDatabase.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationDatabase.stories.tsx
@@ -2,7 +2,6 @@ import { expect } from '@storybook/jest';
 import { Meta, StoryObj } from '@storybook/react';
 import { within } from '@storybook/test';
 
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SettingsIntegrationDatabase } from '~/pages/settings/integrations/SettingsIntegrationDatabase';
 import {
@@ -10,6 +9,7 @@ import {
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 import { sleep } from '~/utils/sleep';
 
 const meta: Meta<PageDecoratorArgs> = {
@@ -17,7 +17,7 @@ const meta: Meta<PageDecoratorArgs> = {
   component: SettingsIntegrationDatabase,
   decorators: [PageDecorator],
   args: {
-    routePath: getSettingsPagePath(SettingsPath.IntegrationDatabase),
+    routePath: getSettingsPath(SettingsPath.IntegrationDatabase),
     routeParams: { ':databaseKey': 'postgresql' },
   },
   parameters: {
diff --git a/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationShowDatabaseConnection.stories.tsx b/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationShowDatabaseConnection.stories.tsx
index bb365de805a2..57ab57c176d5 100644
--- a/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationShowDatabaseConnection.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrationShowDatabaseConnection.stories.tsx
@@ -1,7 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
 import { within } from '@storybook/test';
 
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SettingsIntegrationShowDatabaseConnection } from '~/pages/settings/integrations/SettingsIntegrationShowDatabaseConnection';
 import {
@@ -9,6 +8,7 @@ import {
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 import { sleep } from '~/utils/sleep';
 
 const meta: Meta<PageDecoratorArgs> = {
@@ -17,7 +17,7 @@ const meta: Meta<PageDecoratorArgs> = {
   component: SettingsIntegrationShowDatabaseConnection,
   decorators: [PageDecorator],
   args: {
-    routePath: getSettingsPagePath(SettingsPath.IntegrationDatabaseConnection),
+    routePath: getSettingsPath(SettingsPath.IntegrationDatabaseConnection),
     routeParams: {
       ':databaseKey': 'postgresql',
       ':connectionId': '67cbfd35-8dd4-4591-b9d4-c1906281a5da',
diff --git a/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrations.stories.tsx b/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrations.stories.tsx
index c01318c7bcd0..0221c0253832 100644
--- a/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrations.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/integrations/__stories__/SettingsIntegrations.stories.tsx
@@ -1,7 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react';
 import { within } from '@storybook/test';
 
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SettingsIntegrations } from '~/pages/settings/integrations/SettingsIntegrations';
 import {
@@ -9,13 +8,14 @@ import {
   PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 import { sleep } from '~/utils/sleep';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/Integrations/SettingsIntegrations',
   component: SettingsIntegrations,
   decorators: [PageDecorator],
-  args: { routePath: getSettingsPagePath(SettingsPath.Integrations) },
+  args: { routePath: getSettingsPath(SettingsPath.Integrations) },
   parameters: {
     msw: graphqlMocks,
   },
diff --git a/packages/twenty-front/src/pages/settings/lab/SettingsLab.tsx b/packages/twenty-front/src/pages/settings/lab/SettingsLab.tsx
new file mode 100644
index 000000000000..6257f21d6084
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/lab/SettingsLab.tsx
@@ -0,0 +1,24 @@
+import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
+import { SettingsLabContent } from '@/settings/lab/components/SettingsLabContent';
+import { SettingsPath } from '@/types/SettingsPath';
+import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
+
+export const SettingsLab = () => {
+  return (
+    <SubMenuTopBarContainer
+      title="Lab"
+      links={[
+        {
+          children: 'Other',
+          href: getSettingsPath(SettingsPath.Lab),
+        },
+        { children: 'Lab' },
+      ]}
+    >
+      <SettingsPageContainer>
+        <SettingsLabContent />
+      </SettingsPageContainer>
+    </SubMenuTopBarContainer>
+  );
+};
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettings.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettings.tsx
index c1c20f324995..221083ea0c2e 100644
--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettings.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettings.tsx
@@ -115,12 +115,12 @@ export const DateTimeSettings = () => {
       : dateTimeFormat.timeZone;
 
   const dateFormat =
-    currentWorkspaceMember.dateFormat === WorkspaceMemberDateFormatEnum.System
+    currentWorkspaceMember.dateFormat === WorkspaceMemberDateFormatEnum.SYSTEM
       ? DateFormat.SYSTEM
       : dateTimeFormat.dateFormat;
 
   const timeFormat =
-    currentWorkspaceMember.timeFormat === WorkspaceMemberTimeFormatEnum.System
+    currentWorkspaceMember.timeFormat === WorkspaceMemberTimeFormatEnum.SYSTEM
       ? TimeFormat.SYSTEM
       : dateTimeFormat.timeFormat;
 
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx
index 4d411876bdf7..d64808e9bb35 100644
--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsDateFormatSelect.tsx
@@ -4,6 +4,7 @@ import { DateFormat } from '@/localization/constants/DateFormat';
 import { detectDateFormat } from '@/localization/utils/detectDateFormat';
 import { detectTimeZone } from '@/localization/utils/detectTimeZone';
 import { Select } from '@/ui/input/components/Select';
+import { t } from '@lingui/core/macro';
 
 type DateTimeSettingsDateFormatSelectProps = {
   value: DateFormat;
@@ -22,6 +23,12 @@ export const DateTimeSettingsDateFormatSelect = ({
 
   const systemDateFormat = DateFormat[detectDateFormat()];
 
+  const systemDateFormatLabel = formatInTimeZone(
+    Date.now(),
+    usedTimeZone,
+    systemDateFormat,
+  );
+
   return (
     <Select
       dropdownId="datetime-settings-date-format"
@@ -32,11 +39,7 @@ export const DateTimeSettingsDateFormatSelect = ({
       value={value}
       options={[
         {
-          label: `System settings - ${formatInTimeZone(
-            Date.now(),
-            usedTimeZone,
-            systemDateFormat,
-          )}`,
+          label: t`System settings - ${systemDateFormatLabel}`,
           value: DateFormat.SYSTEM,
         },
         {
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx
index 84b161dc5b10..aa9d329bbc30 100644
--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsTimeFormatSelect.tsx
@@ -4,6 +4,7 @@ import { TimeFormat } from '@/localization/constants/TimeFormat';
 import { detectTimeFormat } from '@/localization/utils/detectTimeFormat';
 import { detectTimeZone } from '@/localization/utils/detectTimeZone';
 import { Select } from '@/ui/input/components/Select';
+import { useLingui } from '@lingui/react/macro';
 
 type DateTimeSettingsTimeFormatSelectProps = {
   value: TimeFormat;
@@ -16,43 +17,50 @@ export const DateTimeSettingsTimeFormatSelect = ({
   timeZone,
   value,
 }: DateTimeSettingsTimeFormatSelectProps) => {
+  const { t } = useLingui();
   const systemTimeZone = detectTimeZone();
 
   const usedTimeZone = timeZone === 'system' ? systemTimeZone : timeZone;
 
   const systemTimeFormat = TimeFormat[detectTimeFormat()];
 
+  const systemTimeFormatLabel = formatInTimeZone(
+    Date.now(),
+    usedTimeZone,
+    systemTimeFormat,
+  );
+
+  const hour24Label = formatInTimeZone(
+    Date.now(),
+    usedTimeZone,
+    TimeFormat.HOUR_24,
+  );
+
+  const hour12Label = formatInTimeZone(
+    Date.now(),
+    usedTimeZone,
+    TimeFormat.HOUR_12,
+  );
+
   return (
     <Select
       dropdownId="datetime-settings-time-format"
       dropdownWidth={218}
-      label="Time format"
+      label={t`Time format`}
       dropdownWidthAuto
       fullWidth
       value={value}
       options={[
         {
-          label: `System Settings - ${formatInTimeZone(
-            Date.now(),
-            usedTimeZone,
-            systemTimeFormat,
-          )}`,
+          label: t`System Settings - ${systemTimeFormatLabel}`,
           value: TimeFormat.SYSTEM,
         },
         {
-          label: `24h (${formatInTimeZone(
-            Date.now(),
-            usedTimeZone,
-            TimeFormat.HOUR_24,
-          )})`,
+          label: t`24h (${hour24Label})`,
           value: TimeFormat.HOUR_24,
         },
         {
-          label: `12h (${formatInTimeZone(
-            Date.now(),
-            usedTimeZone,
-            TimeFormat.HOUR_12,
-          )})`,
+          label: t`12h (${hour12Label})`,
           value: TimeFormat.HOUR_12,
         },
       ]}
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/LocalePicker.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/LocalePicker.tsx
new file mode 100644
index 000000000000..d5f62d6b8e51
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/LocalePicker.tsx
@@ -0,0 +1,114 @@
+import styled from '@emotion/styled';
+import { useRecoilState, useRecoilValue } from 'recoil';
+
+import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
+import { isDebugModeState } from '@/client-config/states/isDebugModeState';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
+import { Select } from '@/ui/input/components/Select';
+
+import { i18n } from '@lingui/core';
+import { useLingui } from '@lingui/react/macro';
+import { dynamicActivate } from '~/utils/i18n/dynamicActivate';
+import { isDefined } from '~/utils/isDefined';
+import { logError } from '~/utils/logError';
+
+const StyledContainer = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: ${({ theme }) => theme.spacing(4)};
+`;
+
+export const LocalePicker = () => {
+  const { t } = useLingui();
+  const [currentWorkspaceMember, setCurrentWorkspaceMember] = useRecoilState(
+    currentWorkspaceMemberState,
+  );
+  const isDebugMode = useRecoilValue(isDebugModeState);
+
+  const { updateOneRecord } = useUpdateOneRecord({
+    objectNameSingular: CoreObjectNameSingular.WorkspaceMember,
+  });
+
+  const updateWorkspaceMember = async (changedFields: any) => {
+    if (!currentWorkspaceMember?.id) {
+      throw new Error('User is not logged in');
+    }
+
+    try {
+      await updateOneRecord({
+        idToUpdate: currentWorkspaceMember.id,
+        updateOneRecordInput: changedFields,
+      });
+    } catch (error) {
+      logError(error);
+    }
+  };
+
+  if (!isDefined(currentWorkspaceMember)) return;
+
+  const handleLocaleChange = (value: string) => {
+    setCurrentWorkspaceMember({
+      ...currentWorkspaceMember,
+      ...{ locale: value },
+    });
+    updateWorkspaceMember({ locale: value });
+
+    dynamicActivate(value);
+  };
+
+  const localeOptions = [
+    {
+      label: t`Portuguese`,
+      value: 'pt',
+    },
+    {
+      label: t`French`,
+      value: 'fr',
+    },
+    {
+      label: t`German`,
+      value: 'de',
+    },
+    {
+      label: t`Italian`,
+      value: 'it',
+    },
+    {
+      label: t`Spanish`,
+      value: 'es',
+    },
+    {
+      label: t`English`,
+      value: 'en',
+    },
+    {
+      label: t`Chinese — Simplified`,
+      value: 'zh-Hans',
+    },
+    {
+      label: t`Chinese — Traditional`,
+      value: 'zh-Hant',
+    },
+  ];
+
+  if (isDebugMode) {
+    localeOptions.push({
+      label: t`Pseudo-English`,
+      value: 'pseudo-en',
+    });
+  }
+
+  return (
+    <StyledContainer>
+      <Select
+        dropdownId="preferred-locale"
+        dropdownWidthAuto
+        fullWidth
+        value={i18n.locale}
+        options={localeOptions}
+        onChange={(value) => handleLocaleChange(value)}
+      />
+    </StyledContainer>
+  );
+};
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearance.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearance.tsx
deleted file mode 100644
index 4a0219a5e66a..000000000000
--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearance.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { ColorSchemePicker, H2Title, Section } from 'twenty-ui';
-
-import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
-import { SettingsPath } from '@/types/SettingsPath';
-import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
-import { useColorScheme } from '@/ui/theme/hooks/useColorScheme';
-import { DateTimeSettings } from '~/pages/settings/profile/appearance/components/DateTimeSettings';
-
-export const SettingsAppearance = () => {
-  const { colorScheme, setColorScheme } = useColorScheme();
-
-  return (
-    <SubMenuTopBarContainer
-      title="Experience"
-      links={[
-        {
-          children: 'User',
-          href: getSettingsPagePath(SettingsPath.ProfilePage),
-        },
-        { children: 'Experience' },
-      ]}
-    >
-      <SettingsPageContainer>
-        <Section>
-          <H2Title title="Appearance" />
-          <ColorSchemePicker value={colorScheme} onChange={setColorScheme} />
-        </Section>
-        <Section>
-          <H2Title
-            title="Date and time"
-            description="Configure how dates are displayed across the app"
-          />
-          <DateTimeSettings />
-        </Section>
-      </SettingsPageContainer>
-    </SubMenuTopBarContainer>
-  );
-};
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsExperience.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsExperience.tsx
new file mode 100644
index 000000000000..c8c921cacad0
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsExperience.tsx
@@ -0,0 +1,60 @@
+import { ColorSchemePicker, H2Title, Section } from 'twenty-ui';
+
+import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
+import { SettingsPath } from '@/types/SettingsPath';
+import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
+import { useColorScheme } from '@/ui/theme/hooks/useColorScheme';
+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
+
+import { Trans, useLingui } from '@lingui/react/macro';
+import { FeatureFlagKey } from '~/generated/graphql';
+import { DateTimeSettings } from '~/pages/settings/profile/appearance/components/DateTimeSettings';
+import { LocalePicker } from '~/pages/settings/profile/appearance/components/LocalePicker';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
+
+export const SettingsExperience = () => {
+  const { colorScheme, setColorScheme } = useColorScheme();
+
+  const isLocalizationEnabled = useIsFeatureEnabled(
+    FeatureFlagKey.IsLocalizationEnabled,
+  );
+
+  const { t } = useLingui();
+
+  return (
+    <SubMenuTopBarContainer
+      title={t`Experience`}
+      links={[
+        {
+          children: <Trans>User</Trans>,
+          href: getSettingsPath(SettingsPath.ProfilePage),
+        },
+        { children: <Trans>Experience</Trans> },
+      ]}
+    >
+      <SettingsPageContainer>
+        <Section>
+          <H2Title title={t`Appearance`} />
+          <ColorSchemePicker value={colorScheme} onChange={setColorScheme} />
+        </Section>
+        <Section>
+          <H2Title
+            title={t`Date and time`}
+            description={t`Configure how dates are displayed across the app`}
+          />
+          <DateTimeSettings />
+        </Section>
+
+        {isLocalizationEnabled && (
+          <Section>
+            <H2Title
+              title={t`Language`}
+              description={t`Select your preferred language`}
+            />
+            <LocalePicker />
+          </Section>
+        )}
+      </SettingsPageContainer>
+    </SubMenuTopBarContainer>
+  );
+};
diff --git a/packages/twenty-front/src/pages/settings/security/SettingsSecurity.tsx b/packages/twenty-front/src/pages/settings/security/SettingsSecurity.tsx
index 6c18725b2c1e..3e361abac1bd 100644
--- a/packages/twenty-front/src/pages/settings/security/SettingsSecurity.tsx
+++ b/packages/twenty-front/src/pages/settings/security/SettingsSecurity.tsx
@@ -1,17 +1,14 @@
 import styled from '@emotion/styled';
+import { Trans, useLingui } from '@lingui/react/macro';
 import { H2Title, IconLock, Section, Tag } from 'twenty-ui';
 
-import { isSSOEnabledState } from '@/client-config/states/isSSOEnabledState';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { SettingsReadDocumentationButton } from '@/settings/developers/components/SettingsReadDocumentationButton';
 import { SettingsSSOIdentitiesProvidersListCard } from '@/settings/security/components/SettingsSSOIdentitiesProvidersListCard';
 import { SettingsSecurityOptionsList } from '@/settings/security/components/SettingsSecurityOptionsList';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
-import { useRecoilValue } from 'recoil';
-import { FeatureFlagKey } from '~/generated/graphql';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 const StyledContainer = styled.div`
   width: 100%;
@@ -29,46 +26,42 @@ const StyledSSOSection = styled(Section)`
 `;
 
 export const SettingsSecurity = () => {
-  const isSSOEnabled = useRecoilValue(isSSOEnabledState);
-  const isSSOSectionDisplay =
-    useIsFeatureEnabled(FeatureFlagKey.IsSsoEnabled) && isSSOEnabled;
+  const { t } = useLingui();
 
   return (
     <SubMenuTopBarContainer
-      title="Security"
+      title={t`Security`}
       actionButton={<SettingsReadDocumentationButton />}
       links={[
         {
-          children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
+          children: <Trans>Workspace</Trans>,
+          href: getSettingsPath(SettingsPath.Workspace),
         },
-        { children: 'Security' },
+        { children: <Trans>Security</Trans> },
       ]}
     >
       <SettingsPageContainer>
         <StyledMainContent>
-          {isSSOSectionDisplay && (
-            <StyledSSOSection>
-              <H2Title
-                title="SSO"
-                description="Configure an SSO connection"
-                adornment={
-                  <Tag
-                    text={'Enterprise'}
-                    color={'transparent'}
-                    Icon={IconLock}
-                    variant={'border'}
-                  />
-                }
-              />
-              <SettingsSSOIdentitiesProvidersListCard />
-            </StyledSSOSection>
-          )}
+          <StyledSSOSection>
+            <H2Title
+              title={t`SSO`}
+              description={t`Configure an SSO connection`}
+              adornment={
+                <Tag
+                  text={t`Enterprise`}
+                  color={'transparent'}
+                  Icon={IconLock}
+                  variant={'border'}
+                />
+              }
+            />
+            <SettingsSSOIdentitiesProvidersListCard />
+          </StyledSSOSection>
           <Section>
             <StyledContainer>
               <H2Title
-                title="Authentication"
-                description="Customize your workspace security"
+                title={t`Authentication`}
+                description={t`Customize your workspace security`}
               />
               <SettingsSecurityOptionsList />
             </StyledContainer>
diff --git a/packages/twenty-front/src/pages/settings/security/SettingsSecuritySSOIdentifyProvider.tsx b/packages/twenty-front/src/pages/settings/security/SettingsSecuritySSOIdentifyProvider.tsx
index bdff355eead1..d44b164a7c60 100644
--- a/packages/twenty-front/src/pages/settings/security/SettingsSecuritySSOIdentifyProvider.tsx
+++ b/packages/twenty-front/src/pages/settings/security/SettingsSecuritySSOIdentifyProvider.tsx
@@ -6,7 +6,6 @@ import { useCreateSSOIdentityProvider } from '@/settings/security/hooks/useCreat
 import { SettingSecurityNewSSOIdentityFormValues } from '@/settings/security/types/SSOIdentityProvider';
 import { sSOIdentityProviderDefaultValues } from '@/settings/security/utils/sSOIdentityProviderDefaultValues';
 import { SSOIdentitiesProvidersParamsSchema } from '@/settings/security/validation-schemas/SSOIdentityProviderSchema';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
@@ -14,10 +13,11 @@ import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBa
 import { zodResolver } from '@hookform/resolvers/zod';
 import pick from 'lodash.pick';
 import { FormProvider, useForm } from 'react-hook-form';
-import { useNavigate } from 'react-router-dom';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const SettingsSecuritySSOIdentifyProvider = () => {
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
 
   const { enqueueSnackBar } = useSnackBar();
   const { createSSOIdentityProvider } = useCreateSSOIdentityProvider();
@@ -44,7 +44,7 @@ export const SettingsSecuritySSOIdentifyProvider = () => {
         ),
       );
 
-      navigate(getSettingsPagePath(SettingsPath.Security));
+      navigate(SettingsPath.Security);
     } catch (error) {
       enqueueSnackBar((error as Error).message, {
         variant: SnackBarVariant.Error,
@@ -58,18 +58,18 @@ export const SettingsSecuritySSOIdentifyProvider = () => {
       actionButton={
         <SaveAndCancelButtons
           isSaveDisabled={!formConfig.formState.isValid}
-          onCancel={() => navigate(getSettingsPagePath(SettingsPath.Security))}
+          onCancel={() => navigate(SettingsPath.Security)}
           onSave={handleSave}
         />
       }
       links={[
         {
           children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
+          href: getSettingsPath(SettingsPath.Workspace),
         },
         {
           children: 'Security',
-          href: getSettingsPagePath(SettingsPath.Security),
+          href: getSettingsPath(SettingsPath.Security),
         },
         { children: 'New' },
       ]}
diff --git a/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctionDetail.tsx b/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctionDetail.tsx
index 09b9db7cc546..775034d111ef 100644
--- a/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctionDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctionDetail.tsx
@@ -9,7 +9,6 @@ import { useGetOneServerlessFunctionSourceCode } from '@/settings/serverless-fun
 import { usePublishOneServerlessFunction } from '@/settings/serverless-functions/hooks/usePublishOneServerlessFunction';
 import { useServerlessFunctionUpdateFormState } from '@/settings/serverless-functions/hooks/useServerlessFunctionUpdateFormState';
 import { useUpdateOneServerlessFunction } from '@/settings/serverless-functions/hooks/useUpdateOneServerlessFunction';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
@@ -25,6 +24,7 @@ import { useDebouncedCallback } from 'use-debounce';
 import { FeatureFlagKey } from '~/generated/graphql';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
 import { isDefined } from '~/utils/isDefined';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 const TAB_LIST_COMPONENT_ID = 'serverless-function-detail';
 
@@ -37,9 +37,10 @@ export const SettingsServerlessFunctionDetail = () => {
     useUpdateOneServerlessFunction(serverlessFunctionId);
   const { publishOneServerlessFunction } = usePublishOneServerlessFunction();
   const { formValues, setFormValues, loading } =
-    useServerlessFunctionUpdateFormState(serverlessFunctionId);
-  const { testServerlessFunction } =
-    useTestServerlessFunction(serverlessFunctionId);
+    useServerlessFunctionUpdateFormState({ serverlessFunctionId });
+  const { testServerlessFunction } = useTestServerlessFunction({
+    serverlessFunctionId,
+  });
   const { code: latestVersionCode } = useGetOneServerlessFunctionSourceCode({
     id: serverlessFunctionId,
     version: 'latest',
@@ -197,11 +198,11 @@ export const SettingsServerlessFunctionDetail = () => {
         links={[
           {
             children: 'Workspace',
-            href: getSettingsPagePath(SettingsPath.Workspace),
+            href: getSettingsPath(SettingsPath.Workspace),
           },
           {
             children: 'Functions',
-            href: getSettingsPagePath(SettingsPath.ServerlessFunctions),
+            href: getSettingsPath(SettingsPath.ServerlessFunctions),
           },
           { children: `${formValues.name}` },
         ]}
diff --git a/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctions.tsx b/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctions.tsx
index 4adf34df19ba..eec3abe214c6 100644
--- a/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctions.tsx
+++ b/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctions.tsx
@@ -1,8 +1,8 @@
 import { SettingsServerlessFunctionsTable } from '@/settings/serverless-functions/components/SettingsServerlessFunctionsTable';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
 import { Button, IconPlus, Section, UndecoratedLink } from 'twenty-ui';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const SettingsServerlessFunctions = () => {
   return (
@@ -10,7 +10,7 @@ export const SettingsServerlessFunctions = () => {
       title="Functions"
       actionButton={
         <UndecoratedLink
-          to={getSettingsPagePath(SettingsPath.NewServerlessFunction)}
+          to={getSettingsPath(SettingsPath.NewServerlessFunction)}
         >
           <Button
             Icon={IconPlus}
@@ -23,7 +23,7 @@ export const SettingsServerlessFunctions = () => {
       links={[
         {
           children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
+          href: getSettingsPath(SettingsPath.Workspace),
         },
         {
           children: 'Functions',
diff --git a/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctionsNew.tsx b/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctionsNew.tsx
index cb52a0c020df..a41f9ebe4272 100644
--- a/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctionsNew.tsx
+++ b/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctionsNew.tsx
@@ -1,22 +1,22 @@
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
-import { useNavigate } from 'react-router-dom';
 
 import { SettingsServerlessFunctionNewForm } from '@/settings/serverless-functions/components/SettingsServerlessFunctionNewForm';
 import { useCreateOneServerlessFunction } from '@/settings/serverless-functions/hooks/useCreateOneServerlessFunction';
 import { ServerlessFunctionNewFormValues } from '@/settings/serverless-functions/hooks/useServerlessFunctionUpdateFormState';
 import { SettingsServerlessFunctionHotkeyScope } from '@/settings/serverless-functions/types/SettingsServerlessFunctionHotKeyScope';
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { useState } from 'react';
 import { Key } from 'ts-key-enum';
 import { useHotkeyScopeOnMount } from '~/hooks/useHotkeyScopeOnMount';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 import { isDefined } from '~/utils/isDefined';
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
 export const SettingsServerlessFunctionsNew = () => {
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
   const [formValues, setFormValues] = useState<ServerlessFunctionNewFormValues>(
     {
       name: '',
@@ -34,11 +34,9 @@ export const SettingsServerlessFunctionsNew = () => {
     if (!isDefined(newServerlessFunction?.data)) {
       return;
     }
-    navigate(
-      getSettingsPagePath(SettingsPath.ServerlessFunctions, {
-        id: newServerlessFunction.data.createOneServerlessFunction.id,
-      }),
-    );
+    navigate(SettingsPath.ServerlessFunctions, {
+      id: newServerlessFunction.data.createOneServerlessFunction.id,
+    });
   };
 
   const onChange = (key: string) => {
@@ -69,7 +67,7 @@ export const SettingsServerlessFunctionsNew = () => {
   useScopedHotkeys(
     [Key.Escape],
     () => {
-      navigate(getSettingsPagePath(SettingsPath.ServerlessFunctions));
+      navigate(SettingsPath.ServerlessFunctions);
     },
     SettingsServerlessFunctionHotkeyScope.ServerlessFunctionNew,
   );
@@ -80,11 +78,11 @@ export const SettingsServerlessFunctionsNew = () => {
       links={[
         {
           children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
+          href: getSettingsPath(SettingsPath.Workspace),
         },
         {
           children: 'Functions',
-          href: getSettingsPagePath(SettingsPath.ServerlessFunctions),
+          href: getSettingsPath(SettingsPath.ServerlessFunctions),
         },
         { children: 'New' },
       ]}
@@ -92,7 +90,7 @@ export const SettingsServerlessFunctionsNew = () => {
         <SaveAndCancelButtons
           isSaveDisabled={!canSave}
           onCancel={() => {
-            navigate('/settings/functions');
+            navigate(SettingsPath.ServerlessFunctions);
           }}
           onSave={handleSave}
         />
diff --git a/packages/twenty-front/src/pages/settings/workspace/SettingsDomain.tsx b/packages/twenty-front/src/pages/settings/workspace/SettingsDomain.tsx
index 8573722ea777..b1083658044a 100644
--- a/packages/twenty-front/src/pages/settings/workspace/SettingsDomain.tsx
+++ b/packages/twenty-front/src/pages/settings/workspace/SettingsDomain.tsx
@@ -1,38 +1,29 @@
-import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
-import { SettingsPath } from '@/types/SettingsPath';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { H2Title, Section } from 'twenty-ui';
-import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
-import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
-import { TextInputV2 } from '@/ui/input/components/TextInputV2';
-import { Controller, useForm } from 'react-hook-form';
-import { z } from 'zod';
+import { ApolloError } from '@apollo/client';
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
-import { useRecoilState, useRecoilValue } from 'recoil';
-import styled from '@emotion/styled';
+import { useRedirectToWorkspaceDomain } from '@/domain-manager/hooks/useRedirectToWorkspaceDomain';
+import { domainConfigurationState } from '@/domain-manager/states/domainConfigurationState';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
+import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
+import { SettingsPath } from '@/types/SettingsPath';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
-import { useNavigate } from 'react-router-dom';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { TextInputV2 } from '@/ui/input/components/TextInputV2';
+import { SubMenuTopBarContainer } from '@/ui/layout/page/components/SubMenuTopBarContainer';
+import styled from '@emotion/styled';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { Trans, useLingui } from '@lingui/react/macro';
+import { Controller, useForm } from 'react-hook-form';
+import { useRecoilState, useRecoilValue } from 'recoil';
+import { H2Title, Section } from 'twenty-ui';
+import { z } from 'zod';
 import { useUpdateWorkspaceMutation } from '~/generated/graphql';
-import { domainConfigurationState } from '@/domain-manager/states/domainConfigurationState';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 import { isDefined } from '~/utils/isDefined';
-import { useRedirectToWorkspaceDomain } from '@/domain-manager/hooks/useRedirectToWorkspaceDomain';
-
-const validationSchema = z
-  .object({
-    subdomain: z
-      .string()
-      .min(3, { message: 'Subdomain can not be shorter than 3 characters' })
-      .max(30, { message: 'Subdomain can not be longer than 30 characters' })
-      .regex(/^[a-z0-9][a-z0-9-]{1,28}[a-z0-9]$/, {
-        message:
-          'Use letter, number and dash only. Start and finish with a letter or a number',
-      }),
-  })
-  .required();
+import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
-type Form = z.infer<typeof validationSchema>;
+type Form = {
+  subdomain: string;
+};
 
 const StyledDomainFromWrapper = styled.div`
   align-items: center;
@@ -48,7 +39,20 @@ const StyledDomain = styled.h2`
 `;
 
 export const SettingsDomain = () => {
-  const navigate = useNavigate();
+  const navigate = useNavigateSettings();
+  const { t } = useLingui();
+
+  const validationSchema = z
+    .object({
+      subdomain: z
+        .string()
+        .min(3, { message: t`Subdomain can not be shorter than 3 characters` })
+        .max(30, { message: t`Subdomain can not be longer than 30 characters` })
+        .regex(/^[a-z0-9][a-z0-9-]{1,28}[a-z0-9]$/, {
+          message: t`Use letter, number and dash only. Start and finish with a letter or a number`,
+        }),
+    })
+    .required();
 
   const domainConfiguration = useRecoilValue(domainConfigurationState);
 
@@ -77,66 +81,65 @@ export const SettingsDomain = () => {
   const subdomainValue = watch('subdomain');
 
   const handleSave = async () => {
-    try {
-      const values = getValues();
-
-      if (!values || !isValid || !currentWorkspace) {
-        throw new Error('Invalid form values');
-      }
+    const values = getValues();
 
-      await updateWorkspace({
-        variables: {
-          input: {
-            subdomain: values.subdomain,
-          },
-        },
-      });
-
-      setCurrentWorkspace({
-        ...currentWorkspace,
-        subdomain: values.subdomain,
+    if (!values || !isValid || !currentWorkspace) {
+      return enqueueSnackBar(t`Invalid form values`, {
+        variant: SnackBarVariant.Error,
       });
+    }
 
-      redirectToWorkspaceDomain(values.subdomain);
-    } catch (error) {
-      if (
-        error instanceof Error &&
-        (error.message === 'Subdomain already taken' ||
-          error.message.endsWith('not allowed'))
-      ) {
-        control.setError('subdomain', {
-          type: 'manual',
-          message: (error as Error).message,
+    await updateWorkspace({
+      variables: {
+        input: {
+          subdomain: values.subdomain,
+        },
+      },
+      onError: (error) => {
+        if (
+          error instanceof ApolloError &&
+          error.graphQLErrors[0]?.extensions?.code === 'CONFLICT'
+        ) {
+          return control.setError('subdomain', {
+            type: 'manual',
+            message: t`Subdomain already taken`,
+          });
+        }
+        enqueueSnackBar((error as Error).message, {
+          variant: SnackBarVariant.Error,
+        });
+      },
+      onCompleted: () => {
+        setCurrentWorkspace({
+          ...currentWorkspace,
+          subdomain: values.subdomain,
         });
-        return;
-      }
 
-      enqueueSnackBar((error as Error).message, {
-        variant: SnackBarVariant.Error,
-      });
-    }
+        redirectToWorkspaceDomain(values.subdomain);
+      },
+    });
   };
 
   return (
     <SubMenuTopBarContainer
-      title="General"
+      title={t`Domain`}
       links={[
         {
-          children: 'Workspace',
-          href: getSettingsPagePath(SettingsPath.Workspace),
+          children: <Trans>Workspace</Trans>,
+          href: getSettingsPath(SettingsPath.Workspace),
         },
         {
-          children: 'General',
-          href: getSettingsPagePath(SettingsPath.Workspace),
+          children: <Trans>General</Trans>,
+          href: getSettingsPath(SettingsPath.Workspace),
         },
-        { children: 'Domain' },
+        { children: <Trans>Domain</Trans> },
       ]}
       actionButton={
         <SaveAndCancelButtons
           isSaveDisabled={
             !isValid || subdomainValue === currentWorkspace?.subdomain
           }
-          onCancel={() => navigate(getSettingsPagePath(SettingsPath.Workspace))}
+          onCancel={() => navigate(SettingsPath.Workspace)}
           onSave={handleSave}
         />
       }
@@ -144,8 +147,8 @@ export const SettingsDomain = () => {
       <SettingsPageContainer>
         <Section>
           <H2Title
-            title="Domain"
-            description="Set the name of your subdomain"
+            title={t`Domain`}
+            description={t`Set the name of your subdomain`}
           />
           {currentWorkspace?.subdomain && (
             <StyledDomainFromWrapper>
diff --git a/packages/twenty-front/src/testing/components/StorybookFieldInputDropdownFocusIdSetterEffect.tsx b/packages/twenty-front/src/testing/components/StorybookFieldInputDropdownFocusIdSetterEffect.tsx
new file mode 100644
index 000000000000..380d99370bb6
--- /dev/null
+++ b/packages/twenty-front/src/testing/components/StorybookFieldInputDropdownFocusIdSetterEffect.tsx
@@ -0,0 +1,26 @@
+import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
+import { getDropdownFocusIdForRecordField } from '@/object-record/utils/getDropdownFocusIdForRecordField';
+import { useSetActiveDropdownFocusIdAndMemorizePrevious } from '@/ui/layout/dropdown/hooks/useSetFocusedDropdownIdAndMemorizePrevious';
+import { useContext, useEffect } from 'react';
+
+export const StorybookFieldInputDropdownFocusIdSetterEffect = () => {
+  const { recordId, fieldDefinition } = useContext(FieldContext);
+
+  const { setActiveDropdownFocusIdAndMemorizePrevious } =
+    useSetActiveDropdownFocusIdAndMemorizePrevious();
+
+  const fieldDropdownFocusIdTableCell = getDropdownFocusIdForRecordField(
+    recordId,
+    fieldDefinition.fieldMetadataId,
+    'table-cell',
+  );
+
+  useEffect(() => {
+    setActiveDropdownFocusIdAndMemorizePrevious(fieldDropdownFocusIdTableCell);
+  }, [
+    setActiveDropdownFocusIdAndMemorizePrevious,
+    fieldDropdownFocusIdTableCell,
+  ]);
+
+  return null;
+};
diff --git a/packages/twenty-front/src/testing/decorators/I18nFrontDecorator.tsx b/packages/twenty-front/src/testing/decorators/I18nFrontDecorator.tsx
new file mode 100644
index 000000000000..5d04d1a80982
--- /dev/null
+++ b/packages/twenty-front/src/testing/decorators/I18nFrontDecorator.tsx
@@ -0,0 +1,17 @@
+import { i18n } from '@lingui/core';
+import { I18nProvider } from '@lingui/react';
+import { Decorator } from '@storybook/react';
+import { messages as enMessages } from '../../locales/generated/en';
+
+i18n.load({
+  en: enMessages,
+});
+i18n.activate('en');
+
+export const I18nFrontDecorator: Decorator = (Story) => {
+  return (
+    <I18nProvider i18n={i18n}>
+      <Story />
+    </I18nProvider>
+  );
+};
diff --git a/packages/twenty-front/src/testing/decorators/PageDecorator.tsx b/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
index 1fcbce56fbc2..35fb494587e7 100644
--- a/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
@@ -22,9 +22,13 @@ import { mockedApolloClient } from '~/testing/mockedApolloClient';
 
 import { RecoilDebugObserverEffect } from '@/debug/components/RecoilDebugObserver';
 import { ObjectMetadataItemsProvider } from '@/object-metadata/components/ObjectMetadataItemsProvider';
+import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';
 import { PrefetchDataProvider } from '@/prefetch/components/PrefetchDataProvider';
 import { WorkspaceProviderEffect } from '@/workspace/components/WorkspaceProviderEffect';
+import { i18n } from '@lingui/core';
+import { I18nProvider } from '@lingui/react';
 import { IconsProvider } from 'twenty-ui';
+import { dynamicActivate } from '~/utils/i18n/dynamicActivate';
 import { FullHeightStorybookLayout } from '../FullHeightStorybookLayout';
 
 export type PageDecoratorArgs = {
@@ -63,35 +67,45 @@ const ApolloStorybookDevLogEffect = () => {
   return <></>;
 };
 
+dynamicActivate('en');
+
 const Providers = () => {
   return (
     <RecoilRoot>
       <SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
         <RecoilDebugObserverEffect />
         <ApolloProvider client={mockedApolloClient}>
-          <ApolloStorybookDevLogEffect />
-          <ClientConfigProviderEffect />
-          <ClientConfigProvider>
-            <UserProviderEffect />
-            <WorkspaceProviderEffect />
-            <UserProvider>
-              <ApolloMetadataClientMockedProvider>
-                <ObjectMetadataItemsProvider>
-                  <FullHeightStorybookLayout>
-                    <HelmetProvider>
-                      <SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
-                        <IconsProvider>
-                          <PrefetchDataProvider>
-                            <Outlet />
-                          </PrefetchDataProvider>
-                        </IconsProvider>
-                      </SnackBarProviderScope>
-                    </HelmetProvider>
-                  </FullHeightStorybookLayout>
-                </ObjectMetadataItemsProvider>
-              </ApolloMetadataClientMockedProvider>
-            </UserProvider>
-          </ClientConfigProvider>
+          <I18nProvider i18n={i18n}>
+            <ApolloStorybookDevLogEffect />
+            <ClientConfigProviderEffect />
+            <ClientConfigProvider>
+              <UserProviderEffect />
+              <WorkspaceProviderEffect />
+              <UserProvider>
+                <ApolloMetadataClientMockedProvider>
+                  <ObjectMetadataItemsProvider>
+                    <FullHeightStorybookLayout>
+                      <HelmetProvider>
+                        <SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
+                          <IconsProvider>
+                            <PrefetchDataProvider>
+                              <RecordFiltersComponentInstanceContext.Provider
+                                value={{
+                                  instanceId: 'storybook-test-record-filters',
+                                }}
+                              >
+                                <Outlet />
+                              </RecordFiltersComponentInstanceContext.Provider>
+                            </PrefetchDataProvider>
+                          </IconsProvider>
+                        </SnackBarProviderScope>
+                      </HelmetProvider>
+                    </FullHeightStorybookLayout>
+                  </ObjectMetadataItemsProvider>
+                </ApolloMetadataClientMockedProvider>
+              </UserProvider>
+            </ClientConfigProvider>
+          </I18nProvider>
         </ApolloProvider>
       </SnackBarProviderScope>
     </RecoilRoot>
diff --git a/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsx b/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsx
index d7e05bd05afd..c634c91ecbbf 100644
--- a/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsx
@@ -2,6 +2,7 @@ import { Decorator } from '@storybook/react';
 import { useRecoilValue } from 'recoil';
 
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
+import { RecordIndexContextProvider } from '@/object-record/record-index/contexts/RecordIndexContext';
 import { RecordTableBodyContextProvider } from '@/object-record/record-table/contexts/RecordTableBodyContext';
 import { RecordTableContextProvider } from '@/object-record/record-table/contexts/RecordTableContext';
 import { isDefined } from 'twenty-ui';
@@ -18,28 +19,39 @@ export const RecordTableDecorator: Decorator = (Story) => {
   }
 
   return (
-    <RecordTableContextProvider
+    <RecordIndexContextProvider
       value={{
+        indexIdentifierUrl: () => '',
+        onIndexRecordsLoaded: () => {},
+        objectNamePlural: personObjectMetadataItem.namePlural,
         objectNameSingular: personObjectMetadataItem.nameSingular,
         objectMetadataItem: personObjectMetadataItem,
-        recordTableId: 'persons',
-        viewBarId: 'view-bar',
-        visibleTableColumns: [],
+        recordIndexId: 'record-index',
       }}
     >
-      <RecordTableBodyContextProvider
+      <RecordTableContextProvider
         value={{
-          onCellMouseEnter: () => {},
-          onCloseTableCell: () => {},
-          onOpenTableCell: () => {},
-          onActionMenuDropdownOpened: () => {},
-          onMoveFocus: () => {},
-          onMoveSoftFocusToCell: () => {},
-          onUpsertRecord: () => {},
+          objectNameSingular: personObjectMetadataItem.nameSingular,
+          objectMetadataItem: personObjectMetadataItem,
+          recordTableId: 'persons',
+          viewBarId: 'view-bar',
+          visibleTableColumns: [],
         }}
       >
-        <Story />
-      </RecordTableBodyContextProvider>
-    </RecordTableContextProvider>
+        <RecordTableBodyContextProvider
+          value={{
+            onCellMouseEnter: () => {},
+            onCloseTableCell: () => {},
+            onOpenTableCell: () => {},
+            onActionMenuDropdownOpened: () => {},
+            onMoveFocus: () => {},
+            onMoveSoftFocusToCell: () => {},
+            onUpsertRecord: () => {},
+          }}
+        >
+          <Story />
+        </RecordTableBodyContextProvider>
+      </RecordTableContextProvider>
+    </RecordIndexContextProvider>
   );
 };
diff --git a/packages/twenty-front/src/testing/jest/getJestMetadataAndApolloMocksAndContextStoreWrapper.tsx b/packages/twenty-front/src/testing/jest/getJestMetadataAndApolloMocksAndContextStoreWrapper.tsx
index 1946010092bd..894cd7795e59 100644
--- a/packages/twenty-front/src/testing/jest/getJestMetadataAndApolloMocksAndContextStoreWrapper.tsx
+++ b/packages/twenty-front/src/testing/jest/getJestMetadataAndApolloMocksAndContextStoreWrapper.tsx
@@ -1,6 +1,7 @@
 import { ActionMenuComponentInstanceContext } from '@/action-menu/states/contexts/ActionMenuComponentInstanceContext';
 import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
 import { ContextStoreTargetedRecordsRule } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
+import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';
 import { MockedResponse } from '@apollo/client/testing';
 import { ReactNode } from 'react';
 import { MutableSnapshot } from 'recoil';
@@ -33,29 +34,33 @@ export const getJestMetadataAndApolloMocksAndActionMenuWrapper = ({
 
   return ({ children }: { children: ReactNode }) => (
     <Wrapper>
-      <ContextStoreComponentInstanceContext.Provider
+      <RecordFiltersComponentInstanceContext.Provider
         value={{
           instanceId: componentInstanceId,
         }}
       >
-        <ActionMenuComponentInstanceContext.Provider
-          value={{
-            instanceId: componentInstanceId,
-          }}
+        <ContextStoreComponentInstanceContext.Provider
+          value={{ instanceId: componentInstanceId }}
         >
-          <JestContextStoreSetter
-            contextStoreTargetedRecordsRule={contextStoreTargetedRecordsRule}
-            contextStoreNumberOfSelectedRecords={
-              contextStoreNumberOfSelectedRecords
-            }
-            contextStoreCurrentObjectMetadataNameSingular={
-              contextStoreCurrentObjectMetadataNameSingular
-            }
+          <ActionMenuComponentInstanceContext.Provider
+            value={{
+              instanceId: componentInstanceId,
+            }}
           >
-            {children}
-          </JestContextStoreSetter>
-        </ActionMenuComponentInstanceContext.Provider>
-      </ContextStoreComponentInstanceContext.Provider>
+            <JestContextStoreSetter
+              contextStoreTargetedRecordsRule={contextStoreTargetedRecordsRule}
+              contextStoreNumberOfSelectedRecords={
+                contextStoreNumberOfSelectedRecords
+              }
+              contextStoreCurrentObjectMetadataNameSingular={
+                contextStoreCurrentObjectMetadataNameSingular
+              }
+            >
+              {children}
+            </JestContextStoreSetter>
+          </ActionMenuComponentInstanceContext.Provider>
+        </ContextStoreComponentInstanceContext.Provider>
+      </RecordFiltersComponentInstanceContext.Provider>
     </Wrapper>
   );
 };
diff --git a/packages/twenty-front/src/testing/jest/getJestMetadataAndApolloMocksWrapper.tsx b/packages/twenty-front/src/testing/jest/getJestMetadataAndApolloMocksWrapper.tsx
index ea0e6528f0bc..7665d4d056a9 100644
--- a/packages/twenty-front/src/testing/jest/getJestMetadataAndApolloMocksWrapper.tsx
+++ b/packages/twenty-front/src/testing/jest/getJestMetadataAndApolloMocksWrapper.tsx
@@ -2,14 +2,16 @@ import { MockedProvider, MockedResponse } from '@apollo/client/testing';
 import { ReactNode } from 'react';
 import { MutableSnapshot, RecoilRoot } from 'recoil';
 
+import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';
 import { SnackBarProviderScope } from '@/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope';
+import { ViewComponentInstanceContext } from '@/views/states/contexts/ViewComponentInstanceContext';
 import { JestObjectMetadataItemSetter } from '~/testing/jest/JestObjectMetadataItemSetter';
 
 export const getJestMetadataAndApolloMocksWrapper = ({
   apolloMocks,
   onInitializeRecoilSnapshot,
 }: {
-  apolloMocks:
+  apolloMocks?:
     | readonly MockedResponse<Record<string, any>, Record<string, any>>[]
     | undefined;
   onInitializeRecoilSnapshot?: (snapshot: MutableSnapshot) => void;
@@ -18,9 +20,17 @@ export const getJestMetadataAndApolloMocksWrapper = ({
     <RecoilRoot initializeState={onInitializeRecoilSnapshot}>
       <SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
         <MockedProvider mocks={apolloMocks} addTypename={false}>
-          <JestObjectMetadataItemSetter>
-            {children}
-          </JestObjectMetadataItemSetter>
+          <RecordFiltersComponentInstanceContext.Provider
+            value={{ instanceId: 'instanceId' }}
+          >
+            <ViewComponentInstanceContext.Provider
+              value={{ instanceId: 'instanceId' }}
+            >
+              <JestObjectMetadataItemSetter>
+                {children}
+              </JestObjectMetadataItemSetter>
+            </ViewComponentInstanceContext.Provider>
+          </RecordFiltersComponentInstanceContext.Provider>
         </MockedProvider>
       </SnackBarProviderScope>
     </RecoilRoot>
diff --git a/packages/twenty-front/src/testing/mock-data/calendar.ts b/packages/twenty-front/src/testing/mock-data/calendar.ts
index ae804cdc940b..ee8b8df395d7 100644
--- a/packages/twenty-front/src/testing/mock-data/calendar.ts
+++ b/packages/twenty-front/src/testing/mock-data/calendar.ts
@@ -10,7 +10,7 @@ export const mockedCalendarEvents: CalendarEvent[] = [
     id: '9a6b35f1-6078-415b-9540-f62671bb81d0',
     isFullDay: false,
     startsAt: addDays(new Date().setHours(10, 0), 1).toISOString(),
-    visibility: CalendarChannelVisibility.Metadata,
+    visibility: CalendarChannelVisibility.METADATA,
     calendarEventParticipants: [
       {
         id: '1',
@@ -44,7 +44,7 @@ export const mockedCalendarEvents: CalendarEvent[] = [
     isFullDay: false,
     startsAt: new Date(new Date().setHours(18, 0)).toISOString(),
     title: 'Bug solving',
-    visibility: CalendarChannelVisibility.ShareEverything,
+    visibility: CalendarChannelVisibility.SHARE_EVERYTHING,
     __typename: 'CalendarEvent',
   },
   {
@@ -54,7 +54,7 @@ export const mockedCalendarEvents: CalendarEvent[] = [
     isFullDay: false,
     startsAt: new Date(new Date().setHours(15, 15)).toISOString(),
     title: 'Onboarding Follow-Up Call',
-    visibility: CalendarChannelVisibility.ShareEverything,
+    visibility: CalendarChannelVisibility.SHARE_EVERYTHING,
     __typename: 'CalendarEvent',
   },
   {
@@ -64,7 +64,7 @@ export const mockedCalendarEvents: CalendarEvent[] = [
     isFullDay: false,
     startsAt: new Date(new Date().setHours(10, 0)).toISOString(),
     title: 'Onboarding Call',
-    visibility: CalendarChannelVisibility.ShareEverything,
+    visibility: CalendarChannelVisibility.SHARE_EVERYTHING,
     __typename: 'CalendarEvent',
   },
   {
@@ -72,7 +72,7 @@ export const mockedCalendarEvents: CalendarEvent[] = [
     id: '5a792d11-259a-4099-af51-59eb85e15d83',
     isFullDay: true,
     startsAt: subMonths(new Date().setHours(8, 0), 1).toISOString(),
-    visibility: CalendarChannelVisibility.Metadata,
+    visibility: CalendarChannelVisibility.METADATA,
     __typename: 'CalendarEvent',
   },
   {
@@ -82,7 +82,7 @@ export const mockedCalendarEvents: CalendarEvent[] = [
     isFullDay: false,
     startsAt: subMonths(new Date().setHours(14, 0), 3).toISOString(),
     title: 'Alan x Garry',
-    visibility: CalendarChannelVisibility.ShareEverything,
+    visibility: CalendarChannelVisibility.SHARE_EVERYTHING,
     __typename: 'CalendarEvent',
   },
 ];
diff --git a/packages/twenty-front/src/testing/mock-data/config.ts b/packages/twenty-front/src/testing/mock-data/config.ts
index a80303d9a5e6..6c91c6caf803 100644
--- a/packages/twenty-front/src/testing/mock-data/config.ts
+++ b/packages/twenty-front/src/testing/mock-data/config.ts
@@ -3,7 +3,7 @@ import { CaptchaDriverType, ClientConfig } from '~/generated/graphql';
 export const mockedClientConfig: ClientConfig = {
   signInPrefilled: true,
   isMultiWorkspaceEnabled: false,
-  isSSOEnabled: false,
+  isEmailVerificationRequired: false,
   authProviders: {
     google: true,
     magicLink: false,
@@ -31,7 +31,18 @@ export const mockedClientConfig: ClientConfig = {
   billing: {
     isBillingEnabled: true,
     billingUrl: '',
-    billingFreeTrialDurationInDays: 10,
+    trialPeriods: [
+      {
+        __typename: 'BillingTrialPeriodDTO',
+        duration: 30,
+        isCreditCardRequired: true,
+      },
+      {
+        __typename: 'BillingTrialPeriodDTO',
+        duration: 7,
+        isCreditCardRequired: false,
+      },
+    ],
     __typename: 'Billing',
   },
   captcha: {
@@ -40,4 +51,6 @@ export const mockedClientConfig: ClientConfig = {
     __typename: 'Captcha',
   },
   api: { mutationMaximumAffectedRecords: 100 },
+  canManageFeatureFlags: true,
+  publicFeatureFlags: [],
 };
diff --git a/packages/twenty-front/src/testing/mock-data/generated/mock-metadata-query-result.ts b/packages/twenty-front/src/testing/mock-data/generated/mock-metadata-query-result.ts
index 31e08110ea54..18375a710d5b 100644
--- a/packages/twenty-front/src/testing/mock-data/generated/mock-metadata-query-result.ts
+++ b/packages/twenty-front/src/testing/mock-data/generated/mock-metadata-query-result.ts
@@ -2868,7 +2868,7 @@ export const mockedStandardObjectMetadataQueryResult: ObjectMetadataItemsQuery =
                         "isSystem": false,
                         "createdAt": "2024-11-06T08:55:38.993Z",
                         "updatedAt": "2024-11-06T08:55:38.993Z",
-                        "labelIdentifierFieldMetadataId": null,
+                        "labelIdentifierFieldMetadataId": "7896a006-eb14-481e-8197-661b7009a22e",
                         "imageIdentifierFieldMetadataId": null,
                         "shortcut": null,
                         "isLabelSyncedWithName": false,
diff --git a/packages/twenty-front/src/testing/mock-data/generatedMockObjectMetadataItems.ts b/packages/twenty-front/src/testing/mock-data/generatedMockObjectMetadataItems.ts
index ea4a8fae3850..665bc9c896ab 100644
--- a/packages/twenty-front/src/testing/mock-data/generatedMockObjectMetadataItems.ts
+++ b/packages/twenty-front/src/testing/mock-data/generatedMockObjectMetadataItems.ts
@@ -1,14 +1,23 @@
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { objectMetadataItemSchema } from '@/object-metadata/validation-schemas/objectMetadataItemSchema';
 import { mockedStandardObjectMetadataQueryResult } from '~/testing/mock-data/generated/mock-metadata-query-result';
 
 export const generatedMockObjectMetadataItems: ObjectMetadataItem[] =
-  mockedStandardObjectMetadataQueryResult.objects.edges.map((edge) => ({
-    ...edge.node,
-    fields: edge.node.fields.edges.map((edge) => edge.node),
-    indexMetadatas: edge.node.indexMetadatas.edges.map((index) => ({
-      ...index.node,
-      indexFieldMetadatas: index.node.indexFieldMetadatas?.edges.map(
-        (indexField) => indexField.node,
-      ),
-    })),
-  }));
+  mockedStandardObjectMetadataQueryResult.objects.edges.map((edge) => {
+    const labelIdentifierFieldMetadataId =
+      objectMetadataItemSchema.shape.labelIdentifierFieldMetadataId.parse(
+        edge.node.labelIdentifierFieldMetadataId,
+      );
+
+    return {
+      ...edge.node,
+      fields: edge.node.fields.edges.map((edge) => edge.node),
+      labelIdentifierFieldMetadataId,
+      indexMetadatas: edge.node.indexMetadatas.edges.map((index) => ({
+        ...index.node,
+        indexFieldMetadatas: index.node.indexFieldMetadatas?.edges.map(
+          (indexField) => indexField.node,
+        ),
+      })),
+    };
+  });
diff --git a/packages/twenty-front/src/testing/mock-data/publicWorkspaceDataBySubdomain.ts b/packages/twenty-front/src/testing/mock-data/publicWorkspaceDataBySubdomain.ts
new file mode 100644
index 000000000000..96bdb729c07b
--- /dev/null
+++ b/packages/twenty-front/src/testing/mock-data/publicWorkspaceDataBySubdomain.ts
@@ -0,0 +1,18 @@
+import { GetPublicWorkspaceDataBySubdomainQuery } from '~/generated/graphql';
+
+export const mockedPublicWorkspaceDataBySubdomain: GetPublicWorkspaceDataBySubdomainQuery['getPublicWorkspaceDataBySubdomain'] =
+  {
+    __typename: 'PublicWorkspaceDataOutput',
+    id: '9870323e-22c3-4d14-9b7f-5bdc84f7d6ee',
+    logo: 'workspace-logo/original/c88deb49-7636-4560-918d-08c3265ffb20.49?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ3b3Jrc3BhY2VJZCI6Ijk4NzAzMjNlLTIyYzMtNGQxNC05YjdmLTViZGM4NGY3ZDZlZSIsImlhdCI6MTczNjU0MDU0MywiZXhwIjoxNzM2NjI2OTQzfQ.C8cnHu09VGseRbQAMM4nhiO6z4TLG03ntFTvxm53-xg',
+    displayName: 'Twenty Eng',
+    subdomain: 'twenty-eng',
+    authProviders: {
+      __typename: 'AuthProviders',
+      sso: [],
+      google: true,
+      magicLink: false,
+      password: true,
+      microsoft: false,
+    },
+  };
diff --git a/packages/twenty-front/src/testing/mock-data/remoteObjectDatabases.ts b/packages/twenty-front/src/testing/mock-data/remoteObjectDatabases.ts
index 09c5bde31b5b..aab486c0c1c2 100644
--- a/packages/twenty-front/src/testing/mock-data/remoteObjectDatabases.ts
+++ b/packages/twenty-front/src/testing/mock-data/remoteObjectDatabases.ts
@@ -9,11 +9,11 @@ export const mockedRemoteObjectIntegrations = [
         id: '67cbfd35-8dd4-4591-b9d4-c1906281a5da',
         name: 'Twenty_postgres',
         tables: [
-          { name: 'Invoices', status: RemoteTableStatus.NotSynced },
-          { name: 'Quotes', status: RemoteTableStatus.Synced },
-          { name: 'Customers', status: RemoteTableStatus.NotSynced },
-          { name: 'Subscriptions', status: RemoteTableStatus.Synced },
-          { name: 'Payments', status: RemoteTableStatus.NotSynced },
+          { name: 'Invoices', status: RemoteTableStatus.NOT_SYNCED },
+          { name: 'Quotes', status: RemoteTableStatus.SYNCED },
+          { name: 'Customers', status: RemoteTableStatus.NOT_SYNCED },
+          { name: 'Subscriptions', status: RemoteTableStatus.SYNCED },
+          { name: 'Payments', status: RemoteTableStatus.NOT_SYNCED },
         ],
       },
       {
diff --git a/packages/twenty-front/src/testing/mock-data/timeline-calendar-events.ts b/packages/twenty-front/src/testing/mock-data/timeline-calendar-events.ts
index 678afbef7376..847628b90351 100644
--- a/packages/twenty-front/src/testing/mock-data/timeline-calendar-events.ts
+++ b/packages/twenty-front/src/testing/mock-data/timeline-calendar-events.ts
@@ -18,7 +18,7 @@ export const mockedTimelineCalendarEvents: TimelineCalendarEvent[] = [
     },
     conferenceSolution: 'GOOGLE_MEET',
     isCanceled: false,
-    visibility: CalendarChannelVisibility.ShareEverything,
+    visibility: CalendarChannelVisibility.SHARE_EVERYTHING,
     isFullDay: false,
     participants: [
       {
@@ -58,7 +58,7 @@ export const mockedTimelineCalendarEvents: TimelineCalendarEvent[] = [
     },
     conferenceSolution: 'GOOGLE_MEET',
     isCanceled: false,
-    visibility: CalendarChannelVisibility.Metadata,
+    visibility: CalendarChannelVisibility.METADATA,
     participants: [
       {
         __typename: 'TimelineCalendarEventParticipant',
@@ -87,7 +87,7 @@ export const mockedTimelineCalendarEvents: TimelineCalendarEvent[] = [
     },
     conferenceSolution: 'GOOGLE_MEET',
     isCanceled: false,
-    visibility: CalendarChannelVisibility.Metadata,
+    visibility: CalendarChannelVisibility.METADATA,
     participants: [
       {
         __typename: 'TimelineCalendarEventParticipant',
diff --git a/packages/twenty-front/src/testing/mock-data/users.ts b/packages/twenty-front/src/testing/mock-data/users.ts
index c9a55bebbc4b..10e132e4ecfe 100644
--- a/packages/twenty-front/src/testing/mock-data/users.ts
+++ b/packages/twenty-front/src/testing/mock-data/users.ts
@@ -45,7 +45,7 @@ export const mockCurrentWorkspace: Workspace = {
   logo: workspaceLogoUrl,
   isPublicInviteLinkEnabled: true,
   allowImpersonation: true,
-  activationStatus: WorkspaceActivationStatus.Active,
+  activationStatus: WorkspaceActivationStatus.ACTIVE,
   hasValidEntrepriseKey: false,
   isGoogleAuthEnabled: true,
   isPasswordAuthEnabled: true,
@@ -59,7 +59,7 @@ export const mockCurrentWorkspace: Workspace = {
     },
     {
       id: '1492de61-5018-4368-8923-4f1eeaf988c5',
-      key: FeatureFlagKey.IsPostgreSqlIntegrationEnabled,
+      key: FeatureFlagKey.IsPostgreSQLIntegrationEnabled,
       value: true,
       workspaceId: '7dfbc3f7-6e5e-4128-957e-8d86808cdf6w',
     },
@@ -73,6 +73,13 @@ export const mockCurrentWorkspace: Workspace = {
     interval: SubscriptionInterval.Month,
     status: SubscriptionStatus.Active,
   },
+  billingSubscriptions: [
+    {
+      __typename: 'BillingSubscription',
+      id: '7efbc3f7-6e5e-4128-957e-8d86808cdf6a',
+      status: SubscriptionStatus.Active,
+    },
+  ],
   workspaceMembersCount: 1,
   databaseSchema: '',
   databaseUrl: '',
@@ -92,8 +99,8 @@ export const mockedWorkspaceMemberData: WorkspaceMember = {
   updatedAt: '2023-04-26T10:23:42.33625+00:00',
   userId: '2603c1f9-0172-4ea6-986c-eeaccdf7f4cf',
   userEmail: 'charles@test.com',
-  dateFormat: WorkspaceMemberDateFormatEnum.DayFirst,
-  timeFormat: WorkspaceMemberTimeFormatEnum.Hour_24,
+  dateFormat: WorkspaceMemberDateFormatEnum.DAY_FIRST,
+  timeFormat: WorkspaceMemberTimeFormatEnum.HOUR_24,
   timeZone: 'America/New_York',
 };
 
@@ -111,7 +118,7 @@ export const mockedUserData: MockedUser = {
   locale: 'en',
   workspaces: [{ workspace: mockCurrentWorkspace }],
   workspaceMembers: [mockedWorkspaceMemberData],
-  onboardingStatus: OnboardingStatus.Completed,
+  onboardingStatus: OnboardingStatus.COMPLETED,
   userVars: {},
   analyticsTinybirdJwts: null,
 };
diff --git a/packages/twenty-front/src/utils/__tests__/title-utils.test.ts b/packages/twenty-front/src/utils/__tests__/title-utils.test.ts
index d67c5ecb0c47..c5d9168eda0d 100644
--- a/packages/twenty-front/src/utils/__tests__/title-utils.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/title-utils.test.ts
@@ -15,8 +15,8 @@ describe('title-utils', () => {
     expect(getPageTitleFromPath('/settings/profile')).toBe(
       SettingsPageTitles.Profile,
     );
-    expect(getPageTitleFromPath('/settings/appearance')).toBe(
-      SettingsPageTitles.Appearance,
+    expect(getPageTitleFromPath('/settings/experience')).toBe(
+      SettingsPageTitles.Experience,
     );
     expect(getPageTitleFromPath('/settings/accounts')).toBe(
       SettingsPageTitles.Accounts,
diff --git a/packages/twenty-front/src/utils/file/__tests__/getFileAbsoluteURI.test.ts b/packages/twenty-front/src/utils/file/__tests__/getFileAbsoluteURI.test.ts
deleted file mode 100644
index 01a75cecaa94..000000000000
--- a/packages/twenty-front/src/utils/file/__tests__/getFileAbsoluteURI.test.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { getFileAbsoluteURI } from '../getFileAbsoluteURI';
-import { REACT_APP_SERVER_BASE_URL } from '~/config';
-
-describe('getFileAbsoluteURI', () => {
-  test('should return absolute uri', () => {
-    expect(getFileAbsoluteURI('foo')).toEqual(
-      `${REACT_APP_SERVER_BASE_URL}/files/foo`,
-    );
-  });
-});
diff --git a/packages/twenty-front/src/utils/file/getFileAbsoluteURI.ts b/packages/twenty-front/src/utils/file/getFileAbsoluteURI.ts
deleted file mode 100644
index f3777e38a92c..000000000000
--- a/packages/twenty-front/src/utils/file/getFileAbsoluteURI.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { REACT_APP_SERVER_BASE_URL } from '~/config';
-
-export const getFileAbsoluteURI = (fileUrl?: string) => {
-  return `${REACT_APP_SERVER_BASE_URL}/files/${fileUrl}`;
-};
diff --git a/packages/twenty-front/src/utils/i18n/dynamicActivate.ts b/packages/twenty-front/src/utils/i18n/dynamicActivate.ts
new file mode 100644
index 000000000000..d2b0e0477f1b
--- /dev/null
+++ b/packages/twenty-front/src/utils/i18n/dynamicActivate.ts
@@ -0,0 +1,7 @@
+import { i18n } from '@lingui/core';
+
+export const dynamicActivate = async (locale: string) => {
+  const { messages } = await import(`../../locales/generated/${locale}.ts`);
+  i18n.load(locale, messages);
+  i18n.activate(locale);
+};
diff --git a/packages/twenty-front/src/utils/navigation/getAppPath.ts b/packages/twenty-front/src/utils/navigation/getAppPath.ts
new file mode 100644
index 000000000000..f9925c7e91e5
--- /dev/null
+++ b/packages/twenty-front/src/utils/navigation/getAppPath.ts
@@ -0,0 +1,30 @@
+import { AppPath } from '@/types/AppPath';
+import qs from 'qs';
+import { generatePath, PathParam } from 'react-router-dom';
+import { isDefined } from 'twenty-ui';
+
+export const getAppPath = <T extends AppPath>(
+  to: T,
+  params?: { [key in PathParam<T>]: string | null },
+  queryParams?: Record<string, any>,
+) => {
+  let path: string = to;
+
+  if (isDefined(params)) {
+    path = generatePath<T>(to, params);
+  }
+
+  if (isDefined(queryParams)) {
+    const filteredParams = Object.fromEntries(
+      Object.entries(queryParams).filter(([_, value]) => isDefined(value)),
+    );
+
+    const queryString = qs.stringify(filteredParams);
+
+    if (queryString !== '') {
+      path += `?${queryString}`;
+    }
+  }
+
+  return path;
+};
diff --git a/packages/twenty-front/src/utils/navigation/getSettingsPath.ts b/packages/twenty-front/src/utils/navigation/getSettingsPath.ts
new file mode 100644
index 000000000000..6c40b209396d
--- /dev/null
+++ b/packages/twenty-front/src/utils/navigation/getSettingsPath.ts
@@ -0,0 +1,36 @@
+import { AppPath } from '@/types/AppPath';
+import { SettingsPath } from '@/types/SettingsPath';
+import qs from 'qs';
+import { generatePath, PathParam } from 'react-router-dom';
+import { isDefined } from 'twenty-ui';
+
+export const getSettingsPath = <T extends SettingsPath>(
+  to: T,
+  params?: {
+    [key in PathParam<`/${AppPath.Settings}/${T}`>]: string | null;
+  },
+  queryParams?: Record<string, any>,
+) => {
+  let path = `/${AppPath.Settings}/${to}`;
+
+  if (isDefined(params)) {
+    path = generatePath<`/${AppPath.Settings}/${T}`>(
+      `/${AppPath.Settings}/${to}`,
+      params,
+    );
+  }
+
+  if (isDefined(queryParams)) {
+    const filteredParams = Object.fromEntries(
+      Object.entries(queryParams).filter(([_, value]) => isDefined(value)),
+    );
+
+    const queryString = qs.stringify(filteredParams);
+
+    if (queryString !== '') {
+      path += `?${queryString}`;
+    }
+  }
+
+  return path;
+};
diff --git a/packages/twenty-front/src/utils/string/__tests__/formatDateString.test.ts b/packages/twenty-front/src/utils/string/__tests__/formatDateString.test.ts
index f4088b6e6ca2..56a48dc44248 100644
--- a/packages/twenty-front/src/utils/string/__tests__/formatDateString.test.ts
+++ b/packages/twenty-front/src/utils/string/__tests__/formatDateString.test.ts
@@ -1,5 +1,4 @@
 import { DateFormat } from '@/localization/constants/DateFormat';
-import { TimeFormat } from '@/localization/constants/TimeFormat';
 import { DateTime } from 'luxon';
 import { formatDateString } from '~/utils/string/formatDateString';
 
@@ -7,7 +6,6 @@ describe('formatDateString', () => {
   const defaultParams = {
     timeZone: 'UTC',
     dateFormat: DateFormat.DAY_FIRST,
-    timeFormat: TimeFormat.HOUR_24,
   };
 
   it('should return empty string for null value', () => {
@@ -49,7 +47,7 @@ describe('formatDateString', () => {
 
   it('should format date as datetime when displayAsRelativeDate is false', () => {
     const mockDate = '2023-01-01T12:00:00Z';
-    const mockFormattedDate = '1 Jan, 2023 12:00';
+    const mockFormattedDate = '1 Jan, 2023';
 
     jest.mock('@/localization/utils/formatDateISOStringToDateTime', () => ({
       formatDateISOStringToDateTime: jest
@@ -68,7 +66,7 @@ describe('formatDateString', () => {
 
   it('should format date as datetime by default when displayAsRelativeDate is not provided', () => {
     const mockDate = '2023-01-01T12:00:00Z';
-    const mockFormattedDate = '1 Jan, 2023 12:00';
+    const mockFormattedDate = '1 Jan, 2023';
 
     jest.mock('@/localization/utils/formatDateISOStringToDateTime', () => ({
       formatDateISOStringToDateTime: jest
diff --git a/packages/twenty-front/src/utils/string/__tests__/formatDateTimeString.test.ts b/packages/twenty-front/src/utils/string/__tests__/formatDateTimeString.test.ts
new file mode 100644
index 000000000000..6cbf77a25214
--- /dev/null
+++ b/packages/twenty-front/src/utils/string/__tests__/formatDateTimeString.test.ts
@@ -0,0 +1,86 @@
+import { DateFormat } from '@/localization/constants/DateFormat';
+import { TimeFormat } from '@/localization/constants/TimeFormat';
+import { DateTime } from 'luxon';
+import { formatDateTimeString } from '~/utils/string/formatDateTimeString';
+
+describe('formatDateTimeString', () => {
+  const defaultParams = {
+    timeZone: 'UTC',
+    dateFormat: DateFormat.DAY_FIRST,
+    timeFormat: TimeFormat.HOUR_24,
+  };
+
+  it('should return empty string for null value', () => {
+    const result = formatDateTimeString({
+      ...defaultParams,
+      value: null,
+    });
+
+    expect(result).toBe('');
+  });
+
+  it('should return empty string for undefined value', () => {
+    const result = formatDateTimeString({
+      ...defaultParams,
+      value: undefined,
+    });
+
+    expect(result).toBe('');
+  });
+
+  it('should format date as relative when displayAsRelativeDate is true', () => {
+    const mockDate = DateTime.now().minus({ months: 2 }).toISO();
+    const mockRelativeDate = '2 months ago';
+
+    jest.mock('@/localization/utils/formatDateISOStringToRelativeDate', () => ({
+      formatDateISOStringToRelativeDate: jest
+        .fn()
+        .mockReturnValue(mockRelativeDate),
+    }));
+
+    const result = formatDateTimeString({
+      ...defaultParams,
+      value: mockDate,
+      displayAsRelativeDate: true,
+    });
+
+    expect(result).toBe(mockRelativeDate);
+  });
+
+  it('should format date as datetime when displayAsRelativeDate is false', () => {
+    const mockDate = '2023-01-01T12:00:00Z';
+    const mockFormattedDate = '1 Jan, 2023 12:00';
+
+    jest.mock('@/localization/utils/formatDateISOStringToDateTime', () => ({
+      formatDateISOStringToDateTime: jest
+        .fn()
+        .mockReturnValue(mockFormattedDate),
+    }));
+
+    const result = formatDateTimeString({
+      ...defaultParams,
+      value: mockDate,
+      displayAsRelativeDate: false,
+    });
+
+    expect(result).toBe(mockFormattedDate);
+  });
+
+  it('should format date as datetime by default when displayAsRelativeDate is not provided', () => {
+    const mockDate = '2023-01-01T12:00:00Z';
+    const mockFormattedDate = '1 Jan, 2023 12:00';
+
+    jest.mock('@/localization/utils/formatDateISOStringToDateTime', () => ({
+      formatDateISOStringToDateTime: jest
+        .fn()
+        .mockReturnValue(mockFormattedDate),
+    }));
+
+    const result = formatDateTimeString({
+      ...defaultParams,
+      value: mockDate,
+    });
+
+    expect(result).toBe(mockFormattedDate);
+  });
+});
diff --git a/packages/twenty-front/src/utils/string/formatDateString.ts b/packages/twenty-front/src/utils/string/formatDateString.ts
index 6aaec870a652..87417854b748 100644
--- a/packages/twenty-front/src/utils/string/formatDateString.ts
+++ b/packages/twenty-front/src/utils/string/formatDateString.ts
@@ -1,25 +1,22 @@
 import { DateFormat } from '@/localization/constants/DateFormat';
-import { TimeFormat } from '@/localization/constants/TimeFormat';
-import { formatDateISOStringToDateTime } from '@/localization/utils/formatDateISOStringToDateTime';
+import { formatDateISOStringToDate } from '@/localization/utils/formatDateISOStringToDate';
 import { formatDateISOStringToRelativeDate } from '@/localization/utils/formatDateISOStringToRelativeDate';
 
 export const formatDateString = ({
   value,
   timeZone,
   dateFormat,
-  timeFormat,
   displayAsRelativeDate,
 }: {
   timeZone: string;
   dateFormat: DateFormat;
-  timeFormat: TimeFormat;
   value?: string | null;
   displayAsRelativeDate?: boolean;
 }) => {
   const formattedDate = value
     ? displayAsRelativeDate
       ? formatDateISOStringToRelativeDate(value)
-      : formatDateISOStringToDateTime(value, timeZone, dateFormat, timeFormat)
+      : formatDateISOStringToDate(value, timeZone, dateFormat)
     : '';
 
   return formattedDate;
diff --git a/packages/twenty-front/src/utils/string/formatDateTimeString.ts b/packages/twenty-front/src/utils/string/formatDateTimeString.ts
new file mode 100644
index 000000000000..6b244fd5c476
--- /dev/null
+++ b/packages/twenty-front/src/utils/string/formatDateTimeString.ts
@@ -0,0 +1,26 @@
+import { DateFormat } from '@/localization/constants/DateFormat';
+import { TimeFormat } from '@/localization/constants/TimeFormat';
+import { formatDateISOStringToDateTime } from '@/localization/utils/formatDateISOStringToDateTime';
+import { formatDateISOStringToRelativeDate } from '@/localization/utils/formatDateISOStringToRelativeDate';
+
+export const formatDateTimeString = ({
+  value,
+  timeZone,
+  dateFormat,
+  timeFormat,
+  displayAsRelativeDate,
+}: {
+  timeZone: string;
+  dateFormat: DateFormat;
+  timeFormat: TimeFormat;
+  value?: string | null;
+  displayAsRelativeDate?: boolean;
+}) => {
+  const formattedDate = value
+    ? displayAsRelativeDate
+      ? formatDateISOStringToRelativeDate(value)
+      : formatDateISOStringToDateTime(value, timeZone, dateFormat, timeFormat)
+    : '';
+
+  return formattedDate;
+};
diff --git a/packages/twenty-front/src/utils/title-utils.ts b/packages/twenty-front/src/utils/title-utils.ts
index dddb2ce1196e..3dd9b430dda8 100644
--- a/packages/twenty-front/src/utils/title-utils.ts
+++ b/packages/twenty-front/src/utils/title-utils.ts
@@ -4,7 +4,7 @@ import { SettingsPath } from '@/types/SettingsPath';
 
 export enum SettingsPageTitles {
   Accounts = 'Account - Settings',
-  Appearance = 'Appearance - Settings',
+  Experience = 'Experience - Settings',
   Profile = 'Profile - Settings',
   Objects = 'Data model - Settings',
   Members = 'Members - Settings',
@@ -17,7 +17,7 @@ export enum SettingsPageTitles {
 
 enum SettingsPathPrefixes {
   Accounts = `${AppBasePath.Settings}/${SettingsPath.Accounts}`,
-  Appearance = `${AppBasePath.Settings}/${SettingsPath.Appearance}`,
+  Experience = `${AppBasePath.Settings}/${SettingsPath.Experience}`,
   Profile = `${AppBasePath.Settings}/${SettingsPath.ProfilePage}`,
   Objects = `${AppBasePath.Settings}/${SettingsPath.Objects}`,
   Members = `${AppBasePath.Settings}/${SettingsPath.WorkspaceMembersPage}`,
@@ -49,8 +49,8 @@ export const getPageTitleFromPath = (pathname: string): string => {
       return 'Create Workspace';
     case AppPath.CreateProfile:
       return 'Create Profile';
-    case SettingsPathPrefixes.Appearance:
-      return SettingsPageTitles.Appearance;
+    case SettingsPathPrefixes.Experience:
+      return SettingsPageTitles.Experience;
     case SettingsPathPrefixes.Accounts:
       return SettingsPageTitles.Accounts;
     case SettingsPathPrefixes.Profile:
diff --git a/packages/twenty-front/tsconfig.dev.json b/packages/twenty-front/tsconfig.dev.json
index f90dcae862bb..dfe9d0d1f34d 100644
--- a/packages/twenty-front/tsconfig.dev.json
+++ b/packages/twenty-front/tsconfig.dev.json
@@ -8,6 +8,7 @@
     "src/**/*.jsx",
     "src/**/*.d.ts",
     "src/**/*.ts",
-    "src/**/*.tsx"
+    "src/**/*.tsx",
+    "lingui.config.ts"
   ]
 }
diff --git a/packages/twenty-front/tsconfig.json b/packages/twenty-front/tsconfig.json
index 48b5bf3817a8..4d00fbc3e30e 100644
--- a/packages/twenty-front/tsconfig.json
+++ b/packages/twenty-front/tsconfig.json
@@ -21,10 +21,10 @@
     "forceConsistentCasingInFileNames": true,
     "outDir": "../../.cache/tsc",
     "paths": {
-      "@/*": ["packages/twenty-front/src/modules/*"],
-      "~/*": ["packages/twenty-front/src/*"],
-      "twenty-ui": ["packages/twenty-ui/src/index.ts"],
-      "@ui/*": ["packages/twenty-ui/src/*"]
+      "@/*": ["./src/modules/*"],
+      "~/*": ["./src/*"],
+      "twenty-ui": ["../twenty-ui/src/index.ts"],
+      "@ui/*": ["../twenty-ui/src/*"]
     }
   },
   "files": [],
diff --git a/packages/twenty-front/tsconfig.spec.json b/packages/twenty-front/tsconfig.spec.json
index 445de2e32c9b..026604daaaca 100644
--- a/packages/twenty-front/tsconfig.spec.json
+++ b/packages/twenty-front/tsconfig.spec.json
@@ -2,11 +2,12 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "types": ["jest", "node"],
+    "baseUrl": "../..",
     "paths": {
-     "@/*": ["packages/twenty-front/src/modules/*"],
-      "~/*": ["packages/twenty-front/src/*"],
-      "twenty-ui": ["packages/twenty-ui/src/index.ts"],
-      "@ui/*": ["packages/twenty-ui/src/*"]
+     "@/*": ["./packages/twenty-front/src/modules/*"],
+      "~/*": ["./packages/twenty-front/src/*"],
+      "twenty-ui": ["./packages/twenty-ui/src/index.ts"],
+      "@ui/*": ["./packages/twenty-ui/src/*"]
     }
   },
   "include": [
diff --git a/packages/twenty-front/vite.config.ts b/packages/twenty-front/vite.config.ts
index 2e86ec59aa39..9a8a8033139a 100644
--- a/packages/twenty-front/vite.config.ts
+++ b/packages/twenty-front/vite.config.ts
@@ -1,4 +1,5 @@
 /* eslint-disable no-console */
+import { lingui } from '@lingui/vite-plugin';
 import { isNonEmptyString } from '@sniptt/guards';
 import react from '@vitejs/plugin-react-swc';
 import wyw from '@wyw-in-js/vite';
@@ -93,11 +94,17 @@ export default defineConfig(({ command, mode }) => {
     },
 
     plugins: [
-      react({ jsxImportSource: '@emotion/react' }),
+      react({
+        jsxImportSource: '@emotion/react',
+        plugins: [['@lingui/swc-plugin', {}]],
+      }),
       tsconfigPaths({
         projects: ['tsconfig.json', '../twenty-ui/tsconfig.json'],
       }),
       svgr(),
+      lingui({
+        configPath: path.resolve(__dirname, './lingui.config.ts'),
+      }),
       checker(checkers),
       // TODO: fix this, we have to restrict the include to only the components that are using linaria
       // Otherwise the build will fail because wyw tries to include emotion styled components
diff --git a/packages/twenty-server/.env.example b/packages/twenty-server/.env.example
index 1b0fed342ba1..76c24492da69 100644
--- a/packages/twenty-server/.env.example
+++ b/packages/twenty-server/.env.example
@@ -27,7 +27,6 @@ FRONT_PORT=3001
 # IS_MULTIWORKSPACE_ENABLED=false
 # AUTH_MICROSOFT_ENABLED=false
 # AUTH_MICROSOFT_CLIENT_ID=replace_me_with_azure_client_id
-# AUTH_MICROSOFT_TENANT_ID=replace_me_with_azure_tenant_id
 # AUTH_MICROSOFT_CLIENT_SECRET=replace_me_with_azure_client_secret
 # AUTH_MICROSOFT_CALLBACK_URL=http://localhost:3000/auth/microsoft/redirect
 # AUTH_MICROSOFT_APIS_CALLBACK_URL=http://localhost:3000/auth/microsoft-apis/get-access-token
@@ -36,7 +35,6 @@ FRONT_PORT=3001
 # AUTH_GOOGLE_CLIENT_SECRET=replace_me_with_google_client_secret
 # AUTH_GOOGLE_CALLBACK_URL=http://localhost:3000/auth/google/redirect
 # AUTH_GOOGLE_APIS_CALLBACK_URL=http://localhost:3000/auth/google-apis/get-access-token
-# AUTH_SSO_ENABLED=false
 # SERVERLESS_TYPE=local
 # STORAGE_TYPE=local
 # STORAGE_LOCAL_PATH=.local-storage
@@ -57,6 +55,8 @@ FRONT_PORT=3001
 # WORKSPACE_INACTIVE_DAYS_BEFORE_NOTIFICATION=30
 # WORKSPACE_INACTIVE_DAYS_BEFORE_DELETION=60
 # Email Server Settings, see this doc for more info: https://docs.twenty.com/start/self-hosting/#email
+# IS_EMAIL_VERIFICATION_REQUIRED=false
+# EMAIL_VERIFICATION_TOKEN_EXPIRES_IN=1h
 # EMAIL_FROM_ADDRESS=contact@yourdomain.com
 # EMAIL_SYSTEM_ADDRESS=system@yourdomain.com
 # EMAIL_FROM_NAME='John from YourDomain'
diff --git a/packages/twenty-server/jest-integration.config.ts b/packages/twenty-server/jest-integration.config.ts
index cbb53051d1fd..d8d0d975edf0 100644
--- a/packages/twenty-server/jest-integration.config.ts
+++ b/packages/twenty-server/jest-integration.config.ts
@@ -1,5 +1,6 @@
 import { JestConfigWithTsJest, pathsToModuleNameMapper } from 'ts-jest';
 
+const isBillingEnabled = process.env.IS_BILLING_ENABLED === 'true';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const tsConfig = require('./tsconfig.json');
 
@@ -9,7 +10,9 @@ const jestConfig: JestConfigWithTsJest = {
   moduleFileExtensions: ['js', 'json', 'ts'],
   rootDir: '.',
   testEnvironment: 'node',
-  testRegex: '.integration-spec.ts$',
+  testRegex: isBillingEnabled
+    ? 'integration-spec.ts'
+    : '^(?!.*billing).*\\.integration-spec\\.ts$',
   modulePathIgnorePatterns: ['<rootDir>/dist'],
   globalSetup: '<rootDir>/test/integration/utils/setup-test.ts',
   globalTeardown: '<rootDir>/test/integration/utils/teardown-test.ts',
diff --git a/packages/twenty-server/package.json b/packages/twenty-server/package.json
index 6de9253d6e35..4e5a0087aa01 100644
--- a/packages/twenty-server/package.json
+++ b/packages/twenty-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twenty-server",
-  "version": "0.40.0-canary",
+  "version": "0.41.0-canary",
   "description": "",
   "author": "",
   "private": true,
@@ -74,6 +74,8 @@
     "@types/react": "^18.2.39",
     "@types/unzipper": "^0",
     "rimraf": "^5.0.5",
+    "twenty-emails": "workspace:*",
+    "twenty-shared": "workspace:*",
     "typescript": "5.3.3"
   },
   "engines": {
diff --git a/packages/twenty-server/project.json b/packages/twenty-server/project.json
index ceded8427357..72cc73a182a6 100644
--- a/packages/twenty-server/project.json
+++ b/packages/twenty-server/project.json
@@ -39,6 +39,7 @@
         "updateBuildableProjectDepsInPackageJson": true
       }
     },
+    "typecheck": {},
     "start": {
       "executor": "nx:run-commands",
       "dependsOn": ["typecheck", "build"],
diff --git a/packages/twenty-server/src/database/commands/active-workspaces.command.ts b/packages/twenty-server/src/database/commands/active-workspaces.command.ts
index 46c7ad2201b9..b9de1e7210dd 100644
--- a/packages/twenty-server/src/database/commands/active-workspaces.command.ts
+++ b/packages/twenty-server/src/database/commands/active-workspaces.command.ts
@@ -1,16 +1,13 @@
 import chalk from 'chalk';
 import { Option } from 'nest-commander';
-import { Repository } from 'typeorm';
+import { WorkspaceActivationStatus } from 'twenty-shared';
+import { In, Repository } from 'typeorm';
 
 import {
   BaseCommandOptions,
   BaseCommandRunner,
 } from 'src/database/commands/base.command';
-import {
-  Workspace,
-  WorkspaceActivationStatus,
-} from 'src/engine/core-modules/workspace/workspace.entity';
-
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 export type ActiveWorkspacesCommandOptions = BaseCommandOptions & {
   workspaceId?: string;
 };
@@ -38,7 +35,10 @@ export abstract class ActiveWorkspacesCommandRunner extends BaseCommandRunner {
     const activeWorkspaces = await this.workspaceRepository.find({
       select: ['id'],
       where: {
-        activationStatus: WorkspaceActivationStatus.ACTIVE,
+        activationStatus: In([
+          WorkspaceActivationStatus.ACTIVE,
+          WorkspaceActivationStatus.SUSPENDED,
+        ]),
       },
     });
 
diff --git a/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts b/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts
index 934a9dd870e6..34cc58d127da 100644
--- a/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts
+++ b/packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts
@@ -32,7 +32,6 @@ import { TypeORMService } from 'src/database/typeorm/typeorm.service';
 import { InjectCacheStorage } from 'src/engine/core-modules/cache-storage/decorators/cache-storage.decorator';
 import { CacheStorageService } from 'src/engine/core-modules/cache-storage/services/cache-storage.service';
 import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/types/cache-storage-namespace.enum';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
@@ -45,7 +44,9 @@ import { SURVEY_RESULTS_METADATA_SEEDS } from 'src/engine/seeder/metadata-seeds/
 import { SeederService } from 'src/engine/seeder/seeder.service';
 import { shouldSeedWorkspaceFavorite } from 'src/engine/utils/should-seed-workspace-favorite';
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
+import { createWorkspaceViews } from 'src/engine/workspace-manager/standard-objects-prefill-data/create-workspace-views';
 import { seedViewWithDemoData } from 'src/engine/workspace-manager/standard-objects-prefill-data/seed-view-with-demo-data';
+import { opportunitiesTableByStageView } from 'src/engine/workspace-manager/standard-objects-prefill-data/views/opportunity-table-by-stage.view';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
 import { WorkspaceSyncMetadataService } from 'src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service';
 
@@ -181,12 +182,6 @@ export class DataSeedWorkspaceCommand extends CommandRunner {
             dataSourceMetadata.workspaceId,
           );
 
-        const isWorkflowEnabled =
-          await this.featureFlagService.isFeatureEnabled(
-            FeatureFlagKey.IsWorkflowEnabled,
-            dataSourceMetadata.workspaceId,
-          );
-
         await seedCompanies(entityManager, dataSourceMetadata.schema);
         await seedPeople(entityManager, dataSourceMetadata.schema);
         await seedOpportunity(entityManager, dataSourceMetadata.schema);
@@ -227,9 +222,16 @@ export class DataSeedWorkspaceCommand extends CommandRunner {
           entityManager,
           dataSourceMetadata.schema,
           objectMetadataStandardIdToIdMap,
-          isWorkflowEnabled,
         );
 
+        const devViewDefinitionsWithId = await createWorkspaceViews(
+          entityManager,
+          dataSourceMetadata.schema,
+          [opportunitiesTableByStageView(objectMetadataStandardIdToIdMap)],
+        );
+
+        viewDefinitionsWithId.push(...devViewDefinitionsWithId);
+
         await seedWorkspaceFavorites(
           viewDefinitionsWithId
             .filter(
diff --git a/packages/twenty-server/src/database/commands/database-command.module.ts b/packages/twenty-server/src/database/commands/database-command.module.ts
index e3aee52bea0c..f6f95ce43620 100644
--- a/packages/twenty-server/src/database/commands/database-command.module.ts
+++ b/packages/twenty-server/src/database/commands/database-command.module.ts
@@ -7,11 +7,8 @@ import { DataSeedDemoWorkspaceCommand } from 'src/database/commands/data-seed-de
 import { DataSeedDemoWorkspaceModule } from 'src/database/commands/data-seed-demo-workspace/data-seed-demo-workspace.module';
 import { DataSeedWorkspaceCommand } from 'src/database/commands/data-seed-dev-workspace.command';
 import { ConfirmationQuestion } from 'src/database/commands/questions/confirmation.question';
-import { UpgradeTo0_32CommandModule } from 'src/database/commands/upgrade-version/0-32/0-32-upgrade-version.module';
-import { UpgradeTo0_33CommandModule } from 'src/database/commands/upgrade-version/0-33/0-33-upgrade-version.module';
-import { UpgradeTo0_34CommandModule } from 'src/database/commands/upgrade-version/0-34/0-34-upgrade-version.module';
-import { UpgradeTo0_35CommandModule } from 'src/database/commands/upgrade-version/0-35/0-35-upgrade-version.module';
 import { UpgradeTo0_40CommandModule } from 'src/database/commands/upgrade-version/0-40/0-40-upgrade-version.module';
+import { UpgradeTo0_41CommandModule } from 'src/database/commands/upgrade-version/0-41/0-41-upgrade-version.module';
 import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
 import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
@@ -52,11 +49,8 @@ import { WorkspaceSyncMetadataModule } from 'src/engine/workspace-manager/worksp
     DataSeedDemoWorkspaceModule,
     WorkspaceCacheStorageModule,
     WorkspaceMetadataVersionModule,
-    UpgradeTo0_32CommandModule,
-    UpgradeTo0_33CommandModule,
-    UpgradeTo0_34CommandModule,
-    UpgradeTo0_35CommandModule,
     UpgradeTo0_40CommandModule,
+    UpgradeTo0_41CommandModule,
     FeatureFlagModule,
   ],
   providers: [
diff --git a/packages/twenty-server/src/database/commands/logger.ts b/packages/twenty-server/src/database/commands/logger.ts
index 722cdb224461..bb912004f96d 100644
--- a/packages/twenty-server/src/database/commands/logger.ts
+++ b/packages/twenty-server/src/database/commands/logger.ts
@@ -28,12 +28,12 @@ export class CommandLogger {
     this.logger.error(message, stack, context);
   }
 
-  warn(message: string, context?: string) {
-    this.logger.warn(message, context);
+  warn(message: string, ...optionalParams: [...any, string?]) {
+    this.logger.warn(message, ...optionalParams);
   }
 
-  debug(message: string, context?: string) {
-    this.logger.debug(message, context);
+  debug(message: string, ...optionalParams: [...any, string?]) {
+    this.logger.debug(message, ...optionalParams);
   }
 
   verbose(message: string, ...optionalParams: [...any, string?]) {
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-32/0-32-backfill-view-groups.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-32/0-32-backfill-view-groups.command.ts
deleted file mode 100644
index ba7c406a483a..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-32/0-32-backfill-view-groups.command.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import chalk from 'chalk';
-import { Command } from 'nest-commander';
-import { In, Repository } from 'typeorm';
-
-import {
-  ActiveWorkspacesCommandOptions,
-  ActiveWorkspacesCommandRunner,
-} from 'src/database/commands/active-workspaces.command';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
-import { ViewGroupWorkspaceEntity } from 'src/modules/view/standard-objects/view-group.workspace-entity';
-import { ViewWorkspaceEntity } from 'src/modules/view/standard-objects/view.workspace-entity';
-
-@Command({
-  name: 'upgrade-0.32:backfill-view-groups',
-  description: 'Backfill view groups',
-})
-export class BackfillViewGroupsCommand extends ActiveWorkspacesCommandRunner {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    @InjectRepository(FieldMetadataEntity, 'metadata')
-    private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
-    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
-  ) {
-    super(workspaceRepository);
-  }
-
-  async executeActiveWorkspacesCommand(
-    _passedParam: string[],
-    _options: ActiveWorkspacesCommandOptions,
-    workspaceIds: string[],
-  ): Promise<void> {
-    this.logger.log('Running command to fix backfill view groups');
-
-    for (const workspaceId of workspaceIds) {
-      this.logger.log(`Running command for workspace ${workspaceId}`);
-
-      try {
-        const viewRepository =
-          await this.twentyORMGlobalManager.getRepositoryForWorkspace<ViewWorkspaceEntity>(
-            workspaceId,
-            'view',
-          );
-
-        const viewGroupRepository =
-          await this.twentyORMGlobalManager.getRepositoryForWorkspace<ViewGroupWorkspaceEntity>(
-            workspaceId,
-            'viewGroup',
-          );
-
-        const kanbanViews = await viewRepository.find({
-          where: {
-            type: 'kanban',
-          },
-        });
-
-        const kanbanFieldMetadataIds = kanbanViews.map(
-          (view) => view.kanbanFieldMetadataId,
-        );
-
-        const kanbanFieldMetadataItems =
-          await this.fieldMetadataRepository.find({
-            where: {
-              id: In(kanbanFieldMetadataIds),
-            },
-          });
-
-        for (const kanbanView of kanbanViews) {
-          const kanbanFieldMetadataItem = kanbanFieldMetadataItems.find(
-            (item) => item.id === kanbanView.kanbanFieldMetadataId,
-          );
-
-          if (!kanbanFieldMetadataItem) {
-            this.logger.log(
-              chalk.red(
-                `Kanban field metadata with id ${kanbanView.kanbanFieldMetadataId} not found`,
-              ),
-            );
-            continue;
-          }
-
-          for (const option of kanbanFieldMetadataItem.options) {
-            const viewGroup = await viewGroupRepository.findOne({
-              where: {
-                fieldMetadataId: kanbanFieldMetadataItem.id,
-                fieldValue: option.value,
-                viewId: kanbanView.id,
-              },
-            });
-
-            if (viewGroup) {
-              this.logger.log(
-                chalk.red(`View group with id ${option.value} already exists`),
-              );
-              continue;
-            }
-
-            await viewGroupRepository.save({
-              fieldMetadataId: kanbanFieldMetadataItem.id,
-              fieldValue: option.value,
-              isVisible: true,
-              viewId: kanbanView.id,
-              position: option.position,
-            });
-          }
-        }
-      } catch (error) {
-        this.logger.log(
-          chalk.red(
-            `Running command on workspace ${workspaceId} failed with error: ${error}`,
-          ),
-        );
-        continue;
-      } finally {
-        this.logger.log(
-          chalk.green(`Finished running command for workspace ${workspaceId}.`),
-        );
-      }
-
-      this.logger.log(chalk.green(`Command completed!`));
-    }
-  }
-}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-32/0-32-copy-webhook-operation-into-operations-command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-32/0-32-copy-webhook-operation-into-operations-command.ts
deleted file mode 100644
index 6d5ef731cc4a..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-32/0-32-copy-webhook-operation-into-operations-command.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Command } from 'nest-commander';
-import chalk from 'chalk';
-import { Repository } from 'typeorm';
-
-import { ActiveWorkspacesCommandRunner } from 'src/database/commands/active-workspaces.command';
-import { BaseCommandOptions } from 'src/database/commands/base.command';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
-
-@Command({
-  name: 'upgrade-0.32:copy-webhook-operation-into-operations',
-  description:
-    'Read, transform and copy webhook from deprecated column operation into newly created column operations',
-})
-export class CopyWebhookOperationIntoOperationsCommand extends ActiveWorkspacesCommandRunner {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
-  ) {
-    super(workspaceRepository);
-  }
-
-  async executeActiveWorkspacesCommand(
-    passedParams: string[],
-    options: BaseCommandOptions,
-    activeWorkspaceIds: string[],
-  ): Promise<void> {
-    this.logger.log('Running command to copy operation to operations');
-
-    for (const workspaceId of activeWorkspaceIds) {
-      try {
-        this.logger.log(`Running command for workspace ${workspaceId}`);
-
-        const webhookRepository =
-          await this.twentyORMGlobalManager.getRepositoryForWorkspace(
-            workspaceId,
-            'webhook',
-          );
-
-        const webhooks = await webhookRepository.find();
-
-        for (const webhook of webhooks) {
-          if ('operation' in webhook) {
-            let newOpe = webhook.operation;
-
-            newOpe = newOpe.replace(/\bcreate\b(?=\.|$)/g, 'created');
-            newOpe = newOpe.replace(/\bupdate\b(?=\.|$)/g, 'updated');
-            newOpe = newOpe.replace(/\bdelete\b(?=\.|$)/g, 'deleted');
-            newOpe = newOpe.replace(/\bdestroy\b(?=\.|$)/g, 'destroyed');
-
-            const [firstWebhookPart, lastWebhookPart] = newOpe.split('.');
-
-            if (
-              ['created', 'updated', 'deleted', 'destroyed'].includes(
-                firstWebhookPart,
-              )
-            ) {
-              newOpe = `${lastWebhookPart}.${firstWebhookPart}`;
-            }
-
-            await webhookRepository.update(webhook.id, {
-              operation: newOpe,
-              operations: [newOpe],
-            });
-
-            this.logger.log(
-              chalk.yellow(
-                `Handled webhook operation updates for ${webhook.id}`,
-              ),
-            );
-          }
-        }
-      } catch (e) {
-        this.logger.log(
-          chalk.red(
-            `Error when running command on workspace ${workspaceId}: ${e}`,
-          ),
-        );
-      }
-    }
-  }
-}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-32/0-32-simplify-search-vector-expression.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-32/0-32-simplify-search-vector-expression.ts
deleted file mode 100644
index 9ed6bb0f6ad0..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-32/0-32-simplify-search-vector-expression.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import chalk from 'chalk';
-import { Command } from 'nest-commander';
-import { Repository } from 'typeorm';
-
-import {
-  ActiveWorkspacesCommandOptions,
-  ActiveWorkspacesCommandRunner,
-} from 'src/database/commands/active-workspaces.command';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { SearchService } from 'src/engine/metadata-modules/search/search.service';
-import { SEARCH_FIELDS_FOR_CUSTOM_OBJECT } from 'src/engine/twenty-orm/custom.workspace-entity';
-import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service';
-import {
-  COMPANY_STANDARD_FIELD_IDS,
-  CUSTOM_OBJECT_STANDARD_FIELD_IDS,
-  OPPORTUNITY_STANDARD_FIELD_IDS,
-  PERSON_STANDARD_FIELD_IDS,
-} from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
-import { FieldTypeAndNameMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/utils/get-ts-vector-column-expression.util';
-import { SEARCH_FIELDS_FOR_COMPANY } from 'src/modules/company/standard-objects/company.workspace-entity';
-import { SEARCH_FIELDS_FOR_OPPORTUNITY } from 'src/modules/opportunity/standard-objects/opportunity.workspace-entity';
-import { SEARCH_FIELDS_FOR_PERSON } from 'src/modules/person/standard-objects/person.workspace-entity';
-
-@Command({
-  name: 'fix-0.32:simplify-search-vector-expression',
-  description: 'Replace searchVector with simpler expression',
-})
-export class SimplifySearchVectorExpressionCommand extends ActiveWorkspacesCommandRunner {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    @InjectRepository(FieldMetadataEntity, 'metadata')
-    private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
-    private readonly searchService: SearchService,
-    private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
-  ) {
-    super(workspaceRepository);
-  }
-
-  async executeActiveWorkspacesCommand(
-    _passedParam: string[],
-    _options: ActiveWorkspacesCommandOptions,
-    workspaceIds: string[],
-  ): Promise<void> {
-    this.logger.log('Running command to fix migration');
-
-    for (const workspaceId of workspaceIds) {
-      this.logger.log(`Running command for workspace ${workspaceId}`);
-
-      try {
-        const searchVectorFields = await this.fieldMetadataRepository.findBy({
-          workspaceId: workspaceId,
-          type: FieldMetadataType.TS_VECTOR,
-        });
-
-        for (const searchVectorField of searchVectorFields) {
-          let fieldsUsedForSearch: FieldTypeAndNameMetadata[] = [];
-
-          switch (searchVectorField.standardId) {
-            case CUSTOM_OBJECT_STANDARD_FIELD_IDS.searchVector: {
-              fieldsUsedForSearch = SEARCH_FIELDS_FOR_CUSTOM_OBJECT;
-              break;
-            }
-            case PERSON_STANDARD_FIELD_IDS.searchVector: {
-              fieldsUsedForSearch = SEARCH_FIELDS_FOR_PERSON;
-              break;
-            }
-            case COMPANY_STANDARD_FIELD_IDS.searchVector: {
-              fieldsUsedForSearch = SEARCH_FIELDS_FOR_COMPANY;
-              break;
-            }
-            case OPPORTUNITY_STANDARD_FIELD_IDS.searchVector: {
-              fieldsUsedForSearch = SEARCH_FIELDS_FOR_OPPORTUNITY;
-              break;
-            }
-          }
-
-          if (fieldsUsedForSearch.length === 0) {
-            continue;
-          }
-
-          await this.searchService.updateSearchVector(
-            searchVectorField.objectMetadataId,
-            fieldsUsedForSearch,
-            workspaceId,
-          );
-
-          await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
-            workspaceId,
-          );
-        }
-      } catch (error) {
-        this.logger.log(
-          chalk.red(
-            `Running command on workspace ${workspaceId} failed with error: ${error}`,
-          ),
-        );
-        continue;
-      } finally {
-        this.logger.log(
-          chalk.green(`Finished running command for workspace ${workspaceId}.`),
-        );
-      }
-
-      this.logger.log(chalk.green(`Command completed!`));
-    }
-  }
-}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-32/0-32-upgrade-version.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-32/0-32-upgrade-version.command.ts
deleted file mode 100644
index 72ba410be906..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-32/0-32-upgrade-version.command.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Command } from 'nest-commander';
-import { Repository } from 'typeorm';
-
-import { ActiveWorkspacesCommandRunner } from 'src/database/commands/active-workspaces.command';
-import { BackfillViewGroupsCommand } from 'src/database/commands/upgrade-version/0-32/0-32-backfill-view-groups.command';
-import { CopyWebhookOperationIntoOperationsCommand } from 'src/database/commands/upgrade-version/0-32/0-32-copy-webhook-operation-into-operations-command';
-import { SimplifySearchVectorExpressionCommand } from 'src/database/commands/upgrade-version/0-32/0-32-simplify-search-vector-expression';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { SyncWorkspaceMetadataCommand } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command';
-
-interface UpdateTo0_32CommandOptions {
-  workspaceId?: string;
-}
-
-@Command({
-  name: 'upgrade-0.32',
-  description: 'Upgrade to 0.32',
-})
-export class UpgradeTo0_32Command extends ActiveWorkspacesCommandRunner {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    private readonly syncWorkspaceMetadataCommand: SyncWorkspaceMetadataCommand,
-    private readonly simplifySearchVectorExpressionCommand: SimplifySearchVectorExpressionCommand,
-    private readonly copyWebhookOperationIntoOperationsCommand: CopyWebhookOperationIntoOperationsCommand,
-    private readonly backfillViewGroupsCommand: BackfillViewGroupsCommand,
-  ) {
-    super(workspaceRepository);
-  }
-
-  async executeActiveWorkspacesCommand(
-    passedParam: string[],
-    options: UpdateTo0_32CommandOptions,
-    workspaceIds: string[],
-  ): Promise<void> {
-    await this.syncWorkspaceMetadataCommand.executeActiveWorkspacesCommand(
-      passedParam,
-      {
-        ...options,
-        force: true,
-      },
-      workspaceIds,
-    );
-
-    await this.simplifySearchVectorExpressionCommand.executeActiveWorkspacesCommand(
-      passedParam,
-      options,
-      workspaceIds,
-    );
-
-    await this.copyWebhookOperationIntoOperationsCommand.executeActiveWorkspacesCommand(
-      passedParam,
-      options,
-      workspaceIds,
-    );
-
-    await this.backfillViewGroupsCommand.executeActiveWorkspacesCommand(
-      passedParam,
-      options,
-      workspaceIds,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-32/0-32-upgrade-version.module.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-32/0-32-upgrade-version.module.ts
deleted file mode 100644
index 63f033a90462..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-32/0-32-upgrade-version.module.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { CopyWebhookOperationIntoOperationsCommand } from 'src/database/commands/upgrade-version/0-32/0-32-copy-webhook-operation-into-operations-command';
-import { SimplifySearchVectorExpressionCommand } from 'src/database/commands/upgrade-version/0-32/0-32-simplify-search-vector-expression';
-import { UpgradeTo0_32Command } from 'src/database/commands/upgrade-version/0-32/0-32-upgrade-version.command';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { SearchModule } from 'src/engine/metadata-modules/search/search.module';
-import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
-import { WorkspaceSyncMetadataCommandsModule } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module';
-
-import { BackfillViewGroupsCommand } from './0-32-backfill-view-groups.command';
-
-@Module({
-  imports: [
-    TypeOrmModule.forFeature([Workspace], 'core'),
-    TypeOrmModule.forFeature(
-      [ObjectMetadataEntity, FieldMetadataEntity],
-      'metadata',
-    ),
-    WorkspaceSyncMetadataCommandsModule,
-    SearchModule,
-    WorkspaceMigrationRunnerModule,
-  ],
-  providers: [
-    UpgradeTo0_32Command,
-    BackfillViewGroupsCommand,
-    CopyWebhookOperationIntoOperationsCommand,
-    SimplifySearchVectorExpressionCommand,
-  ],
-})
-export class UpgradeTo0_32CommandModule {}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-33/0-33-delete-view-fields-without-views.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-33/0-33-delete-view-fields-without-views.command.ts
deleted file mode 100644
index 790d829a9041..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-33/0-33-delete-view-fields-without-views.command.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import chalk from 'chalk';
-import { Command } from 'nest-commander';
-import { IsNull, Repository } from 'typeorm';
-
-import {
-  ActiveWorkspacesCommandOptions,
-  ActiveWorkspacesCommandRunner,
-} from 'src/database/commands/active-workspaces.command';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
-
-interface DeleteViewFieldsWithoutViewsCommandOptions
-  extends ActiveWorkspacesCommandOptions {}
-
-@Command({
-  name: 'upgrade-0.33:delete-view-fields-without-views',
-  description: 'Delete ViewFields that do not have a View',
-})
-export class DeleteViewFieldsWithoutViewsCommand extends ActiveWorkspacesCommandRunner {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
-  ) {
-    super(workspaceRepository);
-  }
-
-  async executeActiveWorkspacesCommand(
-    _passedParam: string[],
-    options: DeleteViewFieldsWithoutViewsCommandOptions,
-    workspaceIds: string[],
-  ): Promise<void> {
-    this.logger.log(
-      'Running command to delete ViewFields that do not have a View',
-    );
-
-    for (const workspaceId of workspaceIds) {
-      this.logger.log(`Running command for workspace ${workspaceId}`);
-
-      try {
-        await this.deleteViewFieldsWithoutViewsForWorkspace(
-          workspaceId,
-          options,
-        );
-      } catch (error) {
-        this.logger.log(
-          chalk.red(
-            `Running command on workspace ${workspaceId} failed with error: ${error}, ${error.stack}`,
-          ),
-        );
-        continue;
-      } finally {
-        this.logger.log(
-          chalk.green(`Finished running command for workspace ${workspaceId}.`),
-        );
-      }
-    }
-
-    this.logger.log(chalk.green(`Command completed!`));
-  }
-
-  private async deleteViewFieldsWithoutViewsForWorkspace(
-    workspaceId: string,
-    options: DeleteViewFieldsWithoutViewsCommandOptions,
-  ): Promise<void> {
-    const viewFieldRepository =
-      await this.twentyORMGlobalManager.getRepositoryForWorkspace(
-        workspaceId,
-        'viewField',
-        false,
-      );
-
-    const viewFieldsWithoutViews = await viewFieldRepository.find({
-      where: {
-        viewId: IsNull(),
-      },
-    });
-
-    const viewFieldIds = viewFieldsWithoutViews.map((vf) => vf.id);
-
-    if (!options.dryRun && viewFieldIds.length > 0) {
-      await viewFieldRepository.delete(viewFieldIds);
-    }
-
-    if (options.verbose) {
-      this.logger.log(
-        chalk.yellow(
-          `Deleted ${viewFieldsWithoutViews.length} ViewFields that do not have a View`,
-        ),
-      );
-    }
-  }
-}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-33/0-33-enforce-unique-constraints.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-33/0-33-enforce-unique-constraints.command.ts
deleted file mode 100644
index a5a0acb850cb..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-33/0-33-enforce-unique-constraints.command.ts
+++ /dev/null
@@ -1,320 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import chalk from 'chalk';
-import { Command, Option } from 'nest-commander';
-import { IsNull, Repository } from 'typeorm';
-
-import {
-  ActiveWorkspacesCommandOptions,
-  ActiveWorkspacesCommandRunner,
-} from 'src/database/commands/active-workspaces.command';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
-
-interface EnforceUniqueConstraintsCommandOptions
-  extends ActiveWorkspacesCommandOptions {
-  person?: boolean;
-  company?: boolean;
-  viewField?: boolean;
-  viewSort?: boolean;
-}
-
-@Command({
-  name: 'upgrade-0.33:enforce-unique-constraints',
-  description:
-    'Enforce unique constraints on company domainName, person emailsPrimaryEmail, ViewField, and ViewSort',
-})
-export class EnforceUniqueConstraintsCommand extends ActiveWorkspacesCommandRunner {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
-  ) {
-    super(workspaceRepository);
-  }
-
-  @Option({
-    flags: '--person',
-    description: 'Enforce unique constraints on person emailsPrimaryEmail',
-  })
-  parsePerson() {
-    return true;
-  }
-
-  @Option({
-    flags: '--company',
-    description: 'Enforce unique constraints on company domainName',
-  })
-  parseCompany() {
-    return true;
-  }
-
-  @Option({
-    flags: '--view-field',
-    description: 'Enforce unique constraints on ViewField',
-  })
-  parseViewField() {
-    return true;
-  }
-
-  @Option({
-    flags: '--view-sort',
-    description: 'Enforce unique constraints on ViewSort',
-  })
-  parseViewSort() {
-    return true;
-  }
-
-  async executeActiveWorkspacesCommand(
-    _passedParam: string[],
-    options: EnforceUniqueConstraintsCommandOptions,
-    workspaceIds: string[],
-  ): Promise<void> {
-    this.logger.log('Running command to enforce unique constraints');
-
-    for (const workspaceId of workspaceIds) {
-      this.logger.log(`Running command for workspace ${workspaceId}`);
-
-      try {
-        await this.enforceUniqueConstraintsForWorkspace(workspaceId, options);
-      } catch (error) {
-        this.logger.log(
-          chalk.red(
-            `Running command on workspace ${workspaceId} failed with error: ${error}, ${error.stack}`,
-          ),
-        );
-        continue;
-      } finally {
-        this.logger.log(
-          chalk.green(`Finished running command for workspace ${workspaceId}.`),
-        );
-      }
-    }
-
-    this.logger.log(chalk.green(`Command completed!`));
-  }
-
-  private async enforceUniqueConstraintsForWorkspace(
-    workspaceId: string,
-    options: EnforceUniqueConstraintsCommandOptions,
-  ): Promise<void> {
-    if (options.person) {
-      await this.enforceUniquePersonEmail(workspaceId, options);
-    }
-    if (options.company) {
-      await this.enforceUniqueCompanyDomainName(workspaceId, options);
-    }
-    if (options.viewField) {
-      await this.enforceUniqueViewField(workspaceId, options);
-    }
-    if (options.viewSort) {
-      await this.enforceUniqueViewSort(workspaceId, options);
-    }
-  }
-
-  private async enforceUniqueCompanyDomainName(
-    workspaceId: string,
-    options: EnforceUniqueConstraintsCommandOptions,
-  ): Promise<void> {
-    const companyRepository =
-      await this.twentyORMGlobalManager.getRepositoryForWorkspace(
-        workspaceId,
-        'company',
-        false,
-      );
-
-    const duplicates = await companyRepository
-      .createQueryBuilder('company')
-      .select('company.domainNamePrimaryLinkUrl')
-      .addSelect('COUNT(*)', 'count')
-      .where('company.deletedAt IS NULL')
-      .where('company.domainNamePrimaryLinkUrl IS NOT NULL')
-      .where("company.domainNamePrimaryLinkUrl != ''")
-      .groupBy('company.domainNamePrimaryLinkUrl')
-      .having('COUNT(*) > 1')
-      .getRawMany();
-
-    for (const duplicate of duplicates) {
-      const { company_domainNamePrimaryLinkUrl } = duplicate;
-      const companies = await companyRepository.find({
-        where: {
-          domainName: {
-            primaryLinkUrl: company_domainNamePrimaryLinkUrl,
-          },
-          deletedAt: IsNull(),
-        },
-        order: { createdAt: 'DESC' },
-      });
-
-      for (let i = 1; i < companies.length; i++) {
-        const newdomainNamePrimaryLinkUrl = `${company_domainNamePrimaryLinkUrl}${i}`;
-
-        if (!options.dryRun) {
-          await companyRepository.update(companies[i].id, {
-            domainNamePrimaryLinkUrl: newdomainNamePrimaryLinkUrl,
-          });
-        }
-        if (options.verbose) {
-          this.logger.log(
-            chalk.yellow(
-              `Updated company ${companies[i].id} domainName from ${company_domainNamePrimaryLinkUrl} to ${newdomainNamePrimaryLinkUrl}`,
-            ),
-          );
-        }
-      }
-    }
-  }
-
-  private async enforceUniquePersonEmail(
-    workspaceId: string,
-    options: EnforceUniqueConstraintsCommandOptions,
-  ): Promise<void> {
-    const personRepository =
-      await this.twentyORMGlobalManager.getRepositoryForWorkspace(
-        workspaceId,
-        'person',
-        false,
-      );
-
-    const duplicates = await personRepository
-      .createQueryBuilder('person')
-      .select('person.emailsPrimaryEmail')
-      .addSelect('COUNT(*)', 'count')
-      .where('person.deletedAt IS NULL')
-      .where('person.emailsPrimaryEmail IS NOT NULL')
-      .where("person.emailsPrimaryEmail != ''")
-      .groupBy('person.emailsPrimaryEmail')
-      .having('COUNT(*) > 1')
-      .getRawMany();
-
-    for (const duplicate of duplicates) {
-      const { person_emailsPrimaryEmail } = duplicate;
-      const persons = await personRepository.find({
-        where: {
-          emails: {
-            primaryEmail: person_emailsPrimaryEmail,
-          },
-          deletedAt: IsNull(),
-        },
-        order: { createdAt: 'DESC' },
-      });
-
-      for (let i = 1; i < persons.length; i++) {
-        const newEmail = person_emailsPrimaryEmail?.includes('@')
-          ? `${person_emailsPrimaryEmail.split('@')[0]}+${i}@${person_emailsPrimaryEmail.split('@')[1]}`
-          : `${person_emailsPrimaryEmail}+${i}`;
-
-        if (!options.dryRun) {
-          await personRepository.update(persons[i].id, {
-            emailsPrimaryEmail: newEmail,
-          });
-        }
-        if (options.verbose) {
-          this.logger.log(
-            chalk.yellow(
-              `Updated person ${persons[i].id} emailsPrimaryEmail from ${person_emailsPrimaryEmail} to ${newEmail}`,
-            ),
-          );
-        }
-      }
-    }
-  }
-
-  private async enforceUniqueViewField(
-    workspaceId: string,
-    options: EnforceUniqueConstraintsCommandOptions,
-  ): Promise<void> {
-    const viewFieldRepository =
-      await this.twentyORMGlobalManager.getRepositoryForWorkspace(
-        workspaceId,
-        'viewField',
-        false,
-      );
-
-    const duplicates = await viewFieldRepository
-      .createQueryBuilder('viewField')
-      .select(['viewField.fieldMetadataId', 'viewField.viewId'])
-      .addSelect('COUNT(*)', 'count')
-      .where('viewField.deletedAt IS NULL')
-      .groupBy('viewField.fieldMetadataId, viewField.viewId')
-      .having('COUNT(*) > 1')
-      .getRawMany();
-
-    for (const duplicate of duplicates) {
-      const {
-        viewField_fieldMetadataId: fieldMetadataId,
-        viewField_viewId: viewId,
-      } = duplicate;
-      const viewFields = await viewFieldRepository.find({
-        where: {
-          fieldMetadataId,
-          viewId,
-          deletedAt: IsNull(),
-        },
-        order: { createdAt: 'DESC' },
-      });
-
-      for (let i = 1; i < viewFields.length; i++) {
-        if (!options.dryRun) {
-          await viewFieldRepository.softDelete(viewFields[i].id);
-        }
-        if (options.verbose) {
-          this.logger.log(
-            chalk.yellow(
-              `Soft deleted duplicate ViewField ${viewFields[i].id} for fieldMetadataId ${fieldMetadataId} and viewId ${viewId}`,
-            ),
-          );
-        }
-      }
-    }
-  }
-
-  private async enforceUniqueViewSort(
-    workspaceId: string,
-    options: EnforceUniqueConstraintsCommandOptions,
-  ): Promise<void> {
-    const viewSortRepository =
-      await this.twentyORMGlobalManager.getRepositoryForWorkspace(
-        workspaceId,
-        'viewSort',
-        false,
-      );
-
-    const duplicates = await viewSortRepository
-      .createQueryBuilder('viewSort')
-      .select(['viewSort.fieldMetadataId', 'viewSort.viewId'])
-      .addSelect('COUNT(*)', 'count')
-      .where('viewSort.deletedAt IS NULL')
-      .groupBy('viewSort.fieldMetadataId, viewSort.viewId')
-      .having('COUNT(*) > 1')
-      .getRawMany();
-
-    for (const duplicate of duplicates) {
-      const {
-        viewSort_fieldMetadataId: fieldMetadataId,
-        viewSort_viewId: viewId,
-      } = duplicate;
-      const viewSorts = await viewSortRepository.find({
-        where: {
-          fieldMetadataId,
-          viewId,
-          deletedAt: IsNull(),
-        },
-        order: { createdAt: 'DESC' },
-      });
-
-      for (let i = 1; i < viewSorts.length; i++) {
-        if (!options.dryRun) {
-          await viewSortRepository.softDelete(viewSorts[i].id);
-        }
-        if (options.verbose) {
-          this.logger.log(
-            chalk.yellow(
-              `Soft deleted duplicate ViewSort ${viewSorts[i].id} for fieldMetadataId ${fieldMetadataId} and viewId ${viewId}`,
-            ),
-          );
-        }
-      }
-    }
-  }
-}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-33/0-33-set-missing-label-identifier-to-custom-objects.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-33/0-33-set-missing-label-identifier-to-custom-objects.command.ts
deleted file mode 100644
index 6505c748a6c8..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-33/0-33-set-missing-label-identifier-to-custom-objects.command.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import chalk from 'chalk';
-import { Command } from 'nest-commander';
-import { IsNull, Repository } from 'typeorm';
-
-import {
-  ActiveWorkspacesCommandOptions,
-  ActiveWorkspacesCommandRunner,
-} from 'src/database/commands/active-workspaces.command';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
-import { CUSTOM_OBJECT_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
-
-interface SetMissingLabelIdentifierToCustomObjectsCommandOptions
-  extends ActiveWorkspacesCommandOptions {}
-
-@Command({
-  name: 'upgrade-0.33:set-missing-label-identifier-to-custom-objects',
-  description: 'Set missing labelIdentifier to custom objects',
-})
-export class SetMissingLabelIdentifierToCustomObjectsCommand extends ActiveWorkspacesCommandRunner {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    @InjectRepository(FieldMetadataEntity, 'metadata')
-    private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
-    @InjectRepository(ObjectMetadataEntity, 'metadata')
-    private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
-    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
-  ) {
-    super(workspaceRepository);
-  }
-
-  async executeActiveWorkspacesCommand(
-    _passedParam: string[],
-    options: SetMissingLabelIdentifierToCustomObjectsCommandOptions,
-    workspaceIds: string[],
-  ): Promise<void> {
-    this.logger.log(
-      'Running command to set missing labelIdentifier to custom objects',
-    );
-
-    for (const workspaceId of workspaceIds) {
-      this.logger.log(`Running command for workspace ${workspaceId}`);
-
-      try {
-        await this.setMissingLabelIdentifierToCustomObjectsForWorkspace(
-          workspaceId,
-          options,
-        );
-      } catch (error) {
-        this.logger.log(
-          chalk.red(
-            `Running command on workspace ${workspaceId} failed with error: ${error}, ${error.stack}`,
-          ),
-        );
-        continue;
-      } finally {
-        this.logger.log(
-          chalk.green(`Finished running command for workspace ${workspaceId}.`),
-        );
-      }
-    }
-
-    this.logger.log(chalk.green(`Command completed!`));
-  }
-
-  private async setMissingLabelIdentifierToCustomObjectsForWorkspace(
-    workspaceId: string,
-    options: SetMissingLabelIdentifierToCustomObjectsCommandOptions,
-  ): Promise<void> {
-    const customObjects = await this.objectMetadataRepository.find({
-      where: {
-        workspaceId,
-        labelIdentifierFieldMetadataId: IsNull(),
-        isCustom: true,
-      },
-    });
-
-    for (const customObject of customObjects) {
-      const labelIdentifierFieldMetadata =
-        await this.fieldMetadataRepository.findOne({
-          where: {
-            workspaceId,
-            objectMetadataId: customObject.id,
-            standardId: CUSTOM_OBJECT_STANDARD_FIELD_IDS.name,
-          },
-        });
-
-      if (labelIdentifierFieldMetadata && !options.dryRun) {
-        await this.objectMetadataRepository.update(customObject.id, {
-          labelIdentifierFieldMetadataId: labelIdentifierFieldMetadata.id,
-        });
-      }
-
-      if (options.verbose) {
-        this.logger.log(
-          chalk.yellow(
-            `Set labelIdentifierFieldMetadataId for custom object ${customObject.nameSingular}`,
-          ),
-        );
-      }
-    }
-  }
-}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-33/0-33-update-rich-text-search-vector-expression.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-33/0-33-update-rich-text-search-vector-expression.ts
deleted file mode 100644
index 0b95e6a67ca5..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-33/0-33-update-rich-text-search-vector-expression.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import chalk from 'chalk';
-import { Command } from 'nest-commander';
-import { Repository } from 'typeorm';
-
-import {
-  ActiveWorkspacesCommandOptions,
-  ActiveWorkspacesCommandRunner,
-} from 'src/database/commands/active-workspaces.command';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { SearchService } from 'src/engine/metadata-modules/search/search.service';
-import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service';
-import {
-  NOTE_STANDARD_FIELD_IDS,
-  TASK_STANDARD_FIELD_IDS,
-} from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
-import { FieldTypeAndNameMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/utils/get-ts-vector-column-expression.util';
-import { SEARCH_FIELDS_FOR_NOTES } from 'src/modules/note/standard-objects/note.workspace-entity';
-import { SEARCH_FIELDS_FOR_TASK } from 'src/modules/task/standard-objects/task.workspace-entity';
-
-@Command({
-  name: 'fix-0.33:update-rich-text-expression',
-  description: 'Update rich text (note and task) search vector expressions',
-})
-export class UpdateRichTextSearchVectorCommand extends ActiveWorkspacesCommandRunner {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    @InjectRepository(FieldMetadataEntity, 'metadata')
-    private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
-    private readonly searchService: SearchService,
-    private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
-  ) {
-    super(workspaceRepository);
-  }
-
-  async executeActiveWorkspacesCommand(
-    _passedParam: string[],
-    _options: ActiveWorkspacesCommandOptions,
-    workspaceIds: string[],
-  ): Promise<void> {
-    this.logger.log('Running command to fix migration');
-
-    for (const workspaceId of workspaceIds) {
-      this.logger.log(`Running command for workspace ${workspaceId}`);
-
-      try {
-        const searchVectorFields = await this.fieldMetadataRepository.findBy({
-          workspaceId: workspaceId,
-          type: FieldMetadataType.TS_VECTOR,
-        });
-
-        for (const searchVectorField of searchVectorFields) {
-          let fieldsUsedForSearch: FieldTypeAndNameMetadata[] = [];
-          let objectNameForLog = '';
-
-          switch (searchVectorField.standardId) {
-            case NOTE_STANDARD_FIELD_IDS.searchVector: {
-              fieldsUsedForSearch = SEARCH_FIELDS_FOR_NOTES;
-              objectNameForLog = 'Note';
-              break;
-            }
-            case TASK_STANDARD_FIELD_IDS.searchVector: {
-              fieldsUsedForSearch = SEARCH_FIELDS_FOR_TASK;
-              objectNameForLog = 'Task';
-              break;
-            }
-          }
-
-          if (fieldsUsedForSearch.length === 0) {
-            continue;
-          }
-
-          this.logger.log(
-            `Updating searchVector for ${searchVectorField.objectMetadataId} (${objectNameForLog})...`,
-          );
-
-          await this.searchService.updateSearchVector(
-            searchVectorField.objectMetadataId,
-            fieldsUsedForSearch,
-            workspaceId,
-          );
-
-          await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
-            workspaceId,
-          );
-        }
-      } catch (error) {
-        this.logger.log(
-          chalk.red(
-            `Running command on workspace ${workspaceId} failed with error: ${error}`,
-          ),
-        );
-        continue;
-      } finally {
-        this.logger.log(
-          chalk.green(`Finished running command for workspace ${workspaceId}.`),
-        );
-      }
-
-      this.logger.log(chalk.green(`Command completed!`));
-    }
-  }
-}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-33/0-33-upgrade-version.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-33/0-33-upgrade-version.command.ts
deleted file mode 100644
index 5fbad5ca8ec9..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-33/0-33-upgrade-version.command.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Command } from 'nest-commander';
-import { Repository } from 'typeorm';
-
-import { ActiveWorkspacesCommandRunner } from 'src/database/commands/active-workspaces.command';
-import { DeleteViewFieldsWithoutViewsCommand } from 'src/database/commands/upgrade-version/0-33/0-33-delete-view-fields-without-views.command';
-import { EnforceUniqueConstraintsCommand } from 'src/database/commands/upgrade-version/0-33/0-33-enforce-unique-constraints.command';
-import { SetMissingLabelIdentifierToCustomObjectsCommand } from 'src/database/commands/upgrade-version/0-33/0-33-set-missing-label-identifier-to-custom-objects.command';
-import { UpdateRichTextSearchVectorCommand } from 'src/database/commands/upgrade-version/0-33/0-33-update-rich-text-search-vector-expression';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { SyncWorkspaceMetadataCommand } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command';
-
-interface UpdateTo0_33CommandOptions {
-  workspaceId?: string;
-}
-
-@Command({
-  name: 'upgrade-0.33',
-  description: 'Upgrade to 0.33',
-})
-export class UpgradeTo0_33Command extends ActiveWorkspacesCommandRunner {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    private readonly updateRichTextSearchVectorCommand: UpdateRichTextSearchVectorCommand,
-    private readonly enforceUniqueConstraintsCommand: EnforceUniqueConstraintsCommand,
-    private readonly deleteViewFieldsWithoutViewsCommand: DeleteViewFieldsWithoutViewsCommand,
-    private readonly syncWorkspaceMetadataCommand: SyncWorkspaceMetadataCommand,
-    private readonly setMissingLabelIdentifierToCustomObjectsCommand: SetMissingLabelIdentifierToCustomObjectsCommand,
-  ) {
-    super(workspaceRepository);
-  }
-
-  async executeActiveWorkspacesCommand(
-    passedParam: string[],
-    options: UpdateTo0_33CommandOptions,
-    workspaceIds: string[],
-  ): Promise<void> {
-    await this.deleteViewFieldsWithoutViewsCommand.executeActiveWorkspacesCommand(
-      passedParam,
-      options,
-      workspaceIds,
-    );
-    await this.enforceUniqueConstraintsCommand.executeActiveWorkspacesCommand(
-      passedParam,
-      {
-        ...options,
-        company: true,
-        person: true,
-        viewField: true,
-        viewSort: true,
-      },
-      workspaceIds,
-    );
-    await this.syncWorkspaceMetadataCommand.executeActiveWorkspacesCommand(
-      passedParam,
-      {
-        ...options,
-        force: true,
-      },
-      workspaceIds,
-    );
-    await this.updateRichTextSearchVectorCommand.executeActiveWorkspacesCommand(
-      passedParam,
-      options,
-      workspaceIds,
-    );
-    await this.setMissingLabelIdentifierToCustomObjectsCommand.executeActiveWorkspacesCommand(
-      passedParam,
-      options,
-      workspaceIds,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-33/0-33-upgrade-version.module.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-33/0-33-upgrade-version.module.ts
deleted file mode 100644
index 9aa09eb69287..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-33/0-33-upgrade-version.module.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { DeleteViewFieldsWithoutViewsCommand } from 'src/database/commands/upgrade-version/0-33/0-33-delete-view-fields-without-views.command';
-import { EnforceUniqueConstraintsCommand } from 'src/database/commands/upgrade-version/0-33/0-33-enforce-unique-constraints.command';
-import { SetMissingLabelIdentifierToCustomObjectsCommand } from 'src/database/commands/upgrade-version/0-33/0-33-set-missing-label-identifier-to-custom-objects.command';
-import { UpdateRichTextSearchVectorCommand } from 'src/database/commands/upgrade-version/0-33/0-33-update-rich-text-search-vector-expression';
-import { UpgradeTo0_33Command } from 'src/database/commands/upgrade-version/0-33/0-33-upgrade-version.command';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { SearchModule } from 'src/engine/metadata-modules/search/search.module';
-import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
-import { WorkspaceSyncMetadataCommandsModule } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module';
-
-@Module({
-  imports: [
-    TypeOrmModule.forFeature([Workspace], 'core'),
-    TypeOrmModule.forFeature(
-      [ObjectMetadataEntity, FieldMetadataEntity],
-      'metadata',
-    ),
-    WorkspaceSyncMetadataCommandsModule,
-    SearchModule,
-    WorkspaceMigrationRunnerModule,
-  ],
-  providers: [
-    UpgradeTo0_33Command,
-    UpdateRichTextSearchVectorCommand,
-    EnforceUniqueConstraintsCommand,
-    DeleteViewFieldsWithoutViewsCommand,
-    SetMissingLabelIdentifierToCustomObjectsCommand,
-  ],
-})
-export class UpgradeTo0_33CommandModule {}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-34/0-34-generate-subdomain.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-34/0-34-generate-subdomain.command.ts
deleted file mode 100644
index 4656de25bb9d..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-34/0-34-generate-subdomain.command.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Command } from 'nest-commander';
-import { In, Repository } from 'typeorm';
-
-import { ActiveWorkspacesCommandRunner } from 'src/database/commands/active-workspaces.command';
-import { BaseCommandOptions } from 'src/database/commands/base.command';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-
-// For DX only
-type WorkspaceId = string;
-
-type Subdomain = string;
-
-@Command({
-  name: 'feat-0.34:add-subdomain-to-workspace',
-  description: 'Add a default subdomain to each workspace',
-})
-export class GenerateDefaultSubdomainCommand extends ActiveWorkspacesCommandRunner {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-  ) {
-    super(workspaceRepository);
-  }
-
-  private generatePayloadForQuery({
-    id,
-    subdomain,
-    domainName,
-    displayName,
-  }: Workspace) {
-    const result = { id, subdomain };
-
-    if (domainName) {
-      const subdomain = domainName.split('.')[0];
-
-      if (subdomain.length > 0) {
-        result.subdomain = subdomain;
-      }
-    }
-
-    if (!domainName && displayName) {
-      result.subdomain = this.sanitizeForSubdomain(displayName);
-    }
-
-    return result;
-  }
-
-  private sanitizeForSubdomain(input: string) {
-    const normalized = input.normalize('NFKD').replace(/[\u0300-\u036f]/g, '');
-
-    const hyphenated = normalized
-      .replace(/[^a-zA-Z0-9]/g, '-')
-      .replace(/-+/g, '-')
-      .replace(/^-+|-+$/g, '')
-      .toLowerCase();
-
-    // DNS subdomain limit is 63, but we want to be conservative for duplicates
-    return hyphenated.substring(0, 60);
-  }
-
-  private groupBySubdomainName(
-    acc: Record<Subdomain, Array<WorkspaceId>>,
-    workspace: Workspace,
-  ) {
-    const payload = this.generatePayloadForQuery(workspace);
-
-    acc[payload.subdomain] = acc[payload.subdomain]
-      ? acc[payload.subdomain].concat([payload.id])
-      : [payload.id];
-
-    return acc;
-  }
-
-  private async deduplicateAndSave(
-    subdomain: Subdomain,
-    workspaceIds: Array<WorkspaceId>,
-    existingSubdomains: Set<string>,
-    options: BaseCommandOptions,
-  ) {
-    for (const [index, workspaceId] of workspaceIds.entries()) {
-      const subdomainDeduplicated =
-        index === 0
-          ? existingSubdomains.has(subdomain)
-            ? `${subdomain}-${index}`
-            : subdomain
-          : `${subdomain}-${index}`;
-
-      this.logger.log(
-        `Updating workspace ${workspaceId} with subdomain ${subdomainDeduplicated}`,
-      );
-
-      existingSubdomains.add(subdomainDeduplicated);
-
-      if (!options.dryRun) {
-        await this.workspaceRepository.update(workspaceId, {
-          subdomain: subdomainDeduplicated,
-        });
-      }
-    }
-  }
-
-  async executeActiveWorkspacesCommand(
-    _passedParam: string[],
-    options: BaseCommandOptions,
-    activeWorkspaceIds: string[],
-  ): Promise<void> {
-    const workspaces = await this.workspaceRepository.find(
-      activeWorkspaceIds.length > 0
-        ? {
-            where: {
-              id: In(activeWorkspaceIds),
-            },
-          }
-        : undefined,
-    );
-
-    if (workspaces.length === 0) {
-      this.logger.log('No workspaces found');
-
-      return;
-    }
-
-    const workspaceBySubdomain = Object.entries(
-      workspaces.reduce(
-        (acc, workspace) => this.groupBySubdomainName(acc, workspace),
-        {} as ReturnType<typeof this.groupBySubdomainName>,
-      ),
-    );
-
-    const existingSubdomains: Set<string> = new Set();
-
-    for (const [subdomain, workspaceIds] of workspaceBySubdomain) {
-      await this.deduplicateAndSave(
-        subdomain,
-        workspaceIds,
-        existingSubdomains,
-        options,
-      );
-    }
-  }
-}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-34/0-34-upgrade-version.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-34/0-34-upgrade-version.command.ts
deleted file mode 100644
index 4817eb5d1a11..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-34/0-34-upgrade-version.command.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Command } from 'nest-commander';
-import { Repository } from 'typeorm';
-
-import { ActiveWorkspacesCommandRunner } from 'src/database/commands/active-workspaces.command';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { GenerateDefaultSubdomainCommand } from 'src/database/commands/upgrade-version/0-34/0-34-generate-subdomain.command';
-
-interface UpdateTo0_34CommandOptions {
-  workspaceId?: string;
-}
-
-@Command({
-  name: 'upgrade-0.34',
-  description: 'Upgrade to 0.34',
-})
-export class UpgradeTo0_34Command extends ActiveWorkspacesCommandRunner {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    private readonly generateDefaultSubdomainCommand: GenerateDefaultSubdomainCommand,
-  ) {
-    super(workspaceRepository);
-  }
-
-  async executeActiveWorkspacesCommand(
-    passedParam: string[],
-    options: UpdateTo0_34CommandOptions,
-    workspaceIds: string[],
-  ): Promise<void> {
-    await this.generateDefaultSubdomainCommand.executeActiveWorkspacesCommand(
-      passedParam,
-      options,
-      workspaceIds,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-34/0-34-upgrade-version.module.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-34/0-34-upgrade-version.module.ts
deleted file mode 100644
index 2e532cc64dd6..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-34/0-34-upgrade-version.module.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { GenerateDefaultSubdomainCommand } from 'src/database/commands/upgrade-version/0-34/0-34-generate-subdomain.command';
-import { UpgradeTo0_34Command } from 'src/database/commands/upgrade-version/0-34/0-34-upgrade-version.command';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { SearchModule } from 'src/engine/metadata-modules/search/search.module';
-import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
-import { WorkspaceSyncMetadataCommandsModule } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module';
-
-@Module({
-  imports: [
-    TypeOrmModule.forFeature([Workspace], 'core'),
-    TypeOrmModule.forFeature(
-      [ObjectMetadataEntity, FieldMetadataEntity],
-      'metadata',
-    ),
-    WorkspaceSyncMetadataCommandsModule,
-    SearchModule,
-    WorkspaceMigrationRunnerModule,
-  ],
-  providers: [UpgradeTo0_34Command, GenerateDefaultSubdomainCommand],
-})
-export class UpgradeTo0_34CommandModule {}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-create-column.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-create-column.command.ts
deleted file mode 100644
index 21fe77a6de86..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-create-column.command.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import chalk from 'chalk';
-import { Command } from 'nest-commander';
-import { Repository } from 'typeorm';
-import { v4 } from 'uuid';
-
-import {
-  ActiveWorkspacesCommandOptions,
-  ActiveWorkspacesCommandRunner,
-} from 'src/database/commands/active-workspaces.command';
-import { isCommandLogger } from 'src/database/commands/logger';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/services/workspace-metadata-version.service';
-import { generateMigrationName } from 'src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util';
-import {
-  WorkspaceMigrationColumnActionType,
-  WorkspaceMigrationTableAction,
-  WorkspaceMigrationTableActionType,
-} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
-import { WorkspaceMigrationFactory } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.factory';
-import { WorkspaceMigrationService } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.service';
-import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
-import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service';
-import { isDefined } from 'src/utils/is-defined';
-
-@Command({
-  name: 'upgrade-0.35:phone-calling-code-create-column',
-  description: 'Create the callingCode column',
-})
-export class PhoneCallingCodeCreateColumnCommand extends ActiveWorkspacesCommandRunner {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    @InjectRepository(FieldMetadataEntity, 'metadata')
-    private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
-    private readonly workspaceMigrationService: WorkspaceMigrationService,
-    private readonly workspaceMigrationFactory: WorkspaceMigrationFactory,
-    private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
-    private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
-  ) {
-    super(workspaceRepository);
-  }
-
-  async executeActiveWorkspacesCommand(
-    _passedParam: string[],
-    options: ActiveWorkspacesCommandOptions,
-    workspaceIds: string[],
-  ): Promise<void> {
-    this.logger.log(
-      'Running command to add calling code and change country code with default one',
-    );
-    if (isCommandLogger(this.logger)) {
-      this.logger.setVerbose(options.verbose ?? false);
-    }
-
-    this.logger.verbose(`Part 1 - Workspace`);
-    let workspaceIterator = 1;
-
-    for (const workspaceId of workspaceIds) {
-      this.logger.verbose(
-        `Running command for workspace ${workspaceId} ${workspaceIterator}/${workspaceIds.length}`,
-      );
-
-      this.logger.verbose(
-        `P1 Step 1 - let's find all the fieldsMetadata that have the PHONES type, and extract the objectMetadataId`,
-      );
-
-      try {
-        const phonesFieldMetadata = await this.fieldMetadataRepository.find({
-          where: {
-            workspaceId,
-            type: FieldMetadataType.PHONES,
-          },
-          relations: ['object'],
-        });
-
-        for (const phoneFieldMetadata of phonesFieldMetadata) {
-          if (
-            isDefined(phoneFieldMetadata?.name) &&
-            isDefined(phoneFieldMetadata.object)
-          ) {
-            this.logger.verbose(
-              `P1 Step 1 - Let's find the "nameSingular" of this objectMetadata: ${phoneFieldMetadata.object.nameSingular || 'not found'}`,
-            );
-
-            if (!phoneFieldMetadata.object?.nameSingular) continue;
-
-            this.logger.verbose(
-              `P1 Step 1 - Create migration for field ${phoneFieldMetadata.name}`,
-            );
-
-            if (options.dryRun) {
-              continue;
-            }
-            await this.workspaceMigrationService.createCustomMigration(
-              generateMigrationName(
-                `create-${phoneFieldMetadata.object.nameSingular}PrimaryPhoneCallingCode-for-field-${phoneFieldMetadata.name}`,
-              ),
-              workspaceId,
-              [
-                {
-                  name: computeObjectTargetTable(phoneFieldMetadata.object),
-                  action: WorkspaceMigrationTableActionType.ALTER,
-                  columns: this.workspaceMigrationFactory.createColumnActions(
-                    WorkspaceMigrationColumnActionType.CREATE,
-                    {
-                      id: v4(),
-                      type: FieldMetadataType.TEXT,
-                      name: `${phoneFieldMetadata.name}PrimaryPhoneCallingCode`,
-                      label: `${phoneFieldMetadata.name}PrimaryPhoneCallingCode`,
-                      objectMetadataId: phoneFieldMetadata.object.id,
-                      workspaceId: workspaceId,
-                      isNullable: true,
-                      defaultValue: "''",
-                    } satisfies Partial<FieldMetadataEntity>,
-                  ),
-                } satisfies WorkspaceMigrationTableAction,
-              ],
-            );
-          }
-        }
-
-        this.logger.verbose(
-          `P1 Step 1 - RUN migration to create callingCodes for ${workspaceId.slice(0, 5)}`,
-        );
-        await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
-          workspaceId,
-        );
-
-        await this.workspaceMetadataVersionService.incrementMetadataVersion(
-          workspaceId,
-        );
-      } catch (error) {
-        this.logger.log(`Error in workspace ${workspaceId} : ${error}`);
-      }
-      workspaceIterator++;
-    }
-
-    this.logger.log(chalk.green(`Command completed!`));
-  }
-}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-migrate-data.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-migrate-data.command.ts
deleted file mode 100644
index 67bf658918d0..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-migrate-data.command.ts
+++ /dev/null
@@ -1,308 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import chalk from 'chalk';
-import { getCountries, getCountryCallingCode } from 'libphonenumber-js';
-import { Command } from 'nest-commander';
-import { Repository } from 'typeorm';
-import { v4 } from 'uuid';
-
-import {
-  ActiveWorkspacesCommandOptions,
-  ActiveWorkspacesCommandRunner,
-} from 'src/database/commands/active-workspaces.command';
-import { isCommandLogger } from 'src/database/commands/logger';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/services/workspace-metadata-version.service';
-import { generateMigrationName } from 'src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util';
-import {
-  WorkspaceMigrationColumnActionType,
-  WorkspaceMigrationTableAction,
-  WorkspaceMigrationTableActionType,
-} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
-import { WorkspaceMigrationFactory } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.factory';
-import { WorkspaceMigrationService } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.service';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
-import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
-import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service';
-import { isDefined } from 'src/utils/is-defined';
-
-const callingCodeToCountryCode = (callingCode: string): string => {
-  if (!callingCode) {
-    return '';
-  }
-  let callingCodeSanitized = callingCode;
-
-  if (callingCode.startsWith('+')) {
-    callingCodeSanitized = callingCode.slice(1);
-  }
-
-  return (
-    getCountries().find(
-      (countryCode) =>
-        getCountryCallingCode(countryCode) === callingCodeSanitized,
-    ) || ''
-  );
-};
-
-const isCallingCode = (callingCode: string): boolean => {
-  return callingCodeToCountryCode(callingCode) !== '';
-};
-
-@Command({
-  name: 'upgrade-0.35:phone-calling-code-migrate-data',
-  description: 'Add calling code and change country code with default one',
-})
-export class PhoneCallingCodeMigrateDataCommand extends ActiveWorkspacesCommandRunner {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    @InjectRepository(FieldMetadataEntity, 'metadata')
-    private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
-    @InjectRepository(ObjectMetadataEntity, 'metadata')
-    private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
-    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
-    private readonly workspaceMigrationService: WorkspaceMigrationService,
-    private readonly workspaceMigrationFactory: WorkspaceMigrationFactory,
-    private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
-    private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
-  ) {
-    super(workspaceRepository);
-  }
-
-  async executeActiveWorkspacesCommand(
-    _passedParam: string[],
-    options: ActiveWorkspacesCommandOptions,
-    workspaceIds: string[],
-  ): Promise<void> {
-    this.logger.log(
-      'Running command to add calling code and change country code with default one',
-    );
-
-    if (isCommandLogger(this.logger)) {
-      this.logger.setVerbose(options.verbose ?? false);
-    }
-    this.logger.verbose(`Part 1 - Workspace`);
-
-    let workspaceIterator = 1;
-
-    for (const workspaceId of workspaceIds) {
-      this.logger.log(
-        `Running command for workspace ${workspaceId} ${workspaceIterator}/${workspaceIds.length}`,
-      );
-
-      this.logger.verbose(
-        `P1 Step 1 - let's find all the fieldsMetadata that have the PHONES type, and extract the objectMetadataId`,
-      );
-
-      try {
-        const phonesFieldMetadata = await this.fieldMetadataRepository.find({
-          where: {
-            workspaceId,
-            type: FieldMetadataType.PHONES,
-          },
-          relations: ['object'],
-        });
-
-        for (const phoneFieldMetadata of phonesFieldMetadata) {
-          if (
-            isDefined(phoneFieldMetadata?.name) &&
-            isDefined(phoneFieldMetadata.object)
-          ) {
-            this.logger.verbose(
-              `P1 Step 1 - Let's find the "nameSingular" of this objectMetadata: ${phoneFieldMetadata.object.nameSingular || 'not found'}`,
-            );
-
-            if (!phoneFieldMetadata.object?.nameSingular) continue;
-
-            this.logger.verbose(
-              `P1 Step 1 - Create migration for field ${phoneFieldMetadata.name}`,
-            );
-            if (!options.dryRun) {
-              await this.workspaceMigrationService.createCustomMigration(
-                generateMigrationName(
-                  `create-${phoneFieldMetadata.object.nameSingular}PrimaryPhoneCallingCode-for-field-${phoneFieldMetadata.name}`,
-                ),
-                workspaceId,
-                [
-                  {
-                    name: computeObjectTargetTable(phoneFieldMetadata.object),
-                    action: WorkspaceMigrationTableActionType.ALTER,
-                    columns: this.workspaceMigrationFactory.createColumnActions(
-                      WorkspaceMigrationColumnActionType.CREATE,
-                      {
-                        id: v4(),
-                        type: FieldMetadataType.TEXT,
-                        name: `${phoneFieldMetadata.name}PrimaryPhoneCallingCode`,
-                        label: `${phoneFieldMetadata.name}PrimaryPhoneCallingCode`,
-                        objectMetadataId: phoneFieldMetadata.object.id,
-                        workspaceId: workspaceId,
-                        isNullable: true,
-                        defaultValue: "''",
-                      },
-                    ),
-                  } satisfies WorkspaceMigrationTableAction,
-                ],
-              );
-            }
-          }
-        }
-
-        this.logger.verbose(
-          `P1 Step 1 - RUN migration to create callingCodes for ${workspaceId.slice(0, 5)}`,
-        );
-        await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
-          workspaceId,
-        );
-
-        await this.workspaceMetadataVersionService.incrementMetadataVersion(
-          workspaceId,
-        );
-
-        this.logger.verbose(
-          `P1 Step 2 - Migrations for callingCode must be first. Now can use twentyORMGlobalManager to update countryCode`,
-        );
-
-        this.logger.verbose(
-          `P1 Step 3 (same time) - update CountryCode to letters: +33 => FR || +1 => US (if mulitple, first one)`,
-        );
-
-        this.logger.verbose(
-          `P1 Step 4 (same time) - update all additioanl phones to add a country code following the same logic`,
-        );
-
-        for (const phoneFieldMetadata of phonesFieldMetadata) {
-          this.logger.verbose(`P1 Step 2 - for ${phoneFieldMetadata.name}`);
-          if (
-            isDefined(phoneFieldMetadata) &&
-            isDefined(phoneFieldMetadata.name)
-          ) {
-            const [objectMetadata] = await this.objectMetadataRepository.find({
-              where: {
-                id: phoneFieldMetadata?.objectMetadataId,
-              },
-            });
-
-            const repository =
-              await this.twentyORMGlobalManager.getRepositoryForWorkspace(
-                workspaceId,
-                objectMetadata.nameSingular,
-              );
-            const records = await repository.find();
-
-            for (const record of records) {
-              if (
-                record?.[phoneFieldMetadata.name]?.primaryPhoneCountryCode &&
-                isCallingCode(
-                  record[phoneFieldMetadata.name].primaryPhoneCountryCode,
-                )
-              ) {
-                let additionalPhones = null;
-
-                if (record[phoneFieldMetadata.name].additionalPhones) {
-                  additionalPhones = record[
-                    phoneFieldMetadata.name
-                  ].additionalPhones.map((phone) => {
-                    return {
-                      ...phone,
-                      countryCode: callingCodeToCountryCode(phone.callingCode),
-                    };
-                  });
-                }
-                if (!options.dryRun) {
-                  await repository.update(record.id, {
-                    [`${phoneFieldMetadata.name}PrimaryPhoneCallingCode`]:
-                      record[phoneFieldMetadata.name].primaryPhoneCountryCode,
-                    [`${phoneFieldMetadata.name}PrimaryPhoneCountryCode`]:
-                      callingCodeToCountryCode(
-                        record[phoneFieldMetadata.name].primaryPhoneCountryCode,
-                      ),
-                    [`${phoneFieldMetadata.name}AdditionalPhones`]:
-                      additionalPhones,
-                  });
-                }
-              }
-            }
-          }
-        }
-      } catch (error) {
-        this.logger.log(`Error in workspace ${workspaceId} : ${error}`);
-      }
-      workspaceIterator++;
-    }
-
-    this.logger.verbose(`
-      
-      Part 2 - FieldMetadata`);
-
-    workspaceIterator = 1;
-    for (const workspaceId of workspaceIds) {
-      this.logger.log(
-        `Running command for workspace ${workspaceId} ${workspaceIterator}/${workspaceIds.length}`,
-      );
-
-      this.logger.verbose(
-        `P2 Step 1 - let's find all the fieldsMetadata that have the PHONES type, and extract the objectMetadataId`,
-      );
-
-      try {
-        const phonesFieldMetadata = await this.fieldMetadataRepository.find({
-          where: {
-            workspaceId,
-            type: FieldMetadataType.PHONES,
-          },
-        });
-
-        for (const phoneFieldMetadata of phonesFieldMetadata) {
-          if (
-            !isDefined(phoneFieldMetadata) ||
-            !isDefined(phoneFieldMetadata.defaultValue)
-          )
-            continue;
-          let defaultValue = phoneFieldMetadata.defaultValue;
-
-          // some cases look like it's an array. let's flatten it (not sure the case is supposed to happen but I saw it in my local db)
-          if (Array.isArray(defaultValue) && isDefined(defaultValue[0]))
-            defaultValue = phoneFieldMetadata.defaultValue[0];
-
-          if (!isDefined(defaultValue)) continue;
-          if (typeof defaultValue !== 'object') continue;
-          if (!('primaryPhoneCountryCode' in defaultValue)) continue;
-          if (!defaultValue.primaryPhoneCountryCode) continue;
-
-          const primaryPhoneCountryCode = defaultValue.primaryPhoneCountryCode;
-
-          const countryCode = callingCodeToCountryCode(
-            primaryPhoneCountryCode.replace(/["']/g, ''),
-          );
-
-          if (!options.dryRun) {
-            if (!defaultValue.primaryPhoneCallingCode) {
-              await this.fieldMetadataRepository.update(phoneFieldMetadata.id, {
-                defaultValue: {
-                  ...defaultValue,
-                  primaryPhoneCountryCode: countryCode
-                    ? `'${countryCode}'`
-                    : "''",
-                  primaryPhoneCallingCode: isCallingCode(
-                    primaryPhoneCountryCode.replace(/["']/g, ''),
-                  )
-                    ? primaryPhoneCountryCode
-                    : "''",
-                },
-              });
-            }
-          }
-        }
-      } catch (error) {
-        this.logger.log(`Error in workspace ${workspaceId} : ${error}`);
-      }
-      workspaceIterator++;
-    }
-    this.logger.log(chalk.green(`Command completed!`));
-  }
-}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-record-position-backfill.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-record-position-backfill.command.ts
deleted file mode 100644
index 7a342b920eb4..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-record-position-backfill.command.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Command } from 'nest-commander';
-import { Repository } from 'typeorm';
-
-import { ActiveWorkspacesCommandRunner } from 'src/database/commands/active-workspaces.command';
-import { BaseCommandOptions } from 'src/database/commands/base.command';
-import { RecordPositionBackfillService } from 'src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-service';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-
-@Command({
-  name: 'upgrade-0.35:record-position-backfill',
-  description: 'Backfill record position',
-})
-export class RecordPositionBackfillCommand extends ActiveWorkspacesCommandRunner {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    private readonly recordPositionBackfillService: RecordPositionBackfillService,
-  ) {
-    super(workspaceRepository);
-  }
-
-  async executeActiveWorkspacesCommand(
-    _passedParam: string[],
-    options: BaseCommandOptions,
-    workspaceIds: string[],
-  ): Promise<void> {
-    for (const workspaceId of workspaceIds) {
-      try {
-        await this.recordPositionBackfillService.backfill(
-          workspaceId,
-          options.dryRun ?? false,
-        );
-      } catch (error) {
-        this.logger.error(
-          `Error backfilling record position for workspace ${workspaceId}: ${error}`,
-        );
-      }
-    }
-  }
-}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-upgrade-version.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-upgrade-version.command.ts
deleted file mode 100644
index a7ee898f0a19..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-upgrade-version.command.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Command } from 'nest-commander';
-import { Repository } from 'typeorm';
-
-import { ActiveWorkspacesCommandRunner } from 'src/database/commands/active-workspaces.command';
-import { BaseCommandOptions } from 'src/database/commands/base.command';
-import { PhoneCallingCodeCreateColumnCommand } from 'src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-create-column.command';
-import { PhoneCallingCodeMigrateDataCommand } from 'src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-migrate-data.command';
-import { RecordPositionBackfillCommand } from 'src/database/commands/upgrade-version/0-35/0-35-record-position-backfill.command';
-import { ViewGroupNoValueBackfillCommand } from 'src/database/commands/upgrade-version/0-35/0-35-view-group-no-value-backfill.command';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { SyncWorkspaceMetadataCommand } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command';
-
-@Command({
-  name: 'upgrade-0.35',
-  description: 'Upgrade to 0.35',
-})
-export class UpgradeTo0_35Command extends ActiveWorkspacesCommandRunner {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    private readonly viewGroupNoValueBackfillCommand: ViewGroupNoValueBackfillCommand,
-    private readonly syncWorkspaceMetadataCommand: SyncWorkspaceMetadataCommand,
-    private readonly phoneCallingCodeMigrateDataCommand: PhoneCallingCodeMigrateDataCommand,
-    private readonly phoneCallingCodeCreateColumnCommand: PhoneCallingCodeCreateColumnCommand,
-    private readonly recordPositionBackfillCommand: RecordPositionBackfillCommand,
-  ) {
-    super(workspaceRepository);
-  }
-
-  async executeActiveWorkspacesCommand(
-    passedParam: string[],
-    options: BaseCommandOptions,
-    workspaceIds: string[],
-  ): Promise<void> {
-    this.logger.log(
-      'Running command to upgrade to 0.35: must start with phone calling code otherwise SyncMetadata will fail',
-    );
-
-    await this.recordPositionBackfillCommand.executeActiveWorkspacesCommand(
-      passedParam,
-      options,
-      workspaceIds,
-    );
-
-    await this.phoneCallingCodeCreateColumnCommand.executeActiveWorkspacesCommand(
-      passedParam,
-      options,
-      workspaceIds,
-    );
-
-    await this.phoneCallingCodeMigrateDataCommand.executeActiveWorkspacesCommand(
-      passedParam,
-      options,
-      workspaceIds,
-    );
-
-    await this.viewGroupNoValueBackfillCommand.executeActiveWorkspacesCommand(
-      passedParam,
-      options,
-      workspaceIds,
-    );
-
-    await this.syncWorkspaceMetadataCommand.executeActiveWorkspacesCommand(
-      passedParam,
-      {
-        ...options,
-        force: true,
-      },
-      workspaceIds,
-    );
-  }
-}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-upgrade-version.module.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-upgrade-version.module.ts
deleted file mode 100644
index aba95d1bb4d2..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-upgrade-version.module.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { PhoneCallingCodeCreateColumnCommand } from 'src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-create-column.command';
-import { PhoneCallingCodeMigrateDataCommand } from 'src/database/commands/upgrade-version/0-35/0-35-phone-calling-code-migrate-data.command';
-import { RecordPositionBackfillCommand } from 'src/database/commands/upgrade-version/0-35/0-35-record-position-backfill.command';
-import { UpgradeTo0_35Command } from 'src/database/commands/upgrade-version/0-35/0-35-upgrade-version.command';
-import { ViewGroupNoValueBackfillCommand } from 'src/database/commands/upgrade-version/0-35/0-35-view-group-no-value-backfill.command';
-import { RecordPositionBackfillModule } from 'src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-module';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { FieldMetadataModule } from 'src/engine/metadata-modules/field-metadata/field-metadata.module';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { SearchModule } from 'src/engine/metadata-modules/search/search.module';
-import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
-import { WorkspaceMigrationFactory } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.factory';
-import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
-import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
-import { WorkspaceSyncMetadataCommandsModule } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module';
-
-@Module({
-  imports: [
-    TypeOrmModule.forFeature([Workspace], 'core'),
-    TypeOrmModule.forFeature(
-      [ObjectMetadataEntity, FieldMetadataEntity],
-      'metadata',
-    ),
-    TypeOrmModule.forFeature([FieldMetadataEntity], 'metadata'),
-    WorkspaceSyncMetadataCommandsModule,
-    SearchModule,
-    WorkspaceMigrationRunnerModule,
-    WorkspaceMetadataVersionModule,
-    WorkspaceMigrationModule,
-    RecordPositionBackfillModule,
-    FieldMetadataModule,
-  ],
-  providers: [
-    UpgradeTo0_35Command,
-    PhoneCallingCodeCreateColumnCommand,
-    PhoneCallingCodeMigrateDataCommand,
-    WorkspaceMigrationFactory,
-    RecordPositionBackfillCommand,
-    ViewGroupNoValueBackfillCommand,
-  ],
-})
-export class UpgradeTo0_35CommandModule {}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-view-group-no-value-backfill.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-view-group-no-value-backfill.command.ts
deleted file mode 100644
index fabdf1154b7c..000000000000
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-35/0-35-view-group-no-value-backfill.command.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Command } from 'nest-commander';
-import { Repository } from 'typeorm';
-
-import { ActiveWorkspacesCommandRunner } from 'src/database/commands/active-workspaces.command';
-import { BaseCommandOptions } from 'src/database/commands/base.command';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { FieldMetadataRelatedRecordsService } from 'src/engine/metadata-modules/field-metadata/services/field-metadata-related-records.service';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
-import { ViewGroupWorkspaceEntity } from 'src/modules/view/standard-objects/view-group.workspace-entity';
-import { ViewWorkspaceEntity } from 'src/modules/view/standard-objects/view.workspace-entity';
-
-@Command({
-  name: 'migrate-0.35:backfill-view-group-no-value',
-  description: 'Backfill view group no value',
-})
-export class ViewGroupNoValueBackfillCommand extends ActiveWorkspacesCommandRunner {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    @InjectRepository(FieldMetadataEntity, 'metadata')
-    private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
-    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
-    private readonly fieldMetadataRelatedRecordsService: FieldMetadataRelatedRecordsService,
-  ) {
-    super(workspaceRepository);
-  }
-
-  async executeActiveWorkspacesCommand(
-    _passedParam: string[],
-    _options: BaseCommandOptions,
-    workspaceIds: string[],
-  ): Promise<void> {
-    for (const workspaceId of workspaceIds) {
-      try {
-        const viewRepository =
-          await this.twentyORMGlobalManager.getRepositoryForWorkspace<ViewWorkspaceEntity>(
-            workspaceId,
-            'view',
-          );
-
-        const viewGroupRepository =
-          await this.twentyORMGlobalManager.getRepositoryForWorkspace<ViewGroupWorkspaceEntity>(
-            workspaceId,
-            'viewGroup',
-          );
-
-        const views = await viewRepository.find({
-          relations: ['viewGroups'],
-        });
-
-        for (const view of views) {
-          if (view.viewGroups.length === 0) {
-            continue;
-          }
-
-          // We're assuming for now that all viewGroups belonging to the same view have the same fieldMetadataId
-          const viewGroup = view.viewGroups?.[0];
-          const fieldMetadataId = viewGroup?.fieldMetadataId;
-
-          if (!fieldMetadataId || !viewGroup) {
-            continue;
-          }
-
-          const fieldMetadata = await this.fieldMetadataRepository.findOne({
-            where: { id: viewGroup.fieldMetadataId },
-          });
-
-          if (!fieldMetadata) {
-            continue;
-          }
-
-          await this.fieldMetadataRelatedRecordsService.syncNoValueViewGroup(
-            fieldMetadata,
-            view,
-            viewGroupRepository,
-          );
-        }
-      } catch (error) {
-        this.logger.error(
-          `Error backfilling view group no value for workspace ${workspaceId}: ${error}`,
-        );
-      }
-    }
-  }
-}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-update-inactive-workspace-status.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-update-inactive-workspace-status.command.ts
new file mode 100644
index 000000000000..f71585667278
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-update-inactive-workspace-status.command.ts
@@ -0,0 +1,248 @@
+import { InjectRepository } from '@nestjs/typeorm';
+
+import chalk from 'chalk';
+import { Command, Option } from 'nest-commander';
+import { WorkspaceActivationStatus } from 'twenty-shared';
+import { In, Repository } from 'typeorm';
+
+import {
+  BaseCommandOptions,
+  BaseCommandRunner,
+} from 'src/database/commands/base.command';
+import { rawDataSource } from 'src/database/typeorm/raw/raw.datasource';
+import { TypeORMService } from 'src/database/typeorm/typeorm.service';
+import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
+import { SubscriptionStatus } from 'src/engine/core-modules/billing/enums/billing-subscription-status.enum';
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { KeyValuePair } from 'src/engine/core-modules/key-value-pair/key-value-pair.entity';
+import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
+import { WorkspaceMigrationEntity } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
+
+type UpdateInactiveWorkspaceStatusOptions = BaseCommandOptions & {
+  workspaceIds: string[];
+};
+
+@Command({
+  name: 'upgrade-0.40:update-inactive-workspace-status',
+  description:
+    'Update the status of inactive workspaces to SUSPENDED and delete them',
+})
+export class UpdateInactiveWorkspaceStatusCommand extends BaseCommandRunner {
+  constructor(
+    @InjectRepository(Workspace, 'core')
+    protected readonly workspaceRepository: Repository<Workspace>,
+    @InjectRepository(DataSourceEntity, 'metadata')
+    protected readonly datasourceRepository: Repository<DataSourceEntity>,
+    @InjectRepository(WorkspaceMigrationEntity, 'metadata')
+    protected readonly workspaceMigrationRepository: Repository<WorkspaceMigrationEntity>,
+    @InjectRepository(BillingSubscription, 'core')
+    protected readonly subscriptionRepository: Repository<BillingSubscription>,
+    @InjectRepository(FeatureFlagEntity, 'core')
+    protected readonly featureFlagRepository: Repository<FeatureFlagEntity>,
+    @InjectRepository(KeyValuePair, 'core')
+    protected readonly keyValuePairRepository: Repository<KeyValuePair>,
+    @InjectRepository(UserWorkspace, 'core')
+    protected readonly userWorkspaceRepository: Repository<UserWorkspace>,
+    @InjectRepository(User, 'core')
+    protected readonly userRepository: Repository<User>,
+    private readonly typeORMService: TypeORMService,
+  ) {
+    super();
+  }
+
+  @Option({
+    flags: '-w, --workspace-ids [workspaceIds]',
+    description: 'Workspace ids to process (comma separated)',
+  })
+  parseWorkspaceIds(val: string): string[] {
+    return val.split(',');
+  }
+
+  override async executeBaseCommand(
+    _passedParams: string[],
+    options: UpdateInactiveWorkspaceStatusOptions,
+  ): Promise<void> {
+    const whereCondition: any = {
+      activationStatus: WorkspaceActivationStatus.INACTIVE,
+    };
+
+    if (options.workspaceIds?.length > 0) {
+      whereCondition.id = In(options.workspaceIds);
+    }
+
+    const workspaces = await this.workspaceRepository.find({
+      where: whereCondition,
+    });
+
+    if (options.dryRun) {
+      this.logger.log(chalk.yellow('Dry run mode: No changes will be applied'));
+    }
+
+    this.logger.log(
+      chalk.blue(
+        `Found ${workspaces.length} inactive workspace${
+          workspaces.length > 1 ? 's' : ''
+        }`,
+      ),
+    );
+
+    await rawDataSource.initialize();
+
+    for (const workspace of workspaces) {
+      this.logger.log(
+        chalk.blue(
+          `Processing workspace ${workspace.id} with name ${workspace.displayName}`,
+        ),
+      );
+      // Check if the workspace has a datasource
+      const datasource = await this.datasourceRepository.findOne({
+        where: { workspaceId: workspace.id },
+      });
+
+      const schemaName = datasource?.schema;
+
+      const postgresSchemaExists = await this.typeORMService
+        .getMainDataSource()
+        .query(
+          `SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name = '${schemaName}'`,
+        );
+
+      if (!schemaName || !postgresSchemaExists) {
+        await this.deleteWorkspaceAndMarkAsSuspended(workspace, options);
+        continue;
+      }
+
+      const subscriptions = await this.subscriptionRepository.find({
+        where: { workspaceId: workspace.id },
+      });
+
+      if (subscriptions.length > 1) {
+        this.logger.warn(chalk.red('More than one subscription found'));
+        continue;
+      }
+
+      const subscription = subscriptions[0];
+
+      if (!subscription) {
+        this.logger.log(chalk.red('No subscription found'));
+        await this.deleteWorkspaceAndMarkAsSuspendedAndDeleteAllData(
+          workspace,
+          schemaName,
+          options,
+        );
+        continue;
+      }
+
+      const thirtyDaysAgo = new Date();
+
+      thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30);
+
+      if (
+        ([
+          SubscriptionStatus.Canceled,
+          SubscriptionStatus.Incomplete,
+          SubscriptionStatus.IncompleteExpired,
+          SubscriptionStatus.Unpaid,
+          SubscriptionStatus.Paused,
+        ].includes(subscription.status) &&
+          subscription.canceledAt &&
+          subscription.canceledAt < thirtyDaysAgo) ||
+        (subscription.canceledAt === null &&
+          subscription.updatedAt &&
+          subscription.updatedAt < thirtyDaysAgo)
+      ) {
+        await this.deleteWorkspaceAndMarkAsSuspendedAndDeleteAllData(
+          workspace,
+          schemaName,
+          options,
+          subscription,
+        );
+        continue;
+      }
+
+      await this.markAsSuspended(workspace, options);
+    }
+  }
+
+  private async deleteWorkspaceAndMarkAsSuspended(
+    workspace: Workspace,
+    options: UpdateInactiveWorkspaceStatusOptions,
+  ) {
+    this.logger.log(
+      chalk.blue('(!!) Deleting workspace and marking as suspended'),
+    );
+
+    if (!options.dryRun) {
+      await this.workspaceRepository.update(workspace.id, {
+        activationStatus: WorkspaceActivationStatus.SUSPENDED,
+      });
+
+      await this.workspaceRepository.softRemove({ id: workspace.id });
+    }
+  }
+
+  private async deleteWorkspaceAndMarkAsSuspendedAndDeleteAllData(
+    workspace: Workspace,
+    schemaName: string,
+    options: UpdateInactiveWorkspaceStatusOptions,
+    billingSubscription?: BillingSubscription,
+  ) {
+    this.logger.warn(
+      chalk.blue(
+        `(!!!) Deleting workspace and marking as suspended and deleting all data for workspace updated at ${workspace.updatedAt} with subscription status ${billingSubscription?.status} and subscription updatedAt ${billingSubscription?.updatedAt} and canceledAt ${billingSubscription?.canceledAt}`,
+      ),
+    );
+
+    if (!options.dryRun) {
+      await this.workspaceRepository.update(workspace.id, {
+        activationStatus: WorkspaceActivationStatus.SUSPENDED,
+      });
+
+      await this.workspaceRepository.softRemove({ id: workspace.id });
+
+      await this.datasourceRepository.delete({ workspaceId: workspace.id });
+      await this.workspaceMigrationRepository.delete({
+        workspaceId: workspace.id,
+      });
+
+      await this.featureFlagRepository.delete({ workspaceId: workspace.id });
+      await this.keyValuePairRepository.delete({ workspaceId: workspace.id });
+
+      const userWorkspaces = await this.userWorkspaceRepository.find({
+        where: { workspaceId: workspace.id },
+      });
+
+      for (const userWorkspace of userWorkspaces) {
+        await this.userWorkspaceRepository.delete({ id: userWorkspace.id });
+
+        const remainingUserWorkspaces =
+          await this.userWorkspaceRepository.count({
+            where: { userId: userWorkspace.userId },
+          });
+
+        if (remainingUserWorkspaces === 0) {
+          await this.userRepository.softRemove({ id: userWorkspace.userId });
+        }
+      }
+
+      await this.typeORMService
+        .getMainDataSource()
+        .query(`DROP SCHEMA IF EXISTS ${schemaName} CASCADE`);
+    }
+  }
+
+  private async markAsSuspended(
+    workspace: Workspace,
+    options: UpdateInactiveWorkspaceStatusOptions,
+  ) {
+    this.logger.log(chalk.blue('(!) Marking as suspended'));
+    if (!options.dryRun) {
+      await this.workspaceRepository.update(workspace.id, {
+        activationStatus: WorkspaceActivationStatus.SUSPENDED,
+      });
+    }
+  }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.module.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.module.ts
index cc33bd8787b7..c1471e69b5e8 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.module.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.module.ts
@@ -2,25 +2,54 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { MigrateAggregateOperationOptionsCommand } from 'src/database/commands/upgrade-version/0-40/0-40-migrate-aggregate-operations-options.command';
+import { UpdateInactiveWorkspaceStatusCommand } from 'src/database/commands/upgrade-version/0-40/0-40-update-inactive-workspace-status.command';
 import { UpgradeTo0_40Command } from 'src/database/commands/upgrade-version/0-40/0-40-upgrade-version.command';
+import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
+import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { KeyValuePair } from 'src/engine/core-modules/key-value-pair/key-value-pair.entity';
+import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
+import { User } from 'src/engine/core-modules/user/user.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
 import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
+import { WorkspaceMigrationEntity } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
 import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
 import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
 
 @Module({
   imports: [
-    TypeOrmModule.forFeature([Workspace], 'core'),
     TypeOrmModule.forFeature(
-      [ObjectMetadataEntity, FieldMetadataEntity],
+      [
+        Workspace,
+        BillingSubscription,
+        FeatureFlagEntity,
+        KeyValuePair,
+        User,
+        UserWorkspace,
+      ],
+      'core',
+    ),
+    TypeOrmModule.forFeature(
+      [
+        ObjectMetadataEntity,
+        FieldMetadataEntity,
+        DataSourceEntity,
+        WorkspaceMigrationEntity,
+      ],
       'metadata',
     ),
     WorkspaceMigrationRunnerModule,
     WorkspaceMigrationModule,
     WorkspaceMetadataVersionModule,
+    TypeORMModule,
+  ],
+  providers: [
+    UpgradeTo0_40Command,
+    MigrateAggregateOperationOptionsCommand,
+    UpdateInactiveWorkspaceStatusCommand,
   ],
-  providers: [UpgradeTo0_40Command, MigrateAggregateOperationOptionsCommand],
 })
 export class UpgradeTo0_40CommandModule {}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-41/0-41-migrate-relations-to-field-metadata.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-41/0-41-migrate-relations-to-field-metadata.command.ts
new file mode 100644
index 000000000000..93f1ba9ed9fd
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version/0-41/0-41-migrate-relations-to-field-metadata.command.ts
@@ -0,0 +1,140 @@
+import { InjectRepository } from '@nestjs/typeorm';
+
+import chalk from 'chalk';
+import { Command } from 'nest-commander';
+import { FieldMetadataType } from 'twenty-shared';
+import { Repository } from 'typeorm';
+
+import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';
+
+import {
+  ActiveWorkspacesCommandOptions,
+  ActiveWorkspacesCommandRunner,
+} from 'src/database/commands/active-workspaces.command';
+import { isCommandLogger } from 'src/database/commands/logger';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import {
+  deduceRelationDirection,
+  RelationDirection,
+} from 'src/engine/utils/deduce-relation-direction.util';
+
+@Command({
+  name: 'upgrade-0.41:migrate-relations-to-field-metadata',
+  description: 'Migrate relations to field metadata',
+})
+export class MigrateRelationsToFieldMetadataCommand extends ActiveWorkspacesCommandRunner {
+  constructor(
+    @InjectRepository(Workspace, 'core')
+    protected readonly workspaceRepository: Repository<Workspace>,
+    @InjectRepository(FieldMetadataEntity, 'metadata')
+    private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
+  ) {
+    super(workspaceRepository);
+  }
+
+  async executeActiveWorkspacesCommand(
+    _passedParam: string[],
+    options: ActiveWorkspacesCommandOptions,
+    workspaceIds: string[],
+  ): Promise<void> {
+    this.logger.log('Running command to create many to one relations');
+
+    if (isCommandLogger(this.logger)) {
+      this.logger.setVerbose(options.verbose ?? false);
+    }
+
+    try {
+      for (const [index, workspaceId] of workspaceIds.entries()) {
+        await this.processWorkspace(workspaceId, index, workspaceIds.length);
+      }
+
+      this.logger.log(chalk.green('Command completed!'));
+    } catch (error) {
+      this.logger.log(chalk.red('Error in workspace'));
+    }
+  }
+
+  private async processWorkspace(
+    workspaceId: string,
+    index: number,
+    total: number,
+  ): Promise<void> {
+    try {
+      this.logger.log(
+        `Running command for workspace ${workspaceId} ${index + 1}/${total}`,
+      );
+
+      const fieldMetadataCollection = (await this.fieldMetadataRepository.find({
+        where: { workspaceId, type: FieldMetadataType.RELATION },
+        relations: ['fromRelationMetadata', 'toRelationMetadata'],
+      })) as unknown as FieldMetadataEntity<FieldMetadataType.RELATION>[];
+
+      if (!fieldMetadataCollection.length) {
+        this.logger.log(
+          chalk.yellow(
+            `No relation field metadata found for workspace ${workspaceId}.`,
+          ),
+        );
+
+        return;
+      }
+
+      const fieldMetadataToUpdateCollection = fieldMetadataCollection.map(
+        (fieldMetadata) => this.mapFieldMetadata(fieldMetadata),
+      );
+
+      if (fieldMetadataToUpdateCollection.length > 0) {
+        await this.fieldMetadataRepository.save(
+          fieldMetadataToUpdateCollection,
+        );
+      }
+
+      this.logger.log(
+        chalk.green(`Command completed for workspace ${workspaceId}.`),
+      );
+    } catch {
+      this.logger.log(chalk.red(`Error in workspace ${workspaceId}.`));
+    }
+  }
+
+  private mapFieldMetadata(
+    fieldMetadata: FieldMetadataEntity<FieldMetadataType.RELATION>,
+  ): FieldMetadataEntity<FieldMetadataType.RELATION> {
+    const relationMetadata =
+      fieldMetadata.fromRelationMetadata ?? fieldMetadata.toRelationMetadata;
+
+    const relationDirection = deduceRelationDirection(
+      fieldMetadata,
+      relationMetadata,
+    );
+    let relationType = relationMetadata.relationType as unknown as RelationType;
+
+    if (
+      relationDirection === RelationDirection.TO &&
+      relationType === RelationType.ONE_TO_MANY
+    ) {
+      relationType = RelationType.MANY_TO_ONE;
+    }
+
+    const relationTargetFieldMetadataId =
+      relationDirection === RelationDirection.FROM
+        ? relationMetadata.toFieldMetadataId
+        : relationMetadata.fromFieldMetadataId;
+
+    const relationTargetObjectMetadataId =
+      relationDirection === RelationDirection.FROM
+        ? relationMetadata.toObjectMetadataId
+        : relationMetadata.fromObjectMetadataId;
+
+    return {
+      ...fieldMetadata,
+      settings: {
+        relationType,
+        onDelete: relationMetadata.onDeleteAction,
+      },
+      relationTargetFieldMetadataId,
+      relationTargetObjectMetadataId,
+    };
+  }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-41/0-41-seed-workflow-views.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-41/0-41-seed-workflow-views.command.ts
new file mode 100644
index 000000000000..4bce88ee7be3
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version/0-41/0-41-seed-workflow-views.command.ts
@@ -0,0 +1,203 @@
+import { Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Command } from 'nest-commander';
+import { EntityManager, IsNull, Not, Repository } from 'typeorm';
+
+import {
+  ActiveWorkspacesCommandOptions,
+  ActiveWorkspacesCommandRunner,
+} from 'src/database/commands/active-workspaces.command';
+import { TypeORMService } from 'src/database/typeorm/typeorm.service';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
+import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
+import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
+import { createWorkspaceViews } from 'src/engine/workspace-manager/standard-objects-prefill-data/create-workspace-views';
+import { workflowRunsAllView } from 'src/engine/workspace-manager/standard-objects-prefill-data/views/workflow-runs-all.view';
+import { workflowVersionsAllView } from 'src/engine/workspace-manager/standard-objects-prefill-data/views/workflow-versions-all.view';
+import { workflowsAllView } from 'src/engine/workspace-manager/standard-objects-prefill-data/views/workflows-all.view';
+import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+
+@Command({
+  name: 'upgrade-0.41:workflow-seed-views',
+  description: 'Seed workflow views for workspace.',
+})
+export class SeedWorkflowViewsCommand extends ActiveWorkspacesCommandRunner {
+  protected readonly logger: Logger;
+
+  constructor(
+    @InjectRepository(Workspace, 'core')
+    protected readonly workspaceRepository: Repository<Workspace>,
+    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
+    private readonly dataSourceService: DataSourceService,
+    private readonly typeORMService: TypeORMService,
+    private readonly objectMetadataService: ObjectMetadataService,
+  ) {
+    super(workspaceRepository);
+    this.logger = new Logger(this.constructor.name);
+  }
+
+  async executeActiveWorkspacesCommand(
+    _passedParam: string[],
+    _options: ActiveWorkspacesCommandOptions,
+    _workspaceIds: string[],
+  ): Promise<void> {
+    const { dryRun } = _options;
+
+    for (const workspaceId of _workspaceIds) {
+      await this.execute(workspaceId, dryRun);
+    }
+  }
+
+  private async execute(workspaceId: string, dryRun = false): Promise<void> {
+    this.logger.log(`Seeding workflow views for workspace: ${workspaceId}`);
+
+    const workflowObjectMetadata =
+      await this.objectMetadataService.findOneWithinWorkspace(workspaceId, {
+        where: {
+          standardId: STANDARD_OBJECT_IDS.workflow,
+        },
+      });
+
+    if (!workflowObjectMetadata) {
+      this.logger.error('Workflow object metadata not found');
+
+      return;
+    }
+
+    await this.seedWorkflowViews(
+      workspaceId,
+      workflowObjectMetadata.id,
+      dryRun,
+    );
+
+    await this.seedWorkspaceFavorite(
+      workspaceId,
+      workflowObjectMetadata.id,
+      dryRun,
+    );
+  }
+
+  private async seedWorkflowViews(
+    workspaceId: string,
+    workflowObjectMetadataId: string,
+    dryRun = false,
+  ) {
+    const viewRepository =
+      await this.twentyORMGlobalManager.getRepositoryForWorkspace(
+        workspaceId,
+        'view',
+      );
+
+    const existingWorkflowView = await viewRepository.findOne({
+      where: {
+        objectMetadataId: workflowObjectMetadataId,
+      },
+    });
+
+    if (existingWorkflowView) {
+      this.logger.log(`View already exists: ${existingWorkflowView.id}`);
+
+      return;
+    }
+
+    if (dryRun) {
+      this.logger.log(`Dry run: not creating view`);
+
+      return;
+    }
+
+    const { objectMetadataStandardIdToIdMap } =
+      await this.objectMetadataService.getObjectMetadataStandardIdToIdMap(
+        workspaceId,
+      );
+
+    const dataSourceMetadata =
+      await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
+        workspaceId,
+      );
+
+    const workspaceDataSource =
+      await this.typeORMService.connectToDataSource(dataSourceMetadata);
+
+    if (!workspaceDataSource) {
+      this.logger.error('Could not connect to workspace data source');
+
+      return;
+    }
+
+    const viewDefinitions = [
+      workflowsAllView(objectMetadataStandardIdToIdMap),
+      workflowVersionsAllView(objectMetadataStandardIdToIdMap),
+      workflowRunsAllView(objectMetadataStandardIdToIdMap),
+    ];
+
+    await workspaceDataSource.transaction(
+      async (entityManager: EntityManager) => {
+        return createWorkspaceViews(
+          entityManager,
+          dataSourceMetadata.schema,
+          viewDefinitions,
+        );
+      },
+    );
+  }
+
+  private async seedWorkspaceFavorite(
+    workspaceId: string,
+    workflowObjectMetadataId: string,
+    dryRun = false,
+  ) {
+    const viewRepository =
+      await this.twentyORMGlobalManager.getRepositoryForWorkspace(
+        workspaceId,
+        'view',
+      );
+
+    const workflowView = await viewRepository.findOne({
+      where: {
+        objectMetadataId: workflowObjectMetadataId,
+      },
+    });
+
+    if (!workflowView) {
+      this.logger.error('Workflow view not found');
+
+      return;
+    }
+
+    if (dryRun) {
+      this.logger.log(`Dry run: not creating favorite`);
+
+      return;
+    }
+
+    const favoriteRepository =
+      await this.twentyORMGlobalManager.getRepositoryForWorkspace(
+        workspaceId,
+        'favorite',
+      );
+
+    const existingFavorites = await favoriteRepository.find({
+      where: {
+        viewId: Not(IsNull()),
+      },
+    });
+
+    const workflowFavorite = existingFavorites.find(
+      (favorite) => favorite.viewId === workflowView.id,
+    );
+
+    if (workflowFavorite) {
+      this.logger.log(`Favorite already exists: ${workflowFavorite.id}`);
+
+      return;
+    }
+
+    await favoriteRepository.insert({
+      viewId: workflowView.id,
+      position: existingFavorites.length,
+    });
+  }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-41/0-41-upgrade-version.command.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-41/0-41-upgrade-version.command.ts
new file mode 100644
index 000000000000..5a8d6216e07b
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version/0-41/0-41-upgrade-version.command.ts
@@ -0,0 +1,56 @@
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Command } from 'nest-commander';
+import { Repository } from 'typeorm';
+
+import { ActiveWorkspacesCommandRunner } from 'src/database/commands/active-workspaces.command';
+import { BaseCommandOptions } from 'src/database/commands/base.command';
+import { MigrateRelationsToFieldMetadataCommand } from 'src/database/commands/upgrade-version/0-41/0-41-migrate-relations-to-field-metadata.command';
+import { SeedWorkflowViewsCommand } from 'src/database/commands/upgrade-version/0-41/0-41-seed-workflow-views.command';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { SyncWorkspaceMetadataCommand } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command';
+
+@Command({
+  name: 'upgrade-0.41',
+  description: 'Upgrade to 0.41',
+})
+export class UpgradeTo0_41Command extends ActiveWorkspacesCommandRunner {
+  constructor(
+    @InjectRepository(Workspace, 'core')
+    protected readonly workspaceRepository: Repository<Workspace>,
+    private readonly seedWorkflowViewsCommand: SeedWorkflowViewsCommand,
+    private readonly syncWorkspaceMetadataCommand: SyncWorkspaceMetadataCommand,
+    private readonly migrateRelationsToFieldMetadata: MigrateRelationsToFieldMetadataCommand,
+  ) {
+    super(workspaceRepository);
+  }
+
+  async executeActiveWorkspacesCommand(
+    passedParam: string[],
+    options: BaseCommandOptions,
+    workspaceIds: string[],
+  ): Promise<void> {
+    this.logger.log('Running command to upgrade to 0.41');
+
+    await this.syncWorkspaceMetadataCommand.executeActiveWorkspacesCommand(
+      passedParam,
+      {
+        ...options,
+        force: true,
+      },
+      workspaceIds,
+    );
+
+    await this.seedWorkflowViewsCommand.executeActiveWorkspacesCommand(
+      passedParam,
+      options,
+      workspaceIds,
+    );
+
+    await this.migrateRelationsToFieldMetadata.executeActiveWorkspacesCommand(
+      passedParam,
+      options,
+      workspaceIds,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version/0-41/0-41-upgrade-version.module.ts b/packages/twenty-server/src/database/commands/upgrade-version/0-41/0-41-upgrade-version.module.ts
new file mode 100644
index 000000000000..fe417eaa2b7a
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version/0-41/0-41-upgrade-version.module.ts
@@ -0,0 +1,37 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { MigrateRelationsToFieldMetadataCommand } from 'src/database/commands/upgrade-version/0-41/0-41-migrate-relations-to-field-metadata.command';
+import { SeedWorkflowViewsCommand } from 'src/database/commands/upgrade-version/0-41/0-41-seed-workflow-views.command';
+import { UpgradeTo0_41Command } from 'src/database/commands/upgrade-version/0-41/0-41-upgrade-version.command';
+import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
+import { WorkspaceHealthModule } from 'src/engine/workspace-manager/workspace-health/workspace-health.module';
+import { SyncWorkspaceLoggerService } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/services/sync-workspace-logger.service';
+import { SyncWorkspaceMetadataCommand } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command';
+import { WorkspaceSyncMetadataCommandsModule } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module';
+import { WorkspaceSyncMetadataModule } from 'src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([Workspace], 'core'),
+    TypeOrmModule.forFeature([FieldMetadataEntity], 'metadata'),
+    TypeORMModule,
+    DataSourceModule,
+    ObjectMetadataModule,
+    WorkspaceSyncMetadataCommandsModule,
+    WorkspaceSyncMetadataModule,
+    WorkspaceHealthModule,
+  ],
+  providers: [
+    SyncWorkspaceLoggerService,
+    SyncWorkspaceMetadataCommand,
+    SeedWorkflowViewsCommand,
+    UpgradeTo0_41Command,
+    MigrateRelationsToFieldMetadataCommand,
+  ],
+})
+export class UpgradeTo0_41CommandModule {}
diff --git a/packages/twenty-server/src/database/typeorm-seeds/core/demo/workspaces.ts b/packages/twenty-server/src/database/typeorm-seeds/core/demo/workspaces.ts
index 5683d282f245..a9fa684027c9 100644
--- a/packages/twenty-server/src/database/typeorm-seeds/core/demo/workspaces.ts
+++ b/packages/twenty-server/src/database/typeorm-seeds/core/demo/workspaces.ts
@@ -1,7 +1,6 @@
+import { WorkspaceActivationStatus } from 'twenty-shared';
 import { DataSource } from 'typeorm';
 
-import { WorkspaceActivationStatus } from 'src/engine/core-modules/workspace/workspace.entity';
-
 const tableName = 'workspace';
 
 export const seedWorkspaces = async (
diff --git a/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts b/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts
index 4b73c35da4d8..e567c7e0888d 100644
--- a/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts
+++ b/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts
@@ -35,11 +35,6 @@ export const seedFeatureFlags = async (
         workspaceId: workspaceId,
         value: true,
       },
-      {
-        key: FeatureFlagKey.IsFunctionSettingsEnabled,
-        workspaceId: workspaceId,
-        value: false,
-      },
       {
         key: FeatureFlagKey.IsWorkflowEnabled,
         workspaceId: workspaceId,
@@ -51,12 +46,7 @@ export const seedFeatureFlags = async (
         value: true,
       },
       {
-        key: FeatureFlagKey.IsSSOEnabled,
-        workspaceId: workspaceId,
-        value: true,
-      },
-      {
-        key: FeatureFlagKey.IsGmailSendEmailScopeEnabled,
+        key: FeatureFlagKey.IsBillingPlansEnabled,
         workspaceId: workspaceId,
         value: true,
       },
@@ -76,12 +66,12 @@ export const seedFeatureFlags = async (
         value: false,
       },
       {
-        key: FeatureFlagKey.IsAggregateQueryEnabled,
+        key: FeatureFlagKey.IsCommandMenuV2Enabled,
         workspaceId: workspaceId,
         value: true,
       },
       {
-        key: FeatureFlagKey.IsPageHeaderV2Enabled,
+        key: FeatureFlagKey.IsLocalizationEnabled,
         workspaceId: workspaceId,
         value: true,
       },
diff --git a/packages/twenty-server/src/database/typeorm-seeds/core/workspaces.ts b/packages/twenty-server/src/database/typeorm-seeds/core/workspaces.ts
index d3dceb8a883e..9cae9446a2f0 100644
--- a/packages/twenty-server/src/database/typeorm-seeds/core/workspaces.ts
+++ b/packages/twenty-server/src/database/typeorm-seeds/core/workspaces.ts
@@ -1,9 +1,7 @@
+import { WorkspaceActivationStatus } from 'twenty-shared';
 import { DataSource } from 'typeorm';
 
-import {
-  Workspace,
-  WorkspaceActivationStatus,
-} from 'src/engine/core-modules/workspace/workspace.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 
 const tableName = 'workspace';
 
diff --git a/packages/twenty-server/src/database/typeorm-seeds/metadata/fieldsMetadata.ts b/packages/twenty-server/src/database/typeorm-seeds/metadata/fieldsMetadata.ts
index fd0bfe2c1279..7e930faa2c73 100644
--- a/packages/twenty-server/src/database/typeorm-seeds/metadata/fieldsMetadata.ts
+++ b/packages/twenty-server/src/database/typeorm-seeds/metadata/fieldsMetadata.ts
@@ -1,5 +1,6 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { CreateFieldInput } from 'src/engine/metadata-modules/field-metadata/dtos/create-field.input';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 
 export const getDevSeedCompanyCustomFields = (
   objectMetadataId: string,
diff --git a/packages/twenty-server/src/database/typeorm-seeds/workspace/message-channels.ts b/packages/twenty-server/src/database/typeorm-seeds/workspace/message-channels.ts
index e27909ec59b1..79ddfcacbeb8 100644
--- a/packages/twenty-server/src/database/typeorm-seeds/workspace/message-channels.ts
+++ b/packages/twenty-server/src/database/typeorm-seeds/workspace/message-channels.ts
@@ -30,6 +30,7 @@ export const seedMessageChannel = async (
       'type',
       'connectedAccountId',
       'handle',
+      'isSyncEnabled',
       'visibility',
       'syncStage',
     ])
@@ -44,8 +45,9 @@ export const seedMessageChannel = async (
         type: 'email',
         connectedAccountId: DEV_SEED_CONNECTED_ACCOUNT_IDS.TIM,
         handle: 'tim@apple.dev',
+        isSyncEnabled: false,
         visibility: MessageChannelVisibility.SHARE_EVERYTHING,
-        syncSubStatus: MessageChannelSyncStage.FULL_MESSAGE_LIST_FETCH_PENDING,
+        syncStage: MessageChannelSyncStage.FULL_MESSAGE_LIST_FETCH_PENDING,
       },
       {
         id: DEV_SEED_MESSAGE_CHANNEL_IDS.JONY,
@@ -56,8 +58,9 @@ export const seedMessageChannel = async (
         type: 'email',
         connectedAccountId: DEV_SEED_CONNECTED_ACCOUNT_IDS.JONY,
         handle: 'jony.ive@apple.dev',
+        isSyncEnabled: false,
         visibility: MessageChannelVisibility.SHARE_EVERYTHING,
-        syncSubStatus: MessageChannelSyncStage.FULL_MESSAGE_LIST_FETCH_PENDING,
+        syncStage: MessageChannelSyncStage.FULL_MESSAGE_LIST_FETCH_PENDING,
       },
       {
         id: DEV_SEED_MESSAGE_CHANNEL_IDS.PHIL,
@@ -68,8 +71,9 @@ export const seedMessageChannel = async (
         type: 'email',
         connectedAccountId: DEV_SEED_CONNECTED_ACCOUNT_IDS.PHIL,
         handle: 'phil.schiler@apple.dev',
+        isSyncEnabled: false,
         visibility: MessageChannelVisibility.SHARE_EVERYTHING,
-        syncSubStatus: MessageChannelSyncStage.FULL_MESSAGE_LIST_FETCH_PENDING,
+        syncStage: MessageChannelSyncStage.FULL_MESSAGE_LIST_FETCH_PENDING,
       },
     ])
     .execute();
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/billing/1737127856478-addNonNullableProductDescription.ts b/packages/twenty-server/src/database/typeorm/core/migrations/billing/1737127856478-addNonNullableProductDescription.ts
new file mode 100644
index 000000000000..0888faf69629
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/billing/1737127856478-addNonNullableProductDescription.ts
@@ -0,0 +1,25 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddNonNullableProductDescription1737127856478
+  implements MigrationInterface
+{
+  name = 'AddNonNullableProductDescription1737127856478';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingProduct" ALTER COLUMN "description" SET DEFAULT ''`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingProduct" ALTER COLUMN "description" SET NOT NULL`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingProduct" ALTER COLUMN "description" DROP DEFAULT`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."billingProduct" ALTER COLUMN "description" DROP NOT NULL`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/common/1736050161854-renameEmailVerifiedColumn.ts b/packages/twenty-server/src/database/typeorm/core/migrations/common/1736050161854-renameEmailVerifiedColumn.ts
new file mode 100644
index 000000000000..8480e5acfcb6
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/common/1736050161854-renameEmailVerifiedColumn.ts
@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class RenameEmailVerifiedColumn1736050161854
+  implements MigrationInterface
+{
+  name = 'RenameEmailVerifiedColumn1736050161854';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" RENAME COLUMN "emailVerified" TO "isEmailVerified"`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."user" RENAME COLUMN "isEmailVerified" TO "emailVerified"`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/common/1736861823893-updateWorkspaceStatusEnum.ts b/packages/twenty-server/src/database/typeorm/core/migrations/common/1736861823893-updateWorkspaceStatusEnum.ts
new file mode 100644
index 000000000000..503410ab9fd6
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/common/1736861823893-updateWorkspaceStatusEnum.ts
@@ -0,0 +1,49 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class UpdateWorkspaceStatusEnum1736861823893
+  implements MigrationInterface
+{
+  name = 'UpdateWorkspaceStatusEnum1736861823893';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TYPE "core"."workspace_activationstatus_enum" RENAME TO "workspace_activationstatus_enum_old"`,
+    );
+    await queryRunner.query(
+      `CREATE TYPE "core"."workspace_activationStatus_enum" AS ENUM('ONGOING_CREATION', 'PENDING_CREATION', 'ACTIVE', 'INACTIVE', 'SUSPENDED')`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ALTER COLUMN "activationStatus" DROP DEFAULT`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ALTER COLUMN "activationStatus" TYPE "core"."workspace_activationStatus_enum" USING "activationStatus"::"text"::"core"."workspace_activationStatus_enum"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ALTER COLUMN "activationStatus" SET DEFAULT 'INACTIVE'`,
+    );
+    await queryRunner.query(
+      `DROP TYPE "core"."workspace_activationstatus_enum_old"`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TYPE "core"."workspace_activationstatus_enum_old" AS ENUM('ACTIVE', 'INACTIVE', 'ONGOING_CREATION', 'PENDING_CREATION')`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ALTER COLUMN "activationStatus" DROP DEFAULT`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ALTER COLUMN "activationStatus" TYPE "core"."workspace_activationstatus_enum_old" USING "activationStatus"::"text"::"core"."workspace_activationstatus_enum_old"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ALTER COLUMN "activationStatus" SET DEFAULT 'INACTIVE'`,
+    );
+    await queryRunner.query(
+      `DROP TYPE "core"."workspace_activationStatus_enum"`,
+    );
+    await queryRunner.query(
+      `ALTER TYPE "core"."workspace_activationstatus_enum_old" RENAME TO "workspace_activationstatus_enum"`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/core/migrations/common/1737630672873-workspace-entity-default-microsoft-auth-enabled.ts b/packages/twenty-server/src/database/typeorm/core/migrations/common/1737630672873-workspace-entity-default-microsoft-auth-enabled.ts
new file mode 100644
index 000000000000..84ef81e60fa4
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/core/migrations/common/1737630672873-workspace-entity-default-microsoft-auth-enabled.ts
@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class WorkspaceEntityDefaultMicrosoftAuthEnabled1737630672873
+  implements MigrationInterface
+{
+  name = 'WorkspaceEntityDefaultMicrosoftAuthEnabled1737630672873';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ALTER COLUMN "isMicrosoftAuthEnabled" SET DEFAULT true`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "core"."workspace" ALTER COLUMN "isMicrosoftAuthEnabled" SET DEFAULT false`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/metadata/migrations/1737047131108-addTimeoutSecondsColumnToServerless.ts b/packages/twenty-server/src/database/typeorm/metadata/migrations/1737047131108-addTimeoutSecondsColumnToServerless.ts
new file mode 100644
index 000000000000..0fd37a2198aa
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/metadata/migrations/1737047131108-addTimeoutSecondsColumnToServerless.ts
@@ -0,0 +1,25 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddTimeoutSecondsColumnToServerless1737047131108
+  implements MigrationInterface
+{
+  name = 'AddTimeoutSecondsColumnToServerless1737047131108';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."serverlessFunction" ADD "timeoutSeconds" integer NOT NULL DEFAULT '300'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."serverlessFunction" ADD CONSTRAINT "CHK_4a5179975ee017934a91703247" CHECK ("timeoutSeconds" >= 1 AND "timeoutSeconds" <= 900)`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."serverlessFunction" DROP CONSTRAINT "CHK_4a5179975ee017934a91703247"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."serverlessFunction" DROP COLUMN "timeoutSeconds"`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/database/typeorm/metadata/migrations/1737561084251-addRelationTargetFieldAndObjectToFieldMetadata.ts b/packages/twenty-server/src/database/typeorm/metadata/migrations/1737561084251-addRelationTargetFieldAndObjectToFieldMetadata.ts
new file mode 100644
index 000000000000..e8932a7c4296
--- /dev/null
+++ b/packages/twenty-server/src/database/typeorm/metadata/migrations/1737561084251-addRelationTargetFieldAndObjectToFieldMetadata.ts
@@ -0,0 +1,55 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddRelationTargetFieldAndObjectToFieldMetadata1737561084251
+  implements MigrationInterface
+{
+  name = 'AddRelationTargetFieldAndObjectToFieldMetadata1737561084251';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."fieldMetadata" ADD "relationTargetFieldMetadataId" uuid`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."fieldMetadata" ADD CONSTRAINT "UQ_47a6c57e1652b6475f8248cff78" UNIQUE ("relationTargetFieldMetadataId")`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."fieldMetadata" ADD "relationTargetObjectMetadataId" uuid`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IndexOnRelationTargetObjectMetadataId" ON "metadata"."fieldMetadata" ("relationTargetObjectMetadataId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IndexOnRelationTargetFieldMetadataId" ON "metadata"."fieldMetadata" ("relationTargetFieldMetadataId") `,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."fieldMetadata" ADD CONSTRAINT "FK_47a6c57e1652b6475f8248cff78" FOREIGN KEY ("relationTargetFieldMetadataId") REFERENCES "metadata"."fieldMetadata"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."fieldMetadata" ADD CONSTRAINT "FK_6f6c87ec32cca956d8be321071c" FOREIGN KEY ("relationTargetObjectMetadataId") REFERENCES "metadata"."objectMetadata"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."fieldMetadata" DROP CONSTRAINT "FK_6f6c87ec32cca956d8be321071c"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."fieldMetadata" DROP CONSTRAINT "FK_47a6c57e1652b6475f8248cff78"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "metadata"."IndexOnRelationTargetFieldMetadataId"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "metadata"."IndexOnRelationTargetObjectMetadataId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."fieldMetadata" DROP COLUMN "relationTargetObjectMetadataId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."fieldMetadata" DROP CONSTRAINT "UQ_47a6c57e1652b6475f8248cff78"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "metadata"."fieldMetadata" DROP COLUMN "relationTargetFieldMetadataId"`,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/api/__mocks__/object-metadata-item.mock.ts b/packages/twenty-server/src/engine/api/__mocks__/object-metadata-item.mock.ts
index 093b4a0efbee..3b3951645968 100644
--- a/packages/twenty-server/src/engine/api/__mocks__/object-metadata-item.mock.ts
+++ b/packages/twenty-server/src/engine/api/__mocks__/object-metadata-item.mock.ts
@@ -1,5 +1,6 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { FieldActorSource } from 'src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 
 export const FIELD_LINKS_MOCK_NAME = 'fieldLinks';
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper.ts
index 777919d2f51c..3915f4efc1e6 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper.ts
@@ -1,3 +1,5 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import {
   ObjectRecord,
   ObjectRecordOrderBy,
@@ -14,7 +16,6 @@ import { encodeCursor } from 'src/engine/api/graphql/graphql-query-runner/utils/
 import { getRelationObjectMetadata } from 'src/engine/api/graphql/graphql-query-runner/utils/get-relation-object-metadata.util';
 import { AggregationField } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-available-aggregations-from-object-fields.util';
 import { compositeTypeDefinitions } from 'src/engine/metadata-modules/field-metadata/composite-types';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
 import { ObjectMetadataMaps } from 'src/engine/metadata-modules/types/object-metadata-maps';
 import { getObjectMetadataMapItemByNameSingular } from 'src/engine/metadata-modules/utils/get-object-metadata-map-item-by-name-singular.util';
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/process-aggregate.helper.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/process-aggregate.helper.ts
index 4b22f5d4d51e..c737ceb6a034 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/process-aggregate.helper.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/process-aggregate.helper.ts
@@ -2,7 +2,6 @@ import { SelectQueryBuilder } from 'typeorm';
 
 import { AGGREGATE_OPERATIONS } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant';
 import { AggregationField } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-available-aggregations-from-object-fields.util';
-import { FIELD_METADATA_TYPES_TO_TEXT_COLUMN_TYPE } from 'src/engine/metadata-modules/workspace-migration/constants/fieldMetadataTypesToTextColumnType';
 import { formatColumnNamesFromCompositeFieldAndSubfields } from 'src/engine/twenty-orm/utils/format-column-names-from-composite-field-and-subfield.util';
 import { isDefined } from 'src/utils/is-defined';
 
@@ -50,14 +49,9 @@ export class ProcessAggregateHelper {
 
       const concatenatedColumns = columnNames
         .map((col) => `"${col}"`)
-        .join(", ' ', ");
+        .join(',');
 
-      const columnExpression =
-        FIELD_METADATA_TYPES_TO_TEXT_COLUMN_TYPE.includes(
-          aggregatedField.fromFieldType,
-        )
-          ? `NULLIF(CONCAT(${concatenatedColumns}), '')`
-          : `CONCAT(${concatenatedColumns})`;
+      const columnExpression = `NULLIF(CONCAT(${concatenatedColumns}), '')`;
 
       switch (aggregatedField.aggregateOperation) {
         case AGGREGATE_OPERATIONS.countEmpty:
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-find-many-resolver.service.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-find-many-resolver.service.ts
index 7e3cfc8acf91..f0d51e1dea8f 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-find-many-resolver.service.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/resolvers/graphql-query-find-many-resolver.service.ts
@@ -27,7 +27,6 @@ import {
   getCursor,
   getPaginationInfo,
 } from 'src/engine/api/graphql/graphql-query-runner/utils/cursors.util';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 import { formatResult } from 'src/engine/twenty-orm/utils/format-result.util';
 import { isDefined } from 'src/utils/is-defined';
@@ -109,19 +108,6 @@ export class GraphqlQueryFindManyResolverService extends GraphqlQueryBaseResolve
       appliedFilters,
     );
 
-    const isAggregationsEnabled =
-      await this.featureFlagService.isFeatureEnabled(
-        FeatureFlagKey.IsAggregateQueryEnabled,
-        authContext.workspace.id,
-      );
-
-    if (!isAggregationsEnabled) {
-      executionArgs.graphqlQuerySelectedFieldsResult.aggregate = {
-        totalCount:
-          executionArgs.graphqlQuerySelectedFieldsResult.aggregate.totalCount,
-      };
-    }
-
     const processAggregateHelper = new ProcessAggregateHelper();
 
     processAggregateHelper.addSelectedAggregatedFieldsQueriesToQueryBuilder({
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/__tests__/compute-cursor-arg-filter.spec.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/__tests__/compute-cursor-arg-filter.spec.ts
index 8aaaeb003b50..cdf056007256 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/__tests__/compute-cursor-arg-filter.spec.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/__tests__/compute-cursor-arg-filter.spec.ts
@@ -1,8 +1,9 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { OrderByDirection } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
 
 import { GraphqlQueryRunnerException } from 'src/engine/api/graphql/graphql-query-runner/errors/graphql-query-runner.exception';
 import { computeCursorArgFilter } from 'src/engine/api/graphql/graphql-query-runner/utils/compute-cursor-arg-filter';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 
 describe('computeCursorArgFilter', () => {
   const mockFieldMetadataMap = {
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/compute-cursor-arg-filter.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/compute-cursor-arg-filter.ts
index 030c515251f4..222c10e67934 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/compute-cursor-arg-filter.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/compute-cursor-arg-filter.ts
@@ -1,3 +1,5 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import {
   ObjectRecordFilter,
   ObjectRecordOrderBy,
@@ -9,7 +11,6 @@ import {
   GraphqlQueryRunnerExceptionCode,
 } from 'src/engine/api/graphql/graphql-query-runner/errors/graphql-query-runner.exception';
 import { compositeTypeDefinitions } from 'src/engine/metadata-modules/field-metadata/composite-types';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
 import { FieldMetadataMap } from 'src/engine/metadata-modules/types/field-metadata-map';
 
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/__tests__/query-runner-args.factory.spec.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/__tests__/query-runner-args.factory.spec.ts
index 04e7b650d454..fe6e8a44b329 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/__tests__/query-runner-args.factory.spec.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/__tests__/query-runner-args.factory.spec.ts
@@ -1,11 +1,12 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
+import { FieldMetadataType } from 'twenty-shared';
+
 import { WorkspaceQueryRunnerOptions } from 'src/engine/api/graphql/workspace-query-runner/interfaces/query-runner-option.interface';
 import { ResolverArgsType } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 
 import { QueryRunnerArgsFactory } from 'src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory';
 import { RecordPositionFactory } from 'src/engine/api/graphql/workspace-query-runner/factories/record-position.factory';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { FieldMetadataMap } from 'src/engine/metadata-modules/types/field-metadata-map';
 
 describe('QueryRunnerArgsFactory', () => {
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-result-getters/handlers/attachment-query-result-getter.handler.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-result-getters/handlers/attachment-query-result-getter.handler.ts
index 794657c7d269..87f9b413532e 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-result-getters/handlers/attachment-query-result-getter.handler.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-result-getters/handlers/attachment-query-result-getter.handler.ts
@@ -23,7 +23,7 @@ export class AttachmentQueryResultGetterHandler
 
     return {
       ...attachment,
-      fullPath: `${attachment.fullPath}?token=${signedPayload}`,
+      fullPath: `${process.env.SERVER_URL}/files/${attachment.fullPath}?token=${signedPayload}`,
     };
   }
 }
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory.ts
index 6fae9cb18e37..25cab922556f 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory.ts
@@ -1,5 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
+import { FieldMetadataType } from 'twenty-shared';
+
 import {
   ObjectRecord,
   ObjectRecordFilter,
@@ -16,7 +18,6 @@ import {
 } from 'src/engine/api/graphql/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { FieldMetadataMap } from 'src/engine/metadata-modules/types/field-metadata-map';
 
 import { RecordPositionFactory } from './record-position.factory';
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
index 1b7e6fb7ce44..cef535df2761 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
@@ -1,17 +1,21 @@
 import { Injectable } from '@nestjs/common';
 
+import { OnDatabaseBatchEvent } from 'src/engine/api/graphql/graphql-query-runner/decorators/on-database-batch-event.decorator';
+import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
 import { ObjectRecordCreateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-create.event';
+import { ObjectRecordDeleteEvent } from 'src/engine/core-modules/event-emitter/types/object-record-delete.event';
+import { ObjectRecordDestroyEvent } from 'src/engine/core-modules/event-emitter/types/object-record-destroy.event';
+import { ObjectRecordEvent } from 'src/engine/core-modules/event-emitter/types/object-record-event.event';
+import { ObjectRecordNonDestructiveEvent } from 'src/engine/core-modules/event-emitter/types/object-record-non-destructive-event';
+import { ObjectRecordRestoreEvent } from 'src/engine/core-modules/event-emitter/types/object-record-restore.event';
 import { ObjectRecordUpdateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-update.event';
-import { ObjectRecordBaseEvent } from 'src/engine/core-modules/event-emitter/types/object-record.base.event';
 import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
 import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event.type';
 import { CreateAuditLogFromInternalEvent } from 'src/modules/timeline/jobs/create-audit-log-from-internal-event';
 import { UpsertTimelineActivityFromInternalEvent } from 'src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job';
-import { OnDatabaseBatchEvent } from 'src/engine/api/graphql/graphql-query-runner/decorators/on-database-batch-event.decorator';
 import { CallWebhookJobsJob } from 'src/modules/webhook/jobs/call-webhook-jobs.job';
-import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
 
 @Injectable()
 export class EntityEventsToDbListener {
@@ -24,47 +28,66 @@ export class EntityEventsToDbListener {
 
   @OnDatabaseBatchEvent('*', DatabaseEventAction.CREATED)
   async handleCreate(batchEvent: WorkspaceEventBatch<ObjectRecordCreateEvent>) {
-    return this.handle(batchEvent);
+    return this.handleEvent(batchEvent, DatabaseEventAction.CREATED);
   }
 
   @OnDatabaseBatchEvent('*', DatabaseEventAction.UPDATED)
   async handleUpdate(batchEvent: WorkspaceEventBatch<ObjectRecordUpdateEvent>) {
-    return this.handle(batchEvent);
+    return this.handleEvent(batchEvent, DatabaseEventAction.UPDATED);
   }
 
   @OnDatabaseBatchEvent('*', DatabaseEventAction.DELETED)
-  async handleDelete(batchEvent: WorkspaceEventBatch<ObjectRecordUpdateEvent>) {
-    return this.handle(batchEvent);
+  async handleDelete(batchEvent: WorkspaceEventBatch<ObjectRecordDeleteEvent>) {
+    return this.handleEvent(batchEvent, DatabaseEventAction.DELETED);
+  }
+
+  @OnDatabaseBatchEvent('*', DatabaseEventAction.RESTORED)
+  async handleRestore(
+    batchEvent: WorkspaceEventBatch<ObjectRecordRestoreEvent>,
+  ) {
+    return this.handleEvent(batchEvent, DatabaseEventAction.RESTORED);
   }
 
   @OnDatabaseBatchEvent('*', DatabaseEventAction.DESTROYED)
   async handleDestroy(
-    batchEvent: WorkspaceEventBatch<ObjectRecordUpdateEvent>,
+    batchEvent: WorkspaceEventBatch<ObjectRecordDestroyEvent>,
   ) {
-    return this.handle(batchEvent);
+    return this.handleEvent(batchEvent, DatabaseEventAction.DESTROYED);
   }
 
-  private async handle(batchEvent: WorkspaceEventBatch<ObjectRecordBaseEvent>) {
+  private async handleEvent<T extends ObjectRecordEvent>(
+    batchEvent: WorkspaceEventBatch<T>,
+    action: DatabaseEventAction,
+  ) {
     const filteredEvents = batchEvent.events.filter(
       (event) => event.objectMetadata?.isAuditLogged,
     );
 
-    await this.entityEventsToDbQueueService.add<
-      WorkspaceEventBatch<ObjectRecordBaseEvent>
-    >(CreateAuditLogFromInternalEvent.name, {
-      ...batchEvent,
-      events: filteredEvents,
-    });
-
-    await this.entityEventsToDbQueueService.add<
-      WorkspaceEventBatch<ObjectRecordBaseEvent>
-    >(UpsertTimelineActivityFromInternalEvent.name, {
-      ...batchEvent,
-      events: filteredEvents,
-    });
-
-    await this.webhookQueueService.add<
-      WorkspaceEventBatch<ObjectRecordBaseEvent>
-    >(CallWebhookJobsJob.name, batchEvent, { retryLimit: 3 });
+    await Promise.all([
+      this.webhookQueueService.add<WorkspaceEventBatch<T>>(
+        CallWebhookJobsJob.name,
+        batchEvent,
+        {
+          retryLimit: 3,
+        },
+      ),
+      this.entityEventsToDbQueueService.add<WorkspaceEventBatch<T>>(
+        CreateAuditLogFromInternalEvent.name,
+        {
+          ...batchEvent,
+          events: filteredEvents,
+        },
+      ),
+      ...(action !== DatabaseEventAction.DESTROYED
+        ? [
+            this.entityEventsToDbQueueService.add<
+              WorkspaceEventBatch<ObjectRecordNonDestructiveEvent>
+            >(UpsertTimelineActivityFromInternalEvent.name, {
+              ...batchEvent,
+              events: filteredEvents,
+            }),
+          ]
+        : []),
+    ]);
   }
 }
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/services/__tests__/record-position-backfill-service.spec.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/services/__tests__/record-position-backfill-service.spec.ts
index 6a05c92837a8..f40616f7963b 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/services/__tests__/record-position-backfill-service.spec.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/services/__tests__/record-position-backfill-service.spec.ts
@@ -1,10 +1,11 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { getRepositoryToken } from '@nestjs/typeorm';
 
+import { FieldMetadataType } from 'twenty-shared';
+
 import { RecordPositionQueryFactory } from 'src/engine/api/graphql/workspace-query-builder/factories/record-position-query.factory';
 import { RecordPositionFactory } from 'src/engine/api/graphql/workspace-query-runner/factories/record-position.factory';
 import { RecordPositionBackfillService } from 'src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-service';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
 
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-service.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-service.ts
index cf5827568c21..fbb183e456b1 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-service.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-service.ts
@@ -3,13 +3,13 @@ import { InjectRepository } from '@nestjs/typeorm';
 
 import { isDefined } from 'class-validator';
 import { Repository } from 'typeorm';
+import { FieldMetadataType } from 'twenty-shared';
 
 import {
   RecordPositionQueryFactory,
   RecordPositionQueryType,
 } from 'src/engine/api/graphql/workspace-query-builder/factories/record-position-query.factory';
 import { RecordPositionFactory } from 'src/engine/api/graphql/workspace-query-runner/factories/record-position.factory';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
 
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-enum-type-definition.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-enum-type-definition.factory.ts
index a400f29050f5..0de3bad9b887 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-enum-type-definition.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-enum-type-definition.factory.ts
@@ -1,6 +1,7 @@
 import { Injectable, Logger } from '@nestjs/common';
 
 import { GraphQLEnumType } from 'graphql';
+import { FieldMetadataType } from 'twenty-shared';
 
 import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
 import {
@@ -8,15 +9,14 @@ import {
   CompositeType,
 } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
 
-import { pascalCase } from 'src/utils/pascal-case';
+import { EnumTypeDefinitionFactory } from 'src/engine/api/graphql/workspace-schema-builder/factories/enum-type-definition.factory';
+import { computeCompositePropertyTarget } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-composite-property-target.util';
 import {
   FieldMetadataComplexOption,
   FieldMetadataDefaultOption,
 } from 'src/engine/metadata-modules/field-metadata/dtos/options.input';
 import { isEnumFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util';
-import { EnumTypeDefinitionFactory } from 'src/engine/api/graphql/workspace-schema-builder/factories/enum-type-definition.factory';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { computeCompositePropertyTarget } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-composite-property-target.util';
+import { pascalCase } from 'src/utils/pascal-case';
 
 export interface EnumTypeDefinition {
   target: string;
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-input-type-definition.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-input-type-definition.factory.ts
index 39ed36c2a6e8..249828b9ef87 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-input-type-definition.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-input-type-definition.factory.ts
@@ -1,18 +1,18 @@
 import { Injectable, Logger } from '@nestjs/common';
 
 import { GraphQLInputFieldConfigMap, GraphQLInputObjectType } from 'graphql';
+import { FieldMetadataType } from 'twenty-shared';
 
 import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
 import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
 
-import { pascalCase } from 'src/utils/pascal-case';
-import { isRelationFieldMetadataType } from 'src/engine/utils/is-relation-field-metadata-type.util';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   InputTypeDefinition,
   InputTypeDefinitionKind,
 } from 'src/engine/api/graphql/workspace-schema-builder/factories/input-type-definition.factory';
 import { computeCompositePropertyTarget } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-composite-property-target.util';
+import { isRelationFieldMetadataType } from 'src/engine/utils/is-relation-field-metadata-type.util';
+import { pascalCase } from 'src/utils/pascal-case';
 
 import { InputTypeFactory } from './input-type.factory';
 
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-object-type-definition.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-object-type-definition.factory.ts
index 1a3934505387..702ff89f379b 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-object-type-definition.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/composite-object-type-definition.factory.ts
@@ -1,19 +1,19 @@
 import { Injectable, Logger } from '@nestjs/common';
 
 import { GraphQLFieldConfigMap, GraphQLObjectType } from 'graphql';
+import { FieldMetadataType } from 'twenty-shared';
 
 import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
 import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
 
-import { pascalCase } from 'src/utils/pascal-case';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { OutputTypeFactory } from 'src/engine/api/graphql/workspace-schema-builder/factories/output-type.factory';
 import {
   ObjectTypeDefinition,
   ObjectTypeDefinitionKind,
 } from 'src/engine/api/graphql/workspace-schema-builder/factories/object-type-definition.factory';
-import { isRelationFieldMetadataType } from 'src/engine/utils/is-relation-field-metadata-type.util';
+import { OutputTypeFactory } from 'src/engine/api/graphql/workspace-schema-builder/factories/output-type.factory';
 import { computeCompositePropertyTarget } from 'src/engine/api/graphql/workspace-schema-builder/utils/compute-composite-property-target.util';
+import { isRelationFieldMetadataType } from 'src/engine/utils/is-relation-field-metadata-type.util';
+import { pascalCase } from 'src/utils/pascal-case';
 
 @Injectable()
 export class CompositeObjectTypeDefinitionFactory {
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/input-type.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/input-type.factory.ts
index 97eb3c6b1932..e9c94e97edcd 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/input-type.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/input-type.factory.ts
@@ -6,6 +6,7 @@ import {
   GraphQLInputType,
   GraphQLList,
 } from 'graphql';
+import { FieldMetadataType } from 'twenty-shared';
 
 import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
 
@@ -15,7 +16,6 @@ import {
   TypeOptions,
 } from 'src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service';
 import { TypeDefinitionsStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { isEnumFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util';
 
 import { InputTypeDefinitionKind } from './input-type-definition.factory';
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/output-type.factory.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/output-type.factory.ts
index ea3bdda4c21c..e8db91075d2b 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/output-type.factory.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/factories/output-type.factory.ts
@@ -1,6 +1,7 @@
 import { Injectable, Logger } from '@nestjs/common';
 
 import { GraphQLOutputType } from 'graphql';
+import { FieldMetadataType } from 'twenty-shared';
 
 import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
 
@@ -9,7 +10,6 @@ import {
   TypeOptions,
 } from 'src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service';
 import { TypeDefinitionsStorage } from 'src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 
 import { ObjectTypeDefinitionKind } from './object-type-definition.factory';
 
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/cursor.scalar.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/cursor.scalar.ts
index 88291346003e..69b6612a0e5a 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/cursor.scalar.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/cursor.scalar.ts
@@ -1,25 +1,27 @@
 import { GraphQLScalarType, Kind } from 'graphql';
 
+import { ValidationError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
+
 export const CursorScalarType = new GraphQLScalarType({
   name: 'Cursor',
   description: 'A custom scalar that represents a cursor for pagination',
   serialize(value) {
     if (typeof value !== 'string') {
-      throw new Error('Cursor must be a string');
+      throw new ValidationError('Cursor must be a string');
     }
 
     return value;
   },
   parseValue(value) {
     if (typeof value !== 'string') {
-      throw new Error('Cursor must be a string');
+      throw new ValidationError('Cursor must be a string');
     }
 
     return value;
   },
   parseLiteral(ast) {
     if (ast.kind !== Kind.STRING) {
-      throw new Error('Cursor must be a string');
+      throw new ValidationError('Cursor must be a string');
     }
 
     return ast.value;
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/position.scalar.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/position.scalar.ts
index 73622e8a2749..fcbc04db0b3b 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/position.scalar.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/position.scalar.ts
@@ -1,5 +1,7 @@
 import { GraphQLScalarType, Kind } from 'graphql';
 
+import { ValidationError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
+
 type PositionType = 'first' | 'last' | number;
 
 const isValidStringPosition = (value: string): boolean =>
@@ -13,7 +15,9 @@ const checkPosition = (value: any): PositionType => {
     return value;
   }
 
-  throw new Error('Invalid position found');
+  throw new ValidationError(
+    `Invalid position value: '${value}'. Position must be 'first', 'last', or a number`,
+  );
 };
 
 export const PositionScalarType = new GraphQLScalarType({
@@ -34,6 +38,6 @@ export const PositionScalarType = new GraphQLScalarType({
       return parseFloat(ast.value);
     }
 
-    throw new Error('Invalid position found');
+    throw new ValidationError('Invalid position value');
   },
 });
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/raw-json.scalar.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/raw-json.scalar.ts
index 92b502f0500c..bff382f0a374 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/raw-json.scalar.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/raw-json.scalar.ts
@@ -3,6 +3,8 @@ import { Maybe } from 'graphql-yoga';
 import { ObjMap } from 'graphql/jsutils/ObjMap';
 import { ASTNode, Kind, ValueNode } from 'graphql/language';
 
+import { ValidationError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
+
 const parseLiteral = (
   ast: ValueNode,
   variables?: Maybe<ObjMap<unknown>>,
@@ -25,7 +27,7 @@ const parseLiteral = (
     case Kind.VARIABLE:
       return variables ? variables[ast.name.value] : undefined;
     default:
-      throw new TypeError(
+      throw new ValidationError(
         `JSONStringify cannot represent value: ${JSON.stringify(ast)}`,
       );
   }
@@ -54,7 +56,7 @@ const parseJSON = (value: string): object => {
   try {
     return JSON.parse(value);
   } catch (e) {
-    throw new TypeError(`Value is not valid JSON: ${value}`);
+    throw new ValidationError(`Value is not valid JSON: ${value}`);
   }
 };
 
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/time.scalar.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/time.scalar.ts
index 55f3811fa63e..31ba10c5929f 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/time.scalar.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/time.scalar.ts
@@ -1,6 +1,8 @@
 import { GraphQLScalarType } from 'graphql';
 import { IntValueNode, Kind } from 'graphql/language';
 
+import { ValidationError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
+
 export const TimeScalarType = new GraphQLScalarType({
   name: 'Time',
   description: 'Time custom scalar type',
@@ -17,8 +19,8 @@ export const TimeScalarType = new GraphQLScalarType({
       if (typeof intAst.value === 'number') {
         return new Date(intAst.value);
       }
-      throw new Error(`Invalid timestamp value: ${ast.value}`);
+      throw new ValidationError(`Invalid timestamp value: ${ast.value}`);
     }
-    throw new Error(`Invalid AST kind: ${ast.kind}`);
+    throw new ValidationError(`Invalid AST kind: ${ast.kind}`);
   },
 });
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/uuid.scalar.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/uuid.scalar.ts
index de46e2fc9069..c0a5edc6c3e6 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/uuid.scalar.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/uuid.scalar.ts
@@ -1,12 +1,14 @@
 import { GraphQLScalarType, Kind } from 'graphql';
 import { validate as uuidValidate } from 'uuid';
 
+import { ValidationError } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
+
 const checkUUID = (value: any): string => {
   if (typeof value !== 'string') {
-    throw new Error('UUID must be a string');
+    throw new ValidationError('UUID must be a string');
   }
   if (!uuidValidate(value)) {
-    throw new Error('Invalid UUID');
+    throw new ValidationError('Invalid UUID');
   }
 
   return value;
@@ -19,7 +21,7 @@ export const UUIDScalarType = new GraphQLScalarType({
   parseValue: checkUUID,
   parseLiteral(ast): string {
     if (ast.kind !== Kind.STRING) {
-      throw new Error('UUID must be a string');
+      throw new ValidationError('UUID must be a string');
     }
 
     return ast.value;
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service.ts
index aa3259aea9b8..4970dc3f543b 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/services/type-mapper.service.ts
@@ -13,6 +13,7 @@ import {
   GraphQLString,
   GraphQLType,
 } from 'graphql';
+import { FieldMetadataType } from 'twenty-shared';
 
 import { FieldMetadataSettings } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-settings.interface';
 
@@ -37,7 +38,6 @@ import { PositionScalarType } from 'src/engine/api/graphql/workspace-schema-buil
 import { RawJSONScalar } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars/raw-json.scalar';
 import { getNumberFilterType } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-number-filter-type.util';
 import { getNumberScalarType } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-number-scalar-type.util';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 
 export interface TypeOptions<T = any> {
   nullable?: boolean;
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage.ts
index 585e9ad99df5..0c98e17c0762 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/storages/type-definitions.storage.ts
@@ -5,8 +5,8 @@ import {
   GraphQLInputObjectType,
   GraphQLObjectType,
 } from 'graphql';
+import { FieldMetadataType } from 'twenty-shared';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { EnumTypeDefinition } from 'src/engine/api/graphql/workspace-schema-builder/factories/enum-type-definition.factory';
 import {
   InputTypeDefinition,
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/__tests__/get-field-metadata-type.spec.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/__tests__/get-field-metadata-type.spec.ts
index 022eab2af3dd..21ad78287e1b 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/__tests__/get-field-metadata-type.spec.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/__tests__/get-field-metadata-type.spec.ts
@@ -1,4 +1,5 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
+
 import { getFieldMetadataType } from 'src/engine/api/graphql/workspace-schema-builder/utils/get-field-metadata-type.util';
 
 describe('getFieldMetadataType', () => {
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/compute-composite-property-target.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/compute-composite-property-target.util.ts
index 607790ef0f95..1ed8adcdcc69 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/compute-composite-property-target.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/compute-composite-property-target.util.ts
@@ -1,6 +1,6 @@
-import { CompositeProperty } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+import { FieldMetadataType } from 'twenty-shared';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { CompositeProperty } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
 
 export const computeCompositePropertyTarget = (
   type: FieldMetadataType,
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/generate-fields.utils.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/generate-fields.utils.ts
index 4797b9dbbaef..0b6460c55866 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/generate-fields.utils.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/generate-fields.utils.ts
@@ -4,13 +4,13 @@ import {
   GraphQLInputType,
   GraphQLOutputType,
 } from 'graphql';
+import { FieldMetadataType } from 'twenty-shared';
 
 import { WorkspaceBuildSchemaOptions } from 'src/engine/api/graphql/workspace-schema-builder/interfaces/workspace-build-schema-optionts.interface';
 import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
 import { InputTypeDefinitionKind } from 'src/engine/api/graphql/workspace-schema-builder/factories/input-type-definition.factory';
 import { ObjectTypeDefinitionKind } from 'src/engine/api/graphql/workspace-schema-builder/factories/object-type-definition.factory';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
 import { isRelationFieldMetadataType } from 'src/engine/utils/is-relation-field-metadata-type.util';
 
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-available-aggregations-from-object-fields.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-available-aggregations-from-object-fields.util.ts
index 52b75d50ddcb..f659720bf381 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-available-aggregations-from-object-fields.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-available-aggregations-from-object-fields.util.ts
@@ -1,12 +1,16 @@
 import { GraphQLISODateTime } from '@nestjs/graphql';
 
 import { GraphQLFloat, GraphQLInt, GraphQLScalarType } from 'graphql';
-import { capitalize } from 'twenty-shared';
+import {
+  capitalize,
+  FIELD_FOR_TOTAL_COUNT_AGGREGATE_OPERATION,
+  FieldMetadataType,
+  isFieldMetadataDateKind,
+} from 'twenty-shared';
 
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 
 import { AGGREGATE_OPERATIONS } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { getSubfieldsForAggregateOperation } from 'src/engine/twenty-orm/utils/get-subfields-for-aggregate-operation.util';
 
 export type AggregationField = {
@@ -75,24 +79,25 @@ export const getAvailableAggregationsFromObjectFields = (
         aggregateOperation: AGGREGATE_OPERATIONS.percentageNotEmpty,
       };
 
-      switch (field.type) {
-        case FieldMetadataType.DATE_TIME:
-          acc[`min${capitalize(field.name)}`] = {
-            type: GraphQLISODateTime,
-            description: `Earliest date contained in the field ${field.name}`,
-            fromField: field.name,
-            fromFieldType: field.type,
-            aggregateOperation: AGGREGATE_OPERATIONS.min,
-          };
+      if (isFieldMetadataDateKind(field.type)) {
+        acc[`min${capitalize(field.name)}`] = {
+          type: GraphQLISODateTime,
+          description: `Earliest date contained in the field ${field.name}`,
+          fromField: field.name,
+          fromFieldType: field.type,
+          aggregateOperation: AGGREGATE_OPERATIONS.min,
+        };
+
+        acc[`max${capitalize(field.name)}`] = {
+          type: GraphQLISODateTime,
+          description: `Latest date contained in the field ${field.name}`,
+          fromField: field.name,
+          fromFieldType: field.type,
+          aggregateOperation: AGGREGATE_OPERATIONS.max,
+        };
+      }
 
-          acc[`max${capitalize(field.name)}`] = {
-            type: GraphQLISODateTime,
-            description: `Latest date contained in the field ${field.name}`,
-            fromField: field.name,
-            fromFieldType: field.type,
-            aggregateOperation: AGGREGATE_OPERATIONS.max,
-          };
-          break;
+      switch (field.type) {
         case FieldMetadataType.NUMBER:
           acc[`min${capitalize(field.name)}`] = {
             type: GraphQLFloat,
@@ -172,7 +177,7 @@ export const getAvailableAggregationsFromObjectFields = (
       totalCount: {
         type: GraphQLInt,
         description: `Total number of records in the connection`,
-        fromField: 'id',
+        fromField: FIELD_FOR_TOTAL_COUNT_AGGREGATE_OPERATION,
         fromFieldType: FieldMetadataType.UUID,
         aggregateOperation: AGGREGATE_OPERATIONS.count,
       },
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-field-metadata-type.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-field-metadata-type.util.ts
index 8c93756899dd..515fbe97c4ab 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-field-metadata-type.util.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-field-metadata-type.util.ts
@@ -1,4 +1,4 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
 
 const typeOrmTypeMapping = new Map<string, FieldMetadataType>([
   ['uuid', FieldMetadataType.UUID],
diff --git a/packages/twenty-server/src/engine/api/rest/core/query-builder/factories/delete-variables.factory.ts b/packages/twenty-server/src/engine/api/rest/core/query-builder/factories/delete-variables.factory.ts
index a1a5a40bd221..09c0473606cd 100644
--- a/packages/twenty-server/src/engine/api/rest/core/query-builder/factories/delete-variables.factory.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/query-builder/factories/delete-variables.factory.ts
@@ -6,7 +6,7 @@ import { QueryVariables } from 'src/engine/api/rest/core/types/query-variables.t
 export class DeleteVariablesFactory {
   create(id: string): QueryVariables {
     return {
-      id: id,
+      id,
     };
   }
 }
diff --git a/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/__tests__/get-field-type.utils.spec.ts b/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/__tests__/get-field-type.utils.spec.ts
index ec6854bc482f..8a23abca6c77 100644
--- a/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/__tests__/get-field-type.utils.spec.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/__tests__/get-field-type.utils.spec.ts
@@ -1,5 +1,6 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { objectMetadataItemMock } from 'src/engine/api/__mocks__/object-metadata-item.mock';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { getFieldType } from 'src/engine/api/rest/core/query-builder/utils/get-field-type.utils';
 
 describe('getFieldType', () => {
diff --git a/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/__tests__/map-field-metadata-to-graphql-query.utils.spec.ts b/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/__tests__/map-field-metadata-to-graphql-query.utils.spec.ts
index 4fec6c7ab443..55743d1a397f 100644
--- a/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/__tests__/map-field-metadata-to-graphql-query.utils.spec.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/__tests__/map-field-metadata-to-graphql-query.utils.spec.ts
@@ -1,3 +1,5 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import {
   fieldCurrencyMock,
   fieldNumberMock,
@@ -5,7 +7,6 @@ import {
   objectMetadataItemMock,
 } from 'src/engine/api/__mocks__/object-metadata-item.mock';
 import { mapFieldMetadataToGraphqlQuery } from 'src/engine/api/rest/core/query-builder/utils/map-field-metadata-to-graphql-query.utils';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 
 describe('mapFieldMetadataToGraphqlQuery', () => {
diff --git a/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/__tests__/check-filter-enum-values.spec.ts b/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/__tests__/check-filter-enum-values.spec.ts
index 8c24bce85846..ee0a8c6e047f 100644
--- a/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/__tests__/check-filter-enum-values.spec.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/__tests__/check-filter-enum-values.spec.ts
@@ -1,9 +1,10 @@
-import { checkFilterEnumValues } from 'src/engine/api/rest/core/query-builder/utils/filter-utils/check-filter-enum-values';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
+
 import {
   fieldSelectMock,
   objectMetadataItemMock,
 } from 'src/engine/api/__mocks__/object-metadata-item.mock';
+import { checkFilterEnumValues } from 'src/engine/api/rest/core/query-builder/utils/filter-utils/check-filter-enum-values';
 
 describe('checkFilterEnumValues', () => {
   it('should check properly', () => {
diff --git a/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/__tests__/format-field-values.utils.spec.ts b/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/__tests__/format-field-values.utils.spec.ts
index 6787ccc3eec8..8d18d3f412fb 100644
--- a/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/__tests__/format-field-values.utils.spec.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/__tests__/format-field-values.utils.spec.ts
@@ -1,4 +1,5 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
+
 import { formatFieldValue } from 'src/engine/api/rest/core/query-builder/utils/filter-utils/format-field-values.utils';
 
 describe('formatFieldValue', () => {
@@ -52,5 +53,23 @@ describe('formatFieldValue', () => {
     ).toThrow(
       "'filter' invalid for 'in' operator. Received '2024-12-01T14:23:23.914Z' but array value expected eg: 'field[in]:[value_1,value_2]'",
     );
+
+    expect(
+      formatFieldValue(
+        '["2023-12-01T14:23:23.914Z","2024-12-01T14:23:23.914Z"]',
+        undefined,
+        'containsAny',
+      ),
+    ).toEqual(['2023-12-01T14:23:23.914Z', '2024-12-01T14:23:23.914Z']);
+
+    expect(
+      formatFieldValue('[1,2]', FieldMetadataType.NUMBER, 'containsAny'),
+    ).toEqual([1, 2]);
+
+    expect(() =>
+      formatFieldValue('2024-12-01T14:23:23.914Z', undefined, 'containsAny'),
+    ).toThrow(
+      "'filter' invalid for 'containsAny' operator. Received '2024-12-01T14:23:23.914Z' but array value expected eg: 'field[containsAny]:[value_1,value_2]'",
+    );
   });
 });
diff --git a/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/check-filter-enum-values.ts b/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/check-filter-enum-values.ts
index 3a57186c15cb..9565a087fcdf 100644
--- a/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/check-filter-enum-values.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/check-filter-enum-values.ts
@@ -1,8 +1,8 @@
 import { BadRequestException } from '@nestjs/common';
 
-import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+import { FieldMetadataType } from 'twenty-shared';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
 export const checkFilterEnumValues = (
   fieldType: FieldMetadataType | undefined,
diff --git a/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/format-field-values.utils.ts b/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/format-field-values.utils.ts
index e884ebf4b6ac..33052ef834c8 100644
--- a/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/format-field-values.utils.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/format-field-values.utils.ts
@@ -1,17 +1,19 @@
 import { BadRequestException } from '@nestjs/common';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
+
 import { FieldValue } from 'src/engine/api/rest/core/types/field-value.type';
+import { isDefined } from 'src/utils/is-defined';
 
 export const formatFieldValue = (
   value: string,
   fieldType?: FieldMetadataType,
   comparator?: string,
 ): FieldValue => {
-  if (comparator === 'in') {
+  if (isDefined(comparator) && ['in', 'containsAny'].includes(comparator)) {
     if (value[0] !== '[' || value[value.length - 1] !== ']') {
       throw new BadRequestException(
-        `'filter' invalid for 'in' operator. Received '${value}' but array value expected eg: 'field[in]:[value_1,value_2]'`,
+        `'filter' invalid for '${comparator}' operator. Received '${value}' but array value expected eg: 'field[${comparator}]:[value_1,value_2]'`,
       );
     }
     const stringValues = value.substring(1, value.length - 1);
diff --git a/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/parse-base-filter.utils.ts b/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/parse-base-filter.utils.ts
index 5a11d1a2007e..0381c45bf78b 100644
--- a/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/parse-base-filter.utils.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/filter-utils/parse-base-filter.utils.ts
@@ -4,6 +4,7 @@ export enum FilterComparators {
   eq = 'eq',
   neq = 'neq',
   in = 'in',
+  containsAny = 'containsAny',
   is = 'is',
   gt = 'gt',
   gte = 'gte',
@@ -59,7 +60,7 @@ export const parseBaseFilter = (
     throw new BadRequestException(
       `'filter' invalid for '${baseFilter}', comparator ${comparator} not in ${Object.keys(
         FilterComparators,
-      ).join(',')}`,
+      ).join(', ')}`,
     );
   }
 
diff --git a/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/get-field-type.utils.ts b/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/get-field-type.utils.ts
index 9cae4ad8e3a3..b118344e2be2 100644
--- a/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/get-field-type.utils.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/get-field-type.utils.ts
@@ -1,6 +1,6 @@
-import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
+import { FieldMetadataType } from 'twenty-shared';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
 export const getFieldType = (
   objectMetadata: ObjectMetadataInterface,
diff --git a/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/map-field-metadata-to-graphql-query.utils.ts b/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/map-field-metadata-to-graphql-query.utils.ts
index fb229a1f8eb5..96bacd1629a6 100644
--- a/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/map-field-metadata-to-graphql-query.utils.ts
+++ b/packages/twenty-server/src/engine/api/rest/core/query-builder/utils/map-field-metadata-to-graphql-query.utils.ts
@@ -1,4 +1,5 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
+
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 
 const DEFAULT_DEPTH_VALUE = 1;
diff --git a/packages/twenty-server/src/engine/api/rest/input-factories/__tests__/filter-input.factory.spec.ts b/packages/twenty-server/src/engine/api/rest/input-factories/__tests__/filter-input.factory.spec.ts
index b6366ff7034d..0ccf816d185b 100644
--- a/packages/twenty-server/src/engine/api/rest/input-factories/__tests__/filter-input.factory.spec.ts
+++ b/packages/twenty-server/src/engine/api/rest/input-factories/__tests__/filter-input.factory.spec.ts
@@ -47,7 +47,7 @@ describe('FilterInputFactory', () => {
       };
 
       expect(() => service.create(request, objectMetadata)).toThrow(
-        "'filter' invalid for 'fieldNumber[wrongComparator]:1', comparator wrongComparator not in eq,neq,in,is,gt,gte,lt,lte,startsWith,like,ilike",
+        "'filter' invalid for 'fieldNumber[wrongComparator]:1', comparator wrongComparator not in eq, neq, in, containsAny, is, gt, gte, lt, lte, startsWith, like, ilike",
       );
     });
 
diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts
index ea18ea80b801..0e91c3c57d7c 100644
--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts
@@ -3,14 +3,14 @@ import { Args, Mutation, Resolver } from '@nestjs/graphql';
 
 import { AdminPanelService } from 'src/engine/core-modules/admin-panel/admin-panel.service';
 import { ImpersonateInput } from 'src/engine/core-modules/admin-panel/dtos/impersonate.input';
+import { ImpersonateOutput } from 'src/engine/core-modules/admin-panel/dtos/impersonate.output';
 import { UpdateWorkspaceFeatureFlagInput } from 'src/engine/core-modules/admin-panel/dtos/update-workspace-feature-flag.input';
 import { UserLookup } from 'src/engine/core-modules/admin-panel/dtos/user-lookup.entity';
 import { UserLookupInput } from 'src/engine/core-modules/admin-panel/dtos/user-lookup.input';
 import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
+import { ImpersonateGuard } from 'src/engine/guards/impersonate-guard';
 import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
-import { ImpersonateGuard } from 'src/engine/guards/impersonate-guard';
-import { ImpersonateOutput } from 'src/engine/core-modules/admin-panel/dtos/impersonate.output';
 
 @Resolver()
 @UseFilters(AuthGraphqlApiExceptionFilter)
diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.service.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.service.ts
index a50708e72e2a..54db76fbaa30 100644
--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.service.ts
@@ -8,13 +8,18 @@ import {
   AuthException,
   AuthExceptionCode,
 } from 'src/engine/core-modules/auth/auth.exception';
+import { LoginTokenService } from 'src/engine/core-modules/auth/token/services/login-token.service';
 import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import {
+  FeatureFlagException,
+  FeatureFlagExceptionCode,
+} from 'src/engine/core-modules/feature-flag/feature-flag.exception';
+import { featureFlagValidator } from 'src/engine/core-modules/feature-flag/validates/feature-flag.validate';
 import { User } from 'src/engine/core-modules/user/user.entity';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { userValidator } from 'src/engine/core-modules/user/user.validate';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace.validate';
-import { LoginTokenService } from 'src/engine/core-modules/auth/token/services/login-token.service';
 
 @Injectable()
 export class AdminPanelService {
@@ -44,14 +49,9 @@ export class AdminPanelService {
 
     userValidator.assertIsDefinedOrThrow(
       user,
-      new AuthException('User not found', AuthExceptionCode.INVALID_INPUT),
-    );
-
-    workspaceValidator.assertIsDefinedOrThrow(
-      user.workspaces[0].workspace,
       new AuthException(
-        'Impersonation not allowed',
-        AuthExceptionCode.FORBIDDEN_EXCEPTION,
+        'User not found or impersonation not enable on workspace',
+        AuthExceptionCode.INVALID_INPUT,
       ),
     );
 
@@ -125,6 +125,14 @@ export class AdminPanelService {
     featureFlag: FeatureFlagKey,
     value: boolean,
   ) {
+    featureFlagValidator.assertIsFeatureFlagKey(
+      featureFlag,
+      new FeatureFlagException(
+        'Invalid feature flag key',
+        FeatureFlagExceptionCode.INVALID_FEATURE_FLAG_KEY,
+      ),
+    );
+
     const workspace = await this.workspaceRepository.findOne({
       where: { id: workspaceId },
       relations: ['featureFlags'],
@@ -136,14 +144,14 @@ export class AdminPanelService {
     );
 
     const existingFlag = workspace.featureFlags?.find(
-      (flag) => flag.key === featureFlag,
+      (flag) => flag.key === FeatureFlagKey[featureFlag],
     );
 
     if (existingFlag) {
       await this.featureFlagRepository.update(existingFlag.id, { value });
     } else {
       await this.featureFlagRepository.save({
-        key: featureFlag,
+        key: FeatureFlagKey[featureFlag],
         value,
         workspaceId: workspace.id,
       });
diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.spec.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.spec.ts
new file mode 100644
index 000000000000..24f55ef5e15c
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.spec.ts
@@ -0,0 +1,219 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { getRepositoryToken } from '@nestjs/typeorm';
+
+import { expect, jest } from '@jest/globals';
+
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { AdminPanelService } from 'src/engine/core-modules/admin-panel/admin-panel.service';
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { LoginTokenService } from 'src/engine/core-modules/auth/token/services/login-token.service';
+import {
+  AuthException,
+  AuthExceptionCode,
+} from 'src/engine/core-modules/auth/auth.exception';
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
+
+const UserFindOneMock = jest.fn();
+const WorkspaceFindOneMock = jest.fn();
+const FeatureFlagUpdateMock = jest.fn();
+const FeatureFlagSaveMock = jest.fn();
+const LoginTokenServiceGenerateLoginTokenMock = jest.fn();
+
+jest.mock(
+  'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum',
+  () => {
+    return {
+      FeatureFlagKey: {
+        IsFlagEnabled: 'IS_FLAG_ENABLED',
+      },
+    };
+  },
+);
+
+describe('AdminPanelService', () => {
+  let service: AdminPanelService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        AdminPanelService,
+        {
+          provide: getRepositoryToken(Workspace, 'core'),
+          useValue: {
+            findOne: WorkspaceFindOneMock,
+          },
+        },
+        {
+          provide: getRepositoryToken(User, 'core'),
+          useValue: {
+            findOne: UserFindOneMock,
+          },
+        },
+        {
+          provide: getRepositoryToken(FeatureFlagEntity, 'core'),
+          useValue: {
+            update: FeatureFlagUpdateMock,
+            save: FeatureFlagSaveMock,
+          },
+        },
+        {
+          provide: LoginTokenService,
+          useValue: {
+            generateLoginToken: LoginTokenServiceGenerateLoginTokenMock,
+          },
+        },
+      ],
+    }).compile();
+
+    service = module.get<AdminPanelService>(AdminPanelService);
+  });
+
+  it('should be defined', async () => {
+    expect(service).toBeDefined();
+  });
+
+  it('should update an existing feature flag if it exists', async () => {
+    const workspaceId = 'workspace-id';
+    const featureFlag = 'IsFlagEnabled' as FeatureFlagKey;
+    const value = true;
+    const existingFlag = {
+      id: 'flag-id',
+      key: 'IS_FLAG_ENABLED',
+      value: false,
+    };
+
+    WorkspaceFindOneMock.mockReturnValueOnce({
+      id: workspaceId,
+      featureFlags: [existingFlag],
+    });
+
+    await service.updateWorkspaceFeatureFlags(workspaceId, featureFlag, value);
+
+    expect(FeatureFlagUpdateMock).toHaveBeenCalledWith(existingFlag.id, {
+      value,
+    });
+    expect(FeatureFlagSaveMock).not.toHaveBeenCalled();
+  });
+
+  it('should create a new feature flag if it does not exist', async () => {
+    const workspaceId = 'workspace-id';
+    const featureFlag = 'IsFlagEnabled' as FeatureFlagKey;
+    const value = true;
+
+    WorkspaceFindOneMock.mockReturnValueOnce({
+      id: workspaceId,
+      featureFlags: [],
+    });
+
+    await service.updateWorkspaceFeatureFlags(workspaceId, featureFlag, value);
+
+    expect(FeatureFlagSaveMock).toHaveBeenCalledWith({
+      key: 'IS_FLAG_ENABLED',
+      value,
+      workspaceId,
+    });
+    expect(FeatureFlagUpdateMock).not.toHaveBeenCalled();
+  });
+
+  it('should throw an exception if the workspace is not found', async () => {
+    const workspaceId = 'non-existent-workspace';
+    const featureFlag = 'IsFlagEnabled' as FeatureFlagKey;
+    const value = true;
+
+    WorkspaceFindOneMock.mockReturnValueOnce(null);
+
+    await expect(
+      service.updateWorkspaceFeatureFlags(workspaceId, featureFlag, value),
+    ).rejects.toThrowError(
+      new AuthException('Workspace not found', AuthExceptionCode.INVALID_INPUT),
+    );
+  });
+
+  it('should throw an exception if the flag is not found', async () => {
+    const workspaceId = 'non-existent-workspace';
+    const featureFlag = 'IsUnknownFlagEnabled' as FeatureFlagKey;
+    const value = true;
+
+    WorkspaceFindOneMock.mockReturnValueOnce(null);
+
+    await expect(
+      service.updateWorkspaceFeatureFlags(workspaceId, featureFlag, value),
+    ).rejects.toThrowError(
+      new AuthException(
+        'Invalid feature flag key',
+        AuthExceptionCode.INVALID_INPUT,
+      ),
+    );
+  });
+
+  it('should impersonate a user and return workspace and loginToken on success', async () => {
+    const mockUser = {
+      id: 'user-id',
+      email: 'user@example.com',
+      workspaces: [
+        {
+          workspace: {
+            id: 'workspace-id',
+            allowImpersonation: true,
+            subdomain: 'example-subdomain',
+          },
+        },
+      ],
+    };
+
+    UserFindOneMock.mockReturnValueOnce(mockUser);
+    LoginTokenServiceGenerateLoginTokenMock.mockReturnValueOnce({
+      token: 'mock-login-token',
+      expiresAt: new Date(),
+    });
+
+    const result = await service.impersonate('user-id', 'workspace-id');
+
+    expect(UserFindOneMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        where: expect.objectContaining({
+          id: 'user-id',
+          workspaces: {
+            workspaceId: 'workspace-id',
+            workspace: { allowImpersonation: true },
+          },
+        }),
+        relations: ['workspaces', 'workspaces.workspace'],
+      }),
+    );
+
+    expect(LoginTokenServiceGenerateLoginTokenMock).toHaveBeenCalledWith(
+      'user@example.com',
+      'workspace-id',
+    );
+
+    expect(result).toEqual(
+      expect.objectContaining({
+        workspace: {
+          id: 'workspace-id',
+          subdomain: 'example-subdomain',
+        },
+        loginToken: expect.objectContaining({
+          token: 'mock-login-token',
+          expiresAt: expect.any(Date),
+        }),
+      }),
+    );
+  });
+
+  it('should throw an error when user is not found', async () => {
+    UserFindOneMock.mockReturnValueOnce(null);
+
+    await expect(
+      service.impersonate('invalid-user-id', 'workspace-id'),
+    ).rejects.toThrow(
+      new AuthException(
+        'User not found or impersonation not enable on workspace',
+        AuthExceptionCode.INVALID_INPUT,
+      ),
+    );
+
+    expect(UserFindOneMock).toHaveBeenCalled();
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/app-token/app-token.entity.ts b/packages/twenty-server/src/engine/core-modules/app-token/app-token.entity.ts
index 38f17ddaa7fc..4c2f2f1fc430 100644
--- a/packages/twenty-server/src/engine/core-modules/app-token/app-token.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/app-token/app-token.entity.ts
@@ -1,21 +1,21 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 
+import { BeforeCreateOne, IDField } from '@ptc-org/nestjs-query-graphql';
 import {
-  Entity,
   Column,
-  PrimaryGeneratedColumn,
-  ManyToOne,
-  JoinColumn,
   CreateDateColumn,
-  UpdateDateColumn,
+  Entity,
+  JoinColumn,
+  ManyToOne,
+  PrimaryGeneratedColumn,
   Relation,
+  UpdateDateColumn,
 } from 'typeorm';
-import { BeforeCreateOne, IDField } from '@ptc-org/nestjs-query-graphql';
 
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
 import { BeforeCreateOneAppToken } from 'src/engine/core-modules/app-token/hooks/before-create-one-app-token.hook';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
 export enum AppTokenType {
   RefreshToken = 'REFRESH_TOKEN',
   CodeChallenge = 'CODE_CHALLENGE',
@@ -23,6 +23,7 @@ export enum AppTokenType {
   PasswordResetToken = 'PASSWORD_RESET_TOKEN',
   InvitationToken = 'INVITATION_TOKEN',
   OIDCCodeVerifier = 'OIDC_CODE_VERIFIER',
+  EmailVerificationToken = 'EMAIL_VERIFICATION_TOKEN',
 }
 
 @Entity({ name: 'appToken', schema: 'core' })
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.exception.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.exception.ts
index 514246339c5e..b658f25e28d1 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/auth.exception.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.exception.ts
@@ -9,10 +9,12 @@ export class AuthException extends CustomException {
 
 export enum AuthExceptionCode {
   USER_NOT_FOUND = 'USER_NOT_FOUND',
+  EMAIL_NOT_VERIFIED = 'EMAIL_NOT_VERIFIED',
   CLIENT_NOT_FOUND = 'CLIENT_NOT_FOUND',
   WORKSPACE_NOT_FOUND = 'WORKSPACE_NOT_FOUND',
   INVALID_INPUT = 'INVALID_INPUT',
   FORBIDDEN_EXCEPTION = 'FORBIDDEN_EXCEPTION',
+  INSUFFICIENT_SCOPES = 'INSUFFICIENT_SCOPES',
   UNAUTHENTICATED = 'UNAUTHENTICATED',
   INVALID_DATA = 'INVALID_DATA',
   INTERNAL_SERVER_ERROR = 'INTERNAL_SERVER_ERROR',
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts
index 8346f4265395..b975d94abc5f 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.module.ts
@@ -17,7 +17,7 @@ import { MicrosoftAPIsService } from 'src/engine/core-modules/auth/services/micr
 // import { OAuthService } from 'src/engine/core-modules/auth/services/oauth.service';
 import { ResetPasswordService } from 'src/engine/core-modules/auth/services/reset-password.service';
 import { SignInUpService } from 'src/engine/core-modules/auth/services/sign-in-up.service';
-import { SwitchWorkspaceService } from 'src/engine/core-modules/auth/services/switch-workspace.service';
+import { SocialSsoService } from 'src/engine/core-modules/auth/services/social-sso.service';
 import { SamlAuthStrategy } from 'src/engine/core-modules/auth/strategies/saml.auth.strategy';
 import { AccessTokenService } from 'src/engine/core-modules/auth/token/services/access-token.service';
 import { LoginTokenService } from 'src/engine/core-modules/auth/token/services/login-token.service';
@@ -25,6 +25,7 @@ import { RefreshTokenService } from 'src/engine/core-modules/auth/token/services
 import { TransientTokenService } from 'src/engine/core-modules/auth/token/services/transient-token.service';
 import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
 import { DomainManagerModule } from 'src/engine/core-modules/domain-manager/domain-manager.module';
+import { EmailVerificationModule } from 'src/engine/core-modules/email-verification/email-verification.module';
 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
 import { FileUploadModule } from 'src/engine/core-modules/file/file-upload/file-upload.module';
@@ -79,6 +80,7 @@ import { JwtAuthStrategy } from './strategies/jwt.auth.strategy';
     WorkspaceSSOModule,
     FeatureFlagModule,
     WorkspaceInvitationModule,
+    EmailVerificationModule,
   ],
   controllers: [
     GoogleAuthController,
@@ -100,9 +102,9 @@ import { JwtAuthStrategy } from './strategies/jwt.auth.strategy';
     RefreshTokenService,
     LoginTokenService,
     ResetPasswordService,
-    SwitchWorkspaceService,
     TransientTokenService,
     ApiKeyService,
+    SocialSsoService,
     // reenable when working on: https://github.com/twentyhq/twenty/issues/9143
     // OAuthService,
   ],
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts
index bf7d07189ffe..de7f682ca78a 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.spec.ts
@@ -3,11 +3,12 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { getRepositoryToken } from '@nestjs/typeorm';
 
 import { CaptchaGuard } from 'src/engine/core-modules/captcha/captcha.guard';
+import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
+import { EmailVerificationService } from 'src/engine/core-modules/email-verification/services/email-verification.service';
 import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
 import { UserService } from 'src/engine/core-modules/user/services/user.service';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
 
 import { AuthResolver } from './auth.resolver';
 
@@ -15,7 +16,7 @@ import { ApiKeyService } from './services/api-key.service';
 import { AuthService } from './services/auth.service';
 // import { OAuthService } from './services/oauth.service';
 import { ResetPasswordService } from './services/reset-password.service';
-import { SwitchWorkspaceService } from './services/switch-workspace.service';
+import { EmailVerificationTokenService } from './token/services/email-verification-token.service';
 import { LoginTokenService } from './token/services/login-token.service';
 import { RenewTokenService } from './token/services/renew-token.service';
 import { TransientTokenService } from './token/services/transient-token.service';
@@ -73,11 +74,15 @@ describe('AuthResolver', () => {
           useValue: {},
         },
         {
-          provide: SwitchWorkspaceService,
+          provide: TransientTokenService,
           useValue: {},
         },
         {
-          provide: TransientTokenService,
+          provide: EmailVerificationService,
+          useValue: {},
+        },
+        {
+          provide: EmailVerificationTokenService,
           useValue: {},
         },
         // {
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts
index ed69a8b7afaa..952df1567534 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.resolver.ts
@@ -1,5 +1,8 @@
 import { UseFilters, UseGuards } from '@nestjs/common';
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository } from 'typeorm';
 
 import { ApiKeyTokenInput } from 'src/engine/core-modules/auth/dto/api-key-token.input';
 import { AppTokenInput } from 'src/engine/core-modules/auth/dto/app-token.input';
@@ -15,30 +18,31 @@ import { ValidatePasswordResetTokenInput } from 'src/engine/core-modules/auth/dt
 import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
 import { ApiKeyService } from 'src/engine/core-modules/auth/services/api-key.service';
 // import { OAuthService } from 'src/engine/core-modules/auth/services/oauth.service';
+import {
+  AuthException,
+  AuthExceptionCode,
+} from 'src/engine/core-modules/auth/auth.exception';
+import { AvailableWorkspaceOutput } from 'src/engine/core-modules/auth/dto/available-workspaces.output';
+import { GetLoginTokenFromEmailVerificationTokenInput } from 'src/engine/core-modules/auth/dto/get-login-token-from-email-verification-token.input';
+import { SignUpOutput } from 'src/engine/core-modules/auth/dto/sign-up.output';
 import { ResetPasswordService } from 'src/engine/core-modules/auth/services/reset-password.service';
-import { SwitchWorkspaceService } from 'src/engine/core-modules/auth/services/switch-workspace.service';
+import { EmailVerificationTokenService } from 'src/engine/core-modules/auth/token/services/email-verification-token.service';
 import { LoginTokenService } from 'src/engine/core-modules/auth/token/services/login-token.service';
 import { RenewTokenService } from 'src/engine/core-modules/auth/token/services/renew-token.service';
 import { TransientTokenService } from 'src/engine/core-modules/auth/token/services/transient-token.service';
 import { CaptchaGuard } from 'src/engine/core-modules/captcha/captcha.guard';
+import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
+import { EmailVerificationService } from 'src/engine/core-modules/email-verification/services/email-verification.service';
+import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
 import { UserService } from 'src/engine/core-modules/user/services/user.service';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace.validate';
 import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { OriginHeader } from 'src/engine/decorators/auth/origin-header.decorator';
 import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
-import { SwitchWorkspaceInput } from 'src/engine/core-modules/auth/dto/switch-workspace.input';
-import { PublicWorkspaceDataOutput } from 'src/engine/core-modules/workspace/dtos/public-workspace-data-output';
-import {
-  AuthException,
-  AuthExceptionCode,
-} from 'src/engine/core-modules/auth/auth.exception';
-import { OriginHeader } from 'src/engine/decorators/auth/origin-header.decorator';
-import { AvailableWorkspaceOutput } from 'src/engine/core-modules/auth/dto/available-workspaces.output';
-import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
-import { SignUpOutput } from 'src/engine/core-modules/auth/dto/sign-up.output';
-import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace.validate';
 
 import { ChallengeInput } from './dto/challenge.input';
 import { LoginToken } from './dto/login-token.entity';
@@ -55,16 +59,20 @@ import { AuthService } from './services/auth.service';
 @UseFilters(AuthGraphqlApiExceptionFilter)
 export class AuthResolver {
   constructor(
+    @InjectRepository(User, 'core')
+    private readonly userRepository: Repository<User>,
     private authService: AuthService,
     private renewTokenService: RenewTokenService,
     private userService: UserService,
     private apiKeyService: ApiKeyService,
     private resetPasswordService: ResetPasswordService,
     private loginTokenService: LoginTokenService,
-    private switchWorkspaceService: SwitchWorkspaceService,
     private transientTokenService: TransientTokenService,
+    private emailVerificationService: EmailVerificationService,
     // private oauthService: OAuthService,
     private domainManagerService: DomainManagerService,
+    private userWorkspaceService: UserWorkspaceService,
+    private emailVerificationTokenService: EmailVerificationTokenService,
   ) {}
 
   @UseGuards(CaptchaGuard)
@@ -104,12 +112,13 @@ export class AuthResolver {
         origin,
       );
 
-    if (!workspace) {
-      throw new AuthException(
+    workspaceValidator.assertIsDefinedOrThrow(
+      workspace,
+      new AuthException(
         'Workspace not found',
         AuthExceptionCode.WORKSPACE_NOT_FOUND,
-      );
-    }
+      ),
+    );
     const user = await this.authService.challenge(challengeInput, workspace);
     const loginToken = await this.loginTokenService.generateLoginToken(
       user.email,
@@ -120,19 +129,94 @@ export class AuthResolver {
   }
 
   @UseGuards(CaptchaGuard)
-  @Mutation(() => SignUpOutput)
-  async signUp(
-    @Args() signUpInput: SignUpInput,
+  @Mutation(() => LoginToken)
+  async getLoginTokenFromEmailVerificationToken(
+    @Args()
+    getLoginTokenFromEmailVerificationTokenInput: GetLoginTokenFromEmailVerificationTokenInput,
     @OriginHeader() origin: string,
-  ): Promise<SignUpOutput> {
-    const { user, workspace } = await this.authService.signInUp({
-      ...signUpInput,
-      targetWorkspaceSubdomain:
-        this.domainManagerService.getWorkspaceSubdomainByOrigin(origin),
-      fromSSO: false,
+  ) {
+    const workspace =
+      await this.domainManagerService.getWorkspaceByOriginOrDefaultWorkspace(
+        origin,
+      );
+
+    workspaceValidator.assertIsDefinedOrThrow(
+      workspace,
+      new AuthException(
+        'Workspace not found',
+        AuthExceptionCode.WORKSPACE_NOT_FOUND,
+      ),
+    );
+
+    const user =
+      await this.emailVerificationTokenService.validateEmailVerificationTokenOrThrow(
+        getLoginTokenFromEmailVerificationTokenInput.emailVerificationToken,
+      );
+
+    await this.userService.markEmailAsVerified(user.id);
+
+    const loginToken = await this.loginTokenService.generateLoginToken(
+      user.email,
+      workspace.id,
+    );
+
+    return { loginToken };
+  }
+
+  @UseGuards(CaptchaGuard)
+  @Mutation(() => SignUpOutput)
+  async signUp(@Args() signUpInput: SignUpInput): Promise<SignUpOutput> {
+    const currentWorkspace = await this.authService.findWorkspaceForSignInUp({
+      workspaceInviteHash: signUpInput.workspaceInviteHash,
       authProvider: 'password',
+      workspaceId: signUpInput.workspaceId,
+    });
+
+    const invitation =
+      currentWorkspace && signUpInput.workspacePersonalInviteToken
+        ? await this.authService.findInvitationForSignInUp({
+            currentWorkspace,
+            workspacePersonalInviteToken:
+              signUpInput.workspacePersonalInviteToken,
+          })
+        : undefined;
+
+    const existingUser = await this.userRepository.findOne({
+      where: {
+        email: signUpInput.email,
+      },
     });
 
+    const { userData } = this.authService.formatUserDataPayload(
+      {
+        email: signUpInput.email,
+      },
+      existingUser,
+    );
+
+    await this.authService.checkAccessForSignIn({
+      userData,
+      invitation,
+      workspaceInviteHash: signUpInput.workspaceInviteHash,
+      workspace: currentWorkspace,
+    });
+
+    const { user, workspace } = await this.authService.signInUp({
+      userData,
+      workspace: currentWorkspace,
+      invitation,
+      authParams: {
+        provider: 'password',
+        password: signUpInput.password,
+      },
+    });
+
+    await this.emailVerificationService.sendVerificationEmail(
+      user.id,
+      user.email,
+      workspace.subdomain,
+    );
+
     const loginToken = await this.loginTokenService.generateLoginToken(
       user.email,
       workspace.id,
@@ -219,18 +303,6 @@ export class AuthResolver {
     );
   }
 
-  @Mutation(() => PublicWorkspaceDataOutput)
-  @UseGuards(WorkspaceAuthGuard, UserAuthGuard)
-  async switchWorkspace(
-    @AuthUser() user: User,
-    @Args() args: SwitchWorkspaceInput,
-  ): Promise<PublicWorkspaceDataOutput> {
-    return await this.switchWorkspaceService.switchWorkspace(
-      user,
-      args.workspaceId,
-    );
-  }
-
   @Mutation(() => AuthTokens)
   async renewToken(@Args() args: AppTokenInput): Promise<AuthTokens> {
     const tokens = await this.renewTokenService.generateTokensFromRefreshToken(
@@ -296,6 +368,6 @@ export class AuthResolver {
   async findAvailableWorkspacesByEmail(
     @Args('email') email: string,
   ): Promise<AvailableWorkspaceOutput[]> {
-    return this.authService.findAvailableWorkspacesByEmail(email);
+    return this.userWorkspaceService.findAvailableWorkspacesByEmail(email);
   }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/auth/auth.util.ts b/packages/twenty-server/src/engine/core-modules/auth/auth.util.ts
index 275eeb7e5116..8e829cb6a205 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/auth.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/auth.util.ts
@@ -12,9 +12,7 @@ export const PASSWORD_REGEX = /^.{8,}$/;
 const saltRounds = 10;
 
 export const hashPassword = async (password: string) => {
-  const hash = await bcrypt.hash(password, saltRounds);
-
-  return hash;
+  return await bcrypt.hash(password, saltRounds);
 };
 
 export const compareHash = async (password: string, passwordHash: string) => {
diff --git a/packages/twenty-server/src/engine/core-modules/auth/controllers/google-auth.controller.ts b/packages/twenty-server/src/engine/core-modules/auth/controllers/google-auth.controller.ts
index 31b83489f461..7a4b9ba4fe18 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/controllers/google-auth.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/controllers/google-auth.controller.ts
@@ -11,7 +11,10 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { Response } from 'express';
 import { Repository } from 'typeorm';
 
-import { AuthException } from 'src/engine/core-modules/auth/auth.exception';
+import {
+  AuthException,
+  AuthExceptionCode,
+} from 'src/engine/core-modules/auth/auth.exception';
 import { AuthOAuthExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-oauth-exception.filter';
 import { AuthRestApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-rest-api-exception.filter';
 import { GoogleOauthGuard } from 'src/engine/core-modules/auth/guards/google-oauth.guard';
@@ -20,8 +23,7 @@ import { AuthService } from 'src/engine/core-modules/auth/services/auth.service'
 import { GoogleRequest } from 'src/engine/core-modules/auth/strategies/google.auth.strategy';
 import { LoginTokenService } from 'src/engine/core-modules/auth/token/services/login-token.service';
 import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
-import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { User } from 'src/engine/core-modules/user/user.entity';
 
 @Controller('auth/google')
 @UseFilters(AuthRestApiExceptionFilter)
@@ -30,9 +32,8 @@ export class GoogleAuthController {
     private readonly loginTokenService: LoginTokenService,
     private readonly authService: AuthService,
     private readonly domainManagerService: DomainManagerService,
-    private readonly environmentService: EnvironmentService,
-    @InjectRepository(Workspace, 'core')
-    private readonly workspaceRepository: Repository<Workspace>,
+    @InjectRepository(User, 'core')
+    private readonly userRepository: Repository<User>,
   ) {}
 
   @Get()
@@ -46,57 +47,63 @@ export class GoogleAuthController {
   @UseGuards(GoogleProviderEnabledGuard, GoogleOauthGuard)
   @UseFilters(AuthOAuthExceptionFilter)
   async googleAuthRedirect(@Req() req: GoogleRequest, @Res() res: Response) {
+    const {
+      firstName,
+      lastName,
+      email,
+      picture,
+      workspaceInviteHash,
+      workspacePersonalInviteToken,
+      workspaceId,
+      billingCheckoutSessionState,
+    } = req.user;
+
+    const currentWorkspace = await this.authService.findWorkspaceForSignInUp({
+      workspaceId,
+      workspaceInviteHash,
+      email,
+      authProvider: 'google',
+    });
+
     try {
-      const {
-        firstName,
-        lastName,
-        email,
-        picture,
-        workspaceInviteHash,
-        workspacePersonalInviteToken,
-        targetWorkspaceSubdomain,
-        billingCheckoutSessionState,
-      } = req.user;
+      const invitation =
+        currentWorkspace && workspacePersonalInviteToken && email
+          ? await this.authService.findInvitationForSignInUp({
+              currentWorkspace,
+              email,
+            })
+          : undefined;
 
-      const signInUpParams = {
-        email,
-        firstName,
-        lastName,
-        picture,
-        workspaceInviteHash,
-        workspacePersonalInviteToken,
-        targetWorkspaceSubdomain,
-        fromSSO: true,
-        isAuthEnabled: 'google',
-      };
+      const existingUser = await this.userRepository.findOne({
+        where: { email },
+      });
 
-      if (
-        this.environmentService.get('IS_MULTIWORKSPACE_ENABLED') &&
-        (targetWorkspaceSubdomain ===
-          this.environmentService.get('DEFAULT_SUBDOMAIN') ||
-          !targetWorkspaceSubdomain)
-      ) {
-        const workspaceWithGoogleAuthActive =
-          await this.workspaceRepository.findOne({
-            where: {
-              isGoogleAuthEnabled: true,
-              workspaceUsers: {
-                user: {
-                  email,
-                },
-              },
-            },
-            relations: ['workspaceUsers', 'workspaceUsers.user'],
-          });
+      const { userData } = this.authService.formatUserDataPayload(
+        {
+          firstName,
+          lastName,
+          email,
+          picture,
+        },
+        existingUser,
+      );
 
-        if (workspaceWithGoogleAuthActive) {
-          signInUpParams.targetWorkspaceSubdomain =
-            workspaceWithGoogleAuthActive.subdomain;
-        }
-      }
+      await this.authService.checkAccessForSignIn({
+        userData,
+        invitation,
+        workspaceInviteHash,
+        workspace: currentWorkspace,
+      });
 
-      const { user, workspace } =
-        await this.authService.signInUp(signInUpParams);
+      const { user, workspace } = await this.authService.signInUp({
+        invitation,
+        workspace: currentWorkspace,
+        userData,
+        authParams: {
+          provider: 'google',
+        },
+        billingCheckoutSessionState,
+      });
 
       const loginToken = await this.loginTokenService.generateLoginToken(
         user.email,
@@ -104,24 +111,21 @@ export class GoogleAuthController {
       );
 
       return res.redirect(
-        this.authService.computeRedirectURI(
-          loginToken.token,
-          workspace.subdomain,
+        this.authService.computeRedirectURI({
+          loginToken: loginToken.token,
+          subdomain: workspace.subdomain,
           billingCheckoutSessionState,
-        ),
+        }),
       );
     } catch (err) {
       if (err instanceof AuthException) {
         return res.redirect(
-          this.domainManagerService.computeRedirectErrorUrl({
-            subdomain:
-              req.user.targetWorkspaceSubdomain ??
-              this.environmentService.get('DEFAULT_SUBDOMAIN'),
-            errorMessage: err.message,
+          this.domainManagerService.computeRedirectErrorUrl(err.message, {
+            subdomain: currentWorkspace?.subdomain,
           }),
         );
       }
-      throw err;
+      throw new AuthException(err, AuthExceptionCode.INTERNAL_SERVER_ERROR);
     }
   }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/auth/controllers/microsoft-auth.controller.ts b/packages/twenty-server/src/engine/core-modules/auth/controllers/microsoft-auth.controller.ts
index 131c56207571..90c1295402b6 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/controllers/microsoft-auth.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/controllers/microsoft-auth.controller.ts
@@ -19,8 +19,7 @@ import { AuthService } from 'src/engine/core-modules/auth/services/auth.service'
 import { MicrosoftRequest } from 'src/engine/core-modules/auth/strategies/microsoft.auth.strategy';
 import { LoginTokenService } from 'src/engine/core-modules/auth/token/services/login-token.service';
 import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
-import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { User } from 'src/engine/core-modules/user/user.entity';
 
 @Controller('auth/microsoft')
 @UseFilters(AuthRestApiExceptionFilter)
@@ -29,9 +28,8 @@ export class MicrosoftAuthController {
     private readonly loginTokenService: LoginTokenService,
     private readonly authService: AuthService,
     private readonly domainManagerService: DomainManagerService,
-    private readonly environmentService: EnvironmentService,
-    @InjectRepository(Workspace, 'core')
-    private readonly workspaceRepository: Repository<Workspace>,
+    @InjectRepository(User, 'core')
+    private readonly userRepository: Repository<User>,
   ) {}
 
   @Get()
@@ -47,38 +45,62 @@ export class MicrosoftAuthController {
     @Req() req: MicrosoftRequest,
     @Res() res: Response,
   ) {
+    const {
+      firstName,
+      lastName,
+      email,
+      picture,
+      workspaceInviteHash,
+      workspacePersonalInviteToken,
+      workspaceId,
+      billingCheckoutSessionState,
+    } = req.user;
+
+    const currentWorkspace = await this.authService.findWorkspaceForSignInUp({
+      workspaceId,
+      workspaceInviteHash,
+      email,
+      authProvider: 'microsoft',
+    });
+
     try {
-      const signInUpParams = req.user;
+      const invitation =
+        currentWorkspace && workspacePersonalInviteToken && email
+          ? await this.authService.findInvitationForSignInUp({
+              currentWorkspace,
+              email,
+            })
+          : undefined;
 
-      if (
-        this.environmentService.get('IS_MULTIWORKSPACE_ENABLED') &&
-        (signInUpParams.targetWorkspaceSubdomain ===
-          this.environmentService.get('DEFAULT_SUBDOMAIN') ||
-          !signInUpParams.targetWorkspaceSubdomain)
-      ) {
-        const workspaceWithGoogleAuthActive =
-          await this.workspaceRepository.findOne({
-            where: {
-              isMicrosoftAuthEnabled: true,
-              workspaceUsers: {
-                user: {
-                  email: signInUpParams.email,
-                },
-              },
-            },
-            relations: ['userWorkspaces', 'userWorkspaces.user'],
-          });
+      const existingUser = await this.userRepository.findOne({
+        where: { email },
+      });
 
-        if (workspaceWithGoogleAuthActive) {
-          signInUpParams.targetWorkspaceSubdomain =
-            workspaceWithGoogleAuthActive.subdomain;
-        }
-      }
+      const { userData } = this.authService.formatUserDataPayload(
+        {
+          firstName,
+          lastName,
+          email,
+          picture,
+        },
+        existingUser,
+      );
+
+      await this.authService.checkAccessForSignIn({
+        userData,
+        invitation,
+        workspaceInviteHash,
+        workspace: currentWorkspace,
+      });
 
       const { user, workspace } = await this.authService.signInUp({
-        ...signInUpParams,
-        fromSSO: true,
-        authProvider: 'microsoft',
+        invitation,
+        workspace: currentWorkspace,
+        userData,
+        authParams: {
+          provider: 'microsoft',
+        },
+        billingCheckoutSessionState,
       });
 
       const loginToken = await this.loginTokenService.generateLoginToken(
@@ -87,20 +109,18 @@ export class MicrosoftAuthController {
       );
 
       return res.redirect(
-        this.authService.computeRedirectURI(
-          loginToken.token,
-          workspace.subdomain,
-          signInUpParams.billingCheckoutSessionState,
-        ),
+        this.authService.computeRedirectURI({
+          loginToken: loginToken.token,
+          subdomain: workspace.subdomain,
+
+          billingCheckoutSessionState,
+        }),
       );
     } catch (err) {
       if (err instanceof AuthException) {
         return res.redirect(
-          this.domainManagerService.computeRedirectErrorUrl({
-            subdomain:
-              req.user.targetWorkspaceSubdomain ??
-              this.environmentService.get('DEFAULT_SUBDOMAIN'),
-            errorMessage: err.message,
+          this.domainManagerService.computeRedirectErrorUrl(err.message, {
+            subdomain: currentWorkspace?.subdomain,
           }),
         );
       }
diff --git a/packages/twenty-server/src/engine/core-modules/auth/controllers/sso-auth.controller.ts b/packages/twenty-server/src/engine/core-modules/auth/controllers/sso-auth.controller.ts
index 394c86713a11..5a8c35f75031 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/controllers/sso-auth.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/controllers/sso-auth.controller.ts
@@ -30,9 +30,8 @@ import {
   IdentityProviderType,
   WorkspaceSSOIdentityProvider,
 } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';
-import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
 import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
-import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+import { User } from 'src/engine/core-modules/user/user.entity';
 
 @Controller('auth')
 @UseFilters(AuthRestApiExceptionFilter)
@@ -41,9 +40,9 @@ export class SSOAuthController {
     private readonly loginTokenService: LoginTokenService,
     private readonly authService: AuthService,
     private readonly domainManagerService: DomainManagerService,
-    private readonly userWorkspaceService: UserWorkspaceService,
-    private readonly environmentService: EnvironmentService,
     private readonly ssoService: SSOService,
+    @InjectRepository(User, 'core')
+    private readonly userRepository: Repository<User>,
     @InjectRepository(WorkspaceSSOIdentityProvider, 'core')
     private readonly workspaceSSOIdentityProviderRepository: Repository<WorkspaceSSOIdentityProvider>,
   ) {}
@@ -81,50 +80,52 @@ export class SSOAuthController {
   @Get('oidc/callback')
   @UseGuards(SSOProviderEnabledGuard, OIDCAuthGuard)
   async oidcAuthCallback(@Req() req: any, @Res() res: Response) {
-    try {
-      const { loginToken, identityProvider } = await this.generateLoginToken(
-        req.user,
-      );
-
-      return res.redirect(
-        this.authService.computeRedirectURI(
-          loginToken.token,
-          identityProvider.workspace.subdomain,
-        ),
-      );
-    } catch (err) {
-      if (err instanceof AuthException) {
-        return res.redirect(
-          this.domainManagerService.computeRedirectErrorUrl({
-            subdomain: this.environmentService.get('DEFAULT_SUBDOMAIN'),
-            errorMessage: err.message,
-          }),
-        );
-      }
-      throw err;
-    }
+    return this.authCallback(req, res);
   }
 
   @Post('saml/callback/:identityProviderId')
   @UseGuards(SSOProviderEnabledGuard, SAMLAuthGuard)
   async samlAuthCallback(@Req() req: any, @Res() res: Response) {
+    return this.authCallback(req, res);
+  }
+
+  private async authCallback({ user }: any, res: Response) {
+    const workspaceIdentityProvider =
+      await this.findWorkspaceIdentityProviderByIdentityProviderId(
+        user.identityProviderId,
+      );
+
+    if (!workspaceIdentityProvider) {
+      throw new AuthException(
+        'Identity provider not found',
+        AuthExceptionCode.INVALID_DATA,
+      );
+    }
+
+    if (!user.user.email) {
+      throw new AuthException(
+        'Email not found',
+        AuthExceptionCode.INVALID_DATA,
+      );
+    }
+
     try {
       const { loginToken, identityProvider } = await this.generateLoginToken(
-        req.user,
+        user.user,
+        workspaceIdentityProvider,
       );
 
       return res.redirect(
-        this.authService.computeRedirectURI(
-          loginToken.token,
-          identityProvider.workspace.subdomain,
-        ),
+        this.authService.computeRedirectURI({
+          loginToken: loginToken.token,
+          subdomain: identityProvider.workspace.subdomain,
+        }),
       );
     } catch (err) {
       if (err instanceof AuthException) {
         return res.redirect(
-          this.domainManagerService.computeRedirectErrorUrl({
-            subdomain: this.environmentService.get('DEFAULT_SUBDOMAIN'),
-            errorMessage: err.message,
+          this.domainManagerService.computeRedirectErrorUrl(err.message, {
+            subdomain: workspaceIdentityProvider.workspace.subdomain,
           }),
         );
       }
@@ -132,26 +133,19 @@ export class SSOAuthController {
     }
   }
 
-  private async generateLoginToken({
-    user,
-    identityProviderId,
-  }: {
-    identityProviderId?: string;
-    user: { email: string } & Record<string, string>;
-  }) {
-    if (!identityProviderId) {
-      throw new AuthException(
-        'Identity provider ID is required',
-        AuthExceptionCode.INVALID_DATA,
-      );
-    }
-
-    const identityProvider =
-      await this.workspaceSSOIdentityProviderRepository.findOne({
-        where: { id: identityProviderId },
-        relations: ['workspace'],
-      });
+  private async findWorkspaceIdentityProviderByIdentityProviderId(
+    identityProviderId: string,
+  ) {
+    return await this.workspaceSSOIdentityProviderRepository.findOne({
+      where: { id: identityProviderId },
+      relations: ['workspace'],
+    });
+  }
 
+  private async generateLoginToken(
+    payload: { email: string } & Record<string, string>,
+    identityProvider: WorkspaceSSOIdentityProvider,
+  ) {
     if (!identityProvider) {
       throw new AuthException(
         'Identity provider not found',
@@ -159,34 +153,45 @@ export class SSOAuthController {
       );
     }
 
-    await this.authService.signInUp({
-      ...user,
-      ...(this.environmentService.get('IS_MULTIWORKSPACE_ENABLED')
-        ? {
-            targetWorkspaceSubdomain: identityProvider.workspace.subdomain,
-          }
-        : {}),
-      fromSSO: true,
+    const invitation =
+      payload.email && identityProvider.workspace
+        ? await this.authService.findInvitationForSignInUp({
+            currentWorkspace: identityProvider.workspace,
+            email: payload.email,
+          })
+        : undefined;
+
+    const existingUser = await this.userRepository.findOne({
+      where: {
+        email: payload.email,
+      },
     });
 
-    const isUserExistInWorkspace =
-      await this.userWorkspaceService.checkUserWorkspaceExistsByEmail(
-        user.email,
-        identityProvider.workspaceId,
-      );
+    const { userData } = this.authService.formatUserDataPayload(
+      payload,
+      existingUser,
+    );
 
-    if (!isUserExistInWorkspace) {
-      throw new AuthException(
-        'User not found in workspace',
-        AuthExceptionCode.FORBIDDEN_EXCEPTION,
-      );
-    }
+    await this.authService.checkAccessForSignIn({
+      userData,
+      invitation,
+      workspace: identityProvider.workspace,
+    });
+
+    const { workspace, user } = await this.authService.signInUp({
+      userData,
+      workspace: identityProvider.workspace,
+      invitation,
+      authParams: {
+        provider: 'sso',
+      },
+    });
 
     return {
       identityProvider,
       loginToken: await this.loginTokenService.generateLoginToken(
         user.email,
-        identityProvider.workspace.id,
+        workspace.id,
       ),
     };
   }
diff --git a/packages/twenty-server/src/engine/core-modules/auth/dto/get-login-token-from-email-verification-token.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/get-login-token-from-email-verification-token.input.ts
new file mode 100644
index 000000000000..333174e75e39
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/dto/get-login-token-from-email-verification-token.input.ts
@@ -0,0 +1,16 @@
+import { ArgsType, Field } from '@nestjs/graphql';
+
+import { IsNotEmpty, IsString, IsOptional } from 'class-validator';
+
+@ArgsType()
+export class GetLoginTokenFromEmailVerificationTokenInput {
+  @Field(() => String)
+  @IsNotEmpty()
+  @IsString()
+  emailVerificationToken: string;
+
+  @Field(() => String, { nullable: true })
+  @IsString()
+  @IsOptional()
+  captchaToken?: string;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/dto/sign-up.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/sign-up.input.ts
index 4d952e0f2d8b..0677274b0e77 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/dto/sign-up.input.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/dto/sign-up.input.ts
@@ -14,6 +14,11 @@ export class SignUpInput {
   @IsString()
   password: string;
 
+  @Field(() => String, { nullable: true })
+  @IsString()
+  @IsOptional()
+  workspaceId?: string;
+
   @Field(() => String, { nullable: true })
   @IsString()
   @IsOptional()
diff --git a/packages/twenty-server/src/engine/core-modules/auth/dto/switch-workspace.input.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/switch-workspace.input.ts
deleted file mode 100644
index 4024deb7f18d..000000000000
--- a/packages/twenty-server/src/engine/core-modules/auth/dto/switch-workspace.input.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { ArgsType, Field } from '@nestjs/graphql';
-
-import { IsNotEmpty, IsString } from 'class-validator';
-
-@ArgsType()
-export class SwitchWorkspaceInput {
-  @Field(() => String)
-  @IsNotEmpty()
-  @IsString()
-  workspaceId: string;
-}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/dto/user-exists.entity.ts b/packages/twenty-server/src/engine/core-modules/auth/dto/user-exists.entity.ts
index e8f7f9a3e2e9..4b914a8a4507 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/dto/user-exists.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/dto/user-exists.entity.ts
@@ -9,6 +9,9 @@ export class UserExists {
 
   @Field(() => [AvailableWorkspaceOutput])
   availableWorkspaces: Array<AvailableWorkspaceOutput>;
+
+  @Field(() => Boolean)
+  isEmailVerified: boolean;
 }
 
 @ObjectType()
diff --git a/packages/twenty-server/src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter.ts b/packages/twenty-server/src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter.ts
index 0cf81224c3b9..818fc399f0d5 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter.ts
@@ -6,6 +6,7 @@ import {
 } from 'src/engine/core-modules/auth/auth.exception';
 import {
   AuthenticationError,
+  EmailNotVerifiedError,
   ForbiddenError,
   InternalServerError,
   NotFoundError,
@@ -20,6 +21,8 @@ export class AuthGraphqlApiExceptionFilter implements ExceptionFilter {
         throw new NotFoundError(exception.message);
       case AuthExceptionCode.INVALID_INPUT:
         throw new UserInputError(exception.message);
+      case AuthExceptionCode.EMAIL_NOT_VERIFIED:
+        throw new EmailNotVerifiedError(exception.message);
       case AuthExceptionCode.FORBIDDEN_EXCEPTION:
         throw new ForbiddenError(exception.message);
       case AuthExceptionCode.UNAUTHENTICATED:
diff --git a/packages/twenty-server/src/engine/core-modules/auth/filters/auth-oauth-exception.filter.ts b/packages/twenty-server/src/engine/core-modules/auth/filters/auth-oauth-exception.filter.ts
index 24ac236a2d9e..8adf85481814 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/filters/auth-oauth-exception.filter.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/filters/auth-oauth-exception.filter.ts
@@ -1,9 +1,4 @@
-import {
-  ArgumentsHost,
-  Catch,
-  ExceptionFilter,
-  InternalServerErrorException,
-} from '@nestjs/common';
+import { ArgumentsHost, Catch, ExceptionFilter } from '@nestjs/common';
 
 import { Response } from 'express';
 
@@ -12,10 +7,14 @@ import {
   AuthExceptionCode,
 } from 'src/engine/core-modules/auth/auth.exception';
 import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
+import { HttpExceptionHandlerService } from 'src/engine/core-modules/exception-handler/http-exception-handler.service';
 
 @Catch(AuthException)
 export class AuthOAuthExceptionFilter implements ExceptionFilter {
-  constructor(private readonly domainManagerService: DomainManagerService) {}
+  constructor(
+    private readonly domainManagerService: DomainManagerService,
+    private readonly httpExceptionHandlerService: HttpExceptionHandlerService,
+  ) {}
 
   catch(exception: AuthException, host: ArgumentsHost) {
     const ctx = host.switchToHttp();
@@ -28,7 +27,11 @@ export class AuthOAuthExceptionFilter implements ExceptionFilter {
           .redirect(this.domainManagerService.getBaseUrl().toString());
         break;
       default:
-        throw new InternalServerErrorException(exception.message);
+        return this.httpExceptionHandlerService.handleError(
+          exception,
+          response,
+          500,
+        );
     }
   }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/auth/filters/auth-rest-api-exception.filter.ts b/packages/twenty-server/src/engine/core-modules/auth/filters/auth-rest-api-exception.filter.ts
index 1c256f87e962..6ce2873f5f26 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/filters/auth-rest-api-exception.filter.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/filters/auth-rest-api-exception.filter.ts
@@ -38,7 +38,7 @@ export class AuthRestApiExceptionFilter implements ExceptionFilter {
         return this.httpExceptionHandlerService.handleError(
           exception,
           response,
-          401,
+          403,
         );
       case AuthExceptionCode.GOOGLE_API_AUTH_DISABLED:
       case AuthExceptionCode.MICROSOFT_API_AUTH_DISABLED:
@@ -46,7 +46,7 @@ export class AuthRestApiExceptionFilter implements ExceptionFilter {
         return this.httpExceptionHandlerService.handleError(
           exception,
           response,
-          403,
+          401,
         );
       case AuthExceptionCode.INTERNAL_SERVER_ERROR:
       default:
diff --git a/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-exchange-code-for-token.guard.ts b/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-exchange-code-for-token.guard.ts
index 7d3e1c324568..ea984e8eb947 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-exchange-code-for-token.guard.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-exchange-code-for-token.guard.ts
@@ -6,36 +6,20 @@ import {
   AuthExceptionCode,
 } from 'src/engine/core-modules/auth/auth.exception';
 import { GoogleAPIsOauthExchangeCodeForTokenStrategy } from 'src/engine/core-modules/auth/strategies/google-apis-oauth-exchange-code-for-token.auth.strategy';
-import { TransientTokenService } from 'src/engine/core-modules/auth/token/services/transient-token.service';
 import { setRequestExtraParams } from 'src/engine/core-modules/auth/utils/google-apis-set-request-extra-params.util';
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 
 @Injectable()
 export class GoogleAPIsOauthExchangeCodeForTokenGuard extends AuthGuard(
   'google-apis',
 ) {
-  constructor(
-    private readonly environmentService: EnvironmentService,
-    private readonly featureFlagService: FeatureFlagService,
-    private readonly transientTokenService: TransientTokenService,
-  ) {
+  constructor(private readonly environmentService: EnvironmentService) {
     super();
   }
 
   async canActivate(context: ExecutionContext) {
     const request = context.switchToHttp().getRequest();
     const state = JSON.parse(request.query.state);
-    const { workspaceId } =
-      await this.transientTokenService.verifyTransientToken(
-        state.transientToken,
-      );
-    const isGmailSendEmailScopeEnabled =
-      await this.featureFlagService.isFeatureEnabled(
-        FeatureFlagKey.IsGmailSendEmailScopeEnabled,
-        workspaceId,
-      );
 
     if (
       !this.environmentService.get('MESSAGING_PROVIDER_GMAIL_ENABLED') &&
@@ -50,7 +34,6 @@ export class GoogleAPIsOauthExchangeCodeForTokenGuard extends AuthGuard(
     new GoogleAPIsOauthExchangeCodeForTokenStrategy(
       this.environmentService,
       {},
-      isGmailSendEmailScopeEnabled,
     );
 
     setRequestExtraParams(request, {
diff --git a/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-request-code.guard.ts b/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-request-code.guard.ts
index 470c0ddf01fa..3a52e0037215 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-request-code.guard.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/guards/google-apis-oauth-request-code.guard.ts
@@ -9,7 +9,6 @@ import { GoogleAPIsOauthRequestCodeStrategy } from 'src/engine/core-modules/auth
 import { TransientTokenService } from 'src/engine/core-modules/auth/token/services/transient-token.service';
 import { setRequestExtraParams } from 'src/engine/core-modules/auth/utils/google-apis-set-request-extra-params.util';
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 
 @Injectable()
@@ -31,11 +30,6 @@ export class GoogleAPIsOauthRequestCodeGuard extends AuthGuard('google-apis') {
       await this.transientTokenService.verifyTransientToken(
         request.query.transientToken,
       );
-    const isGmailSendEmailScopeEnabled =
-      await this.featureFlagService.isFeatureEnabled(
-        FeatureFlagKey.IsGmailSendEmailScopeEnabled,
-        workspaceId,
-      );
 
     setRequestExtraParams(request, {
       transientToken: request.query.transientToken,
@@ -57,11 +51,7 @@ export class GoogleAPIsOauthRequestCodeGuard extends AuthGuard('google-apis') {
       );
     }
 
-    new GoogleAPIsOauthRequestCodeStrategy(
-      this.environmentService,
-      {},
-      isGmailSendEmailScopeEnabled,
-    );
+    new GoogleAPIsOauthRequestCodeStrategy(this.environmentService, {});
 
     const activate = (await super.canActivate(context)) as boolean;
 
diff --git a/packages/twenty-server/src/engine/core-modules/auth/guards/google-oauth.guard.ts b/packages/twenty-server/src/engine/core-modules/auth/guards/google-oauth.guard.ts
index 2cb7e93a1b04..f080dfe77eba 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/guards/google-oauth.guard.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/guards/google-oauth.guard.ts
@@ -39,10 +39,10 @@ export class GoogleOauthGuard extends AuthGuard('google') {
     }
 
     if (
-      request.query.workspaceSubdomain &&
-      typeof request.query.workspaceSubdomain === 'string'
+      request.query.workspaceId &&
+      typeof request.query.workspaceId === 'string'
     ) {
-      request.params.workspaceSubdomain = request.query.workspaceSubdomain;
+      request.params.workspaceId = request.query.workspaceId;
     }
 
     if (
diff --git a/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-apis-oauth-exchange-code-for-token.guard.ts b/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-apis-oauth-exchange-code-for-token.guard.ts
index db94e5d1fec2..de9bce16fe56 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-apis-oauth-exchange-code-for-token.guard.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/guards/microsoft-apis-oauth-exchange-code-for-token.guard.ts
@@ -1,6 +1,10 @@
 import { ExecutionContext, Injectable } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
 
+import {
+  AuthException,
+  AuthExceptionCode,
+} from 'src/engine/core-modules/auth/auth.exception';
 import { MicrosoftAPIsOauthExchangeCodeForTokenStrategy } from 'src/engine/core-modules/auth/strategies/microsoft-apis-oauth-exchange-code-for-token.auth.strategy';
 import { setRequestExtraParams } from 'src/engine/core-modules/auth/utils/google-apis-set-request-extra-params.util';
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
@@ -14,18 +18,31 @@ export class MicrosoftAPIsOauthExchangeCodeForTokenGuard extends AuthGuard(
   }
 
   async canActivate(context: ExecutionContext) {
-    const request = context.switchToHttp().getRequest();
-    const state = JSON.parse(request.query.state);
+    try {
+      const request = context.switchToHttp().getRequest();
+      const state = JSON.parse(request.query.state);
 
-    new MicrosoftAPIsOauthExchangeCodeForTokenStrategy(this.environmentService);
+      new MicrosoftAPIsOauthExchangeCodeForTokenStrategy(
+        this.environmentService,
+      );
 
-    setRequestExtraParams(request, {
-      transientToken: state.transientToken,
-      redirectLocation: state.redirectLocation,
-      calendarVisibility: state.calendarVisibility,
-      messageVisibility: state.messageVisibility,
-    });
+      setRequestExtraParams(request, {
+        transientToken: state.transientToken,
+        redirectLocation: state.redirectLocation,
+        calendarVisibility: state.calendarVisibility,
+        messageVisibility: state.messageVisibility,
+      });
 
-    return (await super.canActivate(context)) as boolean;
+      return (await super.canActivate(context)) as boolean;
+    } catch (error) {
+      if (error?.oauthError?.statusCode === 403) {
+        throw new AuthException(
+          `Insufficient privileges to access this microsoft resource. Make sure you have the correct scopes or ask your admin to update your scopes. ${error?.message}`,
+          AuthExceptionCode.INSUFFICIENT_SCOPES,
+        );
+      }
+
+      return false;
+    }
   }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.ts
index d527add80f81..31ec9b0c8cd3 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.spec.ts
@@ -1,21 +1,28 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { getRepositoryToken } from '@nestjs/typeorm';
 
-import bcrypt from 'bcrypt';
 import { expect, jest } from '@jest/globals';
+import bcrypt from 'bcrypt';
+import { Repository } from 'typeorm';
 
 import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
-import { User } from 'src/engine/core-modules/user/user.entity';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
 import { SignInUpService } from 'src/engine/core-modules/auth/services/sign-in-up.service';
-import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { EmailService } from 'src/engine/core-modules/email/email.service';
 import { AccessTokenService } from 'src/engine/core-modules/auth/token/services/access-token.service';
 import { RefreshTokenService } from 'src/engine/core-modules/auth/token/services/refresh-token.service';
+import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
+import { EmailService } from 'src/engine/core-modules/email/email.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
 import { UserService } from 'src/engine/core-modules/user/services/user.service';
+import { User } from 'src/engine/core-modules/user/user.entity';
 import { WorkspaceInvitationService } from 'src/engine/core-modules/workspace-invitation/services/workspace-invitation.service';
-import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
+import { SocialSsoService } from 'src/engine/core-modules/auth/services/social-sso.service';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { ExistingUserOrNewUser } from 'src/engine/core-modules/auth/types/signInUp.type';
+import {
+  AuthException,
+  AuthExceptionCode,
+} from 'src/engine/core-modules/auth/auth.exception';
 
 import { AuthService } from './auth.service';
 
@@ -26,11 +33,16 @@ const UserWorkspaceFindOneByMock = jest.fn();
 
 const userWorkspaceServiceCheckUserWorkspaceExistsMock = jest.fn();
 const workspaceInvitationGetOneWorkspaceInvitationMock = jest.fn();
-const workspaceInvitationValidateInvitationMock = jest.fn();
+const workspaceInvitationValidatePersonalInvitationMock = jest.fn();
 const userWorkspaceAddUserToWorkspaceMock = jest.fn();
 
+const environmentServiceGetMock = jest.fn();
+
 describe('AuthService', () => {
   let service: AuthService;
+  let userService: UserService;
+  let workspaceRepository: Repository<Workspace>;
+  let socialSsoService: SocialSsoService;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
@@ -38,7 +50,9 @@ describe('AuthService', () => {
         AuthService,
         {
           provide: getRepositoryToken(Workspace, 'core'),
-          useValue: {},
+          useValue: {
+            findOneBy: jest.fn(),
+          },
         },
         {
           provide: getRepositoryToken(User, 'core'),
@@ -48,7 +62,14 @@ describe('AuthService', () => {
         },
         {
           provide: getRepositoryToken(AppToken, 'core'),
-          useValue: {},
+          useValue: {
+            createQueryBuilder: jest.fn().mockReturnValue({
+              leftJoin: jest.fn().mockReturnThis(),
+              andWhere: jest.fn().mockReturnThis(),
+              where: jest.fn().mockReturnThis(),
+              getOne: jest.fn().mockImplementation(() => null),
+            }),
+          },
         },
         {
           provide: SignInUpService,
@@ -56,7 +77,9 @@ describe('AuthService', () => {
         },
         {
           provide: EnvironmentService,
-          useValue: {},
+          useValue: {
+            get: environmentServiceGetMock,
+          },
         },
         {
           provide: DomainManagerService,
@@ -84,20 +107,38 @@ describe('AuthService', () => {
         },
         {
           provide: UserService,
-          useValue: {},
+          useValue: {
+            hasUserAccessToWorkspaceOrThrow: jest.fn(),
+          },
         },
         {
           provide: WorkspaceInvitationService,
           useValue: {
             getOneWorkspaceInvitation:
               workspaceInvitationGetOneWorkspaceInvitationMock,
-            validateInvitation: workspaceInvitationValidateInvitationMock,
+            validatePersonalInvitation:
+              workspaceInvitationValidatePersonalInvitationMock,
+          },
+        },
+        {
+          provide: SocialSsoService,
+          useValue: {
+            findWorkspaceFromWorkspaceIdOrAuthProvider: jest.fn(),
           },
         },
       ],
     }).compile();
 
     service = module.get<AuthService>(AuthService);
+    userService = module.get<UserService>(UserService);
+    socialSsoService = module.get<SocialSsoService>(SocialSsoService);
+    workspaceRepository = module.get<Repository<Workspace>>(
+      getRepositoryToken(Workspace, 'core'),
+    );
+  });
+
+  beforeEach(() => {
+    environmentServiceGetMock.mockReturnValue(false);
   });
 
   it('should be defined', async () => {
@@ -157,7 +198,7 @@ describe('AuthService', () => {
     userWorkspaceServiceCheckUserWorkspaceExistsMock.mockReturnValueOnce(false);
 
     workspaceInvitationGetOneWorkspaceInvitationMock.mockReturnValueOnce({});
-    workspaceInvitationValidateInvitationMock.mockReturnValueOnce({});
+    workspaceInvitationValidatePersonalInvitationMock.mockReturnValueOnce({});
     userWorkspaceAddUserToWorkspaceMock.mockReturnValueOnce({});
 
     const response = await service.challenge(
@@ -180,8 +221,255 @@ describe('AuthService', () => {
     expect(
       workspaceInvitationGetOneWorkspaceInvitationMock,
     ).toHaveBeenCalledTimes(1);
-    expect(workspaceInvitationValidateInvitationMock).toHaveBeenCalledTimes(1);
+    expect(
+      workspaceInvitationValidatePersonalInvitationMock,
+    ).toHaveBeenCalledTimes(1);
     expect(userWorkspaceAddUserToWorkspaceMock).toHaveBeenCalledTimes(1);
     expect(UserFindOneMock).toHaveBeenCalledTimes(1);
   });
+
+  describe('checkAccessForSignIn', () => {
+    it('checkAccessForSignIn - allow signin for existing user who target a workspace with right access', async () => {
+      const spy = jest
+        .spyOn(userService, 'hasUserAccessToWorkspaceOrThrow')
+        .mockResolvedValue();
+
+      await service.checkAccessForSignIn({
+        userData: {
+          type: 'existingUser',
+          existingUser: {
+            id: 'user-id',
+          },
+        } as ExistingUserOrNewUser['userData'],
+        invitation: undefined,
+        workspaceInviteHash: undefined,
+        workspace: {
+          id: 'workspace-id',
+          isPublicInviteLinkEnabled: true,
+        } as Workspace,
+      });
+
+      expect(spy).toHaveBeenCalledTimes(1);
+    });
+
+    it('checkAccessForSignIn - trigger error on existing user signin in unauthorized workspace', async () => {
+      const spy = jest
+        .spyOn(userService, 'hasUserAccessToWorkspaceOrThrow')
+        .mockRejectedValue(new Error('Access denied'));
+
+      await expect(
+        service.checkAccessForSignIn({
+          userData: {
+            type: 'existingUser',
+            existingUser: {
+              id: 'user-id',
+            },
+          } as ExistingUserOrNewUser['userData'],
+          invitation: undefined,
+          workspaceInviteHash: undefined,
+          workspace: {
+            id: 'workspace-id',
+            isPublicInviteLinkEnabled: true,
+          } as Workspace,
+        }),
+      ).rejects.toThrow(new Error('Access denied'));
+
+      expect(spy).toHaveBeenCalledTimes(1);
+    });
+
+    it('checkAccessForSignIn - trigger an error when a user attempts to sign up using a public link in a workspace where public links are disabled', async () => {
+      const spy = jest.spyOn(userService, 'hasUserAccessToWorkspaceOrThrow');
+
+      await expect(
+        service.checkAccessForSignIn({
+          userData: {
+            type: 'existingUser',
+            existingUser: {
+              id: 'user-id',
+            },
+          } as ExistingUserOrNewUser['userData'],
+          invitation: undefined,
+          workspaceInviteHash: 'workspaceInviteHash',
+          workspace: {
+            id: 'workspace-id',
+            isPublicInviteLinkEnabled: false,
+          } as Workspace,
+        }),
+      ).rejects.toThrow(
+        new AuthException(
+          'Public invite link is disabled for this workspace',
+          AuthExceptionCode.FORBIDDEN_EXCEPTION,
+        ),
+      );
+
+      expect(spy).toHaveBeenCalledTimes(0);
+    });
+
+    it("checkAccessForSignIn - allow signup for new user who don't target a workspace", async () => {
+      const spy = jest
+        .spyOn(userService, 'hasUserAccessToWorkspaceOrThrow')
+        .mockResolvedValue();
+
+      await service.checkAccessForSignIn({
+        userData: {
+          type: 'newUser',
+          newUserPayload: {},
+        } as ExistingUserOrNewUser['userData'],
+        invitation: undefined,
+        workspaceInviteHash: undefined,
+        workspace: undefined,
+      });
+
+      expect(spy).toHaveBeenCalledTimes(0);
+    });
+
+    it("checkAccessForSignIn - allow signup for existing user who don't target a workspace", async () => {
+      const spy = jest
+        .spyOn(userService, 'hasUserAccessToWorkspaceOrThrow')
+        .mockResolvedValue();
+
+      await service.checkAccessForSignIn({
+        userData: {
+          type: 'existingUser',
+          existingUser: {
+            id: 'user-id',
+          },
+        } as ExistingUserOrNewUser['userData'],
+        invitation: undefined,
+        workspaceInviteHash: undefined,
+        workspace: undefined,
+      });
+
+      expect(spy).toHaveBeenCalledTimes(0);
+    });
+
+    it('checkAccessForSignIn - allow signup for new user who target a workspace with invitation', async () => {
+      const spy = jest
+        .spyOn(userService, 'hasUserAccessToWorkspaceOrThrow')
+        .mockResolvedValue();
+
+      await service.checkAccessForSignIn({
+        userData: {
+          type: 'existingUser',
+          existingUser: {
+            id: 'user-id',
+          },
+        } as ExistingUserOrNewUser['userData'],
+        invitation: {} as AppToken,
+        workspaceInviteHash: undefined,
+        workspace: {} as Workspace,
+      });
+
+      expect(spy).toHaveBeenCalledTimes(0);
+    });
+
+    it('checkAccessForSignIn - allow signup for new user who target a workspace with public invitation', async () => {
+      const spy = jest
+        .spyOn(userService, 'hasUserAccessToWorkspaceOrThrow')
+        .mockResolvedValue();
+
+      await service.checkAccessForSignIn({
+        userData: {
+          type: 'newUser',
+          newUserPayload: {},
+        } as ExistingUserOrNewUser['userData'],
+        invitation: undefined,
+        workspaceInviteHash: 'workspaceInviteHash',
+        workspace: {
+          isPublicInviteLinkEnabled: true,
+        } as Workspace,
+      });
+
+      expect(spy).toHaveBeenCalledTimes(0);
+    });
+  });
+
+  it('findWorkspaceForSignInUp - signup password auth', async () => {
+    const spyWorkspaceRepository = jest.spyOn(workspaceRepository, 'findOneBy');
+    const spySocialSsoService = jest.spyOn(
+      socialSsoService,
+      'findWorkspaceFromWorkspaceIdOrAuthProvider',
+    );
+
+    const result = await service.findWorkspaceForSignInUp({
+      authProvider: 'password',
+      workspaceId: 'workspaceId',
+    });
+
+    expect(result).toBeUndefined();
+    expect(spyWorkspaceRepository).toHaveBeenCalledTimes(0);
+    expect(spySocialSsoService).toHaveBeenCalledTimes(0);
+  });
+  it('findWorkspaceForSignInUp - signup password auth with workspaceInviteHash', async () => {
+    const spyWorkspaceRepository = jest
+      .spyOn(workspaceRepository, 'findOneBy')
+      .mockResolvedValue({} as Workspace);
+    const spySocialSsoService = jest.spyOn(
+      socialSsoService,
+      'findWorkspaceFromWorkspaceIdOrAuthProvider',
+    );
+
+    const result = await service.findWorkspaceForSignInUp({
+      authProvider: 'password',
+      workspaceId: 'workspaceId',
+      workspaceInviteHash: 'workspaceInviteHash',
+    });
+
+    expect(result).toBeDefined();
+    expect(spyWorkspaceRepository).toHaveBeenCalledTimes(1);
+    expect(spySocialSsoService).toHaveBeenCalledTimes(0);
+  });
+  it('findWorkspaceForSignInUp - signup social sso auth with workspaceInviteHash', async () => {
+    const spyWorkspaceRepository = jest
+      .spyOn(workspaceRepository, 'findOneBy')
+      .mockResolvedValue({} as Workspace);
+    const spySocialSsoService = jest.spyOn(
+      socialSsoService,
+      'findWorkspaceFromWorkspaceIdOrAuthProvider',
+    );
+
+    const result = await service.findWorkspaceForSignInUp({
+      authProvider: 'password',
+      workspaceId: 'workspaceId',
+      workspaceInviteHash: 'workspaceInviteHash',
+    });
+
+    expect(result).toBeDefined();
+    expect(spyWorkspaceRepository).toHaveBeenCalledTimes(1);
+    expect(spySocialSsoService).toHaveBeenCalledTimes(0);
+  });
+  it('findWorkspaceForSignInUp - signup social sso auth', async () => {
+    const spyWorkspaceRepository = jest.spyOn(workspaceRepository, 'findOneBy');
+
+    const spySocialSsoService = jest
+      .spyOn(socialSsoService, 'findWorkspaceFromWorkspaceIdOrAuthProvider')
+      .mockResolvedValue({} as Workspace);
+
+    const result = await service.findWorkspaceForSignInUp({
+      authProvider: 'google',
+      workspaceId: 'workspaceId',
+      email: 'email',
+    });
+
+    expect(result).toBeDefined();
+    expect(spyWorkspaceRepository).toHaveBeenCalledTimes(0);
+    expect(spySocialSsoService).toHaveBeenCalledTimes(1);
+  });
+  it('findWorkspaceForSignInUp - sso auth', async () => {
+    const spyWorkspaceRepository = jest.spyOn(workspaceRepository, 'findOneBy');
+
+    const spySocialSsoService = jest
+      .spyOn(socialSsoService, 'findWorkspaceFromWorkspaceIdOrAuthProvider')
+      .mockResolvedValue({} as Workspace);
+
+    const result = await service.findWorkspaceForSignInUp({
+      authProvider: 'sso',
+      workspaceId: 'workspaceId',
+      email: 'email',
+    });
+
+    expect(result).toBeDefined();
+    expect(spyWorkspaceRepository).toHaveBeenCalledTimes(0);
+    expect(spySocialSsoService).toHaveBeenCalledTimes(1);
+  });
 });
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
index 9a17c69f8773..6d8bc98ecfe2 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts
@@ -26,7 +26,6 @@ import {
 } from 'src/engine/core-modules/auth/auth.util';
 import { AuthorizeApp } from 'src/engine/core-modules/auth/dto/authorize-app.entity';
 import { AuthorizeAppInput } from 'src/engine/core-modules/auth/dto/authorize-app.input';
-import { AvailableWorkspaceOutput } from 'src/engine/core-modules/auth/dto/available-workspaces.output';
 import { ChallengeInput } from 'src/engine/core-modules/auth/dto/challenge.input';
 import { AuthTokens } from 'src/engine/core-modules/auth/dto/token.entity';
 import { UpdatePassword } from 'src/engine/core-modules/auth/dto/update-password.entity';
@@ -47,6 +46,15 @@ import { userValidator } from 'src/engine/core-modules/user/user.validate';
 import { WorkspaceInvitationService } from 'src/engine/core-modules/workspace-invitation/services/workspace-invitation.service';
 import { WorkspaceAuthProvider } from 'src/engine/core-modules/workspace/types/workspace.type';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { SocialSsoService } from 'src/engine/core-modules/auth/services/social-sso.service';
+import { UserService } from 'src/engine/core-modules/user/services/user.service';
+import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace.validate';
+import {
+  AuthProviderWithPasswordType,
+  ExistingUserOrNewUser,
+  SignInUpBaseParams,
+  SignInUpNewUserPayload,
+} from 'src/engine/core-modules/auth/types/signInUp.type';
 
 @Injectable()
 // eslint-disable-next-line @nx/workspace-inject-workspace-repository
@@ -57,6 +65,8 @@ export class AuthService {
     private readonly refreshTokenService: RefreshTokenService,
     private readonly userWorkspaceService: UserWorkspaceService,
     private readonly workspaceInvitationService: WorkspaceInvitationService,
+    private readonly socialSsoService: SocialSsoService,
+    private readonly userService: UserService,
     private readonly signInUpService: SignInUpService,
     @InjectRepository(Workspace, 'core')
     private readonly workspaceRepository: Repository<Workspace>,
@@ -88,7 +98,7 @@ export class AuthService {
       );
 
     if (invitation) {
-      await this.workspaceInvitationService.validateInvitation({
+      await this.workspaceInvitationService.validatePersonalInvitation({
         workspacePersonalInviteToken: invitation.value,
         email: user.email,
       });
@@ -146,44 +156,72 @@ export class AuthService {
       );
     }
 
+    const isEmailVerificationRequired = this.environmentService.get(
+      'IS_EMAIL_VERIFICATION_REQUIRED',
+    );
+
+    if (isEmailVerificationRequired && !user.isEmailVerified) {
+      throw new AuthException(
+        'Email is not verified',
+        AuthExceptionCode.EMAIL_NOT_VERIFIED,
+      );
+    }
+
     return user;
   }
 
-  async signInUp({
-    email,
-    password,
-    workspaceInviteHash,
-    workspacePersonalInviteToken,
-    targetWorkspaceSubdomain,
-    firstName,
-    lastName,
-    picture,
-    fromSSO,
-    authProvider,
-  }: {
-    email: string;
-    password?: string;
-    firstName?: string | null;
-    lastName?: string | null;
-    workspaceInviteHash?: string;
-    workspacePersonalInviteToken?: string;
-    picture?: string | null;
-    fromSSO: boolean;
-    targetWorkspaceSubdomain?: string;
-    authProvider?: WorkspaceAuthProvider;
-    billingCheckoutSessionState?: string;
-  }) {
+  async signInUp(
+    params: SignInUpBaseParams &
+      ExistingUserOrNewUser &
+      AuthProviderWithPasswordType,
+  ) {
+    if (
+      params.authParams.provider === 'password' &&
+      params.userData.type === 'newUser'
+    ) {
+      params.userData.newUserPayload.passwordHash =
+        await this.signInUpService.generateHash(params.authParams.password);
+    }
+
+    if (
+      params.authParams.provider === 'password' &&
+      params.userData.type === 'existingUser'
+    ) {
+      await this.signInUpService.validatePassword({
+        password: params.authParams.password,
+        passwordHash: params.userData.existingUser.passwordHash,
+      });
+    }
+
+    if (params.workspace) {
+      workspaceValidator.isAuthEnabledOrThrow(
+        params.authParams.provider,
+        params.workspace,
+      );
+    }
+
+    if (params.userData.type === 'newUser') {
+      const partialUserWithPicture =
+        await this.signInUpService.computeParamsForNewUser(
+          params.userData.newUserPayload,
+          params.authParams,
+        );
+
+      return await this.signInUpService.signInUp({
+        ...params,
+        userData: {
+          type: 'newUserWithPicture',
+          newUserWithPicture: partialUserWithPicture,
+        },
+      });
+    }
+
     return await this.signInUpService.signInUp({
-      email,
-      password,
-      firstName,
-      lastName,
-      workspaceInviteHash,
-      workspacePersonalInviteToken,
-      targetWorkspaceSubdomain,
-      picture,
-      fromSSO,
-      authProvider,
+      ...params,
+      userData: {
+        type: 'existingUser',
+        existingUser: params.userData.existingUser,
+      },
     });
   }
 
@@ -232,7 +270,9 @@ export class AuthService {
     if (userValidator.isDefined(user)) {
       return {
         exists: true,
-        availableWorkspaces: await this.findAvailableWorkspacesByEmail(email),
+        availableWorkspaces:
+          await this.userWorkspaceService.findAvailableWorkspacesByEmail(email),
+        isEmailVerified: user.isEmailVerified,
       };
     }
 
@@ -414,11 +454,15 @@ export class AuthService {
     return workspace;
   }
 
-  computeRedirectURI(
-    loginToken: string,
-    subdomain?: string,
-    billingCheckoutSessionState?: string,
-  ) {
+  computeRedirectURI({
+    loginToken,
+    subdomain,
+    billingCheckoutSessionState,
+  }: {
+    loginToken: string;
+    subdomain?: string;
+    billingCheckoutSessionState?: string;
+  }) {
     const url = this.domainManagerService.buildWorkspaceURL({
       subdomain,
       pathname: '/verify',
@@ -431,45 +475,131 @@ export class AuthService {
     return url.toString();
   }
 
-  async findAvailableWorkspacesByEmail(email: string) {
-    const user = await this.userRepository.findOne({
-      where: {
-        email,
-      },
-      relations: [
-        'workspaces',
-        'workspaces.workspace',
-        'workspaces.workspace.workspaceSSOIdentityProviders',
-      ],
-    });
+  async findInvitationForSignInUp(
+    params: {
+      currentWorkspace: Workspace;
+    } & ({ workspacePersonalInviteToken: string } | { email: string }),
+  ) {
+    const qr = this.appTokenRepository
+      .createQueryBuilder('appToken')
+      .where('"appToken"."workspaceId" = :workspaceId', {
+        workspaceId: params.currentWorkspace.id,
+      })
+      .andWhere('"appToken".type = :type', {
+        type: AppTokenType.InvitationToken,
+      });
 
-    userValidator.assertIsDefinedOrThrow(
-      user,
-      new AuthException('User not found', AuthExceptionCode.USER_NOT_FOUND),
-    );
+    if ('workspacePersonalInviteToken' in params) {
+      qr.andWhere('"appToken".value = :personalInviteToken', {
+        personalInviteToken: params.workspacePersonalInviteToken,
+      });
+    }
+
+    if ('email' in params) {
+      qr.andWhere('"appToken".context->>\'email\' = :email', {
+        email: params.email,
+      });
+    }
+
+    return (await qr.getOne()) ?? undefined;
+  }
+
+  async findWorkspaceForSignInUp(
+    params: {
+      workspaceId?: string;
+      workspaceInviteHash?: string;
+    } & (
+      | {
+          authProvider: Exclude<WorkspaceAuthProvider, 'password'>;
+          email: string;
+        }
+      | { authProvider: Extract<WorkspaceAuthProvider, 'password'> }
+    ),
+  ) {
+    if (params.workspaceInviteHash) {
+      return (
+        (await this.workspaceRepository.findOneBy({
+          inviteHash: params.workspaceInviteHash,
+        })) ?? undefined
+      );
+    }
+
+    if (params.authProvider !== 'password') {
+      return (
+        (await this.socialSsoService.findWorkspaceFromWorkspaceIdOrAuthProvider(
+          {
+            email: params.email,
+            authProvider: params.authProvider,
+          },
+          params.workspaceId,
+        )) ?? undefined
+      );
+    }
+
+    return undefined;
+  }
+
+  formatUserDataPayload(
+    newUserPayload: SignInUpNewUserPayload,
+    existingUser?: User | null,
+  ): ExistingUserOrNewUser {
+    return {
+      userData: existingUser
+        ? { type: 'existingUser', existingUser }
+        : {
+            type: 'newUser',
+            newUserPayload,
+          },
+    };
+  }
+
+  async checkAccessForSignIn({
+    userData,
+    invitation,
+    workspaceInviteHash,
+    workspace,
+  }: {
+    workspaceInviteHash?: string;
+  } & ExistingUserOrNewUser &
+    SignInUpBaseParams) {
+    const hasPublicInviteLink = !!workspaceInviteHash;
+    const hasPersonalInvitation = !!invitation;
+    const isInvitedToWorkspace = hasPersonalInvitation || hasPublicInviteLink;
+    const isTargetAnExistingWorkspace = !!workspace;
+    const isAnExistingUser = userData.type === 'existingUser';
+
+    if (
+      hasPublicInviteLink &&
+      !hasPersonalInvitation &&
+      workspace &&
+      !workspace.isPublicInviteLinkEnabled
+    ) {
+      throw new AuthException(
+        'Public invite link is disabled for this workspace',
+        AuthExceptionCode.FORBIDDEN_EXCEPTION,
+      );
+    }
+
+    if (
+      !isInvitedToWorkspace &&
+      isTargetAnExistingWorkspace &&
+      isAnExistingUser
+    ) {
+      return await this.userService.hasUserAccessToWorkspaceOrThrow(
+        userData.existingUser.id,
+        workspace.id,
+      );
+    }
 
-    return user.workspaces.map<AvailableWorkspaceOutput>((userWorkspace) => ({
-      id: userWorkspace.workspaceId,
-      displayName: userWorkspace.workspace.displayName,
-      subdomain: userWorkspace.workspace.subdomain,
-      logo: userWorkspace.workspace.logo,
-      sso: userWorkspace.workspace.workspaceSSOIdentityProviders.reduce(
-        (acc, identityProvider) =>
-          acc.concat(
-            identityProvider.status === 'Inactive'
-              ? []
-              : [
-                  {
-                    id: identityProvider.id,
-                    name: identityProvider.name,
-                    issuer: identityProvider.issuer,
-                    type: identityProvider.type,
-                    status: identityProvider.status,
-                  },
-                ],
-          ),
-        [] as AvailableWorkspaceOutput['sso'],
-      ),
-    }));
+    if (
+      !isInvitedToWorkspace &&
+      isTargetAnExistingWorkspace &&
+      !isAnExistingUser
+    ) {
+      throw new AuthException(
+        'User does not have access to this workspace',
+        AuthExceptionCode.FORBIDDEN_EXCEPTION,
+      );
+    }
   }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts
index ad60b010d258..2512918f7545 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/google-apis.service.ts
@@ -5,8 +5,6 @@ import { v4 } from 'uuid';
 
 import { getGoogleApisOauthScopes } from 'src/engine/core-modules/auth/utils/get-google-apis-oauth-scopes';
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
@@ -47,7 +45,6 @@ export class GoogleAPIsService {
     private readonly calendarQueueService: MessageQueueService,
     private readonly environmentService: EnvironmentService,
     private readonly accountsToReconnectService: AccountsToReconnectService,
-    private readonly featureFlagService: FeatureFlagService,
   ) {}
 
   async refreshGoogleRefreshToken(input: {
@@ -99,12 +96,7 @@ export class GoogleAPIsService {
     const workspaceDataSource =
       await this.twentyORMGlobalManager.getDataSourceForWorkspace(workspaceId);
 
-    const isGmailSendEmailScopeEnabled =
-      await this.featureFlagService.isFeatureEnabled(
-        FeatureFlagKey.IsGmailSendEmailScopeEnabled,
-        workspaceId,
-      );
-    const scopes = getGoogleApisOauthScopes(isGmailSendEmailScopeEnabled);
+    const scopes = getGoogleApisOauthScopes();
 
     await workspaceDataSource.transaction(async (manager: EntityManager) => {
       if (!existingAccountId) {
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/microsoft-apis.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/microsoft-apis.service.ts
index b8f6197226aa..c25cf99d06f9 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/microsoft-apis.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/microsoft-apis.service.ts
@@ -28,12 +28,18 @@ import {
   MessageChannelVisibility,
   MessageChannelWorkspaceEntity,
 } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
+import {
+  MessagingMessageListFetchJob,
+  MessagingMessageListFetchJobData,
+} from 'src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
 
 @Injectable()
 export class MicrosoftAPIsService {
   constructor(
     private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
+    @InjectMessageQueue(MessageQueue.messagingQueue)
+    private readonly messageQueueService: MessageQueueService,
     @InjectMessageQueue(MessageQueue.calendarQueue)
     private readonly calendarQueueService: MessageQueueService,
     private readonly accountsToReconnectService: AccountsToReconnectService,
@@ -102,7 +108,6 @@ export class MicrosoftAPIsService {
           manager,
         );
 
-        // TODO: Modify this when the email sync is implemented
         await messageChannelRepository.save(
           {
             id: v4(),
@@ -111,8 +116,7 @@ export class MicrosoftAPIsService {
             handle,
             visibility:
               messageVisibility || MessageChannelVisibility.SHARE_EVERYTHING,
-            syncStatus: MessageChannelSyncStatus.NOT_SYNCED,
-            syncStage: MessageChannelSyncStage.FAILED,
+            syncStatus: MessageChannelSyncStatus.ONGOING,
           },
           {},
           manager,
@@ -160,14 +164,13 @@ export class MicrosoftAPIsService {
           newOrExistingConnectedAccountId,
         );
 
-        // TODO: Modify this when the email sync is implemented
         await messageChannelRepository.update(
           {
             connectedAccountId: newOrExistingConnectedAccountId,
           },
           {
-            syncStage: MessageChannelSyncStage.FAILED,
-            syncStatus: MessageChannelSyncStatus.NOT_SYNCED,
+            syncStage: MessageChannelSyncStage.FULL_MESSAGE_LIST_FETCH_PENDING,
+            syncStatus: MessageChannelSyncStatus.ONGOING,
             syncCursor: '',
             syncStageStartedAt: null,
           },
@@ -176,22 +179,21 @@ export class MicrosoftAPIsService {
       }
     });
 
-    // TODO: Uncomment this when the email sync is implemented
-    // const messageChannels = await messageChannelRepository.find({
-    //   where: {
-    //     connectedAccountId: newOrExistingConnectedAccountId,
-    //   },
-    // });
-
-    // for (const messageChannel of messageChannels) {
-    //   await this.messageQueueService.add<MessagingMessageListFetchJobData>(
-    //     MessagingMessageListFetchJob.name,
-    //     {
-    //       workspaceId,
-    //       messageChannelId: messageChannel.id,
-    //     },
-    //   );
-    // }
+    const messageChannels = await messageChannelRepository.find({
+      where: {
+        connectedAccountId: newOrExistingConnectedAccountId,
+      },
+    });
+
+    for (const messageChannel of messageChannels) {
+      await this.messageQueueService.add<MessagingMessageListFetchJobData>(
+        MessagingMessageListFetchJob.name,
+        {
+          workspaceId,
+          messageChannelId: messageChannel.id,
+        },
+      );
+    }
 
     const calendarChannels = await calendarChannelRepository.find({
       where: {
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.spec.ts
index df14306f7553..b4cdba99ecd8 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.spec.ts
@@ -2,89 +2,79 @@ import { HttpService } from '@nestjs/axios';
 import { Test, TestingModule } from '@nestjs/testing';
 import { getRepositoryToken } from '@nestjs/typeorm';
 
-import { expect, jest } from '@jest/globals';
-import bcrypt from 'bcrypt';
+import { WorkspaceActivationStatus } from 'twenty-shared';
+import { Repository } from 'typeorm';
 
 import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
 import { SignInUpService } from 'src/engine/core-modules/auth/services/sign-in-up.service';
+import {
+  AuthProviderWithPasswordType,
+  ExistingUserOrPartialUserWithPicture,
+  SignInUpBaseParams,
+} from 'src/engine/core-modules/auth/types/signInUp.type';
 import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { FileUploadService } from 'src/engine/core-modules/file/file-upload/services/file-upload.service';
 import { OnboardingService } from 'src/engine/core-modules/onboarding/onboarding.service';
 import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
+import { UserService } from 'src/engine/core-modules/user/services/user.service';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { WorkspaceInvitationService } from 'src/engine/core-modules/workspace-invitation/services/workspace-invitation.service';
-import { WorkspaceService } from 'src/engine/core-modules/workspace/services/workspace.service';
-import { UserService } from 'src/engine/core-modules/user/services/user.service';
-import {
-  Workspace,
-  WorkspaceActivationStatus,
-} from 'src/engine/core-modules/workspace/workspace.entity';
-
-jest.mock('bcrypt');
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 
-const UserFindOneMock = jest.fn();
-const workspaceInvitationValidateInvitationMock = jest.fn();
-const workspaceInvitationInvalidateWorkspaceInvitationMock = jest.fn();
-const workspaceInvitationFindInvitationByWorkspaceSubdomainAndUserEmailMock =
-  jest.fn();
-const userWorkspaceServiceAddUserToWorkspaceMock = jest.fn();
-const UserCreateMock = jest.fn();
-const UserSaveMock = jest.fn();
-const EnvironmentServiceGetMock = jest.fn();
-const WorkspaceCountMock = jest.fn();
-const WorkspaceCreateMock = jest.fn();
-const WorkspaceSaveMock = jest.fn();
-const WorkspaceFindOneMock = jest.fn();
+jest.mock('src/utils/image', () => {
+  return {
+    getImageBufferFromUrl: () => Promise.resolve(Buffer.from('')),
+  };
+});
 
 describe('SignInUpService', () => {
   let service: SignInUpService;
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
+  let UserRepository: Repository<User>;
+  let WorkspaceRepository: Repository<Workspace>;
+  let fileUploadService: FileUploadService;
+  let workspaceInvitationService: WorkspaceInvitationService;
+  let userWorkspaceService: UserWorkspaceService;
+  let environmentService: EnvironmentService;
+  let domainManagerService: DomainManagerService;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
       providers: [
         SignInUpService,
         {
-          provide: FileUploadService,
-          useValue: {},
+          provide: getRepositoryToken(User, 'core'),
+          useValue: {
+            create: jest.fn(),
+            save: jest.fn(),
+          },
         },
         {
           provide: getRepositoryToken(Workspace, 'core'),
           useValue: {
-            count: WorkspaceCountMock,
-            create: WorkspaceCreateMock,
-            save: WorkspaceSaveMock,
-            findOne: WorkspaceFindOneMock,
+            save: jest.fn(),
+            create: jest.fn(),
+            get: jest.fn(),
+            count: jest.fn(),
           },
         },
         {
-          provide: getRepositoryToken(User, 'core'),
+          provide: FileUploadService,
           useValue: {
-            findOne: UserFindOneMock,
-            create: UserCreateMock,
-            save: UserSaveMock,
+            uploadImage: jest.fn(),
           },
         },
-        {
-          provide: getRepositoryToken(AppToken, 'core'),
-          useValue: {},
-        },
         {
           provide: WorkspaceInvitationService,
-          useValue: {},
-        },
-        {
-          provide: WorkspaceService,
-          useValue: {},
+          useValue: {
+            validatePersonalInvitation: jest.fn(),
+            invalidateWorkspaceInvitation: jest.fn(),
+          },
         },
         {
           provide: UserWorkspaceService,
           useValue: {
-            addUserToWorkspace: userWorkspaceServiceAddUserToWorkspaceMock,
+            addUserToWorkspace: jest.fn(),
             create: jest.fn(),
           },
         },
@@ -93,7 +83,6 @@ describe('SignInUpService', () => {
           useValue: {
             setOnboardingConnectAccountPending: jest.fn(),
             setOnboardingInviteTeamPending: jest.fn(),
-            setOnboardingCreateProfilePending: jest.fn(),
           },
         },
         {
@@ -103,409 +92,160 @@ describe('SignInUpService', () => {
         {
           provide: EnvironmentService,
           useValue: {
-            get: EnvironmentServiceGetMock,
+            get: jest.fn(),
           },
         },
         {
-          provide: WorkspaceInvitationService,
+          provide: UserService,
           useValue: {
-            validateInvitation: workspaceInvitationValidateInvitationMock,
-            invalidateWorkspaceInvitation:
-              workspaceInvitationInvalidateWorkspaceInvitationMock,
-            findInvitationByWorkspaceSubdomainAndUserEmail:
-              workspaceInvitationFindInvitationByWorkspaceSubdomainAndUserEmailMock,
+            markEmailAsVerified: jest.fn().mockReturnValue({
+              id: 'test-user-id',
+              email: 'test@test.com',
+              isEmailVerified: true,
+            } as User),
           },
         },
         {
           provide: DomainManagerService,
           useValue: {
-            generateSubdomain: jest.fn().mockReturnValue('testSubDomain'),
-            getWorkspaceBySubdomainOrDefaultWorkspace: jest
-              .fn()
-              .mockReturnValue({}),
-          },
-        },
-        {
-          provide: UserService,
-          useValue: {
-            hasUserAccessToWorkspaceOrThrow: jest.fn(),
+            generateSubdomain: jest.fn(),
           },
         },
       ],
     }).compile();
 
     service = module.get<SignInUpService>(SignInUpService);
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-
-  it('signInUp - sso - new user', async () => {
-    const email = 'test@test.com';
-
-    UserFindOneMock.mockReturnValueOnce(false);
-    workspaceInvitationFindInvitationByWorkspaceSubdomainAndUserEmailMock.mockReturnValueOnce(
-      undefined,
-    );
-
-    const spy = jest
-      .spyOn(service, 'signUpOnNewWorkspace')
-      .mockResolvedValueOnce({ user: {}, workspace: {} } as {
-        user: User;
-        workspace: Workspace;
-      });
-
-    await service.signInUp({
-      email: 'test@test.com',
-      fromSSO: true,
-      targetWorkspaceSubdomain: 'testSubDomain',
-    });
-
-    expect(spy).toHaveBeenCalledWith(
-      expect.objectContaining({
-        email,
-        passwordHash: undefined,
-        firstName: expect.any(String),
-        lastName: expect.any(String),
-        picture: undefined,
-      }),
-    );
-  });
-  it('signInUp - sso - existing user', async () => {
-    const email = 'existing@test.com';
-    const existingUser = {
-      id: 'user-id',
-      email,
-      passwordHash: undefined,
-    };
-
-    UserFindOneMock.mockReturnValueOnce(existingUser);
-    workspaceInvitationFindInvitationByWorkspaceSubdomainAndUserEmailMock.mockReturnValueOnce(
-      undefined,
+    UserRepository = module.get(getRepositoryToken(User, 'core'));
+    WorkspaceRepository = module.get(getRepositoryToken(Workspace, 'core'));
+    fileUploadService = module.get<FileUploadService>(FileUploadService);
+    workspaceInvitationService = module.get<WorkspaceInvitationService>(
+      WorkspaceInvitationService,
     );
-    WorkspaceFindOneMock.mockReturnValueOnce({
-      id: 'another-workspace',
-    });
-
-    const result = await service.signInUp({
-      email,
-      fromSSO: true,
-      targetWorkspaceSubdomain: 'testSubDomain',
-    });
-
-    expect(result).toEqual({ user: existingUser, workspace: {} });
+    userWorkspaceService =
+      module.get<UserWorkspaceService>(UserWorkspaceService);
+    environmentService = module.get<EnvironmentService>(EnvironmentService);
+    domainManagerService =
+      module.get<DomainManagerService>(DomainManagerService);
   });
-  it('signInUp - sso - new user - existing invitation', async () => {
-    const email = 'newuser@test.com';
-    const workspaceId = 'workspace-id';
 
-    UserFindOneMock.mockReturnValueOnce(null);
-    workspaceInvitationFindInvitationByWorkspaceSubdomainAndUserEmailMock.mockReturnValueOnce(
-      {
-        value: 'personal-token-value',
-      },
-    );
-    workspaceInvitationValidateInvitationMock.mockReturnValueOnce({
-      isValid: true,
-      workspace: { id: workspaceId },
-    });
-
-    workspaceInvitationInvalidateWorkspaceInvitationMock.mockReturnValueOnce(
-      true,
-    );
-
-    const spySignInUpOnExistingWorkspace = jest
-      .spyOn(service, 'signInUpOnExistingWorkspace')
-      .mockResolvedValueOnce(
-        {} as Awaited<
-          ReturnType<(typeof service)['signInUpOnExistingWorkspace']>
-        >,
-      );
-
-    await service.signInUp({
-      email,
-      fromSSO: true,
-      targetWorkspaceSubdomain: 'testSubDomain',
-    });
-
-    expect(spySignInUpOnExistingWorkspace).toHaveBeenCalledWith(
-      expect.objectContaining({
-        email,
-        passwordHash: undefined,
-        workspace: expect.objectContaining({
-          id: workspaceId,
-        }),
-        firstName: expect.any(String),
-        lastName: expect.any(String),
-        picture: undefined,
-      }),
-    );
-
-    expect(
-      workspaceInvitationInvalidateWorkspaceInvitationMock,
-    ).toHaveBeenCalledWith(workspaceId, email);
-  });
-  it('signInUp - sso - existing user - existing invitation', async () => {
-    const email = 'existinguser@test.com';
-    const workspaceId = 'workspace-id';
-    const existingUser = {
-      id: 'user-id',
-      email,
-      passwordHash: undefined,
-    };
-
-    const workspace = {
-      id: workspaceId,
-      activationStatus: WorkspaceActivationStatus.ACTIVE,
-    };
-
-    UserFindOneMock.mockReturnValueOnce(existingUser);
-    workspaceInvitationFindInvitationByWorkspaceSubdomainAndUserEmailMock.mockReturnValueOnce(
-      {
-        value: 'personal-token-value',
-      },
-    );
-    workspaceInvitationValidateInvitationMock.mockReturnValueOnce({
-      isValid: true,
-      workspace,
-    });
-
-    workspaceInvitationInvalidateWorkspaceInvitationMock.mockReturnValueOnce(
-      true,
-    );
-
-    userWorkspaceServiceAddUserToWorkspaceMock.mockReturnValueOnce({});
-
-    const result = await service.signInUp({
-      email,
-      fromSSO: true,
-      targetWorkspaceSubdomain: 'testSubDomain',
-    });
-
-    expect(result).toEqual({ user: existingUser, workspace });
-    expect(userWorkspaceServiceAddUserToWorkspaceMock).toHaveBeenCalledTimes(1);
-    expect(
-      workspaceInvitationInvalidateWorkspaceInvitationMock,
-    ).toHaveBeenCalledWith(workspaceId, email);
-  });
-  it('signInUp - sso - new user - personal invitation token', async () => {
-    const email = 'newuser@test.com';
-    const workspaceId = 'workspace-id';
-    const workspacePersonalInviteToken = 'personal-token-value';
-    const workspace = {
-      id: workspaceId,
-      activationStatus: WorkspaceActivationStatus.ACTIVE,
-    };
-
-    UserFindOneMock.mockReturnValueOnce(null);
-
-    workspaceInvitationValidateInvitationMock.mockReturnValueOnce({
-      isValid: true,
-      workspace,
-    });
-
-    workspaceInvitationInvalidateWorkspaceInvitationMock.mockReturnValueOnce(
-      true,
-    );
-
-    const spySignInUpOnExistingWorkspace = jest
-      .spyOn(service, 'signInUpOnExistingWorkspace')
-      .mockResolvedValueOnce(
-        {} as Awaited<
-          ReturnType<(typeof service)['signInUpOnExistingWorkspace']>
-        >,
-      );
-
-    await service.signInUp({
-      email,
-      fromSSO: true,
-      workspacePersonalInviteToken,
-      targetWorkspaceSubdomain: 'testSubDomain',
-    });
-
-    expect(spySignInUpOnExistingWorkspace).toHaveBeenCalledWith(
-      expect.objectContaining({
-        email,
-        passwordHash: undefined,
-        workspace: expect.objectContaining({
-          id: workspaceId,
-        }),
-        firstName: expect.any(String),
-        lastName: expect.any(String),
-        picture: undefined,
-      }),
-    );
-
-    expect(
-      workspaceInvitationFindInvitationByWorkspaceSubdomainAndUserEmailMock,
-    ).not.toHaveBeenCalled();
-    expect(
-      workspaceInvitationInvalidateWorkspaceInvitationMock,
-    ).toHaveBeenCalledWith(workspaceId, email);
-  });
-  it('signInUp - sso - existing user - personal invitation token', async () => {
-    const email = 'existinguser@test.com';
-    const workspaceId = 'workspace-id';
-    const workspacePersonalInviteToken = 'personal-token-value';
-    const existingUser = {
-      id: 'user-id',
-      email,
-      passwordHash: undefined,
-    };
-
-    UserFindOneMock.mockReturnValueOnce(existingUser);
-    workspaceInvitationValidateInvitationMock.mockReturnValueOnce({
-      isValid: true,
+  it('should handle signInUp with valid personal invitation', async () => {
+    const params: SignInUpBaseParams &
+      ExistingUserOrPartialUserWithPicture &
+      AuthProviderWithPasswordType = {
+      invitation: { value: 'invitationToken' } as AppToken,
       workspace: {
-        id: workspaceId,
+        id: 'workspaceId',
         activationStatus: WorkspaceActivationStatus.ACTIVE,
+      } as Workspace,
+      authParams: { provider: 'password', password: 'validPassword' },
+      userData: {
+        type: 'existingUser',
+        existingUser: { email: 'test@example.com' } as User,
       },
-    });
-
-    workspaceInvitationInvalidateWorkspaceInvitationMock.mockReturnValueOnce(
-      true,
-    );
-
-    await service.signInUp({
-      email,
-      fromSSO: true,
-      workspacePersonalInviteToken,
-      targetWorkspaceSubdomain: 'testSubDomain',
-    });
-
-    expect(
-      workspaceInvitationInvalidateWorkspaceInvitationMock,
-    ).toHaveBeenCalledWith(workspaceId, email);
-  });
-  it('signInUp - credentials - existing user', async () => {
-    const email = 'existinguser@test.com';
-    const password = 'validPassword123';
-    const existingUser = {
-      id: 'user-id',
-      email,
-      passwordHash: 'hash-of-validPassword123',
     };
 
-    UserFindOneMock.mockReturnValueOnce(existingUser);
+    jest
+      .spyOn(workspaceInvitationService, 'validatePersonalInvitation')
+      .mockResolvedValue({
+        isValid: true,
+        workspace: params.workspace as Workspace,
+      });
 
-    EnvironmentServiceGetMock.mockReturnValueOnce(false);
+    jest
+      .spyOn(workspaceInvitationService, 'invalidateWorkspaceInvitation')
+      .mockResolvedValue(undefined);
 
-    WorkspaceFindOneMock.mockReturnValueOnce({
-      id: 'another-workspace',
-    });
+    jest
+      .spyOn(userWorkspaceService, 'addUserToWorkspace')
+      .mockResolvedValue({} as User);
 
-    (bcrypt.compare as jest.Mock).mockReturnValueOnce(true);
-
-    await service.signInUp({
-      email,
-      password,
-      fromSSO: false,
-      targetWorkspaceSubdomain: 'testSubDomain',
-    });
+    const result = await service.signInUp(params);
 
+    expect(result.workspace).toEqual(params.workspace);
+    expect(result.user).toBeDefined();
     expect(
-      workspaceInvitationInvalidateWorkspaceInvitationMock,
-    ).not.toHaveBeenCalled();
-  });
-  it('signInUp - credentials - new user', async () => {
-    const email = 'newuser@test.com';
-    const password = 'validPassword123';
-
-    UserFindOneMock.mockReturnValueOnce(null);
-
-    UserCreateMock.mockReturnValueOnce({} as User);
-    UserSaveMock.mockReturnValueOnce({} as User);
-
-    EnvironmentServiceGetMock.mockReturnValueOnce(true);
-
-    WorkspaceCreateMock.mockReturnValueOnce({});
-    WorkspaceSaveMock.mockReturnValueOnce({});
-
-    await service.signInUp({
-      email,
-      password,
-      fromSSO: false,
-      targetWorkspaceSubdomain: 'testSubDomain',
+      workspaceInvitationService.validatePersonalInvitation,
+    ).toHaveBeenCalledWith({
+      workspacePersonalInviteToken: 'invitationToken',
+      email: 'test@example.com',
     });
-
-    expect(UserCreateMock).toHaveBeenCalledTimes(1);
-    expect(UserSaveMock).toHaveBeenCalledTimes(1);
-
-    expect(WorkspaceSaveMock).toHaveBeenCalledTimes(1);
-    expect(WorkspaceCreateMock).toHaveBeenCalledTimes(1);
+    expect(
+      workspaceInvitationService.invalidateWorkspaceInvitation,
+    ).toHaveBeenCalledWith(
+      (params.workspace as Workspace).id,
+      'test@example.com',
+    );
   });
-  it('signInUp - credentials - new user - personal invitation token', async () => {
-    const email = 'newuser@test.com';
-    const password = 'validPassword123';
-    const workspaceId = 'workspace-id';
-    const workspacePersonalInviteToken = 'personal-token-value';
 
-    UserFindOneMock.mockReturnValueOnce(null);
-    workspaceInvitationValidateInvitationMock.mockReturnValueOnce({
-      isValid: true,
+  it('should handle signInUp on existing workspace without invitation', async () => {
+    const params: SignInUpBaseParams &
+      ExistingUserOrPartialUserWithPicture &
+      AuthProviderWithPasswordType = {
       workspace: {
-        id: workspaceId,
+        id: 'workspaceId',
         activationStatus: WorkspaceActivationStatus.ACTIVE,
+      } as Workspace,
+      authParams: { provider: 'password', password: 'validPassword' },
+      userData: {
+        type: 'existingUser',
+        existingUser: { email: 'test@example.com' } as User,
       },
-    });
-
-    workspaceInvitationInvalidateWorkspaceInvitationMock.mockReturnValueOnce(
-      true,
-    );
-
-    UserCreateMock.mockReturnValueOnce({} as User);
-    UserSaveMock.mockReturnValueOnce({} as User);
+    };
 
-    await service.signInUp({
-      email,
-      password,
-      fromSSO: false,
-      workspacePersonalInviteToken,
-      targetWorkspaceSubdomain: 'testSubDomain',
-    });
+    jest
+      .spyOn(userWorkspaceService, 'addUserToWorkspace')
+      .mockResolvedValue({} as User);
 
-    expect(UserCreateMock).toHaveBeenCalledTimes(1);
-    expect(UserSaveMock).toHaveBeenCalledTimes(1);
+    const result = await service.signInUp(params);
 
-    expect(
-      workspaceInvitationInvalidateWorkspaceInvitationMock,
-    ).toHaveBeenCalledWith(workspaceId, email);
+    expect(result.workspace).toEqual(params.workspace);
+    expect(result.user).toBeDefined();
+    expect(userWorkspaceService.addUserToWorkspace).toHaveBeenCalled();
   });
-  it('signInUp - credentials - new user - public invitation token', async () => {
-    const email = 'newuser@test.com';
-    const password = 'validPassword123';
-    const workspaceId = 'workspace-id';
-    const workspaceInviteHash = 'public-token-value';
 
-    UserFindOneMock.mockReturnValueOnce(null);
-    workspaceInvitationValidateInvitationMock.mockReturnValueOnce({
-      isValid: true,
-      workspace: {
-        id: workspaceId,
-        activationStatus: WorkspaceActivationStatus.ACTIVE,
+  it('should handle signUp on new workspace for a new user', async () => {
+    const params: SignInUpBaseParams &
+      ExistingUserOrPartialUserWithPicture &
+      AuthProviderWithPasswordType = {
+      authParams: { provider: 'password', password: 'validPassword' },
+      userData: {
+        type: 'newUserWithPicture',
+        newUserWithPicture: {
+          email: 'newuser@example.com',
+          picture: 'pictureUrl',
+        },
       },
-    });
-
-    workspaceInvitationInvalidateWorkspaceInvitationMock.mockReturnValueOnce(
-      true,
-    );
-
-    UserCreateMock.mockReturnValueOnce({} as User);
-    UserSaveMock.mockReturnValueOnce({} as User);
-
-    await service.signInUp({
-      email,
-      password,
-      fromSSO: false,
-      workspaceInviteHash,
-    });
-
-    expect(UserCreateMock).toHaveBeenCalledTimes(1);
-    expect(UserSaveMock).toHaveBeenCalledTimes(1);
+    };
 
-    expect(
-      workspaceInvitationInvalidateWorkspaceInvitationMock,
-    ).toHaveBeenCalledWith(workspaceId, email);
+    jest.spyOn(environmentService, 'get').mockReturnValue(false);
+    jest.spyOn(WorkspaceRepository, 'count').mockResolvedValue(0);
+    jest.spyOn(WorkspaceRepository, 'create').mockReturnValue({} as Workspace);
+    jest.spyOn(WorkspaceRepository, 'save').mockResolvedValue({
+      id: 'newWorkspaceId',
+      activationStatus: WorkspaceActivationStatus.ACTIVE,
+    } as Workspace);
+    jest.spyOn(fileUploadService, 'uploadImage').mockResolvedValue({
+      id: '',
+      mimeType: '',
+      paths: ['path/to/image'],
+    });
+    jest.spyOn(UserRepository, 'create').mockReturnValue({} as User);
+    jest
+      .spyOn(domainManagerService, 'generateSubdomain')
+      .mockResolvedValue('a-subdomain');
+    jest
+      .spyOn(UserRepository, 'save')
+      .mockResolvedValue({ id: 'newUserId' } as User);
+    jest.spyOn(userWorkspaceService, 'create').mockResolvedValue({} as any);
+
+    const result = await service.signInUp(params);
+
+    expect(result.workspace).toBeDefined();
+    expect(result.user).toBeDefined();
+    expect(WorkspaceRepository.create).toHaveBeenCalled();
+    expect(WorkspaceRepository.save).toHaveBeenCalled();
+    expect(UserRepository.create).toHaveBeenCalled();
+    expect(UserRepository.save).toHaveBeenCalled();
+    expect(fileUploadService.uploadImage).toHaveBeenCalled();
   });
 });
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts
index 53a8028cb80d..5d62e6bf7f22 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.ts
@@ -3,21 +3,32 @@ import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
 import FileType from 'file-type';
-import { TWENTY_ICONS_BASE_URL } from 'twenty-shared';
+import {
+  TWENTY_ICONS_BASE_URL,
+  WorkspaceActivationStatus,
+} from 'twenty-shared';
 import { Repository } from 'typeorm';
 import { v4 } from 'uuid';
 
 import { FileFolder } from 'src/engine/core-modules/file/interfaces/file-folder.interface';
 
+import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
 import {
   AuthException,
   AuthExceptionCode,
 } from 'src/engine/core-modules/auth/auth.exception';
 import {
+  PASSWORD_REGEX,
   compareHash,
   hashPassword,
-  PASSWORD_REGEX,
 } from 'src/engine/core-modules/auth/auth.util';
+import {
+  AuthProviderWithPasswordType,
+  ExistingUserOrPartialUserWithPicture,
+  PartialUserWithPicture,
+  SignInUpBaseParams,
+  SignInUpNewUserPayload,
+} from 'src/engine/core-modules/auth/types/signInUp.type';
 import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { FileUploadService } from 'src/engine/core-modules/file/file-upload/services/file-upload.service';
@@ -25,32 +36,13 @@ import { OnboardingService } from 'src/engine/core-modules/onboarding/onboarding
 import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
 import { UserService } from 'src/engine/core-modules/user/services/user.service';
 import { User } from 'src/engine/core-modules/user/user.entity';
-import { userValidator } from 'src/engine/core-modules/user/user.validate';
 import { WorkspaceInvitationService } from 'src/engine/core-modules/workspace-invitation/services/workspace-invitation.service';
-import { WorkspaceAuthProvider } from 'src/engine/core-modules/workspace/types/workspace.type';
-import {
-  Workspace,
-  WorkspaceActivationStatus,
-} from 'src/engine/core-modules/workspace/workspace.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace.validate';
 import { getDomainNameByEmail } from 'src/utils/get-domain-name-by-email';
 import { getImageBufferFromUrl } from 'src/utils/image';
-import { isDefined } from 'src/utils/is-defined';
 import { isWorkEmail } from 'src/utils/is-work-email';
 
-export type SignInUpServiceInput = {
-  email: string;
-  password?: string;
-  firstName?: string | null;
-  lastName?: string | null;
-  workspaceInviteHash?: string;
-  workspacePersonalInviteToken?: string;
-  picture?: string | null;
-  fromSSO: boolean;
-  targetWorkspaceSubdomain?: string;
-  authProvider?: WorkspaceAuthProvider;
-};
-
 @Injectable()
 // eslint-disable-next-line @nx/workspace-inject-workspace-repository
 export class SignInUpService {
@@ -69,284 +61,202 @@ export class SignInUpService {
     private readonly userService: UserService,
   ) {}
 
-  async signInUp({
-    email,
-    workspacePersonalInviteToken,
-    workspaceInviteHash,
-    password,
-    firstName,
-    lastName,
-    picture,
-    fromSSO,
-    targetWorkspaceSubdomain,
-    authProvider,
-  }: SignInUpServiceInput) {
-    if (!firstName) firstName = '';
-    if (!lastName) lastName = '';
+  async computeParamsForNewUser(
+    newUserParams: SignInUpNewUserPayload,
+    authParams: AuthProviderWithPasswordType['authParams'],
+  ) {
+    if (!newUserParams.firstName) newUserParams.firstName = '';
+    if (!newUserParams.lastName) newUserParams.lastName = '';
 
-    if (!email) {
+    if (!newUserParams?.email) {
       throw new AuthException(
         'Email is required',
         AuthExceptionCode.INVALID_INPUT,
       );
     }
 
-    if (password) {
-      const isPasswordValid = PASSWORD_REGEX.test(password);
-
-      if (!isPasswordValid) {
-        throw new AuthException(
-          'Password too weak',
-          AuthExceptionCode.INVALID_INPUT,
-        );
-      }
+    if (authParams.provider === 'password') {
+      newUserParams.passwordHash = await this.generateHash(authParams.password);
     }
 
-    const passwordHash = password ? await hashPassword(password) : undefined;
-
-    const existingUser = await this.userRepository.findOne({
-      where: { email },
-    });
-
-    if (existingUser && !fromSSO) {
-      const isValid = await compareHash(
-        password || '',
-        existingUser.passwordHash,
-      );
+    return newUserParams as PartialUserWithPicture;
+  }
 
-      if (!isValid) {
-        throw new AuthException(
-          'Wrong password',
-          AuthExceptionCode.FORBIDDEN_EXCEPTION,
-        );
-      }
+  async signInUp(
+    params: SignInUpBaseParams &
+      ExistingUserOrPartialUserWithPicture &
+      AuthProviderWithPasswordType,
+  ) {
+    // with personal invitation flow
+    if (params.workspace && params.invitation) {
+      return {
+        workspace: params.workspace,
+        user: await this.signInUpWithPersonalInvitation({
+          invitation: params.invitation,
+          userData: params.userData,
+        }),
+      };
     }
 
-    const signInUpWithInvitationResult = await this.signInUpWithInvitation({
-      email,
-      workspacePersonalInviteToken,
-      workspaceInviteHash,
-      targetWorkspaceSubdomain,
-      fromSSO,
-      firstName,
-      lastName,
-      picture,
-      authProvider,
-      passwordHash,
-      existingUser,
-    });
+    if (params.workspace) {
+      const updatedUser = await this.signInUpOnExistingWorkspace({
+        workspace: params.workspace,
+        userData: params.userData,
+      });
 
-    if (isDefined(signInUpWithInvitationResult)) {
-      return signInUpWithInvitationResult;
+      return { user: updatedUser, workspace: params.workspace };
     }
 
-    if (!existingUser) {
-      return await this.signUpOnNewWorkspace({
-        email,
-        passwordHash,
-        firstName,
-        lastName,
-        picture,
-      });
+    if (params.userData.type === 'newUserWithPicture') {
+      return await this.signUpOnNewWorkspace(
+        params.userData.newUserWithPicture,
+      );
     }
 
-    const workspace =
-      await this.domainManagerService.getWorkspaceBySubdomainOrDefaultWorkspace(
-        targetWorkspaceSubdomain,
-      );
+    // should never happen.
+    throw new Error('Invalid sign in up params');
+  }
 
-    workspaceValidator.assertIsDefinedOrThrow(workspace);
+  async generateHash(password: string) {
+    const isPasswordValid = PASSWORD_REGEX.test(password);
 
-    return await this.validateSignIn({
-      user: existingUser,
-      workspace,
-      authProvider,
-    });
+    if (!isPasswordValid) {
+      throw new AuthException(
+        'Password too weak',
+        AuthExceptionCode.INVALID_INPUT,
+      );
+    }
+
+    return await hashPassword(password);
   }
 
-  private async signInUpWithInvitation({
-    email,
-    workspacePersonalInviteToken,
-    workspaceInviteHash,
-    firstName,
-    lastName,
-    picture,
-    fromSSO,
-    targetWorkspaceSubdomain,
-    authProvider,
+  async validatePassword({
+    password,
     passwordHash,
-    existingUser,
   }: {
-    email: string;
-    workspacePersonalInviteToken?: string;
-    workspaceInviteHash?: string;
-    firstName: string;
-    lastName: string;
-    picture?: string | null;
-    authProvider?: WorkspaceAuthProvider;
-    passwordHash?: string;
-    existingUser: User | null;
-    fromSSO: boolean;
-    targetWorkspaceSubdomain?: string;
+    password: string;
+    passwordHash: string;
   }) {
-    const maybeInvitation =
-      fromSSO && !workspacePersonalInviteToken && !workspaceInviteHash
-        ? await this.workspaceInvitationService.findInvitationByWorkspaceSubdomainAndUserEmail(
-            {
-              subdomain: targetWorkspaceSubdomain,
-              email,
-            },
-          )
-        : undefined;
-
-    const invitationValidation =
-      workspacePersonalInviteToken || workspaceInviteHash || maybeInvitation
-        ? await this.workspaceInvitationService.validateInvitation({
-            workspacePersonalInviteToken:
-              workspacePersonalInviteToken ?? maybeInvitation?.value,
-            workspaceInviteHash,
-            email,
-          })
-        : null;
-
-    if (
-      invitationValidation?.isValid === true &&
-      invitationValidation.workspace
-    ) {
-      const updatedUser = await this.signInUpOnExistingWorkspace({
-        email,
-        passwordHash,
-        workspace: invitationValidation.workspace,
-        firstName,
-        lastName,
-        picture,
-        existingUser,
-        authProvider,
-      });
+    const isValid = await compareHash(password, passwordHash);
 
-      await this.workspaceInvitationService.invalidateWorkspaceInvitation(
-        invitationValidation.workspace.id,
-        email,
+    if (!isValid) {
+      throw new AuthException(
+        'Wrong password',
+        AuthExceptionCode.FORBIDDEN_EXCEPTION,
       );
-
-      return {
-        user: updatedUser,
-        workspace: invitationValidation.workspace,
-      };
     }
   }
 
-  private async validateSignIn({
-    user,
-    workspace,
-    authProvider,
-  }: {
-    user: User;
-    workspace: Workspace;
-    authProvider: SignInUpServiceInput['authProvider'];
-  }) {
-    if (authProvider) {
-      workspaceValidator.isAuthEnabledOrThrow(authProvider, workspace);
+  private async signInUpWithPersonalInvitation(
+    params: { invitation: AppToken } & ExistingUserOrPartialUserWithPicture,
+  ) {
+    if (!params.invitation) {
+      throw new AuthException(
+        'Invitation not found',
+        AuthExceptionCode.FORBIDDEN_EXCEPTION,
+      );
     }
 
-    await this.userService.hasUserAccessToWorkspaceOrThrow(
-      user.id,
-      workspace.id,
-    );
+    const email =
+      params.userData.type === 'newUserWithPicture'
+        ? params.userData.newUserWithPicture.email
+        : params.userData.existingUser.email;
 
-    return { user, workspace };
-  }
+    if (!email) {
+      throw new AuthException(
+        'Email is required',
+        AuthExceptionCode.INVALID_INPUT,
+      );
+    }
 
-  async signInUpOnExistingWorkspace({
-    email,
-    passwordHash,
-    workspace,
-    firstName,
-    lastName,
-    picture,
-    existingUser,
-    authProvider,
-  }: {
-    email: string;
-    passwordHash: string | undefined;
-    workspace: Workspace;
-    firstName: string;
-    lastName: string;
-    picture: SignInUpServiceInput['picture'];
-    existingUser: User | null;
-    authProvider?: WorkspaceAuthProvider;
-  }) {
-    const isNewUser = !isDefined(existingUser);
-    let user = existingUser;
+    const invitationValidation =
+      await this.workspaceInvitationService.validatePersonalInvitation({
+        workspacePersonalInviteToken: params.invitation.value,
+        email,
+      });
 
-    workspaceValidator.assertIsDefinedOrThrow(
-      workspace,
-      new AuthException(
-        'Workspace not found',
+    if (!invitationValidation?.isValid) {
+      throw new AuthException(
+        'Invitation not found',
         AuthExceptionCode.FORBIDDEN_EXCEPTION,
-      ),
-    );
+      );
+    }
 
-    workspaceValidator.assertIsActive(
-      workspace,
-      new AuthException(
-        'Workspace is not ready to welcome new members',
-        AuthExceptionCode.FORBIDDEN_EXCEPTION,
-      ),
+    const updatedUser = await this.signInUpOnExistingWorkspace({
+      workspace: invitationValidation.workspace,
+      userData: params.userData,
+    });
+
+    await this.workspaceInvitationService.invalidateWorkspaceInvitation(
+      invitationValidation.workspace.id,
+      email,
     );
 
-    if (authProvider) {
-      workspaceValidator.isAuthEnabledOrThrow(authProvider, workspace);
-    }
+    await this.userService.markEmailAsVerified(updatedUser.id);
 
-    if (isNewUser) {
-      const imagePath = await this.uploadPicture(picture, workspace.id);
+    return updatedUser;
+  }
 
-      const userToCreate = this.userRepository.create({
-        email: email,
-        firstName: firstName,
-        lastName: lastName,
-        defaultAvatarUrl: imagePath,
-        canImpersonate: false,
-        passwordHash,
-      });
+  private async persistNewUser(
+    newUser: PartialUserWithPicture,
+    workspace: Workspace,
+  ) {
+    const imagePath = await this.uploadPicture(newUser.picture, workspace.id);
 
-      user = await this.userRepository.save(userToCreate);
-    }
+    delete newUser.picture;
 
-    userValidator.assertIsDefinedOrThrow(
-      user,
+    const userToCreate = this.userRepository.create({
+      ...newUser,
+      defaultAvatarUrl: imagePath,
+      canImpersonate: false,
+    } as Partial<User>);
+
+    return await this.userRepository.save(userToCreate);
+  }
+
+  async signInUpOnExistingWorkspace(
+    params: {
+      workspace: Workspace;
+    } & ExistingUserOrPartialUserWithPicture,
+  ) {
+    workspaceValidator.assertIsActive(
+      params.workspace,
       new AuthException(
-        'User not found',
+        'Workspace is not ready to welcome new members',
         AuthExceptionCode.FORBIDDEN_EXCEPTION,
       ),
     );
 
+    const currentUser =
+      params.userData.type === 'newUserWithPicture'
+        ? await this.persistNewUser(
+            params.userData.newUserWithPicture,
+            params.workspace,
+          )
+        : params.userData.existingUser;
+
     const updatedUser = await this.userWorkspaceService.addUserToWorkspace(
-      user,
-      workspace,
+      currentUser,
+      params.workspace,
     );
 
-    await this.activateOnboardingForUser(user, workspace, {
-      firstName,
-      lastName,
-    });
+    const user = Object.assign(currentUser, updatedUser);
+
+    if (params.userData.type === 'newUserWithPicture') {
+      await this.activateOnboardingForUser(user, params.workspace);
+    }
 
-    return Object.assign(user, updatedUser);
+    return user;
   }
 
-  private async activateOnboardingForUser(
-    user: User,
-    workspace: Workspace,
-    { firstName, lastName }: { firstName: string; lastName: string },
-  ) {
+  private async activateOnboardingForUser(user: User, workspace: Workspace) {
     await this.onboardingService.setOnboardingConnectAccountPending({
       userId: user.id,
       workspaceId: workspace.id,
       value: true,
     });
 
-    if (firstName === '' && lastName === '') {
+    if (user.firstName === '' && user.lastName === '') {
       await this.onboardingService.setOnboardingCreateProfilePending({
         userId: user.id,
         workspaceId: workspace.id,
@@ -355,27 +265,19 @@ export class SignInUpService {
     }
   }
 
-  async signUpOnNewWorkspace({
-    email,
-    passwordHash,
-    firstName,
-    lastName,
-    picture,
-  }: {
-    email: string;
-    passwordHash: string | undefined;
-    firstName: string;
-    lastName: string;
-    picture: SignInUpServiceInput['picture'];
-  }) {
-    const user: Partial<User> = {
-      email,
-      firstName,
-      lastName,
+  async signUpOnNewWorkspace(partialUserWithPicture: PartialUserWithPicture) {
+    const user: PartialUserWithPicture = {
+      ...partialUserWithPicture,
       canImpersonate: false,
-      passwordHash,
     };
 
+    if (!user.email) {
+      throw new AuthException(
+        'Email is required',
+        AuthExceptionCode.INVALID_INPUT,
+      );
+    }
+
     if (!this.environmentService.get('IS_MULTIWORKSPACE_ENABLED')) {
       const workspacesCount = await this.workspaceRepository.count();
 
@@ -391,9 +293,20 @@ export class SignInUpService {
       }
     }
 
-    const logo = isWorkEmail(email)
-      ? `${TWENTY_ICONS_BASE_URL}/${getDomainNameByEmail(email)}`
-      : undefined;
+    const logoUrl = `${TWENTY_ICONS_BASE_URL}/${getDomainNameByEmail(user.email)}`;
+    const isLogoUrlValid = async () => {
+      try {
+        return (
+          (await this.httpService.axiosRef.get(logoUrl, { timeout: 600 }))
+            .status === 200
+        );
+      } catch {
+        return false;
+      }
+    };
+
+    const logo =
+      isWorkEmail(user.email) && (await isLogoUrlValid()) ? logoUrl : undefined;
 
     const workspaceToCreate = this.workspaceRepository.create({
       subdomain: await this.domainManagerService.generateSubdomain(),
@@ -406,7 +319,10 @@ export class SignInUpService {
 
     const workspace = await this.workspaceRepository.save(workspaceToCreate);
 
-    user.defaultAvatarUrl = await this.uploadPicture(picture, workspace.id);
+    user.defaultAvatarUrl = await this.uploadPicture(
+      partialUserWithPicture.picture,
+      workspace.id,
+    );
 
     const userCreated = this.userRepository.create(user);
 
@@ -414,10 +330,7 @@ export class SignInUpService {
 
     await this.userWorkspaceService.create(newUser.id, workspace.id);
 
-    await this.activateOnboardingForUser(newUser, workspace, {
-      firstName,
-      lastName,
-    });
+    await this.activateOnboardingForUser(newUser, workspace);
 
     await this.onboardingService.setOnboardingInviteTeamPending({
       workspaceId: workspace.id,
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/social-sso.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/social-sso.service.ts
new file mode 100644
index 000000000000..1d8287215633
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/services/social-sso.service.ts
@@ -0,0 +1,68 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository } from 'typeorm';
+
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { WorkspaceAuthProvider } from 'src/engine/core-modules/workspace/types/workspace.type';
+
+@Injectable()
+export class SocialSsoService {
+  constructor(
+    @InjectRepository(Workspace, 'core')
+    private readonly workspaceRepository: Repository<Workspace>,
+    private readonly environmentService: EnvironmentService,
+  ) {}
+
+  private getAuthProviderColumnNameByProvider(
+    authProvider: WorkspaceAuthProvider,
+  ) {
+    if (authProvider === 'google') {
+      return 'isGoogleAuthEnabled';
+    }
+
+    if (authProvider === 'microsoft') {
+      return 'isMicrosoftAuthEnabled';
+    }
+
+    if (authProvider === 'password') {
+      return 'isPasswordAuthEnabled';
+    }
+
+    throw new Error(`${authProvider} is not a valid auth provider.`);
+  }
+
+  async findWorkspaceFromWorkspaceIdOrAuthProvider(
+    {
+      authProvider,
+      email,
+    }: { authProvider: WorkspaceAuthProvider; email: string },
+    workspaceId?: string,
+  ) {
+    if (
+      this.environmentService.get('IS_MULTIWORKSPACE_ENABLED') &&
+      !workspaceId
+    ) {
+      // Multi-workspace enable mode but on non workspace url.
+      // so get the first workspace with the current auth method enable
+      const workspace = await this.workspaceRepository.findOne({
+        where: {
+          [this.getAuthProviderColumnNameByProvider(authProvider)]: true,
+          workspaceUsers: {
+            user: {
+              email,
+            },
+          },
+        },
+        relations: ['workspaceUsers', 'workspaceUsers.user'],
+      });
+
+      return workspace ?? undefined;
+    }
+
+    return await this.workspaceRepository.findOneBy({
+      id: workspaceId,
+    });
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/switch-workspace.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/services/switch-workspace.service.spec.ts
deleted file mode 100644
index c6fa11b5f9ca..000000000000
--- a/packages/twenty-server/src/engine/core-modules/auth/services/switch-workspace.service.spec.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { getRepositoryToken } from '@nestjs/typeorm';
-
-import { Repository } from 'typeorm';
-
-import { AuthException } from 'src/engine/core-modules/auth/auth.exception';
-import { AccessTokenService } from 'src/engine/core-modules/auth/token/services/access-token.service';
-import { RefreshTokenService } from 'src/engine/core-modules/auth/token/services/refresh-token.service';
-import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { UserService } from 'src/engine/core-modules/user/services/user.service';
-import { User } from 'src/engine/core-modules/user/user.entity';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-
-import { SwitchWorkspaceService } from './switch-workspace.service';
-
-describe('SwitchWorkspaceService', () => {
-  let service: SwitchWorkspaceService;
-  let userRepository: Repository<User>;
-  let workspaceRepository: Repository<Workspace>;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [
-        SwitchWorkspaceService,
-        {
-          provide: getRepositoryToken(User, 'core'),
-          useClass: Repository,
-        },
-        {
-          provide: getRepositoryToken(Workspace, 'core'),
-          useClass: Repository,
-        },
-        {
-          provide: AccessTokenService,
-          useValue: {
-            generateAccessToken: jest.fn(),
-          },
-        },
-        {
-          provide: RefreshTokenService,
-          useValue: {
-            generateRefreshToken: jest.fn(),
-          },
-        },
-        {
-          provide: EnvironmentService,
-          useValue: {
-            get: jest.fn(),
-          },
-        },
-        {
-          provide: UserService,
-          useValue: {},
-        },
-      ],
-    }).compile();
-
-    service = module.get<SwitchWorkspaceService>(SwitchWorkspaceService);
-    userRepository = module.get<Repository<User>>(
-      getRepositoryToken(User, 'core'),
-    );
-    workspaceRepository = module.get<Repository<Workspace>>(
-      getRepositoryToken(Workspace, 'core'),
-    );
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-
-  describe('switchWorkspace', () => {
-    it('should throw an error if user does not exist', async () => {
-      jest.spyOn(userRepository, 'findBy').mockResolvedValue([]);
-      jest.spyOn(workspaceRepository, 'findOne').mockResolvedValue(null);
-
-      await expect(
-        service.switchWorkspace(
-          { id: 'non-existent-user' } as User,
-          'workspace-id',
-        ),
-      ).rejects.toThrow(AuthException);
-    });
-
-    it('should throw an error if workspace does not exist', async () => {
-      jest
-        .spyOn(userRepository, 'findBy')
-        .mockResolvedValue([{ id: 'user-id' } as User]);
-      jest.spyOn(workspaceRepository, 'findOne').mockResolvedValue(null);
-
-      await expect(
-        service.switchWorkspace(
-          { id: 'user-id' } as User,
-          'non-existent-workspace',
-        ),
-      ).rejects.toThrow(AuthException);
-    });
-
-    it('should throw an error if user does not belong to workspace', async () => {
-      const mockUser = { id: 'user-id' };
-      const mockWorkspace = {
-        id: 'workspace-id',
-        workspaceUsers: [{ userId: 'other-user-id' }],
-      };
-
-      jest
-        .spyOn(userRepository, 'findBy')
-        .mockResolvedValue([mockUser as User]);
-      jest
-        .spyOn(workspaceRepository, 'findOne')
-        .mockResolvedValue(mockWorkspace as any);
-
-      await expect(
-        service.switchWorkspace(mockUser as User, 'workspace-id'),
-      ).rejects.toThrow(AuthException);
-    });
-
-    it('should return SSO auth info if workspace has SSO providers', async () => {
-      const mockUser = { id: 'user-id' };
-      const mockWorkspace = {
-        id: 'workspace-id',
-        workspaceUsers: [{ userId: 'user-id' }],
-        logo: 'logo',
-        displayName: 'displayName',
-        isGoogleAuthEnabled: true,
-        isPasswordAuthEnabled: true,
-        isMicrosoftAuthEnabled: false,
-        workspaceSSOIdentityProviders: [
-          {
-            id: 'sso-id',
-          },
-        ],
-      };
-
-      jest
-        .spyOn(userRepository, 'findBy')
-        .mockResolvedValue([mockUser as User]);
-      jest.spyOn(userRepository, 'save').mockResolvedValue(mockUser as User);
-      jest
-        .spyOn(workspaceRepository, 'findOne')
-        .mockResolvedValue(mockWorkspace as any);
-
-      const result = await service.switchWorkspace(
-        mockUser as User,
-        'workspace-id',
-      );
-
-      expect(result).toEqual({
-        id: mockWorkspace.id,
-        logo: expect.any(String),
-        displayName: expect.any(String),
-        authProviders: expect.any(Object),
-      });
-    });
-
-    it('should return workspace info if workspace does not have SSO providers', async () => {
-      const mockUser = { id: 'user-id' };
-      const mockWorkspace = {
-        id: 'workspace-id',
-        workspaceUsers: [{ userId: 'user-id' }],
-        workspaceSSOIdentityProviders: [],
-        logo: 'logo',
-        displayName: 'displayName',
-      };
-
-      jest
-        .spyOn(userRepository, 'findBy')
-        .mockResolvedValue([mockUser as User]);
-      jest
-        .spyOn(workspaceRepository, 'findOne')
-        .mockResolvedValue(mockWorkspace as any);
-      jest.spyOn(userRepository, 'save').mockResolvedValue({} as User);
-
-      const result = await service.switchWorkspace(
-        mockUser as User,
-        'workspace-id',
-      );
-
-      expect(result).toEqual({
-        id: mockWorkspace.id,
-        logo: expect.any(String),
-        displayName: expect.any(String),
-        authProviders: expect.any(Object),
-      });
-    });
-  });
-});
diff --git a/packages/twenty-server/src/engine/core-modules/auth/services/switch-workspace.service.ts b/packages/twenty-server/src/engine/core-modules/auth/services/switch-workspace.service.ts
deleted file mode 100644
index 266ffb46161c..000000000000
--- a/packages/twenty-server/src/engine/core-modules/auth/services/switch-workspace.service.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Repository } from 'typeorm';
-
-import {
-  AuthException,
-  AuthExceptionCode,
-} from 'src/engine/core-modules/auth/auth.exception';
-import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { User } from 'src/engine/core-modules/user/user.entity';
-import { AuthProviders } from 'src/engine/core-modules/workspace/dtos/public-workspace-data-output';
-import { getAuthProvidersByWorkspace } from 'src/engine/core-modules/workspace/utils/get-auth-providers-by-workspace.util';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace.validate';
-
-@Injectable()
-export class SwitchWorkspaceService {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    private readonly workspaceRepository: Repository<Workspace>,
-    private readonly environmentService: EnvironmentService,
-  ) {}
-
-  async switchWorkspace(user: User, workspaceId: string) {
-    const workspace = await this.workspaceRepository.findOne({
-      where: { id: workspaceId },
-      relations: ['workspaceUsers', 'workspaceSSOIdentityProviders'],
-    });
-
-    workspaceValidator.assertIsDefinedOrThrow(
-      workspace,
-      new AuthException('Workspace not found', AuthExceptionCode.INVALID_INPUT),
-    );
-
-    if (
-      !workspace.workspaceUsers
-        .map((userWorkspace) => userWorkspace.userId)
-        .includes(user.id)
-    ) {
-      throw new AuthException(
-        'user does not belong to workspace',
-        AuthExceptionCode.FORBIDDEN_EXCEPTION,
-      );
-    }
-
-    const systemEnabledProviders: AuthProviders = {
-      google: this.environmentService.get('AUTH_GOOGLE_ENABLED'),
-      magicLink: false,
-      password: this.environmentService.get('AUTH_PASSWORD_ENABLED'),
-      microsoft: this.environmentService.get('AUTH_MICROSOFT_ENABLED'),
-      sso: [],
-    };
-
-    return {
-      id: workspace.id,
-      subdomain: workspace.subdomain,
-      logo: workspace.logo,
-      displayName: workspace.displayName,
-      authProviders: getAuthProvidersByWorkspace({
-        workspace,
-        systemEnabledProviders,
-      }),
-    };
-  }
-}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-common.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-common.auth.strategy.ts
index addf4b6e78cd..741a05ef6c89 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-common.auth.strategy.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-common.auth.strategy.ts
@@ -19,9 +19,8 @@ export class GoogleAPIsOauthCommonStrategy extends PassportStrategy(
   constructor(
     environmentService: EnvironmentService,
     scopeConfig: GoogleAPIScopeConfig,
-    isGmailSendEmailScopeEnabled = false,
   ) {
-    const scopes = getGoogleApisOauthScopes(isGmailSendEmailScopeEnabled);
+    const scopes = getGoogleApisOauthScopes();
 
     super({
       clientID: environmentService.get('AUTH_GOOGLE_CLIENT_ID'),
diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-exchange-code-for-token.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-exchange-code-for-token.auth.strategy.ts
index c8559bd141f2..244b1066d846 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-exchange-code-for-token.auth.strategy.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-exchange-code-for-token.auth.strategy.ts
@@ -15,9 +15,8 @@ export class GoogleAPIsOauthExchangeCodeForTokenStrategy extends GoogleAPIsOauth
   constructor(
     environmentService: EnvironmentService,
     scopeConfig: GoogleAPIScopeConfig,
-    isGmailSendEmailScopeEnabled = false,
   ) {
-    super(environmentService, scopeConfig, isGmailSendEmailScopeEnabled);
+    super(environmentService, scopeConfig);
   }
 
   async validate(
diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-request-code.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-request-code.auth.strategy.ts
index ee0782b9cd8b..6ce3c33c5026 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-request-code.auth.strategy.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/google-apis-oauth-request-code.auth.strategy.ts
@@ -13,9 +13,8 @@ export class GoogleAPIsOauthRequestCodeStrategy extends GoogleAPIsOauthCommonStr
   constructor(
     environmentService: EnvironmentService,
     scopeConfig: GoogleAPIScopeConfig,
-    isGmailSendEmailScopeEnabled = false,
   ) {
-    super(environmentService, scopeConfig, isGmailSendEmailScopeEnabled);
+    super(environmentService, scopeConfig);
   }
 
   authenticate(req: any, options: any) {
diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.ts
index b673e7449952..358ad7e62d19 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/google.auth.strategy.ts
@@ -17,7 +17,7 @@ export type GoogleRequest = Omit<
     picture: string | null;
     workspaceInviteHash?: string;
     workspacePersonalInviteToken?: string;
-    targetWorkspaceSubdomain?: string;
+    workspaceId?: string;
     billingCheckoutSessionState?: string;
   };
 };
@@ -39,7 +39,7 @@ export class GoogleStrategy extends PassportStrategy(Strategy, 'google') {
       ...options,
       state: JSON.stringify({
         workspaceInviteHash: req.params.workspaceInviteHash,
-        workspaceSubdomain: req.params.workspaceSubdomain,
+        workspaceId: req.params.workspaceId,
         ...(req.params.billingCheckoutSessionState
           ? {
               billingCheckoutSessionState:
@@ -78,7 +78,7 @@ export class GoogleStrategy extends PassportStrategy(Strategy, 'google') {
       picture: photos?.[0]?.value,
       workspaceInviteHash: state.workspaceInviteHash,
       workspacePersonalInviteToken: state.workspacePersonalInviteToken,
-      targetWorkspaceSubdomain: state.workspaceSubdomain,
+      workspaceId: state.workspaceId,
       billingCheckoutSessionState: state.billingCheckoutSessionState,
     };
 
diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft-apis-oauth-common.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft-apis-oauth-common.auth.strategy.ts
index 8b506a98045c..e0be81b2e0b9 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft-apis-oauth-common.auth.strategy.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft-apis-oauth-common.auth.strategy.ts
@@ -22,7 +22,7 @@ export class MicrosoftAPIsOauthCommonStrategy extends PassportStrategy(
     super({
       clientID: environmentService.get('AUTH_MICROSOFT_CLIENT_ID'),
       clientSecret: environmentService.get('AUTH_MICROSOFT_CLIENT_SECRET'),
-      tenant: environmentService.get('AUTH_MICROSOFT_TENANT_ID'),
+      tenant: 'common',
       callbackURL: environmentService.get('AUTH_MICROSOFT_APIS_CALLBACK_URL'),
       scope: scopes,
       passReqToCallback: true,
diff --git a/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts b/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts
index 1ae2afb3cbea..cbe7231d9651 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/strategies/microsoft.auth.strategy.ts
@@ -21,7 +21,7 @@ export type MicrosoftRequest = Omit<
     picture: string | null;
     workspaceInviteHash?: string;
     workspacePersonalInviteToken?: string;
-    targetWorkspaceSubdomain?: string;
+    workspaceId?: string;
     billingCheckoutSessionState?: string;
   };
 };
@@ -32,7 +32,7 @@ export class MicrosoftStrategy extends PassportStrategy(Strategy, 'microsoft') {
       clientID: environmentService.get('AUTH_MICROSOFT_CLIENT_ID'),
       clientSecret: environmentService.get('AUTH_MICROSOFT_CLIENT_SECRET'),
       callbackURL: environmentService.get('AUTH_MICROSOFT_CALLBACK_URL'),
-      tenant: environmentService.get('AUTH_MICROSOFT_TENANT_ID'),
+      tenant: 'common',
       scope: ['user.read'],
       passReqToCallback: true,
     });
@@ -43,7 +43,7 @@ export class MicrosoftStrategy extends PassportStrategy(Strategy, 'microsoft') {
       ...options,
       state: JSON.stringify({
         workspaceInviteHash: req.params.workspaceInviteHash,
-        workspaceSubdomain: req.params.workspaceSubdomain,
+        workspaceId: req.params.workspaceId,
         ...(req.params.billingCheckoutSessionState
           ? {
               billingCheckoutSessionState:
@@ -92,7 +92,7 @@ export class MicrosoftStrategy extends PassportStrategy(Strategy, 'microsoft') {
       picture: photos?.[0]?.value,
       workspaceInviteHash: state.workspaceInviteHash,
       workspacePersonalInviteToken: state.workspacePersonalInviteToken,
-      targetWorkspaceSubdomain: state.workspaceSubdomain,
+      workspaceId: state.workspaceId,
       billingCheckoutSessionState: state.billingCheckoutSessionState,
     };
 
diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.spec.ts
index bb73c6369a55..43438bb5d00f 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.spec.ts
@@ -2,6 +2,7 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { getRepositoryToken } from '@nestjs/typeorm';
 
 import { Request } from 'express';
+import { WorkspaceActivationStatus } from 'twenty-shared';
 import { Repository } from 'typeorm';
 
 import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
@@ -12,10 +13,7 @@ import { EnvironmentService } from 'src/engine/core-modules/environment/environm
 import { JwtWrapperService } from 'src/engine/core-modules/jwt/services/jwt-wrapper.service';
 import { SSOService } from 'src/engine/core-modules/sso/services/sso.service';
 import { User } from 'src/engine/core-modules/user/user.entity';
-import {
-  Workspace,
-  WorkspaceActivationStatus,
-} from 'src/engine/core-modules/workspace/workspace.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 
 import { AccessTokenService } from './access-token.service';
diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.ts
index 9fc53b7dc8bb..09dc96cd6246 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/access-token.service.ts
@@ -5,6 +5,7 @@ import { addMilliseconds } from 'date-fns';
 import { Request } from 'express';
 import ms from 'ms';
 import { ExtractJwt } from 'passport-jwt';
+import { isWorkspaceActiveOrSuspended } from 'twenty-shared';
 import { Repository } from 'typeorm';
 
 import {
@@ -20,14 +21,11 @@ import {
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { JwtWrapperService } from 'src/engine/core-modules/jwt/services/jwt-wrapper.service';
 import { User } from 'src/engine/core-modules/user/user.entity';
-import {
-  Workspace,
-  WorkspaceActivationStatus,
-} from 'src/engine/core-modules/workspace/workspace.entity';
+import { userValidator } from 'src/engine/core-modules/user/user.validate';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace.validate';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
-import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace.validate';
-import { userValidator } from 'src/engine/core-modules/user/user.validate';
 
 @Injectable()
 export class AccessTokenService {
@@ -67,7 +65,7 @@ export class AccessTokenService {
 
     workspaceValidator.assertIsDefinedOrThrow(workspace);
 
-    if (workspace.activationStatus === WorkspaceActivationStatus.ACTIVE) {
+    if (isWorkspaceActiveOrSuspended(workspace)) {
       const workspaceMemberRepository =
         await this.twentyORMGlobalManager.getRepositoryForWorkspace<WorkspaceMemberWorkspaceEntity>(
           workspaceId,
diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/email-verification-token.service.spec.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/email-verification-token.service.spec.ts
new file mode 100644
index 000000000000..1ee9e31e9475
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/email-verification-token.service.spec.ts
@@ -0,0 +1,187 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { getRepositoryToken } from '@nestjs/typeorm';
+
+import crypto from 'crypto';
+
+import { Repository } from 'typeorm';
+
+import {
+  AppToken,
+  AppTokenType,
+} from 'src/engine/core-modules/app-token/app-token.entity';
+import {
+  EmailVerificationException,
+  EmailVerificationExceptionCode,
+} from 'src/engine/core-modules/email-verification/email-verification.exception';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+
+import { EmailVerificationTokenService } from './email-verification-token.service';
+
+describe('EmailVerificationTokenService', () => {
+  let service: EmailVerificationTokenService;
+  let appTokenRepository: Repository<AppToken>;
+  let environmentService: EnvironmentService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      providers: [
+        EmailVerificationTokenService,
+        {
+          provide: getRepositoryToken(AppToken, 'core'),
+          useClass: Repository,
+        },
+        {
+          provide: EnvironmentService,
+          useValue: {
+            get: jest.fn(),
+          },
+        },
+      ],
+    }).compile();
+
+    service = module.get<EmailVerificationTokenService>(
+      EmailVerificationTokenService,
+    );
+    appTokenRepository = module.get<Repository<AppToken>>(
+      getRepositoryToken(AppToken, 'core'),
+    );
+    environmentService = module.get<EnvironmentService>(EnvironmentService);
+  });
+
+  describe('generateToken', () => {
+    it('should generate a verification token successfully', async () => {
+      const userId = 'test-user-id';
+      const email = 'test@example.com';
+      const mockExpiresIn = '24h';
+
+      jest.spyOn(environmentService, 'get').mockReturnValue(mockExpiresIn);
+      jest.spyOn(appTokenRepository, 'create').mockReturnValue({} as AppToken);
+      jest.spyOn(appTokenRepository, 'save').mockResolvedValue({} as AppToken);
+
+      const result = await service.generateToken(userId, email);
+
+      expect(result).toHaveProperty('token');
+      expect(result).toHaveProperty('expiresAt');
+      expect(result.token).toHaveLength(64); // 32 bytes in hex = 64 characters
+      expect(appTokenRepository.create).toHaveBeenCalledWith(
+        expect.objectContaining({
+          userId,
+          type: AppTokenType.EmailVerificationToken,
+          context: { email },
+        }),
+      );
+      expect(appTokenRepository.save).toHaveBeenCalled();
+    });
+  });
+
+  describe('validateEmailVerificationTokenOrThrow', () => {
+    it('should validate token successfully and return user', async () => {
+      const plainToken = 'plain-token';
+      const hashedToken = crypto
+        .createHash('sha256')
+        .update(plainToken)
+        .digest('hex');
+      const mockUser = { id: 'user-id', email: 'test@example.com' };
+      const mockAppToken = {
+        type: AppTokenType.EmailVerificationToken,
+        expiresAt: new Date(Date.now() + 86400000), // 24h from now
+        context: { email: 'test@example.com' },
+        user: mockUser,
+      };
+
+      jest
+        .spyOn(appTokenRepository, 'findOne')
+        .mockResolvedValue(mockAppToken as AppToken);
+      jest
+        .spyOn(appTokenRepository, 'remove')
+        .mockResolvedValue(mockAppToken as AppToken);
+
+      const result =
+        await service.validateEmailVerificationTokenOrThrow(plainToken);
+
+      expect(result).toEqual(mockUser);
+      expect(appTokenRepository.findOne).toHaveBeenCalledWith({
+        where: {
+          value: hashedToken,
+          type: AppTokenType.EmailVerificationToken,
+        },
+        relations: ['user'],
+      });
+      expect(appTokenRepository.remove).toHaveBeenCalledWith(mockAppToken);
+    });
+
+    it('should throw exception for invalid token', async () => {
+      jest.spyOn(appTokenRepository, 'findOne').mockResolvedValue(null);
+
+      await expect(
+        service.validateEmailVerificationTokenOrThrow('invalid-token'),
+      ).rejects.toThrow(
+        new EmailVerificationException(
+          'Invalid email verification token',
+          EmailVerificationExceptionCode.INVALID_TOKEN,
+        ),
+      );
+    });
+
+    it('should throw exception for wrong token type', async () => {
+      const mockAppToken = {
+        type: AppTokenType.PasswordResetToken,
+        expiresAt: new Date(Date.now() + 86400000),
+      };
+
+      jest
+        .spyOn(appTokenRepository, 'findOne')
+        .mockResolvedValue(mockAppToken as AppToken);
+
+      await expect(
+        service.validateEmailVerificationTokenOrThrow('wrong-type-token'),
+      ).rejects.toThrow(
+        new EmailVerificationException(
+          'Invalid email verification token type',
+          EmailVerificationExceptionCode.INVALID_APP_TOKEN_TYPE,
+        ),
+      );
+    });
+
+    it('should throw exception for expired token', async () => {
+      const mockAppToken = {
+        type: AppTokenType.EmailVerificationToken,
+        expiresAt: new Date(Date.now() - 86400000), // 24h ago
+      };
+
+      jest
+        .spyOn(appTokenRepository, 'findOne')
+        .mockResolvedValue(mockAppToken as AppToken);
+
+      await expect(
+        service.validateEmailVerificationTokenOrThrow('expired-token'),
+      ).rejects.toThrow(
+        new EmailVerificationException(
+          'Email verification token expired',
+          EmailVerificationExceptionCode.TOKEN_EXPIRED,
+        ),
+      );
+    });
+
+    it('should throw exception when email is missing in context', async () => {
+      const mockAppToken = {
+        type: AppTokenType.EmailVerificationToken,
+        expiresAt: new Date(Date.now() + 86400000),
+        context: {},
+      };
+
+      jest
+        .spyOn(appTokenRepository, 'findOne')
+        .mockResolvedValue(mockAppToken as AppToken);
+
+      await expect(
+        service.validateEmailVerificationTokenOrThrow('valid-token'),
+      ).rejects.toThrow(
+        new EmailVerificationException(
+          'Email missing in email verification token context',
+          EmailVerificationExceptionCode.EMAIL_MISSING,
+        ),
+      );
+    });
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/auth/token/services/email-verification-token.service.ts b/packages/twenty-server/src/engine/core-modules/auth/token/services/email-verification-token.service.ts
new file mode 100644
index 000000000000..02b6cdb4cd4b
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/token/services/email-verification-token.service.ts
@@ -0,0 +1,103 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import crypto from 'crypto';
+
+import { addMilliseconds } from 'date-fns';
+import ms from 'ms';
+import { Repository } from 'typeorm';
+
+import {
+  AppToken,
+  AppTokenType,
+} from 'src/engine/core-modules/app-token/app-token.entity';
+import { AuthToken } from 'src/engine/core-modules/auth/dto/token.entity';
+import {
+  EmailVerificationException,
+  EmailVerificationExceptionCode,
+} from 'src/engine/core-modules/email-verification/email-verification.exception';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+
+@Injectable()
+export class EmailVerificationTokenService {
+  constructor(
+    @InjectRepository(AppToken, 'core')
+    private readonly appTokenRepository: Repository<AppToken>,
+    private readonly environmentService: EnvironmentService,
+  ) {}
+
+  async generateToken(userId: string, email: string): Promise<AuthToken> {
+    const expiresIn = this.environmentService.get(
+      'EMAIL_VERIFICATION_TOKEN_EXPIRES_IN',
+    );
+    const expiresAt = addMilliseconds(new Date().getTime(), ms(expiresIn));
+
+    const plainToken = crypto.randomBytes(32).toString('hex');
+    const hashedToken = crypto
+      .createHash('sha256')
+      .update(plainToken)
+      .digest('hex');
+
+    const verificationToken = this.appTokenRepository.create({
+      userId,
+      expiresAt,
+      type: AppTokenType.EmailVerificationToken,
+      value: hashedToken,
+      context: { email },
+    });
+
+    await this.appTokenRepository.save(verificationToken);
+
+    return {
+      token: plainToken,
+      expiresAt,
+    };
+  }
+
+  async validateEmailVerificationTokenOrThrow(emailVerificationToken: string) {
+    const hashedToken = crypto
+      .createHash('sha256')
+      .update(emailVerificationToken)
+      .digest('hex');
+
+    const appToken = await this.appTokenRepository.findOne({
+      where: {
+        value: hashedToken,
+        type: AppTokenType.EmailVerificationToken,
+      },
+      relations: ['user'],
+    });
+
+    if (!appToken) {
+      throw new EmailVerificationException(
+        'Invalid email verification token',
+        EmailVerificationExceptionCode.INVALID_TOKEN,
+      );
+    }
+
+    if (appToken.type !== AppTokenType.EmailVerificationToken) {
+      throw new EmailVerificationException(
+        'Invalid email verification token type',
+        EmailVerificationExceptionCode.INVALID_APP_TOKEN_TYPE,
+      );
+    }
+
+    if (new Date() > appToken.expiresAt) {
+      throw new EmailVerificationException(
+        'Email verification token expired',
+        EmailVerificationExceptionCode.TOKEN_EXPIRED,
+      );
+    }
+
+    if (!appToken.context?.email) {
+      throw new EmailVerificationException(
+        'Email missing in email verification token context',
+        EmailVerificationExceptionCode.EMAIL_MISSING,
+      );
+    }
+
+    await this.appTokenRepository.remove(appToken);
+
+    return appToken.user;
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/auth/types/signInUp.type.ts b/packages/twenty-server/src/engine/core-modules/auth/types/signInUp.type.ts
new file mode 100644
index 000000000000..7dd623e2b6b7
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/auth/types/signInUp.type.ts
@@ -0,0 +1,51 @@
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { WorkspaceAuthProvider } from 'src/engine/core-modules/workspace/types/workspace.type';
+import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+
+export type SignInUpBaseParams = {
+  invitation?: AppToken;
+  workspace?: Workspace | null;
+  billingCheckoutSessionState?: string | null;
+};
+
+export type SignInUpNewUserPayload = {
+  email: string;
+  firstName?: string | null;
+  lastName?: string | null;
+  picture?: string | null;
+  passwordHash?: string | null;
+};
+
+export type PartialUserWithPicture = {
+  picture?: string;
+} & Partial<User>;
+
+export type ExistingUserOrNewUser = {
+  userData:
+    | { type: 'existingUser'; existingUser: User }
+    | {
+        type: 'newUser';
+        newUserPayload: SignInUpNewUserPayload;
+      };
+};
+
+export type ExistingUserOrPartialUserWithPicture = {
+  userData:
+    | { type: 'existingUser'; existingUser: User }
+    | {
+        type: 'newUserWithPicture';
+        newUserWithPicture: PartialUserWithPicture;
+      };
+};
+
+export type AuthProviderWithPasswordType = {
+  authParams:
+    | {
+        provider: Extract<WorkspaceAuthProvider, 'password'>;
+        password: string;
+      }
+    | {
+        provider: Exclude<WorkspaceAuthProvider, 'password'>;
+      };
+};
diff --git a/packages/twenty-server/src/engine/core-modules/auth/utils/get-google-apis-oauth-scopes.ts b/packages/twenty-server/src/engine/core-modules/auth/utils/get-google-apis-oauth-scopes.ts
index e532c3cdf405..aa94f12cf3ae 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/utils/get-google-apis-oauth-scopes.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/utils/get-google-apis-oauth-scopes.ts
@@ -1,17 +1,10 @@
-export const getGoogleApisOauthScopes = (
-  isGmailSendEmailScopeEnabled = false,
-) => {
-  const scopes = [
+export const getGoogleApisOauthScopes = () => {
+  return [
     'email',
     'profile',
     'https://www.googleapis.com/auth/gmail.readonly',
     'https://www.googleapis.com/auth/calendar.events',
     'https://www.googleapis.com/auth/profile.emails.read',
+    'https://www.googleapis.com/auth/gmail.send',
   ];
-
-  if (isGmailSendEmailScopeEnabled) {
-    scopes.push('https://www.googleapis.com/auth/gmail.send');
-  }
-
-  return scopes;
 };
diff --git a/packages/twenty-server/src/engine/core-modules/auth/utils/get-microsoft-apis-oauth-scopes.ts b/packages/twenty-server/src/engine/core-modules/auth/utils/get-microsoft-apis-oauth-scopes.ts
index e8353e88b5e5..0daa2c3b7ef8 100644
--- a/packages/twenty-server/src/engine/core-modules/auth/utils/get-microsoft-apis-oauth-scopes.ts
+++ b/packages/twenty-server/src/engine/core-modules/auth/utils/get-microsoft-apis-oauth-scopes.ts
@@ -6,6 +6,7 @@ export const getMicrosoftApisOauthScopes = () => {
     'offline_access',
     'Mail.Read',
     'Calendars.Read',
+    'User.Read',
   ];
 
   return scopes;
diff --git a/packages/twenty-server/src/engine/core-modules/billing/billing.controller.ts b/packages/twenty-server/src/engine/core-modules/billing/billing.controller.ts
index b5113fe6ce6a..e35b8743b1d6 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/billing.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/billing.controller.ts
@@ -10,26 +10,27 @@ import {
 } from '@nestjs/common';
 
 import { Response } from 'express';
+import Stripe from 'stripe';
 
 import {
   BillingException,
   BillingExceptionCode,
 } from 'src/engine/core-modules/billing/billing.exception';
-import { WebhookEvent } from 'src/engine/core-modules/billing/enums/billing-webhook-events.enum';
+import { BillingWebhookEvent } from 'src/engine/core-modules/billing/enums/billing-webhook-events.enum';
 import { BillingRestApiExceptionFilter } from 'src/engine/core-modules/billing/filters/billing-api-exception.filter';
 import { BillingSubscriptionService } from 'src/engine/core-modules/billing/services/billing-subscription.service';
-import { BillingWebhookEntitlementService } from 'src/engine/core-modules/billing/services/billing-webhook-entitlement.service';
-import { BillingWebhookPriceService } from 'src/engine/core-modules/billing/services/billing-webhook-price.service';
-import { BillingWebhookProductService } from 'src/engine/core-modules/billing/services/billing-webhook-product.service';
-import { BillingWebhookSubscriptionService } from 'src/engine/core-modules/billing/services/billing-webhook-subscription.service';
-import { StripeService } from 'src/engine/core-modules/billing/stripe/stripe.service';
+import { StripeWebhookService } from 'src/engine/core-modules/billing/stripe/services/stripe-webhook.service';
+import { BillingWebhookEntitlementService } from 'src/engine/core-modules/billing/webhooks/services/billing-webhook-entitlement.service';
+import { BillingWebhookPriceService } from 'src/engine/core-modules/billing/webhooks/services/billing-webhook-price.service';
+import { BillingWebhookProductService } from 'src/engine/core-modules/billing/webhooks/services/billing-webhook-product.service';
+import { BillingWebhookSubscriptionService } from 'src/engine/core-modules/billing/webhooks/services/billing-webhook-subscription.service';
 @Controller('billing')
 @UseFilters(BillingRestApiExceptionFilter)
 export class BillingController {
   protected readonly logger = new Logger(BillingController.name);
 
   constructor(
-    private readonly stripeService: StripeService,
+    private readonly stripeWebhookService: StripeWebhookService,
     private readonly billingWebhookSubscriptionService: BillingWebhookSubscriptionService,
     private readonly billingWebhookEntitlementService: BillingWebhookEntitlementService,
     private readonly billingSubscriptionService: BillingSubscriptionService,
@@ -48,72 +49,63 @@ export class BillingController {
 
       return;
     }
-    const event = this.stripeService.constructEventFromPayload(
+    const event = this.stripeWebhookService.constructEventFromPayload(
       signature,
       req.rawBody,
     );
 
-    if (event.type === WebhookEvent.SETUP_INTENT_SUCCEEDED) {
-      await this.billingSubscriptionService.handleUnpaidInvoices(event.data);
-    }
-
-    if (
-      event.type === WebhookEvent.CUSTOMER_SUBSCRIPTION_CREATED ||
-      event.type === WebhookEvent.CUSTOMER_SUBSCRIPTION_UPDATED ||
-      event.type === WebhookEvent.CUSTOMER_SUBSCRIPTION_DELETED
-    ) {
-      const workspaceId = event.data.object.metadata?.workspaceId;
+    try {
+      const result = await this.handleStripeEvent(event);
 
-      if (!workspaceId) {
+      res.status(200).send(result).end();
+    } catch (error) {
+      if (error instanceof BillingException) {
         res.status(404).end();
-
-        return;
       }
-
-      await this.billingWebhookSubscriptionService.processStripeEvent(
-        workspaceId,
-        event.data,
-      );
     }
-    if (
-      event.type === WebhookEvent.CUSTOMER_ACTIVE_ENTITLEMENT_SUMMARY_UPDATED
-    ) {
-      try {
-        await this.billingWebhookEntitlementService.processStripeEvent(
+  }
+
+  private async handleStripeEvent(event: Stripe.Event) {
+    switch (event.type) {
+      case BillingWebhookEvent.SETUP_INTENT_SUCCEEDED:
+        return await this.billingSubscriptionService.handleUnpaidInvoices(
+          event.data,
+        );
+      case BillingWebhookEvent.PRICE_UPDATED:
+      case BillingWebhookEvent.PRICE_CREATED:
+        return await this.billingWebhookPriceService.processStripeEvent(
           event.data,
         );
-      } catch (error) {
-        if (
-          error instanceof BillingException &&
-          error.code === BillingExceptionCode.BILLING_CUSTOMER_NOT_FOUND
-        ) {
-          res.status(404).end();
-        }
-      }
-    }
 
-    if (
-      event.type === WebhookEvent.PRODUCT_CREATED ||
-      event.type === WebhookEvent.PRODUCT_UPDATED
-    ) {
-      await this.billingWebhookProductService.processStripeEvent(event.data);
-    }
-    if (
-      event.type === WebhookEvent.PRICE_CREATED ||
-      event.type === WebhookEvent.PRICE_UPDATED
-    ) {
-      try {
-        await this.billingWebhookPriceService.processStripeEvent(event.data);
-      } catch (error) {
-        if (
-          error instanceof BillingException &&
-          error.code === BillingExceptionCode.BILLING_PRODUCT_NOT_FOUND
-        ) {
-          res.status(404).end();
+      case BillingWebhookEvent.PRODUCT_UPDATED:
+      case BillingWebhookEvent.PRODUCT_CREATED:
+        return await this.billingWebhookProductService.processStripeEvent(
+          event.data,
+        );
+      case BillingWebhookEvent.CUSTOMER_ACTIVE_ENTITLEMENT_SUMMARY_UPDATED:
+        return await this.billingWebhookEntitlementService.processStripeEvent(
+          event.data,
+        );
+
+      case BillingWebhookEvent.CUSTOMER_SUBSCRIPTION_CREATED:
+      case BillingWebhookEvent.CUSTOMER_SUBSCRIPTION_UPDATED:
+      case BillingWebhookEvent.CUSTOMER_SUBSCRIPTION_DELETED: {
+        const workspaceId = event.data.object.metadata?.workspaceId;
+
+        if (!workspaceId) {
+          throw new BillingException(
+            'Workspace ID is required for subscription events',
+            BillingExceptionCode.BILLING_SUBSCRIPTION_EVENT_WORKSPACE_NOT_FOUND,
+          );
         }
+
+        return await this.billingWebhookSubscriptionService.processStripeEvent(
+          workspaceId,
+          event.data,
+        );
       }
+      default:
+        return {};
     }
-
-    res.status(200).end();
   }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/billing/billing.exception.ts b/packages/twenty-server/src/engine/core-modules/billing/billing.exception.ts
index 59ef9502749b..e5d6230853e4 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/billing.exception.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/billing.exception.ts
@@ -11,5 +11,8 @@ export class BillingException extends CustomException {
 
 export enum BillingExceptionCode {
   BILLING_CUSTOMER_NOT_FOUND = 'BILLING_CUSTOMER_NOT_FOUND',
+  BILLING_PLAN_NOT_FOUND = 'BILLING_PLAN_NOT_FOUND',
   BILLING_PRODUCT_NOT_FOUND = 'BILLING_PRODUCT_NOT_FOUND',
+  BILLING_PRICE_NOT_FOUND = 'BILLING_PRICE_NOT_FOUND',
+  BILLING_SUBSCRIPTION_EVENT_WORKSPACE_NOT_FOUND = 'BILLING_SUBSCRIPTION_EVENT_WORKSPACE_NOT_FOUND',
 }
diff --git a/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts b/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts
index 3dddad725acb..ebab7647ee61 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/billing.module.ts
@@ -14,14 +14,15 @@ import { BillingSubscriptionItem } from 'src/engine/core-modules/billing/entitie
 import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
 import { BillingRestApiExceptionFilter } from 'src/engine/core-modules/billing/filters/billing-api-exception.filter';
 import { BillingWorkspaceMemberListener } from 'src/engine/core-modules/billing/listeners/billing-workspace-member.listener';
+import { BillingPlanService } from 'src/engine/core-modules/billing/services/billing-plan.service';
 import { BillingPortalWorkspaceService } from 'src/engine/core-modules/billing/services/billing-portal.workspace-service';
 import { BillingSubscriptionService } from 'src/engine/core-modules/billing/services/billing-subscription.service';
-import { BillingWebhookEntitlementService } from 'src/engine/core-modules/billing/services/billing-webhook-entitlement.service';
-import { BillingWebhookPriceService } from 'src/engine/core-modules/billing/services/billing-webhook-price.service';
-import { BillingWebhookProductService } from 'src/engine/core-modules/billing/services/billing-webhook-product.service';
-import { BillingWebhookSubscriptionService } from 'src/engine/core-modules/billing/services/billing-webhook-subscription.service';
 import { BillingService } from 'src/engine/core-modules/billing/services/billing.service';
 import { StripeModule } from 'src/engine/core-modules/billing/stripe/stripe.module';
+import { BillingWebhookEntitlementService } from 'src/engine/core-modules/billing/webhooks/services/billing-webhook-entitlement.service';
+import { BillingWebhookPriceService } from 'src/engine/core-modules/billing/webhooks/services/billing-webhook-price.service';
+import { BillingWebhookProductService } from 'src/engine/core-modules/billing/webhooks/services/billing-webhook-product.service';
+import { BillingWebhookSubscriptionService } from 'src/engine/core-modules/billing/webhooks/services/billing-webhook-subscription.service';
 import { DomainManagerModule } from 'src/engine/core-modules/domain-manager/domain-manager.module';
 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
@@ -56,6 +57,7 @@ import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
     BillingWebhookEntitlementService,
     BillingPortalWorkspaceService,
     BillingResolver,
+    BillingPlanService,
     BillingWorkspaceMemberListener,
     BillingService,
     BillingWebhookProductService,
diff --git a/packages/twenty-server/src/engine/core-modules/billing/billing.resolver.ts b/packages/twenty-server/src/engine/core-modules/billing/billing.resolver.ts
index d32d3bf554f3..99e5540dc7ac 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/billing.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/billing.resolver.ts
@@ -1,16 +1,25 @@
 import { UseGuards } from '@nestjs/common';
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
 
-import { BillingSessionInput } from 'src/engine/core-modules/billing/dto/billing-session.input';
-import { CheckoutSessionInput } from 'src/engine/core-modules/billing/dto/checkout-session.input';
-import { ProductPricesEntity } from 'src/engine/core-modules/billing/dto/product-prices.entity';
-import { ProductInput } from 'src/engine/core-modules/billing/dto/product.input';
-import { SessionEntity } from 'src/engine/core-modules/billing/dto/session.entity';
-import { UpdateBillingEntity } from 'src/engine/core-modules/billing/dto/update-billing.entity';
+import { GraphQLError } from 'graphql';
+
+import { BillingCheckoutSessionInput } from 'src/engine/core-modules/billing/dtos/inputs/billing-checkout-session.input';
+import { BillingProductInput } from 'src/engine/core-modules/billing/dtos/inputs/billing-product.input';
+import { BillingSessionInput } from 'src/engine/core-modules/billing/dtos/inputs/billing-session.input';
+import { BillingPlanOutput } from 'src/engine/core-modules/billing/dtos/outputs/billing-plan.output';
+import { BillingProductPricesOutput } from 'src/engine/core-modules/billing/dtos/outputs/billing-product-prices.output';
+import { BillingSessionOutput } from 'src/engine/core-modules/billing/dtos/outputs/billing-session.output';
+import { BillingUpdateOutput } from 'src/engine/core-modules/billing/dtos/outputs/billing-update.output';
 import { AvailableProduct } from 'src/engine/core-modules/billing/enums/billing-available-product.enum';
+import { BillingPlanKey } from 'src/engine/core-modules/billing/enums/billing-plan-key.enum';
+import { BillingPlanService } from 'src/engine/core-modules/billing/services/billing-plan.service';
 import { BillingPortalWorkspaceService } from 'src/engine/core-modules/billing/services/billing-portal.workspace-service';
 import { BillingSubscriptionService } from 'src/engine/core-modules/billing/services/billing-subscription.service';
-import { StripeService } from 'src/engine/core-modules/billing/stripe/stripe.service';
+import { StripePriceService } from 'src/engine/core-modules/billing/stripe/services/stripe-price.service';
+import { BillingPortalCheckoutSessionParameters } from 'src/engine/core-modules/billing/types/billing-portal-checkout-session-parameters.type';
+import { formatBillingDatabaseProductToGraphqlDTO } from 'src/engine/core-modules/billing/utils/format-database-product-to-graphql-dto.util';
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
+import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
@@ -23,20 +32,27 @@ export class BillingResolver {
   constructor(
     private readonly billingSubscriptionService: BillingSubscriptionService,
     private readonly billingPortalWorkspaceService: BillingPortalWorkspaceService,
-    private readonly stripeService: StripeService,
+    private readonly stripePriceService: StripePriceService,
+    private readonly billingPlanService: BillingPlanService,
+    private readonly featureFlagService: FeatureFlagService,
   ) {}
 
-  @Query(() => ProductPricesEntity)
-  async getProductPrices(@Args() { product }: ProductInput) {
-    const productPrices = await this.stripeService.getStripePrices(product);
+  @Query(() => BillingProductPricesOutput)
+  @UseGuards(WorkspaceAuthGuard)
+  async getProductPrices(
+    @AuthWorkspace() workspace: Workspace,
+    @Args() { product }: BillingProductInput,
+  ) {
+    const productPrices =
+      await this.stripePriceService.getStripePrices(product);
 
     return {
       totalNumberOfPrices: productPrices.length,
-      productPrices: productPrices,
+      productPrices,
     };
   }
 
-  @Query(() => SessionEntity)
+  @Query(() => BillingSessionOutput)
   @UseGuards(WorkspaceAuthGuard)
   async billingPortalSession(
     @AuthWorkspace() workspace: Workspace,
@@ -44,13 +60,13 @@ export class BillingResolver {
   ) {
     return {
       url: await this.billingPortalWorkspaceService.computeBillingPortalSessionURLOrThrow(
-        workspace.id,
+        workspace,
         returnUrlPath,
       ),
     };
   }
 
-  @Mutation(() => SessionEntity)
+  @Mutation(() => BillingSessionOutput)
   @UseGuards(WorkspaceAuthGuard, UserAuthGuard)
   async checkoutSession(
     @AuthWorkspace() workspace: Workspace,
@@ -61,36 +77,73 @@ export class BillingResolver {
       successUrlPath,
       plan,
       requirePaymentMethod,
-    }: CheckoutSessionInput,
+    }: BillingCheckoutSessionInput,
   ) {
-    const productPrice = await this.stripeService.getStripePrice(
+    const isBillingPlansEnabled =
+      await this.featureFlagService.isFeatureEnabled(
+        FeatureFlagKey.IsBillingPlansEnabled,
+        workspace.id,
+      );
+
+    const checkoutSessionParams: BillingPortalCheckoutSessionParameters = {
+      user,
+      workspace,
+      successUrlPath,
+      plan: plan ?? BillingPlanKey.PRO,
+      requirePaymentMethod,
+    };
+
+    if (isBillingPlansEnabled) {
+      const billingPricesPerPlan =
+        await this.billingPlanService.getPricesPerPlan({
+          planKey: checkoutSessionParams.plan,
+          interval: recurringInterval,
+        });
+      const checkoutSessionURL =
+        await this.billingPortalWorkspaceService.computeCheckoutSessionURL({
+          ...checkoutSessionParams,
+          billingPricesPerPlan,
+        });
+
+      return {
+        url: checkoutSessionURL,
+      };
+    }
+
+    const productPrice = await this.stripePriceService.getStripePrice(
       AvailableProduct.BasePlan,
       recurringInterval,
     );
 
     if (!productPrice) {
-      throw new Error(
+      throw new GraphQLError(
         'Product price not found for the given recurring interval',
       );
     }
+    const checkoutSessionURL =
+      await this.billingPortalWorkspaceService.computeCheckoutSessionURL({
+        ...checkoutSessionParams,
+        priceId: productPrice.stripePriceId,
+      });
 
     return {
-      url: await this.billingPortalWorkspaceService.computeCheckoutSessionURL(
-        user,
-        workspace,
-        productPrice.stripePriceId,
-        successUrlPath,
-        plan,
-        requirePaymentMethod,
-      ),
+      url: checkoutSessionURL,
     };
   }
 
-  @Mutation(() => UpdateBillingEntity)
+  @Mutation(() => BillingUpdateOutput)
   @UseGuards(WorkspaceAuthGuard)
   async updateBillingSubscription(@AuthWorkspace() workspace: Workspace) {
     await this.billingSubscriptionService.applyBillingSubscription(workspace);
 
     return { success: true };
   }
+
+  @Query(() => [BillingPlanOutput])
+  @UseGuards(WorkspaceAuthGuard)
+  async plans(): Promise<BillingPlanOutput[]> {
+    const plans = await this.billingPlanService.getPlans();
+
+    return plans.map(formatBillingDatabaseProductToGraphqlDTO);
+  }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/billing/commands/billing-sync-customer-data.command.ts b/packages/twenty-server/src/engine/core-modules/billing/commands/billing-sync-customer-data.command.ts
index 70fcb981a080..9733c4bc6756 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/commands/billing-sync-customer-data.command.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/commands/billing-sync-customer-data.command.ts
@@ -9,7 +9,7 @@ import {
   ActiveWorkspacesCommandRunner,
 } from 'src/database/commands/active-workspaces.command';
 import { BillingCustomer } from 'src/engine/core-modules/billing/entities/billing-customer.entity';
-import { StripeService } from 'src/engine/core-modules/billing/stripe/stripe.service';
+import { StripeSubscriptionService } from 'src/engine/core-modules/billing/stripe/services/stripe-subscription.service';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 
 interface SyncCustomerDataCommandOptions
@@ -23,7 +23,7 @@ export class BillingSyncCustomerDataCommand extends ActiveWorkspacesCommandRunne
   constructor(
     @InjectRepository(Workspace, 'core')
     protected readonly workspaceRepository: Repository<Workspace>,
-    private readonly stripeService: StripeService,
+    private readonly stripeSubscriptionService: StripeSubscriptionService,
     @InjectRepository(BillingCustomer, 'core')
     protected readonly billingCustomerRepository: Repository<BillingCustomer>,
   ) {
@@ -71,7 +71,7 @@ export class BillingSyncCustomerDataCommand extends ActiveWorkspacesCommandRunne
 
     if (!options.dryRun && !billingCustomer) {
       const stripeCustomerId =
-        await this.stripeService.getStripeCustomerIdFromWorkspaceId(
+        await this.stripeSubscriptionService.getStripeCustomerIdFromWorkspaceId(
           workspaceId,
         );
 
diff --git a/packages/twenty-server/src/engine/core-modules/billing/commands/billing-sync-plans-data.command.ts b/packages/twenty-server/src/engine/core-modules/billing/commands/billing-sync-plans-data.command.ts
index a75809a3cefe..73f0a63cc4cf 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/commands/billing-sync-plans-data.command.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/commands/billing-sync-plans-data.command.ts
@@ -11,11 +11,13 @@ import {
 import { BillingMeter } from 'src/engine/core-modules/billing/entities/billing-meter.entity';
 import { BillingPrice } from 'src/engine/core-modules/billing/entities/billing-price.entity';
 import { BillingProduct } from 'src/engine/core-modules/billing/entities/billing-product.entity';
-import { StripeService } from 'src/engine/core-modules/billing/stripe/stripe.service';
+import { StripeBillingMeterService } from 'src/engine/core-modules/billing/stripe/services/stripe-billing-meter.service';
+import { StripePriceService } from 'src/engine/core-modules/billing/stripe/services/stripe-price.service';
+import { StripeProductService } from 'src/engine/core-modules/billing/stripe/services/stripe-product.service';
 import { isStripeValidProductMetadata } from 'src/engine/core-modules/billing/utils/is-stripe-valid-product-metadata.util';
-import { transformStripeMeterDataToMeterRepositoryData } from 'src/engine/core-modules/billing/utils/transform-stripe-meter-data-to-meter-repository-data.util';
-import { transformStripePriceDataToPriceRepositoryData } from 'src/engine/core-modules/billing/utils/transform-stripe-price-data-to-price-repository-data.util';
-import { transformStripeProductDataToProductRepositoryData } from 'src/engine/core-modules/billing/utils/transform-stripe-product-data-to-product-repository-data.util';
+import { transformStripeMeterToDatabaseMeter } from 'src/engine/core-modules/billing/utils/transform-stripe-meter-to-database-meter.util';
+import { transformStripePriceToDatabasePrice } from 'src/engine/core-modules/billing/utils/transform-stripe-price-to-database-price.util';
+import { transformStripeProductToDatabaseProduct } from 'src/engine/core-modules/billing/utils/transform-stripe-product-to-database-product.util';
 @Command({
   name: 'billing:sync-plans-data',
   description:
@@ -30,7 +32,9 @@ export class BillingSyncPlansDataCommand extends BaseCommandRunner {
     private readonly billingProductRepository: Repository<BillingProduct>,
     @InjectRepository(BillingMeter, 'core')
     private readonly billingMeterRepository: Repository<BillingMeter>,
-    private readonly stripeService: StripeService,
+    private readonly stripeBillingMeterService: StripeBillingMeterService,
+    private readonly stripeProductService: StripeProductService,
+    private readonly stripePriceService: StripePriceService,
   ) {
     super();
   }
@@ -43,7 +47,7 @@ export class BillingSyncPlansDataCommand extends BaseCommandRunner {
       try {
         if (!options.dryRun) {
           await this.billingMeterRepository.upsert(
-            transformStripeMeterDataToMeterRepositoryData(meter),
+            transformStripeMeterToDatabaseMeter(meter),
             {
               conflictPaths: ['stripeMeterId'],
             },
@@ -63,7 +67,7 @@ export class BillingSyncPlansDataCommand extends BaseCommandRunner {
     try {
       if (!options.dryRun) {
         await this.billingProductRepository.upsert(
-          transformStripeProductDataToProductRepositoryData(product),
+          transformStripeProductToDatabaseProduct(product),
           {
             conflictPaths: ['stripeProductId'],
           },
@@ -92,7 +96,7 @@ export class BillingSyncPlansDataCommand extends BaseCommandRunner {
         }
         await this.upsertProductRepositoryData(product, options);
 
-        const prices = await this.stripeService.getPricesByProductId(
+        const prices = await this.stripePriceService.getPricesByProductId(
           product.id,
         );
 
@@ -133,20 +137,18 @@ export class BillingSyncPlansDataCommand extends BaseCommandRunner {
     passedParams: string[],
     options: BaseCommandOptions,
   ): Promise<void> {
-    const billingMeters = await this.stripeService.getAllMeters();
+    const billingMeters = await this.stripeBillingMeterService.getAllMeters();
 
     await this.upsertMetersRepositoryData(billingMeters, options);
 
-    const billingProducts = await this.stripeService.getAllProducts();
+    const billingProducts = await this.stripeProductService.getAllProducts();
 
     const billingPrices = await this.processBillingPricesByProductBatches(
       billingProducts,
       options,
     );
     const transformedPrices = billingPrices.flatMap((prices) =>
-      prices.map((price) =>
-        transformStripePriceDataToPriceRepositoryData(price),
-      ),
+      prices.map((price) => transformStripePriceToDatabasePrice(price)),
     );
 
     this.logger.log(`Upserting ${transformedPrices.length} transformed prices`);
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dto/product-prices.entity.ts b/packages/twenty-server/src/engine/core-modules/billing/dto/product-prices.entity.ts
deleted file mode 100644
index 02efc4174929..000000000000
--- a/packages/twenty-server/src/engine/core-modules/billing/dto/product-prices.entity.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Field, Int, ObjectType } from '@nestjs/graphql';
-
-import { ProductPriceEntity } from 'src/engine/core-modules/billing/dto/product-price.entity';
-
-@ObjectType()
-export class ProductPricesEntity {
-  @Field(() => Int)
-  totalNumberOfPrices: number;
-
-  @Field(() => [ProductPriceEntity])
-  productPrices: ProductPriceEntity[];
-}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-price-licensed.dto.ts b/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-price-licensed.dto.ts
new file mode 100644
index 000000000000..b6fc10d97728
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-price-licensed.dto.ts
@@ -0,0 +1,15 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+import { SubscriptionInterval } from 'src/engine/core-modules/billing/enums/billing-subscription-interval.enum';
+
+@ObjectType()
+export class BillingPriceLicensedDTO {
+  @Field(() => SubscriptionInterval)
+  recurringInterval: SubscriptionInterval;
+
+  @Field(() => Number)
+  unitAmount: number;
+
+  @Field(() => String)
+  stripePriceId: string;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-price-metered.dto.ts b/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-price-metered.dto.ts
new file mode 100644
index 000000000000..84d7398c869f
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-price-metered.dto.ts
@@ -0,0 +1,20 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+import { BillingPriceTierDTO } from 'src/engine/core-modules/billing/dtos/billing-price-tier.dto';
+import { BillingPriceTiersMode } from 'src/engine/core-modules/billing/enums/billing-price-tiers-mode.enum';
+import { SubscriptionInterval } from 'src/engine/core-modules/billing/enums/billing-subscription-interval.enum';
+
+@ObjectType()
+export class BillingPriceMeteredDTO {
+  @Field(() => BillingPriceTiersMode, { nullable: true })
+  tiersMode: BillingPriceTiersMode.GRADUATED | null;
+
+  @Field(() => [BillingPriceTierDTO], { nullable: true })
+  tiers: BillingPriceTierDTO[];
+
+  @Field(() => SubscriptionInterval)
+  recurringInterval: SubscriptionInterval;
+
+  @Field(() => String)
+  stripePriceId: string;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-price-tier.dto.ts b/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-price-tier.dto.ts
new file mode 100644
index 000000000000..6765dd1c189c
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-price-tier.dto.ts
@@ -0,0 +1,13 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+@ObjectType()
+export class BillingPriceTierDTO {
+  @Field(() => Number, { nullable: true })
+  upTo: number | null;
+
+  @Field(() => Number, { nullable: true })
+  flatAmount: number | null;
+
+  @Field(() => Number, { nullable: true })
+  unitAmount: number | null;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-price-union.dto.ts b/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-price-union.dto.ts
new file mode 100644
index 000000000000..9767818770fc
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-price-union.dto.ts
@@ -0,0 +1,16 @@
+import { createUnionType } from '@nestjs/graphql';
+
+import { BillingPriceLicensedDTO } from 'src/engine/core-modules/billing/dtos/billing-price-licensed.dto';
+import { BillingPriceMeteredDTO } from 'src/engine/core-modules/billing/dtos/billing-price-metered.dto';
+
+export const BillingPriceUnionDTO = createUnionType({
+  name: 'BillingPriceUnionDTO',
+  types: () => [BillingPriceLicensedDTO, BillingPriceMeteredDTO],
+  resolveType(value) {
+    if ('unitAmount' in value) {
+      return BillingPriceLicensedDTO;
+    }
+
+    return BillingPriceMeteredDTO;
+  },
+});
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dto/product-price.entity.ts b/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-product-price.dto.ts
similarity index 92%
rename from packages/twenty-server/src/engine/core-modules/billing/dto/product-price.entity.ts
rename to packages/twenty-server/src/engine/core-modules/billing/dtos/billing-product-price.dto.ts
index 011d880b2af9..6403d233d957 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/dto/product-price.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-product-price.dto.ts
@@ -4,7 +4,7 @@ import Stripe from 'stripe';
 
 import { SubscriptionInterval } from 'src/engine/core-modules/billing/enums/billing-subscription-interval.enum';
 @ObjectType()
-export class ProductPriceEntity {
+export class BillingProductPriceDTO {
   @Field(() => SubscriptionInterval)
   recurringInterval: Stripe.Price.Recurring.Interval;
 
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-product.dto.ts b/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-product.dto.ts
new file mode 100644
index 000000000000..391a1ed27ce1
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-product.dto.ts
@@ -0,0 +1,24 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+import { BillingPriceLicensedDTO } from 'src/engine/core-modules/billing/dtos/billing-price-licensed.dto';
+import { BillingPriceMeteredDTO } from 'src/engine/core-modules/billing/dtos/billing-price-metered.dto';
+import { BillingPriceUnionDTO } from 'src/engine/core-modules/billing/dtos/billing-price-union.dto';
+import { BillingUsageType } from 'src/engine/core-modules/billing/enums/billing-usage-type.enum';
+
+@ObjectType()
+export class BillingProductDTO {
+  @Field(() => String)
+  name: string;
+
+  @Field(() => String)
+  description: string;
+
+  @Field(() => [String], { nullable: true })
+  images: string[];
+
+  @Field(() => BillingUsageType)
+  type: BillingUsageType;
+
+  @Field(() => [BillingPriceUnionDTO], { nullable: 'items' })
+  prices: Array<BillingPriceLicensedDTO | BillingPriceMeteredDTO>;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-trial-period.dto.ts b/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-trial-period.dto.ts
new file mode 100644
index 000000000000..e78cadd197b7
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/dtos/billing-trial-period.dto.ts
@@ -0,0 +1,13 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+import { Min } from 'class-validator';
+
+@ObjectType()
+export class BillingTrialPeriodDTO {
+  @Field(() => Number)
+  @Min(0)
+  duration: number;
+
+  @Field(() => Boolean)
+  isCreditCardRequired: boolean;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dto/checkout-session.input.ts b/packages/twenty-server/src/engine/core-modules/billing/dtos/inputs/billing-checkout-session.input.ts
similarity index 95%
rename from packages/twenty-server/src/engine/core-modules/billing/dto/checkout-session.input.ts
rename to packages/twenty-server/src/engine/core-modules/billing/dtos/inputs/billing-checkout-session.input.ts
index b5c882be2b66..6efa6ca03257 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/dto/checkout-session.input.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/dtos/inputs/billing-checkout-session.input.ts
@@ -12,7 +12,7 @@ import { BillingPlanKey } from 'src/engine/core-modules/billing/enums/billing-pl
 import { SubscriptionInterval } from 'src/engine/core-modules/billing/enums/billing-subscription-interval.enum';
 
 @ArgsType()
-export class CheckoutSessionInput {
+export class BillingCheckoutSessionInput {
   @Field(() => SubscriptionInterval)
   @IsEnum(SubscriptionInterval)
   @IsNotEmpty()
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dto/product.input.ts b/packages/twenty-server/src/engine/core-modules/billing/dtos/inputs/billing-product.input.ts
similarity index 89%
rename from packages/twenty-server/src/engine/core-modules/billing/dto/product.input.ts
rename to packages/twenty-server/src/engine/core-modules/billing/dtos/inputs/billing-product.input.ts
index 126e1351d0ec..e3eade45ade8 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/dto/product.input.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/dtos/inputs/billing-product.input.ts
@@ -5,7 +5,7 @@ import { IsNotEmpty, IsString } from 'class-validator';
 import { AvailableProduct } from 'src/engine/core-modules/billing/enums/billing-available-product.enum';
 
 @ArgsType()
-export class ProductInput {
+export class BillingProductInput {
   @Field(() => String)
   @IsString()
   @IsNotEmpty()
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dto/billing-session.input.ts b/packages/twenty-server/src/engine/core-modules/billing/dtos/inputs/billing-session.input.ts
similarity index 100%
rename from packages/twenty-server/src/engine/core-modules/billing/dto/billing-session.input.ts
rename to packages/twenty-server/src/engine/core-modules/billing/dtos/inputs/billing-session.input.ts
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dtos/outputs/billing-plan.output.ts b/packages/twenty-server/src/engine/core-modules/billing/dtos/outputs/billing-plan.output.ts
new file mode 100644
index 000000000000..765d38cbe399
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/dtos/outputs/billing-plan.output.ts
@@ -0,0 +1,19 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+import { BillingProductDTO } from 'src/engine/core-modules/billing/dtos/billing-product.dto';
+import { BillingPlanKey } from 'src/engine/core-modules/billing/enums/billing-plan-key.enum';
+
+@ObjectType()
+export class BillingPlanOutput {
+  @Field(() => BillingPlanKey)
+  planKey: BillingPlanKey;
+
+  @Field(() => BillingProductDTO)
+  baseProduct: BillingProductDTO;
+
+  @Field(() => [BillingProductDTO])
+  otherLicensedProducts: BillingProductDTO[];
+
+  @Field(() => [BillingProductDTO])
+  meteredProducts: BillingProductDTO[];
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dtos/outputs/billing-product-prices.output.ts b/packages/twenty-server/src/engine/core-modules/billing/dtos/outputs/billing-product-prices.output.ts
new file mode 100644
index 000000000000..c80bc23d9ac0
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/dtos/outputs/billing-product-prices.output.ts
@@ -0,0 +1,12 @@
+import { Field, Int, ObjectType } from '@nestjs/graphql';
+
+import { BillingProductPriceDTO } from 'src/engine/core-modules/billing/dtos/billing-product-price.dto';
+
+@ObjectType()
+export class BillingProductPricesOutput {
+  @Field(() => Int)
+  totalNumberOfPrices: number;
+
+  @Field(() => [BillingProductPriceDTO])
+  productPrices: BillingProductPriceDTO[];
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dto/session.entity.ts b/packages/twenty-server/src/engine/core-modules/billing/dtos/outputs/billing-session.output.ts
similarity index 78%
rename from packages/twenty-server/src/engine/core-modules/billing/dto/session.entity.ts
rename to packages/twenty-server/src/engine/core-modules/billing/dtos/outputs/billing-session.output.ts
index 745a7364b749..a07ebf7a9c55 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/dto/session.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/dtos/outputs/billing-session.output.ts
@@ -1,7 +1,7 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 
 @ObjectType()
-export class SessionEntity {
+export class BillingSessionOutput {
   @Field(() => String, { nullable: true })
   url: string;
 }
diff --git a/packages/twenty-server/src/engine/core-modules/billing/dto/update-billing.entity.ts b/packages/twenty-server/src/engine/core-modules/billing/dtos/outputs/billing-update.output.ts
similarity index 84%
rename from packages/twenty-server/src/engine/core-modules/billing/dto/update-billing.entity.ts
rename to packages/twenty-server/src/engine/core-modules/billing/dtos/outputs/billing-update.output.ts
index ae8f8660d0f0..fd57062c7410 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/dto/update-billing.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/dtos/outputs/billing-update.output.ts
@@ -1,7 +1,7 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 
 @ObjectType()
-export class UpdateBillingEntity {
+export class BillingUpdateOutput {
   @Field(() => Boolean, {
     description: 'Boolean that confirms query was successful',
   })
diff --git a/packages/twenty-server/src/engine/core-modules/billing/entities/billing-product.entity.ts b/packages/twenty-server/src/engine/core-modules/billing/entities/billing-product.entity.ts
index 7019d38ec159..a226c8fdaffa 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/entities/billing-product.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/entities/billing-product.entity.ts
@@ -32,8 +32,8 @@ export class BillingProduct {
   @Column({ nullable: false })
   active: boolean;
 
-  @Column({ nullable: true, type: 'text' })
-  description: string | null;
+  @Column({ nullable: false, type: 'text', default: '' })
+  description: string;
 
   @Column({ nullable: false })
   name: string;
diff --git a/packages/twenty-server/src/engine/core-modules/billing/enums/billing-price-tiers-mode.enum.ts b/packages/twenty-server/src/engine/core-modules/billing/enums/billing-price-tiers-mode.enum.ts
index 2d54ac874063..f7372e1faeec 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/enums/billing-price-tiers-mode.enum.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/enums/billing-price-tiers-mode.enum.ts
@@ -1,4 +1,10 @@
+import { registerEnumType } from '@nestjs/graphql';
+
 export enum BillingPriceTiersMode {
   GRADUATED = 'GRADUATED',
   VOLUME = 'VOLUME',
 }
+registerEnumType(BillingPriceTiersMode, {
+  name: 'BillingPriceTiersMode',
+  description: 'The different billing price tiers modes',
+});
diff --git a/packages/twenty-server/src/engine/core-modules/billing/enums/billing-webhook-events.enum.ts b/packages/twenty-server/src/engine/core-modules/billing/enums/billing-webhook-events.enum.ts
index d275746add4c..220b55a5b55f 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/enums/billing-webhook-events.enum.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/enums/billing-webhook-events.enum.ts
@@ -1,4 +1,4 @@
-export enum WebhookEvent {
+export enum BillingWebhookEvent {
   CUSTOMER_SUBSCRIPTION_CREATED = 'customer.subscription.created',
   CUSTOMER_SUBSCRIPTION_UPDATED = 'customer.subscription.updated',
   CUSTOMER_SUBSCRIPTION_DELETED = 'customer.subscription.deleted',
diff --git a/packages/twenty-server/src/engine/core-modules/billing/filters/billing-api-exception.filter.ts b/packages/twenty-server/src/engine/core-modules/billing/filters/billing-api-exception.filter.ts
index ace8707ee9ca..55bb32ffac58 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/filters/billing-api-exception.filter.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/filters/billing-api-exception.filter.ts
@@ -26,6 +26,12 @@ export class BillingRestApiExceptionFilter implements ExceptionFilter {
           response,
           404,
         );
+      case BillingExceptionCode.BILLING_PRODUCT_NOT_FOUND:
+        return this.httpExceptionHandlerService.handleError(
+          exception,
+          response,
+          404,
+        );
       default:
         return this.httpExceptionHandlerService.handleError(
           exception,
diff --git a/packages/twenty-server/src/engine/core-modules/billing/jobs/update-subscription-quantity.job.ts b/packages/twenty-server/src/engine/core-modules/billing/jobs/update-subscription-quantity.job.ts
index 301322448f3e..b81d67b11fcb 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/jobs/update-subscription-quantity.job.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/jobs/update-subscription-quantity.job.ts
@@ -1,7 +1,7 @@
 import { Logger, Scope } from '@nestjs/common';
 
 import { BillingSubscriptionService } from 'src/engine/core-modules/billing/services/billing-subscription.service';
-import { StripeService } from 'src/engine/core-modules/billing/stripe/stripe.service';
+import { StripeSubscriptionItemService } from 'src/engine/core-modules/billing/stripe/services/stripe-subscription-item.service';
 import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
 import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
@@ -18,7 +18,7 @@ export class UpdateSubscriptionQuantityJob {
 
   constructor(
     private readonly billingSubscriptionService: BillingSubscriptionService,
-    private readonly stripeService: StripeService,
+    private readonly stripeSubscriptionItemService: StripeSubscriptionItemService,
     private readonly twentyORMManager: TwentyORMManager,
   ) {}
 
@@ -41,7 +41,7 @@ export class UpdateSubscriptionQuantityJob {
           data.workspaceId,
         );
 
-      await this.stripeService.updateSubscriptionItem(
+      await this.stripeSubscriptionItemService.updateSubscriptionItem(
         billingSubscriptionItem.stripeSubscriptionItemId,
         workspaceMembersCount,
       );
diff --git a/packages/twenty-server/src/engine/core-modules/billing/services/billing-plan.service.ts b/packages/twenty-server/src/engine/core-modules/billing/services/billing-plan.service.ts
new file mode 100644
index 000000000000..cecf60a80630
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/services/billing-plan.service.ts
@@ -0,0 +1,153 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository } from 'typeorm';
+
+import {
+  BillingException,
+  BillingExceptionCode,
+} from 'src/engine/core-modules/billing/billing.exception';
+import { BillingProduct } from 'src/engine/core-modules/billing/entities/billing-product.entity';
+import { BillingPlanKey } from 'src/engine/core-modules/billing/enums/billing-plan-key.enum';
+import { SubscriptionInterval } from 'src/engine/core-modules/billing/enums/billing-subscription-interval.enum';
+import { BillingUsageType } from 'src/engine/core-modules/billing/enums/billing-usage-type.enum';
+import { BillingGetPlanResult } from 'src/engine/core-modules/billing/types/billing-get-plan-result.type';
+import { BillingGetPricesPerPlanResult } from 'src/engine/core-modules/billing/types/billing-get-prices-per-plan-result.type';
+
+@Injectable()
+export class BillingPlanService {
+  protected readonly logger = new Logger(BillingPlanService.name);
+  constructor(
+    @InjectRepository(BillingProduct, 'core')
+    private readonly billingProductRepository: Repository<BillingProduct>,
+  ) {}
+
+  async getProductsByProductMetadata({
+    planKey,
+    priceUsageBased,
+    isBaseProduct,
+  }: {
+    planKey: BillingPlanKey;
+    priceUsageBased: BillingUsageType;
+    isBaseProduct: 'true' | 'false';
+  }): Promise<BillingProduct[]> {
+    const products = await this.billingProductRepository.find({
+      where: {
+        metadata: {
+          planKey,
+          priceUsageBased,
+          isBaseProduct,
+        },
+        active: true,
+      },
+      relations: ['billingPrices'],
+    });
+
+    return products;
+  }
+
+  async getPlanBaseProduct(planKey: BillingPlanKey): Promise<BillingProduct> {
+    const [baseProduct] = await this.getProductsByProductMetadata({
+      planKey,
+      priceUsageBased: BillingUsageType.LICENSED,
+      isBaseProduct: 'true',
+    });
+
+    return baseProduct;
+  }
+
+  async getPlans(): Promise<BillingGetPlanResult[]> {
+    const planKeys = Object.values(BillingPlanKey);
+
+    const products = await this.billingProductRepository.find({
+      where: {
+        active: true,
+      },
+      relations: ['billingPrices'],
+    });
+
+    return planKeys.map((planKey) => {
+      const planProducts = products
+        .filter((product) => product.metadata.planKey === planKey)
+        .map((product) => {
+          return {
+            ...product,
+            billingPrices: product.billingPrices.filter(
+              (price) => price.active,
+            ),
+          };
+        });
+      const baseProduct = planProducts.find(
+        (product) => product.metadata.isBaseProduct === 'true',
+      );
+
+      if (!baseProduct) {
+        throw new BillingException(
+          'Base product not found',
+          BillingExceptionCode.BILLING_PRODUCT_NOT_FOUND,
+        );
+      }
+
+      const meteredProducts = planProducts.filter(
+        (product) =>
+          product.metadata.priceUsageBased === BillingUsageType.METERED,
+      );
+      const otherLicensedProducts = planProducts.filter(
+        (product) =>
+          product.metadata.priceUsageBased === BillingUsageType.LICENSED &&
+          product.metadata.isBaseProduct === 'false',
+      );
+
+      return {
+        planKey,
+        baseProduct,
+        meteredProducts,
+        otherLicensedProducts,
+      };
+    });
+  }
+
+  async getPricesPerPlan({
+    planKey,
+    interval,
+  }: {
+    planKey: BillingPlanKey;
+    interval: SubscriptionInterval;
+  }): Promise<BillingGetPricesPerPlanResult> {
+    const plans = await this.getPlans();
+    const plan = plans.find((plan) => plan.planKey === planKey);
+
+    if (!plan) {
+      throw new BillingException(
+        'Billing plan not found',
+        BillingExceptionCode.BILLING_PLAN_NOT_FOUND,
+      );
+    }
+    const { baseProduct, meteredProducts, otherLicensedProducts } = plan;
+    const baseProductPrice = baseProduct.billingPrices.find(
+      (price) => price.interval === interval,
+    );
+
+    if (!baseProductPrice) {
+      throw new BillingException(
+        'Base product price not found for given interval',
+        BillingExceptionCode.BILLING_PRICE_NOT_FOUND,
+      );
+    }
+    const filterPricesByInterval = (product: BillingProduct) =>
+      product.billingPrices.filter((price) => price.interval === interval);
+
+    const meteredProductsPrices = meteredProducts.flatMap(
+      filterPricesByInterval,
+    );
+    const otherLicensedProductsPrices = otherLicensedProducts.flatMap(
+      filterPricesByInterval,
+    );
+
+    return {
+      baseProductPrice,
+      meteredProductsPrices,
+      otherLicensedProductsPrices,
+    };
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/services/billing-portal.workspace-service.ts b/packages/twenty-server/src/engine/core-modules/billing/services/billing-portal.workspace-service.ts
index f422b07dc895..f95789a32c79 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/services/billing-portal.workspace-service.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/services/billing-portal.workspace-service.ts
@@ -1,15 +1,23 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
+import { isDefined } from 'class-validator';
+import Stripe from 'stripe';
 import { Repository } from 'typeorm';
 
+import {
+  BillingException,
+  BillingExceptionCode,
+} from 'src/engine/core-modules/billing/billing.exception';
 import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
-import { BillingPlanKey } from 'src/engine/core-modules/billing/enums/billing-plan-key.enum';
-import { BillingSubscriptionService } from 'src/engine/core-modules/billing/services/billing-subscription.service';
-import { StripeService } from 'src/engine/core-modules/billing/stripe/stripe.service';
+import { StripeBillingPortalService } from 'src/engine/core-modules/billing/stripe/services/stripe-billing-portal.service';
+import { StripeCheckoutService } from 'src/engine/core-modules/billing/stripe/services/stripe-checkout.service';
+import { BillingGetPricesPerPlanResult } from 'src/engine/core-modules/billing/types/billing-get-prices-per-plan-result.type';
+import { BillingPortalCheckoutSessionParameters } from 'src/engine/core-modules/billing/types/billing-portal-checkout-session-parameters.type';
 import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
+import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
-import { User } from 'src/engine/core-modules/user/user.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { assert } from 'src/utils/assert';
 
@@ -17,24 +25,28 @@ import { assert } from 'src/utils/assert';
 export class BillingPortalWorkspaceService {
   protected readonly logger = new Logger(BillingPortalWorkspaceService.name);
   constructor(
-    private readonly stripeService: StripeService,
+    private readonly stripeCheckoutService: StripeCheckoutService,
+    private readonly stripeBillingPortalService: StripeBillingPortalService,
     private readonly domainManagerService: DomainManagerService,
+    private readonly featureFlagService: FeatureFlagService,
     @InjectRepository(BillingSubscription, 'core')
     private readonly billingSubscriptionRepository: Repository<BillingSubscription>,
     @InjectRepository(UserWorkspace, 'core')
     private readonly userWorkspaceRepository: Repository<UserWorkspace>,
-    private readonly billingSubscriptionService: BillingSubscriptionService,
   ) {}
 
-  async computeCheckoutSessionURL(
-    user: User,
-    workspace: Workspace,
-    priceId: string,
-    successUrlPath?: string,
-    plan?: BillingPlanKey,
-    requirePaymentMethod?: boolean,
-  ): Promise<string> {
-    const frontBaseUrl = this.domainManagerService.getBaseUrl();
+  async computeCheckoutSessionURL({
+    user,
+    workspace,
+    billingPricesPerPlan,
+    successUrlPath,
+    plan,
+    priceId,
+    requirePaymentMethod,
+  }: BillingPortalCheckoutSessionParameters): Promise<string> {
+    const frontBaseUrl = this.domainManagerService.buildWorkspaceURL({
+      subdomain: workspace.subdomain,
+    });
     const cancelUrl = frontBaseUrl.toString();
 
     if (successUrlPath) {
@@ -46,64 +58,115 @@ export class BillingPortalWorkspaceService {
       workspaceId: workspace.id,
     });
 
-    const stripeCustomerId = (
-      await this.billingSubscriptionRepository.findOneBy({
-        workspaceId: workspace.id,
-      })
-    )?.stripeCustomerId;
-
-    const session = await this.stripeService.createCheckoutSession(
-      user,
-      workspace.id,
-      priceId,
-      quantity,
-      successUrl,
-      cancelUrl,
-      stripeCustomerId,
-      plan,
-      requirePaymentMethod,
-    );
+    const subscription = await this.billingSubscriptionRepository.findOneBy({
+      workspaceId: workspace.id,
+    });
 
-    assert(session.url, 'Error: missing checkout.session.url');
+    const stripeCustomerId = subscription?.stripeCustomerId;
+    const isBillingPlansEnabled =
+      await this.featureFlagService.isFeatureEnabled(
+        FeatureFlagKey.IsBillingPlansEnabled,
+        workspace.id,
+      );
 
-    return session.url;
+    const stripeSubscriptionLineItems =
+      await this.getStripeSubscriptionLineItems({
+        quantity,
+        isBillingPlansEnabled,
+        billingPricesPerPlan,
+        priceId,
+      });
+
+    const checkoutSession =
+      await this.stripeCheckoutService.createCheckoutSession({
+        user,
+        workspaceId: workspace.id,
+        stripeSubscriptionLineItems,
+        successUrl,
+        cancelUrl,
+        stripeCustomerId,
+        plan,
+        requirePaymentMethod,
+        withTrialPeriod: !isDefined(subscription),
+        isBillingPlansEnabled,
+      });
+
+    assert(checkoutSession.url, 'Error: missing checkout.session.url');
+
+    return checkoutSession.url;
   }
 
   async computeBillingPortalSessionURLOrThrow(
-    workspaceId: string,
+    workspace: Workspace,
     returnUrlPath?: string,
   ) {
-    const currentSubscription =
-      await this.billingSubscriptionService.getCurrentBillingSubscriptionOrThrow(
-        {
-          workspaceId,
-        },
-      );
+    const lastSubscription = await this.billingSubscriptionRepository.findOne({
+      where: { workspaceId: workspace.id },
+      order: { createdAt: 'DESC' },
+    });
 
-    if (!currentSubscription) {
+    if (!lastSubscription) {
       throw new Error('Error: missing subscription');
     }
 
-    const stripeCustomerId = currentSubscription.stripeCustomerId;
+    const stripeCustomerId = lastSubscription.stripeCustomerId;
 
     if (!stripeCustomerId) {
       throw new Error('Error: missing stripeCustomerId');
     }
 
-    const frontBaseUrl = this.domainManagerService.getBaseUrl();
+    const frontBaseUrl = this.domainManagerService.buildWorkspaceURL({
+      subdomain: workspace.subdomain,
+    });
 
     if (returnUrlPath) {
       frontBaseUrl.pathname = returnUrlPath;
     }
     const returnUrl = frontBaseUrl.toString();
 
-    const session = await this.stripeService.createBillingPortalSession(
-      stripeCustomerId,
-      returnUrl,
-    );
+    const session =
+      await this.stripeBillingPortalService.createBillingPortalSession(
+        stripeCustomerId,
+        returnUrl,
+      );
 
     assert(session.url, 'Error: missing billingPortal.session.url');
 
     return session.url;
   }
+
+  private getStripeSubscriptionLineItems({
+    quantity,
+    isBillingPlansEnabled,
+    billingPricesPerPlan,
+    priceId,
+  }: {
+    quantity: number;
+    isBillingPlansEnabled: boolean;
+    billingPricesPerPlan?: BillingGetPricesPerPlanResult;
+    priceId?: string;
+  }): Stripe.Checkout.SessionCreateParams.LineItem[] {
+    if (isBillingPlansEnabled && billingPricesPerPlan) {
+      return [
+        {
+          price: billingPricesPerPlan.baseProductPrice.stripePriceId,
+          quantity,
+        },
+        ...billingPricesPerPlan.meteredProductsPrices.map((price) => ({
+          price: price.stripePriceId,
+        })),
+      ];
+    }
+
+    if (priceId && !isBillingPlansEnabled) {
+      return [{ price: priceId, quantity }];
+    }
+
+    throw new BillingException(
+      isBillingPlansEnabled
+        ? 'Missing Billing prices per plan'
+        : 'Missing price id',
+      BillingExceptionCode.BILLING_PRICE_NOT_FOUND,
+    );
+  }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription.service.ts b/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription.service.ts
index ce550fe3d92c..7378f3f8b22e 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/services/billing-subscription.service.ts
@@ -6,22 +6,35 @@ import assert from 'assert';
 import Stripe from 'stripe';
 import { Not, Repository } from 'typeorm';
 
+import {
+  BillingException,
+  BillingExceptionCode,
+} from 'src/engine/core-modules/billing/billing.exception';
 import { BillingEntitlement } from 'src/engine/core-modules/billing/entities/billing-entitlement.entity';
 import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
 import { AvailableProduct } from 'src/engine/core-modules/billing/enums/billing-available-product.enum';
 import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';
+import { BillingPlanKey } from 'src/engine/core-modules/billing/enums/billing-plan-key.enum';
 import { SubscriptionInterval } from 'src/engine/core-modules/billing/enums/billing-subscription-interval.enum';
 import { SubscriptionStatus } from 'src/engine/core-modules/billing/enums/billing-subscription-status.enum';
-import { StripeService } from 'src/engine/core-modules/billing/stripe/stripe.service';
+import { BillingPlanService } from 'src/engine/core-modules/billing/services/billing-plan.service';
+import { StripePriceService } from 'src/engine/core-modules/billing/stripe/services/stripe-price.service';
+import { StripeSubscriptionItemService } from 'src/engine/core-modules/billing/stripe/services/stripe-subscription-item.service';
+import { StripeSubscriptionService } from 'src/engine/core-modules/billing/stripe/services/stripe-subscription.service';
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
+import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-
 @Injectable()
 export class BillingSubscriptionService {
   protected readonly logger = new Logger(BillingSubscriptionService.name);
   constructor(
-    private readonly stripeService: StripeService,
+    private readonly stripeSubscriptionService: StripeSubscriptionService,
+    private readonly stripePriceService: StripePriceService,
+    private readonly stripeSubscriptionItemService: StripeSubscriptionItemService,
+    private readonly billingPlanService: BillingPlanService,
     private readonly environmentService: EnvironmentService,
+    private readonly featureFlagService: FeatureFlagService,
     @InjectRepository(BillingEntitlement, 'core')
     private readonly billingEntitlementRepository: Repository<BillingEntitlement>,
     @InjectRepository(BillingSubscription, 'core')
@@ -52,19 +65,37 @@ export class BillingSubscriptionService {
       'BILLING_STRIPE_BASE_PLAN_PRODUCT_ID',
     ),
   ) {
+    const isBillingPlansEnabled =
+      await this.featureFlagService.isFeatureEnabled(
+        FeatureFlagKey.IsBillingPlansEnabled,
+        workspaceId,
+      );
+
     const billingSubscription = await this.getCurrentBillingSubscriptionOrThrow(
       { workspaceId },
     );
 
+    const getStripeProductId = isBillingPlansEnabled
+      ? (await this.billingPlanService.getPlanBaseProduct(BillingPlanKey.PRO))
+          ?.stripeProductId
+      : stripeProductId;
+
+    if (!getStripeProductId) {
+      throw new BillingException(
+        'Base product not found',
+        BillingExceptionCode.BILLING_PRODUCT_NOT_FOUND,
+      );
+    }
+
     const billingSubscriptionItem =
       billingSubscription.billingSubscriptionItems.filter(
         (billingSubscriptionItem) =>
-          billingSubscriptionItem.stripeProductId === stripeProductId,
+          billingSubscriptionItem.stripeProductId === getStripeProductId,
       )?.[0];
 
     if (!billingSubscriptionItem) {
       throw new Error(
-        `Cannot find billingSubscriptionItem for product ${stripeProductId} for workspace ${workspaceId}`,
+        `Cannot find billingSubscriptionItem for product ${getStripeProductId} for workspace ${workspaceId}`,
       );
     }
 
@@ -78,7 +109,7 @@ export class BillingSubscriptionService {
       });
 
     if (subscriptionToCancel) {
-      await this.stripeService.cancelSubscription(
+      await this.stripeSubscriptionService.cancelSubscription(
         subscriptionToCancel.stripeSubscriptionId,
       );
       await this.billingSubscriptionRepository.delete(subscriptionToCancel.id);
@@ -91,10 +122,15 @@ export class BillingSubscriptionService {
     );
 
     if (billingSubscription?.status === 'unpaid') {
-      await this.stripeService.collectLastInvoice(
+      await this.stripeSubscriptionService.collectLastInvoice(
         billingSubscription.stripeSubscriptionId,
       );
     }
+
+    return {
+      handleUnpaidInvoiceStripeSubscriptionId:
+        billingSubscription.stripeSubscriptionId,
+    };
   }
 
   async getWorkspaceEntitlementByKey(
@@ -118,7 +154,11 @@ export class BillingSubscriptionService {
     const billingSubscription = await this.getCurrentBillingSubscriptionOrThrow(
       { workspaceId: workspace.id },
     );
-
+    const isBillingPlansEnabled =
+      await this.featureFlagService.isFeatureEnabled(
+        FeatureFlagKey.IsBillingPlansEnabled,
+        workspace.id,
+      );
     const newInterval =
       billingSubscription?.interval === SubscriptionInterval.Year
         ? SubscriptionInterval.Month
@@ -127,10 +167,29 @@ export class BillingSubscriptionService {
     const billingSubscriptionItem =
       await this.getCurrentBillingSubscriptionItemOrThrow(workspace.id);
 
-    const productPrice = await this.stripeService.getStripePrice(
-      AvailableProduct.BasePlan,
-      newInterval,
-    );
+    let productPrice;
+
+    if (isBillingPlansEnabled) {
+      const baseProduct = await this.billingPlanService.getPlanBaseProduct(
+        BillingPlanKey.PRO,
+      );
+
+      if (!baseProduct) {
+        throw new BillingException(
+          'Base product not found',
+          BillingExceptionCode.BILLING_PRODUCT_NOT_FOUND,
+        );
+      }
+
+      productPrice = baseProduct.billingPrices.find(
+        (price) => price.interval === newInterval,
+      );
+    } else {
+      productPrice = await this.stripePriceService.getStripePrice(
+        AvailableProduct.BasePlan,
+        newInterval,
+      );
+    }
 
     if (!productPrice) {
       throw new Error(
@@ -138,7 +197,7 @@ export class BillingSubscriptionService {
       );
     }
 
-    await this.stripeService.updateBillingSubscriptionItem(
+    await this.stripeSubscriptionItemService.updateBillingSubscriptionItem(
       billingSubscriptionItem,
       productPrice.stripePriceId,
     );
diff --git a/packages/twenty-server/src/engine/core-modules/billing/services/billing.service.ts b/packages/twenty-server/src/engine/core-modules/billing/services/billing.service.ts
index 647751987852..6e30b9f3c2df 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/services/billing.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/services/billing.service.ts
@@ -1,9 +1,11 @@
 import { Injectable, Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
 
 import { isDefined } from 'class-validator';
+import { Repository } from 'typeorm';
 
+import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
 import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';
-import { SubscriptionStatus } from 'src/engine/core-modules/billing/enums/billing-subscription-status.enum';
 import { BillingSubscriptionService } from 'src/engine/core-modules/billing/services/billing-subscription.service';
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
@@ -16,16 +18,15 @@ export class BillingService {
     private readonly environmentService: EnvironmentService,
     private readonly billingSubscriptionService: BillingSubscriptionService,
     private readonly isFeatureEnabledService: FeatureFlagService,
+    @InjectRepository(BillingSubscription, 'core')
+    private readonly billingSubscriptionRepository: Repository<BillingSubscription>,
   ) {}
 
   isBillingEnabled() {
     return this.environmentService.get('IS_BILLING_ENABLED');
   }
 
-  async hasWorkspaceActiveSubscriptionOrFreeAccessOrEntitlement(
-    workspaceId: string,
-    entitlementKey?: BillingEntitlementKey,
-  ) {
+  async hasWorkspaceSubscriptionOrFreeAccess(workspaceId: string) {
     const isBillingEnabled = this.isBillingEnabled();
 
     if (!isBillingEnabled) {
@@ -42,25 +43,36 @@ export class BillingService {
       return true;
     }
 
-    if (entitlementKey) {
-      return this.billingSubscriptionService.getWorkspaceEntitlementByKey(
-        workspaceId,
-        entitlementKey,
-      );
+    const subscription = await this.billingSubscriptionRepository.findOne({
+      where: { workspaceId },
+    });
+
+    return isDefined(subscription);
+  }
+
+  async hasFreeAccessOrEntitlement(
+    workspaceId: string,
+    entitlementKey: BillingEntitlementKey,
+  ) {
+    const isBillingEnabled = this.isBillingEnabled();
+
+    if (!isBillingEnabled) {
+      return true;
     }
 
-    const currentBillingSubscription =
-      await this.billingSubscriptionService.getCurrentBillingSubscriptionOrThrow(
-        { workspaceId },
+    const isFreeAccessEnabled =
+      await this.isFeatureEnabledService.isFeatureEnabled(
+        FeatureFlagKey.IsFreeAccessEnabled,
+        workspaceId,
       );
 
-    return (
-      isDefined(currentBillingSubscription) &&
-      [
-        SubscriptionStatus.Active,
-        SubscriptionStatus.Trialing,
-        SubscriptionStatus.PastDue,
-      ].includes(currentBillingSubscription.status)
+    if (isFreeAccessEnabled) {
+      return true;
+    }
+
+    return this.billingSubscriptionService.getWorkspaceEntitlementByKey(
+      workspaceId,
+      entitlementKey,
     );
   }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-billing-meter.service.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-billing-meter.service.ts
new file mode 100644
index 000000000000..e2b156e879be
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-billing-meter.service.ts
@@ -0,0 +1,34 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import Stripe from 'stripe';
+
+import { StripeSDKService } from 'src/engine/core-modules/billing/stripe/stripe-sdk/services/stripe-sdk.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+
+@Injectable()
+export class StripeBillingMeterService {
+  protected readonly logger = new Logger(StripeBillingMeterService.name);
+  private readonly stripe: Stripe;
+
+  constructor(
+    private readonly environmentService: EnvironmentService,
+    private readonly stripeSDKService: StripeSDKService,
+  ) {
+    if (!this.environmentService.get('IS_BILLING_ENABLED')) {
+      return;
+    }
+    this.stripe = this.stripeSDKService.getStripe(
+      this.environmentService.get('BILLING_STRIPE_API_KEY'),
+    );
+  }
+
+  async getMeter(stripeMeterId: string) {
+    return await this.stripe.billing.meters.retrieve(stripeMeterId);
+  }
+
+  async getAllMeters() {
+    const meters = await this.stripe.billing.meters.list();
+
+    return meters.data;
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-billing-portal.service.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-billing-portal.service.ts
new file mode 100644
index 000000000000..f899d8457db2
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-billing-portal.service.ts
@@ -0,0 +1,37 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import Stripe from 'stripe';
+
+import { StripeSDKService } from 'src/engine/core-modules/billing/stripe/stripe-sdk/services/stripe-sdk.service';
+import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+
+@Injectable()
+export class StripeBillingPortalService {
+  protected readonly logger = new Logger(StripeBillingPortalService.name);
+  private readonly stripe: Stripe;
+
+  constructor(
+    private readonly environmentService: EnvironmentService,
+    private readonly domainManagerService: DomainManagerService,
+    private readonly stripeSDKService: StripeSDKService,
+  ) {
+    if (!this.environmentService.get('IS_BILLING_ENABLED')) {
+      return;
+    }
+    this.stripe = this.stripeSDKService.getStripe(
+      this.environmentService.get('BILLING_STRIPE_API_KEY'),
+    );
+  }
+
+  async createBillingPortalSession(
+    stripeCustomerId: string,
+    returnUrl?: string,
+  ): Promise<Stripe.BillingPortal.Session> {
+    return await this.stripe.billingPortal.sessions.create({
+      customer: stripeCustomerId,
+      return_url:
+        returnUrl ?? this.domainManagerService.getBaseUrl().toString(),
+    });
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-checkout.service.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-checkout.service.ts
new file mode 100644
index 000000000000..82e23fab55bc
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-checkout.service.ts
@@ -0,0 +1,89 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import Stripe from 'stripe';
+
+import { BillingPlanKey } from 'src/engine/core-modules/billing/enums/billing-plan-key.enum';
+import { StripeSDKService } from 'src/engine/core-modules/billing/stripe/stripe-sdk/services/stripe-sdk.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+import { User } from 'src/engine/core-modules/user/user.entity';
+
+@Injectable()
+export class StripeCheckoutService {
+  protected readonly logger = new Logger(StripeCheckoutService.name);
+  private readonly stripe: Stripe;
+
+  constructor(
+    private readonly environmentService: EnvironmentService,
+    private readonly stripeSDKService: StripeSDKService,
+  ) {
+    if (!this.environmentService.get('IS_BILLING_ENABLED')) {
+      return;
+    }
+    this.stripe = this.stripeSDKService.getStripe(
+      this.environmentService.get('BILLING_STRIPE_API_KEY'),
+    );
+  }
+
+  async createCheckoutSession({
+    user,
+    workspaceId,
+    stripeSubscriptionLineItems,
+    successUrl,
+    cancelUrl,
+    stripeCustomerId,
+    plan = BillingPlanKey.PRO,
+    requirePaymentMethod = true,
+    withTrialPeriod,
+    isBillingPlansEnabled = false,
+  }: {
+    user: User;
+    workspaceId: string;
+    stripeSubscriptionLineItems: Stripe.Checkout.SessionCreateParams.LineItem[];
+    successUrl?: string;
+    cancelUrl?: string;
+    stripeCustomerId?: string;
+    plan?: BillingPlanKey;
+    requirePaymentMethod?: boolean;
+    withTrialPeriod: boolean;
+    isBillingPlansEnabled: boolean;
+  }): Promise<Stripe.Checkout.Session> {
+    return await this.stripe.checkout.sessions.create({
+      line_items: stripeSubscriptionLineItems,
+      mode: 'subscription',
+      subscription_data: {
+        metadata: {
+          workspaceId,
+          plan,
+        },
+        ...(withTrialPeriod
+          ? {
+              trial_period_days: this.environmentService.get(
+                requirePaymentMethod
+                  ? 'BILLING_FREE_TRIAL_WITH_CREDIT_CARD_DURATION_IN_DAYS'
+                  : 'BILLING_FREE_TRIAL_WITHOUT_CREDIT_CARD_DURATION_IN_DAYS',
+              ),
+              trial_settings: {
+                end_behavior: {
+                  missing_payment_method: isBillingPlansEnabled
+                    ? 'create_invoice'
+                    : 'pause',
+                },
+              },
+            }
+          : {}),
+      },
+      automatic_tax: { enabled: !!requirePaymentMethod },
+      tax_id_collection: { enabled: !!requirePaymentMethod },
+      customer: stripeCustomerId,
+      customer_update: stripeCustomerId
+        ? { name: 'auto', address: 'auto' }
+        : undefined,
+      customer_email: stripeCustomerId ? undefined : user.email,
+      success_url: successUrl,
+      cancel_url: cancelUrl,
+      payment_method_collection: requirePaymentMethod
+        ? 'always'
+        : 'if_required',
+    });
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-customer.service.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-customer.service.ts
new file mode 100644
index 000000000000..e8ab972d011e
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-customer.service.ts
@@ -0,0 +1,33 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import Stripe from 'stripe';
+
+import { StripeSDKService } from 'src/engine/core-modules/billing/stripe/stripe-sdk/services/stripe-sdk.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+
+@Injectable()
+export class StripeCustomerService {
+  protected readonly logger = new Logger(StripeCustomerService.name);
+  private readonly stripe: Stripe;
+
+  constructor(
+    private readonly environmentService: EnvironmentService,
+    private readonly stripeSDKService: StripeSDKService,
+  ) {
+    if (!this.environmentService.get('IS_BILLING_ENABLED')) {
+      return;
+    }
+    this.stripe = this.stripeSDKService.getStripe(
+      this.environmentService.get('BILLING_STRIPE_API_KEY'),
+    );
+  }
+
+  async updateCustomerMetadataWorkspaceId(
+    stripeCustomerId: string,
+    workspaceId: string,
+  ) {
+    await this.stripe.customers.update(stripeCustomerId, {
+      metadata: { workspaceId: workspaceId },
+    });
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-price.service.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-price.service.ts
new file mode 100644
index 000000000000..01a3c8d12d8c
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-price.service.ts
@@ -0,0 +1,87 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import Stripe from 'stripe';
+
+import { BillingProductPriceDTO } from 'src/engine/core-modules/billing/dtos/billing-product-price.dto';
+import { AvailableProduct } from 'src/engine/core-modules/billing/enums/billing-available-product.enum';
+import { StripeSDKService } from 'src/engine/core-modules/billing/stripe/stripe-sdk/services/stripe-sdk.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+
+@Injectable()
+export class StripePriceService {
+  protected readonly logger = new Logger(StripePriceService.name);
+  private readonly stripe: Stripe;
+
+  constructor(
+    private readonly environmentService: EnvironmentService,
+    private readonly stripeSDKService: StripeSDKService,
+  ) {
+    if (!this.environmentService.get('IS_BILLING_ENABLED')) {
+      return;
+    }
+    this.stripe = this.stripeSDKService.getStripe(
+      this.environmentService.get('BILLING_STRIPE_API_KEY'),
+    );
+  }
+
+  async getStripePrices(product: AvailableProduct) {
+    const stripeProductId = this.getStripeProductId(product);
+
+    const prices = await this.stripe.prices.search({
+      query: `product: '${stripeProductId}'`,
+    });
+
+    return this.formatProductPrices(prices.data);
+  }
+
+  async getStripePrice(product: AvailableProduct, recurringInterval: string) {
+    const productPrices = await this.getStripePrices(product);
+
+    return productPrices.find(
+      (price) => price.recurringInterval === recurringInterval,
+    );
+  }
+
+  getStripeProductId(product: AvailableProduct) {
+    if (product === AvailableProduct.BasePlan) {
+      return this.environmentService.get('BILLING_STRIPE_BASE_PLAN_PRODUCT_ID');
+    }
+  }
+
+  formatProductPrices(prices: Stripe.Price[]): BillingProductPriceDTO[] {
+    const productPrices: BillingProductPriceDTO[] = Object.values(
+      prices
+        .filter((item) => item.recurring?.interval && item.unit_amount)
+        .reduce((acc, item: Stripe.Price) => {
+          const interval = item.recurring?.interval;
+
+          if (!interval || !item.unit_amount) {
+            return acc;
+          }
+
+          if (!acc[interval] || item.created > acc[interval].created) {
+            acc[interval] = {
+              unitAmount: item.unit_amount,
+              recurringInterval: interval,
+              created: item.created,
+              stripePriceId: item.id,
+            };
+          }
+
+          return acc satisfies Record<string, BillingProductPriceDTO>;
+        }, {}),
+    );
+
+    return productPrices.sort((a, b) => a.unitAmount - b.unitAmount);
+  }
+
+  async getPricesByProductId(productId: string) {
+    const prices = await this.stripe.prices.list({
+      product: productId,
+      type: 'recurring',
+      expand: ['data.currency_options', 'data.tiers'],
+    });
+
+    return prices.data;
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-product.service.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-product.service.ts
new file mode 100644
index 000000000000..c9fd5526c5a4
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-product.service.ts
@@ -0,0 +1,33 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import Stripe from 'stripe';
+
+import { StripeSDKService } from 'src/engine/core-modules/billing/stripe/stripe-sdk/services/stripe-sdk.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+
+@Injectable()
+export class StripeProductService {
+  protected readonly logger = new Logger(StripeProductService.name);
+  private readonly stripe: Stripe;
+
+  constructor(
+    private readonly environmentService: EnvironmentService,
+    private readonly stripeSDKService: StripeSDKService,
+  ) {
+    if (!this.environmentService.get('IS_BILLING_ENABLED')) {
+      return;
+    }
+    this.stripe = this.stripeSDKService.getStripe(
+      this.environmentService.get('BILLING_STRIPE_API_KEY'),
+    );
+  }
+
+  async getAllProducts() {
+    const products = await this.stripe.products.list({
+      active: true,
+      limit: 100,
+    });
+
+    return products.data;
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-subscription-item.service.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-subscription-item.service.ts
new file mode 100644
index 000000000000..3b0c4029e827
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-subscription-item.service.ts
@@ -0,0 +1,45 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import Stripe from 'stripe';
+
+import { BillingSubscriptionItem } from 'src/engine/core-modules/billing/entities/billing-subscription-item.entity';
+import { StripeSDKService } from 'src/engine/core-modules/billing/stripe/stripe-sdk/services/stripe-sdk.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+
+@Injectable()
+export class StripeSubscriptionItemService {
+  protected readonly logger = new Logger(StripeSubscriptionItemService.name);
+  private readonly stripe: Stripe;
+
+  constructor(
+    private readonly environmentService: EnvironmentService,
+    private readonly stripeSDKService: StripeSDKService,
+  ) {
+    if (!this.environmentService.get('IS_BILLING_ENABLED')) {
+      return;
+    }
+    this.stripe = this.stripeSDKService.getStripe(
+      this.environmentService.get('BILLING_STRIPE_API_KEY'),
+    );
+  }
+
+  async updateSubscriptionItem(stripeItemId: string, quantity: number) {
+    await this.stripe.subscriptionItems.update(stripeItemId, { quantity });
+  }
+
+  async updateBillingSubscriptionItem(
+    stripeSubscriptionItem: BillingSubscriptionItem,
+    stripePriceId: string,
+  ) {
+    await this.stripe.subscriptionItems.update(
+      stripeSubscriptionItem.stripeSubscriptionItemId,
+      {
+        price: stripePriceId,
+        quantity:
+          stripeSubscriptionItem.quantity === null
+            ? undefined
+            : stripeSubscriptionItem.quantity,
+      },
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-subscription.service.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-subscription.service.ts
new file mode 100644
index 000000000000..686aafe479cc
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-subscription.service.ts
@@ -0,0 +1,59 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import Stripe from 'stripe';
+
+import { StripeSDKService } from 'src/engine/core-modules/billing/stripe/stripe-sdk/services/stripe-sdk.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+
+@Injectable()
+export class StripeSubscriptionService {
+  protected readonly logger = new Logger(StripeSubscriptionService.name);
+  private readonly stripe: Stripe;
+
+  constructor(
+    private readonly environmentService: EnvironmentService,
+    private readonly stripeSDKService: StripeSDKService,
+  ) {
+    if (!this.environmentService.get('IS_BILLING_ENABLED')) {
+      return;
+    }
+    this.stripe = this.stripeSDKService.getStripe(
+      this.environmentService.get('BILLING_STRIPE_API_KEY'),
+    );
+  }
+
+  async cancelSubscription(stripeSubscriptionId: string) {
+    await this.stripe.subscriptions.cancel(stripeSubscriptionId);
+  }
+
+  async getStripeCustomerIdFromWorkspaceId(workspaceId: string) {
+    const subscription = await this.stripe.subscriptions.search({
+      query: `metadata['workspaceId']:'${workspaceId}'`,
+      limit: 1,
+    });
+    const stripeCustomerId = subscription.data[0].customer
+      ? String(subscription.data[0].customer)
+      : undefined;
+
+    return stripeCustomerId;
+  }
+
+  async collectLastInvoice(stripeSubscriptionId: string) {
+    const subscription = await this.stripe.subscriptions.retrieve(
+      stripeSubscriptionId,
+      { expand: ['latest_invoice'] },
+    );
+    const latestInvoice = subscription.latest_invoice;
+
+    if (
+      !(
+        latestInvoice &&
+        typeof latestInvoice !== 'string' &&
+        latestInvoice.status === 'draft'
+      )
+    ) {
+      return;
+    }
+    await this.stripe.invoices.pay(latestInvoice.id);
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-webhook.service.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-webhook.service.ts
new file mode 100644
index 000000000000..bc218a704996
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/services/stripe-webhook.service.ts
@@ -0,0 +1,37 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import Stripe from 'stripe';
+
+import { StripeSDKService } from 'src/engine/core-modules/billing/stripe/stripe-sdk/services/stripe-sdk.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+@Injectable()
+export class StripeWebhookService {
+  protected readonly logger = new Logger(StripeWebhookService.name);
+  private stripe: Stripe;
+
+  constructor(
+    private readonly environmentService: EnvironmentService,
+    private readonly stripeSDKService: StripeSDKService,
+  ) {
+    if (!this.environmentService.get('IS_BILLING_ENABLED')) {
+      return;
+    }
+    this.stripe = this.stripeSDKService.getStripe(
+      this.environmentService.get('BILLING_STRIPE_API_KEY'),
+    );
+  }
+
+  constructEventFromPayload(signature: string, payload: Buffer) {
+    const webhookSecret = this.environmentService.get(
+      'BILLING_STRIPE_WEBHOOK_SECRET',
+    );
+
+    const returnValue = this.stripe.webhooks.constructEvent(
+      payload,
+      signature,
+      webhookSecret,
+    );
+
+    return returnValue;
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe-sdk/mocks/stripe-sdk-mock.service.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe-sdk/mocks/stripe-sdk-mock.service.ts
new file mode 100644
index 000000000000..e26bb3cd952b
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe-sdk/mocks/stripe-sdk-mock.service.ts
@@ -0,0 +1,13 @@
+import { Injectable } from '@nestjs/common';
+
+import Stripe from 'stripe';
+
+import { StripeSDKMock } from 'src/engine/core-modules/billing/stripe/stripe-sdk/mocks/stripe-sdk.mock';
+import { StripeSDKService } from 'src/engine/core-modules/billing/stripe/stripe-sdk/services/stripe-sdk.service';
+
+@Injectable()
+export class StripeSDKMockService implements StripeSDKService {
+  getStripe(stripeApiKey: string) {
+    return new StripeSDKMock(stripeApiKey) as unknown as Stripe;
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe-sdk/mocks/stripe-sdk.mock.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe-sdk/mocks/stripe-sdk.mock.ts
new file mode 100644
index 000000000000..719cb87fa49e
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe-sdk/mocks/stripe-sdk.mock.ts
@@ -0,0 +1,29 @@
+import Stripe from 'stripe';
+
+export class StripeSDKMock {
+  constructor(private readonly apiKey: string) {}
+
+  customers = {
+    update: (_id: string, _params?: Stripe.CustomerUpdateParams) => {
+      return;
+    },
+  };
+
+  webhooks = {
+    constructEvent: (
+      payload: Buffer,
+      signature: string,
+      _webhookSecret: string,
+    ) => {
+      if (signature === 'correct-signature') {
+        const body = JSON.parse(payload.toString());
+
+        return {
+          type: body.type,
+          data: body.data,
+        };
+      }
+      throw new Error('Invalid signature');
+    },
+  };
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe-sdk/services/stripe-sdk.service.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe-sdk/services/stripe-sdk.service.ts
new file mode 100644
index 000000000000..a8b95dc5196d
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe-sdk/services/stripe-sdk.service.ts
@@ -0,0 +1,10 @@
+import { Injectable } from '@nestjs/common';
+
+import Stripe from 'stripe';
+
+@Injectable()
+export class StripeSDKService {
+  getStripe(stripeApiKey: string) {
+    return new Stripe(stripeApiKey, {});
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe-sdk/stripe-sdk.module.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe-sdk/stripe-sdk.module.ts
new file mode 100644
index 000000000000..5256a28cf27c
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe-sdk/stripe-sdk.module.ts
@@ -0,0 +1,9 @@
+import { Module } from '@nestjs/common';
+
+import { StripeSDKService } from 'src/engine/core-modules/billing/stripe/stripe-sdk/services/stripe-sdk.service';
+
+@Module({
+  providers: [StripeSDKService],
+  exports: [StripeSDKService],
+})
+export class StripeSDKModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.module.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.module.ts
index f85a8930fe64..c7e2dfca4df3 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.module.ts
@@ -1,11 +1,40 @@
 import { Module } from '@nestjs/common';
 
-import { StripeService } from 'src/engine/core-modules/billing/stripe/stripe.service';
+import { StripeBillingMeterService } from 'src/engine/core-modules/billing/stripe/services/stripe-billing-meter.service';
+import { StripeBillingPortalService } from 'src/engine/core-modules/billing/stripe/services/stripe-billing-portal.service';
+import { StripeCheckoutService } from 'src/engine/core-modules/billing/stripe/services/stripe-checkout.service';
+import { StripeCustomerService } from 'src/engine/core-modules/billing/stripe/services/stripe-customer.service';
+import { StripePriceService } from 'src/engine/core-modules/billing/stripe/services/stripe-price.service';
+import { StripeProductService } from 'src/engine/core-modules/billing/stripe/services/stripe-product.service';
+import { StripeSubscriptionItemService } from 'src/engine/core-modules/billing/stripe/services/stripe-subscription-item.service';
+import { StripeSubscriptionService } from 'src/engine/core-modules/billing/stripe/services/stripe-subscription.service';
+import { StripeWebhookService } from 'src/engine/core-modules/billing/stripe/services/stripe-webhook.service';
+import { StripeSDKModule } from 'src/engine/core-modules/billing/stripe/stripe-sdk/stripe-sdk.module';
 import { DomainManagerModule } from 'src/engine/core-modules/domain-manager/domain-manager.module';
 
 @Module({
-  imports: [DomainManagerModule],
-  providers: [StripeService],
-  exports: [StripeService],
+  imports: [DomainManagerModule, StripeSDKModule],
+  providers: [
+    StripeSubscriptionItemService,
+    StripeWebhookService,
+    StripeCheckoutService,
+    StripeSubscriptionService,
+    StripeBillingPortalService,
+    StripeBillingMeterService,
+    StripeCustomerService,
+    StripePriceService,
+    StripeProductService,
+  ],
+  exports: [
+    StripeWebhookService,
+    StripeBillingPortalService,
+    StripeBillingMeterService,
+    StripeCustomerService,
+    StripePriceService,
+    StripeCheckoutService,
+    StripeSubscriptionItemService,
+    StripeSubscriptionService,
+    StripeProductService,
+  ],
 })
 export class StripeModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.service.ts b/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.service.ts
deleted file mode 100644
index ae44628c22fc..000000000000
--- a/packages/twenty-server/src/engine/core-modules/billing/stripe/stripe.service.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-import { Injectable, Logger } from '@nestjs/common';
-
-import Stripe from 'stripe';
-
-import { ProductPriceEntity } from 'src/engine/core-modules/billing/dto/product-price.entity';
-import { BillingSubscriptionItem } from 'src/engine/core-modules/billing/entities/billing-subscription-item.entity';
-import { AvailableProduct } from 'src/engine/core-modules/billing/enums/billing-available-product.enum';
-import { BillingPlanKey } from 'src/engine/core-modules/billing/enums/billing-plan-key.enum';
-import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
-import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { User } from 'src/engine/core-modules/user/user.entity';
-
-@Injectable()
-export class StripeService {
-  protected readonly logger = new Logger(StripeService.name);
-  private readonly stripe: Stripe;
-
-  constructor(
-    private readonly environmentService: EnvironmentService,
-    private readonly domainManagerService: DomainManagerService,
-  ) {
-    if (!this.environmentService.get('IS_BILLING_ENABLED')) {
-      return;
-    }
-    this.stripe = new Stripe(
-      this.environmentService.get('BILLING_STRIPE_API_KEY'),
-      {},
-    );
-  }
-
-  constructEventFromPayload(signature: string, payload: Buffer) {
-    const webhookSecret = this.environmentService.get(
-      'BILLING_STRIPE_WEBHOOK_SECRET',
-    );
-
-    return this.stripe.webhooks.constructEvent(
-      payload,
-      signature,
-      webhookSecret,
-    );
-  }
-
-  async getStripePrices(product: AvailableProduct) {
-    const stripeProductId = this.getStripeProductId(product);
-
-    const prices = await this.stripe.prices.search({
-      query: `product: '${stripeProductId}'`,
-    });
-
-    return this.formatProductPrices(prices.data);
-  }
-
-  async getStripePrice(product: AvailableProduct, recurringInterval: string) {
-    const productPrices = await this.getStripePrices(product);
-
-    return productPrices.find(
-      (price) => price.recurringInterval === recurringInterval,
-    );
-  }
-
-  getStripeProductId(product: AvailableProduct) {
-    if (product === AvailableProduct.BasePlan) {
-      return this.environmentService.get('BILLING_STRIPE_BASE_PLAN_PRODUCT_ID');
-    }
-  }
-
-  async updateSubscriptionItem(stripeItemId: string, quantity: number) {
-    await this.stripe.subscriptionItems.update(stripeItemId, { quantity });
-  }
-
-  async cancelSubscription(stripeSubscriptionId: string) {
-    await this.stripe.subscriptions.cancel(stripeSubscriptionId);
-  }
-
-  async createBillingPortalSession(
-    stripeCustomerId: string,
-    returnUrl?: string,
-  ): Promise<Stripe.BillingPortal.Session> {
-    return await this.stripe.billingPortal.sessions.create({
-      customer: stripeCustomerId,
-      return_url:
-        returnUrl ?? this.domainManagerService.getBaseUrl().toString(),
-    });
-  }
-
-  async createCheckoutSession(
-    user: User,
-    workspaceId: string,
-    priceId: string,
-    quantity: number,
-    successUrl?: string,
-    cancelUrl?: string,
-    stripeCustomerId?: string,
-    plan: BillingPlanKey = BillingPlanKey.PRO,
-    requirePaymentMethod = true,
-  ): Promise<Stripe.Checkout.Session> {
-    return await this.stripe.checkout.sessions.create({
-      line_items: [
-        {
-          price: priceId,
-          quantity,
-        },
-      ],
-      mode: 'subscription',
-      subscription_data: {
-        metadata: {
-          workspaceId,
-          plan,
-        },
-        trial_period_days: this.environmentService.get(
-          'BILLING_FREE_TRIAL_DURATION_IN_DAYS',
-        ),
-      },
-      automatic_tax: { enabled: !!requirePaymentMethod },
-      tax_id_collection: { enabled: !!requirePaymentMethod },
-      customer: stripeCustomerId,
-      customer_update: stripeCustomerId ? { name: 'auto' } : undefined,
-      customer_email: stripeCustomerId ? undefined : user.email,
-      success_url: successUrl,
-      cancel_url: cancelUrl,
-      payment_method_collection: requirePaymentMethod
-        ? 'always'
-        : 'if_required',
-    });
-  }
-
-  async collectLastInvoice(stripeSubscriptionId: string) {
-    const subscription = await this.stripe.subscriptions.retrieve(
-      stripeSubscriptionId,
-      { expand: ['latest_invoice'] },
-    );
-    const latestInvoice = subscription.latest_invoice;
-
-    if (
-      !(
-        latestInvoice &&
-        typeof latestInvoice !== 'string' &&
-        latestInvoice.status === 'draft'
-      )
-    ) {
-      return;
-    }
-    await this.stripe.invoices.pay(latestInvoice.id);
-  }
-
-  async updateBillingSubscriptionItem(
-    stripeSubscriptionItem: BillingSubscriptionItem,
-    stripePriceId: string,
-  ) {
-    await this.stripe.subscriptionItems.update(
-      stripeSubscriptionItem.stripeSubscriptionItemId,
-      {
-        price: stripePriceId,
-        quantity:
-          stripeSubscriptionItem.quantity === null
-            ? undefined
-            : stripeSubscriptionItem.quantity,
-      },
-    );
-  }
-
-  async updateCustomerMetadataWorkspaceId(
-    stripeCustomerId: string,
-    workspaceId: string,
-  ) {
-    await this.stripe.customers.update(stripeCustomerId, {
-      metadata: { workspaceId: workspaceId },
-    });
-  }
-
-  async getMeter(stripeMeterId: string) {
-    return await this.stripe.billing.meters.retrieve(stripeMeterId);
-  }
-
-  formatProductPrices(prices: Stripe.Price[]): ProductPriceEntity[] {
-    const productPrices: ProductPriceEntity[] = Object.values(
-      prices
-        .filter((item) => item.recurring?.interval && item.unit_amount)
-        .reduce((acc, item: Stripe.Price) => {
-          const interval = item.recurring?.interval;
-
-          if (!interval || !item.unit_amount) {
-            return acc;
-          }
-
-          if (!acc[interval] || item.created > acc[interval].created) {
-            acc[interval] = {
-              unitAmount: item.unit_amount,
-              recurringInterval: interval,
-              created: item.created,
-              stripePriceId: item.id,
-            };
-          }
-
-          return acc satisfies Record<string, ProductPriceEntity>;
-        }, {}),
-    );
-
-    return productPrices.sort((a, b) => a.unitAmount - b.unitAmount);
-  }
-
-  async getStripeCustomerIdFromWorkspaceId(workspaceId: string) {
-    const subscription = await this.stripe.subscriptions.search({
-      query: `metadata['workspaceId']:'${workspaceId}'`,
-      limit: 1,
-    });
-    const stripeCustomerId = subscription.data[0].customer
-      ? String(subscription.data[0].customer)
-      : undefined;
-
-    return stripeCustomerId;
-  }
-
-  async getAllProducts() {
-    const products = await this.stripe.products.list();
-
-    return products.data;
-  }
-
-  async getPricesByProductId(productId: string) {
-    const prices = await this.stripe.prices.search({
-      query: `product:'${productId}'`,
-    });
-
-    return prices.data;
-  }
-
-  async getAllMeters() {
-    const meters = await this.stripe.billing.meters.list();
-
-    return meters.data;
-  }
-}
diff --git a/packages/twenty-server/src/engine/core-modules/billing/types/billing-get-plan-result.type.ts b/packages/twenty-server/src/engine/core-modules/billing/types/billing-get-plan-result.type.ts
new file mode 100644
index 000000000000..3505e094d5f9
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/types/billing-get-plan-result.type.ts
@@ -0,0 +1,9 @@
+import { BillingProduct } from 'src/engine/core-modules/billing/entities/billing-product.entity';
+import { BillingPlanKey } from 'src/engine/core-modules/billing/enums/billing-plan-key.enum';
+
+export type BillingGetPlanResult = {
+  planKey: BillingPlanKey;
+  baseProduct: BillingProduct;
+  meteredProducts: BillingProduct[];
+  otherLicensedProducts: BillingProduct[];
+};
diff --git a/packages/twenty-server/src/engine/core-modules/billing/types/billing-get-prices-per-plan-result.type.ts b/packages/twenty-server/src/engine/core-modules/billing/types/billing-get-prices-per-plan-result.type.ts
new file mode 100644
index 000000000000..cf3b613a14fa
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/types/billing-get-prices-per-plan-result.type.ts
@@ -0,0 +1,7 @@
+import { BillingPrice } from 'src/engine/core-modules/billing/entities/billing-price.entity';
+
+export type BillingGetPricesPerPlanResult = {
+  baseProductPrice: BillingPrice;
+  meteredProductsPrices: BillingPrice[];
+  otherLicensedProductsPrices: BillingPrice[];
+};
diff --git a/packages/twenty-server/src/engine/core-modules/billing/types/billing-portal-checkout-session-parameters.type.ts b/packages/twenty-server/src/engine/core-modules/billing/types/billing-portal-checkout-session-parameters.type.ts
new file mode 100644
index 000000000000..cafcbc7554dc
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/types/billing-portal-checkout-session-parameters.type.ts
@@ -0,0 +1,14 @@
+import { BillingPlanKey } from 'src/engine/core-modules/billing/enums/billing-plan-key.enum';
+import { BillingGetPricesPerPlanResult } from 'src/engine/core-modules/billing/types/billing-get-prices-per-plan-result.type';
+import { User } from 'src/engine/core-modules/user/user.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+
+export type BillingPortalCheckoutSessionParameters = {
+  user: User;
+  workspace: Workspace;
+  billingPricesPerPlan?: BillingGetPricesPerPlanResult;
+  successUrlPath?: string;
+  plan: BillingPlanKey;
+  priceId?: string;
+  requirePaymentMethod?: boolean;
+};
diff --git a/packages/twenty-server/src/engine/core-modules/billing/types/billing-product-metadata.type.ts b/packages/twenty-server/src/engine/core-modules/billing/types/billing-product-metadata.type.ts
index 39245f0aeee0..382e22fa69fd 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/types/billing-product-metadata.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/types/billing-product-metadata.type.ts
@@ -5,6 +5,7 @@ export type BillingProductMetadata =
   | {
       planKey: BillingPlanKey;
       priceUsageBased: BillingUsageType;
+      isBaseProduct: 'true' | 'false';
       [key: string]: string;
     }
   | Record<string, never>;
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/format-database-product-to-graphql-dto.util.spec.ts b/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/format-database-product-to-graphql-dto.util.spec.ts
new file mode 100644
index 000000000000..75a049a5fffd
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/format-database-product-to-graphql-dto.util.spec.ts
@@ -0,0 +1,224 @@
+import { BillingPlanKey } from 'src/engine/core-modules/billing/enums/billing-plan-key.enum';
+import { BillingPriceTiersMode } from 'src/engine/core-modules/billing/enums/billing-price-tiers-mode.enum';
+import { SubscriptionInterval } from 'src/engine/core-modules/billing/enums/billing-subscription-interval.enum';
+import { BillingUsageType } from 'src/engine/core-modules/billing/enums/billing-usage-type.enum';
+import { BillingGetPlanResult } from 'src/engine/core-modules/billing/types/billing-get-plan-result.type';
+import { formatBillingDatabaseProductToGraphqlDTO } from 'src/engine/core-modules/billing/utils/format-database-product-to-graphql-dto.util';
+
+describe('formatBillingDatabaseProductToGraphqlDTO', () => {
+  it('should format a complete billing plan correctly', () => {
+    const mockPlan = {
+      planKey: BillingPlanKey.PRO,
+      baseProduct: {
+        id: 'base-1',
+        name: 'Base Product',
+        billingPrices: [
+          {
+            interval: SubscriptionInterval.Month,
+            unitAmount: 1000,
+            stripePriceId: 'price_base1',
+          },
+        ],
+      },
+      otherLicensedProducts: [
+        {
+          id: 'licensed-1',
+          name: 'Licensed Product',
+          billingPrices: [
+            {
+              interval: SubscriptionInterval.Year,
+              unitAmount: 2000,
+              stripePriceId: 'price_licensed1',
+            },
+          ],
+        },
+      ],
+      meteredProducts: [
+        {
+          id: 'metered-1',
+          name: 'Metered Product',
+          billingPrices: [
+            {
+              interval: SubscriptionInterval.Month,
+              tiersMode: BillingPriceTiersMode.GRADUATED,
+              tiers: [
+                {
+                  up_to: 10,
+                  flat_amount: 1000,
+                  unit_amount: 100,
+                },
+              ],
+              stripePriceId: 'price_metered1',
+            },
+          ],
+        },
+      ],
+    };
+
+    const result = formatBillingDatabaseProductToGraphqlDTO(
+      mockPlan as unknown as BillingGetPlanResult,
+    );
+
+    expect(result).toEqual({
+      planKey: BillingPlanKey.PRO,
+      baseProduct: {
+        id: 'base-1',
+        name: 'Base Product',
+        billingPrices: [
+          {
+            interval: SubscriptionInterval.Month,
+            unitAmount: 1000,
+            stripePriceId: 'price_base1',
+          },
+        ],
+        type: BillingUsageType.LICENSED,
+        prices: [
+          {
+            recurringInterval: SubscriptionInterval.Month,
+            unitAmount: 1000,
+            stripePriceId: 'price_base1',
+          },
+        ],
+      },
+      otherLicensedProducts: [
+        {
+          id: 'licensed-1',
+          name: 'Licensed Product',
+          billingPrices: [
+            {
+              interval: SubscriptionInterval.Year,
+              unitAmount: 2000,
+              stripePriceId: 'price_licensed1',
+            },
+          ],
+          type: BillingUsageType.LICENSED,
+          prices: [
+            {
+              recurringInterval: SubscriptionInterval.Year,
+              unitAmount: 2000,
+              stripePriceId: 'price_licensed1',
+            },
+          ],
+        },
+      ],
+      meteredProducts: [
+        {
+          id: 'metered-1',
+          name: 'Metered Product',
+          billingPrices: [
+            {
+              interval: SubscriptionInterval.Month,
+              tiersMode: BillingPriceTiersMode.GRADUATED,
+              tiers: [
+                {
+                  up_to: 10,
+                  flat_amount: 1000,
+                  unit_amount: 100,
+                },
+              ],
+              stripePriceId: 'price_metered1',
+            },
+          ],
+          type: BillingUsageType.METERED,
+          prices: [
+            {
+              tiersMode: BillingPriceTiersMode.GRADUATED,
+              tiers: [
+                {
+                  upTo: 10,
+                  flatAmount: 1000,
+                  unitAmount: 100,
+                },
+              ],
+              recurringInterval: SubscriptionInterval.Month,
+              stripePriceId: 'price_metered1',
+            },
+          ],
+        },
+      ],
+    });
+  });
+
+  it('should handle empty products and null values', () => {
+    const mockPlan = {
+      planKey: 'empty-plan',
+      baseProduct: {
+        id: 'base-1',
+        name: 'Base Product',
+        billingPrices: [
+          {
+            interval: null,
+            unitAmount: null,
+            stripePriceId: null,
+          },
+        ],
+      },
+      otherLicensedProducts: [],
+      meteredProducts: [
+        {
+          id: 'metered-1',
+          name: 'Metered Product',
+          billingPrices: [
+            {
+              interval: null,
+              tiersMode: null,
+              tiers: null,
+              stripePriceId: null,
+            },
+          ],
+        },
+      ],
+    };
+
+    const result = formatBillingDatabaseProductToGraphqlDTO(
+      mockPlan as unknown as BillingGetPlanResult,
+    );
+
+    expect(result).toEqual({
+      planKey: 'empty-plan',
+      baseProduct: {
+        id: 'base-1',
+        name: 'Base Product',
+        billingPrices: [
+          {
+            interval: null,
+            unitAmount: null,
+            stripePriceId: null,
+          },
+        ],
+        type: BillingUsageType.LICENSED,
+        prices: [
+          {
+            recurringInterval: SubscriptionInterval.Month,
+            unitAmount: 0,
+            stripePriceId: null,
+          },
+        ],
+      },
+      otherLicensedProducts: [],
+      meteredProducts: [
+        {
+          id: 'metered-1',
+          name: 'Metered Product',
+          billingPrices: [
+            {
+              interval: null,
+              tiersMode: null,
+              tiers: null,
+              stripePriceId: null,
+            },
+          ],
+          type: BillingUsageType.METERED,
+          prices: [
+            {
+              tiersMode: null,
+              tiers: [],
+              recurringInterval: SubscriptionInterval.Month,
+              stripePriceId: null,
+            },
+          ],
+        },
+      ],
+    });
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/is-stripe-valid-product-metadata.util.spec.ts b/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/is-stripe-valid-product-metadata.util.spec.ts
new file mode 100644
index 000000000000..b2cf6741517b
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/is-stripe-valid-product-metadata.util.spec.ts
@@ -0,0 +1,60 @@
+import Stripe from 'stripe';
+
+import { BillingPlanKey } from 'src/engine/core-modules/billing/enums/billing-plan-key.enum';
+import { BillingUsageType } from 'src/engine/core-modules/billing/enums/billing-usage-type.enum';
+import { isStripeValidProductMetadata } from 'src/engine/core-modules/billing/utils/is-stripe-valid-product-metadata.util';
+describe('isStripeValidProductMetadata', () => {
+  it('should return true if metadata is empty', () => {
+    const metadata: Stripe.Metadata = {};
+
+    expect(isStripeValidProductMetadata(metadata)).toBe(true);
+  });
+  it('should return true if metadata has the correct keys with correct values', () => {
+    const metadata: Stripe.Metadata = {
+      planKey: BillingPlanKey.PRO,
+      priceUsageBased: BillingUsageType.METERED,
+      isBaseProduct: 'true',
+    };
+
+    expect(isStripeValidProductMetadata(metadata)).toBe(true);
+  });
+
+  it('should return true if metadata has extra keys', () => {
+    const metadata: Stripe.Metadata = {
+      planKey: BillingPlanKey.ENTERPRISE,
+      priceUsageBased: BillingUsageType.METERED,
+      isBaseProduct: 'false',
+      randomKey: 'randomValue',
+    };
+
+    expect(isStripeValidProductMetadata(metadata)).toBe(true);
+  });
+
+  it('should return false if metadata has invalid keys', () => {
+    const metadata: Stripe.Metadata = {
+      planKey: 'invalid',
+      priceUsageBased: BillingUsageType.METERED,
+      isBaseProduct: 'invalid',
+    };
+
+    expect(isStripeValidProductMetadata(metadata)).toBe(false);
+  });
+
+  it('should return false if metadata has invalid values', () => {
+    const metadata: Stripe.Metadata = {
+      planKey: BillingPlanKey.PRO,
+      priceUsageBased: 'invalid',
+      isBaseProduct: 'true',
+    };
+
+    expect(isStripeValidProductMetadata(metadata)).toBe(false);
+  });
+
+  it('should return false if the metadata does not have the required keys', () => {
+    const metadata: Stripe.Metadata = {
+      randomKey: 'randomValue',
+    };
+
+    expect(isStripeValidProductMetadata(metadata)).toBe(false);
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/transform-stripe-meter-to-database-meter.util.spec.ts b/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/transform-stripe-meter-to-database-meter.util.spec.ts
new file mode 100644
index 000000000000..30d84cc9102b
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/transform-stripe-meter-to-database-meter.util.spec.ts
@@ -0,0 +1,94 @@
+import Stripe from 'stripe';
+
+import { BillingMeterEventTimeWindow } from 'src/engine/core-modules/billing/enums/billing-meter-event-time-window.enum';
+import { BillingMeterStatus } from 'src/engine/core-modules/billing/enums/billing-meter-status.enum';
+import { transformStripeMeterToDatabaseMeter } from 'src/engine/core-modules/billing/utils/transform-stripe-meter-to-database-meter.util';
+
+describe('transformStripeMeterDataToMeterRepositoryData', () => {
+  it('should return the correct data with customer mapping', () => {
+    const data: Stripe.Billing.Meter = {
+      id: 'met_123',
+      object: 'billing.meter',
+      created: 1719859200,
+      display_name: 'Meter 1',
+      event_name: 'event_1',
+      status: 'active',
+      customer_mapping: {
+        event_payload_key: 'event_payload_key_1',
+        type: 'by_id',
+      },
+      default_aggregation: {
+        formula: 'count',
+      },
+      event_time_window: 'day',
+      livemode: false,
+      status_transitions: {
+        deactivated_at: null,
+      },
+      updated: 1719859200,
+      value_settings: {
+        event_payload_key: 'event_payload_key_1',
+      },
+    };
+
+    const result = transformStripeMeterToDatabaseMeter(data);
+
+    expect(result).toEqual({
+      stripeMeterId: 'met_123',
+      displayName: 'Meter 1',
+      eventName: 'event_1',
+      status: BillingMeterStatus.ACTIVE,
+      customerMapping: {
+        event_payload_key: 'event_payload_key_1',
+        type: 'by_id',
+      },
+      eventTimeWindow: BillingMeterEventTimeWindow.DAY,
+      valueSettings: {
+        event_payload_key: 'event_payload_key_1',
+      },
+    });
+  });
+  it('should return the correct data with null values', () => {
+    const data: Stripe.Billing.Meter = {
+      id: 'met_1234',
+      object: 'billing.meter',
+      created: 1719859200,
+      display_name: 'Meter 2',
+      event_name: 'event_2',
+      status: 'inactive',
+      customer_mapping: {
+        event_payload_key: 'event_payload_key_2',
+        type: 'by_id',
+      },
+      default_aggregation: {
+        formula: 'sum',
+      },
+      event_time_window: null,
+      livemode: false,
+      status_transitions: {
+        deactivated_at: 1719859200,
+      },
+      updated: 1719859200,
+      value_settings: {
+        event_payload_key: 'event_payload_key_2',
+      },
+    };
+
+    const result = transformStripeMeterToDatabaseMeter(data);
+
+    expect(result).toEqual({
+      stripeMeterId: 'met_1234',
+      displayName: 'Meter 2',
+      eventName: 'event_2',
+      status: BillingMeterStatus.INACTIVE,
+      customerMapping: {
+        event_payload_key: 'event_payload_key_2',
+        type: 'by_id',
+      },
+      eventTimeWindow: undefined,
+      valueSettings: {
+        event_payload_key: 'event_payload_key_2',
+      },
+    });
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/transform-stripe-price-to-database-price.util.spec.ts b/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/transform-stripe-price-to-database-price.util.spec.ts
new file mode 100644
index 000000000000..22893641e859
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/transform-stripe-price-to-database-price.util.spec.ts
@@ -0,0 +1,219 @@
+import Stripe from 'stripe';
+
+import { BillingPriceBillingScheme } from 'src/engine/core-modules/billing/enums/billing-price-billing-scheme.enum';
+import { BillingPriceTaxBehavior } from 'src/engine/core-modules/billing/enums/billing-price-tax-behavior.enum';
+import { BillingPriceTiersMode } from 'src/engine/core-modules/billing/enums/billing-price-tiers-mode.enum';
+import { BillingPriceType } from 'src/engine/core-modules/billing/enums/billing-price-type.enum';
+import { SubscriptionInterval } from 'src/engine/core-modules/billing/enums/billing-subscription-interval.enum';
+import { BillingUsageType } from 'src/engine/core-modules/billing/enums/billing-usage-type.enum';
+import { transformStripePriceToDatabasePrice } from 'src/engine/core-modules/billing/utils/transform-stripe-price-to-database-price.util';
+describe('transformStripePriceToDatabasePrice', () => {
+  const createMockPrice = (overrides = {}): Stripe.Price =>
+    ({
+      id: 'price_123',
+      active: true,
+      product: 'prod_123',
+      currency: 'usd',
+      nickname: null,
+      tax_behavior: null,
+      type: 'recurring',
+      billing_scheme: 'per_unit',
+      unit_amount_decimal: '1000',
+      unit_amount: 1000,
+      transform_quantity: null,
+      recurring: {
+        usage_type: 'licensed',
+        interval: 'month',
+        meter: null,
+      },
+      currency_options: null,
+      tiers: null,
+      tiers_mode: null,
+      ...overrides,
+    }) as unknown as Stripe.Price;
+
+  it('should transform basic price data correctly', () => {
+    const mockPrice = createMockPrice();
+    const result = transformStripePriceToDatabasePrice(mockPrice);
+
+    expect(result).toEqual({
+      stripePriceId: 'price_123',
+      active: true,
+      stripeProductId: 'prod_123',
+      stripeMeterId: null,
+      currency: 'USD',
+      nickname: undefined,
+      taxBehavior: undefined,
+      type: BillingPriceType.RECURRING,
+      billingScheme: BillingPriceBillingScheme.PER_UNIT,
+      unitAmountDecimal: '1000',
+      unitAmount: 1000,
+      transformQuantity: undefined,
+      usageType: BillingUsageType.LICENSED,
+      interval: SubscriptionInterval.Month,
+      currencyOptions: undefined,
+      tiers: undefined,
+      tiersMode: undefined,
+      recurring: {
+        usage_type: 'licensed',
+        interval: 'month',
+        meter: null,
+      },
+    });
+  });
+
+  describe('tax behavior transformations', () => {
+    it.each([
+      ['exclusive', BillingPriceTaxBehavior.EXCLUSIVE],
+      ['inclusive', BillingPriceTaxBehavior.INCLUSIVE],
+      ['unspecified', BillingPriceTaxBehavior.UNSPECIFIED],
+    ])(
+      'should transform tax behavior %s correctly',
+      (stripeTaxBehavior, expected) => {
+        const mockPrice = createMockPrice({
+          tax_behavior: stripeTaxBehavior as Stripe.Price.TaxBehavior,
+        });
+        const result = transformStripePriceToDatabasePrice(mockPrice);
+
+        expect(result.taxBehavior).toBe(expected);
+      },
+    );
+  });
+
+  describe('price type transformations', () => {
+    it.each([
+      ['one_time', BillingPriceType.ONE_TIME],
+      ['recurring', BillingPriceType.RECURRING],
+    ])('should transform price type %s correctly', (stripeType, expected) => {
+      const mockPrice = createMockPrice({
+        type: stripeType as Stripe.Price.Type,
+      });
+      const result = transformStripePriceToDatabasePrice(mockPrice);
+
+      expect(result.type).toBe(expected);
+    });
+  });
+
+  describe('billing scheme transformations', () => {
+    it.each([
+      ['per_unit', BillingPriceBillingScheme.PER_UNIT],
+      ['tiered', BillingPriceBillingScheme.TIERED],
+    ])(
+      'should transform billing scheme %s correctly',
+      (stripeScheme, expected) => {
+        const mockPrice = createMockPrice({
+          billing_scheme: stripeScheme as Stripe.Price.BillingScheme,
+        });
+        const result = transformStripePriceToDatabasePrice(mockPrice);
+
+        expect(result.billingScheme).toBe(expected);
+      },
+    );
+  });
+
+  describe('recurring price configurations', () => {
+    it('should handle metered pricing with meter ID', () => {
+      const mockPrice = createMockPrice({
+        recurring: {
+          usage_type: 'metered',
+          interval: 'month',
+          meter: 'meter_123',
+        },
+      });
+      const result = transformStripePriceToDatabasePrice(mockPrice);
+
+      expect(result.stripeMeterId).toBe('meter_123');
+      expect(result.usageType).toBe(BillingUsageType.METERED);
+    });
+
+    it.each([
+      ['month', SubscriptionInterval.Month],
+      ['day', SubscriptionInterval.Day],
+      ['week', SubscriptionInterval.Week],
+      ['year', SubscriptionInterval.Year],
+    ])('should transform interval %s correctly', (stripeInterval, expected) => {
+      const mockPrice = createMockPrice({
+        recurring: {
+          usage_type: 'licensed',
+          interval: stripeInterval as Stripe.Price.Recurring.Interval,
+          meter: null,
+        },
+      });
+      const result = transformStripePriceToDatabasePrice(mockPrice);
+
+      expect(result.interval).toBe(expected);
+    });
+  });
+
+  describe('tiered pricing configurations', () => {
+    const mockTiers = [
+      { up_to: 10, unit_amount: 1000 },
+      { up_to: 20, unit_amount: 800 },
+    ];
+
+    it.each([
+      ['graduated', BillingPriceTiersMode.GRADUATED],
+      ['volume', BillingPriceTiersMode.VOLUME],
+    ])(
+      'should transform tiers mode %s correctly',
+      (stripeTiersMode, expected) => {
+        const mockPrice = createMockPrice({
+          billing_scheme: 'tiered',
+          tiers: mockTiers,
+          tiers_mode: stripeTiersMode as Stripe.Price.TiersMode,
+        });
+        const result = transformStripePriceToDatabasePrice(mockPrice);
+
+        expect(result.tiersMode).toBe(expected);
+        expect(result.tiers).toEqual(mockTiers);
+      },
+    );
+  });
+
+  describe('optional fields handling', () => {
+    it('should handle transform quantity configuration', () => {
+      const transformQuantity = {
+        divide_by: 100,
+        round: 'up',
+      };
+      const mockPrice = createMockPrice({
+        transform_quantity: transformQuantity,
+      });
+      const result = transformStripePriceToDatabasePrice(mockPrice);
+
+      expect(result.transformQuantity).toEqual(transformQuantity);
+    });
+
+    it('should handle currency options', () => {
+      const currencyOptions = {
+        eur: {
+          unit_amount: 850,
+          unit_amount_decimal: '850',
+        },
+      };
+      const mockPrice = createMockPrice({ currency_options: currencyOptions });
+      const result = transformStripePriceToDatabasePrice(mockPrice);
+
+      expect(result.currencyOptions).toEqual(currencyOptions);
+    });
+
+    it('should handle null and undefined fields correctly', () => {
+      const mockPrice = createMockPrice({
+        nickname: null,
+        unit_amount: null,
+        unit_amount_decimal: null,
+        transform_quantity: null,
+        tiers: null,
+        currency_options: null,
+      });
+      const result = transformStripePriceToDatabasePrice(mockPrice);
+
+      expect(result.nickname).toBeUndefined();
+      expect(result.unitAmount).toBeUndefined();
+      expect(result.unitAmountDecimal).toBeUndefined();
+      expect(result.transformQuantity).toBeUndefined();
+      expect(result.tiers).toBeUndefined();
+      expect(result.currencyOptions).toBeUndefined();
+    });
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/transform-stripe-product-to-database-product.util.spec.ts b/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/transform-stripe-product-to-database-product.util.spec.ts
new file mode 100644
index 000000000000..e14ebe833e22
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/utils/__tests__/transform-stripe-product-to-database-product.util.spec.ts
@@ -0,0 +1,86 @@
+import Stripe from 'stripe';
+
+import { transformStripeProductToDatabaseProduct } from 'src/engine/core-modules/billing/utils/transform-stripe-product-to-database-product.util';
+describe('transformStripeProductToDatabaseProduct', () => {
+  it('should return the correct data', () => {
+    const data: Stripe.Product = {
+      id: 'prod_123',
+      name: 'Product 1',
+      active: true,
+      description: 'Description 1',
+      images: ['image1.jpg', 'image2.jpg'],
+      marketing_features: [
+        {
+          name: 'feature1',
+        },
+      ],
+      created: 1719859200,
+      updated: 1719859200,
+      type: 'service',
+      livemode: false,
+      package_dimensions: null,
+      shippable: false,
+      object: 'product',
+      default_price: 'price_123',
+      unit_label: 'Unit',
+      url: 'https://example.com',
+      tax_code: 'tax_code_1',
+      metadata: { key: 'value' },
+    };
+
+    const result = transformStripeProductToDatabaseProduct(data);
+
+    expect(result).toEqual({
+      stripeProductId: 'prod_123',
+      name: 'Product 1',
+      active: true,
+      description: 'Description 1',
+      images: ['image1.jpg', 'image2.jpg'],
+      marketingFeatures: [{ name: 'feature1' }],
+      defaultStripePriceId: 'price_123',
+      unitLabel: 'Unit',
+      url: 'https://example.com',
+      taxCode: 'tax_code_1',
+      metadata: { key: 'value' },
+    });
+  });
+
+  it('should return the correct data with null values', () => {
+    const data: Stripe.Product = {
+      id: 'prod_456',
+      name: 'Product 2',
+      active: false,
+      description: '',
+      images: [],
+      created: 1719859200,
+      updated: 1719859200,
+      type: 'service',
+      livemode: false,
+      package_dimensions: null,
+      shippable: false,
+      object: 'product',
+      marketing_features: [],
+      default_price: null,
+      unit_label: null,
+      url: null,
+      tax_code: null,
+      metadata: {},
+    };
+
+    const result = transformStripeProductToDatabaseProduct(data);
+
+    expect(result).toEqual({
+      stripeProductId: 'prod_456',
+      name: 'Product 2',
+      active: false,
+      description: '',
+      images: [],
+      marketingFeatures: [],
+      defaultStripePriceId: undefined,
+      unitLabel: undefined,
+      url: undefined,
+      taxCode: undefined,
+      metadata: {},
+    });
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/format-database-product-to-graphql-dto.util.ts b/packages/twenty-server/src/engine/core-modules/billing/utils/format-database-product-to-graphql-dto.util.ts
new file mode 100644
index 000000000000..f5979f95c1de
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/utils/format-database-product-to-graphql-dto.util.ts
@@ -0,0 +1,70 @@
+import { BillingPriceLicensedDTO } from 'src/engine/core-modules/billing/dtos/billing-price-licensed.dto';
+import { BillingPriceMeteredDTO } from 'src/engine/core-modules/billing/dtos/billing-price-metered.dto';
+import { BillingPlanOutput } from 'src/engine/core-modules/billing/dtos/outputs/billing-plan.output';
+import { BillingPrice } from 'src/engine/core-modules/billing/entities/billing-price.entity';
+import { BillingPriceTiersMode } from 'src/engine/core-modules/billing/enums/billing-price-tiers-mode.enum';
+import { SubscriptionInterval } from 'src/engine/core-modules/billing/enums/billing-subscription-interval.enum';
+import { BillingUsageType } from 'src/engine/core-modules/billing/enums/billing-usage-type.enum';
+import { BillingGetPlanResult } from 'src/engine/core-modules/billing/types/billing-get-plan-result.type';
+
+export const formatBillingDatabaseProductToGraphqlDTO = (
+  plan: BillingGetPlanResult,
+): BillingPlanOutput => {
+  return {
+    planKey: plan.planKey,
+    baseProduct: {
+      ...plan.baseProduct,
+      type: BillingUsageType.LICENSED,
+      prices: plan.baseProduct.billingPrices.map(
+        formatBillingDatabasePriceToLicensedPriceDTO,
+      ),
+    },
+    otherLicensedProducts: plan.otherLicensedProducts.map((product) => {
+      return {
+        ...product,
+        type: BillingUsageType.LICENSED,
+        prices: product.billingPrices.map(
+          formatBillingDatabasePriceToLicensedPriceDTO,
+        ),
+      };
+    }),
+    meteredProducts: plan.meteredProducts.map((product) => {
+      return {
+        ...product,
+        type: BillingUsageType.METERED,
+        prices: product.billingPrices.map(
+          formatBillingDatabasePriceToMeteredPriceDTO,
+        ),
+      };
+    }),
+  };
+};
+
+const formatBillingDatabasePriceToMeteredPriceDTO = (
+  billingPrice: BillingPrice,
+): BillingPriceMeteredDTO => {
+  return {
+    tiersMode:
+      billingPrice?.tiersMode === BillingPriceTiersMode.GRADUATED
+        ? BillingPriceTiersMode.GRADUATED
+        : null,
+    tiers:
+      billingPrice?.tiers?.map((tier) => ({
+        upTo: tier.up_to,
+        flatAmount: tier.flat_amount,
+        unitAmount: tier.unit_amount,
+      })) ?? [],
+    recurringInterval: billingPrice?.interval ?? SubscriptionInterval.Month,
+    stripePriceId: billingPrice?.stripePriceId,
+  };
+};
+
+const formatBillingDatabasePriceToLicensedPriceDTO = (
+  billingPrice: BillingPrice,
+): BillingPriceLicensedDTO => {
+  return {
+    recurringInterval: billingPrice?.interval ?? SubscriptionInterval.Month,
+    unitAmount: billingPrice?.unitAmount ?? 0,
+    stripePriceId: billingPrice?.stripePriceId,
+  };
+};
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/is-stripe-valid-product-metadata.util.ts b/packages/twenty-server/src/engine/core-modules/billing/utils/is-stripe-valid-product-metadata.util.ts
index cf2a8c955a99..a33b8e5b8454 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/utils/is-stripe-valid-product-metadata.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/utils/is-stripe-valid-product-metadata.util.ts
@@ -12,8 +12,10 @@ export function isStripeValidProductMetadata(
   }
   const hasBillingPlanKey = isValidBillingPlanKey(metadata.planKey);
   const hasPriceUsageBased = isValidPriceUsageBased(metadata.priceUsageBased);
+  const hasIsBaseProduct =
+    metadata.isBaseProduct === 'true' || metadata.isBaseProduct === 'false';
 
-  return hasBillingPlanKey && hasPriceUsageBased;
+  return hasBillingPlanKey && hasPriceUsageBased && hasIsBaseProduct;
 }
 
 const isValidBillingPlanKey = (planKey?: string) => {
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-entitlement-updated-event-to-entitlement-repository-data.util.ts b/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-entitlement-updated-event-to-entitlement-repository-data.util.ts
deleted file mode 100644
index 7577f9a90a21..000000000000
--- a/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-entitlement-updated-event-to-entitlement-repository-data.util.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import Stripe from 'stripe';
-
-import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';
-
-export const transformStripeEntitlementUpdatedEventToEntitlementRepositoryData =
-  (
-    workspaceId: string,
-    data: Stripe.EntitlementsActiveEntitlementSummaryUpdatedEvent.Data,
-  ) => {
-    const stripeCustomerId = data.object.customer;
-    const activeEntitlementsKeys = data.object.entitlements.data.map(
-      (entitlement) => entitlement.lookup_key,
-    );
-
-    return Object.values(BillingEntitlementKey).map((key) => {
-      return {
-        workspaceId,
-        key,
-        value: activeEntitlementsKeys.includes(key),
-        stripeCustomerId,
-      };
-    });
-  };
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-meter-data-to-meter-repository-data.util.ts b/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-meter-to-database-meter.util.ts
similarity index 94%
rename from packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-meter-data-to-meter-repository-data.util.ts
rename to packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-meter-to-database-meter.util.ts
index e7ae8423055b..59370cbd39e5 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-meter-data-to-meter-repository-data.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-meter-to-database-meter.util.ts
@@ -3,7 +3,7 @@ import Stripe from 'stripe';
 import { BillingMeterEventTimeWindow } from 'src/engine/core-modules/billing/enums/billing-meter-event-time-window.enum';
 import { BillingMeterStatus } from 'src/engine/core-modules/billing/enums/billing-meter-status.enum';
 
-export const transformStripeMeterDataToMeterRepositoryData = (
+export const transformStripeMeterToDatabaseMeter = (
   data: Stripe.Billing.Meter,
 ) => {
   return {
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-price-data-to-price-repository-data.util.ts b/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-price-to-database-price.util.ts
similarity index 97%
rename from packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-price-data-to-price-repository-data.util.ts
rename to packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-price-to-database-price.util.ts
index c5525b176277..fdb0cf81c076 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-price-data-to-price-repository-data.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-price-to-database-price.util.ts
@@ -7,9 +7,7 @@ import { BillingPriceType } from 'src/engine/core-modules/billing/enums/billing-
 import { SubscriptionInterval } from 'src/engine/core-modules/billing/enums/billing-subscription-interval.enum';
 import { BillingUsageType } from 'src/engine/core-modules/billing/enums/billing-usage-type.enum';
 
-export const transformStripePriceDataToPriceRepositoryData = (
-  data: Stripe.Price,
-) => {
+export const transformStripePriceToDatabasePrice = (data: Stripe.Price) => {
   return {
     stripePriceId: data.id,
     active: data.active,
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-product-data-to-product-repository-data.util.ts b/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-product-to-database-product.util.ts
similarity index 84%
rename from packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-product-data-to-product-repository-data.util.ts
rename to packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-product-to-database-product.util.ts
index f1e9413fc727..5f9c11ac11f7 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-product-data-to-product-repository-data.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-product-to-database-product.util.ts
@@ -1,13 +1,13 @@
 import Stripe from 'stripe';
 
-export const transformStripeProductDataToProductRepositoryData = (
+export const transformStripeProductToDatabaseProduct = (
   data: Stripe.Product,
 ) => {
   return {
     stripeProductId: data.id,
     name: data.name,
     active: data.active,
-    description: data.description,
+    description: data.description ?? '',
     images: data.images,
     marketingFeatures: data.marketing_features,
     defaultStripePriceId: data.default_price
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-subscription-event-to-subscription-item-repository-data.util.ts b/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-subscription-event-to-subscription-item-repository-data.util.ts
deleted file mode 100644
index 9c72971dce72..000000000000
--- a/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-subscription-event-to-subscription-item-repository-data.util.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import Stripe from 'stripe';
-
-export const transformStripeSubscriptionEventToSubscriptionItemRepositoryData =
-  (
-    billingSubscriptionId: string,
-    data:
-      | Stripe.CustomerSubscriptionUpdatedEvent.Data
-      | Stripe.CustomerSubscriptionCreatedEvent.Data
-      | Stripe.CustomerSubscriptionDeletedEvent.Data,
-  ) => {
-    return data.object.items.data.map((item) => {
-      return {
-        billingSubscriptionId,
-        stripeSubscriptionId: data.object.id,
-        stripeProductId: String(item.price.product),
-        stripePriceId: item.price.id,
-        stripeSubscriptionItemId: item.id,
-        quantity: item.quantity,
-        metadata: item.metadata,
-        billingThresholds:
-          item.billing_thresholds === null
-            ? undefined
-            : item.billing_thresholds,
-      };
-    });
-  };
diff --git a/packages/twenty-server/src/engine/core-modules/billing/services/billing-webhook-entitlement.service.ts b/packages/twenty-server/src/engine/core-modules/billing/webhooks/services/billing-webhook-entitlement.service.ts
similarity index 82%
rename from packages/twenty-server/src/engine/core-modules/billing/services/billing-webhook-entitlement.service.ts
rename to packages/twenty-server/src/engine/core-modules/billing/webhooks/services/billing-webhook-entitlement.service.ts
index 1f34877b7ec2..c73efac37d68 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/services/billing-webhook-entitlement.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/webhooks/services/billing-webhook-entitlement.service.ts
@@ -10,7 +10,7 @@ import {
 } from 'src/engine/core-modules/billing/billing.exception';
 import { BillingEntitlement } from 'src/engine/core-modules/billing/entities/billing-entitlement.entity';
 import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
-import { transformStripeEntitlementUpdatedEventToEntitlementRepositoryData } from 'src/engine/core-modules/billing/utils/transform-stripe-entitlement-updated-event-to-entitlement-repository-data.util';
+import { transformStripeEntitlementUpdatedEventToDatabaseEntitlement } from 'src/engine/core-modules/billing/webhooks/utils/transform-stripe-entitlement-updated-event-to-database-entitlement.util';
 @Injectable()
 export class BillingWebhookEntitlementService {
   protected readonly logger = new Logger(BillingWebhookEntitlementService.name);
@@ -39,7 +39,7 @@ export class BillingWebhookEntitlementService {
     const workspaceId = billingSubscription.workspaceId;
 
     await this.billingEntitlementRepository.upsert(
-      transformStripeEntitlementUpdatedEventToEntitlementRepositoryData(
+      transformStripeEntitlementUpdatedEventToDatabaseEntitlement(
         workspaceId,
         data,
       ),
@@ -48,5 +48,9 @@ export class BillingWebhookEntitlementService {
         skipUpdateIfNoValuesChanged: true,
       },
     );
+
+    return {
+      stripeEntitlementCustomerId: data.object.customer,
+    };
   }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/billing/services/billing-webhook-price.service.ts b/packages/twenty-server/src/engine/core-modules/billing/webhooks/services/billing-webhook-price.service.ts
similarity index 71%
rename from packages/twenty-server/src/engine/core-modules/billing/services/billing-webhook-price.service.ts
rename to packages/twenty-server/src/engine/core-modules/billing/webhooks/services/billing-webhook-price.service.ts
index 8e87fc095979..eca1edd71a6f 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/services/billing-webhook-price.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/webhooks/services/billing-webhook-price.service.ts
@@ -11,14 +11,15 @@ import {
 import { BillingMeter } from 'src/engine/core-modules/billing/entities/billing-meter.entity';
 import { BillingPrice } from 'src/engine/core-modules/billing/entities/billing-price.entity';
 import { BillingProduct } from 'src/engine/core-modules/billing/entities/billing-product.entity';
-import { StripeService } from 'src/engine/core-modules/billing/stripe/stripe.service';
-import { transformStripeMeterDataToMeterRepositoryData } from 'src/engine/core-modules/billing/utils/transform-stripe-meter-data-to-meter-repository-data.util';
-import { transformStripePriceEventToPriceRepositoryData } from 'src/engine/core-modules/billing/utils/transform-stripe-price-event-to-price-repository-data.util';
+import { StripeBillingMeterService } from 'src/engine/core-modules/billing/stripe/services/stripe-billing-meter.service';
+import { transformStripeMeterToDatabaseMeter } from 'src/engine/core-modules/billing/utils/transform-stripe-meter-to-database-meter.util';
+import { transformStripePriceEventToDatabasePrice } from 'src/engine/core-modules/billing/webhooks/utils/transform-stripe-price-event-to-database-price.util';
+
 @Injectable()
 export class BillingWebhookPriceService {
   protected readonly logger = new Logger(BillingWebhookPriceService.name);
   constructor(
-    private readonly stripeService: StripeService,
+    private readonly stripeBillingMeterService: StripeBillingMeterService,
     @InjectRepository(BillingPrice, 'core')
     private readonly billingPriceRepository: Repository<BillingPrice>,
     @InjectRepository(BillingMeter, 'core')
@@ -45,10 +46,10 @@ export class BillingWebhookPriceService {
     const meterId = data.object.recurring?.meter;
 
     if (meterId) {
-      const meterData = await this.stripeService.getMeter(meterId);
+      const meterData = await this.stripeBillingMeterService.getMeter(meterId);
 
       await this.billingMeterRepository.upsert(
-        transformStripeMeterDataToMeterRepositoryData(meterData),
+        transformStripeMeterToDatabaseMeter(meterData),
         {
           conflictPaths: ['stripeMeterId'],
           skipUpdateIfNoValuesChanged: true,
@@ -57,11 +58,16 @@ export class BillingWebhookPriceService {
     }
 
     await this.billingPriceRepository.upsert(
-      transformStripePriceEventToPriceRepositoryData(data),
+      transformStripePriceEventToDatabasePrice(data),
       {
         conflictPaths: ['stripePriceId'],
         skipUpdateIfNoValuesChanged: true,
       },
     );
+
+    return {
+      stripePriceId: data.object.id,
+      stripeMeterId: meterId,
+    };
   }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/billing/services/billing-webhook-product.service.ts b/packages/twenty-server/src/engine/core-modules/billing/webhooks/services/billing-webhook-product.service.ts
similarity index 85%
rename from packages/twenty-server/src/engine/core-modules/billing/services/billing-webhook-product.service.ts
rename to packages/twenty-server/src/engine/core-modules/billing/webhooks/services/billing-webhook-product.service.ts
index 11e2238bf87d..0fd12dedb60a 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/services/billing-webhook-product.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/webhooks/services/billing-webhook-product.service.ts
@@ -9,7 +9,7 @@ import { BillingPlanKey } from 'src/engine/core-modules/billing/enums/billing-pl
 import { BillingUsageType } from 'src/engine/core-modules/billing/enums/billing-usage-type.enum';
 import { BillingProductMetadata } from 'src/engine/core-modules/billing/types/billing-product-metadata.type';
 import { isStripeValidProductMetadata } from 'src/engine/core-modules/billing/utils/is-stripe-valid-product-metadata.util';
-import { transformStripeProductEventToProductRepositoryData } from 'src/engine/core-modules/billing/utils/transform-stripe-product-event-to-product-repository-data.util';
+import { transformStripeProductEventToDatabaseProduct } from 'src/engine/core-modules/billing/webhooks/utils/transform-stripe-product-event-to-database-product.util';
 @Injectable()
 export class BillingWebhookProductService {
   protected readonly logger = new Logger(BillingWebhookProductService.name);
@@ -24,15 +24,19 @@ export class BillingWebhookProductService {
     const metadata = data.object.metadata;
     const productRepositoryData = isStripeValidProductMetadata(metadata)
       ? {
-          ...transformStripeProductEventToProductRepositoryData(data),
+          ...transformStripeProductEventToDatabaseProduct(data),
           metadata,
         }
-      : transformStripeProductEventToProductRepositoryData(data);
+      : transformStripeProductEventToDatabaseProduct(data);
 
     await this.billingProductRepository.upsert(productRepositoryData, {
       conflictPaths: ['stripeProductId'],
       skipUpdateIfNoValuesChanged: true,
     });
+
+    return {
+      stripeProductId: data.object.id,
+    };
   }
 
   isStripeValidProductMetadata(
diff --git a/packages/twenty-server/src/engine/core-modules/billing/services/billing-webhook-subscription.service.ts b/packages/twenty-server/src/engine/core-modules/billing/webhooks/services/billing-webhook-subscription.service.ts
similarity index 65%
rename from packages/twenty-server/src/engine/core-modules/billing/services/billing-webhook-subscription.service.ts
rename to packages/twenty-server/src/engine/core-modules/billing/webhooks/services/billing-webhook-subscription.service.ts
index 9cd4c62551e8..fcad8e097bf7 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/services/billing-webhook-subscription.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/webhooks/services/billing-webhook-subscription.service.ts
@@ -2,27 +2,25 @@ import { Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
 import Stripe from 'stripe';
+import { WorkspaceActivationStatus } from 'twenty-shared';
 import { Repository } from 'typeorm';
 
 import { BillingCustomer } from 'src/engine/core-modules/billing/entities/billing-customer.entity';
 import { BillingSubscriptionItem } from 'src/engine/core-modules/billing/entities/billing-subscription-item.entity';
 import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
 import { SubscriptionStatus } from 'src/engine/core-modules/billing/enums/billing-subscription-status.enum';
-import { StripeService } from 'src/engine/core-modules/billing/stripe/stripe.service';
-import { transformStripeSubscriptionEventToCustomerRepositoryData } from 'src/engine/core-modules/billing/utils/transform-stripe-subscription-event-to-customer-repository-data.util';
-import { transformStripeSubscriptionEventToSubscriptionItemRepositoryData } from 'src/engine/core-modules/billing/utils/transform-stripe-subscription-event-to-subscription-item-repository-data.util';
-import { transformStripeSubscriptionEventToSubscriptionRepositoryData } from 'src/engine/core-modules/billing/utils/transform-stripe-subscription-event-to-subscription-repository-data.util';
-import {
-  Workspace,
-  WorkspaceActivationStatus,
-} from 'src/engine/core-modules/workspace/workspace.entity';
+import { StripeCustomerService } from 'src/engine/core-modules/billing/stripe/services/stripe-customer.service';
+import { transformStripeSubscriptionEventToDatabaseCustomer } from 'src/engine/core-modules/billing/webhooks/utils/transform-stripe-subscription-event-to-database-customer.util';
+import { transformStripeSubscriptionEventToDatabaseSubscriptionItem } from 'src/engine/core-modules/billing/webhooks/utils/transform-stripe-subscription-event-to-database-subscription-item.util';
+import { transformStripeSubscriptionEventToDatabaseSubscription } from 'src/engine/core-modules/billing/webhooks/utils/transform-stripe-subscription-event-to-database-subscription.util';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 @Injectable()
 export class BillingWebhookSubscriptionService {
   protected readonly logger = new Logger(
     BillingWebhookSubscriptionService.name,
   );
   constructor(
-    private readonly stripeService: StripeService,
+    private readonly stripeCustomerService: StripeCustomerService,
     @InjectRepository(BillingSubscription, 'core')
     private readonly billingSubscriptionRepository: Repository<BillingSubscription>,
     @InjectRepository(BillingSubscriptionItem, 'core')
@@ -45,14 +43,11 @@ export class BillingWebhookSubscriptionService {
     });
 
     if (!workspace) {
-      return;
+      return { noWorkspace: true };
     }
 
     await this.billingCustomerRepository.upsert(
-      transformStripeSubscriptionEventToCustomerRepositoryData(
-        workspaceId,
-        data,
-      ),
+      transformStripeSubscriptionEventToDatabaseCustomer(workspaceId, data),
       {
         conflictPaths: ['workspaceId'],
         skipUpdateIfNoValuesChanged: true,
@@ -60,10 +55,7 @@ export class BillingWebhookSubscriptionService {
     );
 
     await this.billingSubscriptionRepository.upsert(
-      transformStripeSubscriptionEventToSubscriptionRepositoryData(
-        workspaceId,
-        data,
-      ),
+      transformStripeSubscriptionEventToDatabaseSubscription(workspaceId, data),
       {
         conflictPaths: ['stripeSubscriptionId'],
         skipUpdateIfNoValuesChanged: true,
@@ -76,7 +68,7 @@ export class BillingWebhookSubscriptionService {
       });
 
     await this.billingSubscriptionItemRepository.upsert(
-      transformStripeSubscriptionEventToSubscriptionItemRepositoryData(
+      transformStripeSubscriptionEventToDatabaseSubscriptionItem(
         billingSubscription.id,
         data,
       ),
@@ -88,10 +80,11 @@ export class BillingWebhookSubscriptionService {
 
     if (
       data.object.status === SubscriptionStatus.Canceled ||
-      data.object.status === SubscriptionStatus.Unpaid
+      data.object.status === SubscriptionStatus.Unpaid ||
+      data.object.status === SubscriptionStatus.Paused
     ) {
       await this.workspaceRepository.update(workspaceId, {
-        activationStatus: WorkspaceActivationStatus.INACTIVE,
+        activationStatus: WorkspaceActivationStatus.SUSPENDED,
       });
     }
 
@@ -99,16 +92,21 @@ export class BillingWebhookSubscriptionService {
       (data.object.status === SubscriptionStatus.Active ||
         data.object.status === SubscriptionStatus.Trialing ||
         data.object.status === SubscriptionStatus.PastDue) &&
-      workspace.activationStatus == WorkspaceActivationStatus.INACTIVE
+      workspace.activationStatus == WorkspaceActivationStatus.SUSPENDED
     ) {
       await this.workspaceRepository.update(workspaceId, {
         activationStatus: WorkspaceActivationStatus.ACTIVE,
       });
     }
 
-    await this.stripeService.updateCustomerMetadataWorkspaceId(
+    await this.stripeCustomerService.updateCustomerMetadataWorkspaceId(
       String(data.object.customer),
       workspaceId,
     );
+
+    return {
+      stripeSubscriptionId: data.object.id,
+      stripeCustomerId: data.object.customer,
+    };
   }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/__tests__/transform-stripe-entitlement-updated-event-to-database-entitlement.util.spec.ts b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/__tests__/transform-stripe-entitlement-updated-event-to-database-entitlement.util.spec.ts
new file mode 100644
index 000000000000..6077e8bb4068
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/__tests__/transform-stripe-entitlement-updated-event-to-database-entitlement.util.spec.ts
@@ -0,0 +1,82 @@
+import Stripe from 'stripe';
+
+import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';
+import { transformStripeEntitlementUpdatedEventToDatabaseEntitlement } from 'src/engine/core-modules/billing/webhooks/utils/transform-stripe-entitlement-updated-event-to-database-entitlement.util';
+
+describe('transformStripeEntitlementUpdatedEventToDatabaseEntitlement', () => {
+  it('should return the SSO key with true value', () => {
+    const data: Stripe.EntitlementsActiveEntitlementSummaryUpdatedEvent.Data = {
+      object: {
+        customer: 'cus_123',
+        entitlements: {
+          data: [
+            {
+              lookup_key: 'SSO',
+              feature: 'SSO',
+              livemode: false,
+              id: 'ent_123',
+              object: 'entitlements.active_entitlement',
+            },
+          ],
+          object: 'list',
+          has_more: false,
+          url: '',
+        },
+        livemode: false,
+        object: 'entitlements.active_entitlement_summary',
+      },
+    };
+
+    const result = transformStripeEntitlementUpdatedEventToDatabaseEntitlement(
+      'workspaceId',
+      data,
+    );
+
+    expect(result).toEqual([
+      {
+        workspaceId: 'workspaceId',
+        key: BillingEntitlementKey.SSO,
+        value: true,
+        stripeCustomerId: 'cus_123',
+      },
+    ]);
+  });
+
+  it('should return the SSO key with false value,should only render the values that are listed in BillingEntitlementKeys', () => {
+    const data: Stripe.EntitlementsActiveEntitlementSummaryUpdatedEvent.Data = {
+      object: {
+        customer: 'cus_123',
+        entitlements: {
+          data: [
+            {
+              id: 'ent_123',
+              object: 'entitlements.active_entitlement',
+              lookup_key: 'DIFFERENT_KEY',
+              feature: 'DIFFERENT_FEATURE',
+              livemode: false,
+            },
+          ],
+          object: 'list',
+          has_more: false,
+          url: '',
+        },
+        livemode: false,
+        object: 'entitlements.active_entitlement_summary',
+      },
+    };
+
+    const result = transformStripeEntitlementUpdatedEventToDatabaseEntitlement(
+      'workspaceId',
+      data,
+    );
+
+    expect(result).toEqual([
+      {
+        workspaceId: 'workspaceId',
+        key: BillingEntitlementKey.SSO,
+        value: false,
+        stripeCustomerId: 'cus_123',
+      },
+    ]);
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/__tests__/transform-stripe-price-event-to-database-price.util.spec.ts b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/__tests__/transform-stripe-price-event-to-database-price.util.spec.ts
new file mode 100644
index 000000000000..3ace9f346054
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/__tests__/transform-stripe-price-event-to-database-price.util.spec.ts
@@ -0,0 +1,214 @@
+import { BillingPriceBillingScheme } from 'src/engine/core-modules/billing/enums/billing-price-billing-scheme.enum';
+import { BillingPriceTaxBehavior } from 'src/engine/core-modules/billing/enums/billing-price-tax-behavior.enum';
+import { BillingPriceTiersMode } from 'src/engine/core-modules/billing/enums/billing-price-tiers-mode.enum';
+import { BillingPriceType } from 'src/engine/core-modules/billing/enums/billing-price-type.enum';
+import { SubscriptionInterval } from 'src/engine/core-modules/billing/enums/billing-subscription-interval.enum';
+import { BillingUsageType } from 'src/engine/core-modules/billing/enums/billing-usage-type.enum';
+import { transformStripePriceEventToDatabasePrice } from 'src/engine/core-modules/billing/webhooks/utils/transform-stripe-price-event-to-database-price.util';
+
+describe('transformStripePriceEventToDatabasePrice', () => {
+  const createMockPriceData = (overrides = {}) => ({
+    object: {
+      id: 'price_123',
+      active: true,
+      product: 'prod_123',
+      meter: null,
+      currency: 'usd',
+      nickname: null,
+      tax_behavior: null,
+      type: 'recurring',
+      billing_scheme: 'per_unit',
+      unit_amount_decimal: '1000',
+      unit_amount: 1000,
+      transform_quantity: null,
+      recurring: {
+        usage_type: 'licensed',
+        interval: 'month',
+      },
+      currency_options: null,
+      tiers: null,
+      tiers_mode: null,
+      ...overrides,
+    },
+  });
+
+  it('should transform basic price data correctly', () => {
+    const mockData = createMockPriceData();
+    const result = transformStripePriceEventToDatabasePrice(mockData as any);
+
+    expect(result).toEqual({
+      stripePriceId: 'price_123',
+      active: true,
+      stripeProductId: 'prod_123',
+      stripeMeterId: undefined,
+      currency: 'USD',
+      nickname: undefined,
+      taxBehavior: undefined,
+      type: BillingPriceType.RECURRING,
+      billingScheme: BillingPriceBillingScheme.PER_UNIT,
+      unitAmountDecimal: '1000',
+      unitAmount: 1000,
+      transformQuantity: undefined,
+      usageType: BillingUsageType.LICENSED,
+      interval: SubscriptionInterval.Month,
+      currencyOptions: undefined,
+      tiers: undefined,
+      tiersMode: undefined,
+      recurring: {
+        usage_type: 'licensed',
+        interval: 'month',
+      },
+    });
+  });
+
+  it('should handle all tax behaviors correctly', () => {
+    const taxBehaviors = [
+      ['exclusive', BillingPriceTaxBehavior.EXCLUSIVE],
+      ['inclusive', BillingPriceTaxBehavior.INCLUSIVE],
+      ['unspecified', BillingPriceTaxBehavior.UNSPECIFIED],
+    ];
+
+    taxBehaviors.forEach(([stripeTaxBehavior, expectedTaxBehavior]) => {
+      const mockData = createMockPriceData({
+        tax_behavior: stripeTaxBehavior,
+      });
+      const result = transformStripePriceEventToDatabasePrice(mockData as any);
+
+      expect(result.taxBehavior).toBe(expectedTaxBehavior);
+    });
+  });
+
+  it('should handle all price types correctly', () => {
+    const priceTypes = [
+      ['one_time', BillingPriceType.ONE_TIME],
+      ['recurring', BillingPriceType.RECURRING],
+    ];
+
+    priceTypes.forEach(([stripeType, expectedType]) => {
+      const mockData = createMockPriceData({ type: stripeType });
+      const result = transformStripePriceEventToDatabasePrice(mockData as any);
+
+      expect(result.type).toBe(expectedType);
+    });
+  });
+
+  it('should handle all billing schemes correctly', () => {
+    const billingSchemes = [
+      ['per_unit', BillingPriceBillingScheme.PER_UNIT],
+      ['tiered', BillingPriceBillingScheme.TIERED],
+    ];
+
+    billingSchemes.forEach(([stripeScheme, expectedScheme]) => {
+      const mockData = createMockPriceData({ billing_scheme: stripeScheme });
+      const result = transformStripePriceEventToDatabasePrice(mockData as any);
+
+      expect(result.billingScheme).toBe(expectedScheme);
+    });
+  });
+
+  it('should handle all usage types correctly', () => {
+    const usageTypes = [
+      ['licensed', BillingUsageType.LICENSED],
+      ['metered', BillingUsageType.METERED],
+    ];
+
+    usageTypes.forEach(([stripeUsageType, expectedUsageType]) => {
+      const mockData = createMockPriceData({
+        recurring: { usage_type: stripeUsageType, interval: 'month' },
+      });
+      const result = transformStripePriceEventToDatabasePrice(mockData as any);
+
+      expect(result.usageType).toBe(expectedUsageType);
+    });
+  });
+
+  it('should handle all tiers modes correctly', () => {
+    const tiersModes = [
+      ['graduated', BillingPriceTiersMode.GRADUATED],
+      ['volume', BillingPriceTiersMode.VOLUME],
+    ];
+
+    tiersModes.forEach(([stripeTiersMode, expectedTiersMode]) => {
+      const mockData = createMockPriceData({ tiers_mode: stripeTiersMode });
+      const result = transformStripePriceEventToDatabasePrice(mockData as any);
+
+      expect(result.tiersMode).toBe(expectedTiersMode);
+    });
+  });
+
+  it('should handle all intervals correctly', () => {
+    const intervals = [
+      ['month', SubscriptionInterval.Month],
+      ['day', SubscriptionInterval.Day],
+      ['week', SubscriptionInterval.Week],
+      ['year', SubscriptionInterval.Year],
+    ];
+
+    intervals.forEach(([stripeInterval, expectedInterval]) => {
+      const mockData = createMockPriceData({
+        recurring: { usage_type: 'licensed', interval: stripeInterval },
+      });
+      const result = transformStripePriceEventToDatabasePrice(mockData as any);
+
+      expect(result.interval).toBe(expectedInterval);
+    });
+  });
+
+  it('should handle tiered pricing configuration', () => {
+    const mockTiers = [
+      { up_to: 10, unit_amount: 1000 },
+      { up_to: 20, unit_amount: 800 },
+    ];
+
+    const mockData = createMockPriceData({
+      billing_scheme: 'tiered',
+      tiers: mockTiers,
+      tiers_mode: 'graduated',
+    });
+
+    const result = transformStripePriceEventToDatabasePrice(mockData as any);
+
+    expect(result.billingScheme).toBe(BillingPriceBillingScheme.TIERED);
+    expect(result.tiers).toEqual(mockTiers);
+    expect(result.tiersMode).toBe(BillingPriceTiersMode.GRADUATED);
+  });
+
+  it('should handle metered pricing with transform quantity', () => {
+    const mockTransformQuantity = {
+      divide_by: 100,
+      round: 'up',
+    };
+
+    const mockData = createMockPriceData({
+      recurring: {
+        usage_type: 'metered',
+        interval: 'month',
+        meter: 'meter_123',
+      },
+      transform_quantity: mockTransformQuantity,
+    });
+
+    const result = transformStripePriceEventToDatabasePrice(mockData as any);
+
+    expect(result.stripeMeterId).toBe('meter_123');
+    expect(result.usageType).toBe(BillingUsageType.METERED);
+    expect(result.transformQuantity).toEqual(mockTransformQuantity);
+  });
+
+  it('should handle currency options', () => {
+    const mockCurrencyOptions = {
+      eur: {
+        unit_amount: 850,
+        unit_amount_decimal: '850',
+      },
+    };
+
+    const mockData = createMockPriceData({
+      currency_options: mockCurrencyOptions,
+    });
+
+    const result = transformStripePriceEventToDatabasePrice(mockData as any);
+
+    expect(result.currencyOptions).toEqual(mockCurrencyOptions);
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/__tests__/transform-stripe-product-event-to-database-product.util.spec.ts b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/__tests__/transform-stripe-product-event-to-database-product.util.spec.ts
new file mode 100644
index 000000000000..b8a496be1528
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/__tests__/transform-stripe-product-event-to-database-product.util.spec.ts
@@ -0,0 +1,89 @@
+import Stripe from 'stripe';
+
+import { transformStripeProductEventToDatabaseProduct } from 'src/engine/core-modules/billing/webhooks/utils/transform-stripe-product-event-to-database-product.util';
+
+describe('transformStripeProductEventToDatabaseProduct', () => {
+  it('should return the correct data', () => {
+    const data: Stripe.ProductCreatedEvent.Data = {
+      object: {
+        id: 'prod_123',
+        name: 'Product 1',
+        active: true,
+        description: 'Description 1',
+        images: ['image1.jpg', 'image2.jpg'],
+        marketing_features: [
+          {
+            name: 'feature1',
+          },
+        ],
+        created: 1719859200,
+        updated: 1719859200,
+        type: 'service',
+        livemode: false,
+        package_dimensions: null,
+        shippable: false,
+        object: 'product',
+        default_price: 'price_123',
+        unit_label: 'Unit',
+        url: 'https://example.com',
+        tax_code: 'tax_code_1',
+        metadata: { key: 'value' },
+      },
+    };
+
+    const result = transformStripeProductEventToDatabaseProduct(data);
+
+    expect(result).toEqual({
+      stripeProductId: 'prod_123',
+      name: 'Product 1',
+      active: true,
+      description: 'Description 1',
+      images: ['image1.jpg', 'image2.jpg'],
+      marketingFeatures: [{ name: 'feature1' }],
+      defaultStripePriceId: 'price_123',
+      unitLabel: 'Unit',
+      url: 'https://example.com',
+      taxCode: 'tax_code_1',
+    });
+  });
+
+  it('should return the correct data with null values', () => {
+    const data: Stripe.ProductUpdatedEvent.Data = {
+      object: {
+        id: 'prod_456',
+        name: 'Product 2',
+        object: 'product',
+        active: false,
+        description: '',
+        images: [],
+        created: 1719859200,
+        updated: 1719859200,
+        type: 'service',
+        livemode: false,
+        package_dimensions: null,
+        shippable: false,
+        marketing_features: [],
+        default_price: null,
+        unit_label: null,
+        url: null,
+        tax_code: null,
+        metadata: {},
+      },
+    };
+
+    const result = transformStripeProductEventToDatabaseProduct(data);
+
+    expect(result).toEqual({
+      stripeProductId: 'prod_456',
+      name: 'Product 2',
+      active: false,
+      description: '',
+      images: [],
+      marketingFeatures: [],
+      defaultStripePriceId: undefined,
+      unitLabel: undefined,
+      url: undefined,
+      taxCode: undefined,
+    });
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/__tests__/transform-stripe-subscription-event-to-database-customer.util.spec.ts b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/__tests__/transform-stripe-subscription-event-to-database-customer.util.spec.ts
new file mode 100644
index 000000000000..d8de729efba0
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/__tests__/transform-stripe-subscription-event-to-database-customer.util.spec.ts
@@ -0,0 +1,84 @@
+import { transformStripeSubscriptionEventToDatabaseCustomer } from 'src/engine/core-modules/billing/webhooks/utils/transform-stripe-subscription-event-to-database-customer.util';
+describe('transformStripeSubscriptionEventToDatabaseCustomer', () => {
+  const mockWorkspaceId = 'workspace_123';
+  const mockTimestamp = 1672531200; // 2023-01-01 00:00:00 UTC
+
+  const createMockSubscriptionData = (overrides = {}) => ({
+    object: {
+      id: 'sub_123',
+      customer: 'cus_123',
+      status: 'active',
+      items: {
+        data: [
+          {
+            plan: {
+              interval: 'month',
+            },
+          },
+        ],
+      },
+      cancel_at_period_end: false,
+      currency: 'usd',
+      current_period_end: mockTimestamp,
+      current_period_start: mockTimestamp - 2592000, // 30 days before end
+      metadata: {},
+      collection_method: 'charge_automatically',
+      automatic_tax: null,
+      cancellation_details: null,
+      ended_at: null,
+      trial_start: null,
+      trial_end: null,
+      cancel_at: null,
+      canceled_at: null,
+      ...overrides,
+    },
+  });
+
+  it('should transform basic customer data correctly', () => {
+    const mockData = createMockSubscriptionData('cus_123');
+
+    const result = transformStripeSubscriptionEventToDatabaseCustomer(
+      mockWorkspaceId,
+      mockData as any,
+    );
+
+    expect(result).toEqual({
+      workspaceId: 'workspace_123',
+      stripeCustomerId: 'cus_123',
+    });
+  });
+
+  it('should work with different subscription event types', () => {
+    const mockData = createMockSubscriptionData('cus_123');
+
+    // Test with different event types (they should all transform the same way)
+    ['updated', 'created', 'deleted'].forEach(() => {
+      const result = transformStripeSubscriptionEventToDatabaseCustomer(
+        mockWorkspaceId,
+        mockData as any,
+      );
+
+      expect(result).toEqual({
+        workspaceId: 'workspace_123',
+        stripeCustomerId: 'cus_123',
+      });
+    });
+  });
+
+  it('should handle different workspace IDs', () => {
+    const mockData = createMockSubscriptionData('cus_123');
+    const testWorkspaces = ['workspace_1', 'workspace_2', 'workspace_abc'];
+
+    testWorkspaces.forEach((testWorkspaceId) => {
+      const result = transformStripeSubscriptionEventToDatabaseCustomer(
+        testWorkspaceId,
+        mockData as any,
+      );
+
+      expect(result).toEqual({
+        workspaceId: testWorkspaceId,
+        stripeCustomerId: 'cus_123',
+      });
+    });
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/__tests__/transform-stripe-subscription-event-to-database-subscription.util.spec.ts b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/__tests__/transform-stripe-subscription-event-to-database-subscription.util.spec.ts
new file mode 100644
index 000000000000..40823ffce4f3
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/__tests__/transform-stripe-subscription-event-to-database-subscription.util.spec.ts
@@ -0,0 +1,195 @@
+import { BillingSubscriptionCollectionMethod } from 'src/engine/core-modules/billing/enums/billing-subscription-collection-method.enum';
+import { SubscriptionStatus } from 'src/engine/core-modules/billing/enums/billing-subscription-status.enum';
+import { transformStripeSubscriptionEventToDatabaseSubscription } from 'src/engine/core-modules/billing/webhooks/utils/transform-stripe-subscription-event-to-database-subscription.util';
+
+describe('transformStripeSubscriptionEventToDatabaseSubscription', () => {
+  const mockWorkspaceId = 'workspace-123';
+  const mockTimestamp = 1672531200; // 2023-01-01 00:00:00 UTC
+
+  const createMockSubscriptionData = (overrides = {}) => ({
+    object: {
+      id: 'sub_123',
+      customer: 'cus_123',
+      status: 'active',
+      items: {
+        data: [
+          {
+            plan: {
+              interval: 'month',
+            },
+          },
+        ],
+      },
+      cancel_at_period_end: false,
+      currency: 'usd',
+      current_period_end: mockTimestamp,
+      current_period_start: mockTimestamp - 2592000, // 30 days before end
+      metadata: {},
+      collection_method: 'charge_automatically',
+      automatic_tax: null,
+      cancellation_details: null,
+      ended_at: null,
+      trial_start: null,
+      trial_end: null,
+      cancel_at: null,
+      canceled_at: null,
+      ...overrides,
+    },
+  });
+
+  it('should transform basic subscription data correctly', () => {
+    const mockData = createMockSubscriptionData();
+    const result = transformStripeSubscriptionEventToDatabaseSubscription(
+      mockWorkspaceId,
+      mockData as any,
+    );
+
+    expect(result).toEqual({
+      workspaceId: mockWorkspaceId,
+      stripeCustomerId: 'cus_123',
+      stripeSubscriptionId: 'sub_123',
+      status: SubscriptionStatus.Active,
+      interval: 'month',
+      cancelAtPeriodEnd: false,
+      currency: 'USD',
+      currentPeriodEnd: new Date(mockTimestamp * 1000),
+      currentPeriodStart: new Date((mockTimestamp - 2592000) * 1000),
+      metadata: {},
+      collectionMethod:
+        BillingSubscriptionCollectionMethod.CHARGE_AUTOMATICALLY,
+      automaticTax: undefined,
+      cancellationDetails: undefined,
+      endedAt: undefined,
+      trialStart: undefined,
+      trialEnd: undefined,
+      cancelAt: undefined,
+      canceledAt: undefined,
+    });
+  });
+
+  it('should handle all subscription statuses correctly', () => {
+    const statuses = [
+      ['active', SubscriptionStatus.Active],
+      ['canceled', SubscriptionStatus.Canceled],
+      ['incomplete', SubscriptionStatus.Incomplete],
+      ['incomplete_expired', SubscriptionStatus.IncompleteExpired],
+      ['past_due', SubscriptionStatus.PastDue],
+      ['paused', SubscriptionStatus.Paused],
+      ['trialing', SubscriptionStatus.Trialing],
+      ['unpaid', SubscriptionStatus.Unpaid],
+    ];
+
+    statuses.forEach(([stripeStatus, expectedStatus]) => {
+      const mockData = createMockSubscriptionData({
+        status: stripeStatus,
+      });
+      const result = transformStripeSubscriptionEventToDatabaseSubscription(
+        mockWorkspaceId,
+        mockData as any,
+      );
+
+      expect(result.status).toBe(expectedStatus);
+    });
+  });
+
+  it('should handle subscription with trial periods', () => {
+    const trialStart = mockTimestamp - 604800; // 7 days before
+    const trialEnd = mockTimestamp + 604800; // 7 days after
+
+    const mockData = createMockSubscriptionData({
+      trial_start: trialStart,
+      trial_end: trialEnd,
+    });
+
+    const result = transformStripeSubscriptionEventToDatabaseSubscription(
+      mockWorkspaceId,
+      mockData as any,
+    );
+
+    expect(result.trialStart).toEqual(new Date(trialStart * 1000));
+    expect(result.trialEnd).toEqual(new Date(trialEnd * 1000));
+  });
+
+  it('should handle subscription cancellation details', () => {
+    const cancelAt = mockTimestamp + 2592000; // 30 days after
+    const canceledAt = mockTimestamp;
+    const mockData = createMockSubscriptionData({
+      cancel_at: cancelAt,
+      canceled_at: canceledAt,
+      cancel_at_period_end: true,
+      cancellation_details: {
+        comment: 'Customer requested cancellation',
+        feedback: 'too_expensive',
+        reason: 'customer_request',
+      },
+    });
+
+    const result = transformStripeSubscriptionEventToDatabaseSubscription(
+      mockWorkspaceId,
+      mockData as any,
+    );
+
+    expect(result.cancelAt).toEqual(new Date(cancelAt * 1000));
+    expect(result.canceledAt).toEqual(new Date(canceledAt * 1000));
+    expect(result.cancelAtPeriodEnd).toBe(true);
+    expect(result.cancellationDetails).toEqual({
+      comment: 'Customer requested cancellation',
+      feedback: 'too_expensive',
+      reason: 'customer_request',
+    });
+  });
+
+  it('should handle automatic tax information', () => {
+    const mockData = createMockSubscriptionData({
+      automatic_tax: {
+        enabled: true,
+        status: 'calculated',
+      },
+    });
+
+    const result = transformStripeSubscriptionEventToDatabaseSubscription(
+      mockWorkspaceId,
+      mockData as any,
+    );
+
+    expect(result.automaticTax).toEqual({
+      enabled: true,
+      status: 'calculated',
+    });
+  });
+
+  it('should handle different collection methods', () => {
+    const methods = [
+      [
+        'charge_automatically',
+        BillingSubscriptionCollectionMethod.CHARGE_AUTOMATICALLY,
+      ],
+      ['send_invoice', BillingSubscriptionCollectionMethod.SEND_INVOICE],
+    ];
+
+    methods.forEach(([stripeMethod, expectedMethod]) => {
+      const mockData = createMockSubscriptionData({
+        collection_method: stripeMethod,
+      });
+      const result = transformStripeSubscriptionEventToDatabaseSubscription(
+        mockWorkspaceId,
+        mockData as any,
+      );
+
+      expect(result.collectionMethod).toBe(expectedMethod);
+    });
+  });
+
+  it('should handle different currencies', () => {
+    const mockData = createMockSubscriptionData({
+      currency: 'eur',
+    });
+
+    const result = transformStripeSubscriptionEventToDatabaseSubscription(
+      mockWorkspaceId,
+      mockData as any,
+    );
+
+    expect(result.currency).toBe('EUR');
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/transform-stripe-entitlement-updated-event-to-database-entitlement.util.ts b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/transform-stripe-entitlement-updated-event-to-database-entitlement.util.ts
new file mode 100644
index 000000000000..02279dca6914
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/transform-stripe-entitlement-updated-event-to-database-entitlement.util.ts
@@ -0,0 +1,22 @@
+import Stripe from 'stripe';
+
+import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';
+
+export const transformStripeEntitlementUpdatedEventToDatabaseEntitlement = (
+  workspaceId: string,
+  data: Stripe.EntitlementsActiveEntitlementSummaryUpdatedEvent.Data,
+) => {
+  const stripeCustomerId = data.object.customer;
+  const activeEntitlementsKeys = data.object.entitlements.data.map(
+    (entitlement) => entitlement.lookup_key,
+  );
+
+  return Object.values(BillingEntitlementKey).map((key) => {
+    return {
+      workspaceId,
+      key,
+      value: activeEntitlementsKeys.includes(key),
+      stripeCustomerId,
+    };
+  });
+};
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-price-event-to-price-repository-data.util.ts b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/transform-stripe-price-event-to-database-price.util.ts
similarity index 98%
rename from packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-price-event-to-price-repository-data.util.ts
rename to packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/transform-stripe-price-event-to-database-price.util.ts
index 5ce42e1e5b21..66e0bb60da44 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-price-event-to-price-repository-data.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/transform-stripe-price-event-to-database-price.util.ts
@@ -7,7 +7,7 @@ import { BillingPriceType } from 'src/engine/core-modules/billing/enums/billing-
 import { SubscriptionInterval } from 'src/engine/core-modules/billing/enums/billing-subscription-interval.enum';
 import { BillingUsageType } from 'src/engine/core-modules/billing/enums/billing-usage-type.enum';
 
-export const transformStripePriceEventToPriceRepositoryData = (
+export const transformStripePriceEventToDatabasePrice = (
   data: Stripe.PriceCreatedEvent.Data | Stripe.PriceUpdatedEvent.Data,
 ) => {
   return {
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-product-event-to-product-repository-data.util.ts b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/transform-stripe-product-event-to-database-product.util.ts
similarity index 85%
rename from packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-product-event-to-product-repository-data.util.ts
rename to packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/transform-stripe-product-event-to-database-product.util.ts
index 2fea8d36c625..de52681f48f6 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-product-event-to-product-repository-data.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/transform-stripe-product-event-to-database-product.util.ts
@@ -1,13 +1,13 @@
 import Stripe from 'stripe';
 
-export const transformStripeProductEventToProductRepositoryData = (
+export const transformStripeProductEventToDatabaseProduct = (
   data: Stripe.ProductUpdatedEvent.Data | Stripe.ProductCreatedEvent.Data,
 ) => {
   return {
     stripeProductId: data.object.id,
     name: data.object.name,
     active: data.object.active,
-    description: data.object.description,
+    description: data.object.description ?? '',
     images: data.object.images,
     marketingFeatures: data.object.marketing_features,
     defaultStripePriceId: data.object.default_price
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-subscription-event-to-customer-repository-data.util.ts b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/transform-stripe-subscription-event-to-database-customer.util.ts
similarity index 80%
rename from packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-subscription-event-to-customer-repository-data.util.ts
rename to packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/transform-stripe-subscription-event-to-database-customer.util.ts
index 3cb313e27c56..5d14b1acc710 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-subscription-event-to-customer-repository-data.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/transform-stripe-subscription-event-to-database-customer.util.ts
@@ -1,6 +1,6 @@
 import Stripe from 'stripe';
 
-export const transformStripeSubscriptionEventToCustomerRepositoryData = (
+export const transformStripeSubscriptionEventToDatabaseCustomer = (
   workspaceId: string,
   data:
     | Stripe.CustomerSubscriptionUpdatedEvent.Data
diff --git a/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/transform-stripe-subscription-event-to-database-subscription-item.util.ts b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/transform-stripe-subscription-event-to-database-subscription-item.util.ts
new file mode 100644
index 000000000000..f6ecd5c65a39
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/transform-stripe-subscription-event-to-database-subscription-item.util.ts
@@ -0,0 +1,23 @@
+import Stripe from 'stripe';
+
+export const transformStripeSubscriptionEventToDatabaseSubscriptionItem = (
+  billingSubscriptionId: string,
+  data:
+    | Stripe.CustomerSubscriptionUpdatedEvent.Data
+    | Stripe.CustomerSubscriptionCreatedEvent.Data
+    | Stripe.CustomerSubscriptionDeletedEvent.Data,
+) => {
+  return data.object.items.data.map((item) => {
+    return {
+      billingSubscriptionId,
+      stripeSubscriptionId: data.object.id,
+      stripeProductId: String(item.price.product),
+      stripePriceId: item.price.id,
+      stripeSubscriptionItemId: item.id,
+      quantity: item.quantity,
+      metadata: item.metadata,
+      billingThresholds:
+        item.billing_thresholds === null ? undefined : item.billing_thresholds,
+    };
+  });
+};
diff --git a/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-subscription-event-to-subscription-repository-data.util.ts b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/transform-stripe-subscription-event-to-database-subscription.util.ts
similarity index 97%
rename from packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-subscription-event-to-subscription-repository-data.util.ts
rename to packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/transform-stripe-subscription-event-to-database-subscription.util.ts
index 53e37d9a1dc7..8d58e3518bc2 100644
--- a/packages/twenty-server/src/engine/core-modules/billing/utils/transform-stripe-subscription-event-to-subscription-repository-data.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/billing/webhooks/utils/transform-stripe-subscription-event-to-database-subscription.util.ts
@@ -3,7 +3,7 @@ import Stripe from 'stripe';
 import { BillingSubscriptionCollectionMethod } from 'src/engine/core-modules/billing/enums/billing-subscription-collection-method.enum';
 import { SubscriptionStatus } from 'src/engine/core-modules/billing/enums/billing-subscription-status.enum';
 
-export const transformStripeSubscriptionEventToSubscriptionRepositoryData = (
+export const transformStripeSubscriptionEventToDatabaseSubscription = (
   workspaceId: string,
   data:
     | Stripe.CustomerSubscriptionUpdatedEvent.Data
diff --git a/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts b/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts
index c94b2418e050..2fdb7ed8c014 100644
--- a/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/client-config/client-config.entity.ts
@@ -1,8 +1,14 @@
-import { Field, ObjectType } from '@nestjs/graphql';
+import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';
 
+import { BillingTrialPeriodDTO } from 'src/engine/core-modules/billing/dtos/billing-trial-period.dto';
 import { CaptchaDriverType } from 'src/engine/core-modules/captcha/interfaces';
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import { AuthProviders } from 'src/engine/core-modules/workspace/dtos/public-workspace-data-output';
 
+registerEnumType(FeatureFlagKey, {
+  name: 'FeatureFlagKey',
+});
+
 @ObjectType()
 class Billing {
   @Field(() => Boolean)
@@ -11,8 +17,8 @@ class Billing {
   @Field(() => String, { nullable: true })
   billingUrl?: string;
 
-  @Field(() => Number, { nullable: true })
-  billingFreeTrialDurationInDays?: number;
+  @Field(() => [BillingTrialPeriodDTO])
+  trialPeriods: BillingTrialPeriodDTO[];
 }
 
 @ObjectType()
@@ -51,6 +57,27 @@ class ApiConfig {
   mutationMaximumAffectedRecords: number;
 }
 
+@ObjectType()
+class PublicFeatureFlagMetadata {
+  @Field(() => String)
+  label: string;
+
+  @Field(() => String)
+  description: string;
+
+  @Field(() => String, { nullable: false, defaultValue: '' })
+  imagePath: string;
+}
+
+@ObjectType()
+class PublicFeatureFlag {
+  @Field(() => FeatureFlagKey)
+  key: FeatureFlagKey;
+
+  @Field(() => PublicFeatureFlagMetadata)
+  metadata: PublicFeatureFlagMetadata;
+}
+
 @ObjectType()
 export class ClientConfig {
   @Field(() => AuthProviders, { nullable: false })
@@ -66,7 +93,7 @@ export class ClientConfig {
   isMultiWorkspaceEnabled: boolean;
 
   @Field(() => Boolean)
-  isSSOEnabled: boolean;
+  isEmailVerificationRequired: boolean;
 
   @Field(() => String, { nullable: true })
   defaultSubdomain: string;
@@ -94,4 +121,10 @@ export class ClientConfig {
 
   @Field(() => ApiConfig)
   api: ApiConfig;
+
+  @Field(() => Boolean)
+  canManageFeatureFlags: boolean;
+
+  @Field(() => [PublicFeatureFlag])
+  publicFeatureFlags: PublicFeatureFlag[];
 }
diff --git a/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts b/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts
index cbd1fb7d0181..04a25f28677f 100644
--- a/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/client-config/client-config.resolver.ts
@@ -2,6 +2,7 @@ import { Query, Resolver } from '@nestjs/graphql';
 
 import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+import { PUBLIC_FEATURE_FLAGS } from 'src/engine/core-modules/feature-flag/constants/public-feature-flag.const';
 
 import { ClientConfig } from './client-config.entity';
 
@@ -18,9 +19,20 @@ export class ClientConfigResolver {
       billing: {
         isBillingEnabled: this.environmentService.get('IS_BILLING_ENABLED'),
         billingUrl: this.environmentService.get('BILLING_PLAN_REQUIRED_LINK'),
-        billingFreeTrialDurationInDays: this.environmentService.get(
-          'BILLING_FREE_TRIAL_DURATION_IN_DAYS',
-        ),
+        trialPeriods: [
+          {
+            duration: this.environmentService.get(
+              'BILLING_FREE_TRIAL_WITH_CREDIT_CARD_DURATION_IN_DAYS',
+            ),
+            isCreditCardRequired: true,
+          },
+          {
+            duration: this.environmentService.get(
+              'BILLING_FREE_TRIAL_WITHOUT_CREDIT_CARD_DURATION_IN_DAYS',
+            ),
+            isCreditCardRequired: false,
+          },
+        ],
       },
       authProviders: {
         google: this.environmentService.get('AUTH_GOOGLE_ENABLED'),
@@ -29,11 +41,13 @@ export class ClientConfigResolver {
         microsoft: this.environmentService.get('AUTH_MICROSOFT_ENABLED'),
         sso: [],
       },
-      isSSOEnabled: this.environmentService.get('AUTH_SSO_ENABLED'),
       signInPrefilled: this.environmentService.get('SIGN_IN_PREFILLED'),
       isMultiWorkspaceEnabled: this.environmentService.get(
         'IS_MULTIWORKSPACE_ENABLED',
       ),
+      isEmailVerificationRequired: this.environmentService.get(
+        'IS_EMAIL_VERIFICATION_REQUIRED',
+      ),
       defaultSubdomain: this.environmentService.get('DEFAULT_SUBDOMAIN'),
       frontDomain: this.domainManagerService.getFrontUrl().hostname,
       debugMode: this.environmentService.get('DEBUG_MODE'),
@@ -59,6 +73,10 @@ export class ClientConfigResolver {
         ),
       },
       analyticsEnabled: this.environmentService.get('ANALYTICS_ENABLED'),
+      canManageFeatureFlags:
+        this.environmentService.get('DEBUG_MODE') ||
+        this.environmentService.get('IS_BILLING_ENABLED'),
+      publicFeatureFlags: PUBLIC_FEATURE_FLAGS,
     };
 
     return Promise.resolve(clientConfig);
diff --git a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts b/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
index 7ba8899150ce..a99b5cf75f36 100644
--- a/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/core-engine.module.ts
@@ -22,6 +22,7 @@ import { FileStorageModule } from 'src/engine/core-modules/file-storage/file-sto
 import { fileStorageModuleFactory } from 'src/engine/core-modules/file-storage/file-storage.module-factory';
 import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';
 import { HealthModule } from 'src/engine/core-modules/health/health.module';
+import { LabModule } from 'src/engine/core-modules/lab/lab.module';
 import { LLMChatModelModule } from 'src/engine/core-modules/llm-chat-model/llm-chat-model.module';
 import { llmChatModelModuleFactory } from 'src/engine/core-modules/llm-chat-model/llm-chat-model.module-factory';
 import { LLMTracingModule } from 'src/engine/core-modules/llm-tracing/llm-tracing.module';
@@ -72,6 +73,7 @@ import { FileModule } from './file/file.module';
     ActorModule,
     TelemetryModule,
     AdminPanelModule,
+    LabModule,
     EnvironmentModule.forRoot({}),
     RedisClientModule,
     FileStorageModule.forRootAsync({
diff --git a/packages/twenty-server/src/engine/core-modules/domain-manager/service/domain-manager.service.ts b/packages/twenty-server/src/engine/core-modules/domain-manager/service/domain-manager.service.ts
index 6176a403aebb..73b95ac42657 100644
--- a/packages/twenty-server/src/engine/core-modules/domain-manager/service/domain-manager.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/domain-manager/service/domain-manager.service.ts
@@ -59,6 +59,22 @@ export class DomainManagerService {
     return baseUrl;
   }
 
+  buildEmailVerificationURL({
+    emailVerificationToken,
+    email,
+    workspaceSubdomain,
+  }: {
+    emailVerificationToken: string;
+    email: string;
+    workspaceSubdomain?: string;
+  }) {
+    return this.buildWorkspaceURL({
+      subdomain: workspaceSubdomain,
+      pathname: 'verify-email',
+      searchParams: { emailVerificationToken, email },
+    });
+  }
+
   buildWorkspaceURL({
     subdomain,
     pathname,
@@ -129,15 +145,16 @@ export class DomainManagerService {
     return subdomain === this.environmentService.get('DEFAULT_SUBDOMAIN');
   }
 
-  computeRedirectErrorUrl({
-    errorMessage,
-    subdomain,
-  }: {
-    errorMessage: string;
-    subdomain?: string;
-  }) {
-    const url = this.buildWorkspaceURL({
+  computeRedirectErrorUrl(
+    errorMessage: string,
+    {
       subdomain,
+    }: {
+      subdomain?: string;
+    },
+  ) {
+    const url = this.buildWorkspaceURL({
+      subdomain: subdomain ?? this.environmentService.get('DEFAULT_SUBDOMAIN'),
       pathname: '/verify',
       searchParams: { errorMessage },
     });
@@ -193,10 +210,12 @@ export class DomainManagerService {
 
       if (!isDefined(subdomain)) return;
 
-      return await this.workspaceRepository.findOne({
-        where: { subdomain },
-        relations: ['workspaceSSOIdentityProviders'],
-      });
+      return (
+        (await this.workspaceRepository.findOne({
+          where: { subdomain },
+          relations: ['workspaceSSOIdentityProviders'],
+        })) ?? undefined
+      );
     } catch (e) {
       throw new WorkspaceException(
         'Workspace not found',
diff --git a/packages/twenty-server/src/engine/core-modules/email-verification/dtos/resend-email-verification-token.input.ts b/packages/twenty-server/src/engine/core-modules/email-verification/dtos/resend-email-verification-token.input.ts
new file mode 100644
index 000000000000..b97cf1bf432c
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/email-verification/dtos/resend-email-verification-token.input.ts
@@ -0,0 +1,11 @@
+import { ArgsType, Field } from '@nestjs/graphql';
+
+import { IsEmail, IsNotEmpty } from 'class-validator';
+
+@ArgsType()
+export class ResendEmailVerificationTokenInput {
+  @Field(() => String)
+  @IsEmail()
+  @IsNotEmpty()
+  email: string;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/email-verification/dtos/resend-email-verification-token.output.ts b/packages/twenty-server/src/engine/core-modules/email-verification/dtos/resend-email-verification-token.output.ts
new file mode 100644
index 000000000000..57434c5644e9
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/email-verification/dtos/resend-email-verification-token.output.ts
@@ -0,0 +1,10 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+import { IsBoolean } from 'class-validator';
+
+@ObjectType()
+export class ResendEmailVerificationTokenOutput {
+  @IsBoolean()
+  @Field(() => Boolean)
+  success: boolean;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/email-verification/email-verification.exception.ts b/packages/twenty-server/src/engine/core-modules/email-verification/email-verification.exception.ts
new file mode 100644
index 000000000000..cd3c49d961ee
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/email-verification/email-verification.exception.ts
@@ -0,0 +1,17 @@
+import { CustomException } from 'src/utils/custom-exception';
+
+export class EmailVerificationException extends CustomException {
+  constructor(message: string, code: EmailVerificationExceptionCode) {
+    super(message, code);
+  }
+}
+
+export enum EmailVerificationExceptionCode {
+  EMAIL_VERIFICATION_NOT_REQUIRED = 'EMAIL_VERIFICATION_NOT_REQUIRED',
+  INVALID_TOKEN = 'INVALID_TOKEN',
+  INVALID_APP_TOKEN_TYPE = 'INVALID_APP_TOKEN_TYPE',
+  TOKEN_EXPIRED = 'TOKEN_EXPIRED',
+  EMAIL_MISSING = 'EMAIL_MISSING',
+  EMAIL_ALREADY_VERIFIED = 'EMAIL_ALREADY_VERIFIED',
+  RATE_LIMIT_EXCEEDED = 'RATE_LIMIT_EXCEEDED',
+}
diff --git a/packages/twenty-server/src/engine/core-modules/email-verification/email-verification.module.ts b/packages/twenty-server/src/engine/core-modules/email-verification/email-verification.module.ts
new file mode 100644
index 000000000000..233dcb1f39d4
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/email-verification/email-verification.module.ts
@@ -0,0 +1,30 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
+import { EmailVerificationTokenService } from 'src/engine/core-modules/auth/token/services/email-verification-token.service';
+import { DomainManagerModule } from 'src/engine/core-modules/domain-manager/domain-manager.module';
+import { EmailVerificationResolver } from 'src/engine/core-modules/email-verification/email-verification.resolver';
+import { EmailVerificationService } from 'src/engine/core-modules/email-verification/services/email-verification.service';
+import { EmailModule } from 'src/engine/core-modules/email/email.module';
+import { EnvironmentModule } from 'src/engine/core-modules/environment/environment.module';
+import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
+import { UserModule } from 'src/engine/core-modules/user/user.module';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([AppToken], 'core'),
+    EmailModule,
+    EnvironmentModule,
+    DomainManagerModule,
+    UserModule,
+    UserWorkspaceModule,
+  ],
+  providers: [
+    EmailVerificationService,
+    EmailVerificationResolver,
+    EmailVerificationTokenService,
+  ],
+  exports: [EmailVerificationService, EmailVerificationTokenService],
+})
+export class EmailVerificationModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/email-verification/email-verification.resolver.ts b/packages/twenty-server/src/engine/core-modules/email-verification/email-verification.resolver.ts
new file mode 100644
index 000000000000..f9d80f3399fc
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/email-verification/email-verification.resolver.ts
@@ -0,0 +1,35 @@
+import { Args, Mutation, Resolver } from '@nestjs/graphql';
+
+import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
+import { ResendEmailVerificationTokenInput } from 'src/engine/core-modules/email-verification/dtos/resend-email-verification-token.input';
+import { ResendEmailVerificationTokenOutput } from 'src/engine/core-modules/email-verification/dtos/resend-email-verification-token.output';
+import { EmailVerificationService } from 'src/engine/core-modules/email-verification/services/email-verification.service';
+import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace.validate';
+import { OriginHeader } from 'src/engine/decorators/auth/origin-header.decorator';
+
+@Resolver()
+export class EmailVerificationResolver {
+  constructor(
+    private readonly emailVerificationService: EmailVerificationService,
+    private readonly domainManagerService: DomainManagerService,
+  ) {}
+
+  @Mutation(() => ResendEmailVerificationTokenOutput)
+  async resendEmailVerificationToken(
+    @Args()
+    resendEmailVerificationTokenInput: ResendEmailVerificationTokenInput,
+    @OriginHeader() origin: string,
+  ): Promise<ResendEmailVerificationTokenOutput> {
+    const workspace =
+      await this.domainManagerService.getWorkspaceByOriginOrDefaultWorkspace(
+        origin,
+      );
+
+    workspaceValidator.assertIsDefinedOrThrow(workspace);
+
+    return await this.emailVerificationService.resendEmailVerificationToken(
+      resendEmailVerificationTokenInput.email,
+      workspace.subdomain,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/email-verification/services/email-verification.service.ts b/packages/twenty-server/src/engine/core-modules/email-verification/services/email-verification.service.ts
new file mode 100644
index 000000000000..e7e90010962c
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/email-verification/services/email-verification.service.ts
@@ -0,0 +1,131 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { render } from '@react-email/render';
+import { addMilliseconds, differenceInMilliseconds } from 'date-fns';
+import ms from 'ms';
+import { SendEmailVerificationLinkEmail } from 'twenty-emails';
+import { Repository } from 'typeorm';
+
+import {
+  AppToken,
+  AppTokenType,
+} from 'src/engine/core-modules/app-token/app-token.entity';
+import { EmailVerificationTokenService } from 'src/engine/core-modules/auth/token/services/email-verification-token.service';
+import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
+import {
+  EmailVerificationException,
+  EmailVerificationExceptionCode,
+} from 'src/engine/core-modules/email-verification/email-verification.exception';
+import { EmailService } from 'src/engine/core-modules/email/email.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+import { UserService } from 'src/engine/core-modules/user/services/user.service';
+
+@Injectable()
+// eslint-disable-next-line @nx/workspace-inject-workspace-repository
+export class EmailVerificationService {
+  constructor(
+    @InjectRepository(AppToken, 'core')
+    private readonly appTokenRepository: Repository<AppToken>,
+    private readonly domainManagerService: DomainManagerService,
+    private readonly emailService: EmailService,
+    private readonly environmentService: EnvironmentService,
+    private readonly userService: UserService,
+    private readonly emailVerificationTokenService: EmailVerificationTokenService,
+  ) {}
+
+  async sendVerificationEmail(
+    userId: string,
+    email: string,
+    workspaceSubdomain?: string,
+  ) {
+    if (!this.environmentService.get('IS_EMAIL_VERIFICATION_REQUIRED')) {
+      return { success: false };
+    }
+
+    const { token: emailVerificationToken } =
+      await this.emailVerificationTokenService.generateToken(userId, email);
+
+    const verificationLink =
+      this.domainManagerService.buildEmailVerificationURL({
+        emailVerificationToken,
+        email,
+        workspaceSubdomain,
+      });
+
+    const emailData = {
+      link: verificationLink.toString(),
+    };
+
+    const emailTemplate = SendEmailVerificationLinkEmail(emailData);
+
+    const html = render(emailTemplate, {
+      pretty: true,
+    });
+
+    const text = render(emailTemplate, {
+      plainText: true,
+    });
+
+    await this.emailService.send({
+      from: `${this.environmentService.get(
+        'EMAIL_FROM_NAME',
+      )} <${this.environmentService.get('EMAIL_FROM_ADDRESS')}>`,
+      to: email,
+      subject: 'Welcome to Twenty: Please Confirm Your Email',
+      text,
+      html,
+    });
+
+    return { success: true };
+  }
+
+  async resendEmailVerificationToken(
+    email: string,
+    workspaceSubdomain?: string,
+  ) {
+    if (!this.environmentService.get('IS_EMAIL_VERIFICATION_REQUIRED')) {
+      throw new EmailVerificationException(
+        'Email verification token cannot be sent because email verification is not required',
+        EmailVerificationExceptionCode.EMAIL_VERIFICATION_NOT_REQUIRED,
+      );
+    }
+
+    const user = await this.userService.getUserByEmail(email);
+
+    if (user.isEmailVerified) {
+      throw new EmailVerificationException(
+        'Email already verified',
+        EmailVerificationExceptionCode.EMAIL_ALREADY_VERIFIED,
+      );
+    }
+
+    const existingToken = await this.appTokenRepository.findOne({
+      where: {
+        userId: user.id,
+        type: AppTokenType.EmailVerificationToken,
+      },
+    });
+
+    if (existingToken) {
+      const cooldownDuration = ms('1m');
+      const timeToWaitMs = differenceInMilliseconds(
+        addMilliseconds(existingToken.createdAt, cooldownDuration),
+        new Date(),
+      );
+
+      if (timeToWaitMs > 0) {
+        throw new EmailVerificationException(
+          `Please wait ${ms(timeToWaitMs, { long: true })} before requesting another verification email`,
+          EmailVerificationExceptionCode.RATE_LIMIT_EXCEEDED,
+        );
+      }
+
+      await this.appTokenRepository.delete(existingToken.id);
+    }
+
+    await this.sendVerificationEmail(user.id, email, workspaceSubdomain);
+
+    return { success: true };
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/environment/environment-variables.ts b/packages/twenty-server/src/engine/core-modules/environment/environment-variables.ts
index 96b46927df95..04edd54f061c 100644
--- a/packages/twenty-server/src/engine/core-modules/environment/environment-variables.ts
+++ b/packages/twenty-server/src/engine/core-modules/environment/environment-variables.ts
@@ -24,7 +24,6 @@ import { LLMTracingDriver } from 'src/engine/core-modules/llm-tracing/interfaces
 
 import { CacheStorageType } from 'src/engine/core-modules/cache-storage/types/cache-storage-type.enum';
 import { CaptchaDriverType } from 'src/engine/core-modules/captcha/interfaces';
-import { AssertOrWarn } from 'src/engine/core-modules/environment/decorators/assert-or-warn.decorator';
 import { CastToBoolean } from 'src/engine/core-modules/environment/decorators/cast-to-boolean.decorator';
 import { CastToLogLevelArray } from 'src/engine/core-modules/environment/decorators/cast-to-log-level-array.decorator';
 import { CastToPositiveNumber } from 'src/engine/core-modules/environment/decorators/cast-to-positive-number.decorator';
@@ -74,7 +73,13 @@ export class EnvironmentVariables {
   @CastToPositiveNumber()
   @IsOptional()
   @ValidateIf((env) => env.IS_BILLING_ENABLED === true)
-  BILLING_FREE_TRIAL_DURATION_IN_DAYS = 7;
+  BILLING_FREE_TRIAL_WITH_CREDIT_CARD_DURATION_IN_DAYS = 30;
+
+  @IsNumber()
+  @CastToPositiveNumber()
+  @IsOptional()
+  @ValidateIf((env) => env.IS_BILLING_ENABLED === true)
+  BILLING_FREE_TRIAL_WITHOUT_CREDIT_CARD_DURATION_IN_DAYS = 7;
 
   @IsString()
   @ValidateIf((env) => env.IS_BILLING_ENABLED === true)
@@ -199,10 +204,6 @@ export class EnvironmentVariables {
   @ValidateIf((env) => env.AUTH_MICROSOFT_ENABLED)
   AUTH_MICROSOFT_CLIENT_ID: string;
 
-  @IsString()
-  @ValidateIf((env) => env.AUTH_MICROSOFT_ENABLED)
-  AUTH_MICROSOFT_TENANT_ID: string;
-
   @IsString()
   @ValidateIf((env) => env.AUTH_MICROSOFT_ENABLED)
   AUTH_MICROSOFT_CLIENT_SECRET: string;
@@ -232,11 +233,6 @@ export class EnvironmentVariables {
   @ValidateIf((env) => env.AUTH_GOOGLE_ENABLED)
   AUTH_GOOGLE_CALLBACK_URL: string;
 
-  @CastToBoolean()
-  @IsOptional()
-  @IsBoolean()
-  AUTH_SSO_ENABLED = false;
-
   @IsString()
   @IsOptional()
   ENTERPRISE_KEY: string;
@@ -419,6 +415,15 @@ export class EnvironmentVariables {
 
   MESSAGE_QUEUE_TYPE: string = MessageQueueDriverType.BullMQ;
 
+  @CastToBoolean()
+  @IsOptional()
+  @IsBoolean()
+  IS_EMAIL_VERIFICATION_REQUIRED = false;
+
+  @IsDuration()
+  @IsOptional()
+  EMAIL_VERIFICATION_TOKEN_EXPIRES_IN = '1h';
+
   EMAIL_FROM_ADDRESS = 'noreply@yourdomain.com';
 
   EMAIL_SYSTEM_ADDRESS = 'system@yourdomain.com';
@@ -459,16 +464,6 @@ export class EnvironmentVariables {
 
   @IsString()
   @IsOptional()
-  @AssertOrWarn(
-    (env, value) =>
-      !env.AUTH_SSO_ENABLED ||
-      (env.AUTH_SSO_ENABLED &&
-        value !== 'replace_me_with_a_random_string_session'),
-    {
-      message:
-        'SESSION_STORE_SECRET should be changed to a secure, random string.',
-    },
-  )
   SESSION_STORE_SECRET = 'replace_me_with_a_random_string_session';
 
   @CastToBoolean()
diff --git a/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-event.event.ts b/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-event.event.ts
new file mode 100644
index 000000000000..fefd2700094c
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-event.event.ts
@@ -0,0 +1,12 @@
+import { ObjectRecordCreateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-create.event';
+import { ObjectRecordDeleteEvent } from 'src/engine/core-modules/event-emitter/types/object-record-delete.event';
+import { ObjectRecordDestroyEvent } from 'src/engine/core-modules/event-emitter/types/object-record-destroy.event';
+import { ObjectRecordRestoreEvent } from 'src/engine/core-modules/event-emitter/types/object-record-restore.event';
+import { ObjectRecordUpdateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-update.event';
+
+export type ObjectRecordEvent<T = object> =
+  | ObjectRecordUpdateEvent<T>
+  | ObjectRecordDeleteEvent<T>
+  | ObjectRecordCreateEvent<T>
+  | ObjectRecordDestroyEvent<T>
+  | ObjectRecordRestoreEvent<T>;
diff --git a/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-non-destructive-event.ts b/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-non-destructive-event.ts
new file mode 100644
index 000000000000..b29204c04fcb
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-non-destructive-event.ts
@@ -0,0 +1,10 @@
+import { ObjectRecordCreateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-create.event';
+import { ObjectRecordDeleteEvent } from 'src/engine/core-modules/event-emitter/types/object-record-delete.event';
+import { ObjectRecordRestoreEvent } from 'src/engine/core-modules/event-emitter/types/object-record-restore.event';
+import { ObjectRecordUpdateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-update.event';
+
+export type ObjectRecordNonDestructiveEvent =
+  | ObjectRecordCreateEvent
+  | ObjectRecordUpdateEvent
+  | ObjectRecordDeleteEvent
+  | ObjectRecordRestoreEvent;
diff --git a/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-restore.event.ts b/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-restore.event.ts
index 1e46993d1682..070ecb0df502 100644
--- a/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-restore.event.ts
+++ b/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-restore.event.ts
@@ -1,9 +1,9 @@
-import { ObjectRecordBaseEvent } from 'src/engine/core-modules/event-emitter/types/object-record.base.event';
+import { ObjectRecordCreateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-create.event';
 
 export class ObjectRecordRestoreEvent<
   T = object,
-> extends ObjectRecordBaseEvent<T> {
+> extends ObjectRecordCreateEvent<T> {
   properties: {
-    before: T;
+    after: T;
   };
 }
diff --git a/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-update.event.ts b/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-update.event.ts
index ba80ea332150..e6c10c5498ee 100644
--- a/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-update.event.ts
+++ b/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-update.event.ts
@@ -1,13 +1,13 @@
-import { ObjectRecordBaseEvent } from 'src/engine/core-modules/event-emitter/types/object-record.base.event';
 import { ObjectRecordDiff } from 'src/engine/core-modules/event-emitter/types/object-record-diff';
+import { ObjectRecordBaseEvent } from 'src/engine/core-modules/event-emitter/types/object-record.base.event';
 
 export class ObjectRecordUpdateEvent<
   T = object,
 > extends ObjectRecordBaseEvent<T> {
   properties: {
     updatedFields?: string[];
+    diff?: Partial<ObjectRecordDiff<T>>;
     before: T;
     after: T;
-    diff?: Partial<ObjectRecordDiff<T>>;
   };
 }
diff --git a/packages/twenty-server/src/engine/core-modules/event-emitter/utils/object-record-changed-values.ts b/packages/twenty-server/src/engine/core-modules/event-emitter/utils/object-record-changed-values.ts
index c8439f7c0b28..476dd8160be9 100644
--- a/packages/twenty-server/src/engine/core-modules/event-emitter/utils/object-record-changed-values.ts
+++ b/packages/twenty-server/src/engine/core-modules/event-emitter/utils/object-record-changed-values.ts
@@ -1,10 +1,9 @@
 import deepEqual from 'deep-equal';
+import { FieldMetadataType } from 'twenty-shared';
 
 import { ObjectRecord } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
 import { ObjectMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/object-metadata.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-
 export const objectRecordChangedValues = (
   oldRecord: Partial<ObjectRecord>,
   newRecord: Partial<ObjectRecord>,
diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts
new file mode 100644
index 000000000000..bd57b9f60c54
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/constants/public-feature-flag.const.ts
@@ -0,0 +1,14 @@
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
+
+type FeatureFlagMetadata = {
+  label: string;
+  description: string;
+  imagePath: string;
+};
+
+export type PublicFeatureFlag = {
+  key: Extract<FeatureFlagKey, never>;
+  metadata: FeatureFlagMetadata;
+};
+
+export const PUBLIC_FEATURE_FLAGS: PublicFeatureFlag[] = [];
diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/enums/feature-flag-key.enum.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/enums/feature-flag-key.enum.ts
index 703a4fd6a9dc..c08b90e5eb80 100644
--- a/packages/twenty-server/src/engine/core-modules/feature-flag/enums/feature-flag-key.enum.ts
+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/enums/feature-flag-key.enum.ts
@@ -5,17 +5,13 @@ export enum FeatureFlagKey {
   IsStripeIntegrationEnabled = 'IS_STRIPE_INTEGRATION_ENABLED',
   IsCopilotEnabled = 'IS_COPILOT_ENABLED',
   IsFreeAccessEnabled = 'IS_FREE_ACCESS_ENABLED',
-  IsFunctionSettingsEnabled = 'IS_FUNCTION_SETTINGS_ENABLED',
   IsWorkflowEnabled = 'IS_WORKFLOW_ENABLED',
-  IsSSOEnabled = 'IS_SSO_ENABLED',
-  IsGmailSendEmailScopeEnabled = 'IS_GMAIL_SEND_EMAIL_SCOPE_ENABLED',
   IsAnalyticsV2Enabled = 'IS_ANALYTICS_V2_ENABLED',
   IsUniqueIndexesEnabled = 'IS_UNIQUE_INDEXES_ENABLED',
   IsMicrosoftSyncEnabled = 'IS_MICROSOFT_SYNC_ENABLED',
   IsAdvancedFiltersEnabled = 'IS_ADVANCED_FILTERS_ENABLED',
-  IsAggregateQueryEnabled = 'IS_AGGREGATE_QUERY_ENABLED',
-  IsViewGroupsEnabled = 'IS_VIEW_GROUPS_ENABLED',
-  IsPageHeaderV2Enabled = 'IS_PAGE_HEADER_V2_ENABLED',
-  IsCrmMigrationEnabled = 'IS_CRM_MIGRATION_ENABLED',
+  IsCommandMenuV2Enabled = 'IS_COMMAND_MENU_V2_ENABLED',
   IsJsonFilterEnabled = 'IS_JSON_FILTER_ENABLED',
+  IsLocalizationEnabled = 'IS_LOCALIZATION_ENABLED',
+  IsBillingPlansEnabled = 'IS_BILLING_PLANS_ENABLED',
 }
diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.exception.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.exception.ts
new file mode 100644
index 000000000000..050852840ef8
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.exception.ts
@@ -0,0 +1,14 @@
+import { CustomException } from 'src/utils/custom-exception';
+
+export class FeatureFlagException extends CustomException {
+  code: FeatureFlagExceptionCode;
+  constructor(message: string, code: FeatureFlagExceptionCode) {
+    super(message, code);
+  }
+}
+
+export enum FeatureFlagExceptionCode {
+  INVALID_FEATURE_FLAG_KEY = 'INVALID_FEATURE_FLAG_KEY',
+  FEATURE_FLAG_IS_NOT_PUBLIC = 'FEATURE_FLAG_IS_NOT_PUBLIC',
+  FEATURE_FLAG_NOT_FOUND = 'FEATURE_FLAG_NOT_FOUND',
+}
diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/services/feature-flag.service.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/services/feature-flag.service.ts
index cd2e4ca4d255..7acd8612e6fc 100644
--- a/packages/twenty-server/src/engine/core-modules/feature-flag/services/feature-flag.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/services/feature-flag.service.ts
@@ -30,10 +30,15 @@ export class FeatureFlagService {
 
   public async getWorkspaceFeatureFlags(
     workspaceId: string,
+  ): Promise<FeatureFlagEntity[]> {
+    return this.featureFlagRepository.find({ where: { workspaceId } });
+  }
+
+  public async getWorkspaceFeatureFlagsMap(
+    workspaceId: string,
   ): Promise<FeatureFlagMap> {
-    const workspaceFeatureFlags = await this.featureFlagRepository.find({
-      where: { workspaceId },
-    });
+    const workspaceFeatureFlags =
+      await this.getWorkspaceFeatureFlags(workspaceId);
 
     const workspaceFeatureFlagsMap = workspaceFeatureFlags.reduce(
       (result, currentFeatureFlag) => {
diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/validates/feature-flag.validate.spec.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/validates/feature-flag.validate.spec.ts
new file mode 100644
index 000000000000..19286d646ddb
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/validates/feature-flag.validate.spec.ts
@@ -0,0 +1,24 @@
+import { CustomException } from 'src/utils/custom-exception';
+import { featureFlagValidator } from 'src/engine/core-modules/feature-flag/validates/feature-flag.validate';
+
+describe('featureFlagValidator', () => {
+  describe('assertIsFeatureFlagKey', () => {
+    it('should not throw error if featureFlagKey is valid', () => {
+      expect(() =>
+        featureFlagValidator.assertIsFeatureFlagKey(
+          'IsWorkflowEnabled',
+          new CustomException('Error', 'Error'),
+        ),
+      ).not.toThrow();
+    });
+
+    it('should throw error if featureFlagKey is invalid', () => {
+      const invalidKey = 'InvalidKey';
+      const exception = new CustomException('Error', 'Error');
+
+      expect(() =>
+        featureFlagValidator.assertIsFeatureFlagKey(invalidKey, exception),
+      ).toThrow(exception);
+    });
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/validates/feature-flag.validate.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/validates/feature-flag.validate.ts
new file mode 100644
index 000000000000..9022ccea33fe
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/validates/feature-flag.validate.ts
@@ -0,0 +1,17 @@
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
+import { CustomException } from 'src/utils/custom-exception';
+import { isDefined } from 'src/utils/is-defined';
+
+const assertIsFeatureFlagKey = (
+  featureFlagKey: string,
+  exceptionToThrow: CustomException,
+): asserts featureFlagKey is FeatureFlagKey => {
+  if (isDefined(FeatureFlagKey[featureFlagKey])) return;
+  throw exceptionToThrow;
+};
+
+export const featureFlagValidator: {
+  assertIsFeatureFlagKey: typeof assertIsFeatureFlagKey;
+} = {
+  assertIsFeatureFlagKey: assertIsFeatureFlagKey,
+};
diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/validates/is-public-feature-flag.validate.spec.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/validates/is-public-feature-flag.validate.spec.ts
new file mode 100644
index 000000000000..2998992aea26
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/validates/is-public-feature-flag.validate.spec.ts
@@ -0,0 +1,109 @@
+import {
+  AuthException,
+  AuthExceptionCode,
+} from 'src/engine/core-modules/auth/auth.exception';
+import { PublicFeatureFlag } from 'src/engine/core-modules/feature-flag/constants/public-feature-flag.const';
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
+import { publicFeatureFlagValidator } from 'src/engine/core-modules/feature-flag/validates/is-public-feature-flag.validate';
+
+jest.mock(
+  'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum',
+  () => ({
+    FeatureFlagKey: {
+      mockKey1: 'MOCK_KEY_1',
+      mockKey2: 'MOCK_KEY_2',
+    },
+  }),
+);
+
+const mockPublicFeatureFlag = {
+  key: 'MOCK_KEY_1',
+  metadata: {
+    label: 'Mock Label 1',
+    description: 'Mock Description 1',
+    imagePath: 'mock/path/1',
+  },
+};
+
+jest.mock(
+  'src/engine/core-modules/lab/utils/is-public-feature-flag.util',
+  () => ({
+    isPublicFeatureFlag: (
+      key: FeatureFlagKey,
+    ): key is PublicFeatureFlag['key'] => {
+      if (!key) return false;
+
+      return key === mockPublicFeatureFlag.key;
+    },
+  }),
+);
+
+// Note: We're using a single public flag for testing as it's sufficient to verify
+// the validator's behavior. The validator's role is to check if a flag exists in
+// the PUBLIC_FEATURE_FLAGS array, so testing with one flag adequately covers this
+// functionality. Adding more flags wouldn't increase the test coverage meaningfully.
+
+describe('publicFeatureFlagValidator', () => {
+  describe('assertIsPublicFeatureFlag', () => {
+    const mockException = new AuthException(
+      'Not a public feature flag',
+      AuthExceptionCode.INVALID_INPUT,
+    );
+
+    it('should not throw for public feature flags', () => {
+      const publicFlag = mockPublicFeatureFlag.key as FeatureFlagKey;
+
+      expect(() => {
+        publicFeatureFlagValidator.assertIsPublicFeatureFlag(
+          publicFlag,
+          mockException,
+        );
+      }).not.toThrow();
+    });
+
+    it('should throw the provided exception for non-public feature flags', () => {
+      const nonPublicFlag = 'MOCK_KEY_2' as FeatureFlagKey;
+
+      expect(() => {
+        publicFeatureFlagValidator.assertIsPublicFeatureFlag(
+          nonPublicFlag,
+          mockException,
+        );
+      }).toThrow(mockException);
+    });
+
+    it('should throw the provided exception for undefined key', () => {
+      expect(() => {
+        publicFeatureFlagValidator.assertIsPublicFeatureFlag(
+          undefined as unknown as FeatureFlagKey,
+          mockException,
+        );
+      }).toThrow(mockException);
+    });
+
+    it('should throw the provided exception for null key', () => {
+      expect(() => {
+        publicFeatureFlagValidator.assertIsPublicFeatureFlag(
+          null as unknown as FeatureFlagKey,
+          mockException,
+        );
+      }).toThrow(mockException);
+    });
+
+    it('should maintain type assertion after validation', () => {
+      const publicFlag = mockPublicFeatureFlag;
+
+      const testTypeAssertion = (flag: FeatureFlagKey) => {
+        publicFeatureFlagValidator.assertIsPublicFeatureFlag(
+          flag,
+          mockException,
+        );
+        const _test: PublicFeatureFlag['key'] = flag;
+
+        return true;
+      };
+
+      expect(testTypeAssertion(publicFlag.key as FeatureFlagKey)).toBe(true);
+    });
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/validates/is-public-feature-flag.validate.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/validates/is-public-feature-flag.validate.ts
new file mode 100644
index 000000000000..d28e9359c467
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/validates/is-public-feature-flag.validate.ts
@@ -0,0 +1,19 @@
+import { PublicFeatureFlag } from 'src/engine/core-modules/feature-flag/constants/public-feature-flag.const';
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
+import { isPublicFeatureFlag } from 'src/engine/core-modules/lab/utils/is-public-feature-flag.util';
+import { CustomException } from 'src/utils/custom-exception';
+
+const assertIsPublicFeatureFlag = (
+  key: FeatureFlagKey,
+  exceptionToThrow: CustomException,
+): asserts key is PublicFeatureFlag['key'] => {
+  if (!isPublicFeatureFlag(key)) {
+    throw exceptionToThrow;
+  }
+};
+
+export const publicFeatureFlagValidator: {
+  assertIsPublicFeatureFlag: typeof assertIsPublicFeatureFlag;
+} = {
+  assertIsPublicFeatureFlag: assertIsPublicFeatureFlag,
+};
diff --git a/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.spec.ts b/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.spec.ts
index 295c89b1b1b0..d4d9205290e4 100644
--- a/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.spec.ts
@@ -1,8 +1,9 @@
-import { Test, TestingModule } from '@nestjs/testing';
 import { CanActivate } from '@nestjs/common';
+import { Test, TestingModule } from '@nestjs/testing';
 
-import { FileService } from 'src/engine/core-modules/file/services/file.service';
+import { FileApiExceptionFilter } from 'src/engine/core-modules/file/filters/file-api-exception.filter';
 import { FilePathGuard } from 'src/engine/core-modules/file/guards/file-path-guard';
+import { FileService } from 'src/engine/core-modules/file/services/file.service';
 
 import { FileController } from './file.controller';
 
@@ -22,6 +23,8 @@ describe('FileController', () => {
     })
       .overrideGuard(FilePathGuard)
       .useValue(mock_FilePathGuard)
+      .overrideFilter(FileApiExceptionFilter)
+      .useValue({})
       .compile();
 
     controller = module.get<FileController>(FileController);
diff --git a/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.ts b/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.ts
index cd95d43c79aa..4c9ed0744b93 100644
--- a/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/controllers/file.controller.ts
@@ -1,4 +1,12 @@
-import { Controller, Get, Param, Req, Res, UseGuards } from '@nestjs/common';
+import {
+  Controller,
+  Get,
+  Param,
+  Req,
+  Res,
+  UseFilters,
+  UseGuards,
+} from '@nestjs/common';
 
 import { Response } from 'express';
 
@@ -7,15 +15,20 @@ import {
   FileStorageExceptionCode,
 } from 'src/engine/core-modules/file-storage/interfaces/file-storage-exception';
 
+import {
+  FileException,
+  FileExceptionCode,
+} from 'src/engine/core-modules/file/file.exception';
 import {
   checkFilePath,
   checkFilename,
 } from 'src/engine/core-modules/file/file.utils';
+import { FileApiExceptionFilter } from 'src/engine/core-modules/file/filters/file-api-exception.filter';
 import { FilePathGuard } from 'src/engine/core-modules/file/guards/file-path-guard';
 import { FileService } from 'src/engine/core-modules/file/services/file.service';
 
-// TODO: Add cookie authentication
 @Controller('files')
+@UseFilters(FileApiExceptionFilter)
 @UseGuards(FilePathGuard)
 export class FileController {
   constructor(private readonly fileService: FileService) {}
@@ -27,15 +40,15 @@ export class FileController {
     @Req() req: Request,
   ) {
     const folderPath = checkFilePath(params[0]);
-
     const filename = checkFilename(params['filename']);
 
     const workspaceId = (req as any)?.workspaceId;
 
     if (!workspaceId) {
-      return res
-        .status(401)
-        .send({ error: 'Unauthorized, missing workspaceId' });
+      throw new FileException(
+        'Unauthorized: missing workspaceId',
+        FileExceptionCode.UNAUTHENTICATED,
+      );
     }
 
     try {
@@ -46,7 +59,10 @@ export class FileController {
       );
 
       fileStream.on('error', () => {
-        res.status(500).send({ error: 'Internal server error' });
+        throw new FileException(
+          'Error streaming file from storage',
+          FileExceptionCode.INTERNAL_SERVER_ERROR,
+        );
       });
 
       fileStream.pipe(res);
@@ -55,10 +71,16 @@ export class FileController {
         error instanceof FileStorageException &&
         error.code === FileStorageExceptionCode.FILE_NOT_FOUND
       ) {
-        return res.status(404).send({ error: 'File not found' });
+        throw new FileException(
+          'File not found',
+          FileExceptionCode.FILE_NOT_FOUND,
+        );
       }
 
-      return res.status(500).send({ error: 'Internal server error' });
+      throw new FileException(
+        `Error retrieving file: ${error.message}`,
+        FileExceptionCode.INTERNAL_SERVER_ERROR,
+      );
     }
   }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/file/file.exception.ts b/packages/twenty-server/src/engine/core-modules/file/file.exception.ts
new file mode 100644
index 000000000000..4a953f2355f7
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/file/file.exception.ts
@@ -0,0 +1,14 @@
+import { CustomException } from 'src/utils/custom-exception';
+
+export enum FileExceptionCode {
+  UNAUTHENTICATED = 'UNAUTHENTICATED',
+  INTERNAL_SERVER_ERROR = 'INTERNAL_SERVER_ERROR',
+  FILE_NOT_FOUND = 'FILE_NOT_FOUND',
+}
+
+export class FileException extends CustomException {
+  code: FileExceptionCode;
+  constructor(message: string, code: FileExceptionCode) {
+    super(message, code);
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/file/filters/file-api-exception.filter.ts b/packages/twenty-server/src/engine/core-modules/file/filters/file-api-exception.filter.ts
new file mode 100644
index 000000000000..548c44155733
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/file/filters/file-api-exception.filter.ts
@@ -0,0 +1,43 @@
+import { ArgumentsHost, Catch, ExceptionFilter } from '@nestjs/common';
+
+import { Response } from 'express';
+
+import { HttpExceptionHandlerService } from 'src/engine/core-modules/exception-handler/http-exception-handler.service';
+import {
+  FileException,
+  FileExceptionCode,
+} from 'src/engine/core-modules/file/file.exception';
+
+@Catch(FileException)
+export class FileApiExceptionFilter implements ExceptionFilter {
+  constructor(
+    private readonly httpExceptionHandlerService: HttpExceptionHandlerService,
+  ) {}
+
+  catch(exception: FileException, host: ArgumentsHost) {
+    const ctx = host.switchToHttp();
+    const response = ctx.getResponse<Response>();
+
+    switch (exception.code) {
+      case FileExceptionCode.UNAUTHENTICATED:
+        return this.httpExceptionHandlerService.handleError(
+          exception,
+          response,
+          403,
+        );
+      case FileExceptionCode.FILE_NOT_FOUND:
+        return this.httpExceptionHandlerService.handleError(
+          exception,
+          response,
+          404,
+        );
+      case FileExceptionCode.INTERNAL_SERVER_ERROR:
+      default:
+        return this.httpExceptionHandlerService.handleError(
+          exception,
+          response,
+          500,
+        );
+    }
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/file/guards/file-path-guard.ts b/packages/twenty-server/src/engine/core-modules/file/guards/file-path-guard.ts
index 3296a57cf76e..0cbe988a03c6 100644
--- a/packages/twenty-server/src/engine/core-modules/file/guards/file-path-guard.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/guards/file-path-guard.ts
@@ -1,10 +1,4 @@
-import {
-  CanActivate,
-  ExecutionContext,
-  HttpException,
-  HttpStatus,
-  Injectable,
-} from '@nestjs/common';
+import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 
 import { JwtWrapperService } from 'src/engine/core-modules/jwt/services/jwt-wrapper.service';
 
@@ -20,12 +14,16 @@ export class FilePathGuard implements CanActivate {
       return false;
     }
 
-    const payload = await this.jwtWrapperService.verifyWorkspaceToken(
-      query['token'],
-      'FILE',
-    );
+    try {
+      const payload = await this.jwtWrapperService.verifyWorkspaceToken(
+        query['token'],
+        'FILE',
+      );
 
-    if (!payload.workspaceId) {
+      if (!payload.workspaceId) {
+        return false;
+      }
+    } catch (error) {
       return false;
     }
 
@@ -33,32 +31,10 @@ export class FilePathGuard implements CanActivate {
       json: true,
     });
 
-    const expirationDate = decodedPayload?.['expirationDate'];
     const workspaceId = decodedPayload?.['workspaceId'];
 
-    const isExpired = await this.isExpired(expirationDate);
-
-    if (isExpired) {
-      return false;
-    }
-
     request.workspaceId = workspaceId;
 
     return true;
   }
-
-  private async isExpired(expirationDate: string): Promise<boolean> {
-    if (!expirationDate) {
-      return true;
-    }
-
-    if (new Date(expirationDate) < new Date()) {
-      throw new HttpException(
-        'This url has expired. Please reload twenty page and open file again.',
-        HttpStatus.FORBIDDEN,
-      );
-    }
-
-    return false;
-  }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/file/services/file.service.ts b/packages/twenty-server/src/engine/core-modules/file/services/file.service.ts
index c4c240f21051..8bc2dc022195 100644
--- a/packages/twenty-server/src/engine/core-modules/file/services/file.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/file/services/file.service.ts
@@ -2,9 +2,6 @@ import { Injectable } from '@nestjs/common';
 
 import { Stream } from 'stream';
 
-import { addMilliseconds } from 'date-fns';
-import ms from 'ms';
-
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { FileStorageService } from 'src/engine/core-modules/file-storage/file-storage.service';
 import { JwtWrapperService } from 'src/engine/core-modules/jwt/services/jwt-wrapper.service';
@@ -39,15 +36,13 @@ export class FileService {
       payloadToEncode.workspaceId,
     );
 
-    const expirationDate = addMilliseconds(new Date(), ms(fileTokenExpiresIn));
-
     const signedPayload = this.jwtWrapperService.sign(
       {
-        expirationDate: expirationDate,
         ...payloadToEncode,
       },
       {
         secret,
+        expiresIn: fileTokenExpiresIn,
       },
     );
 
diff --git a/packages/twenty-server/src/engine/core-modules/graphql/utils/graphql-errors.util.ts b/packages/twenty-server/src/engine/core-modules/graphql/utils/graphql-errors.util.ts
index 799ccedc4f8d..d91ef60ade1a 100644
--- a/packages/twenty-server/src/engine/core-modules/graphql/utils/graphql-errors.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/graphql/utils/graphql-errors.util.ts
@@ -24,6 +24,7 @@ export enum ErrorCode {
   PERSISTED_QUERY_NOT_SUPPORTED = 'PERSISTED_QUERY_NOT_SUPPORTED',
   BAD_USER_INPUT = 'BAD_USER_INPUT',
   NOT_FOUND = 'NOT_FOUND',
+  EMAIL_NOT_VERIFIED = 'EMAIL_NOT_VERIFIED',
   METHOD_NOT_ALLOWED = 'METHOD_NOT_ALLOWED',
   CONFLICT = 'CONFLICT',
   TIMEOUT = 'TIMEOUT',
@@ -160,6 +161,14 @@ export class NotFoundError extends BaseGraphQLError {
   }
 }
 
+export class EmailNotVerifiedError extends BaseGraphQLError {
+  constructor(message: string) {
+    super(message, ErrorCode.EMAIL_NOT_VERIFIED);
+
+    Object.defineProperty(this, 'name', { value: 'EmailNotVerifiedError' });
+  }
+}
+
 export class MethodNotAllowedError extends BaseGraphQLError {
   constructor(message: string) {
     super(message, ErrorCode.METHOD_NOT_ALLOWED);
diff --git a/packages/twenty-server/src/engine/core-modules/lab/dtos/update-lab-public-feature-flag.input.ts b/packages/twenty-server/src/engine/core-modules/lab/dtos/update-lab-public-feature-flag.input.ts
new file mode 100644
index 000000000000..3eea0b6204a2
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/lab/dtos/update-lab-public-feature-flag.input.ts
@@ -0,0 +1,16 @@
+import { Field, InputType } from '@nestjs/graphql';
+
+import { IsBoolean, IsNotEmpty } from 'class-validator';
+
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
+
+@InputType()
+export class UpdateLabPublicFeatureFlagInput {
+  @Field(() => String)
+  @IsNotEmpty()
+  publicFeatureFlag: FeatureFlagKey;
+
+  @Field(() => Boolean)
+  @IsBoolean()
+  value: boolean;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/lab/lab.module.ts b/packages/twenty-server/src/engine/core-modules/lab/lab.module.ts
new file mode 100644
index 000000000000..87f0cd03100f
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/lab/lab.module.ts
@@ -0,0 +1,16 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+
+import { LabResolver } from './lab.resolver';
+
+import { LabService } from './services/lab.service';
+
+@Module({
+  imports: [TypeOrmModule.forFeature([FeatureFlagEntity, Workspace], 'core')],
+  providers: [LabService, LabResolver],
+  exports: [LabService],
+})
+export class LabModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/lab/lab.resolver.ts b/packages/twenty-server/src/engine/core-modules/lab/lab.resolver.ts
new file mode 100644
index 000000000000..8e20917c84fa
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/lab/lab.resolver.ts
@@ -0,0 +1,26 @@
+import { UseFilters, UseGuards } from '@nestjs/common';
+import { Args, Mutation, Resolver } from '@nestjs/graphql';
+
+import { AuthGraphqlApiExceptionFilter } from 'src/engine/core-modules/auth/filters/auth-graphql-api-exception.filter';
+import { UpdateLabPublicFeatureFlagInput } from 'src/engine/core-modules/lab/dtos/update-lab-public-feature-flag.input';
+import { LabService } from 'src/engine/core-modules/lab/services/lab.service';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
+
+@Resolver()
+@UseFilters(AuthGraphqlApiExceptionFilter)
+export class LabResolver {
+  constructor(private labService: LabService) {}
+
+  @UseGuards(WorkspaceAuthGuard)
+  @Mutation(() => Boolean)
+  async updateLabPublicFeatureFlag(
+    @Args('input') input: UpdateLabPublicFeatureFlagInput,
+    @AuthWorkspace() workspace: Workspace,
+  ): Promise<boolean> {
+    await this.labService.updateLabPublicFeatureFlag(workspace.id, input);
+
+    return true;
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/lab/services/lab.service.ts b/packages/twenty-server/src/engine/core-modules/lab/services/lab.service.ts
new file mode 100644
index 000000000000..949c2cb07714
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/lab/services/lab.service.ts
@@ -0,0 +1,76 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Repository } from 'typeorm';
+
+import {
+  AuthException,
+  AuthExceptionCode,
+} from 'src/engine/core-modules/auth/auth.exception';
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import {
+  FeatureFlagException,
+  FeatureFlagExceptionCode,
+} from 'src/engine/core-modules/feature-flag/feature-flag.exception';
+import { featureFlagValidator } from 'src/engine/core-modules/feature-flag/validates/feature-flag.validate';
+import { publicFeatureFlagValidator } from 'src/engine/core-modules/feature-flag/validates/is-public-feature-flag.validate';
+import { UpdateLabPublicFeatureFlagInput } from 'src/engine/core-modules/lab/dtos/update-lab-public-feature-flag.input';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace.validate';
+
+@Injectable()
+export class LabService {
+  constructor(
+    @InjectRepository(FeatureFlagEntity, 'core')
+    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
+    @InjectRepository(Workspace, 'core')
+    private readonly workspaceRepository: Repository<Workspace>,
+  ) {}
+
+  async updateLabPublicFeatureFlag(
+    workspaceId: string,
+    payload: UpdateLabPublicFeatureFlagInput,
+  ): Promise<void> {
+    featureFlagValidator.assertIsFeatureFlagKey(
+      payload.publicFeatureFlag,
+      new FeatureFlagException(
+        'Invalid feature flag key',
+        FeatureFlagExceptionCode.INVALID_FEATURE_FLAG_KEY,
+      ),
+    );
+
+    publicFeatureFlagValidator.assertIsPublicFeatureFlag(
+      FeatureFlagKey[payload.publicFeatureFlag],
+      new FeatureFlagException(
+        'Feature flag is not public',
+        FeatureFlagExceptionCode.FEATURE_FLAG_IS_NOT_PUBLIC,
+      ),
+    );
+
+    const workspace = await this.workspaceRepository.findOne({
+      where: { id: workspaceId },
+      relations: ['featureFlags'],
+    });
+
+    workspaceValidator.assertIsDefinedOrThrow(
+      workspace,
+      new AuthException('Workspace not found', AuthExceptionCode.INVALID_INPUT),
+    );
+
+    const existingFlag = workspace.featureFlags?.find(
+      (flag) => flag.key === FeatureFlagKey[payload.publicFeatureFlag],
+    );
+
+    if (!existingFlag) {
+      throw new FeatureFlagException(
+        'Public feature flag not found',
+        FeatureFlagExceptionCode.FEATURE_FLAG_NOT_FOUND,
+      );
+    }
+
+    await this.featureFlagRepository.update(existingFlag.id, {
+      value: payload.value,
+    });
+  }
+}
diff --git a/packages/twenty-server/src/engine/core-modules/lab/utils/is-public-feature-flag.util.spec.ts b/packages/twenty-server/src/engine/core-modules/lab/utils/is-public-feature-flag.util.spec.ts
new file mode 100644
index 000000000000..5aa2a9791b83
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/lab/utils/is-public-feature-flag.util.spec.ts
@@ -0,0 +1,48 @@
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
+
+import { isPublicFeatureFlag } from './is-public-feature-flag.util';
+
+jest.mock(
+  'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum',
+  () => ({
+    FeatureFlagKey: {
+      mockKey1: 'MOCK_KEY_1',
+      mockKey2: 'MOCK_KEY_2',
+    },
+  }),
+);
+
+jest.mock(
+  'src/engine/core-modules/feature-flag/constants/public-feature-flag.const',
+  () => ({
+    PUBLIC_FEATURE_FLAGS: [
+      {
+        key: 'MOCK_KEY_1',
+        metadata: {
+          label: 'Mock Label 1',
+          description: 'Mock Description 1',
+          imagePath: 'mock/path/1',
+        },
+      },
+    ],
+  }),
+);
+
+describe('isPublicFeatureFlag', () => {
+  it('should return true for public flags', () => {
+    const publicFlag = 'MOCK_KEY_1';
+
+    expect(isPublicFeatureFlag(publicFlag as FeatureFlagKey)).toBe(true);
+  });
+
+  it('should return false for non-public flags', () => {
+    const nonPublicFlag = 'MOCK_KEY_2';
+
+    expect(isPublicFeatureFlag(nonPublicFlag as FeatureFlagKey)).toBe(false);
+  });
+
+  it('should return false for undefined/null', () => {
+    expect(isPublicFeatureFlag(undefined as any)).toBe(false);
+    expect(isPublicFeatureFlag(null as any)).toBe(false);
+  });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/lab/utils/is-public-feature-flag.util.ts b/packages/twenty-server/src/engine/core-modules/lab/utils/is-public-feature-flag.util.ts
new file mode 100644
index 000000000000..bd08582ba791
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/lab/utils/is-public-feature-flag.util.ts
@@ -0,0 +1,15 @@
+import {
+  PUBLIC_FEATURE_FLAGS,
+  PublicFeatureFlag,
+} from 'src/engine/core-modules/feature-flag/constants/public-feature-flag.const';
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
+
+export const isPublicFeatureFlag = (
+  key: FeatureFlagKey,
+): key is PublicFeatureFlag['key'] => {
+  if (!key) {
+    return false;
+  }
+
+  return PUBLIC_FEATURE_FLAGS.some((flag) => flag.key === key);
+};
diff --git a/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.service.ts b/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.service.ts
index 894369f71847..413df67c6fc9 100644
--- a/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/onboarding/onboarding.service.ts
@@ -1,13 +1,12 @@
 import { Injectable } from '@nestjs/common';
 
+import { WorkspaceActivationStatus } from 'twenty-shared';
+
 import { BillingService } from 'src/engine/core-modules/billing/services/billing.service';
 import { OnboardingStatus } from 'src/engine/core-modules/onboarding/enums/onboarding-status.enum';
 import { UserVarsService } from 'src/engine/core-modules/user/user-vars/services/user-vars.service';
 import { User } from 'src/engine/core-modules/user/user.entity';
-import {
-  Workspace,
-  WorkspaceActivationStatus,
-} from 'src/engine/core-modules/workspace/workspace.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 
 export enum OnboardingStepKeys {
   ONBOARDING_CONNECT_ACCOUNT_PENDING = 'ONBOARDING_CONNECT_ACCOUNT_PENDING',
@@ -30,7 +29,7 @@ export class OnboardingService {
 
   private async isSubscriptionIncompleteOnboardingStatus(workspace: Workspace) {
     const hasSubscription =
-      await this.billingService.hasWorkspaceActiveSubscriptionOrFreeAccessOrEntitlement(
+      await this.billingService.hasWorkspaceSubscriptionOrFreeAccess(
         workspace.id,
       );
 
diff --git a/packages/twenty-server/src/engine/core-modules/open-api/utils/components.utils.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/components.utils.ts
index 99e369965d17..e01c55257ad2 100644
--- a/packages/twenty-server/src/engine/core-modules/open-api/utils/components.utils.ts
+++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/components.utils.ts
@@ -1,5 +1,5 @@
 import { OpenAPIV3_1 } from 'openapi-types';
-import { capitalize } from 'twenty-shared';
+import { capitalize, FieldMetadataType } from 'twenty-shared';
 
 import {
   computeDepthParameters,
@@ -10,10 +10,7 @@ import {
   computeOrderByParameters,
   computeStartingAfterParameters,
 } from 'src/engine/core-modules/open-api/utils/parameters.utils';
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 
diff --git a/packages/twenty-server/src/engine/core-modules/serverless/drivers/lambda.driver.ts b/packages/twenty-server/src/engine/core-modules/serverless/drivers/lambda.driver.ts
index 3823999a56b3..08e9b719a361 100644
--- a/packages/twenty-server/src/engine/core-modules/serverless/drivers/lambda.driver.ts
+++ b/packages/twenty-server/src/engine/core-modules/serverless/drivers/lambda.driver.ts
@@ -237,7 +237,7 @@ export class LambdaDriver implements ServerlessDriver {
         Role: this.lambdaRole,
         Runtime: serverlessFunction.runtime,
         Description: 'Lambda function to run user script',
-        Timeout: 900,
+        Timeout: serverlessFunction.timeoutSeconds,
       };
 
       const command = new CreateFunctionCommand(params);
@@ -259,6 +259,7 @@ export class LambdaDriver implements ServerlessDriver {
             Variables: envVariables,
           },
           FunctionName: serverlessFunction.id,
+          Timeout: serverlessFunction.timeoutSeconds,
         };
 
       const updateConfigurationCommand = new UpdateFunctionConfigurationCommand(
diff --git a/packages/twenty-server/src/engine/core-modules/serverless/drivers/local.driver.ts b/packages/twenty-server/src/engine/core-modules/serverless/drivers/local.driver.ts
index 50943f428820..a24e5cc8fe06 100644
--- a/packages/twenty-server/src/engine/core-modules/serverless/drivers/local.driver.ts
+++ b/packages/twenty-server/src/engine/core-modules/serverless/drivers/local.driver.ts
@@ -183,7 +183,17 @@ export class LocalDriver implements ServerlessDriver {
       return await new Promise((resolve, reject) => {
         const child = fork(listenerFile, { silent: true });
 
+        const timeoutMs = serverlessFunction.timeoutSeconds * 1_000;
+
+        const timeoutHandler = setTimeout(() => {
+          child.kill();
+          const duration = Date.now() - startTime;
+
+          reject(new Error(`Task timed out after ${duration / 1_000} seconds`));
+        }, timeoutMs);
+
         child.on('message', (message: object | ServerlessExecuteError) => {
+          clearTimeout(timeoutHandler);
           const duration = Date.now() - startTime;
 
           if ('errorType' in message) {
@@ -204,6 +214,7 @@ export class LocalDriver implements ServerlessDriver {
         });
 
         child.stderr?.on('data', (data) => {
+          clearTimeout(timeoutHandler);
           const stackTrace = data
             .toString()
             .split('\n')
@@ -235,11 +246,13 @@ export class LocalDriver implements ServerlessDriver {
         });
 
         child.on('error', (error) => {
+          clearTimeout(timeoutHandler);
           reject(error);
           child.kill();
         });
 
         child.on('exit', (code) => {
+          clearTimeout(timeoutHandler);
           if (code && code !== 0) {
             reject(new Error(`Child process exited with code ${code}`));
           }
diff --git a/packages/twenty-server/src/engine/core-modules/session-storage/session-storage.module-factory.ts b/packages/twenty-server/src/engine/core-modules/session-storage/session-storage.module-factory.ts
index e3022b8a4293..a717b704c75a 100644
--- a/packages/twenty-server/src/engine/core-modules/session-storage/session-storage.module-factory.ts
+++ b/packages/twenty-server/src/engine/core-modules/session-storage/session-storage.module-factory.ts
@@ -14,10 +14,11 @@ export const getSessionStorageOptions = (
 
   const SERVER_URL = environmentService.get('SERVER_URL');
 
-  const sessionStorage = {
+  const sessionStorage: session.SessionOptions = {
     secret: environmentService.get('SESSION_STORE_SECRET'),
     resave: false,
     saveUninitialized: false,
+    proxy: true,
     cookie: {
       secure: !!(SERVER_URL && SERVER_URL.startsWith('https')),
       maxAge: 1000 * 60 * 30, // 30 minutes
diff --git a/packages/twenty-server/src/engine/core-modules/sso/services/sso.service.ts b/packages/twenty-server/src/engine/core-modules/sso/services/sso.service.ts
index 6216d8019052..fcfb35cb3888 100644
--- a/packages/twenty-server/src/engine/core-modules/sso/services/sso.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/sso/services/sso.service.ts
@@ -9,8 +9,6 @@ import { Repository } from 'typeorm';
 import { BillingEntitlementKey } from 'src/engine/core-modules/billing/enums/billing-entitlement-key.enum';
 import { BillingService } from 'src/engine/core-modules/billing/services/billing.service';
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 import {
   SSOException,
   SSOExceptionCode,
@@ -30,8 +28,6 @@ import {
 export class SSOService {
   private readonly featureLookUpKey = BillingEntitlementKey.SSO;
   constructor(
-    @InjectRepository(FeatureFlagEntity, 'core')
-    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
     @InjectRepository(WorkspaceSSOIdentityProvider, 'core')
     private readonly workspaceSSOIdentityProviderRepository: Repository<WorkspaceSSOIdentityProvider>,
     private readonly environmentService: EnvironmentService,
@@ -39,27 +35,15 @@ export class SSOService {
   ) {}
 
   private async isSSOEnabled(workspaceId: string) {
-    const isSSOEnabledFeatureFlag = await this.featureFlagRepository.findOneBy({
-      workspaceId,
-      key: FeatureFlagKey.IsSSOEnabled,
-      value: true,
-    });
-
-    if (!isSSOEnabledFeatureFlag?.value) {
-      throw new SSOException(
-        `${FeatureFlagKey.IsSSOEnabled} feature flag is disabled`,
-        SSOExceptionCode.SSO_DISABLE,
-      );
-    }
     const isSSOBillingEnabled =
-      await this.billingService.hasWorkspaceActiveSubscriptionOrFreeAccessOrEntitlement(
+      await this.billingService.hasFreeAccessOrEntitlement(
         workspaceId,
         this.featureLookUpKey,
       );
 
     if (!isSSOBillingEnabled) {
       throw new SSOException(
-        `${FeatureFlagKey.IsSSOEnabled} feature is enabled but no entitlement for this workspace`,
+        `No entitlement found for this workspace`,
         SSOExceptionCode.SSO_DISABLE,
       );
     }
diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.resolver.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.resolver.ts
index 338b6e9499f6..4abba0ee6679 100644
--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.resolver.ts
@@ -1,18 +1,14 @@
 import { UseGuards } from '@nestjs/common';
-import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { Resolver } from '@nestjs/graphql';
 import { InjectRepository } from '@nestjs/typeorm';
 
 import { Repository } from 'typeorm';
 
-import { WorkspaceInviteHashValidInput } from 'src/engine/core-modules/auth/dto/workspace-invite-hash.input';
 import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
 import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
-import { User } from 'src/engine/core-modules/user/user.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { AuthUser } from 'src/engine/decorators/auth/auth-user.decorator';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { WorkspaceInvitationService } from 'src/engine/core-modules/workspace-invitation/services/workspace-invitation.service';
-import { WorkspaceInviteTokenInput } from 'src/engine/core-modules/auth/dto/workspace-invite-token.input';
 
 @UseGuards(WorkspaceAuthGuard)
 @Resolver(() => UserWorkspace)
@@ -23,36 +19,4 @@ export class UserWorkspaceResolver {
     private readonly userWorkspaceService: UserWorkspaceService,
     private readonly workspaceInvitationService: WorkspaceInvitationService,
   ) {}
-
-  @Mutation(() => User)
-  async addUserToWorkspace(
-    @AuthUser() user: User,
-    @Args() workspaceInviteHashValidInput: WorkspaceInviteHashValidInput,
-  ) {
-    const workspace = await this.workspaceRepository.findOneBy({
-      inviteHash: workspaceInviteHashValidInput.inviteHash,
-    });
-
-    if (!workspace) {
-      return;
-    }
-
-    await this.workspaceInvitationService.invalidateWorkspaceInvitation(
-      workspace.id,
-      user.email,
-    );
-
-    return await this.userWorkspaceService.addUserToWorkspace(user, workspace);
-  }
-
-  @Mutation(() => User)
-  async addUserToWorkspaceByInviteToken(
-    @AuthUser() user: User,
-    @Args() workspaceInviteTokenInput: WorkspaceInviteTokenInput,
-  ) {
-    return this.userWorkspaceService.addUserToWorkspaceByInviteToken(
-      workspaceInviteTokenInput.inviteToken,
-      user,
-    );
-  }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
index 19413c902ed3..9bc54f7df1a9 100644
--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
@@ -7,8 +7,14 @@ import { Repository } from 'typeorm';
 import { TypeORMService } from 'src/database/typeorm/typeorm.service';
 import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
 import { USER_SIGNUP_EVENT_NAME } from 'src/engine/api/graphql/workspace-query-runner/constants/user-signup-event-name.constants';
+import {
+  AuthException,
+  AuthExceptionCode,
+} from 'src/engine/core-modules/auth/auth.exception';
+import { AvailableWorkspaceOutput } from 'src/engine/core-modules/auth/dto/available-workspaces.output';
 import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
 import { User } from 'src/engine/core-modules/user/user.entity';
+import { userValidator } from 'src/engine/core-modules/user/user.validate';
 import { WorkspaceInvitationService } from 'src/engine/core-modules/workspace-invitation/services/workspace-invitation.service';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
@@ -118,20 +124,6 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
     return user;
   }
 
-  async addUserToWorkspaceByInviteToken(inviteToken: string, user: User) {
-    const appToken = await this.workspaceInvitationService.validateInvitation({
-      workspacePersonalInviteToken: inviteToken,
-      email: user.email,
-    });
-
-    await this.workspaceInvitationService.invalidateWorkspaceInvitation(
-      appToken.workspace.id,
-      user.email,
-    );
-
-    return await this.addUserToWorkspace(user, appToken.workspace);
-  }
-
   public async getUserCount(workspaceId: string): Promise<number | undefined> {
     return await this.userWorkspaceRepository.countBy({
       workspaceId,
@@ -161,4 +153,46 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
       },
     });
   }
+
+  async findAvailableWorkspacesByEmail(email: string) {
+    const user = await this.userRepository.findOne({
+      where: {
+        email,
+      },
+      relations: [
+        'workspaces',
+        'workspaces.workspace',
+        'workspaces.workspace.workspaceSSOIdentityProviders',
+      ],
+    });
+
+    userValidator.assertIsDefinedOrThrow(
+      user,
+      new AuthException('User not found', AuthExceptionCode.USER_NOT_FOUND),
+    );
+
+    return user.workspaces.map<AvailableWorkspaceOutput>((userWorkspace) => ({
+      id: userWorkspace.workspaceId,
+      displayName: userWorkspace.workspace.displayName,
+      subdomain: userWorkspace.workspace.subdomain,
+      logo: userWorkspace.workspace.logo,
+      sso: userWorkspace.workspace.workspaceSSOIdentityProviders.reduce(
+        (acc, identityProvider) =>
+          acc.concat(
+            identityProvider.status === 'Inactive'
+              ? []
+              : [
+                  {
+                    id: identityProvider.id,
+                    name: identityProvider.name,
+                    issuer: identityProvider.issuer,
+                    type: identityProvider.type,
+                    status: identityProvider.status,
+                  },
+                ],
+          ),
+        [] as AvailableWorkspaceOutput['sso'],
+      ),
+    }));
+  }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts b/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
index 60ed6c29a7a2..3b298b3070fc 100644
--- a/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
@@ -3,6 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import assert from 'assert';
 
 import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
+import { isWorkspaceActiveOrSuspended } from 'twenty-shared';
 import { Repository } from 'typeorm';
 
 import { TypeORMService } from 'src/database/typeorm/typeorm.service';
@@ -14,10 +15,7 @@ import {
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { userValidator } from 'src/engine/core-modules/user/user.validate';
 import { WorkspaceService } from 'src/engine/core-modules/workspace/services/workspace.service';
-import {
-  Workspace,
-  WorkspaceActivationStatus,
-} from 'src/engine/core-modules/workspace/workspace.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
@@ -41,7 +39,7 @@ export class UserService extends TypeOrmQueryService<User> {
   }
 
   async loadWorkspaceMember(user: User, workspace: Workspace) {
-    if (workspace?.activationStatus !== WorkspaceActivationStatus.ACTIVE) {
+    if (!isWorkspaceActiveOrSuspended(workspace)) {
       return null;
     }
 
@@ -59,7 +57,7 @@ export class UserService extends TypeOrmQueryService<User> {
   }
 
   async loadWorkspaceMembers(workspace: Workspace) {
-    if (workspace.activationStatus !== WorkspaceActivationStatus.ACTIVE) {
+    if (!isWorkspaceActiveOrSuspended(workspace)) {
       return [];
     }
 
@@ -165,4 +163,30 @@ export class UserService extends TypeOrmQueryService<User> {
       ),
     );
   }
+
+  async getUserByEmail(email: string) {
+    const user = await this.userRepository.findOne({
+      where: {
+        email,
+      },
+    });
+
+    userValidator.assertIsDefinedOrThrow(user);
+
+    return user;
+  }
+
+  async markEmailAsVerified(userId: string) {
+    const user = await this.userRepository.findOne({
+      where: {
+        id: userId,
+      },
+    });
+
+    userValidator.assertIsDefinedOrThrow(user);
+
+    user.isEmailVerified = true;
+
+    return await this.userRepository.save(user);
+  }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/user/user.entity.ts b/packages/twenty-server/src/engine/core-modules/user/user.entity.ts
index 03ce52c7b63c..1ac68ca4b9a4 100644
--- a/packages/twenty-server/src/engine/core-modules/user/user.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/user.entity.ts
@@ -4,6 +4,7 @@ import { IDField } from '@ptc-org/nestjs-query-graphql';
 import {
   Column,
   CreateDateColumn,
+  DeleteDateColumn,
   Entity,
   Index,
   OneToMany,
@@ -54,7 +55,7 @@ export class User {
 
   @Field()
   @Column({ default: false })
-  emailVerified: boolean;
+  isEmailVerified: boolean;
 
   @Field({ nullable: true })
   @Column({ default: false })
@@ -77,7 +78,7 @@ export class User {
   updatedAt: Date;
 
   @Field({ nullable: true })
-  @Column({ nullable: true, type: 'timestamptz' })
+  @DeleteDateColumn({ type: 'timestamptz' })
   deletedAt: Date;
 
   @OneToMany(() => AppToken, (appToken) => appToken.user, {
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/dtos/workflow-version.dto.ts b/packages/twenty-server/src/engine/core-modules/workflow/dtos/workflow-version.dto.ts
new file mode 100644
index 000000000000..7442b6e7350c
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/workflow/dtos/workflow-version.dto.ts
@@ -0,0 +1,9 @@
+import { Field, ObjectType } from '@nestjs/graphql';
+
+import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+
+@ObjectType('WorkflowVersion')
+export class WorkflowVersionDTO {
+  @Field(() => UUIDScalarType)
+  id: string;
+}
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-version-step.resolver.ts b/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-version-step.resolver.ts
index 2a2257e7c0f9..1ca41f569396 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-version-step.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/resolvers/workflow-version-step.resolver.ts
@@ -12,6 +12,7 @@ import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorat
 import { UserAuthGuard } from 'src/engine/guards/user-auth.guard';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { WorkflowVersionStepWorkspaceService } from 'src/modules/workflow/common/workspace-services/workflow-version-step.workspace-service';
+import { WorkflowVersionDTO } from 'src/engine/core-modules/workflow/dtos/workflow-version.dto';
 
 @Resolver()
 @UseGuards(WorkspaceAuthGuard, UserAuthGuard)
@@ -60,7 +61,7 @@ export class WorkflowVersionStepResolver {
     });
   }
 
-  @Mutation(() => Boolean)
+  @Mutation(() => WorkflowVersionDTO)
   async createDraftFromWorkflowVersion(
     @AuthWorkspace() { id: workspaceId }: Workspace,
     @Args('input')
@@ -68,15 +69,15 @@ export class WorkflowVersionStepResolver {
       workflowId,
       workflowVersionIdToCopy,
     }: CreateDraftFromWorkflowVersionInput,
-  ) {
-    await this.workflowVersionStepWorkspaceService.createDraftFromWorkflowVersion(
-      {
-        workspaceId,
-        workflowId,
-        workflowVersionIdToCopy,
-      },
-    );
-
-    return true;
+  ): Promise<WorkflowVersionDTO> {
+    return {
+      id: await this.workflowVersionStepWorkspaceService.createDraftFromWorkflowVersion(
+        {
+          workspaceId,
+          workflowId,
+          workflowVersionIdToCopy,
+        },
+      ),
+    };
   }
 }
diff --git a/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts b/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts
index ce95f3da28c5..34d0d62501b0 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts
@@ -37,8 +37,6 @@ export class WorkspaceInvitationService {
   constructor(
     @InjectRepository(AppToken, 'core')
     private readonly appTokenRepository: Repository<AppToken>,
-    @InjectRepository(Workspace, 'core')
-    private readonly workspaceRepository: Repository<Workspace>,
     @InjectRepository(UserWorkspace, 'core')
     private readonly userWorkspaceRepository: Repository<UserWorkspace>,
     private readonly environmentService: EnvironmentService,
@@ -47,32 +45,7 @@ export class WorkspaceInvitationService {
     private readonly domainManagerService: DomainManagerService,
   ) {}
 
-  // VALIDATIONS METHODS
-  private async validatePublicInvitation(workspaceInviteHash: string) {
-    const workspace = await this.workspaceRepository.findOne({
-      where: {
-        inviteHash: workspaceInviteHash,
-      },
-    });
-
-    if (!workspace) {
-      throw new AuthException(
-        'Workspace not found',
-        AuthExceptionCode.WORKSPACE_NOT_FOUND,
-      );
-    }
-
-    if (!workspace.isPublicInviteLinkEnabled) {
-      throw new AuthException(
-        'Workspace does not allow public invites',
-        AuthExceptionCode.FORBIDDEN_EXCEPTION,
-      );
-    }
-
-    return { isValid: true, workspace };
-  }
-
-  private async validatePersonalInvitation({
+  async validatePersonalInvitation({
     workspacePersonalInviteToken,
     email,
   }: {
@@ -109,37 +82,11 @@ export class WorkspaceInvitationService {
     }
   }
 
-  async validateInvitation({
-    workspacePersonalInviteToken,
-    workspaceInviteHash,
-    email,
-  }: {
-    workspacePersonalInviteToken?: string;
-    workspaceInviteHash?: string;
-    email: string;
-  }) {
-    if (workspacePersonalInviteToken) {
-      return await this.validatePersonalInvitation({
-        workspacePersonalInviteToken,
-        email,
-      });
-    }
-
-    if (workspaceInviteHash) {
-      return await this.validatePublicInvitation(workspaceInviteHash);
-    }
-
-    throw new AuthException(
-      'Invitation invalid',
-      AuthExceptionCode.FORBIDDEN_EXCEPTION,
-    );
-  }
-
   async findInvitationByWorkspaceSubdomainAndUserEmail({
     subdomain,
     email,
   }: {
-    subdomain?: string;
+    subdomain: string;
     email: string;
   }) {
     const workspace =
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
index b2493063ff82..46bf66260bc7 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
@@ -4,6 +4,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import assert from 'assert';
 
 import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
+import { WorkspaceActivationStatus } from 'twenty-shared';
 import { Repository } from 'typeorm';
 
 import { BillingSubscriptionService } from 'src/engine/core-modules/billing/services/billing-subscription.service';
@@ -14,10 +15,7 @@ import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-works
 import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { ActivateWorkspaceInput } from 'src/engine/core-modules/workspace/dtos/activate-workspace-input';
-import {
-  Workspace,
-  WorkspaceActivationStatus,
-} from 'src/engine/core-modules/workspace/workspace.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import {
   WorkspaceException,
   WorkspaceExceptionCode,
@@ -161,6 +159,16 @@ export class WorkspaceService extends TypeOrmQueryService<Workspace> {
       userId,
       workspaceId,
     });
+
+    const userWorkspaces = await this.userWorkspaceRepository.find({
+      where: {
+        userId,
+      },
+    });
+
+    if (userWorkspaces.length === 0) {
+      await this.userRepository.softDelete(userId);
+    }
   }
 
   async isSubdomainAvailable(subdomain: string) {
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/types/workspace.type.ts b/packages/twenty-server/src/engine/core-modules/workspace/types/workspace.type.ts
index 259fc76f2c43..c502be4492c7 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/types/workspace.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/types/workspace.type.ts
@@ -1 +1 @@
-export type WorkspaceAuthProvider = 'google' | 'microsoft' | 'password';
+export type WorkspaceAuthProvider = 'google' | 'microsoft' | 'password' | 'sso';
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts
index 1986e8f6beb2..be5f996bd74f 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.entity.ts
@@ -1,9 +1,11 @@
 import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';
 
-import { IDField, UnPagedRelation } from '@ptc-org/nestjs-query-graphql';
+import { IDField } from '@ptc-org/nestjs-query-graphql';
+import { WorkspaceActivationStatus } from 'twenty-shared';
 import {
   Column,
   CreateDateColumn,
+  DeleteDateColumn,
   Entity,
   OneToMany,
   PrimaryGeneratedColumn,
@@ -13,38 +15,18 @@ import {
 
 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
 import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
-import { BillingCustomer } from 'src/engine/core-modules/billing/entities/billing-customer.entity';
-import { BillingEntitlement } from 'src/engine/core-modules/billing/entities/billing-entitlement.entity';
-import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 import { KeyValuePair } from 'src/engine/core-modules/key-value-pair/key-value-pair.entity';
 import { PostgresCredentials } from 'src/engine/core-modules/postgres-credentials/postgres-credentials.entity';
 import { WorkspaceSSOIdentityProvider } from 'src/engine/core-modules/sso/workspace-sso-identity-provider.entity';
 import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
 
-export enum WorkspaceActivationStatus {
-  ONGOING_CREATION = 'ONGOING_CREATION',
-  PENDING_CREATION = 'PENDING_CREATION',
-  ACTIVE = 'ACTIVE',
-  INACTIVE = 'INACTIVE',
-}
-
 registerEnumType(WorkspaceActivationStatus, {
   name: 'WorkspaceActivationStatus',
 });
 
 @Entity({ name: 'workspace', schema: 'core' })
 @ObjectType('Workspace')
-@UnPagedRelation('featureFlags', () => FeatureFlagEntity, { nullable: true })
-@UnPagedRelation('billingSubscriptions', () => BillingSubscription, {
-  nullable: true,
-})
-@UnPagedRelation('billingEntitlements', () => BillingEntitlement, {
-  nullable: true,
-})
-@UnPagedRelation('billingCustomers', () => BillingCustomer, {
-  nullable: true,
-})
 export class Workspace {
   @IDField(() => UUIDScalarType)
   @PrimaryGeneratedColumn('uuid')
@@ -67,7 +49,7 @@ export class Workspace {
   inviteHash?: string;
 
   @Field({ nullable: true })
-  @Column({ nullable: true, type: 'timestamptz' })
+  @DeleteDateColumn({ type: 'timestamptz' })
   deletedAt?: Date;
 
   @Field()
@@ -110,6 +92,7 @@ export class Workspace {
   @Field(() => WorkspaceActivationStatus)
   @Column({
     type: 'enum',
+    enumName: 'workspace_activationStatus_enum',
     enum: WorkspaceActivationStatus,
     default: WorkspaceActivationStatus.INACTIVE,
   })
@@ -152,6 +135,6 @@ export class Workspace {
   isPasswordAuthEnabled: boolean;
 
   @Field()
-  @Column({ default: false })
+  @Column({ default: true })
   isMicrosoftAuthEnabled: boolean;
 }
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts
index 05d58624ac37..1e8cb58b60a8 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.module.ts
@@ -1,10 +1,14 @@
 import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { NestjsQueryGraphQLModule } from '@ptc-org/nestjs-query-graphql';
 import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
 
 import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
+import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
 import { BillingModule } from 'src/engine/core-modules/billing/billing.module';
+import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
+import { DomainManagerModule } from 'src/engine/core-modules/domain-manager/domain-manager.module';
 import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
 import { FileUploadModule } from 'src/engine/core-modules/file/file-upload/file-upload.module';
 import { FileModule } from 'src/engine/core-modules/file/file.module';
@@ -17,8 +21,6 @@ import { WorkspaceResolver } from 'src/engine/core-modules/workspace/workspace.r
 import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
 import { WorkspaceMetadataCacheModule } from 'src/engine/metadata-modules/workspace-metadata-cache/workspace-metadata-cache.module';
 import { WorkspaceManagerModule } from 'src/engine/workspace-manager/workspace-manager.module';
-import { DomainManagerModule } from 'src/engine/core-modules/domain-manager/domain-manager.module';
-import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
 
 import { workspaceAutoResolverOpts } from './workspace.auto-resolver-opts';
 import { Workspace } from './workspace.entity';
@@ -28,6 +30,7 @@ import { WorkspaceService } from './services/workspace.service';
 @Module({
   imports: [
     TypeORMModule,
+    TypeOrmModule.forFeature([BillingSubscription], 'core'),
     NestjsQueryGraphQLModule.forFeature({
       imports: [
         DomainManagerModule,
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts
index d79d6188f3a0..db28abe7688f 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.resolver.ts
@@ -7,8 +7,10 @@ import {
   ResolveField,
   Resolver,
 } from '@nestjs/graphql';
+import { InjectRepository } from '@nestjs/typeorm';
 
 import { FileUpload, GraphQLUpload } from 'graphql-upload';
+import { Repository } from 'typeorm';
 
 import { FileFolder } from 'src/engine/core-modules/file/interfaces/file-folder.interface';
 
@@ -16,6 +18,9 @@ import { BillingSubscription } from 'src/engine/core-modules/billing/entities/bi
 import { BillingSubscriptionService } from 'src/engine/core-modules/billing/services/billing-subscription.service';
 import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 import { FileUploadService } from 'src/engine/core-modules/file/file-upload/services/file-upload.service';
 import { FileService } from 'src/engine/core-modules/file/services/file.service';
 import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
@@ -59,6 +64,9 @@ export class WorkspaceResolver {
     private readonly fileUploadService: FileUploadService,
     private readonly fileService: FileService,
     private readonly billingSubscriptionService: BillingSubscriptionService,
+    private readonly featureFlagService: FeatureFlagService,
+    @InjectRepository(BillingSubscription, 'core')
+    private readonly billingSubscriptionRepository: Repository<BillingSubscription>,
   ) {}
 
   @Query(() => Workspace)
@@ -95,7 +103,7 @@ export class WorkspaceResolver {
     @AuthWorkspace() workspace: Workspace,
   ) {
     try {
-      return this.workspaceService.updateWorkspaceById({
+      return await this.workspaceService.updateWorkspaceById({
         ...data,
         id: workspace.id,
       });
@@ -134,12 +142,44 @@ export class WorkspaceResolver {
     return `${paths[0]}?token=${workspaceLogoToken}`;
   }
 
+  @ResolveField(() => [FeatureFlagEntity], { nullable: true })
+  async featureFlags(
+    @Parent() workspace: Workspace,
+  ): Promise<FeatureFlagEntity[]> {
+    const featureFlags = await this.featureFlagService.getWorkspaceFeatureFlags(
+      workspace.id,
+    );
+
+    const filteredFeatureFlags = featureFlags.filter((flag) =>
+      Object.values(FeatureFlagKey).includes(flag.key),
+    );
+
+    return filteredFeatureFlags;
+  }
+
   @Mutation(() => Workspace)
   @UseGuards(DemoEnvGuard, WorkspaceAuthGuard)
   async deleteCurrentWorkspace(@AuthWorkspace() { id }: Workspace) {
     return this.workspaceService.deleteWorkspace(id);
   }
 
+  @ResolveField(() => [BillingSubscription])
+  async billingSubscriptions(
+    @Parent() workspace: Workspace,
+  ): Promise<BillingSubscription[] | undefined> {
+    if (!this.environmentService.get('IS_BILLING_ENABLED')) {
+      return [];
+    }
+
+    try {
+      return this.billingSubscriptionRepository.find({
+        where: { workspaceId: workspace.id },
+      });
+    } catch (error) {
+      workspaceGraphqlApiExceptionHandler(error);
+    }
+  }
+
   @ResolveField(() => BillingSubscription, { nullable: true })
   async currentBillingSubscription(
     @Parent() workspace: Workspace,
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/workspace.validate.ts b/packages/twenty-server/src/engine/core-modules/workspace/workspace.validate.ts
index 6affc9c918dd..f3aab2775f2d 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/workspace.validate.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/workspace.validate.ts
@@ -1,17 +1,16 @@
-import {
-  Workspace,
-  WorkspaceActivationStatus,
-} from 'src/engine/core-modules/workspace/workspace.entity';
-import { CustomException } from 'src/utils/custom-exception';
+import { WorkspaceActivationStatus } from 'twenty-shared';
+
 import {
   AuthException,
   AuthExceptionCode,
 } from 'src/engine/core-modules/auth/auth.exception';
 import { WorkspaceAuthProvider } from 'src/engine/core-modules/workspace/types/workspace.type';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import {
   WorkspaceException,
   WorkspaceExceptionCode,
 } from 'src/engine/core-modules/workspace/workspace.exception';
+import { CustomException } from 'src/utils/custom-exception';
 
 const assertIsDefinedOrThrow = (
   workspace: Workspace | undefined | null,
@@ -46,6 +45,7 @@ const isAuthEnabledOrThrow = (
   if (provider === 'google' && workspace.isGoogleAuthEnabled) return true;
   if (provider === 'microsoft' && workspace.isMicrosoftAuthEnabled) return true;
   if (provider === 'password' && workspace.isPasswordAuthEnabled) return true;
+  if (provider === 'sso') return true;
 
   throw exceptionToThrowCustom;
 };
diff --git a/packages/twenty-server/src/engine/guards/impersonate-guard.spec.ts b/packages/twenty-server/src/engine/guards/impersonate-guard.spec.ts
new file mode 100644
index 000000000000..5135bd41790c
--- /dev/null
+++ b/packages/twenty-server/src/engine/guards/impersonate-guard.spec.ts
@@ -0,0 +1,54 @@
+import { ExecutionContext } from '@nestjs/common';
+import { GqlExecutionContext } from '@nestjs/graphql';
+
+import { expect, jest } from '@jest/globals';
+
+import { ImpersonateGuard } from 'src/engine/guards/impersonate-guard';
+
+describe('ImpersonateGuard', () => {
+  const guard = new ImpersonateGuard();
+
+  it('should return true if user can impersonate', async () => {
+    const mockContext = {
+      getContext: jest.fn(() => ({
+        req: {
+          user: {
+            canImpersonate: true,
+          },
+        },
+      })),
+    };
+
+    jest
+      .spyOn(GqlExecutionContext, 'create')
+      .mockReturnValue(mockContext as any);
+
+    const mockExecutionContext = {} as ExecutionContext;
+
+    const result = await guard.canActivate(mockExecutionContext);
+
+    expect(result).toBe(true);
+  });
+
+  it('should return false if user cannot impersonate', async () => {
+    const mockContext = {
+      getContext: jest.fn(() => ({
+        req: {
+          user: {
+            canImpersonate: false,
+          },
+        },
+      })),
+    };
+
+    jest
+      .spyOn(GqlExecutionContext, 'create')
+      .mockReturnValue(mockContext as any);
+
+    const mockExecutionContext = {} as ExecutionContext;
+
+    const result = await guard.canActivate(mockExecutionContext);
+
+    expect(result).toBe(false);
+  });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type.ts
index 80f4689aef74..f517c8b74ca5 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type.ts
@@ -1,10 +1,10 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import {
   CompositeProperty,
   CompositeType,
 } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-
 export enum FieldActorSource {
   EMAIL = 'EMAIL',
   CALENDAR = 'CALENDAR',
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/address.composite-type.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/address.composite-type.ts
index a8871b037bb8..3101877ef8df 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/address.composite-type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/address.composite-type.ts
@@ -1,6 +1,6 @@
-import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+import { FieldMetadataType } from 'twenty-shared';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
 
 export const addressCompositeType: CompositeType = {
   type: FieldMetadataType.ADDRESS,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/currency.composite-type.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/currency.composite-type.ts
index c7ce2147b60c..a948529d5d2e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/currency.composite-type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/currency.composite-type.ts
@@ -1,6 +1,6 @@
-import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+import { FieldMetadataType } from 'twenty-shared';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
 
 export const currencyCompositeType: CompositeType = {
   type: FieldMetadataType.CURRENCY,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/emails.composite-type.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/emails.composite-type.ts
index 5cda75160530..919cf98d1081 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/emails.composite-type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/emails.composite-type.ts
@@ -1,6 +1,6 @@
-import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+import { FieldMetadataType } from 'twenty-shared';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
 
 export const emailsCompositeType: CompositeType = {
   type: FieldMetadataType.EMAILS,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/full-name.composite-type.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/full-name.composite-type.ts
index 937a9f6aae3a..2aca0513a9fb 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/full-name.composite-type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/full-name.composite-type.ts
@@ -1,6 +1,6 @@
-import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+import { FieldMetadataType } from 'twenty-shared';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
 
 export const fullNameCompositeType: CompositeType = {
   type: FieldMetadataType.FULL_NAME,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/index.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/index.ts
index fbc999d49e70..f7f943b825ca 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/index.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/index.ts
@@ -1,3 +1,5 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
 
 import { actorCompositeType } from 'src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type';
@@ -7,7 +9,6 @@ import { emailsCompositeType } from 'src/engine/metadata-modules/field-metadata/
 import { fullNameCompositeType } from 'src/engine/metadata-modules/field-metadata/composite-types/full-name.composite-type';
 import { linksCompositeType } from 'src/engine/metadata-modules/field-metadata/composite-types/links.composite-type';
 import { phonesCompositeType } from 'src/engine/metadata-modules/field-metadata/composite-types/phones.composite-type';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 
 export const compositeTypeDefinitions = new Map<
   FieldMetadataType,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/links.composite-type.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/links.composite-type.ts
index b2d5cfd6ba4c..aebd470b1d55 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/links.composite-type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/links.composite-type.ts
@@ -1,6 +1,6 @@
-import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+import { FieldMetadataType } from 'twenty-shared';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
 
 export const linksCompositeType: CompositeType = {
   type: FieldMetadataType.LINKS,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/phones.composite-type.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/phones.composite-type.ts
index 6f635f63bf21..6802a2854340 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/phones.composite-type.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/composite-types/phones.composite-type.ts
@@ -1,6 +1,6 @@
-import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
+import { FieldMetadataType } from 'twenty-shared';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { CompositeType } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
 
 export const phonesCompositeType: CompositeType = {
   type: FieldMetadataType.PHONES,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto.ts
index fb51feaf042f..612646bdc15a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto.ts
@@ -24,6 +24,7 @@ import {
   Validate,
 } from 'class-validator';
 import { GraphQLJSON } from 'graphql-type-json';
+import { FieldMetadataType } from 'twenty-shared';
 
 import { FieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
 import { FieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface';
@@ -32,7 +33,6 @@ import { FieldMetadataSettings } from 'src/engine/metadata-modules/field-metadat
 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
 import { IsValidMetadataName } from 'src/engine/decorators/metadata/is-valid-metadata-name.decorator';
 import { FieldMetadataDefaultOption } from 'src/engine/metadata-modules/field-metadata/dtos/options.input';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { IsFieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator';
 import { IsFieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator';
 import { ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata-validation.service.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata-validation.service.ts
index e1c29d5fc0d3..caf2ef32968a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata-validation.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata-validation.service.ts
@@ -9,10 +9,10 @@ import {
   Min,
   validateOrReject,
 } from 'class-validator';
+import { FieldMetadataType } from 'twenty-shared';
 
 import { FieldMetadataSettings } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-settings.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   FieldMetadataException,
   FieldMetadataExceptionCode,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.entity.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.entity.ts
index 4f8e5219abb0..a59750474433 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.entity.ts
@@ -1,7 +1,9 @@
+import { FieldMetadataType } from 'twenty-shared';
 import {
   Column,
   CreateDateColumn,
   Entity,
+  Index,
   JoinColumn,
   ManyToOne,
   OneToMany,
@@ -21,38 +23,18 @@ import { IndexFieldMetadataEntity } from 'src/engine/metadata-modules/index-meta
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 
-export enum FieldMetadataType {
-  UUID = 'UUID',
-  TEXT = 'TEXT',
-  PHONES = 'PHONES',
-  EMAILS = 'EMAILS',
-  DATE_TIME = 'DATE_TIME',
-  DATE = 'DATE',
-  BOOLEAN = 'BOOLEAN',
-  NUMBER = 'NUMBER',
-  NUMERIC = 'NUMERIC',
-  LINKS = 'LINKS',
-  CURRENCY = 'CURRENCY',
-  FULL_NAME = 'FULL_NAME',
-  RATING = 'RATING',
-  SELECT = 'SELECT',
-  MULTI_SELECT = 'MULTI_SELECT',
-  RELATION = 'RELATION',
-  POSITION = 'POSITION',
-  ADDRESS = 'ADDRESS',
-  RAW_JSON = 'RAW_JSON',
-  RICH_TEXT = 'RICH_TEXT',
-  ACTOR = 'ACTOR',
-  ARRAY = 'ARRAY',
-  TS_VECTOR = 'TS_VECTOR',
-}
-
 @Entity('fieldMetadata')
 @Unique('IndexOnNameObjectMetadataIdAndWorkspaceIdUnique', [
   'name',
   'objectMetadataId',
   'workspaceId',
 ])
+@Index('IndexOnRelationTargetFieldMetadataId', [
+  'relationTargetFieldMetadataId',
+])
+@Index('IndexOnRelationTargetObjectMetadataId', [
+  'relationTargetObjectMetadataId',
+])
 export class FieldMetadataEntity<
   T extends FieldMetadataType | 'default' = 'default',
 > implements FieldMetadataInterface<T>
@@ -72,7 +54,10 @@ export class FieldMetadataEntity<
   @JoinColumn({ name: 'objectMetadataId' })
   object: Relation<ObjectMetadataEntity>;
 
-  @Column({ nullable: false })
+  @Column({
+    nullable: false,
+    type: 'varchar',
+  })
   type: FieldMetadataType;
 
   @Column({ nullable: false })
@@ -117,6 +102,26 @@ export class FieldMetadataEntity<
   @Column({ default: false })
   isLabelSyncedWithName: boolean;
 
+  @Column({ nullable: true, type: 'uuid' })
+  relationTargetFieldMetadataId: string;
+  @OneToOne(
+    () => FieldMetadataEntity,
+    (fieldMetadata: FieldMetadataEntity) =>
+      fieldMetadata.relationTargetFieldMetadataId,
+  )
+  @JoinColumn({ name: 'relationTargetFieldMetadataId' })
+  relationTargetFieldMetadata: Relation<FieldMetadataEntity>;
+
+  @Column({ nullable: true, type: 'uuid' })
+  relationTargetObjectMetadataId: string;
+  @ManyToOne(
+    () => ObjectMetadataEntity,
+    (objectMetadata: ObjectMetadataEntity) =>
+      objectMetadata.targetRelationFields,
+  )
+  @JoinColumn({ name: 'relationTargetObjectMetadataId' })
+  relationTargetObjectMetadata: Relation<ObjectMetadataEntity>;
+
   @OneToOne(
     () => RelationMetadataEntity,
     (relation: RelationMetadataEntity) => relation.fromFieldMetadata,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts
index 736d557c6fcf..9c6c2cfee8e7 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts
@@ -23,6 +23,7 @@ import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadat
 import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
 import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
 import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
+import { ViewModule } from 'src/modules/view/view.module';
 
 import { FieldMetadataEntity } from './field-metadata.entity';
 import { FieldMetadataService } from './field-metadata.service';
@@ -45,6 +46,7 @@ import { UpdateFieldInput } from './dtos/update-field.input';
         DataSourceModule,
         TypeORMModule,
         ActorModule,
+        ViewModule,
       ],
       services: [
         IsFieldMetadataDefaultValue,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts
index 2d9e4796132c..e2fd5576d7d7 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.resolver.ts
@@ -12,6 +12,8 @@ import {
   Resolver,
 } from '@nestjs/graphql';
 
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
@@ -21,7 +23,6 @@ import { DeleteOneFieldInput } from 'src/engine/metadata-modules/field-metadata/
 import { FieldMetadataDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-metadata.dto';
 import { RelationDefinitionDTO } from 'src/engine/metadata-modules/field-metadata/dtos/relation-definition.dto';
 import { UpdateOneFieldMetadataInput } from 'src/engine/metadata-modules/field-metadata/dtos/update-field.input';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/field-metadata.service';
 import { fieldMetadataGraphqlApiExceptionHandler } from 'src/engine/metadata-modules/field-metadata/utils/field-metadata-graphql-api-exception-handler.util';
 
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts
index 2c539e4b2f04..93f59d98acf3 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts
@@ -3,6 +3,7 @@ import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
 
 import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
 import isEmpty from 'lodash.isempty';
+import { FieldMetadataType } from 'twenty-shared';
 import { DataSource, FindOneOptions, Repository } from 'typeorm';
 import { v4 as uuidV4, v4 } from 'uuid';
 
@@ -56,14 +57,12 @@ import { WorkspaceMigrationService } from 'src/engine/metadata-modules/workspace
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
 import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service';
+import { ViewService } from 'src/modules/view/services/view.service';
 import { ViewFieldWorkspaceEntity } from 'src/modules/view/standard-objects/view-field.workspace-entity';
 import { isDefined } from 'src/utils/is-defined';
 
 import { FieldMetadataValidationService } from './field-metadata-validation.service';
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from './field-metadata.entity';
+import { FieldMetadataEntity } from './field-metadata.entity';
 
 import { generateDefaultValue } from './utils/generate-default-value';
 import { generateRatingOptions } from './utils/generate-rating-optionts.util';
@@ -87,6 +86,7 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
     private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
     private readonly fieldMetadataValidationService: FieldMetadataValidationService,
     private readonly fieldMetadataRelatedRecordsService: FieldMetadataRelatedRecordsService,
+    private readonly viewService: ViewService,
   ) {
     super(fieldMetadataRepository);
   }
@@ -94,7 +94,6 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
   override async createOne(
     fieldMetadataInput: CreateFieldInput,
   ): Promise<FieldMetadataEntity> {
-    console.time('createOne');
     const queryRunner = this.metadataDataSource.createQueryRunner();
 
     await queryRunner.connect();
@@ -106,7 +105,6 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
           FieldMetadataEntity,
         );
 
-      console.time('createOne query');
       const [objectMetadata] = await this.objectMetadataRepository.find({
         where: {
           id: fieldMetadataInput.objectMetadataId,
@@ -116,8 +114,6 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
         order: {},
       });
 
-      console.timeEnd('createOne query');
-
       if (!objectMetadata) {
         throw new FieldMetadataException(
           'Object metadata does not exist',
@@ -183,15 +179,11 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
         );
       }
 
-      console.time('createOne save');
       const createdFieldMetadata = await fieldMetadataRepository.save(
         fieldMetadataForCreate,
       );
 
-      console.timeEnd('createOne save');
-
       if (!fieldMetadataInput.isRemoteCreation) {
-        console.time('createOne migration create');
         await this.workspaceMigrationService.createCustomMigration(
           generateMigrationName(`create-${createdFieldMetadata.name}`),
           fieldMetadataInput.workspaceId,
@@ -207,16 +199,11 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
           ],
         );
 
-        console.timeEnd('createOne migration create');
-
-        console.time('createOne migration run');
         await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
           fieldMetadataInput.workspaceId,
         );
-        console.timeEnd('createOne migration run');
       }
 
-      console.time('createOne workspace viewField');
       // TODO: Move viewField creation to a cdc scheduler
       const dataSourceMetadata =
         await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
@@ -276,11 +263,7 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
             );
           }
         }
-        console.timeEnd('createOne workspace viewField');
-
-        console.time('createOne internal commit');
         await workspaceQueryRunner.commitTransaction();
-        console.timeEnd('createOne internal commit');
       } catch (error) {
         await workspaceQueryRunner.rollbackTransaction();
         throw error;
@@ -288,9 +271,7 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
         await workspaceQueryRunner.release();
       }
 
-      console.time('createOne commit');
       await queryRunner.commitTransaction();
-      console.timeEnd('createOne commit');
 
       return createdFieldMetadata;
     } catch (error) {
@@ -298,12 +279,9 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
       throw error;
     } finally {
       await queryRunner.release();
-      console.time('createOne increment');
       await this.workspaceMetadataVersionService.incrementMetadataVersion(
         fieldMetadataInput.workspaceId,
       );
-      console.timeEnd('createOne increment');
-      console.timeEnd('createOne');
     }
   }
 
@@ -541,6 +519,11 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
         );
       }
 
+      await this.viewService.resetKanbanAggregateOperationByFieldMetadataId({
+        workspaceId,
+        fieldMetadataId: fieldMetadata.id,
+      });
+
       await fieldMetadataRepository.delete(fieldMetadata.id);
 
       if (isCompositeFieldMetadataType(fieldMetadata.type)) {
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface.ts
index 321cd3c7f917..d85b3751a54b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface.ts
@@ -1,6 +1,6 @@
-import { FieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface';
+import { FieldMetadataType } from 'twenty-shared';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface';
 
 export interface CompositeProperty<
   Type extends FieldMetadataType = FieldMetadataType,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface.ts
index 8acf362373e7..5196dac246ef 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface.ts
@@ -1,3 +1,5 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import {
   FieldMetadataDefaultActor,
   FieldMetadataDefaultArray,
@@ -16,7 +18,6 @@ import {
   FieldMetadataDefaultValueString,
   FieldMetadataDefaultValueUuidFunction,
 } from 'src/engine/metadata-modules/field-metadata/dtos/default-value.input';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 
 type ExtractValueType<T> = T extends { value: infer V } ? V : T;
 
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface.ts
index c6139048b511..b801612f6b93 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface.ts
@@ -1,8 +1,9 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import {
   FieldMetadataComplexOption,
   FieldMetadataDefaultOption,
 } from 'src/engine/metadata-modules/field-metadata/dtos/options.input';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 
 type FieldMetadataOptionsMapping = {
   [FieldMetadataType.RATING]: FieldMetadataDefaultOption[];
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata-settings.interface.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata-settings.interface.ts
index 5471a21b3c1c..230cfcdaa37d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata-settings.interface.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata-settings.interface.ts
@@ -1,4 +1,7 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
+
+import { RelationOnDeleteAction } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-on-delete-action.interface';
+import { RelationType } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface';
 
 export enum NumberDataType {
   FLOAT = 'float',
@@ -30,11 +33,17 @@ export type FieldMetadataDateTimeSettings = {
   displayAsRelativeDate?: boolean;
 };
 
+export type FieldMetadataRelationSettings = {
+  relationType: RelationType;
+  onDelete?: RelationOnDeleteAction;
+};
+
 type FieldMetadataSettingsMapping = {
   [FieldMetadataType.NUMBER]: FieldMetadataNumberSettings;
   [FieldMetadataType.DATE]: FieldMetadataDateSettings;
   [FieldMetadataType.DATE_TIME]: FieldMetadataDateTimeSettings;
   [FieldMetadataType.TEXT]: FieldMetadataTextSettings;
+  [FieldMetadataType.RELATION]: FieldMetadataRelationSettings;
 };
 
 type SettingsByFieldMetadata<T extends FieldMetadataType | 'default'> =
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface.ts
index a33fe7392cdd..f5ba634d3e7e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface.ts
@@ -1,8 +1,9 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { FieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
 import { FieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface';
 import { FieldMetadataSettings } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-settings.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 
 export interface FieldMetadataInterface<
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/relation-on-delete-action.interface.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/relation-on-delete-action.interface.ts
new file mode 100644
index 000000000000..6f42eb3996b2
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/relation-on-delete-action.interface.ts
@@ -0,0 +1,6 @@
+export enum RelationOnDeleteAction {
+  CASCADE = 'CASCADE',
+  RESTRICT = 'RESTRICT',
+  SET_NULL = 'SET_NULL',
+  NO_ACTION = 'NO_ACTION',
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface.ts
new file mode 100644
index 000000000000..300fe72ca25f
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/interfaces/relation-type.interface.ts
@@ -0,0 +1,5 @@
+export enum RelationType {
+  ONE_TO_ONE = 'ONE_TO_ONE',
+  ONE_TO_MANY = 'ONE_TO_MANY',
+  MANY_TO_ONE = 'MANY_TO_ONE',
+}
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/field-metadata-validation.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/field-metadata-validation.service.spec.ts
index 1e1b0bf63f07..6c37e8ee7c14 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/field-metadata-validation.service.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/field-metadata-validation.service.spec.ts
@@ -1,7 +1,8 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { FieldMetadataSettings } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-settings.interface';
 
 import { FieldMetadataValidationService } from 'src/engine/metadata-modules/field-metadata/field-metadata-validation.service';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { FieldMetadataException } from 'src/engine/metadata-modules/field-metadata/field-metadata.exception';
 
 describe('FieldMetadataValidationService', () => {
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/generate-nullable.spec.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/generate-nullable.spec.ts
index 7d98519bd66d..7e383d0ae206 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/generate-nullable.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/generate-nullable.spec.ts
@@ -1,4 +1,5 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
+
 import { generateNullable } from 'src/engine/metadata-modules/field-metadata/utils/generate-nullable';
 
 describe('generateNullable', () => {
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/validate-default-value-based-on-type.spec.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/validate-default-value-based-on-type.spec.ts
index 60e4b04261c3..79dc8a2fba03 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/validate-default-value-based-on-type.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/__tests__/validate-default-value-based-on-type.spec.ts
@@ -1,4 +1,5 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
+
 import { validateDefaultValueForType } from 'src/engine/metadata-modules/field-metadata/utils/validate-default-value-for-type.util';
 
 describe('validateDefaultValueForType', () => {
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/compute-column-name.util.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/compute-column-name.util.ts
index bc24729a7277..53958fa1ca63 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/compute-column-name.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/compute-column-name.util.ts
@@ -1,7 +1,8 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { CompositeProperty } from 'src/engine/metadata-modules/field-metadata/interfaces/composite-type.interface';
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   FieldMetadataException,
   FieldMetadataExceptionCode,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/generate-default-value.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/generate-default-value.ts
index 17b55a4b6622..bbb307ebf2cb 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/generate-default-value.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/generate-default-value.ts
@@ -1,6 +1,6 @@
-import { FieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
+import { FieldMetadataType } from 'twenty-shared';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
 
 export function generateDefaultValue(
   type: FieldMetadataType,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/generate-nullable.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/generate-nullable.ts
index 759012070ffc..6d1e400beeea 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/generate-nullable.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/generate-nullable.ts
@@ -1,4 +1,4 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
 
 export function generateNullable(
   type: FieldMetadataType,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util.ts
index 911162c9ae39..0fb1c6968ebf 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util.ts
@@ -1,4 +1,4 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
 
 export const isCompositeFieldMetadataType = (
   type: FieldMetadataType,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util.ts
index 2e179b45f277..45c0b707c044 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util.ts
@@ -1,4 +1,4 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
 
 export type EnumFieldMetadataUnionType =
   | FieldMetadataType.RATING
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-select-field-metadata-type.util.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-select-field-metadata-type.util.ts
index 56a918911e2f..2c892f1f347e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-select-field-metadata-type.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/is-select-field-metadata-type.util.ts
@@ -1,4 +1,4 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
 
 export const isSelectFieldMetadataType = (
   type: FieldMetadataType,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/validate-default-value-for-type.util.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/validate-default-value-for-type.util.ts
index a5cea6d00482..efa979312b3a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/validate-default-value-for-type.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/validate-default-value-for-type.util.ts
@@ -1,5 +1,6 @@
 import { plainToInstance } from 'class-transformer';
 import { ValidationError, validateSync } from 'class-validator';
+import { FieldMetadataType } from 'twenty-shared';
 
 import {
   FieldMetadataClassValidation,
@@ -24,7 +25,6 @@ import {
   FieldMetadataDefaultValueStringArray,
   FieldMetadataDefaultValueUuidFunction,
 } from 'src/engine/metadata-modules/field-metadata/dtos/default-value.input';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
 
 export const defaultValueValidatorsMap = {
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/validate-options-for-type.util.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/validate-options-for-type.util.ts
index aecb4eefe9fd..d9e09b7db11b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/validate-options-for-type.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/utils/validate-options-for-type.util.ts
@@ -1,9 +1,9 @@
 import { plainToInstance } from 'class-transformer';
 import { validateSync } from 'class-validator';
+import { FieldMetadataType } from 'twenty-shared';
 
 import { FieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   FieldMetadataComplexOption,
   FieldMetadataDefaultOption,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator.ts
index cdb17c52e827..254af376042a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-default-value.validator.ts
@@ -6,15 +6,13 @@ import {
   ValidatorConstraint,
   ValidatorConstraintInterface,
 } from 'class-validator';
+import { FieldMetadataType } from 'twenty-shared';
 import { Repository } from 'typeorm';
 
 import { FieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
 
 import { LoggerService } from 'src/engine/core-modules/logger/logger.service';
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { validateDefaultValueForType } from 'src/engine/metadata-modules/field-metadata/utils/validate-default-value-for-type.util';
 
 @Injectable()
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator.ts
index bbfad46aa818..866b96870e1e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/validators/is-field-metadata-options.validator.ts
@@ -2,14 +2,12 @@ import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
 import { ValidationArguments, ValidatorConstraint } from 'class-validator';
+import { FieldMetadataType } from 'twenty-shared';
 import { Repository } from 'typeorm';
 
 import { FieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface';
 
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { validateOptionsForType } from 'src/engine/metadata-modules/field-metadata/utils/validate-options-for-type.util';
 
 @Injectable()
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/create-object.input.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/create-object.input.ts
index e6b953c7caf8..ef365e647b8d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/create-object.input.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/dtos/create-object.input.ts
@@ -3,11 +3,11 @@ import { Field, HideField, InputType } from '@nestjs/graphql';
 import { BeforeCreateOne } from '@ptc-org/nestjs-query-graphql';
 import { IsBoolean, IsNotEmpty, IsOptional, IsString } from 'class-validator';
 import GraphQLJSON from 'graphql-type-json';
+import { FieldMetadataType } from 'twenty-shared';
 
 import { FieldMetadataSettings } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-settings.interface';
 
 import { IsValidMetadataName } from 'src/engine/decorators/metadata/is-valid-metadata-name.decorator';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { BeforeCreateOneObject } from 'src/engine/metadata-modules/object-metadata/hooks/before-create-one-object.hook';
 
 @InputType()
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts
index b307e1ed8b85..eeea46d11477 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.entity.ts
@@ -112,6 +112,12 @@ export class ObjectMetadataEntity implements ObjectMetadataInterface {
   )
   toRelations: Relation<RelationMetadataEntity[]>;
 
+  @OneToMany(
+    () => FieldMetadataEntity,
+    (field) => field.relationTargetObjectMetadataId,
+  )
+  targetRelationFields: Relation<FieldMetadataEntity[]>;
+
   @ManyToOne(() => DataSourceEntity, (dataSource) => dataSource.objects, {
     onDelete: 'CASCADE',
   })
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts
index 9dff05ab7431..4021a3c73518 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts
@@ -103,7 +103,7 @@ export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEnt
       );
     }
 
-    this.validatesNoOtherObjectWithSameNameExistsOrThrows({
+    await this.validatesNoOtherObjectWithSameNameExistsOrThrows({
       objectMetadataNamePlural: objectMetadataInput.namePlural,
       objectMetadataNameSingular: objectMetadataInput.nameSingular,
       workspaceId: objectMetadataInput.workspaceId,
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/services/object-metadata-migration.service.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/services/object-metadata-migration.service.ts
index ece0209c3c45..5fa9c9323105 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/services/object-metadata-migration.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/services/object-metadata-migration.service.ts
@@ -1,12 +1,10 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
+import { FieldMetadataType } from 'twenty-shared';
 import { In, Repository } from 'typeorm';
 
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { computeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { buildMigrationsForCustomObjectRelations } from 'src/engine/metadata-modules/object-metadata/utils/build-migrations-for-custom-object-relations.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/services/object-metadata-relation.service.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/services/object-metadata-relation.service.ts
index de88295e1f84..fbec4faf764e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/services/object-metadata-relation.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/services/object-metadata-relation.service.ts
@@ -1,15 +1,12 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
-import { capitalize } from 'twenty-shared';
+import { capitalize, FieldMetadataType } from 'twenty-shared';
 import { In, Repository } from 'typeorm';
 
 import { FieldMetadataSettings } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-settings.interface';
 
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { buildDescriptionForRelationFieldMetadataOnFromField } from 'src/engine/metadata-modules/object-metadata/utils/build-description-for-relation-field-on-from-field.util';
 import { buildDescriptionForRelationFieldMetadataOnToField } from 'src/engine/metadata-modules/object-metadata/utils/build-description-for-relation-field-on-to-field.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/build-default-fields-for-custom-object.util.ts b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/build-default-fields-for-custom-object.util.ts
index 19eb5b2f7c05..d6edd1bde1fc 100644
--- a/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/build-default-fields-for-custom-object.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/build-default-fields-for-custom-object.util.ts
@@ -1,7 +1,6 @@
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
+
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   BASE_OBJECT_STANDARD_FIELD_IDS,
   CUSTOM_OBJECT_STANDARD_FIELD_IDS,
diff --git a/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.service.ts
index e5fb7e56f4b4..27ef8baca58a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/relation-metadata/relation-metadata.service.ts
@@ -3,15 +3,13 @@ import { InjectRepository } from '@nestjs/typeorm';
 
 import { TypeOrmQueryService } from '@ptc-org/nestjs-query-typeorm';
 import camelCase from 'lodash.camelcase';
+import { FieldMetadataType } from 'twenty-shared';
 import { FindOneOptions, In, Repository } from 'typeorm';
 import { v4 as uuidV4 } from 'uuid';
 
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/field-metadata.service';
 import { IndexMetadataService } from 'src/engine/metadata-modules/index-metadata/index-metadata.service';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
@@ -186,7 +184,7 @@ export class RelationMetadataService extends TypeOrmQueryService<RelationMetadat
       objectMetadataMap[relationMetadataInput.toObjectMetadataId] === undefined
     ) {
       throw new RelationMetadataException(
-        'Can\t find an existing object matching with fromObjectMetadataId or toObjectMetadataId',
+        "Can't find an existing object matching with fromObjectMetadataId or toObjectMetadataId",
         RelationMetadataExceptionCode.RELATION_METADATA_NOT_FOUND,
       );
     }
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table-relations/remote-table-relations.service.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table-relations/remote-table-relations.service.ts
index 614cbb891c2d..0ae9bb96fb9c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table-relations/remote-table-relations.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/remote-table-relations/remote-table-relations.service.ts
@@ -1,14 +1,12 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
+import { FieldMetadataType } from 'twenty-shared';
 import { In, Repository } from 'typeorm';
 
 import { FieldMetadataSettings } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-settings.interface';
 
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { createRelationForeignKeyFieldMetadataName } from 'src/engine/metadata-modules/relation-metadata/utils/create-relation-foreign-key-field-metadata-name.util';
 import { buildMigrationsToCreateRemoteTableRelations } from 'src/engine/metadata-modules/remote-server/remote-table/remote-table-relations/utils/build-migrations-to-create-remote-table-relations.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/utils/udt-name-mapper.util.ts b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/utils/udt-name-mapper.util.ts
index 5678f2ac5a5b..2799da011c26 100644
--- a/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/utils/udt-name-mapper.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/remote-server/remote-table/utils/udt-name-mapper.util.ts
@@ -1,10 +1,10 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import {
   FieldMetadataSettings,
   NumberDataType,
 } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-settings.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-
 export const mapUdtNameToFieldType = (udtName: string): FieldMetadataType => {
   switch (udtName) {
     case 'uuid':
diff --git a/packages/twenty-server/src/engine/metadata-modules/search/search.service.ts b/packages/twenty-server/src/engine/metadata-modules/search/search.service.ts
index 4bad6f902b4d..9f745bef39f8 100644
--- a/packages/twenty-server/src/engine/metadata-modules/search/search.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/search/search.service.ts
@@ -1,15 +1,13 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
+import { FieldMetadataType } from 'twenty-shared';
 import { Repository } from 'typeorm';
 
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 
 import { SEARCH_VECTOR_FIELD } from 'src/engine/metadata-modules/constants/search-vector-field.constants';
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { IndexType } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity';
 import { IndexMetadataService } from 'src/engine/metadata-modules/index-metadata/index-metadata.service';
 import { CreateObjectInput } from 'src/engine/metadata-modules/object-metadata/dtos/create-object.input';
diff --git a/packages/twenty-server/src/engine/metadata-modules/serverless-function/dtos/create-serverless-function.input.ts b/packages/twenty-server/src/engine/metadata-modules/serverless-function/dtos/create-serverless-function.input.ts
index 327044b7bd2f..ea89a9dfc8bf 100644
--- a/packages/twenty-server/src/engine/metadata-modules/serverless-function/dtos/create-serverless-function.input.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/serverless-function/dtos/create-serverless-function.input.ts
@@ -1,6 +1,13 @@
 import { Field, InputType } from '@nestjs/graphql';
 
-import { IsNotEmpty, IsOptional, IsString } from 'class-validator';
+import {
+  IsNotEmpty,
+  IsNumber,
+  IsOptional,
+  IsString,
+  Max,
+  Min,
+} from 'class-validator';
 
 @InputType()
 export class CreateServerlessFunctionInput {
@@ -13,4 +20,11 @@ export class CreateServerlessFunctionInput {
   @IsOptional()
   @Field({ nullable: true })
   description?: string;
+
+  @IsNumber()
+  @Field({ nullable: true })
+  @Min(1)
+  @Max(900)
+  @IsOptional()
+  timeoutSeconds?: number;
 }
diff --git a/packages/twenty-server/src/engine/metadata-modules/serverless-function/dtos/serverless-function.dto.ts b/packages/twenty-server/src/engine/metadata-modules/serverless-function/dtos/serverless-function.dto.ts
index 182988c1eaed..5b9386aec1af 100644
--- a/packages/twenty-server/src/engine/metadata-modules/serverless-function/dtos/serverless-function.dto.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/serverless-function/dtos/serverless-function.dto.ts
@@ -15,6 +15,7 @@ import {
   IsDateString,
   IsEnum,
   IsNotEmpty,
+  IsNumber,
   IsString,
   IsUUID,
 } from 'class-validator';
@@ -58,6 +59,10 @@ export class ServerlessFunctionDTO {
   @Field()
   runtime: string;
 
+  @IsNumber()
+  @Field()
+  timeoutSeconds: number;
+
   @IsString()
   @Field({ nullable: true })
   latestVersion: string;
diff --git a/packages/twenty-server/src/engine/metadata-modules/serverless-function/dtos/update-serverless-function.input.ts b/packages/twenty-server/src/engine/metadata-modules/serverless-function/dtos/update-serverless-function.input.ts
index 60dec1d7d581..4b176f2d331d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/serverless-function/dtos/update-serverless-function.input.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/serverless-function/dtos/update-serverless-function.input.ts
@@ -1,6 +1,15 @@
 import { Field, InputType } from '@nestjs/graphql';
 
-import { IsNotEmpty, IsObject, IsString, IsUUID } from 'class-validator';
+import {
+  IsNotEmpty,
+  IsNumber,
+  IsObject,
+  IsOptional,
+  IsString,
+  IsUUID,
+  Max,
+  Min,
+} from 'class-validator';
 import graphqlTypeJson from 'graphql-type-json';
 
 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
@@ -20,8 +29,16 @@ export class UpdateServerlessFunctionInput {
 
   @IsString()
   @Field({ nullable: true })
+  @IsOptional()
   description?: string;
 
+  @IsNumber()
+  @Field({ nullable: true })
+  @Min(1)
+  @Max(900)
+  @IsOptional()
+  timeoutSeconds?: number;
+
   @Field(() => graphqlTypeJson)
   @IsObject()
   code: JSON;
diff --git a/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.entity.ts b/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.entity.ts
index e0af9da1e7da..7aa9ee725fb0 100644
--- a/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.entity.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.entity.ts
@@ -1,4 +1,5 @@
 import {
+  Check,
   Column,
   CreateDateColumn,
   Entity,
@@ -8,6 +9,8 @@ import {
 
 import { InputSchema } from 'src/modules/workflow/workflow-builder/types/input-schema.type';
 
+const DEFAULT_SERVERLESS_TIMEOUT_SECONDS = 300; // 5 minutes
+
 export enum ServerlessFunctionSyncStatus {
   NOT_READY = 'NOT_READY',
   READY = 'READY',
@@ -40,6 +43,10 @@ export class ServerlessFunctionEntity {
   @Column({ nullable: false, default: ServerlessFunctionRuntime.NODE18 })
   runtime: ServerlessFunctionRuntime;
 
+  @Column({ nullable: false, default: DEFAULT_SERVERLESS_TIMEOUT_SECONDS })
+  @Check(`"timeoutSeconds" >= 1 AND "timeoutSeconds" <= 900`)
+  timeoutSeconds: number;
+
   @Column({ nullable: true })
   layerVersion: number;
 
diff --git a/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.resolver.ts
index c89f9eadc7f7..90e8b9938416 100644
--- a/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.resolver.ts
@@ -159,10 +159,7 @@ export class ServerlessFunctionResolver {
       await this.checkFeatureFlag(workspaceId);
 
       return await this.serverlessFunctionService.createOneServerlessFunction(
-        {
-          name: input.name,
-          description: input.description,
-        },
+        input,
         workspaceId,
       );
     } catch (error) {
diff --git a/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.service.ts b/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.service.ts
index 2b72ec79538b..66cc4d0f1606 100644
--- a/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/serverless-function/serverless-function.service.ts
@@ -4,7 +4,7 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { basename, dirname, join } from 'path';
 
 import deepEqual from 'deep-equal';
-import { Repository } from 'typeorm';
+import { IsNull, Not, Repository } from 'typeorm';
 
 import { FileStorageExceptionCode } from 'src/engine/core-modules/file-storage/interfaces/file-storage-exception';
 import { ServerlessExecuteResult } from 'src/engine/core-modules/serverless/drivers/interfaces/serverless-driver.interface';
@@ -58,11 +58,13 @@ export class ServerlessFunctionService {
     return this.serverlessFunctionRepository.findBy(where);
   }
 
-  async getServerlessFunctionSourceCode(
-    workspaceId: string,
-    id: string,
-    version: string,
-  ): Promise<{ [filePath: string]: string } | undefined> {
+  async findOneOrFail({
+    workspaceId,
+    id,
+  }: {
+    workspaceId: string;
+    id: string;
+  }) {
     const serverlessFunction =
       await this.serverlessFunctionRepository.findOneBy({
         id,
@@ -76,6 +78,28 @@ export class ServerlessFunctionService {
       );
     }
 
+    return serverlessFunction;
+  }
+
+  async hasServerlessFunctionPublishedVersion(serverlessFunctionId: string) {
+    return await this.serverlessFunctionRepository.exists({
+      where: {
+        id: serverlessFunctionId,
+        latestVersion: Not(IsNull()),
+      },
+    });
+  }
+
+  async getServerlessFunctionSourceCode(
+    workspaceId: string,
+    id: string,
+    version: string,
+  ): Promise<{ [filePath: string]: string } | undefined> {
+    const serverlessFunction = await this.findOneOrFail({
+      id,
+      workspaceId,
+    });
+
     try {
       const folderPath = getServerlessFolder({
         serverlessFunction,
@@ -112,19 +136,10 @@ export class ServerlessFunctionService {
   ): Promise<ServerlessExecuteResult> {
     await this.throttleExecution(workspaceId);
 
-    const functionToExecute = await this.serverlessFunctionRepository.findOneBy(
-      {
-        id,
-        workspaceId,
-      },
-    );
-
-    if (!functionToExecute) {
-      throw new ServerlessFunctionException(
-        `Function does not exist`,
-        ServerlessFunctionExceptionCode.SERVERLESS_FUNCTION_NOT_FOUND,
-      );
-    }
+    const functionToExecute = await this.findOneOrFail({
+      id,
+      workspaceId,
+    });
 
     const resultServerlessFunction = await this.serverlessService.execute(
       functionToExecute,
@@ -154,15 +169,10 @@ export class ServerlessFunctionService {
   }
 
   async publishOneServerlessFunction(id: string, workspaceId: string) {
-    const existingServerlessFunction =
-      await this.serverlessFunctionRepository.findOneBy({ id, workspaceId });
-
-    if (!existingServerlessFunction) {
-      throw new ServerlessFunctionException(
-        `Function does not exist`,
-        ServerlessFunctionExceptionCode.SERVERLESS_FUNCTION_NOT_FOUND,
-      );
-    }
+    const existingServerlessFunction = await this.findOneOrFail({
+      id,
+      workspaceId,
+    });
 
     if (isDefined(existingServerlessFunction.latestVersion)) {
       const latestCode = await this.getServerlessFunctionSourceCode(
@@ -214,18 +224,10 @@ export class ServerlessFunctionService {
     workspaceId: string;
     isHardDeletion?: boolean;
   }) {
-    const existingServerlessFunction =
-      await this.serverlessFunctionRepository.findOneBy({
-        id,
-        workspaceId,
-      });
-
-    if (!existingServerlessFunction) {
-      throw new ServerlessFunctionException(
-        `Function does not exist`,
-        ServerlessFunctionExceptionCode.SERVERLESS_FUNCTION_NOT_FOUND,
-      );
-    }
+    const existingServerlessFunction = await this.findOneOrFail({
+      id,
+      workspaceId,
+    });
 
     if (isHardDeletion) {
       await this.serverlessFunctionRepository.delete(id);
@@ -245,18 +247,10 @@ export class ServerlessFunctionService {
     serverlessFunctionInput: UpdateServerlessFunctionInput,
     workspaceId: string,
   ) {
-    const existingServerlessFunction =
-      await this.serverlessFunctionRepository.findOneBy({
-        id: serverlessFunctionInput.id,
-        workspaceId,
-      });
-
-    if (!existingServerlessFunction) {
-      throw new ServerlessFunctionException(
-        `Function does not exist`,
-        ServerlessFunctionExceptionCode.SERVERLESS_FUNCTION_NOT_FOUND,
-      );
-    }
+    const existingServerlessFunction = await this.findOneOrFail({
+      id: serverlessFunctionInput.id,
+      workspaceId,
+    });
 
     await this.serverlessFunctionRepository.update(
       existingServerlessFunction.id,
@@ -264,6 +258,7 @@ export class ServerlessFunctionService {
         name: serverlessFunctionInput.name,
         description: serverlessFunctionInput.description,
         syncStatus: ServerlessFunctionSyncStatus.NOT_READY,
+        timeoutSeconds: serverlessFunctionInput.timeoutSeconds,
       },
     );
 
@@ -357,66 +352,40 @@ export class ServerlessFunctionService {
     });
   }
 
-  async copyOneServerlessFunction({
-    serverlessFunctionToCopyId,
-    serverlessFunctionToCopyVersion,
+  async usePublishedVersionAsDraft({
+    id,
+    version,
     workspaceId,
   }: {
-    serverlessFunctionToCopyId: string;
-    serverlessFunctionToCopyVersion: string;
+    id: string;
+    version: string;
     workspaceId: string;
   }) {
-    const serverlessFunctionToCopy =
-      await this.serverlessFunctionRepository.findOneBy({
-        workspaceId,
-        id: serverlessFunctionToCopyId,
-        latestVersion: serverlessFunctionToCopyVersion,
-      });
-
-    if (!serverlessFunctionToCopy) {
-      throw new ServerlessFunctionException(
-        'Function does not exist',
-        ServerlessFunctionExceptionCode.SERVERLESS_FUNCTION_NOT_FOUND,
-      );
-    }
-
-    const serverlessFunctionToCreate = this.serverlessFunctionRepository.create(
-      {
-        name: serverlessFunctionToCopy?.name,
-        description: serverlessFunctionToCopy?.description,
-        workspaceId,
-        layerVersion: LAST_LAYER_VERSION,
-      },
-    );
-
-    const copiedServerlessFunction =
-      await this.serverlessFunctionRepository.save(serverlessFunctionToCreate);
-
-    const serverlessFunctionToCopyFileFolder = getServerlessFolder({
-      serverlessFunction: serverlessFunctionToCopy,
-      version: 'latest',
-    });
-    const copiedServerlessFunctionFileFolder = getServerlessFolder({
-      serverlessFunction: copiedServerlessFunction,
-      version: 'draft',
+    const serverlessFunction = await this.findOneOrFail({
+      id,
+      workspaceId,
     });
 
     await this.fileStorageService.copy({
       from: {
-        folderPath: serverlessFunctionToCopyFileFolder,
+        folderPath: getServerlessFolder({
+          serverlessFunction: serverlessFunction,
+          version,
+        }),
       },
       to: {
-        folderPath: copiedServerlessFunctionFileFolder,
+        folderPath: getServerlessFolder({
+          serverlessFunction: serverlessFunction,
+          version: 'draft',
+        }),
       },
     });
 
     await this.buildServerlessFunction({
-      serverlessFunctionId: copiedServerlessFunction.id,
+      serverlessFunctionId: id,
       serverlessFunctionVersion: 'draft',
       workspaceId,
     });
-
-    return copiedServerlessFunction;
   }
 
   private async throttleExecution(workspaceId: string) {
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-cache/services/workspace-metadata-cache.service.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-cache/services/workspace-metadata-cache.service.ts
index 97070a741870..89f70f2eb63e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-cache/services/workspace-metadata-cache.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-metadata-cache/services/workspace-metadata-cache.service.ts
@@ -1,8 +1,6 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
-import console from 'console';
-
 import { Repository } from 'typeorm';
 
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
@@ -72,7 +70,6 @@ export class WorkspaceMetadataCacheService {
       currentDatabaseVersion,
     );
 
-    console.time('fetching object metadata');
     const objectMetadataItems = await this.objectMetadataRepository.find({
       where: { workspaceId },
       relations: [
@@ -84,14 +81,9 @@ export class WorkspaceMetadataCacheService {
       ],
     });
 
-    console.timeEnd('fetching object metadata');
-
-    console.time('generating object metadata map');
     const freshObjectMetadataMaps =
       generateObjectMetadataMaps(objectMetadataItems);
 
-    console.timeEnd('generating object metadata map');
-
     await this.workspaceCacheStorageService.setObjectMetadataMaps(
       workspaceId,
       currentDatabaseVersion,
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/constants/fieldMetadataTypesToTextColumnType.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/constants/fieldMetadataTypesToTextColumnType.ts
deleted file mode 100644
index 889cd3035f67..000000000000
--- a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/constants/fieldMetadataTypesToTextColumnType.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-
-export const FIELD_METADATA_TYPES_TO_TEXT_COLUMN_TYPE = [
-  FieldMetadataType.TEXT,
-  FieldMetadataType.RICH_TEXT,
-  FieldMetadataType.ARRAY,
-];
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/basic-column-action.factory.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/basic-column-action.factory.ts
index 26925227d2b1..998191ec556b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/basic-column-action.factory.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/basic-column-action.factory.ts
@@ -1,9 +1,10 @@
 import { Injectable, Logger } from '@nestjs/common';
 
+import { FieldMetadataType } from 'twenty-shared';
+
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 import { WorkspaceColumnActionOptions } from 'src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-options.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { computeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
 import { serializeDefaultValue } from 'src/engine/metadata-modules/field-metadata/utils/serialize-default-value';
 import { ColumnActionAbstractFactory } from 'src/engine/metadata-modules/workspace-migration/factories/column-action-abstract.factory';
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/column-action-abstract.factory.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/column-action-abstract.factory.ts
index 0e600aa6f618..1572fd9a2b66 100644
--- a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/column-action-abstract.factory.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/column-action-abstract.factory.ts
@@ -1,17 +1,18 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { Logger } from '@nestjs/common';
 
+import { FieldMetadataType } from 'twenty-shared';
+
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
-import { WorkspaceColumnActionOptions } from 'src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-options.interface';
 import { WorkspaceColumnActionFactory } from 'src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-factory.interface';
+import { WorkspaceColumnActionOptions } from 'src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-options.interface';
 
 import {
-  WorkspaceMigrationColumnActionType,
   WorkspaceMigrationColumnAction,
-  WorkspaceMigrationColumnCreate,
+  WorkspaceMigrationColumnActionType,
   WorkspaceMigrationColumnAlter,
+  WorkspaceMigrationColumnCreate,
 } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   WorkspaceMigrationException,
   WorkspaceMigrationExceptionCode,
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/composite-column-action.factory.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/composite-column-action.factory.ts
index 0051d7293a65..941403074b21 100644
--- a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/composite-column-action.factory.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/composite-column-action.factory.ts
@@ -1,9 +1,10 @@
 import { Injectable, Logger } from '@nestjs/common';
 
+import { FieldMetadataType } from 'twenty-shared';
+
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 
 import { compositeTypeDefinitions } from 'src/engine/metadata-modules/field-metadata/composite-types';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { computeCompositeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
 import { serializeDefaultValue } from 'src/engine/metadata-modules/field-metadata/utils/serialize-default-value';
 import { ColumnActionAbstractFactory } from 'src/engine/metadata-modules/workspace-migration/factories/column-action-abstract.factory';
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/enum-column-action.factory.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/enum-column-action.factory.ts
index 182bc0a7c9f4..2d7e011f384d 100644
--- a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/enum-column-action.factory.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/enum-column-action.factory.ts
@@ -1,9 +1,10 @@
 import { Injectable, Logger } from '@nestjs/common';
 
+import { FieldMetadataType } from 'twenty-shared';
+
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 import { WorkspaceColumnActionOptions } from 'src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-options.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { computeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
 import { serializeDefaultValue } from 'src/engine/metadata-modules/field-metadata/utils/serialize-default-value';
 import { ColumnActionAbstractFactory } from 'src/engine/metadata-modules/workspace-migration/factories/column-action-abstract.factory';
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/ts-vector-column-action.factory.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/ts-vector-column-action.factory.ts
index 71f1265b7baa..8872e23d9e70 100644
--- a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/ts-vector-column-action.factory.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/factories/ts-vector-column-action.factory.ts
@@ -1,8 +1,9 @@
 import { Injectable, Logger } from '@nestjs/common';
 
+import { FieldMetadataType } from 'twenty-shared';
+
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { computeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
 import { ColumnActionAbstractFactory } from 'src/engine/metadata-modules/workspace-migration/factories/column-action-abstract.factory';
 import { fieldMetadataTypeToColumnType } from 'src/engine/metadata-modules/workspace-migration/utils/field-metadata-type-to-column-type.util';
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-factory.interface.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-factory.interface.ts
index b1114c181488..f8a2f034f678 100644
--- a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-factory.interface.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-factory.interface.ts
@@ -1,10 +1,11 @@
-import { WorkspaceColumnActionOptions } from 'src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-options.interface';
+import { FieldMetadataType } from 'twenty-shared';
+
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
+import { WorkspaceColumnActionOptions } from 'src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-options.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
-  WorkspaceMigrationColumnActionType,
   WorkspaceMigrationColumnAction,
+  WorkspaceMigrationColumnActionType,
 } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
 
 export interface WorkspaceColumnActionFactory<
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/utils/field-metadata-type-to-column-type.util.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/utils/field-metadata-type-to-column-type.util.ts
index 48961fe8530d..c9777c2f5c7b 100644
--- a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/utils/field-metadata-type-to-column-type.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/utils/field-metadata-type-to-column-type.util.ts
@@ -1,4 +1,5 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
+
 import { isTextColumnType } from 'src/engine/metadata-modules/workspace-migration/utils/is-text-column-type.util';
 import {
   WorkspaceMigrationException,
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/utils/is-text-column-type.util.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/utils/is-text-column-type.util.ts
index d0a1d70a298e..6dc0b0ef88a6 100644
--- a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/utils/is-text-column-type.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/utils/is-text-column-type.util.ts
@@ -1,4 +1,4 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
 
 export const isTextColumnType = (type: FieldMetadataType) => {
   return (
diff --git a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.factory.ts b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.factory.ts
index 5df5da052f2b..77d7a8351ae8 100644
--- a/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.factory.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/workspace-migration/workspace-migration.factory.ts
@@ -1,10 +1,11 @@
 import { Injectable, Logger } from '@nestjs/common';
 
+import { FieldMetadataType } from 'twenty-shared';
+
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 import { WorkspaceColumnActionFactory } from 'src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-factory.interface';
 import { WorkspaceColumnActionOptions } from 'src/engine/metadata-modules/workspace-migration/interfaces/workspace-column-action-options.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { BasicColumnActionFactory } from 'src/engine/metadata-modules/workspace-migration/factories/basic-column-action.factory';
 import { CompositeColumnActionFactory } from 'src/engine/metadata-modules/workspace-migration/factories/composite-column-action.factory';
 import { EnumColumnActionFactory } from 'src/engine/metadata-modules/workspace-migration/factories/enum-column-action.factory';
diff --git a/packages/twenty-server/src/engine/middlewares/graphql-hydrate-request-from-token.middleware.ts b/packages/twenty-server/src/engine/middlewares/graphql-hydrate-request-from-token.middleware.ts
index f1eb58a07e21..c868d700ff7f 100644
--- a/packages/twenty-server/src/engine/middlewares/graphql-hydrate-request-from-token.middleware.ts
+++ b/packages/twenty-server/src/engine/middlewares/graphql-hydrate-request-from-token.middleware.ts
@@ -48,6 +48,8 @@ export class GraphQLHydrateRequestFromTokenMiddleware
       'CheckUserExists',
       'Challenge',
       'Verify',
+      'GetLoginTokenFromEmailVerificationToken',
+      'ResendEmailVerificationToken',
       'SignUp',
       'RenewToken',
       'EmailPasswordResetLink',
diff --git a/packages/twenty-server/src/engine/seeder/metadata-seeds/pets-metadata-seeds.ts b/packages/twenty-server/src/engine/seeder/metadata-seeds/pets-metadata-seeds.ts
index e3acc9daed49..13728594dea2 100644
--- a/packages/twenty-server/src/engine/seeder/metadata-seeds/pets-metadata-seeds.ts
+++ b/packages/twenty-server/src/engine/seeder/metadata-seeds/pets-metadata-seeds.ts
@@ -1,6 +1,6 @@
 import { ObjectMetadataSeed } from 'src/engine/seeder/interfaces/object-metadata-seed';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
 
 export const PETS_METADATA_SEEDS: ObjectMetadataSeed = {
   labelPlural: 'Pets',
diff --git a/packages/twenty-server/src/engine/seeder/metadata-seeds/survey-results-metadata-seeds.ts b/packages/twenty-server/src/engine/seeder/metadata-seeds/survey-results-metadata-seeds.ts
index af6d6305fc3e..14a76da5f7e1 100644
--- a/packages/twenty-server/src/engine/seeder/metadata-seeds/survey-results-metadata-seeds.ts
+++ b/packages/twenty-server/src/engine/seeder/metadata-seeds/survey-results-metadata-seeds.ts
@@ -5,7 +5,7 @@ import {
 } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-settings.interface';
 import { ObjectMetadataSeed } from 'src/engine/seeder/interfaces/object-metadata-seed';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
 
 export const SURVEY_RESULTS_METADATA_SEEDS: ObjectMetadataSeed = {
   labelPlural: 'Survey results',
diff --git a/packages/twenty-server/src/engine/seeder/seeder.service.ts b/packages/twenty-server/src/engine/seeder/seeder.service.ts
index f796791a34ab..0f06c7d55808 100644
--- a/packages/twenty-server/src/engine/seeder/seeder.service.ts
+++ b/packages/twenty-server/src/engine/seeder/seeder.service.ts
@@ -1,13 +1,12 @@
 import { Injectable } from '@nestjs/common';
 
-import { capitalize } from 'twenty-shared';
+import { capitalize, FieldMetadataType } from 'twenty-shared';
 
 import { ObjectMetadataSeed } from 'src/engine/seeder/interfaces/object-metadata-seed';
 
 import { DEV_SEED_WORKSPACE_MEMBER_IDS } from 'src/database/typeorm-seeds/workspace/workspace-members';
 import { compositeTypeDefinitions } from 'src/engine/metadata-modules/field-metadata/composite-types';
 import { CreateFieldInput } from 'src/engine/metadata-modules/field-metadata/dtos/create-field.input';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/field-metadata.service';
 import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
 import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
diff --git a/packages/twenty-server/src/engine/twenty-orm/base.workspace-entity.ts b/packages/twenty-server/src/engine/twenty-orm/base.workspace-entity.ts
index 53355304c346..80e9a673b261 100644
--- a/packages/twenty-server/src/engine/twenty-orm/base.workspace-entity.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/base.workspace-entity.ts
@@ -1,4 +1,5 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
+
 import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
 import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
 import { WorkspaceIsPrimaryField } from 'src/engine/twenty-orm/decorators/workspace-is-primary-field.decorator';
diff --git a/packages/twenty-server/src/engine/twenty-orm/custom.workspace-entity.ts b/packages/twenty-server/src/engine/twenty-orm/custom.workspace-entity.ts
index f121b57bd2c8..637d9be075dc 100644
--- a/packages/twenty-server/src/engine/twenty-orm/custom.workspace-entity.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/custom.workspace-entity.ts
@@ -1,9 +1,10 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { SEARCH_VECTOR_FIELD } from 'src/engine/metadata-modules/constants/search-vector-field.constants';
 import {
   ActorMetadata,
   FieldActorSource,
 } from 'src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { IndexType } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity';
 import { DEFAULT_LABEL_IDENTIFIER_FIELD_NAME } from 'src/engine/metadata-modules/object-metadata/object-metadata.constants';
 import {
diff --git a/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-field.decorator.ts b/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-field.decorator.ts
index 35068e823005..2ea31fa1ee63 100644
--- a/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-field.decorator.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-field.decorator.ts
@@ -1,8 +1,9 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { FieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
 import { FieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface';
 import { FieldMetadataSettings } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-settings.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { generateDefaultValue } from 'src/engine/metadata-modules/field-metadata/utils/generate-default-value';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { metadataArgsStorage } from 'src/engine/twenty-orm/storage/metadata-args.storage';
diff --git a/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-gate.decorator.ts b/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-gate.decorator.ts
index ed63b20ee276..a672e70f50a1 100644
--- a/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-gate.decorator.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-gate.decorator.ts
@@ -1,3 +1,5 @@
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
+import { isPublicFeatureFlag } from 'src/engine/core-modules/lab/utils/is-public-feature-flag.util';
 import { TypedReflect } from 'src/utils/typed-reflect';
 
 export interface WorkspaceGateOptions {
@@ -5,6 +7,15 @@ export interface WorkspaceGateOptions {
 }
 
 export function WorkspaceGate(options: WorkspaceGateOptions) {
+  const flagKey = options.featureFlag as FeatureFlagKey;
+
+  if (isPublicFeatureFlag(flagKey)) {
+    throw new Error(
+      `Public feature flag "${flagKey}" cannot be used to gate entities. ` +
+        'Public flags should not be used for entity gating as they can be toggled by users.',
+    );
+  }
+
   return (target: any, propertyKey?: string | symbol) => {
     if (propertyKey !== undefined) {
       TypedReflect.defineMetadata(
diff --git a/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-column.factory.ts b/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-column.factory.ts
index 323a02befdb3..4d6839a37aa2 100644
--- a/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-column.factory.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-column.factory.ts
@@ -1,11 +1,11 @@
 import { Injectable } from '@nestjs/common';
 
 import { ColumnType, EntitySchemaColumnOptions } from 'typeorm';
+import { FieldMetadataType } from 'twenty-shared';
 
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 
 import { compositeTypeDefinitions } from 'src/engine/metadata-modules/field-metadata/composite-types';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { computeCompositeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
 import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
 import { isEnumFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-enum-field-metadata-type.util';
diff --git a/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-field-metadata-args.interface.ts b/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-field-metadata-args.interface.ts
index 03862b3adf61..4d65fc557bcb 100644
--- a/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-field-metadata-args.interface.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/interfaces/workspace-field-metadata-args.interface.ts
@@ -1,9 +1,10 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { FieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
 import { FieldMetadataOptions } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-options.interface';
 import { FieldMetadataSettings } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-settings.interface';
 import { Gate } from 'src/engine/twenty-orm/interfaces/gate.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 
 export interface WorkspaceFieldMetadataArgs {
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/format-data.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/format-data.util.ts
index f1f1e61e8022..66e1838d25cb 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/format-data.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/format-data.util.ts
@@ -1,9 +1,8 @@
-import { capitalize } from 'twenty-shared';
+import { capitalize, FieldMetadataType } from 'twenty-shared';
 
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 
 import { compositeTypeDefinitions } from 'src/engine/metadata-modules/field-metadata/composite-types';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
 import { ObjectMetadataItemWithFieldMaps } from 'src/engine/metadata-modules/types/object-metadata-item-with-field-maps';
 import { CompositeFieldMetadataType } from 'src/engine/metadata-modules/workspace-migration/factories/composite-column-action.factory';
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/format-result.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/format-result.util.ts
index ceb2f427c793..956880cff51b 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/format-result.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/format-result.util.ts
@@ -1,9 +1,12 @@
 import { isPlainObject } from '@nestjs/common/utils/shared.utils';
 
+import { isNonEmptyString } from '@sniptt/guards';
+import { isDefined } from 'class-validator';
+import { FieldMetadataType } from 'twenty-shared';
+
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 
 import { compositeTypeDefinitions } from 'src/engine/metadata-modules/field-metadata/composite-types';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { computeCompositeColumnName } from 'src/engine/metadata-modules/field-metadata/utils/compute-column-name.util';
 import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { ObjectMetadataItemWithFieldMaps } from 'src/engine/metadata-modules/types/object-metadata-item-with-field-maps';
@@ -11,10 +14,12 @@ import { ObjectMetadataMaps } from 'src/engine/metadata-modules/types/object-met
 import { computeRelationType } from 'src/engine/twenty-orm/utils/compute-relation-type.util';
 import { getCompositeFieldMetadataCollection } from 'src/engine/twenty-orm/utils/get-composite-field-metadata-collection';
 import { isRelationFieldMetadataType } from 'src/engine/utils/is-relation-field-metadata-type.util';
+import { isDate } from 'src/utils/date/isDate';
+import { isValidDate } from 'src/utils/date/isValidDate';
 
 export function formatResult<T>(
   data: any,
-  ObjectMetadataItemWithFieldMaps: ObjectMetadataItemWithFieldMaps,
+  objectMetadataItemWithFieldMaps: ObjectMetadataItemWithFieldMaps,
   objectMetadataMaps: ObjectMetadataMaps,
 ): T {
   if (!data) {
@@ -23,7 +28,7 @@ export function formatResult<T>(
 
   if (Array.isArray(data)) {
     return data.map((item) =>
-      formatResult(item, ObjectMetadataItemWithFieldMaps, objectMetadataMaps),
+      formatResult(item, objectMetadataItemWithFieldMaps, objectMetadataMaps),
     ) as T;
   }
 
@@ -31,12 +36,12 @@ export function formatResult<T>(
     return data;
   }
 
-  if (!ObjectMetadataItemWithFieldMaps) {
+  if (!objectMetadataItemWithFieldMaps) {
     throw new Error('Object metadata is missing');
   }
 
   const compositeFieldMetadataCollection = getCompositeFieldMetadataCollection(
-    ObjectMetadataItemWithFieldMaps,
+    objectMetadataItemWithFieldMaps,
   );
 
   const compositeFieldMetadataMap = new Map(
@@ -57,7 +62,7 @@ export function formatResult<T>(
   );
 
   const relationMetadataMap = new Map(
-    Object.values(ObjectMetadataItemWithFieldMaps.fieldsById)
+    Object.values(objectMetadataItemWithFieldMaps.fieldsById)
       .filter(({ type }) => isRelationFieldMetadataType(type))
       .map((fieldMetadata) => [
         fieldMetadata.name,
@@ -75,7 +80,7 @@ export function formatResult<T>(
   );
   const newData: object = {};
   const objectMetadaItemFieldsByName =
-    objectMetadataMaps.byId[ObjectMetadataItemWithFieldMaps.id]?.fieldsByName;
+    objectMetadataMaps.byId[objectMetadataItemWithFieldMaps.id]?.fieldsByName;
 
   for (const [key, value] of Object.entries(data)) {
     const compositePropertyArgs = compositeFieldMetadataMap.get(key);
@@ -86,7 +91,7 @@ export function formatResult<T>(
       if (isPlainObject(value)) {
         newData[key] = formatResult(
           value,
-          ObjectMetadataItemWithFieldMaps,
+          objectMetadataItemWithFieldMaps,
           objectMetadataMaps,
         );
       } else if (objectMetadaItemFieldsByName[key]) {
@@ -141,6 +146,56 @@ export function formatResult<T>(
     newData[parentField][compositeProperty.name] = value;
   }
 
+  const dateFieldMetadataCollection =
+    objectMetadataItemWithFieldMaps.fields.filter(
+      (field) => field.type === FieldMetadataType.DATE,
+    );
+
+  // This is a temporary fix to handle a bug in the frontend where the date gets returned in the wrong timezone,
+  //   thus returning the wrong date.
+  //
+  // In short, for example :
+  //   - DB stores `2025-01-01`
+  //   - TypeORM .returning() returns `2024-12-31T23:00:00.000Z`
+  //   - we shift +1h (or whatever the timezone offset is on the server)
+  //   - we return `2025-01-01T00:00:00.000Z`
+  //
+  // See this PR for more details: https://github.com/twentyhq/twenty/pull/9700
+  const serverOffsetInMillisecondsToCounterActTypeORMAutomaticTimezoneShift =
+    new Date().getTimezoneOffset() * 60 * 1000;
+
+  for (const dateFieldMetadata of dateFieldMetadataCollection) {
+    const rawUpdatedDate = newData[dateFieldMetadata.name] as
+      | string
+      | null
+      | undefined
+      | Date;
+
+    if (!isDefined(rawUpdatedDate)) {
+      continue;
+    }
+
+    if (isDate(rawUpdatedDate)) {
+      if (isValidDate(rawUpdatedDate)) {
+        const shiftedDate = new Date(
+          rawUpdatedDate.getTime() -
+            serverOffsetInMillisecondsToCounterActTypeORMAutomaticTimezoneShift,
+        );
+
+        newData[dateFieldMetadata.name] = shiftedDate;
+      }
+    } else if (isNonEmptyString(rawUpdatedDate)) {
+      const currentDate = new Date(newData[dateFieldMetadata.name]);
+
+      const shiftedDate = new Date(
+        new Date(currentDate).getTime() -
+          serverOffsetInMillisecondsToCounterActTypeORMAutomaticTimezoneShift,
+      );
+
+      newData[dateFieldMetadata.name] = shiftedDate;
+    }
+  }
+
   return newData as T;
 }
 
diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/get-subfields-for-aggregate-operation.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/get-subfields-for-aggregate-operation.util.ts
index bbe0c48f0567..77bf6966538e 100644
--- a/packages/twenty-server/src/engine/twenty-orm/utils/get-subfields-for-aggregate-operation.util.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/utils/get-subfields-for-aggregate-operation.util.ts
@@ -1,4 +1,5 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
+
 import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
 
 export const getSubfieldsForAggregateOperation = (
@@ -26,7 +27,7 @@ export const getSubfieldsForAggregateOperation = (
       case FieldMetadataType.LINKS:
         return ['primaryLinkUrl'];
       case FieldMetadataType.ACTOR:
-        return ['workspaceMemberId'];
+        return ['workspaceMemberId', 'source'];
       case FieldMetadataType.EMAILS:
         return ['primaryEmail'];
       case FieldMetadataType.PHONES:
diff --git a/packages/twenty-server/src/engine/utils/__tests__/deduce-relation-direction.spec.ts b/packages/twenty-server/src/engine/utils/__tests__/deduce-relation-direction.spec.ts
index 71114d678a59..a6a9ad177c6b 100644
--- a/packages/twenty-server/src/engine/utils/__tests__/deduce-relation-direction.spec.ts
+++ b/packages/twenty-server/src/engine/utils/__tests__/deduce-relation-direction.spec.ts
@@ -1,7 +1,8 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 import { RelationMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/relation-metadata.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import {
   deduceRelationDirection,
diff --git a/packages/twenty-server/src/engine/utils/generate-fake-value.ts b/packages/twenty-server/src/engine/utils/generate-fake-value.ts
index e29c0dc9a189..93839ac61e9e 100644
--- a/packages/twenty-server/src/engine/utils/generate-fake-value.ts
+++ b/packages/twenty-server/src/engine/utils/generate-fake-value.ts
@@ -1,4 +1,4 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
 
 type FakeValueTypes =
   | string
@@ -7,13 +7,16 @@ type FakeValueTypes =
   | Date
   | FakeValueTypes[]
   | FieldMetadataType
-  | { [key: string]: FakeValueTypes };
+  | { [key: string]: FakeValueTypes }
+  | null;
 
-export const generateFakeValue = (valueType: string): FakeValueTypes => {
+type TypeClassification = 'Primitive' | 'FieldMetadataType';
+
+const generatePrimitiveValue = (valueType: string): FakeValueTypes => {
   if (valueType === 'string') {
-    return 'generated-string-value';
+    return 'My text';
   } else if (valueType === 'number') {
-    return 1;
+    return 20;
   } else if (valueType === 'boolean') {
     return true;
   } else if (valueType === 'Date') {
@@ -38,9 +41,51 @@ export const generateFakeValue = (valueType: string): FakeValueTypes => {
     });
 
     return objData;
-  } else if (valueType === FieldMetadataType.TEXT) {
-    return 'My text';
   } else {
-    return 'generated-string-value';
+    return null;
+  }
+};
+
+const generateFieldMetadataTypeValue = (
+  valueType: string,
+): FakeValueTypes | null => {
+  // composite types do not need to be generated
+  switch (valueType) {
+    case FieldMetadataType.TEXT:
+      return 'My text';
+    case FieldMetadataType.NUMBER:
+      return 20;
+    case FieldMetadataType.BOOLEAN:
+      return true;
+    case FieldMetadataType.DATE:
+      return '01/23/2025';
+    case FieldMetadataType.DATE_TIME:
+      return '01/23/2025 15:16';
+    case FieldMetadataType.ADDRESS:
+      return '123 Main St, Anytown, CA 12345';
+    case FieldMetadataType.FULL_NAME:
+      return 'Tim Cook';
+    case FieldMetadataType.RAW_JSON:
+      return null;
+    case FieldMetadataType.RICH_TEXT:
+      return 'My rich text';
+    case FieldMetadataType.UUID:
+      return '123e4567-e89b-12d3-a456-426614174000';
+    default:
+      return null;
+  }
+};
+
+export const generateFakeValue = (
+  valueType: string,
+  classification: TypeClassification = 'Primitive',
+): FakeValueTypes => {
+  switch (classification) {
+    case 'Primitive':
+      return generatePrimitiveValue(valueType);
+    case 'FieldMetadataType':
+      return generateFieldMetadataTypeValue(valueType);
+    default:
+      return null;
   }
 };
diff --git a/packages/twenty-server/src/engine/utils/is-relation-field-metadata-type.util.ts b/packages/twenty-server/src/engine/utils/is-relation-field-metadata-type.util.ts
index a5ed9d644eba..f12bc852d86a 100644
--- a/packages/twenty-server/src/engine/utils/is-relation-field-metadata-type.util.ts
+++ b/packages/twenty-server/src/engine/utils/is-relation-field-metadata-type.util.ts
@@ -1,4 +1,4 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
 
 export const isRelationFieldMetadataType = (
   type: FieldMetadataType,
diff --git a/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/seed-workspace-with-demo-data.ts b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/seed-workspace-with-demo-data.ts
index 3817850662d4..f2d889e248f5 100644
--- a/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/seed-workspace-with-demo-data.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/demo-objects-prefill-data/seed-workspace-with-demo-data.ts
@@ -13,7 +13,6 @@ export const seedWorkspaceWithDemoData = async (
   workspaceDataSource: DataSource,
   schemaName: string,
   objectMetadata: ObjectMetadataEntity[],
-  isWorkflowEnabled: boolean,
 ) => {
   const objectMetadataMap = objectMetadata.reduce((acc, object) => {
     acc[object.standardId ?? ''] = {
@@ -38,7 +37,6 @@ export const seedWorkspaceWithDemoData = async (
         entityManager,
         schemaName,
         objectMetadataMap,
-        isWorkflowEnabled,
       );
 
       await seedWorkspaceFavorites(
diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/create-workspace-views.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/create-workspace-views.ts
new file mode 100644
index 000000000000..cafcdb76aca5
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/create-workspace-views.ts
@@ -0,0 +1,139 @@
+import { EntityManager } from 'typeorm';
+import { v4 } from 'uuid';
+
+import { ViewDefinition } from 'src/engine/workspace-manager/standard-objects-prefill-data/types/view-definition.interface';
+
+export const createWorkspaceViews = async (
+  entityManager: EntityManager,
+  schemaName: string,
+  viewDefinitions: ViewDefinition[],
+) => {
+  const viewDefinitionsWithId = viewDefinitions.map((viewDefinition) => ({
+    ...viewDefinition,
+    id: v4(),
+  }));
+
+  await entityManager
+    .createQueryBuilder()
+    .insert()
+    .into(`${schemaName}.view`, [
+      'id',
+      'name',
+      'objectMetadataId',
+      'type',
+      'key',
+      'position',
+      'icon',
+      'kanbanFieldMetadataId',
+      'kanbanAggregateOperation',
+      'kanbanAggregateOperationFieldMetadataId',
+    ])
+    .values(
+      viewDefinitionsWithId.map(
+        ({
+          id,
+          name,
+          objectMetadataId,
+          type,
+          key,
+          position,
+          icon,
+          kanbanFieldMetadataId,
+          kanbanAggregateOperation,
+          kanbanAggregateOperationFieldMetadataId,
+        }) => ({
+          id,
+          name,
+          objectMetadataId,
+          type,
+          key,
+          position,
+          icon,
+          kanbanFieldMetadataId,
+          kanbanAggregateOperation,
+          kanbanAggregateOperationFieldMetadataId,
+        }),
+      ),
+    )
+    .returning('*')
+    .execute();
+
+  for (const viewDefinition of viewDefinitionsWithId) {
+    if (viewDefinition.fields && viewDefinition.fields.length > 0) {
+      await entityManager
+        .createQueryBuilder()
+        .insert()
+        .into(`${schemaName}.viewField`, [
+          'fieldMetadataId',
+          'position',
+          'isVisible',
+          'size',
+          'viewId',
+          'aggregateOperation',
+        ])
+        .values(
+          viewDefinition.fields.map((field) => ({
+            fieldMetadataId: field.fieldMetadataId,
+            position: field.position,
+            isVisible: field.isVisible,
+            size: field.size,
+            viewId: viewDefinition.id,
+            aggregateOperation: field.aggregateOperation,
+          })),
+        )
+        .execute();
+    }
+
+    if (viewDefinition.filters && viewDefinition.filters.length > 0) {
+      await entityManager
+        .createQueryBuilder()
+        .insert()
+        .into(`${schemaName}.viewFilter`, [
+          'fieldMetadataId',
+          'displayValue',
+          'operand',
+          'value',
+          'viewId',
+        ])
+        .values(
+          viewDefinition.filters.map((filter: any) => ({
+            fieldMetadataId: filter.fieldMetadataId,
+            displayValue: filter.displayValue,
+            operand: filter.operand,
+            value: filter.value,
+            viewId: viewDefinition.id,
+          })),
+        )
+        .execute();
+    }
+
+    if (
+      'groups' in viewDefinition &&
+      viewDefinition.groups &&
+      viewDefinition.groups.length > 0
+    ) {
+      await entityManager
+        .createQueryBuilder()
+        .insert()
+        .into(`${schemaName}.viewGroup`, [
+          'fieldMetadataId',
+          'isVisible',
+          'fieldValue',
+          'position',
+          'viewId',
+        ])
+        .values(
+          viewDefinition.groups.map((group: any) => ({
+            fieldMetadataId: group.fieldMetadataId,
+            isVisible: group.isVisible,
+            fieldValue: group.fieldValue,
+            position: group.position,
+            viewId: viewDefinition.id,
+          })),
+        )
+        .execute();
+    }
+  }
+
+  return viewDefinitionsWithId;
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/seed-view-with-demo-data.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/seed-view-with-demo-data.ts
index ed8bdbab1c09..5030b01cd017 100644
--- a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/seed-view-with-demo-data.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/seed-view-with-demo-data.ts
@@ -1,8 +1,8 @@
 import { EntityManager } from 'typeorm';
-import { v4 } from 'uuid';
 
 import { ObjectMetadataStandardIdToIdMap } from 'src/engine/metadata-modules/object-metadata/interfaces/object-metadata-standard-id-to-id-map';
 
+import { createWorkspaceViews } from 'src/engine/workspace-manager/standard-objects-prefill-data/create-workspace-views';
 import { seedCompaniesAllView } from 'src/engine/workspace-manager/standard-objects-prefill-data/views/companies-all.view';
 import { notesAllView } from 'src/engine/workspace-manager/standard-objects-prefill-data/views/notes-all.view';
 import { opportunitiesAllView } from 'src/engine/workspace-manager/standard-objects-prefill-data/views/opportunities-all.view';
@@ -18,7 +18,6 @@ export const seedViewWithDemoData = async (
   entityManager: EntityManager,
   schemaName: string,
   objectMetadataStandardIdToIdMap: ObjectMetadataStandardIdToIdMap,
-  isWorkflowEnabled: boolean,
 ) => {
   const viewDefinitions = [
     seedCompaniesAllView(objectMetadataStandardIdToIdMap),
@@ -28,133 +27,10 @@ export const seedViewWithDemoData = async (
     notesAllView(objectMetadataStandardIdToIdMap),
     tasksAllView(objectMetadataStandardIdToIdMap),
     tasksByStatusView(objectMetadataStandardIdToIdMap),
-    ...(isWorkflowEnabled
-      ? [
-          workflowsAllView(objectMetadataStandardIdToIdMap),
-          workflowVersionsAllView(objectMetadataStandardIdToIdMap),
-          workflowRunsAllView(objectMetadataStandardIdToIdMap),
-        ]
-      : []),
+    workflowsAllView(objectMetadataStandardIdToIdMap),
+    workflowVersionsAllView(objectMetadataStandardIdToIdMap),
+    workflowRunsAllView(objectMetadataStandardIdToIdMap),
   ];
 
-  const viewDefinitionsWithId = viewDefinitions.map((viewDefinition) => ({
-    ...viewDefinition,
-    id: v4(),
-  }));
-
-  await entityManager
-    .createQueryBuilder()
-    .insert()
-    .into(`${schemaName}.view`, [
-      'id',
-      'name',
-      'objectMetadataId',
-      'type',
-      'key',
-      'position',
-      'icon',
-      'kanbanFieldMetadataId',
-    ])
-    .values(
-      viewDefinitionsWithId.map(
-        ({
-          id,
-          name,
-          objectMetadataId,
-          type,
-          key,
-          position,
-          icon,
-          kanbanFieldMetadataId,
-        }) => ({
-          id,
-          name,
-          objectMetadataId,
-          type,
-          key,
-          position,
-          icon,
-          kanbanFieldMetadataId,
-        }),
-      ),
-    )
-    .returning('*')
-    .execute();
-
-  for (const viewDefinition of viewDefinitionsWithId) {
-    if (viewDefinition.fields && viewDefinition.fields.length > 0) {
-      await entityManager
-        .createQueryBuilder()
-        .insert()
-        .into(`${schemaName}.viewField`, [
-          'fieldMetadataId',
-          'position',
-          'isVisible',
-          'size',
-          'viewId',
-        ])
-        .values(
-          viewDefinition.fields.map((field) => ({
-            fieldMetadataId: field.fieldMetadataId,
-            position: field.position,
-            isVisible: field.isVisible,
-            size: field.size,
-            viewId: viewDefinition.id,
-          })),
-        )
-        .execute();
-    }
-
-    if (viewDefinition.filters && viewDefinition.filters.length > 0) {
-      await entityManager
-        .createQueryBuilder()
-        .insert()
-        .into(`${schemaName}.viewFilter`, [
-          'fieldMetadataId',
-          'displayValue',
-          'operand',
-          'value',
-          'viewId',
-        ])
-        .values(
-          viewDefinition.filters.map((filter: any) => ({
-            fieldMetadataId: filter.fieldMetadataId,
-            displayValue: filter.displayValue,
-            operand: filter.operand,
-            value: filter.value,
-            viewId: viewDefinition.id,
-          })),
-        )
-        .execute();
-    }
-
-    if (
-      'groups' in viewDefinition &&
-      viewDefinition.groups &&
-      viewDefinition.groups.length > 0
-    ) {
-      await entityManager
-        .createQueryBuilder()
-        .insert()
-        .into(`${schemaName}.viewGroup`, [
-          'fieldMetadataId',
-          'isVisible',
-          'fieldValue',
-          'position',
-          'viewId',
-        ])
-        .values(
-          viewDefinition.groups.map((group: any) => ({
-            fieldMetadataId: group.fieldMetadataId,
-            isVisible: group.isVisible,
-            fieldValue: group.fieldValue,
-            position: group.position,
-            viewId: viewDefinition.id,
-          })),
-        )
-        .execute();
-    }
-  }
-
-  return viewDefinitionsWithId;
+  return createWorkspaceViews(entityManager, schemaName, viewDefinitions);
 };
diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/standard-objects-prefill-data.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/standard-objects-prefill-data.ts
index 4fe9c86b8651..68aa1a688e9f 100644
--- a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/standard-objects-prefill-data.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/standard-objects-prefill-data.ts
@@ -11,7 +11,6 @@ export const standardObjectsPrefillData = async (
   workspaceDataSource: DataSource,
   schemaName: string,
   objectMetadata: ObjectMetadataEntity[],
-  isWorkflowEnabled: boolean,
 ) => {
   const objectMetadataMap = objectMetadata.reduce((acc, object) => {
     if (!object.standardId) {
@@ -41,7 +40,6 @@ export const standardObjectsPrefillData = async (
       entityManager,
       schemaName,
       objectMetadataMap,
-      isWorkflowEnabled,
     );
 
     await seedWorkspaceFavorites(
diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/types/view-definition.interface.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/types/view-definition.interface.ts
new file mode 100644
index 000000000000..5669bd33b5df
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/types/view-definition.interface.ts
@@ -0,0 +1,33 @@
+import { AGGREGATE_OPERATIONS } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant';
+
+export interface ViewDefinition {
+  id?: string;
+  name: string;
+  objectMetadataId: string;
+  type: string;
+  key: string | null;
+  position: number;
+  icon?: string;
+  kanbanFieldMetadataId?: string;
+  kanbanAggregateOperation?: AGGREGATE_OPERATIONS;
+  kanbanAggregateOperationFieldMetadataId?: string;
+  fields?: {
+    fieldMetadataId: string;
+    position: number;
+    isVisible: boolean;
+    size: number;
+    aggregateOperation?: AGGREGATE_OPERATIONS;
+  }[];
+  filters?: {
+    fieldMetadataId: string;
+    displayValue: string;
+    operand: string;
+    value: string;
+  }[];
+  groups?: {
+    fieldMetadataId: string;
+    isVisible: boolean;
+    fieldValue: string;
+    position: number;
+  }[];
+}
diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/companies-all.view.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/companies-all.view.ts
index 2b0f18cd88bf..0fca411d9f3a 100644
--- a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/companies-all.view.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/companies-all.view.ts
@@ -1,5 +1,6 @@
 import { ObjectMetadataStandardIdToIdMap } from 'src/engine/metadata-modules/object-metadata/interfaces/object-metadata-standard-id-to-id-map';
 
+import { AGGREGATE_OPERATIONS } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant';
 import {
   BASE_OBJECT_STANDARD_FIELD_IDS,
   COMPANY_STANDARD_FIELD_IDS,
@@ -37,6 +38,7 @@ export const seedCompaniesAllView = (
         position: 1,
         isVisible: true,
         size: 100,
+        aggregateOperation: AGGREGATE_OPERATIONS.count,
       },
       {
         fieldMetadataId:
@@ -73,6 +75,7 @@ export const seedCompaniesAllView = (
         position: 5,
         isVisible: true,
         size: 150,
+        aggregateOperation: AGGREGATE_OPERATIONS.max,
       },
       {
         fieldMetadataId:
@@ -82,6 +85,7 @@ export const seedCompaniesAllView = (
         position: 6,
         isVisible: true,
         size: 170,
+        aggregateOperation: AGGREGATE_OPERATIONS.percentageEmpty,
       },
       {
         fieldMetadataId:
@@ -91,6 +95,7 @@ export const seedCompaniesAllView = (
         position: 7,
         isVisible: true,
         size: 170,
+        aggregateOperation: AGGREGATE_OPERATIONS.countNotEmpty,
       },
     ],
   };
diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/opportunities-all.view.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/opportunities-all.view.ts
index f72e0da95b37..fb165543f1f3 100644
--- a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/opportunities-all.view.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/opportunities-all.view.ts
@@ -1,5 +1,6 @@
 import { ObjectMetadataStandardIdToIdMap } from 'src/engine/metadata-modules/object-metadata/interfaces/object-metadata-standard-id-to-id-map';
 
+import { AGGREGATE_OPERATIONS } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant';
 import { OPPORTUNITY_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
 
@@ -32,6 +33,7 @@ export const opportunitiesAllView = (
         position: 1,
         isVisible: true,
         size: 150,
+        aggregateOperation: AGGREGATE_OPERATIONS.avg,
       },
       {
         fieldMetadataId:
@@ -48,6 +50,7 @@ export const opportunitiesAllView = (
         position: 3,
         isVisible: true,
         size: 150,
+        aggregateOperation: AGGREGATE_OPERATIONS.min,
       },
       {
         fieldMetadataId:
diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/opportunity-by-stage.view.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/opportunity-by-stage.view.ts
index 7dae97c1b5fd..bacffb44a435 100644
--- a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/opportunity-by-stage.view.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/opportunity-by-stage.view.ts
@@ -1,5 +1,6 @@
 import { ObjectMetadataStandardIdToIdMap } from 'src/engine/metadata-modules/object-metadata/interfaces/object-metadata-standard-id-to-id-map';
 
+import { AGGREGATE_OPERATIONS } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant';
 import { OPPORTUNITY_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
 
@@ -12,12 +13,17 @@ export const opportunitiesByStageView = (
       objectMetadataStandardIdToIdMap[STANDARD_OBJECT_IDS.opportunity].id,
     type: 'kanban',
     key: null,
-    position: 1,
+    position: 2,
     icon: 'IconLayoutKanban',
     kanbanFieldMetadataId:
       objectMetadataStandardIdToIdMap[STANDARD_OBJECT_IDS.opportunity].fields[
         OPPORTUNITY_STANDARD_FIELD_IDS.stage
       ],
+    kanbanAggregateOperation: AGGREGATE_OPERATIONS.min,
+    kanbanAggregateOperationFieldMetadataId:
+      objectMetadataStandardIdToIdMap[STANDARD_OBJECT_IDS.opportunity].fields[
+        OPPORTUNITY_STANDARD_FIELD_IDS.amount
+      ],
     filters: [],
     fields: [
       {
diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/opportunity-table-by-stage.view.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/opportunity-table-by-stage.view.ts
new file mode 100644
index 000000000000..066b61780812
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/opportunity-table-by-stage.view.ts
@@ -0,0 +1,119 @@
+import { ObjectMetadataStandardIdToIdMap } from 'src/engine/metadata-modules/object-metadata/interfaces/object-metadata-standard-id-to-id-map';
+
+import { AGGREGATE_OPERATIONS } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant';
+import { OPPORTUNITY_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
+import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
+
+export const opportunitiesTableByStageView = (
+  objectMetadataStandardIdToIdMap: ObjectMetadataStandardIdToIdMap,
+) => {
+  return {
+    name: 'By Stage',
+    objectMetadataId:
+      objectMetadataStandardIdToIdMap[STANDARD_OBJECT_IDS.opportunity].id,
+    type: 'table',
+    key: null,
+    position: 1,
+    icon: 'IconList',
+    kanbanFieldMetadataId:
+      objectMetadataStandardIdToIdMap[STANDARD_OBJECT_IDS.opportunity].fields[
+        OPPORTUNITY_STANDARD_FIELD_IDS.stage
+      ],
+    filters: [],
+    fields: [
+      {
+        fieldMetadataId:
+          objectMetadataStandardIdToIdMap[STANDARD_OBJECT_IDS.opportunity]
+            .fields[OPPORTUNITY_STANDARD_FIELD_IDS.name],
+        position: 0,
+        isVisible: true,
+        size: 150,
+      },
+      {
+        fieldMetadataId:
+          objectMetadataStandardIdToIdMap[STANDARD_OBJECT_IDS.opportunity]
+            .fields[OPPORTUNITY_STANDARD_FIELD_IDS.amount],
+        position: 1,
+        isVisible: true,
+        size: 150,
+        aggregateOperation: AGGREGATE_OPERATIONS.avg,
+      },
+      {
+        fieldMetadataId:
+          objectMetadataStandardIdToIdMap[STANDARD_OBJECT_IDS.opportunity]
+            .fields[OPPORTUNITY_STANDARD_FIELD_IDS.createdBy],
+        position: 2,
+        isVisible: true,
+        size: 150,
+      },
+      {
+        fieldMetadataId:
+          objectMetadataStandardIdToIdMap[STANDARD_OBJECT_IDS.opportunity]
+            .fields[OPPORTUNITY_STANDARD_FIELD_IDS.closeDate],
+        position: 3,
+        isVisible: true,
+        size: 150,
+        aggregateOperation: AGGREGATE_OPERATIONS.max,
+      },
+      {
+        fieldMetadataId:
+          objectMetadataStandardIdToIdMap[STANDARD_OBJECT_IDS.opportunity]
+            .fields[OPPORTUNITY_STANDARD_FIELD_IDS.company],
+        position: 4,
+        isVisible: true,
+        size: 150,
+        aggregateOperation: AGGREGATE_OPERATIONS.count,
+      },
+      {
+        fieldMetadataId:
+          objectMetadataStandardIdToIdMap[STANDARD_OBJECT_IDS.opportunity]
+            .fields[OPPORTUNITY_STANDARD_FIELD_IDS.pointOfContact],
+        position: 5,
+        isVisible: true,
+        size: 150,
+      },
+    ],
+    groups: [
+      {
+        fieldMetadataId:
+          objectMetadataStandardIdToIdMap[STANDARD_OBJECT_IDS.opportunity]
+            .fields[OPPORTUNITY_STANDARD_FIELD_IDS.stage],
+        isVisible: true,
+        fieldValue: 'NEW',
+        position: 0,
+      },
+      {
+        fieldMetadataId:
+          objectMetadataStandardIdToIdMap[STANDARD_OBJECT_IDS.opportunity]
+            .fields[OPPORTUNITY_STANDARD_FIELD_IDS.stage],
+        isVisible: true,
+        fieldValue: 'SCREENING',
+        position: 1,
+      },
+      {
+        fieldMetadataId:
+          objectMetadataStandardIdToIdMap[STANDARD_OBJECT_IDS.opportunity]
+            .fields[OPPORTUNITY_STANDARD_FIELD_IDS.stage],
+        isVisible: true,
+        fieldValue: 'MEETING',
+        position: 2,
+      },
+      {
+        fieldMetadataId:
+          objectMetadataStandardIdToIdMap[STANDARD_OBJECT_IDS.opportunity]
+            .fields[OPPORTUNITY_STANDARD_FIELD_IDS.stage],
+        isVisible: true,
+        fieldValue: 'PROPOSAL',
+        position: 3,
+      },
+      {
+        fieldMetadataId:
+          objectMetadataStandardIdToIdMap[STANDARD_OBJECT_IDS.opportunity]
+            .fields[OPPORTUNITY_STANDARD_FIELD_IDS.stage],
+        isVisible: true,
+        fieldValue: 'CUSTOMER',
+        position: 4,
+      },
+    ],
+  };
+};
diff --git a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/people-all.view.ts b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/people-all.view.ts
index f49aaece0b37..1197e3ce6923 100644
--- a/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/people-all.view.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/standard-objects-prefill-data/views/people-all.view.ts
@@ -1,5 +1,6 @@
 import { ObjectMetadataStandardIdToIdMap } from 'src/engine/metadata-modules/object-metadata/interfaces/object-metadata-standard-id-to-id-map';
 
+import { AGGREGATE_OPERATIONS } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant';
 import {
   BASE_OBJECT_STANDARD_FIELD_IDS,
   PERSON_STANDARD_FIELD_IDS,
@@ -37,6 +38,7 @@ export const peopleAllView = (
         position: 1,
         isVisible: true,
         size: 150,
+        aggregateOperation: AGGREGATE_OPERATIONS.countUniqueValues,
       },
       {
         fieldMetadataId:
@@ -64,6 +66,7 @@ export const peopleAllView = (
         position: 4,
         isVisible: true,
         size: 150,
+        aggregateOperation: AGGREGATE_OPERATIONS.percentageEmpty,
       },
       {
         fieldMetadataId:
@@ -73,6 +76,7 @@ export const peopleAllView = (
         position: 5,
         isVisible: true,
         size: 150,
+        aggregateOperation: AGGREGATE_OPERATIONS.min,
       },
       {
         fieldMetadataId:
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/database-structure.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/database-structure.service.ts
index f7d6d1e36f3d..40cfab79a7f1 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/database-structure.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/database-structure.service.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
 
+import { FieldMetadataType } from 'twenty-shared';
 import { ColumnType } from 'typeorm';
 import { ColumnMetadata } from 'typeorm/metadata/ColumnMetadata';
 
@@ -15,10 +16,7 @@ import {
 import { TypeORMService } from 'src/database/typeorm/typeorm.service';
 import { compositeTypeDefinitions } from 'src/engine/metadata-modules/field-metadata/composite-types';
 import { FieldMetadataDefaultValueFunctionNames } from 'src/engine/metadata-modules/field-metadata/dtos/default-value.input';
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
 import { isFunctionDefaultValue } from 'src/engine/metadata-modules/field-metadata/utils/is-function-default-value.util';
 import { serializeFunctionDefaultValue } from 'src/engine/metadata-modules/field-metadata/utils/serialize-function-default-value.util';
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/field-metadata-health.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/field-metadata-health.service.ts
index 994b91ec70ba..b309cde585a1 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/field-metadata-health.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-health/services/field-metadata-health.service.ts
@@ -1,5 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
+import { FieldMetadataType } from 'twenty-shared';
+
 import { FieldMetadataDefaultValue } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata-default-value.interface';
 import {
   WorkspaceHealthIssue,
@@ -9,10 +11,7 @@ import { WorkspaceHealthOptions } from 'src/engine/workspace-manager/workspace-h
 import { WorkspaceTableStructure } from 'src/engine/workspace-manager/workspace-health/interfaces/workspace-table-definition.interface';
 
 import { compositeTypeDefinitions } from 'src/engine/metadata-modules/field-metadata/composite-types';
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   computeColumnName,
   computeCompositeColumnName,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts
index 958a34363e35..39eb7d12ba2d 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-manager.service.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@nestjs/common';
 
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
 import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
@@ -104,16 +103,10 @@ export class WorkspaceManagerService {
     const createdObjectMetadata =
       await this.objectMetadataService.findManyWithinWorkspace(workspaceId);
 
-    const isWorkflowEnabled = await this.featureFlagService.isFeatureEnabled(
-      FeatureFlagKey.IsWorkflowEnabled,
-      workspaceId,
-    );
-
     await standardObjectsPrefillData(
       workspaceDataSource,
       dataSourceMetadata.schema,
       createdObjectMetadata,
-      isWorkflowEnabled,
     );
   }
 
@@ -140,16 +133,10 @@ export class WorkspaceManagerService {
     const createdObjectMetadata =
       await this.objectMetadataService.findManyWithinWorkspace(workspaceId);
 
-    const isWorkflowEnabled = await this.featureFlagService.isFeatureEnabled(
-      FeatureFlagKey.IsWorkflowEnabled,
-      workspaceId,
-    );
-
     await seedWorkspaceWithDemoData(
       workspaceDataSource,
       dataSourceMetadata.schema,
       createdObjectMetadata,
-      isWorkflowEnabled,
     );
 
     await this.seederService.seedCustomObjects(
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-field.factory.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-field.factory.ts
index c4852a5841e5..5f83d8b3e633 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-field.factory.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-field.factory.ts
@@ -1,13 +1,11 @@
 import { Injectable } from '@nestjs/common';
 
 import diff from 'microdiff';
+import { FieldMetadataType } from 'twenty-shared';
 
 import { WorkspaceMigrationBuilderAction } from 'src/engine/workspace-manager/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
 
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { generateMigrationName } from 'src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util';
 import {
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-object.factory.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-object.factory.ts
index 6085de1a0c83..4afc2829e8cc 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-object.factory.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration-builder/factories/workspace-migration-object.factory.ts
@@ -1,8 +1,9 @@
 import { Injectable } from '@nestjs/common';
 
+import { FieldMetadataType } from 'twenty-shared';
+
 import { WorkspaceMigrationBuilderAction } from 'src/engine/workspace-manager/workspace-migration-builder/interfaces/workspace-migration-builder-action.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { RelationMetadataEntity } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { generateMigrationName } from 'src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util';
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-field.comparator.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-field.comparator.ts
index 42c481c81371..2733fc4e8b48 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-field.comparator.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/comparators/workspace-field.comparator.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
 import diff from 'microdiff';
+import { FieldMetadataType } from 'twenty-shared';
 
 import {
   ComparatorAction,
@@ -8,10 +9,7 @@ import {
 } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/comparator.interface';
 import { ComputedPartialFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-field-metadata.interface';
 
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { transformMetadataForComparison } from 'src/engine/workspace-manager/workspace-sync-metadata/comparators/utils/transform-metadata-for-comparison.util';
 
 const commonFieldPropertiesToIgnore = [
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-field.factory.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-field.factory.ts
index 1aae07797ea7..29de3fe17f82 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-field.factory.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/factories/standard-field.factory.ts
@@ -1,5 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
+import { FieldMetadataType } from 'twenty-shared';
+
 import { FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';
 import { WorkspaceDynamicRelationMetadataArgs } from 'src/engine/twenty-orm/interfaces/workspace-dynamic-relation-metadata-args.interface';
 import { WorkspaceEntityMetadataArgs } from 'src/engine/twenty-orm/interfaces/workspace-entity-metadata-args.interface';
@@ -11,7 +13,6 @@ import {
 } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-field-metadata.interface';
 import { WorkspaceSyncContext } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { metadataArgsStorage } from 'src/engine/twenty-orm/storage/metadata-args.storage';
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-field-metadata.interface.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-field-metadata.interface.ts
index 4f17d0ee3dca..fbcc484063a2 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-field-metadata.interface.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-field-metadata.interface.ts
@@ -1,7 +1,8 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
 import { WorkspaceDynamicRelationMetadataArgsFactory } from 'src/engine/twenty-orm/interfaces/workspace-dynamic-relation-metadata-args.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 
 export type PartialFieldMetadata = Omit<
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-metadata-updater.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-metadata-updater.service.ts
index 35636fb042cd..31f0f5e26186 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-metadata-updater.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-metadata-updater.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 
-import { capitalize } from 'twenty-shared';
+import { capitalize, FieldMetadataType } from 'twenty-shared';
 import {
   EntityManager,
   EntityTarget,
@@ -17,10 +17,7 @@ import { PartialIndexMetadata } from 'src/engine/workspace-manager/workspace-syn
 
 import { compositeTypeDefinitions } from 'src/engine/metadata-modules/field-metadata/composite-types';
 import { FieldMetadataComplexOption } from 'src/engine/metadata-modules/field-metadata/dtos/options.input';
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { isCompositeFieldMetadataType } from 'src/engine/metadata-modules/field-metadata/utils/is-composite-field-metadata-type.util';
 import { IndexFieldMetadataEntity } from 'src/engine/metadata-modules/index-metadata/index-field-metadata.entity';
 import { IndexMetadataEntity } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity';
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-object-metadata-identifiers.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-object-metadata-identifiers.service.ts
index d59f35c1f9fc..15052c36a72e 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-object-metadata-identifiers.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/services/workspace-sync-object-metadata-identifiers.service.ts
@@ -1,14 +1,12 @@
 import { Injectable } from '@nestjs/common';
 
+import { FieldMetadataType } from 'twenty-shared';
 import { EntityManager, Repository } from 'typeorm';
 
 import { FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';
 import { WorkspaceSyncContext } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/workspace-sync-context.interface';
 
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { StandardObjectFactory } from 'src/engine/workspace-manager/workspace-sync-metadata/factories/standard-object.factory';
 import { standardObjectMetadataDefinitions } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects';
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/__tests__/get-ts-vectors-column-expression.utils.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/__tests__/get-ts-vectors-column-expression.utils.spec.ts
index a7a4f73bd3b7..1263cc9959a7 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/__tests__/get-ts-vectors-column-expression.utils.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/__tests__/get-ts-vectors-column-expression.utils.spec.ts
@@ -1,4 +1,5 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
+
 import {
   FieldTypeAndNameMetadata,
   getTsVectorColumnExpressionFromFields,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/compute-standard-fields.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/compute-standard-fields.util.ts
index 7f1a1247bdce..e2aa820c43b4 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/compute-standard-fields.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/compute-standard-fields.util.ts
@@ -1,3 +1,5 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import {
   ComputedPartialFieldMetadata,
   PartialComputedFieldMetadata,
@@ -5,7 +7,6 @@ import {
 } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-field-metadata.interface';
 
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   createForeignKeyDeterministicUuid,
   createRelationDeterministicUuid,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/get-ts-vector-column-expression.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/get-ts-vector-column-expression.util.ts
index 3b804ecd4dac..d10224b62a69 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/get-ts-vector-column-expression.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/get-ts-vector-column-expression.util.ts
@@ -1,5 +1,6 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { compositeTypeDefinitions } from 'src/engine/metadata-modules/field-metadata/composite-types';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   computeColumnName,
   computeCompositeColumnName,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/is-searchable-field.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/is-searchable-field.util.ts
index 78b9c62e75cf..c1dd3a3cd567 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/is-searchable-field.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/is-searchable-field.util.ts
@@ -1,4 +1,4 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
 
 const SEARCHABLE_FIELD_TYPES = [
   FieldMetadataType.TEXT,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/sync-metadata.util.spec.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/sync-metadata.util.spec.ts
index 3ab01cd8e3da..801ea23620bd 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/sync-metadata.util.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/utils/sync-metadata.util.spec.ts
@@ -1,5 +1,6 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 
 import { mapObjectMetadataByUniqueIdentifier } from './sync-metadata.util';
 
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service.ts
index 16f01b999ad4..429acfe3e422 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service.ts
@@ -73,7 +73,7 @@ export class WorkspaceSyncMetadataService {
 
       // Retrieve feature flags
       const workspaceFeatureFlagsMap =
-        await this.featureFlagService.getWorkspaceFeatureFlags(
+        await this.featureFlagService.getWorkspaceFeatureFlagsMap(
           context.workspaceId,
         );
 
diff --git a/packages/twenty-server/src/main.ts b/packages/twenty-server/src/main.ts
index 548540494755..90c189a9ac67 100644
--- a/packages/twenty-server/src/main.ts
+++ b/packages/twenty-server/src/main.ts
@@ -38,6 +38,8 @@ const bootstrap = async () => {
   const logger = app.get(LoggerService);
   const environmentService = app.get(EnvironmentService);
 
+  app.use(session(getSessionStorageOptions(environmentService)));
+
   // TODO: Double check this as it's not working for now, it's going to be helpful for durable trees in twenty "orm"
   // // Apply context id strategy for durable trees
   // ContextIdFactory.apply(new AggregateByWorkspaceContextIdStrategy());
@@ -83,11 +85,6 @@ const bootstrap = async () => {
   // Inject the server url in the frontend page
   generateFrontConfig();
 
-  // Enable session - Today it's used only for SSO
-  if (environmentService.get('AUTH_SSO_ENABLED')) {
-    app.use(session(getSessionStorageOptions(environmentService)));
-  }
-
   await app.listen(environmentService.get('PORT'));
 };
 
diff --git a/packages/twenty-server/src/modules/api-key/standard-objects/api-key.workspace-entity.ts b/packages/twenty-server/src/modules/api-key/standard-objects/api-key.workspace-entity.ts
index 7fd493c1c272..376db42bbd35 100644
--- a/packages/twenty-server/src/modules/api-key/standard-objects/api-key.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/api-key/standard-objects/api-key.workspace-entity.ts
@@ -1,4 +1,5 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
+
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
 import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
diff --git a/packages/twenty-server/src/modules/attachment/standard-objects/attachment.workspace-entity.ts b/packages/twenty-server/src/modules/attachment/standard-objects/attachment.workspace-entity.ts
index b47716028f65..50aa00e32214 100644
--- a/packages/twenty-server/src/modules/attachment/standard-objects/attachment.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/attachment/standard-objects/attachment.workspace-entity.ts
@@ -1,6 +1,7 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { CustomWorkspaceEntity } from 'src/engine/twenty-orm/custom.workspace-entity';
diff --git a/packages/twenty-server/src/modules/blocklist/standard-objects/blocklist.workspace-entity.ts b/packages/twenty-server/src/modules/blocklist/standard-objects/blocklist.workspace-entity.ts
index 3a45baa99ed1..da8adfddf3af 100644
--- a/packages/twenty-server/src/modules/blocklist/standard-objects/blocklist.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/blocklist/standard-objects/blocklist.workspace-entity.ts
@@ -1,6 +1,7 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/commands/calendar-event-list-fetch.cron.command.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/commands/calendar-event-list-fetch.cron.command.ts
index 7fce8ebdb4c4..80f3412795f8 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/commands/calendar-event-list-fetch.cron.command.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/commands/calendar-event-list-fetch.cron.command.ts
@@ -4,7 +4,8 @@ import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decora
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
 import { CalendarEventListFetchCronJob } from 'src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-event-list-fetch.cron.job';
-import { CALENDAR_EVENTS_IMPORT_CRON_PATTERN } from 'src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-events-import.cron.job';
+
+const CALENDAR_EVENTS_LIST_CRON_PATTERN = '*/5 * * * *';
 
 @Command({
   name: 'cron:calendar:calendar-event-list-fetch',
@@ -23,7 +24,9 @@ export class CalendarEventListFetchCronCommand extends CommandRunner {
       CalendarEventListFetchCronJob.name,
       undefined,
       {
-        repeat: { pattern: CALENDAR_EVENTS_IMPORT_CRON_PATTERN },
+        repeat: {
+          pattern: CALENDAR_EVENTS_LIST_CRON_PATTERN,
+        },
       },
     );
   }
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-event-list-fetch.cron.job.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-event-list-fetch.cron.job.ts
index 8a26b57319ee..8d1a9b3299d3 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-event-list-fetch.cron.job.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-event-list-fetch.cron.job.ts
@@ -1,5 +1,6 @@
 import { InjectRepository } from '@nestjs/typeorm';
 
+import { WorkspaceActivationStatus } from 'twenty-shared';
 import { Any, Repository } from 'typeorm';
 
 import { SentryCronMonitor } from 'src/engine/core-modules/cron/sentry-cron-monitor.decorator';
@@ -9,10 +10,7 @@ import { Process } from 'src/engine/core-modules/message-queue/decorators/proces
 import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
-import {
-  Workspace,
-  WorkspaceActivationStatus,
-} from 'src/engine/core-modules/workspace/workspace.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import {
   CalendarEventListFetchJob,
@@ -41,8 +39,6 @@ export class CalendarEventListFetchCronJob {
     CALENDAR_EVENT_LIST_FETCH_CRON_PATTERN,
   )
   async handle(): Promise<void> {
-    console.time('CalendarEventListFetchCronJob time');
-
     const activeWorkspaces = await this.workspaceRepository.find({
       where: {
         activationStatus: WorkspaceActivationStatus.ACTIVE,
@@ -84,7 +80,5 @@ export class CalendarEventListFetchCronJob {
         });
       }
     }
-
-    console.timeEnd('CalendarEventListFetchCronJob time');
   }
 }
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-events-import.cron.job.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-events-import.cron.job.ts
index 204177a9e98a..5b2951af3895 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-events-import.cron.job.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-events-import.cron.job.ts
@@ -1,5 +1,6 @@
 import { InjectRepository } from '@nestjs/typeorm';
 
+import { WorkspaceActivationStatus } from 'twenty-shared';
 import { Equal, Repository } from 'typeorm';
 
 import { SentryCronMonitor } from 'src/engine/core-modules/cron/sentry-cron-monitor.decorator';
@@ -9,15 +10,11 @@ import { Process } from 'src/engine/core-modules/message-queue/decorators/proces
 import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
-import {
-  Workspace,
-  WorkspaceActivationStatus,
-} from 'src/engine/core-modules/workspace/workspace.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import { CalendarEventListFetchJobData } from 'src/modules/calendar/calendar-event-import-manager/jobs/calendar-event-list-fetch.job';
 import { CalendarEventsImportJob } from 'src/modules/calendar/calendar-event-import-manager/jobs/calendar-events-import.job';
 import { CalendarChannelSyncStage } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';
-
 export const CALENDAR_EVENTS_IMPORT_CRON_PATTERN = '*/1 * * * *';
 
 @Processor({
@@ -39,8 +36,6 @@ export class CalendarEventsImportCronJob {
     CALENDAR_EVENTS_IMPORT_CRON_PATTERN,
   )
   async handle(): Promise<void> {
-    console.time('CalendarEventsImportCronJob time');
-
     const activeWorkspaces = await this.workspaceRepository.find({
       where: {
         activationStatus: WorkspaceActivationStatus.ACTIVE,
@@ -81,7 +76,5 @@ export class CalendarEventsImportCronJob {
         });
       }
     }
-
-    console.timeEnd('CalendarEventsImportCronJob time');
   }
 }
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-ongoing-stale.cron.job.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-ongoing-stale.cron.job.ts
index 96b95de06f7b..73361fd91dac 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-ongoing-stale.cron.job.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/crons/jobs/calendar-ongoing-stale.cron.job.ts
@@ -1,5 +1,6 @@
 import { InjectRepository } from '@nestjs/typeorm';
 
+import { WorkspaceActivationStatus } from 'twenty-shared';
 import { Repository } from 'typeorm';
 
 import { SentryCronMonitor } from 'src/engine/core-modules/cron/sentry-cron-monitor.decorator';
@@ -9,15 +10,11 @@ import { Process } from 'src/engine/core-modules/message-queue/decorators/proces
 import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
-import {
-  Workspace,
-  WorkspaceActivationStatus,
-} from 'src/engine/core-modules/workspace/workspace.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import {
   CalendarOngoingStaleJob,
   CalendarOngoingStaleJobData,
 } from 'src/modules/calendar/calendar-event-import-manager/jobs/calendar-ongoing-stale.job';
-
 export const CALENDAR_ONGOING_STALE_CRON_PATTERN = '0 * * * *';
 
 @Processor(MessageQueue.cronQueue)
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-event-list-fetch.job.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-event-list-fetch.job.ts
index 30fdda2f6ae3..06c6ed14b847 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-event-list-fetch.job.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-event-list-fetch.job.ts
@@ -28,8 +28,6 @@ export class CalendarEventListFetchJob {
 
   @Process(CalendarEventListFetchJob.name)
   async handle(data: CalendarEventListFetchJobData): Promise<void> {
-    console.time('CalendarEventListFetchJob time');
-
     const { workspaceId, calendarChannelId } = data;
 
     const calendarChannelRepository =
@@ -83,6 +81,5 @@ export class CalendarEventListFetchJob {
       default:
         break;
     }
-    console.timeEnd('CalendarEventListFetchJob time');
   }
 }
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-events-import.job.ts b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-events-import.job.ts
index d99607501f5b..8a5ae1310538 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-events-import.job.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-import-manager/jobs/calendar-events-import.job.ts
@@ -28,8 +28,6 @@ export class CalendarEventsImportJob {
 
   @Process(CalendarEventsImportJob.name)
   async handle(data: CalendarEventsImportJobData): Promise<void> {
-    console.time('CalendarEventsImportJob time');
-
     const { calendarChannelId, workspaceId } = data;
 
     const calendarChannelRepository =
@@ -69,7 +67,5 @@ export class CalendarEventsImportJob {
       calendarChannel.connectedAccount,
       workspaceId,
     );
-
-    console.timeEnd('CalendarEventsImportJob time');
   }
 }
diff --git a/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-channel-event-association.workspace-entity.ts b/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-channel-event-association.workspace-entity.ts
index 99cad3e5a1b0..099f237653a9 100644
--- a/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-channel-event-association.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-channel-event-association.workspace-entity.ts
@@ -1,6 +1,7 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
diff --git a/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity.ts b/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity.ts
index ec4eb9cb7e76..0fe75f820f10 100644
--- a/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity.ts
@@ -1,8 +1,9 @@
 import { registerEnumType } from '@nestjs/graphql';
 
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   RelationMetadataType,
   RelationOnDeleteAction,
diff --git a/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-event-participant.workspace-entity.ts b/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-event-participant.workspace-entity.ts
index 1e2d05b168b1..3c65c9c9de1f 100644
--- a/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-event-participant.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-event-participant.workspace-entity.ts
@@ -1,6 +1,7 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
diff --git a/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-event.workspace-entity.ts b/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-event.workspace-entity.ts
index 94967baae433..22f83677273b 100644
--- a/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-event.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/calendar/common/standard-objects/calendar-event.workspace-entity.ts
@@ -1,7 +1,8 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
 import { LinksMetadata } from 'src/engine/metadata-modules/field-metadata/composite-types/links.composite-type';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   RelationMetadataType,
   RelationOnDeleteAction,
diff --git a/packages/twenty-server/src/modules/company/standard-objects/company.workspace-entity.ts b/packages/twenty-server/src/modules/company/standard-objects/company.workspace-entity.ts
index d36e4f473391..d93ea689dbd1 100644
--- a/packages/twenty-server/src/modules/company/standard-objects/company.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/company/standard-objects/company.workspace-entity.ts
@@ -1,3 +1,5 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
 import { SEARCH_VECTOR_FIELD } from 'src/engine/metadata-modules/constants/search-vector-field.constants';
@@ -8,7 +10,6 @@ import {
 import { AddressMetadata } from 'src/engine/metadata-modules/field-metadata/composite-types/address.composite-type';
 import { CurrencyMetadata } from 'src/engine/metadata-modules/field-metadata/composite-types/currency.composite-type';
 import { LinksMetadata } from 'src/engine/metadata-modules/field-metadata/composite-types/links.composite-type';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { IndexType } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity';
 import {
   RelationMetadataType,
diff --git a/packages/twenty-server/src/modules/connected-account/connected-account.module.ts b/packages/twenty-server/src/modules/connected-account/connected-account.module.ts
index 319cce74482f..3888f9603663 100644
--- a/packages/twenty-server/src/modules/connected-account/connected-account.module.ts
+++ b/packages/twenty-server/src/modules/connected-account/connected-account.module.ts
@@ -1,12 +1,19 @@
 import { Module } from '@nestjs/common';
 
 import { UserVarsModule } from 'src/engine/core-modules/user/user-vars/user-vars.module';
+import { DeleteWorkspaceMemberConnectedAccountsCleanupJob } from 'src/modules/connected-account/jobs/delete-workspace-member-connected-accounts.job';
+import { ConnectedAccountWorkspaceMemberListener } from 'src/modules/connected-account/listeners/connected-account-workspace-member.listener';
 import { ConnectedAccountListener } from 'src/modules/connected-account/listeners/connected-account.listener';
 import { AccountsToReconnectService } from 'src/modules/connected-account/services/accounts-to-reconnect.service';
 
 @Module({
   imports: [UserVarsModule],
-  providers: [AccountsToReconnectService, ConnectedAccountListener],
+  providers: [
+    AccountsToReconnectService,
+    ConnectedAccountListener,
+    DeleteWorkspaceMemberConnectedAccountsCleanupJob,
+    ConnectedAccountWorkspaceMemberListener,
+  ],
   exports: [AccountsToReconnectService],
 })
 export class ConnectedAccountModule {}
diff --git a/packages/twenty-server/src/modules/connected-account/email-alias-manager/services/email-alias-manager.service.ts b/packages/twenty-server/src/modules/connected-account/email-alias-manager/services/email-alias-manager.service.ts
index e4ec7e083960..e4a583e92ec4 100644
--- a/packages/twenty-server/src/modules/connected-account/email-alias-manager/services/email-alias-manager.service.ts
+++ b/packages/twenty-server/src/modules/connected-account/email-alias-manager/services/email-alias-manager.service.ts
@@ -17,6 +17,8 @@ export class EmailAliasManagerService {
     let handleAliases: string[];
 
     switch (connectedAccount.provider) {
+      case 'microsoft':
+        return;
       case 'google':
         handleAliases =
           await this.googleEmailAliasManagerService.getHandleAliases(
diff --git a/packages/twenty-server/src/modules/connected-account/jobs/delete-workspace-member-connected-accounts.job.ts b/packages/twenty-server/src/modules/connected-account/jobs/delete-workspace-member-connected-accounts.job.ts
new file mode 100644
index 000000000000..43871804ce94
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/jobs/delete-workspace-member-connected-accounts.job.ts
@@ -0,0 +1,34 @@
+import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
+import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
+import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
+import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
+
+export type DeleteWorkspaceMemberConnectedAccountsCleanupJobData = {
+  workspaceId: string;
+  workspaceMemberId: string;
+};
+
+@Processor(MessageQueue.deleteCascadeQueue)
+export class DeleteWorkspaceMemberConnectedAccountsCleanupJob {
+  constructor(
+    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
+  ) {}
+
+  @Process(DeleteWorkspaceMemberConnectedAccountsCleanupJob.name)
+  async handle(
+    data: DeleteWorkspaceMemberConnectedAccountsCleanupJobData,
+  ): Promise<void> {
+    const { workspaceId, workspaceMemberId } = data;
+
+    const connectedAccountRepository =
+      await this.twentyORMGlobalManager.getRepositoryForWorkspace<ConnectedAccountWorkspaceEntity>(
+        workspaceId,
+        'connectedAccount',
+      );
+
+    await connectedAccountRepository.delete({
+      accountOwnerId: workspaceMemberId,
+    });
+  }
+}
diff --git a/packages/twenty-server/src/modules/connected-account/listeners/connected-account-workspace-member.listener.ts b/packages/twenty-server/src/modules/connected-account/listeners/connected-account-workspace-member.listener.ts
new file mode 100644
index 000000000000..e0f540345418
--- /dev/null
+++ b/packages/twenty-server/src/modules/connected-account/listeners/connected-account-workspace-member.listener.ts
@@ -0,0 +1,44 @@
+import { Injectable } from '@nestjs/common';
+
+import { OnDatabaseBatchEvent } from 'src/engine/api/graphql/graphql-query-runner/decorators/on-database-batch-event.decorator';
+import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
+import { ObjectRecordDeleteEvent } from 'src/engine/core-modules/event-emitter/types/object-record-delete.event';
+import { ObjectRecordDestroyEvent } from 'src/engine/core-modules/event-emitter/types/object-record-destroy.event';
+import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
+import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
+import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
+import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event.type';
+import {
+  DeleteWorkspaceMemberConnectedAccountsCleanupJob,
+  DeleteWorkspaceMemberConnectedAccountsCleanupJobData,
+} from 'src/modules/connected-account/jobs/delete-workspace-member-connected-accounts.job';
+import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
+
+@Injectable()
+export class ConnectedAccountWorkspaceMemberListener {
+  constructor(
+    @InjectMessageQueue(MessageQueue.deleteCascadeQueue)
+    private readonly messageQueueService: MessageQueueService,
+  ) {}
+
+  @OnDatabaseBatchEvent('workspaceMember', DatabaseEventAction.DESTROYED)
+  @OnDatabaseBatchEvent('workspaceMember', DatabaseEventAction.DELETED)
+  async handleWorkspaceMemberRemovalEvent(
+    payload: WorkspaceEventBatch<
+      | ObjectRecordDeleteEvent<WorkspaceMemberWorkspaceEntity>
+      | ObjectRecordDestroyEvent<WorkspaceMemberWorkspaceEntity>
+    >,
+  ) {
+    await Promise.all(
+      payload.events.map((eventPayload) =>
+        this.messageQueueService.add<DeleteWorkspaceMemberConnectedAccountsCleanupJobData>(
+          DeleteWorkspaceMemberConnectedAccountsCleanupJob.name,
+          {
+            workspaceId: payload.workspaceId,
+            workspaceMemberId: eventPayload.recordId,
+          },
+        ),
+      ),
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/connected-account/oauth2-client-manager/drivers/microsoft/microsoft-oauth2-client-manager.service.ts b/packages/twenty-server/src/modules/connected-account/oauth2-client-manager/drivers/microsoft/microsoft-oauth2-client-manager.service.ts
index b14bb1f82683..7f4d263345c1 100644
--- a/packages/twenty-server/src/modules/connected-account/oauth2-client-manager/drivers/microsoft/microsoft-oauth2-client-manager.service.ts
+++ b/packages/twenty-server/src/modules/connected-account/oauth2-client-manager/drivers/microsoft/microsoft-oauth2-client-manager.service.ts
@@ -17,10 +17,6 @@ export class MicrosoftOAuth2ClientManagerService {
       callback: AuthProviderCallback,
     ) => {
       try {
-        const tenantId = this.environmentService.get(
-          'AUTH_MICROSOFT_TENANT_ID',
-        );
-
         const urlData = new URLSearchParams();
 
         urlData.append(
@@ -36,7 +32,7 @@ export class MicrosoftOAuth2ClientManagerService {
         urlData.append('grant_type', 'refresh_token');
 
         const res = await fetch(
-          `https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/token`,
+          `https://login.microsoftonline.com/common/oauth2/v2.0/token`,
           {
             method: 'POST',
             body: urlData,
diff --git a/packages/twenty-server/src/modules/connected-account/refresh-access-token-manager/services/refresh-access-token.service.ts b/packages/twenty-server/src/modules/connected-account/refresh-access-token-manager/services/refresh-access-token.service.ts
index 853401356842..1e2cc7306976 100644
--- a/packages/twenty-server/src/modules/connected-account/refresh-access-token-manager/services/refresh-access-token.service.ts
+++ b/packages/twenty-server/src/modules/connected-account/refresh-access-token-manager/services/refresh-access-token.service.ts
@@ -20,6 +20,7 @@ export class RefreshAccessTokenService {
     workspaceId: string,
   ): Promise<string> {
     const refreshToken = connectedAccount.refreshToken;
+    let accessToken: string;
 
     if (!refreshToken) {
       throw new RefreshAccessTokenException(
@@ -28,33 +29,39 @@ export class RefreshAccessTokenService {
       );
     }
 
-    let accessToken: string;
-
-    try {
-      accessToken = await this.refreshAccessToken(
-        connectedAccount,
-        refreshToken,
-      );
-    } catch (error) {
-      throw new RefreshAccessTokenException(
-        `Error refreshing access token for connected account ${connectedAccount.id} in workspace ${workspaceId}: ${error.message}`,
-        RefreshAccessTokenExceptionCode.REFRESH_ACCESS_TOKEN_FAILED,
-      );
-    }
+    switch (connectedAccount.provider) {
+      case 'microsoft':
+        return '';
+      case 'google': {
+        try {
+          accessToken = await this.refreshAccessToken(
+            connectedAccount,
+            refreshToken,
+          );
+        } catch (error) {
+          throw new RefreshAccessTokenException(
+            `Error refreshing access token for connected account ${connectedAccount.id} in workspace ${workspaceId}: ${error.message}`,
+            RefreshAccessTokenExceptionCode.REFRESH_ACCESS_TOKEN_FAILED,
+          );
+        }
 
-    const connectedAccountRepository =
-      await this.twentyORMManager.getRepository<ConnectedAccountWorkspaceEntity>(
-        'connectedAccount',
-      );
+        const connectedAccountRepository =
+          await this.twentyORMManager.getRepository<ConnectedAccountWorkspaceEntity>(
+            'connectedAccount',
+          );
 
-    await connectedAccountRepository.update(
-      { id: connectedAccount.id },
-      {
-        accessToken,
-      },
-    );
+        await connectedAccountRepository.update(
+          { id: connectedAccount.id },
+          {
+            accessToken,
+          },
+        );
 
-    return accessToken;
+        return accessToken;
+      }
+      default:
+        throw new Error('Provider not supported for access token refresh');
+    }
   }
 
   async refreshAccessToken(
diff --git a/packages/twenty-server/src/modules/connected-account/standard-objects/connected-account.workspace-entity.ts b/packages/twenty-server/src/modules/connected-account/standard-objects/connected-account.workspace-entity.ts
index b1c0c97c1612..0f8e2769152c 100644
--- a/packages/twenty-server/src/modules/connected-account/standard-objects/connected-account.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/connected-account/standard-objects/connected-account.workspace-entity.ts
@@ -1,6 +1,7 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   RelationMetadataType,
   RelationOnDeleteAction,
diff --git a/packages/twenty-server/src/modules/contact-creation-manager/utils/filter-out-contacts-from-company-or-workspace.util.ts b/packages/twenty-server/src/modules/contact-creation-manager/utils/filter-out-contacts-from-company-or-workspace.util.ts
index 42ecfd59d094..6558f871731d 100644
--- a/packages/twenty-server/src/modules/contact-creation-manager/utils/filter-out-contacts-from-company-or-workspace.util.ts
+++ b/packages/twenty-server/src/modules/contact-creation-manager/utils/filter-out-contacts-from-company-or-workspace.util.ts
@@ -2,6 +2,7 @@ import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/s
 import { Contact } from 'src/modules/contact-creation-manager/types/contact.type';
 import { getDomainNameFromHandle } from 'src/modules/contact-creation-manager/utils/get-domain-name-from-handle.util';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
+import { isWorkDomain } from 'src/utils/is-work-email';
 
 export function filterOutSelfAndContactsFromCompanyOrWorkspace(
   contacts: Contact[],
@@ -21,9 +22,13 @@ export function filterOutSelfAndContactsFromCompanyOrWorkspace(
     new Map<string, boolean>(),
   );
 
+  const isDifferentDomain = (contact: Contact, selfDomainName: string) =>
+    getDomainNameFromHandle(contact.handle) !== selfDomainName;
+
   return contacts.filter(
     (contact) =>
-      getDomainNameFromHandle(contact.handle) !== selfDomainName &&
+      (isDifferentDomain(contact, selfDomainName) ||
+        !isWorkDomain(selfDomainName)) &&
       !workspaceMembersMap[contact.handle] &&
       !handleAliases.includes(contact.handle),
   );
diff --git a/packages/twenty-server/src/modules/favorite-folder/standard-objects/favorite-folder.workspace-entity.ts b/packages/twenty-server/src/modules/favorite-folder/standard-objects/favorite-folder.workspace-entity.ts
index c58dab4027ef..e96fa3fd99cd 100644
--- a/packages/twenty-server/src/modules/favorite-folder/standard-objects/favorite-folder.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/favorite-folder/standard-objects/favorite-folder.workspace-entity.ts
@@ -1,6 +1,7 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   RelationMetadataType,
   RelationOnDeleteAction,
diff --git a/packages/twenty-server/src/modules/favorite/services/favorite-deletion.service.ts b/packages/twenty-server/src/modules/favorite/services/favorite-deletion.service.ts
index 32f62a34b01a..d3f02484c8ae 100644
--- a/packages/twenty-server/src/modules/favorite/services/favorite-deletion.service.ts
+++ b/packages/twenty-server/src/modules/favorite/services/favorite-deletion.service.ts
@@ -1,12 +1,10 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
+import { FieldMetadataType } from 'twenty-shared';
 import { In, Repository } from 'typeorm';
 
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { TwentyORMManager } from 'src/engine/twenty-orm/twenty-orm.manager';
 import { FAVORITE_DELETION_BATCH_SIZE } from 'src/modules/favorite/constants/favorite-deletion-batch-size';
diff --git a/packages/twenty-server/src/modules/favorite/standard-objects/favorite.workspace-entity.ts b/packages/twenty-server/src/modules/favorite/standard-objects/favorite.workspace-entity.ts
index e9fef0ae7ac3..6b3797d0a496 100644
--- a/packages/twenty-server/src/modules/favorite/standard-objects/favorite.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/favorite/standard-objects/favorite.workspace-entity.ts
@@ -1,14 +1,13 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { CustomWorkspaceEntity } from 'src/engine/twenty-orm/custom.workspace-entity';
 import { WorkspaceDynamicRelation } from 'src/engine/twenty-orm/decorators/workspace-dynamic-relation.decorator';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
 import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
-import { WorkspaceGate } from 'src/engine/twenty-orm/decorators/workspace-gate.decorator';
 import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
 import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
 import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
@@ -136,16 +135,10 @@ export class FavoriteWorkspaceEntity extends BaseWorkspaceEntity {
     inverseSideTarget: () => WorkflowWorkspaceEntity,
     inverseSideFieldKey: 'favorites',
   })
-  @WorkspaceGate({
-    featureFlag: FeatureFlagKey.IsWorkflowEnabled,
-  })
   @WorkspaceIsNullable()
   workflow: Relation<WorkflowWorkspaceEntity> | null;
 
   @WorkspaceJoinColumn('workflow')
-  @WorkspaceGate({
-    featureFlag: FeatureFlagKey.IsWorkflowEnabled,
-  })
   workflowId: string;
 
   @WorkspaceRelation({
@@ -157,16 +150,10 @@ export class FavoriteWorkspaceEntity extends BaseWorkspaceEntity {
     inverseSideTarget: () => WorkflowVersionWorkspaceEntity,
     inverseSideFieldKey: 'favorites',
   })
-  @WorkspaceGate({
-    featureFlag: FeatureFlagKey.IsWorkflowEnabled,
-  })
   @WorkspaceIsNullable()
   workflowVersion: Relation<WorkflowVersionWorkspaceEntity> | null;
 
   @WorkspaceJoinColumn('workflowVersion')
-  @WorkspaceGate({
-    featureFlag: FeatureFlagKey.IsWorkflowEnabled,
-  })
   workflowVersionId: string;
 
   @WorkspaceRelation({
@@ -178,16 +165,10 @@ export class FavoriteWorkspaceEntity extends BaseWorkspaceEntity {
     inverseSideTarget: () => WorkflowRunWorkspaceEntity,
     inverseSideFieldKey: 'favorites',
   })
-  @WorkspaceGate({
-    featureFlag: FeatureFlagKey.IsWorkflowEnabled,
-  })
   @WorkspaceIsNullable()
   workflowRun: Relation<WorkflowRunWorkspaceEntity> | null;
 
   @WorkspaceJoinColumn('workflowRun')
-  @WorkspaceGate({
-    featureFlag: FeatureFlagKey.IsWorkflowEnabled,
-  })
   workflowRunId: string;
 
   @WorkspaceRelation({
diff --git a/packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity.ts b/packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity.ts
index b14cb8499fe2..25523625b327 100644
--- a/packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity.ts
@@ -1,6 +1,7 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
diff --git a/packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel.workspace-entity.ts b/packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel.workspace-entity.ts
index 1e0b80b18fec..2f951cefa4f2 100644
--- a/packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel.workspace-entity.ts
@@ -1,8 +1,9 @@
 import { registerEnumType } from '@nestjs/graphql';
 
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   RelationMetadataType,
   RelationOnDeleteAction,
diff --git a/packages/twenty-server/src/modules/messaging/common/standard-objects/message-participant.workspace-entity.ts b/packages/twenty-server/src/modules/messaging/common/standard-objects/message-participant.workspace-entity.ts
index 40989d0ae76f..90623a12f006 100644
--- a/packages/twenty-server/src/modules/messaging/common/standard-objects/message-participant.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/messaging/common/standard-objects/message-participant.workspace-entity.ts
@@ -1,6 +1,7 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
diff --git a/packages/twenty-server/src/modules/messaging/common/standard-objects/message.workspace-entity.ts b/packages/twenty-server/src/modules/messaging/common/standard-objects/message.workspace-entity.ts
index 9780aeb1844f..c7606936731d 100644
--- a/packages/twenty-server/src/modules/messaging/common/standard-objects/message.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/messaging/common/standard-objects/message.workspace-entity.ts
@@ -1,6 +1,7 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   RelationMetadataType,
   RelationOnDeleteAction,
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts
index 072558bbcfee..39046479833c 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-message-list-fetch.cron.job.ts
@@ -1,5 +1,6 @@
 import { InjectRepository } from '@nestjs/typeorm';
 
+import { WorkspaceActivationStatus } from 'twenty-shared';
 import { In, Repository } from 'typeorm';
 
 import { SentryCronMonitor } from 'src/engine/core-modules/cron/sentry-cron-monitor.decorator';
@@ -9,10 +10,7 @@ import { Process } from 'src/engine/core-modules/message-queue/decorators/proces
 import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
-import {
-  Workspace,
-  WorkspaceActivationStatus,
-} from 'src/engine/core-modules/workspace/workspace.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import {
   MessageChannelSyncStage,
@@ -22,7 +20,6 @@ import {
   MessagingMessageListFetchJob,
   MessagingMessageListFetchJobData,
 } from 'src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job';
-
 export const MESSAGING_MESSAGE_LIST_FETCH_CRON_PATTERN = '*/5 * * * *';
 
 @Processor(MessageQueue.cronQueue)
@@ -42,8 +39,6 @@ export class MessagingMessageListFetchCronJob {
     MESSAGING_MESSAGE_LIST_FETCH_CRON_PATTERN,
   )
   async handle(): Promise<void> {
-    console.time('MessagingMessageListFetchCronJob time');
-
     const activeWorkspaces = await this.workspaceRepository.find({
       where: {
         activationStatus: WorkspaceActivationStatus.ACTIVE,
@@ -85,7 +80,5 @@ export class MessagingMessageListFetchCronJob {
         });
       }
     }
-
-    console.timeEnd('MessagingMessageListFetchCronJob time');
   }
 }
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts
index 86d879e89bfa..d77a3e1dfe33 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts
@@ -1,5 +1,6 @@
 import { InjectRepository } from '@nestjs/typeorm';
 
+import { WorkspaceActivationStatus } from 'twenty-shared';
 import { Repository } from 'typeorm';
 
 import { SentryCronMonitor } from 'src/engine/core-modules/cron/sentry-cron-monitor.decorator';
@@ -9,10 +10,7 @@ import { Process } from 'src/engine/core-modules/message-queue/decorators/proces
 import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
-import {
-  Workspace,
-  WorkspaceActivationStatus,
-} from 'src/engine/core-modules/workspace/workspace.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import {
   MessageChannelSyncStage,
@@ -42,8 +40,6 @@ export class MessagingMessagesImportCronJob {
     MESSAGING_MESSAGES_IMPORT_CRON_PATTERN,
   )
   async handle(): Promise<void> {
-    console.time('MessagingMessagesImportCronJob time');
-
     const activeWorkspaces = await this.workspaceRepository.find({
       where: {
         activationStatus: WorkspaceActivationStatus.ACTIVE,
@@ -82,7 +78,5 @@ export class MessagingMessagesImportCronJob {
         });
       }
     }
-
-    console.timeEnd('MessagingMessagesImportCronJob time');
   }
 }
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-ongoing-stale.cron.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-ongoing-stale.cron.job.ts
index fc3771f518f8..a6b3e05650b8 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-ongoing-stale.cron.job.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-ongoing-stale.cron.job.ts
@@ -1,5 +1,6 @@
 import { InjectRepository } from '@nestjs/typeorm';
 
+import { WorkspaceActivationStatus } from 'twenty-shared';
 import { Repository } from 'typeorm';
 
 import { SentryCronMonitor } from 'src/engine/core-modules/cron/sentry-cron-monitor.decorator';
@@ -9,15 +10,11 @@ import { Process } from 'src/engine/core-modules/message-queue/decorators/proces
 import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
-import {
-  Workspace,
-  WorkspaceActivationStatus,
-} from 'src/engine/core-modules/workspace/workspace.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import {
   MessagingOngoingStaleJob,
   MessagingOngoingStaleJobData,
 } from 'src/modules/messaging/message-import-manager/jobs/messaging-ongoing-stale.job';
-
 export const MESSAGING_ONGOING_STALE_CRON_PATTERN = '0 * * * *';
 
 @Processor(MessageQueue.cronQueue)
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/exceptions/message-import-driver.exception.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/exceptions/message-import-driver.exception.ts
index 600b6685376b..a0fc4cb04000 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/exceptions/message-import-driver.exception.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/exceptions/message-import-driver.exception.ts
@@ -14,4 +14,5 @@ export enum MessageImportDriverExceptionCode {
   UNKNOWN = 'UNKNOWN',
   UNKNOWN_NETWORK_ERROR = 'UNKNOWN_NETWORK_ERROR',
   NO_NEXT_SYNC_CURSOR = 'NO_NEXT_SYNC_CURSOR',
+  SYNC_CURSOR_ERROR = 'SYNC_CURSOR_ERROR',
 }
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-get-message-list.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-get-message-list.service.ts
index 1dfa2bc0a69b..ebbb11a42b1f 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-get-message-list.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-get-message-list.service.ts
@@ -32,7 +32,7 @@ export class GmailGetMessageListService {
   public async getFullMessageList(
     connectedAccount: Pick<
       ConnectedAccountWorkspaceEntity,
-      'provider' | 'refreshToken' | 'id'
+      'provider' | 'refreshToken' | 'id' | 'handle'
     >,
   ): Promise<GetFullMessageListResponse> {
     const gmailClient =
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-get-messages.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-get-messages.service.ts
index 15590f1f5148..ce228e3d997b 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-get-messages.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-get-messages.service.ts
@@ -81,6 +81,8 @@ export class GmailGetMessagesService {
           response.error,
           messageIds[index],
         );
+
+        return undefined;
       }
 
       return parseAndFormatGmailMessage(
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/messaging-microsoft-driver.module.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/messaging-microsoft-driver.module.ts
new file mode 100644
index 000000000000..2c19db33f034
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/messaging-microsoft-driver.module.ts
@@ -0,0 +1,40 @@
+import { Module } from '@nestjs/common';
+
+import { EnvironmentModule } from 'src/engine/core-modules/environment/environment.module';
+import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { MicrosoftOAuth2ClientManagerService } from 'src/modules/connected-account/oauth2-client-manager/drivers/microsoft/microsoft-oauth2-client-manager.service';
+import { OAuth2ClientManagerModule } from 'src/modules/connected-account/oauth2-client-manager/oauth2-client-manager.module';
+import { MessagingCommonModule } from 'src/modules/messaging/common/messaging-common.module';
+import { MicrosoftClientProvider } from 'src/modules/messaging/message-import-manager/drivers/microsoft/providers/microsoft-client.provider';
+import { MicrosoftFetchByBatchService } from 'src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-fetch-by-batch.service';
+import { MicrosoftGetMessagesService } from 'src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service';
+import { MicrosoftHandleErrorService } from 'src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-handle-error.service';
+
+import { MicrosoftGetMessageListService } from './services/microsoft-get-message-list.service';
+
+@Module({
+  imports: [
+    EnvironmentModule,
+    MessagingCommonModule,
+    FeatureFlagModule,
+    OAuth2ClientManagerModule,
+    WorkspaceDataSourceModule,
+    ObjectMetadataRepositoryModule,
+  ],
+  providers: [
+    MicrosoftClientProvider,
+    MicrosoftGetMessageListService,
+    MicrosoftGetMessagesService,
+    MicrosoftFetchByBatchService,
+    MicrosoftHandleErrorService,
+    MicrosoftOAuth2ClientManagerService,
+  ],
+  exports: [
+    MicrosoftGetMessageListService,
+    MicrosoftClientProvider,
+    MicrosoftGetMessagesService,
+  ],
+})
+export class MessagingMicrosoftDriverModule {}
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/mocks/microsoft-api-examples.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/mocks/microsoft-api-examples.ts
new file mode 100644
index 000000000000..0e08ccb67d4e
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/mocks/microsoft-api-examples.ts
@@ -0,0 +1,241 @@
+export const microsoftGraphWithMessages = {
+  '@odata.context':
+    'https://graph.microsoft.com/beta/$metadata#Collection(message)',
+  value: [
+    {
+      '@odata.type': '#microsoft.graph.message',
+      '@odata.etag': 'W/"CQAAABYAAAAadQ+1xAL8SLCZzf1KYyk+AAACItFa"',
+      id: 'AAMkAGZlMDQ1NjU5LTUzN2UtNDAyMC1hNmVlLTZhZmExMGU3ZDU1NwBGAAAAAADzAhgkpMbwQYnkXH1D-Va3BwAadQ_1xAL8SLCZzf1KYyk_AAAAAAEMAAAadQ_1xAL8SLCZzf1KYyk_AAACJSmSAAA=',
+    },
+  ],
+  '@odata.nextLink':
+    "https://graph.microsoft.com/beta/me/mailFolders('inbox')/messages/delta?$skiptoken=jWnSM_TVmEdmKBzfVjDdNbDwpt3yYSUqEf9CFdhRcTxhbogC9oaTvY1ZdONMplHuz0pwtPay_qkEcFQ5RLEuDZ3O6IgnI5FXRcfekzOECWlL7zRVdGBidZ5TkXmXV7O7P8cxtvBMFJ2_dV951teFMatpdnD6hvksBK0Ff4tJKfo.HvZwAw_DM9PR3xf90ThtbqSdMCkGCHNPkjpaedxSBN3",
+};
+
+export const microsoftGraphBatchWithTwoMessagesResponse = [
+  {
+    responses: [
+      {
+        id: '2',
+        status: 200,
+        headers: {
+          'Cache-Control': 'private',
+          'Content-Type':
+            'application/json; odata.metadata=minimal; odata.streaming=true; IEEE754Compatible=false; charset=utf-8',
+        },
+        body: {
+          '@odata.context':
+            "https://graph.microsoft.com/v1.0/$metadata#users('599cbaf7-873d-4b6f-b374-f87d3605e9e0')/messages/$entity",
+          '@odata.etag': 'W/"CQAAABYAAAAadQ+1xAL8SLCZzf1KYyk+AAACItFa"',
+          id: 'AAkALgAAAAAAHYQDEapmEc2byACqAC-EWg0AGnUPtcQC-Eiwmc39SmMpPgAAAiVYkAAA',
+          createdDateTime: '2025-01-10T13:31:37Z',
+          lastModifiedDateTime: '2025-01-10T13:31:38Z',
+          changeKey: 'CQAAABYAAAAadQ+1xAL8SLCZzf1KYyk+AAACItFa',
+          categories: [],
+          receivedDateTime: '2025-01-10T13:31:37Z',
+          sentDateTime: '2025-01-10T13:31:34Z',
+          hasAttachments: true,
+          internetMessageId:
+            '<FRZP194MB2383FF1CFE426952F85B1110981C3@FRAP194MB2383.EURP194.PROD.OUTLOOK.COM>',
+          subject: 'test email John: number 4',
+          bodyPreview: 'test 4',
+          importance: 'normal',
+          parentFolderId:
+            'AAMkAGZlMDQ1NjU5LTUzN2UtNDAyMC1hNmVlLTZhZmExMGU3ZDU1NwAuAAAAAADzAhgkpMbwQYnkXH1D-Va3AQAadQ_1xAL8SLCZzf1KYyk_AAAAAAEMAAA=',
+          conversationId:
+            'AAQkAGZlMDQ1NjU5LTUzN2UtNDAyMC1hNmVlLTZhZmExMGU3ZDU1NwAQAAZhOZ86nXZElRkxyGJRiY8=',
+          conversationIndex: 'AQHbY2PrBmE5nzqddkSVGTHIYlGJjw==',
+          isDeliveryReceiptRequested: null,
+          isReadReceiptRequested: false,
+          isRead: false,
+          isDraft: false,
+          webLink:
+            'https://outlook.office365.com/owa/?ItemID=AAkALgAAAAAAHYQDEapmEc2byACqAC%2FEWg0AGnUPtcQC%2FEiwmc39SmMpPgAAAiVYkAAA&exvsurl=1&viewmodel=ReadMessageItem',
+          inferenceClassification: 'focused',
+          body: {
+            contentType: 'text',
+            content: 'plain text format test 4',
+          },
+          sender: {
+            emailAddress: {
+              name: 'John l',
+              address: 'John.l@outlook.fr',
+            },
+          },
+          from: {
+            emailAddress: {
+              name: 'John l',
+              address: 'John.l@outlook.fr',
+            },
+          },
+          toRecipients: [
+            {
+              emailAddress: {
+                name: 'Walker',
+                address: 'walker@felixacme.onmicrosoft.com',
+              },
+            },
+          ],
+          ccRecipients: [],
+          bccRecipients: [],
+          replyTo: [],
+          flag: {
+            flagStatus: 'notFlagged',
+          },
+        },
+      },
+      {
+        id: '1',
+        status: 200,
+        headers: {
+          'Cache-Control': 'private',
+          'Content-Type':
+            'application/json; odata.metadata=minimal; odata.streaming=true; IEEE754Compatible=false; charset=utf-8',
+        },
+        body: {
+          '@odata.context':
+            "https://graph.microsoft.com/v1.0/$metadata#users('599cbaf7-873d-4b6f-b374-f87d3605e9e0')/messages/$entity",
+          '@odata.etag': 'W/"CQAAABYAAAAadQ+1xAL8SLCZzf1KYyk+AAADw4Em"',
+          id: 'AAkALgAAAAAAHYQDEapmEc2byACqAC-EWg0AGnUPtcQC-Eiwmc39SmMpPgAAA8ZAfgAA',
+          createdDateTime: '2025-01-13T09:38:06Z',
+          lastModifiedDateTime: '2025-01-13T11:50:48Z',
+          changeKey: 'CQAAABYAAAAadQ+1xAL8SLCZzf1KYyk+AAADw4Em',
+          categories: [],
+          receivedDateTime: '2025-01-13T09:38:06Z',
+          sentDateTime: '2025-01-13T09:38:01Z',
+          hasAttachments: false,
+          internetMessageId:
+            '<dfe8ac36-cf4c-4842-a506-034548452966@az.westus2.microsoft.com>',
+          subject: 'test subject',
+          bodyPreview: 'You now have 2 licenses',
+          importance: 'normal',
+          parentFolderId:
+            'AAMkAGZlMDQ1NjU5LTUzN2UtNDAyMC1hNmVlLTZhZmExMGU3ZDU1NwAuAAAAAADzAhgkpMbwQYnkXH1D-Va3AQAadQ_1xAL8SLCZzf1KYyk_AAAAAAEMAAA=',
+          conversationId:
+            'AAQkAGZlMDQ1NjU5LTUzN2UtNDAyMC1hNmVlLTZhZmExMGU3ZDU1NwAQADz34qcnxpxEidnAJbZA-OI=',
+          conversationIndex: 'AQHbZZ7ZPPfipyfGnESJ2cAltkD84g==',
+          isDeliveryReceiptRequested: null,
+          isReadReceiptRequested: false,
+          isRead: false,
+          isDraft: false,
+          webLink:
+            'https://outlook.office365.com/owa/?ItemID=AAkALgAAAAAAHYQDEapmEc2byACqAC%2FEWg0AGnUPtcQC%2FEiwmc39SmMpPgAAA8ZAfgAA&exvsurl=1&viewmodel=ReadMessageItem',
+          inferenceClassification: 'focused',
+          body: {
+            contentType: 'text',
+            content: 'You will send a message in the plain text format',
+          },
+          sender: {
+            emailAddress: {
+              name: 'Microsoft',
+              address: 'microsoft-noreply@microsoft.com',
+            },
+          },
+          from: {
+            emailAddress: {
+              name: 'Microsoft',
+              address: 'microsoft-noreply@microsoft.com',
+            },
+          },
+          toRecipients: [
+            {
+              emailAddress: {
+                name: 'Walker',
+                address: 'walker@felixacme.onmicrosoft.com',
+              },
+            },
+          ],
+          ccRecipients: [
+            {
+              emailAddress: {
+                name: 'Antoine',
+                address: 'antoine@gmail.com',
+              },
+            },
+            {
+              emailAddress: {
+                name: 'Cyril@acme2.com',
+                address: 'cyril@acme2.com',
+              },
+            },
+          ],
+          bccRecipients: [],
+          replyTo: [],
+          flag: {
+            flagStatus: 'notFlagged',
+          },
+        },
+      },
+    ],
+  },
+];
+
+export const microsoftGraphBatchWithHtmlMessagesResponse = [
+  {
+    responses: [
+      {
+        id: '2',
+        status: 200,
+        headers: {
+          'Cache-Control': 'private',
+          'Content-Type':
+            'application/json; odata.metadata=minimal; odata.streaming=true; IEEE754Compatible=false; charset=utf-8',
+        },
+        body: {
+          '@odata.context':
+            "https://graph.microsoft.com/v1.0/$metadata#users('599cbaf7-873d-4b6f-b374-f87d3605e9e0')/messages/$entity",
+          '@odata.etag': 'W/"CQAAABYAAAAadQ+1xAL8SLCZzf1KYyk+AAACItFa"',
+          id: 'AAkALgAAAAAAHYQDEapmEc2byACqAC-EWg0AGnUPtcQC-Eiwmc39SmMpPgAAAiVYkAAA',
+          createdDateTime: '2025-01-10T13:31:37Z',
+          lastModifiedDateTime: '2025-01-10T13:31:38Z',
+          changeKey: 'CQAAABYAAAAadQ+1xAL8SLCZzf1KYyk+AAACItFa',
+          categories: [],
+          receivedDateTime: '2025-01-10T13:31:37Z',
+          sentDateTime: '2025-01-10T13:31:34Z',
+          hasAttachments: true,
+          internetMessageId:
+            '<FRZP194MB2383FF1CFE426952F85B1110981C3@FRAP194MB2383.EURP194.PROD.OUTLOOK.COM>',
+          subject: 'test email John: number 5',
+          bodyPreview: 'test 5',
+          importance: 'normal',
+          parentFolderId:
+            'AAMkAGZlMDQ1NjU5LTUzN2UtNDAyMC1hNmVlLTZhZmExMGU3ZDU1NwAuAAAAAADzAhgkpMbwQYnkXH1D-Va3AQAadQ_1xAL8SLCZzf1KYyk_AAAAAAEMAAA=',
+          conversationId:
+            'AAQkAGZlMDQ1NjU5LTUzN2UtNDAyMC1hNmVlLTZhZmExMGU3ZDU1NwAQAAZhOZ86nXZElRkxyGJRiY9=',
+          conversationIndex: 'AQHbY2PrBmE5nzqddkSVGTHIYlGJjr==',
+          isDeliveryReceiptRequested: null,
+          isReadReceiptRequested: false,
+          isRead: false,
+          isDraft: false,
+          webLink:
+            'https://outlook.office365.com/owa/?ItemID=AAkALgAAAAAAHYQDEapmEc2byACqAC%2FEWg0AGnUPtcQC%2FEiwmc39SmMpPgAAAiVYkAAA&exvsurl=1&viewmodel=ReadMessageItem',
+          inferenceClassification: 'focused',
+          body: {
+            contentType: 'html',
+            content:
+              '<html><head>\r\n<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><div dir="ltr"><div dir="ltr"><div dir="ltr"><br></div></div><div id="divRplyFwdMsg" dir="ltr"><div>&nbsp;</div></div><div dir="ltr"><div class="x_elementToProof" style="font-family:Calibri,Helvetica,sans-serif; font-size:12pt; color:rgb(0,0,0)">test 4</div></div></div></body></html>',
+          },
+          sender: {
+            emailAddress: {
+              name: 'John l',
+              address: 'John.l@outlook.fr',
+            },
+          },
+          from: {
+            emailAddress: {
+              name: 'John l',
+              address: 'John.l@outlook.fr',
+            },
+          },
+          toRecipients: [],
+          ccRecipients: [],
+          bccRecipients: [],
+          replyTo: [],
+          flag: {
+            flagStatus: 'notFlagged',
+          },
+        },
+      },
+    ],
+  },
+];
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/providers/microsoft-client.provider.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/providers/microsoft-client.provider.ts
new file mode 100644
index 000000000000..0dfc149b4957
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/providers/microsoft-client.provider.ts
@@ -0,0 +1,32 @@
+import { Injectable } from '@nestjs/common';
+
+import { Client } from '@microsoft/microsoft-graph-client';
+
+import { MicrosoftOAuth2ClientManagerService } from 'src/modules/connected-account/oauth2-client-manager/drivers/microsoft/microsoft-oauth2-client-manager.service';
+import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
+
+@Injectable()
+export class MicrosoftClientProvider {
+  constructor(
+    private readonly microsoftOAuth2ClientManagerService: MicrosoftOAuth2ClientManagerService,
+  ) {}
+
+  public async getMicrosoftClient(
+    connectedAccount: Pick<
+      ConnectedAccountWorkspaceEntity,
+      'refreshToken' | 'id'
+    >,
+  ): Promise<Client> {
+    try {
+      return await this.microsoftOAuth2ClientManagerService.getOAuth2Client(
+        connectedAccount.refreshToken,
+      );
+    } catch (error) {
+      throw new Error(
+        `Failed to get Microsoft client: ${
+          error instanceof Error ? error.message : 'Unknown error'
+        }`,
+      );
+    }
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-fetch-by-batch.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-fetch-by-batch.service.ts
new file mode 100644
index 000000000000..3f4ae6a0bdef
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-fetch-by-batch.service.ts
@@ -0,0 +1,57 @@
+import { Injectable } from '@nestjs/common';
+
+import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
+import { MicrosoftClientProvider } from 'src/modules/messaging/message-import-manager/drivers/microsoft/providers/microsoft-client.provider';
+import { MicrosoftGraphBatchResponse } from 'src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.interface';
+
+@Injectable()
+export class MicrosoftFetchByBatchService {
+  constructor(
+    private readonly microsoftClientProvider: MicrosoftClientProvider,
+  ) {}
+
+  async fetchAllByBatches(
+    messageIds: string[],
+    connectedAccount: Pick<
+      ConnectedAccountWorkspaceEntity,
+      'refreshToken' | 'id'
+    >,
+  ): Promise<{
+    messageIdsByBatch: string[][];
+    batchResponses: MicrosoftGraphBatchResponse[];
+  }> {
+    const batchLimit = 20;
+    const batchResponses: MicrosoftGraphBatchResponse[] = [];
+    const messageIdsByBatch: string[][] = [];
+
+    const client =
+      await this.microsoftClientProvider.getMicrosoftClient(connectedAccount);
+
+    for (let i = 0; i < messageIds.length; i += batchLimit) {
+      const batchMessageIds = messageIds.slice(i, i + batchLimit);
+
+      messageIdsByBatch.push(batchMessageIds);
+
+      const batchRequests = batchMessageIds.map((messageId, index) => ({
+        id: (index + 1).toString(),
+        method: 'GET',
+        url: `/me/messages/${messageId}`,
+        headers: {
+          'Content-Type': 'application/json',
+          Prefer: 'outlook.body-content-type="text"',
+        },
+      }));
+
+      const batchResponse = await client
+        .api('/$batch')
+        .post({ requests: batchRequests });
+
+      batchResponses.push(batchResponse);
+    }
+
+    return {
+      messageIdsByBatch,
+      batchResponses,
+    };
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-message-list.service.dev.spec.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-message-list.service.dev.spec.ts
new file mode 100644
index 000000000000..f2d663fec7f4
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-message-list.service.dev.spec.ts
@@ -0,0 +1,81 @@
+import { ConfigService } from '@nestjs/config';
+import { Test, TestingModule } from '@nestjs/testing';
+
+import { EnvironmentModule } from 'src/engine/core-modules/environment/environment.module';
+import { MicrosoftOAuth2ClientManagerService } from 'src/modules/connected-account/oauth2-client-manager/drivers/microsoft/microsoft-oauth2-client-manager.service';
+import { ConnectedAccountProvider } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
+import { MicrosoftClientProvider } from 'src/modules/messaging/message-import-manager/drivers/microsoft/providers/microsoft-client.provider';
+
+import { MicrosoftGetMessageListService } from './microsoft-get-message-list.service';
+import { MicrosoftHandleErrorService } from './microsoft-handle-error.service';
+
+const refreshToken = 'replace-with-your-refresh-token';
+const syncCursor = `replace-with-your-sync-cursor`;
+
+xdescribe('Microsoft dev tests : get message list service', () => {
+  let service: MicrosoftGetMessageListService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      imports: [EnvironmentModule.forRoot({})],
+      providers: [
+        MicrosoftGetMessageListService,
+        MicrosoftClientProvider,
+        MicrosoftHandleErrorService,
+        MicrosoftOAuth2ClientManagerService,
+        ConfigService,
+      ],
+    }).compile();
+
+    service = module.get<MicrosoftGetMessageListService>(
+      MicrosoftGetMessageListService,
+    );
+  });
+
+  const mockConnectedAccount = {
+    id: 'connected-account-id',
+    provider: ConnectedAccountProvider.MICROSOFT,
+    refreshToken: refreshToken,
+  };
+
+  it('Should fetch and return message list successfully', async () => {
+    const result = await service.getFullMessageList(mockConnectedAccount);
+
+    expect(result.messageExternalIds.length).toBeGreaterThan(0);
+  });
+
+  it('Should throw token error', async () => {
+    const mockConnectedAccountUnvalid = {
+      id: 'connected-account-id',
+      provider: ConnectedAccountProvider.MICROSOFT,
+      refreshToken: 'invalid-token',
+    };
+
+    await expect(
+      service.getFullMessageList(mockConnectedAccountUnvalid),
+    ).rejects.toThrowError('Access token is undefined or empty');
+  });
+
+  it('Should fetch and return partial message list successfully', async () => {
+    const result = await service.getPartialMessageList(
+      mockConnectedAccount,
+      syncCursor,
+    );
+
+    expect(result.nextSyncCursor).toBeTruthy();
+  });
+
+  it('Should fail partial message if syncCursor is invalid', async () => {
+    await expect(
+      service.getPartialMessageList(mockConnectedAccount, 'invalid-syncCursor'),
+    ).rejects.toThrowError(
+      /Resource not found for the segment|Badly formed content/g,
+    );
+  });
+
+  it('Should fail partial message if syncCursor is missing', async () => {
+    await expect(
+      service.getPartialMessageList(mockConnectedAccount, ''),
+    ).rejects.toThrowError(/Missing SyncCursor/g);
+  });
+});
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-message-list.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-message-list.service.ts
new file mode 100644
index 000000000000..335665346af2
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-message-list.service.ts
@@ -0,0 +1,120 @@
+import { Injectable } from '@nestjs/common';
+
+import {
+  PageCollection,
+  PageIterator,
+  PageIteratorCallback,
+} from '@microsoft/microsoft-graph-client';
+
+import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
+import {
+  MessageImportDriverException,
+  MessageImportDriverExceptionCode,
+} from 'src/modules/messaging/message-import-manager/drivers/exceptions/message-import-driver.exception';
+import { MicrosoftClientProvider } from 'src/modules/messaging/message-import-manager/drivers/microsoft/providers/microsoft-client.provider';
+import { MicrosoftHandleErrorService } from 'src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-handle-error.service';
+import {
+  GetFullMessageListResponse,
+  GetPartialMessageListResponse,
+} from 'src/modules/messaging/message-import-manager/services/messaging-get-message-list.service';
+
+// Microsoft API limit is 999 messages per request on this endpoint
+const MESSAGING_MICROSOFT_USERS_MESSAGES_LIST_MAX_RESULT = 999;
+
+@Injectable()
+export class MicrosoftGetMessageListService {
+  constructor(
+    private readonly microsoftClientProvider: MicrosoftClientProvider,
+    private readonly microsoftHandleErrorService: MicrosoftHandleErrorService,
+  ) {}
+
+  public async getFullMessageList(
+    connectedAccount: Pick<
+      ConnectedAccountWorkspaceEntity,
+      'provider' | 'refreshToken' | 'id'
+    >,
+    syncCursor?: string,
+  ): Promise<GetFullMessageListResponse> {
+    const messageExternalIds: string[] = [];
+
+    const microsoftClient =
+      await this.microsoftClientProvider.getMicrosoftClient(connectedAccount);
+
+    const response: PageCollection = await microsoftClient
+      .api(syncCursor || '/me/mailfolders/inbox/messages/delta?$select=id')
+      .version('beta')
+      .headers({
+        Prefer: `odata.maxpagesize=${MESSAGING_MICROSOFT_USERS_MESSAGES_LIST_MAX_RESULT}, IdType="ImmutableId"`,
+      })
+      .get();
+
+    const callback: PageIteratorCallback = (data) => {
+      messageExternalIds.push(data.id);
+
+      return true;
+    };
+
+    const pageIterator = new PageIterator(microsoftClient, response, callback);
+
+    await pageIterator.iterate().catch((error) => {
+      this.microsoftHandleErrorService.handleMicrosoftMessageFetchError(error);
+    });
+
+    return {
+      messageExternalIds: messageExternalIds,
+      nextSyncCursor: pageIterator.getDeltaLink() || '',
+    };
+  }
+
+  public async getPartialMessageList(
+    connectedAccount: Pick<
+      ConnectedAccountWorkspaceEntity,
+      'provider' | 'refreshToken' | 'id'
+    >,
+    syncCursor: string,
+  ): Promise<GetPartialMessageListResponse> {
+    // important: otherwise tries to get the full message list
+    if (!syncCursor) {
+      throw new MessageImportDriverException(
+        'Missing SyncCursor',
+        MessageImportDriverExceptionCode.SYNC_CURSOR_ERROR,
+      );
+    }
+
+    const messageExternalIds: string[] = [];
+    const messageExternalIdsToDelete: string[] = [];
+
+    const microsoftClient =
+      await this.microsoftClientProvider.getMicrosoftClient(connectedAccount);
+
+    const response: PageCollection = await microsoftClient
+      .api(syncCursor)
+      .version('beta')
+      .headers({
+        Prefer: `odata.maxpagesize=${MESSAGING_MICROSOFT_USERS_MESSAGES_LIST_MAX_RESULT}, IdType="ImmutableId"`,
+      })
+      .get();
+
+    const callback: PageIteratorCallback = (data) => {
+      if (data['@removed']) {
+        messageExternalIdsToDelete.push(data.id);
+      } else {
+        messageExternalIds.push(data.id);
+      }
+
+      return true;
+    };
+
+    const pageIterator = new PageIterator(microsoftClient, response, callback);
+
+    await pageIterator.iterate().catch((error) => {
+      this.microsoftHandleErrorService.handleMicrosoftMessageFetchError(error);
+    });
+
+    return {
+      messageExternalIds,
+      messageExternalIdsToDelete,
+      nextSyncCursor: pageIterator.getDeltaLink() || '',
+    };
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.interface.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.interface.ts
new file mode 100644
index 000000000000..14dc42d51246
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.interface.ts
@@ -0,0 +1,45 @@
+export interface MicrosoftGraphBatchResponse {
+  responses: {
+    id: string;
+    status: number;
+    headers?: {
+      'Cache-Control': string;
+      'Content-Type': string;
+    };
+    body?: {
+      '@odata.context'?: string;
+      '@odata.etag'?: string;
+      id?: string;
+      createdDateTime?: string;
+      lastModifiedDateTime?: string;
+      changeKey?: string;
+      categories?: any[];
+      receivedDateTime?: string;
+      sentDateTime?: string;
+      hasAttachments?: boolean;
+      internetMessageId?: string;
+      subject?: string;
+      bodyPreview?: string;
+      importance?: string;
+      parentFolderId?: string;
+      conversationId?: string;
+      conversationIndex?: string;
+      isDeliveryReceiptRequested?: boolean | null;
+      isReadReceiptRequested?: boolean;
+      isRead?: boolean;
+      isDraft?: boolean;
+      webLink?: string;
+      inferenceClassification?: string;
+      body?: {
+        contentType?: string;
+        content?: string;
+      };
+      sender?: {
+        emailAddress?: {
+          name?: string;
+          address?: string;
+        };
+      };
+    };
+  }[];
+}
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.dev.spec.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.dev.spec.ts
new file mode 100644
index 000000000000..43fd7563e470
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.dev.spec.ts
@@ -0,0 +1,58 @@
+import { ConfigService } from '@nestjs/config';
+import { Test, TestingModule } from '@nestjs/testing';
+
+import { EnvironmentModule } from 'src/engine/core-modules/environment/environment.module';
+import { MicrosoftOAuth2ClientManagerService } from 'src/modules/connected-account/oauth2-client-manager/drivers/microsoft/microsoft-oauth2-client-manager.service';
+import { ConnectedAccountProvider } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
+import { MicrosoftClientProvider } from 'src/modules/messaging/message-import-manager/drivers/microsoft/providers/microsoft-client.provider';
+import { MicrosoftFetchByBatchService } from 'src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-fetch-by-batch.service';
+import { MicrosoftGetMessagesService } from 'src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service';
+
+import { MicrosoftHandleErrorService } from './microsoft-handle-error.service';
+
+const mockMessageIds = [
+  'AAkALgAAAAAAHYQDEapmEc2byACqAC-EWg0AGnUPtcQC-Eiwmc39SmMpPgAAA8ZAfgAA',
+  'AAkALgAAAAAAHYQDEapmEc2byACqAC-EWg0AGnUPtcQC-Eiwmc39SmMpPgAAAiVYkAAA',
+];
+
+const refreshToken = 'replace-with-your-refresh-token';
+
+xdescribe('Microsoft dev tests : get messages service', () => {
+  let service: MicrosoftGetMessagesService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      imports: [EnvironmentModule.forRoot({})],
+      providers: [
+        MicrosoftGetMessagesService,
+        MicrosoftHandleErrorService,
+        MicrosoftClientProvider,
+        MicrosoftOAuth2ClientManagerService,
+        MicrosoftFetchByBatchService,
+        ConfigService,
+      ],
+    }).compile();
+
+    service = module.get<MicrosoftGetMessagesService>(
+      MicrosoftGetMessagesService,
+    );
+  });
+
+  const mockConnectedAccount = {
+    id: 'connected-account-id',
+    provider: ConnectedAccountProvider.MICROSOFT,
+    handle: 'John.Walker@outlook.fr',
+    handleAliases: '',
+    refreshToken: refreshToken,
+  };
+
+  it('should fetch and format messages successfully', async () => {
+    const result = await service.getMessages(
+      mockMessageIds,
+      mockConnectedAccount,
+      'workspace-1',
+    );
+
+    expect(result).toHaveLength(1);
+  });
+});
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.spec.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.spec.ts
new file mode 100644
index 000000000000..a0652fa22ebe
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.spec.ts
@@ -0,0 +1,174 @@
+import { ConfigService } from '@nestjs/config';
+import { Test, TestingModule } from '@nestjs/testing';
+
+import { EnvironmentModule } from 'src/engine/core-modules/environment/environment.module';
+import { MicrosoftOAuth2ClientManagerService } from 'src/modules/connected-account/oauth2-client-manager/drivers/microsoft/microsoft-oauth2-client-manager.service';
+import { ConnectedAccountProvider } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
+import {
+  microsoftGraphBatchWithHtmlMessagesResponse,
+  microsoftGraphBatchWithTwoMessagesResponse,
+} from 'src/modules/messaging/message-import-manager/drivers/microsoft/mocks/microsoft-api-examples';
+import { MicrosoftClientProvider } from 'src/modules/messaging/message-import-manager/drivers/microsoft/providers/microsoft-client.provider';
+import { MicrosoftFetchByBatchService } from 'src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-fetch-by-batch.service';
+import { MicrosoftGraphBatchResponse } from 'src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.interface';
+import { MicrosoftGetMessagesService } from 'src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service';
+
+import { MicrosoftHandleErrorService } from './microsoft-handle-error.service';
+
+describe('Microsoft get messages service', () => {
+  let service: MicrosoftGetMessagesService;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      imports: [EnvironmentModule.forRoot({})],
+      providers: [
+        MicrosoftGetMessagesService,
+        MicrosoftHandleErrorService,
+        MicrosoftClientProvider,
+        MicrosoftOAuth2ClientManagerService,
+        MicrosoftFetchByBatchService,
+        ConfigService,
+      ],
+    }).compile();
+
+    service = module.get<MicrosoftGetMessagesService>(
+      MicrosoftGetMessagesService,
+    );
+  });
+
+  it('Should be defined', () => {
+    expect(service).toBeDefined();
+  });
+
+  it('Should format batch responses as messages', () => {
+    const batchResponses: MicrosoftGraphBatchResponse[] =
+      microsoftGraphBatchWithTwoMessagesResponse;
+    const connectedAccount = {
+      id: 'connected-account-id',
+      provider: ConnectedAccountProvider.MICROSOFT,
+      refreshToken: 'refresh-token',
+      handle: 'John.l@outlook.fr',
+      handleAliases: '',
+    };
+    const messages = service.formatBatchResponsesAsMessages(
+      batchResponses,
+      connectedAccount,
+    );
+
+    expect(messages).toHaveLength(2);
+
+    const responseExample1 =
+      microsoftGraphBatchWithTwoMessagesResponse[0].responses[0];
+
+    expect(
+      messages.find(
+        (message) =>
+          message.externalId ===
+          'AAkALgAAAAAAHYQDEapmEc2byACqAC-EWg0AGnUPtcQC-Eiwmc39SmMpPgAAAiVYkAAA',
+      ),
+    ).toStrictEqual({
+      externalId:
+        'AAkALgAAAAAAHYQDEapmEc2byACqAC-EWg0AGnUPtcQC-Eiwmc39SmMpPgAAAiVYkAAA',
+      subject: responseExample1.body.subject,
+      receivedAt: new Date(responseExample1.body.receivedDateTime),
+      text: responseExample1.body.body.content,
+      headerMessageId: responseExample1.body.internetMessageId,
+      messageThreadExternalId: responseExample1.body.conversationId,
+      direction: 'OUTGOING',
+      participants: [
+        {
+          displayName: 'John l',
+          handle: 'john.l@outlook.fr',
+          role: 'from',
+        },
+        {
+          displayName: 'Walker',
+          handle: 'walker@felixacme.onmicrosoft.com',
+          role: 'to',
+        },
+      ],
+      attachments: [],
+    });
+
+    const responseExample2 =
+      microsoftGraphBatchWithTwoMessagesResponse[0].responses[1];
+
+    expect(
+      messages.filter(
+        (message) =>
+          message.externalId ===
+          'AAkALgAAAAAAHYQDEapmEc2byACqAC-EWg0AGnUPtcQC-Eiwmc39SmMpPgAAA8ZAfgAA',
+      )[0],
+    ).toStrictEqual({
+      externalId:
+        'AAkALgAAAAAAHYQDEapmEc2byACqAC-EWg0AGnUPtcQC-Eiwmc39SmMpPgAAA8ZAfgAA',
+      subject: responseExample2.body.subject,
+      receivedAt: new Date(responseExample2.body.receivedDateTime),
+      text: responseExample2.body.body.content,
+      headerMessageId: responseExample2.body.internetMessageId,
+      messageThreadExternalId: responseExample2.body.conversationId,
+      direction: 'INCOMING',
+      participants: [
+        {
+          displayName: 'Microsoft',
+          handle: 'microsoft-noreply@microsoft.com',
+          role: 'from',
+        },
+        {
+          displayName: 'Walker',
+          handle: 'walker@felixacme.onmicrosoft.com',
+          role: 'to',
+        },
+        {
+          displayName: 'Antoine',
+          handle: 'antoine@gmail.com',
+          role: 'cc',
+        },
+        {
+          displayName: 'Cyril@acme2.com',
+          handle: 'cyril@acme2.com',
+          role: 'cc',
+        },
+      ],
+      attachments: [],
+    });
+  });
+
+  it('Should set empty text for html responses', () => {
+    const batchResponses: MicrosoftGraphBatchResponse[] =
+      microsoftGraphBatchWithHtmlMessagesResponse;
+    const connectedAccount = {
+      id: 'connected-account-id',
+      provider: ConnectedAccountProvider.MICROSOFT,
+      refreshToken: 'refresh-token',
+      handle: 'John.l@outlook.fr',
+      handleAliases: '',
+    };
+    const messages = service.formatBatchResponsesAsMessages(
+      batchResponses,
+      connectedAccount,
+    );
+
+    const responseExample =
+      microsoftGraphBatchWithHtmlMessagesResponse[0].responses[0];
+
+    expect(messages[0]).toStrictEqual({
+      externalId: responseExample.body.id,
+      subject: responseExample.body.subject,
+      receivedAt: new Date(responseExample.body.receivedDateTime),
+      text: '',
+      headerMessageId: responseExample.body.internetMessageId,
+      messageThreadExternalId: responseExample.body.conversationId,
+      direction: 'OUTGOING',
+      participants: [
+        {
+          displayName: responseExample.body.sender.emailAddress.name,
+          handle:
+            responseExample.body.sender.emailAddress.address.toLowerCase(),
+          role: 'from',
+        },
+      ],
+      attachments: [],
+    });
+  });
+});
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.ts
new file mode 100644
index 000000000000..84201dc6279d
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service.ts
@@ -0,0 +1,139 @@
+import { Injectable, Logger } from '@nestjs/common';
+
+import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
+import { computeMessageDirection } from 'src/modules/messaging/message-import-manager/drivers/gmail/utils/compute-message-direction.util';
+import { MicrosoftGraphBatchResponse } from 'src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.interface';
+import { MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
+import { formatAddressObjectAsParticipants } from 'src/modules/messaging/message-import-manager/utils/format-address-object-as-participants.util';
+import { isDefined } from 'src/utils/is-defined';
+
+import { MicrosoftFetchByBatchService } from './microsoft-fetch-by-batch.service';
+import { MicrosoftHandleErrorService } from './microsoft-handle-error.service';
+
+type ConnectedAccountType = Pick<
+  ConnectedAccountWorkspaceEntity,
+  'refreshToken' | 'id' | 'provider' | 'handle' | 'handleAliases'
+>;
+
+@Injectable()
+export class MicrosoftGetMessagesService {
+  private readonly logger = new Logger(MicrosoftGetMessagesService.name);
+
+  constructor(
+    private readonly microsoftFetchByBatchService: MicrosoftFetchByBatchService,
+    private readonly microsoftHandleErrorService: MicrosoftHandleErrorService,
+  ) {}
+
+  async getMessages(
+    messageIds: string[],
+    connectedAccount: ConnectedAccountType,
+    workspaceId: string,
+  ): Promise<MessageWithParticipants[]> {
+    const startTime = Date.now();
+
+    try {
+      const { batchResponses } =
+        await this.microsoftFetchByBatchService.fetchAllByBatches(
+          messageIds,
+          connectedAccount,
+        );
+
+      const messages = this.formatBatchResponsesAsMessages(
+        batchResponses,
+        connectedAccount,
+      );
+
+      const endTime = Date.now();
+
+      this.logger.log(
+        `Messaging import for workspace ${workspaceId} and account ${
+          connectedAccount.id
+        } fetched ${messages.length} messages in ${endTime - startTime}ms`,
+      );
+
+      return messages;
+    } catch (error) {
+      this.microsoftHandleErrorService.handleMicrosoftMessageFetchError(error);
+
+      return [];
+    }
+  }
+
+  public formatBatchResponsesAsMessages(
+    batchResponses: MicrosoftGraphBatchResponse[],
+    connectedAccount: ConnectedAccountType,
+  ): MessageWithParticipants[] {
+    return batchResponses.flatMap((batchResponse) => {
+      return this.formatBatchResponseAsMessages(
+        batchResponse,
+        connectedAccount,
+      );
+    });
+  }
+
+  private formatBatchResponseAsMessages(
+    batchResponse: MicrosoftGraphBatchResponse,
+    connectedAccount: ConnectedAccountType,
+  ): MessageWithParticipants[] {
+    const parsedResponses = this.parseBatchResponse(batchResponse);
+
+    const messages = parsedResponses.map((response) => {
+      if ('error' in response) {
+        this.microsoftHandleErrorService.handleMicrosoftMessageFetchError(
+          response.error,
+        );
+      }
+
+      const participants = [
+        ...formatAddressObjectAsParticipants(
+          response?.from?.emailAddress,
+          'from',
+        ),
+        ...formatAddressObjectAsParticipants(
+          response?.toRecipients?.map((recipient) => recipient.emailAddress),
+          'to',
+        ),
+        ...formatAddressObjectAsParticipants(
+          response?.ccRecipients?.map((recipient) => recipient.emailAddress),
+          'cc',
+        ),
+        ...formatAddressObjectAsParticipants(
+          response?.bccRecipients?.map((recipient) => recipient.emailAddress),
+          'bcc',
+        ),
+      ];
+
+      return {
+        externalId: response.id,
+        subject: response.subject || '',
+        receivedAt: new Date(response.receivedDateTime),
+        text:
+          response.body?.contentType === 'text' ? response.body?.content : '',
+        headerMessageId: response.internetMessageId,
+        messageThreadExternalId: response.conversationId,
+        direction: computeMessageDirection(
+          response.from.emailAddress.address,
+          connectedAccount,
+        ),
+        participants: participants,
+        attachments: [],
+      };
+    });
+
+    return messages.filter(isDefined);
+  }
+
+  private parseBatchResponse(batchResponse: MicrosoftGraphBatchResponse) {
+    if (!batchResponse?.responses) {
+      return [];
+    }
+
+    return batchResponse.responses.map((response: any) => {
+      if (response.status === 200) {
+        return response.body;
+      }
+
+      return { error: response.error };
+    });
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-handle-error.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-handle-error.service.ts
new file mode 100644
index 000000000000..5c7560c425bd
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-handle-error.service.ts
@@ -0,0 +1,32 @@
+import { Injectable } from '@nestjs/common';
+
+import { GraphError } from '@microsoft/microsoft-graph-client';
+
+import {
+  MessageImportDriverException,
+  MessageImportDriverExceptionCode,
+} from 'src/modules/messaging/message-import-manager/drivers/exceptions/message-import-driver.exception';
+
+@Injectable()
+export class MicrosoftHandleErrorService {
+  public handleMicrosoftMessageFetchError(error: GraphError): void {
+    if (error.statusCode === 401) {
+      throw new MessageImportDriverException(
+        'Unauthorized access to Microsoft Graph API',
+        MessageImportDriverExceptionCode.INSUFFICIENT_PERMISSIONS,
+      );
+    }
+
+    if (error.statusCode === 403) {
+      throw new MessageImportDriverException(
+        'Forbidden access to Microsoft Graph API',
+        MessageImportDriverExceptionCode.INSUFFICIENT_PERMISSIONS,
+      );
+    }
+
+    throw new MessageImportDriverException(
+      `Microsoft Graph API error: ${error.message}`,
+      MessageImportDriverExceptionCode.UNKNOWN,
+    );
+  }
+}
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job.ts
index 67761ec5d780..c7ff4bcedd76 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job.ts
@@ -34,8 +34,6 @@ export class MessagingMessageListFetchJob {
 
   @Process(MessagingMessageListFetchJob.name)
   async handle(data: MessagingMessageListFetchJobData): Promise<void> {
-    console.time('MessagingMessageListFetchJob time');
-
     const { messageChannelId, workspaceId } = data;
 
     await this.messagingTelemetryService.track({
@@ -133,7 +131,5 @@ export class MessagingMessageListFetchJob {
       default:
         break;
     }
-
-    console.timeEnd('MessagingMessageListFetchJob time');
   }
 }
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-messages-import.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-messages-import.job.ts
index f062400d19bb..449d8a3889a1 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-messages-import.job.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-messages-import.job.ts
@@ -30,8 +30,6 @@ export class MessagingMessagesImportJob {
 
   @Process(MessagingMessagesImportJob.name)
   async handle(data: MessagingMessagesImportJobData): Promise<void> {
-    console.time('MessagingMessagesImportJob time');
-
     const { messageChannelId, workspaceId } = data;
 
     await this.messagingTelemetryService.track({
@@ -87,7 +85,5 @@ export class MessagingMessagesImportJob {
       messageChannel.connectedAccount,
       workspaceId,
     );
-
-    console.timeEnd('MessagingMessagesImportJob time');
   }
 }
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts
index c13c9485cbfc..d5320042f426 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts
@@ -18,6 +18,7 @@ import { MessagingMessageListFetchCronJob } from 'src/modules/messaging/message-
 import { MessagingMessagesImportCronJob } from 'src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job';
 import { MessagingOngoingStaleCronJob } from 'src/modules/messaging/message-import-manager/crons/jobs/messaging-ongoing-stale.cron.job';
 import { MessagingGmailDriverModule } from 'src/modules/messaging/message-import-manager/drivers/gmail/messaging-gmail-driver.module';
+import { MessagingMicrosoftDriverModule } from 'src/modules/messaging/message-import-manager/drivers/microsoft/messaging-microsoft-driver.module';
 import { MessagingAddSingleMessageToCacheForImportJob } from 'src/modules/messaging/message-import-manager/jobs/messaging-add-single-message-to-cache-for-import.job';
 import { MessagingCleanCacheJob } from 'src/modules/messaging/message-import-manager/jobs/messaging-clean-cache';
 import { MessagingMessageListFetchJob } from 'src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job';
@@ -40,6 +41,7 @@ import { MessagingMonitoringModule } from 'src/modules/messaging/monitoring/mess
     RefreshAccessTokenManagerModule,
     WorkspaceDataSourceModule,
     MessagingGmailDriverModule,
+    MessagingMicrosoftDriverModule,
     MessagingCommonModule,
     TypeOrmModule.forFeature([Workspace], 'core'),
     TypeOrmModule.forFeature([DataSourceEntity], 'metadata'),
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/message-import-exception-handler.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/message-import-exception-handler.service.ts
index f67b03eb6021..faaccee96e46 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/message-import-exception-handler.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/message-import-exception-handler.service.ts
@@ -64,6 +64,13 @@ export class MessageImportExceptionHandlerService {
           workspaceId,
         );
         break;
+      case MessageImportDriverExceptionCode.SYNC_CURSOR_ERROR:
+        await this.handlePermanentException(
+          exception,
+          messageChannel,
+          workspaceId,
+        );
+        break;
       default:
         throw exception;
     }
@@ -149,6 +156,22 @@ export class MessageImportExceptionHandlerService {
     );
   }
 
+  private async handlePermanentException(
+    exception: MessageImportDriverException,
+    messageChannel: Pick<MessageChannelWorkspaceEntity, 'id'>,
+    workspaceId: string,
+  ): Promise<void> {
+    await this.messageChannelSyncStatusService.markAsFailedUnknownAndFlushMessagesToImport(
+      [messageChannel.id],
+      workspaceId,
+    );
+
+    throw new MessageImportException(
+      `Permanent error occurred while importing messages for message channel ${messageChannel.id} in workspace ${workspaceId}: ${exception.message}`,
+      MessageImportExceptionCode.UNKNOWN,
+    );
+  }
+
   private async handleNotFoundException(
     syncStep: MessageImportSyncStep,
     messageChannel: Pick<MessageChannelWorkspaceEntity, 'id'>,
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-message-list.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-message-list.service.ts
index c6bf2e68bf0a..a0308572fe25 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-message-list.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-message-list.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
 
 import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
 import { GmailGetMessageListService } from 'src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-get-message-list.service';
+import { MicrosoftGetMessageListService } from 'src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-message-list.service';
 import {
   MessageImportException,
   MessageImportExceptionCode,
@@ -22,12 +23,13 @@ export type GetPartialMessageListResponse = {
 export class MessagingGetMessageListService {
   constructor(
     private readonly gmailGetMessageListService: GmailGetMessageListService,
+    private readonly microsoftGetMessageListService: MicrosoftGetMessageListService,
   ) {}
 
   public async getFullMessageList(
     connectedAccount: Pick<
       ConnectedAccountWorkspaceEntity,
-      'provider' | 'refreshToken' | 'id'
+      'provider' | 'refreshToken' | 'id' | 'handle'
     >,
   ): Promise<GetFullMessageListResponse> {
     switch (connectedAccount.provider) {
@@ -36,11 +38,9 @@ export class MessagingGetMessageListService {
           connectedAccount,
         );
       case 'microsoft':
-        // TODO: Placeholder
-        return {
-          messageExternalIds: [],
-          nextSyncCursor: '',
-        };
+        return this.microsoftGetMessageListService.getFullMessageList(
+          connectedAccount,
+        );
       default:
         throw new MessageImportException(
           `Provider ${connectedAccount.provider} is not supported`,
@@ -63,11 +63,10 @@ export class MessagingGetMessageListService {
           syncCursor,
         );
       case 'microsoft':
-        return {
-          messageExternalIds: [],
-          messageExternalIdsToDelete: [],
-          nextSyncCursor: '',
-        };
+        return this.microsoftGetMessageListService.getPartialMessageList(
+          connectedAccount,
+          syncCursor,
+        );
       default:
         throw new MessageImportException(
           `Provider ${connectedAccount.provider} is not supported`,
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-messages.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-messages.service.ts
index bbd2e980d51f..1542a69ddc7b 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-messages.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-messages.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
 
 import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
 import { GmailGetMessagesService } from 'src/modules/messaging/message-import-manager/drivers/gmail/services/gmail-get-messages.service';
+import { MicrosoftGetMessagesService } from 'src/modules/messaging/message-import-manager/drivers/microsoft/services/microsoft-get-messages.service';
 import {
   MessageImportException,
   MessageImportExceptionCode,
@@ -14,6 +15,7 @@ export type GetMessagesResponse = MessageWithParticipants[];
 export class MessagingGetMessagesService {
   constructor(
     private readonly gmailGetMessagesService: GmailGetMessagesService,
+    private readonly microsoftGetMessagesService: MicrosoftGetMessagesService,
   ) {}
 
   public async getMessages(
@@ -36,6 +38,12 @@ export class MessagingGetMessagesService {
           connectedAccount,
           workspaceId,
         );
+      case 'microsoft':
+        return this.microsoftGetMessagesService.getMessages(
+          messageIds,
+          connectedAccount,
+          workspaceId,
+        );
       default:
         throw new MessageImportException(
           `Provider ${connectedAccount.provider} is not supported`,
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message.service.ts
index f8e5e02c2012..8e26eec36299 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message.service.ts
@@ -58,13 +58,14 @@ export class MessagingMessageService {
       });
 
       if (existingMessage) {
-        await messageChannelMessageAssociationRepository.insert(
+        await messageChannelMessageAssociationRepository.upsert(
           {
             messageChannelId,
             messageId: existingMessage.id,
             messageExternalId: message.externalId,
             messageThreadExternalId: message.messageThreadExternalId,
           },
+          ['messageChannelId', 'messageExternalId'],
           transactionManager,
         );
 
diff --git a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-person.listener.ts b/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-person.listener.ts
index e12f96c77b90..c1b66b2995fd 100644
--- a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-person.listener.ts
+++ b/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-person.listener.ts
@@ -1,5 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
+import { OnDatabaseBatchEvent } from 'src/engine/api/graphql/graphql-query-runner/decorators/on-database-batch-event.decorator';
+import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
 import { ObjectRecordCreateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-create.event';
 import { ObjectRecordUpdateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-update.event';
 import { objectRecordChangedProperties as objectRecordUpdateEventChangedProperties } from 'src/engine/core-modules/event-emitter/utils/object-record-changed-properties.util';
@@ -16,8 +18,6 @@ import {
   MessageParticipantUnmatchParticipantJobData,
 } from 'src/modules/messaging/message-participant-manager/jobs/message-participant-unmatch-participant.job';
 import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/person.workspace-entity';
-import { OnDatabaseBatchEvent } from 'src/engine/api/graphql/graphql-query-runner/decorators/on-database-batch-event.decorator';
-import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
 
 @Injectable()
 export class MessageParticipantPersonListener {
diff --git a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-workspace-member.listener.ts b/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-workspace-member.listener.ts
index e3655c9b2736..913ec59c4454 100644
--- a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-workspace-member.listener.ts
+++ b/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-workspace-member.listener.ts
@@ -1,18 +1,18 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
+import { WorkspaceActivationStatus } from 'twenty-shared';
 import { Repository } from 'typeorm';
 
-import {
-  Workspace,
-  WorkspaceActivationStatus,
-} from 'src/engine/core-modules/workspace/workspace.entity';
+import { OnDatabaseBatchEvent } from 'src/engine/api/graphql/graphql-query-runner/decorators/on-database-batch-event.decorator';
+import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
 import { ObjectRecordCreateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-create.event';
 import { ObjectRecordUpdateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-update.event';
 import { objectRecordChangedProperties as objectRecordUpdateEventChangedProperties } from 'src/engine/core-modules/event-emitter/utils/object-record-changed-properties.util';
 import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event.type';
 import {
   MessageParticipantMatchParticipantJob,
@@ -23,9 +23,6 @@ import {
   MessageParticipantUnmatchParticipantJobData,
 } from 'src/modules/messaging/message-participant-manager/jobs/message-participant-unmatch-participant.job';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
-import { OnDatabaseBatchEvent } from 'src/engine/api/graphql/graphql-query-runner/decorators/on-database-batch-event.decorator';
-import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
-
 @Injectable()
 export class MessageParticipantWorkspaceMemberListener {
   constructor(
diff --git a/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.job.ts b/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.job.ts
index 65e6bf9c42ed..a4654f14d71a 100644
--- a/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.job.ts
+++ b/packages/twenty-server/src/modules/messaging/monitoring/crons/jobs/messaging-message-channel-sync-status-monitoring.cron.job.ts
@@ -2,6 +2,7 @@ import { Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 
 import snakeCase from 'lodash.snakecase';
+import { WorkspaceActivationStatus } from 'twenty-shared';
 import { Repository } from 'typeorm';
 
 import { SentryCronMonitor } from 'src/engine/core-modules/cron/sentry-cron-monitor.decorator';
@@ -9,10 +10,7 @@ import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handl
 import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
 import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
-import {
-  Workspace,
-  WorkspaceActivationStatus,
-} from 'src/engine/core-modules/workspace/workspace.entity';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import { MessageChannelWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
 import { MessagingTelemetryService } from 'src/modules/messaging/monitoring/services/messaging-telemetry.service';
@@ -42,8 +40,6 @@ export class MessagingMessageChannelSyncStatusMonitoringCronJob {
   async handle(): Promise<void> {
     this.logger.log('Starting message channel sync status monitoring...');
 
-    console.time('MessagingMessageChannelSyncStatusMonitoringCronJob time');
-
     await this.messagingTelemetryService.track({
       eventName: 'message_channel.monitoring.sync_status.start',
       message: 'Starting message channel sync status monitoring',
@@ -88,7 +84,5 @@ export class MessagingMessageChannelSyncStatusMonitoringCronJob {
         });
       }
     }
-
-    console.timeEnd('MessagingMessageChannelSyncStatusMonitoringCronJob time');
   }
 }
diff --git a/packages/twenty-server/src/modules/note/standard-objects/note.workspace-entity.ts b/packages/twenty-server/src/modules/note/standard-objects/note.workspace-entity.ts
index 2b51ae509fef..bff384c2d757 100644
--- a/packages/twenty-server/src/modules/note/standard-objects/note.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/note/standard-objects/note.workspace-entity.ts
@@ -1,3 +1,5 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
 import { SEARCH_VECTOR_FIELD } from 'src/engine/metadata-modules/constants/search-vector-field.constants';
@@ -5,7 +7,6 @@ import {
   ActorMetadata,
   FieldActorSource,
 } from 'src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { IndexType } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity';
 import {
   RelationMetadataType,
diff --git a/packages/twenty-server/src/modules/opportunity/standard-objects/opportunity.workspace-entity.ts b/packages/twenty-server/src/modules/opportunity/standard-objects/opportunity.workspace-entity.ts
index 791c1af4a2c7..a3038d2bae2a 100644
--- a/packages/twenty-server/src/modules/opportunity/standard-objects/opportunity.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/opportunity/standard-objects/opportunity.workspace-entity.ts
@@ -1,3 +1,5 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
 import { SEARCH_VECTOR_FIELD } from 'src/engine/metadata-modules/constants/search-vector-field.constants';
@@ -6,7 +8,6 @@ import {
   FieldActorSource,
 } from 'src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type';
 import { CurrencyMetadata } from 'src/engine/metadata-modules/field-metadata/composite-types/currency.composite-type';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { IndexType } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity';
 import {
   RelationMetadataType,
diff --git a/packages/twenty-server/src/modules/person/standard-objects/person.workspace-entity.ts b/packages/twenty-server/src/modules/person/standard-objects/person.workspace-entity.ts
index 68122a1a649d..9ba4c3139f89 100644
--- a/packages/twenty-server/src/modules/person/standard-objects/person.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/person/standard-objects/person.workspace-entity.ts
@@ -1,3 +1,5 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
 import { SEARCH_VECTOR_FIELD } from 'src/engine/metadata-modules/constants/search-vector-field.constants';
@@ -9,7 +11,6 @@ import { EmailsMetadata } from 'src/engine/metadata-modules/field-metadata/compo
 import { FullNameMetadata } from 'src/engine/metadata-modules/field-metadata/composite-types/full-name.composite-type';
 import { LinksMetadata } from 'src/engine/metadata-modules/field-metadata/composite-types/links.composite-type';
 import { PhonesMetadata } from 'src/engine/metadata-modules/field-metadata/composite-types/phones.composite-type';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { IndexType } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity';
 import {
   RelationMetadataType,
diff --git a/packages/twenty-server/src/modules/task/standard-objects/task.workspace-entity.ts b/packages/twenty-server/src/modules/task/standard-objects/task.workspace-entity.ts
index ff3b83e6c07b..73557f8067fb 100644
--- a/packages/twenty-server/src/modules/task/standard-objects/task.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/task/standard-objects/task.workspace-entity.ts
@@ -1,3 +1,5 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
 import { SEARCH_VECTOR_FIELD } from 'src/engine/metadata-modules/constants/search-vector-field.constants';
@@ -5,7 +7,6 @@ import {
   ActorMetadata,
   FieldActorSource,
 } from 'src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { IndexType } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity';
 import {
   RelationMetadataType,
diff --git a/packages/twenty-server/src/modules/timeline/jobs/create-audit-log-from-internal-event.ts b/packages/twenty-server/src/modules/timeline/jobs/create-audit-log-from-internal-event.ts
index e94f293188c3..7d6c8c04f74d 100644
--- a/packages/twenty-server/src/modules/timeline/jobs/create-audit-log-from-internal-event.ts
+++ b/packages/twenty-server/src/modules/timeline/jobs/create-audit-log-from-internal-event.ts
@@ -1,4 +1,4 @@
-import { ObjectRecordBaseEvent } from 'src/engine/core-modules/event-emitter/types/object-record.base.event';
+import { ObjectRecordEvent } from 'src/engine/core-modules/event-emitter/types/object-record-event.event';
 import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
 import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
@@ -20,7 +20,7 @@ export class CreateAuditLogFromInternalEvent {
 
   @Process(CreateAuditLogFromInternalEvent.name)
   async handle(
-    workspaceEventBatch: WorkspaceEventBatch<ObjectRecordBaseEvent>,
+    workspaceEventBatch: WorkspaceEventBatch<ObjectRecordEvent>,
   ): Promise<void> {
     for (const eventData of workspaceEventBatch.events) {
       let workspaceMemberId: string | null = null;
@@ -34,16 +34,14 @@ export class CreateAuditLogFromInternalEvent {
         workspaceMemberId = workspaceMember.id;
       }
 
-      if (eventData.properties.diff) {
-        // we remove "before" and "after" property for a cleaner/slimmer event payload
-        eventData.properties = {
-          diff: eventData.properties.diff,
-        };
-      }
-
       await this.auditLogRepository.insert(
         workspaceEventBatch.name,
-        eventData.properties,
+        'diff' in eventData.properties
+          ? {
+              // we remove "before" and "after" property for a cleaner/slimmer event payload
+              diff: eventData.properties.diff,
+            }
+          : eventData.properties,
         workspaceMemberId,
         workspaceEventBatch.name.split('.')[0],
         eventData.objectMetadata.id,
diff --git a/packages/twenty-server/src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job.ts b/packages/twenty-server/src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job.ts
index b321ff02c129..00be0d5f69a6 100644
--- a/packages/twenty-server/src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job.ts
+++ b/packages/twenty-server/src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job.ts
@@ -1,4 +1,4 @@
-import { ObjectRecordBaseEvent } from 'src/engine/core-modules/event-emitter/types/object-record.base.event';
+import { ObjectRecordNonDestructiveEvent } from 'src/engine/core-modules/event-emitter/types/object-record-non-destructive-event';
 import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
 import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
@@ -7,7 +7,6 @@ import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/wo
 import { TimelineActivityService } from 'src/modules/timeline/services/timeline-activity.service';
 import { WorkspaceMemberRepository } from 'src/modules/workspace-member/repositories/workspace-member.repository';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
-import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-objects/timeline-activity.workspace-entity';
 
 @Processor(MessageQueue.entityEventsToDbQueue)
 export class UpsertTimelineActivityFromInternalEvent {
@@ -19,9 +18,7 @@ export class UpsertTimelineActivityFromInternalEvent {
 
   @Process(UpsertTimelineActivityFromInternalEvent.name)
   async handle(
-    workspaceEventBatch: WorkspaceEventBatch<
-      ObjectRecordBaseEvent<TimelineActivityWorkspaceEntity>
-    >,
+    workspaceEventBatch: WorkspaceEventBatch<ObjectRecordNonDestructiveEvent>,
   ): Promise<void> {
     for (const eventData of workspaceEventBatch.events) {
       if (eventData.userId) {
@@ -33,13 +30,6 @@ export class UpsertTimelineActivityFromInternalEvent {
         eventData.workspaceMemberId = workspaceMember.id;
       }
 
-      if (eventData.properties.diff) {
-        // we remove "before" and "after" property for a cleaner/slimmer event payload
-        eventData.properties = {
-          diff: eventData.properties.diff,
-        };
-      }
-
       // Temporary
       // We ignore every that is not a LinkedObject or a Business Object
       if (
@@ -51,7 +41,16 @@ export class UpsertTimelineActivityFromInternalEvent {
       }
 
       await this.timelineActivityService.upsertEvent({
-        event: eventData,
+        event:
+          // we remove "before" and "after" property for a cleaner/slimmer event payload
+          'diff' in eventData.properties && eventData.properties.diff
+            ? {
+                ...eventData,
+                properties: {
+                  diff: eventData.properties.diff,
+                },
+              }
+            : eventData,
         eventName: workspaceEventBatch.name,
         workspaceId: workspaceEventBatch.workspaceId,
       });
diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
index 001516dc4d40..34ba7a35d2ac 100644
--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
@@ -1,19 +1,20 @@
 import { Injectable } from '@nestjs/common';
 
+import { ObjectRecordNonDestructiveEvent } from 'src/engine/core-modules/event-emitter/types/object-record-non-destructive-event';
 import { ObjectRecordBaseEvent } from 'src/engine/core-modules/event-emitter/types/object-record.base.event';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
 import { TimelineActivityRepository } from 'src/modules/timeline/repositiories/timeline-activity.repository';
 import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-objects/timeline-activity.workspace-entity';
 
-type TimelineActivity =
-  ObjectRecordBaseEvent<TimelineActivityWorkspaceEntity> & {
-    name: string;
-    objectName?: string;
-    linkedRecordCachedName?: string;
-    linkedRecordId?: string;
-    linkedObjectMetadataId?: string;
-  };
+type TimelineActivity = Omit<ObjectRecordNonDestructiveEvent, 'properties'> & {
+  name: string;
+  objectName?: string;
+  linkedRecordCachedName?: string;
+  linkedRecordId?: string;
+  linkedObjectMetadataId?: string;
+  properties: Record<string, any>; // more relaxed conditions than for internal events
+};
 
 @Injectable()
 export class TimelineActivityService {
@@ -33,7 +34,7 @@ export class TimelineActivityService {
     eventName,
     workspaceId,
   }: {
-    event: ObjectRecordBaseEvent<TimelineActivityWorkspaceEntity>;
+    event: ObjectRecordBaseEvent;
     eventName: string;
     workspaceId: string;
   }) {
@@ -65,7 +66,7 @@ export class TimelineActivityService {
     workspaceId,
     eventName,
   }: {
-    event: ObjectRecordBaseEvent<TimelineActivityWorkspaceEntity>;
+    event: ObjectRecordBaseEvent;
     workspaceId: string;
     eventName: string;
   }): Promise<TimelineActivity[] | undefined> {
@@ -78,7 +79,10 @@ export class TimelineActivityService {
 
       // 2 timelines, one for the linked object and one for the task/note
       if (linkedTimelineActivities && linkedTimelineActivities?.length > 0)
-        return [...linkedTimelineActivities, { ...event, name: eventName }];
+        return [
+          ...linkedTimelineActivities,
+          { ...event, name: eventName },
+        ] satisfies TimelineActivity[];
     }
 
     if (
@@ -93,7 +97,7 @@ export class TimelineActivityService {
       });
     }
 
-    return [{ ...event, name: eventName }];
+    return [{ ...event, name: eventName }] satisfies TimelineActivity[];
   }
 
   private async getLinkedTimelineActivities({
@@ -101,7 +105,7 @@ export class TimelineActivityService {
     workspaceId,
     eventName,
   }: {
-    event: ObjectRecordBaseEvent<TimelineActivityWorkspaceEntity>;
+    event: ObjectRecordBaseEvent;
     workspaceId: string;
     eventName: string;
   }): Promise<TimelineActivity[] | undefined> {
@@ -146,7 +150,7 @@ export class TimelineActivityService {
     eventName,
     workspaceId,
   }: {
-    event: ObjectRecordBaseEvent<TimelineActivityWorkspaceEntity>;
+    event: ObjectRecordBaseEvent;
     dataSourceSchema: string;
     activityType: string;
     eventName: string;
@@ -195,7 +199,7 @@ export class TimelineActivityService {
           linkedRecordCachedName: activity[0].title,
           linkedRecordId: activity[0].id,
           linkedObjectMetadataId: event.objectMetadata.id,
-        } as TimelineActivity;
+        } satisfies TimelineActivity;
       })
       .filter((event): event is TimelineActivity => event !== undefined);
   }
@@ -207,7 +211,7 @@ export class TimelineActivityService {
     eventName,
     workspaceId,
   }: {
-    event: ObjectRecordBaseEvent<TimelineActivityWorkspaceEntity>;
+    event: ObjectRecordBaseEvent;
     dataSourceSchema: string;
     activityType: string;
     eventName: string;
@@ -258,7 +262,7 @@ export class TimelineActivityService {
         linkedRecordCachedName: activity[0].title,
         linkedRecordId: activity[0].id,
         linkedObjectMetadataId: activityObjectMetadataId,
-      } as TimelineActivity,
+      } satisfies TimelineActivity,
     ];
   }
 }
diff --git a/packages/twenty-server/src/modules/timeline/standard-objects/audit-log.workspace-entity.ts b/packages/twenty-server/src/modules/timeline/standard-objects/audit-log.workspace-entity.ts
index 8de2edb58317..b826e675ec86 100644
--- a/packages/twenty-server/src/modules/timeline/standard-objects/audit-log.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/timeline/standard-objects/audit-log.workspace-entity.ts
@@ -1,6 +1,7 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
diff --git a/packages/twenty-server/src/modules/timeline/standard-objects/behavioral-event.workspace-entity.ts b/packages/twenty-server/src/modules/timeline/standard-objects/behavioral-event.workspace-entity.ts
index d5ed28db764e..496c9ab9804a 100644
--- a/packages/twenty-server/src/modules/timeline/standard-objects/behavioral-event.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/timeline/standard-objects/behavioral-event.workspace-entity.ts
@@ -1,5 +1,6 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
 import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
diff --git a/packages/twenty-server/src/modules/timeline/standard-objects/timeline-activity.workspace-entity.ts b/packages/twenty-server/src/modules/timeline/standard-objects/timeline-activity.workspace-entity.ts
index 1a3c95e5f41f..e1f9839dced4 100644
--- a/packages/twenty-server/src/modules/timeline/standard-objects/timeline-activity.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/timeline/standard-objects/timeline-activity.workspace-entity.ts
@@ -1,14 +1,13 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { CustomWorkspaceEntity } from 'src/engine/twenty-orm/custom.workspace-entity';
 import { WorkspaceDynamicRelation } from 'src/engine/twenty-orm/decorators/workspace-dynamic-relation.decorator';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
 import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
-import { WorkspaceGate } from 'src/engine/twenty-orm/decorators/workspace-gate.decorator';
 import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
 import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
 import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
@@ -197,16 +196,10 @@ export class TimelineActivityWorkspaceEntity extends BaseWorkspaceEntity {
     inverseSideTarget: () => WorkflowWorkspaceEntity,
     inverseSideFieldKey: 'timelineActivities',
   })
-  @WorkspaceGate({
-    featureFlag: FeatureFlagKey.IsWorkflowEnabled,
-  })
   @WorkspaceIsNullable()
   workflow: Relation<WorkflowWorkspaceEntity> | null;
 
   @WorkspaceJoinColumn('workflow')
-  @WorkspaceGate({
-    featureFlag: FeatureFlagKey.IsWorkflowEnabled,
-  })
   workflowId: string | null;
 
   @WorkspaceRelation({
@@ -218,16 +211,10 @@ export class TimelineActivityWorkspaceEntity extends BaseWorkspaceEntity {
     inverseSideTarget: () => WorkflowVersionWorkspaceEntity,
     inverseSideFieldKey: 'timelineActivities',
   })
-  @WorkspaceGate({
-    featureFlag: FeatureFlagKey.IsWorkflowEnabled,
-  })
   @WorkspaceIsNullable()
   workflowVersion: Relation<WorkflowVersionWorkspaceEntity> | null;
 
   @WorkspaceJoinColumn('workflowVersion')
-  @WorkspaceGate({
-    featureFlag: FeatureFlagKey.IsWorkflowEnabled,
-  })
   workflowVersionId: string | null;
 
   @WorkspaceRelation({
@@ -239,16 +226,10 @@ export class TimelineActivityWorkspaceEntity extends BaseWorkspaceEntity {
     inverseSideTarget: () => WorkflowRunWorkspaceEntity,
     inverseSideFieldKey: 'timelineActivities',
   })
-  @WorkspaceGate({
-    featureFlag: FeatureFlagKey.IsWorkflowEnabled,
-  })
   @WorkspaceIsNullable()
   workflowRun: Relation<WorkflowRunWorkspaceEntity> | null;
 
   @WorkspaceJoinColumn('workflowRun')
-  @WorkspaceGate({
-    featureFlag: FeatureFlagKey.IsWorkflowEnabled,
-  })
   workflowRunId: string | null;
 
   @WorkspaceDynamicRelation({
diff --git a/packages/twenty-server/src/modules/view/services/view.service.ts b/packages/twenty-server/src/modules/view/services/view.service.ts
index 92044d999c0d..2535cbf028a2 100644
--- a/packages/twenty-server/src/modules/view/services/view.service.ts
+++ b/packages/twenty-server/src/modules/view/services/view.service.ts
@@ -3,6 +3,7 @@ import { Injectable, Logger } from '@nestjs/common';
 import { isDefined } from 'class-validator';
 import isEmpty from 'lodash.isempty';
 
+import { AGGREGATE_OPERATIONS } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 
 @Injectable()
@@ -120,4 +121,26 @@ export class ViewService {
       })
       .then((views) => views.map((view) => view.id));
   }
+
+  async resetKanbanAggregateOperationByFieldMetadataId({
+    workspaceId,
+    fieldMetadataId,
+  }: {
+    workspaceId: string;
+    fieldMetadataId: string;
+  }) {
+    const viewRepository =
+      await this.twentyORMGlobalManager.getRepositoryForWorkspace(
+        workspaceId,
+        'view',
+      );
+
+    await viewRepository.update(
+      { kanbanAggregateOperationFieldMetadataId: fieldMetadataId },
+      {
+        kanbanAggregateOperationFieldMetadataId: null,
+        kanbanAggregateOperation: AGGREGATE_OPERATIONS.count,
+      },
+    );
+  }
 }
diff --git a/packages/twenty-server/src/modules/view/standard-objects/view-field.workspace-entity.ts b/packages/twenty-server/src/modules/view/standard-objects/view-field.workspace-entity.ts
index 9f34ac24321b..60b8ed12e11c 100644
--- a/packages/twenty-server/src/modules/view/standard-objects/view-field.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/view/standard-objects/view-field.workspace-entity.ts
@@ -1,9 +1,9 @@
 import { registerEnumType } from '@nestjs/graphql';
 
 import { Relation } from 'typeorm';
+import { FieldMetadataType } from 'twenty-shared';
 
 import { AGGREGATE_OPERATIONS } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
diff --git a/packages/twenty-server/src/modules/view/standard-objects/view-filter-group.workspace-entity.ts b/packages/twenty-server/src/modules/view/standard-objects/view-filter-group.workspace-entity.ts
index b501478a318b..af9d9bab0069 100644
--- a/packages/twenty-server/src/modules/view/standard-objects/view-filter-group.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/view/standard-objects/view-filter-group.workspace-entity.ts
@@ -1,6 +1,6 @@
 import { Relation } from 'typeorm';
+import { FieldMetadataType } from 'twenty-shared';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
diff --git a/packages/twenty-server/src/modules/view/standard-objects/view-filter.workspace-entity.ts b/packages/twenty-server/src/modules/view/standard-objects/view-filter.workspace-entity.ts
index 1d2f33546e27..266b07280364 100644
--- a/packages/twenty-server/src/modules/view/standard-objects/view-filter.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/view/standard-objects/view-filter.workspace-entity.ts
@@ -1,6 +1,7 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
diff --git a/packages/twenty-server/src/modules/view/standard-objects/view-group.workspace-entity.ts b/packages/twenty-server/src/modules/view/standard-objects/view-group.workspace-entity.ts
index 6f7780da4cb9..1f0d25ec1c01 100644
--- a/packages/twenty-server/src/modules/view/standard-objects/view-group.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/view/standard-objects/view-group.workspace-entity.ts
@@ -1,4 +1,5 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
+
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
diff --git a/packages/twenty-server/src/modules/view/standard-objects/view-sort.workspace-entity.ts b/packages/twenty-server/src/modules/view/standard-objects/view-sort.workspace-entity.ts
index 09eb870e9453..32bb1c857985 100644
--- a/packages/twenty-server/src/modules/view/standard-objects/view-sort.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/view/standard-objects/view-sort.workspace-entity.ts
@@ -1,6 +1,7 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
diff --git a/packages/twenty-server/src/modules/view/standard-objects/view.workspace-entity.ts b/packages/twenty-server/src/modules/view/standard-objects/view.workspace-entity.ts
index 06fd46286343..cfab0c8657f4 100644
--- a/packages/twenty-server/src/modules/view/standard-objects/view.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/view/standard-objects/view.workspace-entity.ts
@@ -1,7 +1,8 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
 import { AGGREGATE_OPERATIONS } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   RelationMetadataType,
   RelationOnDeleteAction,
diff --git a/packages/twenty-server/src/modules/webhook/jobs/call-webhook-jobs.job.ts b/packages/twenty-server/src/modules/webhook/jobs/call-webhook-jobs.job.ts
index 20c7c78802d1..929581ae9ce1 100644
--- a/packages/twenty-server/src/modules/webhook/jobs/call-webhook-jobs.job.ts
+++ b/packages/twenty-server/src/modules/webhook/jobs/call-webhook-jobs.job.ts
@@ -2,19 +2,19 @@ import { Logger } from '@nestjs/common';
 
 import { ArrayContains } from 'typeorm';
 
+import { ObjectRecordEvent } from 'src/engine/core-modules/event-emitter/types/object-record-event.event';
 import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
 import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
 import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
-import { WebhookWorkspaceEntity } from 'src/modules/webhook/standard-objects/webhook.workspace-entity';
-import { ObjectRecordBaseEvent } from 'src/engine/core-modules/event-emitter/types/object-record.base.event';
 import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event.type';
 import {
   CallWebhookJob,
   CallWebhookJobData,
 } from 'src/modules/webhook/jobs/call-webhook.job';
+import { WebhookWorkspaceEntity } from 'src/modules/webhook/standard-objects/webhook.workspace-entity';
 import { removeSecretFromWebhookRecord } from 'src/utils/remove-secret-from-webhook-record';
 
 @Processor(MessageQueue.webhookQueue)
@@ -29,7 +29,7 @@ export class CallWebhookJobsJob {
 
   @Process(CallWebhookJobsJob.name)
   async handle(
-    workspaceEventBatch: WorkspaceEventBatch<ObjectRecordBaseEvent>,
+    workspaceEventBatch: WorkspaceEventBatch<ObjectRecordEvent>,
   ): Promise<void> {
     // If you change that function, double check it does not break Zapier
     // trigger in packages/twenty-zapier/src/triggers/trigger_record.ts
@@ -60,8 +60,16 @@ export class CallWebhookJobsJob {
         nameSingular: eventData.objectMetadata.nameSingular,
       };
       const workspaceId = workspaceEventBatch.workspaceId;
-      const record = eventData.properties.after || eventData.properties.before;
-      const updatedFields = eventData.properties.updatedFields;
+      const record =
+        'after' in eventData.properties
+          ? eventData.properties.after
+          : 'before' in eventData.properties
+            ? eventData.properties.before
+            : {};
+      const updatedFields =
+        'updatedFields' in eventData.properties
+          ? eventData.properties.updatedFields
+          : undefined;
 
       const isWebhookEvent = nameSingular === 'webhook';
       const sanitizedRecord = removeSecretFromWebhookRecord(
diff --git a/packages/twenty-server/src/modules/webhook/standard-objects/webhook.workspace-entity.ts b/packages/twenty-server/src/modules/webhook/standard-objects/webhook.workspace-entity.ts
index ee55e07da21d..47183c3a0cff 100644
--- a/packages/twenty-server/src/modules/webhook/standard-objects/webhook.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/webhook/standard-objects/webhook.workspace-entity.ts
@@ -1,4 +1,5 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
+
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
 import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
diff --git a/packages/twenty-server/src/modules/workflow/common/commands/seed-workflow-views.command.ts b/packages/twenty-server/src/modules/workflow/common/commands/seed-workflow-views.command.ts
deleted file mode 100644
index 62e969630b25..000000000000
--- a/packages/twenty-server/src/modules/workflow/common/commands/seed-workflow-views.command.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-import { Logger } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Command } from 'nest-commander';
-import { Repository } from 'typeorm';
-import { v4 } from 'uuid';
-
-import {
-  ActiveWorkspacesCommandOptions,
-  ActiveWorkspacesCommandRunner,
-} from 'src/database/commands/active-workspaces.command';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
-
-@Command({
-  name: 'workflow:seed:views',
-  description: 'Seed workflow views for workspace.',
-})
-export class SeedWorkflowViewsCommand extends ActiveWorkspacesCommandRunner {
-  protected readonly logger: Logger;
-
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    @InjectRepository(ObjectMetadataEntity, 'metadata')
-    private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
-
-    @InjectRepository(FieldMetadataEntity, 'metadata')
-    private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
-    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
-  ) {
-    super(workspaceRepository);
-    this.logger = new Logger(this.constructor.name);
-  }
-
-  async executeActiveWorkspacesCommand(
-    _passedParam: string[],
-    _options: ActiveWorkspacesCommandOptions,
-    _workspaceIds: string[],
-  ): Promise<void> {
-    const { dryRun } = _options;
-
-    for (const workspaceId of _workspaceIds) {
-      await this.execute(workspaceId, dryRun);
-    }
-  }
-
-  private async execute(workspaceId: string, dryRun = false): Promise<void> {
-    this.logger.log(`Seeding workflow views for workspace: ${workspaceId}`);
-
-    const workflowViewId = await this.seedView(
-      workspaceId,
-      'workflow',
-      'All Workflows',
-    );
-
-    await this.seedView(
-      workspaceId,
-      'workflowVersion',
-      'All Workflow Versions',
-    );
-
-    await this.seedView(workspaceId, 'workflowRun', 'All Workflow Runs');
-
-    const favoriteRepository =
-      await this.twentyORMGlobalManager.getRepositoryForWorkspace(
-        workspaceId,
-        'favorite',
-      );
-
-    const existingFavorites = await favoriteRepository.find({
-      where: {
-        viewId: workflowViewId,
-      },
-    });
-
-    if (existingFavorites.length > 0) {
-      this.logger.log(
-        `Favorite already exists for view: ${existingFavorites[0].id}`,
-      );
-
-      return;
-    }
-
-    if (dryRun) {
-      this.logger.log(`Dry run: Creating favorite for view: ${workflowViewId}`);
-
-      return;
-    }
-
-    await favoriteRepository.insert({
-      viewId: workflowViewId,
-      position: 5,
-    });
-  }
-
-  private async seedView(
-    workspaceId: string,
-    nameSingular: string,
-    viewName: string,
-    dryRun = false,
-  ): Promise<string> {
-    const objectMetadata = (
-      await this.objectMetadataRepository.find({
-        where: { workspaceId, nameSingular },
-      })
-    )?.[0];
-
-    if (!objectMetadata) {
-      throw new Error(`Object metadata not found: ${nameSingular}`);
-    }
-
-    const fieldMetadataName = (
-      await this.fieldMetadataRepository.find({
-        where: {
-          workspaceId,
-          objectMetadataId: objectMetadata.id,
-          name: 'name',
-        },
-      })
-    )?.[0];
-
-    if (!fieldMetadataName) {
-      throw new Error(
-        `Field metadata not found for ${objectMetadata.id}: name`,
-      );
-    }
-
-    const viewRepository =
-      await this.twentyORMGlobalManager.getRepositoryForWorkspace(
-        workspaceId,
-        'view',
-      );
-
-    const viewFieldRepository =
-      await this.twentyORMGlobalManager.getRepositoryForWorkspace(
-        workspaceId,
-        'viewField',
-      );
-
-    const viewId = v4();
-
-    const existingViews = await viewRepository.find({
-      where: {
-        objectMetadataId: objectMetadata.id,
-        name: viewName,
-      },
-    });
-
-    if (existingViews.length > 0) {
-      this.logger.log(`View already exists: ${existingViews[0].id}`);
-
-      return existingViews[0].id;
-    }
-
-    if (dryRun) {
-      this.logger.log(`Dry run: Creating view: ${viewName}`);
-
-      return viewId;
-    }
-
-    await viewRepository.insert({
-      id: viewId,
-      name: viewName,
-      objectMetadataId: objectMetadata.id,
-      type: 'table',
-      key: 'INDEX',
-      position: 0,
-      icon: 'IconSettingsAutomation',
-      kanbanFieldMetadataId: '',
-    });
-
-    await viewFieldRepository.insert({
-      fieldMetadataId: fieldMetadataName.id,
-      position: 0,
-      isVisible: true,
-      size: 210,
-      viewId: viewId,
-    });
-
-    return viewId;
-  }
-}
diff --git a/packages/twenty-server/src/modules/workflow/common/commands/workflow-command.module.ts b/packages/twenty-server/src/modules/workflow/common/commands/workflow-command.module.ts
deleted file mode 100644
index 08389b824d7f..000000000000
--- a/packages/twenty-server/src/modules/workflow/common/commands/workflow-command.module.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { SeedWorkflowViewsCommand } from 'src/modules/workflow/common/commands/seed-workflow-views.command';
-
-@Module({
-  imports: [
-    TypeOrmModule.forFeature([Workspace], 'core'),
-    TypeOrmModule.forFeature(
-      [ObjectMetadataEntity, FieldMetadataEntity],
-      'metadata',
-    ),
-  ],
-  providers: [SeedWorkflowViewsCommand],
-  exports: [SeedWorkflowViewsCommand],
-})
-export class WorkflowCommandModule {}
diff --git a/packages/twenty-server/src/modules/workflow/common/standard-objects/workflow-event-listener.workspace-entity.ts b/packages/twenty-server/src/modules/workflow/common/standard-objects/workflow-event-listener.workspace-entity.ts
index 32aa8aeb5a6a..57a41f0d226f 100644
--- a/packages/twenty-server/src/modules/workflow/common/standard-objects/workflow-event-listener.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/workflow/common/standard-objects/workflow-event-listener.workspace-entity.ts
@@ -1,12 +1,11 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
 import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
-import { WorkspaceGate } from 'src/engine/twenty-orm/decorators/workspace-gate.decorator';
 import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
 import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
 import { WorkspaceJoinColumn } from 'src/engine/twenty-orm/decorators/workspace-join-column.decorator';
@@ -26,9 +25,6 @@ import { WorkflowWorkspaceEntity } from 'src/modules/workflow/common/standard-ob
   labelIdentifierStandardId:
     WORKFLOW_EVENT_LISTENER_STANDARD_FIELD_IDS.eventName,
 })
-@WorkspaceGate({
-  featureFlag: FeatureFlagKey.IsWorkflowEnabled,
-})
 @WorkspaceIsSystem()
 export class WorkflowEventListenerWorkspaceEntity extends BaseWorkspaceEntity {
   @WorkspaceField({
diff --git a/packages/twenty-server/src/modules/workflow/common/standard-objects/workflow-run.workspace-entity.ts b/packages/twenty-server/src/modules/workflow/common/standard-objects/workflow-run.workspace-entity.ts
index f14716ee9509..48e0f13cab7f 100644
--- a/packages/twenty-server/src/modules/workflow/common/standard-objects/workflow-run.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/workflow/common/standard-objects/workflow-run.workspace-entity.ts
@@ -1,11 +1,11 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import {
   ActorMetadata,
   FieldActorSource,
 } from 'src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   RelationMetadataType,
   RelationOnDeleteAction,
@@ -13,7 +13,6 @@ import {
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
 import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
-import { WorkspaceGate } from 'src/engine/twenty-orm/decorators/workspace-gate.decorator';
 import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
 import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
 import { WorkspaceJoinColumn } from 'src/engine/twenty-orm/decorators/workspace-join-column.decorator';
@@ -58,9 +57,6 @@ export type WorkflowRunOutput = {
   labelIdentifierStandardId: WORKFLOW_RUN_STANDARD_FIELD_IDS.name,
   icon: STANDARD_OBJECT_ICONS.workflowRun,
 })
-@WorkspaceGate({
-  featureFlag: FeatureFlagKey.IsWorkflowEnabled,
-})
 export class WorkflowRunWorkspaceEntity extends BaseWorkspaceEntity {
   @WorkspaceField({
     standardId: WORKFLOW_RUN_STANDARD_FIELD_IDS.name,
diff --git a/packages/twenty-server/src/modules/workflow/common/standard-objects/workflow-version.workspace-entity.ts b/packages/twenty-server/src/modules/workflow/common/standard-objects/workflow-version.workspace-entity.ts
index 46cd739a7b59..cdac25e797ab 100644
--- a/packages/twenty-server/src/modules/workflow/common/standard-objects/workflow-version.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/workflow/common/standard-objects/workflow-version.workspace-entity.ts
@@ -1,8 +1,8 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import { FieldMetadataComplexOption } from 'src/engine/metadata-modules/field-metadata/dtos/options.input';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
   RelationMetadataType,
   RelationOnDeleteAction,
@@ -10,7 +10,6 @@ import {
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
 import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
-import { WorkspaceGate } from 'src/engine/twenty-orm/decorators/workspace-gate.decorator';
 import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
 import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
 import { WorkspaceJoinColumn } from 'src/engine/twenty-orm/decorators/workspace-join-column.decorator';
@@ -68,9 +67,6 @@ const WorkflowVersionStatusOptions: FieldMetadataComplexOption[] = [
   icon: STANDARD_OBJECT_ICONS.workflowVersion,
   labelIdentifierStandardId: WORKFLOW_VERSION_STANDARD_FIELD_IDS.name,
 })
-@WorkspaceGate({
-  featureFlag: FeatureFlagKey.IsWorkflowEnabled,
-})
 export class WorkflowVersionWorkspaceEntity extends BaseWorkspaceEntity {
   @WorkspaceField({
     standardId: WORKFLOW_VERSION_STANDARD_FIELD_IDS.name,
diff --git a/packages/twenty-server/src/modules/workflow/common/standard-objects/workflow.workspace-entity.ts b/packages/twenty-server/src/modules/workflow/common/standard-objects/workflow.workspace-entity.ts
index 2f8b20361904..5314a2d4ae7a 100644
--- a/packages/twenty-server/src/modules/workflow/common/standard-objects/workflow.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/workflow/common/standard-objects/workflow.workspace-entity.ts
@@ -1,11 +1,12 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
 import {
   ActorMetadata,
   FieldActorSource,
 } from 'src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataComplexOption } from 'src/engine/metadata-modules/field-metadata/dtos/options.input';
 import {
   RelationMetadataType,
   RelationOnDeleteAction,
@@ -13,7 +14,6 @@ import {
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
 import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
-import { WorkspaceGate } from 'src/engine/twenty-orm/decorators/workspace-gate.decorator';
 import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
 import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
 import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
@@ -25,7 +25,6 @@ import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-o
 import { WorkflowEventListenerWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-event-listener.workspace-entity';
 import { WorkflowRunWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-run.workspace-entity';
 import { WorkflowVersionWorkspaceEntity } from 'src/modules/workflow/common/standard-objects/workflow-version.workspace-entity';
-import { FieldMetadataComplexOption } from 'src/engine/metadata-modules/field-metadata/dtos/options.input';
 
 export enum WorkflowStatus {
   DRAFT = 'DRAFT',
@@ -64,9 +63,6 @@ const WorkflowStatusOptions: FieldMetadataComplexOption[] = [
   shortcut: 'W',
   labelIdentifierStandardId: WORKFLOW_STANDARD_FIELD_IDS.name,
 })
-@WorkspaceGate({
-  featureFlag: FeatureFlagKey.IsWorkflowEnabled,
-})
 export class WorkflowWorkspaceEntity extends BaseWorkspaceEntity {
   @WorkspaceField({
     standardId: WORKFLOW_STANDARD_FIELD_IDS.name,
diff --git a/packages/twenty-server/src/modules/workflow/common/workflow-common.module.ts b/packages/twenty-server/src/modules/workflow/common/workflow-common.module.ts
index 7d0f0c7c623b..26905f9e482c 100644
--- a/packages/twenty-server/src/modules/workflow/common/workflow-common.module.ts
+++ b/packages/twenty-server/src/modules/workflow/common/workflow-common.module.ts
@@ -2,18 +2,16 @@ import { Module } from '@nestjs/common';
 
 import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
 
-import { WorkflowCommandModule } from 'src/modules/workflow/common/commands/workflow-command.module';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
+import { ServerlessFunctionModule } from 'src/engine/metadata-modules/serverless-function/serverless-function.module';
 import { WorkflowQueryHookModule } from 'src/modules/workflow/common/query-hooks/workflow-query-hook.module';
 import { WorkflowCommonWorkspaceService } from 'src/modules/workflow/common/workspace-services/workflow-common.workspace-service';
 import { WorkflowVersionStepWorkspaceService } from 'src/modules/workflow/common/workspace-services/workflow-version-step.workspace-service';
 import { WorkflowBuilderModule } from 'src/modules/workflow/workflow-builder/workflow-builder.module';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { ServerlessFunctionModule } from 'src/engine/metadata-modules/serverless-function/serverless-function.module';
 
 @Module({
   imports: [
     WorkflowQueryHookModule,
-    WorkflowCommandModule,
     WorkflowBuilderModule,
     ServerlessFunctionModule,
     NestjsQueryTypeOrmModule.forFeature([ObjectMetadataEntity], 'metadata'),
diff --git a/packages/twenty-server/src/modules/workflow/common/workspace-services/workflow-version-step.workspace-service.ts b/packages/twenty-server/src/modules/workflow/common/workspace-services/workflow-version-step.workspace-service.ts
index 544cb38d8196..aeb849aa3387 100644
--- a/packages/twenty-server/src/modules/workflow/common/workspace-services/workflow-version-step.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/common/workspace-services/workflow-version-step.workspace-service.ts
@@ -92,7 +92,7 @@ export class WorkflowVersionStepWorkspaceService {
                 isLeaf: true,
                 icon: 'IconVariable',
                 tab: 'test',
-                label: 'Generate Function Input',
+                label: 'Generate Function Output',
               },
               _outputSchemaType: 'LINK',
             },
@@ -198,37 +198,27 @@ export class WorkflowVersionStepWorkspaceService {
     step: WorkflowAction;
     workspaceId: string;
   }): Promise<WorkflowAction> {
-    const newStepId = v4();
-
     switch (step.type) {
       case WorkflowActionType.CODE: {
-        const copiedServerlessFunction =
-          await this.serverlessFunctionService.copyOneServerlessFunction({
-            serverlessFunctionToCopyId:
-              step.settings.input.serverlessFunctionId,
-            serverlessFunctionToCopyVersion:
-              step.settings.input.serverlessFunctionVersion,
-            workspaceId,
-          });
+        await this.serverlessFunctionService.usePublishedVersionAsDraft({
+          id: step.settings.input.serverlessFunctionId,
+          version: step.settings.input.serverlessFunctionVersion,
+          workspaceId,
+        });
 
         return {
           ...step,
-          id: newStepId,
           settings: {
             ...step.settings,
             input: {
               ...step.settings.input,
-              serverlessFunctionId: copiedServerlessFunction.id,
-              serverlessFunctionVersion: copiedServerlessFunction.latestVersion,
+              serverlessFunctionVersion: 'draft',
             },
           },
         };
       }
       default: {
-        return {
-          ...step,
-          id: newStepId,
-        };
+        return step;
       }
     }
   }
@@ -473,17 +463,6 @@ export class WorkflowVersionStepWorkspaceService {
 
     assertWorkflowVersionIsDraft(draftWorkflowVersion);
 
-    if (Array.isArray(draftWorkflowVersion.steps)) {
-      await Promise.all(
-        draftWorkflowVersion.steps.map((step) =>
-          this.runWorkflowVersionStepDeletionSideEffects({
-            step,
-            workspaceId,
-          }),
-        ),
-      );
-    }
-
     const newWorkflowVersionTrigger = workflowVersionToCopy.trigger;
     const newWorkflowVersionSteps: WorkflowAction[] = [];
 
@@ -500,6 +479,8 @@ export class WorkflowVersionStepWorkspaceService {
       steps: newWorkflowVersionSteps,
       trigger: newWorkflowVersionTrigger,
     });
+
+    return draftWorkflowVersion.id;
   }
 
   private async runWorkflowVersionStepDeletionSideEffects({
@@ -511,11 +492,16 @@ export class WorkflowVersionStepWorkspaceService {
   }) {
     switch (step.type) {
       case WorkflowActionType.CODE: {
-        await this.serverlessFunctionService.deleteOneServerlessFunction({
-          id: step.settings.input.serverlessFunctionId,
-          workspaceId,
-        });
-
+        if (
+          !(await this.serverlessFunctionService.hasServerlessFunctionPublishedVersion(
+            step.settings.input.serverlessFunctionId,
+          ))
+        ) {
+          await this.serverlessFunctionService.deleteOneServerlessFunction({
+            id: step.settings.input.serverlessFunctionId,
+            workspaceId,
+          });
+        }
         break;
       }
     }
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/types/input-schema.type.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/types/input-schema.type.ts
index cb826df524ab..26d54a485ff8 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/types/input-schema.type.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/types/input-schema.type.ts
@@ -1,4 +1,4 @@
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
 
 export type InputSchemaPropertyType =
   | 'string'
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/utils/generate-fake-object-record-event.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/utils/generate-fake-object-record-event.ts
index 0f297482b4cd..e7362cc3db4f 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/utils/generate-fake-object-record-event.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/utils/generate-fake-object-record-event.ts
@@ -49,7 +49,7 @@ export const generateFakeObjectRecordEvent = (
       properties: {
         isLeaf: false,
         value: { after: { isLeaf: false, value: after, label: 'After' } },
-        label: 'Properties',
+        label: 'Record fields',
       },
     };
   }
@@ -65,7 +65,7 @@ export const generateFakeObjectRecordEvent = (
           before: { isLeaf: false, value: before, label: 'Before' },
           after: { isLeaf: false, value: after, label: 'After' },
         },
-        label: 'Properties',
+        label: 'Record fields',
       },
     };
   }
@@ -78,7 +78,7 @@ export const generateFakeObjectRecordEvent = (
         value: {
           before: { isLeaf: false, value: before, label: 'Before' },
         },
-        label: 'Properties',
+        label: 'Record fields',
       },
     };
   }
@@ -91,7 +91,7 @@ export const generateFakeObjectRecordEvent = (
         value: {
           before: { isLeaf: false, value: before, label: 'Before' },
         },
-        label: 'Properties',
+        label: 'Record fields',
       },
     };
   }
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/utils/generate-fake-object-record.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/utils/generate-fake-object-record.ts
index 945f8a3e0e32..c1e0142c356b 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/utils/generate-fake-object-record.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/utils/generate-fake-object-record.ts
@@ -25,7 +25,7 @@ const generateObjectRecordFields = (
           type: field.type,
           icon: field.icon,
           label: field.label,
-          value: generateFakeValue(field.type),
+          value: generateFakeValue(field.type, 'FieldMetadataType'),
         };
       } else {
         acc[field.name] = {
@@ -37,7 +37,7 @@ const generateObjectRecordFields = (
               isLeaf: true,
               type: property.type,
               label: camelToTitleCase(property.name),
-              value: generateFakeValue(property.type),
+              value: generateFakeValue(property.type, 'FieldMetadataType'),
             };
 
             return acc;
diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/utils/should-generate-field-fake-value.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/utils/should-generate-field-fake-value.ts
index 37ce8c022cdb..fe36a9f363cf 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-builder/utils/should-generate-field-fake-value.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-builder/utils/should-generate-field-fake-value.ts
@@ -1,7 +1,6 @@
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
+
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 
 export const shouldGenerateFieldFakeValue = (field: FieldMetadataEntity) => {
   return (
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/exceptions/send-email-action.exception.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/exceptions/send-email-action.exception.ts
index 18eb09486193..346749425264 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/exceptions/send-email-action.exception.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/exceptions/send-email-action.exception.ts
@@ -10,4 +10,5 @@ export class SendEmailActionException extends CustomException {
 export enum SendEmailActionExceptionCode {
   PROVIDER_NOT_SUPPORTED = 'PROVIDER_NOT_SUPPORTED',
   CONNECTED_ACCOUNT_NOT_FOUND = 'CONNECTED_ACCOUNT_NOT_FOUND',
+  INVALID_EMAIL = 'INVALID_EMAIL',
 }
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/send-email.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/send-email.workflow-action.ts
index 917d0766c67a..01003b30f49e 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/send-email.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/mail-sender/send-email.workflow-action.ts
@@ -80,47 +80,44 @@ export class SendEmailWorkflowAction implements WorkflowAction {
     );
     const { email, body, subject } = workflowActionInput;
 
-    try {
-      const emailSchema = z.string().trim().email('Invalid email');
-
-      const result = emailSchema.safeParse(email);
-
-      if (!result.success) {
-        this.logger.warn(`Email '${email}' invalid`);
-
-        return { result: { success: false } };
-      }
-
-      const window = new JSDOM('').window;
-      const purify = DOMPurify(window);
-      const safeBody = purify.sanitize(body || '');
-      const safeSubject = purify.sanitize(subject || '');
-
-      const message = [
-        `To: ${email}`,
-        `Subject: ${safeSubject || ''}`,
-        'MIME-Version: 1.0',
-        'Content-Type: text/plain; charset="UTF-8"',
-        '',
-        safeBody,
-      ].join('\n');
-
-      const encodedMessage = Buffer.from(message).toString('base64');
-
-      await emailProvider.users.messages.send({
-        userId: 'me',
-        requestBody: {
-          raw: encodedMessage,
-        },
-      });
-
-      this.logger.log(`Email sent successfully`);
-
-      return {
-        result: { success: true } satisfies WorkflowSendEmailStepOutputSchema,
-      };
-    } catch (error) {
-      return { error };
+    const emailSchema = z.string().trim().email('Invalid email');
+
+    const result = emailSchema.safeParse(email);
+
+    if (!result.success) {
+      throw new SendEmailActionException(
+        `Email '${email}' invalid`,
+        SendEmailActionExceptionCode.INVALID_EMAIL,
+      );
     }
+
+    const window = new JSDOM('').window;
+    const purify = DOMPurify(window);
+    const safeBody = purify.sanitize(body || '');
+    const safeSubject = purify.sanitize(subject || '');
+
+    const message = [
+      `To: ${email}`,
+      `Subject: ${safeSubject || ''}`,
+      'MIME-Version: 1.0',
+      'Content-Type: text/plain; charset="UTF-8"',
+      '',
+      safeBody,
+    ].join('\n');
+
+    const encodedMessage = Buffer.from(message).toString('base64');
+
+    await emailProvider.users.messages.send({
+      userId: 'me',
+      requestBody: {
+        raw: encodedMessage,
+      },
+    });
+
+    this.logger.log(`Email sent successfully`);
+
+    return {
+      result: { success: true } satisfies WorkflowSendEmailStepOutputSchema,
+    };
   }
 }
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workspace-services/workflow-executor.workspace-service.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workspace-services/workflow-executor.workspace-service.ts
index a64f8bd6ad8e..bc2655d7ae1d 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workspace-services/workflow-executor.workspace-service.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workspace-services/workflow-executor.workspace-service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 
 import {
   WorkflowRunOutput,
@@ -6,6 +6,7 @@ import {
 } from 'src/modules/workflow/common/standard-objects/workflow-run.workspace-entity';
 import { WorkflowActionFactory } from 'src/modules/workflow/workflow-executor/factories/workflow-action.factory';
 import { resolveInput } from 'src/modules/workflow/workflow-executor/utils/variable-resolver.util';
+import { WorkflowActionResult } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action-result.type';
 import { WorkflowAction } from 'src/modules/workflow/workflow-executor/workflow-actions/types/workflow-action.type';
 
 const MAX_RETRIES_ON_FAILURE = 3;
@@ -17,6 +18,7 @@ export type WorkflowExecutorOutput = {
 
 @Injectable()
 export class WorkflowExecutorWorkspaceService {
+  private readonly logger = new Logger(WorkflowExecutorWorkspaceService.name);
   constructor(private readonly workflowActionFactory: WorkflowActionFactory) {}
 
   async execute({
@@ -42,7 +44,19 @@ export class WorkflowExecutorWorkspaceService {
 
     const actionPayload = resolveInput(step.settings.input, context);
 
-    const result = await workflowAction.execute(actionPayload);
+    let result: WorkflowActionResult;
+
+    try {
+      result = await workflowAction.execute(actionPayload);
+    } catch (error) {
+      result = {
+        error: {
+          errorType: error.name,
+          errorMessage: error.message,
+          stackTrace: error.stack,
+        },
+      };
+    }
 
     const stepOutput = output.steps[step.id];
 
diff --git a/packages/twenty-server/src/modules/workflow/workflow-runner/jobs/run-workflow.job.ts b/packages/twenty-server/src/modules/workflow/workflow-runner/jobs/run-workflow.job.ts
index f6069bf3f940..cb8fd1f522e3 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-runner/jobs/run-workflow.job.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-runner/jobs/run-workflow.job.ts
@@ -1,4 +1,4 @@
-import { Scope } from '@nestjs/common';
+import { Logger, Scope } from '@nestjs/common';
 
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
@@ -23,6 +23,7 @@ export type RunWorkflowJobData = {
 
 @Processor({ queueName: MessageQueue.workflowQueue, scope: Scope.REQUEST })
 export class RunWorkflowJob {
+  private readonly logger = new Logger(RunWorkflowJob.name);
   constructor(
     private readonly workflowCommonWorkspaceService: WorkflowCommonWorkspaceService,
     private readonly workflowExecutorWorkspaceService: WorkflowExecutorWorkspaceService,
@@ -39,36 +40,47 @@ export class RunWorkflowJob {
   }: RunWorkflowJobData): Promise<void> {
     await this.workflowRunWorkspaceService.startWorkflowRun(workflowRunId);
 
-    const workflowVersion =
-      await this.workflowCommonWorkspaceService.getWorkflowVersionOrFail(
-        workflowVersionId,
-      );
+    try {
+      const workflowVersion =
+        await this.workflowCommonWorkspaceService.getWorkflowVersionOrFail(
+          workflowVersionId,
+        );
+
+      await this.throttleExecution(workflowVersion.workflowId);
 
-    await this.throttleExecution(workflowVersion.workflowId, workflowRunId);
+      const { steps, status } =
+        await this.workflowExecutorWorkspaceService.execute({
+          currentStepIndex: 0,
+          steps: workflowVersion.steps || [],
+          context: {
+            trigger: payload,
+          },
+          output: {
+            steps: {},
+            status: WorkflowRunStatus.RUNNING,
+          },
+        });
 
-    const { steps, status } =
-      await this.workflowExecutorWorkspaceService.execute({
-        currentStepIndex: 0,
-        steps: workflowVersion.steps || [],
-        context: {
-          trigger: payload,
+      await this.workflowRunWorkspaceService.endWorkflowRun(
+        workflowRunId,
+        status,
+        {
+          steps,
         },
-        output: {
+      );
+    } catch (error) {
+      await this.workflowRunWorkspaceService.endWorkflowRun(
+        workflowRunId,
+        WorkflowRunStatus.FAILED,
+        {
           steps: {},
-          status: WorkflowRunStatus.RUNNING,
+          error: error.message,
         },
-      });
-
-    await this.workflowRunWorkspaceService.endWorkflowRun(
-      workflowRunId,
-      status,
-      {
-        steps,
-      },
-    );
+      );
+    }
   }
 
-  private async throttleExecution(workflowId: string, workflowRunId: string) {
+  private async throttleExecution(workflowId: string) {
     try {
       await this.throttlerService.throttle(
         `${workflowId}-workflow-execution`,
@@ -76,14 +88,6 @@ export class RunWorkflowJob {
         this.environmentService.get('WORKFLOW_EXEC_THROTTLE_TTL'),
       );
     } catch (error) {
-      await this.workflowRunWorkspaceService.endWorkflowRun(
-        workflowRunId,
-        WorkflowRunStatus.FAILED,
-        {
-          steps: {},
-          error: 'Workflow execution rate limit exceeded',
-        },
-      );
       throw new WorkflowRunException(
         'Workflow execution rate limit exceeded',
         WorkflowRunExceptionCode.WORKFLOW_RUN_LIMIT_REACHED,
diff --git a/packages/twenty-server/src/modules/workflow/workflow-status/jobs/workflow-statuses-update.job.ts b/packages/twenty-server/src/modules/workflow/workflow-status/jobs/workflow-statuses-update.job.ts
index 365b3e16b9d0..467fd090072a 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-status/jobs/workflow-statuses-update.job.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-status/jobs/workflow-statuses-update.job.ts
@@ -161,26 +161,30 @@ export class WorkflowStatusesUpdateJob {
         const newStep = { ...step };
 
         if (step.type === WorkflowActionType.CODE) {
-          let serverlessFunction;
-
           try {
-            serverlessFunction =
-              await this.serverlessFunctionService.publishOneServerlessFunction(
-                step.settings.input.serverlessFunctionId,
-                workspaceId,
-              );
+            await this.serverlessFunctionService.publishOneServerlessFunction(
+              step.settings.input.serverlessFunctionId,
+              workspaceId,
+            );
           } catch (e) {
-            serverlessFunction = null;
+            // publishOneServerlessFunction throws if no change have been
+            // applied between draft and lastPublished version.
+            // If no change have been applied, we just use the same
+            // serverless function version
           }
 
-          if (serverlessFunction) {
-            const newStepSettings = { ...step.settings };
+          const serverlessFunction =
+            await this.serverlessFunctionService.findOneOrFail({
+              id: step.settings.input.serverlessFunctionId,
+              workspaceId,
+            });
 
-            newStepSettings.input.serverlessFunctionVersion =
-              serverlessFunction.latestVersion;
+          const newStepSettings = { ...step.settings };
 
-            newStep.settings = newStepSettings;
-          }
+          newStepSettings.input.serverlessFunctionVersion =
+            serverlessFunction.latestVersion;
+
+          newStep.settings = newStepSettings;
         }
         newSteps.push(newStep);
       }
diff --git a/packages/twenty-server/src/modules/workspace-member/standard-objects/workspace-member.workspace-entity.ts b/packages/twenty-server/src/modules/workspace-member/standard-objects/workspace-member.workspace-entity.ts
index 5e6e87069b3d..4e39f9ff8a73 100644
--- a/packages/twenty-server/src/modules/workspace-member/standard-objects/workspace-member.workspace-entity.ts
+++ b/packages/twenty-server/src/modules/workspace-member/standard-objects/workspace-member.workspace-entity.ts
@@ -1,10 +1,11 @@
 import { registerEnumType } from '@nestjs/graphql';
 
+import { FieldMetadataType } from 'twenty-shared';
+
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';
 
 import { SEARCH_VECTOR_FIELD } from 'src/engine/metadata-modules/constants/search-vector-field.constants';
 import { FullNameMetadata } from 'src/engine/metadata-modules/field-metadata/composite-types/full-name.composite-type';
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { IndexType } from 'src/engine/metadata-modules/index-metadata/index-metadata.entity';
 import {
   RelationMetadataType,
diff --git a/packages/twenty-server/src/utils/date/isDate.ts b/packages/twenty-server/src/utils/date/isDate.ts
new file mode 100644
index 000000000000..8c2b80f47f84
--- /dev/null
+++ b/packages/twenty-server/src/utils/date/isDate.ts
@@ -0,0 +1,3 @@
+export const isDate = (date: any): date is Date => {
+  return date instanceof Date;
+};
diff --git a/packages/twenty-server/src/utils/date/isValidDate.ts b/packages/twenty-server/src/utils/date/isValidDate.ts
new file mode 100644
index 000000000000..9f1775243024
--- /dev/null
+++ b/packages/twenty-server/src/utils/date/isValidDate.ts
@@ -0,0 +1,3 @@
+export const isValidDate = (date: any): date is Date => {
+  return date instanceof Date && !isNaN(date.getTime());
+};
diff --git a/packages/twenty-server/src/utils/is-work-email.ts b/packages/twenty-server/src/utils/is-work-email.ts
index f5f8c3b75bf8..edc3fade7c4c 100644
--- a/packages/twenty-server/src/utils/is-work-email.ts
+++ b/packages/twenty-server/src/utils/is-work-email.ts
@@ -8,3 +8,7 @@ export const isWorkEmail = (email: string) => {
     return false;
   }
 };
+
+export const isWorkDomain = (domain: string) => {
+  return !emailProvidersSet.has(domain);
+};
diff --git a/packages/twenty-server/test/integration/billing/suites/billing-controller.integration-spec.ts b/packages/twenty-server/test/integration/billing/suites/billing-controller.integration-spec.ts
new file mode 100644
index 000000000000..b5b74fb90ea2
--- /dev/null
+++ b/packages/twenty-server/test/integration/billing/suites/billing-controller.integration-spec.ts
@@ -0,0 +1,112 @@
+import request from 'supertest';
+import { createMockStripeEntitlementUpdatedData } from 'test/integration/billing/utils/create-mock-stripe-entitlement-updated-data.util';
+import { createMockStripePriceCreatedData } from 'test/integration/billing/utils/create-mock-stripe-price-created-data.util';
+import { createMockStripeProductUpdatedData } from 'test/integration/billing/utils/create-mock-stripe-product-updated-data.util';
+import { createMockStripeSubscriptionCreatedData } from 'test/integration/billing/utils/create-mock-stripe-subscription-created-data.util';
+
+const client = request(`http://localhost:${APP_PORT}`);
+
+describe('BillingController (integration)', () => {
+  it('should handle product.updated and price.created webhook events', async () => {
+    const productUpdatedPayload = {
+      type: 'product.updated',
+      data: createMockStripeProductUpdatedData(),
+    };
+    const priceCreatedPayload = {
+      type: 'price.created',
+      data: createMockStripePriceCreatedData(),
+    };
+
+    await client
+      .post('/billing/webhooks')
+      .set('Authorization', `Bearer ${ACCESS_TOKEN}`)
+      .set('stripe-signature', 'correct-signature')
+      .set('Content-Type', 'application/json')
+      .send(JSON.stringify(productUpdatedPayload))
+      .expect(200)
+      .then((res) => {
+        expect(res.body.stripeProductId).toBeDefined();
+      });
+
+    await client
+      .post('/billing/webhooks')
+      .set('Authorization', `Bearer ${ACCESS_TOKEN}`)
+      .set('stripe-signature', 'correct-signature')
+      .set('Content-Type', 'application/json')
+      .send(JSON.stringify(priceCreatedPayload))
+      .expect(200)
+      .then((res) => {
+        expect(res.body.stripePriceId).toBeDefined();
+        expect(res.body.stripeMeterId).toBeDefined();
+      });
+  });
+  it('should handle subscription.created webhook event', async () => {
+    const subscriptionCreatedPayload = {
+      type: 'customer.subscription.created',
+      data: createMockStripeSubscriptionCreatedData(),
+    };
+    const entitlementUpdatedPayload = {
+      type: 'entitlements.active_entitlement_summary.updated',
+      data: createMockStripeEntitlementUpdatedData(),
+    };
+
+    await client
+      .post('/billing/webhooks')
+      .set('Authorization', `Bearer ${ACCESS_TOKEN}`)
+      .set('stripe-signature', 'correct-signature')
+      .set('Content-Type', 'application/json')
+      .send(JSON.stringify(subscriptionCreatedPayload))
+      .expect(200)
+      .then((res) => {
+        expect(res.body.stripeSubscriptionId).toBeDefined();
+        expect(res.body.stripeCustomerId).toBeDefined();
+      });
+
+    await client
+      .post('/billing/webhooks')
+      .set('Authorization', `Bearer ${ACCESS_TOKEN}`)
+      .set('stripe-signature', 'correct-signature')
+      .set('Content-Type', 'application/json')
+      .send(JSON.stringify(entitlementUpdatedPayload))
+      .expect(200)
+      .then((res) => {
+        expect(res.body.stripeEntitlementCustomerId).toBeDefined();
+      });
+  });
+
+  it('should handle entitlements.active_entitlement_summary.updated when the subscription is not found', async () => {
+    const entitlementUpdatedPayload = {
+      type: 'entitlements.active_entitlement_summary.updated',
+      data: createMockStripeEntitlementUpdatedData({
+        customer: 'new_customer',
+      }),
+    };
+
+    await client
+      .post('/billing/webhooks')
+      .set('Authorization', `Bearer ${ACCESS_TOKEN}`)
+      .set('stripe-signature', 'correct-signature')
+      .set('Content-Type', 'application/json')
+      .send(JSON.stringify(entitlementUpdatedPayload))
+      .expect(404);
+  });
+
+  it('should reject webhook with invalid signature', async () => {
+    const entitlementUpdatedPayload = {
+      type: 'customer.entitlement.created',
+      data: {
+        object: {
+          id: 'ent_test123',
+        },
+      },
+    };
+
+    await client
+      .post('/billing/webhooks')
+      .set('Authorization', `Bearer ${ACCESS_TOKEN}`)
+      .set('stripe-signature', 'invalid-signature')
+      .set('Content-Type', 'application/json')
+      .send(JSON.stringify(entitlementUpdatedPayload))
+      .expect(500);
+  });
+});
diff --git a/packages/twenty-server/test/integration/billing/utils/create-mock-stripe-entitlement-updated-data.util.ts b/packages/twenty-server/test/integration/billing/utils/create-mock-stripe-entitlement-updated-data.util.ts
new file mode 100644
index 000000000000..1a7e8b7f6f0b
--- /dev/null
+++ b/packages/twenty-server/test/integration/billing/utils/create-mock-stripe-entitlement-updated-data.util.ts
@@ -0,0 +1,25 @@
+import Stripe from 'stripe';
+export const createMockStripeEntitlementUpdatedData = (
+  overrides = {},
+): Stripe.EntitlementsActiveEntitlementSummaryUpdatedEvent.Data => ({
+  object: {
+    object: 'entitlements.active_entitlement_summary',
+    customer: 'cus_default1',
+    livemode: false,
+    entitlements: {
+      object: 'list',
+      data: [
+        {
+          id: 'ent_test_61',
+          object: 'entitlements.active_entitlement',
+          feature: 'feat_test_61',
+          livemode: false,
+          lookup_key: 'SSO',
+        },
+      ],
+      has_more: false,
+      url: '/v1/customer/cus_Q/entitlements',
+    },
+    ...overrides,
+  },
+});
diff --git a/packages/twenty-server/test/integration/billing/utils/create-mock-stripe-price-created-data.util.ts b/packages/twenty-server/test/integration/billing/utils/create-mock-stripe-price-created-data.util.ts
new file mode 100644
index 000000000000..65890e8c8dd4
--- /dev/null
+++ b/packages/twenty-server/test/integration/billing/utils/create-mock-stripe-price-created-data.util.ts
@@ -0,0 +1,34 @@
+import Stripe from 'stripe';
+export const createMockStripePriceCreatedData = (
+  overrides = {},
+): Stripe.PriceCreatedEvent.Data => ({
+  object: {
+    id: 'price_1Q',
+    object: 'price',
+    active: true,
+    billing_scheme: 'per_unit',
+    created: 1733734326,
+    currency: 'usd',
+    custom_unit_amount: null,
+    livemode: false,
+    lookup_key: null,
+    metadata: {},
+    nickname: null,
+    product: 'prod_RLN',
+    recurring: {
+      aggregate_usage: null,
+      interval: 'month',
+      interval_count: 1,
+      meter: null,
+      trial_period_days: null,
+      usage_type: 'licensed',
+    },
+    tax_behavior: 'unspecified',
+    tiers_mode: null,
+    transform_quantity: null,
+    type: 'recurring',
+    unit_amount: 0,
+    unit_amount_decimal: '0',
+    ...overrides,
+  },
+});
diff --git a/packages/twenty-server/test/integration/billing/utils/create-mock-stripe-product-updated-data.util.ts b/packages/twenty-server/test/integration/billing/utils/create-mock-stripe-product-updated-data.util.ts
new file mode 100644
index 000000000000..b65f70da15b8
--- /dev/null
+++ b/packages/twenty-server/test/integration/billing/utils/create-mock-stripe-product-updated-data.util.ts
@@ -0,0 +1,32 @@
+import Stripe from 'stripe';
+
+export const createMockStripeProductUpdatedData = (
+  overrides = {},
+): Stripe.ProductUpdatedEvent.Data => ({
+  object: {
+    id: 'prod_RLN',
+    object: 'product',
+    active: true,
+    created: 1733410584,
+    default_price: null,
+    description: null,
+    images: [],
+    livemode: false,
+    marketing_features: [],
+    metadata: {},
+    name: 'kjnnjkjknkjnjkn',
+    package_dimensions: null,
+    shippable: null,
+    statement_descriptor: null,
+    tax_code: 'txcd_10103001',
+    type: 'service',
+    unit_label: null,
+    updated: 1734694649,
+    url: null,
+  },
+  previous_attributes: {
+    default_price: 'price_1Q',
+    updated: 1733410585,
+  },
+  ...overrides,
+});
diff --git a/packages/twenty-server/test/integration/billing/utils/create-mock-stripe-subscription-created-data.util.ts b/packages/twenty-server/test/integration/billing/utils/create-mock-stripe-subscription-created-data.util.ts
new file mode 100644
index 000000000000..e95a0a542494
--- /dev/null
+++ b/packages/twenty-server/test/integration/billing/utils/create-mock-stripe-subscription-created-data.util.ts
@@ -0,0 +1,130 @@
+import Stripe from 'stripe';
+
+export const createMockStripeSubscriptionCreatedData = (
+  overrides = {},
+): Stripe.CustomerSubscriptionCreatedEvent.Data => ({
+  object: {
+    object: 'subscription',
+    id: 'sub_default',
+    customer: 'cus_default1',
+    status: 'active',
+    items: {
+      data: [
+        {
+          plan: {
+            id: 'plan_default',
+            object: 'plan',
+            active: true,
+            aggregate_usage: null,
+            amount_decimal: '0',
+            billing_scheme: 'per_unit',
+            interval_count: 1,
+            livemode: false,
+            nickname: null,
+            tiers_mode: null,
+            transform_usage: null,
+            trial_period_days: null,
+            interval: 'month',
+            currency: 'usd',
+            amount: 0,
+            created: 1672531200,
+            product: 'prod_default',
+            usage_type: 'licensed',
+            metadata: {},
+            meter: null,
+          },
+          id: '',
+          object: 'subscription_item',
+          billing_thresholds: null,
+          created: 0,
+          discounts: [],
+          metadata: {},
+          price: {
+            id: 'price_default',
+            object: 'price',
+            active: true,
+            billing_scheme: 'per_unit',
+            created: 1672531200,
+            currency: 'usd',
+            custom_unit_amount: null,
+            livemode: false,
+            lookup_key: null,
+            metadata: {},
+            nickname: null,
+            product: 'prod_default',
+            recurring: {
+              aggregate_usage: null,
+              interval: 'month',
+              interval_count: 1,
+              meter: null,
+              trial_period_days: null,
+              usage_type: 'licensed',
+            },
+            tax_behavior: null,
+            tiers_mode: null,
+            transform_quantity: null,
+            type: 'recurring',
+            unit_amount: 1000,
+            unit_amount_decimal: '1000',
+          },
+          subscription: '',
+          tax_rates: null,
+        },
+      ],
+      object: 'list',
+      has_more: false,
+      url: '',
+    },
+    cancel_at_period_end: false,
+    currency: 'usd',
+    current_period_end: 1672531200,
+    current_period_start: 1672531200,
+    metadata: { workspaceId: '3b8e6458-5fc1-4e63-8563-008ccddaa6db' },
+    trial_end: null,
+    trial_start: null,
+    canceled_at: null,
+    ...overrides,
+    application: null,
+    application_fee_percent: null,
+    automatic_tax: {
+      enabled: true,
+      liability: {
+        type: 'self',
+      },
+    },
+    billing_cycle_anchor: 0,
+    billing_cycle_anchor_config: null,
+    billing_thresholds: null,
+    cancel_at: null,
+    cancellation_details: null,
+    collection_method: 'charge_automatically',
+    created: 0,
+    days_until_due: null,
+    default_payment_method: null,
+    default_source: null,
+    description: null,
+    discount: null,
+    discounts: [],
+    ended_at: null,
+    invoice_settings: {
+      account_tax_ids: null,
+      issuer: {
+        type: 'self',
+      },
+    },
+    latest_invoice: null,
+    livemode: false,
+    next_pending_invoice_item_invoice: null,
+    on_behalf_of: null,
+    pause_collection: null,
+    payment_settings: null,
+    pending_invoice_item_interval: null,
+    pending_setup_intent: null,
+    pending_update: null,
+    schedule: null,
+    start_date: 0,
+    test_clock: null,
+    transfer_data: null,
+    trial_settings: null,
+  },
+});
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/create-one-field-metadata.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/field-metadata/create-one-field-metadata.integration-spec.ts
index ee0fbe2e7fed..e4a29aef152a 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/create-one-field-metadata.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/create-one-field-metadata.integration-spec.ts
@@ -2,8 +2,7 @@ import { createOneFieldMetadataFactory } from 'test/integration/metadata/suites/
 import { createListingCustomObject } from 'test/integration/metadata/suites/object-metadata/utils/create-test-object-metadata.util';
 import { deleteOneObjectMetadataItem } from 'test/integration/metadata/suites/object-metadata/utils/delete-one-object-metadata.util';
 import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
-
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
 
 describe('createOne', () => {
   describe('FieldMetadataService name/label sync', () => {
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/delete-one-field-metadata.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/field-metadata/delete-one-field-metadata.integration-spec.ts
new file mode 100644
index 000000000000..ec5db32925e0
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/delete-one-field-metadata.integration-spec.ts
@@ -0,0 +1,121 @@
+import { createOneOperationFactory } from 'test/integration/graphql/utils/create-one-operation-factory.util';
+import { deleteOneOperationFactory } from 'test/integration/graphql/utils/delete-one-operation-factory.util';
+import { findOneOperationFactory } from 'test/integration/graphql/utils/find-one-operation-factory.util';
+import { makeGraphqlAPIRequest } from 'test/integration/graphql/utils/make-graphql-api-request.util';
+import { createCustomTextFieldMetadata } from 'test/integration/metadata/suites/field-metadata/utils/create-custom-text-field-metadata.util';
+import { deleteOneFieldMetadataItemFactory } from 'test/integration/metadata/suites/field-metadata/utils/delete-one-field-metadata-factory.util';
+import { updateOneFieldMetadataFactory } from 'test/integration/metadata/suites/field-metadata/utils/update-one-field-metadata-factory.util';
+import { createListingCustomObject } from 'test/integration/metadata/suites/object-metadata/utils/create-test-object-metadata.util';
+import { deleteOneObjectMetadataItem } from 'test/integration/metadata/suites/object-metadata/utils/delete-one-object-metadata.util';
+import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
+
+describe('deleteOne', () => {
+  describe('Kanban aggregate operation', () => {
+    let listingObjectId = '';
+    let testFieldId = '';
+    let viewId = '';
+
+    beforeEach(async () => {
+      const { objectMetadataId: createdObjectId } =
+        await createListingCustomObject();
+
+      listingObjectId = createdObjectId;
+      const { fieldMetadataId: createdFieldMetadaId } =
+        await createCustomTextFieldMetadata(createdObjectId);
+
+      testFieldId = createdFieldMetadaId;
+
+      // create view
+      const graphqlOperation = createOneOperationFactory({
+        objectMetadataSingularName: 'View',
+        gqlFields: `
+          id
+          kanbanAggregateOperationFieldMetadataId
+          kanbanAggregateOperation
+        `,
+        data: {
+          kanbanAggregateOperationFieldMetadataId: testFieldId,
+          kanbanAggregateOperation: 'MAX',
+          objectMetadataId: listingObjectId,
+          name: 'By Type',
+          type: 'kanban',
+          icon: 'IconLayoutKanban',
+        },
+      });
+
+      const response = await makeGraphqlAPIRequest(graphqlOperation);
+
+      const createdView = response.body.data.createView;
+
+      viewId = createdView.id;
+    });
+    afterEach(async () => {
+      // delete view
+      const deleteViewOperation = deleteOneOperationFactory({
+        objectMetadataSingularName: 'View',
+        gqlFields: 'id',
+        recordId: viewId,
+      });
+
+      await makeGraphqlAPIRequest(deleteViewOperation);
+      await deleteOneObjectMetadataItem(listingObjectId);
+    });
+    it('should reset kanban aggregate operation when deleting a field used as kanbanAggregateOperationFieldMetadataId', async () => {
+      // Arrange
+      // 1. Check that view has expcted kanbanAggregateOperationFieldMetadataId and kanbanAggregateOperation
+      const findViewOperation = findOneOperationFactory({
+        objectMetadataSingularName: 'view',
+        gqlFields: `
+          id
+          kanbanAggregateOperationFieldMetadataId
+          kanbanAggregateOperation
+        `,
+        filter: {
+          id: {
+            eq: viewId,
+          },
+        },
+      });
+
+      const viewResponse = await makeGraphqlAPIRequest(findViewOperation);
+
+      expect(
+        viewResponse.body.data.view.kanbanAggregateOperationFieldMetadataId,
+      ).toBe(testFieldId);
+      expect(viewResponse.body.data.view.kanbanAggregateOperation).toBe('MAX');
+
+      // Deactivate field to be able to delete it after
+      const deactivateFieldOperation = updateOneFieldMetadataFactory({
+        input: { id: testFieldId, update: { isActive: false } },
+        gqlFields: `
+              id
+              isActive
+          `,
+      });
+
+      await makeMetadataAPIRequest(deactivateFieldOperation);
+
+      // Act
+      const graphqlOperation = deleteOneFieldMetadataItemFactory({
+        idToDelete: testFieldId,
+      });
+      const response = await makeMetadataAPIRequest(graphqlOperation);
+
+      // Assert
+      // 1. Field is deleted
+      expect(response.body.data.deleteOneField.id).toBe(testFieldId);
+
+      // 2. Kanban aggregate operation has been reset on view using this field as kanbanAggregateOperationFieldMetadataId
+      const updatedViewResponse =
+        await makeGraphqlAPIRequest(findViewOperation);
+
+      expect(
+        updatedViewResponse.body.data.view
+          .kanbanAggregateOperationFieldMetadataId,
+      ).toBeNull();
+      expect(updatedViewResponse.body.data.view.kanbanAggregateOperation).toBe(
+        'COUNT',
+      );
+    });
+  });
+});
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/update-one-field-metadata.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/field-metadata/update-one-field-metadata.integration-spec.ts
index 2989f8ea4132..fc20c7907bc7 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/update-one-field-metadata.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/update-one-field-metadata.integration-spec.ts
@@ -1,4 +1,4 @@
-import { createTestTextFieldMetadata } from 'test/integration/metadata/suites/field-metadata/utils/create-test-field-metadata.util';
+import { createCustomTextFieldMetadata } from 'test/integration/metadata/suites/field-metadata/utils/create-custom-text-field-metadata.util';
 import { deleteFieldMetadata } from 'test/integration/metadata/suites/field-metadata/utils/delete-one-field-metadata.util';
 import { updateOneFieldMetadataFactory } from 'test/integration/metadata/suites/field-metadata/utils/update-one-field-metadata-factory.util';
 import { createListingCustomObject } from 'test/integration/metadata/suites/object-metadata/utils/create-test-object-metadata.util';
@@ -17,7 +17,7 @@ describe('updateOne', () => {
       listingObjectId = createdObjectId;
 
       const { fieldMetadataId: createdFieldMetadaId } =
-        await createTestTextFieldMetadata(createdObjectId);
+        await createCustomTextFieldMetadata(createdObjectId);
 
       testFieldId = createdFieldMetadaId;
     });
diff --git a/packages/twenty-server/test/integration/metadata/suites/field-metadata/utils/create-test-field-metadata.util.ts b/packages/twenty-server/test/integration/metadata/suites/field-metadata/utils/create-custom-text-field-metadata.util.ts
similarity index 84%
rename from packages/twenty-server/test/integration/metadata/suites/field-metadata/utils/create-test-field-metadata.util.ts
rename to packages/twenty-server/test/integration/metadata/suites/field-metadata/utils/create-custom-text-field-metadata.util.ts
index 7d5af01334cf..0544b4935beb 100644
--- a/packages/twenty-server/test/integration/metadata/suites/field-metadata/utils/create-test-field-metadata.util.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/field-metadata/utils/create-custom-text-field-metadata.util.ts
@@ -1,11 +1,10 @@
 import { createOneFieldMetadataFactory } from 'test/integration/metadata/suites/field-metadata/utils/create-one-field-metadata-factory.util';
 import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
-
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataType } from 'twenty-shared';
 
 const FIELD_NAME = 'testName';
 
-export const createTestTextFieldMetadata = async (
+export const createCustomTextFieldMetadata = async (
   objectMetadataItemId: string,
 ) => {
   const createFieldInput = {
diff --git a/packages/twenty-server/test/integration/metadata/suites/object-metadata/rename-custom-object.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/object-metadata/rename-custom-object.integration-spec.ts
index ac4d836b4981..8b96d3baa45d 100644
--- a/packages/twenty-server/test/integration/metadata/suites/object-metadata/rename-custom-object.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/object-metadata/rename-custom-object.integration-spec.ts
@@ -1,14 +1,14 @@
 import { makeGraphqlAPIRequest } from 'test/integration/graphql/utils/make-graphql-api-request.util';
 import { createOneObjectMetadataFactory } from 'test/integration/metadata/suites/object-metadata/utils/create-one-object-metadata-factory.util';
 import { deleteOneObjectMetadataItemFactory } from 'test/integration/metadata/suites/object-metadata/utils/delete-one-object-metadata-factory.util';
+import { objectsMetadataFactory } from 'test/integration/metadata/suites/object-metadata/utils/objects-metadata-factory.util';
+import { updateOneObjectMetadataItemFactory } from 'test/integration/metadata/suites/object-metadata/utils/update-one-object-metadata-factory.util';
 import { createOneRelationMetadataFactory } from 'test/integration/metadata/suites/utils/create-one-relation-metadata-factory.util';
 import { deleteOneRelationMetadataItemFactory } from 'test/integration/metadata/suites/utils/delete-one-relation-metadata-factory.util';
 import { fieldsMetadataFactory } from 'test/integration/metadata/suites/utils/fields-metadata-factory.util';
 import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
-import { updateOneObjectMetadataItemFactory } from 'test/integration/metadata/suites/object-metadata/utils/update-one-object-metadata-factory.util';
-import { objectsMetadataFactory } from 'test/integration/metadata/suites/object-metadata/utils/objects-metadata-factory.util';
+import { FieldMetadataType } from 'twenty-shared';
 
-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 const LISTING_NAME_SINGULAR = 'listing';
 
diff --git a/packages/twenty-server/test/integration/utils/create-app.ts b/packages/twenty-server/test/integration/utils/create-app.ts
index dfa136e4d4b7..b5eeabf5f3df 100644
--- a/packages/twenty-server/test/integration/utils/create-app.ts
+++ b/packages/twenty-server/test/integration/utils/create-app.ts
@@ -2,6 +2,8 @@ import { NestExpressApplication } from '@nestjs/platform-express';
 import { Test, TestingModule, TestingModuleBuilder } from '@nestjs/testing';
 
 import { AppModule } from 'src/app.module';
+import { StripeSDKMockService } from 'src/engine/core-modules/billing/stripe/stripe-sdk/mocks/stripe-sdk-mock.service';
+import { StripeSDKService } from 'src/engine/core-modules/billing/stripe/stripe-sdk/services/stripe-sdk.service';
 
 interface TestingModuleCreatePreHook {
   (moduleBuilder: TestingModuleBuilder): TestingModuleBuilder;
@@ -23,9 +25,12 @@ export const createApp = async (
     appInitHook?: TestingAppCreatePreHook;
   } = {},
 ): Promise<NestExpressApplication> => {
+  const stripeSDKMockService = new StripeSDKMockService();
   let moduleBuilder: TestingModuleBuilder = Test.createTestingModule({
     imports: [AppModule],
-  });
+  })
+    .overrideProvider(StripeSDKService)
+    .useValue(stripeSDKMockService);
 
   if (config.moduleBuilderHook) {
     moduleBuilder = config.moduleBuilderHook(moduleBuilder);
@@ -33,7 +38,10 @@ export const createApp = async (
 
   const moduleFixture: TestingModule = await moduleBuilder.compile();
 
-  const app = moduleFixture.createNestApplication<NestExpressApplication>();
+  const app = moduleFixture.createNestApplication<NestExpressApplication>({
+    rawBody: true,
+    cors: true,
+  });
 
   if (config.appInitHook) {
     await config.appInitHook(app);
diff --git a/packages/twenty-server/tsconfig.json b/packages/twenty-server/tsconfig.json
index 272cbdde673c..8b1ccda0547d 100644
--- a/packages/twenty-server/tsconfig.json
+++ b/packages/twenty-server/tsconfig.json
@@ -25,9 +25,8 @@
     "resolveJsonModule": true,
     "types": ["jest", "node"],
     "paths": {
-      "src/*": ["packages/twenty-server/src/*"],
-      "test/*": ["packages/twenty-server/test/*"],
-      "twenty-emails": ["packages/twenty-emails/dist"]
+      "src/*": ["./src/*"],
+      "test/*": ["./test/*"]
     }
   },
   "ts-node": {
diff --git a/packages/twenty-shared/package.json b/packages/twenty-shared/package.json
index b929626a6c87..50511cac5afc 100644
--- a/packages/twenty-shared/package.json
+++ b/packages/twenty-shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twenty-shared",
-  "version": "0.40.0-canary",
+  "version": "0.41.0-canary",
   "license": "AGPL-3.0",
   "main": "./dist/index.js",
   "scripts": {
diff --git a/packages/twenty-shared/src/constants/FieldForTotalCountAggregateOperation.ts b/packages/twenty-shared/src/constants/FieldForTotalCountAggregateOperation.ts
new file mode 100644
index 000000000000..3a10ea479117
--- /dev/null
+++ b/packages/twenty-shared/src/constants/FieldForTotalCountAggregateOperation.ts
@@ -0,0 +1 @@
+export const FIELD_FOR_TOTAL_COUNT_AGGREGATE_OPERATION = 'id';
diff --git a/packages/twenty-shared/src/index.ts b/packages/twenty-shared/src/index.ts
index 45c4fb447d51..3d08c22809ca 100644
--- a/packages/twenty-shared/src/index.ts
+++ b/packages/twenty-shared/src/index.ts
@@ -1,5 +1,9 @@
+export * from './constants/FieldForTotalCountAggregateOperation';
 export * from './constants/TwentyCompaniesBaseUrl';
 export * from './constants/TwentyIconsBaseUrl';
+export * from './types/FieldMetadataType';
+export * from './utils/fieldMetadata/isFieldMetadataDateKind';
 export * from './utils/image/getImageAbsoluteURI';
 export * from './utils/strings';
+export * from './workspace';
 
diff --git a/packages/twenty-shared/src/utils/fieldMetadata/isFieldMetadataDateKind.ts b/packages/twenty-shared/src/utils/fieldMetadata/isFieldMetadataDateKind.ts
new file mode 100644
index 000000000000..f28882422ce8
--- /dev/null
+++ b/packages/twenty-shared/src/utils/fieldMetadata/isFieldMetadataDateKind.ts
@@ -0,0 +1,12 @@
+import { FieldMetadataType } from 'src/types/FieldMetadataType';
+
+export const isFieldMetadataDateKind = (
+  fieldMetadataType?: FieldMetadataType,
+): fieldMetadataType is
+  | FieldMetadataType.DATE
+  | FieldMetadataType.DATE_TIME => {
+  return (
+    fieldMetadataType === FieldMetadataType.DATE ||
+    fieldMetadataType === FieldMetadataType.DATE_TIME
+  );
+};
diff --git a/packages/twenty-shared/src/workspace/index.ts b/packages/twenty-shared/src/workspace/index.ts
new file mode 100644
index 000000000000..c9907f187504
--- /dev/null
+++ b/packages/twenty-shared/src/workspace/index.ts
@@ -0,0 +1,2 @@
+export * from './types/WorkspaceActivationStatus';
+export * from './utils/isWorkspaceActiveOrSuspended';
diff --git a/packages/twenty-shared/src/workspace/types/WorkspaceActivationStatus.ts b/packages/twenty-shared/src/workspace/types/WorkspaceActivationStatus.ts
new file mode 100644
index 000000000000..1b76a41f84bd
--- /dev/null
+++ b/packages/twenty-shared/src/workspace/types/WorkspaceActivationStatus.ts
@@ -0,0 +1,7 @@
+export enum WorkspaceActivationStatus {
+  ONGOING_CREATION = 'ONGOING_CREATION',
+  PENDING_CREATION = 'PENDING_CREATION',
+  ACTIVE = 'ACTIVE',
+  INACTIVE = 'INACTIVE',
+  SUSPENDED = 'SUSPENDED',
+}
diff --git a/packages/twenty-shared/src/workspace/utils/__tests__/isWorkspaceActiveOrSuspended.test.ts b/packages/twenty-shared/src/workspace/utils/__tests__/isWorkspaceActiveOrSuspended.test.ts
new file mode 100644
index 000000000000..8f2318c32010
--- /dev/null
+++ b/packages/twenty-shared/src/workspace/utils/__tests__/isWorkspaceActiveOrSuspended.test.ts
@@ -0,0 +1,52 @@
+import { WorkspaceActivationStatus } from '../../types/WorkspaceActivationStatus';
+import { isWorkspaceActiveOrSuspended } from '../isWorkspaceActiveOrSuspended';
+
+describe('isWorkspaceActiveOrSuspended', () => {
+  it('should return true for Active workspace', () => {
+    const workspace = {
+      activationStatus: WorkspaceActivationStatus.ACTIVE,
+    };
+
+    expect(isWorkspaceActiveOrSuspended(workspace)).toBe(true);
+  });
+
+  it('should return true for Suspended workspace', () => {
+    const workspace = {
+      activationStatus: WorkspaceActivationStatus.SUSPENDED,
+    };
+
+    expect(isWorkspaceActiveOrSuspended(workspace)).toBe(true);
+  });
+
+  it('should return false for Inactive workspace', () => {
+    const workspace = {
+      activationStatus: WorkspaceActivationStatus.INACTIVE,
+    };
+
+    expect(isWorkspaceActiveOrSuspended(workspace)).toBe(false);
+  });
+
+  it('should return false for OngoingCreation workspace', () => {
+    const workspace = {
+      activationStatus: WorkspaceActivationStatus.ONGOING_CREATION,
+    };
+
+    expect(isWorkspaceActiveOrSuspended(workspace)).toBe(false);
+  });
+
+  it('should return false for PendingCreation workspace', () => {
+    const workspace = {
+      activationStatus: WorkspaceActivationStatus.PENDING_CREATION,
+    };
+
+    expect(isWorkspaceActiveOrSuspended(workspace)).toBe(false);
+  });
+
+  it('should return false for undefined workspace', () => {
+    expect(isWorkspaceActiveOrSuspended(undefined)).toBe(false);
+  });
+
+  it('should return false for null workspace', () => {
+    expect(isWorkspaceActiveOrSuspended(null)).toBe(false);
+  });
+});
diff --git a/packages/twenty-shared/src/workspace/utils/isWorkspaceActiveOrSuspended.ts b/packages/twenty-shared/src/workspace/utils/isWorkspaceActiveOrSuspended.ts
new file mode 100644
index 000000000000..a809c446a26d
--- /dev/null
+++ b/packages/twenty-shared/src/workspace/utils/isWorkspaceActiveOrSuspended.ts
@@ -0,0 +1,12 @@
+import { WorkspaceActivationStatus } from '../types/WorkspaceActivationStatus';
+
+export const isWorkspaceActiveOrSuspended = (
+  workspace?: {
+    activationStatus: WorkspaceActivationStatus;
+  } | null,
+): boolean => {
+  return (
+    workspace?.activationStatus === WorkspaceActivationStatus.ACTIVE ||
+    workspace?.activationStatus === WorkspaceActivationStatus.SUSPENDED
+  );
+};
diff --git a/packages/twenty-tinybird/datasources/fixtures/pageview.csv b/packages/twenty-tinybird/datasources/fixtures/pageview.csv
index 4cab99aeb092..4105bdc3dfb3 100644
--- a/packages/twenty-tinybird/datasources/fixtures/pageview.csv
+++ b/packages/twenty-tinybird/datasources/fixtures/pageview.csv
@@ -8,4 +8,4 @@
 "http://localhost:3001/settings/developers/webhooks/41a8ad80-265a-425a-93da-35452d0ac83d","en-US","/settings/developers/webhooks/41a8ad80-265a-425a-93da-35452d0ac83d","http://localhost:3001/settings/developers/webhooks/41a8ad80-265a-425a-93da-35452d0ac83d","8fc30143-b648-4fc0-afe7-e55e1c452003","Europe/Paris","2024-10-17 12:38:02.518","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36","20202020-9e3b-46d4-a556-88b9ddc2b034","1","20202020-1c25-4d02-bf25-6aeccf7ea419"
 "http://localhost:3001/settings/developers/webhooks/41a8ad80-265a-425a-93da-35452d0ac83d","en-US","/settings/developers/webhooks/41a8ad80-265a-425a-93da-35452d0ac83d","http://localhost:3001/settings/developers/webhooks/41a8ad80-265a-425a-93da-35452d0ac83d","8fc30143-b648-4fc0-afe7-e55e1c452003","Europe/Paris","2024-10-17 12:41:11.844","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36","20202020-9e3b-46d4-a556-88b9ddc2b034","1","20202020-1c25-4d02-bf25-6aeccf7ea419"
 "http://localhost:3001/settings/profile","en-US","/settings/profile","http://localhost:3001/settings/developers/webhooks/41a8ad80-265a-425a-93da-35452d0ac83d","8fc30143-b648-4fc0-afe7-e55e1c452003","Europe/Paris","2024-10-17 12:41:23.864","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36","20202020-9e3b-46d4-a556-88b9ddc2b034","1","20202020-1c25-4d02-bf25-6aeccf7ea419"
-"http://localhost:3001/settings/appearance","en-US","/settings/appearance","http://localhost:3001/settings/developers/webhooks/41a8ad80-265a-425a-93da-35452d0ac83d","8fc30143-b648-4fc0-afe7-e55e1c452003","Europe/Paris","2024-10-17 12:41:25.972","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36","20202020-9e3b-46d4-a556-88b9ddc2b034","1","20202020-1c25-4d02-bf25-6aeccf7ea419"
+"http://localhost:3001/settings/experience","en-US","/settings/experience","http://localhost:3001/settings/developers/webhooks/41a8ad80-265a-425a-93da-35452d0ac83d","8fc30143-b648-4fc0-afe7-e55e1c452003","Europe/Paris","2024-10-17 12:41:25.972","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36","20202020-9e3b-46d4-a556-88b9ddc2b034","1","20202020-1c25-4d02-bf25-6aeccf7ea419"
diff --git a/packages/twenty-ui/jest.config.ts b/packages/twenty-ui/jest.config.ts
index 9d295020eaba..e3b09b8aef52 100644
--- a/packages/twenty-ui/jest.config.ts
+++ b/packages/twenty-ui/jest.config.ts
@@ -23,7 +23,9 @@ const jestConfig: JestConfigWithTsJest = {
   moduleNameMapper: {
     '\\.(jpg|jpeg|png|gif|webp|svg|svg\\?react)$':
       '<rootDir>/__mocks__/imageMock.js',
-    ...pathsToModuleNameMapper(tsConfig.compilerOptions.paths),
+    ...pathsToModuleNameMapper(tsConfig.compilerOptions.paths, {
+      prefix: '<rootDir>/',
+    }),
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   extensionsToTreatAsEsm: ['.ts', '.tsx'],
diff --git a/packages/twenty-ui/package.json b/packages/twenty-ui/package.json
index ec65a2cced58..7d30345aa849 100644
--- a/packages/twenty-ui/package.json
+++ b/packages/twenty-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twenty-ui",
-  "version": "0.40.0-canary",
+  "version": "0.41.0-canary",
   "type": "module",
   "main": "./src/index.ts",
   "exports": {
@@ -10,6 +10,9 @@
       "require": "./dist/index.cjs"
     }
   },
+  "dependencies": {
+    "twenty-shared": "workspace:*"
+  },
   "scripts": {
     "build": "npx vite build"
   }
diff --git a/packages/twenty-ui/src/display/icon/assets/microsoft-outlook.svg b/packages/twenty-ui/src/display/icon/assets/microsoft-outlook.svg
new file mode 100644
index 000000000000..8e0cdce35a7e
--- /dev/null
+++ b/packages/twenty-ui/src/display/icon/assets/microsoft-outlook.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+<title>file_type_outlook</title>
+<path d="M19.484,7.937v5.477L21.4,14.619a.489.489,0,0,0,.21,0l8.238-5.554a1.174,1.174,0,0,0-.959-1.128Z" style="fill:#0072c6"/>
+<path d="M19.484,15.457l1.747,1.2a.522.522,0,0,0,.543,0c-.3.181,8.073-5.378,8.073-5.378V21.345a1.408,1.408,0,0,1-1.49,1.555H19.483V15.457Z" style="fill:#0072c6"/>
+<path d="M10.44,12.932a1.609,1.609,0,0,0-1.42.838,4.131,4.131,0,0,0-.526,2.218A4.05,4.05,0,0,0,9.02,18.2a1.6,1.6,0,0,0,2.771.022,4.014,4.014,0,0,0,.515-2.2,4.369,4.369,0,0,0-.5-2.281A1.536,1.536,0,0,0,10.44,12.932Z" style="fill:#0072c6"/>
+<path d="M2.153,5.155V26.582L18.453,30V2ZM13.061,19.491a3.231,3.231,0,0,1-2.7,1.361,3.19,3.19,0,0,1-2.64-1.318A5.459,5.459,0,0,1,6.706,16.1a5.868,5.868,0,0,1,1.036-3.616A3.267,3.267,0,0,1,10.486,11.1a3.116,3.116,0,0,1,2.61,1.321,5.639,5.639,0,0,1,1,3.484A5.763,5.763,0,0,1,13.061,19.491Z" style="fill:#0072c6"/>
+</svg>
\ No newline at end of file
diff --git a/packages/twenty-ui/src/display/icon/components/IconMicrosoftOutlook.tsx b/packages/twenty-ui/src/display/icon/components/IconMicrosoftOutlook.tsx
new file mode 100644
index 000000000000..153d0af09049
--- /dev/null
+++ b/packages/twenty-ui/src/display/icon/components/IconMicrosoftOutlook.tsx
@@ -0,0 +1,14 @@
+import { useTheme } from '@emotion/react';
+
+import IconMicrosoftOutlookRaw from '../assets/microsoft-outlook.svg?react';
+
+interface IconMicrosoftOutlookProps {
+  size?: number;
+}
+
+export const IconMicrosoftOutlook = (props: IconMicrosoftOutlookProps) => {
+  const theme = useTheme();
+  const size = props.size ?? theme.icon.size.lg;
+
+  return <IconMicrosoftOutlookRaw height={size} width={size} />;
+};
diff --git a/packages/twenty-ui/src/display/icon/components/TablerIcons.ts b/packages/twenty-ui/src/display/icon/components/TablerIcons.ts
index 10125f41cbce..13561f90f13d 100644
--- a/packages/twenty-ui/src/display/icon/components/TablerIcons.ts
+++ b/packages/twenty-ui/src/display/icon/components/TablerIcons.ts
@@ -131,6 +131,7 @@ export {
   IconFilterCog,
   IconFilterOff,
   IconFlag,
+  IconFlask,
   IconFocusCentered,
   IconFolder,
   IconFolderOpen,
@@ -210,6 +211,7 @@ export {
   IconPuzzle,
   IconQuestionMark,
   IconRefresh,
+  IconRefreshDot,
   IconRelationManyToMany,
   IconRelationOneToMany,
   IconRelationOneToOne,
diff --git a/packages/twenty-ui/src/display/icon/types/IconComponent.ts b/packages/twenty-ui/src/display/icon/types/IconComponent.ts
index 17b108bda77e..63d7b6e3fbf5 100644
--- a/packages/twenty-ui/src/display/icon/types/IconComponent.ts
+++ b/packages/twenty-ui/src/display/icon/types/IconComponent.ts
@@ -2,9 +2,9 @@ import { FunctionComponent } from 'react';
 
 export type IconComponentProps = {
   className?: string;
-  color?: string;
   size?: number;
   stroke?: number;
+  color?: string;
 };
 
 export type IconComponent = FunctionComponent<IconComponentProps>;
diff --git a/packages/twenty-ui/src/display/index.ts b/packages/twenty-ui/src/display/index.ts
index 3b009a351748..85aea3e8b900 100644
--- a/packages/twenty-ui/src/display/index.ts
+++ b/packages/twenty-ui/src/display/index.ts
@@ -16,6 +16,7 @@ export * from './icon/components/IconGoogle';
 export * from './icon/components/IconGoogleCalendar';
 export * from './icon/components/IconLock';
 export * from './icon/components/IconMicrosoft';
+export * from './icon/components/IconMicrosoftOutlook';
 export * from './icon/components/IconRelationManyToOne';
 export * from './icon/components/IconTwentyStar';
 export * from './icon/components/IconTwentyStarFilled';
diff --git a/packages/twenty-ui/src/display/tooltip/AppTooltip.tsx b/packages/twenty-ui/src/display/tooltip/AppTooltip.tsx
index 96db35121f65..e6377957f4b1 100644
--- a/packages/twenty-ui/src/display/tooltip/AppTooltip.tsx
+++ b/packages/twenty-ui/src/display/tooltip/AppTooltip.tsx
@@ -16,7 +16,7 @@ export enum TooltipDelay {
   mediumDelay = '500ms',
 }
 
-const StyledAppTooltip = styled(Tooltip)`
+const StyledAppTooltip = styled(Tooltip)<{ width?: string }>`
   backdrop-filter: ${({ theme }) => theme.blur.strong};
   background-color: ${({ theme }) => RGBA(theme.color.gray80, 0.8)};
   border-radius: ${({ theme }) => theme.border.radius.sm};
@@ -27,7 +27,7 @@ const StyledAppTooltip = styled(Tooltip)`
   font-size: ${({ theme }) => theme.font.size.sm};
   font-weight: ${({ theme }) => theme.font.weight.regular};
 
-  max-width: 40%;
+  max-width: ${({ width }) => width || '40%'};
   overflow: visible;
 
   padding: ${({ theme }) => theme.spacing(2)};
@@ -49,6 +49,7 @@ export type AppTooltipProps = {
   delay?: TooltipDelay;
   positionStrategy?: PositionStrategy;
   clickable?: boolean;
+  width?: string;
 };
 
 export const AppTooltip = ({
@@ -63,6 +64,7 @@ export const AppTooltip = ({
   positionStrategy,
   children,
   clickable,
+  width,
 }: AppTooltipProps) => {
   const delayInMs =
     delay === TooltipDelay.noDelay
@@ -86,6 +88,7 @@ export const AppTooltip = ({
         positionStrategy,
         children,
         clickable,
+        width,
       }}
     />
   );
diff --git a/packages/twenty-ui/src/display/tooltip/__stories__/Tooltip.stories.tsx b/packages/twenty-ui/src/display/tooltip/__stories__/Tooltip.stories.tsx
index 1341cdbb6dfc..d3419c134656 100644
--- a/packages/twenty-ui/src/display/tooltip/__stories__/Tooltip.stories.tsx
+++ b/packages/twenty-ui/src/display/tooltip/__stories__/Tooltip.stories.tsx
@@ -102,6 +102,48 @@ export const Hoverable: Story = {
   ),
 };
 
+export const WithWidth: Story = {
+  args: {
+    place: TooltipPosition.Top,
+    delay: TooltipDelay.mediumDelay,
+    content: 'Tooltip with custom width',
+    hidden: false,
+    anchorSelect: '#width-text',
+    width: '200px',
+  },
+  decorators: [ComponentDecorator],
+  render: ({
+    anchorSelect,
+    className,
+    content,
+    delay,
+    noArrow,
+    offset,
+    place,
+    positionStrategy,
+    width,
+  }) => (
+    <>
+      <p id="width-text" data-testid="tooltip">
+        Hover me to see custom width!
+      </p>
+      <Tooltip
+        {...{
+          anchorSelect,
+          className,
+          content,
+          delay,
+          noArrow,
+          offset,
+          place,
+          positionStrategy,
+          width,
+        }}
+      />
+    </>
+  ),
+};
+
 export const Catalog: CatalogStory<Story, typeof Tooltip> = {
   args: { hidden: false, content: 'Tooltip Test' },
   play: async ({ canvasElement }) => {
diff --git a/packages/twenty-ui/src/input/button/components/AnimatedLightIconButton.tsx b/packages/twenty-ui/src/input/button/components/AnimatedLightIconButton.tsx
new file mode 100644
index 000000000000..077141859d4d
--- /dev/null
+++ b/packages/twenty-ui/src/input/button/components/AnimatedLightIconButton.tsx
@@ -0,0 +1,129 @@
+import { useTheme } from '@emotion/react';
+import styled from '@emotion/styled';
+import { IconComponent } from '@ui/display';
+import {
+  LightIconButtonAccent,
+  LightIconButtonSize,
+} from '@ui/input/button/components/LightIconButton';
+import { motion, MotionProps } from 'framer-motion';
+import { ComponentProps, MouseEvent } from 'react';
+
+export type AnimatedLightIconButtonProps = {
+  className?: string;
+  testId?: string;
+  Icon?: IconComponent;
+  title?: string;
+  size?: LightIconButtonSize;
+  accent?: LightIconButtonAccent;
+  active?: boolean;
+  disabled?: boolean;
+  focus?: boolean;
+  onClick?: (event: MouseEvent<HTMLButtonElement>) => void;
+} & Pick<ComponentProps<'button'>, 'aria-label' | 'title'> &
+  Pick<MotionProps, 'animate' | 'transition'>;
+
+const StyledButton = styled.button<
+  Pick<AnimatedLightIconButtonProps, 'accent' | 'active' | 'size' | 'focus'>
+>`
+  align-items: center;
+  background: transparent;
+  border: none;
+
+  border: ${({ disabled, theme, focus }) =>
+    !disabled && focus ? `1px solid ${theme.color.blue}` : 'none'};
+  border-radius: ${({ theme }) => theme.border.radius.sm};
+  box-shadow: ${({ disabled, theme, focus }) =>
+    !disabled && focus ? `0 0 0 3px ${theme.color.blue10}` : 'none'};
+  color: ${({ theme, accent, active, disabled, focus }) => {
+    switch (accent) {
+      case 'secondary':
+        return active || focus
+          ? theme.color.blue
+          : !disabled
+            ? theme.font.color.secondary
+            : theme.font.color.extraLight;
+      case 'tertiary':
+        return active || focus
+          ? theme.color.blue
+          : !disabled
+            ? theme.font.color.tertiary
+            : theme.font.color.extraLight;
+    }
+  }};
+  cursor: ${({ disabled }) => (disabled ? 'not-allowed' : 'pointer')};
+  display: flex;
+  flex-direction: row;
+
+  font-family: ${({ theme }) => theme.font.family};
+  font-weight: ${({ theme }) => theme.font.weight.regular};
+  gap: ${({ theme }) => theme.spacing(1)};
+  height: ${({ size }) => (size === 'small' ? '24px' : '32px')};
+  justify-content: center;
+  padding: ${({ theme }) => theme.spacing(1)};
+  transition: background 0.1s ease;
+
+  white-space: nowrap;
+  width: ${({ size }) => (size === 'small' ? '24px' : '32px')};
+  min-width: ${({ size }) => (size === 'small' ? '24px' : '32px')};
+
+  &:hover {
+    background: ${({ theme, disabled }) =>
+      !disabled ? theme.background.transparent.light : 'transparent'};
+  }
+
+  &:focus {
+    outline: none;
+  }
+
+  &:active {
+    background: ${({ theme, disabled }) =>
+      !disabled ? theme.background.transparent.medium : 'transparent'};
+  }
+`;
+
+const StyledIconContainer = styled(motion.div)`
+  display: flex;
+  align-items: center;
+  justify-content: center;
+`;
+
+export const AnimatedLightIconButton = ({
+  'aria-label': ariaLabel,
+  className,
+  testId,
+  animate,
+  transition,
+  Icon,
+  active = false,
+  size = 'small',
+  accent = 'secondary',
+  disabled = false,
+  focus = false,
+  onClick,
+  title,
+}: AnimatedLightIconButtonProps) => {
+  const theme = useTheme();
+
+  return (
+    <StyledButton
+      data-testid={testId}
+      aria-label={ariaLabel}
+      onClick={onClick}
+      disabled={disabled}
+      focus={focus && !disabled}
+      accent={accent}
+      className={className}
+      size={size}
+      active={active}
+      title={title}
+    >
+      <StyledIconContainer animate={animate} transition={transition}>
+        {Icon && (
+          <Icon
+            size={size === 'medium' ? theme.icon.size.md : theme.icon.size.sm}
+          />
+        )}
+      </StyledIconContainer>
+    </StyledButton>
+  );
+};
diff --git a/packages/twenty-ui/src/input/button/components/Button.tsx b/packages/twenty-ui/src/input/button/components/Button.tsx
index 902801126393..8f968644d566 100644
--- a/packages/twenty-ui/src/input/button/components/Button.tsx
+++ b/packages/twenty-ui/src/input/button/components/Button.tsx
@@ -3,6 +3,8 @@ import { css, useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { Pill } from '@ui/components/Pill/Pill';
 import { IconComponent } from '@ui/display/icon/types/IconComponent';
+import { useIsMobile } from '@ui/utilities';
+import { getOsShortcutSeparator } from '@ui/utilities/device/getOsShortcutSeparator';
 import React from 'react';
 import { Link } from 'react-router-dom';
 
@@ -29,7 +31,7 @@ export type ButtonProps = {
   to?: string;
   target?: string;
   dataTestId?: string;
-  shortcut?: string;
+  hotkeys?: string[];
   ariaLabel?: string;
 } & React.ComponentProps<'button'>;
 
@@ -417,11 +419,13 @@ export const Button = ({
   to,
   target,
   dataTestId,
-  shortcut,
+  hotkeys,
   ariaLabel,
 }: ButtonProps) => {
   const theme = useTheme();
 
+  const isMobile = useIsMobile();
+
   return (
     <StyledButton
       fullWidth={fullWidth}
@@ -443,11 +447,11 @@ export const Button = ({
     >
       {Icon && <Icon size={theme.icon.size.sm} />}
       {title}
-      {shortcut && (
+      {hotkeys && !isMobile && (
         <>
           <StyledSeparator buttonSize={size} accent={accent} />
           <StyledShortcutLabel variant={variant} accent={accent}>
-            {shortcut}
+            {hotkeys.join(getOsShortcutSeparator())}
           </StyledShortcutLabel>
         </>
       )}
diff --git a/packages/twenty-ui/src/input/button/components/LightIconButton.tsx b/packages/twenty-ui/src/input/button/components/LightIconButton.tsx
index 915ae2b2d90b..fedf7fcd9ff8 100644
--- a/packages/twenty-ui/src/input/button/components/LightIconButton.tsx
+++ b/packages/twenty-ui/src/input/button/components/LightIconButton.tsx
@@ -92,6 +92,7 @@ export const LightIconButton = ({
   title,
 }: LightIconButtonProps) => {
   const theme = useTheme();
+
   return (
     <StyledButton
       data-testid={testId}
diff --git a/packages/twenty-ui/src/input/button/components/__stories__/AnimatedLightIconButton.stories.tsx b/packages/twenty-ui/src/input/button/components/__stories__/AnimatedLightIconButton.stories.tsx
new file mode 100644
index 000000000000..0dd4a2ee62ef
--- /dev/null
+++ b/packages/twenty-ui/src/input/button/components/__stories__/AnimatedLightIconButton.stories.tsx
@@ -0,0 +1,108 @@
+import { Meta, StoryObj } from '@storybook/react';
+import { IconSearch } from '@ui/display';
+import {
+  LightIconButtonAccent,
+  LightIconButtonSize,
+} from '@ui/input/button/components/LightIconButton';
+import {
+  CatalogDecorator,
+  CatalogStory,
+  ComponentDecorator,
+} from '@ui/testing';
+import { AnimatedLightIconButton } from '../AnimatedLightIconButton';
+
+const meta: Meta<typeof AnimatedLightIconButton> = {
+  title: 'UI/Input/Button/AnimatedLightIconButton',
+  component: AnimatedLightIconButton,
+};
+
+export default meta;
+type Story = StoryObj<typeof AnimatedLightIconButton>;
+
+export const Default: Story = {
+  args: {
+    title: 'Filter',
+    accent: 'secondary',
+    disabled: false,
+    active: false,
+    focus: false,
+    Icon: IconSearch,
+    animate: { scale: 1.2 },
+    transition: { duration: 0.3 },
+  },
+  argTypes: {
+    Icon: { control: false },
+    animate: { control: 'object' },
+    transition: { control: 'object' },
+  },
+  decorators: [ComponentDecorator],
+};
+
+export const Catalog: CatalogStory<Story, typeof AnimatedLightIconButton> = {
+  args: {
+    title: 'Filter',
+    Icon: IconSearch,
+    animate: { scale: 1.2 },
+    transition: { duration: 0.3 },
+  },
+  argTypes: {
+    accent: { control: false },
+    disabled: { control: false },
+    active: { control: false },
+    focus: { control: false },
+    animate: { control: 'object' },
+    transition: { control: 'object' },
+  },
+  parameters: {
+    pseudo: { hover: ['.hover'], active: ['.pressed'] },
+    catalog: {
+      dimensions: [
+        {
+          name: 'states',
+          values: [
+            'default',
+            'hover',
+            'pressed',
+            'disabled',
+            'active',
+            'focus',
+            'disabled+focus',
+            'disabled+active',
+          ],
+          props: (state: string) => {
+            switch (state) {
+              case 'default':
+                return {};
+              case 'hover':
+              case 'pressed':
+                return { className: state };
+              case 'focus':
+                return { focus: true };
+              case 'disabled':
+                return { disabled: true };
+              case 'active':
+                return { active: true };
+              case 'disabled+focus':
+                return { disabled: true, focus: true };
+              case 'disabled+active':
+                return { disabled: true, active: true };
+              default:
+                return {};
+            }
+          },
+        },
+        {
+          name: 'accents',
+          values: ['secondary', 'tertiary'] satisfies LightIconButtonAccent[],
+          props: (accent: LightIconButtonAccent) => ({ accent }),
+        },
+        {
+          name: 'sizes',
+          values: ['small', 'medium'] satisfies LightIconButtonSize[],
+          props: (size: LightIconButtonSize) => ({ size }),
+        },
+      ],
+    },
+  },
+  decorators: [CatalogDecorator],
+};
diff --git a/packages/twenty-ui/src/input/button/components/__stories__/Button.stories.tsx b/packages/twenty-ui/src/input/button/components/__stories__/Button.stories.tsx
index d53758a94c16..a52510fd5c74 100644
--- a/packages/twenty-ui/src/input/button/components/__stories__/Button.stories.tsx
+++ b/packages/twenty-ui/src/input/button/components/__stories__/Button.stories.tsx
@@ -23,7 +23,7 @@ type Story = StoryObj<typeof Button>;
 
 export const Default: Story = {
   argTypes: {
-    shortcut: { control: false },
+    hotkeys: { control: false },
     Icon: { control: false },
   },
   args: {
@@ -44,7 +44,7 @@ export const Default: Story = {
 };
 
 export const Catalog: CatalogStory<Story, typeof Button> = {
-  args: { title: 'Filter', Icon: IconSearch, shortcut: '' },
+  args: { title: 'Filter', Icon: IconSearch, hotkeys: ['⌘', 'O'] },
   argTypes: {
     size: { control: false },
     variant: { control: false },
@@ -127,7 +127,7 @@ export const SoonCatalog: CatalogStory<Story, typeof Button> = {
     soon: { control: false },
     position: { control: false },
     className: { control: false },
-    shortcut: { control: false },
+    hotkeys: { control: false },
   },
   parameters: {
     pseudo: { hover: ['.hover'], active: ['.pressed'], focus: ['.focus'] },
@@ -199,7 +199,7 @@ export const PositionCatalog: CatalogStory<Story, typeof Button> = {
     fullWidth: { control: false },
     soon: { control: false },
     position: { control: false },
-    shortcut: { control: false },
+    hotkeys: { control: false },
   },
   parameters: {
     pseudo: { hover: ['.hover'], active: ['.pressed'], focus: ['.focus'] },
@@ -266,7 +266,7 @@ export const PositionCatalog: CatalogStory<Story, typeof Button> = {
 };
 
 export const ShortcutCatalog: CatalogStory<Story, typeof Button> = {
-  args: { title: 'Actions', shortcut: '⌘O' },
+  args: { title: 'Actions', hotkeys: ['⌘', 'O'] },
   argTypes: {
     size: { control: false },
     variant: { control: false },
diff --git a/packages/twenty-ui/src/input/code-editor/components/CodeEditor.tsx b/packages/twenty-ui/src/input/code-editor/components/CodeEditor.tsx
index ab1b8c99c858..a671a4434a29 100644
--- a/packages/twenty-ui/src/input/code-editor/components/CodeEditor.tsx
+++ b/packages/twenty-ui/src/input/code-editor/components/CodeEditor.tsx
@@ -1,11 +1,14 @@
 import { useTheme, css } from '@emotion/react';
-import Editor, { EditorProps } from '@monaco-editor/react';
+import Editor, { EditorProps, Monaco } from '@monaco-editor/react';
 import { codeEditorTheme } from '@ui/input';
 import { isDefined } from '@ui/utilities';
 import styled from '@emotion/styled';
+import { useState } from 'react';
+import { editor } from 'monaco-editor';
 
 type CodeEditorProps = Omit<EditorProps, 'onChange'> & {
   onChange?: (value: string) => void;
+  setMarkers?: (value: string) => editor.IMarkerData[];
   withHeader?: boolean;
 };
 
@@ -35,12 +38,31 @@ export const CodeEditor = ({
   language,
   onMount,
   onChange,
+  setMarkers,
   onValidate,
   height = 450,
   withHeader = false,
   options,
 }: CodeEditorProps) => {
   const theme = useTheme();
+  const [monaco, setMonaco] = useState<Monaco | undefined>(undefined);
+  const [editor, setEditor] = useState<
+    editor.IStandaloneCodeEditor | undefined
+  >(undefined);
+
+  const setModelMarkers = (
+    editor: editor.IStandaloneCodeEditor | undefined,
+    monaco: Monaco | undefined,
+  ) => {
+    const model = editor?.getModel();
+    if (!isDefined(model)) {
+      return;
+    }
+    const customMarkers = setMarkers?.(model.getValue());
+    if (isDefined(customMarkers)) {
+      monaco?.editor.setModelMarkers(model, 'customMarker', customMarkers);
+    }
+  };
 
   return (
     <StyledEditor
@@ -49,17 +71,22 @@ export const CodeEditor = ({
       value={value}
       language={language}
       onMount={(editor, monaco) => {
+        setMonaco(monaco);
+        setEditor(editor);
         monaco.editor.defineTheme('codeEditorTheme', codeEditorTheme(theme));
         monaco.editor.setTheme('codeEditorTheme');
-
         onMount?.(editor, monaco);
+        setModelMarkers(editor, monaco);
       }}
       onChange={(value) => {
         if (isDefined(value)) {
           onChange?.(value);
+          setModelMarkers(editor, monaco);
         }
       }}
-      onValidate={onValidate}
+      onValidate={(markers) => {
+        onValidate?.(markers);
+      }}
       options={{
         overviewRulerLanes: 0,
         scrollbar: {
diff --git a/packages/twenty-ui/src/input/index.ts b/packages/twenty-ui/src/input/index.ts
index 581bcb2e7131..1c9282835224 100644
--- a/packages/twenty-ui/src/input/index.ts
+++ b/packages/twenty-ui/src/input/index.ts
@@ -1,3 +1,4 @@
+export * from './button/components/AnimatedLightIconButton';
 export * from './button/components/Button';
 export * from './button/components/ButtonGroup';
 export * from './button/components/ColorPickerButton';
diff --git a/packages/twenty-ui/src/layout/index.ts b/packages/twenty-ui/src/layout/index.ts
index 1f88712f8c38..8f33feb754a4 100644
--- a/packages/twenty-ui/src/layout/index.ts
+++ b/packages/twenty-ui/src/layout/index.ts
@@ -1,4 +1,12 @@
 export * from './animated-expandable-container/components/AnimatedExpandableContainer';
+export * from './animated-expandable-container/types/AnimationDimension';
+export * from './animated-expandable-container/types/AnimationDurationObject';
+export * from './animated-expandable-container/types/AnimationDurations';
+export * from './animated-expandable-container/types/AnimationMode';
+export * from './animated-expandable-container/types/AnimationSize';
+export * from './animated-expandable-container/utils/getCommonStyles';
+export * from './animated-expandable-container/utils/getExpandableAnimationConfig';
+export * from './animated-expandable-container/utils/getTransitionValues';
 export * from './animated-placeholder/components/AnimatedPlaceholder';
 export * from './animated-placeholder/components/EmptyPlaceholderStyled';
 export * from './animated-placeholder/components/ErrorPlaceholderStyled';
diff --git a/packages/twenty-ui/src/navigation/menu-item/components/MenuItem.tsx b/packages/twenty-ui/src/navigation/menu-item/components/MenuItem.tsx
index b123886983d3..b7ceaa2706d5 100644
--- a/packages/twenty-ui/src/navigation/menu-item/components/MenuItem.tsx
+++ b/packages/twenty-ui/src/navigation/menu-item/components/MenuItem.tsx
@@ -30,6 +30,7 @@ export type MenuItemProps = {
   onMouseEnter?: (event: MouseEvent<HTMLDivElement>) => void;
   onMouseLeave?: (event: MouseEvent<HTMLDivElement>) => void;
   testId?: string;
+  disabled?: boolean;
   text: ReactNode;
   contextualText?: ReactNode;
   hasSubMenu?: boolean;
@@ -49,6 +50,7 @@ export const MenuItem = ({
   text,
   contextualText,
   hasSubMenu = false,
+  disabled = false,
 }: MenuItemProps) => {
   const theme = useTheme();
   const showIconButtons = Array.isArray(iconButtons) && iconButtons.length > 0;
@@ -64,7 +66,8 @@ export const MenuItem = ({
   return (
     <StyledHoverableMenuItemBase
       data-testid={testId ?? undefined}
-      onClick={handleMenuItemClick}
+      onClick={disabled ? undefined : handleMenuItemClick}
+      disabled={disabled}
       className={className}
       accent={accent}
       isIconDisplayedOnHoverOnly={isIconDisplayedOnHoverOnly}
diff --git a/packages/twenty-ui/src/navigation/menu-item/components/MenuItemCommand.tsx b/packages/twenty-ui/src/navigation/menu-item/components/MenuItemCommand.tsx
index 410965ce937a..329909517a09 100644
--- a/packages/twenty-ui/src/navigation/menu-item/components/MenuItemCommand.tsx
+++ b/packages/twenty-ui/src/navigation/menu-item/components/MenuItemCommand.tsx
@@ -98,9 +98,7 @@ export const MenuItemCommand = ({
             <LeftIcon size={theme.icon.size.sm} />
           </StyledBigIconContainer>
         )}
-        <StyledMenuItemLabelText hasLeftIcon={!!LeftIcon}>
-          {text}
-        </StyledMenuItemLabelText>
+        <StyledMenuItemLabelText>{text}</StyledMenuItemLabelText>
       </StyledMenuItemLeftContent>
       {!isMobile && (
         <MenuItemCommandHotKeys
diff --git a/packages/twenty-ui/src/navigation/menu-item/components/MenuItemMultiSelectAvatar.tsx b/packages/twenty-ui/src/navigation/menu-item/components/MenuItemMultiSelectAvatar.tsx
index d96433698863..6674fd9c6423 100644
--- a/packages/twenty-ui/src/navigation/menu-item/components/MenuItemMultiSelectAvatar.tsx
+++ b/packages/twenty-ui/src/navigation/menu-item/components/MenuItemMultiSelectAvatar.tsx
@@ -48,7 +48,7 @@ export const MenuItemMultiSelectAvatar = ({
         <Checkbox checked={selected} />
         <StyledMenuItemLeftContent>
           {avatar}
-          <StyledMenuItemLabel hasLeftIcon={!!avatar}>
+          <StyledMenuItemLabel>
             <OverflowingTextWithTooltip text={text} />
           </StyledMenuItemLabel>
         </StyledMenuItemLeftContent>
diff --git a/packages/twenty-ui/src/navigation/menu-item/components/MenuItemSelect.tsx b/packages/twenty-ui/src/navigation/menu-item/components/MenuItemSelect.tsx
index 98f8eb7157a0..1b2a64181333 100644
--- a/packages/twenty-ui/src/navigation/menu-item/components/MenuItemSelect.tsx
+++ b/packages/twenty-ui/src/navigation/menu-item/components/MenuItemSelect.tsx
@@ -47,6 +47,7 @@ type MenuItemSelectProps = {
   disabled?: boolean;
   hovered?: boolean;
   hasSubMenu?: boolean;
+  contextualText?: string;
 };
 
 export const MenuItemSelect = ({
@@ -59,6 +60,7 @@ export const MenuItemSelect = ({
   disabled,
   hovered,
   hasSubMenu = false,
+  contextualText,
 }: MenuItemSelectProps) => {
   const theme = useTheme();
 
@@ -69,9 +71,17 @@ export const MenuItemSelect = ({
       selected={selected}
       disabled={disabled}
       hovered={hovered}
+      role="option"
+      aria-selected={selected}
+      aria-disabled={disabled}
     >
-      <MenuItemLeftContent LeftIcon={LeftIcon} text={text} />
+      <MenuItemLeftContent
+        LeftIcon={LeftIcon}
+        text={text}
+        contextualText={contextualText}
+      />
       {selected && needIconCheck && <IconCheck size={theme.icon.size.md} />}
+
       {hasSubMenu && (
         <IconChevronRight
           size={theme.icon.size.sm}
diff --git a/packages/twenty-ui/src/navigation/menu-item/components/MenuItemSelectAvatar.tsx b/packages/twenty-ui/src/navigation/menu-item/components/MenuItemSelectAvatar.tsx
index 4df9e280084b..8f143c0441e6 100644
--- a/packages/twenty-ui/src/navigation/menu-item/components/MenuItemSelectAvatar.tsx
+++ b/packages/twenty-ui/src/navigation/menu-item/components/MenuItemSelectAvatar.tsx
@@ -40,10 +40,13 @@ export const MenuItemSelectAvatar = ({
       disabled={disabled}
       hovered={hovered}
       data-testid={testId}
+      role="option"
+      aria-selected={selected}
+      aria-disabled={disabled}
     >
       <StyledMenuItemLeftContent>
         {avatar}
-        <StyledMenuItemLabel hasLeftIcon={!!avatar}>
+        <StyledMenuItemLabel>
           <OverflowingTextWithTooltip text={text} />
         </StyledMenuItemLabel>
       </StyledMenuItemLeftContent>
diff --git a/packages/twenty-ui/src/navigation/menu-item/components/MenuItemSelectColor.tsx b/packages/twenty-ui/src/navigation/menu-item/components/MenuItemSelectColor.tsx
index 60f2f81ff50e..b3c320d31649 100644
--- a/packages/twenty-ui/src/navigation/menu-item/components/MenuItemSelectColor.tsx
+++ b/packages/twenty-ui/src/navigation/menu-item/components/MenuItemSelectColor.tsx
@@ -53,9 +53,7 @@ export const MenuItemSelectColor = ({
     >
       <StyledMenuItemLeftContent>
         <ColorSample colorName={color} variant={variant} />
-        <StyledMenuItemLabel hasLeftIcon={true}>
-          {colorLabels[color]}
-        </StyledMenuItemLabel>
+        <StyledMenuItemLabel>{colorLabels[color]}</StyledMenuItemLabel>
       </StyledMenuItemLeftContent>
       {selected && <IconCheck size={theme.icon.size.md} />}
     </StyledMenuItemSelect>
diff --git a/packages/twenty-ui/src/navigation/menu-item/components/__stories__/MenuItem.stories.tsx b/packages/twenty-ui/src/navigation/menu-item/components/__stories__/MenuItem.stories.tsx
index 261c901f40fe..1a3b43b26988 100644
--- a/packages/twenty-ui/src/navigation/menu-item/components/__stories__/MenuItem.stories.tsx
+++ b/packages/twenty-ui/src/navigation/menu-item/components/__stories__/MenuItem.stories.tsx
@@ -100,6 +100,11 @@ export const Catalog: CatalogStory<Story, typeof MenuItem> = {
             }
           },
         },
+        {
+          name: 'disabled',
+          values: [true, false],
+          props: (disabled: boolean) => ({ disabled }),
+        },
       ],
       options: {
         elementContainer: {
diff --git a/packages/twenty-ui/src/navigation/menu-item/internals/components/MenuItemLeftContent.tsx b/packages/twenty-ui/src/navigation/menu-item/internals/components/MenuItemLeftContent.tsx
index 7ab51f7940b7..a67d60073a5b 100644
--- a/packages/twenty-ui/src/navigation/menu-item/internals/components/MenuItemLeftContent.tsx
+++ b/packages/twenty-ui/src/navigation/menu-item/internals/components/MenuItemLeftContent.tsx
@@ -14,6 +14,10 @@ import {
   StyledMenuItemLeftContent,
 } from './StyledMenuItemBase';
 
+const StyledMainText = styled.div`
+  flex-shrink: 0;
+`;
+
 const StyledContextualText = styled.div`
   color: ${({ theme }) => theme.color.gray35};
   font-family: inherit;
@@ -29,6 +33,7 @@ const StyledContextualText = styled.div`
   white-space: nowrap;
 
   padding-left: ${({ theme }) => theme.spacing(1)};
+  flex-shrink: 1;
 `;
 
 type MenuItemLeftContentProps = {
@@ -66,8 +71,14 @@ export const MenuItemLeftContent = ({
       {LeftIcon && (
         <LeftIcon size={theme.icon.size.md} stroke={theme.icon.stroke.sm} />
       )}
-      <StyledMenuItemLabel hasLeftIcon={!!LeftIcon}>
-        {isString(text) ? <OverflowingTextWithTooltip text={text} /> : text}
+      <StyledMenuItemLabel>
+        {isString(text) ? (
+          <StyledMainText>
+            <OverflowingTextWithTooltip text={text} />
+          </StyledMainText>
+        ) : (
+          text
+        )}
         {isString(contextualText) ? (
           <StyledContextualText>{`· ${contextualText}`}</StyledContextualText>
         ) : (
diff --git a/packages/twenty-ui/src/navigation/menu-item/internals/components/StyledMenuItemBase.tsx b/packages/twenty-ui/src/navigation/menu-item/internals/components/StyledMenuItemBase.tsx
index b713e5b72d50..97f489f41957 100644
--- a/packages/twenty-ui/src/navigation/menu-item/internals/components/StyledMenuItemBase.tsx
+++ b/packages/twenty-ui/src/navigation/menu-item/internals/components/StyledMenuItemBase.tsx
@@ -1,6 +1,7 @@
 import { css } from '@emotion/react';
 import styled from '@emotion/styled';
 
+import { isUndefined } from '@sniptt/guards';
 import { HOVER_BACKGROUND } from '@ui/theme';
 import { MenuItemAccent } from '../../types/MenuItemAccent';
 
@@ -9,6 +10,7 @@ export type MenuItemBaseProps = {
   isKeySelected?: boolean;
   isHoverBackgroundDisabled?: boolean;
   hovered?: boolean;
+  disabled?: boolean;
 };
 
 export const StyledMenuItemBase = styled.div<MenuItemBaseProps>`
@@ -35,10 +37,12 @@ export const StyledMenuItemBase = styled.div<MenuItemBaseProps>`
   ${({ theme, isKeySelected }) =>
     isKeySelected ? `background: ${theme.background.transparent.light};` : ''}
 
-  ${({ isHoverBackgroundDisabled }) =>
-    isHoverBackgroundDisabled ?? HOVER_BACKGROUND};
+  ${({ isHoverBackgroundDisabled, disabled }) =>
+    (disabled || isHoverBackgroundDisabled) ?? HOVER_BACKGROUND};
+
+  ${({ theme, accent, disabled }) => {
+    const isDisabled = !isUndefined(disabled) && disabled !== false;
 
-  ${({ theme, accent }) => {
     switch (accent) {
       case 'danger': {
         return css`
@@ -46,17 +50,20 @@ export const StyledMenuItemBase = styled.div<MenuItemBaseProps>`
           &:hover {
             background: ${theme.background.transparent.danger};
           }
+          ${isDisabled && `opacity: 0.4;`}
         `;
       }
       case 'placeholder': {
         return css`
           color: ${theme.font.color.tertiary};
+          ${isDisabled && `opacity: 0.4;`}
         `;
       }
       case 'default':
       default: {
         return css`
           color: ${theme.font.color.secondary};
+          ${isDisabled && `opacity: 0.4;`}
         `;
       }
     }
@@ -68,15 +75,13 @@ export const StyledMenuItemBase = styled.div<MenuItemBaseProps>`
   width: calc(100% - 2 * var(--horizontal-padding));
 `;
 
-export const StyledMenuItemLabel = styled.div<{ hasLeftIcon: boolean }>`
+export const StyledMenuItemLabel = styled.div`
   display: flex;
   flex-direction: row;
   font-size: ${({ theme }) => theme.font.size.md};
   font-weight: ${({ theme }) => theme.font.weight.regular};
 
   overflow: hidden;
-  padding-left: ${({ theme, hasLeftIcon }) =>
-    hasLeftIcon ? '' : theme.spacing(1)};
 
   white-space: nowrap;
 `;
@@ -114,6 +119,7 @@ export const StyledDraggableItem = styled.div`
 `;
 
 export const StyledHoverableMenuItemBase = styled(StyledMenuItemBase)<{
+  disabled?: boolean;
   isIconDisplayedOnHoverOnly?: boolean;
   cursor?: 'drag' | 'default' | 'not-allowed';
 }>`
@@ -138,7 +144,11 @@ export const StyledHoverableMenuItemBase = styled(StyledMenuItemBase)<{
     transition: opacity ${({ theme }) => theme.animation.duration.instant}s ease;
   }
 
-  cursor: ${({ cursor }) => {
+  cursor: ${({ cursor, disabled }) => {
+    if (!isUndefined(disabled) && disabled !== false) {
+      return 'not-allowed';
+    }
+
     switch (cursor) {
       case 'drag':
         return 'grab';
diff --git a/packages/twenty-ui/src/testing/decorators/CatalogDecorator.tsx b/packages/twenty-ui/src/testing/decorators/CatalogDecorator.tsx
index ab43a7df139f..97920be14527 100644
--- a/packages/twenty-ui/src/testing/decorators/CatalogDecorator.tsx
+++ b/packages/twenty-ui/src/testing/decorators/CatalogDecorator.tsx
@@ -1,7 +1,7 @@
-import { ComponentProps, JSX } from 'react';
 import styled from '@emotion/styled';
 import { isNumber, isString } from '@sniptt/guards';
 import { Decorator } from '@storybook/react';
+import { ComponentProps, JSX } from 'react';
 
 const StyledColumnTitle = styled.h1`
   font-size: ${({ theme }) => theme.font.size.lg};
@@ -91,6 +91,8 @@ export type CatalogDimension<
 export type CatalogOptions = {
   elementContainer?: {
     width?: number;
+    style?: React.CSSProperties;
+    className?: string;
   };
 };
 
@@ -135,6 +137,8 @@ export const CatalogDecorator: Decorator = (Story, context) => {
                         </StyledElementTitle>
                         <StyledElementContainer
                           width={options?.elementContainer?.width}
+                          style={options?.elementContainer?.style}
+                          className={options?.elementContainer?.className}
                         >
                           <Story
                             args={{
diff --git a/packages/twenty-ui/src/theme/provider/ThemeProvider.tsx b/packages/twenty-ui/src/theme/provider/ThemeProvider.tsx
index 3b513f34e1bf..e8cdc3b7e1e1 100644
--- a/packages/twenty-ui/src/theme/provider/ThemeProvider.tsx
+++ b/packages/twenty-ui/src/theme/provider/ThemeProvider.tsx
@@ -1,5 +1,5 @@
-import { ReactNode } from 'react';
 import { ThemeProvider as EmotionThemeProvider } from '@emotion/react';
+import { ReactNode } from 'react';
 
 import { ThemeContextProvider } from '@ui/theme/provider/ThemeContextProvider';
 
diff --git a/packages/twenty-ui/src/utilities/device/__tests__/getOsControlSymbol.test.ts b/packages/twenty-ui/src/utilities/device/__tests__/getOsControlSymbol.test.ts
new file mode 100644
index 000000000000..bd97e08a3569
--- /dev/null
+++ b/packages/twenty-ui/src/utilities/device/__tests__/getOsControlSymbol.test.ts
@@ -0,0 +1,27 @@
+import { getOsControlSymbol } from '../getOsControlSymbol';
+
+describe('getOsControlSymbol', () => {
+  let userAgentSpy: jest.SpyInstance;
+
+  beforeEach(() => {
+    userAgentSpy = jest.spyOn(window.navigator, 'userAgent', 'get');
+  });
+
+  afterEach(() => {
+    userAgentSpy.mockRestore();
+  });
+
+  it('should return Ctrl for Windows', () => {
+    userAgentSpy.mockReturnValue(
+      'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:124.0) Gecko/20100101 Firefox/124.0',
+    );
+    expect(getOsControlSymbol()).toBe('Ctrl');
+  });
+
+  it('should return ⌘ for Mac', () => {
+    userAgentSpy.mockReturnValue(
+      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+    );
+    expect(getOsControlSymbol()).toBe('⌘');
+  });
+});
diff --git a/packages/twenty-ui/src/utilities/device/__tests__/getOsShortcutSeparator.test.ts b/packages/twenty-ui/src/utilities/device/__tests__/getOsShortcutSeparator.test.ts
new file mode 100644
index 000000000000..16205be1425d
--- /dev/null
+++ b/packages/twenty-ui/src/utilities/device/__tests__/getOsShortcutSeparator.test.ts
@@ -0,0 +1,27 @@
+import { getOsShortcutSeparator } from '../getOsShortcutSeparator';
+
+describe('getOsShortcutSeparator', () => {
+  let userAgentSpy: jest.SpyInstance;
+
+  beforeEach(() => {
+    userAgentSpy = jest.spyOn(window.navigator, 'userAgent', 'get');
+  });
+
+  afterEach(() => {
+    userAgentSpy.mockRestore();
+  });
+
+  it('should return space for Windows', () => {
+    userAgentSpy.mockReturnValue(
+      'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:124.0) Gecko/20100101 Firefox/124.0',
+    );
+    expect(getOsShortcutSeparator()).toBe(' ');
+  });
+
+  it('should return empty string for Mac', () => {
+    userAgentSpy.mockReturnValue(
+      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+    );
+    expect(getOsShortcutSeparator()).toBe('');
+  });
+});
diff --git a/packages/twenty-ui/src/utilities/device/getOsControlSymbol.ts b/packages/twenty-ui/src/utilities/device/getOsControlSymbol.ts
new file mode 100644
index 000000000000..3278c3501e98
--- /dev/null
+++ b/packages/twenty-ui/src/utilities/device/getOsControlSymbol.ts
@@ -0,0 +1,7 @@
+import { getUserDevice } from '@ui/utilities/device/getUserDevice';
+
+export const getOsControlSymbol = () => {
+  const device = getUserDevice();
+
+  return device === 'mac' ? '⌘' : 'Ctrl';
+};
diff --git a/packages/twenty-ui/src/utilities/device/getOsShortcutSeparator.ts b/packages/twenty-ui/src/utilities/device/getOsShortcutSeparator.ts
new file mode 100644
index 000000000000..c7bc029b8e57
--- /dev/null
+++ b/packages/twenty-ui/src/utilities/device/getOsShortcutSeparator.ts
@@ -0,0 +1,6 @@
+import { getUserDevice } from '@ui/utilities/device/getUserDevice';
+
+export const getOsShortcutSeparator = () => {
+  const device = getUserDevice();
+  return device === 'mac' ? '' : ' ';
+};
diff --git a/packages/twenty-ui/src/utilities/device/getUserDevice.ts b/packages/twenty-ui/src/utilities/device/getUserDevice.ts
new file mode 100644
index 000000000000..1e724e079b1d
--- /dev/null
+++ b/packages/twenty-ui/src/utilities/device/getUserDevice.ts
@@ -0,0 +1,26 @@
+export const getUserDevice = () => {
+  const userAgent = navigator.userAgent.toLowerCase();
+
+  if (userAgent.includes('mac os x') || userAgent.includes('macos')) {
+    return 'mac';
+  }
+
+  if (userAgent.includes('windows')) {
+    return 'windows';
+  }
+
+  if (userAgent.includes('linux')) {
+    return 'linux';
+  }
+
+  if (userAgent.includes('android')) return 'android';
+
+  if (
+    userAgent.includes('ios') ||
+    userAgent.includes('iphone') ||
+    userAgent.includes('ipad')
+  )
+    return 'ios';
+
+  return 'unknown';
+};
diff --git a/packages/twenty-ui/src/utilities/index.ts b/packages/twenty-ui/src/utilities/index.ts
index d075abd62046..f45ce2d7a906 100644
--- a/packages/twenty-ui/src/utilities/index.ts
+++ b/packages/twenty-ui/src/utilities/index.ts
@@ -5,6 +5,9 @@ export * from './animation/components/AnimatedFadeOut';
 export * from './animation/components/AnimatedTextWord';
 export * from './animation/components/AnimatedTranslation';
 export * from './color/utils/stringToHslColor';
+export * from './device/getOsControlSymbol';
+export * from './device/getOsShortcutSeparator';
+export * from './device/getUserDevice';
 export * from './dimensions/components/ComputeNodeDimensions';
 export * from './isDefined';
 export * from './responsive/hooks/useIsMobile';
diff --git a/packages/twenty-ui/tsconfig.json b/packages/twenty-ui/tsconfig.json
index 31fca817a180..52b04f0ceec0 100644
--- a/packages/twenty-ui/tsconfig.json
+++ b/packages/twenty-ui/tsconfig.json
@@ -10,7 +10,7 @@
     "types": ["node"],
     "outDir": "../../.cache/tsc",
     "paths": {
-      "@ui/*": ["packages/twenty-ui/src/*"]
+      "@ui/*": ["./src/*"]
     }
   },
   "files": [],
diff --git a/packages/twenty-ui/tsconfig.spec.json b/packages/twenty-ui/tsconfig.spec.json
index 4175fe1fba3e..12bcba742063 100644
--- a/packages/twenty-ui/tsconfig.spec.json
+++ b/packages/twenty-ui/tsconfig.spec.json
@@ -2,7 +2,11 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "module": "commonjs",
-    "types": ["jest", "node"]
+    "types": ["jest", "node"],
+    "baseUrl": "../..",
+    "paths": {
+      "@ui/*": ["./packages/twenty-ui/src/*"]
+    }
   },
   "include": [
     "vite.config.ts",
diff --git a/packages/twenty-website/package.json b/packages/twenty-website/package.json
index 0030a953ff7f..ad11c1f2ca23 100644
--- a/packages/twenty-website/package.json
+++ b/packages/twenty-website/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twenty-website",
-  "version": "0.40.0-canary",
+  "version": "0.41.0-canary",
   "private": true,
   "scripts": {
     "nx": "NX_DEFAULT_PROJECT=twenty-website node ../../node_modules/nx/bin/nx.js",
diff --git a/packages/twenty-website/public/.well-known/microsoft-identity-association.json b/packages/twenty-website/public/.well-known/microsoft-identity-association.json
new file mode 100644
index 000000000000..3bca6de211a6
--- /dev/null
+++ b/packages/twenty-website/public/.well-known/microsoft-identity-association.json
@@ -0,0 +1,13 @@
+{
+  "associatedApplications": [
+    {
+      "applicationId": "7ad664fb-ab90-4fb1-bf20-bba9cba9fc69"
+    },
+    {
+      "applicationId": "d4ca5765-1a9c-4b71-b97d-4d806814f8b7"
+    },
+    {
+      "applicationId": "cf541b92-f5ae-4e2b-a54e-4796ec8394e1"
+    }
+  ]
+}
diff --git a/packages/twenty-website/public/images/lab/is-workflow-enabled.png b/packages/twenty-website/public/images/lab/is-workflow-enabled.png
new file mode 100644
index 000000000000..2641aef33da7
Binary files /dev/null and b/packages/twenty-website/public/images/lab/is-workflow-enabled.png differ
diff --git a/packages/twenty-website/public/images/readme/planner-icon.svg b/packages/twenty-website/public/images/readme/planner-icon.svg
new file mode 100644
index 000000000000..1715e5eb522f
--- /dev/null
+++ b/packages/twenty-website/public/images/readme/planner-icon.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg version="1.1" id="_x36_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
+	 viewBox="0 0 512 512"  xml:space="preserve">
+<g>
+	<g>
+		<g>
+			<path style="fill:#504F4F;" d="M512,28.891v308.708c0,0.986-0.071,1.973-0.141,2.959c-0.07,0.916-0.212,1.832-0.423,2.678
+				c-2.819,13.177-14.939,23.112-29.454,23.112H30.018c-1.762,0-3.523-0.141-5.214-0.423c-12.754-2.184-22.76-12.049-24.522-24.522
+				c-0.071-0.493-0.141-1.057-0.141-1.55C0,339.078,0,338.374,0,337.599V28.891c0-1.903,0.212-3.805,0.564-5.638
+				C3.312,10.006,15.502,0,30.018,0h451.964c1.057,0,2.184,0.071,3.241,0.141c1.057,0.141,2.044,0.282,3.1,0.493
+				c11.838,2.466,21.069,11.697,23.183,23.183c0.141,0.704,0.282,1.409,0.352,2.114C511.929,26.918,512,27.904,512,28.891z"/>
+			<path style="fill:#C2C1C1;" d="M80.119,0v366.419H28.82c-1.268,0-2.537-0.071-3.805-0.282
+				c-12.895-1.691-23.042-11.909-24.733-24.733c-0.071-0.493-0.141-1.057-0.141-1.55C0,339.078,0,338.374,0,337.599V28.891
+				c0-1.903,0.212-3.805,0.564-5.638C3.171,10.006,14.798,0,28.82,0H80.119z"/>
+			<path style="fill:#C2C1C1;" d="M512,28.891v308.708c0,0.986-0.071,1.973-0.141,2.959c-1.48,14.445-13.741,25.861-28.679,25.861
+				h-51.298V0h51.298c1.691,0,3.382,0.141,4.933,0.423c11.979,2.114,21.351,11.556,23.465,23.465
+				c0.141,0.705,0.211,1.339,0.282,2.043C511.929,26.918,512,27.904,512,28.891z"/>
+		</g>
+		<g>
+			<path style="fill:#FFFFFF;" d="M246.925,28.905v313.198H62.734c-5.9,0-11.303-2.148-15.463-5.674
+				c-5.176-4.385-8.477-10.941-8.477-18.265V52.844c0-13.224,10.715-23.939,23.94-23.939H246.925z"/>
+			<g>
+				<path style="fill:#FFFFFF;" d="M254.348,28.905v313.198h184.191c5.9,0,11.303-2.148,15.462-5.674
+					c5.176-4.385,8.477-10.941,8.477-18.265V52.844c0-13.224-10.715-23.939-23.94-23.939H254.348z"/>
+			</g>
+		</g>
+		<polygon style="fill:#E14D4B;" points="406.02,0 406.02,91.182 373.818,73.707 341.545,91.182 341.545,0 		"/>
+		<path style="fill:#FFFFFF;" d="M387.656,36.571h-11.063v-0.07l-3.03-9.372l-0.423-1.409h-0.141l-0.423,1.409l-3.1,9.442h-11.063
+			v0.141l8.949,6.624l-1.127,3.523l-2.396,7.328l0.141,0.071l9.09-6.765l9.02,6.765l0.141-0.071l-3.523-10.851l8.949-6.624V36.571z"
+			/>
+		<rect x="73.178" y="75.654" style="fill:#D8D8D8;" width="145.522" height="72.479"/>
+		<rect x="282.812" y="102.763" style="fill:#D8D8D8;" width="42.42" height="41.549"/>
+		<rect x="335.706" y="102.763" style="fill:#D8D8D8;" width="42.42" height="41.549"/>
+		<rect x="388.6" y="103.253" style="fill:#D8D8D8;" width="42.42" height="41.549"/>
+		<rect x="73.178" y="170.951" style="fill:#D8D8D8;" width="145.522" height="6.782"/>
+		<rect x="73.178" y="207.12" style="fill:#D8D8D8;" width="145.522" height="6.782"/>
+		<rect x="73.178" y="250.071" style="fill:#D8D8D8;" width="145.522" height="6.782"/>
+		<rect x="73.178" y="283.98" style="fill:#D8D8D8;" width="145.522" height="6.782"/>
+		<g>
+			<rect x="283.411" y="170.951" style="fill:#D8D8D8;" width="145.522" height="6.782"/>
+			<rect x="283.411" y="207.12" style="fill:#D8D8D8;" width="145.522" height="6.782"/>
+			<rect x="283.411" y="250.071" style="fill:#D8D8D8;" width="145.522" height="6.782"/>
+			<rect x="283.411" y="283.98" style="fill:#D8D8D8;" width="145.522" height="6.782"/>
+		</g>
+	</g>
+	<path style="opacity:0.03;fill:#040000;" d="M507.842,28.82v308.708c0,0.423-0.141,0.704-0.141,1.127
+		c-0.563,14.868-12.402,26.988-27.199,27.693c-0.493,0.071-0.987,0.071-1.48,0.071h-51.369v-0.071H49.255l30.864-30.864
+		l44.746-44.745l6.764-6.765l27.129-27.129l6.764-6.765l36.149-36.149l6.835-6.835l45.873-45.873l30.934-30.934l27.552-27.552
+		l54.117-54.117l10.358-10.288v-0.071l9.372-9.372L406.02,9.583L415.603,0h63.419c3.805,0,7.399,0.775,10.781,2.114
+		c7.117,2.889,12.825,8.597,15.714,15.714c1.268,3.03,2.044,6.342,2.184,9.794C507.701,28.045,507.842,28.468,507.842,28.82z"/>
+</g>
+</svg>
\ No newline at end of file
diff --git a/packages/twenty-website/public/images/releases/0.40/0.40-aggregates.png b/packages/twenty-website/public/images/releases/0.40/0.40-aggregates.png
new file mode 100644
index 000000000000..26f2c6fcfc4b
Binary files /dev/null and b/packages/twenty-website/public/images/releases/0.40/0.40-aggregates.png differ
diff --git a/packages/twenty-website/public/images/releases/0.40/0.40-group-by.png b/packages/twenty-website/public/images/releases/0.40/0.40-group-by.png
new file mode 100644
index 000000000000..80a0718b7d27
Binary files /dev/null and b/packages/twenty-website/public/images/releases/0.40/0.40-group-by.png differ
diff --git a/packages/twenty-website/src/content/developers/backend-development/server-commands.mdx b/packages/twenty-website/src/content/developers/backend-development/server-commands.mdx
index 441d07c7410d..94a8bd4d40f5 100644
--- a/packages/twenty-website/src/content/developers/backend-development/server-commands.mdx
+++ b/packages/twenty-website/src/content/developers/backend-development/server-commands.mdx
@@ -48,7 +48,7 @@ npx nx run twenty-server:database:reset
 #### For objects in Core/Metadata schemas (TypeORM)
 
 ```bash
-npx nx run twenty-server:typeorm --migration:generate src/database/typeorm/metadata/migrations/nameOfYourMigration -d src/database/typeorm/metadata/metadata.datasource.ts # replace by core data source if necessary
+npx nx run twenty-server:typeorm migration:generate src/database/typeorm/metadata/migrations/nameOfYourMigration -d src/database/typeorm/metadata/metadata.datasource.ts # replace by core data source if necessary
 ```
 
 #### For Workspace objects
@@ -98,4 +98,4 @@ Here's what the tech stack now looks like.
 **Development**
 - [AWS EKS](https://aws.amazon.com/eks/) 
 
-<ArticleEditContent></ArticleEditContent>
\ No newline at end of file
+<ArticleEditContent></ArticleEditContent>
diff --git a/packages/twenty-website/src/content/developers/frontend-development/frontend-commands.mdx b/packages/twenty-website/src/content/developers/frontend-development/frontend-commands.mdx
index c7effad7b6ef..e7e4ed08dce3 100644
--- a/packages/twenty-website/src/content/developers/frontend-development/frontend-commands.mdx
+++ b/packages/twenty-website/src/content/developers/frontend-development/frontend-commands.mdx
@@ -28,6 +28,13 @@ npx nx run twenty-front:graphql:generate
 npx nx run twenty-front:lint # pass --fix to fix lint errors
 ```
 
+## Translations
+
+```bash
+npx nx run twenty-front:lingui:extract
+npx nx run twenty-front:lingui:compile
+```
+
 ### Test
 
 ```bash
diff --git a/packages/twenty-website/src/content/developers/frontend-development/hotkeys.mdx b/packages/twenty-website/src/content/developers/frontend-development/hotkeys.mdx
index 3e7103ba6808..c490a2fc1d06 100644
--- a/packages/twenty-website/src/content/developers/frontend-development/hotkeys.mdx
+++ b/packages/twenty-website/src/content/developers/frontend-development/hotkeys.mdx
@@ -16,9 +16,9 @@ For example, if you have a page that listens for the Enter key, and a modal that
 
 To handle this problem, we have a custom hook that makes it possible to listen to hotkeys without any conflict.
 
-You place it in a component and it will listen to the hotkeys only when the component is mounted AND when the specified **hotkey scope** is active.
+You place it in a component, and it will listen to the hotkeys only when the component is mounted AND when the specified **hotkey scope** is active.
 
-## How to listen for hotkeys in practice ?
+## How to listen for hotkeys in practice?
 
 There are two steps involved in setting up hotkey listening :
 1. Set the [hotkey scope](#what-is-a-hotkey-scope-) that will listen to hotkeys
@@ -131,7 +131,7 @@ It's important to use this pattern when you're not sure that just using a useEff
 
 Those conflicts can be hard to debug, and it might happen more often than not with useEffects.
 
-## What is a hotkey scope ?
+## What is a hotkey scope?
 
 A hotkey scope is a string that represents a context in which the hotkeys are active. It is generally encoded as an enum.
 
@@ -171,7 +171,7 @@ export const currentHotkeyScopeState = createState<HotkeyScope>({
 
 But this Recoil state should never be handled manually ! We'll see how to use it in the next section.
 
-## How is it working internally ? 
+## How is it working internally?
 
 We made a thin wrapper on top of [react-hotkeys-hook](https://react-hotkeys-hook.vercel.app/docs/intro) that makes it more performant and avoids unnecessary re-renders.
 
diff --git a/packages/twenty-website/src/content/developers/frontend-development/work-with-figma.mdx b/packages/twenty-website/src/content/developers/frontend-development/work-with-figma.mdx
index 746996ac7fd4..e2c4e4b87e58 100644
--- a/packages/twenty-website/src/content/developers/frontend-development/work-with-figma.mdx
+++ b/packages/twenty-website/src/content/developers/frontend-development/work-with-figma.mdx
@@ -31,7 +31,7 @@ On the left sidebar, you can access the different pages of Twenty's Figma. This
 
 ## Useful Tips
 
-With read-only access, you can't edit the design but you can access all features that will be useful to convert the designs into code.
+With read-only access, you can't edit the design, but you can access all features that will be useful to convert the designs into code.
 
 ### Use the Dev mode
 
diff --git a/packages/twenty-website/src/content/developers/self-hosting/docker-compose.mdx b/packages/twenty-website/src/content/developers/self-hosting/docker-compose.mdx
index 806f3071130b..fa2f2bc63d17 100644
--- a/packages/twenty-website/src/content/developers/self-hosting/docker-compose.mdx
+++ b/packages/twenty-website/src/content/developers/self-hosting/docker-compose.mdx
@@ -44,7 +44,7 @@ Follow these steps for a manual setup.
 
     Copy the example environment file to a new .env file in your working directory:
     ```bash
-    curl -o .env https://raw.githubusercontent.com/twentyhq/twenty/refs/tags/v0.32.0/packages/twenty-docker/.env.example
+    curl -o .env https://raw.githubusercontent.com/twentyhq/twenty/refs/tags/v0.35.0/packages/twenty-docker/.env.example
     ```
 
 2. **Generate Secret Tokens**
@@ -76,14 +76,14 @@ Follow these steps for a manual setup.
 Download the `docker-compose.yml` file to your working directory:
 
 ```bash
-curl -O https://raw.githubusercontent.com/twentyhq/twenty/refs/tags/v0.32.0/packages/twenty-docker/docker-compose.yml
+curl -O https://raw.githubusercontent.com/twentyhq/twenty/refs/tags/v0.35.0/packages/twenty-docker/docker-compose.yml
 ```
 
 ### Step 3: Launch the Application
 
 Start the Docker containers:
 ```bash
-docker-compose up -d
+docker compose up -d
 ```
 
 ### Step 4: Access the Application
@@ -158,8 +158,8 @@ We strongly recommend setting up Twenty behind a reverse proxy with SSL terminat
 
     For changes to take effect, restart the Docker containers:
     ```bash
-        docker-compose down
-        docker-compose up -d
+    docker compose down
+    docker compose up -d
     ```
 
 #### Considerations
diff --git a/packages/twenty-website/src/content/developers/self-hosting/setup.mdx b/packages/twenty-website/src/content/developers/self-hosting/setup.mdx
index 1c63ee63da30..d0110ae57d64 100644
--- a/packages/twenty-website/src/content/developers/self-hosting/setup.mdx
+++ b/packages/twenty-website/src/content/developers/self-hosting/setup.mdx
@@ -40,6 +40,12 @@ Under [Credentials](https://console.cloud.google.com/apis/credentials), in OAuth
 - `https://<your-domain>/auth/google/redirect` if you want to use Google SSO
 - `https://<your-domain>/auth/google-apis/get-access-token`
 
+### Configure scopes
+[See relevant source code](https://github.com/twentyhq/twenty/blob/main/packages/twenty-server/src/engine/core-modules/auth/utils/get-google-apis-oauth-scopes.ts#L4-L10)
+- 'https://www.googleapis.com/auth/calendar.events'
+- 'https://www.googleapis.com/auth/gmail.readonly'
+- 'https://www.googleapis.com/auth/profile.emails.read'
+
 ### If your app is in test mode
 
 If your app is in test mode, you will need to add test users to your project.
@@ -54,6 +60,71 @@ Register the following recurring jobs:
 yarn command:prod cron:messaging:messages-import
 yarn command:prod cron:messaging:message-list-fetch
 yarn command:prod cron:calendar:calendar-event-list-fetch
+yarn command:prod cron:calendar:calendar-events-import
+yarn command:prod cron:messaging:ongoing-stale
+yarn command:prod cron:calendar:ongoing-stale
+```
+
+## For Outlook and Outlook Calendar (Microsoft 365)
+
+<ArticleWarning>
+Users must have a [Microsoft 365 Licence](https://admin.microsoft.com/Adminportal/Home) to be able to use the Calendar and Messaging API. They will not be able to sync their account on Twenty without one.
+</ArticleWarning>
+
+### Create a project in Microsoft Azure
+
+You will need to create a project in [Microsoft Azure](https://portal.azure.com/#view/Microsoft_AAD_IAM/AppGalleryBladeV2) and get the credentials.
+
+Then you can set the following environment variables:
+
+- `AUTH_MICROSOFT_ENABLED=true`
+- `AUTH_MICROSOFT_CLIENT_ID=<client-id>`
+- `AUTH_MICROSOFT_CLIENT_SECRET=<client-secret>`
+- `AUTH_MICROSOFT_CALLBACK_URL=https://<your-domain>/auth/microsoft/redirect` if you want to use Microsoft SSO
+- `AUTH_MICROSOFT_APIS_CALLBACK_URL=https://<your-domain>/auth/microsoft-apis/get-access-token`
+
+### Enable APIs
+
+On Microsoft Azure Console enable the following APIs in "Permissions":
+
+- Microsoft Graph: Mail.Read
+- Microsoft Graph: Calendars.Read
+- Microsoft Graph: User.Read.All
+- Microsoft Graph: openid
+- Microsoft Graph: email
+- Microsoft Graph: profile
+- Microsoft Graph: offline_access
+
+### Authorized redirect URIs
+
+You need to add the following redirect URIs to your project:
+- `https://<your-domain>/auth/microsoft/redirect` if you want to use Microsoft SSO
+- `https://<your-domain>/auth/microsoft-apis/get-access-token`
+
+### Configure scopes
+[See relevant source code](https://github.com/twentyhq/twenty/blob/main/packages/twenty-server/src/engine/core-modules/auth/utils/get-microsoft-apis-oauth-scopes.ts#L2-L9)
+- 'openid'
+- 'email'
+- 'profile'
+- 'offline_access'
+- 'Mail.Read'
+- 'Calendars.Read
+
+### If your app is in test mode
+
+If your app is in test mode, you will need to add test users to your project.
+
+Add your test users to the "Users and groups" section.
+
+### Start the cron jobs
+
+Register the following recurring jobs:
+```
+# from your worker container
+yarn command:prod cron:messaging:messages-import
+yarn command:prod cron:messaging:message-list-fetch
+yarn command:prod cron:calendar:calendar-event-list-fetch
+yarn command:prod cron:calendar:calendar-events-import
 yarn command:prod cron:messaging:ongoing-stale
 yarn command:prod cron:calendar:ongoing-stale
 ```
@@ -116,11 +187,9 @@ yarn command:prod cron:calendar:ongoing-stale
     ['AUTH_GOOGLE_CLIENT_SECRET', '', 'Google client secret'],
     ['AUTH_GOOGLE_CALLBACK_URL', 'https://[YourDomain]/auth/google/redirect', 'Google auth callback'],
     ['AUTH_MICROSOFT_ENABLED', 'false', 'Enable Microsoft SSO login'],
-    ['AUTH_SSO_ENABLED', 'false', 'Enable SSO with SAML or OIDC'],
     ['AUTH_MICROSOFT_CLIENT_ID', '', 'Microsoft client ID'],
-    ['AUTH_MICROSOFT_TENANT_ID', '', 'Microsoft tenant ID'],
     ['AUTH_MICROSOFT_CLIENT_SECRET', '', 'Microsoft client secret'],
-    ['AUTH_MICROSOFT_CALLBACK_URL', 'http://[YourDomain]/auth/microsoft/redirect', 'Microsoft auth callback'],
+    ['AUTH_MICROSOFT_CALLBACK_URL', 'https://[YourDomain]/auth/microsoft/redirect', 'Microsoft auth callback'],
     ['AUTH_MICROSOFT_APIS_CALLBACK_URL', 'http://[YourDomain]/auth/microsoft-apis/get-access-token', 'Microsoft APIs auth callback'],
     ['IS_MULTIWORKSPACE_ENABLED', 'false', 'Allows the use of multiple workspaces. Requires a web server that can manage wildcards for subdomains.'],
     ['PASSWORD_RESET_TOKEN_EXPIRES_IN', '5m', 'Password reset token expiration time'],
@@ -129,6 +198,8 @@ yarn command:prod cron:calendar:ongoing-stale
 ### Email
 
 <ArticleTable options={[
+    ['IS_EMAIL_VERIFICATION_REQUIRED', 'false', 'If enabled, users must verify their email address before signing in. When true, users will receive a verification email after registration'],
+    ['EMAIL_VERIFICATION_TOKEN_EXPIRES_IN', '1h', 'How long email verification tokens remain valid before requiring a new verification email'],
     ['EMAIL_FROM_ADDRESS', 'contact@yourdomain.com', 'Global email From: header used to send emails'],
     ['EMAIL_FROM_NAME', 'John from YourDomain', 'Global name From: header used to send emails'],
     ['EMAIL_SYSTEM_ADDRESS', 'system@yourdomain.com', 'Email address used as a destination to send internal system notification'],
@@ -156,24 +227,24 @@ yarn command:prod cron:calendar:ongoing-stale
 
   <ArticleTab>
 
-    Keep in mind that if you have 2FA enabled, you will need to provision an [App Password](https://support.microsoft.com/en-us/account-billing/manage-app-passwords-for-two-step-verification-d6dc8c6d-4bf7-4851-ad95-6d07799387e9).
-    - EMAIL_DRIVER=smtp
-    - EMAIL_SMTP_HOST=smtp.office365.com
-    - EMAIL_SMTP_PORT=587
-    - EMAIL_SMTP_USER=office365_email_address
+  Keep in mind that if you have 2FA enabled, you will need to provision an [App Password](https://support.microsoft.com/en-us/account-billing/manage-app-passwords-for-two-step-verification-d6dc8c6d-4bf7-4851-ad95-6d07799387e9).
+  - EMAIL_DRIVER=smtp
+  - EMAIL_SMTP_HOST=smtp.office365.com
+  - EMAIL_SMTP_PORT=587
+  - EMAIL_SMTP_USER=office365_email_address
     - EMAIL_SMTP_PASSWORD='office365_password'
 
   </ArticleTab>
 
   <ArticleTab>
 
-    **smtp4dev** is a fake SMTP email server for development and testing.
-    - Run the smtp4dev image: `docker run --rm -it -p 8090:80 -p 2525:25 rnwood/smtp4dev`
-    - Access the smtp4dev ui here: [http://localhost:8090](http://localhost:8090)
-    - Set the following env variables:
-      - EMAIL_DRIVER=smtp
-      - EMAIL_SMTP_HOST=localhost
-      - EMAIL_SMTP_PORT=2525
+  **smtp4dev** is a fake SMTP email server for development and testing.
+  - Run the smtp4dev image: `docker run --rm -it -p 8090:80 -p 2525:25 rnwood/smtp4dev`
+  - Access the smtp4dev ui here: [http://localhost:8090](http://localhost:8090)
+  - Set the following env variables:
+    - EMAIL_DRIVER=smtp
+    - EMAIL_SMTP_HOST=localhost
+    - EMAIL_SMTP_PORT=2525
 
   </ArticleTab>
 
diff --git a/packages/twenty-website/src/content/developers/self-hosting/troubleshooting.mdx b/packages/twenty-website/src/content/developers/self-hosting/troubleshooting.mdx
index bff94051caf0..57b42372b4ba 100644
--- a/packages/twenty-website/src/content/developers/self-hosting/troubleshooting.mdx
+++ b/packages/twenty-website/src/content/developers/self-hosting/troubleshooting.mdx
@@ -70,6 +70,12 @@ Most of the time, it's because the `worker` is not running in the background. Tr
 npx nx worker twenty-server
 ```
 
+#### Cannot connect my Microsoft 365 account
+
+Most of the time, it's because your admin has not enabled the Microsoft 365 Licence for your account. Check [https://admin.microsoft.com/](https://admin.microsoft.com/Adminportal/Home).  
+
+If you have an error code `AADSTS50020`, it probably means that you are using a personal Microsoft account. This is not supported yet. More info [here](https://learn.microsoft.com/fr-fr/troubleshoot/entra/entra-id/app-integration/error-code-aadsts50020-user-account-identity-provider-does-not-exist) 
+
 #### While running `yarn` warnings appear in console
 
 Warnings are informing about pulling additional dependencies which aren't explicitly stated in `package.json`, so as long as no breaking error appears, everything should work as expected.
@@ -90,8 +96,8 @@ If you can't log in after setup:
     ```
 2. Restart the Docker containers:
     ```bash
-    docker-compose down
-    docker-compose up -d
+    docker compose down
+    docker compose up -d
     ```
 
 Note the database:reset command will completely erase your database and recreate it from scratch. 
@@ -121,7 +127,7 @@ If you encounter issues not covered in this guide:
 
     View container logs for error messages:
     ```bash
-    docker-compose logs
+    docker compose logs
     ```
 
 - Community Support:
diff --git a/packages/twenty-website/src/content/developers/self-hosting/upgrade-guide.mdx b/packages/twenty-website/src/content/developers/self-hosting/upgrade-guide.mdx
index f5a879ae7dd5..57737878577c 100644
--- a/packages/twenty-website/src/content/developers/self-hosting/upgrade-guide.mdx
+++ b/packages/twenty-website/src/content/developers/self-hosting/upgrade-guide.mdx
@@ -19,11 +19,26 @@ If you used Docker Compose, follow these steps:
 
 2. Upgrade the version by changing the `TAG` value in the .env file near your docker-compose.
 
-3. Bring Twenty back online with `docker-compose up -d`
+3. Bring Twenty back online with `docker compose up -d`
+
+If you want to upgrade your instance by few versions, e.g. from 0.33.0 to 0.35.0, you have to upgrade your instance sequentially, in this example from 0.33.0 to 0.34.0, then from 0.34.0 to 0.35.0.
 
 
 ## Version-specific upgrade steps
 
+### v0.35.0 to v0.40.0
+
+Upgrade your Twenty instance to use v0.40.0 image
+
+```
+yarn database:migrate:prod
+yarn command:prod upgrade-0.40
+```
+
+**Environment Variables**
+
+- Added: `IS_EMAIL_VERIFICATION_REQUIRED`, `EMAIL_VERIFICATION_TOKEN_EXPIRES_IN`, `WORKFLOW_EXEC_THROTTLE_LIMIT`, `WORKFLOW_EXEC_THROTTLE_TTL`
+
 ### v0.34.0 to v0.35.0
 
 Upgrade your Twenty instance to use v0.35.0 image
@@ -75,6 +90,8 @@ The `yarn command:prod cache:flush` command will flush the Redis cache.
 The `yarn database:migrate:prod` command will apply the migrations to the database structure (core and metadata schemas)
 The `yarn command:prod upgrade-0.33` takes care of the data migration of all workspaces.
 
+Starting from this version, twenty-postgres image for DB became deprecated and twenty-postgres-spilo is used instead.
+If you want to keep using twenty-postgres image, simply replace `twentycrm/twenty-postgres:${TAG}` with `twentycrm/twenty-postgres` in docker-compose.yml.
 
 ### v0.31.0 to v0.32.0
 
diff --git a/packages/twenty-website/src/content/releases/0.40.0.mdx b/packages/twenty-website/src/content/releases/0.40.0.mdx
new file mode 100644
index 000000000000..d3715902e3e4
--- /dev/null
+++ b/packages/twenty-website/src/content/releases/0.40.0.mdx
@@ -0,0 +1,17 @@
+---
+release: 0.40.0
+Date: January 17th 2025
+---
+
+# View Groups
+
+Added "Group By" in tables to better organize entries, like grouping companies by industry for clearer data visualization. This feature is available in the table Options menu.
+
+![](/images/releases/0.40/0.40-group-by.png)
+
+
+# Aggregates
+
+Introduced a feature to calculate and display data summaries, such as sums and latest entries, for quick insights and streamlined data analysis.
+
+![](/images/releases/0.40/0.40-aggregates.png)
\ No newline at end of file
diff --git a/packages/twenty-website/src/shared-utils/wrapHeadingsWithAnchor.tsx b/packages/twenty-website/src/shared-utils/wrapHeadingsWithAnchor.tsx
index f02f385b9ae5..a80a9277e29d 100644
--- a/packages/twenty-website/src/shared-utils/wrapHeadingsWithAnchor.tsx
+++ b/packages/twenty-website/src/shared-utils/wrapHeadingsWithAnchor.tsx
@@ -24,7 +24,7 @@ export const wrapHeadingsWithAnchor = (children: ReactNode): ReactNode => {
         .replace(/\s+/g, '-')
         .toLowerCase();
       return cloneElement(child as ReactElement<any>, {
-        id: id,
+        id,
         className: 'anchor',
         children: <a href={`#${id}`}>{child.props.children}</a>,
       });
diff --git a/packages/twenty-zapier/package.json b/packages/twenty-zapier/package.json
index 4c57386e990a..aaa1e8898770 100644
--- a/packages/twenty-zapier/package.json
+++ b/packages/twenty-zapier/package.json
@@ -1,19 +1,15 @@
 {
   "name": "twenty-zapier",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Effortlessly sync Twenty with 3000+ apps. Automate tasks, boost productivity, and supercharge your customer relationships!",
   "main": "src/index.ts",
   "scripts": {
     "nx": "NX_DEFAULT_PROJECT=twenty-zapier node ../../node_modules/nx/bin/nx.js",
     "format": "prettier . --write \"!build\"",
     "test": "yarn build && jest --testTimeout 10000 --rootDir ./lib/test",
-    "build": "yarn clean && tsc",
-    "deploy": "yarn build && zapier push",
     "validate": "yarn build && zapier validate",
     "versions": "yarn build && zapier versions",
-    "clean": "rimraf ./lib ./build",
-    "watch": "yarn clean && tsc --watch",
-    "_zapier-build": "yarn build"
+    "watch": "yarn clean && npx tsc --watch"
   },
   "engines": {
     "node": "^18.17.1",
diff --git a/packages/twenty-zapier/project.json b/packages/twenty-zapier/project.json
new file mode 100644
index 000000000000..b8e858dc8267
--- /dev/null
+++ b/packages/twenty-zapier/project.json
@@ -0,0 +1,32 @@
+{
+  "name": "twenty-zapier",
+  "projectType": "application",
+  "tags": ["scope:zapier"],
+  "targets": {
+    "build": {
+      "outputs": ["{projectRoot}/lib"],
+      "executor": "nx:run-commands",
+      "options": {
+        "cwd": "{projectRoot}",
+        "commands": ["nx run twenty-zapier:clean && tsc"]
+      },
+      "dependsOn": ["^build"]
+    },
+    "clean": {
+      "executor": "nx:run-commands",
+      "options": {
+        "cwd": "{projectRoot}",
+        "commands": ["rimraf ./lib ./build"]
+      }
+    },
+    "deploy": {
+      "executor": "nx:run-commands",
+      "options": {
+        "cwd": "{projectRoot}",
+        "commands": [
+          "nx run twenty-zapier:build && cp -r ../twenty-shared/ node_modules/twenty-shared && zapier push --skip-npm-install"
+        ]
+      }
+    }
+  }
+}
diff --git a/packages/twenty-zapier/src/creates/crud_record.ts b/packages/twenty-zapier/src/creates/crud_record.ts
index eaa4c2a3dd8a..0d6eb4740c8f 100644
--- a/packages/twenty-zapier/src/creates/crud_record.ts
+++ b/packages/twenty-zapier/src/creates/crud_record.ts
@@ -1,8 +1,8 @@
 import { Bundle, ZObject } from 'zapier-platform-core';
 
+import { capitalize } from 'twenty-shared';
 import { findObjectNamesSingularKey } from '../triggers/find_object_names_singular';
 import { listRecordIdsKey } from '../triggers/list_record_ids';
-import { capitalize } from '../utils/capitalize';
 import { computeInputFields } from '../utils/computeInputFields';
 import { InputData } from '../utils/data.types';
 import handleQueryParams from '../utils/handleQueryParams';
diff --git a/packages/twenty-zapier/src/test/utils/capitalize.test.ts b/packages/twenty-zapier/src/test/utils/capitalize.test.ts
deleted file mode 100644
index 96e7bdf34a36..000000000000
--- a/packages/twenty-zapier/src/test/utils/capitalize.test.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { capitalize } from '../../utils/capitalize';
-
-describe('capitalize', () => {
-  test('should capitalize properly', () => {
-    expect(capitalize('word')).toEqual('Word');
-    expect(capitalize('word word')).toEqual('Word word');
-  });
-});
diff --git a/packages/twenty-zapier/src/test/utils/computeInputFields.test.ts b/packages/twenty-zapier/src/test/utils/computeInputFields.test.ts
index fe76d7bed70d..44ac0afc3166 100644
--- a/packages/twenty-zapier/src/test/utils/computeInputFields.test.ts
+++ b/packages/twenty-zapier/src/test/utils/computeInputFields.test.ts
@@ -1,5 +1,6 @@
+import { FieldMetadataType } from 'twenty-shared';
 import { computeInputFields } from '../../utils/computeInputFields';
-import { FieldMetadataType, InputField } from '../../utils/data.types';
+import { InputField } from '../../utils/data.types';
 
 describe('computeInputFields', () => {
   test('should create Person input fields properly', () => {
@@ -89,16 +90,6 @@ describe('computeInputFields', () => {
               defaultValue: null,
             },
           },
-          {
-            node: {
-              type: FieldMetadataType.LINK,
-              name: 'xLink',
-              label: 'X',
-              description: 'Contact’s X/Twitter account',
-              isNullable: true,
-              defaultValue: null,
-            },
-          },
           {
             node: {
               type: FieldMetadataType.LINKS,
@@ -109,18 +100,6 @@ describe('computeInputFields', () => {
               defaultValue: null,
             },
           },
-          {
-            node: {
-              type: FieldMetadataType.EMAIL,
-              name: 'email',
-              label: 'Email',
-              description: 'Contact’s Email',
-              isNullable: false,
-              defaultValue: {
-                value: '',
-              },
-            },
-          },
           {
             node: {
               type: FieldMetadataType.UUID,
diff --git a/packages/twenty-zapier/src/utils/capitalize.ts b/packages/twenty-zapier/src/utils/capitalize.ts
deleted file mode 100644
index 046620ddf38c..000000000000
--- a/packages/twenty-zapier/src/utils/capitalize.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export const capitalize = (word: string): string => {
-  return word.charAt(0).toUpperCase() + word.slice(1);
-};
diff --git a/packages/twenty-zapier/src/utils/computeInputFields.ts b/packages/twenty-zapier/src/utils/computeInputFields.ts
index 0802361469f1..570c0b9323c0 100644
--- a/packages/twenty-zapier/src/utils/computeInputFields.ts
+++ b/packages/twenty-zapier/src/utils/computeInputFields.ts
@@ -1,9 +1,5 @@
-import {
-  FieldMetadataType,
-  InputField,
-  Node,
-  NodeField,
-} from '../utils/data.types';
+import { FieldMetadataType } from 'twenty-shared';
+import { InputField, Node, NodeField } from '../utils/data.types';
 
 const getListFromFieldMetadataType = (fieldMetadataType: FieldMetadataType) => {
   return fieldMetadataType === FieldMetadataType.ARRAY;
@@ -16,9 +12,6 @@ const getTypeFromFieldMetadataType = (
     case FieldMetadataType.UUID:
     case FieldMetadataType.TEXT:
     case FieldMetadataType.RICH_TEXT:
-    case FieldMetadataType.PHONE:
-    case FieldMetadataType.EMAIL:
-    case FieldMetadataType.LINK:
     case FieldMetadataType.ARRAY:
     case FieldMetadataType.RATING:
       return 'string';
@@ -59,25 +52,6 @@ const get_subfieldsFromField = (nodeField: NodeField): NodeField[] => {
       };
       return [firstName, lastName];
     }
-    case FieldMetadataType.LINK: {
-      const url: NodeField = {
-        type: FieldMetadataType.TEXT,
-        name: 'url',
-        label: 'Url',
-        description: 'Link Url',
-        isNullable: true,
-        defaultValue: null,
-      };
-      const label: NodeField = {
-        type: FieldMetadataType.TEXT,
-        name: 'label',
-        label: 'Label',
-        description: 'Link Label',
-        isNullable: true,
-        defaultValue: null,
-      };
-      return [url, label];
-    }
     case FieldMetadataType.CURRENCY: {
       const amountMicros: NodeField = {
         type: FieldMetadataType.NUMBER,
@@ -244,7 +218,6 @@ export const computeInputFields = (
     const nodeField = field.node;
     switch (nodeField.type) {
       case FieldMetadataType.FULL_NAME:
-      case FieldMetadataType.LINK:
       case FieldMetadataType.CURRENCY:
       case FieldMetadataType.PHONES:
       case FieldMetadataType.EMAILS:
@@ -266,8 +239,6 @@ export const computeInputFields = (
       case FieldMetadataType.UUID:
       case FieldMetadataType.TEXT:
       case FieldMetadataType.RICH_TEXT:
-      case FieldMetadataType.PHONE:
-      case FieldMetadataType.EMAIL:
       case FieldMetadataType.DATE_TIME:
       case FieldMetadataType.DATE:
       case FieldMetadataType.BOOLEAN:
diff --git a/packages/twenty-zapier/src/utils/data.types.ts b/packages/twenty-zapier/src/utils/data.types.ts
index 776b8c8cc3e4..13e3b6ecef77 100644
--- a/packages/twenty-zapier/src/utils/data.types.ts
+++ b/packages/twenty-zapier/src/utils/data.types.ts
@@ -1,3 +1,5 @@
+import { FieldMetadataType } from 'twenty-shared';
+
 export type InputData = { [x: string]: any };
 
 export type NodeField = {
@@ -32,37 +34,6 @@ export type InputField = {
   placeholder?: string;
 };
 
-export enum FieldMetadataType {
-  UUID = 'UUID',
-  TEXT = 'TEXT',
-  PHONE = 'PHONE',
-  PHONES = 'PHONES',
-  EMAIL = 'EMAIL',
-  EMAILS = 'EMAILS',
-  DATE_TIME = 'DATE_TIME',
-  DATE = 'DATE',
-  BOOLEAN = 'BOOLEAN',
-  NUMBER = 'NUMBER',
-  NUMERIC = 'NUMERIC',
-  LINK = 'LINK',
-  LINKS = 'LINKS',
-  CURRENCY = 'CURRENCY',
-  FULL_NAME = 'FULL_NAME',
-  RATING = 'RATING',
-  SELECT = 'SELECT',
-  MULTI_SELECT = 'MULTI_SELECT',
-  POSITION = 'POSITION',
-  ADDRESS = 'ADDRESS',
-  RICH_TEXT = 'RICH_TEXT',
-  ARRAY = 'ARRAY',
-
-  // Ignored fieldTypes
-  RELATION = 'RELATION',
-  RAW_JSON = 'RAW_JSON',
-  ACTOR = 'ACTOR',
-  TS_VECTOR = 'TS_VECTOR',
-}
-
 export type Schema = {
   data: {
     objects: {
diff --git a/packages/twenty-zapier/tsconfig.json b/packages/twenty-zapier/tsconfig.json
index 3e011dd8a419..72ac9b8071df 100644
--- a/packages/twenty-zapier/tsconfig.json
+++ b/packages/twenty-zapier/tsconfig.json
@@ -8,7 +8,7 @@
     "rootDir": "./src",
     "strict": true,
     "esModuleInterop": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
   },
   "exclude": [
     "jest.config.ts"
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 070d6c360d17..1214a784e0f8 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -13,13 +13,7 @@
     "lib": ["es2020", "dom"],
     "skipLibCheck": true,
     "skipDefaultLibCheck": true,
-    "resolveJsonModule": true,
-    "baseUrl": ".",
-    "paths": {
-      "twenty-emails": ["packages/twenty-emails/src/index.ts"],
-      "twenty-ui": ["packages/twenty-ui/src/index.ts"],
-      "twenty-shared": ["packages/twenty-shared/dist"]
-    }
+    "resolveJsonModule": true
   },
   "exclude": ["node_modules", "tmp"]
 }
diff --git a/yarn.lock b/yarn.lock
index 352de163adde..db22733ffedb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1610,6 +1610,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/code-frame@npm:^7.25.9, @babel/code-frame@npm:^7.26.0, @babel/code-frame@npm:^7.26.2":
+  version: 7.26.2
+  resolution: "@babel/code-frame@npm:7.26.2"
+  dependencies:
+    "@babel/helper-validator-identifier": "npm:^7.25.9"
+    js-tokens: "npm:^4.0.0"
+    picocolors: "npm:^1.0.0"
+  checksum: 10c0/7d79621a6849183c415486af99b1a20b84737e8c11cd55b6544f688c51ce1fd710e6d869c3dd21232023da272a79b91efb3e83b5bc2dc65c1187c5fcd1b72ea8
+  languageName: node
+  linkType: hard
+
 "@babel/compat-data@npm:^7.20.5, @babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.25.2":
   version: 7.25.2
   resolution: "@babel/compat-data@npm:7.25.2"
@@ -1617,6 +1628,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/compat-data@npm:^7.26.5":
+  version: 7.26.5
+  resolution: "@babel/compat-data@npm:7.26.5"
+  checksum: 10c0/9d2b41f0948c3dfc5de44d9f789d2208c2ea1fd7eb896dfbb297fe955e696728d6f363c600cd211e7f58ccbc2d834fe516bb1e4cf883bbabed8a32b038afc1a0
+  languageName: node
+  linkType: hard
+
 "@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.13.16, @babel/core@npm:^7.14.0, @babel/core@npm:^7.14.5, @babel/core@npm:^7.18.9, @babel/core@npm:^7.20.12, @babel/core@npm:^7.21.3, @babel/core@npm:^7.22.5, @babel/core@npm:^7.23.0, @babel/core@npm:^7.23.2, @babel/core@npm:^7.23.5, @babel/core@npm:^7.23.9, @babel/core@npm:^7.24.5, @babel/core@npm:^7.7.5":
   version: 7.25.2
   resolution: "@babel/core@npm:7.25.2"
@@ -1640,6 +1658,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/core@npm:^7.21.0":
+  version: 7.26.0
+  resolution: "@babel/core@npm:7.26.0"
+  dependencies:
+    "@ampproject/remapping": "npm:^2.2.0"
+    "@babel/code-frame": "npm:^7.26.0"
+    "@babel/generator": "npm:^7.26.0"
+    "@babel/helper-compilation-targets": "npm:^7.25.9"
+    "@babel/helper-module-transforms": "npm:^7.26.0"
+    "@babel/helpers": "npm:^7.26.0"
+    "@babel/parser": "npm:^7.26.0"
+    "@babel/template": "npm:^7.25.9"
+    "@babel/traverse": "npm:^7.25.9"
+    "@babel/types": "npm:^7.26.0"
+    convert-source-map: "npm:^2.0.0"
+    debug: "npm:^4.1.0"
+    gensync: "npm:^1.0.0-beta.2"
+    json5: "npm:^2.2.3"
+    semver: "npm:^6.3.1"
+  checksum: 10c0/91de73a7ff5c4049fbc747930aa039300e4d2670c2a91f5aa622f1b4868600fc89b01b6278385fbcd46f9574186fa3d9b376a9e7538e50f8d118ec13cfbcb63e
+  languageName: node
+  linkType: hard
+
 "@babel/generator@npm:^7.14.0, @babel/generator@npm:^7.18.13, @babel/generator@npm:^7.22.5, @babel/generator@npm:^7.23.0, @babel/generator@npm:^7.23.5, @babel/generator@npm:^7.25.0, @babel/generator@npm:^7.7.2":
   version: 7.25.0
   resolution: "@babel/generator@npm:7.25.0"
@@ -1652,6 +1693,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/generator@npm:^7.21.1, @babel/generator@npm:^7.26.0, @babel/generator@npm:^7.26.5":
+  version: 7.26.5
+  resolution: "@babel/generator@npm:7.26.5"
+  dependencies:
+    "@babel/parser": "npm:^7.26.5"
+    "@babel/types": "npm:^7.26.5"
+    "@jridgewell/gen-mapping": "npm:^0.3.5"
+    "@jridgewell/trace-mapping": "npm:^0.3.25"
+    jsesc: "npm:^3.0.2"
+  checksum: 10c0/3be79e0aa03f38858a465d12ee2e468320b9122dc44fc85984713e32f16f4d77ce34a16a1a9505972782590e0b8d847b6f373621f9c6fafa1906d90f31416cb0
+  languageName: node
+  linkType: hard
+
 "@babel/helper-annotate-as-pure@npm:^7.18.6, @babel/helper-annotate-as-pure@npm:^7.24.7":
   version: 7.24.7
   resolution: "@babel/helper-annotate-as-pure@npm:7.24.7"
@@ -1684,6 +1738,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-compilation-targets@npm:^7.25.9":
+  version: 7.26.5
+  resolution: "@babel/helper-compilation-targets@npm:7.26.5"
+  dependencies:
+    "@babel/compat-data": "npm:^7.26.5"
+    "@babel/helper-validator-option": "npm:^7.25.9"
+    browserslist: "npm:^4.24.0"
+    lru-cache: "npm:^5.1.1"
+    semver: "npm:^6.3.1"
+  checksum: 10c0/9da5c77e5722f1a2fcb3e893049a01d414124522bbf51323bb1a0c9dcd326f15279836450fc36f83c9e8a846f3c40e88be032ed939c5a9840922bed6073edfb4
+  languageName: node
+  linkType: hard
+
 "@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.21.0, @babel/helper-create-class-features-plugin@npm:^7.24.7, @babel/helper-create-class-features-plugin@npm:^7.25.0":
   version: 7.25.0
   resolution: "@babel/helper-create-class-features-plugin@npm:7.25.0"
@@ -1749,6 +1816,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-module-imports@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-module-imports@npm:7.25.9"
+  dependencies:
+    "@babel/traverse": "npm:^7.25.9"
+    "@babel/types": "npm:^7.25.9"
+  checksum: 10c0/078d3c2b45d1f97ffe6bb47f61961be4785d2342a4156d8b42c92ee4e1b7b9e365655dd6cb25329e8fe1a675c91eeac7e3d04f0c518b67e417e29d6e27b6aa70
+  languageName: node
+  linkType: hard
+
 "@babel/helper-module-transforms@npm:^7.24.7, @babel/helper-module-transforms@npm:^7.24.8, @babel/helper-module-transforms@npm:^7.25.0, @babel/helper-module-transforms@npm:^7.25.2":
   version: 7.25.2
   resolution: "@babel/helper-module-transforms@npm:7.25.2"
@@ -1763,6 +1840,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-module-transforms@npm:^7.26.0":
+  version: 7.26.0
+  resolution: "@babel/helper-module-transforms@npm:7.26.0"
+  dependencies:
+    "@babel/helper-module-imports": "npm:^7.25.9"
+    "@babel/helper-validator-identifier": "npm:^7.25.9"
+    "@babel/traverse": "npm:^7.25.9"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10c0/ee111b68a5933481d76633dad9cdab30c41df4479f0e5e1cc4756dc9447c1afd2c9473b5ba006362e35b17f4ebddd5fca090233bef8dfc84dca9d9127e56ec3a
+  languageName: node
+  linkType: hard
+
 "@babel/helper-optimise-call-expression@npm:^7.24.7":
   version: 7.24.7
   resolution: "@babel/helper-optimise-call-expression@npm:7.24.7"
@@ -1832,6 +1922,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-string-parser@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-string-parser@npm:7.25.9"
+  checksum: 10c0/7244b45d8e65f6b4338a6a68a8556f2cb161b782343e97281a5f2b9b93e420cad0d9f5773a59d79f61d0c448913d06f6a2358a87f2e203cf112e3c5b53522ee6
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-identifier@npm:^7.22.20, @babel/helper-validator-identifier@npm:^7.24.7":
   version: 7.24.7
   resolution: "@babel/helper-validator-identifier@npm:7.24.7"
@@ -1839,6 +1936,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-validator-identifier@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-validator-identifier@npm:7.25.9"
+  checksum: 10c0/4fc6f830177b7b7e887ad3277ddb3b91d81e6c4a24151540d9d1023e8dc6b1c0505f0f0628ae653601eb4388a8db45c1c14b2c07a9173837aef7e4116456259d
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-option@npm:^7.24.7, @babel/helper-validator-option@npm:^7.24.8":
   version: 7.24.8
   resolution: "@babel/helper-validator-option@npm:7.24.8"
@@ -1846,6 +1950,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-validator-option@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-validator-option@npm:7.25.9"
+  checksum: 10c0/27fb195d14c7dcb07f14e58fe77c44eea19a6a40a74472ec05c441478fa0bb49fa1c32b2d64be7a38870ee48ef6601bdebe98d512f0253aea0b39756c4014f3e
+  languageName: node
+  linkType: hard
+
 "@babel/helper-wrap-function@npm:^7.25.0":
   version: 7.25.0
   resolution: "@babel/helper-wrap-function@npm:7.25.0"
@@ -1867,6 +1978,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helpers@npm:^7.26.0":
+  version: 7.26.0
+  resolution: "@babel/helpers@npm:7.26.0"
+  dependencies:
+    "@babel/template": "npm:^7.25.9"
+    "@babel/types": "npm:^7.26.0"
+  checksum: 10c0/343333cced6946fe46617690a1d0789346960910225ce359021a88a60a65bc0d791f0c5d240c0ed46cf8cc63b5fd7df52734ff14e43b9c32feae2b61b1647097
+  languageName: node
+  linkType: hard
+
 "@babel/highlight@npm:^7.24.7":
   version: 7.24.7
   resolution: "@babel/highlight@npm:7.24.7"
@@ -1890,6 +2011,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/parser@npm:^7.22.0, @babel/parser@npm:^7.25.9, @babel/parser@npm:^7.26.0, @babel/parser@npm:^7.26.5":
+  version: 7.26.5
+  resolution: "@babel/parser@npm:7.26.5"
+  dependencies:
+    "@babel/types": "npm:^7.26.5"
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: 10c0/2e77dd99ee028ee3c10fa03517ae1169f2432751adf71315e4dc0d90b61639d51760d622f418f6ac665ae4ea65f8485232a112ea0e76f18e5900225d3d19a61e
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.25.3":
   version: 7.25.3
   resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.25.3"
@@ -3207,6 +3339,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/template@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/template@npm:7.25.9"
+  dependencies:
+    "@babel/code-frame": "npm:^7.25.9"
+    "@babel/parser": "npm:^7.25.9"
+    "@babel/types": "npm:^7.25.9"
+  checksum: 10c0/ebe677273f96a36c92cc15b7aa7b11cc8bc8a3bb7a01d55b2125baca8f19cae94ff3ce15f1b1880fb8437f3a690d9f89d4e91f16fc1dc4d3eb66226d128983ab
+  languageName: node
+  linkType: hard
+
 "@babel/traverse@npm:^7.14.0, @babel/traverse@npm:^7.16.0, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.23.5, @babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8, @babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.1, @babel/traverse@npm:^7.25.2, @babel/traverse@npm:^7.25.3":
   version: 7.25.3
   resolution: "@babel/traverse@npm:7.25.3"
@@ -3222,6 +3365,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/traverse@npm:^7.25.9":
+  version: 7.26.5
+  resolution: "@babel/traverse@npm:7.26.5"
+  dependencies:
+    "@babel/code-frame": "npm:^7.26.2"
+    "@babel/generator": "npm:^7.26.5"
+    "@babel/parser": "npm:^7.26.5"
+    "@babel/template": "npm:^7.25.9"
+    "@babel/types": "npm:^7.26.5"
+    debug: "npm:^4.3.1"
+    globals: "npm:^11.1.0"
+  checksum: 10c0/0779059ecf63e31446564cf31adf170e701e8017ef02c819c57924a9a83d6b2ce41dbff3ef295589da9410497a3e575655bb8084ca470e0ab1bc193128afa9fe
+  languageName: node
+  linkType: hard
+
 "@babel/types@npm:^7.0.0, @babel/types@npm:^7.16.8, @babel/types@npm:^7.18.13, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.5, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
   version: 7.25.2
   resolution: "@babel/types@npm:7.25.2"
@@ -3233,6 +3391,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/types@npm:^7.21.2, @babel/types@npm:^7.25.9, @babel/types@npm:^7.26.0, @babel/types@npm:^7.26.5":
+  version: 7.26.5
+  resolution: "@babel/types@npm:7.26.5"
+  dependencies:
+    "@babel/helper-string-parser": "npm:^7.25.9"
+    "@babel/helper-validator-identifier": "npm:^7.25.9"
+  checksum: 10c0/0278053b69d7c2b8573aa36dc5242cad95f0d965e1c0ed21ccacac6330092e59ba5949753448f6d6eccf6ad59baaef270295cc05218352e060ea8c68388638c4
+  languageName: node
+  linkType: hard
+
 "@base2/pretty-print-object@npm:1.0.1":
   version: 1.0.1
   resolution: "@base2/pretty-print-object@npm:1.0.1"
@@ -6738,6 +6906,172 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@lingui/babel-plugin-extract-messages@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "@lingui/babel-plugin-extract-messages@npm:5.1.2"
+  checksum: 10c0/57152f6eae9b12d20a8dee9e0fb1c7b31d0f5dcf477c14db77b949d935390f9917dd01c7f746372a74ef81f51f92d79c6e90eea7def01b505e7591955dae41ef
+  languageName: node
+  linkType: hard
+
+"@lingui/babel-plugin-lingui-macro@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "@lingui/babel-plugin-lingui-macro@npm:5.1.2"
+  dependencies:
+    "@babel/core": "npm:^7.20.12"
+    "@babel/runtime": "npm:^7.20.13"
+    "@babel/types": "npm:^7.20.7"
+    "@lingui/conf": "npm:^5.1.2"
+    "@lingui/core": "npm:^5.1.2"
+    "@lingui/message-utils": "npm:^5.1.2"
+  peerDependencies:
+    babel-plugin-macros: 2 || 3
+  peerDependenciesMeta:
+    babel-plugin-macros:
+      optional: true
+  checksum: 10c0/b8b82e19a7b8dd227c2b4d6f6c0759c9cf64be6833cfe8c7e69813b5d8a12d12e56f19c4e9770aec93db92495dc8dc72b95a2b2c1b4bd59414c87090137d74ca
+  languageName: node
+  linkType: hard
+
+"@lingui/cli@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "@lingui/cli@npm:5.1.2"
+  dependencies:
+    "@babel/core": "npm:^7.21.0"
+    "@babel/generator": "npm:^7.21.1"
+    "@babel/parser": "npm:^7.22.0"
+    "@babel/runtime": "npm:^7.21.0"
+    "@babel/types": "npm:^7.21.2"
+    "@lingui/babel-plugin-extract-messages": "npm:^5.1.2"
+    "@lingui/babel-plugin-lingui-macro": "npm:^5.1.2"
+    "@lingui/conf": "npm:^5.1.2"
+    "@lingui/core": "npm:^5.1.2"
+    "@lingui/format-po": "npm:^5.1.2"
+    "@lingui/message-utils": "npm:^5.1.2"
+    babel-plugin-macros: "npm:^3.0.1"
+    chalk: "npm:^4.1.0"
+    chokidar: "npm:3.5.1"
+    cli-table: "npm:^0.3.11"
+    commander: "npm:^10.0.0"
+    convert-source-map: "npm:^2.0.0"
+    date-fns: "npm:^3.6.0"
+    esbuild: "npm:^0.21.5"
+    glob: "npm:^11.0.0"
+    inquirer: "npm:^7.3.3"
+    micromatch: "npm:^4.0.7"
+    normalize-path: "npm:^3.0.0"
+    ora: "npm:^5.1.0"
+    pathe: "npm:^1.1.0"
+    pkg-up: "npm:^3.1.0"
+    pofile: "npm:^1.1.4"
+    pseudolocale: "npm:^2.0.0"
+    ramda: "npm:^0.27.1"
+    source-map: "npm:^0.8.0-beta.0"
+  bin:
+    lingui: ./dist/lingui.js
+  checksum: 10c0/c29055b4d2bcfc50e343dbecb786fac63c084ff6fbfc589979cca46dba8d5b76a7b045b2d3be43a672b53c22222ab68b6341d23eb0fedf0a1345912715c4622d
+  languageName: node
+  linkType: hard
+
+"@lingui/conf@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "@lingui/conf@npm:5.1.2"
+  dependencies:
+    "@babel/runtime": "npm:^7.20.13"
+    chalk: "npm:^4.1.0"
+    cosmiconfig: "npm:^8.0.0"
+    jest-validate: "npm:^29.4.3"
+    jiti: "npm:^1.17.1"
+    lodash.get: "npm:^4.4.2"
+  checksum: 10c0/01a29754db921f920031c4db007d13f0de0bec5ee58978ded0018cfa862819013a06a45349e0c05ac47d0dde3b58d1120fb4f027ae95b8e2b9afcde8d925e061
+  languageName: node
+  linkType: hard
+
+"@lingui/core@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "@lingui/core@npm:5.1.2"
+  dependencies:
+    "@babel/runtime": "npm:^7.20.13"
+    "@lingui/message-utils": "npm:^5.1.2"
+    unraw: "npm:^3.0.0"
+  peerDependencies:
+    "@lingui/babel-plugin-lingui-macro": 5.1.2
+    babel-plugin-macros: 2 || 3
+  peerDependenciesMeta:
+    "@lingui/babel-plugin-lingui-macro":
+      optional: true
+    babel-plugin-macros:
+      optional: true
+  checksum: 10c0/94092bc8630395af5093c0661c1d8f8d6525f09d55be5e68f948e5b9c79e47ef627b12c6102dbe764113695e477a6bb46caae335869b4ef818e452ef202520ac
+  languageName: node
+  linkType: hard
+
+"@lingui/format-po@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "@lingui/format-po@npm:5.1.2"
+  dependencies:
+    "@lingui/conf": "npm:^5.1.2"
+    "@lingui/message-utils": "npm:^5.1.2"
+    date-fns: "npm:^3.6.0"
+    pofile: "npm:^1.1.4"
+  checksum: 10c0/a2c46399e6fb46e75f84e1c30b2642a6fc4c18090efed9f3d28b0f5bad529dd0e86a548987bf92e294248e12fdf29741c0c694f59db2037c2f02458a5521c56f
+  languageName: node
+  linkType: hard
+
+"@lingui/message-utils@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "@lingui/message-utils@npm:5.1.2"
+  dependencies:
+    "@messageformat/parser": "npm:^5.0.0"
+    js-sha256: "npm:^0.10.1"
+  checksum: 10c0/9b7636327c9399964cf203f5383a42475346b311c31e9fcf329d6a795f04c99886aaf17be17a658c5f112750f74ecb1c413ad91749bcd2f53f44e546c438fa6d
+  languageName: node
+  linkType: hard
+
+"@lingui/react@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "@lingui/react@npm:5.1.2"
+  dependencies:
+    "@babel/runtime": "npm:^7.20.13"
+    "@lingui/core": "npm:^5.1.2"
+  peerDependencies:
+    "@lingui/babel-plugin-lingui-macro": 5.1.2
+    babel-plugin-macros: 2 || 3
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+  peerDependenciesMeta:
+    "@lingui/babel-plugin-lingui-macro":
+      optional: true
+    babel-plugin-macros:
+      optional: true
+  checksum: 10c0/894476f00918140fe186ef6f53e150d00dd850d9cf7ed93ca91f14d3bcc00eeb6701afca8c26e96db602fb9c545bb694eea014566653e5da38a11d685e3525d7
+  languageName: node
+  linkType: hard
+
+"@lingui/swc-plugin@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "@lingui/swc-plugin@npm:5.0.2"
+  peerDependencies:
+    "@lingui/core": 5
+  peerDependenciesMeta:
+    "@swc/core":
+      optional: true
+    next:
+      optional: true
+  checksum: 10c0/5f7ca68349b642f7034800f6080c4f28f33d97059a8611144b9d78878cf14727b9293e4f5aec5c82a4930617f4bcacd2c25618e6d39ded7ceac15465f3b5aed2
+  languageName: node
+  linkType: hard
+
+"@lingui/vite-plugin@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "@lingui/vite-plugin@npm:5.1.2"
+  dependencies:
+    "@lingui/cli": "npm:^5.1.2"
+    "@lingui/conf": "npm:^5.1.2"
+  peerDependencies:
+    vite: ^3 || ^4 || ^5.0.9 || ^6
+  checksum: 10c0/38acf4a58cdce908aaa77e6a10ade0c1692fa485a7c208f877451ae3cfea9102492313458b002e36cb066849d469021881893ada174a39589538f3d89c792d4b
+  languageName: node
+  linkType: hard
+
 "@ljharb/through@npm:^2.3.9":
   version: 2.3.13
   resolution: "@ljharb/through@npm:2.3.13"
@@ -6858,6 +7192,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@messageformat/parser@npm:^5.0.0":
+  version: 5.1.1
+  resolution: "@messageformat/parser@npm:5.1.1"
+  dependencies:
+    moo: "npm:^0.5.1"
+  checksum: 10c0/fc24596d85a20fa9959a0a1c34f9bfd341e4f6eb235d0648e54296e0bed2ebe91d067c7b91036aea8cc2e4af4ddb0722257b0c04f3c610cd9c7ef4f7659d8668
+  languageName: node
+  linkType: hard
+
 "@microsoft/api-extractor-model@npm:7.28.13":
   version: 7.28.13
   resolution: "@microsoft/api-extractor-model@npm:7.28.13"
@@ -17457,6 +17800,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/scope-manager@npm:8.20.0":
+  version: 8.20.0
+  resolution: "@typescript-eslint/scope-manager@npm:8.20.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:8.20.0"
+    "@typescript-eslint/visitor-keys": "npm:8.20.0"
+  checksum: 10c0/a8074768d06c863169294116624a45c19377ff0b8635ad5fa4ae673b43cf704d1b9b79384ceef0ff0abb78b107d345cd90fe5572354daf6ad773fe462ee71e6a
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/type-utils@npm:6.21.0":
   version: 6.21.0
   resolution: "@typescript-eslint/type-utils@npm:6.21.0"
@@ -17519,6 +17872,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/types@npm:8.20.0":
+  version: 8.20.0
+  resolution: "@typescript-eslint/types@npm:8.20.0"
+  checksum: 10c0/21292d4ca089897015d2bf5ab99909a7b362902f63f4ba10696676823b50d00c7b4cd093b4b43fba01d12bc3feca3852d2c28528c06d8e45446b7477887dbee7
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/typescript-estree@npm:5.62.0":
   version: 5.62.0
   resolution: "@typescript-eslint/typescript-estree@npm:5.62.0"
@@ -17594,6 +17954,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/typescript-estree@npm:8.20.0":
+  version: 8.20.0
+  resolution: "@typescript-eslint/typescript-estree@npm:8.20.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:8.20.0"
+    "@typescript-eslint/visitor-keys": "npm:8.20.0"
+    debug: "npm:^4.3.4"
+    fast-glob: "npm:^3.3.2"
+    is-glob: "npm:^4.0.3"
+    minimatch: "npm:^9.0.4"
+    semver: "npm:^7.6.0"
+    ts-api-utils: "npm:^2.0.0"
+  peerDependencies:
+    typescript: ">=4.8.4 <5.8.0"
+  checksum: 10c0/54a2c1da7d1c5f7e865b941e8a3c98eb4b5f56ed8741664a84065173bde9602cdb8866b0984b26816d6af885c1528311c11e7286e869ed424483b74366514cbd
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/utils@npm:5.62.0, @typescript-eslint/utils@npm:^5.45.0":
   version: 5.62.0
   resolution: "@typescript-eslint/utils@npm:5.62.0"
@@ -17643,6 +18021,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/utils@npm:^8.0.0":
+  version: 8.20.0
+  resolution: "@typescript-eslint/utils@npm:8.20.0"
+  dependencies:
+    "@eslint-community/eslint-utils": "npm:^4.4.0"
+    "@typescript-eslint/scope-manager": "npm:8.20.0"
+    "@typescript-eslint/types": "npm:8.20.0"
+    "@typescript-eslint/typescript-estree": "npm:8.20.0"
+  peerDependencies:
+    eslint: ^8.57.0 || ^9.0.0
+    typescript: ">=4.8.4 <5.8.0"
+  checksum: 10c0/dd36c3b22a2adde1e1462aed0c8b4720f61859b4ebb0c3ef935a786a6b1cb0ec21eb0689f5a8debe8db26d97ebb979bab68d6f8fe7b0098e6200a485cfe2991b
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/utils@npm:^8.8.0":
   version: 8.10.0
   resolution: "@typescript-eslint/utils@npm:8.10.0"
@@ -17697,6 +18090,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/visitor-keys@npm:8.20.0":
+  version: 8.20.0
+  resolution: "@typescript-eslint/visitor-keys@npm:8.20.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:8.20.0"
+    eslint-visitor-keys: "npm:^4.2.0"
+  checksum: 10c0/e95d8b2685e8beb6637bf2e9d06e4177a400d3a2b142ba749944690f969ee3186b750082fd9bf34ada82acf1c5dd5970201dfd97619029c8ecca85fb4b50dbd8
+  languageName: node
+  linkType: hard
+
 "@ungap/structured-clone@npm:^1.0.0":
   version: 1.2.1
   resolution: "@ungap/structured-clone@npm:1.2.1"
@@ -18874,7 +19277,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"anymatch@npm:^3.0.3, anymatch@npm:~3.1.2":
+"anymatch@npm:^3.0.3, anymatch@npm:~3.1.1, anymatch@npm:~3.1.2":
   version: 3.1.3
   resolution: "anymatch@npm:3.1.3"
   dependencies:
@@ -19952,7 +20355,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-macros@npm:^3.1.0":
+"babel-plugin-macros@npm:^3.0.1, babel-plugin-macros@npm:^3.1.0":
   version: 3.1.0
   resolution: "babel-plugin-macros@npm:3.1.0"
   dependencies:
@@ -21283,6 +21686,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"browserslist@npm:^4.24.0":
+  version: 4.24.4
+  resolution: "browserslist@npm:4.24.4"
+  dependencies:
+    caniuse-lite: "npm:^1.0.30001688"
+    electron-to-chromium: "npm:^1.5.73"
+    node-releases: "npm:^2.0.19"
+    update-browserslist-db: "npm:^1.1.1"
+  bin:
+    browserslist: cli.js
+  checksum: 10c0/db7ebc1733cf471e0b490b4f47e3e2ea2947ce417192c9246644e92c667dd56a71406cc58f62ca7587caf828364892e9952904a02b7aead752bc65b62a37cfe9
+  languageName: node
+  linkType: hard
+
 "bs-logger@npm:0.x":
   version: 0.2.6
   resolution: "bs-logger@npm:0.2.6"
@@ -21704,6 +22121,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"caniuse-lite@npm:^1.0.30001688":
+  version: 1.0.30001692
+  resolution: "caniuse-lite@npm:1.0.30001692"
+  checksum: 10c0/fca5105561ea12f3de593f3b0f062af82f7d07519e8dbcb97f34e7fd23349bcef1b1622a9a6cd2164d98e3d2f20059ef7e271edae46567aef88caf4c16c7708a
+  languageName: node
+  linkType: hard
+
 "capital-case@npm:^1.0.4":
   version: 1.0.4
   resolution: "capital-case@npm:1.0.4"
@@ -21992,6 +22416,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"chokidar@npm:3.5.1":
+  version: 3.5.1
+  resolution: "chokidar@npm:3.5.1"
+  dependencies:
+    anymatch: "npm:~3.1.1"
+    braces: "npm:~3.0.2"
+    fsevents: "npm:~2.3.1"
+    glob-parent: "npm:~5.1.0"
+    is-binary-path: "npm:~2.1.0"
+    is-glob: "npm:~4.0.1"
+    normalize-path: "npm:~3.0.0"
+    readdirp: "npm:~3.5.0"
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  checksum: 10c0/894d2fdeeef6a0bc61993a20b864e29e9296f2308628b8b2edf1bef2d59ab11f21938eebbbcbf581f15d16d3e030c08860d2fb035f7b9f3baebac57049a37959
+  languageName: node
+  linkType: hard
+
 "chokidar@npm:3.5.3":
   version: 3.5.3
   resolution: "chokidar@npm:3.5.3"
@@ -22285,7 +22728,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cli-table@npm:^0.3.1":
+"cli-table@npm:^0.3.1, cli-table@npm:^0.3.11":
   version: 0.3.11
   resolution: "cli-table@npm:0.3.11"
   dependencies:
@@ -24063,7 +24506,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"date-fns@npm:^3.3.1":
+"date-fns@npm:^3.3.1, date-fns@npm:^3.6.0":
   version: 3.6.0
   resolution: "date-fns@npm:3.6.0"
   checksum: 10c0/0b5fb981590ef2f8e5a3ba6cd6d77faece0ea7f7158948f2eaae7bbb7c80a8f63ae30b01236c2923cf89bb3719c33aeb150c715ea4fe4e86e37dcf06bed42fb6
@@ -25129,6 +25572,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"electron-to-chromium@npm:^1.5.73":
+  version: 1.5.83
+  resolution: "electron-to-chromium@npm:1.5.83"
+  checksum: 10c0/12380962d057c4679add1047cdddb18b909904614272da0527e505a3859eaffde2022dd0688ce7f230582de96405c3d33b667680614475cdafd3f629caa2fee1
+  languageName: node
+  linkType: hard
+
 "elliptic@npm:^6.5.3, elliptic@npm:^6.5.5":
   version: 6.5.6
   resolution: "elliptic@npm:6.5.6"
@@ -25729,7 +26179,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.21.3":
+"esbuild@npm:^0.21.3, esbuild@npm:^0.21.5":
   version: 0.21.5
   resolution: "esbuild@npm:0.21.5"
   dependencies:
@@ -25899,6 +26349,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"escalade@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "escalade@npm:3.2.0"
+  checksum: 10c0/ced4dd3a78e15897ed3be74e635110bbf3b08877b0a41be50dcb325ee0e0b5f65fc2d50e9845194d7c4633f327e2e1c6cce00a71b617c5673df0374201d67f65
+  languageName: node
+  linkType: hard
+
 "escape-carriage@npm:^1.3.1":
   version: 1.3.1
   resolution: "escape-carriage@npm:1.3.1"
@@ -26094,6 +26551,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-plugin-lingui@npm:^0.9.0":
+  version: 0.9.0
+  resolution: "eslint-plugin-lingui@npm:0.9.0"
+  dependencies:
+    "@typescript-eslint/utils": "npm:^8.0.0"
+    micromatch: "npm:^4.0.0"
+  peerDependencies:
+    eslint: ^8.37.0 || ^9.0.0
+  checksum: 10c0/6fb9225be36b7aceadd98f1ccb69eda9a1abf07238e40bee371dfa1394b5110cadb6266a2dc467598674c422cea3345f80f059ce274f09d17747aa23372ae788
+  languageName: node
+  linkType: hard
+
 "eslint-plugin-prefer-arrow@npm:^1.2.3":
   version: 1.2.3
   resolution: "eslint-plugin-prefer-arrow@npm:1.2.3"
@@ -26289,6 +26758,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-visitor-keys@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "eslint-visitor-keys@npm:4.2.0"
+  checksum: 10c0/2ed81c663b147ca6f578312919483eb040295bbab759e5a371953456c636c5b49a559883e2677112453728d66293c0a4c90ab11cab3428cf02a0236d2e738269
+  languageName: node
+  linkType: hard
+
 "eslint@npm:^8.0.0, eslint@npm:^8.53.0":
   version: 8.57.0
   resolution: "eslint@npm:8.57.0"
@@ -27645,24 +28121,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"framer-motion@npm:^10.12.17":
-  version: 10.18.0
-  resolution: "framer-motion@npm:10.18.0"
+"framer-motion@npm:^11.18.0":
+  version: 11.18.0
+  resolution: "framer-motion@npm:11.18.0"
   dependencies:
-    "@emotion/is-prop-valid": "npm:^0.8.2"
+    motion-dom: "npm:^11.16.4"
+    motion-utils: "npm:^11.16.0"
     tslib: "npm:^2.4.0"
   peerDependencies:
-    react: ^18.0.0
-    react-dom: ^18.0.0
-  dependenciesMeta:
+    "@emotion/is-prop-valid": "*"
+    react: ^18.0.0 || ^19.0.0
+    react-dom: ^18.0.0 || ^19.0.0
+  peerDependenciesMeta:
     "@emotion/is-prop-valid":
       optional: true
-  peerDependenciesMeta:
     react:
       optional: true
     react-dom:
       optional: true
-  checksum: 10c0/0aea1b3dc5cf06687e31f3b6c0b6b1a2cd070afdd4a9d38ebf15715c662ca1d6d1c25e6778695e5ebff37a6ce92b031d036c02570370e6057e66aa9de9f9370f
+  checksum: 10c0/7f3c1e420bca2d920b7f48dfb54b072938771f9237feed02d576884398f4a68ccb2d1ae36b28cf2410dbfe2db6edb4c03429a1d896e789d08a972360c6ad82b1
   languageName: node
   linkType: hard
 
@@ -27847,7 +28324,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fsevents@npm:^2.3.2, fsevents@npm:~2.3.2, fsevents@npm:~2.3.3":
+"fsevents@npm:^2.3.2, fsevents@npm:~2.3.1, fsevents@npm:~2.3.2, fsevents@npm:~2.3.3":
   version: 2.3.3
   resolution: "fsevents@npm:2.3.3"
   dependencies:
@@ -27866,7 +28343,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A~2.3.3#optional!builtin<compat/fsevents>":
+"fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A~2.3.1#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A~2.3.3#optional!builtin<compat/fsevents>":
   version: 2.3.3
   resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin<compat/fsevents>::version=2.3.3&hash=df0bf1"
   dependencies:
@@ -28189,7 +28666,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2":
+"glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.0, glob-parent@npm:~5.1.2":
   version: 5.1.2
   resolution: "glob-parent@npm:5.1.2"
   dependencies:
@@ -28270,6 +28747,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"glob@npm:^11.0.0":
+  version: 11.0.1
+  resolution: "glob@npm:11.0.1"
+  dependencies:
+    foreground-child: "npm:^3.1.0"
+    jackspeak: "npm:^4.0.1"
+    minimatch: "npm:^10.0.0"
+    minipass: "npm:^7.1.2"
+    package-json-from-dist: "npm:^1.0.0"
+    path-scurry: "npm:^2.0.0"
+  bin:
+    glob: dist/esm/bin.mjs
+  checksum: 10c0/2b32588be52e9e90f914c7d8dec32f3144b81b84054b0f70e9adfebf37cd7014570489f2a79d21f7801b9a4bd4cca94f426966bfd00fb64a5b705cfe10da3a03
+  languageName: node
+  linkType: hard
+
 "glob@npm:^7.0.0, glob@npm:^7.1.0, glob@npm:^7.1.1, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0, glob@npm:^7.2.3":
   version: 7.2.3
   resolution: "glob@npm:7.2.3"
@@ -30271,6 +30764,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"inquirer@npm:^7.3.3":
+  version: 7.3.3
+  resolution: "inquirer@npm:7.3.3"
+  dependencies:
+    ansi-escapes: "npm:^4.2.1"
+    chalk: "npm:^4.1.0"
+    cli-cursor: "npm:^3.1.0"
+    cli-width: "npm:^3.0.0"
+    external-editor: "npm:^3.0.3"
+    figures: "npm:^3.0.0"
+    lodash: "npm:^4.17.19"
+    mute-stream: "npm:0.0.8"
+    run-async: "npm:^2.4.0"
+    rxjs: "npm:^6.6.0"
+    string-width: "npm:^4.1.0"
+    strip-ansi: "npm:^6.0.0"
+    through: "npm:^2.3.6"
+  checksum: 10c0/96e75974cfd863fe6653c075e41fa5f1a290896df141189816db945debabcd92d3277145f11aef8d2cfca5409ab003ccdd18a099744814057b52a2f27aeb8c94
+  languageName: node
+  linkType: hard
+
 "insert-module-globals@npm:^7.2.1":
   version: 7.2.1
   resolution: "insert-module-globals@npm:7.2.1"
@@ -31363,6 +31877,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jackspeak@npm:^4.0.1":
+  version: 4.0.2
+  resolution: "jackspeak@npm:4.0.2"
+  dependencies:
+    "@isaacs/cliui": "npm:^8.0.2"
+  checksum: 10c0/b26039d11c0163a95b1e58851b9ac453cce64ad6d1eb98a00b303ad5eeb761b29d33c9419d1e16c016d3f7151c8edf7df223e6cf93a1907655fd95d6ce85c0de
+  languageName: node
+  linkType: hard
+
 "jake@npm:^10.8.5":
   version: 10.9.2
   resolution: "jake@npm:10.9.2"
@@ -31906,7 +32429,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-validate@npm:^29.7.0":
+"jest-validate@npm:^29.4.3, jest-validate@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-validate@npm:29.7.0"
   dependencies:
@@ -32165,6 +32688,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"js-sha256@npm:^0.10.1":
+  version: 0.10.1
+  resolution: "js-sha256@npm:0.10.1"
+  checksum: 10c0/c63119f7c7f8afc24bfa24c1a6b51147c3b562316b6341a375a1cef88569340ec0dbf2cda429ecf472cabfbae47a0b93a0cb82b8730883de066593c3f816c53b
+  languageName: node
+  linkType: hard
+
 "js-sha3@npm:0.8.0":
   version: 0.8.0
   resolution: "js-sha3@npm:0.8.0"
@@ -33842,6 +34372,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lru-cache@npm:^11.0.0":
+  version: 11.0.2
+  resolution: "lru-cache@npm:11.0.2"
+  checksum: 10c0/c993b8e06ead0b24b969c1dbb5b301716aed66e320e9014a80012f5febe280b438f28ff50046b2c55ff404e889351ccb332ff91f8dd175a21f5eae80e3fb155f
+  languageName: node
+  linkType: hard
+
 "lru-cache@npm:^4.0.1":
   version: 4.1.5
   resolution: "lru-cache@npm:4.1.5"
@@ -35372,7 +35909,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromatch@npm:^4.0.8":
+"micromatch@npm:^4.0.7, micromatch@npm:^4.0.8":
   version: 4.0.8
   resolution: "micromatch@npm:4.0.8"
   dependencies:
@@ -35536,6 +36073,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minimatch@npm:^10.0.0":
+  version: 10.0.1
+  resolution: "minimatch@npm:10.0.1"
+  dependencies:
+    brace-expansion: "npm:^2.0.1"
+  checksum: 10c0/e6c29a81fe83e1877ad51348306be2e8aeca18c88fdee7a99df44322314279e15799e41d7cb274e4e8bb0b451a3bc622d6182e157dfa1717d6cda75e9cd8cd5d
+  languageName: node
+  linkType: hard
+
 "minimatch@npm:^3.0.2, minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
   version: 3.1.2
   resolution: "minimatch@npm:3.1.2"
@@ -35868,6 +36414,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"moo@npm:^0.5.1":
+  version: 0.5.2
+  resolution: "moo@npm:0.5.2"
+  checksum: 10c0/a9d9ad8198a51fe35d297f6e9fdd718298ca0b39a412e868a0ebd92286379ab4533cfc1f1f34516177f5129988ab25fe598f78e77c84e3bfe0d4a877b56525a8
+  languageName: node
+  linkType: hard
+
+"motion-dom@npm:^11.16.4":
+  version: 11.16.4
+  resolution: "motion-dom@npm:11.16.4"
+  dependencies:
+    motion-utils: "npm:^11.16.0"
+  checksum: 10c0/66de6d40aef59d3004aaf17e39c7c2d2c679306207fdb28c73917d6a05e8c962747fea53d2e516c25d994109d38e127943a759fed18a0fadfc2572a3335fc0d2
+  languageName: node
+  linkType: hard
+
+"motion-utils@npm:^11.16.0":
+  version: 11.16.0
+  resolution: "motion-utils@npm:11.16.0"
+  checksum: 10c0/e68efa08b9546a2fb065537cedcbab1a416d43cdc5773e02ea01408c276e56bbea9ef76d330e80d8536a6ac585b0bbb6f4f2b9d97637d8d36418483e4492ddff
+  languageName: node
+  linkType: hard
+
 "mri@npm:^1.1.0":
   version: 1.2.0
   resolution: "mri@npm:1.2.0"
@@ -36590,6 +37159,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-releases@npm:^2.0.19":
+  version: 2.0.19
+  resolution: "node-releases@npm:2.0.19"
+  checksum: 10c0/52a0dbd25ccf545892670d1551690fe0facb6a471e15f2cfa1b20142a5b255b3aa254af5f59d6ecb69c2bec7390bc643c43aa63b13bf5e64b6075952e716b1aa
+  languageName: node
+  linkType: hard
+
 "nodemailer@npm:^6.9.8":
   version: 6.9.14
   resolution: "nodemailer@npm:6.9.14"
@@ -37444,7 +38020,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ora@npm:5.4.1, ora@npm:^5.4.1":
+"ora@npm:5.4.1, ora@npm:^5.1.0, ora@npm:^5.4.1":
   version: 5.4.1
   resolution: "ora@npm:5.4.1"
   dependencies:
@@ -38214,6 +38790,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"path-scurry@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "path-scurry@npm:2.0.0"
+  dependencies:
+    lru-cache: "npm:^11.0.0"
+    minipass: "npm:^7.1.2"
+  checksum: 10c0/3da4adedaa8e7ef8d6dc4f35a0ff8f05a9b4d8365f2b28047752b62d4c1ad73eec21e37b1579ef2d075920157856a3b52ae8309c480a6f1a8bbe06ff8e52b33c
+  languageName: node
+  linkType: hard
+
 "path-to-regexp@npm:0.1.7":
   version: 0.1.7
   resolution: "path-to-regexp@npm:0.1.7"
@@ -38258,7 +38844,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pathe@npm:^1.1.1, pathe@npm:^1.1.2":
+"pathe@npm:^1.1.0, pathe@npm:^1.1.1, pathe@npm:^1.1.2":
   version: 1.1.2
   resolution: "pathe@npm:1.1.2"
   checksum: 10c0/64ee0a4e587fb0f208d9777a6c56e4f9050039268faaaaecd50e959ef01bf847b7872785c36483fa5cdcdbdfdb31fef2ff222684d4fc21c330ab60395c681897
@@ -38488,6 +39074,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"picocolors@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "picocolors@npm:1.1.1"
+  checksum: 10c0/e2e3e8170ab9d7c7421969adaa7e1b31434f789afb9b3f115f6b96d91945041ac3ceb02e9ec6fe6510ff036bcc0bf91e69a1772edc0b707e12b19c0f2d6bcf58
+  languageName: node
+  linkType: hard
+
 "picomatch@npm:3.0.1":
   version: 3.0.1
   resolution: "picomatch@npm:3.0.1"
@@ -38594,6 +39187,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pkg-up@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "pkg-up@npm:3.1.0"
+  dependencies:
+    find-up: "npm:^3.0.0"
+  checksum: 10c0/ecb60e1f8e1f611c0bdf1a0b6a474d6dfb51185567dc6f29cdef37c8d480ecba5362e006606bb290519bbb6f49526c403fabea93c3090c20368d98bb90c999ab
+  languageName: node
+  linkType: hard
+
 "planer@npm:^1.2.0":
   version: 1.2.0
   resolution: "planer@npm:1.2.0"
@@ -38668,6 +39270,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pofile@npm:^1.1.4":
+  version: 1.1.4
+  resolution: "pofile@npm:1.1.4"
+  checksum: 10c0/75f764906f64faf9db26c37be8f9b3d57caddca059623b629940eef19f6e917bcfa7b9171e00623582130e97acd5a3db2f6384e42aa142d1d39a056cdaba3be3
+  languageName: node
+  linkType: hard
+
 "polished@npm:^4.1.3, polished@npm:^4.2.2":
   version: 4.3.1
   resolution: "polished@npm:4.3.1"
@@ -39542,6 +40151,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pseudolocale@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "pseudolocale@npm:2.1.0"
+  dependencies:
+    commander: "npm:^10.0.0"
+  bin:
+    pseudolocale: dist/cli.mjs
+  checksum: 10c0/8ee38c52fcbb338514aaf3c1ec6675c9bd129b767cef8fb05bc0feab0b10daacdb69632d902f08db7a8099cd0ae204dad72e552b565a547337b14eccfb3c3eff
+  languageName: node
+  linkType: hard
+
 "pseudomap@npm:^1.0.2":
   version: 1.0.2
   resolution: "pseudomap@npm:1.0.2"
@@ -39774,6 +40394,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ramda@npm:^0.27.1":
+  version: 0.27.2
+  resolution: "ramda@npm:0.27.2"
+  checksum: 10c0/1bbcb5bcde33ab2669810644f920b8af4e228967ff800962100803dcdad57b09c5eeee50d9871c74aa20ce496a2d96ec48774e545d7943c8f742ccac5e0fa072
+  languageName: node
+  linkType: hard
+
 "random-bytes@npm:~1.0.0":
   version: 1.0.0
   resolution: "random-bytes@npm:1.0.0"
@@ -40659,6 +41286,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"readdirp@npm:~3.5.0":
+  version: 3.5.0
+  resolution: "readdirp@npm:3.5.0"
+  dependencies:
+    picomatch: "npm:^2.2.1"
+  checksum: 10c0/293de2ed981884a09e76fbf90bddc7e1a87667e57e0284ddc8c177e3151b0d179a9a56441d9f2f3654423924ec100af57ba9e507086527f98fd1d21bdd041c3e
+  languageName: node
+  linkType: hard
+
 "readdirp@npm:~3.6.0":
   version: 3.6.0
   resolution: "readdirp@npm:3.6.0"
@@ -41852,6 +42488,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rxjs@npm:^6.6.0":
+  version: 6.6.7
+  resolution: "rxjs@npm:6.6.7"
+  dependencies:
+    tslib: "npm:^1.9.0"
+  checksum: 10c0/e556a13a9aa89395e5c9d825eabcfa325568d9c9990af720f3f29f04a888a3b854f25845c2b55875d875381abcae2d8100af9cacdc57576e7ed6be030a01d2fe
+  languageName: node
+  linkType: hard
+
 "sade@npm:^1.7.3":
   version: 1.8.1
   resolution: "sade@npm:1.8.1"
@@ -42734,7 +43379,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map@npm:0.8.0-beta.0":
+"source-map@npm:0.8.0-beta.0, source-map@npm:^0.8.0-beta.0":
   version: 0.8.0-beta.0
   resolution: "source-map@npm:0.8.0-beta.0"
   dependencies:
@@ -44518,6 +45163,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ts-api-utils@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "ts-api-utils@npm:2.0.0"
+  peerDependencies:
+    typescript: ">=4.8.4"
+  checksum: 10c0/6165e29a5b75bd0218e3cb0f9ee31aa893dbd819c2e46dbb086c841121eb0436ed47c2c18a20cb3463d74fd1fb5af62e2604ba5971cc48e5b38ebbdc56746dfc
+  languageName: node
+  linkType: hard
+
 "ts-dedent@npm:^2.0.0, ts-dedent@npm:^2.2.0":
   version: 2.2.0
   resolution: "ts-dedent@npm:2.2.0"
@@ -44762,7 +45416,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^1, tslib@npm:^1.13.0, tslib@npm:^1.8.1, tslib@npm:^1.9.3":
+"tslib@npm:^1, tslib@npm:^1.13.0, tslib@npm:^1.8.1, tslib@npm:^1.9.0, tslib@npm:^1.9.3":
   version: 1.14.1
   resolution: "tslib@npm:1.14.1"
   checksum: 10c0/69ae09c49eea644bc5ebe1bca4fa4cc2c82b7b3e02f43b84bd891504edf66dbc6b2ec0eef31a957042de2269139e4acff911e6d186a258fb14069cd7f6febce2
@@ -44927,7 +45581,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"twenty-emails@workspace:packages/twenty-emails":
+"twenty-emails@workspace:*, twenty-emails@workspace:packages/twenty-emails":
   version: 0.0.0-use.local
   resolution: "twenty-emails@workspace:packages/twenty-emails"
   languageName: unknown
@@ -44958,6 +45612,7 @@ __metadata:
     file-saver: "npm:^2.0.5"
     recoil-sync: "npm:^0.2.0"
     transliteration: "npm:^2.3.5"
+    twenty-shared: "workspace:*"
   languageName: unknown
   linkType: soft
 
@@ -45019,6 +45674,8 @@ __metadata:
     rimraf: "npm:^5.0.5"
     ts-morph: "npm:^24.0.0"
     tsconfig-paths: "npm:^4.2.0"
+    twenty-emails: "workspace:*"
+    twenty-shared: "workspace:*"
     typeorm: "patch:typeorm@0.3.20#./patches/typeorm+0.3.20.patch"
     typescript: "npm:5.3.3"
     unzipper: "npm:^0.12.3"
@@ -45026,7 +45683,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"twenty-shared@workspace:packages/twenty-shared":
+"twenty-shared@workspace:*, twenty-shared@workspace:packages/twenty-shared":
   version: 0.0.0-use.local
   resolution: "twenty-shared@workspace:packages/twenty-shared"
   languageName: unknown
@@ -45035,6 +45692,8 @@ __metadata:
 "twenty-ui@workspace:packages/twenty-ui":
   version: 0.0.0-use.local
   resolution: "twenty-ui@workspace:packages/twenty-ui"
+  dependencies:
+    twenty-shared: "workspace:*"
   languageName: unknown
   linkType: soft
 
@@ -45103,6 +45762,11 @@ __metadata:
     "@jsdevtools/rehype-toc": "npm:^3.0.2"
     "@linaria/core": "npm:^6.2.0"
     "@linaria/react": "npm:^6.2.1"
+    "@lingui/cli": "npm:^5.1.2"
+    "@lingui/core": "npm:^5.1.2"
+    "@lingui/react": "npm:^5.1.2"
+    "@lingui/swc-plugin": "npm:^5.0.2"
+    "@lingui/vite-plugin": "npm:^5.1.2"
     "@mdx-js/react": "npm:^3.0.0"
     "@microsoft/microsoft-graph-client": "npm:^3.0.7"
     "@microsoft/microsoft-graph-types": "npm:^2.40.0"
@@ -45258,6 +45922,7 @@ __metadata:
     eslint-config-prettier: "npm:^9.1.0"
     eslint-plugin-import: "npm:2.29.1"
     eslint-plugin-jsx-a11y: "npm:^6.8.0"
+    eslint-plugin-lingui: "npm:^0.9.0"
     eslint-plugin-prefer-arrow: "npm:^1.2.3"
     eslint-plugin-prettier: "npm:^5.1.2"
     eslint-plugin-project-structure: "npm:^3.9.1"
@@ -45270,7 +45935,7 @@ __metadata:
     eslint-plugin-unused-imports: "npm:^3.0.0"
     facepaint: "npm:^1.2.1"
     file-type: "npm:16.5.4"
-    framer-motion: "npm:^10.12.17"
+    framer-motion: "npm:^11.18.0"
     googleapis: "npm:105"
     graphiql: "npm:^3.1.1"
     graphql: "npm:16.8.0"
@@ -46293,6 +46958,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unraw@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "unraw@npm:3.0.0"
+  checksum: 10c0/cd1e7a961c8dc075bdf07300bc046da6bc8c4f1b88c68191c392520f0c64914fa783d48f2431c668f79b1afbd4bab16e864c7aca3cc06ddc94567c1fec114b43
+  languageName: node
+  linkType: hard
+
 "untildify@npm:^4.0.0":
   version: 4.0.0
   resolution: "untildify@npm:4.0.0"
@@ -46327,6 +46999,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"update-browserslist-db@npm:^1.1.1":
+  version: 1.1.2
+  resolution: "update-browserslist-db@npm:1.1.2"
+  dependencies:
+    escalade: "npm:^3.2.0"
+    picocolors: "npm:^1.1.1"
+  peerDependencies:
+    browserslist: ">= 4.21.0"
+  bin:
+    update-browserslist-db: cli.js
+  checksum: 10c0/9cb353998d6d7d6ba1e46b8fa3db888822dd972212da4eda609d185eb5c3557a93fd59780ceb757afd4d84240518df08542736969e6a5d6d6ce2d58e9363aac6
+  languageName: node
+  linkType: hard
+
 "update-notifier@npm:5.1.0":
   version: 5.1.0
   resolution: "update-notifier@npm:5.1.0"